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.7.0\n" +"Project-Id-Version: rhodecode-enterprise-ce 4.8.0\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-04-07 13:01+0200\n" +"POT-Creation-Date: 2017-06-27 17: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:84 -#: rhodecode/templates/admin/repos/repo_edit.mako:52 +#: rhodecode/templates/admin/repos/repo_edit.mako:55 msgid "VCS" msgstr "" @@ -37,7 +37,7 @@ msgid "Remap and Rescan" msgstr "" #: rhodecode/apps/admin/navigation.py:87 -#: rhodecode/templates/admin/repos/repo_edit.mako:58 +#: rhodecode/templates/admin/repos/repo_edit.mako:61 msgid "Issue Tracker" msgstr "" @@ -48,7 +48,7 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:97 #: rhodecode/templates/admin/users/user_add.mako:86 #: rhodecode/templates/admin/users/user_edit_profile.mako:65 -#: rhodecode/templates/admin/users/users.mako:64 +#: rhodecode/templates/admin/users/users.mako:65 #: rhodecode/templates/email_templates/user_registration.mako:25 #: rhodecode/templates/users/user_profile.mako:51 msgid "Email" @@ -75,7 +75,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:72 +#: rhodecode/templates/admin/repos/repo_edit.mako:75 #: rhodecode/templates/base/base.mako:82 msgid "Integrations" msgstr "" @@ -97,11 +97,11 @@ msgstr "" msgid "Labs" msgstr "" -#: rhodecode/apps/admin/views/sessions.py:86 +#: rhodecode/apps/admin/views/sessions.py:92 msgid "Cleaned up old sessions" msgstr "" -#: rhodecode/apps/admin/views/sessions.py:92 +#: rhodecode/apps/admin/views/sessions.py:98 msgid "Failed to cleanup up old sessions" msgstr "" @@ -113,245 +113,409 @@ msgstr "" msgid "Failed to generate the Apache configuration for Subversion." msgstr "" -#: rhodecode/apps/admin/views/system_info.py:95 +#: rhodecode/apps/admin/views/system_info.py:99 msgid "Note: please make sure this server can access `${url}` for the update link to work" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:98 +#: rhodecode/apps/admin/views/system_info.py:102 msgid "Update info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:100 +#: rhodecode/apps/admin/views/system_info.py:104 msgid "Check for updates" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:105 -msgid "RhodeCode Version" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:106 -msgid "RhodeCode Server IP" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:107 -msgid "RhodeCode Server ID" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:108 -msgid "RhodeCode Configuration" -msgstr "" - #: rhodecode/apps/admin/views/system_info.py:109 -msgid "Workers" +msgid "RhodeCode Version" msgstr "" #: rhodecode/apps/admin/views/system_info.py:110 -msgid "Worker Type" +msgid "RhodeCode Server IP" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:111 +msgid "RhodeCode Server ID" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:112 +msgid "RhodeCode Configuration" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:113 +msgid "RhodeCode Certificate" msgstr "" #: rhodecode/apps/admin/views/system_info.py:114 -msgid "Database" +msgid "Workers" msgstr "" #: rhodecode/apps/admin/views/system_info.py:115 -msgid "Database version" +msgid "Worker Type" msgstr "" #: rhodecode/apps/admin/views/system_info.py:119 -msgid "Platform" +msgid "Database" msgstr "" #: rhodecode/apps/admin/views/system_info.py:120 +msgid "Database version" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:124 +msgid "Platform" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:125 msgid "Platform UUID" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:121 -msgid "Python version" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:122 -msgid "Python path" -msgstr "" - #: rhodecode/apps/admin/views/system_info.py:126 -msgid "CPU" +msgid "Python version" msgstr "" #: rhodecode/apps/admin/views/system_info.py:127 +msgid "Python path" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:131 +msgid "CPU" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:132 msgid "Load" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:128 -msgid "Memory" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:129 -msgid "Uptime" -msgstr "" - #: rhodecode/apps/admin/views/system_info.py:133 -msgid "Storage location" +msgid "Memory" msgstr "" #: rhodecode/apps/admin/views/system_info.py:134 -msgid "Storage info" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:135 -msgid "Storage inodes" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:137 -msgid "Gist storage location" +msgid "Uptime" msgstr "" #: rhodecode/apps/admin/views/system_info.py:138 -msgid "Gist storage info" +msgid "Storage location" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:139 +msgid "Storage info" msgstr "" #: rhodecode/apps/admin/views/system_info.py:140 -msgid "Archive cache storage location" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:141 -msgid "Archive cache info" +msgid "Storage inodes" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:142 +msgid "Gist storage location" msgstr "" #: rhodecode/apps/admin/views/system_info.py:143 -msgid "Temp storage location" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:144 -msgid "Temp storage info" +msgid "Gist storage info" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:145 +msgid "Archive cache storage location" msgstr "" #: rhodecode/apps/admin/views/system_info.py:146 -msgid "Search info" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:147 -msgid "Search location" +msgid "Archive cache info" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:148 +msgid "Temp storage location" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:149 +msgid "Temp storage info" msgstr "" #: rhodecode/apps/admin/views/system_info.py:151 -msgid "VCS Backends" +msgid "Search info" msgstr "" #: rhodecode/apps/admin/views/system_info.py:152 +msgid "Search location" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:156 +msgid "VCS Backends" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:157 msgid "VCS Server" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:153 +#: rhodecode/apps/admin/views/system_info.py:158 msgid "GIT" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:154 +#: rhodecode/apps/admin/views/system_info.py:159 msgid "HG" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:155 +#: rhodecode/apps/admin/views/system_info.py:160 msgid "SVN" msgstr "" -#: rhodecode/apps/admin/views/users.py:60 -#: rhodecode/controllers/admin/users.py:359 -#: rhodecode/controllers/admin/users.py:380 +#: rhodecode/apps/admin/views/users.py:63 +#: rhodecode/controllers/admin/users.py:360 +#: rhodecode/controllers/admin/users.py:381 #: rhodecode/controllers/admin/users.py:412 #: rhodecode/controllers/admin/users.py:486 -#: rhodecode/controllers/admin/users.py:499 -#: rhodecode/controllers/admin/users.py:557 msgid "You can't edit this user" msgstr "" +#: rhodecode/apps/admin/views/users.py:168 +#: rhodecode/apps/my_account/views.py:148 +#: rhodecode/controllers/admin/gists.py:62 +msgid "forever" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:169 +#: rhodecode/apps/my_account/views.py:149 +#: rhodecode/controllers/admin/gists.py:63 +msgid "5 minutes" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:170 +#: rhodecode/apps/my_account/views.py:150 +#: rhodecode/controllers/admin/gists.py:64 +msgid "1 hour" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:171 +#: rhodecode/apps/my_account/views.py:151 +#: rhodecode/controllers/admin/gists.py:65 +msgid "1 day" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:172 +#: rhodecode/apps/my_account/views.py:152 +#: rhodecode/controllers/admin/gists.py:66 +msgid "1 month" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:174 +#: rhodecode/apps/my_account/views.py:154 +#: rhodecode/controllers/admin/gists.py:70 +msgid "Lifetime" +msgstr "" + #: rhodecode/apps/admin/views/users.py:178 -#: rhodecode/apps/my_account/views.py:138 -#: rhodecode/controllers/admin/gists.py:62 -msgid "forever" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:179 -#: rhodecode/apps/my_account/views.py:139 -#: rhodecode/controllers/admin/gists.py:63 -msgid "5 minutes" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:180 -#: rhodecode/apps/my_account/views.py:140 -#: rhodecode/controllers/admin/gists.py:64 -msgid "1 hour" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:181 -#: rhodecode/apps/my_account/views.py:141 -#: rhodecode/controllers/admin/gists.py:65 -msgid "1 day" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:182 -#: rhodecode/apps/my_account/views.py:142 -#: rhodecode/controllers/admin/gists.py:66 -msgid "1 month" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:184 -#: rhodecode/apps/my_account/views.py:144 -#: rhodecode/controllers/admin/gists.py:70 -msgid "Lifetime" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:188 -#: rhodecode/apps/my_account/views.py:148 +#: rhodecode/apps/my_account/views.py:158 #: 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:219 -#: rhodecode/apps/my_account/views.py:175 +#: rhodecode/apps/admin/views/users.py:217 +#: rhodecode/apps/my_account/views.py:191 msgid "Auth token successfully created" msgstr "" -#: rhodecode/apps/admin/views/users.py:240 -#: rhodecode/apps/my_account/views.py:192 +#: rhodecode/apps/admin/views/users.py:246 +#: rhodecode/apps/my_account/views.py:215 msgid "Auth token successfully deleted" msgstr "" -#: rhodecode/apps/admin/views/users.py:284 +#: rhodecode/apps/admin/views/users.py:290 +#: rhodecode/apps/my_account/views.py:253 +#, python-format +msgid "Added new email address `%s` for user account" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:296 +#: rhodecode/apps/my_account/views.py:259 +msgid "An error occurred during email saving" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:323 +msgid "Removed email address from user account" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:372 +#, python-format +msgid "An error occurred during ip saving:%s" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:389 +msgid "An error occurred during ip saving" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:393 +#, python-format +msgid "Added ips %s to user whitelist" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:423 +msgid "Removed ip address from user whitelist" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:472 msgid "Groups successfully changed" msgstr "" -#: rhodecode/apps/login/views.py:247 rhodecode/apps/login/views.py:316 +#: rhodecode/apps/home/views.py:197 rhodecode/apps/home/views.py:230 +#: rhodecode/controllers/pullrequests.py:191 +#: rhodecode/templates/admin/my_account/my_account.mako:38 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:128 +#: 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:76 rhodecode/templates/base/base.mako:148 +#: rhodecode/templates/base/base.mako:575 +msgid "Repositories" +msgstr "" + +#: rhodecode/apps/home/views.py:223 +msgid "Groups" +msgstr "" + +#: rhodecode/apps/home/views.py:243 +#, python-format +msgid "Commits in %(repo)s" +msgstr "" + +#: rhodecode/apps/login/views.py:270 rhodecode/apps/login/views.py:339 msgid "Bad captcha" msgstr "" -#: rhodecode/apps/login/views.py:256 +#: rhodecode/apps/login/views.py:279 msgid "You have successfully registered with RhodeCode" msgstr "" -#: rhodecode/apps/login/views.py:292 +#: rhodecode/apps/login/views.py:315 msgid "If such email exists, a password reset link was sent to it." msgstr "" -#: rhodecode/apps/login/views.py:298 +#: rhodecode/apps/login/views.py:321 msgid "Password reset has been disabled." msgstr "" -#: rhodecode/apps/login/views.py:381 +#: rhodecode/apps/login/views.py:410 msgid "Given reset token is invalid" msgstr "" -#: rhodecode/apps/login/views.py:389 +#: rhodecode/apps/login/views.py:418 msgid "Your password reset was successful, a new password has been sent to your email" msgstr "" -#: rhodecode/apps/my_account/views.py:115 +#: rhodecode/apps/my_account/views.py:125 msgid "Error occurred during update of user password" msgstr "" -#: rhodecode/apps/my_account/views.py:122 +#: rhodecode/apps/my_account/views.py:132 msgid "Successfully updated password" msgstr "" +#: rhodecode/apps/my_account/views.py:281 +msgid "Email successfully deleted" +msgstr "" + +#: rhodecode/apps/repository/views/repo_caches.py:70 +msgid "Cache invalidation successful" +msgstr "" + +#: rhodecode/apps/repository/views/repo_caches.py:74 +msgid "An error occurred during cache invalidation" +msgstr "" + +#: rhodecode/apps/repository/views/repo_permissions.py:95 +msgid "Repository permissions updated" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings.py:171 +msgid "Repository {} updated successfully" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings.py:175 +msgid "Error occurred during update of repository {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:93 +#, python-format +msgid "Detached %s forks" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:96 +#, python-format +msgid "Deleted %s forks" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:109 +#, python-format +msgid "Deleted repository `%s`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:116 +msgid "detach or delete" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:117 +msgid "Cannot delete `{repo}` it still contains attached forks. Try using {delete_or_detach} option." +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:127 +#, python-format +msgid "An error occurred during deletion of `%s`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:152 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:156 +msgid "An error occurred during setting this repository in public journal" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:184 +msgid "Nothing" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:186 +#, python-format +msgid "Marked repo %s as fork of %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 +msgid "An error occurred during this operation" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:217 +msgid "Locked repository" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:220 +msgid "Unlocked repository" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:223 +#: rhodecode/controllers/admin/repos.py:363 +msgid "An error occurred during unlocking" +msgstr "" + +#: rhodecode/apps/repository/views/repo_summary.py:293 +msgid "Branch" +msgstr "" + +#: rhodecode/apps/repository/views/repo_summary.py:294 +msgid "Tag" +msgstr "" + +#: rhodecode/apps/repository/views/repo_summary.py:295 +msgid "Bookmark" +msgstr "" + +#: rhodecode/apps/repository/views/repo_summary.py:318 +#: rhodecode/controllers/files.py:1021 rhodecode/model/pull_request.py:1345 +#: rhodecode/model/scm.py:775 rhodecode/templates/base/vcs_settings.mako:255 +msgid "Branches" +msgstr "" + +#: rhodecode/apps/repository/views/repo_summary.py:319 +msgid "Closed branches" +msgstr "" + #: rhodecode/apps/svn_support/events.py:30 msgid "Configuration for Apaache mad_dav_svn changed." msgstr "" @@ -408,7 +572,7 @@ msgid "The Port in use by the Atlassian msgstr "" #: rhodecode/authentication/plugins/auth_crowd.py:69 -#: rhodecode/authentication/plugins/auth_ldap.py:84 +#: rhodecode/authentication/plugins/auth_ldap.py:86 msgid "Port" msgstr "" @@ -436,7 +600,7 @@ msgstr "" msgid "Admin Groups" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:215 +#: rhodecode/authentication/plugins/auth_crowd.py:216 msgid "CROWD" msgstr "" @@ -483,126 +647,129 @@ msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:74 msgid "" -"Host of the LDAP Server \n" -"(e.g., 192.168.2.154, or ldap-server.domain.com" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:77 +"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:78 msgid "LDAP Host" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:82 -msgid "Custom port that the LDAP server is listening on. Default: 389" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:90 +#: rhodecode/authentication/plugins/auth_ldap.py:83 +msgid "Custom port that the LDAP server is listening on. Default value is: 389" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:92 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:95 +#: rhodecode/authentication/plugins/auth_ldap.py:97 msgid "Account" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:100 +#: rhodecode/authentication/plugins/auth_ldap.py:102 msgid "Password to authenticate for given user DN." msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:103 +#: rhodecode/authentication/plugins/auth_ldap.py:105 #: rhodecode/templates/login.mako:50 rhodecode/templates/register.mako:48 #: rhodecode/templates/admin/my_account/my_account.mako:30 #: rhodecode/templates/admin/users/user_add.mako:44 -#: rhodecode/templates/base/base.mako:313 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:108 +#: rhodecode/authentication/plugins/auth_ldap.py:110 msgid "TLS Type" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:109 +#: rhodecode/authentication/plugins/auth_ldap.py:111 msgid "Connection Security" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:115 -msgid "Require Cert over TLS?" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:116 +#: rhodecode/authentication/plugins/auth_ldap.py:117 +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:120 msgid "Certificate Checks" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:122 +#: rhodecode/authentication/plugins/auth_ldap.py:126 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:127 +#: rhodecode/authentication/plugins/auth_ldap.py:131 msgid "Base DN" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:132 +#: rhodecode/authentication/plugins/auth_ldap.py:136 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:137 +#: rhodecode/authentication/plugins/auth_ldap.py:141 msgid "LDAP Search Filter" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:143 +#: rhodecode/authentication/plugins/auth_ldap.py:147 msgid "How deep to search LDAP. If unsure set to SUBTREE" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:144 +#: rhodecode/authentication/plugins/auth_ldap.py:148 msgid "LDAP Search Scope" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:150 +#: rhodecode/authentication/plugins/auth_ldap.py:154 msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:152 +#: rhodecode/authentication/plugins/auth_ldap.py:156 msgid "Login Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:153 +#: rhodecode/authentication/plugins/auth_ldap.py:157 msgid "The LDAP Login attribute of the CN must be specified" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:158 +#: rhodecode/authentication/plugins/auth_ldap.py:162 msgid "LDAP Attribute to map to first name (e.g., givenName)" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:161 +#: rhodecode/authentication/plugins/auth_ldap.py:165 msgid "First Name Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:166 +#: rhodecode/authentication/plugins/auth_ldap.py:170 msgid "LDAP Attribute to map to last name (e.g., sn)" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:169 +#: rhodecode/authentication/plugins/auth_ldap.py:173 msgid "Last Name Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:174 +#: rhodecode/authentication/plugins/auth_ldap.py:178 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:179 +#: rhodecode/authentication/plugins/auth_ldap.py:183 msgid "Email Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:360 +#: rhodecode/authentication/plugins/auth_ldap.py:365 msgid "LDAP" msgstr "" @@ -634,74 +801,71 @@ msgstr "" msgid "Rhodecode Token Auth" msgstr "" -#: rhodecode/controllers/changelog.py:91 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:204 +#: rhodecode/controllers/changelog.py:70 rhodecode/controllers/compare.py:64 +#: rhodecode/controllers/pullrequests.py:85 msgid "There are no commits yet" msgstr "" +#: rhodecode/controllers/changeset.py:76 +msgid "Show whitespace" +msgstr "" + #: rhodecode/controllers/changeset.py:77 -msgid "Show whitespace" -msgstr "" - -#: rhodecode/controllers/changeset.py:78 msgid "Show whitespace for all diffs" msgstr "" +#: rhodecode/controllers/changeset.py:83 +msgid "Ignore whitespace" +msgstr "" + #: rhodecode/controllers/changeset.py:84 -msgid "Ignore whitespace" -msgstr "" - -#: rhodecode/controllers/changeset.py:85 msgid "Ignore whitespace for all diffs" msgstr "" +#: rhodecode/controllers/changeset.py:140 +msgid "Increase context" +msgstr "" + #: rhodecode/controllers/changeset.py:141 -msgid "Increase context" -msgstr "" - -#: rhodecode/controllers/changeset.py:142 msgid "Increase context for all diffs" msgstr "" -#: rhodecode/controllers/changeset.py:190 rhodecode/controllers/files.py:106 -#: rhodecode/controllers/files.py:127 +#: rhodecode/controllers/changeset.py:189 rhodecode/controllers/files.py:106 +#: rhodecode/controllers/files.py:128 msgid "No such commit exists for this repository" msgstr "" -#: rhodecode/controllers/changeset.py:344 -#: rhodecode/controllers/pullrequests.py:985 -#: rhodecode/model/pull_request.py:1055 +#: rhodecode/controllers/changeset.py:343 +#: rhodecode/controllers/pullrequests.py:919 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" -#: rhodecode/controllers/changeset.py:389 +#: rhodecode/controllers/changeset.py:387 msgid "Changing the status of a commit associated with a closed pull request is not allowed" msgstr "" -#: rhodecode/controllers/compare.py:89 +#: rhodecode/controllers/compare.py:92 msgid "Select commit" msgstr "" -#: rhodecode/controllers/compare.py:144 -#, python-format -msgid "Could not find the original repo: %(repo)s" -msgstr "" - -#: rhodecode/controllers/compare.py:152 -#, python-format -msgid "Could not find the other repo: %(repo)s" -msgstr "" - -#: rhodecode/controllers/compare.py:164 +#: rhodecode/controllers/compare.py:149 +msgid "Could not find the source repo: `{}`" +msgstr "" + +#: rhodecode/controllers/compare.py:156 +msgid "Could not find the target repo: `{}`" +msgstr "" + +#: rhodecode/controllers/compare.py:166 msgid "The comparison of two different kinds of remote repos is not available" msgstr "" -#: rhodecode/controllers/compare.py:202 +#: rhodecode/controllers/compare.py:204 msgid "Could not compare repos with different large file settings" msgstr "" -#: rhodecode/controllers/compare.py:242 +#: rhodecode/controllers/compare.py:244 #, python-format msgid "Repositories unrelated. Cannot compare commit %(commit1)s from repository %(repo1)s with commit %(commit2)s from repository %(repo2)s." msgstr "" @@ -725,51 +889,47 @@ msgstr "" msgid "There are no files yet. %s" msgstr "" -#: rhodecode/controllers/files.py:435 rhodecode/controllers/files.py:488 -#: rhodecode/controllers/files.py:519 rhodecode/controllers/files.py:594 -#: rhodecode/controllers/files.py:639 rhodecode/controllers/files.py:730 +#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:487 +#: rhodecode/controllers/files.py:518 rhodecode/controllers/files.py:593 +#: rhodecode/controllers/files.py:638 rhodecode/controllers/files.py:729 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:443 rhodecode/controllers/files.py:496 +#: rhodecode/controllers/files.py:442 rhodecode/controllers/files.py:495 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:452 rhodecode/controllers/files.py:505 -#, python-format -msgid "Deleted file %s via RhodeCode Enterprise" +#: rhodecode/controllers/files.py:451 rhodecode/controllers/files.py:504 +msgid "Deleted file {} via RhodeCode Enterprise" msgstr "" #: rhodecode/controllers/files.py:472 -#, python-format -msgid "Successfully deleted file %s" -msgstr "" - -#: rhodecode/controllers/files.py:475 rhodecode/controllers/files.py:581 -#: rhodecode/controllers/files.py:718 +msgid "Successfully deleted file `{}`" +msgstr "" + +#: rhodecode/controllers/files.py:476 rhodecode/controllers/files.py:582 +#: rhodecode/controllers/files.py:719 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:527 rhodecode/controllers/files.py:602 +#: rhodecode/controllers/files.py:526 rhodecode/controllers/files.py:601 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:539 rhodecode/controllers/files.py:614 -#, python-format -msgid "Edited file %s via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:556 +#: rhodecode/controllers/files.py:538 rhodecode/controllers/files.py:613 +msgid "Edited file {} via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/controllers/files.py:555 msgid "No changes" msgstr "" -#: rhodecode/controllers/files.py:578 rhodecode/controllers/files.py:707 -#, python-format -msgid "Successfully committed to %s" -msgstr "" - -#: rhodecode/controllers/files.py:652 rhodecode/controllers/files.py:741 +#: rhodecode/controllers/files.py:578 +msgid "Successfully committed changes to file `{}`" +msgstr "" + +#: rhodecode/controllers/files.py:651 rhodecode/controllers/files.py:740 msgid "Added file via RhodeCode Enterprise" msgstr "" @@ -777,39 +937,37 @@ msgstr "" msgid "No filename" msgstr "" +#: rhodecode/controllers/files.py:707 +msgid "Successfully committed new file `{}`" +msgstr "" + #: rhodecode/controllers/files.py:710 msgid "The location specified must be a relative path and must not contain .. in the path" msgstr "" -#: rhodecode/controllers/files.py:764 +#: rhodecode/controllers/files.py:763 msgid "Downloads disabled" msgstr "" -#: rhodecode/controllers/files.py:770 +#: rhodecode/controllers/files.py:769 #, python-format msgid "Unknown revision %s" msgstr "" -#: rhodecode/controllers/files.py:772 +#: rhodecode/controllers/files.py:771 msgid "Empty repository" msgstr "" -#: rhodecode/controllers/files.py:774 rhodecode/controllers/files.py:808 +#: rhodecode/controllers/files.py:773 rhodecode/controllers/files.py:807 msgid "Unknown archive type" msgstr "" -#: rhodecode/controllers/files.py:993 +#: rhodecode/controllers/files.py:1000 msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:1014 rhodecode/controllers/summary.py:277 -#: rhodecode/model/pull_request.py:1280 rhodecode/model/scm.py:782 -#: rhodecode/templates/base/vcs_settings.mako:242 -msgid "Branches" -msgstr "" - -#: rhodecode/controllers/files.py:1018 rhodecode/model/scm.py:797 -#: rhodecode/templates/base/vcs_settings.mako:267 +#: rhodecode/controllers/files.py:1025 rhodecode/model/scm.py:790 +#: rhodecode/templates/base/vcs_settings.mako:280 msgid "Tags" msgstr "" @@ -818,27 +976,6 @@ msgstr "" msgid "An error occurred during repository forking %s" msgstr "" -#: rhodecode/controllers/home.py:207 -msgid "Groups" -msgstr "" - -#: rhodecode/controllers/home.py:214 rhodecode/controllers/home.py:249 -#: rhodecode/controllers/pullrequests.py:310 -#: rhodecode/templates/admin/my_account/my_account.mako:38 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:128 -#: 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:76 rhodecode/templates/base/base.mako:148 -#: rhodecode/templates/base/base.mako:572 -msgid "Repositories" -msgstr "" - -#: rhodecode/controllers/home.py:227 -#, python-format -msgid "Commits in %(repo)s" -msgstr "" - #: rhodecode/controllers/journal.py:107 rhodecode/controllers/journal.py:150 msgid "public journal" msgstr "" @@ -847,80 +984,58 @@ msgstr "" msgid "journal" msgstr "" -#: rhodecode/controllers/pullrequests.py:218 +#: rhodecode/controllers/pullrequests.py:99 msgid "Commit does not exist" msgstr "" -#: rhodecode/controllers/pullrequests.py:335 +#: rhodecode/controllers/pullrequests.py:216 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:337 +#: rhodecode/controllers/pullrequests.py:218 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/controllers/pullrequests.py:385 +#: rhodecode/controllers/pullrequests.py:276 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:388 -msgid "Error occurred during sending pull request" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:431 +#: rhodecode/controllers/pullrequests.py:279 +msgid "Error occurred during creation of this pull request." +msgstr "" + +#: rhodecode/controllers/pullrequests.py:322 msgid "Cannot update closed pull requests." msgstr "" +#: rhodecode/controllers/pullrequests.py:328 +msgid "Pull request title & description updated." +msgstr "" + +#: rhodecode/controllers/pullrequests.py:346 +msgid "Pull request updated to \"{source_commit_id}\" with {count_added} added, {count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:363 +msgid "Reload page" +msgstr "" + #: rhodecode/controllers/pullrequests.py:437 -msgid "Pull request title & description updated." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:455 -msgid "Pull request updated to \"{source_commit_id}\" with {count_added} added, {count_removed} removed commits. Source of changes: {change_source}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:472 -msgid "Reload page" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:546 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/controllers/pullrequests.py:588 +#: rhodecode/controllers/pullrequests.py:461 +msgid "Pull request reviewers updated." +msgstr "" + +#: rhodecode/controllers/pullrequests.py:482 msgid "Successfully deleted pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:592 +#: rhodecode/controllers/pullrequests.py:486 msgid "Your are not allowed to delete this pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:989 -#: rhodecode/model/pull_request.py:1059 -msgid "Closing with" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:1039 -#, python-format -msgid "Closing pull request on other statuses than rejected or approved is forbidden. Calculated status from all reviewers is currently: %s" -msgstr "" - -#: rhodecode/controllers/summary.py:251 -msgid "Branch" -msgstr "" - -#: rhodecode/controllers/summary.py:252 -msgid "Tag" -msgstr "" - -#: rhodecode/controllers/summary.py:253 -msgid "Bookmark" -msgstr "" - -#: rhodecode/controllers/summary.py:278 -msgid "Closed branches" -msgstr "" - #: rhodecode/controllers/admin/defaults.py:84 msgid "Default settings updated successfully" msgstr "" @@ -976,89 +1091,73 @@ msgstr "" msgid "%(expiry)s - current value" msgstr "" -#: rhodecode/controllers/admin/my_account.py:78 +#: rhodecode/controllers/admin/my_account.py:70 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/my_account.py:138 +#: rhodecode/controllers/admin/my_account.py:110 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/controllers/admin/my_account.py:153 -#: rhodecode/controllers/admin/users.py:184 +#: rhodecode/controllers/admin/my_account.py:125 +#: rhodecode/controllers/admin/users.py:182 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/my_account.py:222 -#: rhodecode/controllers/admin/users.py:527 -#, python-format -msgid "Added new email address `%s` for user account" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:229 -#: rhodecode/controllers/admin/users.py:534 -msgid "An error occurred during email saving" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:239 -#: rhodecode/controllers/admin/users.py:549 -msgid "Removed email address from user account" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:112 +#: rhodecode/controllers/admin/permissions.py:107 msgid "Application permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/permissions.py:127 -#: rhodecode/controllers/admin/permissions.py:176 -#: rhodecode/controllers/admin/permissions.py:230 +#: rhodecode/controllers/admin/permissions.py:122 +#: rhodecode/controllers/admin/permissions.py:171 +#: rhodecode/controllers/admin/permissions.py:225 msgid "Error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/permissions.py:161 +#: rhodecode/controllers/admin/permissions.py:156 msgid "Object permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/permissions.py:215 +#: rhodecode/controllers/admin/permissions.py:210 msgid "Global permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/repo_groups.py:197 +#: rhodecode/controllers/admin/repo_groups.py:202 #, python-format msgid "Created repository group %s" msgstr "" -#: rhodecode/controllers/admin/repo_groups.py:210 +#: rhodecode/controllers/admin/repo_groups.py:215 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: rhodecode/controllers/admin/repo_groups.py:258 +#: rhodecode/controllers/admin/repo_groups.py:261 #, python-format msgid "Updated repository group %s" msgstr "" -#: rhodecode/controllers/admin/repo_groups.py:274 +#: rhodecode/controllers/admin/repo_groups.py:276 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: rhodecode/controllers/admin/repo_groups.py:296 +#: rhodecode/controllers/admin/repo_groups.py:291 #, python-format msgid "This group contains %(num)d repository and cannot be deleted" msgid_plural "This group contains %(num)d repositories and cannot be deleted" msgstr[0] "" msgstr[1] "" -#: rhodecode/controllers/admin/repo_groups.py:305 +#: rhodecode/controllers/admin/repo_groups.py:300 #, python-format msgid "This group contains %(num)d subgroup and cannot be deleted" msgid_plural "This group contains %(num)d subgroups and cannot be deleted" msgstr[0] "" msgstr[1] "" -#: rhodecode/controllers/admin/repo_groups.py:312 +#: rhodecode/controllers/admin/repo_groups.py:313 #, python-format msgid "Removed repository group %s" msgstr "" @@ -1068,366 +1167,285 @@ msgstr "" msgid "Error occurred during deletion of repository group %s" msgstr "" -#: rhodecode/controllers/admin/repo_groups.py:388 -#: rhodecode/controllers/admin/user_groups.py:323 +#: rhodecode/controllers/admin/repo_groups.py:381 +#: rhodecode/controllers/admin/user_groups.py:318 msgid "Cannot change permission for yourself as admin" msgstr "" -#: rhodecode/controllers/admin/repo_groups.py:405 +#: rhodecode/controllers/admin/repo_groups.py:404 msgid "Repository Group permissions updated" msgstr "" +#: rhodecode/controllers/admin/repos.py:125 +#, python-format +msgid "Error creating repository %s: invalid certificate" +msgstr "" + #: rhodecode/controllers/admin/repos.py:129 #, python-format -msgid "Error creating repository %s: invalid certificate" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:133 -#, python-format msgid "Error creating repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:274 +#: rhodecode/controllers/admin/repos.py:270 #, python-format msgid "Created repository %s from %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:283 +#: rhodecode/controllers/admin/repos.py:279 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:286 +#: rhodecode/controllers/admin/repos.py:282 #, python-format msgid "Created repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:327 -#, python-format -msgid "Repository %s updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:346 -#, python-format -msgid "Error occurred during update of repository %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:374 -#, python-format -msgid "Detached %s forks" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:377 -#, python-format -msgid "Deleted %s forks" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:382 -#, python-format -msgid "Deleted repository %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:385 -#, python-format -msgid "Cannot delete %s it still contains attached forks" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:390 -#, python-format -msgid "An error occurred during deletion of %s" +#: rhodecode/controllers/admin/repos.py:319 +msgid "An error occurred during creation of field" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:334 +msgid "An error occurred during removal of field" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:353 +msgid "Unlocked" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:357 +msgid "Locked" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:359 +#, python-format +msgid "Repository has been %s" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:373 +msgid "Pulled from remote location" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:376 +msgid "An error occurred during pull from remote location" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:397 +msgid "An error occurred during deletion of repository stats" msgstr "" #: rhodecode/controllers/admin/repos.py:443 -msgid "Repository permissions updated" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:474 -msgid "An error occurred during creation of field" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:489 -msgid "An error occurred during removal of field" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:528 -msgid "Updated repository visibility in public journal" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:532 -msgid "An error occurred during setting this repository in public journal" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:556 -msgid "Nothing" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:558 -#, python-format -msgid "Marked repo %s as fork of %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:565 -msgid "An error occurred during this operation" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:583 -msgid "Locked repository" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:586 -msgid "Unlocked repository" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:589 -#: rhodecode/controllers/admin/repos.py:618 -msgid "An error occurred during unlocking" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:608 -msgid "Unlocked" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:612 -msgid "Locked" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:614 -#, python-format -msgid "Repository has been %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:629 -msgid "Cache invalidation successful" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:633 -msgid "An error occurred during cache invalidation" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:653 -msgid "Pulled from remote location" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:656 -msgid "An error occurred during pull from remote location" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:678 -msgid "An error occurred during deletion of repository stats" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:725 msgid "Error occurred during deleting issue tracker entry" msgstr "" -#: rhodecode/controllers/admin/repos.py:728 -#: rhodecode/controllers/admin/settings.py:381 +#: rhodecode/controllers/admin/repos.py:446 +#: rhodecode/controllers/admin/settings.py:384 msgid "Removed issue tracker entry" msgstr "" -#: rhodecode/controllers/admin/repos.py:758 -#: rhodecode/controllers/admin/settings.py:428 +#: rhodecode/controllers/admin/repos.py:476 +#: rhodecode/controllers/admin/settings.py:431 msgid "Updated issue tracker entries" msgstr "" -#: rhodecode/controllers/admin/repos.py:819 +#: rhodecode/controllers/admin/repos.py:537 #: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:619 +#: rhodecode/controllers/admin/settings.py:622 msgid "Some form inputs contain invalid data." msgstr "" -#: rhodecode/controllers/admin/repos.py:837 +#: rhodecode/controllers/admin/repos.py:555 msgid "Error occurred during updating repository VCS settings" msgstr "" -#: rhodecode/controllers/admin/repos.py:841 +#: rhodecode/controllers/admin/repos.py:559 #: rhodecode/controllers/admin/settings.py:176 msgid "Updated VCS settings" msgstr "" #: rhodecode/controllers/admin/settings.py:172 -#: rhodecode/controllers/admin/settings.py:283 +#: rhodecode/controllers/admin/settings.py:286 msgid "Error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:223 +#: rhodecode/controllers/admin/settings.py:226 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:279 +#: rhodecode/controllers/admin/settings.py:282 msgid "Updated application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:345 -msgid "Updated visualisation settings" -msgstr "" - #: rhodecode/controllers/admin/settings.py:348 +msgid "Updated visualisation settings" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:351 msgid "Error occurred during updating visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:441 +#: rhodecode/controllers/admin/settings.py:444 msgid "Please enter email address" msgstr "" -#: rhodecode/controllers/admin/settings.py:459 +#: rhodecode/controllers/admin/settings.py:462 msgid "Send email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:492 +#: rhodecode/controllers/admin/settings.py:495 msgid "Added new hook" msgstr "" -#: rhodecode/controllers/admin/settings.py:507 +#: rhodecode/controllers/admin/settings.py:510 msgid "Updated hooks" msgstr "" -#: rhodecode/controllers/admin/settings.py:511 +#: rhodecode/controllers/admin/settings.py:514 msgid "Error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:640 +#: rhodecode/controllers/admin/settings.py:643 msgid "Error occurred during updating labs settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:645 +#: rhodecode/controllers/admin/settings.py:648 msgid "Updated Labs settings" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:165 +#: rhodecode/controllers/admin/user_groups.py:164 #, python-format msgid "Created user group %(user_group_link)s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:179 +#: rhodecode/controllers/admin/user_groups.py:178 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:220 +#: rhodecode/controllers/admin/user_groups.py:218 #, python-format msgid "Updated user group %s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:236 +#: rhodecode/controllers/admin/user_groups.py:234 #, python-format msgid "Error occurred during update of user group %s" msgstr "" +#: rhodecode/controllers/admin/user_groups.py:253 +msgid "Successfully deleted user group" +msgstr "" + #: rhodecode/controllers/admin/user_groups.py:258 -msgid "Successfully deleted user group" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:263 msgid "An error occurred during deletion of user group" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:331 +#: rhodecode/controllers/admin/user_groups.py:326 msgid "Target group cannot be the same" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:337 +#: rhodecode/controllers/admin/user_groups.py:332 msgid "User Group permissions updated" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:422 +#: rhodecode/controllers/admin/user_groups.py:415 msgid "User Group global permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:437 +#: rhodecode/controllers/admin/user_groups.py:430 #: rhodecode/controllers/admin/users.py:477 msgid "An error occurred during permissions saving" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:481 +#: rhodecode/controllers/admin/user_groups.py:474 msgid "User Group synchronization updated successfully" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:485 +#: rhodecode/controllers/admin/user_groups.py:478 msgid "An error occurred during synchronization update" msgstr "" -#: rhodecode/controllers/admin/users.py:106 +#: rhodecode/controllers/admin/users.py:108 #, python-format msgid "Created user %(user_link)s" msgstr "" -#: rhodecode/controllers/admin/users.py:122 +#: rhodecode/controllers/admin/users.py:124 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:167 +#: rhodecode/controllers/admin/users.py:166 msgid "User updated successfully" msgstr "" -#: rhodecode/controllers/admin/users.py:218 +#: rhodecode/controllers/admin/users.py:209 #, python-format msgid "Detached %s repositories" msgstr "" -#: rhodecode/controllers/admin/users.py:223 +#: rhodecode/controllers/admin/users.py:214 #, python-format msgid "Deleted %s repositories" msgstr "" -#: rhodecode/controllers/admin/users.py:231 +#: rhodecode/controllers/admin/users.py:222 #, python-format msgid "Detached %s repository groups" msgstr "" -#: rhodecode/controllers/admin/users.py:236 +#: rhodecode/controllers/admin/users.py:227 #, python-format msgid "Deleted %s repository groups" msgstr "" -#: rhodecode/controllers/admin/users.py:244 +#: rhodecode/controllers/admin/users.py:235 #, python-format msgid "Detached %s user groups" msgstr "" -#: rhodecode/controllers/admin/users.py:249 +#: rhodecode/controllers/admin/users.py:240 #, python-format msgid "Deleted %s user groups" msgstr "" -#: rhodecode/controllers/admin/users.py:260 +#: rhodecode/controllers/admin/users.py:257 msgid "Successfully deleted user" msgstr "" -#: rhodecode/controllers/admin/users.py:266 +#: rhodecode/controllers/admin/users.py:263 msgid "An error occurred during deletion of user" msgstr "" +#: rhodecode/controllers/admin/users.py:280 +msgid "Force password change disabled for user" +msgstr "" + #: rhodecode/controllers/admin/users.py:285 -msgid "Force password change disabled for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:287 msgid "Force password change enabled for user" msgstr "" -#: rhodecode/controllers/admin/users.py:291 +#: rhodecode/controllers/admin/users.py:294 msgid "An error occurred during password reset for user" msgstr "" -#: rhodecode/controllers/admin/users.py:324 +#: rhodecode/controllers/admin/users.py:325 #, python-format msgid "Linked repository group `%s` as personal" msgstr "" -#: rhodecode/controllers/admin/users.py:330 +#: rhodecode/controllers/admin/users.py:331 #, python-format msgid "Created repository group `%s`" msgstr "" -#: rhodecode/controllers/admin/users.py:334 +#: rhodecode/controllers/admin/users.py:335 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/controllers/admin/users.py:339 +#: rhodecode/controllers/admin/users.py:340 msgid "An error occurred during repository group creation for user" msgstr "" @@ -1435,81 +1453,63 @@ msgstr "" msgid "The user participates as reviewer in pull requests and cannot be deleted. You can set the user to \"inactive\" instead of deleting it." msgstr "" -#: rhodecode/controllers/admin/users.py:461 +#: rhodecode/controllers/admin/users.py:462 msgid "User global permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/users.py:589 -#, python-format -msgid "An error occurred during ip saving:%s" -msgstr "" - -#: rhodecode/controllers/admin/users.py:604 -msgid "An error occurred during ip saving" -msgstr "" - -#: rhodecode/controllers/admin/users.py:608 -#, python-format -msgid "Added ips %s to user whitelist" -msgstr "" - -#: rhodecode/controllers/admin/users.py:626 -msgid "Removed ip address from user whitelist" -msgstr "" - -#: rhodecode/events/pullrequest.py:68 +#: rhodecode/events/pullrequest.py:71 msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:77 +#: rhodecode/events/pullrequest.py:80 msgid "pullrequest closed" msgstr "" -#: rhodecode/events/pullrequest.py:86 +#: rhodecode/events/pullrequest.py:89 msgid "pullrequest commits updated" msgstr "" -#: rhodecode/events/pullrequest.py:95 +#: rhodecode/events/pullrequest.py:98 msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:104 +#: rhodecode/events/pullrequest.py:107 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:113 +#: rhodecode/events/pullrequest.py:116 msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:138 +#: rhodecode/events/repo.py:148 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:147 +#: rhodecode/events/repo.py:157 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:156 +#: rhodecode/events/repo.py:166 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:165 +#: rhodecode/events/repo.py:175 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:201 +#: rhodecode/events/repo.py:211 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:210 +#: rhodecode/events/repo.py:220 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:219 +#: rhodecode/events/repo.py:229 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:230 +#: rhodecode/events/repo.py:240 msgid "repository push" msgstr "" @@ -1541,7 +1541,7 @@ msgstr "" msgid "user pre update" msgstr "" -#: rhodecode/forms/__init__.py:32 rhodecode/templates/admin/gists/new.mako:62 +#: 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_emails.mako:65 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:107 @@ -1552,8 +1552,8 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:68 #: 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:111 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:161 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:195 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44 #: rhodecode/templates/admin/settings/settings_global.mako:140 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:16 @@ -1563,13 +1563,13 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 #: 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:70 +#: rhodecode/templates/admin/users/user_edit_ips.mako:71 #: rhodecode/templates/admin/users/user_edit_profile.mako:135 #: rhodecode/templates/base/default_perms_box.mako:89 msgid "Reset" msgstr "" -#: rhodecode/forms/__init__.py:33 rhodecode/templates/admin/gists/show.mako:49 +#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:49 #: rhodecode/templates/admin/integrations/list.mako:211 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 @@ -1578,13 +1578,13 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_hooks.mako:46 #: 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:34 +#: rhodecode/templates/admin/users/user_edit_ips.mako:35 #: rhodecode/templates/base/issue_tracker_settings.mako:69 -#: rhodecode/templates/base/vcs_settings.mako:251 -#: rhodecode/templates/base/vcs_settings.mako:276 -#: rhodecode/templates/changeset/changeset_file_comment.mako:137 -#: rhodecode/templates/changeset/changeset_file_comment.mako:139 +#: rhodecode/templates/base/vcs_settings.mako:264 +#: rhodecode/templates/base/vcs_settings.mako:289 #: rhodecode/templates/changeset/changeset_file_comment.mako:142 +#: rhodecode/templates/changeset/changeset_file_comment.mako:144 +#: rhodecode/templates/changeset/changeset_file_comment.mako:147 #: rhodecode/templates/data_table/_dt_elements.mako:123 #: rhodecode/templates/data_table/_dt_elements.mako:184 #: rhodecode/templates/data_table/_dt_elements.mako:198 @@ -1732,16 +1732,15 @@ msgstr "" #: rhodecode/integrations/types/slack.py:60 rhodecode/templates/login.mako:43 #: rhodecode/templates/register.mako:41 -#: rhodecode/templates/admin/admin_log.mako:7 +#: rhodecode/templates/admin/admin_log_base.mako:6 #: rhodecode/templates/admin/my_account/my_account_profile.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:69 #: 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_audit.mako:22 #: rhodecode/templates/admin/users/user_edit_profile.mako:39 -#: rhodecode/templates/admin/users/users.mako:62 -#: rhodecode/templates/base/base.mako:304 +#: rhodecode/templates/admin/users/users.mako:63 +#: rhodecode/templates/base/base.mako:306 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 @@ -1776,180 +1775,180 @@ msgstr "" msgid "Send events such as repo pushes and pull requests to your slack channel." msgstr "" -#: rhodecode/integrations/types/webhook.py:152 +#: rhodecode/integrations/types/webhook.py:164 msgid "Webhook URL" msgstr "" -#: rhodecode/integrations/types/webhook.py:154 +#: rhodecode/integrations/types/webhook.py:166 msgid "URL of the webhook to receive POST event. Following variables are allowed to be used: {vars}. Some of the variables would trigger multiple calls, like ${{branch}} or ${{commit_id}}. Webhook will be called as many times as unique objects in data in such cases." msgstr "" -#: rhodecode/integrations/types/webhook.py:168 +#: rhodecode/integrations/types/webhook.py:180 msgid "Secret Token" msgstr "" -#: rhodecode/integrations/types/webhook.py:169 +#: rhodecode/integrations/types/webhook.py:181 msgid "String used to validate received payloads." msgstr "" -#: rhodecode/integrations/types/webhook.py:178 +#: rhodecode/integrations/types/webhook.py:190 msgid "Call Method" msgstr "" -#: rhodecode/integrations/types/webhook.py:179 +#: rhodecode/integrations/types/webhook.py:191 msgid "Select if the webhook call should be made with POST or GET." msgstr "" -#: rhodecode/integrations/types/webhook.py:192 +#: rhodecode/integrations/types/webhook.py:204 msgid "Webhook" msgstr "" -#: rhodecode/integrations/types/webhook.py:193 +#: rhodecode/integrations/types/webhook.py:205 msgid "Post json events to a webhook endpoint" msgstr "" -#: rhodecode/lib/action_parser.py:89 +#: rhodecode/lib/action_parser.py:94 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/action_parser.py:92 rhodecode/lib/action_parser.py:110 +#: rhodecode/lib/action_parser.py:97 rhodecode/lib/action_parser.py:115 msgid "[created] repository" msgstr "" -#: rhodecode/lib/action_parser.py:95 +#: rhodecode/lib/action_parser.py:100 msgid "[created] repository as fork" msgstr "" -#: rhodecode/lib/action_parser.py:98 rhodecode/lib/action_parser.py:113 +#: rhodecode/lib/action_parser.py:103 rhodecode/lib/action_parser.py:118 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/action_parser.py:101 rhodecode/lib/action_parser.py:116 +#: rhodecode/lib/action_parser.py:106 rhodecode/lib/action_parser.py:121 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/action_parser.py:104 +#: rhodecode/lib/action_parser.py:109 msgid "[downloaded] archive from repository" msgstr "" -#: rhodecode/lib/action_parser.py:107 +#: rhodecode/lib/action_parser.py:112 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/action_parser.py:119 +#: rhodecode/lib/action_parser.py:124 msgid "[created] user" msgstr "" -#: rhodecode/lib/action_parser.py:122 +#: rhodecode/lib/action_parser.py:127 msgid "[updated] user" msgstr "" -#: rhodecode/lib/action_parser.py:125 +#: rhodecode/lib/action_parser.py:130 msgid "[created] user group" msgstr "" -#: rhodecode/lib/action_parser.py:128 +#: rhodecode/lib/action_parser.py:133 msgid "[updated] user group" msgstr "" -#: rhodecode/lib/action_parser.py:131 +#: rhodecode/lib/action_parser.py:136 msgid "[commented] on commit in repository" msgstr "" -#: rhodecode/lib/action_parser.py:134 +#: rhodecode/lib/action_parser.py:139 msgid "[commented] on pull request for" msgstr "" -#: rhodecode/lib/action_parser.py:137 +#: rhodecode/lib/action_parser.py:142 msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/action_parser.py:140 +#: rhodecode/lib/action_parser.py:145 msgid "[merged] pull request for" msgstr "" -#: rhodecode/lib/action_parser.py:143 +#: rhodecode/lib/action_parser.py:148 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/action_parser.py:146 +#: rhodecode/lib/action_parser.py:151 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/action_parser.py:149 +#: rhodecode/lib/action_parser.py:154 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/action_parser.py:152 +#: rhodecode/lib/action_parser.py:157 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/action_parser.py:155 +#: rhodecode/lib/action_parser.py:160 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/action_parser.py:158 +#: rhodecode/lib/action_parser.py:163 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/action_parser.py:166 +#: rhodecode/lib/action_parser.py:172 #, python-format msgid "fork name %s" msgstr "" -#: rhodecode/lib/action_parser.py:183 +#: rhodecode/lib/action_parser.py:190 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" msgstr "" -#: rhodecode/lib/action_parser.py:216 +#: rhodecode/lib/action_parser.py:223 #, python-format msgid "Show all combined commits %s->%s" msgstr "" -#: rhodecode/lib/action_parser.py:220 -msgid "compare view" -msgstr "" - #: rhodecode/lib/action_parser.py:227 +msgid "compare view" +msgstr "" + +#: rhodecode/lib/action_parser.py:234 #, python-format msgid " and %(num)s more commits" msgstr "" -#: rhodecode/lib/action_parser.py:279 +#: rhodecode/lib/action_parser.py:286 #, python-format msgid "Deleted branch: %s" msgstr "" -#: rhodecode/lib/action_parser.py:282 +#: rhodecode/lib/action_parser.py:289 #, python-format msgid "Created tag: %s" msgstr "" -#: rhodecode/lib/action_parser.py:295 +#: rhodecode/lib/action_parser.py:302 msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1197 +#: rhodecode/lib/auth.py:1220 #, python-format msgid "IP %s not allowed" msgstr "" -#: rhodecode/lib/auth.py:1281 +#: rhodecode/lib/auth.py:1309 msgid "You need to be a registered user to perform this action" msgstr "" -#: rhodecode/lib/auth.py:1329 +#: rhodecode/lib/auth.py:1366 #, python-format msgid "Action not supported for %s." msgstr "" -#: rhodecode/lib/auth.py:1379 +#: rhodecode/lib/auth.py:1412 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/base.py:549 +#: rhodecode/lib/base.py:561 #, python-format msgid "The repository at %(repo_name)s cannot be located." msgstr "" @@ -1974,20 +1973,21 @@ msgstr "" msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1517 +#: rhodecode/lib/helpers.py:1527 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:1521 +#: rhodecode/lib/helpers.py:1531 msgid "No Files" msgstr "" -#: rhodecode/lib/helpers.py:1800 +#: rhodecode/lib/helpers.py:1836 msgid "" "Example filter terms:\n" " repository:vcs\n" " username:marcin\n" +" username:(NOT marcin)\n" " action:*push*\n" " ip:127.0.0.1\n" " date:20120101\n" @@ -2002,7 +2002,21 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1820 +#: rhodecode/lib/helpers.py:1859 +msgid "" +"Example filter terms for `{searcher}` search:\n" +"{terms}\n" +"Generate wildcards using '*' character:\n" +" \"repo_name:vcs*\" - search everything starting with 'vcs'\n" +" \"repo_name:*vcs*\" - search for repository containing 'vcs'\n" +"\n" +"Optional AND / OR operators in queries\n" +" \"repo_name:vcs OR repo_name:test\"\n" +" \"owner:test AND repo_name:test*\"\n" +"More: {search_doc}" +msgstr "" + +#: rhodecode/lib/helpers.py:1875 #, 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 "" @@ -2042,7 +2056,7 @@ msgstr "" #: rhodecode/lib/utils2.py:515 #: rhodecode/public/js/rhodecode-components.js:33659 #: rhodecode/public/js/scripts.js:25507 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "" @@ -2076,7 +2090,7 @@ msgstr "" #: 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/model/db.py:2410 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 rhodecode/model/db.py:2482 msgid "Repository no access" msgstr "" @@ -2109,7 +2123,7 @@ msgstr "" #: 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/model/db.py:2411 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 rhodecode/model/db.py:2483 msgid "Repository read access" msgstr "" @@ -2142,7 +2156,7 @@ msgstr "" #: 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/model/db.py:2412 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 rhodecode/model/db.py:2484 msgid "Repository write access" msgstr "" @@ -2175,7 +2189,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2342 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2343 rhodecode/model/db.py:2413 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2343 rhodecode/model/db.py:2485 msgid "Repository admin access" msgstr "" @@ -2248,7 +2262,7 @@ msgstr "" #: 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/model/db.py:2431 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 rhodecode/model/db.py:2503 msgid "Repository creation disabled" msgstr "" @@ -2281,7 +2295,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2361 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2362 rhodecode/model/db.py:2432 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2362 rhodecode/model/db.py:2504 msgid "Repository creation enabled" msgstr "" @@ -2314,7 +2328,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2365 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2366 rhodecode/model/db.py:2436 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2366 rhodecode/model/db.py:2508 msgid "Repository forking disabled" msgstr "" @@ -2347,7 +2361,7 @@ msgstr "" #: 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:2366 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 rhodecode/model/db.py:2437 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 rhodecode/model/db.py:2509 msgid "Repository forking enabled" msgstr "" @@ -2401,7 +2415,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3050 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3051 rhodecode/model/db.py:3121 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3051 rhodecode/model/db.py:3212 msgid "Not Reviewed" msgstr "" @@ -2434,7 +2448,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3051 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3052 rhodecode/model/db.py:3122 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3052 rhodecode/model/db.py:3213 msgid "Approved" msgstr "" @@ -2467,7 +2481,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3052 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3053 rhodecode/model/db.py:3123 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3053 rhodecode/model/db.py:3214 msgid "Rejected" msgstr "" @@ -2500,7 +2514,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3053 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3054 rhodecode/model/db.py:3124 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3054 rhodecode/model/db.py:3215 msgid "Under Review" msgstr "" @@ -2530,7 +2544,7 @@ msgstr "" #: 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/model/db.py:2415 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 rhodecode/model/db.py:2487 msgid "Repository group no access" msgstr "" @@ -2560,7 +2574,7 @@ msgstr "" #: 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/model/db.py:2416 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 rhodecode/model/db.py:2488 msgid "Repository group read access" msgstr "" @@ -2590,7 +2604,7 @@ msgstr "" #: 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/model/db.py:2417 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 rhodecode/model/db.py:2489 msgid "Repository group write access" msgstr "" @@ -2620,7 +2634,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2347 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2348 rhodecode/model/db.py:2418 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2348 rhodecode/model/db.py:2490 msgid "Repository group admin access" msgstr "" @@ -2649,7 +2663,7 @@ msgstr "" #: 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/model/db.py:2420 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 rhodecode/model/db.py:2492 msgid "User group no access" msgstr "" @@ -2678,7 +2692,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2350 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2351 rhodecode/model/db.py:2421 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2351 rhodecode/model/db.py:2493 msgid "User group read access" msgstr "" @@ -2707,7 +2721,7 @@ msgstr "" #: 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/model/db.py:2422 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 rhodecode/model/db.py:2494 msgid "User group write access" msgstr "" @@ -2736,7 +2750,7 @@ msgstr "" #: 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/model/db.py:2423 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 rhodecode/model/db.py:2495 msgid "User group admin access" msgstr "" @@ -2765,7 +2779,7 @@ msgstr "" #: 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/model/db.py:2425 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 rhodecode/model/db.py:2497 msgid "Repository Group creation disabled" msgstr "" @@ -2794,7 +2808,7 @@ msgstr "" #: 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/model/db.py:2426 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 rhodecode/model/db.py:2498 msgid "Repository Group creation enabled" msgstr "" @@ -2823,7 +2837,7 @@ msgstr "" #: 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/model/db.py:2428 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 rhodecode/model/db.py:2500 msgid "User Group creation disabled" msgstr "" @@ -2852,7 +2866,7 @@ msgstr "" #: 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:2358 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2359 rhodecode/model/db.py:2429 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2359 rhodecode/model/db.py:2501 msgid "User Group creation enabled" msgstr "" @@ -2881,7 +2895,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 rhodecode/model/db.py:2439 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 rhodecode/model/db.py:2511 msgid "Registration disabled" msgstr "" @@ -2910,7 +2924,7 @@ msgstr "" #: 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:2369 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2370 rhodecode/model/db.py:2440 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2370 rhodecode/model/db.py:2512 msgid "User Registration with manual account activation" msgstr "" @@ -2939,7 +2953,7 @@ msgstr "" #: 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:2370 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 rhodecode/model/db.py:2441 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 rhodecode/model/db.py:2513 msgid "User Registration with automatic account activation" msgstr "" @@ -2968,7 +2982,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2376 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2377 rhodecode/model/db.py:2447 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2377 rhodecode/model/db.py:2519 #: rhodecode/model/permission.py:95 msgid "Manual activation of external account" msgstr "" @@ -2998,7 +3012,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2377 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2378 rhodecode/model/db.py:2448 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2378 rhodecode/model/db.py:2520 #: rhodecode/model/permission.py:96 msgid "Automatic activation of external account" msgstr "" @@ -3022,7 +3036,7 @@ msgstr "" #: 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/model/db.py:2433 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 rhodecode/model/db.py:2505 msgid "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3045,7 +3059,7 @@ msgstr "" #: 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/model/db.py:2434 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 rhodecode/model/db.py:2506 msgid "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3065,7 +3079,7 @@ msgstr "" #: 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/model/db.py:2408 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338 rhodecode/model/db.py:2480 msgid "RhodeCode Super Administrator" msgstr "" @@ -3083,7 +3097,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2379 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2380 rhodecode/model/db.py:2450 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2380 rhodecode/model/db.py:2522 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3101,7 +3115,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2380 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2381 rhodecode/model/db.py:2451 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2381 rhodecode/model/db.py:2523 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3111,7 +3125,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:954 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:955 rhodecode/model/db.py:1008 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:955 rhodecode/model/db.py:1043 msgid "all" msgstr "" @@ -3121,7 +3135,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 rhodecode/model/db.py:1009 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 rhodecode/model/db.py:1044 msgid "http/web interface" msgstr "" @@ -3131,7 +3145,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 rhodecode/model/db.py:1010 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 rhodecode/model/db.py:1045 msgid "vcs (git/hg/svn protocol)" msgstr "" @@ -3141,7 +3155,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 rhodecode/model/db.py:1011 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 rhodecode/model/db.py:1046 msgid "api calls" msgstr "" @@ -3151,7 +3165,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 rhodecode/model/db.py:1012 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 rhodecode/model/db.py:1047 msgid "feed access" msgstr "" @@ -3161,62 +3175,62 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2108 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2109 rhodecode/model/db.py:2179 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2109 rhodecode/model/db.py:2248 msgid "No parent" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2372 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2373 rhodecode/model/db.py:2443 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2373 rhodecode/model/db.py:2515 msgid "Password reset enabled" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 rhodecode/model/db.py:2444 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 rhodecode/model/db.py:2516 msgid "Password reset hidden" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 rhodecode/model/db.py:2445 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 rhodecode/model/db.py:2517 msgid "Password reset disabled" msgstr "" -#: rhodecode/lib/index/whoosh.py:149 +#: rhodecode/lib/index/whoosh.py:150 msgid "Invalid search query. Try quoting it." msgstr "" -#: rhodecode/lib/index/whoosh.py:151 +#: rhodecode/lib/index/whoosh.py:152 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" -#: rhodecode/lib/index/whoosh.py:156 +#: rhodecode/lib/index/whoosh.py:157 msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/lib/index/whoosh.py:164 -msgid "Index Type" -msgstr "" - #: rhodecode/lib/index/whoosh.py:165 +msgid "Index Type" +msgstr "" + +#: rhodecode/lib/index/whoosh.py:166 msgid "File Index" msgstr "" -#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171 +#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172 msgid "Indexed documents" msgstr "" -#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173 +#: rhodecode/lib/index/whoosh.py:169 rhodecode/lib/index/whoosh.py:174 msgid "Last update" msgstr "" -#: rhodecode/lib/index/whoosh.py:170 +#: rhodecode/lib/index/whoosh.py:171 msgid "Commit index" msgstr "" -#: rhodecode/model/comment.py:368 +#: rhodecode/model/comment.py:374 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:369 +#: rhodecode/model/comment.py:375 msgid "Show it now" msgstr "" @@ -3302,7 +3316,7 @@ msgstr "" #: rhodecode/model/permission.py:79 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:11 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:126 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11 msgid "None" msgstr "" @@ -3310,7 +3324,7 @@ msgstr "" #: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 #: rhodecode/model/permission.py:80 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:12 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12 msgid "Read" msgstr "" @@ -3318,10 +3332,10 @@ msgstr "" #: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 #: rhodecode/model/permission.py:81 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:13 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:14 +#: 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:266 -#: rhodecode/templates/changeset/changeset_file_comment.mako:316 +#: rhodecode/templates/changeset/changeset_file_comment.mako:271 +#: rhodecode/templates/changeset/changeset_file_comment.mako:321 msgid "Write" msgstr "" @@ -3344,7 +3358,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_groups.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:17 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:15 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:14 #: rhodecode/templates/admin/repos/repos.mako:13 #: rhodecode/templates/admin/settings/settings.mako:12 #: rhodecode/templates/admin/user_groups/user_group_add.mako:11 @@ -3354,9 +3368,9 @@ 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:75 -#: rhodecode/templates/base/base.mako:409 -#: rhodecode/templates/base/base.mako:416 +#: rhodecode/templates/admin/users/users.mako:76 +#: rhodecode/templates/base/base.mako:412 +#: rhodecode/templates/base/base.mako:419 msgid "Admin" msgstr "" @@ -3387,79 +3401,79 @@ msgstr "" msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:78 +#: rhodecode/model/pull_request.py:80 msgid "This pull request can be automatically merged." msgstr "" -#: rhodecode/model/pull_request.py:80 +#: rhodecode/model/pull_request.py:82 msgid "This pull request cannot be merged because of an unhandled exception." msgstr "" -#: rhodecode/model/pull_request.py:83 -msgid "This pull request cannot be merged because of merge conflicts." -msgstr "" - #: rhodecode/model/pull_request.py:85 +msgid "This pull request cannot be merged because of merge conflicts." +msgstr "" + +#: rhodecode/model/pull_request.py:87 msgid "This pull request could not be merged because push to target failed." msgstr "" -#: rhodecode/model/pull_request.py:88 +#: rhodecode/model/pull_request.py:90 msgid "This pull request cannot be merged because the target is not a head." msgstr "" -#: rhodecode/model/pull_request.py:91 +#: rhodecode/model/pull_request.py:93 msgid "This pull request cannot be merged because the source contains more branches than the target." msgstr "" -#: rhodecode/model/pull_request.py:94 +#: rhodecode/model/pull_request.py:96 msgid "This pull request cannot be merged because the target has multiple heads." msgstr "" -#: rhodecode/model/pull_request.py:97 +#: rhodecode/model/pull_request.py:99 msgid "This pull request cannot be merged because the target repository is locked." msgstr "" -#: rhodecode/model/pull_request.py:100 +#: rhodecode/model/pull_request.py:102 msgid "This pull request cannot be merged because the target or the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:103 +#: rhodecode/model/pull_request.py:105 msgid "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:106 +#: rhodecode/model/pull_request.py:108 msgid "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:109 +#: rhodecode/model/pull_request.py:111 msgid "This pull request cannot be merged because of conflicts related to sub repositories." msgstr "" -#: rhodecode/model/pull_request.py:115 -msgid "Pull request update successful." -msgstr "" - #: rhodecode/model/pull_request.py:117 -msgid "Pull request update failed because of an unknown error." +msgid "Pull request update successful." msgstr "" #: rhodecode/model/pull_request.py:119 -msgid "No update needed because the source and target have not changed." +msgid "Pull request update failed because of an unknown error." msgstr "" #: rhodecode/model/pull_request.py:121 -msgid "Pull request cannot be updated because the reference type is not supported for an update." -msgstr "" - -#: rhodecode/model/pull_request.py:124 +msgid "No update needed because the source and target have not changed." +msgstr "" + +#: rhodecode/model/pull_request.py:123 +msgid "Pull request cannot be updated because the reference type is not supported for an update. Only Branch, Tag or Bookmark is allowed." +msgstr "" + +#: rhodecode/model/pull_request.py:126 msgid "This pull request cannot be updated because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:127 +#: rhodecode/model/pull_request.py:129 msgid "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:524 +#: rhodecode/model/pull_request.py:544 #, python-format msgid "" "Merge pull request #%(pr_id)s from %(source_repo)s %(source_ref_name)s\n" @@ -3467,86 +3481,90 @@ msgid "" " %(pr_title)s" msgstr "" -#: rhodecode/model/pull_request.py:556 +#: rhodecode/model/pull_request.py:576 msgid "Pull request merged and closed" msgstr "" -#: rhodecode/model/pull_request.py:1087 +#: rhodecode/model/pull_request.py:1108 +msgid "Closing with status change {transition_icon} {status}." +msgstr "" + +#: rhodecode/model/pull_request.py:1152 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1089 +#: rhodecode/model/pull_request.py:1154 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:1101 +#: rhodecode/model/pull_request.py:1166 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1119 +#: rhodecode/model/pull_request.py:1184 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1122 +#: rhodecode/model/pull_request.py:1187 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1279 rhodecode/model/scm.py:790 +#: rhodecode/model/pull_request.py:1344 rhodecode/model/scm.py:783 msgid "Bookmarks" msgstr "" -#: rhodecode/model/pull_request.py:1284 +#: rhodecode/model/pull_request.py:1349 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1287 +#: rhodecode/model/pull_request.py:1352 msgid "Closed Branches" msgstr "" -#: rhodecode/model/pull_request.py:1411 +#: rhodecode/model/pull_request.py:1493 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1424 +#: rhodecode/model/pull_request.py:1506 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1439 +#: rhodecode/model/pull_request.py:1521 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1442 +#: rhodecode/model/pull_request.py:1524 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/scm.py:768 +#: rhodecode/model/scm.py:761 msgid "latest tip" msgstr "" -#: rhodecode/model/user.py:126 +#: rhodecode/model/user.py:166 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:292 +#: rhodecode/model/user.py:332 #, python-format msgid "You can't edit this user (`%(username)s`) since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:462 +#: rhodecode/model/user.py:502 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:470 +#: rhodecode/model/user.py:510 #, python-format msgid "user \"%s\" still owns %s repositories and cannot be removed. Switch owners or remove those repositories:%s" msgstr "" -#: rhodecode/model/user.py:479 +#: rhodecode/model/user.py:519 #, python-format msgid "user \"%s\" still owns %s repository groups and cannot be removed. Switch owners or remove those repository groups:%s" msgstr "" -#: rhodecode/model/user.py:488 +#: rhodecode/model/user.py:528 #, python-format msgid "user \"%s\" still owns %s user groups and cannot be removed. Switch owners or remove those user groups:%s" msgstr "" @@ -3570,6 +3588,7 @@ msgid "Username \"%(username)s\" is forb msgstr "" #: rhodecode/model/validators.py:164 +#: rhodecode/model/validation_schema/schemas/user_schema.py:69 msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character or underscore" msgstr "" @@ -3675,94 +3694,107 @@ msgstr "" msgid "Repository group with name \"%(repo)s\" exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:620 +#: rhodecode/model/validators.py:581 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:219 +msgid "Repository name cannot end with .git" +msgstr "" + +#: rhodecode/model/validators.py:640 #, python-format msgid "invalid clone url for %(rtype)s repository" msgstr "" -#: rhodecode/model/validators.py:621 +#: rhodecode/model/validators.py:641 #, python-format msgid "Invalid clone url, provide a valid clone url starting with one of %(allowed_prefixes)s" msgstr "" -#: rhodecode/model/validators.py:650 +#: rhodecode/model/validators.py:670 msgid "Fork have to be the same type as parent" msgstr "" -#: rhodecode/model/validators.py:665 +#: rhodecode/model/validators.py:685 msgid "You do not have the permission to create repositories in this group." msgstr "" -#: rhodecode/model/validators.py:668 -#: rhodecode/model/validation_schema/schemas/repo_schema.py:102 +#: rhodecode/model/validators.py:688 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:125 msgid "You do not have the permission to store repositories in the root location." msgstr "" -#: rhodecode/model/validators.py:728 +#: rhodecode/model/validators.py:748 msgid "This username or user group name is not valid" msgstr "" -#: rhodecode/model/validators.py:846 +#: rhodecode/model/validators.py:879 msgid "This is not a valid path" msgstr "" -#: rhodecode/model/validators.py:861 +#: rhodecode/model/validators.py:894 msgid "This e-mail address is already taken" msgstr "" -#: rhodecode/model/validators.py:881 +#: rhodecode/model/validators.py:914 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "" -#: rhodecode/model/validators.py:902 +#: rhodecode/model/validators.py:935 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" -#: rhodecode/model/validators.py:933 -#: rhodecode/model/validation_schema/validators.py:16 -#: rhodecode/model/validation_schema/validators.py:29 +#: rhodecode/model/validators.py:966 +#: rhodecode/model/validation_schema/validators.py:40 +#: rhodecode/model/validation_schema/validators.py:53 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: rhodecode/model/validators.py:934 +#: rhodecode/model/validators.py:967 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: rhodecode/model/validators.py:961 +#: rhodecode/model/validators.py:994 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: rhodecode/model/validators.py:976 +#: rhodecode/model/validators.py:1009 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: rhodecode/model/validators.py:979 +#: rhodecode/model/validators.py:1012 #, python-format msgid "The plugin \"%(plugin_id)s\" is missing an includeme function." msgstr "" -#: rhodecode/model/validators.py:982 +#: rhodecode/model/validators.py:1015 #, python-format msgid "Can not load plugin \"%(plugin_id)s\"" msgstr "" -#: rhodecode/model/validators.py:984 +#: rhodecode/model/validators.py:1017 #, python-format msgid "No plugin available with ID \"%(plugin_id)s\"" msgstr "" -#: rhodecode/model/validation_schema/validators.py:37 +#: rhodecode/model/validation_schema/validators.py:61 msgid "Invalid glob pattern" msgstr "" -#: rhodecode/model/validation_schema/validators.py:46 +#: rhodecode/model/validation_schema/validators.py:70 msgid "Name must start with a letter or number. Got `{}`" msgstr "" +#: rhodecode/model/validation_schema/validators.py:132 +msgid "Invalid clone url, provide a valid clone url starting with one of {allowed_prefixes}" +msgstr "" + +#: rhodecode/model/validation_schema/validators.py:138 +msgid "invalid clone url for {repo_type} repository" +msgstr "" + #: rhodecode/model/validation_schema/schemas/comment_schema.py:42 #: rhodecode/model/validation_schema/schemas/gist_schema.py:89 msgid "Gist with name {} already exists" @@ -3831,253 +3863,261 @@ msgid "Repo group owner with id `{}` doe msgstr "" #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:130 -#: rhodecode/model/validation_schema/schemas/repo_schema.py:181 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:204 msgid "Repository with name `{}` already exists" msgstr "" #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:135 -#: rhodecode/model/validation_schema/schemas/repo_schema.py:186 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:209 msgid "Repository group with name `{}` already exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_schema.py:48 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:55 msgid "Repo owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_schema.py:68 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:91 msgid "Fork with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_schema.py:71 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:94 msgid "Cannot set fork of parameter of this repository to itself" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_schema.py:96 -#: rhodecode/model/validation_schema/schemas/repo_schema.py:100 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:119 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:123 msgid "Repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/user_schema.py:36 +#: rhodecode/model/validation_schema/schemas/user_group_schema.py:32 +msgid "Allowed in name are letters, numbers, and `-`, `_`, `.` Name must start with a letter or number. Got `{}`" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/user_group_schema.py:48 +msgid "User group owner with id `{}` does not exists" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/user_schema.py:38 msgid "Password is incorrect" msgstr "" -#: rhodecode/model/validation_schema/schemas/user_schema.py:59 +#: rhodecode/model/validation_schema/schemas/user_schema.py:60 msgid "New password must be different to old password" msgstr "" #: rhodecode/public/js/rhodecode-components.js:31663 #: rhodecode/public/js/scripts.js:23511 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33594 #: rhodecode/public/js/scripts.js:25442 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33595 #: rhodecode/public/js/scripts.js:25443 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33596 #: rhodecode/public/js/scripts.js:25444 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33597 #: rhodecode/public/js/scripts.js:25445 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33598 #: rhodecode/public/js/scripts.js:25446 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33599 #: rhodecode/public/js/scripts.js:25447 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33619 #: rhodecode/public/js/scripts.js:25467 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33627 #: rhodecode/public/js/scripts.js:25475 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33639 #: rhodecode/public/js/scripts.js:25487 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33641 #: rhodecode/public/js/scripts.js:25489 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33645 #: rhodecode/public/js/scripts.js:25493 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33647 #: rhodecode/public/js/scripts.js:25495 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33649 #: rhodecode/public/js/scripts.js:25497 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" #: rhodecode/public/js/rhodecode-components.js:47492 #: rhodecode/public/js/scripts.js:39340 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" #: rhodecode/public/js/rhodecode-components.js:47495 #: rhodecode/public/js/scripts.js:39343 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" #: rhodecode/public/js/rhodecode-components.js:47498 #: rhodecode/public/js/scripts.js:39346 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "" #: rhodecode/public/js/rhodecode-components.js:47501 #: rhodecode/public/js/scripts.js:39349 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" #: rhodecode/public/js/rhodecode-components.js:47505 #: rhodecode/public/js/scripts.js:39353 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 #: 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:47507 #: rhodecode/public/js/scripts.js:39355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: 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:47512 #: rhodecode/public/js/scripts.js:39360 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" #: rhodecode/public/js/rhodecode-components.js:47514 #: rhodecode/public/js/scripts.js:39362 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" #: rhodecode/public/js/rhodecode-components.js:47519 #: rhodecode/public/js/scripts.js:39367 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" #: rhodecode/public/js/rhodecode-components.js:47521 #: rhodecode/public/js/scripts.js:39369 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" #: rhodecode/public/js/rhodecode-components.js:47525 #: rhodecode/public/js/scripts.js:39373 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" #: rhodecode/public/js/rhodecode-components.js:47527 #: rhodecode/public/js/scripts.js:39375 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" #: rhodecode/public/js/rhodecode-components.js:48456 #: rhodecode/public/js/scripts.js:40304 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" #: rhodecode/public/js/rhodecode-components.js:48458 #: rhodecode/public/js/scripts.js:40306 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" #: rhodecode/public/js/rhodecode-components.js:48891 #: rhodecode/public/js/scripts.js:40739 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 #: rhodecode/public/js/src/rhodecode/codemirror.js:296 msgid "Set status to Approved" msgstr "" #: rhodecode/public/js/rhodecode-components.js:48910 #: rhodecode/public/js/scripts.js:40758 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/src/rhodecode/codemirror.js:315 msgid "Set status to Rejected" msgstr "" #: rhodecode/public/js/rhodecode-components.js:48929 #: rhodecode/public/js/scripts.js:40777 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 #: rhodecode/public/js/src/rhodecode/codemirror.js:334 #: rhodecode/templates/email_templates/commit_comment.mako:99 #: rhodecode/templates/email_templates/pull_request_comment.mako:107 @@ -4086,42 +4126,42 @@ msgstr "" #: rhodecode/public/js/rhodecode-components.js:48949 #: rhodecode/public/js/scripts.js:40797 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 #: rhodecode/public/js/src/rhodecode/codemirror.js:354 msgid "Note Comment" msgstr "" #: rhodecode/public/js/rhodecode-components.js:49315 #: rhodecode/public/js/scripts.js:41163 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/public/js/src/rhodecode/comments.js:125 msgid "resolve comment" msgstr "" #: rhodecode/public/js/rhodecode-components.js:49399 #: rhodecode/public/js/scripts.js:41247 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode/comments.js:209 msgid "Status Review" msgstr "" #: rhodecode/public/js/rhodecode-components.js:49414 #: rhodecode/public/js/scripts.js:41262 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 #: rhodecode/public/js/src/rhodecode/comments.js:224 msgid "Comment text will be set automatically based on currently selected status ({0}) ..." msgstr "" #: rhodecode/public/js/rhodecode-components.js:49571 #: rhodecode/public/js/scripts.js:41419 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 #: rhodecode/public/js/src/rhodecode/comments.js:381 msgid "Submitting..." msgstr "" #: rhodecode/public/js/rhodecode-components.js:49622 #: rhodecode/public/js/scripts.js:41470 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/src/rhodecode/comments.js:432 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." @@ -4129,105 +4169,170 @@ msgstr "" #: rhodecode/public/js/rhodecode-components.js:49727 #: rhodecode/public/js/scripts.js:41575 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 #: rhodecode/public/js/src/rhodecode/comments.js:537 msgid "Delete this comment?" msgstr "" #: rhodecode/public/js/rhodecode-components.js:49798 #: rhodecode/public/js/scripts.js:41646 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/comments.js:608 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" #: rhodecode/public/js/rhodecode-components.js:49875 #: rhodecode/public/js/scripts.js:41723 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 #: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" #: rhodecode/public/js/rhodecode-components.js:49989 #: rhodecode/public/js/scripts.js:41837 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 #: rhodecode/public/js/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" #: rhodecode/public/js/rhodecode-components.js:50195 #: rhodecode/public/js/scripts.js:42043 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" #: rhodecode/public/js/rhodecode-components.js:50197 #: rhodecode/public/js/scripts.js:42045 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" #: rhodecode/public/js/rhodecode-components.js:50206 #: rhodecode/public/js/scripts.js:42054 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "" #: rhodecode/public/js/rhodecode-components.js:50341 #: rhodecode/public/js/scripts.js:42189 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "" #: rhodecode/public/js/rhodecode-components.js:50381 #: rhodecode/public/js/scripts.js:42229 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "" #: rhodecode/public/js/rhodecode-components.js:50382 #: rhodecode/public/js/scripts.js:42230 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "" #: rhodecode/public/js/rhodecode-components.js:50391 #: rhodecode/public/js/scripts.js:42239 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 #: rhodecode/public/js/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "" #: rhodecode/public/js/rhodecode-components.js:50392 #: rhodecode/public/js/scripts.js:42240 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50849 -#: rhodecode/public/js/scripts.js:42697 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:213 +#: rhodecode/public/js/rhodecode-components.js:50770 +#: rhodecode/public/js/rhodecode-components.js:50779 +#: rhodecode/public/js/scripts.js:42618 rhodecode/public/js/scripts.js:42627 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:134 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:143 +msgid "All reviewers must vote." +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:50784 +#: rhodecode/public/js/scripts.js:42632 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:148 +msgid "At least {0} reviewer must vote." +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:50790 +#: rhodecode/public/js/scripts.js:42638 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:154 +msgid "At least {0} reviewers must vote." +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:50797 +#: rhodecode/public/js/scripts.js:42645 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:161 +msgid "Reviewers picked from source code changes." +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:50804 +#: rhodecode/public/js/scripts.js:42652 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:168 +msgid "Adding new reviewers is forbidden." +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:50811 +#: rhodecode/public/js/scripts.js:42659 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:175 +msgid "Author is not allowed to be a reviewer." +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:50825 +#: rhodecode/public/js/scripts.js:42673 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:189 +msgid "Commit Authors are not allowed to be a reviewer." +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:50972 +#: rhodecode/public/js/scripts.js:42820 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:336 +msgid "User `{0}` not allowed to be a reviewer" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:51099 +#: rhodecode/public/js/scripts.js:42947 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51420 -#: rhodecode/public/js/scripts.js:43268 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode-components.js:51101 +#: rhodecode/public/js/scripts.js:42949 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:465 +msgid "member of \"{0}\"" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:51682 +#: rhodecode/public/js/scripts.js:43530 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51440 -#: rhodecode/public/js/scripts.js:43288 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 +#: rhodecode/public/js/rhodecode-components.js:51702 +#: rhodecode/public/js/scripts.js:43550 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 #: rhodecode/public/js/src/rhodecode.js:162 msgid "Show more" msgstr "" @@ -4242,150 +4347,150 @@ msgstr "" msgid "Add another comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 #: rhodecode/public/js/src/i18n_messages.js:5 #: rhodecode/templates/pullrequests/pullrequest_show.mako:325 msgid "Close" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 msgid "Diff to Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 -#: rhodecode/public/js/src/i18n_messages.js:4 -msgid "Invite reviewers to this discussion" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 -msgid "No bookmarks available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 -msgid "No branches available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 -msgid "No gists available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 -msgid "No pull requests available yet." +#: rhodecode/public/js/src/i18n_messages.js:4 +msgid "Invite reviewers to this discussion" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 -msgid "No repositories available yet." +msgid "No bookmarks available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 -msgid "No repository groups available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 -msgid "No tags available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 -msgid "No user groups available yet." +msgid "No branches available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 +msgid "No gists available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 -msgid "No users available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 -#: rhodecode/templates/changelog/changelog.mako:61 -msgid "Open new pull request" +msgid "No pull requests available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 +msgid "No repositories available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 +msgid "No repository groups available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 -msgid "Open new pull request for selected commit" +msgid "No tags available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 +msgid "No user groups available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 +msgid "No users available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: rhodecode/templates/changelog/changelog.mako:61 +msgid "Open new pull request" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +msgid "Open new pull request for selected commit" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/src/i18n_messages.js:6 #: rhodecode/templates/admin/settings/settings_email.mako:48 msgid "Send" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 -msgid "Show selected commit __S" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 -msgid "Show selected commits __S ... __E" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 -#: rhodecode/public/js/src/i18n_messages.js:7 -msgid "Switch to chat" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +msgid "Show selected commit __S" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +msgid "Show selected commits __S ... __E" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/src/i18n_messages.js:7 +msgid "Switch to chat" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 -msgid "There are currently no open pull requests requiring your participation." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 -msgid "Updating..." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 -#: rhodecode/templates/admin/auth/auth_settings.mako:71 -msgid "disabled" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 -#: rhodecode/templates/admin/auth/auth_settings.mako:71 -msgid "enabled" +msgid "There are currently no open pull requests requiring your participation." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 -msgid "files" +msgid "Updating..." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 -#: rhodecode/templates/pullrequests/pullrequest.mako:108 +#: rhodecode/templates/admin/auth/auth_settings.mako:71 +msgid "disabled" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: rhodecode/templates/admin/auth/auth_settings.mako:71 +msgid "enabled" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +msgid "files" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 msgid "{0} days" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 msgid "{0} years" msgstr "" @@ -4467,7 +4572,7 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_watched.mako:31 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:53 #: rhodecode/templates/admin/repos/repo_add_base.mako:9 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:15 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:16 #: rhodecode/templates/admin/repos/repos.mako:54 #: rhodecode/templates/admin/user_groups/user_groups.mako:55 #: rhodecode/templates/admin/users/user_edit_groups.mako:54 @@ -4475,7 +4580,7 @@ msgstr "" #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 #: rhodecode/templates/files/files_browser_tree.mako:5 -#: rhodecode/templates/pullrequests/pullrequests.mako:100 +#: rhodecode/templates/pullrequests/pullrequests.mako:110 #: rhodecode/templates/tags/tags.mako:59 msgid "Name" msgstr "" @@ -4490,7 +4595,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 #: rhodecode/templates/admin/repos/repo_add_base.mako:43 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:98 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:127 #: 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 @@ -4498,9 +4603,10 @@ msgstr "" #: 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/base/issue_tracker_settings.mako:10 -#: rhodecode/templates/changeset/changeset.mako:53 -#: rhodecode/templates/compare/compare_commits.mako:20 +#: rhodecode/templates/changeset/changeset.mako:73 +#: rhodecode/templates/compare/compare_commits.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:89 #: rhodecode/templates/email_templates/pull_request_review.mako:41 #: rhodecode/templates/email_templates/pull_request_review.mako:75 @@ -4508,9 +4614,9 @@ msgstr "" #: rhodecode/templates/files/file_tree_detail.mako:12 #: rhodecode/templates/forks/fork.mako:48 #: rhodecode/templates/forks/forks_data.mako:9 -#: rhodecode/templates/pullrequests/pullrequest.mako:47 +#: rhodecode/templates/pullrequests/pullrequest.mako:54 #: rhodecode/templates/pullrequests/pullrequest_show.mako:163 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:460 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:487 #: rhodecode/templates/summary/components.mako:73 msgid "Description" msgstr "" @@ -4521,7 +4627,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:24 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:60 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:5 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:80 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:109 #: 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 @@ -4544,13 +4650,13 @@ msgstr "" #: rhodecode/templates/bookmarks/bookmarks.mako:66 #: rhodecode/templates/branches/branches.mako:65 #: rhodecode/templates/changelog/changelog.mako:107 -#: rhodecode/templates/changelog/changelog_summary_data.mako:8 #: rhodecode/templates/changeset/changeset.mako:36 -#: rhodecode/templates/compare/compare_commits.mako:18 +#: rhodecode/templates/compare/compare_commits.mako:19 #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:458 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:485 #: rhodecode/templates/search/search_commit.mako:6 +#: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 msgid "Commit" msgstr "" @@ -4565,7 +4671,7 @@ msgid "Home" msgstr "" #: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:329 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:332 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "" @@ -4588,13 +4694,13 @@ msgstr "" #: rhodecode/templates/login.mako:68 rhodecode/templates/password_reset.mako:37 #: rhodecode/templates/base/base.mako:46 -#: rhodecode/templates/errors/error_document.mako:64 +#: rhodecode/templates/errors/error_document.mako:63 msgid "Support" msgstr "" #: rhodecode/templates/login.mako:69 rhodecode/templates/password_reset.mako:38 #: rhodecode/templates/files/files_add.mako:54 -#: rhodecode/templates/files/files_add.mako:65 +#: rhodecode/templates/files/files_add.mako:71 msgid "or" msgstr "" @@ -4653,7 +4759,7 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:79 #: rhodecode/templates/admin/users/user_add.mako:68 #: rhodecode/templates/admin/users/user_edit_profile.mako:47 -#: rhodecode/templates/admin/users/users.mako:66 +#: rhodecode/templates/admin/users/users.mako:67 msgid "First Name" msgstr "" @@ -4663,7 +4769,7 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:88 #: rhodecode/templates/admin/users/user_add.mako:77 #: rhodecode/templates/admin/users/user_edit_profile.mako:56 -#: rhodecode/templates/admin/users/users.mako:68 +#: rhodecode/templates/admin/users/users.mako:69 msgid "Last Name" msgstr "" @@ -4675,36 +4781,32 @@ msgstr "" msgid "Create Account" msgstr "" -#: rhodecode/templates/admin/admin.mako:5 -#: rhodecode/templates/admin/admin.mako:15 +#: rhodecode/templates/admin/admin_audit_logs.mako:5 #: rhodecode/templates/base/base.mako:75 -msgid "Admin journal" -msgstr "" - -#: rhodecode/templates/admin/admin.mako:13 -msgid "journal filter..." -msgstr "" - -#: rhodecode/templates/admin/admin.mako:14 +msgid "Admin audit logs" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_logs.mako:13 +msgid "filter..." +msgstr "" + +#: rhodecode/templates/admin/admin_audit_logs.mako:14 #: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "" -#: rhodecode/templates/admin/admin.mako:15 -#: rhodecode/templates/journal/journal.mako:14 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/admin.mako:17 +#: rhodecode/templates/admin/admin_audit_logs.mako:15 +msgid "Audit logs" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_logs.mako:17 #: rhodecode/templates/admin/users/user_edit_audit.mako:17 #: rhodecode/templates/journal/journal.mako:17 +#: rhodecode/templates/search/search.mako:76 msgid "Example Queries" msgstr "" -#: rhodecode/templates/admin/admin_log.mako:8 +#: rhodecode/templates/admin/admin_log_base.mako:7 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 @@ -4712,38 +4814,45 @@ msgstr "" #: 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:68 -#: rhodecode/templates/admin/users/user_edit_audit.mako:23 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 #: rhodecode/templates/admin/users/user_edit_groups.mako:73 -#: rhodecode/templates/admin/users/users.mako:79 +#: rhodecode/templates/admin/users/users.mako:80 #: rhodecode/templates/files/files_detail.mako:58 msgid "Action" msgstr "" -#: rhodecode/templates/admin/admin_log.mako:9 +#: rhodecode/templates/admin/admin_log_base.mako:8 +msgid "Action Data" +msgstr "" + +#: rhodecode/templates/admin/admin_log_base.mako:9 #: rhodecode/templates/admin/defaults/defaults.mako:31 #: rhodecode/templates/admin/permissions/permissions_objects.mako:13 -#: rhodecode/templates/admin/users/user_edit_audit.mako:24 #: rhodecode/templates/search/search_commit.mako:5 #: rhodecode/templates/search/search_path.mako:3 msgid "Repository" msgstr "" -#: rhodecode/templates/admin/admin_log.mako:10 -#: rhodecode/templates/admin/users/user_edit_audit.mako:25 +#: rhodecode/templates/admin/admin_log_base.mako:10 #: rhodecode/templates/bookmarks/bookmarks.mako:61 #: rhodecode/templates/branches/branches.mako:60 #: rhodecode/templates/tags/tags.mako:61 msgid "Date" msgstr "" -#: rhodecode/templates/admin/admin_log.mako:11 -#: rhodecode/templates/admin/users/user_edit_audit.mako:26 -msgid "From IP" -msgstr "" - -#: rhodecode/templates/admin/admin_log.mako:46 -#: rhodecode/templates/admin/users/user_edit_audit.mako:61 +#: rhodecode/templates/admin/admin_log_base.mako:11 +msgid "IP" +msgstr "" + +#: rhodecode/templates/admin/admin_log_base.mako:38 +msgid "toggle" +msgstr "" + +#: rhodecode/templates/admin/admin_log_base.mako:43 +msgid "data not available for v1 entries type" +msgstr "" + +#: rhodecode/templates/admin/admin_log_base.mako:64 msgid "No actions yet" msgstr "" @@ -4784,8 +4893,8 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 #: rhodecode/templates/admin/repos/repo_add_base.mako:101 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:79 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:160 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:194 #: 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 @@ -4826,7 +4935,7 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 #: rhodecode/templates/admin/repos/repo_add_base.mako:97 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:112 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:143 #: rhodecode/templates/forks/fork.mako:87 msgid "Private repositories are only visible to people explicitly added as collaborators." msgstr "" @@ -4877,7 +4986,7 @@ msgstr "" #: rhodecode/templates/admin/gists/edit.mako:56 #: rhodecode/templates/admin/gists/new.mako:50 -#: rhodecode/templates/files/files_add.mako:74 +#: rhodecode/templates/files/files_add.mako:80 #: rhodecode/templates/files/files_edit.mako:78 msgid "plain" msgstr "" @@ -4888,9 +4997,9 @@ msgstr "" #: rhodecode/templates/admin/gists/edit.mako:102 #: rhodecode/templates/base/issue_tracker_settings.mako:73 -#: rhodecode/templates/changeset/changeset_file_comment.mako:385 +#: rhodecode/templates/changeset/changeset_file_comment.mako:390 #: rhodecode/templates/codeblocks/diffs.mako:76 -#: rhodecode/templates/files/files_add.mako:102 +#: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 #: rhodecode/templates/files/files_edit.mako:105 #: rhodecode/templates/pullrequests/pullrequest_show.mako:64 @@ -4957,14 +5066,13 @@ msgstr "" #: rhodecode/templates/bookmarks/bookmarks.mako:63 #: rhodecode/templates/branches/branches.mako:62 #: rhodecode/templates/changelog/changelog.mako:113 -#: rhodecode/templates/changelog/changelog_summary_data.mako:11 -#: rhodecode/templates/changeset/changeset.mako:180 -#: rhodecode/templates/compare/compare_commits.mako:17 +#: rhodecode/templates/changeset/changeset.mako:200 +#: rhodecode/templates/compare/compare_commits.mako:18 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:457 -#: rhodecode/templates/pullrequests/pullrequests.mako:102 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:484 +#: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 +#: rhodecode/templates/summary/summary_commits.mako:11 #: rhodecode/templates/tags/tags.mako:63 msgid "Author" msgstr "" @@ -5025,12 +5133,12 @@ msgstr "" #: rhodecode/templates/data_table/_dt_elements.mako:193 #: rhodecode/templates/data_table/_dt_elements.mako:206 #: rhodecode/templates/debug_style/buttons.html:128 -#: rhodecode/templates/files/files_add.mako:204 +#: rhodecode/templates/files/files_add.mako:208 #: rhodecode/templates/files/files_edit.mako:165 #: rhodecode/templates/files/files_source.mako:48 #: rhodecode/templates/files/files_source.mako:51 #: rhodecode/templates/pullrequests/pullrequest_show.mako:63 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:324 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:339 #: rhodecode/templates/users/user_profile.mako:7 msgid "Edit" msgstr "" @@ -5071,10 +5179,10 @@ msgstr "" #: rhodecode/templates/admin/integrations/new.mako:21 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:48 #: rhodecode/templates/admin/repos/repo_edit.mako:15 -#: rhodecode/templates/admin/repos/repo_edit.mako:43 +#: rhodecode/templates/admin/repos/repo_edit.mako:46 #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 -#: rhodecode/templates/base/base.mako:84 rhodecode/templates/base/base.mako:249 +#: rhodecode/templates/base/base.mako:84 rhodecode/templates/base/base.mako:251 msgid "Settings" msgstr "" @@ -5177,7 +5285,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:343 +#: rhodecode/templates/base/base.mako:346 msgid "My account" msgstr "" @@ -5201,7 +5309,7 @@ msgid "OAuth Identities" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:38 +#: rhodecode/templates/admin/users/user_edit.mako:43 msgid "Emails" msgstr "" @@ -5218,7 +5326,7 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:41 #: rhodecode/templates/admin/permissions/permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:49 -#: rhodecode/templates/admin/repos/repo_edit.mako:46 +#: rhodecode/templates/admin/repos/repo_edit.mako:49 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:34 #: rhodecode/templates/base/base.mako:80 msgid "Permissions" @@ -5275,7 +5383,7 @@ msgstr "" #: 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:69 +#: rhodecode/templates/admin/users/user_edit_ips.mako:70 msgid "Add" msgstr "" @@ -5294,9 +5402,7 @@ msgid "Primary" msgstr "" #: rhodecode/templates/admin/my_account/my_account_emails.mako:31 -#: rhodecode/templates/admin/users/user_edit_emails.mako:30 -#, python-format -msgid "Confirm to delete this email: %s" +msgid "Confirm to delete this email: {}" msgstr "" #: rhodecode/templates/admin/my_account/my_account_emails.mako:42 @@ -5380,13 +5486,13 @@ 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:38 -#: rhodecode/templates/pullrequests/pullrequests.mako:104 +#: rhodecode/templates/pullrequests/pullrequest.mako:45 +#: rhodecode/templates/pullrequests/pullrequests.mako:114 msgid "Title" msgstr "" #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:47 -#: rhodecode/templates/pullrequests/pullrequests.mako:108 +#: rhodecode/templates/pullrequests/pullrequests.mako:118 msgid "Last Update" msgstr "" @@ -5404,7 +5510,7 @@ msgid "My Notifications" msgstr "" #: rhodecode/templates/admin/notifications/notifications.mako:32 -#: rhodecode/templates/changeset/changeset.mako:140 +#: rhodecode/templates/changeset/changeset.mako:160 msgid "Comments" msgstr "" @@ -5425,6 +5531,10 @@ msgstr "" msgid "Notifications" msgstr "" +#: rhodecode/templates/admin/notifications/show_notification.mako:40 +msgid "Subject" +msgstr "" + #: rhodecode/templates/admin/permissions/permissions.mako:5 msgid "Permissions Administration" msgstr "" @@ -5483,23 +5593,23 @@ msgid "Default IP Whitelist For All User msgstr "" #: rhodecode/templates/admin/permissions/permissions_ips.mako:27 -#: rhodecode/templates/admin/users/user_edit_ips.mako:35 +#: rhodecode/templates/admin/users/user_edit_ips.mako:36 #, python-format msgid "Confirm to delete this ip: %s" msgstr "" #: rhodecode/templates/admin/permissions/permissions_ips.mako:34 -#: rhodecode/templates/admin/users/user_edit_ips.mako:43 +#: rhodecode/templates/admin/users/user_edit_ips.mako:44 msgid "All IP addresses are allowed" msgstr "" #: rhodecode/templates/admin/permissions/permissions_ips.mako:49 -#: rhodecode/templates/admin/users/user_edit_ips.mako:59 +#: rhodecode/templates/admin/users/user_edit_ips.mako:60 msgid "New IP Address" msgstr "" #: rhodecode/templates/admin/permissions/permissions_ips.mako:53 -#: rhodecode/templates/admin/users/user_edit_ips.mako:62 +#: rhodecode/templates/admin/users/user_edit_ips.mako:63 msgid "Description..." msgstr "" @@ -5583,9 +5693,9 @@ msgid "Add Child Group" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:50 -#: rhodecode/templates/admin/repos/repo_edit.mako:49 +#: rhodecode/templates/admin/repos/repo_edit.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35 -#: rhodecode/templates/admin/users/user_edit.mako:35 +#: rhodecode/templates/admin/users/user_edit.mako:40 msgid "Advanced" msgstr "" @@ -5642,26 +5752,26 @@ msgid "Repository Group Permissions" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:15 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:16 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:15 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:15 msgid "User/User Group" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:31 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:31 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:30 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:31 msgid "super admin" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:34 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:34 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:33 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:34 msgid "owner" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:52 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:76 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:61 +#: 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" @@ -5669,8 +5779,8 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:62 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:109 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:71 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:99 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:70 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:98 msgid "Revoke" msgstr "" @@ -5680,7 +5790,7 @@ msgid "delegated admin" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:107 +#: 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" @@ -5745,7 +5855,7 @@ msgid "Clone from" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:47 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:102 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:132 #: rhodecode/templates/forks/fork.mako:52 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" @@ -5755,7 +5865,6 @@ msgid "Repository Group" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:58 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:62 #: rhodecode/templates/forks/fork.mako:64 #, python-format msgid "Select my personal group (%(repo_group_name)s)" @@ -5775,7 +5884,7 @@ msgid "Set the type of repository to cre msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:84 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:70 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:98 #: rhodecode/templates/forks/fork.mako:73 msgid "Landing commit" msgstr "" @@ -5803,36 +5912,36 @@ msgstr "" msgid "%s repository settings" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.mako:55 +#: rhodecode/templates/admin/repos/repo_edit.mako:58 msgid "Extra Fields" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.mako:61 +#: rhodecode/templates/admin/repos/repo_edit.mako:64 msgid "Caches" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.mako:65 +#: rhodecode/templates/admin/repos/repo_edit.mako:68 msgid "Remote" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.mako:69 +#: rhodecode/templates/admin/repos/repo_edit.mako:72 #: rhodecode/templates/summary/components.mako:135 msgid "Statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.mako:75 +#: rhodecode/templates/admin/repos/repo_edit.mako:79 +msgid "Reviewer Rules" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:83 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3 msgid "Maintenance" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.mako:78 +#: rhodecode/templates/admin/repos/repo_edit.mako:86 msgid "Strip" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.mako:93 -msgid "Reviewers" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:7 msgid "Updated on" msgstr "" @@ -5867,84 +5976,77 @@ msgstr "" msgid "Public Journal Visibility" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:56 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:55 msgid "Remove from Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:60 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:59 msgid "Add to Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:65 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:64 msgid "All actions made on this repository will be visible to everyone following the public journal." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:74 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:73 msgid "Locking state" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:83 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:82 msgid "This Repository is not currently locked." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:90 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:89 msgid "Confirm to unlock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:92 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:91 msgid "Unlock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:97 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:96 msgid "Confirm to lock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:99 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:98 msgid "Lock Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:105 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:104 msgid "Force repository locking. This only works when anonymous access is disabled. Pulling from the repository locks the repository to that user until the same user pushes to that repository again." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:114 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:113 msgid "Delete repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:121 -#, python-format -msgid "This repository has %s fork." -msgid_plural "This repository has %s forks." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:125 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:124 msgid "Detach forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129 msgid "Delete forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:139 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138 #: rhodecode/templates/data_table/_dt_elements.mako:124 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:141 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:140 msgid "Delete This Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:146 -msgid "This repository will be renamed in a special way in order to make it inaccessible to RhodeCode Enterprise and its VCS systems. If you need to fully delete it from the file system, please do it manually, or with rhodecode-cleanup-repos command." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:145 +msgid "This repository will be renamed in a special way in order to make it inaccessible to RhodeCode Enterprise and its VCS systems. If you need to fully delete it from the file system, please do it manually, or with rhodecode-cleanup-repos command available in rhodecode-tools." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179 msgid "Change repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179 msgid "Pick repository" msgstr "" @@ -5952,44 +6054,41 @@ msgstr "" msgid "Invalidate Cache for Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Invalidate repository cache" +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:7 +msgid "Manually invalidate the repository cache. On the next access a repository cache will be recreated." msgstr "" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 +msgid "Cache purge can be automated by such api call. Can be called periodically in crontab etc." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:20 +msgid "Invalidate repository cache" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:20 msgid "Confirm to invalidate repository cache" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:14 -msgid "Manually invalidate the repository cache. On the next access a repository cache will be recreated." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:28 -#, python-format -msgid "List of repository caches (%(count)s entry)" -msgid_plural "List of repository caches (%(count)s entries)" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:35 +#: 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" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:36 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:40 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:11 msgid "Key" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:37 +#: 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:64 #: 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:73 +#: rhodecode/templates/admin/users/users.mako:74 msgid "Active" msgstr "" @@ -6063,19 +6162,27 @@ msgstr "" msgid "Test Patterns" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:9 -msgid "Perform maintenance tasks for this repo, following tasks will be performed" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:16 +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:8 +msgid "Perform maintenance tasks for this repo" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:10 +msgid "Following tasks will be performed" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:17 +msgid "Maintenance can be automated by such api call. Can be called periodically in crontab etc." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:25 msgid "No maintenance tasks for this repo available" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:26 +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:34 msgid "Run Maintenance" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:41 +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:49 msgid "Performing Maintenance" msgstr "" @@ -6083,11 +6190,11 @@ msgstr "" msgid "Repository Permissions" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:43 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:42 msgid "private repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:47 msgid "only users/user groups explicitly added here will have access" msgstr "" @@ -6095,56 +6202,87 @@ msgstr "" msgid "Remote url" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:9 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:7 +msgid "Manually pull changes from external repository." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:11 msgid "Remote mirror url" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:12 -msgid "Pull can be automated by such api call called periodically (in crontab etc)" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:22 -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:30 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:15 +msgid "Pull can be automated by such api call. Can be called periodically in crontab etc." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:25 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:36 msgid "Pull changes from remote location" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:22 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:25 msgid "Confirm to pull changes from remote side" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:27 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:31 msgid "This repository does not have any remote mirror url set." msgstr "" +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:32 +msgid "Set remote url." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_reviewers.mako:3 +msgid "Default Reviewer Rules" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_reviewers.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_settings.mako:6 #, python-format msgid "Settings for Repository: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:19 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 msgid "Non-changeable id" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:19 -msgid "what is that ?" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:21 -msgid "URL by id" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 +msgid "what is that ?" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:24 +msgid "URL by id" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:25 msgid "" "In case this repository is renamed or moved into another group the repository url changes.\n" " Using above url guarantees that this repository will always be accessible under such url.\n" " Useful for CI systems, or any other cases that you need to hardcode the url into 3rd party service." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:30 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:33 +#: rhodecode/templates/data_table/_dt_elements.mako:164 +#: rhodecode/templates/forks/fork.mako:58 +msgid "Repository group" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:41 +#, python-format +msgid "Select my personal group (`%(repo_group_name)s`)" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:44 +msgid "Optional select a group to put this repository into." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:51 msgid "Remote uri" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:36 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:59 #: rhodecode/templates/base/perms_summary.mako:79 #: rhodecode/templates/base/perms_summary.mako:149 #: rhodecode/templates/base/perms_summary.mako:151 @@ -6152,63 +6290,56 @@ msgstr "" msgid "edit" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:39 -msgid "new value, leave empty to remove" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:41 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:65 +msgid "enter new value, or leave empty to remove" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:75 msgid "cancel" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:48 -msgid "http[s] url where from repository was imported, also used for doing remote pulls." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:56 -#: rhodecode/templates/data_table/_dt_elements.mako:164 -#: rhodecode/templates/forks/fork.mako:58 -msgid "Repository group" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:65 -msgid "Optional select a group to put this repository into." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:74 -#: rhodecode/templates/forks/fork.mako:77 -msgid "Default commit for files page, downloads, whoosh and readme" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:92 -msgid "Change owner of this repository." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:108 -#: rhodecode/templates/data_table/_dt_elements.mako:58 -msgid "Private repository" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:117 -msgid "Enable statistics" +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:87 +msgid "http[s] url where from repository was imported, this field can used for doing {pull_link}." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:88 +msgid "This field is stored encrypted inside Database, a format of http://user:password@server.com/repo_name can be used and will be hidden from display." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:103 +msgid "Default commit for files page, downloads, full text search index and readme" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:121 +msgid "Change owner of this repository." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:138 +#: rhodecode/templates/data_table/_dt_elements.mako:58 +msgid "Private repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:148 +msgid "Enable statistics" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:153 msgid "Enable statistics window on summary page." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:126 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:158 msgid "Enable downloads" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:130 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:163 msgid "Enable download menu on summary page." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:135 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:168 msgid "Enable automatic locking" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:139 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:173 msgid "Enable automatic locking on repository. Pulling from this repository creates a lock that can be released by pushing back by the same user" msgstr "" @@ -6272,32 +6403,24 @@ msgstr "" msgid "Remove" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_strip.mako:112 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:114 msgid "Checking commits" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_strip.mako:127 -msgid "author" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_strip.mako:127 -msgid "comment" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_strip.mako:128 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:142 msgid " commit verified positive" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_strip.mako:131 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:154 msgid " commit verified negative" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_strip.mako:153 -msgid " commit striped successful" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_strip.mako:156 -msgid " commit striped failed" +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:179 +msgid " commit striped successfully" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:182 +msgid " commit strip failed" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:13 @@ -6835,12 +6958,12 @@ msgid "%s user group settings" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:36 -#: rhodecode/templates/admin/users/user_edit.mako:36 +#: rhodecode/templates/admin/users/user_edit.mako:41 msgid "Global permissions" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:37 +#: rhodecode/templates/admin/users/user_edit.mako:42 msgid "Permissions summary" msgstr "" @@ -6877,43 +7000,35 @@ msgid "This group is set to be automatic msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:37 -msgid "Each member will be added or removed from this groups once they interact with RhodeCode system." -msgstr "" - -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:38 msgid "This group synchronization was set by" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:42 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:41 msgid "This group is not set to be automatically synchronised" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:50 msgid "Disable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:52 msgid "Enable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:60 -msgid "User group will no longer synchronize membership" -msgstr "" - -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:62 -msgid "User group will start to synchronize membership" -msgstr "" - -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:75 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:58 +msgid "Users will be added or removed from this group when they authenticate with RhodeCode system, based on LDAP group membership. This requires `LDAP+User group` authentication plugin to be configured and enabled. (EE only feature)" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:71 msgid "Delete User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:81 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:77 #, python-format msgid "Confirm to delete user group `%(ugroup)s` with all permission assignments" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:83 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:79 msgid "Delete This User Group" msgstr "" @@ -7005,24 +7120,28 @@ msgstr "" msgid "%s user settings" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:33 +#: rhodecode/templates/admin/users/user_edit.mako:19 +msgid "This user is set as disabled" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.mako:38 #: rhodecode/templates/admin/users/user_edit_profile.mako:5 msgid "User Profile" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:34 -msgid "Auth tokens" -msgstr "" - #: rhodecode/templates/admin/users/user_edit.mako:39 +msgid "Auth tokens" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Ip Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit.mako:45 msgid "User Groups Management" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:41 +#: rhodecode/templates/admin/users/user_edit.mako:46 msgid "User audit" msgstr "" @@ -7036,7 +7155,7 @@ msgid "Last login" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 -#: rhodecode/templates/admin/users/users.mako:71 +#: rhodecode/templates/admin/users/users.mako:72 msgid "Last activity" msgstr "" @@ -7151,6 +7270,11 @@ msgstr "" msgid "Additional Email Addresses" msgstr "" +#: rhodecode/templates/admin/users/user_edit_emails.mako:30 +#, python-format +msgid "Confirm to delete this email: %s" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_groups.mako:12 #, python-format msgid "Add `%s` to user group" @@ -7160,12 +7284,24 @@ msgstr "" msgid "Custom IP Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ips.mako:19 +#: rhodecode/templates/admin/users/user_edit_ips.mako:7 +msgid "Current IP address" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ips.mako:10 +msgid "IP Address" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ips.mako:11 +msgid "IP Range" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ips.mako:20 #, python-format msgid "Inherited from %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ips.mako:63 +#: rhodecode/templates/admin/users/user_edit_ips.mako:64 msgid "" "Enter comma separated list of ip addresses like 127.0.0.1,\n" "or use a ip address with a mask 127.0.0.1/24, to create a network range.\n" @@ -7210,7 +7346,7 @@ msgstr "" msgid "Users administration" msgstr "" -#: rhodecode/templates/admin/users/users.mako:77 +#: rhodecode/templates/admin/users/users.mako:78 msgid "Auth type" msgstr "" @@ -7278,110 +7414,110 @@ msgstr "" msgid "Show Pull Requests for %s" msgstr "" -#: rhodecode/templates/base/base.mako:246 +#: rhodecode/templates/base/base.mako:247 msgid "Options" msgstr "" -#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/base/base.mako:255 #: rhodecode/templates/forks/forks_data.mako:30 msgid "Compare fork" msgstr "" -#: rhodecode/templates/base/base.mako:256 -#: rhodecode/templates/base/base.mako:403 +#: rhodecode/templates/base/base.mako:258 +#: rhodecode/templates/base/base.mako:406 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "" -#: rhodecode/templates/base/base.mako:260 -msgid "Unlock" -msgstr "" - #: rhodecode/templates/base/base.mako:262 +msgid "Unlock" +msgstr "" + +#: rhodecode/templates/base/base.mako:264 msgid "Lock" msgstr "" -#: rhodecode/templates/base/base.mako:267 +#: rhodecode/templates/base/base.mako:269 #: rhodecode/templates/data_table/_dt_elements.mako:27 #: rhodecode/templates/data_table/_dt_elements.mako:28 #: rhodecode/templates/forks/forks_data.mako:8 -#: rhodecode/templates/summary/components.mako:103 msgid "Fork" -msgid_plural "Forks" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/base/base.mako:268 +msgstr "" + +#: rhodecode/templates/base/base.mako:270 msgid "Create Pull Request" msgstr "" -#: rhodecode/templates/base/base.mako:290 +#: rhodecode/templates/base/base.mako:292 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:298 +#: rhodecode/templates/base/base.mako:300 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:315 +#: rhodecode/templates/base/base.mako:317 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:325 -#: rhodecode/templates/debug_style/login.html:56 -msgid "Don't have an account ?" -msgstr "" - -#: rhodecode/templates/base/base.mako:345 +#: rhodecode/templates/base/base.mako:327 +msgid "Don't have an account?" +msgstr "" + +#: rhodecode/templates/base/base.mako:329 +msgid "Using external auth? Sign In here." +msgstr "" + +#: rhodecode/templates/base/base.mako:348 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:349 +#: rhodecode/templates/base/base.mako:352 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:385 +#: rhodecode/templates/base/base.mako:388 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:386 +#: rhodecode/templates/base/base.mako:389 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:14 msgid "Journal" msgstr "" -#: rhodecode/templates/base/base.mako:391 +#: rhodecode/templates/base/base.mako:394 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:392 +#: rhodecode/templates/base/base.mako:395 msgid "Public journal" msgstr "" -#: rhodecode/templates/base/base.mako:397 +#: rhodecode/templates/base/base.mako:400 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:398 +#: rhodecode/templates/base/base.mako:401 msgid "Gists" msgstr "" -#: rhodecode/templates/base/base.mako:402 +#: rhodecode/templates/base/base.mako:405 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:408 +#: rhodecode/templates/base/base.mako:411 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:415 +#: rhodecode/templates/base/base.mako:418 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:425 -#: rhodecode/templates/base/base.mako:426 +#: rhodecode/templates/base/base.mako:428 +#: rhodecode/templates/base/base.mako:429 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7403,15 +7539,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:483 +#: rhodecode/templates/base/base.mako:486 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:536 +#: rhodecode/templates/base/base.mako:539 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:544 +#: rhodecode/templates/base/base.mako:547 msgid "Site-wide shortcuts" msgstr "" @@ -7503,10 +7639,10 @@ msgid "Confirm to remove this pattern:" msgstr "" #: rhodecode/templates/base/issue_tracker_settings.mako:191 -#: rhodecode/templates/changeset/changeset_file_comment.mako:269 -#: rhodecode/templates/changeset/changeset_file_comment.mako:319 -#: rhodecode/templates/files/files_add.mako:78 -#: rhodecode/templates/files/files_add.mako:224 +#: rhodecode/templates/changeset/changeset_file_comment.mako:274 +#: rhodecode/templates/changeset/changeset_file_comment.mako:324 +#: rhodecode/templates/files/files_add.mako:84 +#: rhodecode/templates/files/files_add.mako:228 #: rhodecode/templates/files/files_edit.mako:82 #: rhodecode/templates/files/files_edit.mako:185 msgid "Preview" @@ -7586,7 +7722,7 @@ msgstr "" msgid "No permission defined" msgstr "" -#: rhodecode/templates/base/root.mako:150 +#: rhodecode/templates/base/root.mako:155 msgid "Please enable JavaScript to use RhodeCode Enterprise" msgstr "" @@ -7682,95 +7818,107 @@ msgstr "" msgid "Requires hgsubversion library to be installed. Allows cloning remote SVN repositories and migrates them to Mercurial type." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:139 +#: rhodecode/templates/base/vcs_settings.mako:136 +msgid "Enable evolve extension" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:140 +msgid "Enable evolve extension for all repositories." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:142 +msgid "Enable evolve extension for this repository." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:152 msgid "Mercurial Labs Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:139 +#: rhodecode/templates/base/vcs_settings.mako:152 msgid "These features are considered experimental and may not work as expected." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:145 +#: rhodecode/templates/base/vcs_settings.mako:158 msgid "Use rebase as merge strategy" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:148 +#: rhodecode/templates/base/vcs_settings.mako:161 msgid "Use rebase instead of creating a merge commit when merging via web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:160 +#: rhodecode/templates/base/vcs_settings.mako:173 msgid "Git Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:165 +#: rhodecode/templates/base/vcs_settings.mako:178 msgid "Enable lfs extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:169 -msgid "Enable lfs extensions for all repositories." -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:171 -msgid "Enable lfs extensions for this repository." -msgstr "" - #: rhodecode/templates/base/vcs_settings.mako:182 +msgid "Enable lfs extensions for all repositories." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:184 +msgid "Enable lfs extensions for this repository." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:195 msgid "Filesystem location where Git lfs objects should be stored." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:193 +#: rhodecode/templates/base/vcs_settings.mako:206 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:199 +#: rhodecode/templates/base/vcs_settings.mako:212 msgid "Proxy subversion HTTP requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:203 -msgid "Subversion HTTP Support. Enables communication with SVN over HTTP protocol." -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:204 -msgid "SVN Protocol setup Documentation" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:210 -msgid "Subversion HTTP Server URL" -msgstr "" - #: rhodecode/templates/base/vcs_settings.mako:216 +msgid "Subversion HTTP Support. Enables communication with SVN over HTTP protocol." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:217 +msgid "SVN Protocol setup Documentation" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:223 +msgid "Subversion HTTP Server URL" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:229 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:228 +#: rhodecode/templates/base/vcs_settings.mako:241 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:233 +#: rhodecode/templates/base/vcs_settings.mako:246 msgid "Repository patterns" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:237 +#: rhodecode/templates/base/vcs_settings.mako:250 msgid "Patterns for identifying SVN branches and tags. For recursive search, use \"*\". Eg.: \"/branches/*\"" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:301 +#: rhodecode/templates/base/vcs_settings.mako:314 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:306 +#: rhodecode/templates/base/vcs_settings.mako:319 msgid "Enable server-side merge for pull requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:309 +#: rhodecode/templates/base/vcs_settings.mako:322 msgid "Note: when this feature is enabled, it only runs hooks defined in the rcextension package. Custom hooks added on the Admin -> Settings -> Hooks page will not be run when pull requests are automatically merged from the web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:313 +#: rhodecode/templates/base/vcs_settings.mako:326 msgid "Invalidate and relocate inline comments during update" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:316 +#: rhodecode/templates/base/vcs_settings.mako:329 msgid "During the update of a pull request, the position of inline comments will be updated and outdated inline comments will be hidden." msgstr "" @@ -7788,10 +7936,10 @@ msgid "Compare Selected Bookmarks" msgstr "" #: rhodecode/templates/bookmarks/bookmarks_data.mako:13 -#: rhodecode/templates/changelog/changelog_elements.mako:91 -#: rhodecode/templates/changelog/changelog_summary_data.mako:62 -#: rhodecode/templates/changeset/changeset.mako:92 +#: rhodecode/templates/changelog/changelog_elements.mako:111 +#: rhodecode/templates/changeset/changeset.mako:112 #: rhodecode/templates/files/base.mako:10 +#: rhodecode/templates/summary/summary_commits.mako:62 #, python-format msgid "Bookmark %s" msgstr "" @@ -7810,10 +7958,10 @@ msgid "Compare Selected Branches" msgstr "" #: rhodecode/templates/branches/branches_data.mako:12 -#: rhodecode/templates/changelog/changelog_elements.mako:83 -#: rhodecode/templates/changelog/changelog_summary_data.mako:76 -#: rhodecode/templates/changeset/changeset.mako:105 +#: rhodecode/templates/changelog/changelog_elements.mako:103 +#: rhodecode/templates/changeset/changeset.mako:125 #: rhodecode/templates/files/base.mako:23 +#: rhodecode/templates/summary/summary_commits.mako:76 #, python-format msgid "Branch %s" msgstr "" @@ -7851,19 +7999,19 @@ msgstr[0] "" msgstr[1] "" #: rhodecode/templates/changelog/changelog.mako:110 -#: rhodecode/templates/files/files_add.mako:93 +#: rhodecode/templates/files/files_add.mako:99 #: rhodecode/templates/files/files_delete.mako:60 #: rhodecode/templates/files/files_edit.mako:96 msgid "Commit Message" msgstr "" #: rhodecode/templates/changelog/changelog.mako:112 -#: rhodecode/templates/changelog/changelog_summary_data.mako:10 +#: rhodecode/templates/summary/summary_commits.mako:10 msgid "Age" msgstr "" #: rhodecode/templates/changelog/changelog.mako:115 -#: rhodecode/templates/changelog/changelog_summary_data.mako:12 +#: rhodecode/templates/summary/summary_commits.mako:12 msgid "Refs" msgstr "" @@ -7880,7 +8028,7 @@ msgid "load previous" msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:26 -#: rhodecode/templates/changelog/changelog_summary_data.mako:21 +#: rhodecode/templates/summary/summary_commits.mako:21 #, python-format msgid "" "Commit status: %s\n" @@ -7888,44 +8036,66 @@ msgid "" msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:30 -#: rhodecode/templates/changelog/changelog_summary_data.mako:25 +#: rhodecode/templates/summary/summary_commits.mako:25 #, python-format msgid "Commit status: %s" msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:36 -#: rhodecode/templates/changelog/changelog_summary_data.mako:31 +#: rhodecode/templates/summary/summary_commits.mako:31 msgid "Commit status: Not Reviewed" msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:41 -#: rhodecode/templates/changelog/changelog_summary_data.mako:36 +#: rhodecode/templates/summary/summary_commits.mako:36 msgid "Commit has comments" msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:53 -#: rhodecode/templates/compare/compare_commits.mako:46 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:495 +#: rhodecode/templates/changeset/changeset.mako:40 +msgid "Commit phase" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:60 +#: rhodecode/templates/changelog/changelog_elements.mako:67 +#: rhodecode/templates/changeset/changeset.mako:46 +#: rhodecode/templates/changeset/changeset.mako:53 +msgid "Evolve State" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:60 +#: rhodecode/templates/changeset/changeset.mako:46 +msgid "obsolete" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:67 +#: rhodecode/templates/changeset/changeset.mako:53 +msgid "hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/compare/compare_commits.mako:47 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:522 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:77 -#: rhodecode/templates/changeset/changeset.mako:86 +#: rhodecode/templates/changelog/changelog_elements.mako:97 +#: rhodecode/templates/changeset/changeset.mako:106 #: rhodecode/templates/files/base.mako:4 msgid "merge" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:99 -#: rhodecode/templates/changelog/changelog_summary_data.mako:69 -#: rhodecode/templates/changeset/changeset.mako:99 +#: rhodecode/templates/changelog/changelog_elements.mako:119 +#: rhodecode/templates/changeset/changeset.mako:119 #: rhodecode/templates/files/base.mako:17 +#: rhodecode/templates/summary/summary_commits.mako:69 #: rhodecode/templates/tags/tags_data.mako:12 #, python-format msgid "Tag %s" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:113 +#: rhodecode/templates/changelog/changelog_elements.mako:133 msgid "load next" msgstr "" @@ -7933,100 +8103,78 @@ msgstr "" msgid "Show File" msgstr "" -#: rhodecode/templates/changelog/changelog_summary_data.mako:9 -#: rhodecode/templates/search/search_commit.mako:8 -msgid "Commit message" -msgstr "" - -#: rhodecode/templates/changelog/changelog_summary_data.mako:100 -msgid "Add or upload files directly via RhodeCode:" -msgstr "" - -#: rhodecode/templates/changelog/changelog_summary_data.mako:103 -#: rhodecode/templates/files/files_browser.mako:25 -msgid "Add New File" -msgstr "" - -#: rhodecode/templates/changelog/changelog_summary_data.mako:111 -msgid "Push new repo:" -msgstr "" - -#: rhodecode/templates/changelog/changelog_summary_data.mako:122 -msgid "Existing repository?" -msgstr "" - #: rhodecode/templates/changeset/changeset.mako:7 #, python-format msgid "%s Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:43 +#: rhodecode/templates/changeset/changeset.mako:62 msgid "Parent Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:43 +#: rhodecode/templates/changeset/changeset.mako:62 msgid "Parent" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:47 +#: rhodecode/templates/changeset/changeset.mako:66 msgid "Child Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:47 -msgid "Child" -msgstr "" - -#: rhodecode/templates/changeset/changeset.mako:58 -msgid "Expand" -msgstr "" - #: rhodecode/templates/changeset/changeset.mako:66 -#: rhodecode/templates/changeset/changeset.mako:72 +msgid "Child" +msgstr "" + +#: rhodecode/templates/changeset/changeset.mako:78 +msgid "Expand" +msgstr "" + +#: rhodecode/templates/changeset/changeset.mako:86 +#: rhodecode/templates/changeset/changeset.mako:92 #: rhodecode/templates/changeset/changeset_file_comment.mako:81 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:79 +#: rhodecode/templates/changeset/changeset.mako:99 #: rhodecode/templates/files/file_tree_detail.mako:21 #: rhodecode/templates/files/files_detail.mako:20 msgid "References" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:115 +#: rhodecode/templates/changeset/changeset.mako:135 msgid "Diff options" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:119 +#: rhodecode/templates/changeset/changeset.mako:139 #: rhodecode/templates/codeblocks/diffs.mako:445 #: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:120 +#: rhodecode/templates/changeset/changeset.mako:140 msgid "Raw Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:123 +#: rhodecode/templates/changeset/changeset.mako:143 msgid "Patch diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:124 +#: rhodecode/templates/changeset/changeset.mako:144 msgid "Patch Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:127 +#: rhodecode/templates/changeset/changeset.mako:147 #: rhodecode/templates/codeblocks/diffs.mako:452 #: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:128 +#: rhodecode/templates/changeset/changeset.mako:148 msgid "Download Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:145 -#: rhodecode/templates/changeset/changeset.mako:147 +#: rhodecode/templates/changeset/changeset.mako:165 +#: rhodecode/templates/changeset/changeset.mako:167 #: rhodecode/tests/functional/test_commit_comments.py:275 #, python-format msgid "%d Commit comment" @@ -8034,8 +8182,8 @@ msgid_plural "%d Commit comments" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.mako:150 -#: rhodecode/templates/changeset/changeset.mako:152 +#: rhodecode/templates/changeset/changeset.mako:170 +#: rhodecode/templates/changeset/changeset.mako:172 #: rhodecode/tests/functional/test_commit_comments.py:282 #, python-format msgid "%d Inline Comment" @@ -8043,19 +8191,19 @@ msgid_plural "%d Inline Comments" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.mako:160 +#: rhodecode/templates/changeset/changeset.mako:180 msgid "Unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:169 +#: rhodecode/templates/changeset/changeset.mako:189 msgid "There are no unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:249 +#: rhodecode/templates/changeset/changeset.mako:269 msgid "No Child Commits" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:285 +#: rhodecode/templates/changeset/changeset.mako:305 msgid "No Parent Commits" msgstr "" @@ -8081,72 +8229,80 @@ msgstr "" msgid "resolves comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:100 +#: rhodecode/templates/changeset/changeset_file_comment.mako:96 +msgid "Pull request author" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:97 +msgid "author" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:105 msgid "Outdated comment from pull request version {0}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:104 -#: rhodecode/templates/changeset/changeset_file_comment.mako:119 +#: rhodecode/templates/changeset/changeset_file_comment.mako:109 +#: rhodecode/templates/changeset/changeset_file_comment.mako:124 msgid "Comment from pull request version {0}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:116 +#: rhodecode/templates/changeset/changeset_file_comment.mako:121 msgid "Outdated comment from pull request version {}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:146 -#: rhodecode/templates/changeset/changeset_file_comment.mako:149 +#: rhodecode/templates/changeset/changeset_file_comment.mako:151 +#: rhodecode/templates/changeset/changeset_file_comment.mako:154 msgid "Prev" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:147 -#: rhodecode/templates/changeset/changeset_file_comment.mako:150 +#: rhodecode/templates/changeset/changeset_file_comment.mako:152 +#: rhodecode/templates/changeset/changeset_file_comment.mako:155 msgid "Next" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:185 +#: rhodecode/templates/changeset/changeset_file_comment.mako:190 msgid "Leave a comment on this Pull Request." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:187 +#: rhodecode/templates/changeset/changeset_file_comment.mako:192 msgid "Leave a comment on {} commits in this range." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:189 +#: rhodecode/templates/changeset/changeset_file_comment.mako:194 msgid "Leave a comment on this Commit." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:277 +#: rhodecode/templates/changeset/changeset_file_comment.mako:282 #: rhodecode/templates/codeblocks/diffs.mako:71 msgid "You need to be logged in to leave comments." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:278 +#: rhodecode/templates/changeset/changeset_file_comment.mako:283 #: rhodecode/templates/codeblocks/diffs.mako:71 msgid "Login now" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:343 +#: rhodecode/templates/changeset/changeset_file_comment.mako:348 #, python-format msgid "Comments parsed using %s syntax with %s, and %s actions support." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:345 +#: rhodecode/templates/changeset/changeset_file_comment.mako:350 msgid "Use @username inside this text to send notification to this RhodeCode user" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:346 +#: rhodecode/templates/changeset/changeset_file_comment.mako:351 msgid "Start typing with / for certain actions to be triggered via text box." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:363 +#: rhodecode/templates/changeset/changeset_file_comment.mako:368 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 #: rhodecode/templates/pullrequests/pullrequest_show.mako:153 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:393 +#: rhodecode/templates/changeset/changeset_file_comment.mako:398 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 @@ -8185,7 +8341,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_range.mako:99 #: rhodecode/templates/compare/compare_diff.mako:312 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:419 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:446 #, python-format msgid "Expand %s commit" msgid_plural "Expand %s commits" @@ -8194,7 +8350,7 @@ msgstr[1] "" #: rhodecode/templates/changeset/changeset_range.mako:105 #: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 #, python-format msgid "Collapse %s commit" msgid_plural "Collapse %s commits" @@ -8363,26 +8519,26 @@ msgstr "" msgid "Compare was calculated based on this shared commit." msgstr "" -#: rhodecode/templates/compare/compare_commits.mako:16 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:456 +#: rhodecode/templates/compare/compare_commits.mako:17 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:483 msgid "Time" msgstr "" -#: rhodecode/templates/compare/compare_commits.mako:67 +#: rhodecode/templates/compare/compare_commits.mako:68 #, python-format msgid "%s commit hidden" msgid_plural "%s commits hidden" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/compare/compare_commits.mako:68 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:573 +#: rhodecode/templates/compare/compare_commits.mako:69 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:600 msgid "show it" msgid_plural "show them" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/compare/compare_commits.mako:74 +#: rhodecode/templates/compare/compare_commits.mako:75 msgid "No commits in this compare" msgstr "" @@ -8420,6 +8576,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:23 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:71 msgid "Source" msgstr "" @@ -8633,6 +8790,10 @@ msgstr "" msgid "Form vertical" msgstr "" +#: rhodecode/templates/debug_style/login.html:56 +msgid "Don't have an account ?" +msgstr "" + #: rhodecode/templates/email_templates/base.mako:32 #, python-format msgid "This is a notification from RhodeCode. %(instance_url)s" @@ -8746,6 +8907,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 msgid "Source repository" msgstr "" @@ -8814,8 +8976,6 @@ msgid "%(target_ref_type)s of %(target_r msgstr "" #: rhodecode/templates/email_templates/pull_request_review.mako:76 -#: rhodecode/templates/summary/components.mako:95 -#: rhodecode/templates/summary/components.mako:98 #, python-format msgid "%(num)s Commit" msgid_plural "%(num)s Commits" @@ -8839,7 +8999,7 @@ msgstr "" msgid "Full Name" msgstr "" -#: rhodecode/templates/errors/error_document.mako:46 +#: rhodecode/templates/errors/error_document.mako:45 #, python-format msgid "You will be redirected to %s in %s seconds" msgstr "" @@ -8910,6 +9070,7 @@ msgid "Remove Custom Path" msgstr "" #: rhodecode/templates/files/files_add.mako:50 +#: rhodecode/templates/files/files_add.mako:59 msgid "Filename" msgstr "" @@ -8917,34 +9078,34 @@ msgstr "" msgid "Upload File" msgstr "" -#: rhodecode/templates/files/files_add.mako:59 -msgid "Upload file" -msgstr "" - -#: rhodecode/templates/files/files_add.mako:63 +#: rhodecode/templates/files/files_add.mako:62 msgid "No file selected" msgstr "" #: rhodecode/templates/files/files_add.mako:65 +msgid "Upload file" +msgstr "" + +#: rhodecode/templates/files/files_add.mako:71 msgid "Create New File" msgstr "" -#: rhodecode/templates/files/files_add.mako:75 +#: rhodecode/templates/files/files_add.mako:81 #: rhodecode/templates/files/files_edit.mako:79 msgid "line wraps" msgstr "" -#: rhodecode/templates/files/files_add.mako:76 +#: rhodecode/templates/files/files_add.mako:82 #: rhodecode/templates/files/files_edit.mako:80 msgid "on" msgstr "" -#: rhodecode/templates/files/files_add.mako:76 +#: rhodecode/templates/files/files_add.mako:82 #: rhodecode/templates/files/files_edit.mako:80 msgid "off" msgstr "" -#: rhodecode/templates/files/files_add.mako:103 +#: rhodecode/templates/files/files_add.mako:109 #: rhodecode/templates/files/files_edit.mako:106 msgid "Commit changes" msgstr "" @@ -8965,6 +9126,11 @@ msgstr "" msgid "Close File List" msgstr "" +#: rhodecode/templates/files/files_browser.mako:25 +#: rhodecode/templates/summary/summary_commits.mako:103 +msgid "Add New File" +msgstr "" + #: rhodecode/templates/files/files_browser.mako:27 msgid "Add File" msgstr "" @@ -9077,7 +9243,6 @@ msgid "LargeFile" msgstr "" #: rhodecode/templates/files/files_source.mako:10 -#: rhodecode/templates/search/search_content.mako:57 msgid "line" msgid_plural "lines" msgstr[0] "" @@ -9141,6 +9306,10 @@ msgstr "" msgid "Fork name" msgstr "" +#: rhodecode/templates/forks/fork.mako:77 +msgid "Default commit for files page, downloads, whoosh and readme" +msgstr "" + #: rhodecode/templates/forks/fork.mako:93 msgid "Copy permissions" msgstr "" @@ -9178,6 +9347,13 @@ msgstr "" msgid "Filter" msgstr "" +#: rhodecode/templates/journal/journal.mako:14 +#, python-format +msgid "%s entry" +msgid_plural "%s entries" +msgstr[0] "" +msgstr[1] "" + #: rhodecode/templates/journal/journal.mako:23 msgid "ATOM journal feed" msgstr "" @@ -9208,65 +9384,75 @@ msgstr "" msgid "New pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:51 +#: rhodecode/templates/pullrequests/pullrequest.mako:35 +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:57 +#: rhodecode/templates/pullrequests/pullrequest.mako:64 msgid "Commit flow" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:65 -msgid "Origin repository" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.mako:83 +#: rhodecode/templates/pullrequests/pullrequest.mako:90 msgid "Loading refs..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:94 +#: rhodecode/templates/pullrequests/pullrequest.mako:101 msgid "Submit Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:107 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:322 +#: rhodecode/templates/pullrequests/pullrequest.mako:115 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +msgid "Author of this pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.mako:129 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:323 +msgid "Reviewer rules" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.mako:139 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:337 msgid "Pull request reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:118 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:366 -msgid "Add reviewer" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.mako:297 -#: rhodecode/templates/pullrequests/pullrequest.mako:570 -msgid "Please select origin and destination" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.mako:303 +#: rhodecode/templates/pullrequests/pullrequest.mako:150 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +msgid "Add reviewer or reviewer group" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.mako:302 +#: rhodecode/templates/pullrequests/pullrequest.mako:504 +msgid "Please select source and target" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.mako:308 msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:350 -#: rhodecode/templates/pullrequests/pullrequest.mako:352 +#: rhodecode/templates/pullrequests/pullrequest.mako:356 +#: rhodecode/templates/pullrequests/pullrequest.mako:358 msgid "This pull request will consist of __COMMITS__ commit." msgid_plural "This pull request will consist of __COMMITS__ commits." msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/pullrequests/pullrequest.mako:355 +#: rhodecode/templates/pullrequests/pullrequest.mako:361 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:362 +#: rhodecode/templates/pullrequests/pullrequest.mako:368 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:462 -msgid "Destination repository" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.mako:473 +#: rhodecode/templates/pullrequests/pullrequest.mako:431 +msgid "Target repository" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.mako:441 msgid "Select commit reference" msgstr "" @@ -9314,10 +9500,6 @@ msgstr "" msgid "Confirm to delete this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:71 -msgid "Origin" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:88 msgid "Common ancestor" msgstr "" @@ -9416,69 +9598,69 @@ msgid "Pull request versions not availab msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:300 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:370 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:387 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:414 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:388 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:415 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:396 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:423 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:424 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:398 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 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:409 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:436 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:432 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:459 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:445 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:472 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:449 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:476 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:494 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:469 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:496 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:572 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:599 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:575 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:602 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:576 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:603 msgid "show them" msgstr "" @@ -9568,6 +9750,11 @@ msgstr "" msgid "File names" msgstr "" +#: rhodecode/templates/search/search_commit.mako:8 +#: rhodecode/templates/summary/summary_commits.mako:9 +msgid "Commit message" +msgstr "" + #: rhodecode/templates/search/search_commit.mako:11 msgid "Age (new first)" msgstr "" @@ -9599,34 +9786,6 @@ msgstr "" msgid "%s RSS feed" msgstr "" -#: rhodecode/templates/summary/components.mako:5 -#, python-format -msgid "%(num)s Branch" -msgid_plural "%(num)s Branches" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/summary/components.mako:12 -#, python-format -msgid "%(num)s Closed Branch" -msgid_plural "%(num)s Closed Branches" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/summary/components.mako:19 -#, python-format -msgid "%(num)s Tag" -msgid_plural "%(num)s Tags" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/summary/components.mako:26 -#, python-format -msgid "%(num)s Bookmark" -msgid_plural "%(num)s Bookmarks" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/summary/components.mako:49 msgid "Read-only url" msgstr "" @@ -9707,6 +9866,18 @@ msgstr "" msgid "Readme file from commit %s:%s" msgstr "" +#: rhodecode/templates/summary/summary_commits.mako:100 +msgid "Add or upload files directly via RhodeCode:" +msgstr "" + +#: rhodecode/templates/summary/summary_commits.mako:111 +msgid "Push new repo:" +msgstr "" + +#: rhodecode/templates/summary/summary_commits.mako:122 +msgid "Existing repository?" +msgstr "" + #: rhodecode/templates/tags/tags.mako:5 #, python-format msgid "%s Tags" 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 @@ -7,8 +7,14 @@ var _TM = { '(from usergroup {0})': '(from usergroup {0})', 'Add another comment': 'Add another comment', + 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'All reviewers must vote.': 'All reviewers must vote.', + 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', + 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Close': 'Close', 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', + 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', 'Follow': 'Follow', @@ -38,6 +44,7 @@ var _TM = { 'Please delete {0} characters': 'Please delete {0} characters', 'Please enter {0} or more character': 'Please enter {0} or more character', 'Please enter {0} or more characters': 'Please enter {0} or more characters', + 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': 'Searching...', 'Selection link': 'Selection link', @@ -59,6 +66,7 @@ var _TM = { 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', 'Unfollow': 'Unfollow', 'Updating...': 'Updating...', + 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'You can only select {0} item': 'You can only select {0} item', 'You can only select {0} items': 'You can only select {0} items', 'added manually by "{0}"': 'added manually by "{0}"', @@ -71,6 +79,7 @@ var _TM = { 'in {0}, {1}': 'in {0}, {1}', 'just now': 'just now', 'loading...': 'loading...', + 'member of "{0}"': 'member of "{0}"', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', 'showing {0} out of {1} commits': 'showing {0} out of {1} commits', 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 @@ -7,8 +7,14 @@ var _TM = { '(from usergroup {0})': '(from usergroup {0})', 'Add another comment': 'Add another comment', + 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'All reviewers must vote.': 'All reviewers must vote.', + 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', + 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Close': 'Close', 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', + 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', 'Follow': 'Follow', @@ -38,6 +44,7 @@ var _TM = { 'Please delete {0} characters': 'Bitte {0} Zeichen löschen', 'Please enter {0} or more character': 'Bitte {0} oder mehr Zeichen eingeben', 'Please enter {0} or more characters': 'Bitte {0} oder mehr Zeichen eingeben', + 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': 'Searching...', 'Selection link': 'Selection link', @@ -59,6 +66,7 @@ var _TM = { 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', 'Unfollow': 'Unfollow', 'Updating...': 'Updating...', + 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'You can only select {0} item': 'You can only select {0} item', 'You can only select {0} items': 'You can only select {0} items', 'added manually by "{0}"': 'added manually by "{0}"', @@ -71,6 +79,7 @@ var _TM = { 'in {0}, {1}': 'in {0}, {1}', 'just now': 'jetzt gerade', 'loading...': 'loading...', + 'member of "{0}"': 'member of "{0}"', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', 'showing {0} out of {1} commits': 'showing {0} out of {1} commits', 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 @@ -7,8 +7,14 @@ var _TM = { '(from usergroup {0})': '(from usergroup {0})', 'Add another comment': 'Add another comment', + 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'All reviewers must vote.': 'All reviewers must vote.', + 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', + 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Close': 'Close', 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', + 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', 'Follow': 'Follow', @@ -38,6 +44,7 @@ var _TM = { 'Please delete {0} characters': 'Please delete {0} characters', 'Please enter {0} or more character': 'Please enter {0} or more character', 'Please enter {0} or more characters': 'Please enter {0} or more characters', + 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': 'Searching...', 'Selection link': 'Selection link', @@ -59,6 +66,7 @@ var _TM = { 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', 'Unfollow': 'Unfollow', 'Updating...': 'Updating...', + 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'You can only select {0} item': 'You can only select {0} item', 'You can only select {0} items': 'You can only select {0} items', 'added manually by "{0}"': 'added manually by "{0}"', @@ -71,6 +79,7 @@ var _TM = { 'in {0}, {1}': 'in {0}, {1}', 'just now': 'just now', 'loading...': 'loading...', + 'member of "{0}"': 'member of "{0}"', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', 'showing {0} out of {1} commits': 'showing {0} out of {1} commits', 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 @@ -7,8 +7,14 @@ var _TM = { '(from usergroup {0})': '(from usergroup {0})', 'Add another comment': 'Add another comment', + 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'All reviewers must vote.': 'All reviewers must vote.', + 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', + 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Close': 'Close', 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', + 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', 'Follow': 'Follow', @@ -38,6 +44,7 @@ var _TM = { 'Please delete {0} characters': 'Please delete {0} characters', 'Please enter {0} or more character': 'Please enter {0} or more character', 'Please enter {0} or more characters': 'Please enter {0} or more characters', + 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': 'Searching...', 'Selection link': 'Selection link', @@ -59,6 +66,7 @@ var _TM = { 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', 'Unfollow': 'Unfollow', 'Updating...': 'Updating...', + 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'You can only select {0} item': 'You can only select {0} item', 'You can only select {0} items': 'You can only select {0} items', 'added manually by "{0}"': 'added manually by "{0}"', @@ -71,6 +79,7 @@ var _TM = { 'in {0}, {1}': 'in {0}, {1}', 'just now': 'just now', 'loading...': 'loading...', + 'member of "{0}"': 'member of "{0}"', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', 'showing {0} out of {1} commits': 'showing {0} out of {1} commits', 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 @@ -7,8 +7,14 @@ var _TM = { '(from usergroup {0})': '(from usergroup {0})', 'Add another comment': 'Add another comment', + 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'All reviewers must vote.': 'All reviewers must vote.', + 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', + 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Close': 'Close', 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', + 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', 'Follow': 'Follow', @@ -38,6 +44,7 @@ var _TM = { 'Please delete {0} characters': 'Please delete {0} characters', 'Please enter {0} or more character': 'Please enter {0} or more character', 'Please enter {0} or more characters': 'Please enter {0} or more characters', + 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': 'Searching...', 'Selection link': 'Lien vers la sélection', @@ -59,6 +66,7 @@ var _TM = { 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', 'Unfollow': 'Unfollow', 'Updating...': 'Updating...', + 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'You can only select {0} item': 'You can only select {0} item', 'You can only select {0} items': 'You can only select {0} items', 'added manually by "{0}"': 'added manually by "{0}"', @@ -71,6 +79,7 @@ var _TM = { 'in {0}, {1}': 'in {0}, {1}', 'just now': 'à l’instant', 'loading...': 'Chargement…', + 'member of "{0}"': 'member of "{0}"', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', 'showing {0} out of {1} commits': 'showing {0} out of {1} commits', 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 @@ -7,8 +7,14 @@ var _TM = { '(from usergroup {0})': '(from usergroup {0})', 'Add another comment': 'Aggiungi un altro commento', + 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'All reviewers must vote.': 'All reviewers must vote.', + 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', + 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Close': 'Close', 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', + 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', 'Follow': 'Segui', @@ -38,6 +44,7 @@ var _TM = { 'Please delete {0} characters': 'Please delete {0} characters', 'Please enter {0} or more character': 'Please enter {0} or more character', 'Please enter {0} or more characters': 'Please enter {0} or more characters', + 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': 'Searching...', 'Selection link': 'Collegamento selezione', @@ -59,6 +66,7 @@ var _TM = { 'There are currently no open pull requests requiring your participation.': 'Al momento non ci sono richieste di PULL che richiedono il tuo intervento', 'Unfollow': 'Smetti di seguire', 'Updating...': 'Updating...', + 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'You can only select {0} item': 'You can only select {0} item', 'You can only select {0} items': 'You can only select {0} items', 'added manually by "{0}"': 'added manually by "{0}"', @@ -71,6 +79,7 @@ var _TM = { 'in {0}, {1}': 'in {0}, {1}', 'just now': 'proprio ora', 'loading...': 'loading...', + 'member of "{0}"': 'member of "{0}"', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', 'showing {0} out of {1} commits': 'showing {0} out of {1} commits', 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 @@ -7,8 +7,14 @@ var _TM = { '(from usergroup {0})': '(from usergroup {0})', 'Add another comment': '別のコメントを追加', + 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'All reviewers must vote.': 'All reviewers must vote.', + 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', + 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Close': 'Close', 'Comment text will be set automatically based on currently selected status ({0}) ...': '選択したステータス ({0}) を元にコメントが自動的に設定されます...', + 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', 'Follow': 'フォロー', @@ -38,6 +44,7 @@ var _TM = { 'Please delete {0} characters': '{0} 文字削除してください', 'Please enter {0} or more character': '{0} 文字以上入力してください', 'Please enter {0} or more characters': '{0} 文字以上入力してください', + 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': '検索中...', 'Selection link': 'セレクション・リンク', @@ -59,6 +66,7 @@ var _TM = { 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', 'Unfollow': 'アンフォロー', 'Updating...': 'Updating...', + 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'You can only select {0} item': '{0} 件のみ選択できます', 'You can only select {0} items': '{0} 件のみ選択できます', 'added manually by "{0}"': 'added manually by "{0}"', @@ -71,6 +79,7 @@ var _TM = { 'in {0}, {1}': 'in {0}, {1}', 'just now': 'たったいま', 'loading...': '読み込み中...', + 'member of "{0}"': 'member of "{0}"', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', 'showing {0} out of {1} commits': 'showing {0} out of {1} commits', diff --git a/rhodecode/public/js/rhodecode/i18n/js_translations.js b/rhodecode/public/js/rhodecode/i18n/js_translations.js --- a/rhodecode/public/js/rhodecode/i18n/js_translations.js +++ b/rhodecode/public/js/rhodecode/i18n/js_translations.js @@ -1,8 +1,14 @@ // AUTO GENERATED FILE FOR Babel JS-GETTEXT EXTRACTORS, DO NOT CHANGE _gettext('(from usergroup {0})'); _gettext('Add another comment'); +_gettext('Adding new reviewers is forbidden.'); +_gettext('All reviewers must vote.'); +_gettext('At least {0} reviewer must vote.'); +_gettext('At least {0} reviewers must vote.'); +_gettext('Author is not allowed to be a reviewer.'); _gettext('Close'); _gettext('Comment text will be set automatically based on currently selected status ({0}) ...'); +_gettext('Commit Authors are not allowed to be a reviewer.'); _gettext('Delete this comment?'); _gettext('Diff to Commit '); _gettext('Follow'); @@ -32,6 +38,7 @@ _gettext('Please delete {0} characters'); _gettext('Please enter {0} or more character'); _gettext('Please enter {0} or more characters'); +_gettext('Reviewers picked from source code changes.'); _gettext('Saving...'); _gettext('Searching...'); _gettext('Selection link'); @@ -53,6 +60,7 @@ _gettext('There are currently no open pull requests requiring your participation.'); _gettext('Unfollow'); _gettext('Updating...'); +_gettext('User `{0}` not allowed to be a reviewer'); _gettext('You can only select {0} item'); _gettext('You can only select {0} items'); _gettext('added manually by "{0}"'); @@ -65,6 +73,7 @@ _gettext('in {0}, {1}'); _gettext('just now'); _gettext('loading...'); +_gettext('member of "{0}"'); _gettext('resolve comment'); _gettext('showing {0} out of {1} commit'); _gettext('showing {0} out of {1} commits'); 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 @@ -7,8 +7,14 @@ var _TM = { '(from usergroup {0})': '(from usergroup {0})', 'Add another comment': 'Dodaj kolejny komentarz', + 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'All reviewers must vote.': 'All reviewers must vote.', + 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', + 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Close': 'Zamknij', 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', + 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', 'Follow': 'Obserwuj', @@ -38,6 +44,7 @@ var _TM = { 'Please delete {0} characters': 'Please delete {0} characters', 'Please enter {0} or more character': 'Please enter {0} or more character', 'Please enter {0} or more characters': 'Please enter {0} or more characters', + 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': 'Searching...', 'Selection link': 'Wybór linku', @@ -59,6 +66,7 @@ var _TM = { 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', 'Unfollow': 'Nie obserwuj', 'Updating...': 'Updating...', + 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'You can only select {0} item': 'You can only select {0} item', 'You can only select {0} items': 'You can only select {0} items', 'added manually by "{0}"': 'added manually by "{0}"', @@ -71,6 +79,7 @@ var _TM = { 'in {0}, {1}': 'in {0}, {1}', 'just now': 'przed chwilą', 'loading...': 'wczytywanie...', + 'member of "{0}"': 'member of "{0}"', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', 'showing {0} out of {1} commits': 'showing {0} out of {1} commits', 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 @@ -7,8 +7,14 @@ var _TM = { '(from usergroup {0})': '(from usergroup {0})', 'Add another comment': 'Adicionar outro comentário', + 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'All reviewers must vote.': 'All reviewers must vote.', + 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', + 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Close': 'Close', 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', + 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', 'Follow': 'Seguir', @@ -38,6 +44,7 @@ var _TM = { 'Please delete {0} characters': 'Please delete {0} characters', 'Please enter {0} or more character': 'Please enter {0} or more character', 'Please enter {0} or more characters': 'Please enter {0} or more characters', + 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': 'Searching...', 'Selection link': 'Link da seleção', @@ -59,6 +66,7 @@ var _TM = { 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', 'Unfollow': 'Parar de seguir', 'Updating...': 'Updating...', + 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'You can only select {0} item': 'You can only select {0} item', 'You can only select {0} items': 'You can only select {0} items', 'added manually by "{0}"': 'added manually by "{0}"', @@ -71,6 +79,7 @@ var _TM = { 'in {0}, {1}': 'in {0}, {1}', 'just now': 'agora há pouco', 'loading...': 'loading...', + 'member of "{0}"': 'member of "{0}"', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', 'showing {0} out of {1} commits': 'showing {0} out of {1} commits', 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 @@ -7,8 +7,14 @@ var _TM = { '(from usergroup {0})': '(from usergroup {0})', 'Add another comment': 'Добавить другой комментарий', + 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'All reviewers must vote.': 'All reviewers must vote.', + 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', + 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Close': 'Close', 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', + 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', 'Follow': 'Наблюдать', @@ -38,6 +44,7 @@ var _TM = { 'Please delete {0} characters': 'Please delete {0} characters', 'Please enter {0} or more character': 'Please enter {0} or more character', 'Please enter {0} or more characters': 'Please enter {0} or more characters', + 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': 'Searching...', 'Selection link': 'Ссылка выбора', @@ -59,6 +66,7 @@ var _TM = { 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', 'Unfollow': 'Не наблюдать', 'Updating...': 'Updating...', + 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'You can only select {0} item': 'You can only select {0} item', 'You can only select {0} items': 'You can only select {0} items', 'added manually by "{0}"': 'added manually by "{0}"', @@ -71,6 +79,7 @@ var _TM = { 'in {0}, {1}': 'in {0}, {1}', 'just now': 'прямо сейчас', 'loading...': 'загрузка...', + 'member of "{0}"': 'member of "{0}"', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', 'showing {0} out of {1} commits': 'showing {0} out of {1} commits', 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 @@ -7,8 +7,14 @@ var _TM = { '(from usergroup {0})': '(from usergroup {0})', 'Add another comment': 'Add another comment', + 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'All reviewers must vote.': 'All reviewers must vote.', + 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', + 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Close': 'Close', 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', + 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', 'Follow': 'Follow', @@ -38,6 +44,7 @@ var _TM = { 'Please delete {0} characters': 'Please delete {0} characters', 'Please enter {0} or more character': 'Please enter {0} or more character', 'Please enter {0} or more characters': 'Please enter {0} or more characters', + 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': 'Searching...', 'Selection link': '选择链接', @@ -59,6 +66,7 @@ var _TM = { 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', 'Unfollow': 'Unfollow', 'Updating...': 'Updating...', + 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'You can only select {0} item': 'You can only select {0} item', 'You can only select {0} items': 'You can only select {0} items', 'added manually by "{0}"': 'added manually by "{0}"', @@ -71,6 +79,7 @@ var _TM = { 'in {0}, {1}': 'in {0}, {1}', 'just now': '刚才', 'loading...': 'loading...', + 'member of "{0}"': 'member of "{0}"', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', 'showing {0} out of {1} commits': 'showing {0} out of {1} commits',