# HG changeset patch # User Marcin Kuzminski # Date 2017-06-28 19:57:07 # Node ID 8ea695397f2619ff98617dce54f557518e913017 # Parent ccef6e7d738a2a3c6da08842e3d29d920e1a3c6b i18n: Pulled translation from Transifex diff --git a/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-04-07 12:33+0200\n" -"PO-Revision-Date: 2017-04-07 10:34+0000\n" +"POT-Creation-Date: 2017-06-27 17:25+0200\n" +"PO-Revision-Date: 2017-06-27 15:26+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Belarusian (http://www.transifex.com/rhodecode/RhodeCode/language/be/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,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 "" @@ -38,7 +38,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 "" @@ -49,7 +49,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" @@ -76,7 +76,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 "" @@ -98,11 +98,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 "" @@ -114,249 +114,416 @@ 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 "" @@ -414,7 +581,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 "" @@ -444,7 +611,7 @@ msgstr "" msgid "Admin Groups" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:215 +#: rhodecode/authentication/plugins/auth_crowd.py:216 msgid "CROWD" msgstr "" @@ -494,126 +661,130 @@ 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 "" @@ -646,76 +817,73 @@ 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 " @@ -741,51 +909,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 "" @@ -793,41 +957,39 @@ 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 "" @@ -836,28 +998,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 "" @@ -866,84 +1006,60 @@ 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:437 +#: rhodecode/controllers/pullrequests.py:328 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/controllers/pullrequests.py:455 +#: 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:472 +#: rhodecode/controllers/pullrequests.py:363 msgid "Reload page" msgstr "" -#: rhodecode/controllers/pullrequests.py:546 +#: rhodecode/controllers/pullrequests.py:437 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 "" @@ -999,75 +1115,59 @@ 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" @@ -1076,7 +1176,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: 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" @@ -1085,7 +1185,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/controllers/admin/repo_groups.py:312 +#: rhodecode/controllers/admin/repo_groups.py:313 #, python-format msgid "Removed repository group %s" msgstr "" @@ -1095,366 +1195,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 "" @@ -1464,81 +1483,63 @@ msgid "" "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 "" @@ -1570,7 +1571,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 @@ -1581,8 +1582,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 @@ -1592,13 +1593,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 @@ -1607,13 +1608,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 @@ -1767,16 +1768,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 @@ -1812,11 +1812,11 @@ 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 " @@ -1824,172 +1824,172 @@ msgid "" "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 "" @@ -2015,20 +2015,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" @@ -2043,7 +2044,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" @@ -2085,7 +2100,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 "" @@ -2120,7 +2135,7 @@ msgstr "" #: 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/model/db.py:2482 msgid "Repository no access" msgstr "" @@ -2154,7 +2169,7 @@ msgstr "" #: 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/model/db.py:2483 msgid "Repository read access" msgstr "" @@ -2188,7 +2203,7 @@ msgstr "" #: 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/model/db.py:2484 msgid "Repository write access" msgstr "" @@ -2222,7 +2237,7 @@ msgstr "" #: 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/model/db.py:2485 msgid "Repository admin access" msgstr "" @@ -2296,7 +2311,7 @@ msgstr "" #: 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/model/db.py:2503 msgid "Repository creation disabled" msgstr "" @@ -2330,7 +2345,7 @@ msgstr "" #: 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/model/db.py:2504 msgid "Repository creation enabled" msgstr "" @@ -2364,7 +2379,7 @@ msgstr "" #: 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/model/db.py:2508 msgid "Repository forking disabled" msgstr "" @@ -2398,7 +2413,7 @@ msgstr "" #: 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/model/db.py:2509 msgid "Repository forking enabled" msgstr "" @@ -2453,7 +2468,7 @@ msgstr "" #: 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/model/db.py:3212 msgid "Not Reviewed" msgstr "" @@ -2487,7 +2502,7 @@ msgstr "" #: 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/model/db.py:3213 msgid "Approved" msgstr "" @@ -2521,7 +2536,7 @@ msgstr "" #: 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/model/db.py:3214 msgid "Rejected" msgstr "" @@ -2555,7 +2570,7 @@ msgstr "" #: 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/model/db.py:3215 msgid "Under Review" msgstr "" @@ -2586,7 +2601,7 @@ msgstr "" #: 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/model/db.py:2487 msgid "Repository group no access" msgstr "" @@ -2617,7 +2632,7 @@ msgstr "" #: 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/model/db.py:2488 msgid "Repository group read access" msgstr "" @@ -2648,7 +2663,7 @@ msgstr "" #: 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/model/db.py:2489 msgid "Repository group write access" msgstr "" @@ -2679,7 +2694,7 @@ msgstr "" #: 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/model/db.py:2490 msgid "Repository group admin access" msgstr "" @@ -2709,7 +2724,7 @@ msgstr "" #: 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/model/db.py:2492 msgid "User group no access" msgstr "" @@ -2739,7 +2754,7 @@ msgstr "" #: 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/model/db.py:2493 msgid "User group read access" msgstr "" @@ -2769,7 +2784,7 @@ msgstr "" #: 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/model/db.py:2494 msgid "User group write access" msgstr "" @@ -2799,7 +2814,7 @@ msgstr "" #: 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/model/db.py:2495 msgid "User group admin access" msgstr "" @@ -2829,7 +2844,7 @@ msgstr "" #: 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/model/db.py:2497 msgid "Repository Group creation disabled" msgstr "" @@ -2859,7 +2874,7 @@ msgstr "" #: 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/model/db.py:2498 msgid "Repository Group creation enabled" msgstr "" @@ -2889,7 +2904,7 @@ msgstr "" #: 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/model/db.py:2500 msgid "User Group creation disabled" msgstr "" @@ -2919,7 +2934,7 @@ msgstr "" #: 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/model/db.py:2501 msgid "User Group creation enabled" msgstr "" @@ -2949,7 +2964,7 @@ msgstr "" #: 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/model/db.py:2511 msgid "Registration disabled" msgstr "" @@ -2979,7 +2994,7 @@ msgstr "" #: 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/model/db.py:2512 msgid "User Registration with manual account activation" msgstr "" @@ -3009,7 +3024,7 @@ msgstr "" #: 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/model/db.py:2513 msgid "User Registration with automatic account activation" msgstr "" @@ -3039,7 +3054,7 @@ msgstr "" #: 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/model/permission.py:95 +#: rhodecode/model/db.py:2519 rhodecode/model/permission.py:95 msgid "Manual activation of external account" msgstr "" @@ -3069,7 +3084,7 @@ msgstr "" #: 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/model/permission.py:96 +#: rhodecode/model/db.py:2520 rhodecode/model/permission.py:96 msgid "Automatic activation of external account" msgstr "" @@ -3093,7 +3108,7 @@ msgstr "" #: 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/model/db.py:2505 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3118,7 +3133,7 @@ msgstr "" #: 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/model/db.py:2506 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3140,7 +3155,7 @@ msgstr "" #: 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/model/db.py:2480 msgid "RhodeCode Super Administrator" msgstr "" @@ -3159,7 +3174,7 @@ msgstr "" #: 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/model/db.py:2522 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3178,7 +3193,7 @@ msgstr "" #: 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/model/db.py:2523 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3188,7 +3203,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 "" @@ -3198,7 +3213,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 "" @@ -3208,7 +3223,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 "" @@ -3218,7 +3233,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 "" @@ -3228,7 +3243,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 "" @@ -3239,65 +3254,65 @@ msgstr "" #: 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/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/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/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/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 "" @@ -3383,7 +3398,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 "" @@ -3391,7 +3406,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 "" @@ -3399,10 +3414,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 "" @@ -3425,7 +3440,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 @@ -3435,9 +3450,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 "" @@ -3468,93 +3483,93 @@ 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 "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." -msgstr "" - -#: rhodecode/model/pull_request.py:124 +"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" @@ -3562,92 +3577,96 @@ 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 " @@ -3673,6 +3692,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" @@ -3782,98 +3802,113 @@ 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" @@ -3946,253 +3981,263 @@ 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 @@ -4201,28 +4246,28 @@ 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 " @@ -4231,14 +4276,14 @@ 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 ..." @@ -4246,105 +4291,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 "" @@ -4359,151 +4469,151 @@ 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 "" @@ -4585,7 +4695,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 @@ -4593,7 +4703,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 "" @@ -4608,7 +4718,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 @@ -4616,9 +4726,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 @@ -4626,9 +4737,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 "" @@ -4639,7 +4750,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 @@ -4662,13 +4773,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 "" @@ -4683,7 +4794,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 "" @@ -4708,14 +4819,14 @@ 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 "" @@ -4775,7 +4886,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 "" @@ -4785,7 +4896,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 "" @@ -4797,38 +4908,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] "" -msgstr[2] "" -msgstr[3] "" - -#: 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 @@ -4836,38 +4941,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 "" @@ -4910,8 +5022,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 @@ -4952,7 +5064,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 " @@ -5007,7 +5119,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 "" @@ -5018,9 +5130,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 @@ -5089,14 +5201,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 "" @@ -5157,12 +5268,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 "" @@ -5203,11 +5314,11 @@ 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:251 msgid "Settings" msgstr "" @@ -5310,7 +5421,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 "" @@ -5334,7 +5445,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 "" @@ -5351,7 +5462,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" @@ -5411,7 +5522,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 "" @@ -5430,9 +5541,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 @@ -5518,13 +5627,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 "" @@ -5542,7 +5651,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 "" @@ -5563,6 +5672,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 "" @@ -5625,23 +5738,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 "" @@ -5739,9 +5852,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 "" @@ -5802,26 +5915,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" @@ -5829,8 +5942,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 "" @@ -5840,7 +5953,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" @@ -5910,7 +6023,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." @@ -5921,7 +6034,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)" @@ -5941,7 +6053,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 "" @@ -5973,36 +6085,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 "" @@ -6037,95 +6149,86 @@ 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] "" -msgstr[2] "" -msgstr[3] "" - -#: 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 +#: 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." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 +"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 "" @@ -6133,48 +6236,45 @@ msgstr "" msgid "Invalidate Cache for Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Invalidate repository cache" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Confirm to invalidate repository cache" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:14 +#: 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:28 -#, python-format -msgid "List of repository caches (%(count)s entry)" -msgid_plural "List of repository caches (%(count)s entries)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:35 +#: 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: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 "" @@ -6250,20 +6350,29 @@ 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 "" @@ -6271,11 +6380,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 "" @@ -6283,57 +6392,91 @@ 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 @@ -6341,65 +6484,62 @@ 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" @@ -6466,32 +6606,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 @@ -7061,12 +7193,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 "" @@ -7103,46 +7235,39 @@ 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 "" @@ -7234,24 +7359,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 "" @@ -7265,7 +7394,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 "" @@ -7392,6 +7521,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" @@ -7401,12 +7535,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" @@ -7453,7 +7599,7 @@ msgstr "" msgid "Users administration" msgstr "" -#: rhodecode/templates/admin/users/users.mako:77 +#: rhodecode/templates/admin/users/users.mako:78 msgid "Auth type" msgstr "" @@ -7521,112 +7667,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] "" -msgstr[2] "" -msgstr[3] "" - -#: 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 @@ -7648,15 +7792,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 "" @@ -7763,10 +7907,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" @@ -7846,7 +7990,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 "" @@ -7957,93 +8101,105 @@ msgid "" "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 " @@ -8051,11 +8207,11 @@ msgid "" "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." @@ -8075,10 +8231,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 "" @@ -8097,10 +8253,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 "" @@ -8140,19 +8296,19 @@ msgstr[2] "" msgstr[3] "" #: 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 "" @@ -8169,7 +8325,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" @@ -8177,44 +8333,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 "" @@ -8222,100 +8400,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" @@ -8325,8 +8481,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: 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" @@ -8336,19 +8492,19 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: 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 "" @@ -8374,73 +8530,81 @@ 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 @@ -8481,7 +8645,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" @@ -8492,7 +8656,7 @@ msgstr[3] "" #: 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" @@ -8672,12 +8836,12 @@ 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" @@ -8686,8 +8850,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: 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] "" @@ -8695,7 +8859,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/compare/compare_commits.mako:74 +#: rhodecode/templates/compare/compare_commits.mako:75 msgid "No commits in this compare" msgstr "" @@ -8735,6 +8899,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 "" @@ -8950,6 +9115,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" @@ -9071,6 +9240,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 "" @@ -9146,8 +9316,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" @@ -9173,7 +9341,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 "" @@ -9246,6 +9414,7 @@ msgid "Remove Custom Path" msgstr "" #: rhodecode/templates/files/files_add.mako:50 +#: rhodecode/templates/files/files_add.mako:59 msgid "Filename" msgstr "" @@ -9253,34 +9422,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 "" @@ -9301,6 +9470,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 "" @@ -9413,7 +9587,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] "" @@ -9479,6 +9652,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 "" @@ -9516,6 +9693,15 @@ msgstr "" msgid "Filter" msgstr "" +#: rhodecode/templates/journal/journal.mako:14 +#, python-format +msgid "%s entry" +msgid_plural "%s entries" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #: rhodecode/templates/journal/journal.mako:23 msgid "ATOM journal feed" msgstr "" @@ -9546,47 +9732,57 @@ 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] "" @@ -9594,19 +9790,19 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: 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 "" @@ -9654,10 +9850,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 "" @@ -9760,77 +9952,77 @@ 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 "" @@ -9920,6 +10112,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 "" @@ -9951,42 +10148,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] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/summary/components.mako:12 -#, python-format -msgid "%(num)s Closed Branch" -msgid_plural "%(num)s Closed Branches" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/summary/components.mako:19 -#, python-format -msgid "%(num)s Tag" -msgid_plural "%(num)s Tags" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/summary/components.mako:26 -#, python-format -msgid "%(num)s Bookmark" -msgid_plural "%(num)s Bookmarks" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: rhodecode/templates/summary/components.mako:49 msgid "Read-only url" msgstr "" @@ -10067,6 +10228,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/i18n/de/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-04-07 12:33+0200\n" -"PO-Revision-Date: 2017-04-07 10:34+0000\n" +"POT-Creation-Date: 2017-06-27 17:25+0200\n" +"PO-Revision-Date: 2017-06-27 15:26+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: German (http://www.transifex.com/rhodecode/RhodeCode/language/de/)\n" "MIME-Version: 1.0\n" @@ -28,7 +28,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 "" @@ -41,7 +41,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 "" @@ -52,7 +52,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" @@ -79,7 +79,7 @@ msgstr "Volltextsuche" #: 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 "" @@ -101,11 +101,11 @@ msgstr "Open Source Lizenzen" 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 "" @@ -117,249 +117,416 @@ msgstr "Apache-Konfiguration für Subversion erzeugt." msgid "Failed to generate the Apache configuration for Subversion." msgstr "Apache-Konfiguration für Subversion konnte nicht erzeugt werden." -#: 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 "Update Informationen" -#: rhodecode/apps/admin/views/system_info.py:100 +#: rhodecode/apps/admin/views/system_info.py:104 msgid "Check for updates" msgstr "Nach Updates suchen" -#: rhodecode/apps/admin/views/system_info.py:105 +#: rhodecode/apps/admin/views/system_info.py:109 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 Konfiguration" - -#: rhodecode/apps/admin/views/system_info.py:109 -msgid "Workers" -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 Konfiguration" + +#: rhodecode/apps/admin/views/system_info.py:113 +msgid "RhodeCode Certificate" msgstr "" #: rhodecode/apps/admin/views/system_info.py:114 -msgid "Database" -msgstr "Datenbank" +msgid "Workers" +msgstr "" #: rhodecode/apps/admin/views/system_info.py:115 -msgid "Database version" -msgstr "Datenbank Version" +msgid "Worker Type" +msgstr "" #: rhodecode/apps/admin/views/system_info.py:119 -msgid "Platform" -msgstr "Plattform" +msgid "Database" +msgstr "Datenbank" #: rhodecode/apps/admin/views/system_info.py:120 +msgid "Database version" +msgstr "Datenbank Version" + +#: rhodecode/apps/admin/views/system_info.py:124 +msgid "Platform" +msgstr "Plattform" + +#: rhodecode/apps/admin/views/system_info.py:125 msgid "Platform UUID" msgstr "Plattform UUID" -#: rhodecode/apps/admin/views/system_info.py:121 +#: rhodecode/apps/admin/views/system_info.py:126 msgid "Python version" msgstr "Python Version" -#: rhodecode/apps/admin/views/system_info.py:122 +#: rhodecode/apps/admin/views/system_info.py:127 msgid "Python path" msgstr "Python Pfad" -#: rhodecode/apps/admin/views/system_info.py:126 +#: rhodecode/apps/admin/views/system_info.py:131 msgid "CPU" msgstr "CPU" -#: rhodecode/apps/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:132 msgid "Load" msgstr "Auslastung" -#: rhodecode/apps/admin/views/system_info.py:128 +#: rhodecode/apps/admin/views/system_info.py:133 msgid "Memory" msgstr "Speicher" -#: rhodecode/apps/admin/views/system_info.py:129 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Uptime" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Storage location" msgstr "Ablageort" -#: rhodecode/apps/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:139 msgid "Storage info" msgstr "Information zur Ablage" -#: rhodecode/apps/admin/views/system_info.py:135 +#: rhodecode/apps/admin/views/system_info.py:140 msgid "Storage inodes" msgstr "Inodes der Ablage " -#: rhodecode/apps/admin/views/system_info.py:137 +#: rhodecode/apps/admin/views/system_info.py:142 msgid "Gist storage location" msgstr "Gist Ablageort" -#: rhodecode/apps/admin/views/system_info.py:138 +#: rhodecode/apps/admin/views/system_info.py:143 msgid "Gist storage info" msgstr "Information zur Gist Ablage" -#: rhodecode/apps/admin/views/system_info.py:140 +#: rhodecode/apps/admin/views/system_info.py:145 msgid "Archive cache storage location" msgstr "Archivcache-Ablageort" -#: rhodecode/apps/admin/views/system_info.py:141 +#: rhodecode/apps/admin/views/system_info.py:146 msgid "Archive cache info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:143 +#: rhodecode/apps/admin/views/system_info.py:148 msgid "Temp storage location" msgstr "Temporärer Ablageort" -#: rhodecode/apps/admin/views/system_info.py:144 +#: rhodecode/apps/admin/views/system_info.py:149 msgid "Temp storage info" msgstr "Information zur temporären Ablage" -#: rhodecode/apps/admin/views/system_info.py:146 +#: rhodecode/apps/admin/views/system_info.py:151 msgid "Search info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:147 -msgid "Search location" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:151 -msgid "VCS Backends" -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 "Sie können diesen Benutzer nicht editieren" -#: rhodecode/apps/admin/views/users.py:178 -#: rhodecode/apps/my_account/views.py:138 +#: rhodecode/apps/admin/views/users.py:168 +#: rhodecode/apps/my_account/views.py:148 #: rhodecode/controllers/admin/gists.py:62 msgid "forever" msgstr "für immer" -#: rhodecode/apps/admin/views/users.py:179 -#: rhodecode/apps/my_account/views.py:139 +#: rhodecode/apps/admin/views/users.py:169 +#: rhodecode/apps/my_account/views.py:149 #: rhodecode/controllers/admin/gists.py:63 msgid "5 minutes" msgstr "5 Minuten" -#: rhodecode/apps/admin/views/users.py:180 -#: rhodecode/apps/my_account/views.py:140 +#: rhodecode/apps/admin/views/users.py:170 +#: rhodecode/apps/my_account/views.py:150 #: rhodecode/controllers/admin/gists.py:64 msgid "1 hour" msgstr "1 Stunde" -#: rhodecode/apps/admin/views/users.py:181 -#: rhodecode/apps/my_account/views.py:141 +#: rhodecode/apps/admin/views/users.py:171 +#: rhodecode/apps/my_account/views.py:151 #: rhodecode/controllers/admin/gists.py:65 msgid "1 day" msgstr "1 Tag" -#: rhodecode/apps/admin/views/users.py:182 -#: rhodecode/apps/my_account/views.py:142 +#: rhodecode/apps/admin/views/users.py:172 +#: rhodecode/apps/my_account/views.py:152 #: rhodecode/controllers/admin/gists.py:66 msgid "1 month" msgstr "1 Monat" -#: rhodecode/apps/admin/views/users.py:184 -#: rhodecode/apps/my_account/views.py:144 +#: rhodecode/apps/admin/views/users.py:174 +#: rhodecode/apps/my_account/views.py:154 #: rhodecode/controllers/admin/gists.py:70 msgid "Lifetime" msgstr "Lebensdauer" -#: rhodecode/apps/admin/views/users.py:188 -#: rhodecode/apps/my_account/views.py:148 +#: rhodecode/apps/admin/views/users.py:178 +#: 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 "Rolle" -#: 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 "Authentifizierungstoken erfolgreich erstellt" -#: 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 "Authentifizierungstoken erfolgreich gelöscht" -#: 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 "Neue E-Mail-Adresse `%s` zu Benutzerkonto hinzugefügt." + +#: rhodecode/apps/admin/views/users.py:296 +#: rhodecode/apps/my_account/views.py:259 +msgid "An error occurred during email saving" +msgstr "Währen der Speicherung der E-Mail-Adresse trat ein Fehler auf" + +#: rhodecode/apps/admin/views/users.py:323 +msgid "Removed email address from user account" +msgstr "E-Mail-Adresse von Benutzerkonto entfernt" + +#: rhodecode/apps/admin/views/users.py:372 +#, python-format +msgid "An error occurred during ip saving:%s" +msgstr "Fehler beim Speichern der IP-Adresse aufgetreten: %s" + +#: rhodecode/apps/admin/views/users.py:389 +msgid "An error occurred during ip saving" +msgstr "Fehler beim Speichern der IP-Adresse aufgetreten" + +#: rhodecode/apps/admin/views/users.py:393 +#, python-format +msgid "Added ips %s to user whitelist" +msgstr "IP-Adressen %s zur Whitelist des Benutzers hinzugefügt" + +#: rhodecode/apps/admin/views/users.py:423 +msgid "Removed ip address from user whitelist" +msgstr "IP-Adressen von der Whitelist des Benutzers entfernt" + +#: 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 "Repositories" + +#: rhodecode/apps/home/views.py:223 +msgid "Groups" +msgstr "Gruppen" + +#: 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 "Du hast dich erfolgreich bei RhodeCode angemeldet" -#: 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 "Ihr Passwort wurde zurückgesetzt, ein neues Passwort wurde and ihre E-Mail Adresse gesendet" -#: rhodecode/apps/my_account/views.py:115 +#: rhodecode/apps/my_account/views.py:125 msgid "Error occurred during update of user password" msgstr "Fehler bei der Aktualisierung des Benutzerpassworts aufgetreten" -#: rhodecode/apps/my_account/views.py:122 +#: rhodecode/apps/my_account/views.py:132 msgid "Successfully updated password" msgstr "Passwort erfolgreich aktualisiert" +#: 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 "Cache erfolgreich invalidiert" + +#: rhodecode/apps/repository/views/repo_caches.py:74 +msgid "An error occurred during cache invalidation" +msgstr "Währen der Cache Invalidierung trat ein Fehler auf" + +#: rhodecode/apps/repository/views/repo_permissions.py:95 +msgid "Repository permissions updated" +msgstr "Repository Berechtigungen aktualisiert" + +#: 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 "%s Forks abgetrennt" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:96 +#, python-format +msgid "Deleted %s forks" +msgstr "%s Forks gelöscht" + +#: 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 "Sichtbarkeit des Repositorys im öffentlichen Logbuch aktualisiert" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:156 +msgid "An error occurred during setting this repository in public journal" +msgstr "Es trat ein Fehler während der Aktualisierung der Sicherbarkeit dieses Repositorys im Öffentlichen Logbuch auf" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:184 +msgid "Nothing" +msgstr "Nichts" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:186 +#, python-format +msgid "Marked repo %s as fork of %s" +msgstr "Markiere Repository %s als Abzweig von Repository %s" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 +msgid "An error occurred during this operation" +msgstr "Während dieser operation trat ein Fehler auf" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:217 +msgid "Locked repository" +msgstr "Gesperrtes Respository" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:220 +msgid "Unlocked repository" +msgstr "Entsperrtes Repository" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:223 +#: rhodecode/controllers/admin/repos.py:363 +msgid "An error occurred during unlocking" +msgstr "Fehler beim Entsperren des Repositorys aufgetreten" + +#: rhodecode/apps/repository/views/repo_summary.py:293 +msgid "Branch" +msgstr "Branch" + +#: rhodecode/apps/repository/views/repo_summary.py:294 +msgid "Tag" +msgstr "Tag" + +#: rhodecode/apps/repository/views/repo_summary.py:295 +msgid "Bookmark" +msgstr "Lesezeichen" + +#: 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 "Entwicklungszweige" + +#: rhodecode/apps/repository/views/repo_summary.py:319 +msgid "Closed branches" +msgstr "Geschlossene Branches" + #: rhodecode/apps/svn_support/events.py:30 msgid "Configuration for Apaache mad_dav_svn changed." msgstr "" @@ -417,7 +584,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 "" @@ -447,7 +614,7 @@ msgstr "" msgid "Admin Groups" msgstr "Administratorengruppen" -#: rhodecode/authentication/plugins/auth_crowd.py:215 +#: rhodecode/authentication/plugins/auth_crowd.py:216 msgid "CROWD" msgstr "" @@ -497,126 +664,130 @@ 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 "LDAP Host" -#: 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 "Konto" -#: 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 "Passwort" -#: rhodecode/authentication/plugins/auth_ldap.py:108 +#: rhodecode/authentication/plugins/auth_ldap.py:110 msgid "TLS Type" msgstr "TLS Typ" -#: 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 "" @@ -649,76 +820,73 @@ 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 "Es sind noch keine Commits vorhanden" -#: rhodecode/controllers/changeset.py:77 +#: rhodecode/controllers/changeset.py:76 msgid "Show whitespace" msgstr "Zeige Leerzeichen" -#: rhodecode/controllers/changeset.py:78 +#: rhodecode/controllers/changeset.py:77 msgid "Show whitespace for all diffs" msgstr "" +#: rhodecode/controllers/changeset.py:83 +msgid "Ignore whitespace" +msgstr "Ignoriere Leerzeichen" + #: rhodecode/controllers/changeset.py:84 -msgid "Ignore whitespace" -msgstr "Ignoriere Leerzeichen" - -#: 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 "Status Änderung %(transition_icon)s %(status)s" -#: 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 " @@ -744,51 +912,47 @@ msgstr "Klicke hier, um eine neue Datei hinzuzufügen." msgid "There are no files yet. %s" msgstr "Es sind noch keine Dateien vorhanden. %s" -#: 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 "Das Repository ist vom %s seit %s gesperrt" -#: 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 "Du kannst Dateien nur dann löschen, wenn die Revision ein gültiger Branch ist" -#: rhodecode/controllers/files.py:452 rhodecode/controllers/files.py:505 -#, python-format -msgid "Deleted file %s via RhodeCode Enterprise" -msgstr "Datei %s wurde über RhodeCode Enterprise gelöscht." +#: 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 "Datei %s erfolgreich gelöscht" - -#: 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 "Während des Committens trat ein Fehler auf" -#: 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 "Du kannst Dateien nur dann bearbeiten, wenn die Revision ein gültiger Branch ist" -#: rhodecode/controllers/files.py:539 rhodecode/controllers/files.py:614 -#, python-format -msgid "Edited file %s via RhodeCode Enterprise" -msgstr "Datei %s wurde über RhodeCode Enterprise editiert." - -#: 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 "Keine Änderungen" -#: rhodecode/controllers/files.py:578 rhodecode/controllers/files.py:707 -#, python-format -msgid "Successfully committed to %s" -msgstr "Der Commit zu %s war erfolgreich" - -#: 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 "Eine Datei wurde über RhodeCode Enterprise hinzugefügt." @@ -796,41 +960,39 @@ msgstr "Eine Datei wurde über RhodeCode Enterprise hinzugefügt." msgid "No filename" msgstr "Kein Dateiname" +#: 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 "Die spezifizierte Adresse muss ein gültiger Pfad sein und .. darf nicht teil des Pfades sein" -#: rhodecode/controllers/files.py:764 +#: rhodecode/controllers/files.py:763 msgid "Downloads disabled" msgstr "Downloads deaktiviert" -#: rhodecode/controllers/files.py:770 +#: rhodecode/controllers/files.py:769 #, python-format msgid "Unknown revision %s" msgstr "Unbekannte Revision %s" -#: rhodecode/controllers/files.py:772 +#: rhodecode/controllers/files.py:771 msgid "Empty repository" msgstr "Leeres Repository" -#: 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 "Unbekannter Archiv Typ" -#: rhodecode/controllers/files.py:993 +#: rhodecode/controllers/files.py:1000 msgid "Changesets" msgstr "Changesets" -#: 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 "Entwicklungszweige" - -#: 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 "Tags" @@ -839,28 +1001,6 @@ msgstr "Tags" msgid "An error occurred during repository forking %s" msgstr "Währen des Forken des Repositorys trat ein Fehler auf: %s" -#: rhodecode/controllers/home.py:207 -msgid "Groups" -msgstr "Gruppen" - -#: 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 "Repositories" - -#: 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 "Öffentliches Journal" @@ -869,84 +1009,60 @@ msgstr "Öffentliches Journal" msgid "journal" msgstr "Logbuch" -#: rhodecode/controllers/pullrequests.py:218 +#: rhodecode/controllers/pullrequests.py:99 msgid "Commit does not exist" msgstr "Commit existiert nicht" -#: rhodecode/controllers/pullrequests.py:335 +#: rhodecode/controllers/pullrequests.py:216 msgid "Pull request requires a title with min. 3 chars" msgstr "Der Titel eines Pullrequests muss mindestens aus 3 Zeichen bestehen" -#: 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 "Es wurde erfolgreich ein neuer Pullrequest eröffnet" -#: rhodecode/controllers/pullrequests.py:388 -msgid "Error occurred during sending pull request" -msgstr "Es trat ein Fehler auf während der Pullrequest gesendet wurde" - -#: 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 "Geschlossener Pullrequest kann nicht aktualisiert werden." -#: rhodecode/controllers/pullrequests.py:437 +#: rhodecode/controllers/pullrequests.py:328 msgid "Pull request title & description updated." msgstr "Pullrequest Überschrift und Beschreibung aktualisiert." -#: rhodecode/controllers/pullrequests.py:455 +#: 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:472 +#: rhodecode/controllers/pullrequests.py:363 msgid "Reload page" msgstr "Seite neu laden" -#: rhodecode/controllers/pullrequests.py:546 +#: rhodecode/controllers/pullrequests.py:437 msgid "Pull request was successfully merged and closed." msgstr "Pullrequest wurde erfolgreich zusammengeführt und geschlossen." -#: 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 "Pullrequest erfolgreich gelöscht" -#: 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 "Schließen mit" - -#: 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 "Ein Pullrequest kann nur in den Stati rejected oder approved geschlossen werden. Berechneter Status aus den Reviews ist: %s" - -#: rhodecode/controllers/summary.py:251 -msgid "Branch" -msgstr "Branch" - -#: rhodecode/controllers/summary.py:252 -msgid "Tag" -msgstr "Tag" - -#: rhodecode/controllers/summary.py:253 -msgid "Bookmark" -msgstr "Lesezeichen" - -#: rhodecode/controllers/summary.py:278 -msgid "Closed branches" -msgstr "Geschlossene Branches" - #: rhodecode/controllers/admin/defaults.py:84 msgid "Default settings updated successfully" msgstr "Standardeinstellungen erfolgreich aktualisiert" @@ -1002,89 +1118,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 "Sie können diesen Benutzer nicht editieren, da er für die ganze Applikation von entscheidender bedeutung ist." -#: rhodecode/controllers/admin/my_account.py:138 +#: rhodecode/controllers/admin/my_account.py:110 msgid "Your account was updated successfully" msgstr "Ihr Account wurde erfolgreich aktualisiert" -#: 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 "Fehler bei der Aktualisierung des Benutzers %s" -#: 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 "Neue E-Mail-Adresse `%s` zu Benutzerkonto hinzugefügt." - -#: rhodecode/controllers/admin/my_account.py:229 -#: rhodecode/controllers/admin/users.py:534 -msgid "An error occurred during email saving" -msgstr "Währen der Speicherung der E-Mail-Adresse trat ein Fehler auf" - -#: rhodecode/controllers/admin/my_account.py:239 -#: rhodecode/controllers/admin/users.py:549 -msgid "Removed email address from user account" -msgstr "E-Mail-Adresse von Benutzerkonto entfernt" - -#: rhodecode/controllers/admin/permissions.py:112 +#: rhodecode/controllers/admin/permissions.py:107 msgid "Application permissions updated successfully" msgstr "Anwendungs-Berechtigungen erfolgreich aktualisiert" -#: 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 "Fehler bei der Aktualisierung der Berechtigungen aufgetreten" -#: rhodecode/controllers/admin/permissions.py:161 +#: rhodecode/controllers/admin/permissions.py:156 msgid "Object permissions updated successfully" msgstr "Objekt-Berechtigungen erfolgreich aktualisiert" -#: rhodecode/controllers/admin/permissions.py:215 +#: rhodecode/controllers/admin/permissions.py:210 msgid "Global permissions updated successfully" msgstr "Globale Berechtigungen erfolgreich aktualisiert" -#: rhodecode/controllers/admin/repo_groups.py:197 +#: rhodecode/controllers/admin/repo_groups.py:202 #, python-format msgid "Created repository group %s" msgstr "Repository-Gruppe %s erstellt" -#: 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 "Fehler bei der Erstellung der Repository-Gruppe %s" -#: rhodecode/controllers/admin/repo_groups.py:258 +#: rhodecode/controllers/admin/repo_groups.py:261 #, python-format msgid "Updated repository group %s" msgstr "Repository-Gruppe %s aktualisiert" -#: 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 "Fehler bei der Aktualisierung der Repository-Gruppe %s aufgetreten" -#: 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] "Diese Gruppe enthält %(num)d Repository und kann nicht gelöscht werden" msgstr[1] "Diese Gruppe enthält %(num)d Repositories und kann nicht gelöscht werden" -#: 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] "Diese Gruppe enthält %(num)d Untergruppe und kann nicht gelöscht werden" msgstr[1] "Diese Gruppe enthält %(num)d Untergruppen und kann nicht gelöscht werden" -#: rhodecode/controllers/admin/repo_groups.py:312 +#: rhodecode/controllers/admin/repo_groups.py:313 #, python-format msgid "Removed repository group %s" msgstr "Repository-Gruppe %s gelöscht" @@ -1094,366 +1194,285 @@ msgstr "Repository-Gruppe %s gelöscht" msgid "Error occurred during deletion of repository group %s" msgstr "Fehler beim Löschen der Repository-Gruppe %s aufgetreten" -#: 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 "Es ist nicht möglich als Administrator die eigenen Berechtigungen zu ändern" -#: rhodecode/controllers/admin/repo_groups.py:405 +#: rhodecode/controllers/admin/repo_groups.py:404 msgid "Repository Group permissions updated" msgstr "Berechtigungen der Repository-Gruppe aktualisiert" -#: rhodecode/controllers/admin/repos.py:129 +#: rhodecode/controllers/admin/repos.py:125 #, python-format msgid "Error creating repository %s: invalid certificate" msgstr "Fehler beim Erstellen des Repositorys %s: Ungültiges Zertifikat" -#: rhodecode/controllers/admin/repos.py:133 +#: rhodecode/controllers/admin/repos.py:129 #, python-format msgid "Error creating repository %s" msgstr "Fehler beim Erstellen des Repositorys %s" -#: rhodecode/controllers/admin/repos.py:274 +#: rhodecode/controllers/admin/repos.py:270 #, python-format msgid "Created repository %s from %s" msgstr "Repository %s von %s erstellt" -#: rhodecode/controllers/admin/repos.py:283 +#: rhodecode/controllers/admin/repos.py:279 #, python-format msgid "Forked repository %s as %s" msgstr "Repository %s als %s geforkt" -#: rhodecode/controllers/admin/repos.py:286 +#: rhodecode/controllers/admin/repos.py:282 #, python-format msgid "Created repository %s" msgstr "Repository %s erstellt" -#: rhodecode/controllers/admin/repos.py:327 -#, python-format -msgid "Repository %s updated successfully" -msgstr "Repository %s wurde erfolgreich aktualisiert" - -#: rhodecode/controllers/admin/repos.py:346 -#, python-format -msgid "Error occurred during update of repository %s" -msgstr "Fehler bei der Aktualisierung des Repositorys %s aufgetreten" - -#: rhodecode/controllers/admin/repos.py:374 -#, python-format -msgid "Detached %s forks" -msgstr "%s Forks abgetrennt" - -#: rhodecode/controllers/admin/repos.py:377 -#, python-format -msgid "Deleted %s forks" -msgstr "%s Forks gelöscht" - -#: rhodecode/controllers/admin/repos.py:382 -#, python-format -msgid "Deleted repository %s" -msgstr "Repository %s gelöscht" - -#: rhodecode/controllers/admin/repos.py:385 -#, python-format -msgid "Cannot delete %s it still contains attached forks" -msgstr "%s konnte nicht gelöscht werden da es noch Forks enthält" - -#: rhodecode/controllers/admin/repos.py:390 -#, python-format -msgid "An error occurred during deletion of %s" -msgstr "Fehler beim Löschen von %s aufgetreten" - -#: rhodecode/controllers/admin/repos.py:443 -msgid "Repository permissions updated" -msgstr "Repository Berechtigungen aktualisiert" - -#: rhodecode/controllers/admin/repos.py:474 +#: rhodecode/controllers/admin/repos.py:319 msgid "An error occurred during creation of field" msgstr "Fehler bei der Erstellung des Feldes aufgetreten" -#: rhodecode/controllers/admin/repos.py:489 +#: rhodecode/controllers/admin/repos.py:334 msgid "An error occurred during removal of field" msgstr "Fehler beim Löschen des Feldes aufgetreten" -#: rhodecode/controllers/admin/repos.py:528 -msgid "Updated repository visibility in public journal" -msgstr "Sichtbarkeit des Repositorys im öffentlichen Logbuch aktualisiert" - -#: rhodecode/controllers/admin/repos.py:532 -msgid "An error occurred during setting this repository in public journal" -msgstr "Es trat ein Fehler während der Aktualisierung der Sicherbarkeit dieses Repositorys im Öffentlichen Logbuch auf" - -#: rhodecode/controllers/admin/repos.py:556 -msgid "Nothing" -msgstr "Nichts" - -#: rhodecode/controllers/admin/repos.py:558 -#, python-format -msgid "Marked repo %s as fork of %s" -msgstr "Markiere Repository %s als Abzweig von Repository %s" - -#: rhodecode/controllers/admin/repos.py:565 -msgid "An error occurred during this operation" -msgstr "Während dieser operation trat ein Fehler auf" - -#: rhodecode/controllers/admin/repos.py:583 -msgid "Locked repository" -msgstr "Gesperrtes Respository" - -#: rhodecode/controllers/admin/repos.py:586 -msgid "Unlocked repository" -msgstr "Entsperrtes Repository" - -#: rhodecode/controllers/admin/repos.py:589 -#: rhodecode/controllers/admin/repos.py:618 -msgid "An error occurred during unlocking" -msgstr "Fehler beim Entsperren des Repositorys aufgetreten" - -#: rhodecode/controllers/admin/repos.py:608 +#: rhodecode/controllers/admin/repos.py:353 msgid "Unlocked" msgstr "Entsperrt" -#: rhodecode/controllers/admin/repos.py:612 +#: rhodecode/controllers/admin/repos.py:357 msgid "Locked" msgstr "Gesperrt" -#: rhodecode/controllers/admin/repos.py:614 +#: rhodecode/controllers/admin/repos.py:359 #, python-format msgid "Repository has been %s" msgstr "Repository wurde %s" -#: rhodecode/controllers/admin/repos.py:629 -msgid "Cache invalidation successful" -msgstr "Cache erfolgreich invalidiert" - -#: rhodecode/controllers/admin/repos.py:633 -msgid "An error occurred during cache invalidation" -msgstr "Währen der Cache Invalidierung trat ein Fehler auf" - -#: rhodecode/controllers/admin/repos.py:653 +#: rhodecode/controllers/admin/repos.py:373 msgid "Pulled from remote location" msgstr "Von entferntem Ort übertragen" -#: rhodecode/controllers/admin/repos.py:656 +#: rhodecode/controllers/admin/repos.py:376 msgid "An error occurred during pull from remote location" msgstr "Fehler während des Abrufens vom remote Speicherplatz aufgetreten" -#: rhodecode/controllers/admin/repos.py:678 +#: rhodecode/controllers/admin/repos.py:397 msgid "An error occurred during deletion of repository stats" msgstr "Fehler während des Löschens der Repository-Statistik aufgetreten" -#: rhodecode/controllers/admin/repos.py:725 +#: rhodecode/controllers/admin/repos.py:443 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 "Ein Eintrag wurde aus dem Issue Tracker gelöscht." -#: 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 "Einige Eingabefelder enthalten ungültige Daten." -#: 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 "VCS-Einstellungen aktualisiert" #: 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 "Fehler während der Aktualisierung der Applikations-Einstellungen aufgetreten" -#: rhodecode/controllers/admin/settings.py:223 +#: rhodecode/controllers/admin/settings.py:226 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "Repositories erfolgreich gescannt, hinzugefügt: %s; entfernt: %s" -#: rhodecode/controllers/admin/settings.py:279 +#: rhodecode/controllers/admin/settings.py:282 msgid "Updated application settings" msgstr "Applikations-Einstellungen aktualisiert" -#: rhodecode/controllers/admin/settings.py:345 -msgid "Updated visualisation settings" -msgstr "Visualisierungs-Einstellungen aktualisiert" - #: rhodecode/controllers/admin/settings.py:348 +msgid "Updated visualisation settings" +msgstr "Visualisierungs-Einstellungen aktualisiert" + +#: rhodecode/controllers/admin/settings.py:351 msgid "Error occurred during updating visualisation settings" msgstr "Fehler bei der Aktualisierung der Visualisierungs-Einstellungen" -#: rhodecode/controllers/admin/settings.py:441 +#: rhodecode/controllers/admin/settings.py:444 msgid "Please enter email address" msgstr "Bitte E-Mail-Adresse eingeben" -#: rhodecode/controllers/admin/settings.py:459 +#: rhodecode/controllers/admin/settings.py:462 msgid "Send email task created" msgstr "Aufgabe zum Senden der E-Mail erstellt" -#: rhodecode/controllers/admin/settings.py:492 +#: rhodecode/controllers/admin/settings.py:495 msgid "Added new hook" msgstr "Neuer Hook hinzugefügt" -#: rhodecode/controllers/admin/settings.py:507 +#: rhodecode/controllers/admin/settings.py:510 msgid "Updated hooks" msgstr "Die Hooks wurden aktutalisiert" -#: 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 "Fehler bei der Aktualisierung der Labs-Einstellungen aufgetreten" -#: rhodecode/controllers/admin/settings.py:645 +#: rhodecode/controllers/admin/settings.py:648 msgid "Updated Labs settings" msgstr "Labs-Einstellungen aktualisiert" -#: 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 "Benutzergruppe %(user_group_link)s erstellt" -#: 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 "Fehler bei der Erstellung der Benutzergruppe %s aufgetreten" -#: rhodecode/controllers/admin/user_groups.py:220 +#: rhodecode/controllers/admin/user_groups.py:218 #, python-format msgid "Updated user group %s" msgstr "Benutzergruppe %s aktualisiert" -#: 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 "Fehler bei der Aktualisierung des Benutzers %s aufgetreten" -#: rhodecode/controllers/admin/user_groups.py:258 +#: rhodecode/controllers/admin/user_groups.py:253 msgid "Successfully deleted user group" msgstr "Benutzergruppe erfolgreich gelöscht" -#: rhodecode/controllers/admin/user_groups.py:263 +#: rhodecode/controllers/admin/user_groups.py:258 msgid "An error occurred during deletion of user group" msgstr "Fehler beim Löschen der Benutzergruppe aufgetreten" -#: rhodecode/controllers/admin/user_groups.py:331 +#: rhodecode/controllers/admin/user_groups.py:326 msgid "Target group cannot be the same" msgstr "Zielgruppe kann nicht die gleiche sein" -#: rhodecode/controllers/admin/user_groups.py:337 +#: rhodecode/controllers/admin/user_groups.py:332 msgid "User Group permissions updated" msgstr "Berechtigungen der Benutzergruppe aktualisiert" -#: rhodecode/controllers/admin/user_groups.py:422 +#: rhodecode/controllers/admin/user_groups.py:415 msgid "User Group global permissions updated successfully" msgstr "Globale Berechtigungen der Benutzergruppe aktualisiert" -#: 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 "Fehler beim Speichern der Berechtigungen aufgetreten" -#: 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 "Benutzer %(user_link)s erstellt" -#: rhodecode/controllers/admin/users.py:122 +#: rhodecode/controllers/admin/users.py:124 #, python-format msgid "Error occurred during creation of user %s" msgstr "Fehler beim Erstellen des Benutzers %s aufgetreten" -#: rhodecode/controllers/admin/users.py:167 +#: rhodecode/controllers/admin/users.py:166 msgid "User updated successfully" msgstr "Der Benutzer wurde erfolgreich aktualisiert" -#: rhodecode/controllers/admin/users.py:218 +#: rhodecode/controllers/admin/users.py:209 #, python-format msgid "Detached %s repositories" msgstr "%s Repositories abgetrennt" -#: rhodecode/controllers/admin/users.py:223 +#: rhodecode/controllers/admin/users.py:214 #, python-format msgid "Deleted %s repositories" msgstr "%s Repositories gelöscht" -#: rhodecode/controllers/admin/users.py:231 +#: rhodecode/controllers/admin/users.py:222 #, python-format msgid "Detached %s repository groups" msgstr "%s Repository-Gruppen abgetrennt" -#: rhodecode/controllers/admin/users.py:236 +#: rhodecode/controllers/admin/users.py:227 #, python-format msgid "Deleted %s repository groups" msgstr "%s Repository-Gruppen gelöscht" -#: rhodecode/controllers/admin/users.py:244 +#: rhodecode/controllers/admin/users.py:235 #, python-format msgid "Detached %s user groups" msgstr "%s Benutzergruppen abgetrennt" -#: rhodecode/controllers/admin/users.py:249 +#: rhodecode/controllers/admin/users.py:240 #, python-format msgid "Deleted %s user groups" msgstr "%s Benutzergruppen gelöscht" -#: rhodecode/controllers/admin/users.py:260 +#: rhodecode/controllers/admin/users.py:257 msgid "Successfully deleted user" msgstr "Benutzer erfolgreich gelöscht" -#: rhodecode/controllers/admin/users.py:266 +#: rhodecode/controllers/admin/users.py:263 msgid "An error occurred during deletion of user" msgstr "Während der Löschen des Benutzers trat ein Fehler auf" -#: rhodecode/controllers/admin/users.py:285 +#: rhodecode/controllers/admin/users.py:280 msgid "Force password change disabled for user" msgstr "Erzwungene Passwortänderung inaktiv für Benutzer" -#: rhodecode/controllers/admin/users.py:287 +#: rhodecode/controllers/admin/users.py:285 msgid "Force password change enabled for user" msgstr "Erzwungene Passwortänderung aktiv für Benutzer" -#: rhodecode/controllers/admin/users.py:291 +#: rhodecode/controllers/admin/users.py:294 msgid "An error occurred during password reset for user" msgstr "Fehler beim Zurücksetzen des Passworts für den Benutzer aufgetreten" -#: 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 "Repository-Gruppe %s erstellt" -#: 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 "Fehler bei der Erstellung der Repository-Gruppe aufgetreten" @@ -1463,81 +1482,63 @@ msgid "" "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 "Globale Berechtigungen des Benutzers erfolgreich aktualisiert" -#: rhodecode/controllers/admin/users.py:589 -#, python-format -msgid "An error occurred during ip saving:%s" -msgstr "Fehler beim Speichern der IP-Adresse aufgetreten: %s" - -#: rhodecode/controllers/admin/users.py:604 -msgid "An error occurred during ip saving" -msgstr "Fehler beim Speichern der IP-Adresse aufgetreten" - -#: rhodecode/controllers/admin/users.py:608 -#, python-format -msgid "Added ips %s to user whitelist" -msgstr "IP-Adressen %s zur Whitelist des Benutzers hinzugefügt" - -#: rhodecode/controllers/admin/users.py:626 -msgid "Removed ip address from user whitelist" -msgstr "IP-Adressen von der Whitelist des Benutzers entfernt" - -#: 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 "" @@ -1569,7 +1570,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 @@ -1580,8 +1581,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 @@ -1591,13 +1592,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 "Zurücksetzen" -#: 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 @@ -1606,13 +1607,13 @@ msgstr "Zurücksetzen" #: 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 @@ -1766,16 +1767,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 @@ -1811,11 +1811,11 @@ 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 " @@ -1823,172 +1823,172 @@ msgid "" "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 "[gelöscht] Repository" -#: 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 "[erstellt] Repository" -#: rhodecode/lib/action_parser.py:95 +#: rhodecode/lib/action_parser.py:100 msgid "[created] repository as fork" msgstr "[erstellt] Repository als Fork" -#: 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 "[forked] Repository" -#: 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 "[aktualisiert] Repository" -#: 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 "[gelöscht] Repository" -#: rhodecode/lib/action_parser.py:119 +#: rhodecode/lib/action_parser.py:124 msgid "[created] user" msgstr "[erstellt] Benutzer" -#: rhodecode/lib/action_parser.py:122 +#: rhodecode/lib/action_parser.py:127 msgid "[updated] user" msgstr "[akutalisiert] Benutzer" -#: rhodecode/lib/action_parser.py:125 +#: rhodecode/lib/action_parser.py:130 msgid "[created] user group" msgstr "[erstellt] Benutzergruppe" -#: rhodecode/lib/action_parser.py:128 +#: rhodecode/lib/action_parser.py:133 msgid "[updated] user group" msgstr "[aktualisiert] Benutzergruppe" -#: 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 "[übermittelt] in" -#: 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 "[beginnt zu folgen] Repository" -#: rhodecode/lib/action_parser.py:158 +#: rhodecode/lib/action_parser.py:163 msgid "[stopped following] repository" msgstr "[folgt nicht mehr] Repository" -#: rhodecode/lib/action_parser.py:166 +#: rhodecode/lib/action_parser.py:172 #, python-format msgid "fork name %s" msgstr "Fork Name %s" -#: 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 "Pullrequest #%s" -#: 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 +#: rhodecode/lib/action_parser.py:227 msgid "compare view" msgstr "vergleichsansicht" -#: rhodecode/lib/action_parser.py:227 +#: 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 "Gelöschter Branch: %s" -#: rhodecode/lib/action_parser.py:282 +#: rhodecode/lib/action_parser.py:289 #, python-format msgid "Created tag: %s" msgstr "Tag erstellt: %s" -#: 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 "IP-Adresse %s nicht erlaubt" -#: rhodecode/lib/auth.py:1281 +#: rhodecode/lib/auth.py:1309 msgid "You need to be a registered user to perform this action" msgstr "Sie müssen ein Registrierter Nutzer sein um diese Aktion durchzuführen" -#: rhodecode/lib/auth.py:1329 +#: rhodecode/lib/auth.py:1366 #, python-format msgid "Action not supported for %s." msgstr "Aktion wird für %s nicht unterstützt." -#: rhodecode/lib/auth.py:1379 +#: rhodecode/lib/auth.py:1412 msgid "You need to be signed in to view this page" msgstr "Sie müssen angemeldet sein, um diese Seite zu betrachten" -#: rhodecode/lib/base.py:549 +#: rhodecode/lib/base.py:561 #, python-format msgid "The repository at %(repo_name)s cannot be located." msgstr "" @@ -2014,20 +2014,21 @@ msgstr "Keine Änderungen erkannt" msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1517 +#: rhodecode/lib/helpers.py:1527 #, python-format msgid " and %s more" msgstr "und %s weitere" -#: rhodecode/lib/helpers.py:1521 +#: rhodecode/lib/helpers.py:1531 msgid "No Files" msgstr "Keine Dateien" -#: 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" @@ -2042,7 +2043,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" @@ -2084,7 +2099,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 "jetzt gerade" @@ -2119,7 +2134,7 @@ msgstr "jetzt gerade" #: 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/model/db.py:2482 msgid "Repository no access" msgstr "Kein Zugriff auf Repository" @@ -2153,7 +2168,7 @@ msgstr "Kein Zugriff auf Repository" #: 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/model/db.py:2483 msgid "Repository read access" msgstr "Lesender Zugriff auf Repository" @@ -2187,7 +2202,7 @@ msgstr "Lesender Zugriff auf Repository" #: 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/model/db.py:2484 msgid "Repository write access" msgstr "Schreibdender Zugriff auf Repository" @@ -2221,7 +2236,7 @@ msgstr "Schreibdender Zugriff auf Reposi #: 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/model/db.py:2485 msgid "Repository admin access" msgstr "Administrativer Zugang zum Repository" @@ -2295,7 +2310,7 @@ msgstr "RhodeCode Administrator" #: 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/model/db.py:2503 msgid "Repository creation disabled" msgstr "Repository erstelllung deaktiviert" @@ -2329,7 +2344,7 @@ msgstr "Repository erstelllung deaktivie #: 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/model/db.py:2504 msgid "Repository creation enabled" msgstr "Repository erstellung aktiviert" @@ -2363,7 +2378,7 @@ msgstr "Repository erstellung aktiviert" #: 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/model/db.py:2508 msgid "Repository forking disabled" msgstr "Repository Forken deaktiviert" @@ -2397,7 +2412,7 @@ msgstr "Repository Forken deaktiviert" #: 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/model/db.py:2509 msgid "Repository forking enabled" msgstr "Repository Forken aktiviert" @@ -2452,7 +2467,7 @@ msgstr "Registrierung neuer Benutzer in #: 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/model/db.py:3212 msgid "Not Reviewed" msgstr "Nicht Begutachtet" @@ -2486,7 +2501,7 @@ msgstr "Nicht Begutachtet" #: 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/model/db.py:3213 msgid "Approved" msgstr "Akzeptiert" @@ -2520,7 +2535,7 @@ msgstr "Akzeptiert" #: 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/model/db.py:3214 msgid "Rejected" msgstr "Abgelehnt" @@ -2554,7 +2569,7 @@ msgstr "Abgelehnt" #: 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/model/db.py:3215 msgid "Under Review" msgstr "In Begutachtung" @@ -2585,7 +2600,7 @@ msgstr "In Begutachtung" #: 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/model/db.py:2487 msgid "Repository group no access" msgstr "" @@ -2616,7 +2631,7 @@ msgstr "" #: 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/model/db.py:2488 msgid "Repository group read access" msgstr "" @@ -2647,7 +2662,7 @@ msgstr "" #: 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/model/db.py:2489 msgid "Repository group write access" msgstr "" @@ -2678,7 +2693,7 @@ msgstr "" #: 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/model/db.py:2490 msgid "Repository group admin access" msgstr "" @@ -2708,7 +2723,7 @@ msgstr "" #: 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/model/db.py:2492 msgid "User group no access" msgstr "" @@ -2738,7 +2753,7 @@ msgstr "" #: 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/model/db.py:2493 msgid "User group read access" msgstr "" @@ -2768,7 +2783,7 @@ msgstr "" #: 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/model/db.py:2494 msgid "User group write access" msgstr "" @@ -2798,7 +2813,7 @@ msgstr "" #: 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/model/db.py:2495 msgid "User group admin access" msgstr "" @@ -2828,7 +2843,7 @@ msgstr "" #: 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/model/db.py:2497 msgid "Repository Group creation disabled" msgstr "" @@ -2858,7 +2873,7 @@ msgstr "" #: 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/model/db.py:2498 msgid "Repository Group creation enabled" msgstr "" @@ -2888,7 +2903,7 @@ msgstr "" #: 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/model/db.py:2500 msgid "User Group creation disabled" msgstr "" @@ -2918,7 +2933,7 @@ msgstr "" #: 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/model/db.py:2501 msgid "User Group creation enabled" msgstr "" @@ -2948,7 +2963,7 @@ msgstr "" #: 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/model/db.py:2511 msgid "Registration disabled" msgstr "" @@ -2978,7 +2993,7 @@ msgstr "" #: 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/model/db.py:2512 msgid "User Registration with manual account activation" msgstr "" @@ -3008,7 +3023,7 @@ msgstr "" #: 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/model/db.py:2513 msgid "User Registration with automatic account activation" msgstr "" @@ -3038,7 +3053,7 @@ msgstr "" #: 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/model/permission.py:95 +#: rhodecode/model/db.py:2519 rhodecode/model/permission.py:95 msgid "Manual activation of external account" msgstr "" @@ -3068,7 +3083,7 @@ msgstr "" #: 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/model/permission.py:96 +#: rhodecode/model/db.py:2520 rhodecode/model/permission.py:96 msgid "Automatic activation of external account" msgstr "" @@ -3092,7 +3107,7 @@ msgstr "" #: 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/model/db.py:2505 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3117,7 +3132,7 @@ msgstr "" #: 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/model/db.py:2506 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3139,7 +3154,7 @@ msgstr "" #: 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/model/db.py:2480 msgid "RhodeCode Super Administrator" msgstr "" @@ -3158,7 +3173,7 @@ msgstr "" #: 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/model/db.py:2522 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3177,7 +3192,7 @@ msgstr "" #: 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/model/db.py:2523 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3187,7 +3202,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 "" @@ -3197,7 +3212,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 "" @@ -3207,7 +3222,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 "" @@ -3217,7 +3232,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 "" @@ -3227,7 +3242,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 "" @@ -3238,65 +3253,65 @@ msgstr "" #: 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/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/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/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/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 "Ungültige Suchanfrage. Versuchen sie die Anfrage in Anführungszeichen zu setzen." -#: 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 "Es gibt keinen durchsuchbaren Index. Bitte den Whoosh Indizierer ausführen" -#: rhodecode/lib/index/whoosh.py:156 +#: rhodecode/lib/index/whoosh.py:157 msgid "An error occurred during this search operation" msgstr "Während dieser Suche trat ein Fehler auf" -#: 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 "" @@ -3382,7 +3397,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 "Keine" @@ -3390,7 +3405,7 @@ msgstr "Keine" #: 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 "Lesen" @@ -3398,10 +3413,10 @@ msgstr "Lesen" #: 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 "Schreiben" @@ -3424,7 +3439,7 @@ msgstr "Schreiben" #: 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 @@ -3434,9 +3449,9 @@ msgstr "Schreiben" #: 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 "Admin" @@ -3467,93 +3482,93 @@ 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 "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." -msgstr "" - -#: rhodecode/model/pull_request.py:124 +"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" @@ -3561,92 +3576,96 @@ msgid "" " %(pr_title)s" msgstr "" -#: rhodecode/model/pull_request.py:556 +#: rhodecode/model/pull_request.py:576 msgid "Pull request merged and closed" msgstr "Pullrequest zusammengeführt und geschlossen" -#: 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 "Lesezeichen" -#: 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 "Reviewer Zustimmung fehlt." -#: 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 "Sie können diesen User nicht editieren da er für die ganze Applikation von entscheidender bedeutung ist." -#: 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 "Sie können diesen User nicht löschen da er für die ganze Applikation von entscheidender bedeutung ist." -#: 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 " @@ -3672,6 +3691,7 @@ msgid "Username \"%(username)s\" is forb msgstr "Benutzername \"%(username)s\" ist verboten" #: 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" @@ -3781,98 +3801,113 @@ 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 "Forke um den selben typ wie der Vorgesetze zu haben" -#: 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 "Dies ist ein Ungültiger Pfad" -#: rhodecode/model/validators.py:861 +#: rhodecode/model/validators.py:894 msgid "This e-mail address is already taken" msgstr "Diese EMail Addresse ist schon in Benutzung" -#: rhodecode/model/validators.py:881 +#: rhodecode/model/validators.py:914 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "E-Mail-Adresse \"%(email)s\" existiert nicht." -#: 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" @@ -3945,253 +3980,263 @@ 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 "Keine Treffer gefunden" #: 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 "Bitte {0} oder mehr Zeichen eingeben" #: 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 "Bitte {0} oder mehr Zeichen eingeben" #: 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 "Bitte {0} Zeichen löschen" #: 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 "Bitte {0} Zeichen löschen" #: 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 @@ -4200,28 +4245,28 @@ 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 " @@ -4230,14 +4275,14 @@ 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 ..." @@ -4245,105 +4290,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 "" @@ -4358,151 +4468,151 @@ 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 "Senden" -#: 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 "" @@ -4584,7 +4694,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 @@ -4592,7 +4702,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 "Name" @@ -4607,7 +4717,7 @@ msgstr "Name" #: 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 @@ -4615,9 +4725,10 @@ msgstr "Name" #: 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 @@ -4625,9 +4736,9 @@ msgstr "Name" #: 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 "Beschreibung" @@ -4638,7 +4749,7 @@ msgstr "Beschreibung" #: 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 @@ -4661,13 +4772,13 @@ msgstr "Letzte Änderung" #: 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 "" @@ -4682,7 +4793,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 "Einloggen" @@ -4707,14 +4818,14 @@ 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 "Support" #: 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 "" @@ -4774,7 +4885,7 @@ msgstr "Passwort erneut eingeben" #: 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 "Vorname" @@ -4784,7 +4895,7 @@ msgstr "Vorname" #: 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 "Nachname" @@ -4796,36 +4907,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 "Admin Logbuch" - -#: rhodecode/templates/admin/admin.mako:13 -msgid "journal filter..." -msgstr "Logbuch filter..." - -#: 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 @@ -4833,38 +4940,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 "Aktion" -#: 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 "Repository" -#: 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 "Datum" -#: rhodecode/templates/admin/admin_log.mako:11 -#: rhodecode/templates/admin/users/user_edit_audit.mako:26 -msgid "From IP" -msgstr "Von IP" - -#: 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 "Es sind bisher keine Aktionen passiert" @@ -4907,8 +5021,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 @@ -4949,7 +5063,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 " @@ -5004,7 +5118,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 "" @@ -5015,9 +5129,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 @@ -5086,14 +5200,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 "" @@ -5154,12 +5267,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 "" @@ -5200,11 +5313,11 @@ 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:251 msgid "Settings" msgstr "Einstellungen" @@ -5307,7 +5420,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 "Mein Account" @@ -5331,7 +5444,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 "E-Mails" @@ -5348,7 +5461,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" @@ -5408,7 +5521,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 "Hinzufügen" @@ -5427,10 +5540,8 @@ 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" -msgstr "Bestätigen Sie, um diese E-Mail zu löschen: %s" +msgid "Confirm to delete this email: {}" +msgstr "" #: rhodecode/templates/admin/my_account/my_account_emails.mako:42 #: rhodecode/templates/admin/users/user_edit_emails.mako:41 @@ -5515,13 +5626,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 "Titel" #: 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 "" @@ -5539,7 +5650,7 @@ msgid "My Notifications" msgstr "Meine Benachrichtigungen" #: rhodecode/templates/admin/notifications/notifications.mako:32 -#: rhodecode/templates/changeset/changeset.mako:140 +#: rhodecode/templates/changeset/changeset.mako:160 msgid "Comments" msgstr "Kommentare" @@ -5560,6 +5671,10 @@ msgstr "Zeige Benachrichtigung" msgid "Notifications" msgstr "Benachrichtigungen" +#: rhodecode/templates/admin/notifications/show_notification.mako:40 +msgid "Subject" +msgstr "" + #: rhodecode/templates/admin/permissions/permissions.mako:5 msgid "Permissions Administration" msgstr "" @@ -5622,23 +5737,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 "" @@ -5736,9 +5851,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 "" @@ -5795,26 +5910,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" @@ -5822,8 +5937,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 "" @@ -5833,7 +5948,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" @@ -5903,7 +6018,7 @@ msgid "Clone from" msgstr "Clone von" #: 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." @@ -5914,7 +6029,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)" @@ -5934,7 +6048,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 "" @@ -5966,36 +6080,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 "Entfernt" -#: 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 "Statistiken" -#: 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 "" @@ -6030,93 +6144,86 @@ 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 +#: 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." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 +"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 "" @@ -6124,46 +6231,45 @@ msgstr "" msgid "Invalidate Cache for Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Invalidate repository cache" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Confirm to invalidate repository cache" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:14 +#: 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: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: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: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 "Aktiv" @@ -6239,20 +6345,29 @@ 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 "" @@ -6260,11 +6375,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 "privates Repository" -#: 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 "" @@ -6272,57 +6387,91 @@ 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 "Repository Gruppe" + +#: 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 @@ -6330,65 +6479,62 @@ msgstr "" msgid "edit" msgstr "bearbeiten" -#: 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 "Repository Gruppe" - -#: 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 +#: 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:108 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:138 #: rhodecode/templates/data_table/_dt_elements.mako:58 msgid "Private repository" msgstr "Privates Repository" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:117 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:148 msgid "Enable statistics" msgstr "Aktiviere Statistiken" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:121 +#: 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 "Aktiviere Downloads" -#: 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" @@ -6455,32 +6601,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 @@ -7050,12 +7188,12 @@ msgid "%s user group settings" msgstr "%s Benutzergruppen Einstellungen" #: 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 "Globale Berechtigungen" #: 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 "Berechtigungsübersicht" @@ -7092,46 +7230,39 @@ 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 "Bestägigen dass die Benutzergrupe `%(ugroup)s` mit allen Berechtigungen gelöscht werden soll" -#: 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 "" @@ -7223,24 +7354,28 @@ msgstr "Generiertes Passwort:" 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 "" @@ -7254,7 +7389,7 @@ msgid "Last login" msgstr "Letzte Anmeldung" #: 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 "Letzte Aktivität" @@ -7375,6 +7510,11 @@ msgstr "" msgid "Additional Email Addresses" msgstr "Weitere E-Mail-Adressen" +#: rhodecode/templates/admin/users/user_edit_emails.mako:30 +#, python-format +msgid "Confirm to delete this email: %s" +msgstr "Bestätigen Sie, um diese E-Mail zu löschen: %s" + #: rhodecode/templates/admin/users/user_edit_groups.mako:12 #, python-format msgid "Add `%s` to user group" @@ -7384,12 +7524,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 "Geerbt von %s" -#: 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" @@ -7436,7 +7588,7 @@ msgstr "" msgid "Users administration" msgstr "Benutzerverwaltung" -#: rhodecode/templates/admin/users/users.mako:77 +#: rhodecode/templates/admin/users/users.mako:78 msgid "Auth type" msgstr "" @@ -7504,110 +7656,110 @@ msgstr "Vergleiche" msgid "Show Pull Requests for %s" msgstr "Zeige Pullrequests für %s" -#: rhodecode/templates/base/base.mako:246 +#: rhodecode/templates/base/base.mako:247 msgid "Options" msgstr "Optionen" -#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/base/base.mako:255 #: rhodecode/templates/forks/forks_data.mako:30 msgid "Compare fork" msgstr "Vergleiche Fork" -#: 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 "Suche" -#: rhodecode/templates/base/base.mako:260 +#: rhodecode/templates/base/base.mako:262 msgid "Unlock" msgstr "Entsperren" -#: rhodecode/templates/base/base.mako:262 +#: rhodecode/templates/base/base.mako:264 msgid "Lock" msgstr "Sperren" -#: 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 "Fork" + +#: rhodecode/templates/base/base.mako:270 msgid "Create Pull Request" msgstr "Pullrequest erstellen" -#: rhodecode/templates/base/base.mako:290 +#: rhodecode/templates/base/base.mako:292 msgid "Sign in" msgstr "Anmelden" -#: 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 "(Kennwort vergessen?)" -#: rhodecode/templates/base/base.mako:325 -#: rhodecode/templates/debug_style/login.html:56 -msgid "Don't have an account ?" -msgstr "Kein Account?" - -#: 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 "Logbuch" -#: 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 "Öffentliches Logbuch" -#: 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 @@ -7629,15 +7781,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 "" @@ -7744,10 +7896,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" @@ -7827,7 +7979,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 "" @@ -7938,93 +8090,105 @@ msgid "" "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 " @@ -8032,11 +8196,11 @@ msgid "" "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." @@ -8056,10 +8220,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 "" @@ -8078,10 +8242,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 "" @@ -8119,19 +8283,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 "" @@ -8148,7 +8312,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" @@ -8156,44 +8320,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 "" @@ -8201,100 +8387,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" @@ -8302,8 +8466,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" @@ -8311,19 +8475,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 "" @@ -8349,73 +8513,81 @@ 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 @@ -8454,7 +8626,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" @@ -8463,7 +8635,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" @@ -8635,26 +8807,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 "" @@ -8692,6 +8864,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 "" @@ -8905,6 +9078,10 @@ msgstr "" msgid "Form vertical" msgstr "" +#: rhodecode/templates/debug_style/login.html:56 +msgid "Don't have an account ?" +msgstr "Kein Account?" + #: rhodecode/templates/email_templates/base.mako:32 #, python-format msgid "This is a notification from RhodeCode. %(instance_url)s" @@ -9026,6 +9203,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 "" @@ -9099,8 +9277,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" @@ -9124,7 +9300,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 "" @@ -9195,6 +9371,7 @@ msgid "Remove Custom Path" msgstr "" #: rhodecode/templates/files/files_add.mako:50 +#: rhodecode/templates/files/files_add.mako:59 msgid "Filename" msgstr "" @@ -9202,34 +9379,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 "" @@ -9250,6 +9427,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 "" @@ -9362,7 +9544,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] "" @@ -9426,6 +9607,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 "" @@ -9463,6 +9648,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 "ATOM Logbuch Feed" @@ -9493,65 +9685,75 @@ msgstr "RSS Feed für das Öffentliche Logbuch" 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 "" @@ -9599,10 +9801,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 "" @@ -9701,77 +9899,77 @@ 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 "" @@ -9861,6 +10059,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 "" @@ -9892,34 +10095,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 "" @@ -10000,6 +10175,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/i18n/es/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/es/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/es/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/es/LC_MESSAGES/rhodecode.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-04-07 12:33+0200\n" -"PO-Revision-Date: 2017-04-07 10:34+0000\n" +"POT-Creation-Date: 2017-06-27 17:25+0200\n" +"PO-Revision-Date: 2017-06-27 15:26+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Spanish (http://www.transifex.com/rhodecode/RhodeCode/language/es/)\n" "MIME-Version: 1.0\n" @@ -26,7 +26,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 "" @@ -39,7 +39,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 "" @@ -50,7 +50,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" @@ -77,7 +77,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 "" @@ -99,11 +99,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 "" @@ -115,249 +115,416 @@ 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 "Usted no puede editar este usuario" -#: rhodecode/apps/admin/views/users.py:178 -#: rhodecode/apps/my_account/views.py:138 +#: rhodecode/apps/admin/views/users.py:168 +#: rhodecode/apps/my_account/views.py:148 #: rhodecode/controllers/admin/gists.py:62 msgid "forever" msgstr "para siempre" -#: rhodecode/apps/admin/views/users.py:179 -#: rhodecode/apps/my_account/views.py:139 +#: rhodecode/apps/admin/views/users.py:169 +#: rhodecode/apps/my_account/views.py:149 #: rhodecode/controllers/admin/gists.py:63 msgid "5 minutes" msgstr "5 minutos" -#: rhodecode/apps/admin/views/users.py:180 -#: rhodecode/apps/my_account/views.py:140 +#: rhodecode/apps/admin/views/users.py:170 +#: rhodecode/apps/my_account/views.py:150 #: rhodecode/controllers/admin/gists.py:64 msgid "1 hour" msgstr "1 hora" -#: rhodecode/apps/admin/views/users.py:181 -#: rhodecode/apps/my_account/views.py:141 +#: rhodecode/apps/admin/views/users.py:171 +#: rhodecode/apps/my_account/views.py:151 #: rhodecode/controllers/admin/gists.py:65 msgid "1 day" msgstr "1 día" -#: rhodecode/apps/admin/views/users.py:182 -#: rhodecode/apps/my_account/views.py:142 +#: rhodecode/apps/admin/views/users.py:172 +#: rhodecode/apps/my_account/views.py:152 #: rhodecode/controllers/admin/gists.py:66 msgid "1 month" msgstr "1 mes" -#: rhodecode/apps/admin/views/users.py:184 -#: rhodecode/apps/my_account/views.py:144 +#: rhodecode/apps/admin/views/users.py:174 +#: rhodecode/apps/my_account/views.py:154 #: rhodecode/controllers/admin/gists.py:70 msgid "Lifetime" msgstr "De por vida" -#: rhodecode/apps/admin/views/users.py:188 -#: rhodecode/apps/my_account/views.py:148 +#: rhodecode/apps/admin/views/users.py:178 +#: 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 "Rol" -#: 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 "Ficha de autenticación creada exitosamente" -#: 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 "Ficha de autenticación eliminada exitosamente" -#: 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 "Ocurrió un error durante guardado de correo electrónico" + +#: 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 "Ocurrió un error al guardar ip:%s" + +#: rhodecode/apps/admin/views/users.py:389 +msgid "An error occurred during ip saving" +msgstr "Ocurrió un error al guardar ip" + +#: rhodecode/apps/admin/views/users.py:393 +#, python-format +msgid "Added ips %s to user whitelist" +msgstr "Se agregaron ips %s a la lista blanca de usuario" + +#: rhodecode/apps/admin/views/users.py:423 +msgid "Removed ip address from user whitelist" +msgstr "Se eliminó dirección ip de lista blanca de usuario" + +#: 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 "Repositorios" + +#: rhodecode/apps/home/views.py:223 +msgid "Groups" +msgstr "Grupos" + +#: 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 "Se ha registrado exitosamente con RhodeCode" -#: 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 "Su reinicio de contraseña fue exitoso, una nueva contraseña ha sido enviada a su correo electrónico" -#: rhodecode/apps/my_account/views.py:115 +#: rhodecode/apps/my_account/views.py:125 msgid "Error occurred during update of user password" msgstr "Error ocurrido durante actualización de contraseña de usuario" -#: rhodecode/apps/my_account/views.py:122 +#: rhodecode/apps/my_account/views.py:132 msgid "Successfully updated password" msgstr "Contraseña actualizada exitosamente" +#: 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 "Invalidación de caché exitosa" + +#: rhodecode/apps/repository/views/repo_caches.py:74 +msgid "An error occurred during cache invalidation" +msgstr "Ocurrió un error durante invalidación de caché" + +#: rhodecode/apps/repository/views/repo_permissions.py:95 +msgid "Repository permissions updated" +msgstr "Permisos de repositorio actualizados" + +#: 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 "Se despegaron %s bifurcaciones" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:96 +#, python-format +msgid "Deleted %s forks" +msgstr "Se eliminaron %s bifurcaciones" + +#: 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 "Se actualizó visibilidad de repositorio en diario público" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:156 +msgid "An error occurred during setting this repository in public journal" +msgstr "Ocurrió un error al ajustar este repositorio en diario público" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:184 +msgid "Nothing" +msgstr "Nada" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:186 +#, python-format +msgid "Marked repo %s as fork of %s" +msgstr "Se marcó repositorio %s como bifurcación de %s" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 +msgid "An error occurred during this operation" +msgstr "Ocurrió un error durante esta operación" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:217 +msgid "Locked repository" +msgstr "Repositorio blockeado" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:220 +msgid "Unlocked repository" +msgstr "Repositorio desbloqueado" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:223 +#: rhodecode/controllers/admin/repos.py:363 +msgid "An error occurred during unlocking" +msgstr "Ocurrió un error durante desbloqueo" + +#: rhodecode/apps/repository/views/repo_summary.py:293 +msgid "Branch" +msgstr "Rama" + +#: rhodecode/apps/repository/views/repo_summary.py:294 +msgid "Tag" +msgstr "Etiqueta" + +#: rhodecode/apps/repository/views/repo_summary.py:295 +msgid "Bookmark" +msgstr "Marcador" + +#: 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 "Ramas" + +#: rhodecode/apps/repository/views/repo_summary.py:319 +msgid "Closed branches" +msgstr "Ramas cerradas" + #: rhodecode/apps/svn_support/events.py:30 msgid "Configuration for Apaache mad_dav_svn changed." msgstr "" @@ -415,7 +582,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 "" @@ -445,7 +612,7 @@ msgstr "" msgid "Admin Groups" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:215 +#: rhodecode/authentication/plugins/auth_crowd.py:216 msgid "CROWD" msgstr "" @@ -495,126 +662,130 @@ 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 "" @@ -647,76 +818,73 @@ 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 "No hay cometidos todavía" +#: rhodecode/controllers/changeset.py:76 +msgid "Show whitespace" +msgstr "Mostrar espacio" + #: rhodecode/controllers/changeset.py:77 -msgid "Show whitespace" -msgstr "Mostrar espacio" - -#: rhodecode/controllers/changeset.py:78 msgid "Show whitespace for all diffs" msgstr "Mostrar espacio para todas las diferencias" -#: rhodecode/controllers/changeset.py:84 +#: rhodecode/controllers/changeset.py:83 msgid "Ignore whitespace" msgstr "Ignorar espacio" -#: rhodecode/controllers/changeset.py:85 +#: rhodecode/controllers/changeset.py:84 msgid "Ignore whitespace for all diffs" msgstr "Ignorar espacio para todas las diferencias" -#: rhodecode/controllers/changeset.py:141 +#: rhodecode/controllers/changeset.py:140 msgid "Increase context" msgstr "Incrementar contexto" -#: rhodecode/controllers/changeset.py:142 +#: rhodecode/controllers/changeset.py:141 msgid "Increase context for all diffs" msgstr "Incrementar contexto para todas las diferencias" -#: 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 "Cambio de estado %(transition_icon)s %(status)s" -#: 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 " @@ -742,51 +910,47 @@ msgstr "" msgid "There are no files yet. %s" msgstr "No hay archivos todavía. %s" -#: 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 "El repositorio ha sido bloqueado por %s en %s" -#: 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 "Sólo puede eliminar archivos con revisión siendo una rama válida" -#: rhodecode/controllers/files.py:452 rhodecode/controllers/files.py:505 -#, python-format -msgid "Deleted file %s via RhodeCode Enterprise" -msgstr "Se eliminó archivo %s vía 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 "Se eliminó archivo %s exitosamente" - -#: 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 "Error occurrido durante cometido" -#: 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 "Usted puede editar solamente archivos con revision siendo una rama válida" -#: rhodecode/controllers/files.py:539 rhodecode/controllers/files.py:614 -#, python-format -msgid "Edited file %s via RhodeCode Enterprise" -msgstr "Se editó archivo %s vía RhodeCode Enterprise" - -#: 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 "Sin cambios" -#: rhodecode/controllers/files.py:578 rhodecode/controllers/files.py:707 -#, python-format -msgid "Successfully committed to %s" -msgstr "Se cometió a %s exitosamente" - -#: 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 "Se agregó archivo vía RhodeCode Enterprise" @@ -794,41 +958,39 @@ msgstr "Se agregó archivo vía RhodeCode Enterprise" msgid "No filename" msgstr "Sin nombre de archivo" +#: 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 "La localización específica debe ser una ruta relativa y no deve contener .. en la ruta" -#: rhodecode/controllers/files.py:764 +#: rhodecode/controllers/files.py:763 msgid "Downloads disabled" msgstr "Descargas deshabilitadas" -#: rhodecode/controllers/files.py:770 +#: rhodecode/controllers/files.py:769 #, python-format msgid "Unknown revision %s" msgstr "Revision desconocida %s" -#: rhodecode/controllers/files.py:772 +#: rhodecode/controllers/files.py:771 msgid "Empty repository" msgstr "Repositorio vacío" -#: 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 "Typo de archivo desconocido" -#: rhodecode/controllers/files.py:993 +#: rhodecode/controllers/files.py:1000 msgid "Changesets" msgstr "Conjuntos de cambios" -#: 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 "Ramas" - -#: 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 "Etiquetas" @@ -837,28 +999,6 @@ msgstr "Etiquetas" msgid "An error occurred during repository forking %s" msgstr "Ocurrió un error durante bifurcación de repositorio %s" -#: rhodecode/controllers/home.py:207 -msgid "Groups" -msgstr "Grupos" - -#: 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 "Repositorios" - -#: 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 "diario público" @@ -867,84 +1007,60 @@ msgstr "diario público" msgid "journal" msgstr "diario" -#: 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 "La solicitud de extracción requiere un título con un mínimo de 3 caracteres" -#: 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 "Se abrió nueva solicitud de extracción exitosamente" -#: rhodecode/controllers/pullrequests.py:388 -msgid "Error occurred during sending pull request" -msgstr "Error ocurrido durante envío de solicitud de extracción" - -#: 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 "No se pueden actualizar solicitudes de extracción cerradas." -#: rhodecode/controllers/pullrequests.py:437 +#: rhodecode/controllers/pullrequests.py:328 msgid "Pull request title & description updated." msgstr "Título de solicitud de extracción & descripción actualizados." -#: rhodecode/controllers/pullrequests.py:455 +#: 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:472 +#: rhodecode/controllers/pullrequests.py:363 msgid "Reload page" msgstr "" -#: rhodecode/controllers/pullrequests.py:546 +#: rhodecode/controllers/pullrequests.py:437 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 "Se eliminó la solicitud de extracción exitosamente" -#: 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 "Cerrando con" - -#: 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 "Está prohibido el cerrar solicitudes de extracción otros estados que no sean rechazado o aprobado. El estado calculado por parte de todos los revisadores es actualmente: %s" - -#: rhodecode/controllers/summary.py:251 -msgid "Branch" -msgstr "Rama" - -#: rhodecode/controllers/summary.py:252 -msgid "Tag" -msgstr "Etiqueta" - -#: rhodecode/controllers/summary.py:253 -msgid "Bookmark" -msgstr "Marcador" - -#: rhodecode/controllers/summary.py:278 -msgid "Closed branches" -msgstr "Ramas cerradas" - #: rhodecode/controllers/admin/defaults.py:84 msgid "Default settings updated successfully" msgstr "Ajustes por defecto actualizados exitosamente" @@ -1000,89 +1116,73 @@ msgstr "nunca" msgid "%(expiry)s - current value" msgstr "%(expiry)s - valor actual" -#: 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 "Usted no puede editar este usuario porque es crucial para la aplicación entera" -#: rhodecode/controllers/admin/my_account.py:138 +#: rhodecode/controllers/admin/my_account.py:110 msgid "Your account was updated successfully" msgstr "Su cuenta fue actualizada exitosamente" -#: 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 "Error ocurrido durante actualización de usuario %s" -#: 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 "Ocurrió un error durante guardado de correo electrónico" - -#: 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 "Permisos de aplicación actualizados exitosamente" -#: 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 "Error ocurrido durante actualización de permisos" -#: rhodecode/controllers/admin/permissions.py:161 +#: rhodecode/controllers/admin/permissions.py:156 msgid "Object permissions updated successfully" msgstr "Permisos de objeto actualizados exitosamente" -#: rhodecode/controllers/admin/permissions.py:215 +#: rhodecode/controllers/admin/permissions.py:210 msgid "Global permissions updated successfully" msgstr "Permisos globales actualizado exitosamente" -#: rhodecode/controllers/admin/repo_groups.py:197 +#: rhodecode/controllers/admin/repo_groups.py:202 #, python-format msgid "Created repository group %s" msgstr "Se creó grupo de repositorio %s" -#: 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 "Error ocurrido durante creación de grupo de repositorio %s" -#: rhodecode/controllers/admin/repo_groups.py:258 +#: rhodecode/controllers/admin/repo_groups.py:261 #, python-format msgid "Updated repository group %s" msgstr "Se actualizó grupo de repositorio %s" -#: 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 "Error ocurrido durante actualización de grupo de repositorio %s" -#: 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] "Este grupo contiene %(num)d repositorio y no puede ser eliminado" msgstr[1] "Este grupo contiene %(num)d repositorios y no puede ser eliminado" -#: 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] "Este grupo contiene %(num)d subgrupo y no puede ser eliminado" msgstr[1] "Este grupo contiene %(num)d subgrupos y no puede ser eliminado" -#: rhodecode/controllers/admin/repo_groups.py:312 +#: rhodecode/controllers/admin/repo_groups.py:313 #, python-format msgid "Removed repository group %s" msgstr "Se removió grup de repositorio %s" @@ -1092,366 +1192,285 @@ msgstr "Se removió grup de repositorio %s" msgid "Error occurred during deletion of repository group %s" msgstr "Error ocurrido durante eliminación de grupo de repositorio %s" -#: 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 "No puede cambiar el permiso para usted como admin" -#: rhodecode/controllers/admin/repo_groups.py:405 +#: rhodecode/controllers/admin/repo_groups.py:404 msgid "Repository Group permissions updated" msgstr "Permisos de Grupo de Repositorio actualizados" -#: rhodecode/controllers/admin/repos.py:129 +#: rhodecode/controllers/admin/repos.py:125 #, python-format msgid "Error creating repository %s: invalid certificate" msgstr "Error al crear repositorio %s: certificado inválido" -#: rhodecode/controllers/admin/repos.py:133 +#: rhodecode/controllers/admin/repos.py:129 #, python-format msgid "Error creating repository %s" msgstr "Error al crear repositorio %s" -#: rhodecode/controllers/admin/repos.py:274 +#: rhodecode/controllers/admin/repos.py:270 #, python-format msgid "Created repository %s from %s" msgstr "Se creó repositorio %s a base de %s" -#: rhodecode/controllers/admin/repos.py:283 +#: rhodecode/controllers/admin/repos.py:279 #, python-format msgid "Forked repository %s as %s" msgstr "Se bifurcó repositorio %s como %s" -#: rhodecode/controllers/admin/repos.py:286 +#: rhodecode/controllers/admin/repos.py:282 #, python-format msgid "Created repository %s" msgstr "Se creó repositorio %s" -#: rhodecode/controllers/admin/repos.py:327 -#, python-format -msgid "Repository %s updated successfully" -msgstr "Repositorio %s actualizado exitosamente" - -#: rhodecode/controllers/admin/repos.py:346 -#, python-format -msgid "Error occurred during update of repository %s" -msgstr "Error ocurrido durante actualización de repositorio %s" - -#: rhodecode/controllers/admin/repos.py:374 -#, python-format -msgid "Detached %s forks" -msgstr "Se despegaron %s bifurcaciones" - -#: rhodecode/controllers/admin/repos.py:377 -#, python-format -msgid "Deleted %s forks" -msgstr "Se eliminaron %s bifurcaciones" - -#: rhodecode/controllers/admin/repos.py:382 -#, python-format -msgid "Deleted repository %s" -msgstr "Se eliminó repositorio %s" - -#: rhodecode/controllers/admin/repos.py:385 -#, python-format -msgid "Cannot delete %s it still contains attached forks" -msgstr "No se puede eliminar %s todavía contiene bifurcaciones adjuntas" - -#: rhodecode/controllers/admin/repos.py:390 -#, python-format -msgid "An error occurred during deletion of %s" -msgstr "Ocurrió un error durante eliminación de %s" - -#: rhodecode/controllers/admin/repos.py:443 -msgid "Repository permissions updated" -msgstr "Permisos de repositorio actualizados" - -#: rhodecode/controllers/admin/repos.py:474 +#: rhodecode/controllers/admin/repos.py:319 msgid "An error occurred during creation of field" msgstr "Ocurrió un error durante creación de campo" -#: rhodecode/controllers/admin/repos.py:489 +#: rhodecode/controllers/admin/repos.py:334 msgid "An error occurred during removal of field" msgstr "Ocurrió un error durante remoción de campo" -#: rhodecode/controllers/admin/repos.py:528 -msgid "Updated repository visibility in public journal" -msgstr "Se actualizó visibilidad de repositorio en diario público" - -#: rhodecode/controllers/admin/repos.py:532 -msgid "An error occurred during setting this repository in public journal" -msgstr "Ocurrió un error al ajustar este repositorio en diario público" - -#: rhodecode/controllers/admin/repos.py:556 -msgid "Nothing" -msgstr "Nada" - -#: rhodecode/controllers/admin/repos.py:558 -#, python-format -msgid "Marked repo %s as fork of %s" -msgstr "Se marcó repositorio %s como bifurcación de %s" - -#: rhodecode/controllers/admin/repos.py:565 -msgid "An error occurred during this operation" -msgstr "Ocurrió un error durante esta operación" - -#: rhodecode/controllers/admin/repos.py:583 -msgid "Locked repository" -msgstr "Repositorio blockeado" - -#: rhodecode/controllers/admin/repos.py:586 -msgid "Unlocked repository" -msgstr "Repositorio desbloqueado" - -#: rhodecode/controllers/admin/repos.py:589 -#: rhodecode/controllers/admin/repos.py:618 -msgid "An error occurred during unlocking" -msgstr "Ocurrió un error durante desbloqueo" - -#: rhodecode/controllers/admin/repos.py:608 +#: rhodecode/controllers/admin/repos.py:353 msgid "Unlocked" msgstr "Desbloqueado" -#: rhodecode/controllers/admin/repos.py:612 +#: rhodecode/controllers/admin/repos.py:357 msgid "Locked" msgstr "Bloqueado" -#: rhodecode/controllers/admin/repos.py:614 +#: rhodecode/controllers/admin/repos.py:359 #, python-format msgid "Repository has been %s" msgstr "El repositorio ha sido %s" -#: rhodecode/controllers/admin/repos.py:629 -msgid "Cache invalidation successful" -msgstr "Invalidación de caché exitosa" - -#: rhodecode/controllers/admin/repos.py:633 -msgid "An error occurred during cache invalidation" -msgstr "Ocurrió un error durante invalidación de caché" - -#: rhodecode/controllers/admin/repos.py:653 +#: rhodecode/controllers/admin/repos.py:373 msgid "Pulled from remote location" msgstr "Extraído de localidad remota" -#: rhodecode/controllers/admin/repos.py:656 +#: rhodecode/controllers/admin/repos.py:376 msgid "An error occurred during pull from remote location" msgstr "Ocurrió un error durante extracción de localidad remota" -#: rhodecode/controllers/admin/repos.py:678 +#: rhodecode/controllers/admin/repos.py:397 msgid "An error occurred during deletion of repository stats" msgstr "Ocurrió un error durante eliminacion de estadísticas de repositorio" -#: rhodecode/controllers/admin/repos.py:725 +#: rhodecode/controllers/admin/repos.py:443 msgid "Error occurred during deleting issue tracker entry" msgstr "Error ocurrido al eliminar entrada en el seguidor de incidencias" -#: 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 "Se eliminó entrada en el seguidor de incidencias" -#: 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 "Se actualizaron entradas en el seguidor de incidencias" -#: 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 "Algunos campos de entrada contienen datos inválidos" -#: rhodecode/controllers/admin/repos.py:837 +#: rhodecode/controllers/admin/repos.py:555 msgid "Error occurred during updating repository VCS settings" msgstr "Error ocurrido al actualizar ajustes VCS del repositorio" -#: rhodecode/controllers/admin/repos.py:841 +#: rhodecode/controllers/admin/repos.py:559 #: rhodecode/controllers/admin/settings.py:176 msgid "Updated VCS settings" msgstr "Se actualizaron ajustes VCS" #: 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 "Error ocurrido durante actualización de ajustes de aplicación" -#: rhodecode/controllers/admin/settings.py:223 +#: rhodecode/controllers/admin/settings.py:226 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "Repositorios reescaneados exitosamente agregados: %s ; eliminados: %s" -#: rhodecode/controllers/admin/settings.py:279 +#: rhodecode/controllers/admin/settings.py:282 msgid "Updated application settings" msgstr "Se actualizaron los ajustes de aplicación" -#: rhodecode/controllers/admin/settings.py:345 -msgid "Updated visualisation settings" -msgstr "Se actualizaron los ajustes de visualización" - #: rhodecode/controllers/admin/settings.py:348 +msgid "Updated visualisation settings" +msgstr "Se actualizaron los ajustes de visualización" + +#: rhodecode/controllers/admin/settings.py:351 msgid "Error occurred during updating visualisation settings" msgstr "Error ocurrido al actualizar ajustes de visualización" -#: rhodecode/controllers/admin/settings.py:441 +#: rhodecode/controllers/admin/settings.py:444 msgid "Please enter email address" msgstr "Por favor ingrese una dirección de correo electrónico" -#: rhodecode/controllers/admin/settings.py:459 +#: rhodecode/controllers/admin/settings.py:462 msgid "Send email task created" msgstr "Tarea de envío de correo electrónico creada" -#: rhodecode/controllers/admin/settings.py:492 +#: rhodecode/controllers/admin/settings.py:495 msgid "Added new hook" msgstr "Se agregó nuevo gancho" -#: rhodecode/controllers/admin/settings.py:507 +#: rhodecode/controllers/admin/settings.py:510 msgid "Updated hooks" msgstr "Se actualizaron ganchos" -#: rhodecode/controllers/admin/settings.py:511 +#: rhodecode/controllers/admin/settings.py:514 msgid "Error occurred during hook creation" msgstr "Error ocurrido durante creación de gancho" -#: rhodecode/controllers/admin/settings.py:640 +#: rhodecode/controllers/admin/settings.py:643 msgid "Error occurred during updating labs settings" msgstr "Error ocurrido al actiualizar ajustes de laboratorios" -#: rhodecode/controllers/admin/settings.py:645 +#: rhodecode/controllers/admin/settings.py:648 msgid "Updated Labs settings" msgstr "Se Actualizaron Ajustes de Laboratorios" -#: 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 "Se creó grupo de usuario %(user_group_link)s" -#: 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 "Error ocurrido al crear grupo de usuario %s" -#: rhodecode/controllers/admin/user_groups.py:220 +#: rhodecode/controllers/admin/user_groups.py:218 #, python-format msgid "Updated user group %s" msgstr "Se actualizó grupo de usuario %s" -#: 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 "Error ocurrido al actualizar group de usuario %s" -#: rhodecode/controllers/admin/user_groups.py:258 +#: rhodecode/controllers/admin/user_groups.py:253 msgid "Successfully deleted user group" msgstr "Grupo de usuario eliminado exitosamente" -#: rhodecode/controllers/admin/user_groups.py:263 +#: rhodecode/controllers/admin/user_groups.py:258 msgid "An error occurred during deletion of user group" msgstr "Ocurrió un error durante eliminación de grupo de usuario" -#: rhodecode/controllers/admin/user_groups.py:331 +#: rhodecode/controllers/admin/user_groups.py:326 msgid "Target group cannot be the same" msgstr "El grupo de destino no puede ser el mismo" -#: rhodecode/controllers/admin/user_groups.py:337 +#: rhodecode/controllers/admin/user_groups.py:332 msgid "User Group permissions updated" msgstr "Permisos de grupo de usuario actualizados" -#: rhodecode/controllers/admin/user_groups.py:422 +#: rhodecode/controllers/admin/user_groups.py:415 msgid "User Group global permissions updated successfully" msgstr "Permisos globales para Grupo de Usuario actualizados exitosamente" -#: 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 "Ocurrió un error al guardar permisos" -#: 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 "Se creó usuario %(user_link)s" -#: rhodecode/controllers/admin/users.py:122 +#: rhodecode/controllers/admin/users.py:124 #, python-format msgid "Error occurred during creation of user %s" msgstr "Error ocurrido durante creación de usuario %s" -#: rhodecode/controllers/admin/users.py:167 +#: rhodecode/controllers/admin/users.py:166 msgid "User updated successfully" msgstr "Usuario actualizado exitosamente" -#: 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 "Se elminaron %s grupos de repositorio" -#: 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 "Se eliminaron %s grupos de usuario" -#: rhodecode/controllers/admin/users.py:260 +#: rhodecode/controllers/admin/users.py:257 msgid "Successfully deleted user" msgstr "Se eliminó usuario exitosamente" -#: rhodecode/controllers/admin/users.py:266 +#: rhodecode/controllers/admin/users.py:263 msgid "An error occurred during deletion of user" msgstr "Ocurrió un error durante eliminación de usuario" -#: rhodecode/controllers/admin/users.py:285 +#: rhodecode/controllers/admin/users.py:280 msgid "Force password change disabled for user" msgstr "Forzar cambio de contraseña deshabilitado para usuario" -#: rhodecode/controllers/admin/users.py:287 +#: rhodecode/controllers/admin/users.py:285 msgid "Force password change enabled for user" msgstr "Forzar cambio de contraseña habilitado para usuario" -#: rhodecode/controllers/admin/users.py:291 +#: rhodecode/controllers/admin/users.py:294 msgid "An error occurred during password reset for user" msgstr "Ocurrió un error durante reinicio de contraseña para usuario" -#: 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 "Se creó grupo de repositorio `%s`" -#: 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 "Ocurrió un error durante creación de grupo de repositorio para usuario" @@ -1461,81 +1480,63 @@ msgid "" "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 "Permisos globales de usario actualizados exitosamente" -#: rhodecode/controllers/admin/users.py:589 -#, python-format -msgid "An error occurred during ip saving:%s" -msgstr "Ocurrió un error al guardar ip:%s" - -#: rhodecode/controllers/admin/users.py:604 -msgid "An error occurred during ip saving" -msgstr "Ocurrió un error al guardar ip" - -#: rhodecode/controllers/admin/users.py:608 -#, python-format -msgid "Added ips %s to user whitelist" -msgstr "Se agregaron ips %s a la lista blanca de usuario" - -#: rhodecode/controllers/admin/users.py:626 -msgid "Removed ip address from user whitelist" -msgstr "Se eliminó dirección ip de lista blanca de usuario" - -#: 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 "" @@ -1567,7 +1568,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 @@ -1578,8 +1579,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 @@ -1589,13 +1590,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 @@ -1604,13 +1605,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 @@ -1764,16 +1765,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 @@ -1809,11 +1809,11 @@ 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 " @@ -1821,172 +1821,172 @@ msgid "" "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 "[deleted] repositorio" -#: 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 "[created] repositorio" -#: rhodecode/lib/action_parser.py:95 +#: rhodecode/lib/action_parser.py:100 msgid "[created] repository as fork" msgstr "[created] repositorio como bifurcación" -#: 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 "[forked] repositorio" -#: 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 "[updated] repositorio" -#: 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 "Nombre de bifurcación %s" -#: 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 "Solicitud de extracción #%s" -#: 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 +#: rhodecode/lib/action_parser.py:227 msgid "compare view" msgstr "comparar vista" -#: rhodecode/lib/action_parser.py:227 +#: 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 "Se eliminó rama: %s" -#: 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 "IP %s no permitida" -#: rhodecode/lib/auth.py:1281 +#: rhodecode/lib/auth.py:1309 msgid "You need to be a registered user to perform this action" msgstr "Usted necesita ser un usuario registrado para llevar a cabo esta acción" -#: rhodecode/lib/auth.py:1329 +#: rhodecode/lib/auth.py:1366 #, python-format msgid "Action not supported for %s." msgstr "Acción no soportada para %s" -#: rhodecode/lib/auth.py:1379 +#: rhodecode/lib/auth.py:1412 msgid "You need to be signed in to view this page" msgstr "Usted necesita estar en sesión para ver esta página" -#: rhodecode/lib/base.py:549 +#: rhodecode/lib/base.py:561 #, python-format msgid "The repository at %(repo_name)s cannot be located." msgstr "" @@ -2012,20 +2012,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" @@ -2040,7 +2041,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" @@ -2082,7 +2097,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 "" @@ -2117,7 +2132,7 @@ msgstr "" #: 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/model/db.py:2482 msgid "Repository no access" msgstr "" @@ -2151,7 +2166,7 @@ msgstr "" #: 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/model/db.py:2483 msgid "Repository read access" msgstr "" @@ -2185,7 +2200,7 @@ msgstr "" #: 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/model/db.py:2484 msgid "Repository write access" msgstr "" @@ -2219,7 +2234,7 @@ msgstr "" #: 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/model/db.py:2485 msgid "Repository admin access" msgstr "" @@ -2293,7 +2308,7 @@ msgstr "" #: 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/model/db.py:2503 msgid "Repository creation disabled" msgstr "" @@ -2327,7 +2342,7 @@ msgstr "" #: 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/model/db.py:2504 msgid "Repository creation enabled" msgstr "" @@ -2361,7 +2376,7 @@ msgstr "" #: 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/model/db.py:2508 msgid "Repository forking disabled" msgstr "" @@ -2395,7 +2410,7 @@ msgstr "" #: 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/model/db.py:2509 msgid "Repository forking enabled" msgstr "" @@ -2450,7 +2465,7 @@ msgstr "" #: 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/model/db.py:3212 msgid "Not Reviewed" msgstr "" @@ -2484,7 +2499,7 @@ msgstr "" #: 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/model/db.py:3213 msgid "Approved" msgstr "" @@ -2518,7 +2533,7 @@ msgstr "" #: 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/model/db.py:3214 msgid "Rejected" msgstr "" @@ -2552,7 +2567,7 @@ msgstr "" #: 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/model/db.py:3215 msgid "Under Review" msgstr "" @@ -2583,7 +2598,7 @@ msgstr "" #: 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/model/db.py:2487 msgid "Repository group no access" msgstr "" @@ -2614,7 +2629,7 @@ msgstr "" #: 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/model/db.py:2488 msgid "Repository group read access" msgstr "" @@ -2645,7 +2660,7 @@ msgstr "" #: 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/model/db.py:2489 msgid "Repository group write access" msgstr "" @@ -2676,7 +2691,7 @@ msgstr "" #: 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/model/db.py:2490 msgid "Repository group admin access" msgstr "" @@ -2706,7 +2721,7 @@ msgstr "" #: 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/model/db.py:2492 msgid "User group no access" msgstr "" @@ -2736,7 +2751,7 @@ msgstr "" #: 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/model/db.py:2493 msgid "User group read access" msgstr "" @@ -2766,7 +2781,7 @@ msgstr "" #: 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/model/db.py:2494 msgid "User group write access" msgstr "" @@ -2796,7 +2811,7 @@ msgstr "" #: 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/model/db.py:2495 msgid "User group admin access" msgstr "" @@ -2826,7 +2841,7 @@ msgstr "" #: 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/model/db.py:2497 msgid "Repository Group creation disabled" msgstr "" @@ -2856,7 +2871,7 @@ msgstr "" #: 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/model/db.py:2498 msgid "Repository Group creation enabled" msgstr "" @@ -2886,7 +2901,7 @@ msgstr "" #: 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/model/db.py:2500 msgid "User Group creation disabled" msgstr "" @@ -2916,7 +2931,7 @@ msgstr "" #: 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/model/db.py:2501 msgid "User Group creation enabled" msgstr "" @@ -2946,7 +2961,7 @@ msgstr "" #: 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/model/db.py:2511 msgid "Registration disabled" msgstr "" @@ -2976,7 +2991,7 @@ msgstr "" #: 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/model/db.py:2512 msgid "User Registration with manual account activation" msgstr "" @@ -3006,7 +3021,7 @@ msgstr "" #: 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/model/db.py:2513 msgid "User Registration with automatic account activation" msgstr "" @@ -3036,7 +3051,7 @@ msgstr "" #: 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/model/permission.py:95 +#: rhodecode/model/db.py:2519 rhodecode/model/permission.py:95 msgid "Manual activation of external account" msgstr "" @@ -3066,7 +3081,7 @@ msgstr "" #: 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/model/permission.py:96 +#: rhodecode/model/db.py:2520 rhodecode/model/permission.py:96 msgid "Automatic activation of external account" msgstr "" @@ -3090,7 +3105,7 @@ msgstr "" #: 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/model/db.py:2505 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3115,7 +3130,7 @@ msgstr "" #: 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/model/db.py:2506 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3137,7 +3152,7 @@ msgstr "" #: 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/model/db.py:2480 msgid "RhodeCode Super Administrator" msgstr "" @@ -3156,7 +3171,7 @@ msgstr "" #: 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/model/db.py:2522 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3175,7 +3190,7 @@ msgstr "" #: 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/model/db.py:2523 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3185,7 +3200,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 "" @@ -3195,7 +3210,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 "" @@ -3205,7 +3220,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 "" @@ -3215,7 +3230,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 "" @@ -3225,7 +3240,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 "" @@ -3236,65 +3251,65 @@ msgstr "" #: 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/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/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/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/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 "Consulta de búsqueda inválidad. Intente agregar comillas." -#: 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 "No hay un índice en el cual buscar. Por favor execute el indexador whoosh" -#: rhodecode/lib/index/whoosh.py:156 +#: rhodecode/lib/index/whoosh.py:157 msgid "An error occurred during this search operation" msgstr "Un error ocurrió durante esta operación de búsqueda" -#: 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 "" @@ -3380,7 +3395,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 "" @@ -3388,7 +3403,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 "" @@ -3396,10 +3411,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 "" @@ -3422,7 +3437,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 @@ -3432,9 +3447,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 "" @@ -3465,93 +3480,93 @@ 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 "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." -msgstr "" - -#: rhodecode/model/pull_request.py:124 +"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" @@ -3559,92 +3574,96 @@ 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 "La aprobacion del revisador de la solicitud de extracción está pendiente" -#: 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 " @@ -3670,6 +3689,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" @@ -3779,98 +3799,113 @@ 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" @@ -3943,253 +3978,263 @@ 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 @@ -4198,28 +4243,28 @@ 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 " @@ -4228,14 +4273,14 @@ 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 ..." @@ -4243,105 +4288,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 "" @@ -4356,151 +4466,151 @@ 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 "" @@ -4582,7 +4692,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 @@ -4590,7 +4700,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 "" @@ -4605,7 +4715,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 @@ -4613,9 +4723,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 @@ -4623,9 +4734,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 "" @@ -4636,7 +4747,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 @@ -4659,13 +4770,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 "" @@ -4680,7 +4791,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 "" @@ -4705,14 +4816,14 @@ 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 "" @@ -4772,7 +4883,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 "" @@ -4782,7 +4893,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 "" @@ -4794,36 +4905,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 @@ -4831,38 +4938,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 "" @@ -4905,8 +5019,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 @@ -4947,7 +5061,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 " @@ -5002,7 +5116,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 "" @@ -5013,9 +5127,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 @@ -5084,14 +5198,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 "" @@ -5152,12 +5265,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 "" @@ -5198,11 +5311,11 @@ 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:251 msgid "Settings" msgstr "" @@ -5305,7 +5418,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 "" @@ -5329,7 +5442,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 "" @@ -5346,7 +5459,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" @@ -5406,7 +5519,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 "" @@ -5425,9 +5538,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 @@ -5513,13 +5624,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 "" @@ -5537,7 +5648,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 "" @@ -5558,6 +5669,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 "" @@ -5620,23 +5735,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 "" @@ -5734,9 +5849,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 "" @@ -5793,26 +5908,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" @@ -5820,8 +5935,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 "" @@ -5831,7 +5946,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" @@ -5901,7 +6016,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." @@ -5912,7 +6027,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)" @@ -5932,7 +6046,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 "" @@ -5964,36 +6078,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 "" @@ -6028,93 +6142,86 @@ 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 +#: 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." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 +"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 "" @@ -6122,46 +6229,45 @@ msgstr "" msgid "Invalidate Cache for Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Invalidate repository cache" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Confirm to invalidate repository cache" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:14 +#: 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: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: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: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 "" @@ -6237,20 +6343,29 @@ 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 "" @@ -6258,11 +6373,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 "" @@ -6270,57 +6385,91 @@ 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 @@ -6328,65 +6477,62 @@ 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" @@ -6453,32 +6599,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 @@ -7048,12 +7186,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 "" @@ -7090,46 +7228,39 @@ 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 "" @@ -7221,24 +7352,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 "" @@ -7252,7 +7387,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 "" @@ -7373,6 +7508,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" @@ -7382,12 +7522,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" @@ -7434,7 +7586,7 @@ msgstr "" msgid "Users administration" msgstr "" -#: rhodecode/templates/admin/users/users.mako:77 +#: rhodecode/templates/admin/users/users.mako:78 msgid "Auth type" msgstr "" @@ -7502,110 +7654,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 @@ -7627,15 +7779,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 "" @@ -7742,10 +7894,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" @@ -7825,7 +7977,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 "" @@ -7936,93 +8088,105 @@ msgid "" "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 "Solicitudes por proxy HTTP subversion" -#: rhodecode/templates/base/vcs_settings.mako:203 +#: 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:204 +#: rhodecode/templates/base/vcs_settings.mako:217 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:210 +#: rhodecode/templates/base/vcs_settings.mako:223 msgid "Subversion HTTP Server URL" msgstr "URL de Servidor HTTP Subversion" -#: rhodecode/templates/base/vcs_settings.mako:216 +#: 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 " @@ -8030,11 +8194,11 @@ msgid "" "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." @@ -8054,10 +8218,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 "" @@ -8076,10 +8240,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 "" @@ -8117,19 +8281,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 "" @@ -8146,7 +8310,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" @@ -8154,44 +8318,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 "" @@ -8199,100 +8385,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" @@ -8300,8 +8464,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" @@ -8309,19 +8473,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 "" @@ -8347,73 +8511,81 @@ 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 @@ -8452,7 +8624,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" @@ -8461,7 +8633,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" @@ -8633,26 +8805,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 "" @@ -8690,6 +8862,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 "" @@ -8903,6 +9076,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" @@ -9024,6 +9201,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 "" @@ -9097,8 +9275,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" @@ -9122,7 +9298,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 "" @@ -9193,6 +9369,7 @@ msgid "Remove Custom Path" msgstr "" #: rhodecode/templates/files/files_add.mako:50 +#: rhodecode/templates/files/files_add.mako:59 msgid "Filename" msgstr "" @@ -9200,34 +9377,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 "" @@ -9248,6 +9425,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 "" @@ -9360,7 +9542,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] "" @@ -9424,6 +9605,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 "" @@ -9461,6 +9646,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 "" @@ -9491,65 +9683,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 "" @@ -9597,10 +9799,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 "" @@ -9699,77 +9897,77 @@ 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 "" @@ -9859,6 +10057,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 "" @@ -9890,34 +10093,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 "" @@ -9998,6 +10173,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/i18n/fr/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-04-07 12:33+0200\n" -"PO-Revision-Date: 2017-04-07 10:34+0000\n" +"POT-Creation-Date: 2017-06-27 17:25+0200\n" +"PO-Revision-Date: 2017-06-27 15:26+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: French (http://www.transifex.com/rhodecode/RhodeCode/language/fr/)\n" "MIME-Version: 1.0\n" @@ -26,7 +26,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 "" @@ -39,7 +39,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 "" @@ -50,7 +50,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" @@ -77,7 +77,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 "" @@ -99,11 +99,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 "" @@ -115,249 +115,416 @@ 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 "Vous ne pouvez pas éditer cet utilisateur" -#: rhodecode/apps/admin/views/users.py:178 -#: rhodecode/apps/my_account/views.py:138 +#: 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:179 -#: rhodecode/apps/my_account/views.py:139 +#: rhodecode/apps/admin/views/users.py:169 +#: rhodecode/apps/my_account/views.py:149 #: rhodecode/controllers/admin/gists.py:63 msgid "5 minutes" msgstr "5 minute" -#: rhodecode/apps/admin/views/users.py:180 -#: rhodecode/apps/my_account/views.py:140 +#: rhodecode/apps/admin/views/users.py:170 +#: rhodecode/apps/my_account/views.py:150 #: rhodecode/controllers/admin/gists.py:64 msgid "1 hour" msgstr "1 heure" -#: rhodecode/apps/admin/views/users.py:181 -#: rhodecode/apps/my_account/views.py:141 +#: rhodecode/apps/admin/views/users.py:171 +#: rhodecode/apps/my_account/views.py:151 #: rhodecode/controllers/admin/gists.py:65 msgid "1 day" msgstr "1 jour" -#: rhodecode/apps/admin/views/users.py:182 -#: rhodecode/apps/my_account/views.py:142 +#: rhodecode/apps/admin/views/users.py:172 +#: rhodecode/apps/my_account/views.py:152 #: rhodecode/controllers/admin/gists.py:66 msgid "1 month" msgstr "1 mois" -#: rhodecode/apps/admin/views/users.py:184 -#: rhodecode/apps/my_account/views.py:144 +#: 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:188 -#: rhodecode/apps/my_account/views.py:148 +#: rhodecode/apps/admin/views/users.py:178 +#: 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 "Une erreur est survenue durant l’enregistrement de l’e-mail." + +#: 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 "Dépôts" + +#: rhodecode/apps/home/views.py:223 +msgid "Groups" +msgstr "Groupes" + +#: 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 "Une erreur est survenue durant l’invalidation du cache." + +#: 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 "La visibilité du dépôt dans le journal public a été mise à jour." + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:156 +msgid "An error occurred during setting this repository in public journal" +msgstr "Une erreur est survenue durant la configuration du journal public pour ce dépôt." + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:184 +msgid "Nothing" +msgstr "[Aucun dépôt]" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:186 +#, python-format +msgid "Marked repo %s as fork of %s" +msgstr "Le dépôt %s a été marké comme fork de %s" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 +msgid "An error occurred during this operation" +msgstr "Une erreur est survenue durant cette opération." + +#: 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 "Une erreur est survenue durant le déverrouillage." + +#: 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 "Branches" + +#: 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 "" @@ -415,7 +582,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 "Port" @@ -445,7 +612,7 @@ msgstr "" msgid "Admin Groups" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:215 +#: rhodecode/authentication/plugins/auth_crowd.py:216 msgid "CROWD" msgstr "" @@ -495,126 +662,130 @@ 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 "Compte" -#: 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 "Mot de passe" -#: 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 "Vérif. des certificats" -#: 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 "Base de recherche" -#: 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 "Portée de recherche" -#: 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 "Attribut pour le nom d’utilisateur" -#: 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 "Attribut pour le prénom" -#: 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 "Attribut pour le nom de famille" -#: 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 "" @@ -647,76 +818,73 @@ 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 " @@ -742,51 +910,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 "Une erreur est survenue durant le commit" -#: 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 "Aucun changement" -#: rhodecode/controllers/files.py:578 rhodecode/controllers/files.py:707 -#, python-format -msgid "Successfully committed to %s" -msgstr "Commit réalisé avec succès sur %s" - -#: 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 "" @@ -794,41 +958,39 @@ msgstr "" msgid "No filename" msgstr "Aucun nom de fichier" +#: 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 "Les téléchargements sont désactivés" -#: rhodecode/controllers/files.py:770 +#: rhodecode/controllers/files.py:769 #, python-format msgid "Unknown revision %s" msgstr "Révision %s inconnue." -#: rhodecode/controllers/files.py:772 +#: rhodecode/controllers/files.py:771 msgid "Empty repository" msgstr "Dépôt vide." -#: 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 "Type d’archive inconnu" -#: rhodecode/controllers/files.py:993 +#: rhodecode/controllers/files.py:1000 msgid "Changesets" msgstr "Changesets" -#: 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 "Branches" - -#: 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 "Tags" @@ -837,28 +999,6 @@ msgstr "Tags" msgid "An error occurred during repository forking %s" msgstr "Une erreur est survenue durant le fork du dépôt %s." -#: rhodecode/controllers/home.py:207 -msgid "Groups" -msgstr "Groupes" - -#: 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 "Dépôts" - -#: 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 "Journal public" @@ -867,84 +1007,60 @@ msgstr "Journal public" msgid "journal" msgstr "Journal" -#: 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 "Les requêtes de pull nécessitent un titre d’au moins 3 caractères." -#: 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 "La requête de pull a été ouverte avec succès." -#: rhodecode/controllers/pullrequests.py:388 -msgid "Error occurred during sending pull request" -msgstr "Une erreur est survenue durant l’envoi de la requête de pull." - -#: 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:437 +#: rhodecode/controllers/pullrequests.py:328 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/controllers/pullrequests.py:455 +#: 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:472 +#: rhodecode/controllers/pullrequests.py:363 msgid "Reload page" msgstr "" -#: rhodecode/controllers/pullrequests.py:546 +#: rhodecode/controllers/pullrequests.py:437 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 "La requête de pull a été supprimée avec succès." -#: 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 "" @@ -1000,89 +1116,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 "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon fonctionnement de l’application." -#: rhodecode/controllers/admin/my_account.py:138 +#: rhodecode/controllers/admin/my_account.py:110 msgid "Your account was updated successfully" msgstr "Votre compte a été mis à jour avec succès" -#: 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 "Une erreur est survenue durant l’enregistrement de l’e-mail." - -#: 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 "" @@ -1092,366 +1192,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 "dépôt %s forké en tant que %s" -#: 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 "Dépôt %s mis à jour avec succès." - -#: 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 "Impossible de supprimer le dépôt %s : Des forks y sont attachés." - -#: rhodecode/controllers/admin/repos.py:390 -#, python-format -msgid "An error occurred during deletion of %s" -msgstr "Erreur pendant la suppression de %s" - -#: rhodecode/controllers/admin/repos.py:443 -msgid "Repository permissions updated" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:474 +#: rhodecode/controllers/admin/repos.py:319 msgid "An error occurred during creation of field" msgstr "" -#: rhodecode/controllers/admin/repos.py:489 +#: rhodecode/controllers/admin/repos.py:334 msgid "An error occurred during removal of field" msgstr "" -#: rhodecode/controllers/admin/repos.py:528 -msgid "Updated repository visibility in public journal" -msgstr "La visibilité du dépôt dans le journal public a été mise à jour." - -#: rhodecode/controllers/admin/repos.py:532 -msgid "An error occurred during setting this repository in public journal" -msgstr "Une erreur est survenue durant la configuration du journal public pour ce dépôt." - -#: rhodecode/controllers/admin/repos.py:556 -msgid "Nothing" -msgstr "[Aucun dépôt]" - -#: rhodecode/controllers/admin/repos.py:558 -#, python-format -msgid "Marked repo %s as fork of %s" -msgstr "Le dépôt %s a été marké comme fork de %s" - -#: rhodecode/controllers/admin/repos.py:565 -msgid "An error occurred during this operation" -msgstr "Une erreur est survenue durant cette opération." - -#: 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 "Une erreur est survenue durant le déverrouillage." - -#: rhodecode/controllers/admin/repos.py:608 +#: rhodecode/controllers/admin/repos.py:353 msgid "Unlocked" msgstr "" -#: rhodecode/controllers/admin/repos.py:612 +#: rhodecode/controllers/admin/repos.py:357 msgid "Locked" msgstr "" -#: rhodecode/controllers/admin/repos.py:614 +#: rhodecode/controllers/admin/repos.py:359 #, python-format msgid "Repository has been %s" msgstr "Le dépôt a été %s." -#: 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 "Une erreur est survenue durant l’invalidation du cache." - -#: rhodecode/controllers/admin/repos.py:653 +#: rhodecode/controllers/admin/repos.py:373 msgid "Pulled from remote location" msgstr "Les changements distants ont été récupérés." -#: rhodecode/controllers/admin/repos.py:656 +#: rhodecode/controllers/admin/repos.py:376 msgid "An error occurred during pull from remote location" msgstr "Une erreur est survenue durant le pull depuis la source distante." -#: rhodecode/controllers/admin/repos.py:678 +#: rhodecode/controllers/admin/repos.py:397 msgid "An error occurred during deletion of repository stats" msgstr "Une erreur est survenue durant la suppression des statistiques du dépôt." -#: rhodecode/controllers/admin/repos.py:725 +#: rhodecode/controllers/admin/repos.py:443 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 "Réglages des gestionnaires de versions mis à jour." #: 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 "Réglages mis à jour" -#: rhodecode/controllers/admin/settings.py:345 +#: rhodecode/controllers/admin/settings.py:348 msgid "Updated visualisation settings" msgstr "Réglages d’affichage mis à jour." -#: rhodecode/controllers/admin/settings.py:348 +#: 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 "Le nouveau hook a été ajouté." -#: rhodecode/controllers/admin/settings.py:507 +#: rhodecode/controllers/admin/settings.py:510 msgid "Updated hooks" msgstr "Hooks mis à jour" -#: 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 "Une erreur est survenue durant l’enregistrement des permissions." -#: 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 "L’utilisateur a été mis à jour avec succès." -#: 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 "Une erreur est survenue durant la suppression de l’utilisateur." +#: 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 "" @@ -1461,81 +1480,63 @@ msgid "" "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 "" @@ -1567,7 +1568,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 @@ -1578,8 +1579,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 @@ -1589,13 +1590,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 "Réinitialiser" -#: 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 @@ -1604,13 +1605,13 @@ msgstr "Réinitialiser" #: 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 @@ -1764,16 +1765,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 @@ -1809,11 +1809,11 @@ 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 " @@ -1821,172 +1821,172 @@ msgid "" "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 "[a supprimé] le dépôt" -#: 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 "[a créé] le dépôt" -#: rhodecode/lib/action_parser.py:95 +#: rhodecode/lib/action_parser.py:100 msgid "[created] repository as fork" msgstr "[a créé] le dépôt en tant que fork" -#: 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 "[a forké] le dépôt" -#: 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 "[a mis à jour] le dépôt" -#: 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 "[a supprimé] le dépôt" -#: rhodecode/lib/action_parser.py:119 +#: rhodecode/lib/action_parser.py:124 msgid "[created] user" msgstr "[a créé] l’utilisateur" -#: rhodecode/lib/action_parser.py:122 +#: rhodecode/lib/action_parser.py:127 msgid "[updated] user" msgstr "[a mis à jour] l’utilisateur" -#: 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 "[a commenté] la requête de pull pour" -#: rhodecode/lib/action_parser.py:137 +#: rhodecode/lib/action_parser.py:142 msgid "[closed] pull request for" msgstr "[a fermé] la requête de pull de" -#: 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 "[a pushé] dans" -#: rhodecode/lib/action_parser.py:146 +#: rhodecode/lib/action_parser.py:151 msgid "[committed via RhodeCode] into repository" msgstr "[a commité via RhodeCode] dans le dépôt" -#: rhodecode/lib/action_parser.py:149 +#: rhodecode/lib/action_parser.py:154 msgid "[pulled from remote] into repository" msgstr "[a pullé depuis un site distant] dans le dépôt" -#: rhodecode/lib/action_parser.py:152 +#: rhodecode/lib/action_parser.py:157 msgid "[pulled] from" msgstr "[a pullé] depuis" -#: rhodecode/lib/action_parser.py:155 +#: rhodecode/lib/action_parser.py:160 msgid "[started following] repository" msgstr "[suit maintenant] le dépôt" -#: rhodecode/lib/action_parser.py:158 +#: rhodecode/lib/action_parser.py:163 msgid "[stopped following] repository" msgstr "[ne suit plus] le dépôt" -#: 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 "Requête de pull #%s" -#: 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 "vue de comparaison" - #: rhodecode/lib/action_parser.py:227 +msgid "compare view" +msgstr "vue de comparaison" + +#: 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 "Vous devez être un utilisateur enregistré pour effectuer cette action." -#: 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 "" @@ -2012,20 +2012,21 @@ msgstr "Aucun changement détecté." msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1517 +#: rhodecode/lib/helpers.py:1527 #, python-format msgid " and %s more" msgstr "et %s de plus" -#: rhodecode/lib/helpers.py:1521 +#: rhodecode/lib/helpers.py:1531 msgid "No Files" msgstr "Aucun fichier" -#: 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" @@ -2040,7 +2041,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" @@ -2082,7 +2097,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 "à l’instant" @@ -2117,7 +2132,7 @@ msgstr "à l’instant" #: 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/model/db.py:2482 msgid "Repository no access" msgstr "Aucun accès au dépôt" @@ -2151,7 +2166,7 @@ msgstr "Aucun accès au dépôt" #: 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/model/db.py:2483 msgid "Repository read access" msgstr "Accès en lecture au dépôt" @@ -2185,7 +2200,7 @@ msgstr "Accès en lecture au dépôt" #: 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/model/db.py:2484 msgid "Repository write access" msgstr "Accès en écriture au dépôt" @@ -2219,7 +2234,7 @@ msgstr "Accès en écriture au dépôt" #: 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/model/db.py:2485 msgid "Repository admin access" msgstr "Accès administrateur au dépôt" @@ -2293,7 +2308,7 @@ msgstr "Administrateur RhodeCode" #: 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/model/db.py:2503 msgid "Repository creation disabled" msgstr "Création de dépôt désactivée" @@ -2327,7 +2342,7 @@ msgstr "Création de dépôt désactivée" #: 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/model/db.py:2504 msgid "Repository creation enabled" msgstr "Création de dépôt activée" @@ -2361,7 +2376,7 @@ msgstr "Création de dépôt activée" #: 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/model/db.py:2508 msgid "Repository forking disabled" msgstr "Fork de dépôt désactivé" @@ -2395,7 +2410,7 @@ msgstr "Fork de dépôt désactivé" #: 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/model/db.py:2509 msgid "Repository forking enabled" msgstr "Fork de dépôt activé" @@ -2450,7 +2465,7 @@ msgstr "Enregistrer un nouvel utilisateur Rhodecode auto-activé" #: 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/model/db.py:3212 msgid "Not Reviewed" msgstr "Pas encore relue" @@ -2484,7 +2499,7 @@ msgstr "Pas encore relue" #: 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/model/db.py:3213 msgid "Approved" msgstr "Approuvée " @@ -2518,7 +2533,7 @@ msgstr "Approuvée " #: 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/model/db.py:3214 msgid "Rejected" msgstr "Rejetée" @@ -2552,7 +2567,7 @@ msgstr "Rejetée" #: 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/model/db.py:3215 msgid "Under Review" msgstr "En cours de relecture" @@ -2583,7 +2598,7 @@ msgstr "En cours de relecture" #: 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/model/db.py:2487 msgid "Repository group no access" msgstr "" @@ -2614,7 +2629,7 @@ msgstr "" #: 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/model/db.py:2488 msgid "Repository group read access" msgstr "" @@ -2645,7 +2660,7 @@ msgstr "" #: 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/model/db.py:2489 msgid "Repository group write access" msgstr "" @@ -2676,7 +2691,7 @@ msgstr "" #: 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/model/db.py:2490 msgid "Repository group admin access" msgstr "" @@ -2706,7 +2721,7 @@ msgstr "" #: 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/model/db.py:2492 msgid "User group no access" msgstr "" @@ -2736,7 +2751,7 @@ msgstr "" #: 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/model/db.py:2493 msgid "User group read access" msgstr "" @@ -2766,7 +2781,7 @@ msgstr "" #: 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/model/db.py:2494 msgid "User group write access" msgstr "" @@ -2796,7 +2811,7 @@ msgstr "" #: 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/model/db.py:2495 msgid "User group admin access" msgstr "" @@ -2826,7 +2841,7 @@ msgstr "" #: 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/model/db.py:2497 msgid "Repository Group creation disabled" msgstr "" @@ -2856,7 +2871,7 @@ msgstr "" #: 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/model/db.py:2498 msgid "Repository Group creation enabled" msgstr "" @@ -2886,7 +2901,7 @@ msgstr "" #: 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/model/db.py:2500 msgid "User Group creation disabled" msgstr "" @@ -2916,7 +2931,7 @@ msgstr "" #: 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/model/db.py:2501 msgid "User Group creation enabled" msgstr "" @@ -2946,7 +2961,7 @@ msgstr "" #: 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/model/db.py:2511 msgid "Registration disabled" msgstr "" @@ -2976,7 +2991,7 @@ msgstr "" #: 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/model/db.py:2512 msgid "User Registration with manual account activation" msgstr "" @@ -3006,7 +3021,7 @@ msgstr "" #: 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/model/db.py:2513 msgid "User Registration with automatic account activation" msgstr "" @@ -3036,7 +3051,7 @@ msgstr "" #: 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/model/permission.py:95 +#: rhodecode/model/db.py:2519 rhodecode/model/permission.py:95 msgid "Manual activation of external account" msgstr "" @@ -3066,7 +3081,7 @@ msgstr "" #: 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/model/permission.py:96 +#: rhodecode/model/db.py:2520 rhodecode/model/permission.py:96 msgid "Automatic activation of external account" msgstr "" @@ -3090,7 +3105,7 @@ msgstr "" #: 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/model/db.py:2505 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3115,7 +3130,7 @@ msgstr "" #: 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/model/db.py:2506 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3137,7 +3152,7 @@ msgstr "" #: 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/model/db.py:2480 msgid "RhodeCode Super Administrator" msgstr "" @@ -3156,7 +3171,7 @@ msgstr "" #: 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/model/db.py:2522 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3175,7 +3190,7 @@ msgstr "" #: 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/model/db.py:2523 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3185,7 +3200,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 "" @@ -3195,7 +3210,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 "" @@ -3205,7 +3220,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 "" @@ -3215,7 +3230,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 "" @@ -3225,7 +3240,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 "" @@ -3236,65 +3251,65 @@ msgstr "" #: 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/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/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/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/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 "Requête invalide. Essayer de la mettre entre guillemets." -#: 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 "L’index de recherche n’est pas présent. Veuillez exécuter l’indexeur de code Whoosh." -#: rhodecode/lib/index/whoosh.py:156 +#: rhodecode/lib/index/whoosh.py:157 msgid "An error occurred during this search operation" msgstr "Une erreur est survenue durant l’opération de recherche." -#: 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 "" @@ -3380,7 +3395,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 "Aucun" @@ -3388,7 +3403,7 @@ msgstr "Aucun" #: 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 "Lire" @@ -3396,10 +3411,10 @@ msgstr "Lire" #: 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 "Écrire" @@ -3422,7 +3437,7 @@ msgstr "Écrire" #: 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 @@ -3432,9 +3447,9 @@ msgstr "Écrire" #: 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 "Administration" @@ -3465,93 +3480,93 @@ 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 "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." -msgstr "" - -#: rhodecode/model/pull_request.py:124 +"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" @@ -3559,92 +3574,96 @@ 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 "Signets" -#: 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 "Dernier sommet" -#: 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 "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon fonctionnement de l’application." -#: 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 "Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le bon fonctionnement de l’application." -#: 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 " @@ -3670,6 +3689,7 @@ msgid "Username \"%(username)s\" is forb msgstr "Le nom d’utilisateur « %(username)s » n’est pas autorisé" #: 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" @@ -3779,98 +3799,113 @@ 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 "Le fork doit être du même type que le parent." -#: 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 "Ceci n’est pas un chemin valide" -#: rhodecode/model/validators.py:861 +#: rhodecode/model/validators.py:894 msgid "This e-mail address is already taken" msgstr "Cette adresse e-mail est déjà enregistrée" -#: rhodecode/model/validators.py:881 +#: rhodecode/model/validators.py:914 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "L’adresse e-mail « %(email)s » n’existe pas" -#: 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 "Les révisions %(revs)s font déjà partie de la requête de pull ou on des statuts définis." -#: 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" @@ -3943,253 +3978,263 @@ 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 @@ -4198,28 +4243,28 @@ 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 " @@ -4228,14 +4273,14 @@ 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 "Envoi…" #: 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 ..." @@ -4243,105 +4288,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 "Lien vers la sélection" #: 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 "Arrêter de suivre ce dépôt" #: 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 "Suivre ce dépôt" #: 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 "" @@ -4356,151 +4466,151 @@ 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 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 "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:29 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 #: rhodecode/templates/changelog/changelog.mako:61 msgid "Open new pull request" msgstr "Nouvelle requête de pull" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 +#: 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:35 +#: 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 "Envoyer" -#: 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 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 msgid "" "There are currently no open pull requests requiring your participation." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "Désactivé" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: 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:62 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 msgid "files" msgstr "Fichiers" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 -#: rhodecode/templates/pullrequests/pullrequest.mako:108 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "Chargement…" -#: 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 "" @@ -4582,7 +4692,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 @@ -4590,7 +4700,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 "Nom" @@ -4605,7 +4715,7 @@ msgstr "Nom" #: 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 @@ -4613,9 +4723,10 @@ msgstr "Nom" #: 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 @@ -4623,9 +4734,9 @@ msgstr "Nom" #: 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 "Description" @@ -4636,7 +4747,7 @@ msgstr "Description" #: 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 @@ -4659,13 +4770,13 @@ msgstr "Dernière modification" #: 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 "" @@ -4680,7 +4791,7 @@ msgid "Home" msgstr "Accueil" #: 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 "Connexion" @@ -4705,14 +4816,14 @@ 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 "ou" @@ -4772,7 +4883,7 @@ msgstr "Confirmation" #: 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 "Prénom" @@ -4782,7 +4893,7 @@ msgstr "Prénom" #: 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 "Nom" @@ -4794,36 +4905,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 "Historique d’administration" - -#: 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 @@ -4831,38 +4938,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 "Action" -#: 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 "Dépôt" -#: 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 "Date" -#: rhodecode/templates/admin/admin_log.mako:11 -#: rhodecode/templates/admin/users/user_edit_audit.mako:26 -msgid "From IP" -msgstr "Depuis l’adresse IP" - -#: 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 "Aucune action n’a été enregistrée pour le moment." @@ -4905,8 +5019,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 @@ -4947,7 +5061,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 " @@ -5002,7 +5116,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 "" @@ -5013,9 +5127,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 @@ -5084,14 +5198,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 "Auteur" @@ -5152,12 +5265,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 "" @@ -5198,11 +5311,11 @@ 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:251 msgid "Settings" msgstr "Options" @@ -5305,7 +5418,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 "Mon compte" @@ -5329,7 +5442,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 "" @@ -5346,7 +5459,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" @@ -5406,7 +5519,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 "Ajouter" @@ -5425,10 +5538,8 @@ 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" -msgstr "Veuillez confirmer la suppression de l’e-mail : %s" +msgid "Confirm to delete this email: {}" +msgstr "" #: rhodecode/templates/admin/my_account/my_account_emails.mako:42 #: rhodecode/templates/admin/users/user_edit_emails.mako:41 @@ -5513,13 +5624,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 "Titre" #: 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 "" @@ -5537,7 +5648,7 @@ msgid "My Notifications" msgstr "Mes notifications" #: rhodecode/templates/admin/notifications/notifications.mako:32 -#: rhodecode/templates/changeset/changeset.mako:140 +#: rhodecode/templates/changeset/changeset.mako:160 msgid "Comments" msgstr "Commentaires" @@ -5558,6 +5669,10 @@ msgstr "Notification" msgid "Notifications" msgstr "Notifications" +#: rhodecode/templates/admin/notifications/show_notification.mako:40 +msgid "Subject" +msgstr "" + #: rhodecode/templates/admin/permissions/permissions.mako:5 msgid "Permissions Administration" msgstr "" @@ -5620,23 +5735,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 "" @@ -5734,9 +5849,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 "" @@ -5793,26 +5908,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 "Propriétaire" #: 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" @@ -5820,8 +5935,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 "" @@ -5831,7 +5946,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" @@ -5901,7 +6016,7 @@ msgid "Clone from" msgstr "Cloner depuis" #: 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." @@ -5912,7 +6027,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)" @@ -5932,7 +6046,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 "" @@ -5964,36 +6078,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 "Dépôt distant" -#: 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 "Statistiques" -#: 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 "" @@ -6028,93 +6142,86 @@ msgstr "Marquer ce dépôt comme fork d’un autre dépôt de la liste." 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 "Voulez-vous vraiment supprimer le dépôt %s ?" -#: 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 +#: 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." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 +"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 "" @@ -6122,46 +6229,45 @@ msgstr "" msgid "Invalidate Cache for Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Invalidate repository cache" -msgstr "Invalider le cache du dépôt" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Confirm to invalidate repository cache" -msgstr "Voulez-vous vraiment invalider le cache du dépôt ?" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:14 +#: 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: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: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 "Invalider le cache du dépôt" + +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:20 +msgid "Confirm to invalidate repository cache" +msgstr "Voulez-vous vraiment invalider le cache du dépôt ?" + +#: 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 "Actif" @@ -6237,20 +6343,29 @@ 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 "" @@ -6258,11 +6373,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 "Dépôt privé" -#: 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 "" @@ -6270,57 +6385,91 @@ 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 "Récupérer les changements depuis le site distant" -#: 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 "Voulez-vous vraiment récupérer les changements depuis le site distant ?" -#: 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 "Groupe de dépôt" + +#: 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 "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt." + +#: 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 @@ -6328,65 +6477,62 @@ msgstr "" msgid "edit" msgstr "éditer" -#: 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 "Groupe de dépôt" - -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:65 -msgid "Optional select a group to put this repository into." -msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt." - -#: 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 +#: 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 "Changer le propriétaire de ce dépôt." -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:108 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:138 #: rhodecode/templates/data_table/_dt_elements.mako:58 msgid "Private repository" msgstr "Dépôt privé" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:117 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:148 msgid "Enable statistics" msgstr "Activer les statistiques" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:121 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:153 msgid "Enable statistics window on summary page." msgstr "Afficher les statistiques sur la page du dépôt." -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:126 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:158 msgid "Enable downloads" msgstr "Activer les téléchargements" -#: 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 "Afficher le menu de téléchargements sur la page du dépôt." -#: 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" @@ -6453,32 +6599,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 "Auteur" - -#: 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 @@ -7048,12 +7186,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 "" @@ -7090,46 +7228,39 @@ 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 "" @@ -7221,24 +7352,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 "" @@ -7252,7 +7387,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 "" @@ -7373,6 +7508,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 "Veuillez confirmer la suppression de l’e-mail : %s" + #: rhodecode/templates/admin/users/user_edit_groups.mako:12 #, python-format msgid "Add `%s` to user group" @@ -7382,12 +7522,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" @@ -7434,7 +7586,7 @@ msgstr "" msgid "Users administration" msgstr "Administration des utilisateurs" -#: rhodecode/templates/admin/users/users.mako:77 +#: rhodecode/templates/admin/users/users.mako:78 msgid "Auth type" msgstr "" @@ -7502,110 +7654,110 @@ msgstr "Comparer" msgid "Show Pull Requests for %s" msgstr "" -#: rhodecode/templates/base/base.mako:246 +#: rhodecode/templates/base/base.mako:247 msgid "Options" msgstr "Options" -#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/base/base.mako:255 #: rhodecode/templates/forks/forks_data.mako:30 msgid "Compare fork" msgstr "Comparer le fork" -#: 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 "Rechercher" -#: rhodecode/templates/base/base.mako:260 +#: rhodecode/templates/base/base.mako:262 msgid "Unlock" msgstr "" -#: rhodecode/templates/base/base.mako:262 +#: 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 "Fork" + +#: 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 "Vous n’avez pas de compte ?" - -#: 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 "Historique" -#: 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 "Journal public" -#: 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 @@ -7627,15 +7779,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 "" @@ -7742,10 +7894,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" @@ -7825,7 +7977,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 "" @@ -7936,93 +8088,105 @@ msgid "" "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 " @@ -8030,11 +8194,11 @@ msgid "" "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." @@ -8054,10 +8218,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 "" @@ -8076,10 +8240,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 "" @@ -8117,19 +8281,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 "" @@ -8146,7 +8310,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" @@ -8154,44 +8318,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 "Fusion" -#: 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 "" @@ -8199,100 +8385,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 "Le dépôt existe déjà ?" - #: 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" @@ -8300,8 +8464,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" @@ -8309,19 +8473,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 "" @@ -8347,73 +8511,81 @@ 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 "Auteur" + +#: 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 "Se connecter maintenant" -#: 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 "Utilisez @nomutilisateur dans ce texte pour envoyer une notification à l’utilisateur RhodeCode en question." -#: 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 "Fermée" -#: 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 @@ -8452,7 +8624,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" @@ -8461,7 +8633,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" @@ -8633,26 +8805,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 "" @@ -8690,6 +8862,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 "" @@ -8903,6 +9076,10 @@ msgstr "" msgid "Form vertical" msgstr "" +#: rhodecode/templates/debug_style/login.html:56 +msgid "Don't have an account ?" +msgstr "Vous n’avez pas de compte ?" + #: rhodecode/templates/email_templates/base.mako:32 #, python-format msgid "This is a notification from RhodeCode. %(instance_url)s" @@ -9024,6 +9201,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 "" @@ -9097,8 +9275,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" @@ -9122,7 +9298,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 "Vous serez redirigé vers %s dans %s secondes." @@ -9193,6 +9369,7 @@ msgid "Remove Custom Path" msgstr "" #: rhodecode/templates/files/files_add.mako:50 +#: rhodecode/templates/files/files_add.mako:59 msgid "Filename" msgstr "" @@ -9200,34 +9377,34 @@ msgstr "" msgid "Upload File" msgstr "" -#: rhodecode/templates/files/files_add.mako:59 -msgid "Upload file" -msgstr "Téléverser un fichier" - -#: 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 "Téléverser un fichier" + +#: 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 "Commiter les changements" @@ -9248,6 +9425,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 "" @@ -9360,7 +9542,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] "" @@ -9424,6 +9605,10 @@ msgstr "" msgid "Fork name" msgstr "Nom du fork" +#: 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 "Copier les permissions" @@ -9461,6 +9646,13 @@ msgstr "Il n’y a pas encore de forks." 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 "Flux ATOM du journal" @@ -9491,65 +9683,75 @@ msgstr "Flux RSS du journal public" msgid "New pull request" msgstr "Nouvelle requête de pull" -#: 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 "Relecteurs de la requête de pull" -#: 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 "" @@ -9597,10 +9799,6 @@ msgstr "" msgid "Confirm to delete this pull request" msgstr "Veuillez confirmer la suppression de cette requête de pull." -#: rhodecode/templates/pullrequests/pullrequest_show.mako:71 -msgid "Origin" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:88 msgid "Common ancestor" msgstr "" @@ -9699,77 +9897,77 @@ 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 "" @@ -9859,6 +10057,11 @@ msgstr "Les messages de commit" msgid "File names" msgstr "Les noms de fichiers" +#: 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 "" @@ -9890,34 +10093,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 "" @@ -9998,6 +10173,18 @@ msgstr "Démarrage rapide" 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 "Le dépôt existe déjà ?" + #: rhodecode/templates/tags/tags.mako:5 #, python-format msgid "%s Tags" diff --git a/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-04-07 12:33+0200\n" -"PO-Revision-Date: 2017-04-07 10:34+0000\n" +"POT-Creation-Date: 2017-06-27 17:25+0200\n" +"PO-Revision-Date: 2017-06-27 15:26+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Italian (http://www.transifex.com/rhodecode/RhodeCode/language/it/)\n" "MIME-Version: 1.0\n" @@ -27,7 +27,7 @@ msgid "Global" msgstr "Globale" #: 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 "VCS" @@ -40,7 +40,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 "" @@ -51,7 +51,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" @@ -78,7 +78,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 "" @@ -100,11 +100,11 @@ msgstr "" msgid "Labs" msgstr "Laboratori" -#: 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 "" @@ -116,249 +116,416 @@ 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" -msgstr "Database" +msgid "Workers" +msgstr "" #: rhodecode/apps/admin/views/system_info.py:115 -msgid "Database version" -msgstr "Versione Database" +msgid "Worker Type" +msgstr "" #: rhodecode/apps/admin/views/system_info.py:119 -msgid "Platform" -msgstr "Piattaforma" +msgid "Database" +msgstr "Database" #: rhodecode/apps/admin/views/system_info.py:120 +msgid "Database version" +msgstr "Versione Database" + +#: rhodecode/apps/admin/views/system_info.py:124 +msgid "Platform" +msgstr "Piattaforma" + +#: rhodecode/apps/admin/views/system_info.py:125 msgid "Platform UUID" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:121 +#: rhodecode/apps/admin/views/system_info.py:126 msgid "Python version" msgstr "Versione python" -#: rhodecode/apps/admin/views/system_info.py:122 -msgid "Python path" -msgstr "Percorso Python" - -#: rhodecode/apps/admin/views/system_info.py:126 -msgid "CPU" -msgstr "CPU" - #: rhodecode/apps/admin/views/system_info.py:127 +msgid "Python path" +msgstr "Percorso Python" + +#: rhodecode/apps/admin/views/system_info.py:131 +msgid "CPU" +msgstr "CPU" + +#: rhodecode/apps/admin/views/system_info.py:132 msgid "Load" msgstr "Carico" -#: rhodecode/apps/admin/views/system_info.py:128 +#: rhodecode/apps/admin/views/system_info.py:133 msgid "Memory" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:129 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Uptime" msgstr "Attivo da" -#: rhodecode/apps/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Storage location" msgstr "Percorso di storage" -#: rhodecode/apps/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:139 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" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:138 -msgid "Gist 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 "Non si hanno i permessi per editare l'utente" -#: rhodecode/apps/admin/views/users.py:178 -#: rhodecode/apps/my_account/views.py:138 +#: rhodecode/apps/admin/views/users.py:168 +#: rhodecode/apps/my_account/views.py:148 #: rhodecode/controllers/admin/gists.py:62 msgid "forever" msgstr "per sempre" -#: rhodecode/apps/admin/views/users.py:179 -#: rhodecode/apps/my_account/views.py:139 +#: rhodecode/apps/admin/views/users.py:169 +#: rhodecode/apps/my_account/views.py:149 #: rhodecode/controllers/admin/gists.py:63 msgid "5 minutes" msgstr "5 minuti" -#: rhodecode/apps/admin/views/users.py:180 -#: rhodecode/apps/my_account/views.py:140 +#: rhodecode/apps/admin/views/users.py:170 +#: rhodecode/apps/my_account/views.py:150 #: rhodecode/controllers/admin/gists.py:64 msgid "1 hour" msgstr "1 ora" -#: rhodecode/apps/admin/views/users.py:181 -#: rhodecode/apps/my_account/views.py:141 +#: rhodecode/apps/admin/views/users.py:171 +#: rhodecode/apps/my_account/views.py:151 #: rhodecode/controllers/admin/gists.py:65 msgid "1 day" msgstr "1 giorno" -#: rhodecode/apps/admin/views/users.py:182 -#: rhodecode/apps/my_account/views.py:142 +#: rhodecode/apps/admin/views/users.py:172 +#: rhodecode/apps/my_account/views.py:152 #: rhodecode/controllers/admin/gists.py:66 msgid "1 month" msgstr "1 mese" -#: rhodecode/apps/admin/views/users.py:184 -#: rhodecode/apps/my_account/views.py:144 +#: rhodecode/apps/admin/views/users.py:174 +#: rhodecode/apps/my_account/views.py:154 #: rhodecode/controllers/admin/gists.py:70 msgid "Lifetime" msgstr "a vita" -#: rhodecode/apps/admin/views/users.py:188 -#: rhodecode/apps/my_account/views.py:148 +#: rhodecode/apps/admin/views/users.py:178 +#: 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 "Ruolo" -#: 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 "Token Autorizzativo creato" -#: 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 "Token autorizzativo cancellato" -#: 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 "Errore durante il salvataggio dell'email" + +#: 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 "Errore durante il salvataggio dell'ip: %s" + +#: rhodecode/apps/admin/views/users.py:389 +msgid "An error occurred during ip saving" +msgstr "Errore durante il salvataggio dell'ip" + +#: rhodecode/apps/admin/views/users.py:393 +#, python-format +msgid "Added ips %s to user whitelist" +msgstr "Aggiunti gli ip %s alla 'whitelist' dell'utente" + +#: rhodecode/apps/admin/views/users.py:423 +msgid "Removed ip address from user whitelist" +msgstr "Indirizzo ip rimosso dalla 'whitelist' dell'utente" + +#: 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 "Repositories" + +#: rhodecode/apps/home/views.py:223 +msgid "Groups" +msgstr "Gruppi" + +#: 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 "La registrazione con RhodeCode ha avuto successo" -#: 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 "Reset della password confermato. Una nuova password è stata inviata alla tua email" -#: rhodecode/apps/my_account/views.py:115 +#: rhodecode/apps/my_account/views.py:125 msgid "Error occurred during update of user password" msgstr "Errore durante l'aggiornamento della password" -#: rhodecode/apps/my_account/views.py:122 +#: rhodecode/apps/my_account/views.py:132 msgid "Successfully updated password" msgstr "Password aggiornata correttamente" +#: 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 "Cache invalidata" + +#: rhodecode/apps/repository/views/repo_caches.py:74 +msgid "An error occurred during cache invalidation" +msgstr "Errore durante l'invalidazione della cache" + +#: rhodecode/apps/repository/views/repo_permissions.py:95 +msgid "Repository permissions updated" +msgstr "Permessi sul repository aggiornati" + +#: 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 "Delocalizzazione del fork %s" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:96 +#, python-format +msgid "Deleted %s forks" +msgstr "Cancellati %s fork" + +#: 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 "Visibilita' del repository nel journal pubblico aggiornata" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:156 +msgid "An error occurred during setting this repository in public journal" +msgstr "Errore durante l'impostazione del repository nel journal pubblico" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:184 +msgid "Nothing" +msgstr "Nulla" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:186 +#, python-format +msgid "Marked repo %s as fork of %s" +msgstr "Il repository %s e' stato marcato come fork di %s" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 +msgid "An error occurred during this operation" +msgstr "Errore durante il completamento dell'operazione" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:217 +msgid "Locked repository" +msgstr "Repository bloccato" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:220 +msgid "Unlocked repository" +msgstr "Repository sbloccato" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:223 +#: rhodecode/controllers/admin/repos.py:363 +msgid "An error occurred during unlocking" +msgstr "Errore durante lo sblocco" + +#: rhodecode/apps/repository/views/repo_summary.py:293 +msgid "Branch" +msgstr "Branch" + +#: rhodecode/apps/repository/views/repo_summary.py:294 +msgid "Tag" +msgstr "Tag" + +#: rhodecode/apps/repository/views/repo_summary.py:295 +msgid "Bookmark" +msgstr "Segnalibro" + +#: 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 "Branches" + +#: rhodecode/apps/repository/views/repo_summary.py:319 +msgid "Closed branches" +msgstr "Branch chiusi" + #: rhodecode/apps/svn_support/events.py:30 msgid "Configuration for Apaache mad_dav_svn changed." msgstr "" @@ -416,7 +583,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 "" @@ -446,7 +613,7 @@ msgstr "" msgid "Admin Groups" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:215 +#: rhodecode/authentication/plugins/auth_crowd.py:216 msgid "CROWD" msgstr "" @@ -496,126 +663,130 @@ 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 "Password" -#: 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 "" @@ -648,76 +819,73 @@ 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 "Nessun commit" +#: rhodecode/controllers/changeset.py:76 +msgid "Show whitespace" +msgstr "Mostra caratteri di spaziatura" + #: rhodecode/controllers/changeset.py:77 -msgid "Show whitespace" -msgstr "Mostra caratteri di spaziatura" - -#: rhodecode/controllers/changeset.py:78 msgid "Show whitespace for all diffs" msgstr "Mostra caratteri di spaziatura per tutti i DIFF" -#: rhodecode/controllers/changeset.py:84 +#: rhodecode/controllers/changeset.py:83 msgid "Ignore whitespace" msgstr "Ignora caratteri di spaziatura" -#: rhodecode/controllers/changeset.py:85 +#: rhodecode/controllers/changeset.py:84 msgid "Ignore whitespace for all diffs" msgstr "Ignora caratteri di spaziatura per tutti i DIFF" -#: rhodecode/controllers/changeset.py:141 +#: rhodecode/controllers/changeset.py:140 msgid "Increase context" msgstr "Allarga il contesto" -#: rhodecode/controllers/changeset.py:142 +#: rhodecode/controllers/changeset.py:141 msgid "Increase context for all diffs" msgstr "Allarga il contesto per tutti i DIFF" -#: 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 "Cambiamento stato %(transition_icon)s %(status)s" -#: 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 "Seleziona una commit" -#: 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 " @@ -743,51 +911,47 @@ msgstr "Clicca qui per aggiungere un fil msgid "There are no files yet. %s" msgstr "Nessun file selezionato. %s" -#: 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 "Il repository è stato bloccato da %s il %s" -#: 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 "Puoi eliminare solo file appartenenti ad una revisione con un branch valido" -#: rhodecode/controllers/files.py:452 rhodecode/controllers/files.py:505 -#, python-format -msgid "Deleted file %s via RhodeCode Enterprise" -msgstr "File %s eliminato 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 "File eliminato %s" - -#: 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 "Un errore e' avvenuto durante l'operazione di commit" -#: 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 "Puoi modificare solo file appartenenti ad una revisione con un branch valido" -#: rhodecode/controllers/files.py:539 rhodecode/controllers/files.py:614 -#, python-format -msgid "Edited file %s via RhodeCode Enterprise" -msgstr "File %s modificato via Rhodecode Enterprise" - -#: 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 "Nessuna modifica" -#: rhodecode/controllers/files.py:578 rhodecode/controllers/files.py:707 -#, python-format -msgid "Successfully committed to %s" -msgstr "Commit eseguita correttamente su %s" - -#: 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 "File aggiunto via RhodeCode Enterprise" @@ -795,41 +959,39 @@ msgstr "File aggiunto via RhodeCode Ente msgid "No filename" msgstr "Nome file mancante" +#: 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 "La locazione specificata deve essere un path relativo ma non deve contenere .. " -#: rhodecode/controllers/files.py:764 +#: rhodecode/controllers/files.py:763 msgid "Downloads disabled" msgstr "Downloads disabilitati" -#: rhodecode/controllers/files.py:770 +#: rhodecode/controllers/files.py:769 #, python-format msgid "Unknown revision %s" msgstr "Revisione %s sconosciuta" -#: rhodecode/controllers/files.py:772 +#: rhodecode/controllers/files.py:771 msgid "Empty repository" msgstr "Repository vuoto" -#: 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 "Formato archivio sconosciuto" -#: rhodecode/controllers/files.py:993 +#: rhodecode/controllers/files.py:1000 msgid "Changesets" msgstr "Changesets" -#: 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 "Branches" - -#: 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 "Tags" @@ -838,28 +1000,6 @@ msgstr "Tags" msgid "An error occurred during repository forking %s" msgstr "Errore durante il fork del repository %s" -#: rhodecode/controllers/home.py:207 -msgid "Groups" -msgstr "Gruppi" - -#: 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 "Repositories" - -#: 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 "journal pubblico" @@ -868,84 +1008,60 @@ msgstr "journal pubblico" msgid "journal" msgstr "journal" -#: 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 "La 'pull request' deve avere un titolo di almeno 3 caratteri" -#: 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 "'Pull request' aperta correttamente" -#: rhodecode/controllers/pullrequests.py:388 -msgid "Error occurred during sending pull request" -msgstr "Un errore e' avenuto durante l'invio della 'pull request'" - -#: 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 "Non è possibile aggiornare richieste PULL già chiuse" -#: rhodecode/controllers/pullrequests.py:437 +#: rhodecode/controllers/pullrequests.py:328 msgid "Pull request title & description updated." msgstr "Titolo e Descrizione della richiesta PULL aggiornati." -#: rhodecode/controllers/pullrequests.py:455 +#: 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:472 +#: rhodecode/controllers/pullrequests.py:363 msgid "Reload page" msgstr "" -#: rhodecode/controllers/pullrequests.py:546 +#: rhodecode/controllers/pullrequests.py:437 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 "'Pull request' eliminata con successo" -#: 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 "Chiusura con" - -#: 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 "Non è consentito chiudere la richiesta PULL con stati diversi da \"rigettato\" o \"approvato\". Lo stato ricavato da tutti i revisori al momento è: %s." - -#: rhodecode/controllers/summary.py:251 -msgid "Branch" -msgstr "Branch" - -#: rhodecode/controllers/summary.py:252 -msgid "Tag" -msgstr "Tag" - -#: rhodecode/controllers/summary.py:253 -msgid "Bookmark" -msgstr "Segnalibro" - -#: rhodecode/controllers/summary.py:278 -msgid "Closed branches" -msgstr "Branch chiusi" - #: rhodecode/controllers/admin/defaults.py:84 msgid "Default settings updated successfully" msgstr "Impostazioni di default aggiornate" @@ -1001,89 +1117,73 @@ msgstr "mai" msgid "%(expiry)s - current value" msgstr "%(expiry)s - valore corrente" -#: 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 "Utente critico per l'intera applicazione. Editing disabilitato." -#: rhodecode/controllers/admin/my_account.py:138 +#: rhodecode/controllers/admin/my_account.py:110 msgid "Your account was updated successfully" msgstr "Account aggiornato correttamente" -#: 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 "Errore durante l'aggiornamento dell'utente %s" -#: 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 "Errore durante il salvataggio dell'email" - -#: 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 "Permessi applicati con successo." -#: 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 "Errore durante l'aggiornamento dei permessi" -#: rhodecode/controllers/admin/permissions.py:161 +#: rhodecode/controllers/admin/permissions.py:156 msgid "Object permissions updated successfully" msgstr "Permessi sull'oggetto aggiornati." -#: rhodecode/controllers/admin/permissions.py:215 +#: rhodecode/controllers/admin/permissions.py:210 msgid "Global permissions updated successfully" msgstr "Permessi globali aggiornati correttamente" -#: rhodecode/controllers/admin/repo_groups.py:197 +#: rhodecode/controllers/admin/repo_groups.py:202 #, python-format msgid "Created repository group %s" msgstr "Creato gruppo di repository %s" -#: 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 "Errore durante la creazione del gruppo di repository %s" -#: rhodecode/controllers/admin/repo_groups.py:258 +#: rhodecode/controllers/admin/repo_groups.py:261 #, python-format msgid "Updated repository group %s" msgstr "Gruppo di repository %s aggiornato" -#: 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 "Errore durante l'aggiornamento del gruppo di repository %s" -#: 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] "Questo gruppo contiene %(num)d repository e non può essere cancellato." msgstr[1] "Questo gruppo contiene %(num)d repository e non può essere cancellato." -#: 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] "Questo gruppo contiene %(num)d sotto-gruppo e non può essere eliminato" msgstr[1] "Questo gruppo contiene %(num)d sotto-gruppi e non può essere eliminato" -#: rhodecode/controllers/admin/repo_groups.py:312 +#: rhodecode/controllers/admin/repo_groups.py:313 #, python-format msgid "Removed repository group %s" msgstr "Gruppo di repository %s eliminato" @@ -1093,366 +1193,285 @@ msgstr "Gruppo di repository %s eliminat msgid "Error occurred during deletion of repository group %s" msgstr "Errore durante l'eliminazione del gruppo di repository %s" -#: 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 "Impossibile cambiare i permessi per se stessi come admin" -#: rhodecode/controllers/admin/repo_groups.py:405 +#: rhodecode/controllers/admin/repo_groups.py:404 msgid "Repository Group permissions updated" msgstr "Permessi del gruppo di repository aggiornati" -#: rhodecode/controllers/admin/repos.py:129 +#: rhodecode/controllers/admin/repos.py:125 #, python-format msgid "Error creating repository %s: invalid certificate" msgstr "Errore durante la creazione del repository %s: certificato invalido" -#: rhodecode/controllers/admin/repos.py:133 +#: rhodecode/controllers/admin/repos.py:129 #, python-format msgid "Error creating repository %s" msgstr "Errore durante la creazione del repository %s" -#: rhodecode/controllers/admin/repos.py:274 +#: rhodecode/controllers/admin/repos.py:270 #, python-format msgid "Created repository %s from %s" msgstr "Repository %s creato da %s" -#: rhodecode/controllers/admin/repos.py:283 +#: rhodecode/controllers/admin/repos.py:279 #, python-format msgid "Forked repository %s as %s" msgstr "Fork del repository %s come %s" -#: rhodecode/controllers/admin/repos.py:286 +#: rhodecode/controllers/admin/repos.py:282 #, python-format msgid "Created repository %s" msgstr "Repository %s creato" -#: rhodecode/controllers/admin/repos.py:327 -#, python-format -msgid "Repository %s updated successfully" -msgstr "Repository %s aggiornato correttamente" - -#: rhodecode/controllers/admin/repos.py:346 -#, python-format -msgid "Error occurred during update of repository %s" -msgstr "Errore durante l'aggiornamento del repository %s" - -#: rhodecode/controllers/admin/repos.py:374 -#, python-format -msgid "Detached %s forks" -msgstr "Delocalizzazione del fork %s" - -#: rhodecode/controllers/admin/repos.py:377 -#, python-format -msgid "Deleted %s forks" -msgstr "Cancellati %s fork" - -#: rhodecode/controllers/admin/repos.py:382 -#, python-format -msgid "Deleted repository %s" -msgstr "Repository %s eliminato" - -#: rhodecode/controllers/admin/repos.py:385 -#, python-format -msgid "Cannot delete %s it still contains attached forks" -msgstr "Non e' possibile eliminare %s in quanto contiene fork collegati" - -#: rhodecode/controllers/admin/repos.py:390 -#, python-format -msgid "An error occurred during deletion of %s" -msgstr "Errore durante l'eliminazione di %s" - -#: rhodecode/controllers/admin/repos.py:443 -msgid "Repository permissions updated" -msgstr "Permessi sul repository aggiornati" - -#: rhodecode/controllers/admin/repos.py:474 +#: rhodecode/controllers/admin/repos.py:319 msgid "An error occurred during creation of field" msgstr "Errore durante la crezione del campo" -#: rhodecode/controllers/admin/repos.py:489 +#: rhodecode/controllers/admin/repos.py:334 msgid "An error occurred during removal of field" msgstr "Errore durante la rimozione del campo" -#: rhodecode/controllers/admin/repos.py:528 -msgid "Updated repository visibility in public journal" -msgstr "Visibilita' del repository nel journal pubblico aggiornata" - -#: rhodecode/controllers/admin/repos.py:532 -msgid "An error occurred during setting this repository in public journal" -msgstr "Errore durante l'impostazione del repository nel journal pubblico" - -#: rhodecode/controllers/admin/repos.py:556 -msgid "Nothing" -msgstr "Nulla" - -#: rhodecode/controllers/admin/repos.py:558 -#, python-format -msgid "Marked repo %s as fork of %s" -msgstr "Il repository %s e' stato marcato come fork di %s" - -#: rhodecode/controllers/admin/repos.py:565 -msgid "An error occurred during this operation" -msgstr "Errore durante il completamento dell'operazione" - -#: rhodecode/controllers/admin/repos.py:583 -msgid "Locked repository" -msgstr "Repository bloccato" - -#: rhodecode/controllers/admin/repos.py:586 -msgid "Unlocked repository" -msgstr "Repository sbloccato" - -#: rhodecode/controllers/admin/repos.py:589 -#: rhodecode/controllers/admin/repos.py:618 -msgid "An error occurred during unlocking" -msgstr "Errore durante lo sblocco" - -#: rhodecode/controllers/admin/repos.py:608 +#: rhodecode/controllers/admin/repos.py:353 msgid "Unlocked" msgstr "Sbloccato" -#: rhodecode/controllers/admin/repos.py:612 +#: rhodecode/controllers/admin/repos.py:357 msgid "Locked" msgstr "Bloccato" -#: rhodecode/controllers/admin/repos.py:614 +#: rhodecode/controllers/admin/repos.py:359 #, python-format msgid "Repository has been %s" msgstr "Il repository e' stato %s" -#: rhodecode/controllers/admin/repos.py:629 -msgid "Cache invalidation successful" -msgstr "Cache invalidata" - -#: rhodecode/controllers/admin/repos.py:633 -msgid "An error occurred during cache invalidation" -msgstr "Errore durante l'invalidazione della cache" - -#: rhodecode/controllers/admin/repos.py:653 +#: rhodecode/controllers/admin/repos.py:373 msgid "Pulled from remote location" msgstr "Effettuato 'Pull' dal remoto" -#: rhodecode/controllers/admin/repos.py:656 +#: rhodecode/controllers/admin/repos.py:376 msgid "An error occurred during pull from remote location" msgstr "Errore durante il 'Pull' dal remoto" -#: rhodecode/controllers/admin/repos.py:678 +#: rhodecode/controllers/admin/repos.py:397 msgid "An error occurred during deletion of repository stats" msgstr "Errore durante l'eliminazione delle statistiche del repository" -#: rhodecode/controllers/admin/repos.py:725 +#: rhodecode/controllers/admin/repos.py:443 msgid "Error occurred during deleting issue tracker entry" msgstr "Errore durante la rimozione dell'entry dall'issue tracker" -#: 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 "Entry dell'issue tracker rimossa" -#: 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 "Dati dell'Issue Tracker aggiornati" -#: 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 "Ci son dati non validi tra i dati immessi" -#: rhodecode/controllers/admin/repos.py:837 +#: rhodecode/controllers/admin/repos.py:555 msgid "Error occurred during updating repository VCS settings" msgstr "Errore durante l'aggiornamento delle impostazioni del repository VCS" -#: rhodecode/controllers/admin/repos.py:841 +#: rhodecode/controllers/admin/repos.py:559 #: rhodecode/controllers/admin/settings.py:176 msgid "Updated VCS settings" msgstr "Impostazioni VCS aggiornate" #: 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 "Errore durante l'aggiornamento delle impostazioni" -#: rhodecode/controllers/admin/settings.py:223 +#: rhodecode/controllers/admin/settings.py:226 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "Scansione dei repository completata. Aggiunti: %s ; rimossi: %s" -#: rhodecode/controllers/admin/settings.py:279 +#: rhodecode/controllers/admin/settings.py:282 msgid "Updated application settings" msgstr "Impostazioni applicazione aggiornate" -#: rhodecode/controllers/admin/settings.py:345 -msgid "Updated visualisation settings" -msgstr "Impostazioni di visualizzazione aggiornate" - #: rhodecode/controllers/admin/settings.py:348 +msgid "Updated visualisation settings" +msgstr "Impostazioni di visualizzazione aggiornate" + +#: rhodecode/controllers/admin/settings.py:351 msgid "Error occurred during updating visualisation settings" msgstr "Errore durante l'aggiornamento delle impostazioni di visualizzazione" -#: rhodecode/controllers/admin/settings.py:441 +#: rhodecode/controllers/admin/settings.py:444 msgid "Please enter email address" msgstr "Prego fornire un indirizzo email" -#: rhodecode/controllers/admin/settings.py:459 +#: rhodecode/controllers/admin/settings.py:462 msgid "Send email task created" msgstr "Task 'invio posta' creato" -#: rhodecode/controllers/admin/settings.py:492 +#: rhodecode/controllers/admin/settings.py:495 msgid "Added new hook" msgstr "Aggiunto nuovo 'hook'" -#: rhodecode/controllers/admin/settings.py:507 +#: rhodecode/controllers/admin/settings.py:510 msgid "Updated hooks" msgstr "'Hook' aggiornato" -#: rhodecode/controllers/admin/settings.py:511 +#: rhodecode/controllers/admin/settings.py:514 msgid "Error occurred during hook creation" msgstr "Errore durante creazione hook'" -#: rhodecode/controllers/admin/settings.py:640 +#: rhodecode/controllers/admin/settings.py:643 msgid "Error occurred during updating labs settings" msgstr "Errore durante l'aggiornamento delle impostazioni sui lab" -#: rhodecode/controllers/admin/settings.py:645 +#: rhodecode/controllers/admin/settings.py:648 msgid "Updated Labs settings" msgstr "Impostazioni sui Lab aggiornate" -#: 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 "Creato il gruppo utenti %(user_group_link)s" -#: 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 "Errore avvenuto durante la creazione del gruppo di utenti %s" -#: rhodecode/controllers/admin/user_groups.py:220 +#: rhodecode/controllers/admin/user_groups.py:218 #, python-format msgid "Updated user group %s" msgstr "Gruppo utenti %s aggiornato" -#: 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 "Errore durante l'aggiornamento del gruppo utenti %s" -#: rhodecode/controllers/admin/user_groups.py:258 +#: rhodecode/controllers/admin/user_groups.py:253 msgid "Successfully deleted user group" msgstr "Gruppo utenti eliminato" -#: rhodecode/controllers/admin/user_groups.py:263 +#: rhodecode/controllers/admin/user_groups.py:258 msgid "An error occurred during deletion of user group" msgstr "Errore avvenuto durante l'eliminazione del gruppo utenti" -#: rhodecode/controllers/admin/user_groups.py:331 +#: rhodecode/controllers/admin/user_groups.py:326 msgid "Target group cannot be the same" msgstr "Il gruppo di destinazione non può coincidere con l'origine" -#: rhodecode/controllers/admin/user_groups.py:337 +#: rhodecode/controllers/admin/user_groups.py:332 msgid "User Group permissions updated" msgstr "Permessi del gruppo utenti aggiornati" -#: rhodecode/controllers/admin/user_groups.py:422 +#: rhodecode/controllers/admin/user_groups.py:415 msgid "User Group global permissions updated successfully" msgstr "Permessi globali dei Gruppi Utenti aggiornati." -#: 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 "Errore avvenuto durante il salvataggio dei permessi" -#: 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 "Creato l'utente %(user_link)s" -#: rhodecode/controllers/admin/users.py:122 +#: rhodecode/controllers/admin/users.py:124 #, python-format msgid "Error occurred during creation of user %s" msgstr "Errore durante la creazione dell'utente %s" -#: rhodecode/controllers/admin/users.py:167 +#: rhodecode/controllers/admin/users.py:166 msgid "User updated successfully" msgstr "Utente aggiornato correttamente" -#: rhodecode/controllers/admin/users.py:218 +#: rhodecode/controllers/admin/users.py:209 #, python-format msgid "Detached %s repositories" msgstr "Distaccati %s repository" -#: rhodecode/controllers/admin/users.py:223 +#: rhodecode/controllers/admin/users.py:214 #, python-format msgid "Deleted %s repositories" msgstr "%s repository cancellati" -#: rhodecode/controllers/admin/users.py:231 +#: rhodecode/controllers/admin/users.py:222 #, python-format msgid "Detached %s repository groups" msgstr "Distaccati %s gruppi di repository" -#: rhodecode/controllers/admin/users.py:236 +#: rhodecode/controllers/admin/users.py:227 #, python-format msgid "Deleted %s repository groups" msgstr "%s gruppo di repository cancellati" -#: rhodecode/controllers/admin/users.py:244 +#: rhodecode/controllers/admin/users.py:235 #, python-format msgid "Detached %s user groups" msgstr "Distaccati %s gruppi utente" -#: rhodecode/controllers/admin/users.py:249 +#: rhodecode/controllers/admin/users.py:240 #, python-format msgid "Deleted %s user groups" msgstr "%s gruppi utente cancellati" -#: rhodecode/controllers/admin/users.py:260 +#: rhodecode/controllers/admin/users.py:257 msgid "Successfully deleted user" msgstr "Utente eliminato" -#: rhodecode/controllers/admin/users.py:266 +#: rhodecode/controllers/admin/users.py:263 msgid "An error occurred during deletion of user" msgstr "Errore durante la cancellazione dell'utente" -#: rhodecode/controllers/admin/users.py:285 +#: rhodecode/controllers/admin/users.py:280 msgid "Force password change disabled for user" msgstr "Obbligo del cambiamento password disabilitato per l'utente" -#: rhodecode/controllers/admin/users.py:287 +#: rhodecode/controllers/admin/users.py:285 msgid "Force password change enabled for user" msgstr "Obbligo del cambio password abilitato per l'utente" -#: rhodecode/controllers/admin/users.py:291 +#: rhodecode/controllers/admin/users.py:294 msgid "An error occurred during password reset for user" msgstr "Errore durante il ripristino della password dell'utente" -#: 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 "Creato il gruppo di repository `%s`" -#: 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 "Errore durante la creazione del gruppo di repository per l'utente" @@ -1462,81 +1481,63 @@ msgid "" "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 "Permessi globali Utente aggiornati" -#: rhodecode/controllers/admin/users.py:589 -#, python-format -msgid "An error occurred during ip saving:%s" -msgstr "Errore durante il salvataggio dell'ip: %s" - -#: rhodecode/controllers/admin/users.py:604 -msgid "An error occurred during ip saving" -msgstr "Errore durante il salvataggio dell'ip" - -#: rhodecode/controllers/admin/users.py:608 -#, python-format -msgid "Added ips %s to user whitelist" -msgstr "Aggiunti gli ip %s alla 'whitelist' dell'utente" - -#: rhodecode/controllers/admin/users.py:626 -msgid "Removed ip address from user whitelist" -msgstr "Indirizzo ip rimosso dalla 'whitelist' dell'utente" - -#: 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 "" @@ -1568,7 +1569,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 @@ -1579,8 +1580,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 @@ -1590,13 +1591,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 "Ripristina" -#: 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 @@ -1605,13 +1606,13 @@ msgstr "Ripristina" #: 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 @@ -1765,16 +1766,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 @@ -1810,11 +1810,11 @@ 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 " @@ -1822,172 +1822,172 @@ msgid "" "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 " [eliminato] repository" -#: 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 "repository [creato]" -#: rhodecode/lib/action_parser.py:95 +#: rhodecode/lib/action_parser.py:100 msgid "[created] repository as fork" msgstr "[creato] repository come fork" -#: 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 "[forked] repository" -#: 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 "[aggiornato] repository" -#: rhodecode/lib/action_parser.py:104 +#: rhodecode/lib/action_parser.py:109 msgid "[downloaded] archive from repository" msgstr "[scaricato] archivio dal repository" -#: rhodecode/lib/action_parser.py:107 +#: rhodecode/lib/action_parser.py:112 msgid "[delete] repository" msgstr "[elimina] repository" -#: rhodecode/lib/action_parser.py:119 +#: rhodecode/lib/action_parser.py:124 msgid "[created] user" msgstr "[creato] utente" -#: rhodecode/lib/action_parser.py:122 +#: rhodecode/lib/action_parser.py:127 msgid "[updated] user" msgstr "[aggiornato] utente" -#: rhodecode/lib/action_parser.py:125 +#: rhodecode/lib/action_parser.py:130 msgid "[created] user group" msgstr "[creato] gruppo utenti" -#: rhodecode/lib/action_parser.py:128 +#: rhodecode/lib/action_parser.py:133 msgid "[updated] user group" msgstr "[aggiornato] gruppo utenti" -#: rhodecode/lib/action_parser.py:131 +#: rhodecode/lib/action_parser.py:136 msgid "[commented] on commit in repository" msgstr "[commentato] al commit nel repository" -#: rhodecode/lib/action_parser.py:134 +#: rhodecode/lib/action_parser.py:139 msgid "[commented] on pull request for" msgstr "[commentato] sulla richiesta di 'Pull' per" -#: rhodecode/lib/action_parser.py:137 +#: rhodecode/lib/action_parser.py:142 msgid "[closed] pull request for" msgstr "[chiusa] Richiesta di 'Pull' per" -#: rhodecode/lib/action_parser.py:140 +#: rhodecode/lib/action_parser.py:145 msgid "[merged] pull request for" msgstr "[merged] richiesta pull per" -#: rhodecode/lib/action_parser.py:143 +#: rhodecode/lib/action_parser.py:148 msgid "[pushed] into" msgstr "[pushed] nel" -#: rhodecode/lib/action_parser.py:146 +#: rhodecode/lib/action_parser.py:151 msgid "[committed via RhodeCode] into repository" msgstr "[committato via Rhodecode] nel repository" -#: rhodecode/lib/action_parser.py:149 +#: rhodecode/lib/action_parser.py:154 msgid "[pulled from remote] into repository" msgstr "[pulled da remoto] nel repository" -#: rhodecode/lib/action_parser.py:152 +#: rhodecode/lib/action_parser.py:157 msgid "[pulled] from" msgstr "[pulled] da" -#: rhodecode/lib/action_parser.py:155 +#: rhodecode/lib/action_parser.py:160 msgid "[started following] repository" msgstr "[da ora segui] repository" -#: rhodecode/lib/action_parser.py:158 +#: rhodecode/lib/action_parser.py:163 msgid "[stopped following] repository" msgstr "[non segui più] repository" -#: rhodecode/lib/action_parser.py:166 +#: rhodecode/lib/action_parser.py:172 #, python-format msgid "fork name %s" msgstr "Nome del 'fork' %s" -#: 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 "Richiesta di 'Pull' #%s" -#: rhodecode/lib/action_parser.py:216 +#: rhodecode/lib/action_parser.py:223 #, python-format msgid "Show all combined commits %s->%s" msgstr "Mostra tutte le commit combinate %s->%s" -#: rhodecode/lib/action_parser.py:220 +#: rhodecode/lib/action_parser.py:227 msgid "compare view" msgstr "vista comparativa" -#: rhodecode/lib/action_parser.py:227 +#: 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 "Eliminato il branch: %s" -#: rhodecode/lib/action_parser.py:282 +#: rhodecode/lib/action_parser.py:289 #, python-format msgid "Created tag: %s" msgstr "Creato il tag: %s" -#: rhodecode/lib/action_parser.py:295 +#: rhodecode/lib/action_parser.py:302 msgid "Commit not found" msgstr "Commit non trovata" -#: rhodecode/lib/auth.py:1197 +#: rhodecode/lib/auth.py:1220 #, python-format msgid "IP %s not allowed" msgstr "IP %s non consentito" -#: rhodecode/lib/auth.py:1281 +#: rhodecode/lib/auth.py:1309 msgid "You need to be a registered user to perform this action" msgstr "È necessario essere utenti registrati per eseguire l'azione" -#: rhodecode/lib/auth.py:1329 +#: rhodecode/lib/auth.py:1366 #, python-format msgid "Action not supported for %s." msgstr "Azione non supportata per %s." -#: rhodecode/lib/auth.py:1379 +#: rhodecode/lib/auth.py:1412 msgid "You need to be signed in to view this page" msgstr "Bisogna autenticarsi per vedere questa pagina" -#: rhodecode/lib/base.py:549 +#: rhodecode/lib/base.py:561 #, python-format msgid "The repository at %(repo_name)s cannot be located." msgstr "Il repository in %(repo_name)s non può essere localizzato." @@ -2013,20 +2013,21 @@ msgstr "Nessun cambiamento rilevato" msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1517 +#: rhodecode/lib/helpers.py:1527 #, python-format msgid " and %s more" msgstr "e %s ulteriore/i" -#: rhodecode/lib/helpers.py:1521 +#: rhodecode/lib/helpers.py:1531 msgid "No Files" msgstr "Nessun file" -#: 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" @@ -2039,9 +2040,23 @@ msgid "" "Optional AND / OR operators in queries\n" " \"repository:vcs OR repository:test\"\n" " \"username:test AND repository:test*\"\n" -msgstr "Esempio termini di ricerca:\n repository:vcs\n username:marcin\n action:*push*\n ip:127.0.0.1\n date:20120101\n date:[20120101100000 TO 20120102]\n\nUso del carattere joly '*':\n \"repository:vcs*\" - search everything starting with 'vcs'\n \"repository:*vcs*\" - search for repository containing 'vcs'\n\nInterrogazioni con operatori opzionali AND / OR:\n \"repository:vcs OR repository:test\"\n \"username:test AND repository:test*\"\n" - -#: rhodecode/lib/helpers.py:1820 +msgstr "" + +#: 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" @@ -2083,7 +2098,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 "proprio ora" @@ -2118,7 +2133,7 @@ msgstr "proprio ora" #: 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/model/db.py:2482 msgid "Repository no access" msgstr "Repository nessun accesso" @@ -2152,7 +2167,7 @@ msgstr "Repository nessun accesso" #: 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/model/db.py:2483 msgid "Repository read access" msgstr "Repository accesso in lettura" @@ -2186,7 +2201,7 @@ msgstr "Repository accesso in lettura" #: 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/model/db.py:2484 msgid "Repository write access" msgstr "Repository accesso in scrittura" @@ -2220,7 +2235,7 @@ msgstr "Repository accesso in scrittura" #: 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/model/db.py:2485 msgid "Repository admin access" msgstr "Repository accesso admin" @@ -2294,7 +2309,7 @@ msgstr "RhodeCode Administrator" #: 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/model/db.py:2503 msgid "Repository creation disabled" msgstr "Creazione di Repository disabilitata" @@ -2328,7 +2343,7 @@ msgstr "Creazione di Repository disabili #: 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/model/db.py:2504 msgid "Repository creation enabled" msgstr "Creazione di Repository abilitata" @@ -2362,7 +2377,7 @@ msgstr "Creazione di Repository abilitat #: 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/model/db.py:2508 msgid "Repository forking disabled" msgstr "Forking Repository disabilitato" @@ -2396,7 +2411,7 @@ msgstr "Forking Repository disabilitato" #: 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/model/db.py:2509 msgid "Repository forking enabled" msgstr "Forking Repository abilitato" @@ -2451,7 +2466,7 @@ msgstr "Registrazione nuovo utente attra #: 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/model/db.py:3212 msgid "Not Reviewed" msgstr "Non Revisionato" @@ -2485,7 +2500,7 @@ msgstr "Non Revisionato" #: 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/model/db.py:3213 msgid "Approved" msgstr "Approvato" @@ -2519,7 +2534,7 @@ msgstr "Approvato" #: 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/model/db.py:3214 msgid "Rejected" msgstr "Rifiutato" @@ -2553,7 +2568,7 @@ msgstr "Rifiutato" #: 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/model/db.py:3215 msgid "Under Review" msgstr "in Revisione" @@ -2584,7 +2599,7 @@ msgstr "in Revisione" #: 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/model/db.py:2487 msgid "Repository group no access" msgstr "Gruppo di repository: nessun accesso" @@ -2615,7 +2630,7 @@ msgstr "Gruppo di repository: nessun acc #: 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/model/db.py:2488 msgid "Repository group read access" msgstr "Gruppo di repository: accesso in lettura" @@ -2646,7 +2661,7 @@ msgstr "Gruppo di repository: accesso in #: 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/model/db.py:2489 msgid "Repository group write access" msgstr "Gruppo di repository: accesso in scrittura" @@ -2677,7 +2692,7 @@ msgstr "Gruppo di repository: accesso in #: 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/model/db.py:2490 msgid "Repository group admin access" msgstr "Gruppo di repository: accesso admin" @@ -2707,7 +2722,7 @@ msgstr "Gruppo di repository: accesso ad #: 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/model/db.py:2492 msgid "User group no access" msgstr "Gruppo utenti: nessun accesso" @@ -2737,7 +2752,7 @@ msgstr "Gruppo utenti: nessun accesso" #: 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/model/db.py:2493 msgid "User group read access" msgstr "Gruppo utenti: accesso in lettura" @@ -2767,7 +2782,7 @@ msgstr "Gruppo utenti: accesso in lettur #: 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/model/db.py:2494 msgid "User group write access" msgstr "Gruppo utenti: accesso in scrittura" @@ -2797,7 +2812,7 @@ msgstr "Gruppo utenti: accesso in scritt #: 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/model/db.py:2495 msgid "User group admin access" msgstr "Gruppo utenti: accesso admin" @@ -2827,7 +2842,7 @@ msgstr "Gruppo utenti: accesso admin" #: 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/model/db.py:2497 msgid "Repository Group creation disabled" msgstr "Creazione gruppo di repository disabiltiata" @@ -2857,7 +2872,7 @@ msgstr "Creazione gruppo di repository d #: 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/model/db.py:2498 msgid "Repository Group creation enabled" msgstr "Creazione gruppo di repository abilitata" @@ -2887,7 +2902,7 @@ msgstr "Creazione gruppo di repository a #: 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/model/db.py:2500 msgid "User Group creation disabled" msgstr "Creazione gruppo utenti disabilitata" @@ -2917,7 +2932,7 @@ msgstr "Creazione gruppo utenti disabili #: 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/model/db.py:2501 msgid "User Group creation enabled" msgstr "Creazione gruppo utenti abilitata" @@ -2947,7 +2962,7 @@ msgstr "Creazione gruppo utenti abilitat #: 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/model/db.py:2511 msgid "Registration disabled" msgstr "Registrazione disabilitata" @@ -2977,7 +2992,7 @@ msgstr "Registrazione disabilitata" #: 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/model/db.py:2512 msgid "User Registration with manual account activation" msgstr "Registrazione utente con attivazione manuale dell'account" @@ -3007,7 +3022,7 @@ msgstr "Registrazione utente con attivaz #: 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/model/db.py:2513 msgid "User Registration with automatic account activation" msgstr "Registrazione utente con attivazione automatica dell'account" @@ -3037,7 +3052,7 @@ msgstr "Registrazione utente con attivaz #: 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/model/permission.py:95 +#: rhodecode/model/db.py:2519 rhodecode/model/permission.py:95 msgid "Manual activation of external account" msgstr "Attivazione manuale di account esterni" @@ -3067,7 +3082,7 @@ msgstr "Attivazione manuale di account e #: 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/model/permission.py:96 +#: rhodecode/model/db.py:2520 rhodecode/model/permission.py:96 msgid "Automatic activation of external account" msgstr "Attivazione automatrica di account esterni" @@ -3091,7 +3106,7 @@ msgstr "Attivazione automatrica di accou #: 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/model/db.py:2505 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "Creazione di repository abilitata con permessi di scrittura al gruppo di repository" @@ -3116,7 +3131,7 @@ msgstr "Creazione di repository abilitat #: 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/model/db.py:2506 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "Creazione di repository disabilitata abilitata con permessi di scrittura al gruppo di repository" @@ -3138,7 +3153,7 @@ msgstr "Creazione di repository disabili #: 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/model/db.py:2480 msgid "RhodeCode Super Administrator" msgstr "RhodeCode Super Administrator" @@ -3157,7 +3172,7 @@ msgstr "RhodeCode Super Administrator" #: 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/model/db.py:2522 msgid "Inherit object permissions from default user disabled" msgstr "Ereditarietà dei permessi \"user default\" sull'oggetto disabilitata." @@ -3176,7 +3191,7 @@ msgstr "Ereditarietà dei permessi \"user default\" sull'oggetto disabilitata." #: 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/model/db.py:2523 msgid "Inherit object permissions from default user enabled" msgstr "Ereditarietà dei permessi \"user default\" sull'oggetto abilitata" @@ -3186,7 +3201,7 @@ msgstr "Ereditarietà dei permessi \"user default\" sull'oggetto abilitata" #: 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 "tutti" @@ -3196,7 +3211,7 @@ msgstr "tutti" #: 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 "interfaccia http/web" @@ -3206,7 +3221,7 @@ msgstr "interfaccia http/web" #: 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 "" @@ -3216,7 +3231,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 "chiamate API" @@ -3226,7 +3241,7 @@ msgstr "chiamate API" #: 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 "accesso al feed" @@ -3237,65 +3252,65 @@ msgstr "accesso al feed" #: 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/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/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/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/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 "Stringa di ricerca invalida. Provare a quotarla" -#: 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 "Non ci sono indici con cui effettuare la ricerca. Avviare 'whoosh indexer'" -#: rhodecode/lib/index/whoosh.py:156 +#: rhodecode/lib/index/whoosh.py:157 msgid "An error occurred during this search operation" msgstr "Errore durante la ricerca" -#: 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 "Indice del File" -#: 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 "Documenti indicizzati" -#: 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 "Ultimo aggiornamento" -#: 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 "" @@ -3381,7 +3396,7 @@ msgstr "%(user)s ha commentato la richie #: 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 "None" @@ -3389,7 +3404,7 @@ msgstr "None" #: 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 "Lettura" @@ -3397,10 +3412,10 @@ msgstr "Lettura" #: 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 "Scrittura" @@ -3423,7 +3438,7 @@ msgstr "Scrittura" #: 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 @@ -3433,9 +3448,9 @@ msgstr "Scrittura" #: 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 "Admin" @@ -3466,93 +3481,93 @@ 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 "Questa richiesta PULL può essere incorporata automaticamente." -#: 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 "Questa richiesta PULL non può essere incorporata a causa di un eccezione non gestita" -#: rhodecode/model/pull_request.py:83 +#: rhodecode/model/pull_request.py:85 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:85 +#: rhodecode/model/pull_request.py:87 msgid "This pull request could not be merged because push to target failed." msgstr "Questa richiesta PULL non può esere incorporata perché è fallito il PUSH sul target." -#: 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 "Questa richiesta PULL non può essere incorporata perché il target indicato non è la versione di testa (head)." -#: 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 "Questa richiesta PULL non può esser incorporata perché la sorgente contiene un numero superiore di branch rispetto al target" -#: 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 "Questa richiesta di PULL non può essere incorporata perché il target ha versioni di testa multiple" -#: 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 "La richiesta PULL non può essere \"merged\" poiché il repository target è \"locked\"" -#: 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 "La \"richiesta di PULL\" non può essere incorporata poichè manca il riferimento alla sorgente o alla destinazione" -#: 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 "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." -msgstr "" - -#: rhodecode/model/pull_request.py:124 +"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" @@ -3560,92 +3575,96 @@ msgid "" " %(pr_title)s" msgstr "" -#: rhodecode/model/pull_request.py:556 +#: rhodecode/model/pull_request.py:576 msgid "Pull request merged and closed" msgstr "Richiesta PULL chiusa. Merge effettuato." -#: 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 "L'Incorporamento lato server delle richiesta di PULL è disabilitato" -#: rhodecode/model/pull_request.py:1089 +#: rhodecode/model/pull_request.py:1154 msgid "This pull request is closed." msgstr "Questa richiesta PULL è chiusa." -#: rhodecode/model/pull_request.py:1101 +#: rhodecode/model/pull_request.py:1166 msgid "Pull request merging is not supported." msgstr "L'incorporamento delle richieste PULL non è supportato." -#: rhodecode/model/pull_request.py:1119 +#: rhodecode/model/pull_request.py:1184 msgid "Target repository large files support is disabled." msgstr "Il supporto ai file di grosse dimensioni sul repository target è disabilitato." -#: rhodecode/model/pull_request.py:1122 +#: rhodecode/model/pull_request.py:1187 msgid "Source repository large files support is disabled." msgstr "Sul repository sorgente, il supporto a file di grosse dimensioni è disabilitato." -#: 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 "Segnalibri" -#: rhodecode/model/pull_request.py:1284 +#: rhodecode/model/pull_request.py:1349 msgid "Commit IDs" msgstr "Commit IDs" -#: rhodecode/model/pull_request.py:1287 +#: rhodecode/model/pull_request.py:1352 msgid "Closed Branches" msgstr "Branch chiusi" -#: 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 "Approvazione della richiesta PULL in attesa." -#: 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 "ultimo consiglio" -#: 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 "Utente critico per l'intera applicazione. Editing disabilitato." -#: 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 "Non puoi editare questo utente (`%(username)s`) poiché è cruciale per l'intera applicazione" -#: 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 "Utente critico per l'intera applicazione. Eliminazione disabilitata." -#: 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 "L'utente \"%s\" è ancora proprietario di %s repository e non può' essere rimosso. Sostituire i proprietari o rimuovere quei repository: %s" -#: 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 "L'utente \"%s\" è ancora proprietario del/dei %s gruppi di repositor y e non può essere rimosso. Sostituire il proprietario o rimuovere quel/quei gruppi di repository: %s" -#: 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 " @@ -3671,6 +3690,7 @@ msgid "Username \"%(username)s\" is forb msgstr "Il nome utente \"%(username)s\" è riservato" #: 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" @@ -3780,98 +3800,113 @@ msgstr "Un repository chiamato %(repo)s è presente nel gruppo \"%(group)s\"" msgid "Repository group with name \"%(repo)s\" exists in group \"%(group)s\"" msgstr "Un gruppo di repository chiamato \"%(repo)s\" è presente nel gruppo \"%(group)s\"" -#: 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 "L'URL per la clonazione non corrisponde ai repository di tipo %(rtype)s " -#: 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 "URL invalido. Fornire un URL che cominci con un prefisso incluso tra %(allowed_prefixes)s" -#: rhodecode/model/validators.py:650 +#: rhodecode/model/validators.py:670 msgid "Fork have to be the same type as parent" msgstr "Un Fork deve essere dello stesso tipo del genitore" -#: rhodecode/model/validators.py:665 +#: rhodecode/model/validators.py:685 msgid "You do not have the permission to create repositories in this group." msgstr "Non hai permessi per creare repository in questo gruppo." -#: 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 "Non hai permessi per memorizzare repository nella radice." -#: rhodecode/model/validators.py:728 +#: rhodecode/model/validators.py:748 msgid "This username or user group name is not valid" msgstr "Nome utente o nome gruppo invalidi" -#: rhodecode/model/validators.py:846 +#: rhodecode/model/validators.py:879 msgid "This is not a valid path" msgstr "Questo non è un path valido" -#: rhodecode/model/validators.py:861 +#: rhodecode/model/validators.py:894 msgid "This e-mail address is already taken" msgstr "Indirizzo e-mail già in uso da qualcuno" -#: rhodecode/model/validators.py:881 +#: rhodecode/model/validators.py:914 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "L'e-mail \"%(email)s\" non esiste." -#: 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 "Le revisioni %(revs)s fanno già parte della richiesta 'Pull' o hanno lo stato" -#: 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 "Inserire un indirizzo IPv4 o IPv6 valido" -#: 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 "Il dimensionamento in bit della network deve essere nel range di 0-32 (non %(bits)r)" -#: rhodecode/model/validators.py:961 +#: rhodecode/model/validators.py:994 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "Il nome della chiave può contenere solo lettere, trattini (bassi o medi) o numeri" -#: 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 "I plugin %(loaded)s e %(next_to_load)s esportano entrambi lo stesso nome" -#: 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" @@ -3944,253 +3979,263 @@ 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 "Nessun risultato" #: 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 "Nessuna corrispondenza" #: 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 @@ -4199,28 +4244,28 @@ 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 " @@ -4229,14 +4274,14 @@ 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 "Inoltro..." #: 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 ..." @@ -4244,105 +4289,170 @@ msgstr "Caricamento ..." #: 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 "Nessuna corrispondenza tra i file" #: 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 "Collegamento selezione" #: 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 "Smetti di seguire il repository" #: 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 "Smetti di seguire" #: 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 "Inizia a seguire il repository" #: 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 "Segui" -#: 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 "Mostra ancora" @@ -4357,151 +4467,151 @@ msgstr "" msgid "Add another comment" msgstr "Aggiungi un altro commento" -#: 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 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 "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:29 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 #: rhodecode/templates/changelog/changelog.mako:61 msgid "Open new pull request" msgstr "Apri una richiesta PULL" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 +#: 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:35 +#: 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 "Invia" -#: 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 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 msgid "" "There are currently no open pull requests requiring your participation." msgstr "Al momento non ci sono richieste di PULL che richiedono il tuo intervento" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "disabilitato" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "abilitato" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 msgid "files" msgstr "i file" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 -#: rhodecode/templates/pullrequests/pullrequest.mako:108 +#: 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 "" @@ -4583,7 +4693,7 @@ msgstr "Modifica il Gruppo di Repository #: 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 @@ -4591,7 +4701,7 @@ msgstr "Modifica il Gruppo di Repository #: 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 "Nome" @@ -4606,7 +4716,7 @@ msgstr "Nome" #: 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 @@ -4614,9 +4724,10 @@ msgstr "Nome" #: 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 @@ -4624,9 +4735,9 @@ msgstr "Nome" #: 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 "Descrizione" @@ -4637,7 +4748,7 @@ msgstr "Descrizione" #: 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 @@ -4660,13 +4771,13 @@ msgstr "Ultimo cambiamento" #: 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 "Commit" @@ -4681,7 +4792,7 @@ msgid "Home" msgstr "Base" #: 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 "Autenticati" @@ -4706,14 +4817,14 @@ 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 "Supporto" #: 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 "oppure" @@ -4773,7 +4884,7 @@ msgstr "Ripetere la password" #: 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 "Nome" @@ -4783,7 +4894,7 @@ msgstr "Nome" #: 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 "Cognome" @@ -4795,36 +4906,32 @@ msgstr "L'attivazione dell'account richi 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 "admin Journal" - -#: rhodecode/templates/admin/admin.mako:13 -msgid "journal filter..." -msgstr "Filtra il journal..." - -#: 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 "filtro" -#: rhodecode/templates/admin/admin.mako:15 -#: rhodecode/templates/journal/journal.mako:14 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" -msgstr[0] "%s elemento" -msgstr[1] "%s elementi" - -#: 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 "Query di esempio" -#: 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 @@ -4832,38 +4939,45 @@ msgstr "Query di esempio" #: 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 "Azione" -#: 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 "Repository" -#: 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 "Data" -#: rhodecode/templates/admin/admin_log.mako:11 -#: rhodecode/templates/admin/users/user_edit_audit.mako:26 -msgid "From IP" -msgstr "Dall'IP" - -#: 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 "Nessuna azione" @@ -4906,8 +5020,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 @@ -4948,7 +5062,7 @@ msgstr "Repository privato" #: 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 " @@ -5003,7 +5117,7 @@ msgstr "Livello di accesso ai Gist" #: 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 "testo semplice" @@ -5014,9 +5128,9 @@ msgstr "Aggiorna il Gist" #: 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 @@ -5085,14 +5199,13 @@ msgstr "Mio Pubblico" #: 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 "Autore" @@ -5153,12 +5266,12 @@ msgstr "Conferma di voler eliminare ques #: 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 "Modifica" @@ -5199,11 +5312,11 @@ msgstr "Gruppi di Repository" #: 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:251 msgid "Settings" msgstr "Impostazioni" @@ -5306,7 +5419,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 "il mio Account" @@ -5330,7 +5443,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 "le Email" @@ -5347,7 +5460,7 @@ msgstr "Richieste 'Pull'" #: 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" @@ -5407,7 +5520,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 "Aggiungi" @@ -5426,10 +5539,8 @@ msgid "Primary" msgstr "Primario" #: 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" -msgstr "Conferma l'eliminazione dell'email: %s" +msgid "Confirm to delete this email: {}" +msgstr "" #: rhodecode/templates/admin/my_account/my_account_emails.mako:42 #: rhodecode/templates/admin/users/user_edit_emails.mako:41 @@ -5514,13 +5625,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 "Titolo" #: 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 "" @@ -5538,7 +5649,7 @@ msgid "My Notifications" msgstr "Le mie Notifiche" #: rhodecode/templates/admin/notifications/notifications.mako:32 -#: rhodecode/templates/changeset/changeset.mako:140 +#: rhodecode/templates/changeset/changeset.mako:160 msgid "Comments" msgstr "Commenti" @@ -5559,6 +5670,10 @@ msgstr "Mostra notifica" msgid "Notifications" msgstr "Notifiche" +#: rhodecode/templates/admin/notifications/show_notification.mako:40 +msgid "Subject" +msgstr "" + #: rhodecode/templates/admin/permissions/permissions.mako:5 msgid "Permissions Administration" msgstr "Amministrazione Permessi" @@ -5621,23 +5736,23 @@ msgid "Default IP Whitelist For All User msgstr "Whitelist di base di indirizzi IP per tutti gli utenti" #: 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 "Conferma eliminazione dell'ip: %s" #: 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 "Tutti gli indirizzi IP possono accedere" #: 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 "Nuovo indirizzo IP" #: 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 "Descrizione.." @@ -5735,9 +5850,9 @@ msgid "Add Child Group" msgstr "Aggiungi Gruppo Figlio" #: 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 "Avanzate" @@ -5794,26 +5909,26 @@ msgid "Repository Group Permissions" msgstr "Permessi del Gruppo di Repository" #: 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 "Utente/Utente Gruppo" #: 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 "super admin" #: 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 "proprietario" #: 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" @@ -5821,8 +5936,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 "Revoca" @@ -5832,7 +5947,7 @@ msgid "delegated admin" msgstr "admin delegato" #: 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" @@ -5902,7 +6017,7 @@ msgid "Clone from" msgstr "Clona da" #: 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." @@ -5913,7 +6028,6 @@ msgid "Repository Group" msgstr "Gruppo di Repository" #: 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)" @@ -5933,7 +6047,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 "" @@ -5965,36 +6079,36 @@ msgstr "Repository \"%(repo_name)s\" in msgid "%s repository settings" msgstr "Impostazioni del repository %s" -#: 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 "Caches" -#: rhodecode/templates/admin/repos/repo_edit.mako:65 +#: rhodecode/templates/admin/repos/repo_edit.mako:68 msgid "Remote" msgstr "Remoto" -#: 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 "Statistiche" -#: 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 "" @@ -6029,93 +6143,86 @@ msgstr "Imposta manualmente questo repos 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 "Conferma sbloccaggio repository." -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:92 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:91 msgid "Unlock repository" msgstr "Sblocca repository" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:97 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:96 msgid "Confirm to lock repository." msgstr "Conferma il blocco del repository." -#: 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 "Scollega i fork" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129 msgid "Delete forks" msgstr "Cancella i fork" -#: 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 "Conferma la cancellazione del repository: %s" -#: 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 +#: 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." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 +"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 "" @@ -6123,46 +6230,45 @@ msgstr "" msgid "Invalidate Cache for Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Invalidate repository cache" -msgstr "Invalida la cache del repository" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Confirm to invalidate repository cache" -msgstr "Conferma l'invalidazione della cache del repository" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:14 +#: 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: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: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 "Invalida la cache del repository" + +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:20 +msgid "Confirm to invalidate repository cache" +msgstr "Conferma l'invalidazione della cache del repository" + +#: 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 "Prefisso" -#: 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 "Chiave" -#: 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 "Attivo" @@ -6238,20 +6344,29 @@ 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 "" @@ -6259,11 +6374,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 "repository privato" -#: 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 "" @@ -6271,57 +6386,91 @@ msgstr "" msgid "Remote url" msgstr "URL remoto" -#: 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 "PULL - Incorpora i cambiamenti dalla origine remota" -#: 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 "Conferma il 'Pull' dalla origine remota" -#: 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 "ID non modificabile" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:19 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 msgid "what is that ?" msgstr "cos'è quello ?" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:21 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:24 msgid "URL by id" msgstr "URL per ID" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 +#: 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 "In caso il repository sia rinominato o spostato in un altro gruppo l'URL cambierebbe.\nUsare l'indirizzo sopra riportato, garantisce che questo repository sarà sempre accessibile da quell'URL.\nUtile per i sistemi CI, o ogni altro caso in cui si necessiti di cablare l'URL in servizi di terze parti" -#: 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 "Gruppo di Repository" + +#: 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 "Opzionale: selezionare un gruppo all'interno del quale aggiungere questo repository" + +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:51 msgid "Remote uri" msgstr "URI remoto" -#: 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 @@ -6329,65 +6478,62 @@ msgstr "URI remoto" msgid "edit" msgstr "modifica" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:39 -msgid "new value, leave empty to remove" -msgstr "nuovo valore. lascia vuoto per eliminarlo" - -#: 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 "annulla" -#: 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 "URL http[s] da cui il repository è stato importato. Usato anche per PULL remoti." - -#: 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 "Gruppo di Repository" - -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:65 -msgid "Optional select a group to put this repository into." -msgstr "Opzionale: selezionare un gruppo all'interno del quale aggiungere questo repository" - -#: 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 +#: 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 "Cambia il proprietario del repository" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:108 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:138 #: rhodecode/templates/data_table/_dt_elements.mako:58 msgid "Private repository" msgstr "Repository privato" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:117 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:148 msgid "Enable statistics" msgstr "Abilita statistiche" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:121 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:153 msgid "Enable statistics window on summary page." msgstr "Abilita la finestra delle statistiche sulla pagina di riepilogo" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:126 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:158 msgid "Enable downloads" msgstr "Abilita i download" -#: 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 "Abilita il menù per il download sulla pagina di riepilogo" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:135 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:168 msgid "Enable automatic locking" msgstr "Abilita il blocco automatico" -#: 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" @@ -6454,32 +6600,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 @@ -7049,12 +7187,12 @@ msgid "%s user group settings" msgstr "Impostazioni del gruppo utente %s" #: 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 "Permessi globali" #: 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 "Riepilogo dei permessi" @@ -7091,46 +7229,39 @@ 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 "Conferma l'eliminazione del gruppo utente `%(ugroup)s` con tutti i permessi assegnati" -#: 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 "" @@ -7222,24 +7353,28 @@ msgstr "Password generata:" msgid "%s user settings" msgstr "Impostazioni utente %s" -#: 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 +#: rhodecode/templates/admin/users/user_edit.mako:39 msgid "Auth tokens" msgstr "Token autorizzativi" -#: rhodecode/templates/admin/users/user_edit.mako:39 +#: 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 "" @@ -7253,7 +7388,7 @@ msgid "Last login" msgstr "Ultimo login" #: 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 "Ultima attivit" @@ -7374,6 +7509,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 "Conferma l'eliminazione dell'email: %s" + #: rhodecode/templates/admin/users/user_edit_groups.mako:12 #, python-format msgid "Add `%s` to user group" @@ -7383,12 +7523,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 "Ereditato da %s" -#: 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" @@ -7435,7 +7587,7 @@ msgstr "Aiuta a tradurre %(rc_link)s nel msgid "Users administration" msgstr "Amministrazione utenti" -#: rhodecode/templates/admin/users/users.mako:77 +#: rhodecode/templates/admin/users/users.mako:78 msgid "Auth type" msgstr "Tipo di Auth" @@ -7503,110 +7655,110 @@ msgstr "Confronta" msgid "Show Pull Requests for %s" msgstr "Mostra le richieste PULL da %s" -#: rhodecode/templates/base/base.mako:246 +#: rhodecode/templates/base/base.mako:247 msgid "Options" msgstr "Opzioni" -#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/base/base.mako:255 #: rhodecode/templates/forks/forks_data.mako:30 msgid "Compare fork" msgstr "Confronta FORK" -#: 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 "Ricerca" -#: rhodecode/templates/base/base.mako:260 +#: rhodecode/templates/base/base.mako:262 msgid "Unlock" msgstr "Sblocca" -#: rhodecode/templates/base/base.mako:262 +#: rhodecode/templates/base/base.mako:264 msgid "Lock" msgstr "Blocca" -#: 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] "Fork" -msgstr[1] "Forks" - -#: rhodecode/templates/base/base.mako:268 +msgstr "Fork" + +#: rhodecode/templates/base/base.mako:270 msgid "Create Pull Request" msgstr "Crea richiesta di PULL" -#: rhodecode/templates/base/base.mako:290 +#: rhodecode/templates/base/base.mako:292 msgid "Sign in" msgstr "Accedi" -#: 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 "Accedi al tuo account" -#: rhodecode/templates/base/base.mako:315 +#: rhodecode/templates/base/base.mako:317 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "(Password dimenticata?)" -#: rhodecode/templates/base/base.mako:325 -#: rhodecode/templates/debug_style/login.html:56 -msgid "Don't have an account ?" +#: rhodecode/templates/base/base.mako:327 +msgid "Don't have an account?" msgstr "Non possiedi un account?" -#: rhodecode/templates/base/base.mako:345 +#: 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 "Journal" -#: 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 "Journal pubblico" -#: 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 "i Gist" -#: 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 @@ -7628,15 +7780,15 @@ msgstr "" msgid "Style" msgstr "Stile" -#: 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 "Scorciatoie da tastiera" -#: rhodecode/templates/base/base.mako:544 +#: rhodecode/templates/base/base.mako:547 msgid "Site-wide shortcuts" msgstr "Scorciatoie per tutto il sito" @@ -7743,10 +7895,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" @@ -7826,7 +7978,7 @@ msgstr "Crea gruppi utente" msgid "No permission defined" msgstr "Nessun permesso definito" -#: rhodecode/templates/base/root.mako:150 +#: rhodecode/templates/base/root.mako:155 msgid "Please enable JavaScript to use RhodeCode Enterprise" msgstr "" @@ -7937,93 +8089,105 @@ msgid "" "repositories and migrates them to Mercurial type." msgstr "Richiede che sia installata la libreria hgsubversion. Permette il \"clone\" di repository SVN remoti e la loro migrazione a Mercurial" -#: 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 "Proxy per le richieste HTTP Subversion" -#: rhodecode/templates/base/vcs_settings.mako:203 +#: 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:204 +#: rhodecode/templates/base/vcs_settings.mako:217 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:210 +#: rhodecode/templates/base/vcs_settings.mako:223 msgid "Subversion HTTP Server URL" msgstr "URL del server HTTP Subversion" -#: rhodecode/templates/base/vcs_settings.mako:216 +#: 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 "Pattern del Repository" -#: 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 "\"Pattern\" per identificare \"branch\" e \"tag\" svn. Per ricerche ricorsive, usare \"*\". Es.: \"/branches/*\"" -#: 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 "Abilita l'incorporamento lato server delle \"richieste di PULL\"" -#: 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 " @@ -8031,11 +8195,11 @@ msgid "" "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 "Invalida e realloca i commenti in linea durante l'aggiornmento" -#: 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." @@ -8055,10 +8219,10 @@ msgid "Compare Selected Bookmarks" msgstr "confronta i Segnalibri Selezionati" #: 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 "Segnalibro %s" @@ -8077,10 +8241,10 @@ msgid "Compare Selected Branches" msgstr "confronta i Branch Selezionati" #: 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 "Branch %s" @@ -8118,19 +8282,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 "Messaggio Commit" #: rhodecode/templates/changelog/changelog.mako:112 -#: rhodecode/templates/changelog/changelog_summary_data.mako:10 +#: rhodecode/templates/summary/summary_commits.mako:10 msgid "Age" msgstr "Et" #: rhodecode/templates/changelog/changelog.mako:115 -#: rhodecode/templates/changelog/changelog_summary_data.mako:12 +#: rhodecode/templates/summary/summary_commits.mako:12 msgid "Refs" msgstr "" @@ -8147,7 +8311,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" @@ -8155,44 +8319,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 "Espandi il messaggio commit" -#: 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 "merge" -#: 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 "Tag %s" -#: rhodecode/templates/changelog/changelog_elements.mako:113 +#: rhodecode/templates/changelog/changelog_elements.mako:133 msgid "load next" msgstr "" @@ -8200,100 +8386,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 "Messaggio commit" - -#: 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 "Aggiungi Nuovo File" - -#: 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 "Repository esistente?" - #: 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 "diff semplice" -#: 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 "Patch diff" -#: 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 "Download diff" -#: 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" @@ -8301,8 +8465,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" @@ -8310,19 +8474,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 "" @@ -8348,73 +8512,81 @@ 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 "Autenticati ora" -#: 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 "Usa @username all'interno del testo per notificare l'utente RhodeCode." -#: 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 "Chiuso" -#: 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 @@ -8453,7 +8625,7 @@ msgstr "Mostra confronto combinato" #: 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" @@ -8462,7 +8634,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" @@ -8634,26 +8806,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 "" @@ -8691,6 +8863,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 "" @@ -8904,6 +9077,10 @@ msgstr "" msgid "Form vertical" msgstr "" +#: rhodecode/templates/debug_style/login.html:56 +msgid "Don't have an account ?" +msgstr "Non possiedi un account?" + #: rhodecode/templates/email_templates/base.mako:32 #, python-format msgid "This is a notification from RhodeCode. %(instance_url)s" @@ -9025,6 +9202,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 "" @@ -9098,8 +9276,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" @@ -9123,7 +9299,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 "Sarete rediretti a %s in %s secondi" @@ -9194,6 +9370,7 @@ msgid "Remove Custom Path" msgstr "" #: rhodecode/templates/files/files_add.mako:50 +#: rhodecode/templates/files/files_add.mako:59 msgid "Filename" msgstr "" @@ -9201,34 +9378,34 @@ msgstr "" msgid "Upload File" msgstr "Carica un file" -#: 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 "Crea Nuovo File" -#: 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 "accapo automatico" -#: rhodecode/templates/files/files_add.mako:76 +#: rhodecode/templates/files/files_add.mako:82 #: rhodecode/templates/files/files_edit.mako:80 msgid "on" msgstr "acceso" -#: rhodecode/templates/files/files_add.mako:76 +#: rhodecode/templates/files/files_add.mako:82 #: rhodecode/templates/files/files_edit.mako:80 msgid "off" msgstr "spento" -#: 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 "Commit modifiche" @@ -9249,6 +9426,11 @@ msgstr "Lista Ricerca File" msgid "Close File List" msgstr "" +#: rhodecode/templates/files/files_browser.mako:25 +#: rhodecode/templates/summary/summary_commits.mako:103 +msgid "Add New File" +msgstr "Aggiungi Nuovo File" + #: rhodecode/templates/files/files_browser.mako:27 msgid "Add File" msgstr "" @@ -9361,7 +9543,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] "" @@ -9425,6 +9606,10 @@ msgstr "" msgid "Fork name" msgstr "nome Fork" +#: 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 "Copia permessi" @@ -9462,6 +9647,13 @@ msgstr "Non ci sono Fork" msgid "Filter" msgstr "" +#: rhodecode/templates/journal/journal.mako:14 +#, python-format +msgid "%s entry" +msgid_plural "%s entries" +msgstr[0] "%s elemento" +msgstr[1] "%s elementi" + #: rhodecode/templates/journal/journal.mako:23 msgid "ATOM journal feed" msgstr "Feed ATOM del journal" @@ -9492,65 +9684,75 @@ msgstr "Feed RSS del journal pubblico" msgid "New pull request" msgstr "Nuova richiesta PULL" -#: 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 "Scrivi una breve descrizione sulla richiesta PULL" -#: 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 "Origine del repository" - -#: 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 "Revisori della richiesta PULL" -#: 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 "Repository di destinazione" - -#: 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 "" @@ -9598,10 +9800,6 @@ msgstr "" msgid "Confirm to delete this pull request" msgstr "Conferma l'eliminazione di questa richiesta 'Pull'" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:71 -msgid "Origin" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:88 msgid "Common ancestor" msgstr "" @@ -9700,77 +9898,77 @@ 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 "Salva i Cambiamenti" -#: 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 "Aggiorna i commit" -#: 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 "" @@ -9860,6 +10058,11 @@ msgstr "Messaggi di commit" msgid "File names" msgstr "Nomi dei file" +#: rhodecode/templates/search/search_commit.mako:8 +#: rhodecode/templates/summary/summary_commits.mako:9 +msgid "Commit message" +msgstr "Messaggio commit" + #: rhodecode/templates/search/search_commit.mako:11 msgid "Age (new first)" msgstr "" @@ -9891,34 +10094,6 @@ msgstr "%s feed ATOM" msgid "%s RSS feed" msgstr "%s feed RSS" -#: 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 "" @@ -9999,6 +10174,18 @@ msgstr "Avvio rapido" 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 "Repository esistente?" + #: rhodecode/templates/tags/tags.mako:5 #, python-format msgid "%s Tags" diff --git a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-04-07 12:33+0200\n" -"PO-Revision-Date: 2017-04-07 10:34+0000\n" +"POT-Creation-Date: 2017-06-27 17:25+0200\n" +"PO-Revision-Date: 2017-06-27 15:26+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Japanese (http://www.transifex.com/rhodecode/RhodeCode/language/ja/)\n" "MIME-Version: 1.0\n" @@ -34,7 +34,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 "VCS" @@ -47,7 +47,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 "問題追跡システム" @@ -58,7 +58,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" @@ -85,7 +85,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 "インテグレーション" @@ -107,11 +107,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 "" @@ -123,249 +123,416 @@ 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" -msgstr "データーベース" +msgid "Workers" +msgstr "" #: rhodecode/apps/admin/views/system_info.py:115 -msgid "Database version" -msgstr "データーベースバージョン" +msgid "Worker Type" +msgstr "" #: rhodecode/apps/admin/views/system_info.py:119 -msgid "Platform" -msgstr "プラットフォーム" +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 +#: rhodecode/apps/admin/views/system_info.py:126 msgid "Python version" msgstr "Python バージョン" -#: rhodecode/apps/admin/views/system_info.py:122 -msgid "Python path" -msgstr "Python パス" - -#: rhodecode/apps/admin/views/system_info.py:126 -msgid "CPU" -msgstr "CPU" - #: rhodecode/apps/admin/views/system_info.py:127 +msgid "Python path" +msgstr "Python パス" + +#: rhodecode/apps/admin/views/system_info.py:131 +msgid "CPU" +msgstr "CPU" + +#: rhodecode/apps/admin/views/system_info.py:132 msgid "Load" msgstr "Load" -#: rhodecode/apps/admin/views/system_info.py:128 +#: rhodecode/apps/admin/views/system_info.py:133 msgid "Memory" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:129 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Uptime" msgstr "稼働時間" -#: rhodecode/apps/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Storage location" msgstr "ストレージの場所" -#: rhodecode/apps/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:139 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" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:138 -msgid "Gist 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:178 -#: rhodecode/apps/my_account/views.py:138 +#: 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:179 -#: rhodecode/apps/my_account/views.py:139 +#: rhodecode/apps/admin/views/users.py:169 +#: rhodecode/apps/my_account/views.py:149 #: rhodecode/controllers/admin/gists.py:63 msgid "5 minutes" msgstr "5 分" -#: rhodecode/apps/admin/views/users.py:180 -#: rhodecode/apps/my_account/views.py:140 +#: rhodecode/apps/admin/views/users.py:170 +#: rhodecode/apps/my_account/views.py:150 #: rhodecode/controllers/admin/gists.py:64 msgid "1 hour" msgstr "1 時間" -#: rhodecode/apps/admin/views/users.py:181 -#: rhodecode/apps/my_account/views.py:141 +#: rhodecode/apps/admin/views/users.py:171 +#: rhodecode/apps/my_account/views.py:151 #: rhodecode/controllers/admin/gists.py:65 msgid "1 day" msgstr "1 日" -#: rhodecode/apps/admin/views/users.py:182 -#: rhodecode/apps/my_account/views.py:142 +#: rhodecode/apps/admin/views/users.py:172 +#: rhodecode/apps/my_account/views.py:152 #: rhodecode/controllers/admin/gists.py:66 msgid "1 month" msgstr "1 ヶ月" -#: rhodecode/apps/admin/views/users.py:184 -#: rhodecode/apps/my_account/views.py:144 +#: 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:188 -#: rhodecode/apps/my_account/views.py:148 +#: rhodecode/apps/admin/views/users.py:178 +#: 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 "ユーザーアカウントに新しいメールアドレス `%s` を追加しました" + +#: 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 "IP アドレスの保存中にエラーが発生しました: %s" + +#: rhodecode/apps/admin/views/users.py:389 +msgid "An error occurred during ip saving" +msgstr "IPアドレスの保存中にエラーが発生しました" + +#: rhodecode/apps/admin/views/users.py:393 +#, python-format +msgid "Added ips %s to user whitelist" +msgstr "ユーザーホワイトリストに IP アドレス %s を追加しました" + +#: rhodecode/apps/admin/views/users.py:423 +msgid "Removed ip address from user whitelist" +msgstr "ユーザーホワイトリストからIPアドレスを削除しました" + +#: 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 "%(repo)s のコミット" + +#: 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 に登録されました" -#: 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 "%s 個のフォークを切り離しました" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:96 +#, python-format +msgid "Deleted %s forks" +msgstr "%s 個のフォークを削除しました" + +#: 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 "%s リポジトリを %s のフォークとする" + +#: 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 "" @@ -423,7 +590,7 @@ msgid "The Port in use by the Atlassian msgstr "Atlassian CROWDサーバが使用するポート" #: rhodecode/authentication/plugins/auth_crowd.py:69 -#: rhodecode/authentication/plugins/auth_ldap.py:84 +#: rhodecode/authentication/plugins/auth_ldap.py:86 msgid "Port" msgstr "ポート" @@ -453,7 +620,7 @@ msgstr "RhodeCode管理者とみなされるコンマで区切られたグループ名のリスト" msgid "Admin Groups" msgstr "管理者グループ" -#: rhodecode/authentication/plugins/auth_crowd.py:215 +#: rhodecode/authentication/plugins/auth_crowd.py:216 msgid "CROWD" msgstr "CROWD" @@ -503,126 +670,130 @@ msgstr "Jasig-CAS" #: 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 "LDAPホスト" -#: 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 "TLSの種類" -#: 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 "TLSの証明書の要求レベル" - -#: 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 "ベースDN" -#: 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 "LDAP検索フィルタ" -#: 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 "LDAP検索範囲" -#: 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 "LDAPログイン属性は必ず指定する必要があります" -#: 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 "LDAP" @@ -655,76 +826,73 @@ msgstr "Rhodecode" msgid "Rhodecode Token Auth" msgstr "Rhodecodeトークン認証" -#: 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:84 +#: rhodecode/controllers/changeset.py:83 msgid "Ignore whitespace" msgstr "空白文字を無視" -#: rhodecode/controllers/changeset.py:85 +#: rhodecode/controllers/changeset.py:84 msgid "Ignore whitespace for all diffs" msgstr "すべての差分で空白文字を無視" -#: rhodecode/controllers/changeset.py:141 +#: rhodecode/controllers/changeset.py:140 msgid "Increase context" msgstr "差分の範囲を拡大" -#: rhodecode/controllers/changeset.py:142 +#: rhodecode/controllers/changeset.py:141 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 "状態変更 %(transition_icon)s %(status)s" -#: 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 " @@ -750,51 +918,47 @@ msgstr "ファイルを追加するにはここをクリックしてください。" msgid "There are no files yet. %s" msgstr "まだファイルがありません。 %s" -#: 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 "このリポジトリは %s on %s によりロックされています" -#: 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" -msgstr "RhodeCode Enterprise 経由でファイル %s を削除しました" +#: 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 "%s ファイルの削除に成功しました" - -#: 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 Enterprise 経由でファイル %s を編集しました" - -#: 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 "%s へのコミットが成功しました" - -#: 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 "RhodeCode Enterprise 経由でファイルを追加しました" @@ -802,41 +966,39 @@ msgstr "RhodeCode Enterprise 経由でファイルを追加しました" 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 "%s は未知のリビジョンです" -#: 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 "タグ" @@ -845,28 +1007,6 @@ msgstr "タグ" msgid "An error occurred during repository forking %s" msgstr "リポジトリ %s のフォーク中にエラーが発生しました" -#: 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 "%(repo)s のコミット" - #: rhodecode/controllers/journal.py:107 rhodecode/controllers/journal.py:150 msgid "public journal" msgstr "公開ジャーナル" @@ -875,84 +1015,60 @@ 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 "プルリクエストには3文字以上のタイトルが必要です" -#: 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:437 +#: rhodecode/controllers/pullrequests.py:328 msgid "Pull request title & description updated." msgstr "プルリクエストのタイトルと説明を更新しました。" -#: rhodecode/controllers/pullrequests.py:455 +#: 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:472 +#: rhodecode/controllers/pullrequests.py:363 msgid "Reload page" msgstr "" -#: rhodecode/controllers/pullrequests.py:546 +#: rhodecode/controllers/pullrequests.py:437 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 "却下または承認以外のステータスのプルリクエストは終了できません。すべてのレビュワーより算出した現時点のステータス: %s" - -#: 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 "デフォルト設定の更新に成功しました" @@ -1008,87 +1124,71 @@ msgstr "無し" msgid "%(expiry)s - current value" msgstr "%(expiry)s - 現在値" -#: 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 "ユーザー %s の更新中にエラーが発生しました" -#: 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 "ユーザーアカウントに新しいメールアドレス `%s` を追加しました" - -#: 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 "リポジトリグループ %s を作成しました" -#: 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 "リポジトリグループ %s の作成中にエラーが発生しました" -#: rhodecode/controllers/admin/repo_groups.py:258 +#: rhodecode/controllers/admin/repo_groups.py:261 #, python-format msgid "Updated repository group %s" msgstr "リポジトリグループ %s を更新しました" -#: 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 "リポジトリグループ %s の更新中にエラーが発生しました" -#: 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] "このグループは %(num)d 個のリポジトリを含んでいるため削除できません" -#: 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] "このグループは %(num)d のサブグループを含んでいるため削除できません" -#: rhodecode/controllers/admin/repo_groups.py:312 +#: rhodecode/controllers/admin/repo_groups.py:313 #, python-format msgid "Removed repository group %s" msgstr "リポジトリグループ %s を削除しました" @@ -1098,366 +1198,285 @@ msgstr "リポジトリグループ %s を削除しました" msgid "Error occurred during deletion of repository group %s" msgstr "リポジトリグループ %s の削除中にエラーが発生しました" -#: 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:129 +#: rhodecode/controllers/admin/repos.py:125 #, python-format msgid "Error creating repository %s: invalid certificate" msgstr "リポジトリ %s 作成中にエラーが発生しました: 無効な証明書です" -#: rhodecode/controllers/admin/repos.py:133 +#: rhodecode/controllers/admin/repos.py:129 #, python-format msgid "Error creating repository %s" msgstr "リポジトリ %s の作成中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:274 +#: rhodecode/controllers/admin/repos.py:270 #, python-format msgid "Created repository %s from %s" msgstr "リポジトリ %s を %s から作成しました" -#: rhodecode/controllers/admin/repos.py:283 +#: rhodecode/controllers/admin/repos.py:279 #, python-format msgid "Forked repository %s as %s" msgstr "リポジトリ %s を %s としてフォークしました" -#: rhodecode/controllers/admin/repos.py:286 +#: rhodecode/controllers/admin/repos.py:282 #, python-format msgid "Created repository %s" msgstr "リポジトリ %s を作成しました" -#: rhodecode/controllers/admin/repos.py:327 -#, python-format -msgid "Repository %s updated successfully" -msgstr "リポジトリ %s の更新に成功しました" - -#: rhodecode/controllers/admin/repos.py:346 -#, python-format -msgid "Error occurred during update of repository %s" -msgstr "リポジトリ %s の更新中にエラーが発生しました" - -#: rhodecode/controllers/admin/repos.py:374 -#, python-format -msgid "Detached %s forks" -msgstr "%s 個のフォークを切り離しました" - -#: rhodecode/controllers/admin/repos.py:377 -#, python-format -msgid "Deleted %s forks" -msgstr "%s 個のフォークを削除しました" - -#: rhodecode/controllers/admin/repos.py:382 -#, python-format -msgid "Deleted repository %s" -msgstr "リポジトリ %s を削除しました" - -#: rhodecode/controllers/admin/repos.py:385 -#, python-format -msgid "Cannot delete %s it still contains attached forks" -msgstr "フォークしたリポジトリが存在するため、 %s は削除できません" - -#: rhodecode/controllers/admin/repos.py:390 -#, python-format -msgid "An error occurred during deletion of %s" -msgstr "%s の削除中にエラーが発生しました" - -#: rhodecode/controllers/admin/repos.py:443 -msgid "Repository permissions updated" -msgstr "リポジトリ権限を更新しました" - -#: rhodecode/controllers/admin/repos.py:474 +#: rhodecode/controllers/admin/repos.py:319 msgid "An error occurred during creation of field" msgstr "フィールドの作成中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:489 +#: rhodecode/controllers/admin/repos.py:334 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 "%s リポジトリを %s のフォークとする" - -#: 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 +#: rhodecode/controllers/admin/repos.py:353 msgid "Unlocked" msgstr "アンロック" -#: rhodecode/controllers/admin/repos.py:612 +#: rhodecode/controllers/admin/repos.py:357 msgid "Locked" msgstr "ロック" -#: rhodecode/controllers/admin/repos.py:614 +#: rhodecode/controllers/admin/repos.py:359 #, python-format msgid "Repository has been %s" msgstr "リポジトリは %s されています" -#: 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 +#: rhodecode/controllers/admin/repos.py:373 msgid "Pulled from remote location" msgstr "リモートから取得" -#: rhodecode/controllers/admin/repos.py:656 +#: rhodecode/controllers/admin/repos.py:376 msgid "An error occurred during pull from remote location" msgstr "リモートから取得中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:678 +#: rhodecode/controllers/admin/repos.py:397 msgid "An error occurred during deletion of repository stats" msgstr "リポジトリステートの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:725 +#: rhodecode/controllers/admin/repos.py:443 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 "リポジトリのVCS設定を更新中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:841 +#: rhodecode/controllers/admin/repos.py:559 #: rhodecode/controllers/admin/settings.py:176 msgid "Updated VCS settings" msgstr "VCS設定を更新しました" #: 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 "リポジトリの再スキャンに成功しました。 追加: %s 削除: %s" -#: 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 "ユーザーグループ %(user_group_link)s を作成しました" -#: 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 "ユーザーグループ %s の作成中にエラーが発生しました" -#: rhodecode/controllers/admin/user_groups.py:220 +#: rhodecode/controllers/admin/user_groups.py:218 #, python-format msgid "Updated user group %s" msgstr "ユーザーグループ %s を更新しました" -#: 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 "ユーザーグループ %s の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/user_groups.py:258 +#: rhodecode/controllers/admin/user_groups.py:253 msgid "Successfully deleted user group" msgstr "ユーザーグループの削除に成功しました" -#: rhodecode/controllers/admin/user_groups.py:263 +#: rhodecode/controllers/admin/user_groups.py:258 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 "ユーザー %(user_link)s を作成しました" -#: rhodecode/controllers/admin/users.py:122 +#: rhodecode/controllers/admin/users.py:124 #, python-format msgid "Error occurred during creation of user %s" msgstr "ユーザー %s の作成中にエラーが発生しました" -#: 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 "%s 個のリポジトリを切り離しました" -#: rhodecode/controllers/admin/users.py:223 +#: rhodecode/controllers/admin/users.py:214 #, python-format msgid "Deleted %s repositories" msgstr " %s 個のリポジトリを削除しました" -#: rhodecode/controllers/admin/users.py:231 +#: rhodecode/controllers/admin/users.py:222 #, python-format msgid "Detached %s repository groups" msgstr "%s 個のリポジトリグループを切り離しました" -#: rhodecode/controllers/admin/users.py:236 +#: rhodecode/controllers/admin/users.py:227 #, python-format msgid "Deleted %s repository groups" msgstr "%s 個のリポジトリグループを削除しました" -#: rhodecode/controllers/admin/users.py:244 +#: rhodecode/controllers/admin/users.py:235 #, python-format msgid "Detached %s user groups" msgstr "%s 個のユーザーグループを切り離しました" -#: rhodecode/controllers/admin/users.py:249 +#: rhodecode/controllers/admin/users.py:240 #, python-format msgid "Deleted %s user groups" msgstr "%s 個のユーザーグループを削除しました" -#: 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:285 +#: rhodecode/controllers/admin/users.py:280 msgid "Force password change disabled for user" msgstr "パスワード変更強制を無効化しました" -#: rhodecode/controllers/admin/users.py:287 +#: rhodecode/controllers/admin/users.py:285 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 "リポジトリグループ `%s` を作成しました" -#: 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 "ユーザーのリポジトリグループを作成中にエラーが発生しました" @@ -1467,81 +1486,63 @@ msgid "" "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 "IP アドレスの保存中にエラーが発生しました: %s" - -#: rhodecode/controllers/admin/users.py:604 -msgid "An error occurred during ip saving" -msgstr "IPアドレスの保存中にエラーが発生しました" - -#: rhodecode/controllers/admin/users.py:608 -#, python-format -msgid "Added ips %s to user whitelist" -msgstr "ユーザーホワイトリストに IP アドレス %s を追加しました" - -#: rhodecode/controllers/admin/users.py:626 -msgid "Removed ip address from user whitelist" -msgstr "ユーザーホワイトリストからIPアドレスを削除しました" - -#: 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 "リポジトリのプッシュ" @@ -1573,7 +1574,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 @@ -1584,8 +1585,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 @@ -1595,13 +1596,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 @@ -1610,13 +1611,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 @@ -1770,16 +1771,15 @@ msgstr "Slack app manager でセットアップできます" #: 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 @@ -1815,11 +1815,11 @@ msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "Slack のチャンネルにリポジトリのプッシュやプルリクエストなどのイベントを送信する。" -#: rhodecode/integrations/types/webhook.py:152 +#: rhodecode/integrations/types/webhook.py:164 msgid "Webhook URL" msgstr "Webhook URL" -#: 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 " @@ -1827,172 +1827,172 @@ msgid "" "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 "Webhook" -#: rhodecode/integrations/types/webhook.py:193 +#: rhodecode/integrations/types/webhook.py:205 msgid "Post json events to a webhook endpoint" msgstr "JSON イベントを webhook エンドポイントに POST する" -#: 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経由でコミット]" -#: 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 "フォーク名 %s" -#: 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 "プルリクエスト #%s" -#: rhodecode/lib/action_parser.py:216 +#: rhodecode/lib/action_parser.py:223 #, python-format msgid "Show all combined commits %s->%s" msgstr "%s から %s までのすべてのコミットを表示" -#: rhodecode/lib/action_parser.py:220 +#: rhodecode/lib/action_parser.py:227 msgid "compare view" msgstr "比較ビュー" -#: rhodecode/lib/action_parser.py:227 +#: rhodecode/lib/action_parser.py:234 #, python-format msgid " and %(num)s more commits" msgstr "と %(num)s 以上のコミット" -#: rhodecode/lib/action_parser.py:279 +#: rhodecode/lib/action_parser.py:286 #, python-format msgid "Deleted branch: %s" msgstr "削除されたブランチ: %s" -#: rhodecode/lib/action_parser.py:282 +#: rhodecode/lib/action_parser.py:289 #, python-format msgid "Created tag: %s" msgstr "作成したタグ: %s" -#: 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 "IPアドレス %s は許可されません" -#: 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 "%s に対するアクションはできません。" -#: 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 "リポジトリ %(repo_name)s が見つかりません。" @@ -2018,20 +2018,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 " と %s 以上" -#: 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" @@ -2046,7 +2047,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" @@ -2088,7 +2103,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 "たったいま" @@ -2123,7 +2138,7 @@ msgstr "たったいま" #: 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/model/db.py:2482 msgid "Repository no access" msgstr "リポジトリへのアクセス権限無し" @@ -2157,7 +2172,7 @@ msgstr "リポジトリへのアクセス権限無し" #: 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/model/db.py:2483 msgid "Repository read access" msgstr "リポジトリに読込権限でアクセス" @@ -2191,7 +2206,7 @@ msgstr "リポジトリに読込権限でアクセス" #: 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/model/db.py:2484 msgid "Repository write access" msgstr "リポジトリに書込権限でアクセス" @@ -2225,7 +2240,7 @@ msgstr "リポジトリに書込権限でアクセス" #: 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/model/db.py:2485 msgid "Repository admin access" msgstr "リポジトリに管理権限でアクセス" @@ -2299,7 +2314,7 @@ msgstr "RhodeCode 管理者" #: 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/model/db.py:2503 msgid "Repository creation disabled" msgstr "リポジトリの作成を有効にする" @@ -2333,7 +2348,7 @@ msgstr "リポジトリの作成を有効にする" #: 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/model/db.py:2504 msgid "Repository creation enabled" msgstr "リポジトリの作成を有効にする" @@ -2367,7 +2382,7 @@ msgstr "リポジトリの作成を有効にする" #: 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/model/db.py:2508 msgid "Repository forking disabled" msgstr "リポジトリのフォークを無効にする" @@ -2401,7 +2416,7 @@ msgstr "リポジトリのフォークを無効にする" #: 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/model/db.py:2509 msgid "Repository forking enabled" msgstr "リポジトリのフォークを有効にする" @@ -2456,7 +2471,7 @@ msgstr "Rhodecodeに登録した新しいユーザーを自動でアクティベートする" #: 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/model/db.py:3212 msgid "Not Reviewed" msgstr "未レビュー" @@ -2490,7 +2505,7 @@ msgstr "未レビュー" #: 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/model/db.py:3213 msgid "Approved" msgstr "承認" @@ -2524,7 +2539,7 @@ msgstr "承認" #: 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/model/db.py:3214 msgid "Rejected" msgstr "却下" @@ -2558,7 +2573,7 @@ msgstr "却下" #: 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/model/db.py:3215 msgid "Under Review" msgstr "レビュー中" @@ -2589,7 +2604,7 @@ msgstr "レビュー中" #: 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/model/db.py:2487 msgid "Repository group no access" msgstr "リポジトリグループへのアクセス権限なし" @@ -2620,7 +2635,7 @@ msgstr "リポジトリグループへのアクセス権限なし" #: 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/model/db.py:2488 msgid "Repository group read access" msgstr "リポジトリグループに読込権限でアクセス" @@ -2651,7 +2666,7 @@ msgstr "リポジトリグループに読込権限でアクセス" #: 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/model/db.py:2489 msgid "Repository group write access" msgstr "リポジトリグループに書込権限でアクセス" @@ -2682,7 +2697,7 @@ msgstr "リポジトリグループに書込権限でアクセス" #: 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/model/db.py:2490 msgid "Repository group admin access" msgstr "リポジトリグループに管理権限でアクセス" @@ -2712,7 +2727,7 @@ msgstr "リポジトリグループに管理権限でアクセス" #: 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/model/db.py:2492 msgid "User group no access" msgstr "ユーザーグループへのアクセス権限なし" @@ -2742,7 +2757,7 @@ msgstr "ユーザーグループへのアクセス権限なし" #: 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/model/db.py:2493 msgid "User group read access" msgstr "ユーザーグループに読込権限でアクセス" @@ -2772,7 +2787,7 @@ msgstr "ユーザーグループに読込権限でアクセス" #: 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/model/db.py:2494 msgid "User group write access" msgstr "ユーザーグループに書込権限でアクセス" @@ -2802,7 +2817,7 @@ msgstr "ユーザーグループに書込権限でアクセス" #: 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/model/db.py:2495 msgid "User group admin access" msgstr "ユーザーグループに管理権限でアクセス" @@ -2832,7 +2847,7 @@ msgstr "ユーザーグループに管理権限でアクセス" #: 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/model/db.py:2497 msgid "Repository Group creation disabled" msgstr "リポジトリグループの作成を無効にする" @@ -2862,7 +2877,7 @@ msgstr "リポジトリグループの作成を無効にする" #: 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/model/db.py:2498 msgid "Repository Group creation enabled" msgstr "リポジトリグループの作成を有効にする" @@ -2892,7 +2907,7 @@ msgstr "リポジトリグループの作成を有効にする" #: 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/model/db.py:2500 msgid "User Group creation disabled" msgstr "ユーザーグループの作成を無効にする" @@ -2922,7 +2937,7 @@ msgstr "ユーザーグループの作成を無効にする" #: 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/model/db.py:2501 msgid "User Group creation enabled" msgstr "ユーザーグループの作成を有効にする" @@ -2952,7 +2967,7 @@ msgstr "ユーザーグループの作成を有効にする" #: 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/model/db.py:2511 msgid "Registration disabled" msgstr "新規登録を無効にする" @@ -2982,7 +2997,7 @@ msgstr "新規登録を無効にする" #: 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/model/db.py:2512 msgid "User Registration with manual account activation" msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" @@ -3012,7 +3027,7 @@ msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" #: 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/model/db.py:2513 msgid "User Registration with automatic account activation" msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" @@ -3042,7 +3057,7 @@ msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" #: 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/model/permission.py:95 +#: rhodecode/model/db.py:2519 rhodecode/model/permission.py:95 msgid "Manual activation of external account" msgstr "外部アカウントを手動でアクティベートする" @@ -3072,7 +3087,7 @@ msgstr "外部アカウントを手動でアクティベートする" #: 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/model/permission.py:96 +#: rhodecode/model/db.py:2520 rhodecode/model/permission.py:96 msgid "Automatic activation of external account" msgstr "外部アカウントを自動でアクティベートする" @@ -3096,7 +3111,7 @@ msgstr "外部アカウントを自動でアクティベートする" #: 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/model/db.py:2505 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成が有効です" @@ -3121,7 +3136,7 @@ msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成が有効です" #: 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/model/db.py:2506 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成は無効です" @@ -3143,7 +3158,7 @@ msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成は無効です" #: 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/model/db.py:2480 msgid "RhodeCode Super Administrator" msgstr "" @@ -3162,7 +3177,7 @@ msgstr "" #: 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/model/db.py:2522 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3181,7 +3196,7 @@ msgstr "" #: 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/model/db.py:2523 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3191,7 +3206,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 "すべて" @@ -3201,7 +3216,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 "HTTP/Web インターフェース" @@ -3211,7 +3226,7 @@ msgstr "HTTP/Web インターフェース" #: 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 "VCS (git/hg/svn プロトコル)" @@ -3221,7 +3236,7 @@ msgstr "VCS (git/hg/svn プロトコル)" #: 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 "API 呼び出し" @@ -3231,7 +3246,7 @@ msgstr "API 呼び出し" #: 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 "フィードへのアクセス" @@ -3242,65 +3257,65 @@ msgstr "フィードへのアクセス" #: 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/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/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/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/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 "検索するためのインデックスがありません。whooshでインデックスを作成して下さい" -#: 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 "表示する" @@ -3386,7 +3401,7 @@ msgstr "%(user)s がプルリクエストにコメント %(date_or_age)s" #: 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 "なし" @@ -3394,7 +3409,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 "読込" @@ -3402,10 +3417,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 "書込" @@ -3428,7 +3443,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 @@ -3438,9 +3453,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 "管理" @@ -3471,93 +3486,93 @@ 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 +#: rhodecode/model/pull_request.py:85 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:85 +#: 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 "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." -msgstr "" - -#: rhodecode/model/pull_request.py:124 +"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" @@ -3565,92 +3580,96 @@ msgid "" " %(pr_title)s" msgstr "%(source_repo)s %(source_ref_name)s からのプルリクエスト #%(pr_id)s をマージ\n\n %(pr_title)s" -#: 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 "コミットID" -#: 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 "最新のtip" -#: 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 "ユーザー `%(username)s` を編集できません。このユーザはアプリケーションにとって必要不可欠です。" -#: 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 "ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできません。リポジトリの所有者を変更するか削除してください: %s" -#: 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 "ユーザー \"%s\" はまだ %s 個のリポジトリグループの所有者のため削除することはできません。リポジトリグループの所有者を変更するか削除してください: %s" -#: 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 " @@ -3676,6 +3695,7 @@ msgid "Username \"%(username)s\" is forb msgstr "ユーザー名 \"%(username)s\" は許可されていません" #: 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" @@ -3785,98 +3805,113 @@ msgstr "リポジトリ %(repo)s は グループ %(group)s にすでに存在します" msgid "Repository group with name \"%(repo)s\" exists in group \"%(group)s\"" msgstr "リポジトリグループ \"%(repo)s\" は グループ \"%(group)s\" にすでに存在します" -#: 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 "%(rtype)s リポジトリの不正なクローン URL " -#: 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 "不正なクローン URL です、 %(allowed_prefixes)s のどれかで始まる有効なクローン URL を入力してください" -#: 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 "メールアドレス \"%(email)s\" は存在しません" -#: 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 "リビジョン %(revs)s はすでにプルリクエストの一部かステータスが設定されています" -#: 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 "有効なIPv4かIPv6のアドレスを入力してください" -#: 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 "ネットワークサイズ (bits) は0-32の範囲にする必要があります ( %(bits)r は不正です)" -#: 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 "%(loaded)s プラグインと %(next_to_load)s プラグインで同じ名前が使われています" -#: rhodecode/model/validators.py:979 +#: rhodecode/model/validators.py:1012 #, python-format msgid "The plugin \"%(plugin_id)s\" is missing an includeme function." msgstr "プラグイン \"%(plugin_id)s\" に includeme 関数がありません。" -#: rhodecode/model/validators.py:982 +#: rhodecode/model/validators.py:1015 #, python-format msgid "Can not load plugin \"%(plugin_id)s\"" msgstr "プラグイン \"%(plugin_id)s\" をロードできません" -#: rhodecode/model/validators.py:984 +#: rhodecode/model/validators.py:1017 #, python-format msgid "No plugin available with ID \"%(plugin_id)s\"" msgstr "ID \"%(plugin_id)s\" で利用可能なプラグインがありません" -#: 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" @@ -3949,253 +3984,263 @@ 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 "{0} 年" #: 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 "{0} ヶ月" #: 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 "{0} 日" #: 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 "{0} 時間" #: 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 "{0} 分" #: 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 "{0} 秒" #: 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 "{0} 前" #: 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 "1 件の結果があります。 Enter で選択できます。" #: 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 "{0} 件の結果があります。矢印キーの上下で選択できます。" #: 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 "{0} 文字以上入力してください" #: 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 "{0} 文字以上入力してください" #: 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 "{0} 文字削除してください" #: 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 "{0} 文字削除してください" #: 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 "{0} 件のみ選択できます" #: 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 "{0} 件のみ選択できます" #: 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 @@ -4204,28 +4249,28 @@ 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 " @@ -4234,14 +4279,14 @@ msgstr "選択したステータス ({0}) を元にコメントが自動的に設定されます..." #: 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 ..." @@ -4249,105 +4294,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 "もっと表示" @@ -4362,151 +4472,151 @@ 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 +#: 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 bookmarks available yet." msgstr "まだブックマークがありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 msgid "No branches available yet." msgstr "まだブランチがありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 msgid "No gists available yet." msgstr "まだ Gist がありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 msgid "No pull requests available yet." msgstr "まだプルリクエストがありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 msgid "No repositories available yet." msgstr "まだリポジトリがありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 msgid "No repository groups available yet." msgstr "まだリポジトリグループがありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 msgid "No tags available yet." msgstr "まだタグがありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 msgid "No user groups available yet." msgstr "まだユーザーグループがありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 msgid "No users available yet." msgstr "まだユーザーがいません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: 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:30 +#: 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:35 +#: 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 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 msgid "" "There are currently no open pull requests requiring your participation." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "無効" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: 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:62 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 msgid "files" msgstr "ファイル" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 -#: rhodecode/templates/pullrequests/pullrequest.mako:108 +#: 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 "" @@ -4588,7 +4698,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 @@ -4596,7 +4706,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 "名前" @@ -4611,7 +4721,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 @@ -4619,9 +4729,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 @@ -4629,9 +4740,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 "説明" @@ -4642,7 +4753,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 @@ -4665,13 +4776,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 "" @@ -4686,7 +4797,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 "サインイン" @@ -4711,14 +4822,14 @@ 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 "または" @@ -4778,7 +4889,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 "名前" @@ -4788,7 +4899,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 "名字" @@ -4800,35 +4911,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] "%s 個のエントリ" - -#: 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 @@ -4836,38 +4944,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 "アクセス元IPアドレス" - -#: 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 "まだアクションがありません" @@ -4910,8 +5025,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 @@ -4952,7 +5067,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 " @@ -5007,7 +5122,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 "plain" @@ -5018,9 +5133,9 @@ msgstr "Gistを更新" #: 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 @@ -5089,14 +5204,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 "作成者" @@ -5157,12 +5271,12 @@ msgstr "このGistを削除してもよろしいですか？" #: 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 "編集" @@ -5203,11 +5317,11 @@ 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:251 msgid "Settings" msgstr "設定" @@ -5310,7 +5424,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 "アカウント" @@ -5334,7 +5448,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 "メールアドレス" @@ -5351,7 +5465,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" @@ -5411,7 +5525,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 "追加" @@ -5430,10 +5544,8 @@ 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" -msgstr "このメールアドレスを削除してもよろしいですか？ : %s" +msgid "Confirm to delete this email: {}" +msgstr "" #: rhodecode/templates/admin/my_account/my_account_emails.mako:42 #: rhodecode/templates/admin/users/user_edit_emails.mako:41 @@ -5518,13 +5630,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 "" @@ -5542,7 +5654,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 "コメント" @@ -5563,6 +5675,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 "" @@ -5625,23 +5741,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 "このIPアドレスを削除してもよろしいですか？ : %s" #: 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 "すべてのIPアドレスが許可されています" #: 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 "" @@ -5739,9 +5855,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 "高度な設定" @@ -5796,26 +5912,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" @@ -5823,8 +5939,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 "" @@ -5834,7 +5950,7 @@ msgid "delegated admin" msgstr "代理 admin" #: 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" @@ -5904,7 +6020,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." @@ -5915,7 +6031,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)" @@ -5935,7 +6050,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 "" @@ -5967,36 +6082,36 @@ msgstr "" msgid "%s repository settings" msgstr "%s リポジトリ設定" -#: 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 "" @@ -6031,92 +6146,86 @@ 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] "" - -#: 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 "このリポジトリを削除してもよろしいですか？ : %s" -#: 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 +#: 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." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 +"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 "" @@ -6124,45 +6233,45 @@ msgstr "" msgid "Invalidate Cache for Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Invalidate repository cache" -msgstr "リポジトリのキャッシュを無効化" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Confirm to invalidate repository cache" -msgstr "リポジトリのキャッシュを無効化してもよろしいですか？" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:14 +#: 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:28 -#, python-format -msgid "List of repository caches (%(count)s entry)" -msgid_plural "List of repository caches (%(count)s entries)" -msgstr[0] "" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:35 +#: 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: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 "アクティブ" @@ -6238,20 +6347,29 @@ 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 "" @@ -6259,11 +6377,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 "" @@ -6271,57 +6389,91 @@ msgstr "" msgid "Remote url" msgstr "リモート URL" -#: 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 "変更不能ID" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:19 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 msgid "what is that ?" msgstr "これは何？" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:21 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:24 msgid "URL by id" msgstr "id を使ってURLを表現" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 +#: 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 @@ -6329,65 +6481,62 @@ 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 +#: 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:108 +#: 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:117 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:148 msgid "Enable statistics" msgstr "統計を有効にする" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:121 +#: 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" @@ -6454,32 +6603,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 @@ -7049,12 +7190,12 @@ msgid "%s user group settings" msgstr "%s ユーザーグループ設定" #: 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 "権限の概要" @@ -7091,46 +7232,39 @@ 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 "ユーザーグループ `%(ugroup)s` とその全権限を削除しますか？" -#: 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 "このユーザーグループを削除" @@ -7222,24 +7356,28 @@ msgstr "生成されたパスワード:" msgid "%s user settings" msgstr "%s ユーザー設定" -#: 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 +#: rhodecode/templates/admin/users/user_edit.mako:39 msgid "Auth tokens" msgstr "認証トークン" -#: rhodecode/templates/admin/users/user_edit.mako:39 +#: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Ip Whitelist" msgstr "IP アドレスのホワイトリスト" -#: 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 "" @@ -7253,7 +7391,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 "最後の活動" @@ -7371,6 +7509,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 "このメールアドレスを削除してもよろしいですか？ : %s" + #: rhodecode/templates/admin/users/user_edit_groups.mako:12 #, python-format msgid "Add `%s` to user group" @@ -7380,12 +7523,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 "%s から継承" -#: 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" @@ -7432,7 +7587,7 @@ msgstr "" msgid "Users administration" msgstr "ユーザー管理" -#: rhodecode/templates/admin/users/users.mako:77 +#: rhodecode/templates/admin/users/users.mako:78 msgid "Auth type" msgstr "認証タイプ" @@ -7500,109 +7655,110 @@ msgstr "比較" msgid "Show Pull Requests for %s" msgstr "%s のプルリクエストを表示" -#: 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 +#: rhodecode/templates/base/base.mako:262 msgid "Unlock" msgstr "アンロック" -#: rhodecode/templates/base/base.mako:262 +#: 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] "" - -#: 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 "Gists" -#: 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 @@ -7624,15 +7780,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 "サイト全体" @@ -7739,10 +7895,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" @@ -7822,7 +7978,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 "" @@ -7933,93 +8089,105 @@ msgid "" "repositories and migrates them to Mercurial type." msgstr "hgsubversion ライブラリのインストールが必要です。リモートのSVNリポジトリをクローンしてMercurialリポジトリに変換するすることが可能です。" -#: 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 " @@ -8027,11 +8195,11 @@ msgid "" "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." @@ -8051,10 +8219,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 "ブックマーク %s" @@ -8073,10 +8241,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 "ブランチ %s" @@ -8113,19 +8281,19 @@ msgid_plural "showing %d out of %d commi msgstr[0] "" #: 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 "Refs" @@ -8142,7 +8310,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" @@ -8150,44 +8318,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 "タグ %s" -#: rhodecode/templates/changelog/changelog_elements.mako:113 +#: rhodecode/templates/changelog/changelog_elements.mako:133 msgid "load next" msgstr "" @@ -8195,127 +8385,105 @@ 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 "diffとして差分を表示" -#: 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" msgid_plural "%d Commit comments" msgstr[0] "" -#: 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" msgid_plural "%d Inline Comments" msgstr[0] "" -#: 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 "" @@ -8341,73 +8509,81 @@ 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 "テキスト内で @username を使うと、その RhodeCode のユーザーに通知を送信します" -#: 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 @@ -8445,7 +8621,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" @@ -8453,7 +8629,7 @@ msgstr[0] "" #: 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" @@ -8621,24 +8797,24 @@ 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] "" -#: 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] "" -#: rhodecode/templates/compare/compare_commits.mako:74 +#: rhodecode/templates/compare/compare_commits.mako:75 msgid "No commits in this compare" msgstr "" @@ -8675,6 +8851,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 "ソース" @@ -8887,6 +9064,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" @@ -9008,6 +9189,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 "" @@ -9080,8 +9262,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" @@ -9104,7 +9284,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 "%s へ %s 秒後にリダイレクトします" @@ -9174,6 +9354,7 @@ msgid "Remove Custom Path" msgstr "" #: rhodecode/templates/files/files_add.mako:50 +#: rhodecode/templates/files/files_add.mako:59 msgid "Filename" msgstr "" @@ -9181,34 +9362,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 "変更をコミット" @@ -9229,6 +9410,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 "" @@ -9341,7 +9527,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] "" @@ -9404,6 +9589,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 "権限のコピー" @@ -9441,6 +9630,12 @@ msgstr "まだフォークがありません" msgid "Filter" msgstr "" +#: rhodecode/templates/journal/journal.mako:14 +#, python-format +msgid "%s entry" +msgid_plural "%s entries" +msgstr[0] "%s 個のエントリ" + #: rhodecode/templates/journal/journal.mako:23 msgid "ATOM journal feed" msgstr "ATOM ジャーナルフィード" @@ -9471,64 +9666,74 @@ msgstr "RSS 公開ジャーナルフィード" 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] "" -#: 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 "" @@ -9576,10 +9781,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 "" @@ -9676,77 +9877,77 @@ 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 "" @@ -9836,6 +10037,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 "経過時間 (新しい順)" @@ -9867,30 +10073,6 @@ msgstr "%s ATOM フィード" msgid "%s RSS feed" msgstr "%s RSS フィード" -#: rhodecode/templates/summary/components.mako:5 -#, python-format -msgid "%(num)s Branch" -msgid_plural "%(num)s Branches" -msgstr[0] "%(num)s 個のブランチ" - -#: rhodecode/templates/summary/components.mako:12 -#, python-format -msgid "%(num)s Closed Branch" -msgid_plural "%(num)s Closed Branches" -msgstr[0] "%(num)s 個の終了したブランチ" - -#: rhodecode/templates/summary/components.mako:19 -#, python-format -msgid "%(num)s Tag" -msgid_plural "%(num)s Tags" -msgstr[0] "%(num)s 個のタグ" - -#: rhodecode/templates/summary/components.mako:26 -#, python-format -msgid "%(num)s Bookmark" -msgid_plural "%(num)s Bookmarks" -msgstr[0] "%(num)s 個のブックマーク" - #: rhodecode/templates/summary/components.mako:49 msgid "Read-only url" msgstr "リードオンリー URL" @@ -9971,6 +10153,18 @@ msgstr "クイックスタート" msgid "Readme file from commit %s:%s" msgstr "コミット %s:%s の README ファイル" +#: 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/i18n/pl/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-04-07 12:33+0200\n" -"PO-Revision-Date: 2017-04-07 10:34+0000\n" +"POT-Creation-Date: 2017-06-27 17:25+0200\n" +"PO-Revision-Date: 2017-06-27 15:26+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Polish (http://www.transifex.com/rhodecode/RhodeCode/language/pl/)\n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" "Language: pl\n" -"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" #: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 #: rhodecode/integrations/views.py:166 @@ -32,7 +32,7 @@ msgid "Global" msgstr "Globalne" #: 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 "VCS" @@ -45,7 +45,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 "" @@ -56,7 +56,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" @@ -83,7 +83,7 @@ msgstr "Wyszukiwanie Pełnotekstowe" #: 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 "Integracje" @@ -105,11 +105,11 @@ msgstr "Licencje Otwarto Źródłowe" msgid "Labs" msgstr "Laboratorium" -#: 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 "" @@ -121,249 +121,416 @@ 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 "Nie możesz edytować tego użytkownika" -#: rhodecode/apps/admin/views/users.py:178 -#: rhodecode/apps/my_account/views.py:138 +#: rhodecode/apps/admin/views/users.py:168 +#: rhodecode/apps/my_account/views.py:148 #: rhodecode/controllers/admin/gists.py:62 msgid "forever" msgstr "na zawsze" -#: rhodecode/apps/admin/views/users.py:179 -#: rhodecode/apps/my_account/views.py:139 +#: rhodecode/apps/admin/views/users.py:169 +#: rhodecode/apps/my_account/views.py:149 #: rhodecode/controllers/admin/gists.py:63 msgid "5 minutes" msgstr "5 minut" -#: rhodecode/apps/admin/views/users.py:180 -#: rhodecode/apps/my_account/views.py:140 +#: rhodecode/apps/admin/views/users.py:170 +#: rhodecode/apps/my_account/views.py:150 #: rhodecode/controllers/admin/gists.py:64 msgid "1 hour" msgstr "1 godzina" -#: rhodecode/apps/admin/views/users.py:181 -#: rhodecode/apps/my_account/views.py:141 +#: rhodecode/apps/admin/views/users.py:171 +#: rhodecode/apps/my_account/views.py:151 #: rhodecode/controllers/admin/gists.py:65 msgid "1 day" msgstr "1 dzień" -#: rhodecode/apps/admin/views/users.py:182 -#: rhodecode/apps/my_account/views.py:142 +#: rhodecode/apps/admin/views/users.py:172 +#: rhodecode/apps/my_account/views.py:152 #: rhodecode/controllers/admin/gists.py:66 msgid "1 month" msgstr "1 miesiąc" -#: rhodecode/apps/admin/views/users.py:184 -#: rhodecode/apps/my_account/views.py:144 +#: rhodecode/apps/admin/views/users.py:174 +#: rhodecode/apps/my_account/views.py:154 #: rhodecode/controllers/admin/gists.py:70 msgid "Lifetime" msgstr "Czas życia" -#: rhodecode/apps/admin/views/users.py:188 -#: rhodecode/apps/my_account/views.py:148 +#: rhodecode/apps/admin/views/users.py:178 +#: 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 "Rola" -#: 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 "Wystąpił błąd podczas zapisywania e-maila" + +#: 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 "Wystąpił błąd podczas zapisywania e-maila" + +#: 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 "Usunięto adres ip z listy dozwolonych adresów dla użytkownika" + +#: 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 "Repozytoria" + +#: rhodecode/apps/home/views.py:223 +msgid "Groups" +msgstr "Grupy" + +#: 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 "Cache wyczyszczony poprawnie" + +#: rhodecode/apps/repository/views/repo_caches.py:74 +msgid "An error occurred during cache invalidation" +msgstr "Wystąpił błąd podczas unieważniania cache" + +#: rhodecode/apps/repository/views/repo_permissions.py:95 +msgid "Repository permissions updated" +msgstr "Uprawnienia repozytorium zostały zaktualizowane" + +#: 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 "Oderwane rozgałęzienie %s" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:96 +#, python-format +msgid "Deleted %s forks" +msgstr "Usunięte repozytorium %s" + +#: 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 "Zaktualizowano widoczność stron w publicznym dzienniku" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:156 +msgid "An error occurred during setting this repository in public journal" +msgstr "Wystąpił błąd podczas ustawiania tego repozytorium w dzienniku publicznym" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:184 +msgid "Nothing" +msgstr "Brak" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:186 +#, python-format +msgid "Marked repo %s as fork of %s" +msgstr "Oznaczono %s repo jako rozwidlenie %s" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 +msgid "An error occurred during this operation" +msgstr "Wystąpił błąd podczas tej operacji" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:217 +msgid "Locked repository" +msgstr "Zablokowane repozytorium" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:220 +msgid "Unlocked repository" +msgstr "Odblokowane repozytorium" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:223 +#: rhodecode/controllers/admin/repos.py:363 +msgid "An error occurred during unlocking" +msgstr "Wystąpił błąd podczas odblokowywania" + +#: rhodecode/apps/repository/views/repo_summary.py:293 +msgid "Branch" +msgstr "gałąź" + +#: rhodecode/apps/repository/views/repo_summary.py:294 +msgid "Tag" +msgstr "Tag" + +#: rhodecode/apps/repository/views/repo_summary.py:295 +msgid "Bookmark" +msgstr "Bookmark" + +#: 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 "Gałęzie" + +#: rhodecode/apps/repository/views/repo_summary.py:319 +msgid "Closed branches" +msgstr "Zamkniętę gałęzie" + #: rhodecode/apps/svn_support/events.py:30 msgid "Configuration for Apaache mad_dav_svn changed." msgstr "" @@ -421,7 +588,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 "Port" @@ -451,7 +618,7 @@ msgstr "" msgid "Admin Groups" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:215 +#: rhodecode/authentication/plugins/auth_crowd.py:216 msgid "CROWD" msgstr "" @@ -501,126 +668,130 @@ 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 "Konto" -#: 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 "Hasło" -#: 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 "Kontrola certyfikatów" -#: 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 "Bazowy DN" -#: 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 "Zakres wyszukiwania LDAP" -#: 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 "Atrybuty logowania" -#: 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 "Atrybut Nazwiska" -#: 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 "Atrybut Imienia" -#: 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 "LDAP" @@ -653,76 +824,73 @@ 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 "Brak commitów" -#: rhodecode/controllers/changeset.py:77 +#: rhodecode/controllers/changeset.py:76 msgid "Show whitespace" msgstr "Pokaż białe znaki" -#: rhodecode/controllers/changeset.py:78 +#: rhodecode/controllers/changeset.py:77 msgid "Show whitespace for all diffs" msgstr "Pokaż białe znaki dla wszystkich zmian" +#: rhodecode/controllers/changeset.py:83 +msgid "Ignore whitespace" +msgstr "Ignoruj białe znaki" + #: rhodecode/controllers/changeset.py:84 -msgid "Ignore whitespace" -msgstr "Ignoruj białe znaki" - -#: rhodecode/controllers/changeset.py:85 msgid "Ignore whitespace for all diffs" msgstr "Ignoruj białe znaki dla wszystkich zmian" -#: rhodecode/controllers/changeset.py:141 +#: rhodecode/controllers/changeset.py:140 msgid "Increase context" msgstr "" -#: rhodecode/controllers/changeset.py:142 +#: rhodecode/controllers/changeset.py:141 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 " @@ -748,51 +916,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 "Wystąpił błąd w trakcie zatwierdzania" -#: 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 "Można tylko edytować pliki z rewizji obecnej gałęzi" -#: 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 "Bez zmian" -#: rhodecode/controllers/files.py:578 rhodecode/controllers/files.py:707 -#, python-format -msgid "Successfully committed to %s" -msgstr "Committ wykonany do %s" - -#: 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 "" @@ -800,41 +964,39 @@ msgstr "" msgid "No filename" msgstr "Brak nazwy pliku" +#: 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 "Pobieranie wyłączone" -#: rhodecode/controllers/files.py:770 +#: rhodecode/controllers/files.py:769 #, python-format msgid "Unknown revision %s" msgstr "Nieznana wersja %s" -#: rhodecode/controllers/files.py:772 +#: rhodecode/controllers/files.py:771 msgid "Empty repository" msgstr "Puste repozytorium" -#: 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 "Nieznany typ archiwum" -#: rhodecode/controllers/files.py:993 +#: rhodecode/controllers/files.py:1000 msgid "Changesets" msgstr "Różnice" -#: 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 "Gałęzie" - -#: 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 "Etykiety" @@ -843,28 +1005,6 @@ msgstr "Etykiety" msgid "An error occurred during repository forking %s" msgstr "Wystąpił błąd podczas rozgałęzienia %s repozytorium" -#: rhodecode/controllers/home.py:207 -msgid "Groups" -msgstr "Grupy" - -#: 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 "Repozytoria" - -#: 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 "Dziennik publiczny" @@ -873,84 +1013,60 @@ msgstr "Dziennik publiczny" msgid "journal" msgstr "dziennik" -#: 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 "Wniosek połączenia gałęzi wymaga tytułu z min. 3 znakami" -#: 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 "Prośba o wykonanie połączenia gałęzi została wykonana prawidłowo" -#: rhodecode/controllers/pullrequests.py:388 -msgid "Error occurred during sending pull request" -msgstr "Wystąpił błąd podczas prośby o połączenie gałęzi" - -#: 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:437 +#: rhodecode/controllers/pullrequests.py:328 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/controllers/pullrequests.py:455 +#: 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:472 +#: rhodecode/controllers/pullrequests.py:363 msgid "Reload page" msgstr "" -#: rhodecode/controllers/pullrequests.py:546 +#: rhodecode/controllers/pullrequests.py:437 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 "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo" -#: 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 "Zamykanie" - -#: 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 "gałąź" - -#: rhodecode/controllers/summary.py:252 -msgid "Tag" -msgstr "Tag" - -#: rhodecode/controllers/summary.py:253 -msgid "Bookmark" -msgstr "Bookmark" - -#: rhodecode/controllers/summary.py:278 -msgid "Closed branches" -msgstr "Zamkniętę gałęzie" - #: rhodecode/controllers/admin/defaults.py:84 msgid "Default settings updated successfully" msgstr "Domyślne ustawienia zostały pomyślnie zaktualizowane" @@ -1006,75 +1122,59 @@ msgstr "nigdy" 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 "Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej aplikacji" -#: rhodecode/controllers/admin/my_account.py:138 +#: rhodecode/controllers/admin/my_account.py:110 msgid "Your account was updated successfully" msgstr "Twoje konto zostało pomyślnie zaktualizowane" -#: 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 "wystąpił błąd podczas aktualizacji użytkownika %s" -#: 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 "Wystąpił błąd podczas zapisywania e-maila" - -#: 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 "Wystąpił błąd podczas aktualizacji uprawnień" -#: 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 "Globalne uprawnienia zaktualizowane poprawnie" -#: rhodecode/controllers/admin/repo_groups.py:197 +#: rhodecode/controllers/admin/repo_groups.py:202 #, python-format msgid "Created repository group %s" msgstr "Utworzono grupę repo %s" -#: 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 "Wystąpił błąd podczas tworzenia grupy repo %s" -#: rhodecode/controllers/admin/repo_groups.py:258 +#: rhodecode/controllers/admin/repo_groups.py:261 #, python-format msgid "Updated repository group %s" msgstr "Zaktualizowano grupę repo %s" -#: 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 "Wystąpił błąd podczas aktualizacji grupy repo %s" -#: 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" @@ -1083,7 +1183,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: 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" @@ -1092,7 +1192,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/controllers/admin/repo_groups.py:312 +#: rhodecode/controllers/admin/repo_groups.py:313 #, python-format msgid "Removed repository group %s" msgstr "Usunięto grupę repo %s" @@ -1102,366 +1202,285 @@ msgstr "Usunięto grupę repo %s" msgid "Error occurred during deletion of repository group %s" msgstr "Wystąpił błąd podczas usuwania z repozytorium grupy %s" -#: 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 "Aktualizacja uprawnień grup repozytorium" -#: rhodecode/controllers/admin/repos.py:129 +#: rhodecode/controllers/admin/repos.py:125 #, python-format msgid "Error creating repository %s: invalid certificate" msgstr "" -#: rhodecode/controllers/admin/repos.py:133 +#: rhodecode/controllers/admin/repos.py:129 #, python-format msgid "Error creating repository %s" msgstr "utworzone repozytorium %s" -#: rhodecode/controllers/admin/repos.py:274 +#: rhodecode/controllers/admin/repos.py:270 #, python-format msgid "Created repository %s from %s" msgstr "utworzone repozytorium %s z %s" -#: rhodecode/controllers/admin/repos.py:283 +#: rhodecode/controllers/admin/repos.py:279 #, python-format msgid "Forked repository %s as %s" msgstr "Gałęzi %s w repozytorium %s" -#: rhodecode/controllers/admin/repos.py:286 +#: rhodecode/controllers/admin/repos.py:282 #, python-format msgid "Created repository %s" msgstr "Utworzone repozytorium %s" -#: rhodecode/controllers/admin/repos.py:327 -#, python-format -msgid "Repository %s updated successfully" -msgstr "Repozytorium %s zostało pomyślnie zaktualizowane" - -#: rhodecode/controllers/admin/repos.py:346 -#, python-format -msgid "Error occurred during update of repository %s" -msgstr "Wystąpił błąd podczas aktualizacji repozytorium %s" - -#: rhodecode/controllers/admin/repos.py:374 -#, python-format -msgid "Detached %s forks" -msgstr "Oderwane rozgałęzienie %s" - -#: rhodecode/controllers/admin/repos.py:377 -#, python-format -msgid "Deleted %s forks" -msgstr "Usunięte repozytorium %s" - -#: rhodecode/controllers/admin/repos.py:382 -#, python-format -msgid "Deleted repository %s" -msgstr "Usunięte repozytorium %s" - -#: rhodecode/controllers/admin/repos.py:385 -#, python-format -msgid "Cannot delete %s it still contains attached forks" -msgstr "Nie można usunąć %s nadal zawiera załączniki rozgałęzienia" - -#: rhodecode/controllers/admin/repos.py:390 -#, python-format -msgid "An error occurred during deletion of %s" -msgstr "Wystąpił błąd podczas usuwania %s" - -#: rhodecode/controllers/admin/repos.py:443 -msgid "Repository permissions updated" -msgstr "Uprawnienia repozytorium zostały zaktualizowane" - -#: rhodecode/controllers/admin/repos.py:474 +#: rhodecode/controllers/admin/repos.py:319 msgid "An error occurred during creation of field" msgstr "Wystąpił błąd podczas tworzenia użytkownika %s" -#: rhodecode/controllers/admin/repos.py:489 +#: rhodecode/controllers/admin/repos.py:334 msgid "An error occurred during removal of field" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: rhodecode/controllers/admin/repos.py:528 -msgid "Updated repository visibility in public journal" -msgstr "Zaktualizowano widoczność stron w publicznym dzienniku" - -#: rhodecode/controllers/admin/repos.py:532 -msgid "An error occurred during setting this repository in public journal" -msgstr "Wystąpił błąd podczas ustawiania tego repozytorium w dzienniku publicznym" - -#: rhodecode/controllers/admin/repos.py:556 -msgid "Nothing" -msgstr "Brak" - -#: rhodecode/controllers/admin/repos.py:558 -#, python-format -msgid "Marked repo %s as fork of %s" -msgstr "Oznaczono %s repo jako rozwidlenie %s" - -#: rhodecode/controllers/admin/repos.py:565 -msgid "An error occurred during this operation" -msgstr "Wystąpił błąd podczas tej operacji" - -#: rhodecode/controllers/admin/repos.py:583 -msgid "Locked repository" -msgstr "Zablokowane repozytorium" - -#: rhodecode/controllers/admin/repos.py:586 -msgid "Unlocked repository" -msgstr "Odblokowane repozytorium" - -#: rhodecode/controllers/admin/repos.py:589 -#: rhodecode/controllers/admin/repos.py:618 -msgid "An error occurred during unlocking" -msgstr "Wystąpił błąd podczas odblokowywania" - -#: rhodecode/controllers/admin/repos.py:608 +#: rhodecode/controllers/admin/repos.py:353 msgid "Unlocked" msgstr "Odblokowany" -#: rhodecode/controllers/admin/repos.py:612 +#: rhodecode/controllers/admin/repos.py:357 msgid "Locked" msgstr "Zablokowany" -#: rhodecode/controllers/admin/repos.py:614 +#: rhodecode/controllers/admin/repos.py:359 #, python-format msgid "Repository has been %s" msgstr "Repozytoriów jest %s" -#: rhodecode/controllers/admin/repos.py:629 -msgid "Cache invalidation successful" -msgstr "Cache wyczyszczony poprawnie" - -#: rhodecode/controllers/admin/repos.py:633 -msgid "An error occurred during cache invalidation" -msgstr "Wystąpił błąd podczas unieważniania cache" - -#: rhodecode/controllers/admin/repos.py:653 +#: rhodecode/controllers/admin/repos.py:373 msgid "Pulled from remote location" msgstr "Pobieranie z lokalizacji zdalnej" -#: rhodecode/controllers/admin/repos.py:656 +#: rhodecode/controllers/admin/repos.py:376 msgid "An error occurred during pull from remote location" msgstr "Wystąpił błąd podczas pobierania z lokalizacji zdalnej" -#: rhodecode/controllers/admin/repos.py:678 +#: rhodecode/controllers/admin/repos.py:397 msgid "An error occurred during deletion of repository stats" msgstr "Wystąpił błąd podczas usuwania z repozytorium statystyk" -#: rhodecode/controllers/admin/repos.py:725 +#: rhodecode/controllers/admin/repos.py:443 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 "Aktualizacja ustawień VCS" #: 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 "Wystąpił błąd podczas aktualizacji ustawień aplikacji" -#: rhodecode/controllers/admin/settings.py:223 +#: rhodecode/controllers/admin/settings.py:226 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "Repozytoria z powodzeniem zostały ponownie zeskanowane dodano: %s, usunięto: %s" -#: rhodecode/controllers/admin/settings.py:279 +#: rhodecode/controllers/admin/settings.py:282 msgid "Updated application settings" msgstr "Aktualizacja ustawień aplikacji" -#: rhodecode/controllers/admin/settings.py:345 +#: rhodecode/controllers/admin/settings.py:348 msgid "Updated visualisation settings" msgstr "Aktualizacja ustawień wizualizacji" -#: rhodecode/controllers/admin/settings.py:348 +#: rhodecode/controllers/admin/settings.py:351 msgid "Error occurred during updating visualisation settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień wizualizacji" -#: rhodecode/controllers/admin/settings.py:441 +#: rhodecode/controllers/admin/settings.py:444 msgid "Please enter email address" msgstr "Proszę podać adres email" -#: 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 "Dodano nowy hook" -#: rhodecode/controllers/admin/settings.py:507 +#: rhodecode/controllers/admin/settings.py:510 msgid "Updated hooks" msgstr "Aktualizacja hooku" -#: rhodecode/controllers/admin/settings.py:511 +#: rhodecode/controllers/admin/settings.py:514 msgid "Error occurred during hook creation" msgstr "Wystąpił błąd podczas tworzenia hooku" -#: 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 "Wystąpił błąd podczas tworzenia grupy użytkowników %s" -#: rhodecode/controllers/admin/user_groups.py:220 +#: rhodecode/controllers/admin/user_groups.py:218 #, python-format msgid "Updated user group %s" msgstr "Zaktualizowano grupę użytkowników %s" -#: 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 "Wystąpił błąd podczas aktualizacji grupy użytkowników %s" -#: rhodecode/controllers/admin/user_groups.py:258 +#: rhodecode/controllers/admin/user_groups.py:253 msgid "Successfully deleted user group" msgstr "Grupa użytkowników została usunięta z powodzeniem" -#: rhodecode/controllers/admin/user_groups.py:263 +#: rhodecode/controllers/admin/user_groups.py:258 msgid "An error occurred during deletion of user group" msgstr "Wystąpił błąd podczas usuwania grupy użytkowników" -#: rhodecode/controllers/admin/user_groups.py:331 +#: rhodecode/controllers/admin/user_groups.py:326 msgid "Target group cannot be the same" msgstr "Grupa docelowa nie może być taka sama" -#: rhodecode/controllers/admin/user_groups.py:337 +#: rhodecode/controllers/admin/user_groups.py:332 msgid "User Group permissions updated" msgstr "Aktualizacja uprawnień grupy użytkowników" -#: 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 "Wystąpił błąd podczas zapisywania uprawnień" -#: 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 "Wystąpił błąd podczas tworzenia użytkownika %s" -#: rhodecode/controllers/admin/users.py:167 +#: rhodecode/controllers/admin/users.py:166 msgid "User updated successfully" msgstr "Użytkownik został zaktualizowany" -#: 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 "Użytkownik został usunięty" -#: rhodecode/controllers/admin/users.py:266 +#: rhodecode/controllers/admin/users.py:263 msgid "An error occurred during deletion of user" msgstr "Wystąpił błąd podczas usuwania użytkownika" +#: 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 "" @@ -1471,81 +1490,63 @@ msgid "" "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 "Wystąpił błąd podczas zapisywania e-maila" - -#: 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 "Usunięto adres ip z listy dozwolonych adresów dla użytkownika" - -#: 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 "" @@ -1577,7 +1578,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 @@ -1588,8 +1589,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 @@ -1599,13 +1600,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 "Zresetuj" -#: 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 @@ -1614,13 +1615,13 @@ msgstr "Zresetuj" #: 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 @@ -1774,16 +1775,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 @@ -1819,11 +1819,11 @@ 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 " @@ -1831,172 +1831,172 @@ msgid "" "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 "[usunięte] repozytorium" -#: 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 "[utworzone] repozytorium" -#: rhodecode/lib/action_parser.py:95 +#: rhodecode/lib/action_parser.py:100 msgid "[created] repository as fork" msgstr "[utworzone] repozytorium jako rozgałęzienie" -#: 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 "[rozgałęzione] repozytorium" -#: 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 "[zaktualizowane] repozytorium" -#: rhodecode/lib/action_parser.py:104 +#: rhodecode/lib/action_parser.py:109 msgid "[downloaded] archive from repository" msgstr "[pobierz] archiwum z repozytorium" -#: rhodecode/lib/action_parser.py:107 +#: rhodecode/lib/action_parser.py:112 msgid "[delete] repository" msgstr "[skasowane] repozytorium" -#: rhodecode/lib/action_parser.py:119 +#: rhodecode/lib/action_parser.py:124 msgid "[created] user" msgstr "[utworzony] użytkownik" -#: rhodecode/lib/action_parser.py:122 +#: rhodecode/lib/action_parser.py:127 msgid "[updated] user" msgstr "[zaktualizowany] użytkownik" -#: rhodecode/lib/action_parser.py:125 +#: rhodecode/lib/action_parser.py:130 msgid "[created] user group" msgstr "[utworzona] grupa użytkowników" -#: rhodecode/lib/action_parser.py:128 +#: rhodecode/lib/action_parser.py:133 msgid "[updated] user group" msgstr "[zaktualizowana] grupa użytkowników" -#: 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 "[komentarz] wniosek o połączenie gałęzi" -#: rhodecode/lib/action_parser.py:137 +#: rhodecode/lib/action_parser.py:142 msgid "[closed] pull request for" msgstr "[zamknięty] wniosek o połączenie gałęzi" -#: 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 "[wysłane zmiany] w" -#: rhodecode/lib/action_parser.py:146 +#: rhodecode/lib/action_parser.py:151 msgid "[committed via RhodeCode] into repository" msgstr "[synchronizacja przez RhodeCode] z repozytorium" -#: rhodecode/lib/action_parser.py:149 +#: rhodecode/lib/action_parser.py:154 msgid "[pulled from remote] into repository" msgstr "[pobieranie z zdalnego] do repozytorium" -#: rhodecode/lib/action_parser.py:152 +#: rhodecode/lib/action_parser.py:157 msgid "[pulled] from" msgstr "[pobrano] " -#: rhodecode/lib/action_parser.py:155 +#: rhodecode/lib/action_parser.py:160 msgid "[started following] repository" msgstr "[start następnego] repozytorium" -#: rhodecode/lib/action_parser.py:158 +#: rhodecode/lib/action_parser.py:163 msgid "[stopped following] repository" msgstr "[zatrzymany po] repozytorium" -#: rhodecode/lib/action_parser.py:166 +#: rhodecode/lib/action_parser.py:172 #, python-format msgid "fork name %s" msgstr "nazwa rozgałęzienia %s" -#: 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 "Połączonych gałęzi #%s" -#: 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 +#: rhodecode/lib/action_parser.py:227 msgid "compare view" msgstr "Wyświetl porównanie" -#: rhodecode/lib/action_parser.py:227 +#: 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 "Usunięta gałąź: %s" -#: rhodecode/lib/action_parser.py:282 +#: rhodecode/lib/action_parser.py:289 #, python-format msgid "Created tag: %s" msgstr "Utworzony tag: %s" -#: 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 "Obserwatorzy %s" -#: rhodecode/lib/auth.py:1281 +#: rhodecode/lib/auth.py:1309 msgid "You need to be a registered user to perform this action" msgstr "Musisz być zarejestrowanym użytkownikiem, żeby wykonać to działanie" -#: 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 "" @@ -2022,20 +2022,21 @@ msgstr "Nie wykryto zmian" msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1517 +#: rhodecode/lib/helpers.py:1527 #, python-format msgid " and %s more" msgstr "i %s więcej" -#: rhodecode/lib/helpers.py:1521 +#: rhodecode/lib/helpers.py:1531 msgid "No Files" msgstr "Brak Plików" -#: 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" @@ -2050,7 +2051,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" @@ -2092,7 +2107,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 "przed chwilą" @@ -2127,7 +2142,7 @@ msgstr "przed chwilą" #: 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/model/db.py:2482 msgid "Repository no access" msgstr "Brak dostępu do repozytorium" @@ -2161,7 +2176,7 @@ msgstr "Brak dostępu do repozytorium" #: 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/model/db.py:2483 msgid "Repository read access" msgstr "Repozytorium do odczytu" @@ -2195,7 +2210,7 @@ msgstr "Repozytorium do odczytu" #: 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/model/db.py:2484 msgid "Repository write access" msgstr "Repozytorium do zapisu" @@ -2229,7 +2244,7 @@ msgstr "Repozytorium do zapisu" #: 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/model/db.py:2485 msgid "Repository admin access" msgstr "Administracja dostępu do repozytorium" @@ -2303,7 +2318,7 @@ msgstr "Administrator Repo" #: 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/model/db.py:2503 msgid "Repository creation disabled" msgstr "Tworzenie repozytorium jest wyłączone" @@ -2337,7 +2352,7 @@ msgstr "Tworzenie repozytorium jest wyłączone" #: 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/model/db.py:2504 msgid "Repository creation enabled" msgstr "Tworzenie repozytorium jest włączone" @@ -2371,7 +2386,7 @@ msgstr "Tworzenie repozytorium jest włączone" #: 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/model/db.py:2508 msgid "Repository forking disabled" msgstr "Rozwidlenie repozytorium wyłączone" @@ -2405,7 +2420,7 @@ msgstr "Rozwidlenie repozytorium wyłączone" #: 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/model/db.py:2509 msgid "Repository forking enabled" msgstr "Rozwidlenie repozytorium włączone" @@ -2460,7 +2475,7 @@ msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją" #: 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/model/db.py:3212 msgid "Not Reviewed" msgstr "Brak Korekty" @@ -2494,7 +2509,7 @@ msgstr "Brak Korekty" #: 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/model/db.py:3213 msgid "Approved" msgstr "Zaakceptowano" @@ -2528,7 +2543,7 @@ msgstr "Zaakceptowano" #: 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/model/db.py:3214 msgid "Rejected" msgstr "Odrzucono" @@ -2562,7 +2577,7 @@ msgstr "Odrzucono" #: 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/model/db.py:3215 msgid "Under Review" msgstr "Objęty Przeglądem" @@ -2593,7 +2608,7 @@ msgstr "Objęty Przeglądem" #: 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/model/db.py:2487 msgid "Repository group no access" msgstr "Grupy repozytoriów brak dostępu" @@ -2624,7 +2639,7 @@ msgstr "Grupy repozytoriów brak dostępu" #: 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/model/db.py:2488 msgid "Repository group read access" msgstr "Grupy repozytoriów dostęp do odczytu" @@ -2655,7 +2670,7 @@ msgstr "Grupy repozytoriów dostęp do odczytu" #: 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/model/db.py:2489 msgid "Repository group write access" msgstr "Grupy repozytoriów dostęp do zapisu" @@ -2686,7 +2701,7 @@ msgstr "Grupy repozytoriów dostęp do zapisu" #: 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/model/db.py:2490 msgid "Repository group admin access" msgstr "Repozytoria Grupy dostęp administratora" @@ -2716,7 +2731,7 @@ msgstr "Repozytoria Grupy dostęp administratora" #: 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/model/db.py:2492 msgid "User group no access" msgstr "Ta grupa użytkowników nie ma dostępu" @@ -2746,7 +2761,7 @@ msgstr "Ta grupa użytkowników nie ma dostępu" #: 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/model/db.py:2493 msgid "User group read access" msgstr "Dostęp do grupy parametrów użytkownika" @@ -2776,7 +2791,7 @@ msgstr "Dostęp do grupy parametrów użytkownika" #: 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/model/db.py:2494 msgid "User group write access" msgstr "Ta grupa użytkowników ma prawo do zapisu" @@ -2806,7 +2821,7 @@ msgstr "Ta grupa użytkowników ma prawo do zapisu" #: 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/model/db.py:2495 msgid "User group admin access" msgstr "Ta grupa użytkowników ma uprawnienia administratora" @@ -2836,7 +2851,7 @@ msgstr "Ta grupa użytkowników ma uprawnienia administratora" #: 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/model/db.py:2497 msgid "Repository Group creation disabled" msgstr "Tworzenie grup repozytoriów wyłączone" @@ -2866,7 +2881,7 @@ msgstr "Tworzenie grup repozytoriów wyłączone" #: 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/model/db.py:2498 msgid "Repository Group creation enabled" msgstr "Tworzenie grup repozytoriów włączone" @@ -2896,7 +2911,7 @@ msgstr "Tworzenie grup repozytoriów włączone" #: 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/model/db.py:2500 msgid "User Group creation disabled" msgstr "Tworzenie grup użytkowników wyłączone" @@ -2926,7 +2941,7 @@ msgstr "Tworzenie grup użytkowników wyłączone" #: 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/model/db.py:2501 msgid "User Group creation enabled" msgstr "Tworzenie grup użytkowników właczone" @@ -2956,7 +2971,7 @@ msgstr "Tworzenie grup użytkowników właczone" #: 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/model/db.py:2511 msgid "Registration disabled" msgstr "Rejestracja wyłączona" @@ -2986,7 +3001,7 @@ msgstr "Rejestracja wyłączona" #: 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/model/db.py:2512 msgid "User Registration with manual account activation" msgstr "Rejestracja użytkownika z ręczną aktywacją konta" @@ -3016,7 +3031,7 @@ msgstr "Rejestracja użytkownika z ręczną aktywacją konta" #: 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/model/db.py:2513 msgid "User Registration with automatic account activation" msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" @@ -3046,7 +3061,7 @@ msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" #: 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/model/permission.py:95 +#: rhodecode/model/db.py:2519 rhodecode/model/permission.py:95 msgid "Manual activation of external account" msgstr "Ręczna aktywacja nowego konta" @@ -3076,7 +3091,7 @@ msgstr "Ręczna aktywacja nowego konta" #: 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/model/permission.py:96 +#: rhodecode/model/db.py:2520 rhodecode/model/permission.py:96 msgid "Automatic activation of external account" msgstr "Automatyczna aktywacja nowego konta" @@ -3100,7 +3115,7 @@ msgstr "Automatyczna aktywacja nowego ko #: 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/model/db.py:2505 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3125,7 +3140,7 @@ msgstr "" #: 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/model/db.py:2506 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3147,7 +3162,7 @@ msgstr "" #: 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/model/db.py:2480 msgid "RhodeCode Super Administrator" msgstr "" @@ -3166,7 +3181,7 @@ msgstr "" #: 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/model/db.py:2522 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3185,7 +3200,7 @@ msgstr "" #: 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/model/db.py:2523 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3195,7 +3210,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 "" @@ -3205,7 +3220,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 "" @@ -3215,7 +3230,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 "" @@ -3225,7 +3240,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 "" @@ -3235,7 +3250,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 "" @@ -3246,65 +3261,65 @@ msgstr "" #: 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/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/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/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/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 "Nieprawidłowe zapytania. Spróbuj zacytować go." -#: 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 "Nie ma szukanego indeksu. Proszę uruchomić indeksowanie whoosh" -#: rhodecode/lib/index/whoosh.py:156 +#: rhodecode/lib/index/whoosh.py:157 msgid "An error occurred during this search operation" msgstr "Wystąpił błąd podczas wyszukiwania tej operacji" -#: 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 "" @@ -3390,7 +3405,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 "Brak" @@ -3398,7 +3413,7 @@ msgstr "Brak" #: 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 "Odczyt" @@ -3406,10 +3421,10 @@ msgstr "Odczyt" #: 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 "Zapis" @@ -3432,7 +3447,7 @@ msgstr "Zapis" #: 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 @@ -3442,9 +3457,9 @@ msgstr "Zapis" #: 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 "Administracja" @@ -3475,93 +3490,93 @@ 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 "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." -msgstr "" - -#: rhodecode/model/pull_request.py:124 +"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" @@ -3569,92 +3584,96 @@ 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 "Zakładki" -#: 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 "Zamknięte Gałęzie" -#: 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 "ostatni tip" -#: 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 "Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej aplikacji" -#: 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 "Nie możesz usunąć tego użytkownika ponieważ jest kluczowy dla całej aplikacji" -#: 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 " @@ -3680,6 +3699,7 @@ msgid "Username \"%(username)s\" is forb msgstr "Nazwa użytkownika \"%(username)s\" jest zabroniona" #: 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" @@ -3789,98 +3809,113 @@ 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 "Fork musi być tego samego typu, jak rodzic" -#: 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 "Ta nazwa użytkownika lub grupy użytkowników nie jest prawidłowa" -#: rhodecode/model/validators.py:846 +#: rhodecode/model/validators.py:879 msgid "This is not a valid path" msgstr "To nie jest prawidłowa ścieżka" -#: rhodecode/model/validators.py:861 +#: rhodecode/model/validators.py:894 msgid "This e-mail address is already taken" msgstr "Ten adres e-mail jest już zajęty" -#: rhodecode/model/validators.py:881 +#: rhodecode/model/validators.py:914 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "e-mail \"%(email)s\" nie istnieje." -#: 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 "Rewizja %(revs)s jest już częścią nowej gałęzi więc określ jego status" -#: 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 "Proszę podać poprawny adres IPv4 lub IPv6" -#: 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 "Rozmiar sieci (bits) może mieścić się w zakresie od 0-32 (nie %(bits)r)" -#: rhodecode/model/validators.py:961 +#: rhodecode/model/validators.py:994 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "Klucz nazwy może składać się tylko z liter, podkreślenia, myślnika lub numerów" -#: 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" @@ -3953,253 +3988,263 @@ 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 @@ -4208,28 +4253,28 @@ 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 " @@ -4238,14 +4283,14 @@ 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 "Przesyłanie..." #: 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 ..." @@ -4253,105 +4298,170 @@ msgstr "Ładuję..." #: 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 "Nie ma plików pasujących" #: 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 "Wybór linku" #: 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 "Zakończyć obserwację tego repozytorium" #: 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 "Nie obserwuj" #: 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 "Zacznij obserwację tego repozytorium" #: 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 "Obserwuj" -#: 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 "Pokaż więcej" @@ -4366,151 +4476,151 @@ msgstr "" msgid "Add another comment" msgstr "Dodaj kolejny komentarz" -#: 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 "Zamknij" -#: 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 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 "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:29 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 #: rhodecode/templates/changelog/changelog.mako:61 msgid "Open new pull request" msgstr "Otwórz nową prośbę o połączenie gałęzi" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 +#: 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:35 +#: 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 "Wyślij" -#: 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 "Updating..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: 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 "pliki" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 -#: rhodecode/templates/pullrequests/pullrequest.mako:108 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "wczytywanie..." -#: 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 "{0} aktywnych z {1} użytkowników" -#: 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 "" @@ -4592,7 +4702,7 @@ msgstr "Edytuj Grupę Repozytoriów" #: 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 @@ -4600,7 +4710,7 @@ msgstr "Edytuj Grupę Repozytoriów" #: 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 "Nazwa" @@ -4615,7 +4725,7 @@ msgstr "Nazwa" #: 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 @@ -4623,9 +4733,10 @@ msgstr "Nazwa" #: 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 @@ -4633,9 +4744,9 @@ msgstr "Nazwa" #: 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 "Opis" @@ -4646,7 +4757,7 @@ msgstr "Opis" #: 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 @@ -4669,13 +4780,13 @@ msgstr "Ostatnia akytwność" #: 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 "" @@ -4690,7 +4801,7 @@ msgid "Home" msgstr "Strona Główna" #: 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 "Zaloguj się" @@ -4715,14 +4826,14 @@ 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 "lub" @@ -4782,7 +4893,7 @@ msgstr "Ponownie wprowadź hasło" #: 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 "Imię" @@ -4792,7 +4903,7 @@ msgstr "Imię" #: 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 "Nazwisko" @@ -4804,38 +4915,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 "Dziennik administratora" - -#: rhodecode/templates/admin/admin.mako:13 -msgid "journal filter..." -msgstr "szybkie wyszukiwanie..." - -#: 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 "filtr" -#: rhodecode/templates/admin/admin.mako:15 -#: rhodecode/templates/journal/journal.mako:14 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" -msgstr[0] "%s wejście" -msgstr[1] "%s wejść" -msgstr[2] "%s wejść" -msgstr[3] "%s wejść" - -#: 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 @@ -4843,38 +4948,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 "Działanie" -#: 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 "Repozytorium" -#: 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 "Data" -#: rhodecode/templates/admin/admin_log.mako:11 -#: rhodecode/templates/admin/users/user_edit_audit.mako:26 -msgid "From IP" -msgstr "Z IP" - -#: 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 "Brak akcji" @@ -4917,8 +5029,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 @@ -4959,7 +5071,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 " @@ -5014,7 +5126,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 "zwykły" @@ -5025,9 +5137,9 @@ msgstr "Zaktualizuj Gist" #: 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 @@ -5096,14 +5208,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 "Autor" @@ -5164,12 +5275,12 @@ msgstr "Potwierdź aby usunąć ten Gist" #: 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 "Edycja" @@ -5210,11 +5321,11 @@ msgstr "Grupy Repozytoriów" #: 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:251 msgid "Settings" msgstr "Ustawienia" @@ -5317,7 +5428,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 "Moje konto" @@ -5341,7 +5452,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 "" @@ -5358,7 +5469,7 @@ msgstr "Połączone gałęzie" #: 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" @@ -5418,7 +5529,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 "Dodaj" @@ -5437,10 +5548,8 @@ msgid "Primary" msgstr "Główny" #: 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" -msgstr "Potwierdź, aby usunąć ten e-mail: %s" +msgid "Confirm to delete this email: {}" +msgstr "" #: rhodecode/templates/admin/my_account/my_account_emails.mako:42 #: rhodecode/templates/admin/users/user_edit_emails.mako:41 @@ -5525,13 +5634,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 "Tytuł" #: 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 "" @@ -5549,7 +5658,7 @@ msgid "My Notifications" msgstr "Opcje powiadomień" #: rhodecode/templates/admin/notifications/notifications.mako:32 -#: rhodecode/templates/changeset/changeset.mako:140 +#: rhodecode/templates/changeset/changeset.mako:160 msgid "Comments" msgstr "Komentarze" @@ -5570,6 +5679,10 @@ msgstr "Pokaż powiadomienia" msgid "Notifications" msgstr "Powiadomienia" +#: rhodecode/templates/admin/notifications/show_notification.mako:40 +msgid "Subject" +msgstr "" + #: rhodecode/templates/admin/permissions/permissions.mako:5 msgid "Permissions Administration" msgstr "" @@ -5632,23 +5745,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 "Potwierdź, aby usunąć to ip: %s" #: 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 "Wszystkie adresy IP są dozwolone" #: 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 "" @@ -5746,9 +5859,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 "Zaawansowane" @@ -5809,26 +5922,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 "właściciel" #: 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" @@ -5836,8 +5949,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 "" @@ -5847,7 +5960,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" @@ -5917,7 +6030,7 @@ msgid "Clone from" msgstr "Klonuj z" #: 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." @@ -5928,7 +6041,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)" @@ -5948,7 +6060,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 "" @@ -5980,36 +6092,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 "Zdalnie" -#: 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 "Statystyki" -#: 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 "" @@ -6044,95 +6156,86 @@ msgstr "Ręczne ustawienie rozwidlenia z listy" 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] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:125 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:124 msgid "Detach forks" msgstr "Ustaw jako rozwidlenie" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129 msgid "Delete forks" msgstr "Usuń rozwidlenie" -#: 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 "Potwierdź usunięcie repozytorium: %s" -#: 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 +#: 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." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 +"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 "" @@ -6140,48 +6243,45 @@ msgstr "" msgid "Invalidate Cache for Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Invalidate repository cache" -msgstr "Unieważnij pamięć podręczną repozytorium" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Confirm to invalidate repository cache" -msgstr "Potwierdź unieważnienie pamięci podręcznej repozytorium" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:14 +#: 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:28 -#, python-format -msgid "List of repository caches (%(count)s entry)" -msgid_plural "List of repository caches (%(count)s entries)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:35 +#: 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 "Unieważnij pamięć podręczną repozytorium" + +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:20 +msgid "Confirm to invalidate repository cache" +msgstr "Potwierdź unieważnienie pamięci podręcznej repozytorium" + +#: 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 "Prefiks" -#: 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 "Klucz" -#: 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 "Aktywny" @@ -6257,20 +6357,29 @@ 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 "" @@ -6278,11 +6387,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 "prywatne repozytorium" -#: 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 "" @@ -6290,57 +6399,91 @@ 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 "Pobierz z zdalnej lokalizacji" -#: 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 "Potwierdź pull z zdalnej strony" -#: 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 "Brak zmiennej id" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:19 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 msgid "what is that ?" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:21 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:24 msgid "URL by id" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 +#: 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 "Repozytorium grupy" + +#: 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 "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium." + +#: 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 @@ -6348,65 +6491,62 @@ msgstr "" msgid "edit" msgstr "edycja" -#: 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 "Repozytorium grupy" - -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:65 -msgid "Optional select a group to put this repository into." -msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium." - -#: 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 +#: 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 "Zmiana właściciela tego repozytorium." -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:108 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:138 #: rhodecode/templates/data_table/_dt_elements.mako:58 msgid "Private repository" msgstr "Prywatne repozytorium" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:117 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:148 msgid "Enable statistics" msgstr "Włącz statystyki" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:121 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:153 msgid "Enable statistics window on summary page." msgstr "Włącz okno statystyk na stronie podsumowania." -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:126 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:158 msgid "Enable downloads" msgstr "Włącz pobieranie" -#: 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 "Włącz menu pobierania na stronie podsumowania." -#: 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" @@ -6473,32 +6613,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 @@ -7068,12 +7200,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 "" @@ -7110,46 +7242,39 @@ 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 "" @@ -7241,24 +7366,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 "" @@ -7272,7 +7401,7 @@ msgid "Last login" msgstr "Ostatnio zalogowany" #: 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 "" @@ -7399,6 +7528,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 "Potwierdź, aby usunąć ten e-mail: %s" + #: rhodecode/templates/admin/users/user_edit_groups.mako:12 #, python-format msgid "Add `%s` to user group" @@ -7408,12 +7542,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" @@ -7460,7 +7606,7 @@ msgstr "" msgid "Users administration" msgstr "Administracja użytkownikami" -#: rhodecode/templates/admin/users/users.mako:77 +#: rhodecode/templates/admin/users/users.mako:78 msgid "Auth type" msgstr "" @@ -7528,112 +7674,110 @@ msgstr "Porównaj" msgid "Show Pull Requests for %s" msgstr "Pokaż Prośby Pobrania %s" -#: rhodecode/templates/base/base.mako:246 +#: rhodecode/templates/base/base.mako:247 msgid "Options" msgstr "Opcje" -#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/base/base.mako:255 #: rhodecode/templates/forks/forks_data.mako:30 msgid "Compare fork" msgstr "Porównaj rozwidlenie" -#: 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 "Szukaj" -#: rhodecode/templates/base/base.mako:260 +#: rhodecode/templates/base/base.mako:262 msgid "Unlock" msgstr "Odblokowany" -#: rhodecode/templates/base/base.mako:262 +#: rhodecode/templates/base/base.mako:264 msgid "Lock" msgstr "zablokowane" -#: 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] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/base/base.mako:268 +msgstr "Gałąź" + +#: rhodecode/templates/base/base.mako:270 msgid "Create Pull Request" msgstr "Stwórz nowe żądanie połączenia gałęzi" -#: 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 "Nie masz konta?" - -#: 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 "Dziennik" -#: 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 "Dziennik publiczny" -#: 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 "Gists" -#: 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 @@ -7655,15 +7799,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:483 +#: rhodecode/templates/base/base.mako:486 msgid "Go to" msgstr "Idź do" -#: 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 "" @@ -7770,10 +7914,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" @@ -7853,7 +7997,7 @@ msgstr "Tworzenie grup użytkowników" 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 "" @@ -7964,93 +8108,105 @@ msgid "" "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 " @@ -8058,11 +8214,11 @@ msgid "" "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." @@ -8082,10 +8238,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 "Zakładki %s" @@ -8104,10 +8260,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 "Gałęzie %s" @@ -8147,19 +8303,19 @@ msgstr[2] "" msgstr[3] "" #: 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 "Ostatnia zmiana" #: rhodecode/templates/changelog/changelog.mako:115 -#: rhodecode/templates/changelog/changelog_summary_data.mako:12 +#: rhodecode/templates/summary/summary_commits.mako:12 msgid "Refs" msgstr "Gałąź/Etykieta" @@ -8176,7 +8332,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" @@ -8184,44 +8340,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 "połącz" -#: 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 "Tagi %s" -#: rhodecode/templates/changelog/changelog_elements.mako:113 +#: rhodecode/templates/changelog/changelog_elements.mako:133 msgid "load next" msgstr "" @@ -8229,100 +8407,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 "Komentarz" - -#: 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 "Istniejące repozytorium?" - #: 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 "Raw różnic" -#: 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 "Poprawka różnic" -#: 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 "Pobierz różnice" -#: 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" @@ -8332,8 +8488,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: 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" @@ -8343,19 +8499,19 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: 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 "" @@ -8381,73 +8537,81 @@ 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 "Zaloguj się teraz" -#: 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 "Użyj @username wewnątrz tego tekstu, aby wysłać powiadomienie do użytkownika strony" -#: 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 "Zamknięte" -#: 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 @@ -8488,7 +8652,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" @@ -8499,7 +8663,7 @@ msgstr[3] "" #: 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" @@ -8679,12 +8843,12 @@ 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" @@ -8693,8 +8857,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: 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] "" @@ -8702,7 +8866,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/compare/compare_commits.mako:74 +#: rhodecode/templates/compare/compare_commits.mako:75 msgid "No commits in this compare" msgstr "" @@ -8742,6 +8906,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 "Źródło" @@ -8957,6 +9122,10 @@ msgstr "" msgid "Form vertical" msgstr "" +#: rhodecode/templates/debug_style/login.html:56 +msgid "Don't have an account ?" +msgstr "Nie masz konta?" + #: rhodecode/templates/email_templates/base.mako:32 #, python-format msgid "This is a notification from RhodeCode. %(instance_url)s" @@ -9078,6 +9247,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 "" @@ -9153,8 +9323,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" @@ -9180,7 +9348,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 "Zostaniesz przekierowany do %s za %s sekund" @@ -9253,6 +9421,7 @@ msgid "Remove Custom Path" msgstr "" #: rhodecode/templates/files/files_add.mako:50 +#: rhodecode/templates/files/files_add.mako:59 msgid "Filename" msgstr "" @@ -9260,34 +9429,34 @@ msgstr "" msgid "Upload File" msgstr "" -#: rhodecode/templates/files/files_add.mako:59 -msgid "Upload file" -msgstr "Dodaj plik" - -#: 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 "Dodaj plik" + +#: 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 "Zatwierdź zmiany" @@ -9308,6 +9477,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 "Dodaj Plik" @@ -9420,7 +9594,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] "" @@ -9486,6 +9659,10 @@ msgstr "" msgid "Fork name" msgstr "Nazwa rozgałęzienia" +#: 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 "Skopiuj uprawnienia" @@ -9523,6 +9700,15 @@ msgstr "Nie ma jeszcze gałęzi" msgid "Filter" msgstr "" +#: rhodecode/templates/journal/journal.mako:14 +#, python-format +msgid "%s entry" +msgid_plural "%s entries" +msgstr[0] "%s wejście" +msgstr[1] "%s wejść" +msgstr[2] "%s wejść" +msgstr[3] "%s wejść" + #: rhodecode/templates/journal/journal.mako:23 msgid "ATOM journal feed" msgstr "Dziennik kanału ATOM" @@ -9553,47 +9739,57 @@ msgstr "Publiczny dziennik kanału RSS" msgid "New pull request" msgstr "Nowa prośba o połączenie gałęzi" -#: 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 "Napisz krótki opis tego tego połączenia gałęzi" -#: 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 "Repozytorium git" - -#: 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 "Recenzje wniosków połączenia gałęzi" -#: 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] "" @@ -9601,19 +9797,19 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: 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 "Repozytorium docelowe" - -#: 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 "" @@ -9661,10 +9857,6 @@ msgstr "" msgid "Confirm to delete this pull request" msgstr "Potwierdź usunięcie połączenia gałęzi" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:71 -msgid "Origin" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:88 msgid "Common ancestor" msgstr "" @@ -9767,77 +9959,77 @@ 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 "Zapisz zmiany" -#: 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 "" @@ -9927,6 +10119,11 @@ msgstr "Komunikaty" msgid "File names" msgstr "Nazwy plików" +#: rhodecode/templates/search/search_commit.mako:8 +#: rhodecode/templates/summary/summary_commits.mako:9 +msgid "Commit message" +msgstr "Komentarz" + #: rhodecode/templates/search/search_commit.mako:11 msgid "Age (new first)" msgstr "" @@ -9958,42 +10155,6 @@ msgstr "%s ATOM" msgid "%s RSS feed" msgstr "%s RSS" -#: rhodecode/templates/summary/components.mako:5 -#, python-format -msgid "%(num)s Branch" -msgid_plural "%(num)s Branches" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/summary/components.mako:12 -#, python-format -msgid "%(num)s Closed Branch" -msgid_plural "%(num)s Closed Branches" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/summary/components.mako:19 -#, python-format -msgid "%(num)s Tag" -msgid_plural "%(num)s Tags" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/summary/components.mako:26 -#, python-format -msgid "%(num)s Bookmark" -msgid_plural "%(num)s Bookmarks" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: rhodecode/templates/summary/components.mako:49 msgid "Read-only url" msgstr "" @@ -10074,6 +10235,18 @@ msgstr "Szybki start" 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 "Istniejące repozytorium?" + #: rhodecode/templates/tags/tags.mako:5 #, python-format msgid "%s Tags" diff --git a/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po @@ -5,12 +5,13 @@ # Translators: # Augusto Herrmann , 2012 # Gustavo Chaves , 2013 +# Renato Françoso , 2017 msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-04-07 12:33+0200\n" -"PO-Revision-Date: 2017-04-07 10:34+0000\n" +"POT-Creation-Date: 2017-06-27 17:25+0200\n" +"PO-Revision-Date: 2017-06-27 15:26+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Portuguese (http://www.transifex.com/rhodecode/RhodeCode/language/pt/)\n" "MIME-Version: 1.0\n" @@ -24,25 +25,25 @@ msgstr "" #: rhodecode/integrations/views.py:166 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" -msgstr "" +msgstr "Global" #: 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 "" +msgstr "VCS" #: rhodecode/apps/admin/navigation.py:85 msgid "Visual" -msgstr "" +msgstr "Visual" #: rhodecode/apps/admin/navigation.py:86 msgid "Remap and Rescan" -msgstr "" +msgstr "Remapear e Reescanear" #: 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 "" +msgstr "Registro de ocorrências" #: rhodecode/apps/admin/navigation.py:89 #: rhodecode/integrations/types/email.py:232 @@ -51,7 +52,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" @@ -63,7 +64,7 @@ msgstr "Ganchos" #: rhodecode/apps/admin/navigation.py:91 msgid "Full Text Search" -msgstr "" +msgstr "Busca de texto completa" #: rhodecode/apps/admin/navigation.py:93 #: rhodecode/templates/admin/integrations/base.mako:23 @@ -78,294 +79,461 @@ 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 "" +msgstr "Integrações" #: rhodecode/apps/admin/navigation.py:95 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" -msgstr "" +msgstr "Informações do Sistema" #: rhodecode/apps/admin/navigation.py:97 msgid "User Sessions" -msgstr "" +msgstr "Sessões do usuário" #: rhodecode/apps/admin/navigation.py:99 msgid "Open Source Licenses" -msgstr "" +msgstr "Licenças Open Source" #: rhodecode/apps/admin/navigation.py:107 msgid "Labs" -msgstr "" - -#: rhodecode/apps/admin/views/sessions.py:86 -msgid "Cleaned up old sessions" -msgstr "" +msgstr "Labs" #: rhodecode/apps/admin/views/sessions.py:92 +msgid "Cleaned up old sessions" +msgstr "Limpar sessões antigas" + +#: rhodecode/apps/admin/views/sessions.py:98 msgid "Failed to cleanup up old sessions" -msgstr "" +msgstr "Falha ao limpar sessões antigas" #: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." -msgstr "" +msgstr "Configurações do Apache para Subversion geradas." #: rhodecode/apps/admin/views/svn_config.py:54 msgid "Failed to generate the Apache configuration for Subversion." -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:95 +msgstr "Falha ao gerar configurações do Apache para o Subversion." + +#: 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 +msgstr "Nota: Por favor, garanta que o servidor possa acessar `${url}` para que o link de atualização funcione" + +#: rhodecode/apps/admin/views/system_info.py:102 msgid "Update info" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:100 +msgstr "Atualizar Informações" + +#: 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 "" +msgstr "Verificar Atualizações" #: rhodecode/apps/admin/views/system_info.py:109 -msgid "Workers" -msgstr "" +msgid "RhodeCode Version" +msgstr "Versão do RhodeCode" #: rhodecode/apps/admin/views/system_info.py:110 -msgid "Worker Type" +msgid "RhodeCode Server IP" +msgstr "IP do Servidor do RhodeCode" + +#: rhodecode/apps/admin/views/system_info.py:111 +msgid "RhodeCode Server ID" +msgstr "Identificador do Servidor do RhodeCode" + +#: rhodecode/apps/admin/views/system_info.py:112 +msgid "RhodeCode Configuration" +msgstr "Configuração do RhodeCode" + +#: 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" -msgstr "" +msgid "Database" +msgstr "Banco de Dados" #: rhodecode/apps/admin/views/system_info.py:120 +msgid "Database version" +msgstr "Versão do Banco de Dados" + +#: rhodecode/apps/admin/views/system_info.py:124 +msgid "Platform" +msgstr "Plataforma" + +#: 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 "" +msgstr "UUID da Plataforma" #: rhodecode/apps/admin/views/system_info.py:126 -msgid "CPU" -msgstr "" +msgid "Python version" +msgstr "Versão do Python" #: rhodecode/apps/admin/views/system_info.py:127 +msgid "Python path" +msgstr "Diretório do Python" + +#: rhodecode/apps/admin/views/system_info.py:131 +msgid "CPU" +msgstr "CPU" + +#: 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 "" +msgstr "Carga" #: rhodecode/apps/admin/views/system_info.py:133 -msgid "Storage location" -msgstr "" +msgid "Memory" +msgstr "Memória" #: 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" -msgstr "" +msgid "Uptime" +msgstr "Tempo Ligado" #: rhodecode/apps/admin/views/system_info.py:138 -msgid "Gist storage info" -msgstr "" +msgid "Storage location" +msgstr "Local de armazenamento" + +#: rhodecode/apps/admin/views/system_info.py:139 +msgid "Storage info" +msgstr "Informações do armazenamento" #: 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" -msgstr "" +msgid "Storage inodes" +msgstr "Inodes de Armazenamento" + +#: rhodecode/apps/admin/views/system_info.py:142 +msgid "Gist storage location" +msgstr "Local de armazenamento do Gist" #: 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" -msgstr "" +msgid "Gist storage info" +msgstr "Informações do armazenamento do Gist" + +#: rhodecode/apps/admin/views/system_info.py:145 +msgid "Archive cache storage location" +msgstr "Local de armazenamento do cache" #: rhodecode/apps/admin/views/system_info.py:146 -msgid "Search info" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:147 -msgid "Search location" -msgstr "" +msgid "Archive cache info" +msgstr "Informações do armazenamento de cache" + +#: rhodecode/apps/admin/views/system_info.py:148 +msgid "Temp storage location" +msgstr "Local de armazenamento temporário" + +#: rhodecode/apps/admin/views/system_info.py:149 +msgid "Temp storage info" +msgstr "Informações do armazenamento temporário" #: rhodecode/apps/admin/views/system_info.py:151 -msgid "VCS Backends" -msgstr "" +msgid "Search info" +msgstr "Informações de busca" #: rhodecode/apps/admin/views/system_info.py:152 +msgid "Search location" +msgstr "Local de busca" + +#: rhodecode/apps/admin/views/system_info.py:156 +msgid "VCS Backends" +msgstr "Servidores VCS" + +#: rhodecode/apps/admin/views/system_info.py:157 msgid "VCS Server" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:153 +msgstr "Servidor VCS" + +#: rhodecode/apps/admin/views/system_info.py:158 msgid "GIT" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:154 +msgstr "GIT" + +#: rhodecode/apps/admin/views/system_info.py:159 msgid "HG" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:155 +msgstr "HG" + +#: 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 +msgstr "SVN" + +#: 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 "Você não pode editar esse usuário" -#: rhodecode/apps/admin/views/users.py:178 -#: rhodecode/apps/my_account/views.py:138 +#: rhodecode/apps/admin/views/users.py:168 +#: rhodecode/apps/my_account/views.py:148 #: rhodecode/controllers/admin/gists.py:62 msgid "forever" msgstr "para sempre" -#: rhodecode/apps/admin/views/users.py:179 -#: rhodecode/apps/my_account/views.py:139 +#: rhodecode/apps/admin/views/users.py:169 +#: rhodecode/apps/my_account/views.py:149 #: rhodecode/controllers/admin/gists.py:63 msgid "5 minutes" msgstr "cinco minutos" -#: rhodecode/apps/admin/views/users.py:180 -#: rhodecode/apps/my_account/views.py:140 +#: rhodecode/apps/admin/views/users.py:170 +#: rhodecode/apps/my_account/views.py:150 #: rhodecode/controllers/admin/gists.py:64 msgid "1 hour" msgstr "uma hora" -#: rhodecode/apps/admin/views/users.py:181 -#: rhodecode/apps/my_account/views.py:141 +#: rhodecode/apps/admin/views/users.py:171 +#: rhodecode/apps/my_account/views.py:151 #: rhodecode/controllers/admin/gists.py:65 msgid "1 day" msgstr "um dia" -#: rhodecode/apps/admin/views/users.py:182 -#: rhodecode/apps/my_account/views.py:142 +#: rhodecode/apps/admin/views/users.py:172 +#: rhodecode/apps/my_account/views.py:152 #: rhodecode/controllers/admin/gists.py:66 msgid "1 month" msgstr "um mês" -#: rhodecode/apps/admin/views/users.py:184 -#: rhodecode/apps/my_account/views.py:144 +#: 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:188 -#: rhodecode/apps/my_account/views.py:148 +msgstr "Tempo de Vida" + +#: rhodecode/apps/admin/views/users.py:178 +#: 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 +msgstr "Função" + +#: 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 +msgstr "Token de Autenticação criado com sucesso" + +#: 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 +msgstr "Token de Autenticação removido com sucesso" + +#: 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 "Ocorreu um erro durante o salvamento do email" + +#: 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 "Ocorreu um erro durante o salvamento do IP" + +#: 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 +msgstr "Grupos alterados com sucesso" + +#: 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 "Repositórios" + +#: rhodecode/apps/home/views.py:223 +msgid "Groups" +msgstr "Grupos" + +#: 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 +msgstr "Captcha incorreto" + +#: rhodecode/apps/login/views.py:279 msgid "You have successfully registered with RhodeCode" -msgstr "" - -#: rhodecode/apps/login/views.py:292 +msgstr "Você se registrou no RhodeCode com sucesso" + +#: 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 +msgstr "Se este email existir, um link para restaurar a senha foi enviado para ele." + +#: rhodecode/apps/login/views.py:321 msgid "Password reset has been disabled." -msgstr "" - -#: rhodecode/apps/login/views.py:381 +msgstr "Restauração de senha foi desabilitada." + +#: rhodecode/apps/login/views.py:410 msgid "Given reset token is invalid" -msgstr "" - -#: rhodecode/apps/login/views.py:389 +msgstr "O token de restauração informado é inválido" + +#: 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 +msgstr "Senha restaurada com sucesso, uma nova senha foi enviada para seu e-mail" + +#: rhodecode/apps/my_account/views.py:125 msgid "Error occurred during update of user password" -msgstr "" - -#: rhodecode/apps/my_account/views.py:122 +msgstr "Ocorreu um erro durante a atualização da senha de usuário" + +#: rhodecode/apps/my_account/views.py:132 msgid "Successfully updated password" +msgstr "Senha atualizada com sucesso" + +#: 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 "Ocorreu um erro ao invalidar o cache" + +#: rhodecode/apps/repository/views/repo_permissions.py:95 +msgid "Repository permissions updated" +msgstr "Permissões do repositório atualizadas" + +#: 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 "%s bifurcações excluídas" + +#: 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 "Atualizada a visibilidade do repositório no diário público" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:156 +msgid "An error occurred during setting this repository in public journal" +msgstr "Ocorreu um erro ao ajustar esse repositório no diário público" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:184 +msgid "Nothing" +msgstr "Nada" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:186 +#, python-format +msgid "Marked repo %s as fork of %s" +msgstr "Marcado repositório %s como bifurcação de %s" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 +msgid "An error occurred during this operation" +msgstr "Ocorreu um erro durante essa operação" + +#: 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 "Ocorreu um erro durante o destravamento" + +#: rhodecode/apps/repository/views/repo_summary.py:293 +msgid "Branch" +msgstr "Ramo" + +#: 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 "Ramos" + +#: 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 "" +msgstr "Configuração para o Apache mad_dav_svn alterada." #: rhodecode/authentication/schema.py:35 msgid "Enable or disable this authentication plugin." -msgstr "" +msgstr "Habilitar ou desabilitar este plugin de autenticação" #: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:32 #: rhodecode/model/permission.py:100 rhodecode/model/permission.py:104 @@ -384,16 +552,16 @@ msgstr "" #: rhodecode/authentication/schema.py:49 msgid "Auth Cache TTL" -msgstr "" +msgstr "Tempo de Vida do Cache de Autenticação" #: rhodecode/authentication/views.py:90 msgid "" "Errors exist when saving plugin settings. Please check the form inputs." -msgstr "" +msgstr "Ocorreu um erro ao salvar as configurações do plugin. Por favor, verifique os dados do formulário." #: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:172 msgid "Auth settings updated successfully." -msgstr "" +msgstr "Configurações de autenticação atualizadas com sucesso." #: rhodecode/authentication/views.py:177 msgid "Errors exist when saving plugin setting. Please check the form inputs." @@ -416,7 +584,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 "" @@ -446,7 +614,7 @@ msgstr "" msgid "Admin Groups" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:215 +#: rhodecode/authentication/plugins/auth_crowd.py:216 msgid "CROWD" msgstr "" @@ -496,126 +664,130 @@ 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 "Senha" -#: 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 "" @@ -648,76 +820,73 @@ 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 " @@ -743,51 +912,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 "Ocorreu um erro ao realizar commit" -#: 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 "Só é possível editar arquivos quando a revisão é um ramo válido" -#: 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 "Sem modificações" -#: rhodecode/controllers/files.py:578 rhodecode/controllers/files.py:707 -#, python-format -msgid "Successfully committed to %s" -msgstr "Commit realizado com sucesso para %s" - -#: 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 "" @@ -795,41 +960,39 @@ msgstr "" msgid "No filename" msgstr "Nenhum nome de arquivo" +#: 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 "Downloads desabilitados" -#: rhodecode/controllers/files.py:770 +#: rhodecode/controllers/files.py:769 #, python-format msgid "Unknown revision %s" msgstr "Revisão desconhecida %s" -#: rhodecode/controllers/files.py:772 +#: rhodecode/controllers/files.py:771 msgid "Empty repository" msgstr "Repositório vazio" -#: 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 "Tipo de arquivo desconhecido" -#: rhodecode/controllers/files.py:993 +#: rhodecode/controllers/files.py:1000 msgid "Changesets" msgstr "Conjuntos de mudanças" -#: 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 "Ramos" - -#: 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 "Etiquetas" @@ -838,28 +1001,6 @@ msgstr "Etiquetas" msgid "An error occurred during repository forking %s" msgstr "Ocorreu um erro ao bifurcar o repositório %s" -#: rhodecode/controllers/home.py:207 -msgid "Groups" -msgstr "Grupos" - -#: 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 "Repositórios" - -#: 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 "diário público" @@ -868,84 +1009,60 @@ msgstr "diário público" msgid "journal" msgstr "diário" -#: 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 "O pull request requer um título com no mínimo três caracteres" -#: 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 "Novo pull request criado com sucesso" -#: rhodecode/controllers/pullrequests.py:388 -msgid "Error occurred during sending pull request" -msgstr "Ocorreu um erro durante o envio do pull request" - -#: 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:437 +#: rhodecode/controllers/pullrequests.py:328 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/controllers/pullrequests.py:455 +#: 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:472 +#: rhodecode/controllers/pullrequests.py:363 msgid "Reload page" msgstr "" -#: rhodecode/controllers/pullrequests.py:546 +#: rhodecode/controllers/pullrequests.py:437 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 "Pull request excluído com sucesso" -#: 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 "Fechando com" - -#: 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 "Ramo" - -#: 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 "Configurações padrão atualizadas com sucesso" @@ -1001,89 +1118,73 @@ msgstr "nunca" 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 "Você não pode editar esse usuário pois ele é crucial para toda a aplicação" -#: rhodecode/controllers/admin/my_account.py:138 +#: rhodecode/controllers/admin/my_account.py:110 msgid "Your account was updated successfully" msgstr "Sua conta foi atualizada com sucesso" -#: 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 "Ocorreu um erro durante a atualização do usuário %s" -#: 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 "Ocorreu um erro durante o salvamento do email" - -#: 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 "Ocorreu um erro durante a atualização das permissões" -#: 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 "Grupo de repositórios %s criado" -#: 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 "Ocorreu um erro durante a criação do grupo de repositórios %s" -#: rhodecode/controllers/admin/repo_groups.py:258 +#: rhodecode/controllers/admin/repo_groups.py:261 #, python-format msgid "Updated repository group %s" msgstr "Grupo de repositórios %s atualizado" -#: 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 "Ocorreu um erro durante a atualização do grupo de repositórios %s" -#: 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 "Grupo de repositórios %s excluído" @@ -1093,366 +1194,285 @@ msgstr "Grupo de repositórios %s excluído" msgid "Error occurred during deletion of repository group %s" msgstr "Ocorreu um erro durante a exclusão do grupo de repositórios %s" -#: 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 "Permissões atualizadas do Grupo de Repositórios" -#: rhodecode/controllers/admin/repos.py:129 +#: rhodecode/controllers/admin/repos.py:125 #, python-format msgid "Error creating repository %s: invalid certificate" msgstr "" -#: rhodecode/controllers/admin/repos.py:133 +#: rhodecode/controllers/admin/repos.py:129 #, python-format msgid "Error creating repository %s" msgstr "Erro ao criar repositório %s" -#: rhodecode/controllers/admin/repos.py:274 +#: rhodecode/controllers/admin/repos.py:270 #, python-format msgid "Created repository %s from %s" msgstr "Repositório %s criado de %s" -#: rhodecode/controllers/admin/repos.py:283 +#: rhodecode/controllers/admin/repos.py:279 #, python-format msgid "Forked repository %s as %s" msgstr "Repositório %s bifurcado como %s" -#: rhodecode/controllers/admin/repos.py:286 +#: rhodecode/controllers/admin/repos.py:282 #, python-format msgid "Created repository %s" msgstr "Repositório %s criado" -#: rhodecode/controllers/admin/repos.py:327 -#, python-format -msgid "Repository %s updated successfully" -msgstr "Repositório %s atualizado com sucesso" - -#: rhodecode/controllers/admin/repos.py:346 -#, python-format -msgid "Error occurred during update of repository %s" -msgstr "Ocorreu um erro durante a atualização do repositório %s" - -#: 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 "%s bifurcações excluídas" - -#: rhodecode/controllers/admin/repos.py:382 -#, python-format -msgid "Deleted repository %s" -msgstr "Repositório %s excluído" - -#: rhodecode/controllers/admin/repos.py:385 -#, python-format -msgid "Cannot delete %s it still contains attached forks" -msgstr "Nao é possível excluir %s pois ele ainda contém bifurcações vinculadas" - -#: rhodecode/controllers/admin/repos.py:390 -#, python-format -msgid "An error occurred during deletion of %s" -msgstr "Ocorreu um erro durante a exclusão de %s" - -#: rhodecode/controllers/admin/repos.py:443 -msgid "Repository permissions updated" -msgstr "Permissões do repositório atualizadas" - -#: rhodecode/controllers/admin/repos.py:474 +#: rhodecode/controllers/admin/repos.py:319 msgid "An error occurred during creation of field" msgstr "Ocorreu um erro durante a criação do campo" -#: rhodecode/controllers/admin/repos.py:489 +#: rhodecode/controllers/admin/repos.py:334 msgid "An error occurred during removal of field" msgstr "Ocorreu um erro durante a remoção do campo" -#: rhodecode/controllers/admin/repos.py:528 -msgid "Updated repository visibility in public journal" -msgstr "Atualizada a visibilidade do repositório no diário público" - -#: rhodecode/controllers/admin/repos.py:532 -msgid "An error occurred during setting this repository in public journal" -msgstr "Ocorreu um erro ao ajustar esse repositório no diário público" - -#: rhodecode/controllers/admin/repos.py:556 -msgid "Nothing" -msgstr "Nada" - -#: rhodecode/controllers/admin/repos.py:558 -#, python-format -msgid "Marked repo %s as fork of %s" -msgstr "Marcado repositório %s como bifurcação de %s" - -#: rhodecode/controllers/admin/repos.py:565 -msgid "An error occurred during this operation" -msgstr "Ocorreu um erro durante essa operação" - -#: 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 "Ocorreu um erro durante o destravamento" - -#: rhodecode/controllers/admin/repos.py:608 +#: rhodecode/controllers/admin/repos.py:353 msgid "Unlocked" msgstr "Destravado" -#: rhodecode/controllers/admin/repos.py:612 +#: rhodecode/controllers/admin/repos.py:357 msgid "Locked" msgstr "Travado" -#: rhodecode/controllers/admin/repos.py:614 +#: rhodecode/controllers/admin/repos.py:359 #, python-format msgid "Repository has been %s" msgstr "O repositório foi %s" -#: 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 "Ocorreu um erro ao invalidar o cache" - -#: rhodecode/controllers/admin/repos.py:653 +#: rhodecode/controllers/admin/repos.py:373 msgid "Pulled from remote location" msgstr "Realizado pull de localização remota" -#: rhodecode/controllers/admin/repos.py:656 +#: rhodecode/controllers/admin/repos.py:376 msgid "An error occurred during pull from remote location" msgstr "Ocorreu um erro ao realizar pull de localização remota" -#: rhodecode/controllers/admin/repos.py:678 +#: rhodecode/controllers/admin/repos.py:397 msgid "An error occurred during deletion of repository stats" msgstr "Ocorreu um erro ao excluir estatísticas de repositório" -#: rhodecode/controllers/admin/repos.py:725 +#: rhodecode/controllers/admin/repos.py:443 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 "Configurações de VCS atualizadas" #: 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 "Ocorreu um erro durante a atualização das configurações da aplicação" -#: rhodecode/controllers/admin/settings.py:223 +#: rhodecode/controllers/admin/settings.py:226 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "Repositórios varridos com sucesso adicionados: %s ; removidos: %s" -#: rhodecode/controllers/admin/settings.py:279 +#: rhodecode/controllers/admin/settings.py:282 msgid "Updated application settings" msgstr "Configurações da aplicação atualizadas" -#: rhodecode/controllers/admin/settings.py:345 +#: rhodecode/controllers/admin/settings.py:348 msgid "Updated visualisation settings" msgstr "Configurações de visualização atualizadas" -#: rhodecode/controllers/admin/settings.py:348 +#: rhodecode/controllers/admin/settings.py:351 msgid "Error occurred during updating visualisation settings" msgstr "Ocorreu um erro durante a atualização das configurações de visualização" -#: 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 "Adicionado novo gancho" -#: rhodecode/controllers/admin/settings.py:507 +#: rhodecode/controllers/admin/settings.py:510 msgid "Updated hooks" msgstr "Atualizados os ganchos" -#: rhodecode/controllers/admin/settings.py:511 +#: rhodecode/controllers/admin/settings.py:514 msgid "Error occurred during hook creation" msgstr "Ocorreu um erro durante a criação do hook" -#: 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 "Ocorreu um erro durante a criação do grupo de usuários %s" -#: rhodecode/controllers/admin/user_groups.py:220 +#: rhodecode/controllers/admin/user_groups.py:218 #, python-format msgid "Updated user group %s" msgstr "Grupo de usuários %s atualizado" -#: 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 "Ocorreu um erro durante a atualização do grupo de usuários %s" -#: rhodecode/controllers/admin/user_groups.py:258 +#: rhodecode/controllers/admin/user_groups.py:253 msgid "Successfully deleted user group" msgstr "Grupo de usuários excluído com sucesso" -#: rhodecode/controllers/admin/user_groups.py:263 +#: rhodecode/controllers/admin/user_groups.py:258 msgid "An error occurred during deletion of user group" msgstr "Ocorreu um erro durante a exclusão do grupo de usuários" -#: rhodecode/controllers/admin/user_groups.py:331 +#: rhodecode/controllers/admin/user_groups.py:326 msgid "Target group cannot be the same" msgstr "O grupo destino não pode ser o mesmo" -#: rhodecode/controllers/admin/user_groups.py:337 +#: rhodecode/controllers/admin/user_groups.py:332 msgid "User Group permissions updated" msgstr "Permissões do Grupo de Usuários atualizadas" -#: 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 "Ocorreu um erro durante o salvamento das permissões" -#: 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 "Ocorreu um erro durante a criação do usuário %s" -#: rhodecode/controllers/admin/users.py:167 +#: rhodecode/controllers/admin/users.py:166 msgid "User updated successfully" msgstr "Usuário atualizado com sucesso" -#: 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 "Usuário excluído com sucesso" -#: rhodecode/controllers/admin/users.py:266 +#: rhodecode/controllers/admin/users.py:263 msgid "An error occurred during deletion of user" msgstr "Ocorreu um erro ao excluir o usuário" +#: 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 "" @@ -1462,81 +1482,63 @@ msgid "" "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 "Ocorreu um erro durante o salvamento do IP" - -#: 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 "" @@ -1568,7 +1570,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 @@ -1579,8 +1581,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 @@ -1590,13 +1592,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 "Limpar" -#: 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 @@ -1605,13 +1607,13 @@ msgstr "Limpar" #: 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 @@ -1765,16 +1767,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 @@ -1810,11 +1811,11 @@ 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 " @@ -1822,172 +1823,172 @@ msgid "" "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 "repositório [excluído]" -#: 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 "repositório [criado]" -#: rhodecode/lib/action_parser.py:95 +#: rhodecode/lib/action_parser.py:100 msgid "[created] repository as fork" msgstr "repositório [criado] como uma bifurcação" -#: 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 "repositório [bifurcado]" -#: 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 "repositório [atualizado]" -#: rhodecode/lib/action_parser.py:104 +#: rhodecode/lib/action_parser.py:109 msgid "[downloaded] archive from repository" msgstr "[baixado] archive do repositório" -#: rhodecode/lib/action_parser.py:107 +#: rhodecode/lib/action_parser.py:112 msgid "[delete] repository" msgstr "[excluir] repositório" -#: rhodecode/lib/action_parser.py:119 +#: rhodecode/lib/action_parser.py:124 msgid "[created] user" msgstr "usuário [criado]" -#: rhodecode/lib/action_parser.py:122 +#: rhodecode/lib/action_parser.py:127 msgid "[updated] user" msgstr "usuário [atualizado]" -#: rhodecode/lib/action_parser.py:125 +#: rhodecode/lib/action_parser.py:130 msgid "[created] user group" msgstr "[criado] grupo de usuários" -#: rhodecode/lib/action_parser.py:128 +#: rhodecode/lib/action_parser.py:133 msgid "[updated] user group" msgstr "[atualizado] grupo de usuários" -#: 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 "[comentado] no pull request para" -#: rhodecode/lib/action_parser.py:137 +#: rhodecode/lib/action_parser.py:142 msgid "[closed] pull request for" msgstr "[fechado] pull request para" -#: 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 "[realizado push] para" -#: rhodecode/lib/action_parser.py:146 +#: rhodecode/lib/action_parser.py:151 msgid "[committed via RhodeCode] into repository" msgstr "[commitado via RhodeCode] no repositório" -#: rhodecode/lib/action_parser.py:149 +#: rhodecode/lib/action_parser.py:154 msgid "[pulled from remote] into repository" msgstr "[pulled do remote] no repositório" -#: rhodecode/lib/action_parser.py:152 +#: rhodecode/lib/action_parser.py:157 msgid "[pulled] from" msgstr "[realizado pull] a partir de" -#: rhodecode/lib/action_parser.py:155 +#: rhodecode/lib/action_parser.py:160 msgid "[started following] repository" msgstr "[passou a seguir] o repositório" -#: rhodecode/lib/action_parser.py:158 +#: rhodecode/lib/action_parser.py:163 msgid "[stopped following] repository" msgstr "[parou de seguir] o repositório" -#: rhodecode/lib/action_parser.py:166 +#: rhodecode/lib/action_parser.py:172 #, python-format msgid "fork name %s" msgstr "nome da bifurcação %s" -#: 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 "Pull request #%s" -#: 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 +#: rhodecode/lib/action_parser.py:227 msgid "compare view" msgstr "comparar exibir" -#: rhodecode/lib/action_parser.py:227 +#: 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 "Excluído ramo: %s" -#: rhodecode/lib/action_parser.py:282 +#: rhodecode/lib/action_parser.py:289 #, python-format msgid "Created tag: %s" msgstr "Tag criada: %s" -#: 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 "IP %s não permitido" -#: rhodecode/lib/auth.py:1281 +#: rhodecode/lib/auth.py:1309 msgid "You need to be a registered user to perform this action" msgstr "Você precisa ser um usuário registrado para realizar essa ação" -#: 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 "" @@ -2013,20 +2014,21 @@ msgstr "Nenhuma alteração detectada" msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1517 +#: rhodecode/lib/helpers.py:1527 #, python-format msgid " and %s more" msgstr " e mais %s" -#: rhodecode/lib/helpers.py:1521 +#: rhodecode/lib/helpers.py:1531 msgid "No Files" msgstr "Nenhum Arquivo" -#: 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" @@ -2041,7 +2043,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" @@ -2083,7 +2099,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 "agora há pouco" @@ -2118,7 +2134,7 @@ msgstr "agora há pouco" #: 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/model/db.py:2482 msgid "Repository no access" msgstr "Nenhum acesso ao repositório" @@ -2152,7 +2168,7 @@ msgstr "Nenhum acesso ao repositório" #: 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/model/db.py:2483 msgid "Repository read access" msgstr "Acesso de leitura ao repositório" @@ -2186,7 +2202,7 @@ msgstr "Acesso de leitura ao repositório" #: 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/model/db.py:2484 msgid "Repository write access" msgstr "Acesso de escrita ao repositório" @@ -2220,7 +2236,7 @@ msgstr "Acesso de escrita ao repositório" #: 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/model/db.py:2485 msgid "Repository admin access" msgstr "Acesso administrativo ao repositório" @@ -2294,7 +2310,7 @@ msgstr "Administrador do RhodeCode" #: 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/model/db.py:2503 msgid "Repository creation disabled" msgstr "Criação de repositórios desabilitada" @@ -2328,7 +2344,7 @@ msgstr "Criação de repositórios desabilitada" #: 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/model/db.py:2504 msgid "Repository creation enabled" msgstr "Criação de repositórios habilitada" @@ -2362,7 +2378,7 @@ msgstr "Criação de repositórios habilitada" #: 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/model/db.py:2508 msgid "Repository forking disabled" msgstr "Bifurcação de repositórios desabilitada" @@ -2396,7 +2412,7 @@ msgstr "Bifurcação de repositórios desabilitada" #: 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/model/db.py:2509 msgid "Repository forking enabled" msgstr "Bifurcação de repositórios habilitada" @@ -2451,7 +2467,7 @@ msgstr "Registro de novo usuário no RhodeCode com auto-ativação" #: 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/model/db.py:3212 msgid "Not Reviewed" msgstr "Não Revisado" @@ -2485,7 +2501,7 @@ msgstr "Não Revisado" #: 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/model/db.py:3213 msgid "Approved" msgstr "Aprovado" @@ -2519,7 +2535,7 @@ msgstr "Aprovado" #: 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/model/db.py:3214 msgid "Rejected" msgstr "Rejeitado" @@ -2553,7 +2569,7 @@ msgstr "Rejeitado" #: 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/model/db.py:3215 msgid "Under Review" msgstr "Sob Revisão" @@ -2584,7 +2600,7 @@ msgstr "Sob Revisão" #: 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/model/db.py:2487 msgid "Repository group no access" msgstr "Sem acesso ao grupo de repositórios" @@ -2615,7 +2631,7 @@ msgstr "Sem acesso ao grupo de repositórios" #: 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/model/db.py:2488 msgid "Repository group read access" msgstr "Acesso de leitura ao grupo de repositórios" @@ -2646,7 +2662,7 @@ msgstr "Acesso de leitura ao grupo de repositórios" #: 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/model/db.py:2489 msgid "Repository group write access" msgstr "Acesso de escrita ao grupo de repositórios" @@ -2677,7 +2693,7 @@ msgstr "Acesso de escrita ao grupo de repositórios" #: 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/model/db.py:2490 msgid "Repository group admin access" msgstr "Acesso administrativo ao grupo de repositórios" @@ -2707,7 +2723,7 @@ msgstr "Acesso administrativo ao grupo de repositórios" #: 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/model/db.py:2492 msgid "User group no access" msgstr "Sem acesso ao grupo de usuários" @@ -2737,7 +2753,7 @@ msgstr "Sem acesso ao grupo de usuários" #: 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/model/db.py:2493 msgid "User group read access" msgstr "Acesso de leitura ao grupo de usuários" @@ -2767,7 +2783,7 @@ msgstr "Acesso de leitura ao grupo de usuários" #: 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/model/db.py:2494 msgid "User group write access" msgstr "Acesso de escrita ao grupo de usuários" @@ -2797,7 +2813,7 @@ msgstr "Acesso de escrita ao grupo de usuários" #: 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/model/db.py:2495 msgid "User group admin access" msgstr "Acesso administrativo ao grupo de usuários" @@ -2827,7 +2843,7 @@ msgstr "Acesso administrativo ao grupo de usuários" #: 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/model/db.py:2497 msgid "Repository Group creation disabled" msgstr "Criação de Grupo de Repositórios desatilibada" @@ -2857,7 +2873,7 @@ msgstr "Criação de Grupo de Repositórios desatilibada" #: 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/model/db.py:2498 msgid "Repository Group creation enabled" msgstr "Criação de Grupo de Repositórios habilitada" @@ -2887,7 +2903,7 @@ msgstr "Criação de Grupo de Repositórios habilitada" #: 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/model/db.py:2500 msgid "User Group creation disabled" msgstr "Criação de Grupo de Usuários desabilitada" @@ -2917,7 +2933,7 @@ msgstr "Criação de Grupo de Usuários desabilitada" #: 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/model/db.py:2501 msgid "User Group creation enabled" msgstr "Criação de Grupo de Usuários habilitada" @@ -2947,7 +2963,7 @@ msgstr "Criação de Grupo de Usuários habilitada" #: 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/model/db.py:2511 msgid "Registration disabled" msgstr "Registro desatilitado" @@ -2977,7 +2993,7 @@ msgstr "Registro desatilitado" #: 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/model/db.py:2512 msgid "User Registration with manual account activation" msgstr "Registro de Usuário com ativação manual de conta" @@ -3007,7 +3023,7 @@ msgstr "Registro de Usuário com ativação manual de conta" #: 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/model/db.py:2513 msgid "User Registration with automatic account activation" msgstr "Registro de Usuário com ativação automática de conta" @@ -3037,7 +3053,7 @@ msgstr "Registro de Usuário com ativação automática de conta" #: 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/model/permission.py:95 +#: rhodecode/model/db.py:2519 rhodecode/model/permission.py:95 msgid "Manual activation of external account" msgstr "Ativação manual de conta externa" @@ -3067,7 +3083,7 @@ msgstr "Ativação manual de conta externa" #: 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/model/permission.py:96 +#: rhodecode/model/db.py:2520 rhodecode/model/permission.py:96 msgid "Automatic activation of external account" msgstr "Ativação automática de conta externa" @@ -3091,7 +3107,7 @@ msgstr "Ativação automática de conta externa" #: 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/model/db.py:2505 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3116,7 +3132,7 @@ msgstr "" #: 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/model/db.py:2506 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3138,7 +3154,7 @@ msgstr "" #: 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/model/db.py:2480 msgid "RhodeCode Super Administrator" msgstr "" @@ -3157,7 +3173,7 @@ msgstr "" #: 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/model/db.py:2522 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3176,7 +3192,7 @@ msgstr "" #: 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/model/db.py:2523 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3186,7 +3202,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 "" @@ -3196,7 +3212,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 "" @@ -3206,7 +3222,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 "" @@ -3216,7 +3232,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 "" @@ -3226,7 +3242,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 "" @@ -3237,65 +3253,65 @@ msgstr "" #: 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/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/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/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/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 "Consulta de busca inválida. Tente usar aspas." -#: 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 "Não há índice onde pesquisa. Por favor execute o indexador whoosh" -#: rhodecode/lib/index/whoosh.py:156 +#: rhodecode/lib/index/whoosh.py:157 msgid "An error occurred during this search operation" msgstr "Ocorreu um erro durante essa operação de busca" -#: 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 "" @@ -3381,7 +3397,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 "Nenhum" @@ -3389,7 +3405,7 @@ msgstr "Nenhum" #: 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 "Ler" @@ -3397,10 +3413,10 @@ msgstr "Ler" #: 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 "Gravar" @@ -3423,7 +3439,7 @@ msgstr "Gravar" #: 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 @@ -3433,9 +3449,9 @@ msgstr "Gravar" #: 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 "Administrador" @@ -3466,93 +3482,93 @@ 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 "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." -msgstr "" - -#: rhodecode/model/pull_request.py:124 +"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" @@ -3560,92 +3576,96 @@ 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 "Marcadores" -#: 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 "Ramos Fechados" -#: 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 "tip mais recente" -#: 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 "Você não pode Editar esse usuário, pois ele é crucial para toda a aplicação" -#: 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 "Você não pode remover esse usuário, pois ele é crucial para toda a aplicação" -#: 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 " @@ -3671,6 +3691,7 @@ msgid "Username \"%(username)s\" is forb msgstr "O username \\\"%(username)s\\\" é proibido" #: 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" @@ -3780,98 +3801,113 @@ 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 "A bifurcação deve ser do mesmo tipo que o pai" -#: 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 "Este nome de usuário ou de grupo de usuários não é válido" -#: rhodecode/model/validators.py:846 +#: rhodecode/model/validators.py:879 msgid "This is not a valid path" msgstr "Esse não é um caminho válido" -#: rhodecode/model/validators.py:861 +#: rhodecode/model/validators.py:894 msgid "This e-mail address is already taken" msgstr "Esse endereço de e-mail já está tomado" -#: rhodecode/model/validators.py:881 +#: rhodecode/model/validators.py:914 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "o e-mail \"%(email)s\" não existe." -#: 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 "As revisões %(revs)s já fazem parte de um pull request ou já setaram o estado" -#: 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 "Por favor, forneça um endereço válido IPv4 ou IPv6" -#: 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 "O tamanho da rede (bits) deve estar no intervalo 0-32 (não %(bits)r)" -#: rhodecode/model/validators.py:961 +#: rhodecode/model/validators.py:994 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "O nome da chave só pode conter letras, underscore, hífen ou dígitos" -#: 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" @@ -3944,253 +3980,263 @@ 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 @@ -4199,28 +4245,28 @@ 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 " @@ -4229,14 +4275,14 @@ 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 "Enviando..." #: 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 ..." @@ -4244,105 +4290,170 @@ msgstr "Carregando..." #: 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 "Nenhum arquivo encontrado" #: 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 "Link da seleção" #: 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 "Parar de seguir este repositório" #: 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 "Parar de seguir" #: 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 "Passar a seguir este repositório" #: 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 "Seguir" -#: 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 "Mostrar mais" @@ -4357,151 +4468,151 @@ msgstr "" msgid "Add another comment" msgstr "Adicionar outro comentário" -#: 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 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 "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:29 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 #: rhodecode/templates/changelog/changelog.mako:61 msgid "Open new pull request" msgstr "Crie novo pull request" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 +#: 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:35 +#: 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 "Enviar" -#: 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 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 msgid "" "There are currently no open pull requests requiring your participation." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "desabilitado" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: 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:62 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 msgid "files" msgstr "arquivos" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 -#: rhodecode/templates/pullrequests/pullrequest.mako:108 +#: 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 "" @@ -4583,7 +4694,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 @@ -4591,7 +4702,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 "Nome" @@ -4606,7 +4717,7 @@ msgstr "Nome" #: 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 @@ -4614,9 +4725,10 @@ msgstr "Nome" #: 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 @@ -4624,9 +4736,9 @@ msgstr "Nome" #: 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 "Descrição" @@ -4637,7 +4749,7 @@ msgstr "Descrição" #: 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 @@ -4660,13 +4772,13 @@ msgstr "Última Alteração" #: 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 "" @@ -4681,7 +4793,7 @@ msgid "Home" msgstr "Início" #: 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 "Entrar" @@ -4706,14 +4818,14 @@ 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 "ou" @@ -4773,7 +4885,7 @@ msgstr "Repita a senha" #: 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 "Primeiro Nome" @@ -4783,7 +4895,7 @@ msgstr "Primeiro Nome" #: 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 "Último Nome" @@ -4795,36 +4907,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 "Diário do administrador" - -#: rhodecode/templates/admin/admin.mako:13 -msgid "journal filter..." -msgstr "filtro de diário..." - -#: 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 "filtro" -#: rhodecode/templates/admin/admin.mako:15 -#: rhodecode/templates/journal/journal.mako:14 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" -msgstr[0] "%s entrada" -msgstr[1] "%s entradas" - -#: 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 @@ -4832,38 +4940,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 "Ação" -#: 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 "Repositório" -#: 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 "Data" -#: rhodecode/templates/admin/admin_log.mako:11 -#: rhodecode/templates/admin/users/user_edit_audit.mako:26 -msgid "From IP" -msgstr "A partir do IP" - -#: 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 "Ainda não há ações" @@ -4906,8 +5021,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 @@ -4948,7 +5063,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 " @@ -5003,7 +5118,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 "" @@ -5014,9 +5129,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 @@ -5085,14 +5200,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 "Autor" @@ -5153,12 +5267,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 "Editar" @@ -5199,11 +5313,11 @@ 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:251 msgid "Settings" msgstr "Configurações" @@ -5306,7 +5420,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 "Minha conta" @@ -5330,7 +5444,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 "" @@ -5347,7 +5461,7 @@ msgstr "Pull Requests" #: 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" @@ -5407,7 +5521,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 "Adicionar" @@ -5426,10 +5540,8 @@ 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" -msgstr "Confirme para excluir este email: %s" +msgid "Confirm to delete this email: {}" +msgstr "" #: rhodecode/templates/admin/my_account/my_account_emails.mako:42 #: rhodecode/templates/admin/users/user_edit_emails.mako:41 @@ -5514,13 +5626,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 "Título" #: 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 "" @@ -5538,7 +5650,7 @@ msgid "My Notifications" msgstr "Minhas Notificações" #: rhodecode/templates/admin/notifications/notifications.mako:32 -#: rhodecode/templates/changeset/changeset.mako:140 +#: rhodecode/templates/changeset/changeset.mako:160 msgid "Comments" msgstr "Comentários" @@ -5559,6 +5671,10 @@ msgstr "Mostrar notificação" msgid "Notifications" msgstr "Notificações" +#: rhodecode/templates/admin/notifications/show_notification.mako:40 +msgid "Subject" +msgstr "" + #: rhodecode/templates/admin/permissions/permissions.mako:5 msgid "Permissions Administration" msgstr "" @@ -5621,23 +5737,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 "Confirme para excluir este IP: %s" #: 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 "Todos os endereços IP são permitidos" #: 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 "" @@ -5735,9 +5851,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 "" @@ -5794,26 +5910,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 "dono" #: 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" @@ -5821,8 +5937,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 "" @@ -5832,7 +5948,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" @@ -5902,7 +6018,7 @@ msgid "Clone from" msgstr "Clonar de" #: 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." @@ -5913,7 +6029,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)" @@ -5933,7 +6048,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 "" @@ -5965,36 +6080,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 "Remoto" -#: 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 "Estatísticas" -#: 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 "" @@ -6029,93 +6144,86 @@ msgstr "Marque manualmente este repositório como uma bifurcação de um outro da lista" 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 "Desassociar bifurcações" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129 msgid "Delete forks" msgstr "Excluir bifurcações" -#: 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 "Confirma excluir esse repositório: %s" -#: 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 +#: 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." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 +"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 "" @@ -6123,46 +6231,45 @@ msgstr "" msgid "Invalidate Cache for Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Invalidate repository cache" -msgstr "Invalidar cache do repositório" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Confirm to invalidate repository cache" -msgstr "Confirma invalidar cache do repositório" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:14 +#: 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: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: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 "Invalidar cache do repositório" + +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:20 +msgid "Confirm to invalidate repository cache" +msgstr "Confirma invalidar cache do repositório" + +#: 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 "Prefixo" -#: 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 "Chave" -#: 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 "Ativo" @@ -6238,20 +6345,29 @@ 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 "" @@ -6259,11 +6375,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 "repositório privado" -#: 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 "" @@ -6271,57 +6387,91 @@ 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 "Realizar pull de alterações a partir de localização remota" -#: 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 "Confirma realizar pull de alterações a partir de lado remoto" -#: 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 "ID inalterável" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:19 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 msgid "what is that ?" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:21 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:24 msgid "URL by id" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 +#: 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 "Grupo de repositórios" + +#: 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 "Opcionalmente selecione um grupo no qual colocar esse repositório." + +#: 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 @@ -6329,65 +6479,62 @@ msgstr "" msgid "edit" msgstr "editar" -#: 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 "Grupo de repositórios" - -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:65 -msgid "Optional select a group to put this repository into." -msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório." - -#: 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 +#: 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 "Mudar o dono desse repositório." -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:108 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:138 #: rhodecode/templates/data_table/_dt_elements.mako:58 msgid "Private repository" msgstr "Repositório privado" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:117 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:148 msgid "Enable statistics" msgstr "Habilitar estatísticas" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:121 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:153 msgid "Enable statistics window on summary page." msgstr "Habilitar janela de estatísticas na página de sumário." -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:126 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:158 msgid "Enable downloads" msgstr "Habilitar downloads" -#: 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 "Habilitar menu de descarregar na página de sumário." -#: 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" @@ -6454,32 +6601,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 @@ -7049,12 +7188,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 "" @@ -7091,46 +7230,39 @@ 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 "" @@ -7222,24 +7354,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 "" @@ -7253,7 +7389,7 @@ msgid "Last login" msgstr "Último login" #: 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 "" @@ -7374,6 +7510,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 "Confirme para excluir este email: %s" + #: rhodecode/templates/admin/users/user_edit_groups.mako:12 #, python-format msgid "Add `%s` to user group" @@ -7383,12 +7524,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" @@ -7435,7 +7588,7 @@ msgstr "" msgid "Users administration" msgstr "Administração de usuários" -#: rhodecode/templates/admin/users/users.mako:77 +#: rhodecode/templates/admin/users/users.mako:78 msgid "Auth type" msgstr "" @@ -7503,110 +7656,110 @@ msgstr "Compare" msgid "Show Pull Requests for %s" msgstr "Mostrar Pull Requests para %s" -#: rhodecode/templates/base/base.mako:246 +#: rhodecode/templates/base/base.mako:247 msgid "Options" msgstr "Opções" -#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/base/base.mako:255 #: rhodecode/templates/forks/forks_data.mako:30 msgid "Compare fork" msgstr "Compare bifurcação" -#: 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 "Pesquisar" -#: rhodecode/templates/base/base.mako:260 +#: rhodecode/templates/base/base.mako:262 msgid "Unlock" msgstr "Destravar" -#: rhodecode/templates/base/base.mako:262 +#: rhodecode/templates/base/base.mako:264 msgid "Lock" msgstr "Travar" -#: 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 "Bifurcação" + +#: rhodecode/templates/base/base.mako:270 msgid "Create Pull Request" msgstr "Criar Pull Request" -#: 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 "Não possui uma conta ?" - -#: 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 "Diário" -#: 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 "Diário público" -#: 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 "Gists" -#: 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 @@ -7628,15 +7781,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 "" @@ -7743,10 +7896,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" @@ -7826,7 +7979,7 @@ msgstr "Criar grupos de usuários" 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 "" @@ -7937,93 +8090,105 @@ msgid "" "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 " @@ -8031,11 +8196,11 @@ msgid "" "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." @@ -8055,10 +8220,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 "Bookmark %s" @@ -8077,10 +8242,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 "Ramo %s" @@ -8118,19 +8283,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 "Idade" #: rhodecode/templates/changelog/changelog.mako:115 -#: rhodecode/templates/changelog/changelog_summary_data.mako:12 +#: rhodecode/templates/summary/summary_commits.mako:12 msgid "Refs" msgstr "" @@ -8147,7 +8312,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" @@ -8155,44 +8320,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 "mesclar" -#: 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 "Tag %s" -#: rhodecode/templates/changelog/changelog_elements.mako:113 +#: rhodecode/templates/changelog/changelog_elements.mako:133 msgid "load next" msgstr "" @@ -8200,100 +8387,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 "Mensagem de commit" - -#: 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 "Repositório existente?" - #: 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 "Diff cru" -#: 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 "D" -#: 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 "Baixar diff" -#: 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" @@ -8301,8 +8466,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" @@ -8310,19 +8475,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 "" @@ -8348,73 +8513,81 @@ 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 "Entrar agora" -#: 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 "Use @nomedeusuário dentro desse texto para enviar notificação a este usuário do RhodeCode" -#: 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 "Fechado" -#: 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 @@ -8453,7 +8626,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" @@ -8462,7 +8635,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" @@ -8634,26 +8807,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 "" @@ -8691,6 +8864,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 "" @@ -8904,6 +9078,10 @@ msgstr "" msgid "Form vertical" msgstr "" +#: rhodecode/templates/debug_style/login.html:56 +msgid "Don't have an account ?" +msgstr "Não possui uma conta ?" + #: rhodecode/templates/email_templates/base.mako:32 #, python-format msgid "This is a notification from RhodeCode. %(instance_url)s" @@ -9025,6 +9203,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 "" @@ -9098,8 +9277,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" @@ -9123,7 +9300,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 "Você será redirecionado para %s em %s segundos" @@ -9194,6 +9371,7 @@ msgid "Remove Custom Path" msgstr "" #: rhodecode/templates/files/files_add.mako:50 +#: rhodecode/templates/files/files_add.mako:59 msgid "Filename" msgstr "" @@ -9201,34 +9379,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 "Realizar commit das alterações" @@ -9249,6 +9427,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 "" @@ -9361,7 +9544,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] "" @@ -9425,6 +9607,10 @@ msgstr "" msgid "Fork name" msgstr "Nome da bifurcação" +#: 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 "Copiar permissões" @@ -9462,6 +9648,13 @@ msgstr "Ainda não há bifurcações" msgid "Filter" msgstr "" +#: rhodecode/templates/journal/journal.mako:14 +#, python-format +msgid "%s entry" +msgid_plural "%s entries" +msgstr[0] "%s entrada" +msgstr[1] "%s entradas" + #: rhodecode/templates/journal/journal.mako:23 msgid "ATOM journal feed" msgstr "ATOM feed do diário" @@ -9492,65 +9685,75 @@ msgstr "RSS feed do diário público" msgid "New pull request" msgstr "Novo pull request" -#: 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 "Escreva uma breve descrição para este pull request" -#: 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 "Repositório origem" - -#: 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 "Revisores do pull request" -#: 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 "Repositório de destino" - -#: 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 "" @@ -9598,10 +9801,6 @@ msgstr "" msgid "Confirm to delete this pull request" msgstr "Confirme para excluir este pull request" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:71 -msgid "Origin" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:88 msgid "Common ancestor" msgstr "" @@ -9700,77 +9899,77 @@ 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 "" @@ -9860,6 +10059,11 @@ msgstr "Mensagens de commit" msgid "File names" msgstr "Nomes dos arquivos" +#: rhodecode/templates/search/search_commit.mako:8 +#: rhodecode/templates/summary/summary_commits.mako:9 +msgid "Commit message" +msgstr "Mensagem de commit" + #: rhodecode/templates/search/search_commit.mako:11 msgid "Age (new first)" msgstr "" @@ -9891,34 +10095,6 @@ msgstr "%s ATOM feed" msgid "%s RSS feed" msgstr "%s RSS feed" -#: 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 "" @@ -9999,6 +10175,18 @@ msgstr "Início rápido" 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 "Repositório existente?" + #: rhodecode/templates/tags/tags.mako:5 #, python-format msgid "%s Tags" diff --git a/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po @@ -27,8 +27,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-04-07 12:33+0200\n" -"PO-Revision-Date: 2017-04-07 10:34+0000\n" +"POT-Creation-Date: 2017-06-27 17:25+0200\n" +"PO-Revision-Date: 2017-06-27 15:26+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Russian (http://www.transifex.com/rhodecode/RhodeCode/language/ru/)\n" "MIME-Version: 1.0\n" @@ -45,7 +45,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 "" @@ -58,7 +58,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 "" @@ -69,7 +69,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" @@ -96,7 +96,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 "" @@ -118,11 +118,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 "" @@ -134,249 +134,416 @@ 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:178 -#: rhodecode/apps/my_account/views.py:138 +#: 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:179 -#: rhodecode/apps/my_account/views.py:139 +#: rhodecode/apps/admin/views/users.py:169 +#: rhodecode/apps/my_account/views.py:149 #: rhodecode/controllers/admin/gists.py:63 msgid "5 minutes" msgstr "5 минут" -#: rhodecode/apps/admin/views/users.py:180 -#: rhodecode/apps/my_account/views.py:140 +#: rhodecode/apps/admin/views/users.py:170 +#: rhodecode/apps/my_account/views.py:150 #: rhodecode/controllers/admin/gists.py:64 msgid "1 hour" msgstr "1 час" -#: rhodecode/apps/admin/views/users.py:181 -#: rhodecode/apps/my_account/views.py:141 +#: rhodecode/apps/admin/views/users.py:171 +#: rhodecode/apps/my_account/views.py:151 #: rhodecode/controllers/admin/gists.py:65 msgid "1 day" msgstr "1 день" -#: rhodecode/apps/admin/views/users.py:182 -#: rhodecode/apps/my_account/views.py:142 +#: rhodecode/apps/admin/views/users.py:172 +#: rhodecode/apps/my_account/views.py:152 #: rhodecode/controllers/admin/gists.py:66 msgid "1 month" msgstr "1 месяц" -#: rhodecode/apps/admin/views/users.py:184 -#: rhodecode/apps/my_account/views.py:144 +#: 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:188 -#: rhodecode/apps/my_account/views.py:148 +#: rhodecode/apps/admin/views/users.py:178 +#: 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 "Произошла ошибка при сохранении E-mail" + +#: 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 "Произошла ошибка при сохранении IP" + +#: 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 "IP %s удален из белого списка пользователя" + +#: 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 прошла успешно" -#: 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 "Форки %s отсоединены" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:96 +#, python-format +msgid "Deleted %s forks" +msgstr "Удалены форки репозитория %s" + +#: 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 "Репозиторий %s отмечен как форк %s" + +#: 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 "" @@ -434,7 +601,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 "Порт" @@ -464,7 +631,7 @@ msgstr "" msgid "Admin Groups" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:215 +#: rhodecode/authentication/plugins/auth_crowd.py:216 msgid "CROWD" msgstr "" @@ -514,126 +681,130 @@ 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 "База (Base DN)" -#: 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 "Глубина (scope)" -#: 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 "LDAP" @@ -666,76 +837,73 @@ 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:84 +#: rhodecode/controllers/changeset.py:83 msgid "Ignore whitespace" msgstr "Игнорировать пробел" -#: rhodecode/controllers/changeset.py:85 +#: rhodecode/controllers/changeset.py:84 msgid "Ignore whitespace for all diffs" msgstr "Всегда игнорировать пробел при сравнении файлов" -#: rhodecode/controllers/changeset.py:141 +#: rhodecode/controllers/changeset.py:140 msgid "Increase context" msgstr "Выделять несовпадения увеличением текста" -#: rhodecode/controllers/changeset.py:142 +#: rhodecode/controllers/changeset.py:141 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 "Изменить статус %(transition_icon)s %(status)s" -#: 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 " @@ -761,51 +929,47 @@ msgstr "" msgid "There are no files yet. %s" msgstr "Файлов пока нет. %s" -#: 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 "Репозиторий заблокировал %s в %s" -#: 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" -msgstr "Файл %s удален с помощью 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 "Файл %s успешно удален" - -#: 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 "Файл %s отредактирован с помощью RhodeCode Enterprise" - -#: 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 "Изменения применены в %s" - -#: 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 "Файл добавлен с помощью RhodeCode Enterprise" @@ -813,41 +977,39 @@ msgstr "Файл добавлен с помощью RhodeCode Enterprise" 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 "Неизвестная версия %s" -#: 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 "Метки" @@ -856,28 +1018,6 @@ msgstr "Метки" msgid "An error occurred during repository forking %s" msgstr "Произошла ошибка во время создания форка репозитория %s" -#: 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 "общедоступный журнал" @@ -886,84 +1026,60 @@ 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 "Заголовок Pull запроса должен быть не менее 3-х символов" -#: 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 "Pull запрос создан успешно" -#: rhodecode/controllers/pullrequests.py:388 -msgid "Error occurred during sending pull request" -msgstr "Произошла ошибка при создании Pull запроса" - -#: 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:437 +#: rhodecode/controllers/pullrequests.py:328 msgid "Pull request title & description updated." msgstr "Заголовок и описание запроса на включение изменений обновлены." -#: rhodecode/controllers/pullrequests.py:455 +#: 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:472 +#: rhodecode/controllers/pullrequests.py:363 msgid "Reload page" msgstr "" -#: rhodecode/controllers/pullrequests.py:546 +#: rhodecode/controllers/pullrequests.py:437 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 "Pull запрос успешно удалён" -#: 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 "Стандартные настройки успешно обновлены" @@ -1019,75 +1135,59 @@ 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 "Произошла ошибка при обновлении пользователя %s" -#: 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 "Произошла ошибка при сохранении E-mail" - -#: 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 "Создана новая группа репозиториев %s" -#: 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 "Произошла ошибка при создании группы репозиториев %s" -#: rhodecode/controllers/admin/repo_groups.py:258 +#: rhodecode/controllers/admin/repo_groups.py:261 #, python-format msgid "Updated repository group %s" msgstr "Группа репозиториев %s обновлена" -#: 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 "Произошла ошибка при обновлении группы репозиториев %s" -#: 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" @@ -1096,7 +1196,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: 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" @@ -1105,7 +1205,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/controllers/admin/repo_groups.py:312 +#: rhodecode/controllers/admin/repo_groups.py:313 #, python-format msgid "Removed repository group %s" msgstr "Группа репозиториев %s удалена" @@ -1115,366 +1215,285 @@ msgstr "Группа репозиториев %s удалена" msgid "Error occurred during deletion of repository group %s" msgstr "Произошла ошибка при удалении группы репозиториев %s" -#: 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:129 +#: rhodecode/controllers/admin/repos.py:125 #, python-format msgid "Error creating repository %s: invalid certificate" msgstr "" -#: rhodecode/controllers/admin/repos.py:133 +#: rhodecode/controllers/admin/repos.py:129 #, python-format msgid "Error creating repository %s" msgstr "Произошла ошибка при создании репозитория %s" -#: rhodecode/controllers/admin/repos.py:274 +#: rhodecode/controllers/admin/repos.py:270 #, python-format msgid "Created repository %s from %s" msgstr "Репозиторий %s создан из %s" -#: rhodecode/controllers/admin/repos.py:283 +#: rhodecode/controllers/admin/repos.py:279 #, python-format msgid "Forked repository %s as %s" msgstr "Сделан форк(копия) репозитория %s на %s" -#: rhodecode/controllers/admin/repos.py:286 +#: rhodecode/controllers/admin/repos.py:282 #, python-format msgid "Created repository %s" msgstr "Репозиторий %s создан" -#: rhodecode/controllers/admin/repos.py:327 -#, python-format -msgid "Repository %s updated successfully" -msgstr "Репозитарий %s успешно обновлён" - -#: rhodecode/controllers/admin/repos.py:346 -#, python-format -msgid "Error occurred during update of repository %s" -msgstr "Произошла ошибка во время обновления репозитория %s" - -#: rhodecode/controllers/admin/repos.py:374 -#, python-format -msgid "Detached %s forks" -msgstr "Форки %s отсоединены" - -#: rhodecode/controllers/admin/repos.py:377 -#, python-format -msgid "Deleted %s forks" -msgstr "Удалены форки репозитория %s" - -#: rhodecode/controllers/admin/repos.py:382 -#, python-format -msgid "Deleted repository %s" -msgstr "Репозиторий %s удалён" - -#: rhodecode/controllers/admin/repos.py:385 -#, python-format -msgid "Cannot delete %s it still contains attached forks" -msgstr "Невозможно удалить %s, он всё-ещё содержит форки" - -#: rhodecode/controllers/admin/repos.py:390 -#, python-format -msgid "An error occurred during deletion of %s" -msgstr "Произошла ошибка во время удаления %s" - -#: rhodecode/controllers/admin/repos.py:443 -msgid "Repository permissions updated" -msgstr "Привилегии репозитория обновлены" - -#: rhodecode/controllers/admin/repos.py:474 +#: rhodecode/controllers/admin/repos.py:319 msgid "An error occurred during creation of field" msgstr "Произошла ошибка при создании поля" -#: rhodecode/controllers/admin/repos.py:489 +#: rhodecode/controllers/admin/repos.py:334 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 "Репозиторий %s отмечен как форк %s" - -#: 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 +#: rhodecode/controllers/admin/repos.py:353 msgid "Unlocked" msgstr "Разблокировано" -#: rhodecode/controllers/admin/repos.py:612 +#: rhodecode/controllers/admin/repos.py:357 msgid "Locked" msgstr "Заблокировано" -#: rhodecode/controllers/admin/repos.py:614 +#: rhodecode/controllers/admin/repos.py:359 #, python-format msgid "Repository has been %s" msgstr "Репозиторий %s" -#: 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 +#: rhodecode/controllers/admin/repos.py:373 msgid "Pulled from remote location" msgstr "Внесены изменения из удалённого репозитория" -#: rhodecode/controllers/admin/repos.py:656 +#: rhodecode/controllers/admin/repos.py:376 msgid "An error occurred during pull from remote location" msgstr "Произошла ошибка при внесении изменений из удалённого репозитория" -#: rhodecode/controllers/admin/repos.py:678 +#: rhodecode/controllers/admin/repos.py:397 msgid "An error occurred during deletion of repository stats" msgstr "Произошла ошибка при удалении статистики репозитория" -#: rhodecode/controllers/admin/repos.py:725 +#: rhodecode/controllers/admin/repos.py:443 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 "Обновлены настройки VCS" #: 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 "Репозитории успешно пересканированы, добавлено: %s ; удалено: %s" -#: rhodecode/controllers/admin/settings.py:279 +#: rhodecode/controllers/admin/settings.py:282 msgid "Updated application settings" msgstr "Обновленные параметры настройки приложения" -#: rhodecode/controllers/admin/settings.py:345 +#: rhodecode/controllers/admin/settings.py:348 msgid "Updated visualisation settings" msgstr "Настройки визуализации обновлены" -#: rhodecode/controllers/admin/settings.py:348 +#: 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 "Задача отправки Email создана" -#: 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 "Произошла ошибка при создании группы пользователей %s" -#: rhodecode/controllers/admin/user_groups.py:220 +#: rhodecode/controllers/admin/user_groups.py:218 #, python-format msgid "Updated user group %s" msgstr "Группа пользователей %s обновлена" -#: 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 "Произошла ошибка при обновлении группы пользователей %s" -#: rhodecode/controllers/admin/user_groups.py:258 +#: rhodecode/controllers/admin/user_groups.py:253 msgid "Successfully deleted user group" msgstr "Группа пользователей успешно удалена" -#: rhodecode/controllers/admin/user_groups.py:263 +#: rhodecode/controllers/admin/user_groups.py:258 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 "Произошла ошибка при создании пользователя %s" -#: 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 "" @@ -1484,81 +1503,63 @@ msgid "" "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 "Произошла ошибка при сохранении IP" - -#: 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 "IP %s удален из белого списка пользователя" - -#: 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 "" @@ -1590,7 +1591,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 @@ -1601,8 +1602,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 @@ -1612,13 +1613,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 @@ -1627,13 +1628,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 @@ -1787,16 +1788,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 @@ -1832,11 +1832,11 @@ 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 " @@ -1844,172 +1844,172 @@ msgid "" "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 "[закрыт] pull запрос для" -#: 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] в репозитории" -#: 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 "имя форка %s" -#: 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 "Pull запрос #%s" -#: 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 +#: rhodecode/lib/action_parser.py:227 msgid "compare view" msgstr "сравнение" -#: rhodecode/lib/action_parser.py:227 +#: 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 "Удалена ветка: %s" -#: rhodecode/lib/action_parser.py:282 +#: rhodecode/lib/action_parser.py:289 #, python-format msgid "Created tag: %s" msgstr "Создан тег: %s" -#: 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 "IP %s заблокирован" -#: 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 "" @@ -2035,20 +2035,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 "и на %s больше" -#: 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" @@ -2063,7 +2064,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" @@ -2105,7 +2120,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 "прямо сейчас" @@ -2140,7 +2155,7 @@ msgstr "прямо сейчас" #: 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/model/db.py:2482 msgid "Repository no access" msgstr "Репозитарий - нет доступа" @@ -2174,7 +2189,7 @@ msgstr "Репозитарий - нет доступа" #: 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/model/db.py:2483 msgid "Repository read access" msgstr "Репозитарий - доступ на чтение" @@ -2208,7 +2223,7 @@ msgstr "Репозитарий - доступ на чтение" #: 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/model/db.py:2484 msgid "Repository write access" msgstr "Репозитарий - доступ на запись" @@ -2242,7 +2257,7 @@ msgstr "Репозитарий - доступ на запись" #: 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/model/db.py:2485 msgid "Repository admin access" msgstr "Репозитарий - администрирование" @@ -2316,7 +2331,7 @@ msgstr "Администратор RhodeCode " #: 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/model/db.py:2503 msgid "Repository creation disabled" msgstr "Создание репозиториев отключено" @@ -2350,7 +2365,7 @@ msgstr "Создание репозиториев отключено" #: 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/model/db.py:2504 msgid "Repository creation enabled" msgstr "Создание репозиториев включено" @@ -2384,7 +2399,7 @@ msgstr "Создание репозиториев включено" #: 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/model/db.py:2508 msgid "Repository forking disabled" msgstr "Возможность создавать форк репозитория отключена" @@ -2418,7 +2433,7 @@ msgstr "Возможность создавать форк репозитория отключена" #: 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/model/db.py:2509 msgid "Repository forking enabled" msgstr "Возможность создавать форк репозитория включена" @@ -2473,7 +2488,7 @@ msgstr "Регистрация нового пользователя в RhodeCode с автоматической активацией" #: 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/model/db.py:3212 msgid "Not Reviewed" msgstr "Не просмотрено" @@ -2507,7 +2522,7 @@ msgstr "Не просмотрено" #: 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/model/db.py:3213 msgid "Approved" msgstr "Одобрено" @@ -2541,7 +2556,7 @@ msgstr "Одобрено" #: 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/model/db.py:3214 msgid "Rejected" msgstr "Отклонено" @@ -2575,7 +2590,7 @@ msgstr "Отклонено" #: 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/model/db.py:3215 msgid "Under Review" msgstr "На рассмотрении" @@ -2606,7 +2621,7 @@ msgstr "На рассмотрении" #: 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/model/db.py:2487 msgid "Repository group no access" msgstr "Группа репозиториев - нет доступа" @@ -2637,7 +2652,7 @@ msgstr "Группа репозиториев - нет доступа" #: 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/model/db.py:2488 msgid "Repository group read access" msgstr "Группа репозиториев - доступ на чтение" @@ -2668,7 +2683,7 @@ msgstr "Группа репозиториев - доступ на чтение" #: 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/model/db.py:2489 msgid "Repository group write access" msgstr "Группа репозиториев - доступ на запись" @@ -2699,7 +2714,7 @@ msgstr "Группа репозиториев - доступ на запись" #: 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/model/db.py:2490 msgid "Repository group admin access" msgstr "Группа репозиториев - администрирование" @@ -2729,7 +2744,7 @@ msgstr "Группа репозиториев - администрирование" #: 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/model/db.py:2492 msgid "User group no access" msgstr "Группа пользователей - нет доступа" @@ -2759,7 +2774,7 @@ msgstr "Группа пользователей - нет доступа" #: 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/model/db.py:2493 msgid "User group read access" msgstr "Группа пользователей - доступ на чтение" @@ -2789,7 +2804,7 @@ msgstr "Группа пользователей - доступ на чтение" #: 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/model/db.py:2494 msgid "User group write access" msgstr "Группа пользователей - доступ на запись" @@ -2819,7 +2834,7 @@ msgstr "Группа пользователей - доступ на запись" #: 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/model/db.py:2495 msgid "User group admin access" msgstr "Группа пользователей - администрирование" @@ -2849,7 +2864,7 @@ msgstr "Группа пользователей - администрирование" #: 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/model/db.py:2497 msgid "Repository Group creation disabled" msgstr "Создание групп репозиториев отключено" @@ -2879,7 +2894,7 @@ msgstr "Создание групп репозиториев отключено" #: 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/model/db.py:2498 msgid "Repository Group creation enabled" msgstr "Создание групп репозиториев включено" @@ -2909,7 +2924,7 @@ msgstr "Создание групп репозиториев включено" #: 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/model/db.py:2500 msgid "User Group creation disabled" msgstr "Создание групп пользователей отключено" @@ -2939,7 +2954,7 @@ msgstr "Создание групп пользователей отключено" #: 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/model/db.py:2501 msgid "User Group creation enabled" msgstr "Создание групп пользователей включено" @@ -2969,7 +2984,7 @@ msgstr "Создание групп пользователей включено" #: 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/model/db.py:2511 msgid "Registration disabled" msgstr "Регистрация отключена" @@ -2999,7 +3014,7 @@ msgstr "Регистрация отключена" #: 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/model/db.py:2512 msgid "User Registration with manual account activation" msgstr "Регистрация пользователя с ручной активацией учётной записи" @@ -3029,7 +3044,7 @@ msgstr "Регистрация пользователя с ручной активацией учётной записи" #: 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/model/db.py:2513 msgid "User Registration with automatic account activation" msgstr "Регистрация пользователя с автоматической активацией учётной записи" @@ -3059,7 +3074,7 @@ msgstr "Регистрация пользователя с автоматической активацией учётной записи" #: 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/model/permission.py:95 +#: rhodecode/model/db.py:2519 rhodecode/model/permission.py:95 msgid "Manual activation of external account" msgstr "Ручная активация внешней учетной записи" @@ -3089,7 +3104,7 @@ msgstr "Ручная активация внешней учетной записи" #: 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/model/permission.py:96 +#: rhodecode/model/db.py:2520 rhodecode/model/permission.py:96 msgid "Automatic activation of external account" msgstr "Автоматическая активация внешней учетной записи" @@ -3113,7 +3128,7 @@ msgstr "Автоматическая активация внешней учетной записи" #: 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/model/db.py:2505 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3138,7 +3153,7 @@ msgstr "" #: 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/model/db.py:2506 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3160,7 +3175,7 @@ msgstr "" #: 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/model/db.py:2480 msgid "RhodeCode Super Administrator" msgstr "" @@ -3179,7 +3194,7 @@ msgstr "" #: 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/model/db.py:2522 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3198,7 +3213,7 @@ msgstr "" #: 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/model/db.py:2523 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3208,7 +3223,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 "" @@ -3218,7 +3233,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 "" @@ -3228,7 +3243,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 "" @@ -3238,7 +3253,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 "" @@ -3248,7 +3263,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 "" @@ -3259,65 +3274,65 @@ msgstr "" #: 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/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/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/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/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 "Индексы отсутствуют. Пожалуйста, запустите индексатор Whoosh." -#: 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 "" @@ -3403,7 +3418,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 "Ничего" @@ -3411,7 +3426,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 "Чтение" @@ -3419,10 +3434,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 "Запись" @@ -3445,7 +3460,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 @@ -3455,9 +3470,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 "Администратор" @@ -3488,93 +3503,93 @@ 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 "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." -msgstr "" - -#: rhodecode/model/pull_request.py:124 +"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" @@ -3582,92 +3597,96 @@ 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 " @@ -3693,6 +3712,7 @@ msgid "Username \"%(username)s\" is forb msgstr "Имя \"%(username)s\" отклонено" #: 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" @@ -3802,98 +3822,113 @@ 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 "Этот E-mail уже занят" -#: rhodecode/model/validators.py:881 +#: rhodecode/model/validators.py:914 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "\"%(email)s\" не существует" -#: 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 "Ревизии %(revs)s уже включены в pull-request или имеют установленный статус" -#: 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 "Пожалуйста, введите существующий IPv4 или IpV6 адре" -#: 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 "Значение маски подсети должно быть в пределах от 0 до 32 (%(bits)r - неверно)" -#: 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" @@ -3966,253 +4001,263 @@ 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 @@ -4221,28 +4266,28 @@ 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 " @@ -4251,14 +4296,14 @@ 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 ..." @@ -4266,105 +4311,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 "Показать еще" @@ -4379,151 +4489,151 @@ 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 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 "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:29 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 #: rhodecode/templates/changelog/changelog.mako:61 msgid "Open new pull request" msgstr "Создать новый pull запрос" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 +#: 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:35 +#: 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 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 msgid "" "There are currently no open pull requests requiring your participation." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "отключено" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: 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:62 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 msgid "files" msgstr "файлы" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 -#: rhodecode/templates/pullrequests/pullrequest.mako:108 +#: 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 "" @@ -4605,7 +4715,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 @@ -4613,7 +4723,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 "Имя" @@ -4628,7 +4738,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 @@ -4636,9 +4746,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 @@ -4646,9 +4757,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 "Описание" @@ -4659,7 +4770,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 @@ -4682,13 +4793,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 "" @@ -4703,7 +4814,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 "Войти" @@ -4728,14 +4839,14 @@ 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 "или" @@ -4795,7 +4906,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 "Имя" @@ -4805,7 +4916,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 "Фамилия" @@ -4817,38 +4928,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] "%s запись" -msgstr[1] "%s записей" -msgstr[2] "%s записи" -msgstr[3] "%s записи" - -#: 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 @@ -4856,38 +4961,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 "С IP" - -#: 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 "Действия ещё не производились" @@ -4930,8 +5042,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 @@ -4972,7 +5084,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 " @@ -5027,7 +5139,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 "plain" @@ -5038,9 +5150,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 @@ -5109,14 +5221,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 "Автор" @@ -5177,12 +5288,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 "Редактировать" @@ -5223,11 +5334,11 @@ 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:251 msgid "Settings" msgstr "Настройки" @@ -5330,7 +5441,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 "Мой аккаунт" @@ -5354,7 +5465,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 "" @@ -5371,7 +5482,7 @@ msgstr "Pull-request'ы" #: 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" @@ -5431,7 +5542,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 "Добавить" @@ -5450,10 +5561,8 @@ 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" -msgstr "Подтвердите удаление E-mail: %s" +msgid "Confirm to delete this email: {}" +msgstr "" #: rhodecode/templates/admin/my_account/my_account_emails.mako:42 #: rhodecode/templates/admin/users/user_edit_emails.mako:41 @@ -5538,13 +5647,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 "" @@ -5562,7 +5671,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 "Комментарии" @@ -5583,6 +5692,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 "" @@ -5645,23 +5758,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 "Подтвердите удаление ip %s" #: 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 "Разрешены любые IP-адреса" #: 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 "" @@ -5759,9 +5872,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 "Дополнительно" @@ -5822,26 +5935,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" @@ -5849,8 +5962,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 "" @@ -5860,7 +5973,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" @@ -5930,7 +6043,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." @@ -5941,7 +6054,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)" @@ -5961,7 +6073,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 "" @@ -5993,36 +6105,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 "" @@ -6057,95 +6169,86 @@ 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] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:125 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:124 msgid "Detach forks" msgstr "Отсоединить fork'и" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129 msgid "Delete forks" msgstr "Удалить fork'и" -#: 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 "Подтвердите удаление этого репозитория: %s" -#: 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 +#: 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." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 +"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 "" @@ -6153,48 +6256,45 @@ msgstr "" msgid "Invalidate Cache for Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Invalidate repository cache" -msgstr "Сбросить кэш репозитория" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Confirm to invalidate repository cache" -msgstr "Подтвердите сброс кэша" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:14 +#: 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:28 -#, python-format -msgid "List of repository caches (%(count)s entry)" -msgid_plural "List of repository caches (%(count)s entries)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:35 +#: 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: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 "Активный" @@ -6270,20 +6370,29 @@ 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 "" @@ -6291,11 +6400,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 "" @@ -6303,57 +6412,91 @@ 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 "Неизменяемый id" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:19 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 msgid "what is that ?" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:21 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:24 msgid "URL by id" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 +#: 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 @@ -6361,65 +6504,62 @@ 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 +#: 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:108 +#: 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:117 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:148 msgid "Enable statistics" msgstr "Включить статистику." -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:121 +#: 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" @@ -6486,32 +6626,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 @@ -7081,12 +7213,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 "" @@ -7123,46 +7255,39 @@ 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 "" @@ -7254,24 +7379,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 "" @@ -7285,7 +7414,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 "" @@ -7412,6 +7541,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 "Подтвердите удаление E-mail: %s" + #: rhodecode/templates/admin/users/user_edit_groups.mako:12 #, python-format msgid "Add `%s` to user group" @@ -7421,12 +7555,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" @@ -7473,7 +7619,7 @@ msgstr "" msgid "Users administration" msgstr "Администрирование пользователей" -#: rhodecode/templates/admin/users/users.mako:77 +#: rhodecode/templates/admin/users/users.mako:78 msgid "Auth type" msgstr "" @@ -7541,112 +7687,110 @@ msgstr "Сравнить" msgid "Show Pull Requests for %s" msgstr "Показать pull-request'ы для %s" -#: 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 +#: rhodecode/templates/base/base.mako:262 msgid "Unlock" msgstr "Разблокировать" -#: rhodecode/templates/base/base.mako:262 +#: 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] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/base/base.mako:268 +msgstr "Форк" + +#: rhodecode/templates/base/base.mako:270 msgid "Create Pull Request" msgstr "Создать Pull запрос" -#: 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 "Gist" -#: 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 @@ -7668,15 +7812,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 "" @@ -7783,10 +7927,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" @@ -7866,7 +8010,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 "" @@ -7977,93 +8121,105 @@ msgid "" "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 " @@ -8071,11 +8227,11 @@ msgid "" "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." @@ -8095,10 +8251,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 "Закладка %s" @@ -8117,10 +8273,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 "Ветка %s" @@ -8160,19 +8316,19 @@ msgstr[2] "" msgstr[3] "" #: 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 "Ссылки" @@ -8189,7 +8345,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" @@ -8197,44 +8353,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 "Метка %s" -#: rhodecode/templates/changelog/changelog_elements.mako:113 +#: rhodecode/templates/changelog/changelog_elements.mako:133 msgid "load next" msgstr "" @@ -8242,100 +8420,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 "Сообщение commit'а" - -#: 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 "Отобразить в формате diff" -#: 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 "Применить разностное исправление (Patch diff)" -#: 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 "Скачать diff" -#: 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" @@ -8345,8 +8501,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: 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" @@ -8356,19 +8512,19 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: 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 "" @@ -8394,73 +8550,81 @@ 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" -#: 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 @@ -8501,7 +8665,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" @@ -8512,7 +8676,7 @@ msgstr[3] "" #: 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" @@ -8692,12 +8856,12 @@ 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" @@ -8706,8 +8870,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: 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] "" @@ -8715,7 +8879,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/compare/compare_commits.mako:74 +#: rhodecode/templates/compare/compare_commits.mako:75 msgid "No commits in this compare" msgstr "" @@ -8755,6 +8919,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 "Исходный код" @@ -8970,6 +9135,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" @@ -9091,6 +9260,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 "" @@ -9166,8 +9336,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" @@ -9193,7 +9361,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 "Вы будете посланы на %s через %s секунд" @@ -9266,6 +9434,7 @@ msgid "Remove Custom Path" msgstr "" #: rhodecode/templates/files/files_add.mako:50 +#: rhodecode/templates/files/files_add.mako:59 msgid "Filename" msgstr "" @@ -9273,34 +9442,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 "Применить изменения" @@ -9321,6 +9490,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 "" @@ -9433,7 +9607,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] "" @@ -9499,6 +9672,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 "Скопировать привилегии" @@ -9536,6 +9713,15 @@ msgstr "Форки ещё не созданы" msgid "Filter" msgstr "" +#: rhodecode/templates/journal/journal.mako:14 +#, python-format +msgid "%s entry" +msgid_plural "%s entries" +msgstr[0] "%s запись" +msgstr[1] "%s записей" +msgstr[2] "%s записи" +msgstr[3] "%s записи" + #: rhodecode/templates/journal/journal.mako:23 msgid "ATOM journal feed" msgstr "Лента журнала ATOM" @@ -9566,47 +9752,57 @@ msgstr "Общая лента журнала RSS" msgid "New pull request" msgstr "Новый pull запрос" -#: 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 "Рецензенты запросов на внесение изменений Pull request" -#: 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] "" @@ -9614,19 +9810,19 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: 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 "" @@ -9674,10 +9870,6 @@ msgstr "" msgid "Confirm to delete this pull request" msgstr "Подтвердите удаление этого pull-request'а" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:71 -msgid "Origin" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:88 msgid "Common ancestor" msgstr "" @@ -9780,77 +9972,77 @@ 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 "" @@ -9940,6 +10132,11 @@ msgstr "Сообщения commit'а" msgid "File names" msgstr "Имя файла" +#: rhodecode/templates/search/search_commit.mako:8 +#: rhodecode/templates/summary/summary_commits.mako:9 +msgid "Commit message" +msgstr "Сообщение commit'а" + #: rhodecode/templates/search/search_commit.mako:11 msgid "Age (new first)" msgstr "" @@ -9971,42 +10168,6 @@ msgstr "ATOM лента репозитория %s" msgid "%s RSS feed" msgstr "RSS лента репозитория %s" -#: rhodecode/templates/summary/components.mako:5 -#, python-format -msgid "%(num)s Branch" -msgid_plural "%(num)s Branches" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/summary/components.mako:12 -#, python-format -msgid "%(num)s Closed Branch" -msgid_plural "%(num)s Closed Branches" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/summary/components.mako:19 -#, python-format -msgid "%(num)s Tag" -msgid_plural "%(num)s Tags" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/summary/components.mako:26 -#, python-format -msgid "%(num)s Bookmark" -msgid_plural "%(num)s Bookmarks" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: rhodecode/templates/summary/components.mako:49 msgid "Read-only url" msgstr "" @@ -10087,6 +10248,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/i18n/zh/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po @@ -5,13 +5,14 @@ # Translators: # FIRST AUTHOR , 2011 # mikespook , 2012 +# Song Li , 2017 # xpolife , 2012 msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-04-07 12:33+0200\n" -"PO-Revision-Date: 2017-04-07 10:34+0000\n" +"POT-Creation-Date: 2017-06-27 17:25+0200\n" +"PO-Revision-Date: 2017-06-27 15:26+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Chinese (http://www.transifex.com/rhodecode/RhodeCode/language/zh/)\n" "MIME-Version: 1.0\n" @@ -28,7 +29,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 "" @@ -41,7 +42,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 "" @@ -52,7 +53,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" @@ -64,7 +65,7 @@ msgstr "钩子" #: rhodecode/apps/admin/navigation.py:91 msgid "Full Text Search" -msgstr "" +msgstr "全文检索" #: rhodecode/apps/admin/navigation.py:93 #: rhodecode/templates/admin/integrations/base.mako:23 @@ -79,7 +80,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 "" @@ -87,7 +88,7 @@ msgstr "" #: rhodecode/apps/admin/navigation.py:95 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" -msgstr "" +msgstr "系统信息" #: rhodecode/apps/admin/navigation.py:97 msgid "User Sessions" @@ -101,11 +102,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 "" @@ -117,249 +118,416 @@ 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 +msgstr "GIT" + +#: rhodecode/apps/admin/views/system_info.py:159 msgid "HG" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:155 +msgstr "HG" + +#: 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 +msgstr "SVN" + +#: 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:178 -#: rhodecode/apps/my_account/views.py:138 +#: 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:179 -#: rhodecode/apps/my_account/views.py:139 +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:180 -#: rhodecode/apps/my_account/views.py:140 +msgstr "5分钟" + +#: 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:181 -#: rhodecode/apps/my_account/views.py:141 +msgstr "1小时" + +#: 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:182 -#: rhodecode/apps/my_account/views.py:142 +msgstr "1天" + +#: 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:184 -#: rhodecode/apps/my_account/views.py:144 +msgstr "1个月" + +#: 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:188 -#: rhodecode/apps/my_account/views.py:148 +msgstr "终身" + +#: rhodecode/apps/admin/views/users.py:178 +#: 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 "成功将版本库 %s 标记为复刻自 %s" + +#: 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 "" @@ -417,7 +585,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 "" @@ -447,7 +615,7 @@ msgstr "" msgid "Admin Groups" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:215 +#: rhodecode/authentication/plugins/auth_crowd.py:216 msgid "CROWD" msgstr "" @@ -497,126 +665,130 @@ 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 "" @@ -649,76 +821,73 @@ 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 " @@ -728,12 +897,12 @@ msgstr "" #: rhodecode/controllers/feed.py:69 #, python-format msgid "Changes on %s repository" -msgstr "%s库的修改" +msgstr "%s 库的修改" #: rhodecode/controllers/feed.py:70 #, python-format msgid "%s %s feed" -msgstr "%s %s订阅" +msgstr "%s %s 订阅" #: rhodecode/controllers/files.py:98 msgid "Click here to add a new file." @@ -744,51 +913,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 "成功提交到%s" - -#: 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 "" @@ -796,70 +961,46 @@ 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 "未知版本%s" - -#: rhodecode/controllers/files.py:772 +msgstr "未知版本 %s" + +#: 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 "标签" #: rhodecode/controllers/forks.py:190 #, python-format msgid "An error occurred during repository forking %s" -msgstr "在复刻版本库%s的时候发生错误" - -#: 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 "" +msgstr "在复刻版本库 %s 的时候发生错误" #: rhodecode/controllers/journal.py:107 rhodecode/controllers/journal.py:150 msgid "public journal" @@ -869,84 +1010,60 @@ 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 "拉取请求的标题至少3个字符" -#: 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:437 +#: rhodecode/controllers/pullrequests.py:328 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/controllers/pullrequests.py:455 +#: 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:472 +#: rhodecode/controllers/pullrequests.py:363 msgid "Reload page" msgstr "" -#: rhodecode/controllers/pullrequests.py:546 +#: rhodecode/controllers/pullrequests.py:437 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 "默认设置已经成功更新" @@ -1002,87 +1119,71 @@ 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] "" -#: 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] "" -#: rhodecode/controllers/admin/repo_groups.py:312 +#: rhodecode/controllers/admin/repo_groups.py:313 #, python-format msgid "Removed repository group %s" msgstr "" @@ -1092,366 +1193,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 "版本库%s成功更新" - -#: 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 "无法删除%s因为它还有其他分复刻本库" - -#: rhodecode/controllers/admin/repos.py:390 -#, python-format -msgid "An error occurred during deletion of %s" -msgstr "在删除%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 "版本库曾经为 %s" + +#: 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 "成功将版本库%s标记为复刻自%s" - -#: 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 "版本库已被%s" - -#: 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 +#: rhodecode/controllers/admin/settings.py:348 msgid "Updated visualisation settings" msgstr "成功更新可视化设置" -#: rhodecode/controllers/admin/settings.py:348 +#: 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 "" @@ -1461,81 +1481,63 @@ msgid "" "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 "" @@ -1567,7 +1569,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 @@ -1578,8 +1580,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 @@ -1589,13 +1591,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 @@ -1604,13 +1606,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 @@ -1764,16 +1766,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 @@ -1809,11 +1810,11 @@ 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 " @@ -1821,172 +1822,172 @@ msgid "" "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提交]到版本库" -#: 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 "复刻名称%s" - -#: rhodecode/lib/action_parser.py:183 +msgstr "复刻名称 %s" + +#: rhodecode/lib/action_parser.py:190 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" -msgstr "拉取请求#%s" - -#: rhodecode/lib/action_parser.py:216 +msgstr "拉取请求 #%s" + +#: rhodecode/lib/action_parser.py:223 #, python-format msgid "Show all combined commits %s->%s" msgstr "" -#: rhodecode/lib/action_parser.py:220 +#: rhodecode/lib/action_parser.py:227 msgid "compare view" msgstr "比较显示" -#: rhodecode/lib/action_parser.py:227 +#: 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 "已经删除分支%s" - -#: rhodecode/lib/action_parser.py:282 +msgstr "已经删除分支 %s" + +#: rhodecode/lib/action_parser.py:289 #, python-format msgid "Created tag: %s" -msgstr "创建标签%s" - -#: rhodecode/lib/action_parser.py:295 +msgstr "创建标签 %s" + +#: 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 "" @@ -2012,20 +2013,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 "还有%s个" - -#: rhodecode/lib/helpers.py:1521 +msgstr "还有 %s 个" + +#: 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" @@ -2040,12 +2042,26 @@ 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 "版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以重新扫描版本库" +msgstr "版本库 %s 没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以重新扫描版本库" #: rhodecode/lib/utils2.py:486 msgid "in ${ago}" @@ -2082,10 +2098,10 @@ 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 "刚才" +msgstr "刚刚" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:582 @@ -2117,7 +2133,7 @@ msgstr "刚才" #: 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/model/db.py:2482 msgid "Repository no access" msgstr "无版本库访问权限" @@ -2151,7 +2167,7 @@ msgstr "无版本库访问权限" #: 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/model/db.py:2483 msgid "Repository read access" msgstr "版本库读取权限" @@ -2185,7 +2201,7 @@ msgstr "版本库读取权限" #: 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/model/db.py:2484 msgid "Repository write access" msgstr "版本库写入权限" @@ -2219,7 +2235,7 @@ msgstr "版本库写入权限" #: 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/model/db.py:2485 msgid "Repository admin access" msgstr "版本库管理权限" @@ -2293,7 +2309,7 @@ msgstr "RhodeCode 管理员" #: 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/model/db.py:2503 msgid "Repository creation disabled" msgstr "禁用创建版本库" @@ -2327,7 +2343,7 @@ msgstr "禁用创建版本库" #: 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/model/db.py:2504 msgid "Repository creation enabled" msgstr "允许创建版本库" @@ -2361,7 +2377,7 @@ msgstr "允许创建版本库" #: 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/model/db.py:2508 msgid "Repository forking disabled" msgstr "禁用复刻版本库" @@ -2395,7 +2411,7 @@ msgstr "禁用复刻版本库" #: 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/model/db.py:2509 msgid "Repository forking enabled" msgstr "允许复刻版本库" @@ -2450,7 +2466,7 @@ msgstr "用自动激活注册新用户" #: 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/model/db.py:3212 msgid "Not Reviewed" msgstr "未检视" @@ -2484,7 +2500,7 @@ msgstr "未检视" #: 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/model/db.py:3213 msgid "Approved" msgstr "已批准" @@ -2518,7 +2534,7 @@ msgstr "已批准" #: 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/model/db.py:3214 msgid "Rejected" msgstr "驳回" @@ -2552,7 +2568,7 @@ msgstr "驳回" #: 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/model/db.py:3215 msgid "Under Review" msgstr "检视中" @@ -2583,7 +2599,7 @@ msgstr "检视中" #: 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/model/db.py:2487 msgid "Repository group no access" msgstr "" @@ -2614,7 +2630,7 @@ msgstr "" #: 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/model/db.py:2488 msgid "Repository group read access" msgstr "" @@ -2645,7 +2661,7 @@ msgstr "" #: 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/model/db.py:2489 msgid "Repository group write access" msgstr "" @@ -2676,7 +2692,7 @@ msgstr "" #: 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/model/db.py:2490 msgid "Repository group admin access" msgstr "" @@ -2706,7 +2722,7 @@ msgstr "" #: 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/model/db.py:2492 msgid "User group no access" msgstr "" @@ -2736,7 +2752,7 @@ msgstr "" #: 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/model/db.py:2493 msgid "User group read access" msgstr "" @@ -2766,7 +2782,7 @@ msgstr "" #: 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/model/db.py:2494 msgid "User group write access" msgstr "" @@ -2796,7 +2812,7 @@ msgstr "" #: 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/model/db.py:2495 msgid "User group admin access" msgstr "" @@ -2826,7 +2842,7 @@ msgstr "" #: 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/model/db.py:2497 msgid "Repository Group creation disabled" msgstr "" @@ -2856,7 +2872,7 @@ msgstr "" #: 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/model/db.py:2498 msgid "Repository Group creation enabled" msgstr "" @@ -2886,7 +2902,7 @@ msgstr "" #: 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/model/db.py:2500 msgid "User Group creation disabled" msgstr "" @@ -2916,7 +2932,7 @@ msgstr "" #: 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/model/db.py:2501 msgid "User Group creation enabled" msgstr "" @@ -2946,7 +2962,7 @@ msgstr "" #: 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/model/db.py:2511 msgid "Registration disabled" msgstr "" @@ -2976,7 +2992,7 @@ msgstr "" #: 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/model/db.py:2512 msgid "User Registration with manual account activation" msgstr "" @@ -3006,7 +3022,7 @@ msgstr "" #: 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/model/db.py:2513 msgid "User Registration with automatic account activation" msgstr "" @@ -3036,7 +3052,7 @@ msgstr "" #: 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/model/permission.py:95 +#: rhodecode/model/db.py:2519 rhodecode/model/permission.py:95 msgid "Manual activation of external account" msgstr "" @@ -3066,7 +3082,7 @@ msgstr "" #: 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/model/permission.py:96 +#: rhodecode/model/db.py:2520 rhodecode/model/permission.py:96 msgid "Automatic activation of external account" msgstr "" @@ -3090,7 +3106,7 @@ msgstr "" #: 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/model/db.py:2505 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3115,7 +3131,7 @@ msgstr "" #: 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/model/db.py:2506 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3137,7 +3153,7 @@ msgstr "" #: 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/model/db.py:2480 msgid "RhodeCode Super Administrator" msgstr "" @@ -3156,7 +3172,7 @@ msgstr "" #: 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/model/db.py:2522 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3175,7 +3191,7 @@ msgstr "" #: 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/model/db.py:2523 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3185,7 +3201,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 "" @@ -3195,7 +3211,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 "" @@ -3205,7 +3221,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 "" @@ -3215,7 +3231,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 "" @@ -3225,7 +3241,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 "" @@ -3236,65 +3252,65 @@ msgstr "" #: 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/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/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/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/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 "没有索引用于搜索。请运行whoosh索引器" -#: 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 "" @@ -3314,7 +3330,7 @@ msgstr "请输入密码" #: rhodecode/model/forms.py:96 #, python-format msgid "Enter %(min)i characters or more" -msgstr "输入少于%(min)i个字符" +msgstr "输入至少%(min)i个字符" #: rhodecode/model/notification.py:247 #, python-format @@ -3380,7 +3396,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 "无" @@ -3388,7 +3404,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 "读" @@ -3396,10 +3412,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 "写" @@ -3422,7 +3438,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 @@ -3432,9 +3448,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 "管理" @@ -3465,93 +3481,93 @@ 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 "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." -msgstr "" - -#: rhodecode/model/pull_request.py:124 +"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" @@ -3559,92 +3575,96 @@ 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 "最新tip版本" - -#: rhodecode/model/user.py:126 +msgstr "最新tip" + +#: 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 " @@ -3662,7 +3682,7 @@ msgstr "" #: rhodecode/model/validators.py:160 #, python-format msgid "Username \"%(username)s\" already exists" -msgstr "用户名称%(username)s已经存在" +msgstr "用户名称 %(username)s 已经存在" #: rhodecode/model/validators.py:162 #, python-format @@ -3670,6 +3690,7 @@ msgid "Username \"%(username)s\" is forb msgstr "不允许用户名 \"%(username)s\"" #: 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" @@ -3757,7 +3778,7 @@ msgstr "令牌不匹配" #: rhodecode/model/validators.py:484 #, python-format msgid "Repository name %(repo)s is disallowed" -msgstr "版本库名称不能为%(repo)s" +msgstr "版本库名称不能为 %(repo)s" #: rhodecode/model/validators.py:486 #, python-format @@ -3779,98 +3800,113 @@ 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 "邮件地址\"%(email)s\"不存在" -#: 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 "修订%(revs)s已经包含在拉取请求中或者或者已经设置状态" - -#: rhodecode/model/validators.py:933 -#: rhodecode/model/validation_schema/validators.py:16 -#: rhodecode/model/validation_schema/validators.py:29 +msgstr "修订 %(revs)s 已经包含在拉取请求中或者或者已经设置状态" + +#: 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" @@ -3943,253 +3979,263 @@ 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 @@ -4198,28 +4244,28 @@ 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 " @@ -4228,14 +4274,14 @@ 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 ..." @@ -4243,105 +4289,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 "" @@ -4356,151 +4467,151 @@ 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 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 "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:29 +#: 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:30 +#: 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:35 +#: 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 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 msgid "" "There are currently no open pull requests requiring your participation." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "禁用" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: 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:62 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 msgid "files" msgstr "文件" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 -#: rhodecode/templates/pullrequests/pullrequest.mako:108 +#: 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 "" @@ -4582,7 +4693,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 @@ -4590,7 +4701,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 "名称" @@ -4605,7 +4716,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 @@ -4613,9 +4724,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 @@ -4623,9 +4735,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 "描述" @@ -4636,7 +4748,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 @@ -4659,13 +4771,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 "" @@ -4680,7 +4792,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 "登录" @@ -4705,14 +4817,14 @@ 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 "或者" @@ -4772,7 +4884,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 "名" @@ -4782,7 +4894,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 "姓" @@ -4794,35 +4906,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] "%s条" - -#: 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 @@ -4830,38 +4939,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 "来源IP" - -#: 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 "无操作" @@ -4904,8 +5020,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 @@ -4946,7 +5062,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 " @@ -5001,7 +5117,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 "" @@ -5012,9 +5128,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 @@ -5083,14 +5199,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 "作者" @@ -5151,12 +5266,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 "" @@ -5197,11 +5312,11 @@ 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:251 msgid "Settings" msgstr "设置" @@ -5304,7 +5419,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 "我的账户" @@ -5328,7 +5443,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 "" @@ -5345,7 +5460,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" @@ -5405,7 +5520,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 "增加" @@ -5424,10 +5539,8 @@ 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" -msgstr "确认删除邮箱：%s" +msgid "Confirm to delete this email: {}" +msgstr "" #: rhodecode/templates/admin/my_account/my_account_emails.mako:42 #: rhodecode/templates/admin/users/user_edit_emails.mako:41 @@ -5512,13 +5625,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 "" @@ -5536,7 +5649,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 "评论" @@ -5557,6 +5670,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 "" @@ -5619,23 +5736,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 "" @@ -5733,9 +5850,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 "" @@ -5790,26 +5907,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" @@ -5817,8 +5934,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 "" @@ -5828,7 +5945,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" @@ -5898,7 +6015,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." @@ -5909,7 +6026,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)" @@ -5929,7 +6045,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 "" @@ -5961,36 +6077,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 "" @@ -6025,92 +6141,86 @@ 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] "" - -#: 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 "确认删除版本库：%s" -#: 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 +#: 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." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 +"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 "" @@ -6118,45 +6228,45 @@ msgstr "" msgid "Invalidate Cache for Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Invalidate repository cache" -msgstr "清除版本库缓存" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 -msgid "Confirm to invalidate repository cache" -msgstr "确认清除版本库缓存" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:14 +#: 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:28 -#, python-format -msgid "List of repository caches (%(count)s entry)" -msgid_plural "List of repository caches (%(count)s entries)" -msgstr[0] "" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:35 +#: 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: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 "启用" @@ -6232,20 +6342,29 @@ 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 "" @@ -6253,11 +6372,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 "" @@ -6265,57 +6384,91 @@ 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 @@ -6323,65 +6476,62 @@ 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 +#: 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:108 +#: 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:117 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:148 msgid "Enable statistics" msgstr "启用统计" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:121 +#: 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" @@ -6448,32 +6598,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 @@ -7043,12 +7185,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 "" @@ -7085,46 +7227,39 @@ 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 "" @@ -7216,24 +7351,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 "" @@ -7247,7 +7386,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 "" @@ -7365,6 +7504,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 "确认删除邮箱：%s" + #: rhodecode/templates/admin/users/user_edit_groups.mako:12 #, python-format msgid "Add `%s` to user group" @@ -7374,12 +7518,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" @@ -7426,7 +7582,7 @@ msgstr "" msgid "Users administration" msgstr "用户管理员" -#: rhodecode/templates/admin/users/users.mako:77 +#: rhodecode/templates/admin/users/users.mako:78 msgid "Auth type" msgstr "" @@ -7494,109 +7650,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 +#: rhodecode/templates/base/base.mako:262 msgid "Unlock" msgstr "" -#: rhodecode/templates/base/base.mako:262 +#: 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] "" - -#: 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 @@ -7618,15 +7775,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 "" @@ -7733,10 +7890,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" @@ -7816,7 +7973,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 "" @@ -7927,93 +8084,105 @@ msgid "" "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 " @@ -8021,11 +8190,11 @@ msgid "" "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." @@ -8045,10 +8214,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 "" @@ -8067,10 +8236,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 "" @@ -8107,19 +8276,19 @@ msgid_plural "showing %d out of %d commi msgstr[0] "" #: 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 "" @@ -8136,7 +8305,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" @@ -8144,44 +8313,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 "" @@ -8189,127 +8380,105 @@ 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" msgid_plural "%d Commit comments" msgstr[0] "" -#: 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" msgid_plural "%d Inline Comments" msgstr[0] "" -#: 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 "" @@ -8335,73 +8504,81 @@ 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用户" -#: 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 @@ -8439,7 +8616,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" @@ -8447,7 +8624,7 @@ msgstr[0] "" #: 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" @@ -8615,24 +8792,24 @@ 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] "" -#: 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] "" -#: rhodecode/templates/compare/compare_commits.mako:74 +#: rhodecode/templates/compare/compare_commits.mako:75 msgid "No commits in this compare" msgstr "" @@ -8669,6 +8846,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 "" @@ -8881,6 +9059,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" @@ -9002,6 +9184,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 "" @@ -9074,8 +9257,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" @@ -9098,7 +9279,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 "重定向到%s，于%s秒后" @@ -9168,6 +9349,7 @@ msgid "Remove Custom Path" msgstr "" #: rhodecode/templates/files/files_add.mako:50 +#: rhodecode/templates/files/files_add.mako:59 msgid "Filename" msgstr "" @@ -9175,34 +9357,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 "提交修改" @@ -9223,6 +9405,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 "" @@ -9335,7 +9522,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] "" @@ -9398,6 +9584,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 "拷贝权限" @@ -9435,6 +9625,12 @@ msgstr "无复刻" msgid "Filter" msgstr "" +#: rhodecode/templates/journal/journal.mako:14 +#, python-format +msgid "%s entry" +msgid_plural "%s entries" +msgstr[0] "%s条" + #: rhodecode/templates/journal/journal.mako:23 msgid "ATOM journal feed" msgstr "订阅日志ATOM" @@ -9465,64 +9661,74 @@ msgstr "订阅公共日志RSS" 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] "" -#: 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 "" @@ -9570,10 +9776,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 "" @@ -9670,77 +9872,77 @@ 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 "" @@ -9830,6 +10032,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 "" @@ -9861,30 +10068,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] "" - -#: rhodecode/templates/summary/components.mako:12 -#, python-format -msgid "%(num)s Closed Branch" -msgid_plural "%(num)s Closed Branches" -msgstr[0] "" - -#: rhodecode/templates/summary/components.mako:19 -#, python-format -msgid "%(num)s Tag" -msgid_plural "%(num)s Tags" -msgstr[0] "" - -#: rhodecode/templates/summary/components.mako:26 -#, python-format -msgid "%(num)s Bookmark" -msgid_plural "%(num)s Bookmarks" -msgstr[0] "" - #: rhodecode/templates/summary/components.mako:49 msgid "Read-only url" msgstr "" @@ -9965,10 +10148,22 @@ 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" -msgstr "%s标签" +msgstr "%s 标签" #: rhodecode/templates/tags/tags.mako:13 msgid "tags"