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-02-05 17:11+0100\n" -"PO-Revision-Date: 2017-02-01 20:10+0000\n" +"POT-Creation-Date: 2017-04-07 12:33+0200\n" +"PO-Revision-Date: 2017-04-07 10:34+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Belarusian (http://www.transifex.com/rhodecode/RhodeCode/language/be/)\n" "MIME-Version: 1.0\n" @@ -18,51 +18,52 @@ msgstr "" "Language: be\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: rhodecode/admin/navigation.py:83 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:167 +#: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 +#: rhodecode/integrations/views.py:166 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "" -#: rhodecode/admin/navigation.py:84 +#: rhodecode/apps/admin/navigation.py:84 #: rhodecode/templates/admin/repos/repo_edit.mako:52 msgid "VCS" msgstr "" -#: rhodecode/admin/navigation.py:85 +#: rhodecode/apps/admin/navigation.py:85 msgid "Visual" msgstr "" -#: rhodecode/admin/navigation.py:86 +#: rhodecode/apps/admin/navigation.py:86 msgid "Remap and Rescan" msgstr "" -#: rhodecode/admin/navigation.py:87 +#: rhodecode/apps/admin/navigation.py:87 #: rhodecode/templates/admin/repos/repo_edit.mako:58 msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:89 rhodecode/integrations/types/email.py:232 -#: rhodecode/templates/register.mako:75 +#: rhodecode/apps/admin/navigation.py:89 +#: rhodecode/integrations/types/email.py:232 +#: rhodecode/templates/register.mako:76 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: 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:92 +#: rhodecode/templates/admin/users/users.mako:64 #: rhodecode/templates/email_templates/user_registration.mako:25 #: rhodecode/templates/users/user_profile.mako:51 msgid "Email" msgstr "" -#: rhodecode/admin/navigation.py:90 +#: rhodecode/apps/admin/navigation.py:90 msgid "Hooks" msgstr "" -#: rhodecode/admin/navigation.py:91 +#: rhodecode/apps/admin/navigation.py:91 msgid "Full Text Search" msgstr "" -#: rhodecode/admin/navigation.py:93 +#: rhodecode/apps/admin/navigation.py:93 #: rhodecode/templates/admin/integrations/base.mako:23 #: rhodecode/templates/admin/integrations/form.mako:8 #: rhodecode/templates/admin/integrations/form.mako:21 @@ -76,177 +77,290 @@ msgstr "" #: 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/base/base.mako:79 +#: rhodecode/templates/base/base.mako:82 msgid "Integrations" msgstr "" -#: rhodecode/admin/navigation.py:95 +#: rhodecode/apps/admin/navigation.py:95 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" msgstr "" -#: rhodecode/admin/navigation.py:97 +#: rhodecode/apps/admin/navigation.py:97 msgid "User Sessions" msgstr "" -#: rhodecode/admin/navigation.py:99 +#: rhodecode/apps/admin/navigation.py:99 msgid "Open Source Licenses" msgstr "" -#: rhodecode/admin/navigation.py:107 +#: rhodecode/apps/admin/navigation.py:107 msgid "Labs" msgstr "" -#: rhodecode/admin/views/sessions.py:90 +#: rhodecode/apps/admin/views/sessions.py:86 msgid "Cleaned up old sessions" msgstr "" -#: rhodecode/admin/views/sessions.py:96 +#: rhodecode/apps/admin/views/sessions.py:92 msgid "Failed to cleanup up old sessions" msgstr "" -#: rhodecode/admin/views/svn_config.py:47 +#: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." msgstr "" -#: rhodecode/admin/views/svn_config.py:55 +#: rhodecode/apps/admin/views/svn_config.py:54 msgid "Failed to generate the Apache configuration for Subversion." msgstr "" -#: rhodecode/admin/views/system_info.py:96 +#: rhodecode/apps/admin/views/system_info.py:95 msgid "" "Note: please make sure this server can access `${url}` for the update link " "to work" msgstr "" -#: rhodecode/admin/views/system_info.py:99 +#: rhodecode/apps/admin/views/system_info.py:98 msgid "Update info" msgstr "" -#: rhodecode/admin/views/system_info.py:101 +#: rhodecode/apps/admin/views/system_info.py:100 msgid "Check for updates" msgstr "" -#: rhodecode/admin/views/system_info.py:106 +#: rhodecode/apps/admin/views/system_info.py:105 msgid "RhodeCode Version" msgstr "" -#: rhodecode/admin/views/system_info.py:107 +#: rhodecode/apps/admin/views/system_info.py:106 msgid "RhodeCode Server IP" msgstr "" -#: rhodecode/admin/views/system_info.py:108 +#: rhodecode/apps/admin/views/system_info.py:107 msgid "RhodeCode Server ID" msgstr "" -#: rhodecode/admin/views/system_info.py:109 +#: rhodecode/apps/admin/views/system_info.py:108 msgid "RhodeCode Configuration" msgstr "" -#: rhodecode/admin/views/system_info.py:113 +#: rhodecode/apps/admin/views/system_info.py:109 +msgid "Workers" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:110 +msgid "Worker Type" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:114 msgid "Database" msgstr "" -#: rhodecode/admin/views/system_info.py:114 +#: rhodecode/apps/admin/views/system_info.py:115 msgid "Database version" msgstr "" -#: rhodecode/admin/views/system_info.py:118 +#: rhodecode/apps/admin/views/system_info.py:119 msgid "Platform" msgstr "" -#: rhodecode/admin/views/system_info.py:119 +#: rhodecode/apps/admin/views/system_info.py:120 msgid "Platform UUID" msgstr "" -#: rhodecode/admin/views/system_info.py:120 +#: rhodecode/apps/admin/views/system_info.py:121 msgid "Python version" msgstr "" -#: rhodecode/admin/views/system_info.py:121 +#: rhodecode/apps/admin/views/system_info.py:122 msgid "Python path" msgstr "" -#: rhodecode/admin/views/system_info.py:125 +#: rhodecode/apps/admin/views/system_info.py:126 msgid "CPU" msgstr "" -#: rhodecode/admin/views/system_info.py:126 +#: rhodecode/apps/admin/views/system_info.py:127 msgid "Load" msgstr "" -#: rhodecode/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:128 msgid "Memory" msgstr "" -#: rhodecode/admin/views/system_info.py:128 +#: rhodecode/apps/admin/views/system_info.py:129 msgid "Uptime" msgstr "" -#: rhodecode/admin/views/system_info.py:132 +#: rhodecode/apps/admin/views/system_info.py:133 msgid "Storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:135 msgid "Storage inodes" msgstr "" -#: rhodecode/admin/views/system_info.py:136 +#: rhodecode/apps/admin/views/system_info.py:137 msgid "Gist storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:137 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Gist storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:139 +#: rhodecode/apps/admin/views/system_info.py:140 msgid "Archive cache storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:140 +#: rhodecode/apps/admin/views/system_info.py:141 msgid "Archive cache info" msgstr "" -#: rhodecode/admin/views/system_info.py:142 +#: rhodecode/apps/admin/views/system_info.py:143 msgid "Temp storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:143 +#: rhodecode/apps/admin/views/system_info.py:144 msgid "Temp storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:145 +#: rhodecode/apps/admin/views/system_info.py:146 msgid "Search info" msgstr "" -#: rhodecode/admin/views/system_info.py:146 +#: rhodecode/apps/admin/views/system_info.py:147 msgid "Search location" msgstr "" -#: rhodecode/admin/views/system_info.py:150 +#: rhodecode/apps/admin/views/system_info.py:151 msgid "VCS Backends" msgstr "" -#: rhodecode/admin/views/system_info.py:151 +#: rhodecode/apps/admin/views/system_info.py:152 msgid "VCS Server" msgstr "" -#: rhodecode/admin/views/system_info.py:152 +#: rhodecode/apps/admin/views/system_info.py:153 msgid "GIT" msgstr "" -#: rhodecode/admin/views/system_info.py:153 +#: rhodecode/apps/admin/views/system_info.py:154 msgid "HG" msgstr "" -#: rhodecode/admin/views/system_info.py:154 +#: rhodecode/apps/admin/views/system_info.py:155 msgid "SVN" msgstr "" +#: rhodecode/apps/admin/views/users.py:60 +#: rhodecode/controllers/admin/users.py:359 +#: rhodecode/controllers/admin/users.py:380 +#: 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/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/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 +msgid "Auth token successfully created" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:240 +#: rhodecode/apps/my_account/views.py:192 +msgid "Auth token successfully deleted" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:284 +msgid "Groups successfully changed" +msgstr "" + +#: rhodecode/apps/login/views.py:247 rhodecode/apps/login/views.py:316 +msgid "Bad captcha" +msgstr "" + +#: rhodecode/apps/login/views.py:256 +msgid "You have successfully registered with RhodeCode" +msgstr "" + +#: rhodecode/apps/login/views.py:292 +msgid "If such email exists, a password reset link was sent to it." +msgstr "" + +#: rhodecode/apps/login/views.py:298 +msgid "Password reset has been disabled." +msgstr "" + +#: rhodecode/apps/login/views.py:381 +msgid "Given reset token is invalid" +msgstr "" + +#: rhodecode/apps/login/views.py:389 +msgid "" +"Your password reset was successful, a new password has been sent to your " +"email" +msgstr "" + +#: rhodecode/apps/my_account/views.py:115 +msgid "Error occurred during update of user password" +msgstr "" + +#: rhodecode/apps/my_account/views.py:122 +msgid "Successfully updated password" +msgstr "" + +#: rhodecode/apps/svn_support/events.py:30 +msgid "Configuration for Apaache mad_dav_svn changed." +msgstr "" + #: rhodecode/authentication/schema.py:35 msgid "Enable or disable this authentication plugin." msgstr "" @@ -262,12 +376,11 @@ msgstr "" #: rhodecode/authentication/schema.py:43 msgid "" -"Amount of seconds to cache the authentication call for this plugin. Useful " -"for long calls like LDAP to improve the responsiveness of the authentication" -" system (0 means disabled)." -msgstr "" - -#: rhodecode/authentication/schema.py:48 +"Amount of seconds to cache the authentication responsecall for this plugin. \n" +"Useful for long calls like LDAP to improve the performance of the authentication system (0 means disabled)." +msgstr "" + +#: rhodecode/authentication/schema.py:49 msgid "Auth Cache TTL" msgstr "" @@ -288,99 +401,101 @@ msgstr "" msgid "Error occurred during update of auth settings." msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:61 +#: rhodecode/authentication/plugins/auth_crowd.py:60 msgid "The FQDN or IP of the Atlassian CROWD Server" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:63 +#: rhodecode/authentication/plugins/auth_crowd.py:62 msgid "Host" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:68 +#: rhodecode/authentication/plugins/auth_crowd.py:67 msgid "The Port in use by the Atlassian CROWD Server" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:70 +#: rhodecode/authentication/plugins/auth_crowd.py:69 #: rhodecode/authentication/plugins/auth_ldap.py:84 msgid "Port" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:76 +#: rhodecode/authentication/plugins/auth_crowd.py:75 msgid "The Application Name to authenticate to CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:78 +#: rhodecode/authentication/plugins/auth_crowd.py:77 msgid "Application Name" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:83 +#: rhodecode/authentication/plugins/auth_crowd.py:82 msgid "The password to authenticate to CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:85 +#: rhodecode/authentication/plugins/auth_crowd.py:84 msgid "Application Password" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:90 +#: rhodecode/authentication/plugins/auth_crowd.py:89 msgid "" "A comma separated list of group names that identify users as RhodeCode " "Administrators" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:94 +#: rhodecode/authentication/plugins/auth_crowd.py:93 msgid "Admin Groups" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:216 +#: rhodecode/authentication/plugins/auth_crowd.py:215 msgid "CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:55 +#: rhodecode/authentication/plugins/auth_headers.py:54 msgid "Header to extract the user from" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:57 +#: rhodecode/authentication/plugins/auth_headers.py:56 msgid "Header" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:62 +#: rhodecode/authentication/plugins/auth_headers.py:61 msgid "Header to extract the user from when main one fails" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:64 +#: rhodecode/authentication/plugins/auth_headers.py:63 msgid "Fallback header" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:69 +#: rhodecode/authentication/plugins/auth_headers.py:68 msgid "" "Perform cleaning of user, if passed user has @ in username then first part " "before @ is taken. If there's \\ in the username only the part after \\ is " "taken" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:74 +#: rhodecode/authentication/plugins/auth_headers.py:73 msgid "Clean username" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:99 +#: rhodecode/authentication/plugins/auth_headers.py:98 msgid "Headers" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:63 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:62 msgid "The url of the Jasig CAS REST service" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:65 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:64 #: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:93 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:92 msgid "Jasig-CAS" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:75 -msgid "Host of the LDAP Server" +#: 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 @@ -388,107 +503,117 @@ msgid "LDAP Host" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:82 -msgid "Port that the LDAP server is listening on" +msgid "Custom port that the LDAP server is listening on. Default: 389" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:90 -msgid "User to connect to LDAP" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:93 +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 msgid "Account" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:98 -msgid "Password to connect to LDAP" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:101 -#: rhodecode/templates/login.mako:49 rhodecode/templates/register.mako:47 +#: rhodecode/authentication/plugins/auth_ldap.py:100 +msgid "Password to authenticate for given user DN." +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:103 +#: 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:310 +#: rhodecode/templates/base/base.mako:313 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:106 +#: rhodecode/authentication/plugins/auth_ldap.py:108 msgid "TLS Type" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:107 +#: rhodecode/authentication/plugins/auth_ldap.py:109 msgid "Connection Security" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:113 +#: rhodecode/authentication/plugins/auth_ldap.py:115 msgid "Require Cert over TLS?" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:114 +#: rhodecode/authentication/plugins/auth_ldap.py:116 msgid "Certificate Checks" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:120 -msgid "Base DN to search (e.g., dc=mydomain,dc=com)" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:123 +#: rhodecode/authentication/plugins/auth_ldap.py:122 +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 msgid "Base DN" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:128 -msgid "Filter to narrow results (e.g., ou=Users, etc)" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:131 -msgid "LDAP Search Filter" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:136 -msgid "How deep to search LDAP" +#: rhodecode/authentication/plugins/auth_ldap.py:132 +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 -msgid "LDAP Search Scope" +msgid "LDAP Search Filter" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:143 -msgid "LDAP Attribute to map to user name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:145 +msgid "How deep to search LDAP. If unsure set to SUBTREE" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:144 +msgid "LDAP Search Scope" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:150 +msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:152 msgid "Login Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:146 +#: rhodecode/authentication/plugins/auth_ldap.py:153 msgid "The LDAP Login attribute of the CN must be specified" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:151 -msgid "LDAP Attribute to map to first name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:154 +#: rhodecode/authentication/plugins/auth_ldap.py:158 +msgid "LDAP Attribute to map to first name (e.g., givenName)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:161 msgid "First Name Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:159 -msgid "LDAP Attribute to map to last name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:162 +#: rhodecode/authentication/plugins/auth_ldap.py:166 +msgid "LDAP Attribute to map to last name (e.g., sn)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:169 msgid "Last Name Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:167 -msgid "LDAP Attribute to map to email address" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:170 +#: rhodecode/authentication/plugins/auth_ldap.py:174 +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 msgid "Email Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:351 +#: rhodecode/authentication/plugins/auth_ldap.py:360 msgid "LDAP" msgstr "" @@ -513,16 +638,16 @@ msgstr "" msgid "PAM" msgstr "" -#: rhodecode/authentication/plugins/auth_rhodecode.py:68 +#: rhodecode/authentication/plugins/auth_rhodecode.py:67 msgid "Rhodecode" msgstr "" -#: rhodecode/authentication/plugins/auth_token.py:71 +#: rhodecode/authentication/plugins/auth_token.py:70 msgid "Rhodecode Token Auth" msgstr "" #: rhodecode/controllers/changelog.py:91 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:202 +#: rhodecode/controllers/pullrequests.py:204 msgid "There are no commits yet" msgstr "" @@ -556,8 +681,8 @@ msgid "No such commit exists for this re msgstr "" #: rhodecode/controllers/changeset.py:344 -#: rhodecode/controllers/pullrequests.py:948 -#: rhodecode/model/pull_request.py:1009 +#: rhodecode/controllers/pullrequests.py:985 +#: rhodecode/model/pull_request.py:1055 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" @@ -597,12 +722,12 @@ msgid "" "%(repo1)s with commit %(commit2)s from repository %(repo2)s." msgstr "" -#: rhodecode/controllers/feed.py:70 +#: rhodecode/controllers/feed.py:69 #, python-format msgid "Changes on %s repository" msgstr "" -#: rhodecode/controllers/feed.py:71 +#: rhodecode/controllers/feed.py:70 #, python-format msgid "%s %s feed" msgstr "" @@ -616,93 +741,93 @@ msgstr "" msgid "There are no files yet. %s" msgstr "" -#: rhodecode/controllers/files.py:394 rhodecode/controllers/files.py:447 -#: rhodecode/controllers/files.py:478 rhodecode/controllers/files.py:553 -#: rhodecode/controllers/files.py:598 rhodecode/controllers/files.py:689 +#: 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 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:402 rhodecode/controllers/files.py:455 +#: rhodecode/controllers/files.py:443 rhodecode/controllers/files.py:496 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:411 rhodecode/controllers/files.py:464 +#: rhodecode/controllers/files.py:452 rhodecode/controllers/files.py:505 #, python-format msgid "Deleted file %s via RhodeCode Enterprise" msgstr "" -#: rhodecode/controllers/files.py:431 +#: rhodecode/controllers/files.py:472 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:540 -#: rhodecode/controllers/files.py:677 +#: rhodecode/controllers/files.py:475 rhodecode/controllers/files.py:581 +#: rhodecode/controllers/files.py:718 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:486 rhodecode/controllers/files.py:561 +#: rhodecode/controllers/files.py:527 rhodecode/controllers/files.py:602 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:498 rhodecode/controllers/files.py:573 +#: rhodecode/controllers/files.py:539 rhodecode/controllers/files.py:614 #, python-format msgid "Edited file %s via RhodeCode Enterprise" msgstr "" -#: rhodecode/controllers/files.py:515 +#: rhodecode/controllers/files.py:556 msgid "No changes" msgstr "" -#: rhodecode/controllers/files.py:537 rhodecode/controllers/files.py:666 +#: rhodecode/controllers/files.py:578 rhodecode/controllers/files.py:707 #, python-format msgid "Successfully committed to %s" msgstr "" -#: rhodecode/controllers/files.py:611 rhodecode/controllers/files.py:700 +#: rhodecode/controllers/files.py:652 rhodecode/controllers/files.py:741 msgid "Added file via RhodeCode Enterprise" msgstr "" -#: rhodecode/controllers/files.py:636 +#: rhodecode/controllers/files.py:677 msgid "No filename" msgstr "" -#: rhodecode/controllers/files.py:669 +#: 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:723 +#: rhodecode/controllers/files.py:764 msgid "Downloads disabled" msgstr "" -#: rhodecode/controllers/files.py:729 +#: rhodecode/controllers/files.py:770 #, python-format msgid "Unknown revision %s" msgstr "" -#: rhodecode/controllers/files.py:731 +#: rhodecode/controllers/files.py:772 msgid "Empty repository" msgstr "" -#: rhodecode/controllers/files.py:733 rhodecode/controllers/files.py:767 +#: rhodecode/controllers/files.py:774 rhodecode/controllers/files.py:808 msgid "Unknown archive type" msgstr "" -#: rhodecode/controllers/files.py:952 +#: rhodecode/controllers/files.py:993 msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:973 rhodecode/controllers/summary.py:269 -#: rhodecode/model/pull_request.py:1234 rhodecode/model/scm.py:782 -#: rhodecode/templates/base/vcs_settings.mako:193 +#: 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:977 rhodecode/model/scm.py:797 -#: rhodecode/templates/base/vcs_settings.mako:218 +#: rhodecode/controllers/files.py:1018 rhodecode/model/scm.py:797 +#: rhodecode/templates/base/vcs_settings.mako:267 msgid "Tags" msgstr "" @@ -711,23 +836,24 @@ msgstr "" msgid "An error occurred during repository forking %s" msgstr "" -#: rhodecode/controllers/home.py:205 +#: rhodecode/controllers/home.py:207 msgid "Groups" msgstr "" -#: rhodecode/controllers/home.py:212 rhodecode/controllers/home.py:247 -#: rhodecode/controllers/pullrequests.py:308 +#: 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:73 -#: rhodecode/templates/base/base.mako:145 -#: rhodecode/templates/base/base.mako:569 +#: 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:225 +#: rhodecode/controllers/home.py:227 #, python-format msgid "Commits in %(repo)s" msgstr "" @@ -740,81 +866,81 @@ msgstr "" msgid "journal" msgstr "" -#: rhodecode/controllers/pullrequests.py:216 +#: rhodecode/controllers/pullrequests.py:218 msgid "Commit does not exist" msgstr "" -#: rhodecode/controllers/pullrequests.py:333 -msgid "Pull request requires a title with min. 3 chars" -msgstr "" - #: rhodecode/controllers/pullrequests.py:335 +msgid "Pull request requires a title with min. 3 chars" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:337 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/controllers/pullrequests.py:383 +#: rhodecode/controllers/pullrequests.py:385 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:386 +#: rhodecode/controllers/pullrequests.py:388 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:429 +#: rhodecode/controllers/pullrequests.py:431 msgid "Cannot update closed pull requests." msgstr "" -#: rhodecode/controllers/pullrequests.py:435 +#: rhodecode/controllers/pullrequests.py:437 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/controllers/pullrequests.py:443 +#: rhodecode/controllers/pullrequests.py:455 msgid "" "Pull request updated to \"{source_commit_id}\" with {count_added} added, " -"{count_removed} removed commits." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:458 +"{count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:472 msgid "Reload page" msgstr "" -#: rhodecode/controllers/pullrequests.py:532 +#: rhodecode/controllers/pullrequests.py:546 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/controllers/pullrequests.py:569 +#: rhodecode/controllers/pullrequests.py:588 msgid "Successfully deleted pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:864 -msgid "Close Pull Request" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:952 -#: rhodecode/model/pull_request.py:1013 +#: rhodecode/controllers/pullrequests.py:592 +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:1002 +#: 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:243 +#: rhodecode/controllers/summary.py:251 msgid "Branch" msgstr "" -#: rhodecode/controllers/summary.py:244 +#: rhodecode/controllers/summary.py:252 msgid "Tag" msgstr "" -#: rhodecode/controllers/summary.py:245 +#: rhodecode/controllers/summary.py:253 msgid "Bookmark" msgstr "" -#: rhodecode/controllers/summary.py:270 +#: rhodecode/controllers/summary.py:278 msgid "Closed branches" msgstr "" @@ -826,42 +952,6 @@ msgstr "" msgid "Error occurred during update of default values" msgstr "" -#: rhodecode/controllers/admin/gists.py:62 -#: rhodecode/controllers/admin/my_account.py:384 -#: rhodecode/controllers/admin/users.py:465 -msgid "forever" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:63 -#: rhodecode/controllers/admin/my_account.py:385 -#: rhodecode/controllers/admin/users.py:466 -msgid "5 minutes" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:64 -#: rhodecode/controllers/admin/my_account.py:386 -#: rhodecode/controllers/admin/users.py:467 -msgid "1 hour" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:65 -#: rhodecode/controllers/admin/my_account.py:387 -#: rhodecode/controllers/admin/users.py:468 -msgid "1 day" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:66 -#: rhodecode/controllers/admin/my_account.py:388 -#: rhodecode/controllers/admin/users.py:469 -msgid "1 month" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:70 -#: rhodecode/controllers/admin/my_account.py:390 -#: rhodecode/controllers/admin/users.py:471 -msgid "Lifetime" -msgstr "" - #: rhodecode/controllers/admin/gists.py:72 msgid "Requires registered account" msgstr "" @@ -898,10 +988,8 @@ msgstr "" #: rhodecode/controllers/admin/gists.py:343 #: rhodecode/templates/admin/gists/show.mako:67 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 #: rhodecode/templates/data_table/_dt_elements.mako:263 msgid "never" msgstr "" @@ -911,65 +999,36 @@ msgstr "" msgid "%(expiry)s - current value" msgstr "" -#: rhodecode/controllers/admin/my_account.py:80 +#: rhodecode/controllers/admin/my_account.py:78 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/my_account.py:140 +#: rhodecode/controllers/admin/my_account.py:138 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/controllers/admin/my_account.py:155 -#: rhodecode/controllers/admin/users.py:231 +#: rhodecode/controllers/admin/my_account.py:153 +#: rhodecode/controllers/admin/users.py:184 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/my_account.py:221 -#: rhodecode/controllers/admin/my_account.py:227 -msgid "Error occurred during update of user password" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:234 -msgid "Successfully updated password" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:278 -#: rhodecode/controllers/admin/users.py:645 +#: 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:285 -#: rhodecode/controllers/admin/users.py:652 +#: 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:295 -#: rhodecode/controllers/admin/users.py:667 +#: rhodecode/controllers/admin/my_account.py:239 +#: rhodecode/controllers/admin/users.py:549 msgid "Removed email address from user account" msgstr "" -#: rhodecode/controllers/admin/my_account.py:393 -#: rhodecode/controllers/admin/users.py:474 -msgid "Role" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:406 -#: rhodecode/controllers/admin/users.py:498 -msgid "Auth token successfully created" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:419 -#: rhodecode/controllers/admin/users.py:517 -msgid "Auth token successfully reset" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:423 -#: rhodecode/controllers/admin/users.py:521 -msgid "Auth token successfully deleted" -msgstr "" - #: rhodecode/controllers/admin/permissions.py:112 msgid "Application permissions updated successfully" msgstr "" @@ -1037,7 +1096,7 @@ msgid "Error occurred during deletion of msgstr "" #: rhodecode/controllers/admin/repo_groups.py:388 -#: rhodecode/controllers/admin/user_groups.py:322 +#: rhodecode/controllers/admin/user_groups.py:323 msgid "Cannot change permission for yourself as admin" msgstr "" @@ -1189,18 +1248,18 @@ msgid "Error occurred during deleting is msgstr "" #: rhodecode/controllers/admin/repos.py:728 -#: rhodecode/controllers/admin/settings.py:380 +#: rhodecode/controllers/admin/settings.py:381 msgid "Removed issue tracker entry" msgstr "" #: rhodecode/controllers/admin/repos.py:758 -#: rhodecode/controllers/admin/settings.py:427 +#: rhodecode/controllers/admin/settings.py:428 msgid "Updated issue tracker entries" msgstr "" #: rhodecode/controllers/admin/repos.py:819 #: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:618 +#: rhodecode/controllers/admin/settings.py:619 msgid "Some form inputs contain invalid data." msgstr "" @@ -1209,281 +1268,277 @@ msgid "Error occurred during updating re msgstr "" #: rhodecode/controllers/admin/repos.py:841 -#: rhodecode/controllers/admin/settings.py:175 +#: rhodecode/controllers/admin/settings.py:176 msgid "Updated VCS settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:171 -#: rhodecode/controllers/admin/settings.py:282 +#: rhodecode/controllers/admin/settings.py:172 +#: rhodecode/controllers/admin/settings.py:283 msgid "Error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:222 +#: rhodecode/controllers/admin/settings.py:223 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:278 +#: rhodecode/controllers/admin/settings.py:279 msgid "Updated application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:344 +#: rhodecode/controllers/admin/settings.py:345 msgid "Updated visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:347 +#: rhodecode/controllers/admin/settings.py:348 msgid "Error occurred during updating visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:440 +#: rhodecode/controllers/admin/settings.py:441 msgid "Please enter email address" msgstr "" -#: rhodecode/controllers/admin/settings.py:458 +#: rhodecode/controllers/admin/settings.py:459 msgid "Send email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:491 +#: rhodecode/controllers/admin/settings.py:492 msgid "Added new hook" msgstr "" -#: rhodecode/controllers/admin/settings.py:506 +#: rhodecode/controllers/admin/settings.py:507 msgid "Updated hooks" msgstr "" -#: rhodecode/controllers/admin/settings.py:510 +#: rhodecode/controllers/admin/settings.py:511 msgid "Error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:639 +#: rhodecode/controllers/admin/settings.py:640 msgid "Error occurred during updating labs settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:644 +#: rhodecode/controllers/admin/settings.py:645 msgid "Updated Labs settings" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:164 +#: rhodecode/controllers/admin/user_groups.py:165 #, python-format msgid "Created user group %(user_group_link)s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:178 +#: rhodecode/controllers/admin/user_groups.py:179 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:219 +#: rhodecode/controllers/admin/user_groups.py:220 #, python-format msgid "Updated user group %s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:235 +#: rhodecode/controllers/admin/user_groups.py:236 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:257 +#: rhodecode/controllers/admin/user_groups.py:258 msgid "Successfully deleted user group" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:262 +#: rhodecode/controllers/admin/user_groups.py:263 msgid "An error occurred during deletion of user group" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:330 +#: rhodecode/controllers/admin/user_groups.py:331 msgid "Target group cannot be the same" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:336 +#: rhodecode/controllers/admin/user_groups.py:337 msgid "User Group permissions updated" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:421 +#: rhodecode/controllers/admin/user_groups.py:422 msgid "User Group global permissions updated successfully" msgstr "" #: rhodecode/controllers/admin/user_groups.py:437 -#: rhodecode/controllers/admin/users.py:595 +#: rhodecode/controllers/admin/users.py:477 msgid "An error occurred during permissions saving" msgstr "" -#: rhodecode/controllers/admin/users.py:153 +#: rhodecode/controllers/admin/user_groups.py:481 +msgid "User Group synchronization updated successfully" +msgstr "" + +#: rhodecode/controllers/admin/user_groups.py:485 +msgid "An error occurred during synchronization update" +msgstr "" + +#: rhodecode/controllers/admin/users.py:106 #, python-format msgid "Created user %(user_link)s" msgstr "" -#: rhodecode/controllers/admin/users.py:169 +#: rhodecode/controllers/admin/users.py:122 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:214 +#: rhodecode/controllers/admin/users.py:167 msgid "User updated successfully" msgstr "" -#: rhodecode/controllers/admin/users.py:265 +#: rhodecode/controllers/admin/users.py:218 #, python-format msgid "Detached %s repositories" msgstr "" -#: rhodecode/controllers/admin/users.py:270 +#: rhodecode/controllers/admin/users.py:223 #, python-format msgid "Deleted %s repositories" msgstr "" -#: rhodecode/controllers/admin/users.py:278 +#: rhodecode/controllers/admin/users.py:231 #, python-format msgid "Detached %s repository groups" msgstr "" -#: rhodecode/controllers/admin/users.py:283 +#: rhodecode/controllers/admin/users.py:236 #, python-format msgid "Deleted %s repository groups" msgstr "" +#: rhodecode/controllers/admin/users.py:244 +#, python-format +msgid "Detached %s user groups" +msgstr "" + +#: rhodecode/controllers/admin/users.py:249 +#, python-format +msgid "Deleted %s user groups" +msgstr "" + +#: rhodecode/controllers/admin/users.py:260 +msgid "Successfully deleted user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:266 +msgid "An error occurred during deletion of 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 -#, python-format -msgid "Detached %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:296 -#, python-format -msgid "Deleted %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:307 -msgid "Successfully deleted user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:313 -msgid "An error occurred during deletion of user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:332 -msgid "Force password change disabled for user" +msgid "An error occurred during password reset for user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:324 +#, python-format +msgid "Linked repository group `%s` as personal" +msgstr "" + +#: rhodecode/controllers/admin/users.py:330 +#, python-format +msgid "Created repository group `%s`" msgstr "" #: rhodecode/controllers/admin/users.py:334 -msgid "Force password change enabled for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:338 -msgid "An error occurred during password reset for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:371 -#, python-format -msgid "Linked repository group `%s` as personal" -msgstr "" - -#: rhodecode/controllers/admin/users.py:377 -#, python-format -msgid "Created repository group `%s`" -msgstr "" - -#: rhodecode/controllers/admin/users.py:381 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/controllers/admin/users.py:386 +#: rhodecode/controllers/admin/users.py:339 msgid "An error occurred during repository group creation for user" msgstr "" -#: rhodecode/controllers/admin/users.py:406 -#: rhodecode/controllers/admin/users.py:427 -#: rhodecode/controllers/admin/users.py:459 -#: rhodecode/controllers/admin/users.py:490 -#: rhodecode/controllers/admin/users.py:507 -#: rhodecode/controllers/admin/users.py:530 -#: rhodecode/controllers/admin/users.py:604 -#: rhodecode/controllers/admin/users.py:617 -#: rhodecode/controllers/admin/users.py:675 -msgid "You can't edit this user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:443 +#: rhodecode/controllers/admin/users.py:396 msgid "" "The user participates as reviewer in pull requests and cannot be deleted. " "You can set the user to \"inactive\" instead of deleting it." msgstr "" -#: rhodecode/controllers/admin/users.py:579 +#: rhodecode/controllers/admin/users.py:461 msgid "User global permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/users.py:707 +#: rhodecode/controllers/admin/users.py:589 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/controllers/admin/users.py:722 +#: rhodecode/controllers/admin/users.py:604 msgid "An error occurred during ip saving" msgstr "" -#: rhodecode/controllers/admin/users.py:726 +#: rhodecode/controllers/admin/users.py:608 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/controllers/admin/users.py:744 +#: rhodecode/controllers/admin/users.py:626 msgid "Removed ip address from user whitelist" msgstr "" -#: rhodecode/events/pullrequest.py:65 +#: rhodecode/events/pullrequest.py:68 msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:74 +#: rhodecode/events/pullrequest.py:77 msgid "pullrequest closed" msgstr "" -#: rhodecode/events/pullrequest.py:83 +#: rhodecode/events/pullrequest.py:86 msgid "pullrequest commits updated" msgstr "" -#: rhodecode/events/pullrequest.py:92 +#: rhodecode/events/pullrequest.py:95 msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:101 +#: rhodecode/events/pullrequest.py:104 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:110 +#: rhodecode/events/pullrequest.py:113 msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:136 +#: rhodecode/events/repo.py:138 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:145 +#: rhodecode/events/repo.py:147 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:154 +#: rhodecode/events/repo.py:156 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:163 +#: rhodecode/events/repo.py:165 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:199 +#: rhodecode/events/repo.py:201 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:208 +#: rhodecode/events/repo.py:210 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:217 +#: rhodecode/events/repo.py:219 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:228 +#: rhodecode/events/repo.py:230 msgid "repository push" msgstr "" @@ -1499,25 +1554,24 @@ msgstr "" msgid "repository group update" msgstr "" -#: rhodecode/events/user.py:34 +#: rhodecode/events/user.py:37 msgid "user registered" msgstr "" -#: rhodecode/events/user.py:48 +#: rhodecode/events/user.py:52 msgid "user pre create" msgstr "" -#: rhodecode/events/user.py:61 +#: rhodecode/events/user.py:66 msgid "user post create" msgstr "" -#: rhodecode/events/user.py:74 +#: rhodecode/events/user.py:80 msgid "user pre update" msgstr "" #: rhodecode/forms/__init__.py:32 rhodecode/templates/admin/gists/new.mako:62 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:31 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:88 +#: 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 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 @@ -1529,15 +1583,14 @@ msgstr "" #: 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_vcs.mako:46 +#: 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 #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 #: rhodecode/templates/admin/settings/settings_visual.mako:222 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:27 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:85 +#: 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_profile.mako:135 @@ -1547,17 +1600,17 @@ msgstr "" #: rhodecode/forms/__init__.py:33 rhodecode/templates/admin/gists/show.mako:49 #: rhodecode/templates/admin/integrations/list.mako:211 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:60 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 #: rhodecode/templates/admin/permissions/permissions_ips.mako:26 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:56 +#: 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/base/issue_tracker_settings.mako:70 -#: rhodecode/templates/base/vcs_settings.mako:202 -#: rhodecode/templates/base/vcs_settings.mako:227 +#: 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/changeset/changeset_file_comment.mako:142 @@ -1566,9 +1619,9 @@ msgstr "" #: rhodecode/templates/data_table/_dt_elements.mako:198 #: rhodecode/templates/data_table/_dt_elements.mako:210 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:35 -#: rhodecode/templates/files/files_source.mako:39 -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_source.mako:45 +#: rhodecode/templates/files/files_source.mako:49 +#: rhodecode/templates/files/files_source.mako:52 #: rhodecode/templates/pullrequests/pullrequest_show.mako:56 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" @@ -1607,28 +1660,28 @@ msgstr "" msgid "Root repositories only" msgstr "" -#: rhodecode/integrations/views.py:161 +#: rhodecode/integrations/views.py:160 msgid "{repo_name} repository" msgstr "" -#: rhodecode/integrations/views.py:164 +#: rhodecode/integrations/views.py:163 msgid "{repo_group_name} repo group" msgstr "" -#: rhodecode/integrations/views.py:171 +#: rhodecode/integrations/views.py:170 msgid "{name} integration" msgstr "" -#: rhodecode/integrations/views.py:185 +#: rhodecode/integrations/views.py:184 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:265 +#: rhodecode/integrations/views.py:264 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:290 +#: rhodecode/integrations/views.py:289 msgid "Integration {integration_name} updated successfully." msgstr "" @@ -1702,58 +1755,59 @@ msgid "" "Send events such as repo pushes and pull requests to your hipchat channel." msgstr "" -#: rhodecode/integrations/types/slack.py:44 +#: rhodecode/integrations/types/slack.py:46 msgid "Slack service URL" msgstr "" -#: rhodecode/integrations/types/slack.py:45 +#: rhodecode/integrations/types/slack.py:47 msgid "" "This can be setup at the slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:58 rhodecode/templates/login.mako:42 -#: rhodecode/templates/register.mako:40 +#: 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/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:90 -#: rhodecode/templates/base/base.mako:301 +#: rhodecode/templates/admin/users/users.mako:62 +#: rhodecode/templates/base/base.mako:304 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 msgid "Username" msgstr "" -#: rhodecode/integrations/types/slack.py:59 +#: rhodecode/integrations/types/slack.py:61 msgid "Username to show notifications coming from." msgstr "" -#: rhodecode/integrations/types/slack.py:68 +#: rhodecode/integrations/types/slack.py:70 msgid "Channel" msgstr "" -#: rhodecode/integrations/types/slack.py:69 +#: rhodecode/integrations/types/slack.py:71 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:78 +#: rhodecode/integrations/types/slack.py:80 msgid "Emoji" msgstr "" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:81 msgid "Emoji to use eg. :studio_microphone:" msgstr "" -#: rhodecode/integrations/types/slack.py:101 +#: rhodecode/integrations/types/slack.py:92 msgid "Slack" msgstr "" -#: rhodecode/integrations/types/slack.py:102 +#: rhodecode/integrations/types/slack.py:93 msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" @@ -1917,25 +1971,25 @@ msgstr "" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1189 +#: rhodecode/lib/auth.py:1197 #, python-format msgid "IP %s not allowed" msgstr "" -#: rhodecode/lib/auth.py:1263 +#: rhodecode/lib/auth.py:1281 msgid "You need to be a registered user to perform this action" msgstr "" -#: rhodecode/lib/auth.py:1311 +#: rhodecode/lib/auth.py:1329 #, python-format msgid "Action not supported for %s." msgstr "" -#: rhodecode/lib/auth.py:1348 +#: rhodecode/lib/auth.py:1379 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/base.py:557 +#: rhodecode/lib/base.py:549 #, python-format msgid "The repository at %(repo_name)s cannot be located." msgstr "" @@ -1961,36 +2015,16 @@ msgstr "" msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1515 +#: rhodecode/lib/helpers.py:1517 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:1519 +#: rhodecode/lib/helpers.py:1521 msgid "No Files" msgstr "" -#: rhodecode/lib/helpers.py:1592 -msgid "new file" -msgstr "" - -#: rhodecode/lib/helpers.py:1595 -msgid "mod" -msgstr "" - -#: rhodecode/lib/helpers.py:1598 -msgid "del" -msgstr "" - -#: rhodecode/lib/helpers.py:1601 -msgid "rename" -msgstr "" - -#: rhodecode/lib/helpers.py:1606 -msgid "chmod" -msgstr "" - -#: rhodecode/lib/helpers.py:1853 +#: rhodecode/lib/helpers.py:1800 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2009,7 +2043,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1873 +#: rhodecode/lib/helpers.py:1820 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the" @@ -2049,9 +2083,9 @@ msgid "in ${val} and ${detail}" msgstr "" #: rhodecode/lib/utils2.py:515 -#: rhodecode/public/js/rhodecode-components.js:33194 -#: rhodecode/public/js/scripts.js:25042 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: 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/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "" @@ -2084,7 +2118,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/model/db.py:2298 +#: 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 msgid "Repository no access" msgstr "" @@ -2116,7 +2152,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/model/db.py:2299 +#: 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 msgid "Repository read access" msgstr "" @@ -2148,7 +2186,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/model/db.py:2300 +#: 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 msgid "Repository write access" msgstr "" @@ -2180,7 +2220,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 -#: rhodecode/model/db.py:2301 +#: 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 msgid "Repository admin access" msgstr "" @@ -2252,7 +2294,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/model/db.py:2319 +#: 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 msgid "Repository creation disabled" msgstr "" @@ -2284,7 +2328,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 -#: rhodecode/model/db.py:2320 +#: 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 msgid "Repository creation enabled" msgstr "" @@ -2316,7 +2362,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 -#: rhodecode/model/db.py:2324 +#: 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 msgid "Repository forking disabled" msgstr "" @@ -2348,7 +2396,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/model/db.py:2325 +#: 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 msgid "Repository forking enabled" msgstr "" @@ -2401,7 +2451,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 -#: rhodecode/model/db.py:3009 +#: 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 msgid "Not Reviewed" msgstr "" @@ -2433,7 +2485,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 -#: rhodecode/model/db.py:3010 +#: 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 msgid "Approved" msgstr "" @@ -2465,7 +2519,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 -#: rhodecode/model/db.py:3011 +#: 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 msgid "Rejected" msgstr "" @@ -2497,7 +2553,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 -#: rhodecode/model/db.py:3012 +#: 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 msgid "Under Review" msgstr "" @@ -2526,7 +2584,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/model/db.py:2303 +#: 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 msgid "Repository group no access" msgstr "" @@ -2555,7 +2615,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/model/db.py:2304 +#: 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 msgid "Repository group read access" msgstr "" @@ -2584,7 +2646,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/model/db.py:2305 +#: 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 msgid "Repository group write access" msgstr "" @@ -2613,7 +2677,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 -#: rhodecode/model/db.py:2306 +#: 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 msgid "Repository group admin access" msgstr "" @@ -2641,7 +2707,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/model/db.py:2308 +#: 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 msgid "User group no access" msgstr "" @@ -2669,7 +2737,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 -#: rhodecode/model/db.py:2309 +#: 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 msgid "User group read access" msgstr "" @@ -2697,7 +2767,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/model/db.py:2310 +#: 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 msgid "User group write access" msgstr "" @@ -2725,7 +2797,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/model/db.py:2311 +#: 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 msgid "User group admin access" msgstr "" @@ -2753,7 +2827,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/model/db.py:2313 +#: 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 msgid "Repository Group creation disabled" msgstr "" @@ -2781,7 +2857,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/model/db.py:2314 +#: 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 msgid "Repository Group creation enabled" msgstr "" @@ -2809,7 +2887,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/model/db.py:2316 +#: 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 msgid "User Group creation disabled" msgstr "" @@ -2837,7 +2917,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/model/db.py:2317 +#: 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 msgid "User Group creation enabled" msgstr "" @@ -2865,7 +2947,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 -#: rhodecode/model/db.py:2327 +#: 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 msgid "Registration disabled" msgstr "" @@ -2893,7 +2977,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/model/db.py:2328 +#: 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 msgid "User Registration with manual account activation" msgstr "" @@ -2921,7 +3007,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/model/db.py:2329 +#: 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 msgid "User Registration with automatic account activation" msgstr "" @@ -2949,7 +3037,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 -#: rhodecode/model/db.py:2335 rhodecode/model/permission.py:95 +#: 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 msgid "Manual activation of external account" msgstr "" @@ -2977,7 +3067,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 -#: rhodecode/model/db.py:2336 rhodecode/model/permission.py:96 +#: 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 msgid "Automatic activation of external account" msgstr "" @@ -2999,7 +3091,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/model/db.py:2321 +#: 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 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3022,7 +3116,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/model/db.py:2322 +#: 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 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3042,7 +3138,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/model/db.py:2296 +#: 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 msgid "RhodeCode Super Administrator" msgstr "" @@ -3059,7 +3157,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 -#: rhodecode/model/db.py:2338 +#: 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 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3076,7 +3176,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 -#: rhodecode/model/db.py:2339 +#: 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 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3084,7 +3186,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 rhodecode/model/db.py:913 +#: 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 msgid "all" msgstr "" @@ -3092,7 +3196,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 rhodecode/model/db.py:914 +#: 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 msgid "http/web interface" msgstr "" @@ -3100,7 +3206,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 rhodecode/model/db.py:915 +#: 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 msgid "vcs (git/hg/svn protocol)" msgstr "" @@ -3108,7 +3216,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 rhodecode/model/db.py:916 +#: 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 msgid "api calls" msgstr "" @@ -3116,7 +3226,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 rhodecode/model/db.py:917 +#: 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 msgid "feed access" msgstr "" @@ -3125,84 +3237,70 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 -#: rhodecode/model/db.py:2067 +#: 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 msgid "No parent" msgstr "" -#: rhodecode/lib/index/whoosh.py:148 +#: 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 +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 +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 +msgid "Password reset disabled" +msgstr "" + +#: rhodecode/lib/index/whoosh.py:149 msgid "Invalid search query. Try quoting it." msgstr "" -#: rhodecode/lib/index/whoosh.py:150 +#: rhodecode/lib/index/whoosh.py:151 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" -#: rhodecode/lib/index/whoosh.py:155 +#: rhodecode/lib/index/whoosh.py:156 msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/lib/index/whoosh.py:163 -msgid "Index Type" -msgstr "" - #: rhodecode/lib/index/whoosh.py:164 +msgid "Index Type" +msgstr "" + +#: rhodecode/lib/index/whoosh.py:165 msgid "File Index" msgstr "" -#: rhodecode/lib/index/whoosh.py:165 rhodecode/lib/index/whoosh.py:170 +#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171 msgid "Indexed documents" msgstr "" -#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172 +#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173 msgid "Last update" msgstr "" -#: rhodecode/lib/index/whoosh.py:169 +#: rhodecode/lib/index/whoosh.py:170 msgid "Commit index" msgstr "" -#: rhodecode/login/views.py:249 rhodecode/login/views.py:311 -msgid "Bad captcha" -msgstr "" - -#: rhodecode/login/views.py:258 -msgid "You have successfully registered with RhodeCode" -msgstr "" - -#: rhodecode/login/views.py:300 -msgid "Password reset has been disabled." -msgstr "" - -#: rhodecode/login/views.py:327 -msgid "Your password reset link was sent" -msgstr "" - -#: rhodecode/login/views.py:351 -msgid "" -"Your password reset was successful, a new password has been sent to your " -"email" -msgstr "" - -#: rhodecode/model/comment.py:367 -msgid "made a comment" -msgstr "" - #: rhodecode/model/comment.py:368 +msgid "made a comment" +msgstr "" + +#: rhodecode/model/comment.py:369 msgid "Show it now" msgstr "" -#: rhodecode/model/db.py:2331 -msgid "Password reset enabled" -msgstr "" - -#: rhodecode/model/db.py:2332 -msgid "Password reset hidden" -msgstr "" - -#: rhodecode/model/db.py:2333 -msgid "Password reset disabled" -msgstr "" - #: rhodecode/model/forms.py:85 msgid "Please enter a login" msgstr "" @@ -3337,9 +3435,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:103 -#: rhodecode/templates/base/base.mako:406 -#: rhodecode/templates/base/base.mako:413 +#: rhodecode/templates/admin/users/users.mako:75 +#: rhodecode/templates/base/base.mako:409 +#: rhodecode/templates/base/base.mako:416 msgid "Admin" msgstr "" @@ -3370,74 +3468,74 @@ msgstr "" msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:77 +#: rhodecode/model/pull_request.py:78 msgid "This pull request can be automatically merged." msgstr "" -#: rhodecode/model/pull_request.py:79 +#: rhodecode/model/pull_request.py:80 msgid "This pull request cannot be merged because of an unhandled exception." msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:83 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:84 +#: rhodecode/model/pull_request.py:85 msgid "This pull request could not be merged because push to target failed." msgstr "" -#: rhodecode/model/pull_request.py:87 +#: rhodecode/model/pull_request.py:88 msgid "This pull request cannot be merged because the target is not a head." msgstr "" -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:91 msgid "" "This pull request cannot be merged because the source contains more branches" " than the target." msgstr "" -#: rhodecode/model/pull_request.py:93 +#: rhodecode/model/pull_request.py:94 msgid "" "This pull request cannot be merged because the target has multiple heads." msgstr "" -#: rhodecode/model/pull_request.py:96 +#: rhodecode/model/pull_request.py:97 msgid "" "This pull request cannot be merged because the target repository is locked." msgstr "" -#: rhodecode/model/pull_request.py:99 +#: rhodecode/model/pull_request.py:100 msgid "" "This pull request cannot be merged because the target or the source " "reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:102 +#: rhodecode/model/pull_request.py:103 msgid "" "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:105 +#: rhodecode/model/pull_request.py:106 msgid "" "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:108 +#: rhodecode/model/pull_request.py:109 msgid "" "This pull request cannot be merged because of conflicts related to sub " "repositories." msgstr "" -#: rhodecode/model/pull_request.py:114 +#: rhodecode/model/pull_request.py:115 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:116 +#: rhodecode/model/pull_request.py:117 msgid "Pull request update failed because of an unknown error." msgstr "" -#: rhodecode/model/pull_request.py:118 -msgid "No update needed because the source reference is already up to date." +#: rhodecode/model/pull_request.py:119 +msgid "No update needed because the source and target have not changed." msgstr "" #: rhodecode/model/pull_request.py:121 @@ -3468,51 +3566,51 @@ msgstr "" msgid "Pull request merged and closed" msgstr "" -#: rhodecode/model/pull_request.py:1041 +#: rhodecode/model/pull_request.py:1087 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1043 +#: rhodecode/model/pull_request.py:1089 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:1055 +#: rhodecode/model/pull_request.py:1101 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1073 +#: rhodecode/model/pull_request.py:1119 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1076 +#: rhodecode/model/pull_request.py:1122 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1233 rhodecode/model/scm.py:790 +#: rhodecode/model/pull_request.py:1279 rhodecode/model/scm.py:790 msgid "Bookmarks" msgstr "" -#: rhodecode/model/pull_request.py:1238 +#: rhodecode/model/pull_request.py:1284 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1241 +#: rhodecode/model/pull_request.py:1287 msgid "Closed Branches" msgstr "" -#: rhodecode/model/pull_request.py:1364 +#: rhodecode/model/pull_request.py:1411 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1375 +#: rhodecode/model/pull_request.py:1424 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1390 +#: rhodecode/model/pull_request.py:1439 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1393 +#: rhodecode/model/pull_request.py:1442 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" @@ -3520,36 +3618,36 @@ msgstr "" msgid "latest tip" msgstr "" -#: rhodecode/model/user.py:125 +#: rhodecode/model/user.py:126 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:291 +#: rhodecode/model/user.py:292 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " "application" msgstr "" -#: rhodecode/model/user.py:464 +#: rhodecode/model/user.py:462 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:472 +#: rhodecode/model/user.py:470 #, 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:481 +#: rhodecode/model/user.py:479 #, 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:490 +#: rhodecode/model/user.py:488 #, python-format msgid "" "user \"%s\" still owns %s user groups and cannot be removed. Switch owners " @@ -3882,369 +3980,371 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:31198 -#: rhodecode/public/js/scripts.js:23046 +#: 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/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33129 -#: rhodecode/public/js/scripts.js:24977 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: 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/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33130 -#: rhodecode/public/js/scripts.js:24978 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: 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/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33131 -#: rhodecode/public/js/scripts.js:24979 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: 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/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33132 -#: rhodecode/public/js/scripts.js:24980 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: 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/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33133 -#: rhodecode/public/js/scripts.js:24981 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: 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/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33134 -#: rhodecode/public/js/scripts.js:24982 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: 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/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33154 -#: rhodecode/public/js/scripts.js:25002 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: 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/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33162 -#: rhodecode/public/js/scripts.js:25010 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: 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/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33174 -#: rhodecode/public/js/scripts.js:25022 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: 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/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33176 -#: rhodecode/public/js/scripts.js:25024 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: 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/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33180 -#: rhodecode/public/js/scripts.js:25028 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: 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/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33182 -#: rhodecode/public/js/scripts.js:25030 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: 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/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33184 -#: rhodecode/public/js/scripts.js:25032 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: 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/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47027 -#: rhodecode/public/js/scripts.js:38875 +#: 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/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47030 -#: rhodecode/public/js/scripts.js:38878 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: 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/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47033 -#: rhodecode/public/js/scripts.js:38881 +#: 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/select2/translations.js:10 msgid "No matches found" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47036 -#: rhodecode/public/js/scripts.js:38884 +#: 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/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47040 -#: rhodecode/public/js/scripts.js:38888 +#: 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/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47042 -#: rhodecode/public/js/scripts.js:38890 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: 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/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47047 -#: rhodecode/public/js/scripts.js:38895 +#: 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/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47049 -#: rhodecode/public/js/scripts.js:38897 +#: 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/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47054 -#: rhodecode/public/js/scripts.js:38902 +#: 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/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47056 -#: rhodecode/public/js/scripts.js:38904 +#: 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/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47060 -#: rhodecode/public/js/scripts.js:38908 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: 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/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47062 -#: rhodecode/public/js/scripts.js:38910 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: 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/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47991 -#: rhodecode/public/js/scripts.js:39839 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: 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/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47993 -#: rhodecode/public/js/scripts.js:39841 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: 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/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48426 -#: rhodecode/public/js/scripts.js:40274 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: 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/src/rhodecode/codemirror.js:296 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48445 -#: rhodecode/public/js/scripts.js:40293 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: 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/src/rhodecode/codemirror.js:315 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48464 -#: rhodecode/public/js/scripts.js:40312 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: 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/src/rhodecode/codemirror.js:334 +#: rhodecode/templates/email_templates/commit_comment.mako:99 +#: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48484 -#: rhodecode/public/js/scripts.js:40332 +#: 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/src/rhodecode/codemirror.js:354 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48848 -#: rhodecode/public/js/scripts.js:40696 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/comments.js:123 +#: 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/src/rhodecode/comments.js:125 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48927 -#: rhodecode/public/js/scripts.js:40775 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 -#: rhodecode/public/js/src/rhodecode/comments.js:202 +#: 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/src/rhodecode/comments.js:209 msgid "Status Review" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48941 -#: rhodecode/public/js/scripts.js:40789 +#: 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/src/rhodecode/comments.js:216 +#: rhodecode/public/js/src/rhodecode/comments.js:224 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49089 -#: rhodecode/public/js/scripts.js:40937 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/comments.js:364 +#: 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/src/rhodecode/comments.js:381 msgid "Submitting..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49140 -#: rhodecode/public/js/scripts.js:40988 +#: 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/src/rhodecode/comments.js:415 +#: rhodecode/public/js/src/rhodecode/comments.js:432 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49245 -#: rhodecode/public/js/scripts.js:41093 +#: 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/src/rhodecode/comments.js:520 +#: rhodecode/public/js/src/rhodecode/comments.js:537 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49316 -#: rhodecode/public/js/scripts.js:41164 +#: 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/src/rhodecode/comments.js:591 +#: 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:49393 -#: rhodecode/public/js/scripts.js:41241 +#: 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/src/rhodecode/comments.js:668 +#: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49507 -#: rhodecode/public/js/scripts.js:41355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 -#: rhodecode/public/js/src/rhodecode/comments.js:782 +#: 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/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49713 -#: rhodecode/public/js/scripts.js:41561 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: 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/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49715 -#: rhodecode/public/js/scripts.js:41563 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: 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/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49724 -#: rhodecode/public/js/scripts.js:41572 +#: 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/src/rhodecode/files.js:161 msgid "No matching files" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49859 -#: rhodecode/public/js/scripts.js:41707 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: 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/src/rhodecode/files.js:296 msgid "Selection link" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49899 -#: rhodecode/public/js/scripts.js:41747 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: 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/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49900 -#: rhodecode/public/js/scripts.js:41748 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 +#: 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/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49909 -#: rhodecode/public/js/scripts.js:41757 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: 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/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49910 -#: rhodecode/public/js/scripts.js:41758 +#: 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/src/rhodecode/followers.js:37 msgid "Follow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50366 -#: rhodecode/public/js/scripts.js:42214 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:212 +#: 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 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50937 -#: rhodecode/public/js/scripts.js:42785 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: 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/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50957 -#: rhodecode/public/js/scripts.js:42805 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: 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/src/rhodecode.js:162 msgid "Show more" msgstr "" @@ -4254,14 +4354,14 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:479 -#: rhodecode/templates/codeblocks/diffs.mako:484 +#: rhodecode/templates/codeblocks/diffs.mako:488 +#: rhodecode/templates/codeblocks/diffs.mako:493 msgid "Add another comment" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:320 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:325 msgid "Close" msgstr "" @@ -4319,81 +4419,102 @@ msgstr "" msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +msgid "Saving..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: 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:40 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 -msgid "Show selected commit __S" -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:48 -#: rhodecode/public/js/src/i18n_messages.js:7 -msgid "Switch to chat" -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 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: 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:54 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 -#: rhodecode/templates/admin/auth/auth_settings.mako:71 -msgid "disabled" -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" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 msgid "files" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/templates/pullrequests/pullrequest.mako:108 +msgid "loading..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -msgid "{0} days" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +msgid "{0} out of {1} users" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 msgid "{0} years" msgstr "" +#: rhodecode/public/js/src/math_jax/extensions/HelpDialog.js:19 +msgid "HelpDialog" +msgstr "" + +#: rhodecode/public/js/src/math_jax/jax/output/HTML-CSS/autoload/mglyph.js:19 +msgid "MathML" +msgstr "" + #: rhodecode/public/js/vendors/webcomponentsjs/webcomponents.min.js:11 msgid "UIEvent" msgstr "" @@ -4410,10 +4531,6 @@ msgstr "" msgid "FocusEvent" msgstr "" -#: rhodecode/svn_support/events.py:30 -msgid "Configuration for Apaache mad_dav_svn changed." -msgstr "" - #: rhodecode/templates/index.mako:5 msgid "Dashboard" msgstr "" @@ -4471,6 +4588,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:15 #: 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 #: rhodecode/templates/base/perms_summary.mako:102 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 @@ -4483,22 +4601,25 @@ msgstr "" #: rhodecode/templates/index_base.mako:100 #: rhodecode/templates/index_base.mako:125 #: rhodecode/templates/admin/gists/index.mako:114 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:81 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 -#: rhodecode/templates/admin/repos/repo_add_base.mako:32 +#: 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/repos.mako:57 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 #: rhodecode/templates/admin/user_groups/user_groups.mako:57 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +#: 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/base/issue_tracker_settings.mako:10 #: rhodecode/templates/changeset/changeset.mako:53 #: rhodecode/templates/compare/compare_commits.mako:20 -#: rhodecode/templates/email_templates/commit_comment.mako:82 +#: 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 #: rhodecode/templates/files/file_tree_detail.mako:5 @@ -4506,8 +4627,8 @@ msgstr "" #: rhodecode/templates/forks/fork.mako:48 #: rhodecode/templates/forks/forks_data.mako:9 #: rhodecode/templates/pullrequests/pullrequest.mako:47 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:158 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:163 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:460 #: rhodecode/templates/summary/components.mako:73 msgid "Description" msgstr "" @@ -4522,7 +4643,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/users/user_edit_groups.mako:65 #: rhodecode/templates/forks/forks_data.mako:7 #: rhodecode/templates/summary/components.mako:195 msgid "Owner" @@ -4543,9 +4665,9 @@ msgstr "" #: rhodecode/templates/changelog/changelog_summary_data.mako:8 #: rhodecode/templates/changeset/changeset.mako:36 #: rhodecode/templates/compare/compare_commits.mako:18 -#: rhodecode/templates/email_templates/commit_comment.mako:45 -#: rhodecode/templates/email_templates/commit_comment.mako:81 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: 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/search/search_commit.mako:6 #: rhodecode/templates/tags/tags.mako:66 msgid "Commit" @@ -4560,45 +4682,45 @@ msgstr "" msgid "Home" msgstr "" -#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:34 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:326 +#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:329 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "" -#: rhodecode/templates/login.mako:36 +#: rhodecode/templates/login.mako:37 msgid "Go to the registration page to create a new account." msgstr "" -#: rhodecode/templates/login.mako:57 +#: rhodecode/templates/login.mako:58 msgid "Remember me" msgstr "" -#: rhodecode/templates/login.mako:61 +#: rhodecode/templates/login.mako:62 msgid "Forgot your password?" msgstr "" -#: rhodecode/templates/login.mako:65 -#: rhodecode/templates/password_reset.mako:34 +#: rhodecode/templates/login.mako:66 +#: rhodecode/templates/password_reset.mako:35 msgid "Password reset is disabled. Please contact " msgstr "" -#: rhodecode/templates/login.mako:67 -#: rhodecode/templates/password_reset.mako:36 -#: rhodecode/templates/base/base.mako:43 -#: rhodecode/templates/errors/error_document.mako:64 -msgid "Support" -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 +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 msgid "or" msgstr "" -#: rhodecode/templates/login.mako:70 -#: rhodecode/templates/password_reset.mako:39 +#: rhodecode/templates/login.mako:71 +#: rhodecode/templates/password_reset.mako:40 msgid "an administrator if you need help." msgstr "" @@ -4606,28 +4728,28 @@ msgstr "" msgid "Reset Password" msgstr "" -#: rhodecode/templates/password_reset.mako:46 +#: rhodecode/templates/password_reset.mako:47 msgid "Reset your Password" msgstr "" -#: rhodecode/templates/password_reset.mako:47 +#: rhodecode/templates/password_reset.mako:48 msgid "Go to the login page to sign in." msgstr "" -#: rhodecode/templates/password_reset.mako:51 +#: rhodecode/templates/password_reset.mako:52 msgid "Email Address" msgstr "" -#: rhodecode/templates/password_reset.mako:60 -#: rhodecode/templates/register.mako:84 +#: rhodecode/templates/password_reset.mako:61 +#: rhodecode/templates/register.mako:85 msgid "Captcha" msgstr "" -#: rhodecode/templates/password_reset.mako:70 -msgid "Send password reset email" -msgstr "" - #: rhodecode/templates/password_reset.mako:71 +msgid "Send password reset email" +msgstr "" + +#: rhodecode/templates/password_reset.mako:72 msgid "Password reset link will be sent to matching email address" msgstr "" @@ -4635,49 +4757,49 @@ msgstr "" msgid "Create an Account" msgstr "" -#: rhodecode/templates/register.mako:34 +#: rhodecode/templates/register.mako:35 msgid "Create an account" msgstr "" -#: rhodecode/templates/register.mako:35 +#: rhodecode/templates/register.mako:36 msgid "Go to the login page to sign in with an existing account." msgstr "" -#: rhodecode/templates/register.mako:54 +#: rhodecode/templates/register.mako:55 msgid "Re-enter password" msgstr "" -#: rhodecode/templates/register.mako:61 +#: rhodecode/templates/register.mako:62 #: rhodecode/templates/admin/my_account/my_account_profile.mako:32 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:33 #: 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:94 +#: rhodecode/templates/admin/users/users.mako:66 msgid "First Name" msgstr "" -#: rhodecode/templates/register.mako:68 +#: rhodecode/templates/register.mako:69 #: rhodecode/templates/admin/my_account/my_account_profile.mako:40 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:42 #: 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:96 +#: rhodecode/templates/admin/users/users.mako:68 msgid "Last Name" msgstr "" -#: rhodecode/templates/register.mako:96 +#: rhodecode/templates/register.mako:97 msgid "Account activation requires admin approval." msgstr "" -#: rhodecode/templates/register.mako:103 +#: rhodecode/templates/register.mako:104 msgid "Create Account" msgstr "" #: rhodecode/templates/admin/admin.mako:5 #: rhodecode/templates/admin/admin.mako:15 -#: rhodecode/templates/base/base.mako:72 +#: rhodecode/templates/base/base.mako:75 msgid "Admin journal" msgstr "" @@ -4686,6 +4808,7 @@ msgid "journal filter..." msgstr "" #: rhodecode/templates/admin/admin.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "" @@ -4700,31 +4823,38 @@ msgstr[2] "" msgstr[3] "" #: rhodecode/templates/admin/admin.mako:17 +#: rhodecode/templates/admin/users/user_edit_audit.mako:17 #: rhodecode/templates/journal/journal.mako:17 msgid "Example Queries" msgstr "" #: rhodecode/templates/admin/admin_log.mako:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 #: rhodecode/templates/admin/repos/repos.mako:69 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 -#: rhodecode/templates/admin/user_groups/user_groups.mako:66 -#: rhodecode/templates/admin/users/users.mako:107 -#: rhodecode/templates/files/files_detail.mako:63 +#: 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/files/files_detail.mako:58 msgid "Action" msgstr "" #: rhodecode/templates/admin/admin_log.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/bookmarks/bookmarks.mako:61 #: rhodecode/templates/branches/branches.mako:60 #: rhodecode/templates/tags/tags.mako:61 @@ -4732,10 +4862,12 @@ 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 msgid "No actions yet" msgstr "" @@ -4776,7 +4908,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:135 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 -#: rhodecode/templates/admin/repos/repo_add_base.mako:90 +#: 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 @@ -4786,6 +4918,7 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:120 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:102 #: rhodecode/templates/admin/users/user_add.mako:128 +#: rhodecode/templates/admin/users/user_edit_groups.mako:27 #: rhodecode/templates/admin/users/user_edit_profile.mako:134 #: rhodecode/templates/base/default_perms_box.mako:88 msgid "Save" @@ -4807,18 +4940,18 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/index.mako:110 #: rhodecode/templates/admin/integrations/list.mako:103 -#: rhodecode/templates/admin/repos/repo_add_base.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:75 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 -#: rhodecode/templates/admin/repos/repo_add_base.mako:82 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 msgid "Private Repository" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:86 +#: rhodecode/templates/admin/repos/repo_add_base.mako:97 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:112 #: rhodecode/templates/forks/fork.mako:87 msgid "" @@ -4884,7 +5017,7 @@ msgid "Update Gist" msgstr "" #: rhodecode/templates/admin/gists/edit.mako:102 -#: rhodecode/templates/base/issue_tracker_settings.mako:74 +#: rhodecode/templates/base/issue_tracker_settings.mako:73 #: rhodecode/templates/changeset/changeset_file_comment.mako:385 #: rhodecode/templates/codeblocks/diffs.mako:76 #: rhodecode/templates/files/files_add.mako:102 @@ -4960,8 +5093,8 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:180 #: rhodecode/templates/compare/compare_commits.mako:17 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:304 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:457 #: rhodecode/templates/pullrequests/pullrequests.mako:102 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/tags/tags.mako:63 @@ -5018,7 +5151,7 @@ msgstr "" #: rhodecode/templates/admin/gists/show.mako:56 #: rhodecode/templates/admin/integrations/list.mako:204 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 -#: rhodecode/templates/base/issue_tracker_settings.mako:61 +#: rhodecode/templates/base/issue_tracker_settings.mako:60 #: rhodecode/templates/data_table/_dt_elements.mako:118 #: rhodecode/templates/data_table/_dt_elements.mako:180 #: rhodecode/templates/data_table/_dt_elements.mako:193 @@ -5026,10 +5159,10 @@ msgstr "" #: rhodecode/templates/debug_style/buttons.html:128 #: rhodecode/templates/files/files_add.mako:204 #: rhodecode/templates/files/files_edit.mako:165 -#: rhodecode/templates/files/files_source.mako:38 -#: rhodecode/templates/files/files_source.mako:41 +#: 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:319 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:324 #: rhodecode/templates/users/user_profile.mako:7 msgid "Edit" msgstr "" @@ -5048,7 +5181,7 @@ msgstr "" #: rhodecode/templates/admin/gists/show.mako:91 #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:87 msgid "Show as raw" msgstr "" @@ -5073,8 +5206,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:43 #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 -#: rhodecode/templates/base/base.mako:81 -#: rhodecode/templates/base/base.mako:246 +#: rhodecode/templates/base/base.mako:84 +#: rhodecode/templates/base/base.mako:249 msgid "Settings" msgstr "" @@ -5106,6 +5239,8 @@ msgid "Create new integration" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:104 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14 msgid "Scope" msgstr "" @@ -5175,7 +5310,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:340 +#: rhodecode/templates/base/base.mako:343 msgid "My account" msgstr "" @@ -5184,9 +5319,10 @@ msgid "My Account" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:29 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 -msgid "My Profile" +#: rhodecode/templates/email_templates/user_registration.mako:26 +#: rhodecode/templates/users/user.mako:29 +#: rhodecode/templates/users/user_profile.mako:5 +msgid "Profile" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:31 @@ -5198,11 +5334,8 @@ msgid "OAuth Identities" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:37 -msgid "My Emails" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account.mako:38 -msgid "My Repositories" +#: rhodecode/templates/admin/users/user_edit.mako:38 +msgid "Emails" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:39 @@ -5211,81 +5344,82 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:40 #: rhodecode/templates/admin/notifications/notifications.mako:33 -#: rhodecode/templates/base/base.mako:238 +#: rhodecode/templates/base/base.mako:241 msgid "Pull Requests" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:41 -msgid "My Permissions" +#: 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/user_groups/user_group_edit.mako:34 +#: rhodecode/templates/base/base.mako:80 +msgid "Permissions" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:42 -msgid "My Live Notifications" +msgid "Live Notifications" msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:3 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 msgid "Authentication Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:7 -msgid "Built-in tokens can be used to authenticate with all possible options." -msgstr "" - #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:8 -msgid "" -"Each token can have a role. VCS tokens can be used together with the " -"authtoken auth plugin for git/hg/svn operations." -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:11 -msgid "Built-in" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:51 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:47 -msgid "expires" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:29 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:26 -#, python-format -msgid "Confirm to reset this auth token: %s" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 -msgid "expired" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:59 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:55 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:8 +msgid "" +"Each token can have a role. Token with a role can be used only in given " +"context, e.g. VCS tokens can be used together with the authtoken auth plugin" +" for git/hg/svn operations only." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:13 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:13 +msgid "Token" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:17 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:17 +msgid "Expiration" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:48 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:44 #, python-format msgid "Confirm to remove this auth token: %s" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:67 -msgid "No additional auth token specified" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:78 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:56 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:52 +msgid "No additional auth tokens specified" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:68 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:64 msgid "New authentication token" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:82 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +msgid "Repository scope works only with tokens with VCS type." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86 #: rhodecode/templates/admin/my_account/my_account_emails.mako:64 #: rhodecode/templates/admin/permissions/permissions_ips.mako:60 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:84 +#: 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 msgid "Add" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:128 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:125 +msgid "repository scope" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_emails.mako:5 msgid "Account Emails" msgstr "" @@ -5339,6 +5473,11 @@ msgstr "" msgid "Source type" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 +msgid "My Profile" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_profile.mako:11 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:55 #: rhodecode/templates/admin/users/user_edit_profile.mako:25 @@ -5428,14 +5567,6 @@ msgstr "" msgid "Permissions Administration" msgstr "" -#: 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/user_groups/user_group_edit.mako:34 -#: rhodecode/templates/base/base.mako:77 -msgid "Permissions" -msgstr "" - #: rhodecode/templates/admin/permissions/permissions.mako:33 msgid "Application" msgstr "" @@ -5575,8 +5706,8 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:74 -#: rhodecode/templates/base/base.mako:148 +#: rhodecode/templates/base/base.mako:77 +#: rhodecode/templates/base/base.mako:151 msgid "Repository groups" msgstr "" @@ -5590,7 +5721,7 @@ msgid "Group Parent" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 -#: rhodecode/templates/admin/repos/repo_add_base.mako:55 +#: rhodecode/templates/admin/repos/repo_add_base.mako:66 msgid "Copy Parent Group Permissions" msgstr "" @@ -5711,7 +5842,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:107 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117 -#: rhodecode/templates/base/issue_tracker_settings.mako:84 +#: rhodecode/templates/base/issue_tracker_settings.mako:83 msgid "Add new" msgstr "" @@ -5774,52 +5905,48 @@ msgid "Import Existing Repository ?" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:193 +#: rhodecode/templates/base/base.mako:196 msgid "Clone from" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:27 -msgid "Optional http[s] URL from which to clone a repository." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_add_base.mako:36 +#: rhodecode/templates/admin/repos/repo_add_base.mako:47 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:102 #: rhodecode/templates/forks/fork.mako:52 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:41 +#: rhodecode/templates/admin/repos/repo_add_base.mako:52 msgid "Repository Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 +#: 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)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:50 +#: rhodecode/templates/admin/repos/repo_add_base.mako:61 #: rhodecode/templates/forks/fork.mako:67 msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:59 +#: rhodecode/templates/admin/repos/repo_add_base.mako:70 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:68 +#: rhodecode/templates/admin/repos/repo_add_base.mako:79 msgid "Set the type of repository to create." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:73 +#: rhodecode/templates/admin/repos/repo_add_base.mako:84 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:70 #: rhodecode/templates/forks/fork.mako:73 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:77 +#: rhodecode/templates/admin/repos/repo_add_base.mako:88 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." @@ -5863,7 +5990,16 @@ msgstr "" msgid "Statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.mako:87 +#: rhodecode/templates/admin/repos/repo_edit.mako:75 +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3 +msgid "Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:78 +msgid "Strip" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:93 msgid "Reviewers" msgstr "" @@ -5890,12 +6026,10 @@ msgid "This repository is a fork of %(re msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 -#: rhodecode/templates/admin/repos/repo_edit_fork.mako:5 msgid "Set" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:39 -#: rhodecode/templates/admin/repos/repo_edit_fork.mako:9 msgid "Manually set this repository as a fork of another from the list" msgstr "" @@ -6036,10 +6170,11 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:37 #: 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:62 +#: 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:101 +#: rhodecode/templates/admin/users/users.mako:73 msgid "Active" msgstr "" @@ -6115,6 +6250,23 @@ 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 +msgid "No maintenance tasks for this repo available" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:26 +msgid "Run Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:41 +msgid "Performing Maintenance" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:5 msgid "Repository Permissions" msgstr "" @@ -6135,16 +6287,21 @@ msgstr "" msgid "Remote mirror url" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 +#: 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 msgid "Pull changes from remote location" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:22 msgid "Confirm to pull changes from remote side" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:19 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:27 msgid "This repository does not have any remote mirror url set." msgstr "" @@ -6268,11 +6425,80 @@ msgstr "" msgid "Confirm to remove current statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:3 +msgid "Strip commits from repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:7 +#, python-format +msgid "Please provide up to %d commits commits to strip" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:9 +msgid "" +"In the first step commits will be verified for existance in the repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:10 +msgid "In the second step, correct commits will be available for stripping" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:16 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:52 +msgid "Enter full 40 character commit sha" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:18 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:54 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:95 +msgid "Add another commit" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:27 +msgid "Check commits" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:33 +msgid "Sorry this functionality is not available for SVN repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:46 +msgid "Remove" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:112 +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 +msgid " commit verified positive" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:131 +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" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:13 msgid "Select to inherit global vcs settings." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:45 +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:43 #: rhodecode/templates/admin/settings/settings_global.mako:139 #: rhodecode/templates/admin/settings/settings_labs.mako:48 #: rhodecode/templates/admin/settings/settings_vcs.mako:13 @@ -6809,8 +7035,8 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_add.mako:13 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:76 -#: rhodecode/templates/base/base.mako:151 +#: rhodecode/templates/base/base.mako:79 +#: rhodecode/templates/base/base.mako:154 msgid "User groups" msgstr "" @@ -6851,30 +7077,72 @@ msgid "Members" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:9 +msgid "Automatic member sync" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:11 msgid "Assigned to repositories" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:10 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:12 msgid "Assigned to repo groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:17 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:19 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6 #, python-format msgid "User Group: %s" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:26 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:29 +msgid "Group members sync" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:36 +msgid "This group is set to be automatically synchronised." +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 +msgid "This group is not set to be automatically synchronised" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51 +msgid "Disable synchronization" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53 +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 msgid "Delete User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:32 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:81 #, 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:34 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:83 msgid "Delete This User Group" msgstr "" @@ -6900,6 +7168,7 @@ msgid "No members yet" msgstr "" #: rhodecode/templates/admin/user_groups/user_groups.mako:5 +#: rhodecode/templates/admin/users/user_edit_groups.mako:6 msgid "User groups administration" msgstr "" @@ -6907,18 +7176,22 @@ msgstr "" msgid "user groups" msgstr "" +#: rhodecode/templates/admin/user_groups/user_groups.mako:62 +msgid "Sync" +msgstr "" + #: rhodecode/templates/admin/users/user_add.mako:5 msgid "Add user" msgstr "" #: rhodecode/templates/admin/users/user_add.mako:13 #: rhodecode/templates/admin/users/user_edit.mako:14 -#: rhodecode/templates/base/base.mako:75 +#: rhodecode/templates/base/base.mako:78 msgid "Users" msgstr "" #: rhodecode/templates/admin/users/user_add.mako:15 -#: rhodecode/templates/admin/users/users.mako:27 +#: rhodecode/templates/admin/users/users.mako:28 msgid "Add User" msgstr "" @@ -6970,14 +7243,18 @@ msgstr "" msgid "Auth tokens" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:38 -msgid "Emails" -msgstr "" - #: rhodecode/templates/admin/users/user_edit.mako:39 msgid "Ip Whitelist" msgstr "" +#: rhodecode/templates/admin/users/user_edit.mako:40 +msgid "User Groups Management" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.mako:41 +msgid "User audit" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 #: rhodecode/templates/admin/users/user_edit_profile.mako:106 msgid "Source of Record" @@ -6988,7 +7265,7 @@ msgid "Last login" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 -#: rhodecode/templates/admin/users/users.mako:99 +#: rhodecode/templates/admin/users/users.mako:71 msgid "Last activity" msgstr "" @@ -7103,22 +7380,23 @@ msgid "" "will delete the user's repositories!" msgstr "" -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 -msgid "Authentication Access Tokens" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:63 -msgid "No additional auth tokens specified" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:75 -msgid "New auth token" +#: rhodecode/templates/admin/users/user_edit_audit.mako:7 +msgid "User Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +msgid "audit filter..." msgstr "" #: rhodecode/templates/admin/users/user_edit_emails.mako:5 msgid "Additional Email Addresses" msgstr "" +#: rhodecode/templates/admin/users/user_edit_groups.mako:12 +#, python-format +msgid "Add `%s` to user group" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_ips.mako:3 msgid "Custom IP Whitelist" msgstr "" @@ -7175,98 +7453,98 @@ msgstr "" msgid "Users administration" msgstr "" -#: rhodecode/templates/admin/users/users.mako:105 +#: rhodecode/templates/admin/users/users.mako:77 msgid "Auth type" msgstr "" -#: rhodecode/templates/base/base.mako:50 +#: rhodecode/templates/base/base.mako:53 #, python-format msgid "RhodeCode instance id: %s" msgstr "" -#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:81 msgid "Authentication" msgstr "" -#: rhodecode/templates/base/base.mako:80 +#: rhodecode/templates/base/base.mako:83 msgid "Defaults" msgstr "" -#: rhodecode/templates/base/base.mako:98 +#: rhodecode/templates/base/base.mako:101 #: rhodecode/templates/files/files_pjax.mako:24 #: rhodecode/templates/summary/components.mako:42 msgid "Show More" msgstr "" -#: rhodecode/templates/base/base.mako:185 +#: rhodecode/templates/base/base.mako:188 msgid "Fork of" msgstr "" -#: rhodecode/templates/base/base.mako:202 +#: rhodecode/templates/base/base.mako:205 #, python-format msgid "Repository locked by %(user)s" msgstr "" -#: rhodecode/templates/base/base.mako:207 +#: rhodecode/templates/base/base.mako:210 msgid "Repository not locked. Pull repository to lock it." msgstr "" -#: rhodecode/templates/base/base.mako:225 +#: rhodecode/templates/base/base.mako:228 #: rhodecode/templates/data_table/_dt_elements.mako:12 #: rhodecode/templates/data_table/_dt_elements.mako:13 #: rhodecode/templates/data_table/_dt_elements.mako:153 msgid "Summary" msgstr "" -#: rhodecode/templates/base/base.mako:226 +#: rhodecode/templates/base/base.mako:229 #: rhodecode/templates/data_table/_dt_elements.mako:17 #: rhodecode/templates/data_table/_dt_elements.mako:18 msgid "Changelog" msgstr "" -#: rhodecode/templates/base/base.mako:227 +#: rhodecode/templates/base/base.mako:230 #: rhodecode/templates/data_table/_dt_elements.mako:22 #: rhodecode/templates/data_table/_dt_elements.mako:23 #: rhodecode/templates/files/files.mako:15 msgid "Files" msgstr "" -#: rhodecode/templates/base/base.mako:229 +#: rhodecode/templates/base/base.mako:232 #: rhodecode/templates/bookmarks/bookmarks.mako:68 #: rhodecode/templates/branches/branches.mako:67 #: rhodecode/templates/tags/tags.mako:68 msgid "Compare" msgstr "" -#: rhodecode/templates/base/base.mako:234 +#: rhodecode/templates/base/base.mako:237 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: rhodecode/templates/base/base.mako:243 +#: rhodecode/templates/base/base.mako:246 msgid "Options" msgstr "" -#: rhodecode/templates/base/base.mako:250 -#: rhodecode/templates/forks/forks_data.mako:30 -msgid "Compare fork" -msgstr "" - #: rhodecode/templates/base/base.mako:253 -#: rhodecode/templates/base/base.mako:400 +#: 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/search/search.mako:64 msgid "Search" msgstr "" -#: rhodecode/templates/base/base.mako:257 +#: rhodecode/templates/base/base.mako:260 msgid "Unlock" msgstr "" -#: rhodecode/templates/base/base.mako:259 +#: rhodecode/templates/base/base.mako:262 msgid "Lock" msgstr "" -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:267 #: rhodecode/templates/data_table/_dt_elements.mako:27 #: rhodecode/templates/data_table/_dt_elements.mako:28 #: rhodecode/templates/forks/forks_data.mako:8 @@ -7278,77 +7556,77 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/base/base.mako:265 +#: rhodecode/templates/base/base.mako:268 msgid "Create Pull Request" msgstr "" -#: rhodecode/templates/base/base.mako:287 +#: rhodecode/templates/base/base.mako:290 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:295 +#: rhodecode/templates/base/base.mako:298 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:312 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:322 +#: 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:342 +#: rhodecode/templates/base/base.mako:345 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:346 +#: rhodecode/templates/base/base.mako:349 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:382 +#: rhodecode/templates/base/base.mako:385 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:383 +#: rhodecode/templates/base/base.mako:386 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:14 msgid "Journal" msgstr "" -#: rhodecode/templates/base/base.mako:388 +#: rhodecode/templates/base/base.mako:391 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:389 +#: rhodecode/templates/base/base.mako:392 msgid "Public journal" msgstr "" -#: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/base/base.mako:397 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:395 +#: rhodecode/templates/base/base.mako:398 msgid "Gists" msgstr "" -#: rhodecode/templates/base/base.mako:399 +#: rhodecode/templates/base/base.mako:402 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:408 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:412 +#: rhodecode/templates/base/base.mako:415 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:422 -#: rhodecode/templates/base/base.mako:423 +#: rhodecode/templates/base/base.mako:425 +#: rhodecode/templates/base/base.mako:426 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7370,15 +7648,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:480 +#: rhodecode/templates/base/base.mako:483 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:533 +#: rhodecode/templates/base/base.mako:536 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:541 +#: rhodecode/templates/base/base.mako:544 msgid "Site-wide shortcuts" msgstr "" @@ -7447,9 +7725,7 @@ msgid "User Group Creation" msgstr "" #: rhodecode/templates/base/default_perms_box.mako:72 -msgid "" -"Permission to allow user group creation. When disabled, user group admins " -"can still create subgroups within their user groups." +msgid "Permission to allow user group creation." msgstr "" #: rhodecode/templates/base/default_perms_box.mako:78 @@ -7474,19 +7750,19 @@ msgid "" "permission by members of user groups." msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:22 +#: rhodecode/templates/base/issue_tracker_settings.mako:21 msgid "Read more" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:92 +#: rhodecode/templates/base/issue_tracker_settings.mako:91 msgid "New Entry" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:96 +#: rhodecode/templates/base/issue_tracker_settings.mako:95 msgid "Confirm to remove this pattern:" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:192 +#: 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 @@ -7496,7 +7772,7 @@ msgstr "" msgid "Preview" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:193 +#: rhodecode/templates/base/issue_tracker_settings.mako:192 msgid "Test Pattern Preview" msgstr "" @@ -7644,101 +7920,130 @@ msgstr "" msgid "Enable largefiles extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:99 +#: rhodecode/templates/base/vcs_settings.mako:100 msgid "Enable Largefiles extensions for all repositories." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:103 +#: rhodecode/templates/base/vcs_settings.mako:102 +msgid "Enable Largefiles extensions for this repository." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:113 +msgid "" +"Filesystem location where Mercurial largefile objects should be stored." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:119 msgid "Set repositories as publishing" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:103 +#: rhodecode/templates/base/vcs_settings.mako:119 msgid "Set repository as publishing" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:106 +#: rhodecode/templates/base/vcs_settings.mako:122 msgid "" "When this is enabled all commits in the repository are seen as public " "commits by clients." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:111 +#: rhodecode/templates/base/vcs_settings.mako:127 msgid "Enable hgsubversion extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:114 +#: rhodecode/templates/base/vcs_settings.mako:130 msgid "" "Requires hgsubversion library to be installed. Allows cloning remote SVN " "repositories and migrates them to Mercurial type." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:123 +#: rhodecode/templates/base/vcs_settings.mako:139 msgid "Mercurial Labs Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:123 +#: rhodecode/templates/base/vcs_settings.mako:139 msgid "" "These features are considered experimental and may not work as expected." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:129 +#: rhodecode/templates/base/vcs_settings.mako:145 msgid "Use rebase as merge strategy" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:132 +#: rhodecode/templates/base/vcs_settings.mako:148 msgid "" "Use rebase instead of creating a merge commit when merging via web " "interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:144 +#: rhodecode/templates/base/vcs_settings.mako:160 +msgid "Git Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:165 +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 "Filesystem location where Git lfs objects should be stored." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:193 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:150 +#: rhodecode/templates/base/vcs_settings.mako:199 msgid "Proxy subversion HTTP requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:154 +#: 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:155 +#: rhodecode/templates/base/vcs_settings.mako:204 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:161 +#: rhodecode/templates/base/vcs_settings.mako:210 msgid "Subversion HTTP Server URL" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:167 +#: rhodecode/templates/base/vcs_settings.mako:216 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:179 +#: rhodecode/templates/base/vcs_settings.mako:228 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:184 +#: rhodecode/templates/base/vcs_settings.mako:233 msgid "Repository patterns" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:188 +#: rhodecode/templates/base/vcs_settings.mako:237 msgid "" "Patterns for identifying SVN branches and tags. For recursive search, use " "\"*\". Eg.: \"/branches/*\"" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:254 +#: rhodecode/templates/base/vcs_settings.mako:301 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:259 +#: rhodecode/templates/base/vcs_settings.mako:306 msgid "Enable server-side merge for pull requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:262 +#: rhodecode/templates/base/vcs_settings.mako:309 msgid "" "Note: when this feature is enabled, it only runs hooks defined in the " "rcextension package. Custom hooks added on the Admin -> Settings -> Hooks " @@ -7746,11 +8051,11 @@ msgid "" "web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:266 +#: rhodecode/templates/base/vcs_settings.mako:313 msgid "Invalidate and relocate inline comments during update" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:269 +#: rhodecode/templates/base/vcs_settings.mako:316 msgid "" "During the update of a pull request, the position of inline comments will be" " updated and outdated inline comments will be hidden." @@ -7889,7 +8194,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:53 #: rhodecode/templates/compare/compare_commits.mako:46 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:495 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" @@ -7982,8 +8287,8 @@ msgid "Diff options" msgstr "" #: rhodecode/templates/changeset/changeset.mako:119 -#: rhodecode/templates/codeblocks/diffs.mako:436 -#: rhodecode/templates/codeblocks/diffs.mako:439 +#: rhodecode/templates/codeblocks/diffs.mako:445 +#: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "" @@ -8000,8 +8305,8 @@ msgid "Patch Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:127 -#: rhodecode/templates/codeblocks/diffs.mako:443 -#: rhodecode/templates/codeblocks/diffs.mako:446 +#: rhodecode/templates/codeblocks/diffs.mako:452 +#: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "" @@ -8011,7 +8316,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:145 #: rhodecode/templates/changeset/changeset.mako:147 -#: rhodecode/tests/functional/test_commit_comments.py:270 +#: rhodecode/tests/functional/test_commit_comments.py:275 #, python-format msgid "%d Commit comment" msgid_plural "%d Commit comments" @@ -8022,7 +8327,7 @@ msgstr[3] "" #: rhodecode/templates/changeset/changeset.mako:150 #: rhodecode/templates/changeset/changeset.mako:152 -#: rhodecode/tests/functional/test_commit_comments.py:277 +#: rhodecode/tests/functional/test_commit_comments.py:282 #, python-format msgid "%d Inline Comment" msgid_plural "%d Inline Comments" @@ -8130,18 +8435,16 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:363 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:148 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:153 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:388 +#: rhodecode/templates/changeset/changeset_file_comment.mako:393 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 #: rhodecode/templates/compare/compare_diff.mako:122 -#: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:97 msgid "Comment" msgstr "" @@ -8178,7 +8481,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_range.mako:99 #: rhodecode/templates/compare/compare_diff.mako:312 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:414 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:419 #, python-format msgid "Expand %s commit" msgid_plural "Expand %s commits" @@ -8189,7 +8492,7 @@ msgstr[3] "" #: rhodecode/templates/changeset/changeset_range.mako:105 #: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 #, python-format msgid "Collapse %s commit" msgid_plural "Collapse %s commits" @@ -8299,64 +8602,68 @@ msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:406 -#: rhodecode/templates/codeblocks/diffs.mako:422 +#: rhodecode/templates/codeblocks/diffs.mako:415 +#: rhodecode/templates/codeblocks/diffs.mako:431 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:408 -#: rhodecode/templates/codeblocks/diffs.mako:415 +#: rhodecode/templates/codeblocks/diffs.mako:417 +#: rhodecode/templates/codeblocks/diffs.mako:424 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:413 -#: rhodecode/templates/codeblocks/diffs.mako:429 +#: rhodecode/templates/codeblocks/diffs.mako:422 +#: rhodecode/templates/codeblocks/diffs.mako:438 #, python-format msgid "File no longer present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:424 -#: rhodecode/templates/codeblocks/diffs.mako:431 +#: rhodecode/templates/codeblocks/diffs.mako:433 +#: rhodecode/templates/codeblocks/diffs.mako:440 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:462 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:462 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:634 +#: rhodecode/templates/codeblocks/diffs.mako:643 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:636 +#: rhodecode/templates/codeblocks/diffs.mako:645 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:640 +#: rhodecode/templates/codeblocks/diffs.mako:649 msgid "View unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:641 +#: rhodecode/templates/codeblocks/diffs.mako:650 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:651 +#: rhodecode/templates/codeblocks/diffs.mako:660 msgid "Expand All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:655 +#: rhodecode/templates/codeblocks/diffs.mako:664 msgid "Collapse All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:659 +#: rhodecode/templates/codeblocks/diffs.mako:668 msgid "Wide Mode Diff" msgstr "" +#: rhodecode/templates/codeblocks/source.mako:24 +msgid "view annotation from before this change" +msgstr "" + #: rhodecode/templates/compare/compare_commits.mako:5 msgid "Common Ancestor Commit" msgstr "" @@ -8366,7 +8673,7 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:16 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:451 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:456 msgid "Time" msgstr "" @@ -8380,7 +8687,7 @@ msgstr[2] "" msgstr[3] "" #: rhodecode/templates/compare/compare_commits.mako:68 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:568 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:573 msgid "show it" msgid_plural "show them" msgstr[0] "" @@ -8420,14 +8727,14 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:98 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:103 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.mako:76 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 -#: rhodecode/templates/files/files_source.mako:20 +#: rhodecode/templates/files/files_source.mako:23 msgid "Source" msgstr "" @@ -8652,133 +8959,150 @@ msgstr "" msgid "RhodeCode" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:16 -#: rhodecode/templates/email_templates/pull_request_comment.mako:18 +#: rhodecode/templates/email_templates/commit_comment.mako:18 +#: rhodecode/templates/email_templates/pull_request_comment.mako:19 msgid "[mention]" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:19 -#, python-format -msgid "" -"%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:19 -#: rhodecode/templates/email_templates/commit_comment.mako:22 +#: rhodecode/templates/email_templates/commit_comment.mako:21 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on commit `%(commit_id)s` (file: " +"`%(comment_file)s`)" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:24 +#: rhodecode/templates/email_templates/commit_comment.mako:26 #, python-format msgid "in the %(repo_name)s repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:22 -#, python-format -msgid "%(user)s commented on commit `%(commit_id)s` (status: %(status)s)" -msgstr "" - #: rhodecode/templates/email_templates/commit_comment.mako:24 -#: rhodecode/templates/email_templates/commit_comment.mako:78 -#, python-format -msgid "%(user)s commented on commit `%(commit_id)s`" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:43 -#: rhodecode/templates/email_templates/pull_request_comment.mako:44 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on commit `%(commit_id)s` (status: " +"%(status)s)" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:26 +#, python-format +msgid "%(user)s left %(comment_type)s on commit `%(commit_id)s`" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:47 +#: rhodecode/templates/email_templates/pull_request_comment.mako:47 msgid "Comment link" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:48 -#: rhodecode/templates/email_templates/pull_request_comment.mako:49 +#: rhodecode/templates/email_templates/commit_comment.mako:52 +#: rhodecode/templates/email_templates/pull_request_comment.mako:52 #, python-format msgid "File: %(comment_file)s on line %(comment_line)s" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:54 +#: rhodecode/templates/email_templates/commit_comment.mako:58 msgid "Commit status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:76 +#: rhodecode/templates/email_templates/commit_comment.mako:82 #, python-format msgid "%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:76 -#: rhodecode/templates/email_templates/commit_comment.mako:78 +#: rhodecode/templates/email_templates/commit_comment.mako:82 +#: rhodecode/templates/email_templates/commit_comment.mako:84 #, python-format msgid "in the %(repo)s repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:85 +#: rhodecode/templates/email_templates/commit_comment.mako:84 +#, python-format +msgid "%(user)s commented on commit `%(commit_id)s`" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:92 +#: rhodecode/templates/email_templates/pull_request_comment.mako:94 msgid "Status" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:85 +#: rhodecode/templates/email_templates/commit_comment.mako:93 msgid "The commit status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:97 -#, python-format -msgid "Comment on line: %(comment_line)s" -msgstr "" - -#: rhodecode/templates/email_templates/password_reset.mako:30 +#: rhodecode/templates/email_templates/commit_comment.mako:99 +#: rhodecode/templates/email_templates/pull_request_comment.mako:107 +#, python-format +msgid "TODO comment on line: %(comment_line)s" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:101 +#: rhodecode/templates/email_templates/pull_request_comment.mako:109 +#, python-format +msgid "Note comment on line: %(comment_line)s" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:101 +#: rhodecode/templates/email_templates/pull_request_comment.mako:109 +msgid "Note comment" +msgstr "" + +#: rhodecode/templates/email_templates/password_reset.mako:31 msgid "Generate new password here" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:21 -#, python-format -msgid "" -"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: " -"`%(comment_file)s`)" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:24 -#, python-format -msgid "" -"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: " -"%(status)s)" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:26 -#: rhodecode/templates/email_templates/pull_request_comment.mako:83 -#, python-format -msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:46 +#: rhodecode/templates/email_templates/pull_request_comment.mako:22 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\" " +"(file: `%(comment_file)s`)" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:25 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\" " +"(status: %(status)s)" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:27 +#, python-format +msgid "%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:49 msgid "Source repository" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:55 +#: rhodecode/templates/email_templates/pull_request_comment.mako:58 #, python-format msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:57 +#: rhodecode/templates/email_templates/pull_request_comment.mako:60 #, python-format msgid "" "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:81 +#: rhodecode/templates/email_templates/pull_request_comment.mako:84 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" " "(file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:87 -#, python-format -msgid "submitted pull request status: %(status)s" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:89 -#, python-format -msgid "submitted pull request status: %(status)s and closed" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:95 -msgid "Submitted status" +#: rhodecode/templates/email_templates/pull_request_comment.mako:86 +#, python-format +msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 +msgid "Closed pull request with status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:99 +msgid "Submitted review status" msgstr "" #: rhodecode/templates/email_templates/pull_request_review.mako:14 @@ -8849,12 +9173,6 @@ msgstr "" msgid "Full Name" msgstr "" -#: rhodecode/templates/email_templates/user_registration.mako:26 -#: rhodecode/templates/users/user.mako:29 -#: rhodecode/templates/users/user_profile.mako:5 -msgid "Profile" -msgstr "" - #: rhodecode/templates/errors/error_document.mako:46 #, python-format msgid "You will be redirected to %s in %s seconds" @@ -9013,13 +9331,13 @@ msgid "Delete file" msgstr "" #: rhodecode/templates/files/files_delete.mako:45 -#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:65 #, python-format msgid "Binary file (%s)" msgstr "" #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:87 msgid "File is too big to display" msgstr "" @@ -9032,19 +9350,19 @@ msgstr "" msgid "Commit Description" msgstr "" -#: rhodecode/templates/files/files_detail.mako:35 +#: rhodecode/templates/files/files_detail.mako:32 msgid "File last commit" msgstr "" -#: rhodecode/templates/files/files_detail.mako:51 +#: rhodecode/templates/files/files_detail.mako:46 msgid "Show/Diff file" msgstr "" -#: rhodecode/templates/files/files_detail.mako:66 +#: rhodecode/templates/files/files_detail.mako:61 msgid "Diff to Commit" msgstr "" -#: rhodecode/templates/files/files_detail.mako:67 +#: rhodecode/templates/files/files_detail.mako:62 msgid "Show at Commit" msgstr "" @@ -9086,7 +9404,15 @@ msgstr "" msgid "Location" msgstr "" -#: rhodecode/templates/files/files_source.mako:7 +#: rhodecode/templates/files/files_source.mako:8 +msgid "This file is a pointer to large binary file" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:8 +msgid "LargeFile" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:10 #: rhodecode/templates/search/search_content.mako:57 msgid "line" msgid_plural "lines" @@ -9095,65 +9421,51 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/files/files_source.mako:14 +#: rhodecode/templates/files/files_source.mako:17 msgid "History" msgstr "" -#: rhodecode/templates/files/files_source.mako:17 +#: rhodecode/templates/files/files_source.mako:20 #: rhodecode/templates/search/search_content.mako:68 msgid "Show Full History" msgstr "" -#: rhodecode/templates/files/files_source.mako:22 +#: rhodecode/templates/files/files_source.mako:25 #: rhodecode/templates/search/search_content.mako:70 msgid "Annotation" msgstr "" -#: rhodecode/templates/files/files_source.mako:24 +#: rhodecode/templates/files/files_source.mako:27 #: rhodecode/templates/search/search_content.mako:71 msgid "Raw" msgstr "" -#: rhodecode/templates/files/files_source.mako:26 +#: rhodecode/templates/files/files_source.mako:31 +msgid "Download largefile" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:35 #: rhodecode/templates/search/search_content.mako:73 msgid "Download" msgstr "" -#: rhodecode/templates/files/files_source.mako:33 +#: rhodecode/templates/files/files_source.mako:43 #, python-format msgid "Edit on Branch:%s" msgstr "" -#: rhodecode/templates/files/files_source.mako:38 +#: rhodecode/templates/files/files_source.mako:48 msgid "Editing binary files not allowed" msgstr "" -#: rhodecode/templates/files/files_source.mako:41 +#: rhodecode/templates/files/files_source.mako:51 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_source.mako:52 msgid "Deleting files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/followers/followers.mako:5 -#: rhodecode/templates/followers/followers.mako:27 -#, python-format -msgid "%s Followers" -msgstr "" - -#: rhodecode/templates/followers/followers.mako:12 -msgid "Followers" -msgstr "" - -#: rhodecode/templates/followers/followers_data.mako:5 -msgid "Follower Name" -msgstr "" - -#: rhodecode/templates/followers/followers_data.mako:6 -msgid "Following Since" -msgstr "" - #: rhodecode/templates/forks/fork.mako:5 #, python-format msgid "Fork repository %s" @@ -9234,51 +9546,47 @@ msgstr "" msgid "New pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:52 +#: rhodecode/templates/pullrequests/pullrequest.mako:51 msgid "Write a short description on this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:59 +#: rhodecode/templates/pullrequests/pullrequest.mako:57 msgid "Commit flow" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:67 +#: rhodecode/templates/pullrequests/pullrequest.mako:65 msgid "Origin repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:85 +#: rhodecode/templates/pullrequests/pullrequest.mako:83 msgid "Loading refs..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:96 +#: rhodecode/templates/pullrequests/pullrequest.mako:94 msgid "Submit Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:109 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:317 +#: rhodecode/templates/pullrequests/pullrequest.mako:107 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:322 msgid "Pull request reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:110 -msgid "loading..." -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.mako:120 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:361 +#: rhodecode/templates/pullrequests/pullrequest.mako:118 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:366 msgid "Add reviewer" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:299 -#: rhodecode/templates/pullrequests/pullrequest.mako:572 +#: rhodecode/templates/pullrequests/pullrequest.mako:297 +#: rhodecode/templates/pullrequests/pullrequest.mako:570 msgid "Please select origin and destination" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:305 +#: rhodecode/templates/pullrequests/pullrequest.mako:303 msgid "Loading compare ..." msgstr "" +#: rhodecode/templates/pullrequests/pullrequest.mako:350 #: rhodecode/templates/pullrequests/pullrequest.mako:352 -#: rhodecode/templates/pullrequests/pullrequest.mako:354 msgid "This pull request will consist of __COMMITS__ commit." msgid_plural "This pull request will consist of __COMMITS__ commits." msgstr[0] "" @@ -9286,48 +9594,53 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/pullrequests/pullrequest.mako:357 +#: rhodecode/templates/pullrequests/pullrequest.mako:355 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:364 +#: rhodecode/templates/pullrequests/pullrequest.mako:362 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:464 +#: rhodecode/templates/pullrequests/pullrequest.mako:462 msgid "Destination repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:475 +#: rhodecode/templates/pullrequests/pullrequest.mako:473 msgid "Select commit reference" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:8 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:7 msgid "This pull request can be merged automatically." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:13 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:12 msgid "Merge is not currently possible because of below failed checks." msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:37 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:42 +msgid "refresh checks" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:38 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 -msgid "refresh checks" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:39 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:44 msgid "Merge Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:44 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 msgid "You are not allowed to merge this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:46 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:45 msgid "Login to Merge this Pull Request" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:54 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 +msgid "Close with status {}" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show.mako:5 #, python-format msgid "%s Pull Request #%s" @@ -9345,19 +9658,23 @@ msgstr "" msgid "Origin" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:120 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:88 +msgid "Common ancestor" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:125 msgid "Merge" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:133 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:138 msgid "Shadow repository data not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:141 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:146 msgid "Review" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:157 #, python-format msgid "calculated based on %s reviewer vote" msgid_plural "calculated based on %s reviewers votes" @@ -9366,12 +9683,12 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:170 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:175 msgid "Versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:183 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:186 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:188 msgid "{} version available for this pull request, show it." msgid_plural "{} versions available for this pull request, show them." msgstr[0] "" @@ -9379,141 +9696,141 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:182 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:187 msgid "Hide all versions of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:207 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:212 msgid "Your review status at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:213 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:218 msgid "Comment from pull request version {0}, general:{1} inline:{2}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:230 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:234 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:235 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:239 msgid "select versions to show changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:231 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:236 msgid "show changes between versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:232 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:237 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:247 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:252 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:251 -msgid "Comments for this pull request" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:256 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 +msgid "Comments for this pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:261 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:263 #, python-format msgid "%d General " msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:264 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:267 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:269 #, python-format msgid "%d Inline" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:268 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:272 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:273 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 #, python-format msgid "%d Outdated" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:269 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:274 msgid "show outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:270 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:281 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:286 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:295 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:365 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:300 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:370 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:382 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:387 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:383 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:388 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:391 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:396 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 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:393 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 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:404 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:409 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:427 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:432 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:440 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:445 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:444 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:449 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:462 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:464 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:469 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:567 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:572 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:570 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:575 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:571 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:576 msgid "show them" msgstr "" 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-02-05 17:11+0100\n" -"PO-Revision-Date: 2017-02-01 20:10+0000\n" +"POT-Creation-Date: 2017-04-07 12:33+0200\n" +"PO-Revision-Date: 2017-04-07 10:34+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: German (http://www.transifex.com/rhodecode/RhodeCode/language/de/)\n" "MIME-Version: 1.0\n" @@ -21,51 +21,52 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: rhodecode/admin/navigation.py:83 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:167 +#: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 +#: rhodecode/integrations/views.py:166 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "" -#: rhodecode/admin/navigation.py:84 +#: rhodecode/apps/admin/navigation.py:84 #: rhodecode/templates/admin/repos/repo_edit.mako:52 msgid "VCS" msgstr "" -#: rhodecode/admin/navigation.py:85 +#: rhodecode/apps/admin/navigation.py:85 msgid "Visual" msgstr "" -#: rhodecode/admin/navigation.py:86 +#: rhodecode/apps/admin/navigation.py:86 msgid "Remap and Rescan" msgstr "" -#: rhodecode/admin/navigation.py:87 +#: rhodecode/apps/admin/navigation.py:87 #: rhodecode/templates/admin/repos/repo_edit.mako:58 msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:89 rhodecode/integrations/types/email.py:232 -#: rhodecode/templates/register.mako:75 +#: rhodecode/apps/admin/navigation.py:89 +#: rhodecode/integrations/types/email.py:232 +#: rhodecode/templates/register.mako:76 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: 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:92 +#: rhodecode/templates/admin/users/users.mako:64 #: rhodecode/templates/email_templates/user_registration.mako:25 #: rhodecode/templates/users/user_profile.mako:51 msgid "Email" -msgstr "EMail" - -#: rhodecode/admin/navigation.py:90 +msgstr "E-Mail" + +#: rhodecode/apps/admin/navigation.py:90 msgid "Hooks" msgstr "" -#: rhodecode/admin/navigation.py:91 +#: rhodecode/apps/admin/navigation.py:91 msgid "Full Text Search" msgstr "Volltextsuche" -#: rhodecode/admin/navigation.py:93 +#: rhodecode/apps/admin/navigation.py:93 #: rhodecode/templates/admin/integrations/base.mako:23 #: rhodecode/templates/admin/integrations/form.mako:8 #: rhodecode/templates/admin/integrations/form.mako:21 @@ -79,177 +80,290 @@ msgstr "Volltextsuche" #: 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/base/base.mako:79 +#: rhodecode/templates/base/base.mako:82 msgid "Integrations" msgstr "" -#: rhodecode/admin/navigation.py:95 +#: rhodecode/apps/admin/navigation.py:95 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" msgstr "Systeminformation" -#: rhodecode/admin/navigation.py:97 +#: rhodecode/apps/admin/navigation.py:97 msgid "User Sessions" msgstr "" -#: rhodecode/admin/navigation.py:99 +#: rhodecode/apps/admin/navigation.py:99 msgid "Open Source Licenses" msgstr "Open Source Lizenzen" -#: rhodecode/admin/navigation.py:107 +#: rhodecode/apps/admin/navigation.py:107 msgid "Labs" msgstr "" -#: rhodecode/admin/views/sessions.py:90 +#: rhodecode/apps/admin/views/sessions.py:86 msgid "Cleaned up old sessions" msgstr "" -#: rhodecode/admin/views/sessions.py:96 +#: rhodecode/apps/admin/views/sessions.py:92 msgid "Failed to cleanup up old sessions" msgstr "" -#: rhodecode/admin/views/svn_config.py:47 +#: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." msgstr "Apache-Konfiguration für Subversion erzeugt." -#: rhodecode/admin/views/svn_config.py:55 +#: rhodecode/apps/admin/views/svn_config.py:54 msgid "Failed to generate the Apache configuration for Subversion." msgstr "Apache-Konfiguration für Subversion konnte nicht erzeugt werden." -#: rhodecode/admin/views/system_info.py:96 +#: rhodecode/apps/admin/views/system_info.py:95 msgid "" "Note: please make sure this server can access `${url}` for the update link " "to work" msgstr "" -#: rhodecode/admin/views/system_info.py:99 +#: rhodecode/apps/admin/views/system_info.py:98 msgid "Update info" -msgstr "" - -#: rhodecode/admin/views/system_info.py:101 +msgstr "Update Informationen" + +#: rhodecode/apps/admin/views/system_info.py:100 msgid "Check for updates" -msgstr "" - -#: rhodecode/admin/views/system_info.py:106 +msgstr "Nach Updates suchen" + +#: rhodecode/apps/admin/views/system_info.py:105 msgid "RhodeCode Version" msgstr "" -#: rhodecode/admin/views/system_info.py:107 +#: rhodecode/apps/admin/views/system_info.py:106 msgid "RhodeCode Server IP" msgstr "" -#: rhodecode/admin/views/system_info.py:108 +#: rhodecode/apps/admin/views/system_info.py:107 msgid "RhodeCode Server ID" msgstr "" -#: rhodecode/admin/views/system_info.py:109 +#: rhodecode/apps/admin/views/system_info.py:108 msgid "RhodeCode Configuration" msgstr "RhodeCode Konfiguration" -#: rhodecode/admin/views/system_info.py:113 +#: rhodecode/apps/admin/views/system_info.py:109 +msgid "Workers" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:110 +msgid "Worker Type" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:114 msgid "Database" msgstr "Datenbank" -#: rhodecode/admin/views/system_info.py:114 +#: rhodecode/apps/admin/views/system_info.py:115 msgid "Database version" msgstr "Datenbank Version" -#: rhodecode/admin/views/system_info.py:118 +#: rhodecode/apps/admin/views/system_info.py:119 msgid "Platform" -msgstr "" - -#: rhodecode/admin/views/system_info.py:119 +msgstr "Plattform" + +#: rhodecode/apps/admin/views/system_info.py:120 msgid "Platform UUID" -msgstr "" - -#: rhodecode/admin/views/system_info.py:120 +msgstr "Plattform UUID" + +#: rhodecode/apps/admin/views/system_info.py:121 msgid "Python version" msgstr "Python Version" -#: rhodecode/admin/views/system_info.py:121 +#: rhodecode/apps/admin/views/system_info.py:122 msgid "Python path" msgstr "Python Pfad" -#: rhodecode/admin/views/system_info.py:125 +#: rhodecode/apps/admin/views/system_info.py:126 msgid "CPU" msgstr "CPU" -#: rhodecode/admin/views/system_info.py:126 +#: rhodecode/apps/admin/views/system_info.py:127 msgid "Load" msgstr "Auslastung" -#: rhodecode/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:128 msgid "Memory" msgstr "Speicher" -#: rhodecode/admin/views/system_info.py:128 +#: rhodecode/apps/admin/views/system_info.py:129 msgid "Uptime" msgstr "" -#: rhodecode/admin/views/system_info.py:132 +#: rhodecode/apps/admin/views/system_info.py:133 msgid "Storage location" -msgstr "" - -#: rhodecode/admin/views/system_info.py:133 +msgstr "Ablageort" + +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Storage info" -msgstr "" - -#: rhodecode/admin/views/system_info.py:134 +msgstr "Information zur Ablage" + +#: rhodecode/apps/admin/views/system_info.py:135 msgid "Storage inodes" -msgstr "" - -#: rhodecode/admin/views/system_info.py:136 +msgstr "Inodes der Ablage " + +#: rhodecode/apps/admin/views/system_info.py:137 msgid "Gist storage location" -msgstr "" - -#: rhodecode/admin/views/system_info.py:137 +msgstr "Gist Ablageort" + +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Gist storage info" -msgstr "" - -#: rhodecode/admin/views/system_info.py:139 +msgstr "Information zur Gist Ablage" + +#: rhodecode/apps/admin/views/system_info.py:140 msgid "Archive cache storage location" -msgstr "" - -#: rhodecode/admin/views/system_info.py:140 +msgstr "Archivcache-Ablageort" + +#: rhodecode/apps/admin/views/system_info.py:141 msgid "Archive cache info" msgstr "" -#: rhodecode/admin/views/system_info.py:142 +#: rhodecode/apps/admin/views/system_info.py:143 msgid "Temp storage location" -msgstr "" - -#: rhodecode/admin/views/system_info.py:143 +msgstr "Temporärer Ablageort" + +#: rhodecode/apps/admin/views/system_info.py:144 msgid "Temp storage info" -msgstr "" - -#: rhodecode/admin/views/system_info.py:145 +msgstr "Information zur temporären Ablage" + +#: rhodecode/apps/admin/views/system_info.py:146 msgid "Search info" msgstr "" -#: rhodecode/admin/views/system_info.py:146 +#: rhodecode/apps/admin/views/system_info.py:147 msgid "Search location" msgstr "" -#: rhodecode/admin/views/system_info.py:150 +#: rhodecode/apps/admin/views/system_info.py:151 msgid "VCS Backends" msgstr "" -#: rhodecode/admin/views/system_info.py:151 +#: rhodecode/apps/admin/views/system_info.py:152 msgid "VCS Server" msgstr "" -#: rhodecode/admin/views/system_info.py:152 +#: rhodecode/apps/admin/views/system_info.py:153 msgid "GIT" msgstr "" -#: rhodecode/admin/views/system_info.py:153 +#: rhodecode/apps/admin/views/system_info.py:154 msgid "HG" msgstr "" -#: rhodecode/admin/views/system_info.py:154 +#: rhodecode/apps/admin/views/system_info.py:155 msgid "SVN" msgstr "" +#: rhodecode/apps/admin/views/users.py:60 +#: rhodecode/controllers/admin/users.py:359 +#: rhodecode/controllers/admin/users.py:380 +#: 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/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/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/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/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/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/controllers/admin/gists.py:70 +msgid "Lifetime" +msgstr "Lebensdauer" + +#: rhodecode/apps/admin/views/users.py:188 +#: rhodecode/apps/my_account/views.py:148 +#: 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 +msgid "Auth token successfully created" +msgstr "Authentifizierungstoken erfolgreich erstellt" + +#: rhodecode/apps/admin/views/users.py:240 +#: rhodecode/apps/my_account/views.py:192 +msgid "Auth token successfully deleted" +msgstr "Authentifizierungstoken erfolgreich gelöscht" + +#: rhodecode/apps/admin/views/users.py:284 +msgid "Groups successfully changed" +msgstr "" + +#: rhodecode/apps/login/views.py:247 rhodecode/apps/login/views.py:316 +msgid "Bad captcha" +msgstr "" + +#: rhodecode/apps/login/views.py:256 +msgid "You have successfully registered with RhodeCode" +msgstr "Du hast dich erfolgreich bei RhodeCode angemeldet" + +#: rhodecode/apps/login/views.py:292 +msgid "If such email exists, a password reset link was sent to it." +msgstr "" + +#: rhodecode/apps/login/views.py:298 +msgid "Password reset has been disabled." +msgstr "" + +#: rhodecode/apps/login/views.py:381 +msgid "Given reset token is invalid" +msgstr "" + +#: rhodecode/apps/login/views.py:389 +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 +msgid "Error occurred during update of user password" +msgstr "Fehler bei der Aktualisierung des Benutzerpassworts aufgetreten" + +#: rhodecode/apps/my_account/views.py:122 +msgid "Successfully updated password" +msgstr "Passwort erfolgreich aktualisiert" + +#: rhodecode/apps/svn_support/events.py:30 +msgid "Configuration for Apaache mad_dav_svn changed." +msgstr "" + #: rhodecode/authentication/schema.py:35 msgid "Enable or disable this authentication plugin." msgstr "Authentifizierungs-Plugin aktivieren/deaktivieren" @@ -265,12 +379,11 @@ msgstr "Aktiviert" #: rhodecode/authentication/schema.py:43 msgid "" -"Amount of seconds to cache the authentication call for this plugin. Useful " -"for long calls like LDAP to improve the responsiveness of the authentication" -" system (0 means disabled)." -msgstr "" - -#: rhodecode/authentication/schema.py:48 +"Amount of seconds to cache the authentication responsecall for this plugin. \n" +"Useful for long calls like LDAP to improve the performance of the authentication system (0 means disabled)." +msgstr "" + +#: rhodecode/authentication/schema.py:49 msgid "Auth Cache TTL" msgstr "" @@ -291,99 +404,101 @@ msgstr "" msgid "Error occurred during update of auth settings." msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:61 +#: rhodecode/authentication/plugins/auth_crowd.py:60 msgid "The FQDN or IP of the Atlassian CROWD Server" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:63 +#: rhodecode/authentication/plugins/auth_crowd.py:62 msgid "Host" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:68 +#: rhodecode/authentication/plugins/auth_crowd.py:67 msgid "The Port in use by the Atlassian CROWD Server" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:70 +#: rhodecode/authentication/plugins/auth_crowd.py:69 #: rhodecode/authentication/plugins/auth_ldap.py:84 msgid "Port" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:76 +#: rhodecode/authentication/plugins/auth_crowd.py:75 msgid "The Application Name to authenticate to CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:78 +#: rhodecode/authentication/plugins/auth_crowd.py:77 msgid "Application Name" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:83 +#: rhodecode/authentication/plugins/auth_crowd.py:82 msgid "The password to authenticate to CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:85 +#: rhodecode/authentication/plugins/auth_crowd.py:84 msgid "Application Password" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:90 +#: rhodecode/authentication/plugins/auth_crowd.py:89 msgid "" "A comma separated list of group names that identify users as RhodeCode " "Administrators" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:94 +#: rhodecode/authentication/plugins/auth_crowd.py:93 msgid "Admin Groups" msgstr "Administratorengruppen" -#: rhodecode/authentication/plugins/auth_crowd.py:216 +#: rhodecode/authentication/plugins/auth_crowd.py:215 msgid "CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:55 +#: rhodecode/authentication/plugins/auth_headers.py:54 msgid "Header to extract the user from" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:57 +#: rhodecode/authentication/plugins/auth_headers.py:56 msgid "Header" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:62 +#: rhodecode/authentication/plugins/auth_headers.py:61 msgid "Header to extract the user from when main one fails" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:64 +#: rhodecode/authentication/plugins/auth_headers.py:63 msgid "Fallback header" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:69 +#: rhodecode/authentication/plugins/auth_headers.py:68 msgid "" "Perform cleaning of user, if passed user has @ in username then first part " "before @ is taken. If there's \\ in the username only the part after \\ is " "taken" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:74 +#: rhodecode/authentication/plugins/auth_headers.py:73 msgid "Clean username" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:99 +#: rhodecode/authentication/plugins/auth_headers.py:98 msgid "Headers" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:63 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:62 msgid "The url of the Jasig CAS REST service" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:65 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:64 #: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:93 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:92 msgid "Jasig-CAS" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:75 -msgid "Host of the LDAP Server" +#: 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 @@ -391,107 +506,117 @@ msgid "LDAP Host" msgstr "LDAP Host" #: rhodecode/authentication/plugins/auth_ldap.py:82 -msgid "Port that the LDAP server is listening on" +msgid "Custom port that the LDAP server is listening on. Default: 389" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:90 -msgid "User to connect to LDAP" -msgstr "LDAP Benutzer" - -#: rhodecode/authentication/plugins/auth_ldap.py:93 +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 msgid "Account" msgstr "Konto" -#: rhodecode/authentication/plugins/auth_ldap.py:98 -msgid "Password to connect to LDAP" -msgstr "LDAP Passwort" - -#: rhodecode/authentication/plugins/auth_ldap.py:101 -#: rhodecode/templates/login.mako:49 rhodecode/templates/register.mako:47 +#: rhodecode/authentication/plugins/auth_ldap.py:100 +msgid "Password to authenticate for given user DN." +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:103 +#: 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:310 +#: rhodecode/templates/base/base.mako:313 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "Passwort" -#: rhodecode/authentication/plugins/auth_ldap.py:106 +#: rhodecode/authentication/plugins/auth_ldap.py:108 msgid "TLS Type" msgstr "TLS Typ" -#: rhodecode/authentication/plugins/auth_ldap.py:107 +#: rhodecode/authentication/plugins/auth_ldap.py:109 msgid "Connection Security" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:113 +#: rhodecode/authentication/plugins/auth_ldap.py:115 msgid "Require Cert over TLS?" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:114 +#: rhodecode/authentication/plugins/auth_ldap.py:116 msgid "Certificate Checks" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:120 -msgid "Base DN to search (e.g., dc=mydomain,dc=com)" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:123 +#: rhodecode/authentication/plugins/auth_ldap.py:122 +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 msgid "Base DN" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:128 -msgid "Filter to narrow results (e.g., ou=Users, etc)" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:131 -msgid "LDAP Search Filter" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:136 -msgid "How deep to search LDAP" +#: rhodecode/authentication/plugins/auth_ldap.py:132 +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 -msgid "LDAP Search Scope" +msgid "LDAP Search Filter" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:143 -msgid "LDAP Attribute to map to user name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:145 +msgid "How deep to search LDAP. If unsure set to SUBTREE" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:144 +msgid "LDAP Search Scope" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:150 +msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:152 msgid "Login Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:146 +#: rhodecode/authentication/plugins/auth_ldap.py:153 msgid "The LDAP Login attribute of the CN must be specified" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:151 -msgid "LDAP Attribute to map to first name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:154 +#: rhodecode/authentication/plugins/auth_ldap.py:158 +msgid "LDAP Attribute to map to first name (e.g., givenName)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:161 msgid "First Name Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:159 -msgid "LDAP Attribute to map to last name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:162 +#: rhodecode/authentication/plugins/auth_ldap.py:166 +msgid "LDAP Attribute to map to last name (e.g., sn)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:169 msgid "Last Name Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:167 -msgid "LDAP Attribute to map to email address" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:170 +#: rhodecode/authentication/plugins/auth_ldap.py:174 +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 msgid "Email Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:351 +#: rhodecode/authentication/plugins/auth_ldap.py:360 msgid "LDAP" msgstr "" @@ -516,16 +641,16 @@ msgstr "" msgid "PAM" msgstr "" -#: rhodecode/authentication/plugins/auth_rhodecode.py:68 +#: rhodecode/authentication/plugins/auth_rhodecode.py:67 msgid "Rhodecode" msgstr "" -#: rhodecode/authentication/plugins/auth_token.py:71 +#: rhodecode/authentication/plugins/auth_token.py:70 msgid "Rhodecode Token Auth" msgstr "" #: rhodecode/controllers/changelog.py:91 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:202 +#: rhodecode/controllers/pullrequests.py:204 msgid "There are no commits yet" msgstr "Es sind noch keine Commits vorhanden" @@ -559,8 +684,8 @@ msgid "No such commit exists for this re msgstr "" #: rhodecode/controllers/changeset.py:344 -#: rhodecode/controllers/pullrequests.py:948 -#: rhodecode/model/pull_request.py:1009 +#: rhodecode/controllers/pullrequests.py:985 +#: rhodecode/model/pull_request.py:1055 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "Status Änderung %(transition_icon)s %(status)s" @@ -600,12 +725,12 @@ msgid "" "%(repo1)s with commit %(commit2)s from repository %(repo2)s." msgstr "" -#: rhodecode/controllers/feed.py:70 +#: rhodecode/controllers/feed.py:69 #, python-format msgid "Changes on %s repository" msgstr "Änderungen im %s Repository" -#: rhodecode/controllers/feed.py:71 +#: rhodecode/controllers/feed.py:70 #, python-format msgid "%s %s feed" msgstr "%s %s Feed" @@ -619,93 +744,93 @@ 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:394 rhodecode/controllers/files.py:447 -#: rhodecode/controllers/files.py:478 rhodecode/controllers/files.py:553 -#: rhodecode/controllers/files.py:598 rhodecode/controllers/files.py:689 +#: 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 #, 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:402 rhodecode/controllers/files.py:455 +#: rhodecode/controllers/files.py:443 rhodecode/controllers/files.py:496 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:411 rhodecode/controllers/files.py:464 +#: 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:431 +#: rhodecode/controllers/files.py:472 #, python-format msgid "Successfully deleted file %s" msgstr "Datei %s erfolgreich gelöscht" -#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:540 -#: rhodecode/controllers/files.py:677 +#: rhodecode/controllers/files.py:475 rhodecode/controllers/files.py:581 +#: rhodecode/controllers/files.py:718 msgid "Error occurred during commit" msgstr "Während des Committens trat ein Fehler auf" -#: rhodecode/controllers/files.py:486 rhodecode/controllers/files.py:561 +#: rhodecode/controllers/files.py:527 rhodecode/controllers/files.py:602 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:498 rhodecode/controllers/files.py:573 +#: 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:515 +#: rhodecode/controllers/files.py:556 msgid "No changes" msgstr "Keine Änderungen" -#: rhodecode/controllers/files.py:537 rhodecode/controllers/files.py:666 +#: 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:611 rhodecode/controllers/files.py:700 +#: rhodecode/controllers/files.py:652 rhodecode/controllers/files.py:741 msgid "Added file via RhodeCode Enterprise" msgstr "Eine Datei wurde über RhodeCode Enterprise hinzugefügt." -#: rhodecode/controllers/files.py:636 +#: rhodecode/controllers/files.py:677 msgid "No filename" msgstr "Kein Dateiname" -#: rhodecode/controllers/files.py:669 +#: 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:723 +#: rhodecode/controllers/files.py:764 msgid "Downloads disabled" msgstr "Downloads deaktiviert" -#: rhodecode/controllers/files.py:729 +#: rhodecode/controllers/files.py:770 #, python-format msgid "Unknown revision %s" msgstr "Unbekannte Revision %s" -#: rhodecode/controllers/files.py:731 +#: rhodecode/controllers/files.py:772 msgid "Empty repository" msgstr "Leeres Repository" -#: rhodecode/controllers/files.py:733 rhodecode/controllers/files.py:767 +#: rhodecode/controllers/files.py:774 rhodecode/controllers/files.py:808 msgid "Unknown archive type" msgstr "Unbekannter Archiv Typ" -#: rhodecode/controllers/files.py:952 +#: rhodecode/controllers/files.py:993 msgid "Changesets" msgstr "Changesets" -#: rhodecode/controllers/files.py:973 rhodecode/controllers/summary.py:269 -#: rhodecode/model/pull_request.py:1234 rhodecode/model/scm.py:782 -#: rhodecode/templates/base/vcs_settings.mako:193 +#: 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:977 rhodecode/model/scm.py:797 -#: rhodecode/templates/base/vcs_settings.mako:218 +#: rhodecode/controllers/files.py:1018 rhodecode/model/scm.py:797 +#: rhodecode/templates/base/vcs_settings.mako:267 msgid "Tags" msgstr "Tags" @@ -714,23 +839,24 @@ 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:205 +#: rhodecode/controllers/home.py:207 msgid "Groups" msgstr "Gruppen" -#: rhodecode/controllers/home.py:212 rhodecode/controllers/home.py:247 -#: rhodecode/controllers/pullrequests.py:308 +#: 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:73 -#: rhodecode/templates/base/base.mako:145 -#: rhodecode/templates/base/base.mako:569 +#: 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:225 +#: rhodecode/controllers/home.py:227 #, python-format msgid "Commits in %(repo)s" msgstr "" @@ -743,81 +869,81 @@ msgstr "Öffentliches Journal" msgid "journal" msgstr "Logbuch" -#: rhodecode/controllers/pullrequests.py:216 +#: rhodecode/controllers/pullrequests.py:218 msgid "Commit does not exist" msgstr "Commit existiert nicht" -#: rhodecode/controllers/pullrequests.py:333 -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:335 +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 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/controllers/pullrequests.py:383 +#: rhodecode/controllers/pullrequests.py:385 msgid "Successfully opened new pull request" msgstr "Es wurde erfolgreich ein neuer Pullrequest eröffnet" -#: rhodecode/controllers/pullrequests.py:386 +#: 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:429 +#: rhodecode/controllers/pullrequests.py:431 msgid "Cannot update closed pull requests." msgstr "Geschlossener Pullrequest kann nicht aktualisiert werden." -#: rhodecode/controllers/pullrequests.py:435 +#: rhodecode/controllers/pullrequests.py:437 msgid "Pull request title & description updated." msgstr "Pullrequest Überschrift und Beschreibung aktualisiert." -#: rhodecode/controllers/pullrequests.py:443 +#: rhodecode/controllers/pullrequests.py:455 msgid "" "Pull request updated to \"{source_commit_id}\" with {count_added} added, " -"{count_removed} removed commits." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:458 +"{count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:472 msgid "Reload page" msgstr "Seite neu laden" -#: rhodecode/controllers/pullrequests.py:532 +#: rhodecode/controllers/pullrequests.py:546 msgid "Pull request was successfully merged and closed." msgstr "Pullrequest wurde erfolgreich zusammengeführt und geschlossen." -#: rhodecode/controllers/pullrequests.py:569 +#: rhodecode/controllers/pullrequests.py:588 msgid "Successfully deleted pull request" msgstr "Pullrequest erfolgreich gelöscht" -#: rhodecode/controllers/pullrequests.py:864 -msgid "Close Pull Request" -msgstr "Pullrequest schließen" - -#: rhodecode/controllers/pullrequests.py:952 -#: rhodecode/model/pull_request.py:1013 +#: rhodecode/controllers/pullrequests.py:592 +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:1002 +#: 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:243 +#: rhodecode/controllers/summary.py:251 msgid "Branch" msgstr "Branch" -#: rhodecode/controllers/summary.py:244 +#: rhodecode/controllers/summary.py:252 msgid "Tag" msgstr "Tag" -#: rhodecode/controllers/summary.py:245 +#: rhodecode/controllers/summary.py:253 msgid "Bookmark" msgstr "Lesezeichen" -#: rhodecode/controllers/summary.py:270 +#: rhodecode/controllers/summary.py:278 msgid "Closed branches" msgstr "Geschlossene Branches" @@ -829,42 +955,6 @@ msgstr "Standardeinstellungen erfolgreic msgid "Error occurred during update of default values" msgstr "Fehler bei der Aktualisierung der Standardwerte aufgetreten" -#: rhodecode/controllers/admin/gists.py:62 -#: rhodecode/controllers/admin/my_account.py:384 -#: rhodecode/controllers/admin/users.py:465 -msgid "forever" -msgstr "für immer" - -#: rhodecode/controllers/admin/gists.py:63 -#: rhodecode/controllers/admin/my_account.py:385 -#: rhodecode/controllers/admin/users.py:466 -msgid "5 minutes" -msgstr "5 Minuten" - -#: rhodecode/controllers/admin/gists.py:64 -#: rhodecode/controllers/admin/my_account.py:386 -#: rhodecode/controllers/admin/users.py:467 -msgid "1 hour" -msgstr "1 Stunde" - -#: rhodecode/controllers/admin/gists.py:65 -#: rhodecode/controllers/admin/my_account.py:387 -#: rhodecode/controllers/admin/users.py:468 -msgid "1 day" -msgstr "1 Tag" - -#: rhodecode/controllers/admin/gists.py:66 -#: rhodecode/controllers/admin/my_account.py:388 -#: rhodecode/controllers/admin/users.py:469 -msgid "1 month" -msgstr "1 Monat" - -#: rhodecode/controllers/admin/gists.py:70 -#: rhodecode/controllers/admin/my_account.py:390 -#: rhodecode/controllers/admin/users.py:471 -msgid "Lifetime" -msgstr "Lebensdauer" - #: rhodecode/controllers/admin/gists.py:72 msgid "Requires registered account" msgstr "" @@ -901,10 +991,8 @@ msgstr "Fehler beim Update des Gist %s a #: rhodecode/controllers/admin/gists.py:343 #: rhodecode/templates/admin/gists/show.mako:67 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 #: rhodecode/templates/data_table/_dt_elements.mako:263 msgid "never" msgstr "" @@ -914,64 +1002,35 @@ msgstr "" msgid "%(expiry)s - current value" msgstr "" -#: rhodecode/controllers/admin/my_account.py:80 +#: rhodecode/controllers/admin/my_account.py:78 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:140 +#: rhodecode/controllers/admin/my_account.py:138 msgid "Your account was updated successfully" msgstr "Ihr Account wurde erfolgreich aktualisiert" -#: rhodecode/controllers/admin/my_account.py:155 -#: rhodecode/controllers/admin/users.py:231 +#: rhodecode/controllers/admin/my_account.py:153 +#: rhodecode/controllers/admin/users.py:184 #, python-format msgid "Error occurred during update of user %s" msgstr "Fehler bei der Aktualisierung des Benutzers %s" -#: rhodecode/controllers/admin/my_account.py:221 -#: rhodecode/controllers/admin/my_account.py:227 -msgid "Error occurred during update of user password" -msgstr "Fehler bei der Aktualisierung des Benutzerpassworts aufgetreten" - -#: rhodecode/controllers/admin/my_account.py:234 -msgid "Successfully updated password" -msgstr "Passwort erfolgreich aktualisiert" - -#: rhodecode/controllers/admin/my_account.py:278 -#: rhodecode/controllers/admin/users.py:645 +#: 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:285 -#: rhodecode/controllers/admin/users.py:652 +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-Addresse trat ein Fehler auf" - -#: rhodecode/controllers/admin/my_account.py:295 -#: rhodecode/controllers/admin/users.py:667 +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 "" - -#: rhodecode/controllers/admin/my_account.py:393 -#: rhodecode/controllers/admin/users.py:474 -msgid "Role" -msgstr "Rolle" - -#: rhodecode/controllers/admin/my_account.py:406 -#: rhodecode/controllers/admin/users.py:498 -msgid "Auth token successfully created" -msgstr "Authentifizierungstoken erfolgreich erstellt" - -#: rhodecode/controllers/admin/my_account.py:419 -#: rhodecode/controllers/admin/users.py:517 -msgid "Auth token successfully reset" -msgstr "Authentifizierungstoken erfolgreich zurückgesetzt" - -#: rhodecode/controllers/admin/my_account.py:423 -#: rhodecode/controllers/admin/users.py:521 -msgid "Auth token successfully deleted" -msgstr "Authentifizierungstoken erfolgreich gelöscht" +msgstr "E-Mail-Adresse von Benutzerkonto entfernt" #: rhodecode/controllers/admin/permissions.py:112 msgid "Application permissions updated successfully" @@ -1036,7 +1095,7 @@ msgid "Error occurred during deletion of msgstr "Fehler beim Löschen der Repository-Gruppe %s aufgetreten" #: rhodecode/controllers/admin/repo_groups.py:388 -#: rhodecode/controllers/admin/user_groups.py:322 +#: rhodecode/controllers/admin/user_groups.py:323 msgid "Cannot change permission for yourself as admin" msgstr "Es ist nicht möglich als Administrator die eigenen Berechtigungen zu ändern" @@ -1188,18 +1247,18 @@ msgid "Error occurred during deleting is msgstr "" #: rhodecode/controllers/admin/repos.py:728 -#: rhodecode/controllers/admin/settings.py:380 +#: rhodecode/controllers/admin/settings.py:381 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:427 +#: rhodecode/controllers/admin/settings.py:428 msgid "Updated issue tracker entries" msgstr "" #: rhodecode/controllers/admin/repos.py:819 #: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:618 +#: rhodecode/controllers/admin/settings.py:619 msgid "Some form inputs contain invalid data." msgstr "Einige Eingabefelder enthalten ungültige Daten." @@ -1208,281 +1267,277 @@ msgid "Error occurred during updating re msgstr "" #: rhodecode/controllers/admin/repos.py:841 -#: rhodecode/controllers/admin/settings.py:175 +#: rhodecode/controllers/admin/settings.py:176 msgid "Updated VCS settings" msgstr "VCS-Einstellungen aktualisiert" -#: rhodecode/controllers/admin/settings.py:171 -#: rhodecode/controllers/admin/settings.py:282 +#: rhodecode/controllers/admin/settings.py:172 +#: rhodecode/controllers/admin/settings.py:283 msgid "Error occurred during updating application settings" msgstr "Fehler während der Aktualisierung der Applikations-Einstellungen aufgetreten" -#: rhodecode/controllers/admin/settings.py:222 +#: rhodecode/controllers/admin/settings.py:223 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "Repositories erfolgreich gescannt, hinzugefügt: %s; entfernt: %s" -#: rhodecode/controllers/admin/settings.py:278 +#: rhodecode/controllers/admin/settings.py:279 msgid "Updated application settings" msgstr "Applikations-Einstellungen aktualisiert" -#: rhodecode/controllers/admin/settings.py:344 +#: rhodecode/controllers/admin/settings.py:345 msgid "Updated visualisation settings" msgstr "Visualisierungs-Einstellungen aktualisiert" -#: rhodecode/controllers/admin/settings.py:347 +#: rhodecode/controllers/admin/settings.py:348 msgid "Error occurred during updating visualisation settings" msgstr "Fehler bei der Aktualisierung der Visualisierungs-Einstellungen" -#: rhodecode/controllers/admin/settings.py:440 +#: rhodecode/controllers/admin/settings.py:441 msgid "Please enter email address" msgstr "Bitte E-Mail-Adresse eingeben" -#: rhodecode/controllers/admin/settings.py:458 +#: rhodecode/controllers/admin/settings.py:459 msgid "Send email task created" msgstr "Aufgabe zum Senden der E-Mail erstellt" -#: rhodecode/controllers/admin/settings.py:491 +#: rhodecode/controllers/admin/settings.py:492 msgid "Added new hook" msgstr "Neuer Hook hinzugefügt" -#: rhodecode/controllers/admin/settings.py:506 +#: rhodecode/controllers/admin/settings.py:507 msgid "Updated hooks" msgstr "Die Hooks wurden aktutalisiert" -#: rhodecode/controllers/admin/settings.py:510 +#: rhodecode/controllers/admin/settings.py:511 msgid "Error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:639 +#: rhodecode/controllers/admin/settings.py:640 msgid "Error occurred during updating labs settings" msgstr "Fehler bei der Aktualisierung der Labs-Einstellungen aufgetreten" -#: rhodecode/controllers/admin/settings.py:644 +#: rhodecode/controllers/admin/settings.py:645 msgid "Updated Labs settings" msgstr "Labs-Einstellungen aktualisiert" -#: rhodecode/controllers/admin/user_groups.py:164 +#: rhodecode/controllers/admin/user_groups.py:165 #, python-format msgid "Created user group %(user_group_link)s" msgstr "Benutzergruppe %(user_group_link)s erstellt" -#: rhodecode/controllers/admin/user_groups.py:178 +#: rhodecode/controllers/admin/user_groups.py:179 #, 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:219 +#: rhodecode/controllers/admin/user_groups.py:220 #, python-format msgid "Updated user group %s" msgstr "Benutzergruppe %s aktualisiert" -#: rhodecode/controllers/admin/user_groups.py:235 +#: rhodecode/controllers/admin/user_groups.py:236 #, 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:257 +#: rhodecode/controllers/admin/user_groups.py:258 msgid "Successfully deleted user group" msgstr "Benutzergruppe erfolgreich gelöscht" -#: rhodecode/controllers/admin/user_groups.py:262 +#: rhodecode/controllers/admin/user_groups.py:263 msgid "An error occurred during deletion of user group" msgstr "Fehler beim Löschen der Benutzergruppe aufgetreten" -#: rhodecode/controllers/admin/user_groups.py:330 +#: rhodecode/controllers/admin/user_groups.py:331 msgid "Target group cannot be the same" msgstr "Zielgruppe kann nicht die gleiche sein" -#: rhodecode/controllers/admin/user_groups.py:336 +#: rhodecode/controllers/admin/user_groups.py:337 msgid "User Group permissions updated" msgstr "Berechtigungen der Benutzergruppe aktualisiert" -#: rhodecode/controllers/admin/user_groups.py:421 +#: rhodecode/controllers/admin/user_groups.py:422 msgid "User Group global permissions updated successfully" msgstr "Globale Berechtigungen der Benutzergruppe aktualisiert" #: rhodecode/controllers/admin/user_groups.py:437 -#: rhodecode/controllers/admin/users.py:595 +#: rhodecode/controllers/admin/users.py:477 msgid "An error occurred during permissions saving" msgstr "Fehler beim Speichern der Berechtigungen aufgetreten" -#: rhodecode/controllers/admin/users.py:153 +#: rhodecode/controllers/admin/user_groups.py:481 +msgid "User Group synchronization updated successfully" +msgstr "" + +#: rhodecode/controllers/admin/user_groups.py:485 +msgid "An error occurred during synchronization update" +msgstr "" + +#: rhodecode/controllers/admin/users.py:106 #, python-format msgid "Created user %(user_link)s" msgstr "Benutzer %(user_link)s erstellt" -#: rhodecode/controllers/admin/users.py:169 +#: rhodecode/controllers/admin/users.py:122 #, python-format msgid "Error occurred during creation of user %s" msgstr "Fehler beim Erstellen des Benutzers %s aufgetreten" -#: rhodecode/controllers/admin/users.py:214 +#: rhodecode/controllers/admin/users.py:167 msgid "User updated successfully" msgstr "Der Benutzer wurde erfolgreich aktualisiert" -#: rhodecode/controllers/admin/users.py:265 +#: rhodecode/controllers/admin/users.py:218 #, python-format msgid "Detached %s repositories" msgstr "%s Repositories abgetrennt" -#: rhodecode/controllers/admin/users.py:270 +#: rhodecode/controllers/admin/users.py:223 #, python-format msgid "Deleted %s repositories" msgstr "%s Repositories gelöscht" -#: rhodecode/controllers/admin/users.py:278 +#: rhodecode/controllers/admin/users.py:231 #, python-format msgid "Detached %s repository groups" msgstr "%s Repository-Gruppen abgetrennt" -#: rhodecode/controllers/admin/users.py:283 +#: rhodecode/controllers/admin/users.py:236 #, python-format msgid "Deleted %s repository groups" msgstr "%s Repository-Gruppen gelöscht" -#: rhodecode/controllers/admin/users.py:291 +#: rhodecode/controllers/admin/users.py:244 #, python-format msgid "Detached %s user groups" msgstr "%s Benutzergruppen abgetrennt" -#: rhodecode/controllers/admin/users.py:296 +#: rhodecode/controllers/admin/users.py:249 #, python-format msgid "Deleted %s user groups" msgstr "%s Benutzergruppen gelöscht" -#: rhodecode/controllers/admin/users.py:307 +#: rhodecode/controllers/admin/users.py:260 msgid "Successfully deleted user" msgstr "Benutzer erfolgreich gelöscht" -#: rhodecode/controllers/admin/users.py:313 +#: rhodecode/controllers/admin/users.py:266 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:332 +#: rhodecode/controllers/admin/users.py:285 msgid "Force password change disabled for user" msgstr "Erzwungene Passwortänderung inaktiv für Benutzer" -#: rhodecode/controllers/admin/users.py:334 +#: rhodecode/controllers/admin/users.py:287 msgid "Force password change enabled for user" msgstr "Erzwungene Passwortänderung aktiv für Benutzer" -#: rhodecode/controllers/admin/users.py:338 +#: rhodecode/controllers/admin/users.py:291 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:371 +#: rhodecode/controllers/admin/users.py:324 #, python-format msgid "Linked repository group `%s` as personal" msgstr "" -#: rhodecode/controllers/admin/users.py:377 +#: rhodecode/controllers/admin/users.py:330 #, python-format msgid "Created repository group `%s`" msgstr "Repository-Gruppe %s erstellt" -#: rhodecode/controllers/admin/users.py:381 +#: rhodecode/controllers/admin/users.py:334 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/controllers/admin/users.py:386 +#: rhodecode/controllers/admin/users.py:339 msgid "An error occurred during repository group creation for user" msgstr "Fehler bei der Erstellung der Repository-Gruppe aufgetreten" -#: rhodecode/controllers/admin/users.py:406 -#: rhodecode/controllers/admin/users.py:427 -#: rhodecode/controllers/admin/users.py:459 -#: rhodecode/controllers/admin/users.py:490 -#: rhodecode/controllers/admin/users.py:507 -#: rhodecode/controllers/admin/users.py:530 -#: rhodecode/controllers/admin/users.py:604 -#: rhodecode/controllers/admin/users.py:617 -#: rhodecode/controllers/admin/users.py:675 -msgid "You can't edit this user" -msgstr "Sie können diesen Benutzer nicht editieren" - -#: rhodecode/controllers/admin/users.py:443 +#: rhodecode/controllers/admin/users.py:396 msgid "" "The user participates as reviewer in pull requests and cannot be deleted. " "You can set the user to \"inactive\" instead of deleting it." msgstr "" -#: rhodecode/controllers/admin/users.py:579 +#: rhodecode/controllers/admin/users.py:461 msgid "User global permissions updated successfully" msgstr "Globale Berechtigungen des Benutzers erfolgreich aktualisiert" -#: rhodecode/controllers/admin/users.py:707 +#: 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:722 +#: 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:726 +#: 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:744 +#: 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:65 +#: rhodecode/events/pullrequest.py:68 msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:74 +#: rhodecode/events/pullrequest.py:77 msgid "pullrequest closed" msgstr "" -#: rhodecode/events/pullrequest.py:83 +#: rhodecode/events/pullrequest.py:86 msgid "pullrequest commits updated" msgstr "" -#: rhodecode/events/pullrequest.py:92 +#: rhodecode/events/pullrequest.py:95 msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:101 +#: rhodecode/events/pullrequest.py:104 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:110 +#: rhodecode/events/pullrequest.py:113 msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:136 +#: rhodecode/events/repo.py:138 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:145 +#: rhodecode/events/repo.py:147 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:154 +#: rhodecode/events/repo.py:156 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:163 +#: rhodecode/events/repo.py:165 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:199 +#: rhodecode/events/repo.py:201 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:208 +#: rhodecode/events/repo.py:210 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:217 +#: rhodecode/events/repo.py:219 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:228 +#: rhodecode/events/repo.py:230 msgid "repository push" msgstr "" @@ -1498,25 +1553,24 @@ msgstr "" msgid "repository group update" msgstr "" -#: rhodecode/events/user.py:34 +#: rhodecode/events/user.py:37 msgid "user registered" msgstr "" -#: rhodecode/events/user.py:48 +#: rhodecode/events/user.py:52 msgid "user pre create" msgstr "" -#: rhodecode/events/user.py:61 +#: rhodecode/events/user.py:66 msgid "user post create" msgstr "" -#: rhodecode/events/user.py:74 +#: rhodecode/events/user.py:80 msgid "user pre update" msgstr "" #: rhodecode/forms/__init__.py:32 rhodecode/templates/admin/gists/new.mako:62 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:31 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:88 +#: 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 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 @@ -1528,15 +1582,14 @@ msgstr "" #: 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_vcs.mako:46 +#: 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 #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 #: rhodecode/templates/admin/settings/settings_visual.mako:222 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:27 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:85 +#: 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_profile.mako:135 @@ -1546,17 +1599,17 @@ msgstr "Zurücksetzen" #: rhodecode/forms/__init__.py:33 rhodecode/templates/admin/gists/show.mako:49 #: rhodecode/templates/admin/integrations/list.mako:211 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:60 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 #: rhodecode/templates/admin/permissions/permissions_ips.mako:26 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:56 +#: 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/base/issue_tracker_settings.mako:70 -#: rhodecode/templates/base/vcs_settings.mako:202 -#: rhodecode/templates/base/vcs_settings.mako:227 +#: 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/changeset/changeset_file_comment.mako:142 @@ -1565,9 +1618,9 @@ msgstr "Zurücksetzen" #: rhodecode/templates/data_table/_dt_elements.mako:198 #: rhodecode/templates/data_table/_dt_elements.mako:210 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:35 -#: rhodecode/templates/files/files_source.mako:39 -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_source.mako:45 +#: rhodecode/templates/files/files_source.mako:49 +#: rhodecode/templates/files/files_source.mako:52 #: rhodecode/templates/pullrequests/pullrequest_show.mako:56 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" @@ -1606,28 +1659,28 @@ msgstr "" msgid "Root repositories only" msgstr "" -#: rhodecode/integrations/views.py:161 +#: rhodecode/integrations/views.py:160 msgid "{repo_name} repository" msgstr "" -#: rhodecode/integrations/views.py:164 +#: rhodecode/integrations/views.py:163 msgid "{repo_group_name} repo group" msgstr "" -#: rhodecode/integrations/views.py:171 +#: rhodecode/integrations/views.py:170 msgid "{name} integration" msgstr "" -#: rhodecode/integrations/views.py:185 +#: rhodecode/integrations/views.py:184 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:265 +#: rhodecode/integrations/views.py:264 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:290 +#: rhodecode/integrations/views.py:289 msgid "Integration {integration_name} updated successfully." msgstr "" @@ -1701,58 +1754,59 @@ msgid "" "Send events such as repo pushes and pull requests to your hipchat channel." msgstr "" -#: rhodecode/integrations/types/slack.py:44 +#: rhodecode/integrations/types/slack.py:46 msgid "Slack service URL" msgstr "" -#: rhodecode/integrations/types/slack.py:45 +#: rhodecode/integrations/types/slack.py:47 msgid "" "This can be setup at the slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:58 rhodecode/templates/login.mako:42 -#: rhodecode/templates/register.mako:40 +#: 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/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:90 -#: rhodecode/templates/base/base.mako:301 +#: rhodecode/templates/admin/users/users.mako:62 +#: rhodecode/templates/base/base.mako:304 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 msgid "Username" msgstr "Benutzername" -#: rhodecode/integrations/types/slack.py:59 +#: rhodecode/integrations/types/slack.py:61 msgid "Username to show notifications coming from." msgstr "" -#: rhodecode/integrations/types/slack.py:68 +#: rhodecode/integrations/types/slack.py:70 msgid "Channel" msgstr "" -#: rhodecode/integrations/types/slack.py:69 +#: rhodecode/integrations/types/slack.py:71 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:78 +#: rhodecode/integrations/types/slack.py:80 msgid "Emoji" msgstr "" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:81 msgid "Emoji to use eg. :studio_microphone:" msgstr "" -#: rhodecode/integrations/types/slack.py:101 +#: rhodecode/integrations/types/slack.py:92 msgid "Slack" msgstr "" -#: rhodecode/integrations/types/slack.py:102 +#: rhodecode/integrations/types/slack.py:93 msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" @@ -1916,25 +1970,25 @@ msgstr "Tag erstellt: %s" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1189 +#: rhodecode/lib/auth.py:1197 #, python-format msgid "IP %s not allowed" msgstr "IP-Adresse %s nicht erlaubt" -#: rhodecode/lib/auth.py:1263 +#: rhodecode/lib/auth.py:1281 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:1311 +#: rhodecode/lib/auth.py:1329 #, python-format msgid "Action not supported for %s." msgstr "Aktion wird für %s nicht unterstützt." -#: rhodecode/lib/auth.py:1348 +#: rhodecode/lib/auth.py:1379 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:557 +#: rhodecode/lib/base.py:549 #, python-format msgid "The repository at %(repo_name)s cannot be located." msgstr "" @@ -1960,36 +2014,16 @@ msgstr "Keine Änderungen erkannt" msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1515 +#: rhodecode/lib/helpers.py:1517 #, python-format msgid " and %s more" msgstr "und %s weitere" -#: rhodecode/lib/helpers.py:1519 +#: rhodecode/lib/helpers.py:1521 msgid "No Files" msgstr "Keine Dateien" -#: rhodecode/lib/helpers.py:1592 -msgid "new file" -msgstr "neue Datei" - -#: rhodecode/lib/helpers.py:1595 -msgid "mod" -msgstr "moderieren" - -#: rhodecode/lib/helpers.py:1598 -msgid "del" -msgstr "löschen" - -#: rhodecode/lib/helpers.py:1601 -msgid "rename" -msgstr "umbennen" - -#: rhodecode/lib/helpers.py:1606 -msgid "chmod" -msgstr "chmod" - -#: rhodecode/lib/helpers.py:1853 +#: rhodecode/lib/helpers.py:1800 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2008,7 +2042,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1873 +#: rhodecode/lib/helpers.py:1820 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the" @@ -2048,9 +2082,9 @@ msgid "in ${val} and ${detail}" msgstr "" #: rhodecode/lib/utils2.py:515 -#: rhodecode/public/js/rhodecode-components.js:33194 -#: rhodecode/public/js/scripts.js:25042 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: 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/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "jetzt gerade" @@ -2083,7 +2117,9 @@ msgstr "jetzt gerade" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/model/db.py:2298 +#: 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 msgid "Repository no access" msgstr "Kein Zugriff auf Repository" @@ -2115,7 +2151,9 @@ msgstr "Kein Zugriff auf Repository" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/model/db.py:2299 +#: 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 msgid "Repository read access" msgstr "Lesender Zugriff auf Repository" @@ -2147,7 +2185,9 @@ msgstr "Lesender Zugriff auf Repository" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/model/db.py:2300 +#: 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 msgid "Repository write access" msgstr "Schreibdender Zugriff auf Repository" @@ -2179,7 +2219,9 @@ msgstr "Schreibdender Zugriff auf Reposi #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 -#: rhodecode/model/db.py:2301 +#: 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 msgid "Repository admin access" msgstr "Administrativer Zugang zum Repository" @@ -2251,7 +2293,9 @@ msgstr "RhodeCode Administrator" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/model/db.py:2319 +#: 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 msgid "Repository creation disabled" msgstr "Repository erstelllung deaktiviert" @@ -2283,7 +2327,9 @@ msgstr "Repository erstelllung deaktivie #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 -#: rhodecode/model/db.py:2320 +#: 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 msgid "Repository creation enabled" msgstr "Repository erstellung aktiviert" @@ -2315,7 +2361,9 @@ msgstr "Repository erstellung aktiviert" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 -#: rhodecode/model/db.py:2324 +#: 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 msgid "Repository forking disabled" msgstr "Repository Forken deaktiviert" @@ -2347,7 +2395,9 @@ msgstr "Repository Forken deaktiviert" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/model/db.py:2325 +#: 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 msgid "Repository forking enabled" msgstr "Repository Forken aktiviert" @@ -2400,7 +2450,9 @@ msgstr "Registrierung neuer Benutzer in #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 -#: rhodecode/model/db.py:3009 +#: 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 msgid "Not Reviewed" msgstr "Nicht Begutachtet" @@ -2432,7 +2484,9 @@ msgstr "Nicht Begutachtet" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 -#: rhodecode/model/db.py:3010 +#: 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 msgid "Approved" msgstr "Akzeptiert" @@ -2464,7 +2518,9 @@ msgstr "Akzeptiert" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 -#: rhodecode/model/db.py:3011 +#: 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 msgid "Rejected" msgstr "Abgelehnt" @@ -2496,7 +2552,9 @@ msgstr "Abgelehnt" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 -#: rhodecode/model/db.py:3012 +#: 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 msgid "Under Review" msgstr "In Begutachtung" @@ -2525,7 +2583,9 @@ msgstr "In Begutachtung" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/model/db.py:2303 +#: 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 msgid "Repository group no access" msgstr "" @@ -2554,7 +2614,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/model/db.py:2304 +#: 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 msgid "Repository group read access" msgstr "" @@ -2583,7 +2645,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/model/db.py:2305 +#: 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 msgid "Repository group write access" msgstr "" @@ -2612,7 +2676,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 -#: rhodecode/model/db.py:2306 +#: 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 msgid "Repository group admin access" msgstr "" @@ -2640,7 +2706,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/model/db.py:2308 +#: 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 msgid "User group no access" msgstr "" @@ -2668,7 +2736,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 -#: rhodecode/model/db.py:2309 +#: 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 msgid "User group read access" msgstr "" @@ -2696,7 +2766,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/model/db.py:2310 +#: 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 msgid "User group write access" msgstr "" @@ -2724,7 +2796,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/model/db.py:2311 +#: 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 msgid "User group admin access" msgstr "" @@ -2752,7 +2826,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/model/db.py:2313 +#: 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 msgid "Repository Group creation disabled" msgstr "" @@ -2780,7 +2856,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/model/db.py:2314 +#: 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 msgid "Repository Group creation enabled" msgstr "" @@ -2808,7 +2886,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/model/db.py:2316 +#: 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 msgid "User Group creation disabled" msgstr "" @@ -2836,7 +2916,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/model/db.py:2317 +#: 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 msgid "User Group creation enabled" msgstr "" @@ -2864,7 +2946,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 -#: rhodecode/model/db.py:2327 +#: 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 msgid "Registration disabled" msgstr "" @@ -2892,7 +2976,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/model/db.py:2328 +#: 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 msgid "User Registration with manual account activation" msgstr "" @@ -2920,7 +3006,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/model/db.py:2329 +#: 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 msgid "User Registration with automatic account activation" msgstr "" @@ -2948,7 +3036,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 -#: rhodecode/model/db.py:2335 rhodecode/model/permission.py:95 +#: 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 msgid "Manual activation of external account" msgstr "" @@ -2976,7 +3066,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 -#: rhodecode/model/db.py:2336 rhodecode/model/permission.py:96 +#: 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 msgid "Automatic activation of external account" msgstr "" @@ -2998,7 +3090,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/model/db.py:2321 +#: 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 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3021,7 +3115,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/model/db.py:2322 +#: 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 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3041,7 +3137,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/model/db.py:2296 +#: 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 msgid "RhodeCode Super Administrator" msgstr "" @@ -3058,7 +3156,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 -#: rhodecode/model/db.py:2338 +#: 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 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3075,7 +3175,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 -#: rhodecode/model/db.py:2339 +#: 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 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3083,7 +3185,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 rhodecode/model/db.py:913 +#: 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 msgid "all" msgstr "" @@ -3091,7 +3195,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 rhodecode/model/db.py:914 +#: 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 msgid "http/web interface" msgstr "" @@ -3099,7 +3205,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 rhodecode/model/db.py:915 +#: 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 msgid "vcs (git/hg/svn protocol)" msgstr "" @@ -3107,7 +3215,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 rhodecode/model/db.py:916 +#: 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 msgid "api calls" msgstr "" @@ -3115,7 +3225,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 rhodecode/model/db.py:917 +#: 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 msgid "feed access" msgstr "" @@ -3124,84 +3236,70 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 -#: rhodecode/model/db.py:2067 +#: 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 msgid "No parent" msgstr "" -#: rhodecode/lib/index/whoosh.py:148 +#: 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 +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 +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 +msgid "Password reset disabled" +msgstr "" + +#: rhodecode/lib/index/whoosh.py:149 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:150 +#: rhodecode/lib/index/whoosh.py:151 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:155 +#: rhodecode/lib/index/whoosh.py:156 msgid "An error occurred during this search operation" msgstr "Während dieser Suche trat ein Fehler auf" -#: rhodecode/lib/index/whoosh.py:163 -msgid "Index Type" -msgstr "" - #: rhodecode/lib/index/whoosh.py:164 +msgid "Index Type" +msgstr "" + +#: rhodecode/lib/index/whoosh.py:165 msgid "File Index" msgstr "" -#: rhodecode/lib/index/whoosh.py:165 rhodecode/lib/index/whoosh.py:170 +#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171 msgid "Indexed documents" msgstr "" -#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172 +#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173 msgid "Last update" msgstr "" -#: rhodecode/lib/index/whoosh.py:169 +#: rhodecode/lib/index/whoosh.py:170 msgid "Commit index" msgstr "" -#: rhodecode/login/views.py:249 rhodecode/login/views.py:311 -msgid "Bad captcha" -msgstr "" - -#: rhodecode/login/views.py:258 -msgid "You have successfully registered with RhodeCode" -msgstr "Du hast dich erfolgreich bei RhodeCode angemeldet" - -#: rhodecode/login/views.py:300 -msgid "Password reset has been disabled." -msgstr "" - -#: rhodecode/login/views.py:327 -msgid "Your password reset link was sent" -msgstr "Ihr Passwort Zurücksetzen Link wurde versendet" - -#: rhodecode/login/views.py:351 -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/model/comment.py:367 -msgid "made a comment" -msgstr "" - #: rhodecode/model/comment.py:368 +msgid "made a comment" +msgstr "" + +#: rhodecode/model/comment.py:369 msgid "Show it now" msgstr "" -#: rhodecode/model/db.py:2331 -msgid "Password reset enabled" -msgstr "" - -#: rhodecode/model/db.py:2332 -msgid "Password reset hidden" -msgstr "" - -#: rhodecode/model/db.py:2333 -msgid "Password reset disabled" -msgstr "" - #: rhodecode/model/forms.py:85 msgid "Please enter a login" msgstr "Bitte einen Benutzernamen eingeben" @@ -3336,9 +3434,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:103 -#: rhodecode/templates/base/base.mako:406 -#: rhodecode/templates/base/base.mako:413 +#: rhodecode/templates/admin/users/users.mako:75 +#: rhodecode/templates/base/base.mako:409 +#: rhodecode/templates/base/base.mako:416 msgid "Admin" msgstr "Admin" @@ -3369,74 +3467,74 @@ msgstr "" msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:77 +#: rhodecode/model/pull_request.py:78 msgid "This pull request can be automatically merged." msgstr "" -#: rhodecode/model/pull_request.py:79 +#: rhodecode/model/pull_request.py:80 msgid "This pull request cannot be merged because of an unhandled exception." msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:83 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:84 +#: rhodecode/model/pull_request.py:85 msgid "This pull request could not be merged because push to target failed." msgstr "" -#: rhodecode/model/pull_request.py:87 +#: rhodecode/model/pull_request.py:88 msgid "This pull request cannot be merged because the target is not a head." msgstr "" -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:91 msgid "" "This pull request cannot be merged because the source contains more branches" " than the target." msgstr "" -#: rhodecode/model/pull_request.py:93 +#: rhodecode/model/pull_request.py:94 msgid "" "This pull request cannot be merged because the target has multiple heads." msgstr "" -#: rhodecode/model/pull_request.py:96 +#: rhodecode/model/pull_request.py:97 msgid "" "This pull request cannot be merged because the target repository is locked." msgstr "" -#: rhodecode/model/pull_request.py:99 +#: rhodecode/model/pull_request.py:100 msgid "" "This pull request cannot be merged because the target or the source " "reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:102 +#: rhodecode/model/pull_request.py:103 msgid "" "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:105 +#: rhodecode/model/pull_request.py:106 msgid "" "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:108 +#: rhodecode/model/pull_request.py:109 msgid "" "This pull request cannot be merged because of conflicts related to sub " "repositories." msgstr "" -#: rhodecode/model/pull_request.py:114 +#: rhodecode/model/pull_request.py:115 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:116 +#: rhodecode/model/pull_request.py:117 msgid "Pull request update failed because of an unknown error." msgstr "" -#: rhodecode/model/pull_request.py:118 -msgid "No update needed because the source reference is already up to date." +#: rhodecode/model/pull_request.py:119 +msgid "No update needed because the source and target have not changed." msgstr "" #: rhodecode/model/pull_request.py:121 @@ -3467,51 +3565,51 @@ msgstr "" msgid "Pull request merged and closed" msgstr "Pullrequest zusammengeführt und geschlossen" -#: rhodecode/model/pull_request.py:1041 +#: rhodecode/model/pull_request.py:1087 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1043 +#: rhodecode/model/pull_request.py:1089 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:1055 +#: rhodecode/model/pull_request.py:1101 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1073 +#: rhodecode/model/pull_request.py:1119 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1076 +#: rhodecode/model/pull_request.py:1122 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1233 rhodecode/model/scm.py:790 +#: rhodecode/model/pull_request.py:1279 rhodecode/model/scm.py:790 msgid "Bookmarks" msgstr "Lesezeichen" -#: rhodecode/model/pull_request.py:1238 +#: rhodecode/model/pull_request.py:1284 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1241 +#: rhodecode/model/pull_request.py:1287 msgid "Closed Branches" msgstr "" -#: rhodecode/model/pull_request.py:1364 +#: rhodecode/model/pull_request.py:1411 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1375 +#: rhodecode/model/pull_request.py:1424 msgid "Pull request reviewer approval is pending." msgstr "Reviewer Zustimmung fehlt." -#: rhodecode/model/pull_request.py:1390 +#: rhodecode/model/pull_request.py:1439 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1393 +#: rhodecode/model/pull_request.py:1442 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" @@ -3519,36 +3617,36 @@ msgstr "" msgid "latest tip" msgstr "" -#: rhodecode/model/user.py:125 +#: rhodecode/model/user.py:126 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:291 +#: rhodecode/model/user.py:292 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " "application" msgstr "" -#: rhodecode/model/user.py:464 +#: rhodecode/model/user.py:462 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:472 +#: rhodecode/model/user.py:470 #, 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:481 +#: rhodecode/model/user.py:479 #, 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:490 +#: rhodecode/model/user.py:488 #, python-format msgid "" "user \"%s\" still owns %s user groups and cannot be removed. Switch owners " @@ -3724,7 +3822,7 @@ msgstr "Diese EMail Addresse ist schon i #: rhodecode/model/validators.py:881 #, python-format msgid "e-mail \"%(email)s\" does not exist." -msgstr "EMail Addresse \"%(email)s\" existiert nicht." +msgstr "E-Mail-Adresse \"%(email)s\" existiert nicht." #: rhodecode/model/validators.py:902 #, python-format @@ -3881,369 +3979,371 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:31198 -#: rhodecode/public/js/scripts.js:23046 +#: 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/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33129 -#: rhodecode/public/js/scripts.js:24977 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: 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/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33130 -#: rhodecode/public/js/scripts.js:24978 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: 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/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33131 -#: rhodecode/public/js/scripts.js:24979 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: 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/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33132 -#: rhodecode/public/js/scripts.js:24980 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: 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/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33133 -#: rhodecode/public/js/scripts.js:24981 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: 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/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33134 -#: rhodecode/public/js/scripts.js:24982 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: 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/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33154 -#: rhodecode/public/js/scripts.js:25002 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: 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/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33162 -#: rhodecode/public/js/scripts.js:25010 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: 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/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33174 -#: rhodecode/public/js/scripts.js:25022 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: 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/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33176 -#: rhodecode/public/js/scripts.js:25024 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: 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/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33180 -#: rhodecode/public/js/scripts.js:25028 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: 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/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33182 -#: rhodecode/public/js/scripts.js:25030 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: 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/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33184 -#: rhodecode/public/js/scripts.js:25032 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: 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/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47027 -#: rhodecode/public/js/scripts.js:38875 +#: 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/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47030 -#: rhodecode/public/js/scripts.js:38878 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: 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/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47033 -#: rhodecode/public/js/scripts.js:38881 +#: 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/select2/translations.js:10 msgid "No matches found" msgstr "Keine Treffer gefunden" -#: rhodecode/public/js/rhodecode-components.js:47036 -#: rhodecode/public/js/scripts.js:38884 +#: 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/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47040 -#: rhodecode/public/js/scripts.js:38888 +#: 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/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47042 -#: rhodecode/public/js/scripts.js:38890 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: 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/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47047 -#: rhodecode/public/js/scripts.js:38895 +#: 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/select2/translations.js:24 msgid "Please enter {0} or more character" -msgstr "" - -#: rhodecode/public/js/rhodecode-components.js:47049 -#: rhodecode/public/js/scripts.js:38897 +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/select2/translations.js:26 msgid "Please enter {0} or more characters" -msgstr "" - -#: rhodecode/public/js/rhodecode-components.js:47054 -#: rhodecode/public/js/scripts.js:38902 +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/select2/translations.js:31 msgid "Please delete {0} character" -msgstr "" - -#: rhodecode/public/js/rhodecode-components.js:47056 -#: rhodecode/public/js/scripts.js:38904 +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/select2/translations.js:33 msgid "Please delete {0} characters" -msgstr "" - -#: rhodecode/public/js/rhodecode-components.js:47060 -#: rhodecode/public/js/scripts.js:38908 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +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/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47062 -#: rhodecode/public/js/scripts.js:38910 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: 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/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47991 -#: rhodecode/public/js/scripts.js:39839 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: 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/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47993 -#: rhodecode/public/js/scripts.js:39841 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: 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/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48426 -#: rhodecode/public/js/scripts.js:40274 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: 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/src/rhodecode/codemirror.js:296 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48445 -#: rhodecode/public/js/scripts.js:40293 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: 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/src/rhodecode/codemirror.js:315 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48464 -#: rhodecode/public/js/scripts.js:40312 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: 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/src/rhodecode/codemirror.js:334 +#: rhodecode/templates/email_templates/commit_comment.mako:99 +#: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48484 -#: rhodecode/public/js/scripts.js:40332 +#: 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/src/rhodecode/codemirror.js:354 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48848 -#: rhodecode/public/js/scripts.js:40696 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/comments.js:123 +#: 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/src/rhodecode/comments.js:125 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48927 -#: rhodecode/public/js/scripts.js:40775 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 -#: rhodecode/public/js/src/rhodecode/comments.js:202 +#: 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/src/rhodecode/comments.js:209 msgid "Status Review" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48941 -#: rhodecode/public/js/scripts.js:40789 +#: 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/src/rhodecode/comments.js:216 +#: rhodecode/public/js/src/rhodecode/comments.js:224 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49089 -#: rhodecode/public/js/scripts.js:40937 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/comments.js:364 +#: 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/src/rhodecode/comments.js:381 msgid "Submitting..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49140 -#: rhodecode/public/js/scripts.js:40988 +#: 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/src/rhodecode/comments.js:415 +#: rhodecode/public/js/src/rhodecode/comments.js:432 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49245 -#: rhodecode/public/js/scripts.js:41093 +#: 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/src/rhodecode/comments.js:520 +#: rhodecode/public/js/src/rhodecode/comments.js:537 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49316 -#: rhodecode/public/js/scripts.js:41164 +#: 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/src/rhodecode/comments.js:591 +#: 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:49393 -#: rhodecode/public/js/scripts.js:41241 +#: 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/src/rhodecode/comments.js:668 +#: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49507 -#: rhodecode/public/js/scripts.js:41355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 -#: rhodecode/public/js/src/rhodecode/comments.js:782 +#: 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/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49713 -#: rhodecode/public/js/scripts.js:41561 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: 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/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49715 -#: rhodecode/public/js/scripts.js:41563 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: 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/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49724 -#: rhodecode/public/js/scripts.js:41572 +#: 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/src/rhodecode/files.js:161 msgid "No matching files" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49859 -#: rhodecode/public/js/scripts.js:41707 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: 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/src/rhodecode/files.js:296 msgid "Selection link" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49899 -#: rhodecode/public/js/scripts.js:41747 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: 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/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49900 -#: rhodecode/public/js/scripts.js:41748 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 +#: 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/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49909 -#: rhodecode/public/js/scripts.js:41757 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: 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/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49910 -#: rhodecode/public/js/scripts.js:41758 +#: 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/src/rhodecode/followers.js:37 msgid "Follow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50366 -#: rhodecode/public/js/scripts.js:42214 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:212 +#: 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 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50937 -#: rhodecode/public/js/scripts.js:42785 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: 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/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50957 -#: rhodecode/public/js/scripts.js:42805 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: 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/src/rhodecode.js:162 msgid "Show more" msgstr "" @@ -4253,14 +4353,14 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:479 -#: rhodecode/templates/codeblocks/diffs.mako:484 +#: rhodecode/templates/codeblocks/diffs.mako:488 +#: rhodecode/templates/codeblocks/diffs.mako:493 msgid "Add another comment" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:320 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:325 msgid "Close" msgstr "" @@ -4318,81 +4418,102 @@ msgstr "" msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +msgid "Saving..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: 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:40 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 -msgid "Show selected commit __S" -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:48 -#: rhodecode/public/js/src/i18n_messages.js:7 -msgid "Switch to chat" -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 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: 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:54 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 -#: rhodecode/templates/admin/auth/auth_settings.mako:71 -msgid "disabled" -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" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 msgid "files" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/templates/pullrequests/pullrequest.mako:108 +msgid "loading..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -msgid "{0} days" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +msgid "{0} out of {1} users" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 msgid "{0} years" msgstr "" +#: rhodecode/public/js/src/math_jax/extensions/HelpDialog.js:19 +msgid "HelpDialog" +msgstr "" + +#: rhodecode/public/js/src/math_jax/jax/output/HTML-CSS/autoload/mglyph.js:19 +msgid "MathML" +msgstr "" + #: rhodecode/public/js/vendors/webcomponentsjs/webcomponents.min.js:11 msgid "UIEvent" msgstr "" @@ -4409,10 +4530,6 @@ msgstr "" msgid "FocusEvent" msgstr "" -#: rhodecode/svn_support/events.py:30 -msgid "Configuration for Apaache mad_dav_svn changed." -msgstr "" - #: rhodecode/templates/index.mako:5 msgid "Dashboard" msgstr "Übersichtsseite" @@ -4470,6 +4587,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:15 #: 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 #: rhodecode/templates/base/perms_summary.mako:102 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 @@ -4482,22 +4600,25 @@ msgstr "Name" #: rhodecode/templates/index_base.mako:100 #: rhodecode/templates/index_base.mako:125 #: rhodecode/templates/admin/gists/index.mako:114 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:81 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 -#: rhodecode/templates/admin/repos/repo_add_base.mako:32 +#: 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/repos.mako:57 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 #: rhodecode/templates/admin/user_groups/user_groups.mako:57 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +#: 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/base/issue_tracker_settings.mako:10 #: rhodecode/templates/changeset/changeset.mako:53 #: rhodecode/templates/compare/compare_commits.mako:20 -#: rhodecode/templates/email_templates/commit_comment.mako:82 +#: 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 #: rhodecode/templates/files/file_tree_detail.mako:5 @@ -4505,8 +4626,8 @@ msgstr "Name" #: rhodecode/templates/forks/fork.mako:48 #: rhodecode/templates/forks/forks_data.mako:9 #: rhodecode/templates/pullrequests/pullrequest.mako:47 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:158 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:163 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:460 #: rhodecode/templates/summary/components.mako:73 msgid "Description" msgstr "Beschreibung" @@ -4521,7 +4642,8 @@ msgstr "Beschreibung" #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/users/user_edit_groups.mako:65 #: rhodecode/templates/forks/forks_data.mako:7 #: rhodecode/templates/summary/components.mako:195 msgid "Owner" @@ -4542,9 +4664,9 @@ msgstr "Letzte Änderung" #: rhodecode/templates/changelog/changelog_summary_data.mako:8 #: rhodecode/templates/changeset/changeset.mako:36 #: rhodecode/templates/compare/compare_commits.mako:18 -#: rhodecode/templates/email_templates/commit_comment.mako:45 -#: rhodecode/templates/email_templates/commit_comment.mako:81 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: 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/search/search_commit.mako:6 #: rhodecode/templates/tags/tags.mako:66 msgid "Commit" @@ -4559,45 +4681,45 @@ msgstr "" msgid "Home" msgstr "" -#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:34 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:326 +#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:329 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "Einloggen" -#: rhodecode/templates/login.mako:36 +#: rhodecode/templates/login.mako:37 msgid "Go to the registration page to create a new account." msgstr "" -#: rhodecode/templates/login.mako:57 +#: rhodecode/templates/login.mako:58 msgid "Remember me" msgstr "Login Speichern" -#: rhodecode/templates/login.mako:61 +#: rhodecode/templates/login.mako:62 msgid "Forgot your password?" msgstr "Passwort vergessen?" -#: rhodecode/templates/login.mako:65 -#: rhodecode/templates/password_reset.mako:34 +#: rhodecode/templates/login.mako:66 +#: rhodecode/templates/password_reset.mako:35 msgid "Password reset is disabled. Please contact " msgstr "" -#: rhodecode/templates/login.mako:67 -#: rhodecode/templates/password_reset.mako:36 -#: rhodecode/templates/base/base.mako:43 +#: rhodecode/templates/login.mako:68 +#: rhodecode/templates/password_reset.mako:37 +#: rhodecode/templates/base/base.mako:46 #: rhodecode/templates/errors/error_document.mako:64 msgid "Support" msgstr "Support" -#: rhodecode/templates/login.mako:68 -#: rhodecode/templates/password_reset.mako:37 +#: 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 msgid "or" msgstr "" -#: rhodecode/templates/login.mako:70 -#: rhodecode/templates/password_reset.mako:39 +#: rhodecode/templates/login.mako:71 +#: rhodecode/templates/password_reset.mako:40 msgid "an administrator if you need help." msgstr "" @@ -4605,28 +4727,28 @@ msgstr "" msgid "Reset Password" msgstr "" -#: rhodecode/templates/password_reset.mako:46 +#: rhodecode/templates/password_reset.mako:47 msgid "Reset your Password" msgstr "Passwort zurücksetzen" -#: rhodecode/templates/password_reset.mako:47 +#: rhodecode/templates/password_reset.mako:48 msgid "Go to the login page to sign in." msgstr "" -#: rhodecode/templates/password_reset.mako:51 +#: rhodecode/templates/password_reset.mako:52 msgid "Email Address" msgstr "E-Mail-Adresse" -#: rhodecode/templates/password_reset.mako:60 -#: rhodecode/templates/register.mako:84 +#: rhodecode/templates/password_reset.mako:61 +#: rhodecode/templates/register.mako:85 msgid "Captcha" msgstr "Captcha" -#: rhodecode/templates/password_reset.mako:70 +#: rhodecode/templates/password_reset.mako:71 msgid "Send password reset email" msgstr "" -#: rhodecode/templates/password_reset.mako:71 +#: rhodecode/templates/password_reset.mako:72 msgid "Password reset link will be sent to matching email address" msgstr "" @@ -4634,49 +4756,49 @@ msgstr "" msgid "Create an Account" msgstr "" -#: rhodecode/templates/register.mako:34 +#: rhodecode/templates/register.mako:35 msgid "Create an account" msgstr "" -#: rhodecode/templates/register.mako:35 +#: rhodecode/templates/register.mako:36 msgid "Go to the login page to sign in with an existing account." msgstr "" -#: rhodecode/templates/register.mako:54 +#: rhodecode/templates/register.mako:55 msgid "Re-enter password" msgstr "Passwort erneut eingeben" -#: rhodecode/templates/register.mako:61 +#: rhodecode/templates/register.mako:62 #: rhodecode/templates/admin/my_account/my_account_profile.mako:32 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:33 #: 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:94 +#: rhodecode/templates/admin/users/users.mako:66 msgid "First Name" msgstr "Vorname" -#: rhodecode/templates/register.mako:68 +#: rhodecode/templates/register.mako:69 #: rhodecode/templates/admin/my_account/my_account_profile.mako:40 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:42 #: 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:96 +#: rhodecode/templates/admin/users/users.mako:68 msgid "Last Name" msgstr "Nachname" -#: rhodecode/templates/register.mako:96 +#: rhodecode/templates/register.mako:97 msgid "Account activation requires admin approval." msgstr "" -#: rhodecode/templates/register.mako:103 +#: rhodecode/templates/register.mako:104 msgid "Create Account" msgstr "" #: rhodecode/templates/admin/admin.mako:5 #: rhodecode/templates/admin/admin.mako:15 -#: rhodecode/templates/base/base.mako:72 +#: rhodecode/templates/base/base.mako:75 msgid "Admin journal" msgstr "Admin Logbuch" @@ -4685,6 +4807,7 @@ msgid "journal filter..." msgstr "Logbuch filter..." #: rhodecode/templates/admin/admin.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "" @@ -4697,31 +4820,38 @@ msgstr[0] "" msgstr[1] "" #: rhodecode/templates/admin/admin.mako:17 +#: rhodecode/templates/admin/users/user_edit_audit.mako:17 #: rhodecode/templates/journal/journal.mako:17 msgid "Example Queries" msgstr "" #: rhodecode/templates/admin/admin_log.mako:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 #: rhodecode/templates/admin/repos/repos.mako:69 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 -#: rhodecode/templates/admin/user_groups/user_groups.mako:66 -#: rhodecode/templates/admin/users/users.mako:107 -#: rhodecode/templates/files/files_detail.mako:63 +#: 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/files/files_detail.mako:58 msgid "Action" msgstr "Aktion" #: rhodecode/templates/admin/admin_log.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/bookmarks/bookmarks.mako:61 #: rhodecode/templates/branches/branches.mako:60 #: rhodecode/templates/tags/tags.mako:61 @@ -4729,10 +4859,12 @@ 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 msgid "No actions yet" msgstr "Es sind bisher keine Aktionen passiert" @@ -4773,7 +4905,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:135 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 -#: rhodecode/templates/admin/repos/repo_add_base.mako:90 +#: 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 @@ -4783,6 +4915,7 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:120 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:102 #: rhodecode/templates/admin/users/user_add.mako:128 +#: rhodecode/templates/admin/users/user_edit_groups.mako:27 #: rhodecode/templates/admin/users/user_edit_profile.mako:134 #: rhodecode/templates/base/default_perms_box.mako:88 msgid "Save" @@ -4804,18 +4937,18 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/index.mako:110 #: rhodecode/templates/admin/integrations/list.mako:103 -#: rhodecode/templates/admin/repos/repo_add_base.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:75 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "Typ" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 -#: rhodecode/templates/admin/repos/repo_add_base.mako:82 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 msgid "Private Repository" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:86 +#: rhodecode/templates/admin/repos/repo_add_base.mako:97 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:112 #: rhodecode/templates/forks/fork.mako:87 msgid "" @@ -4881,7 +5014,7 @@ msgid "Update Gist" msgstr "" #: rhodecode/templates/admin/gists/edit.mako:102 -#: rhodecode/templates/base/issue_tracker_settings.mako:74 +#: rhodecode/templates/base/issue_tracker_settings.mako:73 #: rhodecode/templates/changeset/changeset_file_comment.mako:385 #: rhodecode/templates/codeblocks/diffs.mako:76 #: rhodecode/templates/files/files_add.mako:102 @@ -4957,8 +5090,8 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:180 #: rhodecode/templates/compare/compare_commits.mako:17 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:304 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:457 #: rhodecode/templates/pullrequests/pullrequests.mako:102 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/tags/tags.mako:63 @@ -5015,7 +5148,7 @@ msgstr "" #: rhodecode/templates/admin/gists/show.mako:56 #: rhodecode/templates/admin/integrations/list.mako:204 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 -#: rhodecode/templates/base/issue_tracker_settings.mako:61 +#: rhodecode/templates/base/issue_tracker_settings.mako:60 #: rhodecode/templates/data_table/_dt_elements.mako:118 #: rhodecode/templates/data_table/_dt_elements.mako:180 #: rhodecode/templates/data_table/_dt_elements.mako:193 @@ -5023,10 +5156,10 @@ msgstr "" #: rhodecode/templates/debug_style/buttons.html:128 #: rhodecode/templates/files/files_add.mako:204 #: rhodecode/templates/files/files_edit.mako:165 -#: rhodecode/templates/files/files_source.mako:38 -#: rhodecode/templates/files/files_source.mako:41 +#: 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:319 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:324 #: rhodecode/templates/users/user_profile.mako:7 msgid "Edit" msgstr "" @@ -5045,7 +5178,7 @@ msgstr "" #: rhodecode/templates/admin/gists/show.mako:91 #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:87 msgid "Show as raw" msgstr "" @@ -5070,8 +5203,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:43 #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 -#: rhodecode/templates/base/base.mako:81 -#: rhodecode/templates/base/base.mako:246 +#: rhodecode/templates/base/base.mako:84 +#: rhodecode/templates/base/base.mako:249 msgid "Settings" msgstr "Einstellungen" @@ -5103,6 +5236,8 @@ msgid "Create new integration" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:104 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14 msgid "Scope" msgstr "" @@ -5172,7 +5307,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:340 +#: rhodecode/templates/base/base.mako:343 msgid "My account" msgstr "Mein Account" @@ -5181,9 +5316,10 @@ msgid "My Account" msgstr "Mein Account" #: rhodecode/templates/admin/my_account/my_account.mako:29 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 -msgid "My Profile" +#: rhodecode/templates/email_templates/user_registration.mako:26 +#: rhodecode/templates/users/user.mako:29 +#: rhodecode/templates/users/user_profile.mako:5 +msgid "Profile" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:31 @@ -5195,12 +5331,9 @@ msgid "OAuth Identities" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:37 -msgid "My Emails" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account.mako:38 -msgid "My Repositories" -msgstr "" +#: rhodecode/templates/admin/users/user_edit.mako:38 +msgid "Emails" +msgstr "E-Mails" #: rhodecode/templates/admin/my_account/my_account.mako:39 msgid "Watched" @@ -5208,81 +5341,82 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:40 #: rhodecode/templates/admin/notifications/notifications.mako:33 -#: rhodecode/templates/base/base.mako:238 +#: rhodecode/templates/base/base.mako:241 msgid "Pull Requests" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:41 -msgid "My Permissions" -msgstr "" +#: 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/user_groups/user_group_edit.mako:34 +#: rhodecode/templates/base/base.mako:80 +msgid "Permissions" +msgstr "Rechte" #: rhodecode/templates/admin/my_account/my_account.mako:42 -msgid "My Live Notifications" +msgid "Live Notifications" msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:3 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 msgid "Authentication Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:7 -msgid "Built-in tokens can be used to authenticate with all possible options." -msgstr "" - #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:8 -msgid "" -"Each token can have a role. VCS tokens can be used together with the " -"authtoken auth plugin for git/hg/svn operations." -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:11 -msgid "Built-in" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:51 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:47 -msgid "expires" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:29 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:26 -#, python-format -msgid "Confirm to reset this auth token: %s" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 -msgid "expired" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:59 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:55 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:8 +msgid "" +"Each token can have a role. Token with a role can be used only in given " +"context, e.g. VCS tokens can be used together with the authtoken auth plugin" +" for git/hg/svn operations only." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:13 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:13 +msgid "Token" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:17 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:17 +msgid "Expiration" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:48 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:44 #, python-format msgid "Confirm to remove this auth token: %s" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:67 -msgid "No additional auth token specified" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:78 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:56 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:52 +msgid "No additional auth tokens specified" +msgstr "Keine zusätzlichen Authentifizierungstoken spezifiziert" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:68 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:64 msgid "New authentication token" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:82 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +msgid "Repository scope works only with tokens with VCS type." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86 #: rhodecode/templates/admin/my_account/my_account_emails.mako:64 #: rhodecode/templates/admin/permissions/permissions_ips.mako:60 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:84 +#: 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 msgid "Add" msgstr "Hinzufügen" +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:128 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:125 +msgid "repository scope" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_emails.mako:5 msgid "Account Emails" msgstr "" @@ -5296,7 +5430,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_emails.mako:30 #, python-format msgid "Confirm to delete this email: %s" -msgstr "" +msgstr "Bestätigen Sie, um diese E-Mail zu löschen: %s" #: rhodecode/templates/admin/my_account/my_account_emails.mako:42 #: rhodecode/templates/admin/users/user_edit_emails.mako:41 @@ -5306,7 +5440,7 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_emails.mako:57 #: rhodecode/templates/admin/users/user_edit_emails.mako:55 msgid "New email address" -msgstr "" +msgstr "Neue E-Mail-Adresse" #: rhodecode/templates/admin/my_account/my_account_notifications.mako:21 msgid "Your Live Notification Settings" @@ -5336,6 +5470,11 @@ msgstr "" msgid "Source type" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 +msgid "My Profile" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_profile.mako:11 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:55 #: rhodecode/templates/admin/users/user_edit_profile.mako:25 @@ -5379,7 +5518,7 @@ msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:38 #: rhodecode/templates/pullrequests/pullrequests.mako:104 msgid "Title" -msgstr "" +msgstr "Titel" #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:47 #: rhodecode/templates/pullrequests/pullrequests.mako:108 @@ -5425,14 +5564,6 @@ msgstr "Benachrichtigungen" msgid "Permissions Administration" msgstr "" -#: 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/user_groups/user_group_edit.mako:34 -#: rhodecode/templates/base/base.mako:77 -msgid "Permissions" -msgstr "Rechte" - #: rhodecode/templates/admin/permissions/permissions.mako:33 msgid "Application" msgstr "" @@ -5572,8 +5703,8 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:74 -#: rhodecode/templates/base/base.mako:148 +#: rhodecode/templates/base/base.mako:77 +#: rhodecode/templates/base/base.mako:151 msgid "Repository groups" msgstr "" @@ -5587,7 +5718,7 @@ msgid "Group Parent" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 -#: rhodecode/templates/admin/repos/repo_add_base.mako:55 +#: rhodecode/templates/admin/repos/repo_add_base.mako:66 msgid "Copy Parent Group Permissions" msgstr "" @@ -5704,7 +5835,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:107 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117 -#: rhodecode/templates/base/issue_tracker_settings.mako:84 +#: rhodecode/templates/base/issue_tracker_settings.mako:83 msgid "Add new" msgstr "" @@ -5767,52 +5898,48 @@ msgid "Import Existing Repository ?" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:193 +#: rhodecode/templates/base/base.mako:196 msgid "Clone from" msgstr "Clone von" -#: rhodecode/templates/admin/repos/repo_add_base.mako:27 -msgid "Optional http[s] URL from which to clone a repository." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_add_base.mako:36 +#: rhodecode/templates/admin/repos/repo_add_base.mako:47 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:102 #: rhodecode/templates/forks/fork.mako:52 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:41 +#: rhodecode/templates/admin/repos/repo_add_base.mako:52 msgid "Repository Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 +#: 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)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:50 +#: rhodecode/templates/admin/repos/repo_add_base.mako:61 #: rhodecode/templates/forks/fork.mako:67 msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:59 +#: rhodecode/templates/admin/repos/repo_add_base.mako:70 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:68 +#: rhodecode/templates/admin/repos/repo_add_base.mako:79 msgid "Set the type of repository to create." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:73 +#: rhodecode/templates/admin/repos/repo_add_base.mako:84 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:70 #: rhodecode/templates/forks/fork.mako:73 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:77 +#: rhodecode/templates/admin/repos/repo_add_base.mako:88 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." @@ -5856,7 +5983,16 @@ msgstr "Entfernt" msgid "Statistics" msgstr "Statistiken" -#: rhodecode/templates/admin/repos/repo_edit.mako:87 +#: rhodecode/templates/admin/repos/repo_edit.mako:75 +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3 +msgid "Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:78 +msgid "Strip" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:93 msgid "Reviewers" msgstr "" @@ -5883,12 +6019,10 @@ msgid "This repository is a fork of %(re msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 -#: rhodecode/templates/admin/repos/repo_edit_fork.mako:5 msgid "Set" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:39 -#: rhodecode/templates/admin/repos/repo_edit_fork.mako:9 msgid "Manually set this repository as a fork of another from the list" msgstr "" @@ -6025,10 +6159,11 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:37 #: 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:62 +#: 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:101 +#: rhodecode/templates/admin/users/users.mako:73 msgid "Active" msgstr "Aktiv" @@ -6104,6 +6239,23 @@ 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 +msgid "No maintenance tasks for this repo available" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:26 +msgid "Run Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:41 +msgid "Performing Maintenance" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:5 msgid "Repository Permissions" msgstr "" @@ -6124,16 +6276,21 @@ msgstr "" msgid "Remote mirror url" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 +#: 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 msgid "Pull changes from remote location" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:22 msgid "Confirm to pull changes from remote side" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:19 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:27 msgid "This repository does not have any remote mirror url set." msgstr "" @@ -6257,11 +6414,80 @@ msgstr "" msgid "Confirm to remove current statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:3 +msgid "Strip commits from repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:7 +#, python-format +msgid "Please provide up to %d commits commits to strip" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:9 +msgid "" +"In the first step commits will be verified for existance in the repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:10 +msgid "In the second step, correct commits will be available for stripping" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:16 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:52 +msgid "Enter full 40 character commit sha" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:18 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:54 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:95 +msgid "Add another commit" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:27 +msgid "Check commits" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:33 +msgid "Sorry this functionality is not available for SVN repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:46 +msgid "Remove" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:112 +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 +msgid " commit verified positive" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:131 +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" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:13 msgid "Select to inherit global vcs settings." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:45 +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:43 #: rhodecode/templates/admin/settings/settings_global.mako:139 #: rhodecode/templates/admin/settings/settings_labs.mako:48 #: rhodecode/templates/admin/settings/settings_vcs.mako:13 @@ -6287,63 +6513,63 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_email.mako:3 msgid "Email Configuration" -msgstr "" +msgstr "E-Mail Konfiguration" #: rhodecode/templates/admin/settings/settings_email.mako:8 msgid "Email prefix" -msgstr "" +msgstr "E-Mail Prefix" #: rhodecode/templates/admin/settings/settings_email.mako:9 msgid "RhodeCode email from" -msgstr "" +msgstr "RodeCode E-Mail Absender" #: rhodecode/templates/admin/settings/settings_email.mako:10 msgid "Error email from" -msgstr "" +msgstr "Fehler E-Mail Absender" #: rhodecode/templates/admin/settings/settings_email.mako:11 msgid "Error email recipients" -msgstr "" +msgstr "Fehler E-Mail Empfänger" #: rhodecode/templates/admin/settings/settings_email.mako:13 msgid "SMTP server" -msgstr "" +msgstr "SMTP Server" #: rhodecode/templates/admin/settings/settings_email.mako:14 msgid "SMTP username" -msgstr "" +msgstr "SMTP Benutzername" #: rhodecode/templates/admin/settings/settings_email.mako:15 msgid "SMTP password" -msgstr "" +msgstr "SMTP Passwort" #: rhodecode/templates/admin/settings/settings_email.mako:16 msgid "SMTP port" -msgstr "" +msgstr "SMTP Port" #: rhodecode/templates/admin/settings/settings_email.mako:18 msgid "SMTP use TLS" -msgstr "" +msgstr "SMTP verwendet TLS" #: rhodecode/templates/admin/settings/settings_email.mako:19 msgid "SMTP use SSL" -msgstr "" +msgstr "SMTP verwendet SSL" #: rhodecode/templates/admin/settings/settings_email.mako:20 msgid "SMTP auth" -msgstr "" +msgstr "SMTP Autorität" #: rhodecode/templates/admin/settings/settings_email.mako:34 msgid "Test Email" -msgstr "" +msgstr "E-Mail Test" #: rhodecode/templates/admin/settings/settings_email.mako:40 msgid "enter valid email" -msgstr "" +msgstr "Geben Sie eine gültige E-Mail-Adresse ein" #: rhodecode/templates/admin/settings/settings_email.mako:44 msgid "Send an auto-generated email from this server to above email..." -msgstr "" +msgstr "Sendet eine automatisch generierte E-Mail an die oben angegebene Adresse..." #: rhodecode/templates/admin/settings/settings_global.mako:5 msgid "Branding" @@ -6352,7 +6578,7 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:16 msgid "" "Set a custom title for your RhodeCode instance (limited to 40 characters)." -msgstr "" +msgstr "Setze einen eigenen Titel für die RhodeCode Instanz (beschränkt auf 40 Zeichen)" #: rhodecode/templates/admin/settings/settings_global.mako:20 msgid "HTTP[S] authentication realm" @@ -6609,7 +6835,7 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_system.mako:3 msgid "Checking for updates..." -msgstr "" +msgstr "Suche nach Updates..." #: rhodecode/templates/admin/settings/settings_system.mako:11 msgid "create summary snapshot" @@ -6798,8 +7024,8 @@ msgstr "Benutzergruppe hinzufügen" #: rhodecode/templates/admin/user_groups/user_group_add.mako:13 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:76 -#: rhodecode/templates/base/base.mako:151 +#: rhodecode/templates/base/base.mako:79 +#: rhodecode/templates/base/base.mako:154 msgid "User groups" msgstr "Benutzergruppen" @@ -6840,30 +7066,72 @@ msgid "Members" msgstr "Mitglieder" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:9 +msgid "Automatic member sync" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:11 msgid "Assigned to repositories" msgstr "Zugewiesen zu Repositories" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:10 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:12 msgid "Assigned to repo groups" msgstr "Zugewiesen zu Repository-Gruppen" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:17 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:19 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6 #, python-format msgid "User Group: %s" msgstr "Benutzergruppe: %s" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:26 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:29 +msgid "Group members sync" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:36 +msgid "This group is set to be automatically synchronised." +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 +msgid "This group is not set to be automatically synchronised" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51 +msgid "Disable synchronization" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53 +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 msgid "Delete User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:32 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:81 #, 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:34 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:83 msgid "Delete This User Group" msgstr "" @@ -6889,6 +7157,7 @@ msgid "No members yet" msgstr "Noch keine Mitglieder" #: rhodecode/templates/admin/user_groups/user_groups.mako:5 +#: rhodecode/templates/admin/users/user_edit_groups.mako:6 msgid "User groups administration" msgstr "Verwaltung der Benutzergruppen" @@ -6896,18 +7165,22 @@ msgstr "Verwaltung der Benutzergruppen" msgid "user groups" msgstr "Benutzergruppen" +#: rhodecode/templates/admin/user_groups/user_groups.mako:62 +msgid "Sync" +msgstr "" + #: rhodecode/templates/admin/users/user_add.mako:5 msgid "Add user" msgstr "Benutzer hinzufügen" #: rhodecode/templates/admin/users/user_add.mako:13 #: rhodecode/templates/admin/users/user_edit.mako:14 -#: rhodecode/templates/base/base.mako:75 +#: rhodecode/templates/base/base.mako:78 msgid "Users" msgstr "Benutzer" #: rhodecode/templates/admin/users/user_add.mako:15 -#: rhodecode/templates/admin/users/users.mako:27 +#: rhodecode/templates/admin/users/users.mako:28 msgid "Add User" msgstr "Benutzer hinzufügen" @@ -6959,14 +7232,18 @@ msgstr "" msgid "Auth tokens" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:38 -msgid "Emails" -msgstr "E-Mails" - #: rhodecode/templates/admin/users/user_edit.mako:39 msgid "Ip Whitelist" msgstr "" +#: rhodecode/templates/admin/users/user_edit.mako:40 +msgid "User Groups Management" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.mako:41 +msgid "User audit" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 #: rhodecode/templates/admin/users/user_edit_profile.mako:106 msgid "Source of Record" @@ -6977,7 +7254,7 @@ msgid "Last login" msgstr "Letzte Anmeldung" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 -#: rhodecode/templates/admin/users/users.mako:99 +#: rhodecode/templates/admin/users/users.mako:71 msgid "Last activity" msgstr "Letzte Aktivität" @@ -7086,20 +7363,21 @@ msgid "" "will delete the user's repositories!" msgstr "" -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 -msgid "Authentication Access Tokens" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:63 -msgid "No additional auth tokens specified" -msgstr "Keine zusätzlichen Authentifizierungstoken spezifiziert" - -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:75 -msgid "New auth token" +#: rhodecode/templates/admin/users/user_edit_audit.mako:7 +msgid "User Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +msgid "audit filter..." msgstr "" #: rhodecode/templates/admin/users/user_edit_emails.mako:5 msgid "Additional Email Addresses" +msgstr "Weitere E-Mail-Adressen" + +#: rhodecode/templates/admin/users/user_edit_groups.mako:12 +#, python-format +msgid "Add `%s` to user group" msgstr "" #: rhodecode/templates/admin/users/user_edit_ips.mako:3 @@ -7158,98 +7436,98 @@ msgstr "" msgid "Users administration" msgstr "Benutzerverwaltung" -#: rhodecode/templates/admin/users/users.mako:105 +#: rhodecode/templates/admin/users/users.mako:77 msgid "Auth type" msgstr "" -#: rhodecode/templates/base/base.mako:50 +#: rhodecode/templates/base/base.mako:53 #, python-format msgid "RhodeCode instance id: %s" msgstr "" -#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:81 msgid "Authentication" msgstr "Authentifizierung" -#: rhodecode/templates/base/base.mako:80 +#: rhodecode/templates/base/base.mako:83 msgid "Defaults" msgstr "Standards" -#: rhodecode/templates/base/base.mako:98 +#: rhodecode/templates/base/base.mako:101 #: rhodecode/templates/files/files_pjax.mako:24 #: rhodecode/templates/summary/components.mako:42 msgid "Show More" msgstr "" -#: rhodecode/templates/base/base.mako:185 +#: rhodecode/templates/base/base.mako:188 msgid "Fork of" msgstr "" -#: rhodecode/templates/base/base.mako:202 +#: rhodecode/templates/base/base.mako:205 #, python-format msgid "Repository locked by %(user)s" msgstr "" -#: rhodecode/templates/base/base.mako:207 +#: rhodecode/templates/base/base.mako:210 msgid "Repository not locked. Pull repository to lock it." msgstr "" -#: rhodecode/templates/base/base.mako:225 +#: rhodecode/templates/base/base.mako:228 #: rhodecode/templates/data_table/_dt_elements.mako:12 #: rhodecode/templates/data_table/_dt_elements.mako:13 #: rhodecode/templates/data_table/_dt_elements.mako:153 msgid "Summary" msgstr "Zusammenfassung" -#: rhodecode/templates/base/base.mako:226 +#: rhodecode/templates/base/base.mako:229 #: rhodecode/templates/data_table/_dt_elements.mako:17 #: rhodecode/templates/data_table/_dt_elements.mako:18 msgid "Changelog" msgstr "" -#: rhodecode/templates/base/base.mako:227 +#: rhodecode/templates/base/base.mako:230 #: rhodecode/templates/data_table/_dt_elements.mako:22 #: rhodecode/templates/data_table/_dt_elements.mako:23 #: rhodecode/templates/files/files.mako:15 msgid "Files" msgstr "Dateien" -#: rhodecode/templates/base/base.mako:229 +#: rhodecode/templates/base/base.mako:232 #: rhodecode/templates/bookmarks/bookmarks.mako:68 #: rhodecode/templates/branches/branches.mako:67 #: rhodecode/templates/tags/tags.mako:68 msgid "Compare" msgstr "Vergleiche" -#: rhodecode/templates/base/base.mako:234 +#: rhodecode/templates/base/base.mako:237 #, python-format msgid "Show Pull Requests for %s" msgstr "Zeige Pullrequests für %s" -#: rhodecode/templates/base/base.mako:243 +#: rhodecode/templates/base/base.mako:246 msgid "Options" msgstr "Optionen" -#: rhodecode/templates/base/base.mako:250 +#: rhodecode/templates/base/base.mako:253 #: rhodecode/templates/forks/forks_data.mako:30 msgid "Compare fork" msgstr "Vergleiche Fork" -#: rhodecode/templates/base/base.mako:253 -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:256 +#: rhodecode/templates/base/base.mako:403 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "Suche" -#: rhodecode/templates/base/base.mako:257 +#: rhodecode/templates/base/base.mako:260 msgid "Unlock" msgstr "Entsperren" -#: rhodecode/templates/base/base.mako:259 +#: rhodecode/templates/base/base.mako:262 msgid "Lock" msgstr "Sperren" -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:267 #: rhodecode/templates/data_table/_dt_elements.mako:27 #: rhodecode/templates/data_table/_dt_elements.mako:28 #: rhodecode/templates/forks/forks_data.mako:8 @@ -7259,77 +7537,77 @@ msgid_plural "Forks" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/base/base.mako:265 +#: rhodecode/templates/base/base.mako:268 msgid "Create Pull Request" msgstr "Pullrequest erstellen" -#: rhodecode/templates/base/base.mako:287 +#: rhodecode/templates/base/base.mako:290 msgid "Sign in" msgstr "Anmelden" -#: rhodecode/templates/base/base.mako:295 +#: rhodecode/templates/base/base.mako:298 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:312 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "(Kennwort vergessen?)" -#: rhodecode/templates/base/base.mako:322 +#: 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:342 +#: rhodecode/templates/base/base.mako:345 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:346 +#: rhodecode/templates/base/base.mako:349 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:382 +#: rhodecode/templates/base/base.mako:385 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:383 +#: rhodecode/templates/base/base.mako:386 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:14 msgid "Journal" msgstr "Logbuch" -#: rhodecode/templates/base/base.mako:388 +#: rhodecode/templates/base/base.mako:391 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:389 +#: rhodecode/templates/base/base.mako:392 msgid "Public journal" msgstr "Öffentliches Logbuch" -#: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/base/base.mako:397 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:395 +#: rhodecode/templates/base/base.mako:398 msgid "Gists" msgstr "" -#: rhodecode/templates/base/base.mako:399 +#: rhodecode/templates/base/base.mako:402 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:408 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:412 +#: rhodecode/templates/base/base.mako:415 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:422 -#: rhodecode/templates/base/base.mako:423 +#: rhodecode/templates/base/base.mako:425 +#: rhodecode/templates/base/base.mako:426 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7351,15 +7629,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:480 +#: rhodecode/templates/base/base.mako:483 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:533 +#: rhodecode/templates/base/base.mako:536 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:541 +#: rhodecode/templates/base/base.mako:544 msgid "Site-wide shortcuts" msgstr "" @@ -7428,9 +7706,7 @@ msgid "User Group Creation" msgstr "" #: rhodecode/templates/base/default_perms_box.mako:72 -msgid "" -"Permission to allow user group creation. When disabled, user group admins " -"can still create subgroups within their user groups." +msgid "Permission to allow user group creation." msgstr "" #: rhodecode/templates/base/default_perms_box.mako:78 @@ -7455,19 +7731,19 @@ msgid "" "permission by members of user groups." msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:22 +#: rhodecode/templates/base/issue_tracker_settings.mako:21 msgid "Read more" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:92 +#: rhodecode/templates/base/issue_tracker_settings.mako:91 msgid "New Entry" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:96 +#: rhodecode/templates/base/issue_tracker_settings.mako:95 msgid "Confirm to remove this pattern:" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:192 +#: 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 @@ -7477,7 +7753,7 @@ msgstr "" msgid "Preview" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:193 +#: rhodecode/templates/base/issue_tracker_settings.mako:192 msgid "Test Pattern Preview" msgstr "" @@ -7567,7 +7843,7 @@ msgstr "" #: rhodecode/templates/base/vcs_settings.mako:29 msgid "Main Storage Location" -msgstr "" +msgstr "Hauptablageort" #: rhodecode/templates/base/vcs_settings.mako:37 msgid "" @@ -7625,101 +7901,130 @@ msgstr "" msgid "Enable largefiles extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:99 +#: rhodecode/templates/base/vcs_settings.mako:100 msgid "Enable Largefiles extensions for all repositories." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:103 +#: rhodecode/templates/base/vcs_settings.mako:102 +msgid "Enable Largefiles extensions for this repository." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:113 +msgid "" +"Filesystem location where Mercurial largefile objects should be stored." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:119 msgid "Set repositories as publishing" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:103 +#: rhodecode/templates/base/vcs_settings.mako:119 msgid "Set repository as publishing" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:106 +#: rhodecode/templates/base/vcs_settings.mako:122 msgid "" "When this is enabled all commits in the repository are seen as public " "commits by clients." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:111 +#: rhodecode/templates/base/vcs_settings.mako:127 msgid "Enable hgsubversion extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:114 +#: rhodecode/templates/base/vcs_settings.mako:130 msgid "" "Requires hgsubversion library to be installed. Allows cloning remote SVN " "repositories and migrates them to Mercurial type." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:123 +#: rhodecode/templates/base/vcs_settings.mako:139 msgid "Mercurial Labs Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:123 +#: rhodecode/templates/base/vcs_settings.mako:139 msgid "" "These features are considered experimental and may not work as expected." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:129 +#: rhodecode/templates/base/vcs_settings.mako:145 msgid "Use rebase as merge strategy" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:132 +#: rhodecode/templates/base/vcs_settings.mako:148 msgid "" "Use rebase instead of creating a merge commit when merging via web " "interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:144 +#: rhodecode/templates/base/vcs_settings.mako:160 +msgid "Git Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:165 +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 "Filesystem location where Git lfs objects should be stored." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:193 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:150 +#: rhodecode/templates/base/vcs_settings.mako:199 msgid "Proxy subversion HTTP requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:154 +#: 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:155 +#: rhodecode/templates/base/vcs_settings.mako:204 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:161 +#: rhodecode/templates/base/vcs_settings.mako:210 msgid "Subversion HTTP Server URL" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:167 +#: rhodecode/templates/base/vcs_settings.mako:216 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:179 +#: rhodecode/templates/base/vcs_settings.mako:228 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:184 +#: rhodecode/templates/base/vcs_settings.mako:233 msgid "Repository patterns" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:188 +#: rhodecode/templates/base/vcs_settings.mako:237 msgid "" "Patterns for identifying SVN branches and tags. For recursive search, use " "\"*\". Eg.: \"/branches/*\"" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:254 +#: rhodecode/templates/base/vcs_settings.mako:301 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:259 +#: rhodecode/templates/base/vcs_settings.mako:306 msgid "Enable server-side merge for pull requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:262 +#: rhodecode/templates/base/vcs_settings.mako:309 msgid "" "Note: when this feature is enabled, it only runs hooks defined in the " "rcextension package. Custom hooks added on the Admin -> Settings -> Hooks " @@ -7727,11 +8032,11 @@ msgid "" "web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:266 +#: rhodecode/templates/base/vcs_settings.mako:313 msgid "Invalidate and relocate inline comments during update" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:269 +#: rhodecode/templates/base/vcs_settings.mako:316 msgid "" "During the update of a pull request, the position of inline comments will be" " updated and outdated inline comments will be hidden." @@ -7868,7 +8173,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:53 #: rhodecode/templates/compare/compare_commits.mako:46 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:495 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" @@ -7961,8 +8266,8 @@ msgid "Diff options" msgstr "" #: rhodecode/templates/changeset/changeset.mako:119 -#: rhodecode/templates/codeblocks/diffs.mako:436 -#: rhodecode/templates/codeblocks/diffs.mako:439 +#: rhodecode/templates/codeblocks/diffs.mako:445 +#: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "" @@ -7979,8 +8284,8 @@ msgid "Patch Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:127 -#: rhodecode/templates/codeblocks/diffs.mako:443 -#: rhodecode/templates/codeblocks/diffs.mako:446 +#: rhodecode/templates/codeblocks/diffs.mako:452 +#: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "" @@ -7990,7 +8295,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:145 #: rhodecode/templates/changeset/changeset.mako:147 -#: rhodecode/tests/functional/test_commit_comments.py:270 +#: rhodecode/tests/functional/test_commit_comments.py:275 #, python-format msgid "%d Commit comment" msgid_plural "%d Commit comments" @@ -7999,7 +8304,7 @@ msgstr[1] "" #: rhodecode/templates/changeset/changeset.mako:150 #: rhodecode/templates/changeset/changeset.mako:152 -#: rhodecode/tests/functional/test_commit_comments.py:277 +#: rhodecode/tests/functional/test_commit_comments.py:282 #, python-format msgid "%d Inline Comment" msgid_plural "%d Inline Comments" @@ -8105,18 +8410,16 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:363 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:148 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:153 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:388 +#: rhodecode/templates/changeset/changeset_file_comment.mako:393 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 #: rhodecode/templates/compare/compare_diff.mako:122 -#: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:97 msgid "Comment" msgstr "" @@ -8151,7 +8454,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_range.mako:99 #: rhodecode/templates/compare/compare_diff.mako:312 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:414 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:419 #, python-format msgid "Expand %s commit" msgid_plural "Expand %s commits" @@ -8160,7 +8463,7 @@ msgstr[1] "" #: rhodecode/templates/changeset/changeset_range.mako:105 #: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 #, python-format msgid "Collapse %s commit" msgid_plural "Collapse %s commits" @@ -8262,64 +8565,68 @@ msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:406 -#: rhodecode/templates/codeblocks/diffs.mako:422 +#: rhodecode/templates/codeblocks/diffs.mako:415 +#: rhodecode/templates/codeblocks/diffs.mako:431 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:408 -#: rhodecode/templates/codeblocks/diffs.mako:415 +#: rhodecode/templates/codeblocks/diffs.mako:417 +#: rhodecode/templates/codeblocks/diffs.mako:424 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:413 -#: rhodecode/templates/codeblocks/diffs.mako:429 +#: rhodecode/templates/codeblocks/diffs.mako:422 +#: rhodecode/templates/codeblocks/diffs.mako:438 #, python-format msgid "File no longer present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:424 -#: rhodecode/templates/codeblocks/diffs.mako:431 +#: rhodecode/templates/codeblocks/diffs.mako:433 +#: rhodecode/templates/codeblocks/diffs.mako:440 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:462 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:462 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:634 +#: rhodecode/templates/codeblocks/diffs.mako:643 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:636 +#: rhodecode/templates/codeblocks/diffs.mako:645 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:640 +#: rhodecode/templates/codeblocks/diffs.mako:649 msgid "View unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:641 +#: rhodecode/templates/codeblocks/diffs.mako:650 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:651 +#: rhodecode/templates/codeblocks/diffs.mako:660 msgid "Expand All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:655 +#: rhodecode/templates/codeblocks/diffs.mako:664 msgid "Collapse All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:659 +#: rhodecode/templates/codeblocks/diffs.mako:668 msgid "Wide Mode Diff" msgstr "" +#: rhodecode/templates/codeblocks/source.mako:24 +msgid "view annotation from before this change" +msgstr "" + #: rhodecode/templates/compare/compare_commits.mako:5 msgid "Common Ancestor Commit" msgstr "" @@ -8329,7 +8636,7 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:16 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:451 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:456 msgid "Time" msgstr "" @@ -8341,7 +8648,7 @@ msgstr[0] "" msgstr[1] "" #: rhodecode/templates/compare/compare_commits.mako:68 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:568 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:573 msgid "show it" msgid_plural "show them" msgstr[0] "" @@ -8377,14 +8684,14 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:98 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:103 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.mako:76 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 -#: rhodecode/templates/files/files_source.mako:20 +#: rhodecode/templates/files/files_source.mako:23 msgid "Source" msgstr "" @@ -8607,133 +8914,150 @@ msgstr "" msgid "RhodeCode" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:16 -#: rhodecode/templates/email_templates/pull_request_comment.mako:18 +#: rhodecode/templates/email_templates/commit_comment.mako:18 +#: rhodecode/templates/email_templates/pull_request_comment.mako:19 msgid "[mention]" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:19 -#, python-format -msgid "" -"%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:19 -#: rhodecode/templates/email_templates/commit_comment.mako:22 +#: rhodecode/templates/email_templates/commit_comment.mako:21 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on commit `%(commit_id)s` (file: " +"`%(comment_file)s`)" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:24 +#: rhodecode/templates/email_templates/commit_comment.mako:26 #, python-format msgid "in the %(repo_name)s repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:22 -#, python-format -msgid "%(user)s commented on commit `%(commit_id)s` (status: %(status)s)" -msgstr "" - #: rhodecode/templates/email_templates/commit_comment.mako:24 -#: rhodecode/templates/email_templates/commit_comment.mako:78 -#, python-format -msgid "%(user)s commented on commit `%(commit_id)s`" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:43 -#: rhodecode/templates/email_templates/pull_request_comment.mako:44 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on commit `%(commit_id)s` (status: " +"%(status)s)" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:26 +#, python-format +msgid "%(user)s left %(comment_type)s on commit `%(commit_id)s`" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:47 +#: rhodecode/templates/email_templates/pull_request_comment.mako:47 msgid "Comment link" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:48 -#: rhodecode/templates/email_templates/pull_request_comment.mako:49 +#: rhodecode/templates/email_templates/commit_comment.mako:52 +#: rhodecode/templates/email_templates/pull_request_comment.mako:52 #, python-format msgid "File: %(comment_file)s on line %(comment_line)s" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:54 +#: rhodecode/templates/email_templates/commit_comment.mako:58 msgid "Commit status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:76 +#: rhodecode/templates/email_templates/commit_comment.mako:82 #, python-format msgid "%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:76 -#: rhodecode/templates/email_templates/commit_comment.mako:78 +#: rhodecode/templates/email_templates/commit_comment.mako:82 +#: rhodecode/templates/email_templates/commit_comment.mako:84 #, python-format msgid "in the %(repo)s repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:85 +#: rhodecode/templates/email_templates/commit_comment.mako:84 +#, python-format +msgid "%(user)s commented on commit `%(commit_id)s`" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:92 +#: rhodecode/templates/email_templates/pull_request_comment.mako:94 msgid "Status" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:85 +#: rhodecode/templates/email_templates/commit_comment.mako:93 msgid "The commit status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:97 -#, python-format -msgid "Comment on line: %(comment_line)s" -msgstr "" - -#: rhodecode/templates/email_templates/password_reset.mako:30 +#: rhodecode/templates/email_templates/commit_comment.mako:99 +#: rhodecode/templates/email_templates/pull_request_comment.mako:107 +#, python-format +msgid "TODO comment on line: %(comment_line)s" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:101 +#: rhodecode/templates/email_templates/pull_request_comment.mako:109 +#, python-format +msgid "Note comment on line: %(comment_line)s" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:101 +#: rhodecode/templates/email_templates/pull_request_comment.mako:109 +msgid "Note comment" +msgstr "" + +#: rhodecode/templates/email_templates/password_reset.mako:31 msgid "Generate new password here" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:21 -#, python-format -msgid "" -"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: " -"`%(comment_file)s`)" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:24 -#, python-format -msgid "" -"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: " -"%(status)s)" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:26 -#: rhodecode/templates/email_templates/pull_request_comment.mako:83 -#, python-format -msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:46 +#: rhodecode/templates/email_templates/pull_request_comment.mako:22 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\" " +"(file: `%(comment_file)s`)" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:25 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\" " +"(status: %(status)s)" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:27 +#, python-format +msgid "%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:49 msgid "Source repository" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:55 +#: rhodecode/templates/email_templates/pull_request_comment.mako:58 #, python-format msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:57 +#: rhodecode/templates/email_templates/pull_request_comment.mako:60 #, python-format msgid "" "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:81 +#: rhodecode/templates/email_templates/pull_request_comment.mako:84 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" " "(file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:87 -#, python-format -msgid "submitted pull request status: %(status)s" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:89 -#, python-format -msgid "submitted pull request status: %(status)s and closed" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:95 -msgid "Submitted status" +#: rhodecode/templates/email_templates/pull_request_comment.mako:86 +#, python-format +msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 +msgid "Closed pull request with status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:99 +msgid "Submitted review status" msgstr "" #: rhodecode/templates/email_templates/pull_request_review.mako:14 @@ -8800,12 +9124,6 @@ msgstr "" msgid "Full Name" msgstr "" -#: rhodecode/templates/email_templates/user_registration.mako:26 -#: rhodecode/templates/users/user.mako:29 -#: rhodecode/templates/users/user_profile.mako:5 -msgid "Profile" -msgstr "" - #: rhodecode/templates/errors/error_document.mako:46 #, python-format msgid "You will be redirected to %s in %s seconds" @@ -8962,13 +9280,13 @@ msgid "Delete file" msgstr "" #: rhodecode/templates/files/files_delete.mako:45 -#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:65 #, python-format msgid "Binary file (%s)" msgstr "" #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:87 msgid "File is too big to display" msgstr "" @@ -8981,19 +9299,19 @@ msgstr "" msgid "Commit Description" msgstr "" -#: rhodecode/templates/files/files_detail.mako:35 +#: rhodecode/templates/files/files_detail.mako:32 msgid "File last commit" msgstr "" -#: rhodecode/templates/files/files_detail.mako:51 +#: rhodecode/templates/files/files_detail.mako:46 msgid "Show/Diff file" msgstr "" -#: rhodecode/templates/files/files_detail.mako:66 +#: rhodecode/templates/files/files_detail.mako:61 msgid "Diff to Commit" msgstr "" -#: rhodecode/templates/files/files_detail.mako:67 +#: rhodecode/templates/files/files_detail.mako:62 msgid "Show at Commit" msgstr "" @@ -9035,72 +9353,66 @@ msgstr "" msgid "Location" msgstr "" -#: rhodecode/templates/files/files_source.mako:7 +#: rhodecode/templates/files/files_source.mako:8 +msgid "This file is a pointer to large binary file" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:8 +msgid "LargeFile" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:10 #: rhodecode/templates/search/search_content.mako:57 msgid "line" msgid_plural "lines" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/files/files_source.mako:14 +#: rhodecode/templates/files/files_source.mako:17 msgid "History" msgstr "" -#: rhodecode/templates/files/files_source.mako:17 +#: rhodecode/templates/files/files_source.mako:20 #: rhodecode/templates/search/search_content.mako:68 msgid "Show Full History" msgstr "" -#: rhodecode/templates/files/files_source.mako:22 +#: rhodecode/templates/files/files_source.mako:25 #: rhodecode/templates/search/search_content.mako:70 msgid "Annotation" msgstr "" -#: rhodecode/templates/files/files_source.mako:24 +#: rhodecode/templates/files/files_source.mako:27 #: rhodecode/templates/search/search_content.mako:71 msgid "Raw" msgstr "" -#: rhodecode/templates/files/files_source.mako:26 +#: rhodecode/templates/files/files_source.mako:31 +msgid "Download largefile" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:35 #: rhodecode/templates/search/search_content.mako:73 msgid "Download" msgstr "" -#: rhodecode/templates/files/files_source.mako:33 +#: rhodecode/templates/files/files_source.mako:43 #, python-format msgid "Edit on Branch:%s" msgstr "" -#: rhodecode/templates/files/files_source.mako:38 +#: rhodecode/templates/files/files_source.mako:48 msgid "Editing binary files not allowed" msgstr "" -#: rhodecode/templates/files/files_source.mako:41 +#: rhodecode/templates/files/files_source.mako:51 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_source.mako:52 msgid "Deleting files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/followers/followers.mako:5 -#: rhodecode/templates/followers/followers.mako:27 -#, python-format -msgid "%s Followers" -msgstr "" - -#: rhodecode/templates/followers/followers.mako:12 -msgid "Followers" -msgstr "" - -#: rhodecode/templates/followers/followers_data.mako:5 -msgid "Follower Name" -msgstr "" - -#: rhodecode/templates/followers/followers_data.mako:6 -msgid "Following Since" -msgstr "" - #: rhodecode/templates/forks/fork.mako:5 #, python-format msgid "Fork repository %s" @@ -9181,98 +9493,99 @@ msgstr "RSS Feed für das Öffentliche Logbuch" msgid "New pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:52 +#: rhodecode/templates/pullrequests/pullrequest.mako:51 msgid "Write a short description on this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:59 +#: rhodecode/templates/pullrequests/pullrequest.mako:57 msgid "Commit flow" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:67 +#: rhodecode/templates/pullrequests/pullrequest.mako:65 msgid "Origin repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:85 +#: rhodecode/templates/pullrequests/pullrequest.mako:83 msgid "Loading refs..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:96 +#: rhodecode/templates/pullrequests/pullrequest.mako:94 msgid "Submit Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:109 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:317 +#: rhodecode/templates/pullrequests/pullrequest.mako:107 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:322 msgid "Pull request reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:110 -msgid "loading..." -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.mako:120 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:361 +#: rhodecode/templates/pullrequests/pullrequest.mako:118 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:366 msgid "Add reviewer" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:299 -#: rhodecode/templates/pullrequests/pullrequest.mako:572 +#: rhodecode/templates/pullrequests/pullrequest.mako:297 +#: rhodecode/templates/pullrequests/pullrequest.mako:570 msgid "Please select origin and destination" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:305 +#: rhodecode/templates/pullrequests/pullrequest.mako:303 msgid "Loading compare ..." msgstr "" +#: rhodecode/templates/pullrequests/pullrequest.mako:350 #: rhodecode/templates/pullrequests/pullrequest.mako:352 -#: rhodecode/templates/pullrequests/pullrequest.mako:354 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:357 +#: rhodecode/templates/pullrequests/pullrequest.mako:355 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:364 +#: rhodecode/templates/pullrequests/pullrequest.mako:362 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:464 +#: rhodecode/templates/pullrequests/pullrequest.mako:462 msgid "Destination repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:475 +#: rhodecode/templates/pullrequests/pullrequest.mako:473 msgid "Select commit reference" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:8 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:7 msgid "This pull request can be merged automatically." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:13 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:12 msgid "Merge is not currently possible because of below failed checks." msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:37 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:42 +msgid "refresh checks" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:38 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 -msgid "refresh checks" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:39 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:44 msgid "Merge Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:44 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 msgid "You are not allowed to merge this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:46 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:45 msgid "Login to Merge this Pull Request" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:54 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 +msgid "Close with status {}" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show.mako:5 #, python-format msgid "%s Pull Request #%s" @@ -9290,171 +9603,175 @@ msgstr "" msgid "Origin" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:120 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:88 +msgid "Common ancestor" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:125 msgid "Merge" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:133 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:138 msgid "Shadow repository data not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:141 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:146 msgid "Review" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:157 #, python-format msgid "calculated based on %s reviewer vote" msgid_plural "calculated based on %s reviewers votes" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:170 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:175 msgid "Versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:183 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:186 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:188 msgid "{} version available for this pull request, show it." msgid_plural "{} versions available for this pull request, show them." msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:182 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:187 msgid "Hide all versions of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:207 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:212 msgid "Your review status at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:213 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:218 msgid "Comment from pull request version {0}, general:{1} inline:{2}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:230 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:234 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:235 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:239 msgid "select versions to show changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:231 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:236 msgid "show changes between versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:232 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:237 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:247 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:252 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:251 -msgid "Comments for this pull request" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:256 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 +msgid "Comments for this pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:261 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:263 #, python-format msgid "%d General " msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:264 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:267 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:269 #, python-format msgid "%d Inline" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:268 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:272 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:273 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 #, python-format msgid "%d Outdated" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:269 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:274 msgid "show outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:270 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:281 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:286 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:295 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:365 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:300 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:370 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:382 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:387 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:383 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:388 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:391 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:396 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 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:393 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 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:404 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:409 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:427 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:432 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:440 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:445 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:444 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:449 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:462 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:464 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:469 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:567 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:572 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:570 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:575 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:571 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:576 msgid "show them" msgstr "" 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-02-05 17:11+0100\n" -"PO-Revision-Date: 2017-02-01 20:10+0000\n" +"POT-Creation-Date: 2017-04-07 12:33+0200\n" +"PO-Revision-Date: 2017-04-07 10:34+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Spanish (http://www.transifex.com/rhodecode/RhodeCode/language/es/)\n" "MIME-Version: 1.0\n" @@ -19,51 +19,52 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: rhodecode/admin/navigation.py:83 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:167 +#: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 +#: rhodecode/integrations/views.py:166 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "" -#: rhodecode/admin/navigation.py:84 +#: rhodecode/apps/admin/navigation.py:84 #: rhodecode/templates/admin/repos/repo_edit.mako:52 msgid "VCS" msgstr "" -#: rhodecode/admin/navigation.py:85 +#: rhodecode/apps/admin/navigation.py:85 msgid "Visual" msgstr "" -#: rhodecode/admin/navigation.py:86 +#: rhodecode/apps/admin/navigation.py:86 msgid "Remap and Rescan" msgstr "" -#: rhodecode/admin/navigation.py:87 +#: rhodecode/apps/admin/navigation.py:87 #: rhodecode/templates/admin/repos/repo_edit.mako:58 msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:89 rhodecode/integrations/types/email.py:232 -#: rhodecode/templates/register.mako:75 +#: rhodecode/apps/admin/navigation.py:89 +#: rhodecode/integrations/types/email.py:232 +#: rhodecode/templates/register.mako:76 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: 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:92 +#: rhodecode/templates/admin/users/users.mako:64 #: rhodecode/templates/email_templates/user_registration.mako:25 #: rhodecode/templates/users/user_profile.mako:51 msgid "Email" msgstr "" -#: rhodecode/admin/navigation.py:90 +#: rhodecode/apps/admin/navigation.py:90 msgid "Hooks" msgstr "" -#: rhodecode/admin/navigation.py:91 +#: rhodecode/apps/admin/navigation.py:91 msgid "Full Text Search" msgstr "" -#: rhodecode/admin/navigation.py:93 +#: rhodecode/apps/admin/navigation.py:93 #: rhodecode/templates/admin/integrations/base.mako:23 #: rhodecode/templates/admin/integrations/form.mako:8 #: rhodecode/templates/admin/integrations/form.mako:21 @@ -77,177 +78,290 @@ msgstr "" #: 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/base/base.mako:79 +#: rhodecode/templates/base/base.mako:82 msgid "Integrations" msgstr "" -#: rhodecode/admin/navigation.py:95 +#: rhodecode/apps/admin/navigation.py:95 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" msgstr "" -#: rhodecode/admin/navigation.py:97 +#: rhodecode/apps/admin/navigation.py:97 msgid "User Sessions" msgstr "" -#: rhodecode/admin/navigation.py:99 +#: rhodecode/apps/admin/navigation.py:99 msgid "Open Source Licenses" msgstr "" -#: rhodecode/admin/navigation.py:107 +#: rhodecode/apps/admin/navigation.py:107 msgid "Labs" msgstr "" -#: rhodecode/admin/views/sessions.py:90 +#: rhodecode/apps/admin/views/sessions.py:86 msgid "Cleaned up old sessions" msgstr "" -#: rhodecode/admin/views/sessions.py:96 +#: rhodecode/apps/admin/views/sessions.py:92 msgid "Failed to cleanup up old sessions" msgstr "" -#: rhodecode/admin/views/svn_config.py:47 +#: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." msgstr "" -#: rhodecode/admin/views/svn_config.py:55 +#: rhodecode/apps/admin/views/svn_config.py:54 msgid "Failed to generate the Apache configuration for Subversion." msgstr "" -#: rhodecode/admin/views/system_info.py:96 +#: rhodecode/apps/admin/views/system_info.py:95 msgid "" "Note: please make sure this server can access `${url}` for the update link " "to work" msgstr "" -#: rhodecode/admin/views/system_info.py:99 +#: rhodecode/apps/admin/views/system_info.py:98 msgid "Update info" msgstr "" -#: rhodecode/admin/views/system_info.py:101 +#: rhodecode/apps/admin/views/system_info.py:100 msgid "Check for updates" msgstr "" -#: rhodecode/admin/views/system_info.py:106 +#: rhodecode/apps/admin/views/system_info.py:105 msgid "RhodeCode Version" msgstr "" -#: rhodecode/admin/views/system_info.py:107 +#: rhodecode/apps/admin/views/system_info.py:106 msgid "RhodeCode Server IP" msgstr "" -#: rhodecode/admin/views/system_info.py:108 +#: rhodecode/apps/admin/views/system_info.py:107 msgid "RhodeCode Server ID" msgstr "" -#: rhodecode/admin/views/system_info.py:109 +#: rhodecode/apps/admin/views/system_info.py:108 msgid "RhodeCode Configuration" msgstr "" -#: rhodecode/admin/views/system_info.py:113 +#: rhodecode/apps/admin/views/system_info.py:109 +msgid "Workers" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:110 +msgid "Worker Type" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:114 msgid "Database" msgstr "" -#: rhodecode/admin/views/system_info.py:114 +#: rhodecode/apps/admin/views/system_info.py:115 msgid "Database version" msgstr "" -#: rhodecode/admin/views/system_info.py:118 +#: rhodecode/apps/admin/views/system_info.py:119 msgid "Platform" msgstr "" -#: rhodecode/admin/views/system_info.py:119 +#: rhodecode/apps/admin/views/system_info.py:120 msgid "Platform UUID" msgstr "" -#: rhodecode/admin/views/system_info.py:120 +#: rhodecode/apps/admin/views/system_info.py:121 msgid "Python version" msgstr "" -#: rhodecode/admin/views/system_info.py:121 +#: rhodecode/apps/admin/views/system_info.py:122 msgid "Python path" msgstr "" -#: rhodecode/admin/views/system_info.py:125 +#: rhodecode/apps/admin/views/system_info.py:126 msgid "CPU" msgstr "" -#: rhodecode/admin/views/system_info.py:126 +#: rhodecode/apps/admin/views/system_info.py:127 msgid "Load" msgstr "" -#: rhodecode/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:128 msgid "Memory" msgstr "" -#: rhodecode/admin/views/system_info.py:128 +#: rhodecode/apps/admin/views/system_info.py:129 msgid "Uptime" msgstr "" -#: rhodecode/admin/views/system_info.py:132 +#: rhodecode/apps/admin/views/system_info.py:133 msgid "Storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:135 msgid "Storage inodes" msgstr "" -#: rhodecode/admin/views/system_info.py:136 +#: rhodecode/apps/admin/views/system_info.py:137 msgid "Gist storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:137 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Gist storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:139 +#: rhodecode/apps/admin/views/system_info.py:140 msgid "Archive cache storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:140 +#: rhodecode/apps/admin/views/system_info.py:141 msgid "Archive cache info" msgstr "" -#: rhodecode/admin/views/system_info.py:142 +#: rhodecode/apps/admin/views/system_info.py:143 msgid "Temp storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:143 +#: rhodecode/apps/admin/views/system_info.py:144 msgid "Temp storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:145 +#: rhodecode/apps/admin/views/system_info.py:146 msgid "Search info" msgstr "" -#: rhodecode/admin/views/system_info.py:146 +#: rhodecode/apps/admin/views/system_info.py:147 msgid "Search location" msgstr "" -#: rhodecode/admin/views/system_info.py:150 +#: rhodecode/apps/admin/views/system_info.py:151 msgid "VCS Backends" msgstr "" -#: rhodecode/admin/views/system_info.py:151 +#: rhodecode/apps/admin/views/system_info.py:152 msgid "VCS Server" msgstr "" -#: rhodecode/admin/views/system_info.py:152 +#: rhodecode/apps/admin/views/system_info.py:153 msgid "GIT" msgstr "" -#: rhodecode/admin/views/system_info.py:153 +#: rhodecode/apps/admin/views/system_info.py:154 msgid "HG" msgstr "" -#: rhodecode/admin/views/system_info.py:154 +#: rhodecode/apps/admin/views/system_info.py:155 msgid "SVN" msgstr "" +#: rhodecode/apps/admin/views/users.py:60 +#: rhodecode/controllers/admin/users.py:359 +#: rhodecode/controllers/admin/users.py:380 +#: 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/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/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/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/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/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/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/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 +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 +msgid "Auth token successfully deleted" +msgstr "Ficha de autenticación eliminada exitosamente" + +#: rhodecode/apps/admin/views/users.py:284 +msgid "Groups successfully changed" +msgstr "" + +#: rhodecode/apps/login/views.py:247 rhodecode/apps/login/views.py:316 +msgid "Bad captcha" +msgstr "" + +#: rhodecode/apps/login/views.py:256 +msgid "You have successfully registered with RhodeCode" +msgstr "Se ha registrado exitosamente con RhodeCode" + +#: rhodecode/apps/login/views.py:292 +msgid "If such email exists, a password reset link was sent to it." +msgstr "" + +#: rhodecode/apps/login/views.py:298 +msgid "Password reset has been disabled." +msgstr "" + +#: rhodecode/apps/login/views.py:381 +msgid "Given reset token is invalid" +msgstr "" + +#: rhodecode/apps/login/views.py:389 +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 +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 +msgid "Successfully updated password" +msgstr "Contraseña actualizada exitosamente" + +#: rhodecode/apps/svn_support/events.py:30 +msgid "Configuration for Apaache mad_dav_svn changed." +msgstr "" + #: rhodecode/authentication/schema.py:35 msgid "Enable or disable this authentication plugin." msgstr "" @@ -263,12 +377,11 @@ msgstr "" #: rhodecode/authentication/schema.py:43 msgid "" -"Amount of seconds to cache the authentication call for this plugin. Useful " -"for long calls like LDAP to improve the responsiveness of the authentication" -" system (0 means disabled)." -msgstr "" - -#: rhodecode/authentication/schema.py:48 +"Amount of seconds to cache the authentication responsecall for this plugin. \n" +"Useful for long calls like LDAP to improve the performance of the authentication system (0 means disabled)." +msgstr "" + +#: rhodecode/authentication/schema.py:49 msgid "Auth Cache TTL" msgstr "" @@ -289,99 +402,101 @@ msgstr "" msgid "Error occurred during update of auth settings." msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:61 +#: rhodecode/authentication/plugins/auth_crowd.py:60 msgid "The FQDN or IP of the Atlassian CROWD Server" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:63 +#: rhodecode/authentication/plugins/auth_crowd.py:62 msgid "Host" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:68 +#: rhodecode/authentication/plugins/auth_crowd.py:67 msgid "The Port in use by the Atlassian CROWD Server" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:70 +#: rhodecode/authentication/plugins/auth_crowd.py:69 #: rhodecode/authentication/plugins/auth_ldap.py:84 msgid "Port" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:76 +#: rhodecode/authentication/plugins/auth_crowd.py:75 msgid "The Application Name to authenticate to CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:78 +#: rhodecode/authentication/plugins/auth_crowd.py:77 msgid "Application Name" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:83 +#: rhodecode/authentication/plugins/auth_crowd.py:82 msgid "The password to authenticate to CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:85 +#: rhodecode/authentication/plugins/auth_crowd.py:84 msgid "Application Password" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:90 +#: rhodecode/authentication/plugins/auth_crowd.py:89 msgid "" "A comma separated list of group names that identify users as RhodeCode " "Administrators" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:94 +#: rhodecode/authentication/plugins/auth_crowd.py:93 msgid "Admin Groups" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:216 +#: rhodecode/authentication/plugins/auth_crowd.py:215 msgid "CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:55 +#: rhodecode/authentication/plugins/auth_headers.py:54 msgid "Header to extract the user from" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:57 +#: rhodecode/authentication/plugins/auth_headers.py:56 msgid "Header" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:62 +#: rhodecode/authentication/plugins/auth_headers.py:61 msgid "Header to extract the user from when main one fails" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:64 +#: rhodecode/authentication/plugins/auth_headers.py:63 msgid "Fallback header" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:69 +#: rhodecode/authentication/plugins/auth_headers.py:68 msgid "" "Perform cleaning of user, if passed user has @ in username then first part " "before @ is taken. If there's \\ in the username only the part after \\ is " "taken" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:74 +#: rhodecode/authentication/plugins/auth_headers.py:73 msgid "Clean username" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:99 +#: rhodecode/authentication/plugins/auth_headers.py:98 msgid "Headers" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:63 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:62 msgid "The url of the Jasig CAS REST service" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:65 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:64 #: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:93 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:92 msgid "Jasig-CAS" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:75 -msgid "Host of the LDAP Server" +#: 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 @@ -389,107 +504,117 @@ msgid "LDAP Host" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:82 -msgid "Port that the LDAP server is listening on" +msgid "Custom port that the LDAP server is listening on. Default: 389" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:90 -msgid "User to connect to LDAP" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:93 +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 msgid "Account" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:98 -msgid "Password to connect to LDAP" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:101 -#: rhodecode/templates/login.mako:49 rhodecode/templates/register.mako:47 +#: rhodecode/authentication/plugins/auth_ldap.py:100 +msgid "Password to authenticate for given user DN." +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:103 +#: 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:310 +#: rhodecode/templates/base/base.mako:313 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:106 +#: rhodecode/authentication/plugins/auth_ldap.py:108 msgid "TLS Type" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:107 +#: rhodecode/authentication/plugins/auth_ldap.py:109 msgid "Connection Security" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:113 +#: rhodecode/authentication/plugins/auth_ldap.py:115 msgid "Require Cert over TLS?" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:114 +#: rhodecode/authentication/plugins/auth_ldap.py:116 msgid "Certificate Checks" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:120 -msgid "Base DN to search (e.g., dc=mydomain,dc=com)" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:123 +#: rhodecode/authentication/plugins/auth_ldap.py:122 +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 msgid "Base DN" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:128 -msgid "Filter to narrow results (e.g., ou=Users, etc)" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:131 -msgid "LDAP Search Filter" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:136 -msgid "How deep to search LDAP" +#: rhodecode/authentication/plugins/auth_ldap.py:132 +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 -msgid "LDAP Search Scope" +msgid "LDAP Search Filter" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:143 -msgid "LDAP Attribute to map to user name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:145 +msgid "How deep to search LDAP. If unsure set to SUBTREE" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:144 +msgid "LDAP Search Scope" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:150 +msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:152 msgid "Login Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:146 +#: rhodecode/authentication/plugins/auth_ldap.py:153 msgid "The LDAP Login attribute of the CN must be specified" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:151 -msgid "LDAP Attribute to map to first name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:154 +#: rhodecode/authentication/plugins/auth_ldap.py:158 +msgid "LDAP Attribute to map to first name (e.g., givenName)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:161 msgid "First Name Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:159 -msgid "LDAP Attribute to map to last name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:162 +#: rhodecode/authentication/plugins/auth_ldap.py:166 +msgid "LDAP Attribute to map to last name (e.g., sn)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:169 msgid "Last Name Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:167 -msgid "LDAP Attribute to map to email address" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:170 +#: rhodecode/authentication/plugins/auth_ldap.py:174 +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 msgid "Email Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:351 +#: rhodecode/authentication/plugins/auth_ldap.py:360 msgid "LDAP" msgstr "" @@ -514,16 +639,16 @@ msgstr "" msgid "PAM" msgstr "" -#: rhodecode/authentication/plugins/auth_rhodecode.py:68 +#: rhodecode/authentication/plugins/auth_rhodecode.py:67 msgid "Rhodecode" msgstr "" -#: rhodecode/authentication/plugins/auth_token.py:71 +#: rhodecode/authentication/plugins/auth_token.py:70 msgid "Rhodecode Token Auth" msgstr "" #: rhodecode/controllers/changelog.py:91 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:202 +#: rhodecode/controllers/pullrequests.py:204 msgid "There are no commits yet" msgstr "No hay cometidos todavía" @@ -557,8 +682,8 @@ msgid "No such commit exists for this re msgstr "" #: rhodecode/controllers/changeset.py:344 -#: rhodecode/controllers/pullrequests.py:948 -#: rhodecode/model/pull_request.py:1009 +#: rhodecode/controllers/pullrequests.py:985 +#: rhodecode/model/pull_request.py:1055 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "Cambio de estado %(transition_icon)s %(status)s" @@ -598,12 +723,12 @@ msgid "" "%(repo1)s with commit %(commit2)s from repository %(repo2)s." msgstr "" -#: rhodecode/controllers/feed.py:70 +#: rhodecode/controllers/feed.py:69 #, python-format msgid "Changes on %s repository" msgstr "Cambios en repositorio %s" -#: rhodecode/controllers/feed.py:71 +#: rhodecode/controllers/feed.py:70 #, python-format msgid "%s %s feed" msgstr "%s %s fuente" @@ -617,93 +742,93 @@ msgstr "" msgid "There are no files yet. %s" msgstr "No hay archivos todavía. %s" -#: rhodecode/controllers/files.py:394 rhodecode/controllers/files.py:447 -#: rhodecode/controllers/files.py:478 rhodecode/controllers/files.py:553 -#: rhodecode/controllers/files.py:598 rhodecode/controllers/files.py:689 +#: 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 #, 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:402 rhodecode/controllers/files.py:455 +#: rhodecode/controllers/files.py:443 rhodecode/controllers/files.py:496 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:411 rhodecode/controllers/files.py:464 +#: 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:431 +#: rhodecode/controllers/files.py:472 #, python-format msgid "Successfully deleted file %s" msgstr "Se eliminó archivo %s exitosamente" -#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:540 -#: rhodecode/controllers/files.py:677 +#: rhodecode/controllers/files.py:475 rhodecode/controllers/files.py:581 +#: rhodecode/controllers/files.py:718 msgid "Error occurred during commit" msgstr "Error occurrido durante cometido" -#: rhodecode/controllers/files.py:486 rhodecode/controllers/files.py:561 +#: rhodecode/controllers/files.py:527 rhodecode/controllers/files.py:602 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:498 rhodecode/controllers/files.py:573 +#: 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:515 +#: rhodecode/controllers/files.py:556 msgid "No changes" msgstr "Sin cambios" -#: rhodecode/controllers/files.py:537 rhodecode/controllers/files.py:666 +#: 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:611 rhodecode/controllers/files.py:700 +#: rhodecode/controllers/files.py:652 rhodecode/controllers/files.py:741 msgid "Added file via RhodeCode Enterprise" msgstr "Se agregó archivo vía RhodeCode Enterprise" -#: rhodecode/controllers/files.py:636 +#: rhodecode/controllers/files.py:677 msgid "No filename" msgstr "Sin nombre de archivo" -#: rhodecode/controllers/files.py:669 +#: 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:723 +#: rhodecode/controllers/files.py:764 msgid "Downloads disabled" msgstr "Descargas deshabilitadas" -#: rhodecode/controllers/files.py:729 +#: rhodecode/controllers/files.py:770 #, python-format msgid "Unknown revision %s" msgstr "Revision desconocida %s" -#: rhodecode/controllers/files.py:731 +#: rhodecode/controllers/files.py:772 msgid "Empty repository" msgstr "Repositorio vacío" -#: rhodecode/controllers/files.py:733 rhodecode/controllers/files.py:767 +#: rhodecode/controllers/files.py:774 rhodecode/controllers/files.py:808 msgid "Unknown archive type" msgstr "Typo de archivo desconocido" -#: rhodecode/controllers/files.py:952 +#: rhodecode/controllers/files.py:993 msgid "Changesets" msgstr "Conjuntos de cambios" -#: rhodecode/controllers/files.py:973 rhodecode/controllers/summary.py:269 -#: rhodecode/model/pull_request.py:1234 rhodecode/model/scm.py:782 -#: rhodecode/templates/base/vcs_settings.mako:193 +#: 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:977 rhodecode/model/scm.py:797 -#: rhodecode/templates/base/vcs_settings.mako:218 +#: rhodecode/controllers/files.py:1018 rhodecode/model/scm.py:797 +#: rhodecode/templates/base/vcs_settings.mako:267 msgid "Tags" msgstr "Etiquetas" @@ -712,23 +837,24 @@ msgstr "Etiquetas" msgid "An error occurred during repository forking %s" msgstr "Ocurrió un error durante bifurcación de repositorio %s" -#: rhodecode/controllers/home.py:205 +#: rhodecode/controllers/home.py:207 msgid "Groups" msgstr "Grupos" -#: rhodecode/controllers/home.py:212 rhodecode/controllers/home.py:247 -#: rhodecode/controllers/pullrequests.py:308 +#: 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:73 -#: rhodecode/templates/base/base.mako:145 -#: rhodecode/templates/base/base.mako:569 +#: 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:225 +#: rhodecode/controllers/home.py:227 #, python-format msgid "Commits in %(repo)s" msgstr "" @@ -741,81 +867,81 @@ msgstr "diario público" msgid "journal" msgstr "diario" -#: rhodecode/controllers/pullrequests.py:216 +#: rhodecode/controllers/pullrequests.py:218 msgid "Commit does not exist" msgstr "" -#: rhodecode/controllers/pullrequests.py:333 -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:335 +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 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/controllers/pullrequests.py:383 +#: rhodecode/controllers/pullrequests.py:385 msgid "Successfully opened new pull request" msgstr "Se abrió nueva solicitud de extracción exitosamente" -#: rhodecode/controllers/pullrequests.py:386 +#: 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:429 +#: rhodecode/controllers/pullrequests.py:431 msgid "Cannot update closed pull requests." msgstr "No se pueden actualizar solicitudes de extracción cerradas." -#: rhodecode/controllers/pullrequests.py:435 +#: rhodecode/controllers/pullrequests.py:437 msgid "Pull request title & description updated." msgstr "Título de solicitud de extracción & descripción actualizados." -#: rhodecode/controllers/pullrequests.py:443 +#: rhodecode/controllers/pullrequests.py:455 msgid "" "Pull request updated to \"{source_commit_id}\" with {count_added} added, " -"{count_removed} removed commits." -msgstr "Solicitud de extracción actualizada a \"{source_commit_id}\" con {count_added} cometidos agregados, {count_removed} removidos." - -#: rhodecode/controllers/pullrequests.py:458 +"{count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:472 msgid "Reload page" msgstr "" -#: rhodecode/controllers/pullrequests.py:532 +#: rhodecode/controllers/pullrequests.py:546 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/controllers/pullrequests.py:569 +#: rhodecode/controllers/pullrequests.py:588 msgid "Successfully deleted pull request" msgstr "Se eliminó la solicitud de extracción exitosamente" -#: rhodecode/controllers/pullrequests.py:864 -msgid "Close Pull Request" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:952 -#: rhodecode/model/pull_request.py:1013 +#: rhodecode/controllers/pullrequests.py:592 +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:1002 +#: 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:243 +#: rhodecode/controllers/summary.py:251 msgid "Branch" msgstr "Rama" -#: rhodecode/controllers/summary.py:244 +#: rhodecode/controllers/summary.py:252 msgid "Tag" msgstr "Etiqueta" -#: rhodecode/controllers/summary.py:245 +#: rhodecode/controllers/summary.py:253 msgid "Bookmark" msgstr "Marcador" -#: rhodecode/controllers/summary.py:270 +#: rhodecode/controllers/summary.py:278 msgid "Closed branches" msgstr "Ramas cerradas" @@ -827,42 +953,6 @@ msgstr "Ajustes por defecto actualizados msgid "Error occurred during update of default values" msgstr "Error ocurrido durante actalización de valores por defecto" -#: rhodecode/controllers/admin/gists.py:62 -#: rhodecode/controllers/admin/my_account.py:384 -#: rhodecode/controllers/admin/users.py:465 -msgid "forever" -msgstr "para siempre" - -#: rhodecode/controllers/admin/gists.py:63 -#: rhodecode/controllers/admin/my_account.py:385 -#: rhodecode/controllers/admin/users.py:466 -msgid "5 minutes" -msgstr "5 minutos" - -#: rhodecode/controllers/admin/gists.py:64 -#: rhodecode/controllers/admin/my_account.py:386 -#: rhodecode/controllers/admin/users.py:467 -msgid "1 hour" -msgstr "1 hora" - -#: rhodecode/controllers/admin/gists.py:65 -#: rhodecode/controllers/admin/my_account.py:387 -#: rhodecode/controllers/admin/users.py:468 -msgid "1 day" -msgstr "1 día" - -#: rhodecode/controllers/admin/gists.py:66 -#: rhodecode/controllers/admin/my_account.py:388 -#: rhodecode/controllers/admin/users.py:469 -msgid "1 month" -msgstr "1 mes" - -#: rhodecode/controllers/admin/gists.py:70 -#: rhodecode/controllers/admin/my_account.py:390 -#: rhodecode/controllers/admin/users.py:471 -msgid "Lifetime" -msgstr "De por vida" - #: rhodecode/controllers/admin/gists.py:72 msgid "Requires registered account" msgstr "Requiere cuenta registrada" @@ -899,10 +989,8 @@ msgstr "Error ocurrido durante actualización de quid %s" #: rhodecode/controllers/admin/gists.py:343 #: rhodecode/templates/admin/gists/show.mako:67 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 #: rhodecode/templates/data_table/_dt_elements.mako:263 msgid "never" msgstr "nunca" @@ -912,65 +1000,36 @@ msgstr "nunca" msgid "%(expiry)s - current value" msgstr "%(expiry)s - valor actual" -#: rhodecode/controllers/admin/my_account.py:80 +#: rhodecode/controllers/admin/my_account.py:78 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:140 +#: rhodecode/controllers/admin/my_account.py:138 msgid "Your account was updated successfully" msgstr "Su cuenta fue actualizada exitosamente" -#: rhodecode/controllers/admin/my_account.py:155 -#: rhodecode/controllers/admin/users.py:231 +#: rhodecode/controllers/admin/my_account.py:153 +#: rhodecode/controllers/admin/users.py:184 #, 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:221 -#: rhodecode/controllers/admin/my_account.py:227 -msgid "Error occurred during update of user password" -msgstr "Error ocurrido durante actualización de contraseña de usuario" - -#: rhodecode/controllers/admin/my_account.py:234 -msgid "Successfully updated password" -msgstr "Contraseña actualizada exitosamente" - -#: rhodecode/controllers/admin/my_account.py:278 -#: rhodecode/controllers/admin/users.py:645 +#: 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:285 -#: rhodecode/controllers/admin/users.py:652 +#: 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:295 -#: rhodecode/controllers/admin/users.py:667 +#: rhodecode/controllers/admin/my_account.py:239 +#: rhodecode/controllers/admin/users.py:549 msgid "Removed email address from user account" msgstr "" -#: rhodecode/controllers/admin/my_account.py:393 -#: rhodecode/controllers/admin/users.py:474 -msgid "Role" -msgstr "Rol" - -#: rhodecode/controllers/admin/my_account.py:406 -#: rhodecode/controllers/admin/users.py:498 -msgid "Auth token successfully created" -msgstr "Ficha de autenticación creada exitosamente" - -#: rhodecode/controllers/admin/my_account.py:419 -#: rhodecode/controllers/admin/users.py:517 -msgid "Auth token successfully reset" -msgstr "Ficha de autenticación reiniciada exitosamente" - -#: rhodecode/controllers/admin/my_account.py:423 -#: rhodecode/controllers/admin/users.py:521 -msgid "Auth token successfully deleted" -msgstr "Ficha de autenticación eliminada exitosamente" - #: rhodecode/controllers/admin/permissions.py:112 msgid "Application permissions updated successfully" msgstr "Permisos de aplicación actualizados exitosamente" @@ -1034,7 +1093,7 @@ msgid "Error occurred during deletion of msgstr "Error ocurrido durante eliminación de grupo de repositorio %s" #: rhodecode/controllers/admin/repo_groups.py:388 -#: rhodecode/controllers/admin/user_groups.py:322 +#: rhodecode/controllers/admin/user_groups.py:323 msgid "Cannot change permission for yourself as admin" msgstr "No puede cambiar el permiso para usted como admin" @@ -1186,18 +1245,18 @@ msgid "Error occurred during deleting is msgstr "Error ocurrido al eliminar entrada en el seguidor de incidencias" #: rhodecode/controllers/admin/repos.py:728 -#: rhodecode/controllers/admin/settings.py:380 +#: rhodecode/controllers/admin/settings.py:381 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:427 +#: rhodecode/controllers/admin/settings.py:428 msgid "Updated issue tracker entries" msgstr "Se actualizaron entradas en el seguidor de incidencias" #: rhodecode/controllers/admin/repos.py:819 #: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:618 +#: rhodecode/controllers/admin/settings.py:619 msgid "Some form inputs contain invalid data." msgstr "Algunos campos de entrada contienen datos inválidos" @@ -1206,281 +1265,277 @@ msgid "Error occurred during updating re msgstr "Error ocurrido al actualizar ajustes VCS del repositorio" #: rhodecode/controllers/admin/repos.py:841 -#: rhodecode/controllers/admin/settings.py:175 +#: rhodecode/controllers/admin/settings.py:176 msgid "Updated VCS settings" msgstr "Se actualizaron ajustes VCS" -#: rhodecode/controllers/admin/settings.py:171 -#: rhodecode/controllers/admin/settings.py:282 +#: rhodecode/controllers/admin/settings.py:172 +#: rhodecode/controllers/admin/settings.py:283 msgid "Error occurred during updating application settings" msgstr "Error ocurrido durante actualización de ajustes de aplicación" -#: rhodecode/controllers/admin/settings.py:222 +#: rhodecode/controllers/admin/settings.py:223 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "Repositorios reescaneados exitosamente agregados: %s ; eliminados: %s" -#: rhodecode/controllers/admin/settings.py:278 +#: rhodecode/controllers/admin/settings.py:279 msgid "Updated application settings" msgstr "Se actualizaron los ajustes de aplicación" -#: rhodecode/controllers/admin/settings.py:344 +#: rhodecode/controllers/admin/settings.py:345 msgid "Updated visualisation settings" msgstr "Se actualizaron los ajustes de visualización" -#: rhodecode/controllers/admin/settings.py:347 +#: rhodecode/controllers/admin/settings.py:348 msgid "Error occurred during updating visualisation settings" msgstr "Error ocurrido al actualizar ajustes de visualización" -#: rhodecode/controllers/admin/settings.py:440 +#: rhodecode/controllers/admin/settings.py:441 msgid "Please enter email address" msgstr "Por favor ingrese una dirección de correo electrónico" -#: rhodecode/controllers/admin/settings.py:458 +#: rhodecode/controllers/admin/settings.py:459 msgid "Send email task created" msgstr "Tarea de envío de correo electrónico creada" -#: rhodecode/controllers/admin/settings.py:491 +#: rhodecode/controllers/admin/settings.py:492 msgid "Added new hook" msgstr "Se agregó nuevo gancho" -#: rhodecode/controllers/admin/settings.py:506 +#: rhodecode/controllers/admin/settings.py:507 msgid "Updated hooks" msgstr "Se actualizaron ganchos" -#: rhodecode/controllers/admin/settings.py:510 +#: rhodecode/controllers/admin/settings.py:511 msgid "Error occurred during hook creation" msgstr "Error ocurrido durante creación de gancho" -#: rhodecode/controllers/admin/settings.py:639 +#: rhodecode/controllers/admin/settings.py:640 msgid "Error occurred during updating labs settings" msgstr "Error ocurrido al actiualizar ajustes de laboratorios" -#: rhodecode/controllers/admin/settings.py:644 +#: rhodecode/controllers/admin/settings.py:645 msgid "Updated Labs settings" msgstr "Se Actualizaron Ajustes de Laboratorios" -#: rhodecode/controllers/admin/user_groups.py:164 +#: rhodecode/controllers/admin/user_groups.py:165 #, 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:178 +#: rhodecode/controllers/admin/user_groups.py:179 #, 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:219 +#: rhodecode/controllers/admin/user_groups.py:220 #, python-format msgid "Updated user group %s" msgstr "Se actualizó grupo de usuario %s" -#: rhodecode/controllers/admin/user_groups.py:235 +#: rhodecode/controllers/admin/user_groups.py:236 #, 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:257 +#: rhodecode/controllers/admin/user_groups.py:258 msgid "Successfully deleted user group" msgstr "Grupo de usuario eliminado exitosamente" -#: rhodecode/controllers/admin/user_groups.py:262 +#: rhodecode/controllers/admin/user_groups.py:263 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:330 +#: rhodecode/controllers/admin/user_groups.py:331 msgid "Target group cannot be the same" msgstr "El grupo de destino no puede ser el mismo" -#: rhodecode/controllers/admin/user_groups.py:336 +#: rhodecode/controllers/admin/user_groups.py:337 msgid "User Group permissions updated" msgstr "Permisos de grupo de usuario actualizados" -#: rhodecode/controllers/admin/user_groups.py:421 +#: rhodecode/controllers/admin/user_groups.py:422 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/users.py:595 +#: rhodecode/controllers/admin/users.py:477 msgid "An error occurred during permissions saving" msgstr "Ocurrió un error al guardar permisos" -#: rhodecode/controllers/admin/users.py:153 +#: rhodecode/controllers/admin/user_groups.py:481 +msgid "User Group synchronization updated successfully" +msgstr "" + +#: rhodecode/controllers/admin/user_groups.py:485 +msgid "An error occurred during synchronization update" +msgstr "" + +#: rhodecode/controllers/admin/users.py:106 #, python-format msgid "Created user %(user_link)s" msgstr "Se creó usuario %(user_link)s" -#: rhodecode/controllers/admin/users.py:169 +#: rhodecode/controllers/admin/users.py:122 #, python-format msgid "Error occurred during creation of user %s" msgstr "Error ocurrido durante creación de usuario %s" -#: rhodecode/controllers/admin/users.py:214 +#: rhodecode/controllers/admin/users.py:167 msgid "User updated successfully" msgstr "Usuario actualizado exitosamente" -#: rhodecode/controllers/admin/users.py:265 +#: rhodecode/controllers/admin/users.py:218 #, python-format msgid "Detached %s repositories" msgstr "" -#: rhodecode/controllers/admin/users.py:270 +#: rhodecode/controllers/admin/users.py:223 #, python-format msgid "Deleted %s repositories" msgstr "" -#: rhodecode/controllers/admin/users.py:278 +#: rhodecode/controllers/admin/users.py:231 #, python-format msgid "Detached %s repository groups" msgstr "" -#: rhodecode/controllers/admin/users.py:283 +#: rhodecode/controllers/admin/users.py:236 #, python-format msgid "Deleted %s repository groups" msgstr "Se elminaron %s grupos de repositorio" -#: rhodecode/controllers/admin/users.py:291 +#: rhodecode/controllers/admin/users.py:244 #, python-format msgid "Detached %s user groups" msgstr "" -#: rhodecode/controllers/admin/users.py:296 +#: rhodecode/controllers/admin/users.py:249 #, python-format msgid "Deleted %s user groups" msgstr "Se eliminaron %s grupos de usuario" -#: rhodecode/controllers/admin/users.py:307 +#: rhodecode/controllers/admin/users.py:260 msgid "Successfully deleted user" msgstr "Se eliminó usuario exitosamente" -#: rhodecode/controllers/admin/users.py:313 +#: rhodecode/controllers/admin/users.py:266 msgid "An error occurred during deletion of user" msgstr "Ocurrió un error durante eliminación de usuario" -#: rhodecode/controllers/admin/users.py:332 +#: rhodecode/controllers/admin/users.py:285 msgid "Force password change disabled for user" msgstr "Forzar cambio de contraseña deshabilitado para usuario" -#: rhodecode/controllers/admin/users.py:334 +#: rhodecode/controllers/admin/users.py:287 msgid "Force password change enabled for user" msgstr "Forzar cambio de contraseña habilitado para usuario" -#: rhodecode/controllers/admin/users.py:338 +#: rhodecode/controllers/admin/users.py:291 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:371 +#: rhodecode/controllers/admin/users.py:324 #, python-format msgid "Linked repository group `%s` as personal" msgstr "" -#: rhodecode/controllers/admin/users.py:377 +#: rhodecode/controllers/admin/users.py:330 #, python-format msgid "Created repository group `%s`" msgstr "Se creó grupo de repositorio `%s`" -#: rhodecode/controllers/admin/users.py:381 +#: rhodecode/controllers/admin/users.py:334 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/controllers/admin/users.py:386 +#: rhodecode/controllers/admin/users.py:339 msgid "An error occurred during repository group creation for user" msgstr "Ocurrió un error durante creación de grupo de repositorio para usuario" -#: rhodecode/controllers/admin/users.py:406 -#: rhodecode/controllers/admin/users.py:427 -#: rhodecode/controllers/admin/users.py:459 -#: rhodecode/controllers/admin/users.py:490 -#: rhodecode/controllers/admin/users.py:507 -#: rhodecode/controllers/admin/users.py:530 -#: rhodecode/controllers/admin/users.py:604 -#: rhodecode/controllers/admin/users.py:617 -#: rhodecode/controllers/admin/users.py:675 -msgid "You can't edit this user" -msgstr "Usted no puede editar este usuario" - -#: rhodecode/controllers/admin/users.py:443 +#: rhodecode/controllers/admin/users.py:396 msgid "" "The user participates as reviewer in pull requests and cannot be deleted. " "You can set the user to \"inactive\" instead of deleting it." msgstr "" -#: rhodecode/controllers/admin/users.py:579 +#: rhodecode/controllers/admin/users.py:461 msgid "User global permissions updated successfully" msgstr "Permisos globales de usario actualizados exitosamente" -#: rhodecode/controllers/admin/users.py:707 +#: 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:722 +#: 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:726 +#: 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:744 +#: 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:65 +#: rhodecode/events/pullrequest.py:68 msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:74 +#: rhodecode/events/pullrequest.py:77 msgid "pullrequest closed" msgstr "" -#: rhodecode/events/pullrequest.py:83 +#: rhodecode/events/pullrequest.py:86 msgid "pullrequest commits updated" msgstr "" -#: rhodecode/events/pullrequest.py:92 +#: rhodecode/events/pullrequest.py:95 msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:101 +#: rhodecode/events/pullrequest.py:104 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:110 +#: rhodecode/events/pullrequest.py:113 msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:136 +#: rhodecode/events/repo.py:138 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:145 +#: rhodecode/events/repo.py:147 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:154 +#: rhodecode/events/repo.py:156 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:163 +#: rhodecode/events/repo.py:165 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:199 +#: rhodecode/events/repo.py:201 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:208 +#: rhodecode/events/repo.py:210 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:217 +#: rhodecode/events/repo.py:219 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:228 +#: rhodecode/events/repo.py:230 msgid "repository push" msgstr "" @@ -1496,25 +1551,24 @@ msgstr "" msgid "repository group update" msgstr "" -#: rhodecode/events/user.py:34 +#: rhodecode/events/user.py:37 msgid "user registered" msgstr "" -#: rhodecode/events/user.py:48 +#: rhodecode/events/user.py:52 msgid "user pre create" msgstr "" -#: rhodecode/events/user.py:61 +#: rhodecode/events/user.py:66 msgid "user post create" msgstr "" -#: rhodecode/events/user.py:74 +#: rhodecode/events/user.py:80 msgid "user pre update" msgstr "" #: rhodecode/forms/__init__.py:32 rhodecode/templates/admin/gists/new.mako:62 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:31 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:88 +#: 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 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 @@ -1526,15 +1580,14 @@ msgstr "" #: 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_vcs.mako:46 +#: 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 #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 #: rhodecode/templates/admin/settings/settings_visual.mako:222 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:27 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:85 +#: 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_profile.mako:135 @@ -1544,17 +1597,17 @@ msgstr "" #: rhodecode/forms/__init__.py:33 rhodecode/templates/admin/gists/show.mako:49 #: rhodecode/templates/admin/integrations/list.mako:211 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:60 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 #: rhodecode/templates/admin/permissions/permissions_ips.mako:26 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:56 +#: 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/base/issue_tracker_settings.mako:70 -#: rhodecode/templates/base/vcs_settings.mako:202 -#: rhodecode/templates/base/vcs_settings.mako:227 +#: 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/changeset/changeset_file_comment.mako:142 @@ -1563,9 +1616,9 @@ msgstr "" #: rhodecode/templates/data_table/_dt_elements.mako:198 #: rhodecode/templates/data_table/_dt_elements.mako:210 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:35 -#: rhodecode/templates/files/files_source.mako:39 -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_source.mako:45 +#: rhodecode/templates/files/files_source.mako:49 +#: rhodecode/templates/files/files_source.mako:52 #: rhodecode/templates/pullrequests/pullrequest_show.mako:56 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" @@ -1604,28 +1657,28 @@ msgstr "" msgid "Root repositories only" msgstr "" -#: rhodecode/integrations/views.py:161 +#: rhodecode/integrations/views.py:160 msgid "{repo_name} repository" msgstr "" -#: rhodecode/integrations/views.py:164 +#: rhodecode/integrations/views.py:163 msgid "{repo_group_name} repo group" msgstr "" -#: rhodecode/integrations/views.py:171 +#: rhodecode/integrations/views.py:170 msgid "{name} integration" msgstr "" -#: rhodecode/integrations/views.py:185 +#: rhodecode/integrations/views.py:184 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:265 +#: rhodecode/integrations/views.py:264 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:290 +#: rhodecode/integrations/views.py:289 msgid "Integration {integration_name} updated successfully." msgstr "" @@ -1699,58 +1752,59 @@ msgid "" "Send events such as repo pushes and pull requests to your hipchat channel." msgstr "" -#: rhodecode/integrations/types/slack.py:44 +#: rhodecode/integrations/types/slack.py:46 msgid "Slack service URL" msgstr "" -#: rhodecode/integrations/types/slack.py:45 +#: rhodecode/integrations/types/slack.py:47 msgid "" "This can be setup at the slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:58 rhodecode/templates/login.mako:42 -#: rhodecode/templates/register.mako:40 +#: 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/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:90 -#: rhodecode/templates/base/base.mako:301 +#: rhodecode/templates/admin/users/users.mako:62 +#: rhodecode/templates/base/base.mako:304 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 msgid "Username" msgstr "" -#: rhodecode/integrations/types/slack.py:59 +#: rhodecode/integrations/types/slack.py:61 msgid "Username to show notifications coming from." msgstr "" -#: rhodecode/integrations/types/slack.py:68 +#: rhodecode/integrations/types/slack.py:70 msgid "Channel" msgstr "" -#: rhodecode/integrations/types/slack.py:69 +#: rhodecode/integrations/types/slack.py:71 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:78 +#: rhodecode/integrations/types/slack.py:80 msgid "Emoji" msgstr "" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:81 msgid "Emoji to use eg. :studio_microphone:" msgstr "" -#: rhodecode/integrations/types/slack.py:101 +#: rhodecode/integrations/types/slack.py:92 msgid "Slack" msgstr "" -#: rhodecode/integrations/types/slack.py:102 +#: rhodecode/integrations/types/slack.py:93 msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" @@ -1914,25 +1968,25 @@ msgstr "" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1189 +#: rhodecode/lib/auth.py:1197 #, python-format msgid "IP %s not allowed" msgstr "IP %s no permitida" -#: rhodecode/lib/auth.py:1263 +#: rhodecode/lib/auth.py:1281 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:1311 +#: rhodecode/lib/auth.py:1329 #, python-format msgid "Action not supported for %s." msgstr "Acción no soportada para %s" -#: rhodecode/lib/auth.py:1348 +#: rhodecode/lib/auth.py:1379 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:557 +#: rhodecode/lib/base.py:549 #, python-format msgid "The repository at %(repo_name)s cannot be located." msgstr "" @@ -1958,36 +2012,16 @@ msgstr "" msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1515 +#: rhodecode/lib/helpers.py:1517 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:1519 +#: rhodecode/lib/helpers.py:1521 msgid "No Files" msgstr "" -#: rhodecode/lib/helpers.py:1592 -msgid "new file" -msgstr "" - -#: rhodecode/lib/helpers.py:1595 -msgid "mod" -msgstr "" - -#: rhodecode/lib/helpers.py:1598 -msgid "del" -msgstr "" - -#: rhodecode/lib/helpers.py:1601 -msgid "rename" -msgstr "" - -#: rhodecode/lib/helpers.py:1606 -msgid "chmod" -msgstr "" - -#: rhodecode/lib/helpers.py:1853 +#: rhodecode/lib/helpers.py:1800 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2006,7 +2040,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1873 +#: rhodecode/lib/helpers.py:1820 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the" @@ -2046,9 +2080,9 @@ msgid "in ${val} and ${detail}" msgstr "" #: rhodecode/lib/utils2.py:515 -#: rhodecode/public/js/rhodecode-components.js:33194 -#: rhodecode/public/js/scripts.js:25042 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: 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/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "" @@ -2081,7 +2115,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/model/db.py:2298 +#: 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 msgid "Repository no access" msgstr "" @@ -2113,7 +2149,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/model/db.py:2299 +#: 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 msgid "Repository read access" msgstr "" @@ -2145,7 +2183,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/model/db.py:2300 +#: 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 msgid "Repository write access" msgstr "" @@ -2177,7 +2217,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 -#: rhodecode/model/db.py:2301 +#: 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 msgid "Repository admin access" msgstr "" @@ -2249,7 +2291,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/model/db.py:2319 +#: 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 msgid "Repository creation disabled" msgstr "" @@ -2281,7 +2325,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 -#: rhodecode/model/db.py:2320 +#: 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 msgid "Repository creation enabled" msgstr "" @@ -2313,7 +2359,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 -#: rhodecode/model/db.py:2324 +#: 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 msgid "Repository forking disabled" msgstr "" @@ -2345,7 +2393,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/model/db.py:2325 +#: 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 msgid "Repository forking enabled" msgstr "" @@ -2398,7 +2448,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 -#: rhodecode/model/db.py:3009 +#: 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 msgid "Not Reviewed" msgstr "" @@ -2430,7 +2482,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 -#: rhodecode/model/db.py:3010 +#: 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 msgid "Approved" msgstr "" @@ -2462,7 +2516,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 -#: rhodecode/model/db.py:3011 +#: 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 msgid "Rejected" msgstr "" @@ -2494,7 +2550,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 -#: rhodecode/model/db.py:3012 +#: 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 msgid "Under Review" msgstr "" @@ -2523,7 +2581,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/model/db.py:2303 +#: 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 msgid "Repository group no access" msgstr "" @@ -2552,7 +2612,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/model/db.py:2304 +#: 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 msgid "Repository group read access" msgstr "" @@ -2581,7 +2643,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/model/db.py:2305 +#: 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 msgid "Repository group write access" msgstr "" @@ -2610,7 +2674,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 -#: rhodecode/model/db.py:2306 +#: 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 msgid "Repository group admin access" msgstr "" @@ -2638,7 +2704,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/model/db.py:2308 +#: 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 msgid "User group no access" msgstr "" @@ -2666,7 +2734,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 -#: rhodecode/model/db.py:2309 +#: 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 msgid "User group read access" msgstr "" @@ -2694,7 +2764,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/model/db.py:2310 +#: 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 msgid "User group write access" msgstr "" @@ -2722,7 +2794,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/model/db.py:2311 +#: 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 msgid "User group admin access" msgstr "" @@ -2750,7 +2824,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/model/db.py:2313 +#: 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 msgid "Repository Group creation disabled" msgstr "" @@ -2778,7 +2854,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/model/db.py:2314 +#: 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 msgid "Repository Group creation enabled" msgstr "" @@ -2806,7 +2884,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/model/db.py:2316 +#: 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 msgid "User Group creation disabled" msgstr "" @@ -2834,7 +2914,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/model/db.py:2317 +#: 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 msgid "User Group creation enabled" msgstr "" @@ -2862,7 +2944,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 -#: rhodecode/model/db.py:2327 +#: 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 msgid "Registration disabled" msgstr "" @@ -2890,7 +2974,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/model/db.py:2328 +#: 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 msgid "User Registration with manual account activation" msgstr "" @@ -2918,7 +3004,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/model/db.py:2329 +#: 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 msgid "User Registration with automatic account activation" msgstr "" @@ -2946,7 +3034,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 -#: rhodecode/model/db.py:2335 rhodecode/model/permission.py:95 +#: 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 msgid "Manual activation of external account" msgstr "" @@ -2974,7 +3064,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 -#: rhodecode/model/db.py:2336 rhodecode/model/permission.py:96 +#: 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 msgid "Automatic activation of external account" msgstr "" @@ -2996,7 +3088,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/model/db.py:2321 +#: 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 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3019,7 +3113,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/model/db.py:2322 +#: 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 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3039,7 +3135,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/model/db.py:2296 +#: 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 msgid "RhodeCode Super Administrator" msgstr "" @@ -3056,7 +3154,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 -#: rhodecode/model/db.py:2338 +#: 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 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3073,7 +3173,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 -#: rhodecode/model/db.py:2339 +#: 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 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3081,7 +3183,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 rhodecode/model/db.py:913 +#: 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 msgid "all" msgstr "" @@ -3089,7 +3193,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 rhodecode/model/db.py:914 +#: 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 msgid "http/web interface" msgstr "" @@ -3097,7 +3203,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 rhodecode/model/db.py:915 +#: 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 msgid "vcs (git/hg/svn protocol)" msgstr "" @@ -3105,7 +3213,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 rhodecode/model/db.py:916 +#: 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 msgid "api calls" msgstr "" @@ -3113,7 +3223,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 rhodecode/model/db.py:917 +#: 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 msgid "feed access" msgstr "" @@ -3122,84 +3234,70 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 -#: rhodecode/model/db.py:2067 +#: 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 msgid "No parent" msgstr "" -#: rhodecode/lib/index/whoosh.py:148 +#: 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 +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 +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 +msgid "Password reset disabled" +msgstr "" + +#: rhodecode/lib/index/whoosh.py:149 msgid "Invalid search query. Try quoting it." msgstr "Consulta de búsqueda inválidad. Intente agregar comillas." -#: rhodecode/lib/index/whoosh.py:150 +#: rhodecode/lib/index/whoosh.py:151 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:155 +#: rhodecode/lib/index/whoosh.py:156 msgid "An error occurred during this search operation" msgstr "Un error ocurrió durante esta operación de búsqueda" -#: rhodecode/lib/index/whoosh.py:163 -msgid "Index Type" -msgstr "" - #: rhodecode/lib/index/whoosh.py:164 +msgid "Index Type" +msgstr "" + +#: rhodecode/lib/index/whoosh.py:165 msgid "File Index" msgstr "" -#: rhodecode/lib/index/whoosh.py:165 rhodecode/lib/index/whoosh.py:170 +#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171 msgid "Indexed documents" msgstr "" -#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172 +#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173 msgid "Last update" msgstr "" -#: rhodecode/lib/index/whoosh.py:169 +#: rhodecode/lib/index/whoosh.py:170 msgid "Commit index" msgstr "" -#: rhodecode/login/views.py:249 rhodecode/login/views.py:311 -msgid "Bad captcha" -msgstr "" - -#: rhodecode/login/views.py:258 -msgid "You have successfully registered with RhodeCode" -msgstr "Se ha registrado exitosamente con RhodeCode" - -#: rhodecode/login/views.py:300 -msgid "Password reset has been disabled." -msgstr "" - -#: rhodecode/login/views.py:327 -msgid "Your password reset link was sent" -msgstr "Su liga de reinicio de contraseña fue enviada" - -#: rhodecode/login/views.py:351 -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/model/comment.py:367 -msgid "made a comment" -msgstr "" - #: rhodecode/model/comment.py:368 +msgid "made a comment" +msgstr "" + +#: rhodecode/model/comment.py:369 msgid "Show it now" msgstr "" -#: rhodecode/model/db.py:2331 -msgid "Password reset enabled" -msgstr "" - -#: rhodecode/model/db.py:2332 -msgid "Password reset hidden" -msgstr "" - -#: rhodecode/model/db.py:2333 -msgid "Password reset disabled" -msgstr "" - #: rhodecode/model/forms.py:85 msgid "Please enter a login" msgstr "" @@ -3334,9 +3432,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:103 -#: rhodecode/templates/base/base.mako:406 -#: rhodecode/templates/base/base.mako:413 +#: rhodecode/templates/admin/users/users.mako:75 +#: rhodecode/templates/base/base.mako:409 +#: rhodecode/templates/base/base.mako:416 msgid "Admin" msgstr "" @@ -3367,74 +3465,74 @@ msgstr "" msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:77 +#: rhodecode/model/pull_request.py:78 msgid "This pull request can be automatically merged." msgstr "" -#: rhodecode/model/pull_request.py:79 +#: rhodecode/model/pull_request.py:80 msgid "This pull request cannot be merged because of an unhandled exception." msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:83 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:84 +#: rhodecode/model/pull_request.py:85 msgid "This pull request could not be merged because push to target failed." msgstr "" -#: rhodecode/model/pull_request.py:87 +#: rhodecode/model/pull_request.py:88 msgid "This pull request cannot be merged because the target is not a head." msgstr "" -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:91 msgid "" "This pull request cannot be merged because the source contains more branches" " than the target." msgstr "" -#: rhodecode/model/pull_request.py:93 +#: rhodecode/model/pull_request.py:94 msgid "" "This pull request cannot be merged because the target has multiple heads." msgstr "" -#: rhodecode/model/pull_request.py:96 +#: rhodecode/model/pull_request.py:97 msgid "" "This pull request cannot be merged because the target repository is locked." msgstr "" -#: rhodecode/model/pull_request.py:99 +#: rhodecode/model/pull_request.py:100 msgid "" "This pull request cannot be merged because the target or the source " "reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:102 +#: rhodecode/model/pull_request.py:103 msgid "" "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:105 +#: rhodecode/model/pull_request.py:106 msgid "" "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:108 +#: rhodecode/model/pull_request.py:109 msgid "" "This pull request cannot be merged because of conflicts related to sub " "repositories." msgstr "" -#: rhodecode/model/pull_request.py:114 +#: rhodecode/model/pull_request.py:115 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:116 +#: rhodecode/model/pull_request.py:117 msgid "Pull request update failed because of an unknown error." msgstr "" -#: rhodecode/model/pull_request.py:118 -msgid "No update needed because the source reference is already up to date." +#: rhodecode/model/pull_request.py:119 +msgid "No update needed because the source and target have not changed." msgstr "" #: rhodecode/model/pull_request.py:121 @@ -3465,51 +3563,51 @@ msgstr "" msgid "Pull request merged and closed" msgstr "" -#: rhodecode/model/pull_request.py:1041 +#: rhodecode/model/pull_request.py:1087 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1043 +#: rhodecode/model/pull_request.py:1089 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:1055 +#: rhodecode/model/pull_request.py:1101 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1073 +#: rhodecode/model/pull_request.py:1119 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1076 +#: rhodecode/model/pull_request.py:1122 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1233 rhodecode/model/scm.py:790 +#: rhodecode/model/pull_request.py:1279 rhodecode/model/scm.py:790 msgid "Bookmarks" msgstr "" -#: rhodecode/model/pull_request.py:1238 +#: rhodecode/model/pull_request.py:1284 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1241 +#: rhodecode/model/pull_request.py:1287 msgid "Closed Branches" msgstr "" -#: rhodecode/model/pull_request.py:1364 +#: rhodecode/model/pull_request.py:1411 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1375 +#: rhodecode/model/pull_request.py:1424 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:1390 +#: rhodecode/model/pull_request.py:1439 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1393 +#: rhodecode/model/pull_request.py:1442 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" @@ -3517,36 +3615,36 @@ msgstr "" msgid "latest tip" msgstr "" -#: rhodecode/model/user.py:125 +#: rhodecode/model/user.py:126 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:291 +#: rhodecode/model/user.py:292 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " "application" msgstr "" -#: rhodecode/model/user.py:464 +#: rhodecode/model/user.py:462 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:472 +#: rhodecode/model/user.py:470 #, 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:481 +#: rhodecode/model/user.py:479 #, 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:490 +#: rhodecode/model/user.py:488 #, python-format msgid "" "user \"%s\" still owns %s user groups and cannot be removed. Switch owners " @@ -3879,369 +3977,371 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:31198 -#: rhodecode/public/js/scripts.js:23046 +#: 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/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33129 -#: rhodecode/public/js/scripts.js:24977 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: 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/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33130 -#: rhodecode/public/js/scripts.js:24978 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: 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/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33131 -#: rhodecode/public/js/scripts.js:24979 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: 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/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33132 -#: rhodecode/public/js/scripts.js:24980 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: 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/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33133 -#: rhodecode/public/js/scripts.js:24981 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: 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/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33134 -#: rhodecode/public/js/scripts.js:24982 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: 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/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33154 -#: rhodecode/public/js/scripts.js:25002 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: 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/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33162 -#: rhodecode/public/js/scripts.js:25010 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: 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/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33174 -#: rhodecode/public/js/scripts.js:25022 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: 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/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33176 -#: rhodecode/public/js/scripts.js:25024 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: 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/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33180 -#: rhodecode/public/js/scripts.js:25028 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: 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/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33182 -#: rhodecode/public/js/scripts.js:25030 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: 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/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33184 -#: rhodecode/public/js/scripts.js:25032 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: 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/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47027 -#: rhodecode/public/js/scripts.js:38875 +#: 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/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47030 -#: rhodecode/public/js/scripts.js:38878 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: 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/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47033 -#: rhodecode/public/js/scripts.js:38881 +#: 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/select2/translations.js:10 msgid "No matches found" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47036 -#: rhodecode/public/js/scripts.js:38884 +#: 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/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47040 -#: rhodecode/public/js/scripts.js:38888 +#: 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/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47042 -#: rhodecode/public/js/scripts.js:38890 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: 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/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47047 -#: rhodecode/public/js/scripts.js:38895 +#: 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/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47049 -#: rhodecode/public/js/scripts.js:38897 +#: 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/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47054 -#: rhodecode/public/js/scripts.js:38902 +#: 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/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47056 -#: rhodecode/public/js/scripts.js:38904 +#: 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/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47060 -#: rhodecode/public/js/scripts.js:38908 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: 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/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47062 -#: rhodecode/public/js/scripts.js:38910 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: 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/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47991 -#: rhodecode/public/js/scripts.js:39839 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: 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/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47993 -#: rhodecode/public/js/scripts.js:39841 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: 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/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48426 -#: rhodecode/public/js/scripts.js:40274 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: 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/src/rhodecode/codemirror.js:296 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48445 -#: rhodecode/public/js/scripts.js:40293 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: 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/src/rhodecode/codemirror.js:315 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48464 -#: rhodecode/public/js/scripts.js:40312 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: 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/src/rhodecode/codemirror.js:334 +#: rhodecode/templates/email_templates/commit_comment.mako:99 +#: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48484 -#: rhodecode/public/js/scripts.js:40332 +#: 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/src/rhodecode/codemirror.js:354 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48848 -#: rhodecode/public/js/scripts.js:40696 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/comments.js:123 +#: 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/src/rhodecode/comments.js:125 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48927 -#: rhodecode/public/js/scripts.js:40775 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 -#: rhodecode/public/js/src/rhodecode/comments.js:202 +#: 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/src/rhodecode/comments.js:209 msgid "Status Review" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48941 -#: rhodecode/public/js/scripts.js:40789 +#: 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/src/rhodecode/comments.js:216 +#: rhodecode/public/js/src/rhodecode/comments.js:224 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49089 -#: rhodecode/public/js/scripts.js:40937 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/comments.js:364 +#: 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/src/rhodecode/comments.js:381 msgid "Submitting..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49140 -#: rhodecode/public/js/scripts.js:40988 +#: 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/src/rhodecode/comments.js:415 +#: rhodecode/public/js/src/rhodecode/comments.js:432 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49245 -#: rhodecode/public/js/scripts.js:41093 +#: 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/src/rhodecode/comments.js:520 +#: rhodecode/public/js/src/rhodecode/comments.js:537 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49316 -#: rhodecode/public/js/scripts.js:41164 +#: 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/src/rhodecode/comments.js:591 +#: 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:49393 -#: rhodecode/public/js/scripts.js:41241 +#: 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/src/rhodecode/comments.js:668 +#: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49507 -#: rhodecode/public/js/scripts.js:41355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 -#: rhodecode/public/js/src/rhodecode/comments.js:782 +#: 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/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49713 -#: rhodecode/public/js/scripts.js:41561 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: 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/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49715 -#: rhodecode/public/js/scripts.js:41563 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: 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/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49724 -#: rhodecode/public/js/scripts.js:41572 +#: 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/src/rhodecode/files.js:161 msgid "No matching files" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49859 -#: rhodecode/public/js/scripts.js:41707 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: 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/src/rhodecode/files.js:296 msgid "Selection link" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49899 -#: rhodecode/public/js/scripts.js:41747 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: 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/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49900 -#: rhodecode/public/js/scripts.js:41748 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 +#: 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/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49909 -#: rhodecode/public/js/scripts.js:41757 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: 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/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49910 -#: rhodecode/public/js/scripts.js:41758 +#: 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/src/rhodecode/followers.js:37 msgid "Follow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50366 -#: rhodecode/public/js/scripts.js:42214 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:212 +#: 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 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50937 -#: rhodecode/public/js/scripts.js:42785 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: 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/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50957 -#: rhodecode/public/js/scripts.js:42805 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: 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/src/rhodecode.js:162 msgid "Show more" msgstr "" @@ -4251,14 +4351,14 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:479 -#: rhodecode/templates/codeblocks/diffs.mako:484 +#: rhodecode/templates/codeblocks/diffs.mako:488 +#: rhodecode/templates/codeblocks/diffs.mako:493 msgid "Add another comment" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:320 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:325 msgid "Close" msgstr "" @@ -4316,81 +4416,102 @@ msgstr "" msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +msgid "Saving..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: 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:40 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 -msgid "Show selected commit __S" -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:48 -#: rhodecode/public/js/src/i18n_messages.js:7 -msgid "Switch to chat" -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 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: 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:54 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 -#: rhodecode/templates/admin/auth/auth_settings.mako:71 -msgid "disabled" -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" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 msgid "files" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/templates/pullrequests/pullrequest.mako:108 +msgid "loading..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -msgid "{0} days" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +msgid "{0} out of {1} users" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 msgid "{0} years" msgstr "" +#: rhodecode/public/js/src/math_jax/extensions/HelpDialog.js:19 +msgid "HelpDialog" +msgstr "" + +#: rhodecode/public/js/src/math_jax/jax/output/HTML-CSS/autoload/mglyph.js:19 +msgid "MathML" +msgstr "" + #: rhodecode/public/js/vendors/webcomponentsjs/webcomponents.min.js:11 msgid "UIEvent" msgstr "" @@ -4407,10 +4528,6 @@ msgstr "" msgid "FocusEvent" msgstr "" -#: rhodecode/svn_support/events.py:30 -msgid "Configuration for Apaache mad_dav_svn changed." -msgstr "" - #: rhodecode/templates/index.mako:5 msgid "Dashboard" msgstr "" @@ -4468,6 +4585,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:15 #: 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 #: rhodecode/templates/base/perms_summary.mako:102 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 @@ -4480,22 +4598,25 @@ msgstr "" #: rhodecode/templates/index_base.mako:100 #: rhodecode/templates/index_base.mako:125 #: rhodecode/templates/admin/gists/index.mako:114 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:81 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 -#: rhodecode/templates/admin/repos/repo_add_base.mako:32 +#: 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/repos.mako:57 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 #: rhodecode/templates/admin/user_groups/user_groups.mako:57 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +#: 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/base/issue_tracker_settings.mako:10 #: rhodecode/templates/changeset/changeset.mako:53 #: rhodecode/templates/compare/compare_commits.mako:20 -#: rhodecode/templates/email_templates/commit_comment.mako:82 +#: 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 #: rhodecode/templates/files/file_tree_detail.mako:5 @@ -4503,8 +4624,8 @@ msgstr "" #: rhodecode/templates/forks/fork.mako:48 #: rhodecode/templates/forks/forks_data.mako:9 #: rhodecode/templates/pullrequests/pullrequest.mako:47 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:158 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:163 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:460 #: rhodecode/templates/summary/components.mako:73 msgid "Description" msgstr "" @@ -4519,7 +4640,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/users/user_edit_groups.mako:65 #: rhodecode/templates/forks/forks_data.mako:7 #: rhodecode/templates/summary/components.mako:195 msgid "Owner" @@ -4540,9 +4662,9 @@ msgstr "" #: rhodecode/templates/changelog/changelog_summary_data.mako:8 #: rhodecode/templates/changeset/changeset.mako:36 #: rhodecode/templates/compare/compare_commits.mako:18 -#: rhodecode/templates/email_templates/commit_comment.mako:45 -#: rhodecode/templates/email_templates/commit_comment.mako:81 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: 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/search/search_commit.mako:6 #: rhodecode/templates/tags/tags.mako:66 msgid "Commit" @@ -4557,45 +4679,45 @@ msgstr "" msgid "Home" msgstr "" -#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:34 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:326 +#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:329 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "" -#: rhodecode/templates/login.mako:36 +#: rhodecode/templates/login.mako:37 msgid "Go to the registration page to create a new account." msgstr "" -#: rhodecode/templates/login.mako:57 +#: rhodecode/templates/login.mako:58 msgid "Remember me" msgstr "" -#: rhodecode/templates/login.mako:61 +#: rhodecode/templates/login.mako:62 msgid "Forgot your password?" msgstr "" -#: rhodecode/templates/login.mako:65 -#: rhodecode/templates/password_reset.mako:34 +#: rhodecode/templates/login.mako:66 +#: rhodecode/templates/password_reset.mako:35 msgid "Password reset is disabled. Please contact " msgstr "" -#: rhodecode/templates/login.mako:67 -#: rhodecode/templates/password_reset.mako:36 -#: rhodecode/templates/base/base.mako:43 -#: rhodecode/templates/errors/error_document.mako:64 -msgid "Support" -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 +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 msgid "or" msgstr "" -#: rhodecode/templates/login.mako:70 -#: rhodecode/templates/password_reset.mako:39 +#: rhodecode/templates/login.mako:71 +#: rhodecode/templates/password_reset.mako:40 msgid "an administrator if you need help." msgstr "" @@ -4603,28 +4725,28 @@ msgstr "" msgid "Reset Password" msgstr "" -#: rhodecode/templates/password_reset.mako:46 +#: rhodecode/templates/password_reset.mako:47 msgid "Reset your Password" msgstr "" -#: rhodecode/templates/password_reset.mako:47 +#: rhodecode/templates/password_reset.mako:48 msgid "Go to the login page to sign in." msgstr "" -#: rhodecode/templates/password_reset.mako:51 +#: rhodecode/templates/password_reset.mako:52 msgid "Email Address" msgstr "" -#: rhodecode/templates/password_reset.mako:60 -#: rhodecode/templates/register.mako:84 +#: rhodecode/templates/password_reset.mako:61 +#: rhodecode/templates/register.mako:85 msgid "Captcha" msgstr "" -#: rhodecode/templates/password_reset.mako:70 -msgid "Send password reset email" -msgstr "" - #: rhodecode/templates/password_reset.mako:71 +msgid "Send password reset email" +msgstr "" + +#: rhodecode/templates/password_reset.mako:72 msgid "Password reset link will be sent to matching email address" msgstr "" @@ -4632,49 +4754,49 @@ msgstr "" msgid "Create an Account" msgstr "" -#: rhodecode/templates/register.mako:34 +#: rhodecode/templates/register.mako:35 msgid "Create an account" msgstr "" -#: rhodecode/templates/register.mako:35 +#: rhodecode/templates/register.mako:36 msgid "Go to the login page to sign in with an existing account." msgstr "" -#: rhodecode/templates/register.mako:54 +#: rhodecode/templates/register.mako:55 msgid "Re-enter password" msgstr "" -#: rhodecode/templates/register.mako:61 +#: rhodecode/templates/register.mako:62 #: rhodecode/templates/admin/my_account/my_account_profile.mako:32 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:33 #: 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:94 +#: rhodecode/templates/admin/users/users.mako:66 msgid "First Name" msgstr "" -#: rhodecode/templates/register.mako:68 +#: rhodecode/templates/register.mako:69 #: rhodecode/templates/admin/my_account/my_account_profile.mako:40 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:42 #: 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:96 +#: rhodecode/templates/admin/users/users.mako:68 msgid "Last Name" msgstr "" -#: rhodecode/templates/register.mako:96 +#: rhodecode/templates/register.mako:97 msgid "Account activation requires admin approval." msgstr "" -#: rhodecode/templates/register.mako:103 +#: rhodecode/templates/register.mako:104 msgid "Create Account" msgstr "" #: rhodecode/templates/admin/admin.mako:5 #: rhodecode/templates/admin/admin.mako:15 -#: rhodecode/templates/base/base.mako:72 +#: rhodecode/templates/base/base.mako:75 msgid "Admin journal" msgstr "" @@ -4683,6 +4805,7 @@ msgid "journal filter..." msgstr "" #: rhodecode/templates/admin/admin.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "" @@ -4695,31 +4818,38 @@ msgstr[0] "" msgstr[1] "" #: rhodecode/templates/admin/admin.mako:17 +#: rhodecode/templates/admin/users/user_edit_audit.mako:17 #: rhodecode/templates/journal/journal.mako:17 msgid "Example Queries" msgstr "" #: rhodecode/templates/admin/admin_log.mako:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 #: rhodecode/templates/admin/repos/repos.mako:69 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 -#: rhodecode/templates/admin/user_groups/user_groups.mako:66 -#: rhodecode/templates/admin/users/users.mako:107 -#: rhodecode/templates/files/files_detail.mako:63 +#: 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/files/files_detail.mako:58 msgid "Action" msgstr "" #: rhodecode/templates/admin/admin_log.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/bookmarks/bookmarks.mako:61 #: rhodecode/templates/branches/branches.mako:60 #: rhodecode/templates/tags/tags.mako:61 @@ -4727,10 +4857,12 @@ 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 msgid "No actions yet" msgstr "" @@ -4771,7 +4903,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:135 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 -#: rhodecode/templates/admin/repos/repo_add_base.mako:90 +#: 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 @@ -4781,6 +4913,7 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:120 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:102 #: rhodecode/templates/admin/users/user_add.mako:128 +#: rhodecode/templates/admin/users/user_edit_groups.mako:27 #: rhodecode/templates/admin/users/user_edit_profile.mako:134 #: rhodecode/templates/base/default_perms_box.mako:88 msgid "Save" @@ -4802,18 +4935,18 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/index.mako:110 #: rhodecode/templates/admin/integrations/list.mako:103 -#: rhodecode/templates/admin/repos/repo_add_base.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:75 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 -#: rhodecode/templates/admin/repos/repo_add_base.mako:82 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 msgid "Private Repository" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:86 +#: rhodecode/templates/admin/repos/repo_add_base.mako:97 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:112 #: rhodecode/templates/forks/fork.mako:87 msgid "" @@ -4879,7 +5012,7 @@ msgid "Update Gist" msgstr "" #: rhodecode/templates/admin/gists/edit.mako:102 -#: rhodecode/templates/base/issue_tracker_settings.mako:74 +#: rhodecode/templates/base/issue_tracker_settings.mako:73 #: rhodecode/templates/changeset/changeset_file_comment.mako:385 #: rhodecode/templates/codeblocks/diffs.mako:76 #: rhodecode/templates/files/files_add.mako:102 @@ -4955,8 +5088,8 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:180 #: rhodecode/templates/compare/compare_commits.mako:17 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:304 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:457 #: rhodecode/templates/pullrequests/pullrequests.mako:102 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/tags/tags.mako:63 @@ -5013,7 +5146,7 @@ msgstr "" #: rhodecode/templates/admin/gists/show.mako:56 #: rhodecode/templates/admin/integrations/list.mako:204 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 -#: rhodecode/templates/base/issue_tracker_settings.mako:61 +#: rhodecode/templates/base/issue_tracker_settings.mako:60 #: rhodecode/templates/data_table/_dt_elements.mako:118 #: rhodecode/templates/data_table/_dt_elements.mako:180 #: rhodecode/templates/data_table/_dt_elements.mako:193 @@ -5021,10 +5154,10 @@ msgstr "" #: rhodecode/templates/debug_style/buttons.html:128 #: rhodecode/templates/files/files_add.mako:204 #: rhodecode/templates/files/files_edit.mako:165 -#: rhodecode/templates/files/files_source.mako:38 -#: rhodecode/templates/files/files_source.mako:41 +#: 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:319 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:324 #: rhodecode/templates/users/user_profile.mako:7 msgid "Edit" msgstr "" @@ -5043,7 +5176,7 @@ msgstr "" #: rhodecode/templates/admin/gists/show.mako:91 #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:87 msgid "Show as raw" msgstr "" @@ -5068,8 +5201,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:43 #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 -#: rhodecode/templates/base/base.mako:81 -#: rhodecode/templates/base/base.mako:246 +#: rhodecode/templates/base/base.mako:84 +#: rhodecode/templates/base/base.mako:249 msgid "Settings" msgstr "" @@ -5101,6 +5234,8 @@ msgid "Create new integration" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:104 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14 msgid "Scope" msgstr "" @@ -5170,7 +5305,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:340 +#: rhodecode/templates/base/base.mako:343 msgid "My account" msgstr "" @@ -5179,9 +5314,10 @@ msgid "My Account" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:29 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 -msgid "My Profile" +#: rhodecode/templates/email_templates/user_registration.mako:26 +#: rhodecode/templates/users/user.mako:29 +#: rhodecode/templates/users/user_profile.mako:5 +msgid "Profile" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:31 @@ -5193,11 +5329,8 @@ msgid "OAuth Identities" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:37 -msgid "My Emails" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account.mako:38 -msgid "My Repositories" +#: rhodecode/templates/admin/users/user_edit.mako:38 +msgid "Emails" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:39 @@ -5206,81 +5339,82 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:40 #: rhodecode/templates/admin/notifications/notifications.mako:33 -#: rhodecode/templates/base/base.mako:238 +#: rhodecode/templates/base/base.mako:241 msgid "Pull Requests" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:41 -msgid "My Permissions" +#: 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/user_groups/user_group_edit.mako:34 +#: rhodecode/templates/base/base.mako:80 +msgid "Permissions" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:42 -msgid "My Live Notifications" +msgid "Live Notifications" msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:3 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 msgid "Authentication Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:7 -msgid "Built-in tokens can be used to authenticate with all possible options." -msgstr "" - #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:8 -msgid "" -"Each token can have a role. VCS tokens can be used together with the " -"authtoken auth plugin for git/hg/svn operations." -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:11 -msgid "Built-in" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:51 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:47 -msgid "expires" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:29 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:26 -#, python-format -msgid "Confirm to reset this auth token: %s" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 -msgid "expired" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:59 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:55 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:8 +msgid "" +"Each token can have a role. Token with a role can be used only in given " +"context, e.g. VCS tokens can be used together with the authtoken auth plugin" +" for git/hg/svn operations only." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:13 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:13 +msgid "Token" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:17 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:17 +msgid "Expiration" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:48 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:44 #, python-format msgid "Confirm to remove this auth token: %s" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:67 -msgid "No additional auth token specified" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:78 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:56 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:52 +msgid "No additional auth tokens specified" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:68 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:64 msgid "New authentication token" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:82 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +msgid "Repository scope works only with tokens with VCS type." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86 #: rhodecode/templates/admin/my_account/my_account_emails.mako:64 #: rhodecode/templates/admin/permissions/permissions_ips.mako:60 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:84 +#: 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 msgid "Add" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:128 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:125 +msgid "repository scope" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_emails.mako:5 msgid "Account Emails" msgstr "" @@ -5334,6 +5468,11 @@ msgstr "" msgid "Source type" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 +msgid "My Profile" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_profile.mako:11 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:55 #: rhodecode/templates/admin/users/user_edit_profile.mako:25 @@ -5423,14 +5562,6 @@ msgstr "" msgid "Permissions Administration" msgstr "" -#: 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/user_groups/user_group_edit.mako:34 -#: rhodecode/templates/base/base.mako:77 -msgid "Permissions" -msgstr "" - #: rhodecode/templates/admin/permissions/permissions.mako:33 msgid "Application" msgstr "" @@ -5570,8 +5701,8 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:74 -#: rhodecode/templates/base/base.mako:148 +#: rhodecode/templates/base/base.mako:77 +#: rhodecode/templates/base/base.mako:151 msgid "Repository groups" msgstr "" @@ -5585,7 +5716,7 @@ msgid "Group Parent" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 -#: rhodecode/templates/admin/repos/repo_add_base.mako:55 +#: rhodecode/templates/admin/repos/repo_add_base.mako:66 msgid "Copy Parent Group Permissions" msgstr "" @@ -5702,7 +5833,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:107 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117 -#: rhodecode/templates/base/issue_tracker_settings.mako:84 +#: rhodecode/templates/base/issue_tracker_settings.mako:83 msgid "Add new" msgstr "" @@ -5765,52 +5896,48 @@ msgid "Import Existing Repository ?" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:193 +#: rhodecode/templates/base/base.mako:196 msgid "Clone from" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:27 -msgid "Optional http[s] URL from which to clone a repository." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_add_base.mako:36 +#: rhodecode/templates/admin/repos/repo_add_base.mako:47 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:102 #: rhodecode/templates/forks/fork.mako:52 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:41 +#: rhodecode/templates/admin/repos/repo_add_base.mako:52 msgid "Repository Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 +#: 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)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:50 +#: rhodecode/templates/admin/repos/repo_add_base.mako:61 #: rhodecode/templates/forks/fork.mako:67 msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:59 +#: rhodecode/templates/admin/repos/repo_add_base.mako:70 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:68 +#: rhodecode/templates/admin/repos/repo_add_base.mako:79 msgid "Set the type of repository to create." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:73 +#: rhodecode/templates/admin/repos/repo_add_base.mako:84 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:70 #: rhodecode/templates/forks/fork.mako:73 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:77 +#: rhodecode/templates/admin/repos/repo_add_base.mako:88 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." @@ -5854,7 +5981,16 @@ msgstr "" msgid "Statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.mako:87 +#: rhodecode/templates/admin/repos/repo_edit.mako:75 +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3 +msgid "Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:78 +msgid "Strip" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:93 msgid "Reviewers" msgstr "" @@ -5881,12 +6017,10 @@ msgid "This repository is a fork of %(re msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 -#: rhodecode/templates/admin/repos/repo_edit_fork.mako:5 msgid "Set" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:39 -#: rhodecode/templates/admin/repos/repo_edit_fork.mako:9 msgid "Manually set this repository as a fork of another from the list" msgstr "" @@ -6023,10 +6157,11 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:37 #: 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:62 +#: 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:101 +#: rhodecode/templates/admin/users/users.mako:73 msgid "Active" msgstr "" @@ -6102,6 +6237,23 @@ 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 +msgid "No maintenance tasks for this repo available" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:26 +msgid "Run Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:41 +msgid "Performing Maintenance" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:5 msgid "Repository Permissions" msgstr "" @@ -6122,16 +6274,21 @@ msgstr "" msgid "Remote mirror url" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 +#: 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 msgid "Pull changes from remote location" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:22 msgid "Confirm to pull changes from remote side" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:19 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:27 msgid "This repository does not have any remote mirror url set." msgstr "" @@ -6255,11 +6412,80 @@ msgstr "" msgid "Confirm to remove current statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:3 +msgid "Strip commits from repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:7 +#, python-format +msgid "Please provide up to %d commits commits to strip" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:9 +msgid "" +"In the first step commits will be verified for existance in the repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:10 +msgid "In the second step, correct commits will be available for stripping" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:16 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:52 +msgid "Enter full 40 character commit sha" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:18 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:54 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:95 +msgid "Add another commit" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:27 +msgid "Check commits" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:33 +msgid "Sorry this functionality is not available for SVN repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:46 +msgid "Remove" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:112 +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 +msgid " commit verified positive" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:131 +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" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:13 msgid "Select to inherit global vcs settings." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:45 +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:43 #: rhodecode/templates/admin/settings/settings_global.mako:139 #: rhodecode/templates/admin/settings/settings_labs.mako:48 #: rhodecode/templates/admin/settings/settings_vcs.mako:13 @@ -6796,8 +7022,8 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_add.mako:13 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:76 -#: rhodecode/templates/base/base.mako:151 +#: rhodecode/templates/base/base.mako:79 +#: rhodecode/templates/base/base.mako:154 msgid "User groups" msgstr "" @@ -6838,30 +7064,72 @@ msgid "Members" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:9 +msgid "Automatic member sync" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:11 msgid "Assigned to repositories" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:10 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:12 msgid "Assigned to repo groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:17 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:19 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6 #, python-format msgid "User Group: %s" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:26 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:29 +msgid "Group members sync" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:36 +msgid "This group is set to be automatically synchronised." +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 +msgid "This group is not set to be automatically synchronised" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51 +msgid "Disable synchronization" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53 +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 msgid "Delete User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:32 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:81 #, 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:34 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:83 msgid "Delete This User Group" msgstr "" @@ -6887,6 +7155,7 @@ msgid "No members yet" msgstr "" #: rhodecode/templates/admin/user_groups/user_groups.mako:5 +#: rhodecode/templates/admin/users/user_edit_groups.mako:6 msgid "User groups administration" msgstr "" @@ -6894,18 +7163,22 @@ msgstr "" msgid "user groups" msgstr "" +#: rhodecode/templates/admin/user_groups/user_groups.mako:62 +msgid "Sync" +msgstr "" + #: rhodecode/templates/admin/users/user_add.mako:5 msgid "Add user" msgstr "" #: rhodecode/templates/admin/users/user_add.mako:13 #: rhodecode/templates/admin/users/user_edit.mako:14 -#: rhodecode/templates/base/base.mako:75 +#: rhodecode/templates/base/base.mako:78 msgid "Users" msgstr "" #: rhodecode/templates/admin/users/user_add.mako:15 -#: rhodecode/templates/admin/users/users.mako:27 +#: rhodecode/templates/admin/users/users.mako:28 msgid "Add User" msgstr "" @@ -6957,14 +7230,18 @@ msgstr "" msgid "Auth tokens" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:38 -msgid "Emails" -msgstr "" - #: rhodecode/templates/admin/users/user_edit.mako:39 msgid "Ip Whitelist" msgstr "" +#: rhodecode/templates/admin/users/user_edit.mako:40 +msgid "User Groups Management" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.mako:41 +msgid "User audit" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 #: rhodecode/templates/admin/users/user_edit_profile.mako:106 msgid "Source of Record" @@ -6975,7 +7252,7 @@ msgid "Last login" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 -#: rhodecode/templates/admin/users/users.mako:99 +#: rhodecode/templates/admin/users/users.mako:71 msgid "Last activity" msgstr "" @@ -7084,22 +7361,23 @@ msgid "" "will delete the user's repositories!" msgstr "" -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 -msgid "Authentication Access Tokens" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:63 -msgid "No additional auth tokens specified" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:75 -msgid "New auth token" +#: rhodecode/templates/admin/users/user_edit_audit.mako:7 +msgid "User Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +msgid "audit filter..." msgstr "" #: rhodecode/templates/admin/users/user_edit_emails.mako:5 msgid "Additional Email Addresses" msgstr "" +#: rhodecode/templates/admin/users/user_edit_groups.mako:12 +#, python-format +msgid "Add `%s` to user group" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_ips.mako:3 msgid "Custom IP Whitelist" msgstr "" @@ -7156,98 +7434,98 @@ msgstr "" msgid "Users administration" msgstr "" -#: rhodecode/templates/admin/users/users.mako:105 +#: rhodecode/templates/admin/users/users.mako:77 msgid "Auth type" msgstr "" -#: rhodecode/templates/base/base.mako:50 +#: rhodecode/templates/base/base.mako:53 #, python-format msgid "RhodeCode instance id: %s" msgstr "" -#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:81 msgid "Authentication" msgstr "" -#: rhodecode/templates/base/base.mako:80 +#: rhodecode/templates/base/base.mako:83 msgid "Defaults" msgstr "" -#: rhodecode/templates/base/base.mako:98 +#: rhodecode/templates/base/base.mako:101 #: rhodecode/templates/files/files_pjax.mako:24 #: rhodecode/templates/summary/components.mako:42 msgid "Show More" msgstr "" -#: rhodecode/templates/base/base.mako:185 +#: rhodecode/templates/base/base.mako:188 msgid "Fork of" msgstr "" -#: rhodecode/templates/base/base.mako:202 +#: rhodecode/templates/base/base.mako:205 #, python-format msgid "Repository locked by %(user)s" msgstr "" -#: rhodecode/templates/base/base.mako:207 +#: rhodecode/templates/base/base.mako:210 msgid "Repository not locked. Pull repository to lock it." msgstr "" -#: rhodecode/templates/base/base.mako:225 +#: rhodecode/templates/base/base.mako:228 #: rhodecode/templates/data_table/_dt_elements.mako:12 #: rhodecode/templates/data_table/_dt_elements.mako:13 #: rhodecode/templates/data_table/_dt_elements.mako:153 msgid "Summary" msgstr "" -#: rhodecode/templates/base/base.mako:226 +#: rhodecode/templates/base/base.mako:229 #: rhodecode/templates/data_table/_dt_elements.mako:17 #: rhodecode/templates/data_table/_dt_elements.mako:18 msgid "Changelog" msgstr "" -#: rhodecode/templates/base/base.mako:227 +#: rhodecode/templates/base/base.mako:230 #: rhodecode/templates/data_table/_dt_elements.mako:22 #: rhodecode/templates/data_table/_dt_elements.mako:23 #: rhodecode/templates/files/files.mako:15 msgid "Files" msgstr "" -#: rhodecode/templates/base/base.mako:229 +#: rhodecode/templates/base/base.mako:232 #: rhodecode/templates/bookmarks/bookmarks.mako:68 #: rhodecode/templates/branches/branches.mako:67 #: rhodecode/templates/tags/tags.mako:68 msgid "Compare" msgstr "" -#: rhodecode/templates/base/base.mako:234 +#: rhodecode/templates/base/base.mako:237 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: rhodecode/templates/base/base.mako:243 +#: rhodecode/templates/base/base.mako:246 msgid "Options" msgstr "" -#: rhodecode/templates/base/base.mako:250 -#: rhodecode/templates/forks/forks_data.mako:30 -msgid "Compare fork" -msgstr "" - #: rhodecode/templates/base/base.mako:253 -#: rhodecode/templates/base/base.mako:400 +#: 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/search/search.mako:64 msgid "Search" msgstr "" -#: rhodecode/templates/base/base.mako:257 +#: rhodecode/templates/base/base.mako:260 msgid "Unlock" msgstr "" -#: rhodecode/templates/base/base.mako:259 +#: rhodecode/templates/base/base.mako:262 msgid "Lock" msgstr "" -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:267 #: rhodecode/templates/data_table/_dt_elements.mako:27 #: rhodecode/templates/data_table/_dt_elements.mako:28 #: rhodecode/templates/forks/forks_data.mako:8 @@ -7257,77 +7535,77 @@ msgid_plural "Forks" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/base/base.mako:265 +#: rhodecode/templates/base/base.mako:268 msgid "Create Pull Request" msgstr "" -#: rhodecode/templates/base/base.mako:287 +#: rhodecode/templates/base/base.mako:290 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:295 +#: rhodecode/templates/base/base.mako:298 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:312 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:322 +#: 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:342 +#: rhodecode/templates/base/base.mako:345 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:346 +#: rhodecode/templates/base/base.mako:349 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:382 +#: rhodecode/templates/base/base.mako:385 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:383 +#: rhodecode/templates/base/base.mako:386 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:14 msgid "Journal" msgstr "" -#: rhodecode/templates/base/base.mako:388 +#: rhodecode/templates/base/base.mako:391 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:389 +#: rhodecode/templates/base/base.mako:392 msgid "Public journal" msgstr "" -#: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/base/base.mako:397 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:395 +#: rhodecode/templates/base/base.mako:398 msgid "Gists" msgstr "" -#: rhodecode/templates/base/base.mako:399 +#: rhodecode/templates/base/base.mako:402 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:408 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:412 +#: rhodecode/templates/base/base.mako:415 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:422 -#: rhodecode/templates/base/base.mako:423 +#: rhodecode/templates/base/base.mako:425 +#: rhodecode/templates/base/base.mako:426 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7349,15 +7627,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:480 +#: rhodecode/templates/base/base.mako:483 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:533 +#: rhodecode/templates/base/base.mako:536 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:541 +#: rhodecode/templates/base/base.mako:544 msgid "Site-wide shortcuts" msgstr "" @@ -7426,9 +7704,7 @@ msgid "User Group Creation" msgstr "" #: rhodecode/templates/base/default_perms_box.mako:72 -msgid "" -"Permission to allow user group creation. When disabled, user group admins " -"can still create subgroups within their user groups." +msgid "Permission to allow user group creation." msgstr "" #: rhodecode/templates/base/default_perms_box.mako:78 @@ -7453,19 +7729,19 @@ msgid "" "permission by members of user groups." msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:22 +#: rhodecode/templates/base/issue_tracker_settings.mako:21 msgid "Read more" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:92 +#: rhodecode/templates/base/issue_tracker_settings.mako:91 msgid "New Entry" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:96 +#: rhodecode/templates/base/issue_tracker_settings.mako:95 msgid "Confirm to remove this pattern:" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:192 +#: 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 @@ -7475,7 +7751,7 @@ msgstr "" msgid "Preview" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:193 +#: rhodecode/templates/base/issue_tracker_settings.mako:192 msgid "Test Pattern Preview" msgstr "" @@ -7623,101 +7899,130 @@ msgstr "" msgid "Enable largefiles extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:99 +#: rhodecode/templates/base/vcs_settings.mako:100 msgid "Enable Largefiles extensions for all repositories." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:103 +#: rhodecode/templates/base/vcs_settings.mako:102 +msgid "Enable Largefiles extensions for this repository." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:113 +msgid "" +"Filesystem location where Mercurial largefile objects should be stored." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:119 msgid "Set repositories as publishing" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:103 +#: rhodecode/templates/base/vcs_settings.mako:119 msgid "Set repository as publishing" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:106 +#: rhodecode/templates/base/vcs_settings.mako:122 msgid "" "When this is enabled all commits in the repository are seen as public " "commits by clients." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:111 +#: rhodecode/templates/base/vcs_settings.mako:127 msgid "Enable hgsubversion extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:114 +#: rhodecode/templates/base/vcs_settings.mako:130 msgid "" "Requires hgsubversion library to be installed. Allows cloning remote SVN " "repositories and migrates them to Mercurial type." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:123 +#: rhodecode/templates/base/vcs_settings.mako:139 msgid "Mercurial Labs Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:123 +#: rhodecode/templates/base/vcs_settings.mako:139 msgid "" "These features are considered experimental and may not work as expected." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:129 +#: rhodecode/templates/base/vcs_settings.mako:145 msgid "Use rebase as merge strategy" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:132 +#: rhodecode/templates/base/vcs_settings.mako:148 msgid "" "Use rebase instead of creating a merge commit when merging via web " "interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:144 +#: rhodecode/templates/base/vcs_settings.mako:160 +msgid "Git Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:165 +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 "Filesystem location where Git lfs objects should be stored." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:193 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:150 +#: rhodecode/templates/base/vcs_settings.mako:199 msgid "Proxy subversion HTTP requests" msgstr "Solicitudes por proxy HTTP subversion" -#: rhodecode/templates/base/vcs_settings.mako:154 +#: 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:155 +#: rhodecode/templates/base/vcs_settings.mako:204 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:161 +#: rhodecode/templates/base/vcs_settings.mako:210 msgid "Subversion HTTP Server URL" msgstr "URL de Servidor HTTP Subversion" -#: rhodecode/templates/base/vcs_settings.mako:167 +#: rhodecode/templates/base/vcs_settings.mako:216 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:179 +#: rhodecode/templates/base/vcs_settings.mako:228 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:184 +#: rhodecode/templates/base/vcs_settings.mako:233 msgid "Repository patterns" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:188 +#: rhodecode/templates/base/vcs_settings.mako:237 msgid "" "Patterns for identifying SVN branches and tags. For recursive search, use " "\"*\". Eg.: \"/branches/*\"" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:254 +#: rhodecode/templates/base/vcs_settings.mako:301 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:259 +#: rhodecode/templates/base/vcs_settings.mako:306 msgid "Enable server-side merge for pull requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:262 +#: rhodecode/templates/base/vcs_settings.mako:309 msgid "" "Note: when this feature is enabled, it only runs hooks defined in the " "rcextension package. Custom hooks added on the Admin -> Settings -> Hooks " @@ -7725,11 +8030,11 @@ msgid "" "web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:266 +#: rhodecode/templates/base/vcs_settings.mako:313 msgid "Invalidate and relocate inline comments during update" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:269 +#: rhodecode/templates/base/vcs_settings.mako:316 msgid "" "During the update of a pull request, the position of inline comments will be" " updated and outdated inline comments will be hidden." @@ -7866,7 +8171,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:53 #: rhodecode/templates/compare/compare_commits.mako:46 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:495 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" @@ -7959,8 +8264,8 @@ msgid "Diff options" msgstr "" #: rhodecode/templates/changeset/changeset.mako:119 -#: rhodecode/templates/codeblocks/diffs.mako:436 -#: rhodecode/templates/codeblocks/diffs.mako:439 +#: rhodecode/templates/codeblocks/diffs.mako:445 +#: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "" @@ -7977,8 +8282,8 @@ msgid "Patch Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:127 -#: rhodecode/templates/codeblocks/diffs.mako:443 -#: rhodecode/templates/codeblocks/diffs.mako:446 +#: rhodecode/templates/codeblocks/diffs.mako:452 +#: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "" @@ -7988,7 +8293,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:145 #: rhodecode/templates/changeset/changeset.mako:147 -#: rhodecode/tests/functional/test_commit_comments.py:270 +#: rhodecode/tests/functional/test_commit_comments.py:275 #, python-format msgid "%d Commit comment" msgid_plural "%d Commit comments" @@ -7997,7 +8302,7 @@ msgstr[1] "" #: rhodecode/templates/changeset/changeset.mako:150 #: rhodecode/templates/changeset/changeset.mako:152 -#: rhodecode/tests/functional/test_commit_comments.py:277 +#: rhodecode/tests/functional/test_commit_comments.py:282 #, python-format msgid "%d Inline Comment" msgid_plural "%d Inline Comments" @@ -8103,18 +8408,16 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:363 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:148 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:153 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:388 +#: rhodecode/templates/changeset/changeset_file_comment.mako:393 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 #: rhodecode/templates/compare/compare_diff.mako:122 -#: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:97 msgid "Comment" msgstr "" @@ -8149,7 +8452,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_range.mako:99 #: rhodecode/templates/compare/compare_diff.mako:312 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:414 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:419 #, python-format msgid "Expand %s commit" msgid_plural "Expand %s commits" @@ -8158,7 +8461,7 @@ msgstr[1] "" #: rhodecode/templates/changeset/changeset_range.mako:105 #: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 #, python-format msgid "Collapse %s commit" msgid_plural "Collapse %s commits" @@ -8260,64 +8563,68 @@ msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:406 -#: rhodecode/templates/codeblocks/diffs.mako:422 +#: rhodecode/templates/codeblocks/diffs.mako:415 +#: rhodecode/templates/codeblocks/diffs.mako:431 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:408 -#: rhodecode/templates/codeblocks/diffs.mako:415 +#: rhodecode/templates/codeblocks/diffs.mako:417 +#: rhodecode/templates/codeblocks/diffs.mako:424 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:413 -#: rhodecode/templates/codeblocks/diffs.mako:429 +#: rhodecode/templates/codeblocks/diffs.mako:422 +#: rhodecode/templates/codeblocks/diffs.mako:438 #, python-format msgid "File no longer present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:424 -#: rhodecode/templates/codeblocks/diffs.mako:431 +#: rhodecode/templates/codeblocks/diffs.mako:433 +#: rhodecode/templates/codeblocks/diffs.mako:440 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:462 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:462 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:634 +#: rhodecode/templates/codeblocks/diffs.mako:643 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:636 +#: rhodecode/templates/codeblocks/diffs.mako:645 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:640 +#: rhodecode/templates/codeblocks/diffs.mako:649 msgid "View unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:641 +#: rhodecode/templates/codeblocks/diffs.mako:650 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:651 +#: rhodecode/templates/codeblocks/diffs.mako:660 msgid "Expand All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:655 +#: rhodecode/templates/codeblocks/diffs.mako:664 msgid "Collapse All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:659 +#: rhodecode/templates/codeblocks/diffs.mako:668 msgid "Wide Mode Diff" msgstr "" +#: rhodecode/templates/codeblocks/source.mako:24 +msgid "view annotation from before this change" +msgstr "" + #: rhodecode/templates/compare/compare_commits.mako:5 msgid "Common Ancestor Commit" msgstr "" @@ -8327,7 +8634,7 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:16 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:451 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:456 msgid "Time" msgstr "" @@ -8339,7 +8646,7 @@ msgstr[0] "" msgstr[1] "" #: rhodecode/templates/compare/compare_commits.mako:68 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:568 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:573 msgid "show it" msgid_plural "show them" msgstr[0] "" @@ -8375,14 +8682,14 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:98 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:103 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.mako:76 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 -#: rhodecode/templates/files/files_source.mako:20 +#: rhodecode/templates/files/files_source.mako:23 msgid "Source" msgstr "" @@ -8605,133 +8912,150 @@ msgstr "" msgid "RhodeCode" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:16 -#: rhodecode/templates/email_templates/pull_request_comment.mako:18 +#: rhodecode/templates/email_templates/commit_comment.mako:18 +#: rhodecode/templates/email_templates/pull_request_comment.mako:19 msgid "[mention]" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:19 -#, python-format -msgid "" -"%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:19 -#: rhodecode/templates/email_templates/commit_comment.mako:22 +#: rhodecode/templates/email_templates/commit_comment.mako:21 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on commit `%(commit_id)s` (file: " +"`%(comment_file)s`)" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:24 +#: rhodecode/templates/email_templates/commit_comment.mako:26 #, python-format msgid "in the %(repo_name)s repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:22 -#, python-format -msgid "%(user)s commented on commit `%(commit_id)s` (status: %(status)s)" -msgstr "" - #: rhodecode/templates/email_templates/commit_comment.mako:24 -#: rhodecode/templates/email_templates/commit_comment.mako:78 -#, python-format -msgid "%(user)s commented on commit `%(commit_id)s`" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:43 -#: rhodecode/templates/email_templates/pull_request_comment.mako:44 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on commit `%(commit_id)s` (status: " +"%(status)s)" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:26 +#, python-format +msgid "%(user)s left %(comment_type)s on commit `%(commit_id)s`" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:47 +#: rhodecode/templates/email_templates/pull_request_comment.mako:47 msgid "Comment link" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:48 -#: rhodecode/templates/email_templates/pull_request_comment.mako:49 +#: rhodecode/templates/email_templates/commit_comment.mako:52 +#: rhodecode/templates/email_templates/pull_request_comment.mako:52 #, python-format msgid "File: %(comment_file)s on line %(comment_line)s" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:54 +#: rhodecode/templates/email_templates/commit_comment.mako:58 msgid "Commit status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:76 +#: rhodecode/templates/email_templates/commit_comment.mako:82 #, python-format msgid "%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:76 -#: rhodecode/templates/email_templates/commit_comment.mako:78 +#: rhodecode/templates/email_templates/commit_comment.mako:82 +#: rhodecode/templates/email_templates/commit_comment.mako:84 #, python-format msgid "in the %(repo)s repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:85 +#: rhodecode/templates/email_templates/commit_comment.mako:84 +#, python-format +msgid "%(user)s commented on commit `%(commit_id)s`" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:92 +#: rhodecode/templates/email_templates/pull_request_comment.mako:94 msgid "Status" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:85 +#: rhodecode/templates/email_templates/commit_comment.mako:93 msgid "The commit status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:97 -#, python-format -msgid "Comment on line: %(comment_line)s" -msgstr "" - -#: rhodecode/templates/email_templates/password_reset.mako:30 +#: rhodecode/templates/email_templates/commit_comment.mako:99 +#: rhodecode/templates/email_templates/pull_request_comment.mako:107 +#, python-format +msgid "TODO comment on line: %(comment_line)s" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:101 +#: rhodecode/templates/email_templates/pull_request_comment.mako:109 +#, python-format +msgid "Note comment on line: %(comment_line)s" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:101 +#: rhodecode/templates/email_templates/pull_request_comment.mako:109 +msgid "Note comment" +msgstr "" + +#: rhodecode/templates/email_templates/password_reset.mako:31 msgid "Generate new password here" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:21 -#, python-format -msgid "" -"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: " -"`%(comment_file)s`)" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:24 -#, python-format -msgid "" -"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: " -"%(status)s)" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:26 -#: rhodecode/templates/email_templates/pull_request_comment.mako:83 -#, python-format -msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:46 +#: rhodecode/templates/email_templates/pull_request_comment.mako:22 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\" " +"(file: `%(comment_file)s`)" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:25 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\" " +"(status: %(status)s)" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:27 +#, python-format +msgid "%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:49 msgid "Source repository" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:55 +#: rhodecode/templates/email_templates/pull_request_comment.mako:58 #, python-format msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:57 +#: rhodecode/templates/email_templates/pull_request_comment.mako:60 #, python-format msgid "" "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:81 +#: rhodecode/templates/email_templates/pull_request_comment.mako:84 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" " "(file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:87 -#, python-format -msgid "submitted pull request status: %(status)s" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:89 -#, python-format -msgid "submitted pull request status: %(status)s and closed" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:95 -msgid "Submitted status" +#: rhodecode/templates/email_templates/pull_request_comment.mako:86 +#, python-format +msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 +msgid "Closed pull request with status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:99 +msgid "Submitted review status" msgstr "" #: rhodecode/templates/email_templates/pull_request_review.mako:14 @@ -8798,12 +9122,6 @@ msgstr "" msgid "Full Name" msgstr "" -#: rhodecode/templates/email_templates/user_registration.mako:26 -#: rhodecode/templates/users/user.mako:29 -#: rhodecode/templates/users/user_profile.mako:5 -msgid "Profile" -msgstr "" - #: rhodecode/templates/errors/error_document.mako:46 #, python-format msgid "You will be redirected to %s in %s seconds" @@ -8960,13 +9278,13 @@ msgid "Delete file" msgstr "" #: rhodecode/templates/files/files_delete.mako:45 -#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:65 #, python-format msgid "Binary file (%s)" msgstr "" #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:87 msgid "File is too big to display" msgstr "" @@ -8979,19 +9297,19 @@ msgstr "" msgid "Commit Description" msgstr "" -#: rhodecode/templates/files/files_detail.mako:35 +#: rhodecode/templates/files/files_detail.mako:32 msgid "File last commit" msgstr "" -#: rhodecode/templates/files/files_detail.mako:51 +#: rhodecode/templates/files/files_detail.mako:46 msgid "Show/Diff file" msgstr "" -#: rhodecode/templates/files/files_detail.mako:66 +#: rhodecode/templates/files/files_detail.mako:61 msgid "Diff to Commit" msgstr "" -#: rhodecode/templates/files/files_detail.mako:67 +#: rhodecode/templates/files/files_detail.mako:62 msgid "Show at Commit" msgstr "" @@ -9033,72 +9351,66 @@ msgstr "" msgid "Location" msgstr "" -#: rhodecode/templates/files/files_source.mako:7 +#: rhodecode/templates/files/files_source.mako:8 +msgid "This file is a pointer to large binary file" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:8 +msgid "LargeFile" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:10 #: rhodecode/templates/search/search_content.mako:57 msgid "line" msgid_plural "lines" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/files/files_source.mako:14 +#: rhodecode/templates/files/files_source.mako:17 msgid "History" msgstr "" -#: rhodecode/templates/files/files_source.mako:17 +#: rhodecode/templates/files/files_source.mako:20 #: rhodecode/templates/search/search_content.mako:68 msgid "Show Full History" msgstr "" -#: rhodecode/templates/files/files_source.mako:22 +#: rhodecode/templates/files/files_source.mako:25 #: rhodecode/templates/search/search_content.mako:70 msgid "Annotation" msgstr "" -#: rhodecode/templates/files/files_source.mako:24 +#: rhodecode/templates/files/files_source.mako:27 #: rhodecode/templates/search/search_content.mako:71 msgid "Raw" msgstr "" -#: rhodecode/templates/files/files_source.mako:26 +#: rhodecode/templates/files/files_source.mako:31 +msgid "Download largefile" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:35 #: rhodecode/templates/search/search_content.mako:73 msgid "Download" msgstr "" -#: rhodecode/templates/files/files_source.mako:33 +#: rhodecode/templates/files/files_source.mako:43 #, python-format msgid "Edit on Branch:%s" msgstr "" -#: rhodecode/templates/files/files_source.mako:38 +#: rhodecode/templates/files/files_source.mako:48 msgid "Editing binary files not allowed" msgstr "" -#: rhodecode/templates/files/files_source.mako:41 +#: rhodecode/templates/files/files_source.mako:51 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_source.mako:52 msgid "Deleting files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/followers/followers.mako:5 -#: rhodecode/templates/followers/followers.mako:27 -#, python-format -msgid "%s Followers" -msgstr "" - -#: rhodecode/templates/followers/followers.mako:12 -msgid "Followers" -msgstr "" - -#: rhodecode/templates/followers/followers_data.mako:5 -msgid "Follower Name" -msgstr "" - -#: rhodecode/templates/followers/followers_data.mako:6 -msgid "Following Since" -msgstr "" - #: rhodecode/templates/forks/fork.mako:5 #, python-format msgid "Fork repository %s" @@ -9179,98 +9491,99 @@ msgstr "" msgid "New pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:52 +#: rhodecode/templates/pullrequests/pullrequest.mako:51 msgid "Write a short description on this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:59 +#: rhodecode/templates/pullrequests/pullrequest.mako:57 msgid "Commit flow" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:67 +#: rhodecode/templates/pullrequests/pullrequest.mako:65 msgid "Origin repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:85 +#: rhodecode/templates/pullrequests/pullrequest.mako:83 msgid "Loading refs..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:96 +#: rhodecode/templates/pullrequests/pullrequest.mako:94 msgid "Submit Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:109 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:317 +#: rhodecode/templates/pullrequests/pullrequest.mako:107 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:322 msgid "Pull request reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:110 -msgid "loading..." -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.mako:120 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:361 +#: rhodecode/templates/pullrequests/pullrequest.mako:118 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:366 msgid "Add reviewer" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:299 -#: rhodecode/templates/pullrequests/pullrequest.mako:572 +#: rhodecode/templates/pullrequests/pullrequest.mako:297 +#: rhodecode/templates/pullrequests/pullrequest.mako:570 msgid "Please select origin and destination" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:305 +#: rhodecode/templates/pullrequests/pullrequest.mako:303 msgid "Loading compare ..." msgstr "" +#: rhodecode/templates/pullrequests/pullrequest.mako:350 #: rhodecode/templates/pullrequests/pullrequest.mako:352 -#: rhodecode/templates/pullrequests/pullrequest.mako:354 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:357 +#: rhodecode/templates/pullrequests/pullrequest.mako:355 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:364 +#: rhodecode/templates/pullrequests/pullrequest.mako:362 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:464 +#: rhodecode/templates/pullrequests/pullrequest.mako:462 msgid "Destination repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:475 +#: rhodecode/templates/pullrequests/pullrequest.mako:473 msgid "Select commit reference" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:8 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:7 msgid "This pull request can be merged automatically." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:13 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:12 msgid "Merge is not currently possible because of below failed checks." msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:37 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:42 +msgid "refresh checks" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:38 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 -msgid "refresh checks" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:39 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:44 msgid "Merge Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:44 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 msgid "You are not allowed to merge this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:46 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:45 msgid "Login to Merge this Pull Request" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:54 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 +msgid "Close with status {}" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show.mako:5 #, python-format msgid "%s Pull Request #%s" @@ -9288,171 +9601,175 @@ msgstr "" msgid "Origin" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:120 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:88 +msgid "Common ancestor" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:125 msgid "Merge" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:133 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:138 msgid "Shadow repository data not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:141 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:146 msgid "Review" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:157 #, python-format msgid "calculated based on %s reviewer vote" msgid_plural "calculated based on %s reviewers votes" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:170 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:175 msgid "Versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:183 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:186 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:188 msgid "{} version available for this pull request, show it." msgid_plural "{} versions available for this pull request, show them." msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:182 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:187 msgid "Hide all versions of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:207 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:212 msgid "Your review status at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:213 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:218 msgid "Comment from pull request version {0}, general:{1} inline:{2}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:230 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:234 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:235 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:239 msgid "select versions to show changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:231 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:236 msgid "show changes between versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:232 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:237 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:247 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:252 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:251 -msgid "Comments for this pull request" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:256 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 +msgid "Comments for this pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:261 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:263 #, python-format msgid "%d General " msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:264 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:267 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:269 #, python-format msgid "%d Inline" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:268 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:272 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:273 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 #, python-format msgid "%d Outdated" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:269 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:274 msgid "show outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:270 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:281 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:286 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:295 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:365 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:300 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:370 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:382 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:387 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:383 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:388 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:391 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:396 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 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:393 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 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:404 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:409 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:427 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:432 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:440 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:445 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:444 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:449 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:462 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:464 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:469 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:567 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:572 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:570 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:575 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:571 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:576 msgid "show them" msgstr "" 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-02-05 17:11+0100\n" -"PO-Revision-Date: 2017-02-01 20:10+0000\n" +"POT-Creation-Date: 2017-04-07 12:33+0200\n" +"PO-Revision-Date: 2017-04-07 10:34+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: French (http://www.transifex.com/rhodecode/RhodeCode/language/fr/)\n" "MIME-Version: 1.0\n" @@ -19,51 +19,52 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: rhodecode/admin/navigation.py:83 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:167 +#: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 +#: rhodecode/integrations/views.py:166 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "" -#: rhodecode/admin/navigation.py:84 +#: rhodecode/apps/admin/navigation.py:84 #: rhodecode/templates/admin/repos/repo_edit.mako:52 msgid "VCS" msgstr "" -#: rhodecode/admin/navigation.py:85 +#: rhodecode/apps/admin/navigation.py:85 msgid "Visual" msgstr "" -#: rhodecode/admin/navigation.py:86 +#: rhodecode/apps/admin/navigation.py:86 msgid "Remap and Rescan" msgstr "" -#: rhodecode/admin/navigation.py:87 +#: rhodecode/apps/admin/navigation.py:87 #: rhodecode/templates/admin/repos/repo_edit.mako:58 msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:89 rhodecode/integrations/types/email.py:232 -#: rhodecode/templates/register.mako:75 +#: rhodecode/apps/admin/navigation.py:89 +#: rhodecode/integrations/types/email.py:232 +#: rhodecode/templates/register.mako:76 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: 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:92 +#: rhodecode/templates/admin/users/users.mako:64 #: rhodecode/templates/email_templates/user_registration.mako:25 #: rhodecode/templates/users/user_profile.mako:51 msgid "Email" msgstr "E-mail" -#: rhodecode/admin/navigation.py:90 +#: rhodecode/apps/admin/navigation.py:90 msgid "Hooks" msgstr "Hooks" -#: rhodecode/admin/navigation.py:91 +#: rhodecode/apps/admin/navigation.py:91 msgid "Full Text Search" msgstr "" -#: rhodecode/admin/navigation.py:93 +#: rhodecode/apps/admin/navigation.py:93 #: rhodecode/templates/admin/integrations/base.mako:23 #: rhodecode/templates/admin/integrations/form.mako:8 #: rhodecode/templates/admin/integrations/form.mako:21 @@ -77,177 +78,290 @@ msgstr "" #: 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/base/base.mako:79 +#: rhodecode/templates/base/base.mako:82 msgid "Integrations" msgstr "" -#: rhodecode/admin/navigation.py:95 +#: rhodecode/apps/admin/navigation.py:95 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" msgstr "" -#: rhodecode/admin/navigation.py:97 +#: rhodecode/apps/admin/navigation.py:97 msgid "User Sessions" msgstr "" -#: rhodecode/admin/navigation.py:99 +#: rhodecode/apps/admin/navigation.py:99 msgid "Open Source Licenses" msgstr "" -#: rhodecode/admin/navigation.py:107 +#: rhodecode/apps/admin/navigation.py:107 msgid "Labs" msgstr "" -#: rhodecode/admin/views/sessions.py:90 +#: rhodecode/apps/admin/views/sessions.py:86 msgid "Cleaned up old sessions" msgstr "" -#: rhodecode/admin/views/sessions.py:96 +#: rhodecode/apps/admin/views/sessions.py:92 msgid "Failed to cleanup up old sessions" msgstr "" -#: rhodecode/admin/views/svn_config.py:47 +#: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." msgstr "" -#: rhodecode/admin/views/svn_config.py:55 +#: rhodecode/apps/admin/views/svn_config.py:54 msgid "Failed to generate the Apache configuration for Subversion." msgstr "" -#: rhodecode/admin/views/system_info.py:96 +#: rhodecode/apps/admin/views/system_info.py:95 msgid "" "Note: please make sure this server can access `${url}` for the update link " "to work" msgstr "" -#: rhodecode/admin/views/system_info.py:99 +#: rhodecode/apps/admin/views/system_info.py:98 msgid "Update info" msgstr "" -#: rhodecode/admin/views/system_info.py:101 +#: rhodecode/apps/admin/views/system_info.py:100 msgid "Check for updates" msgstr "" -#: rhodecode/admin/views/system_info.py:106 +#: rhodecode/apps/admin/views/system_info.py:105 msgid "RhodeCode Version" msgstr "" -#: rhodecode/admin/views/system_info.py:107 +#: rhodecode/apps/admin/views/system_info.py:106 msgid "RhodeCode Server IP" msgstr "" -#: rhodecode/admin/views/system_info.py:108 +#: rhodecode/apps/admin/views/system_info.py:107 msgid "RhodeCode Server ID" msgstr "" -#: rhodecode/admin/views/system_info.py:109 +#: rhodecode/apps/admin/views/system_info.py:108 msgid "RhodeCode Configuration" msgstr "" -#: rhodecode/admin/views/system_info.py:113 +#: rhodecode/apps/admin/views/system_info.py:109 +msgid "Workers" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:110 +msgid "Worker Type" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:114 msgid "Database" msgstr "" -#: rhodecode/admin/views/system_info.py:114 +#: rhodecode/apps/admin/views/system_info.py:115 msgid "Database version" msgstr "" -#: rhodecode/admin/views/system_info.py:118 +#: rhodecode/apps/admin/views/system_info.py:119 msgid "Platform" msgstr "" -#: rhodecode/admin/views/system_info.py:119 +#: rhodecode/apps/admin/views/system_info.py:120 msgid "Platform UUID" msgstr "" -#: rhodecode/admin/views/system_info.py:120 +#: rhodecode/apps/admin/views/system_info.py:121 msgid "Python version" msgstr "" -#: rhodecode/admin/views/system_info.py:121 +#: rhodecode/apps/admin/views/system_info.py:122 msgid "Python path" msgstr "" -#: rhodecode/admin/views/system_info.py:125 +#: rhodecode/apps/admin/views/system_info.py:126 msgid "CPU" msgstr "" -#: rhodecode/admin/views/system_info.py:126 +#: rhodecode/apps/admin/views/system_info.py:127 msgid "Load" msgstr "" -#: rhodecode/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:128 msgid "Memory" msgstr "" -#: rhodecode/admin/views/system_info.py:128 +#: rhodecode/apps/admin/views/system_info.py:129 msgid "Uptime" msgstr "" -#: rhodecode/admin/views/system_info.py:132 +#: rhodecode/apps/admin/views/system_info.py:133 msgid "Storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:135 msgid "Storage inodes" msgstr "" -#: rhodecode/admin/views/system_info.py:136 +#: rhodecode/apps/admin/views/system_info.py:137 msgid "Gist storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:137 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Gist storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:139 +#: rhodecode/apps/admin/views/system_info.py:140 msgid "Archive cache storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:140 +#: rhodecode/apps/admin/views/system_info.py:141 msgid "Archive cache info" msgstr "" -#: rhodecode/admin/views/system_info.py:142 +#: rhodecode/apps/admin/views/system_info.py:143 msgid "Temp storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:143 +#: rhodecode/apps/admin/views/system_info.py:144 msgid "Temp storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:145 +#: rhodecode/apps/admin/views/system_info.py:146 msgid "Search info" msgstr "" -#: rhodecode/admin/views/system_info.py:146 +#: rhodecode/apps/admin/views/system_info.py:147 msgid "Search location" msgstr "" -#: rhodecode/admin/views/system_info.py:150 +#: rhodecode/apps/admin/views/system_info.py:151 msgid "VCS Backends" msgstr "" -#: rhodecode/admin/views/system_info.py:151 +#: rhodecode/apps/admin/views/system_info.py:152 msgid "VCS Server" msgstr "" -#: rhodecode/admin/views/system_info.py:152 +#: rhodecode/apps/admin/views/system_info.py:153 msgid "GIT" msgstr "" -#: rhodecode/admin/views/system_info.py:153 +#: rhodecode/apps/admin/views/system_info.py:154 msgid "HG" msgstr "" -#: rhodecode/admin/views/system_info.py:154 +#: rhodecode/apps/admin/views/system_info.py:155 msgid "SVN" msgstr "" +#: rhodecode/apps/admin/views/users.py:60 +#: rhodecode/controllers/admin/users.py:359 +#: rhodecode/controllers/admin/users.py:380 +#: 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/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 "5 minute" + +#: rhodecode/apps/admin/views/users.py:180 +#: rhodecode/apps/my_account/views.py:140 +#: 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/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/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/controllers/admin/gists.py:70 +msgid "Lifetime" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:188 +#: rhodecode/apps/my_account/views.py:148 +#: 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 +msgid "Auth token successfully created" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:240 +#: rhodecode/apps/my_account/views.py:192 +msgid "Auth token successfully deleted" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:284 +msgid "Groups successfully changed" +msgstr "" + +#: rhodecode/apps/login/views.py:247 rhodecode/apps/login/views.py:316 +msgid "Bad captcha" +msgstr "" + +#: rhodecode/apps/login/views.py:256 +msgid "You have successfully registered with RhodeCode" +msgstr "" + +#: rhodecode/apps/login/views.py:292 +msgid "If such email exists, a password reset link was sent to it." +msgstr "" + +#: rhodecode/apps/login/views.py:298 +msgid "Password reset has been disabled." +msgstr "" + +#: rhodecode/apps/login/views.py:381 +msgid "Given reset token is invalid" +msgstr "" + +#: rhodecode/apps/login/views.py:389 +msgid "" +"Your password reset was successful, a new password has been sent to your " +"email" +msgstr "" + +#: rhodecode/apps/my_account/views.py:115 +msgid "Error occurred during update of user password" +msgstr "" + +#: rhodecode/apps/my_account/views.py:122 +msgid "Successfully updated password" +msgstr "" + +#: rhodecode/apps/svn_support/events.py:30 +msgid "Configuration for Apaache mad_dav_svn changed." +msgstr "" + #: rhodecode/authentication/schema.py:35 msgid "Enable or disable this authentication plugin." msgstr "" @@ -263,12 +377,11 @@ msgstr "Autorisée" #: rhodecode/authentication/schema.py:43 msgid "" -"Amount of seconds to cache the authentication call for this plugin. Useful " -"for long calls like LDAP to improve the responsiveness of the authentication" -" system (0 means disabled)." -msgstr "" - -#: rhodecode/authentication/schema.py:48 +"Amount of seconds to cache the authentication responsecall for this plugin. \n" +"Useful for long calls like LDAP to improve the performance of the authentication system (0 means disabled)." +msgstr "" + +#: rhodecode/authentication/schema.py:49 msgid "Auth Cache TTL" msgstr "" @@ -289,99 +402,101 @@ msgstr "" msgid "Error occurred during update of auth settings." msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:61 +#: rhodecode/authentication/plugins/auth_crowd.py:60 msgid "The FQDN or IP of the Atlassian CROWD Server" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:63 +#: rhodecode/authentication/plugins/auth_crowd.py:62 msgid "Host" msgstr "Serveur" -#: rhodecode/authentication/plugins/auth_crowd.py:68 +#: rhodecode/authentication/plugins/auth_crowd.py:67 msgid "The Port in use by the Atlassian CROWD Server" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:70 +#: rhodecode/authentication/plugins/auth_crowd.py:69 #: rhodecode/authentication/plugins/auth_ldap.py:84 msgid "Port" msgstr "Port" -#: rhodecode/authentication/plugins/auth_crowd.py:76 +#: rhodecode/authentication/plugins/auth_crowd.py:75 msgid "The Application Name to authenticate to CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:78 +#: rhodecode/authentication/plugins/auth_crowd.py:77 msgid "Application Name" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:83 +#: rhodecode/authentication/plugins/auth_crowd.py:82 msgid "The password to authenticate to CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:85 +#: rhodecode/authentication/plugins/auth_crowd.py:84 msgid "Application Password" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:90 +#: rhodecode/authentication/plugins/auth_crowd.py:89 msgid "" "A comma separated list of group names that identify users as RhodeCode " "Administrators" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:94 +#: rhodecode/authentication/plugins/auth_crowd.py:93 msgid "Admin Groups" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:216 +#: rhodecode/authentication/plugins/auth_crowd.py:215 msgid "CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:55 +#: rhodecode/authentication/plugins/auth_headers.py:54 msgid "Header to extract the user from" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:57 +#: rhodecode/authentication/plugins/auth_headers.py:56 msgid "Header" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:62 +#: rhodecode/authentication/plugins/auth_headers.py:61 msgid "Header to extract the user from when main one fails" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:64 +#: rhodecode/authentication/plugins/auth_headers.py:63 msgid "Fallback header" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:69 +#: rhodecode/authentication/plugins/auth_headers.py:68 msgid "" "Perform cleaning of user, if passed user has @ in username then first part " "before @ is taken. If there's \\ in the username only the part after \\ is " "taken" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:74 +#: rhodecode/authentication/plugins/auth_headers.py:73 msgid "Clean username" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:99 +#: rhodecode/authentication/plugins/auth_headers.py:98 msgid "Headers" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:63 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:62 msgid "The url of the Jasig CAS REST service" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:65 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:64 #: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:93 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:92 msgid "Jasig-CAS" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:75 -msgid "Host of the LDAP Server" +#: 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 @@ -389,107 +504,117 @@ msgid "LDAP Host" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:82 -msgid "Port that the LDAP server is listening on" +msgid "Custom port that the LDAP server is listening on. Default: 389" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:90 -msgid "User to connect to LDAP" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:93 +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 msgid "Account" msgstr "Compte" -#: rhodecode/authentication/plugins/auth_ldap.py:98 -msgid "Password to connect to LDAP" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:101 -#: rhodecode/templates/login.mako:49 rhodecode/templates/register.mako:47 +#: rhodecode/authentication/plugins/auth_ldap.py:100 +msgid "Password to authenticate for given user DN." +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:103 +#: 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:310 +#: rhodecode/templates/base/base.mako:313 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "Mot de passe" -#: rhodecode/authentication/plugins/auth_ldap.py:106 +#: rhodecode/authentication/plugins/auth_ldap.py:108 msgid "TLS Type" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:107 +#: rhodecode/authentication/plugins/auth_ldap.py:109 msgid "Connection Security" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:113 +#: rhodecode/authentication/plugins/auth_ldap.py:115 msgid "Require Cert over TLS?" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:114 +#: rhodecode/authentication/plugins/auth_ldap.py:116 msgid "Certificate Checks" msgstr "Vérif. des certificats" -#: rhodecode/authentication/plugins/auth_ldap.py:120 -msgid "Base DN to search (e.g., dc=mydomain,dc=com)" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:123 +#: rhodecode/authentication/plugins/auth_ldap.py:122 +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 msgid "Base DN" msgstr "Base de recherche" -#: rhodecode/authentication/plugins/auth_ldap.py:128 -msgid "Filter to narrow results (e.g., ou=Users, etc)" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:131 -msgid "LDAP Search Filter" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:136 -msgid "How deep to search LDAP" +#: rhodecode/authentication/plugins/auth_ldap.py:132 +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 -msgid "LDAP Search Scope" -msgstr "Portée de recherche" +msgid "LDAP Search Filter" +msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:143 -msgid "LDAP Attribute to map to user name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:145 +msgid "How deep to search LDAP. If unsure set to SUBTREE" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:144 +msgid "LDAP Search Scope" +msgstr "Portée de recherche" + +#: rhodecode/authentication/plugins/auth_ldap.py:150 +msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:152 msgid "Login Attribute" msgstr "Attribut pour le nom d’utilisateur" -#: rhodecode/authentication/plugins/auth_ldap.py:146 +#: rhodecode/authentication/plugins/auth_ldap.py:153 msgid "The LDAP Login attribute of the CN must be specified" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:151 -msgid "LDAP Attribute to map to first name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:154 +#: rhodecode/authentication/plugins/auth_ldap.py:158 +msgid "LDAP Attribute to map to first name (e.g., givenName)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:161 msgid "First Name Attribute" msgstr "Attribut pour le prénom" -#: rhodecode/authentication/plugins/auth_ldap.py:159 -msgid "LDAP Attribute to map to last name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:162 +#: rhodecode/authentication/plugins/auth_ldap.py:166 +msgid "LDAP Attribute to map to last name (e.g., sn)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:169 msgid "Last Name Attribute" msgstr "Attribut pour le nom de famille" -#: rhodecode/authentication/plugins/auth_ldap.py:167 -msgid "LDAP Attribute to map to email address" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:170 +#: rhodecode/authentication/plugins/auth_ldap.py:174 +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 msgid "Email Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:351 +#: rhodecode/authentication/plugins/auth_ldap.py:360 msgid "LDAP" msgstr "" @@ -514,16 +639,16 @@ msgstr "" msgid "PAM" msgstr "" -#: rhodecode/authentication/plugins/auth_rhodecode.py:68 +#: rhodecode/authentication/plugins/auth_rhodecode.py:67 msgid "Rhodecode" msgstr "" -#: rhodecode/authentication/plugins/auth_token.py:71 +#: rhodecode/authentication/plugins/auth_token.py:70 msgid "Rhodecode Token Auth" msgstr "" #: rhodecode/controllers/changelog.py:91 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:202 +#: rhodecode/controllers/pullrequests.py:204 msgid "There are no commits yet" msgstr "" @@ -557,8 +682,8 @@ msgid "No such commit exists for this re msgstr "" #: rhodecode/controllers/changeset.py:344 -#: rhodecode/controllers/pullrequests.py:948 -#: rhodecode/model/pull_request.py:1009 +#: rhodecode/controllers/pullrequests.py:985 +#: rhodecode/model/pull_request.py:1055 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" @@ -598,12 +723,12 @@ msgid "" "%(repo1)s with commit %(commit2)s from repository %(repo2)s." msgstr "" -#: rhodecode/controllers/feed.py:70 +#: rhodecode/controllers/feed.py:69 #, python-format msgid "Changes on %s repository" msgstr "Changements sur le dépôt %s" -#: rhodecode/controllers/feed.py:71 +#: rhodecode/controllers/feed.py:70 #, python-format msgid "%s %s feed" msgstr "Flux %s de %s" @@ -617,93 +742,93 @@ msgstr "" msgid "There are no files yet. %s" msgstr "" -#: rhodecode/controllers/files.py:394 rhodecode/controllers/files.py:447 -#: rhodecode/controllers/files.py:478 rhodecode/controllers/files.py:553 -#: rhodecode/controllers/files.py:598 rhodecode/controllers/files.py:689 +#: 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 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:402 rhodecode/controllers/files.py:455 +#: rhodecode/controllers/files.py:443 rhodecode/controllers/files.py:496 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:411 rhodecode/controllers/files.py:464 +#: rhodecode/controllers/files.py:452 rhodecode/controllers/files.py:505 #, python-format msgid "Deleted file %s via RhodeCode Enterprise" msgstr "" -#: rhodecode/controllers/files.py:431 +#: rhodecode/controllers/files.py:472 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:540 -#: rhodecode/controllers/files.py:677 +#: rhodecode/controllers/files.py:475 rhodecode/controllers/files.py:581 +#: rhodecode/controllers/files.py:718 msgid "Error occurred during commit" msgstr "Une erreur est survenue durant le commit" -#: rhodecode/controllers/files.py:486 rhodecode/controllers/files.py:561 +#: rhodecode/controllers/files.py:527 rhodecode/controllers/files.py:602 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:498 rhodecode/controllers/files.py:573 +#: rhodecode/controllers/files.py:539 rhodecode/controllers/files.py:614 #, python-format msgid "Edited file %s via RhodeCode Enterprise" msgstr "" -#: rhodecode/controllers/files.py:515 +#: rhodecode/controllers/files.py:556 msgid "No changes" msgstr "Aucun changement" -#: rhodecode/controllers/files.py:537 rhodecode/controllers/files.py:666 +#: 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:611 rhodecode/controllers/files.py:700 +#: rhodecode/controllers/files.py:652 rhodecode/controllers/files.py:741 msgid "Added file via RhodeCode Enterprise" msgstr "" -#: rhodecode/controllers/files.py:636 +#: rhodecode/controllers/files.py:677 msgid "No filename" msgstr "Aucun nom de fichier" -#: rhodecode/controllers/files.py:669 +#: 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:723 +#: rhodecode/controllers/files.py:764 msgid "Downloads disabled" msgstr "Les téléchargements sont désactivés" -#: rhodecode/controllers/files.py:729 +#: rhodecode/controllers/files.py:770 #, python-format msgid "Unknown revision %s" msgstr "Révision %s inconnue." -#: rhodecode/controllers/files.py:731 +#: rhodecode/controllers/files.py:772 msgid "Empty repository" msgstr "Dépôt vide." -#: rhodecode/controllers/files.py:733 rhodecode/controllers/files.py:767 +#: rhodecode/controllers/files.py:774 rhodecode/controllers/files.py:808 msgid "Unknown archive type" msgstr "Type d’archive inconnu" -#: rhodecode/controllers/files.py:952 +#: rhodecode/controllers/files.py:993 msgid "Changesets" msgstr "Changesets" -#: rhodecode/controllers/files.py:973 rhodecode/controllers/summary.py:269 -#: rhodecode/model/pull_request.py:1234 rhodecode/model/scm.py:782 -#: rhodecode/templates/base/vcs_settings.mako:193 +#: 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:977 rhodecode/model/scm.py:797 -#: rhodecode/templates/base/vcs_settings.mako:218 +#: rhodecode/controllers/files.py:1018 rhodecode/model/scm.py:797 +#: rhodecode/templates/base/vcs_settings.mako:267 msgid "Tags" msgstr "Tags" @@ -712,23 +837,24 @@ 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:205 +#: rhodecode/controllers/home.py:207 msgid "Groups" msgstr "Groupes" -#: rhodecode/controllers/home.py:212 rhodecode/controllers/home.py:247 -#: rhodecode/controllers/pullrequests.py:308 +#: 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:73 -#: rhodecode/templates/base/base.mako:145 -#: rhodecode/templates/base/base.mako:569 +#: 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:225 +#: rhodecode/controllers/home.py:227 #, python-format msgid "Commits in %(repo)s" msgstr "" @@ -741,81 +867,81 @@ msgstr "Journal public" msgid "journal" msgstr "Journal" -#: rhodecode/controllers/pullrequests.py:216 +#: rhodecode/controllers/pullrequests.py:218 msgid "Commit does not exist" msgstr "" -#: rhodecode/controllers/pullrequests.py:333 -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:335 +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 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/controllers/pullrequests.py:383 +#: rhodecode/controllers/pullrequests.py:385 msgid "Successfully opened new pull request" msgstr "La requête de pull a été ouverte avec succès." -#: rhodecode/controllers/pullrequests.py:386 +#: 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:429 +#: rhodecode/controllers/pullrequests.py:431 msgid "Cannot update closed pull requests." msgstr "" -#: rhodecode/controllers/pullrequests.py:435 +#: rhodecode/controllers/pullrequests.py:437 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/controllers/pullrequests.py:443 +#: rhodecode/controllers/pullrequests.py:455 msgid "" "Pull request updated to \"{source_commit_id}\" with {count_added} added, " -"{count_removed} removed commits." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:458 +"{count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:472 msgid "Reload page" msgstr "" -#: rhodecode/controllers/pullrequests.py:532 +#: rhodecode/controllers/pullrequests.py:546 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/controllers/pullrequests.py:569 +#: rhodecode/controllers/pullrequests.py:588 msgid "Successfully deleted pull request" msgstr "La requête de pull a été supprimée avec succès." -#: rhodecode/controllers/pullrequests.py:864 -msgid "Close Pull Request" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:952 -#: rhodecode/model/pull_request.py:1013 +#: rhodecode/controllers/pullrequests.py:592 +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:1002 +#: 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:243 +#: rhodecode/controllers/summary.py:251 msgid "Branch" msgstr "" -#: rhodecode/controllers/summary.py:244 +#: rhodecode/controllers/summary.py:252 msgid "Tag" msgstr "" -#: rhodecode/controllers/summary.py:245 +#: rhodecode/controllers/summary.py:253 msgid "Bookmark" msgstr "" -#: rhodecode/controllers/summary.py:270 +#: rhodecode/controllers/summary.py:278 msgid "Closed branches" msgstr "" @@ -827,42 +953,6 @@ msgstr "" msgid "Error occurred during update of default values" msgstr "" -#: rhodecode/controllers/admin/gists.py:62 -#: rhodecode/controllers/admin/my_account.py:384 -#: rhodecode/controllers/admin/users.py:465 -msgid "forever" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:63 -#: rhodecode/controllers/admin/my_account.py:385 -#: rhodecode/controllers/admin/users.py:466 -msgid "5 minutes" -msgstr "5 minute" - -#: rhodecode/controllers/admin/gists.py:64 -#: rhodecode/controllers/admin/my_account.py:386 -#: rhodecode/controllers/admin/users.py:467 -msgid "1 hour" -msgstr "1 heure" - -#: rhodecode/controllers/admin/gists.py:65 -#: rhodecode/controllers/admin/my_account.py:387 -#: rhodecode/controllers/admin/users.py:468 -msgid "1 day" -msgstr "1 jour" - -#: rhodecode/controllers/admin/gists.py:66 -#: rhodecode/controllers/admin/my_account.py:388 -#: rhodecode/controllers/admin/users.py:469 -msgid "1 month" -msgstr "1 mois" - -#: rhodecode/controllers/admin/gists.py:70 -#: rhodecode/controllers/admin/my_account.py:390 -#: rhodecode/controllers/admin/users.py:471 -msgid "Lifetime" -msgstr "" - #: rhodecode/controllers/admin/gists.py:72 msgid "Requires registered account" msgstr "" @@ -899,10 +989,8 @@ msgstr "" #: rhodecode/controllers/admin/gists.py:343 #: rhodecode/templates/admin/gists/show.mako:67 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 #: rhodecode/templates/data_table/_dt_elements.mako:263 msgid "never" msgstr "" @@ -912,65 +1000,36 @@ msgstr "" msgid "%(expiry)s - current value" msgstr "" -#: rhodecode/controllers/admin/my_account.py:80 +#: rhodecode/controllers/admin/my_account.py:78 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:140 +#: rhodecode/controllers/admin/my_account.py:138 msgid "Your account was updated successfully" msgstr "Votre compte a été mis à jour avec succès" -#: rhodecode/controllers/admin/my_account.py:155 -#: rhodecode/controllers/admin/users.py:231 +#: rhodecode/controllers/admin/my_account.py:153 +#: rhodecode/controllers/admin/users.py:184 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/my_account.py:221 -#: rhodecode/controllers/admin/my_account.py:227 -msgid "Error occurred during update of user password" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:234 -msgid "Successfully updated password" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:278 -#: rhodecode/controllers/admin/users.py:645 +#: 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:285 -#: rhodecode/controllers/admin/users.py:652 +#: 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:295 -#: rhodecode/controllers/admin/users.py:667 +#: rhodecode/controllers/admin/my_account.py:239 +#: rhodecode/controllers/admin/users.py:549 msgid "Removed email address from user account" msgstr "" -#: rhodecode/controllers/admin/my_account.py:393 -#: rhodecode/controllers/admin/users.py:474 -msgid "Role" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:406 -#: rhodecode/controllers/admin/users.py:498 -msgid "Auth token successfully created" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:419 -#: rhodecode/controllers/admin/users.py:517 -msgid "Auth token successfully reset" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:423 -#: rhodecode/controllers/admin/users.py:521 -msgid "Auth token successfully deleted" -msgstr "" - #: rhodecode/controllers/admin/permissions.py:112 msgid "Application permissions updated successfully" msgstr "" @@ -1034,7 +1093,7 @@ msgid "Error occurred during deletion of msgstr "" #: rhodecode/controllers/admin/repo_groups.py:388 -#: rhodecode/controllers/admin/user_groups.py:322 +#: rhodecode/controllers/admin/user_groups.py:323 msgid "Cannot change permission for yourself as admin" msgstr "" @@ -1186,18 +1245,18 @@ msgid "Error occurred during deleting is msgstr "" #: rhodecode/controllers/admin/repos.py:728 -#: rhodecode/controllers/admin/settings.py:380 +#: rhodecode/controllers/admin/settings.py:381 msgid "Removed issue tracker entry" msgstr "" #: rhodecode/controllers/admin/repos.py:758 -#: rhodecode/controllers/admin/settings.py:427 +#: rhodecode/controllers/admin/settings.py:428 msgid "Updated issue tracker entries" msgstr "" #: rhodecode/controllers/admin/repos.py:819 #: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:618 +#: rhodecode/controllers/admin/settings.py:619 msgid "Some form inputs contain invalid data." msgstr "" @@ -1206,281 +1265,277 @@ msgid "Error occurred during updating re msgstr "" #: rhodecode/controllers/admin/repos.py:841 -#: rhodecode/controllers/admin/settings.py:175 +#: rhodecode/controllers/admin/settings.py:176 msgid "Updated VCS settings" msgstr "Réglages des gestionnaires de versions mis à jour." -#: rhodecode/controllers/admin/settings.py:171 -#: rhodecode/controllers/admin/settings.py:282 +#: rhodecode/controllers/admin/settings.py:172 +#: rhodecode/controllers/admin/settings.py:283 msgid "Error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:222 +#: rhodecode/controllers/admin/settings.py:223 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:278 +#: rhodecode/controllers/admin/settings.py:279 msgid "Updated application settings" msgstr "Réglages mis à jour" -#: rhodecode/controllers/admin/settings.py:344 +#: rhodecode/controllers/admin/settings.py:345 msgid "Updated visualisation settings" msgstr "Réglages d’affichage mis à jour." -#: rhodecode/controllers/admin/settings.py:347 +#: rhodecode/controllers/admin/settings.py:348 msgid "Error occurred during updating visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:440 +#: rhodecode/controllers/admin/settings.py:441 msgid "Please enter email address" msgstr "" -#: rhodecode/controllers/admin/settings.py:458 +#: rhodecode/controllers/admin/settings.py:459 msgid "Send email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:491 +#: rhodecode/controllers/admin/settings.py:492 msgid "Added new hook" msgstr "Le nouveau hook a été ajouté." -#: rhodecode/controllers/admin/settings.py:506 +#: rhodecode/controllers/admin/settings.py:507 msgid "Updated hooks" msgstr "Hooks mis à jour" -#: rhodecode/controllers/admin/settings.py:510 +#: rhodecode/controllers/admin/settings.py:511 msgid "Error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:639 +#: rhodecode/controllers/admin/settings.py:640 msgid "Error occurred during updating labs settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:644 +#: rhodecode/controllers/admin/settings.py:645 msgid "Updated Labs settings" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:164 +#: rhodecode/controllers/admin/user_groups.py:165 #, python-format msgid "Created user group %(user_group_link)s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:178 +#: rhodecode/controllers/admin/user_groups.py:179 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:219 +#: rhodecode/controllers/admin/user_groups.py:220 #, python-format msgid "Updated user group %s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:235 +#: rhodecode/controllers/admin/user_groups.py:236 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:257 +#: rhodecode/controllers/admin/user_groups.py:258 msgid "Successfully deleted user group" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:262 +#: rhodecode/controllers/admin/user_groups.py:263 msgid "An error occurred during deletion of user group" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:330 +#: rhodecode/controllers/admin/user_groups.py:331 msgid "Target group cannot be the same" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:336 +#: rhodecode/controllers/admin/user_groups.py:337 msgid "User Group permissions updated" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:421 +#: rhodecode/controllers/admin/user_groups.py:422 msgid "User Group global permissions updated successfully" msgstr "" #: rhodecode/controllers/admin/user_groups.py:437 -#: rhodecode/controllers/admin/users.py:595 +#: 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/users.py:153 +#: rhodecode/controllers/admin/user_groups.py:481 +msgid "User Group synchronization updated successfully" +msgstr "" + +#: rhodecode/controllers/admin/user_groups.py:485 +msgid "An error occurred during synchronization update" +msgstr "" + +#: rhodecode/controllers/admin/users.py:106 #, python-format msgid "Created user %(user_link)s" msgstr "" -#: rhodecode/controllers/admin/users.py:169 +#: rhodecode/controllers/admin/users.py:122 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:214 +#: rhodecode/controllers/admin/users.py:167 msgid "User updated successfully" msgstr "L’utilisateur a été mis à jour avec succès." -#: rhodecode/controllers/admin/users.py:265 +#: rhodecode/controllers/admin/users.py:218 #, python-format msgid "Detached %s repositories" msgstr "" -#: rhodecode/controllers/admin/users.py:270 +#: rhodecode/controllers/admin/users.py:223 #, python-format msgid "Deleted %s repositories" msgstr "" -#: rhodecode/controllers/admin/users.py:278 +#: rhodecode/controllers/admin/users.py:231 #, python-format msgid "Detached %s repository groups" msgstr "" -#: rhodecode/controllers/admin/users.py:283 +#: rhodecode/controllers/admin/users.py:236 #, python-format msgid "Deleted %s repository groups" msgstr "" +#: rhodecode/controllers/admin/users.py:244 +#, python-format +msgid "Detached %s user groups" +msgstr "" + +#: rhodecode/controllers/admin/users.py:249 +#, python-format +msgid "Deleted %s user groups" +msgstr "" + +#: rhodecode/controllers/admin/users.py:260 +msgid "Successfully deleted user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:266 +msgid "An error occurred during deletion of user" +msgstr "Une erreur est survenue durant la suppression de l’utilisateur." + +#: 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 -#, python-format -msgid "Detached %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:296 -#, python-format -msgid "Deleted %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:307 -msgid "Successfully deleted user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:313 -msgid "An error occurred during deletion of user" -msgstr "Une erreur est survenue durant la suppression de l’utilisateur." - -#: rhodecode/controllers/admin/users.py:332 -msgid "Force password change disabled for user" +msgid "An error occurred during password reset for user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:324 +#, python-format +msgid "Linked repository group `%s` as personal" +msgstr "" + +#: rhodecode/controllers/admin/users.py:330 +#, python-format +msgid "Created repository group `%s`" msgstr "" #: rhodecode/controllers/admin/users.py:334 -msgid "Force password change enabled for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:338 -msgid "An error occurred during password reset for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:371 -#, python-format -msgid "Linked repository group `%s` as personal" -msgstr "" - -#: rhodecode/controllers/admin/users.py:377 -#, python-format -msgid "Created repository group `%s`" -msgstr "" - -#: rhodecode/controllers/admin/users.py:381 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/controllers/admin/users.py:386 +#: rhodecode/controllers/admin/users.py:339 msgid "An error occurred during repository group creation for user" msgstr "" -#: rhodecode/controllers/admin/users.py:406 -#: rhodecode/controllers/admin/users.py:427 -#: rhodecode/controllers/admin/users.py:459 -#: rhodecode/controllers/admin/users.py:490 -#: rhodecode/controllers/admin/users.py:507 -#: rhodecode/controllers/admin/users.py:530 -#: rhodecode/controllers/admin/users.py:604 -#: rhodecode/controllers/admin/users.py:617 -#: rhodecode/controllers/admin/users.py:675 -msgid "You can't edit this user" -msgstr "Vous ne pouvez pas éditer cet utilisateur" - -#: rhodecode/controllers/admin/users.py:443 +#: rhodecode/controllers/admin/users.py:396 msgid "" "The user participates as reviewer in pull requests and cannot be deleted. " "You can set the user to \"inactive\" instead of deleting it." msgstr "" -#: rhodecode/controllers/admin/users.py:579 +#: rhodecode/controllers/admin/users.py:461 msgid "User global permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/users.py:707 +#: rhodecode/controllers/admin/users.py:589 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/controllers/admin/users.py:722 +#: rhodecode/controllers/admin/users.py:604 msgid "An error occurred during ip saving" msgstr "" -#: rhodecode/controllers/admin/users.py:726 +#: rhodecode/controllers/admin/users.py:608 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/controllers/admin/users.py:744 +#: rhodecode/controllers/admin/users.py:626 msgid "Removed ip address from user whitelist" msgstr "" -#: rhodecode/events/pullrequest.py:65 +#: rhodecode/events/pullrequest.py:68 msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:74 +#: rhodecode/events/pullrequest.py:77 msgid "pullrequest closed" msgstr "" -#: rhodecode/events/pullrequest.py:83 +#: rhodecode/events/pullrequest.py:86 msgid "pullrequest commits updated" msgstr "" -#: rhodecode/events/pullrequest.py:92 +#: rhodecode/events/pullrequest.py:95 msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:101 +#: rhodecode/events/pullrequest.py:104 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:110 +#: rhodecode/events/pullrequest.py:113 msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:136 +#: rhodecode/events/repo.py:138 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:145 +#: rhodecode/events/repo.py:147 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:154 +#: rhodecode/events/repo.py:156 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:163 +#: rhodecode/events/repo.py:165 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:199 +#: rhodecode/events/repo.py:201 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:208 +#: rhodecode/events/repo.py:210 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:217 +#: rhodecode/events/repo.py:219 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:228 +#: rhodecode/events/repo.py:230 msgid "repository push" msgstr "" @@ -1496,25 +1551,24 @@ msgstr "" msgid "repository group update" msgstr "" -#: rhodecode/events/user.py:34 +#: rhodecode/events/user.py:37 msgid "user registered" msgstr "" -#: rhodecode/events/user.py:48 +#: rhodecode/events/user.py:52 msgid "user pre create" msgstr "" -#: rhodecode/events/user.py:61 +#: rhodecode/events/user.py:66 msgid "user post create" msgstr "" -#: rhodecode/events/user.py:74 +#: rhodecode/events/user.py:80 msgid "user pre update" msgstr "" #: rhodecode/forms/__init__.py:32 rhodecode/templates/admin/gists/new.mako:62 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:31 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:88 +#: 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 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 @@ -1526,15 +1580,14 @@ msgstr "" #: 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_vcs.mako:46 +#: 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 #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 #: rhodecode/templates/admin/settings/settings_visual.mako:222 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:27 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:85 +#: 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_profile.mako:135 @@ -1544,17 +1597,17 @@ msgstr "Réinitialiser" #: rhodecode/forms/__init__.py:33 rhodecode/templates/admin/gists/show.mako:49 #: rhodecode/templates/admin/integrations/list.mako:211 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:60 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 #: rhodecode/templates/admin/permissions/permissions_ips.mako:26 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:56 +#: 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/base/issue_tracker_settings.mako:70 -#: rhodecode/templates/base/vcs_settings.mako:202 -#: rhodecode/templates/base/vcs_settings.mako:227 +#: 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/changeset/changeset_file_comment.mako:142 @@ -1563,9 +1616,9 @@ msgstr "Réinitialiser" #: rhodecode/templates/data_table/_dt_elements.mako:198 #: rhodecode/templates/data_table/_dt_elements.mako:210 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:35 -#: rhodecode/templates/files/files_source.mako:39 -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_source.mako:45 +#: rhodecode/templates/files/files_source.mako:49 +#: rhodecode/templates/files/files_source.mako:52 #: rhodecode/templates/pullrequests/pullrequest_show.mako:56 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" @@ -1604,28 +1657,28 @@ msgstr "" msgid "Root repositories only" msgstr "" -#: rhodecode/integrations/views.py:161 +#: rhodecode/integrations/views.py:160 msgid "{repo_name} repository" msgstr "" -#: rhodecode/integrations/views.py:164 +#: rhodecode/integrations/views.py:163 msgid "{repo_group_name} repo group" msgstr "" -#: rhodecode/integrations/views.py:171 +#: rhodecode/integrations/views.py:170 msgid "{name} integration" msgstr "" -#: rhodecode/integrations/views.py:185 +#: rhodecode/integrations/views.py:184 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:265 +#: rhodecode/integrations/views.py:264 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:290 +#: rhodecode/integrations/views.py:289 msgid "Integration {integration_name} updated successfully." msgstr "" @@ -1699,58 +1752,59 @@ msgid "" "Send events such as repo pushes and pull requests to your hipchat channel." msgstr "" -#: rhodecode/integrations/types/slack.py:44 +#: rhodecode/integrations/types/slack.py:46 msgid "Slack service URL" msgstr "" -#: rhodecode/integrations/types/slack.py:45 +#: rhodecode/integrations/types/slack.py:47 msgid "" "This can be setup at the slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:58 rhodecode/templates/login.mako:42 -#: rhodecode/templates/register.mako:40 +#: 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/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:90 -#: rhodecode/templates/base/base.mako:301 +#: rhodecode/templates/admin/users/users.mako:62 +#: rhodecode/templates/base/base.mako:304 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 msgid "Username" msgstr "Nom d’utilisateur" -#: rhodecode/integrations/types/slack.py:59 +#: rhodecode/integrations/types/slack.py:61 msgid "Username to show notifications coming from." msgstr "" -#: rhodecode/integrations/types/slack.py:68 +#: rhodecode/integrations/types/slack.py:70 msgid "Channel" msgstr "" -#: rhodecode/integrations/types/slack.py:69 +#: rhodecode/integrations/types/slack.py:71 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:78 +#: rhodecode/integrations/types/slack.py:80 msgid "Emoji" msgstr "" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:81 msgid "Emoji to use eg. :studio_microphone:" msgstr "" -#: rhodecode/integrations/types/slack.py:101 +#: rhodecode/integrations/types/slack.py:92 msgid "Slack" msgstr "" -#: rhodecode/integrations/types/slack.py:102 +#: rhodecode/integrations/types/slack.py:93 msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" @@ -1914,25 +1968,25 @@ msgstr "" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1189 +#: rhodecode/lib/auth.py:1197 #, python-format msgid "IP %s not allowed" msgstr "" -#: rhodecode/lib/auth.py:1263 +#: rhodecode/lib/auth.py:1281 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:1311 +#: rhodecode/lib/auth.py:1329 #, python-format msgid "Action not supported for %s." msgstr "" -#: rhodecode/lib/auth.py:1348 +#: rhodecode/lib/auth.py:1379 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/base.py:557 +#: rhodecode/lib/base.py:549 #, python-format msgid "The repository at %(repo_name)s cannot be located." msgstr "" @@ -1958,36 +2012,16 @@ msgstr "Aucun changement détecté." msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1515 +#: rhodecode/lib/helpers.py:1517 #, python-format msgid " and %s more" msgstr "et %s de plus" -#: rhodecode/lib/helpers.py:1519 +#: rhodecode/lib/helpers.py:1521 msgid "No Files" msgstr "Aucun fichier" -#: rhodecode/lib/helpers.py:1592 -msgid "new file" -msgstr "" - -#: rhodecode/lib/helpers.py:1595 -msgid "mod" -msgstr "" - -#: rhodecode/lib/helpers.py:1598 -msgid "del" -msgstr "" - -#: rhodecode/lib/helpers.py:1601 -msgid "rename" -msgstr "" - -#: rhodecode/lib/helpers.py:1606 -msgid "chmod" -msgstr "" - -#: rhodecode/lib/helpers.py:1853 +#: rhodecode/lib/helpers.py:1800 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2006,7 +2040,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1873 +#: rhodecode/lib/helpers.py:1820 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the" @@ -2046,9 +2080,9 @@ msgid "in ${val} and ${detail}" msgstr "" #: rhodecode/lib/utils2.py:515 -#: rhodecode/public/js/rhodecode-components.js:33194 -#: rhodecode/public/js/scripts.js:25042 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: 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/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "à l’instant" @@ -2081,7 +2115,9 @@ msgstr "à l’instant" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/model/db.py:2298 +#: 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 msgid "Repository no access" msgstr "Aucun accès au dépôt" @@ -2113,7 +2149,9 @@ msgstr "Aucun accès au dépôt" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/model/db.py:2299 +#: 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 msgid "Repository read access" msgstr "Accès en lecture au dépôt" @@ -2145,7 +2183,9 @@ msgstr "Accès en lecture au dépôt" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/model/db.py:2300 +#: 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 msgid "Repository write access" msgstr "Accès en écriture au dépôt" @@ -2177,7 +2217,9 @@ msgstr "Accès en écriture au dépôt" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 -#: rhodecode/model/db.py:2301 +#: 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 msgid "Repository admin access" msgstr "Accès administrateur au dépôt" @@ -2249,7 +2291,9 @@ msgstr "Administrateur RhodeCode" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/model/db.py:2319 +#: 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 msgid "Repository creation disabled" msgstr "Création de dépôt désactivée" @@ -2281,7 +2325,9 @@ msgstr "Création de dépôt désactivée" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 -#: rhodecode/model/db.py:2320 +#: 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 msgid "Repository creation enabled" msgstr "Création de dépôt activée" @@ -2313,7 +2359,9 @@ msgstr "Création de dépôt activée" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 -#: rhodecode/model/db.py:2324 +#: 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 msgid "Repository forking disabled" msgstr "Fork de dépôt désactivé" @@ -2345,7 +2393,9 @@ msgstr "Fork de dépôt désactivé" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/model/db.py:2325 +#: 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 msgid "Repository forking enabled" msgstr "Fork de dépôt activé" @@ -2398,7 +2448,9 @@ msgstr "Enregistrer un nouvel utilisateur Rhodecode auto-activé" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 -#: rhodecode/model/db.py:3009 +#: 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 msgid "Not Reviewed" msgstr "Pas encore relue" @@ -2430,7 +2482,9 @@ msgstr "Pas encore relue" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 -#: rhodecode/model/db.py:3010 +#: 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 msgid "Approved" msgstr "Approuvée " @@ -2462,7 +2516,9 @@ msgstr "Approuvée " #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 -#: rhodecode/model/db.py:3011 +#: 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 msgid "Rejected" msgstr "Rejetée" @@ -2494,7 +2550,9 @@ msgstr "Rejetée" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 -#: rhodecode/model/db.py:3012 +#: 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 msgid "Under Review" msgstr "En cours de relecture" @@ -2523,7 +2581,9 @@ msgstr "En cours de relecture" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/model/db.py:2303 +#: 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 msgid "Repository group no access" msgstr "" @@ -2552,7 +2612,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/model/db.py:2304 +#: 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 msgid "Repository group read access" msgstr "" @@ -2581,7 +2643,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/model/db.py:2305 +#: 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 msgid "Repository group write access" msgstr "" @@ -2610,7 +2674,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 -#: rhodecode/model/db.py:2306 +#: 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 msgid "Repository group admin access" msgstr "" @@ -2638,7 +2704,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/model/db.py:2308 +#: 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 msgid "User group no access" msgstr "" @@ -2666,7 +2734,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 -#: rhodecode/model/db.py:2309 +#: 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 msgid "User group read access" msgstr "" @@ -2694,7 +2764,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/model/db.py:2310 +#: 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 msgid "User group write access" msgstr "" @@ -2722,7 +2794,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/model/db.py:2311 +#: 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 msgid "User group admin access" msgstr "" @@ -2750,7 +2824,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/model/db.py:2313 +#: 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 msgid "Repository Group creation disabled" msgstr "" @@ -2778,7 +2854,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/model/db.py:2314 +#: 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 msgid "Repository Group creation enabled" msgstr "" @@ -2806,7 +2884,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/model/db.py:2316 +#: 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 msgid "User Group creation disabled" msgstr "" @@ -2834,7 +2914,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/model/db.py:2317 +#: 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 msgid "User Group creation enabled" msgstr "" @@ -2862,7 +2944,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 -#: rhodecode/model/db.py:2327 +#: 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 msgid "Registration disabled" msgstr "" @@ -2890,7 +2974,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/model/db.py:2328 +#: 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 msgid "User Registration with manual account activation" msgstr "" @@ -2918,7 +3004,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/model/db.py:2329 +#: 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 msgid "User Registration with automatic account activation" msgstr "" @@ -2946,7 +3034,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 -#: rhodecode/model/db.py:2335 rhodecode/model/permission.py:95 +#: 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 msgid "Manual activation of external account" msgstr "" @@ -2974,7 +3064,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 -#: rhodecode/model/db.py:2336 rhodecode/model/permission.py:96 +#: 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 msgid "Automatic activation of external account" msgstr "" @@ -2996,7 +3088,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/model/db.py:2321 +#: 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 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3019,7 +3113,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/model/db.py:2322 +#: 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 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3039,7 +3135,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/model/db.py:2296 +#: 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 msgid "RhodeCode Super Administrator" msgstr "" @@ -3056,7 +3154,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 -#: rhodecode/model/db.py:2338 +#: 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 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3073,7 +3173,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 -#: rhodecode/model/db.py:2339 +#: 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 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3081,7 +3183,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 rhodecode/model/db.py:913 +#: 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 msgid "all" msgstr "" @@ -3089,7 +3193,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 rhodecode/model/db.py:914 +#: 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 msgid "http/web interface" msgstr "" @@ -3097,7 +3203,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 rhodecode/model/db.py:915 +#: 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 msgid "vcs (git/hg/svn protocol)" msgstr "" @@ -3105,7 +3213,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 rhodecode/model/db.py:916 +#: 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 msgid "api calls" msgstr "" @@ -3113,7 +3223,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 rhodecode/model/db.py:917 +#: 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 msgid "feed access" msgstr "" @@ -3122,84 +3234,70 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 -#: rhodecode/model/db.py:2067 +#: 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 msgid "No parent" msgstr "" -#: rhodecode/lib/index/whoosh.py:148 +#: 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 +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 +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 +msgid "Password reset disabled" +msgstr "" + +#: rhodecode/lib/index/whoosh.py:149 msgid "Invalid search query. Try quoting it." msgstr "Requête invalide. Essayer de la mettre entre guillemets." -#: rhodecode/lib/index/whoosh.py:150 +#: rhodecode/lib/index/whoosh.py:151 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:155 +#: rhodecode/lib/index/whoosh.py:156 msgid "An error occurred during this search operation" msgstr "Une erreur est survenue durant l’opération de recherche." -#: rhodecode/lib/index/whoosh.py:163 -msgid "Index Type" -msgstr "" - #: rhodecode/lib/index/whoosh.py:164 +msgid "Index Type" +msgstr "" + +#: rhodecode/lib/index/whoosh.py:165 msgid "File Index" msgstr "" -#: rhodecode/lib/index/whoosh.py:165 rhodecode/lib/index/whoosh.py:170 +#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171 msgid "Indexed documents" msgstr "" -#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172 +#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173 msgid "Last update" msgstr "" -#: rhodecode/lib/index/whoosh.py:169 +#: rhodecode/lib/index/whoosh.py:170 msgid "Commit index" msgstr "" -#: rhodecode/login/views.py:249 rhodecode/login/views.py:311 -msgid "Bad captcha" -msgstr "" - -#: rhodecode/login/views.py:258 -msgid "You have successfully registered with RhodeCode" -msgstr "" - -#: rhodecode/login/views.py:300 -msgid "Password reset has been disabled." -msgstr "" - -#: rhodecode/login/views.py:327 -msgid "Your password reset link was sent" -msgstr "Un lien de rénitialisation de votre mot de passe vous a été envoyé." - -#: rhodecode/login/views.py:351 -msgid "" -"Your password reset was successful, a new password has been sent to your " -"email" -msgstr "" - -#: rhodecode/model/comment.py:367 -msgid "made a comment" -msgstr "" - #: rhodecode/model/comment.py:368 +msgid "made a comment" +msgstr "" + +#: rhodecode/model/comment.py:369 msgid "Show it now" msgstr "" -#: rhodecode/model/db.py:2331 -msgid "Password reset enabled" -msgstr "" - -#: rhodecode/model/db.py:2332 -msgid "Password reset hidden" -msgstr "" - -#: rhodecode/model/db.py:2333 -msgid "Password reset disabled" -msgstr "" - #: rhodecode/model/forms.py:85 msgid "Please enter a login" msgstr "Veuillez entrer un identifiant" @@ -3334,9 +3432,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:103 -#: rhodecode/templates/base/base.mako:406 -#: rhodecode/templates/base/base.mako:413 +#: rhodecode/templates/admin/users/users.mako:75 +#: rhodecode/templates/base/base.mako:409 +#: rhodecode/templates/base/base.mako:416 msgid "Admin" msgstr "Administration" @@ -3367,74 +3465,74 @@ msgstr "" msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:77 +#: rhodecode/model/pull_request.py:78 msgid "This pull request can be automatically merged." msgstr "" -#: rhodecode/model/pull_request.py:79 +#: rhodecode/model/pull_request.py:80 msgid "This pull request cannot be merged because of an unhandled exception." msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:83 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:84 +#: rhodecode/model/pull_request.py:85 msgid "This pull request could not be merged because push to target failed." msgstr "" -#: rhodecode/model/pull_request.py:87 +#: rhodecode/model/pull_request.py:88 msgid "This pull request cannot be merged because the target is not a head." msgstr "" -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:91 msgid "" "This pull request cannot be merged because the source contains more branches" " than the target." msgstr "" -#: rhodecode/model/pull_request.py:93 +#: rhodecode/model/pull_request.py:94 msgid "" "This pull request cannot be merged because the target has multiple heads." msgstr "" -#: rhodecode/model/pull_request.py:96 +#: rhodecode/model/pull_request.py:97 msgid "" "This pull request cannot be merged because the target repository is locked." msgstr "" -#: rhodecode/model/pull_request.py:99 +#: rhodecode/model/pull_request.py:100 msgid "" "This pull request cannot be merged because the target or the source " "reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:102 +#: rhodecode/model/pull_request.py:103 msgid "" "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:105 +#: rhodecode/model/pull_request.py:106 msgid "" "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:108 +#: rhodecode/model/pull_request.py:109 msgid "" "This pull request cannot be merged because of conflicts related to sub " "repositories." msgstr "" -#: rhodecode/model/pull_request.py:114 +#: rhodecode/model/pull_request.py:115 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:116 +#: rhodecode/model/pull_request.py:117 msgid "Pull request update failed because of an unknown error." msgstr "" -#: rhodecode/model/pull_request.py:118 -msgid "No update needed because the source reference is already up to date." +#: rhodecode/model/pull_request.py:119 +msgid "No update needed because the source and target have not changed." msgstr "" #: rhodecode/model/pull_request.py:121 @@ -3465,51 +3563,51 @@ msgstr "" msgid "Pull request merged and closed" msgstr "" -#: rhodecode/model/pull_request.py:1041 +#: rhodecode/model/pull_request.py:1087 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1043 +#: rhodecode/model/pull_request.py:1089 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:1055 +#: rhodecode/model/pull_request.py:1101 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1073 +#: rhodecode/model/pull_request.py:1119 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1076 +#: rhodecode/model/pull_request.py:1122 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1233 rhodecode/model/scm.py:790 +#: rhodecode/model/pull_request.py:1279 rhodecode/model/scm.py:790 msgid "Bookmarks" msgstr "Signets" -#: rhodecode/model/pull_request.py:1238 +#: rhodecode/model/pull_request.py:1284 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1241 +#: rhodecode/model/pull_request.py:1287 msgid "Closed Branches" msgstr "" -#: rhodecode/model/pull_request.py:1364 +#: rhodecode/model/pull_request.py:1411 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1375 +#: rhodecode/model/pull_request.py:1424 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1390 +#: rhodecode/model/pull_request.py:1439 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1393 +#: rhodecode/model/pull_request.py:1442 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" @@ -3517,36 +3615,36 @@ msgstr "" msgid "latest tip" msgstr "Dernier sommet" -#: rhodecode/model/user.py:125 +#: rhodecode/model/user.py:126 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:291 +#: rhodecode/model/user.py:292 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " "application" msgstr "" -#: rhodecode/model/user.py:464 +#: rhodecode/model/user.py:462 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:472 +#: rhodecode/model/user.py:470 #, 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:481 +#: rhodecode/model/user.py:479 #, 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:490 +#: rhodecode/model/user.py:488 #, python-format msgid "" "user \"%s\" still owns %s user groups and cannot be removed. Switch owners " @@ -3879,369 +3977,371 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:31198 -#: rhodecode/public/js/scripts.js:23046 +#: 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/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33129 -#: rhodecode/public/js/scripts.js:24977 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: 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/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33130 -#: rhodecode/public/js/scripts.js:24978 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: 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/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33131 -#: rhodecode/public/js/scripts.js:24979 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: 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/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33132 -#: rhodecode/public/js/scripts.js:24980 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: 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/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33133 -#: rhodecode/public/js/scripts.js:24981 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: 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/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33134 -#: rhodecode/public/js/scripts.js:24982 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: 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/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33154 -#: rhodecode/public/js/scripts.js:25002 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: 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/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33162 -#: rhodecode/public/js/scripts.js:25010 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: 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/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33174 -#: rhodecode/public/js/scripts.js:25022 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: 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/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33176 -#: rhodecode/public/js/scripts.js:25024 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: 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/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33180 -#: rhodecode/public/js/scripts.js:25028 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: 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/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33182 -#: rhodecode/public/js/scripts.js:25030 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: 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/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33184 -#: rhodecode/public/js/scripts.js:25032 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: 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/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47027 -#: rhodecode/public/js/scripts.js:38875 +#: 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/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47030 -#: rhodecode/public/js/scripts.js:38878 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: 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/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47033 -#: rhodecode/public/js/scripts.js:38881 +#: 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/select2/translations.js:10 msgid "No matches found" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47036 -#: rhodecode/public/js/scripts.js:38884 +#: 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/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47040 -#: rhodecode/public/js/scripts.js:38888 +#: 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/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47042 -#: rhodecode/public/js/scripts.js:38890 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: 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/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47047 -#: rhodecode/public/js/scripts.js:38895 +#: 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/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47049 -#: rhodecode/public/js/scripts.js:38897 +#: 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/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47054 -#: rhodecode/public/js/scripts.js:38902 +#: 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/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47056 -#: rhodecode/public/js/scripts.js:38904 +#: 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/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47060 -#: rhodecode/public/js/scripts.js:38908 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: 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/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47062 -#: rhodecode/public/js/scripts.js:38910 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: 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/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47991 -#: rhodecode/public/js/scripts.js:39839 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: 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/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47993 -#: rhodecode/public/js/scripts.js:39841 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: 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/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48426 -#: rhodecode/public/js/scripts.js:40274 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: 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/src/rhodecode/codemirror.js:296 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48445 -#: rhodecode/public/js/scripts.js:40293 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: 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/src/rhodecode/codemirror.js:315 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48464 -#: rhodecode/public/js/scripts.js:40312 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: 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/src/rhodecode/codemirror.js:334 +#: rhodecode/templates/email_templates/commit_comment.mako:99 +#: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48484 -#: rhodecode/public/js/scripts.js:40332 +#: 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/src/rhodecode/codemirror.js:354 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48848 -#: rhodecode/public/js/scripts.js:40696 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/comments.js:123 +#: 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/src/rhodecode/comments.js:125 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48927 -#: rhodecode/public/js/scripts.js:40775 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 -#: rhodecode/public/js/src/rhodecode/comments.js:202 +#: 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/src/rhodecode/comments.js:209 msgid "Status Review" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48941 -#: rhodecode/public/js/scripts.js:40789 +#: 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/src/rhodecode/comments.js:216 +#: rhodecode/public/js/src/rhodecode/comments.js:224 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49089 -#: rhodecode/public/js/scripts.js:40937 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/comments.js:364 +#: 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/src/rhodecode/comments.js:381 msgid "Submitting..." msgstr "Envoi…" -#: rhodecode/public/js/rhodecode-components.js:49140 -#: rhodecode/public/js/scripts.js:40988 +#: 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/src/rhodecode/comments.js:415 +#: rhodecode/public/js/src/rhodecode/comments.js:432 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49245 -#: rhodecode/public/js/scripts.js:41093 +#: 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/src/rhodecode/comments.js:520 +#: rhodecode/public/js/src/rhodecode/comments.js:537 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49316 -#: rhodecode/public/js/scripts.js:41164 +#: 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/src/rhodecode/comments.js:591 +#: 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:49393 -#: rhodecode/public/js/scripts.js:41241 +#: 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/src/rhodecode/comments.js:668 +#: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49507 -#: rhodecode/public/js/scripts.js:41355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 -#: rhodecode/public/js/src/rhodecode/comments.js:782 +#: 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/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49713 -#: rhodecode/public/js/scripts.js:41561 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: 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/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49715 -#: rhodecode/public/js/scripts.js:41563 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: 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/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49724 -#: rhodecode/public/js/scripts.js:41572 +#: 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/src/rhodecode/files.js:161 msgid "No matching files" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49859 -#: rhodecode/public/js/scripts.js:41707 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: 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/src/rhodecode/files.js:296 msgid "Selection link" msgstr "Lien vers la sélection" -#: rhodecode/public/js/rhodecode-components.js:49899 -#: rhodecode/public/js/scripts.js:41747 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: 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/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:49900 -#: rhodecode/public/js/scripts.js:41748 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 +#: 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/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49909 -#: rhodecode/public/js/scripts.js:41757 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: 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/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "Suivre ce dépôt" -#: rhodecode/public/js/rhodecode-components.js:49910 -#: rhodecode/public/js/scripts.js:41758 +#: 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/src/rhodecode/followers.js:37 msgid "Follow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50366 -#: rhodecode/public/js/scripts.js:42214 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:212 +#: 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 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50937 -#: rhodecode/public/js/scripts.js:42785 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: 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/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50957 -#: rhodecode/public/js/scripts.js:42805 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: 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/src/rhodecode.js:162 msgid "Show more" msgstr "" @@ -4251,14 +4351,14 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:479 -#: rhodecode/templates/codeblocks/diffs.mako:484 +#: rhodecode/templates/codeblocks/diffs.mako:488 +#: rhodecode/templates/codeblocks/diffs.mako:493 msgid "Add another comment" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:320 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:325 msgid "Close" msgstr "" @@ -4316,81 +4416,102 @@ msgstr "Nouvelle requête de pull" msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +msgid "Saving..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: 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:40 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 -msgid "Show selected commit __S" -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:48 -#: rhodecode/public/js/src/i18n_messages.js:7 -msgid "Switch to chat" -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 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: 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:54 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 -#: rhodecode/templates/admin/auth/auth_settings.mako:71 -msgid "disabled" -msgstr "Désactivé" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 #: rhodecode/templates/admin/auth/auth_settings.mako:71 +msgid "disabled" +msgstr "Désactivé" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 msgid "files" msgstr "Fichiers" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/templates/pullrequests/pullrequest.mako:108 +msgid "loading..." +msgstr "Chargement…" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -msgid "{0} days" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +msgid "{0} out of {1} users" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 msgid "{0} years" msgstr "" +#: rhodecode/public/js/src/math_jax/extensions/HelpDialog.js:19 +msgid "HelpDialog" +msgstr "" + +#: rhodecode/public/js/src/math_jax/jax/output/HTML-CSS/autoload/mglyph.js:19 +msgid "MathML" +msgstr "" + #: rhodecode/public/js/vendors/webcomponentsjs/webcomponents.min.js:11 msgid "UIEvent" msgstr "" @@ -4407,10 +4528,6 @@ msgstr "" msgid "FocusEvent" msgstr "" -#: rhodecode/svn_support/events.py:30 -msgid "Configuration for Apaache mad_dav_svn changed." -msgstr "" - #: rhodecode/templates/index.mako:5 msgid "Dashboard" msgstr "Tableau de bord" @@ -4468,6 +4585,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:15 #: 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 #: rhodecode/templates/base/perms_summary.mako:102 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 @@ -4480,22 +4598,25 @@ msgstr "Nom" #: rhodecode/templates/index_base.mako:100 #: rhodecode/templates/index_base.mako:125 #: rhodecode/templates/admin/gists/index.mako:114 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:81 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 -#: rhodecode/templates/admin/repos/repo_add_base.mako:32 +#: 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/repos.mako:57 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 #: rhodecode/templates/admin/user_groups/user_groups.mako:57 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +#: 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/base/issue_tracker_settings.mako:10 #: rhodecode/templates/changeset/changeset.mako:53 #: rhodecode/templates/compare/compare_commits.mako:20 -#: rhodecode/templates/email_templates/commit_comment.mako:82 +#: 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 #: rhodecode/templates/files/file_tree_detail.mako:5 @@ -4503,8 +4624,8 @@ msgstr "Nom" #: rhodecode/templates/forks/fork.mako:48 #: rhodecode/templates/forks/forks_data.mako:9 #: rhodecode/templates/pullrequests/pullrequest.mako:47 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:158 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:163 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:460 #: rhodecode/templates/summary/components.mako:73 msgid "Description" msgstr "Description" @@ -4519,7 +4640,8 @@ msgstr "Description" #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/users/user_edit_groups.mako:65 #: rhodecode/templates/forks/forks_data.mako:7 #: rhodecode/templates/summary/components.mako:195 msgid "Owner" @@ -4540,9 +4662,9 @@ msgstr "Dernière modification" #: rhodecode/templates/changelog/changelog_summary_data.mako:8 #: rhodecode/templates/changeset/changeset.mako:36 #: rhodecode/templates/compare/compare_commits.mako:18 -#: rhodecode/templates/email_templates/commit_comment.mako:45 -#: rhodecode/templates/email_templates/commit_comment.mako:81 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: 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/search/search_commit.mako:6 #: rhodecode/templates/tags/tags.mako:66 msgid "Commit" @@ -4557,45 +4679,45 @@ msgstr "" msgid "Home" msgstr "Accueil" -#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:34 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:326 +#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:329 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "Connexion" -#: rhodecode/templates/login.mako:36 +#: rhodecode/templates/login.mako:37 msgid "Go to the registration page to create a new account." msgstr "" -#: rhodecode/templates/login.mako:57 +#: rhodecode/templates/login.mako:58 msgid "Remember me" msgstr "Se souvenir de moi" -#: rhodecode/templates/login.mako:61 +#: rhodecode/templates/login.mako:62 msgid "Forgot your password?" msgstr "" -#: rhodecode/templates/login.mako:65 -#: rhodecode/templates/password_reset.mako:34 +#: rhodecode/templates/login.mako:66 +#: rhodecode/templates/password_reset.mako:35 msgid "Password reset is disabled. Please contact " msgstr "" -#: rhodecode/templates/login.mako:67 -#: rhodecode/templates/password_reset.mako:36 -#: rhodecode/templates/base/base.mako:43 -#: rhodecode/templates/errors/error_document.mako:64 -msgid "Support" -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 +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 msgid "or" msgstr "ou" -#: rhodecode/templates/login.mako:70 -#: rhodecode/templates/password_reset.mako:39 +#: rhodecode/templates/login.mako:71 +#: rhodecode/templates/password_reset.mako:40 msgid "an administrator if you need help." msgstr "" @@ -4603,28 +4725,28 @@ msgstr "" msgid "Reset Password" msgstr "" -#: rhodecode/templates/password_reset.mako:46 +#: rhodecode/templates/password_reset.mako:47 msgid "Reset your Password" msgstr "" -#: rhodecode/templates/password_reset.mako:47 +#: rhodecode/templates/password_reset.mako:48 msgid "Go to the login page to sign in." msgstr "" -#: rhodecode/templates/password_reset.mako:51 +#: rhodecode/templates/password_reset.mako:52 msgid "Email Address" msgstr "" -#: rhodecode/templates/password_reset.mako:60 -#: rhodecode/templates/register.mako:84 +#: rhodecode/templates/password_reset.mako:61 +#: rhodecode/templates/register.mako:85 msgid "Captcha" msgstr "" -#: rhodecode/templates/password_reset.mako:70 -msgid "Send password reset email" -msgstr "" - #: rhodecode/templates/password_reset.mako:71 +msgid "Send password reset email" +msgstr "" + +#: rhodecode/templates/password_reset.mako:72 msgid "Password reset link will be sent to matching email address" msgstr "" @@ -4632,49 +4754,49 @@ msgstr "" msgid "Create an Account" msgstr "" -#: rhodecode/templates/register.mako:34 +#: rhodecode/templates/register.mako:35 msgid "Create an account" msgstr "" -#: rhodecode/templates/register.mako:35 +#: rhodecode/templates/register.mako:36 msgid "Go to the login page to sign in with an existing account." msgstr "" -#: rhodecode/templates/register.mako:54 +#: rhodecode/templates/register.mako:55 msgid "Re-enter password" msgstr "Confirmation" -#: rhodecode/templates/register.mako:61 +#: rhodecode/templates/register.mako:62 #: rhodecode/templates/admin/my_account/my_account_profile.mako:32 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:33 #: 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:94 +#: rhodecode/templates/admin/users/users.mako:66 msgid "First Name" msgstr "Prénom" -#: rhodecode/templates/register.mako:68 +#: rhodecode/templates/register.mako:69 #: rhodecode/templates/admin/my_account/my_account_profile.mako:40 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:42 #: 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:96 +#: rhodecode/templates/admin/users/users.mako:68 msgid "Last Name" msgstr "Nom" -#: rhodecode/templates/register.mako:96 +#: rhodecode/templates/register.mako:97 msgid "Account activation requires admin approval." msgstr "" -#: rhodecode/templates/register.mako:103 +#: rhodecode/templates/register.mako:104 msgid "Create Account" msgstr "" #: rhodecode/templates/admin/admin.mako:5 #: rhodecode/templates/admin/admin.mako:15 -#: rhodecode/templates/base/base.mako:72 +#: rhodecode/templates/base/base.mako:75 msgid "Admin journal" msgstr "Historique d’administration" @@ -4683,6 +4805,7 @@ msgid "journal filter..." msgstr "" #: rhodecode/templates/admin/admin.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "" @@ -4695,31 +4818,38 @@ msgstr[0] "" msgstr[1] "" #: rhodecode/templates/admin/admin.mako:17 +#: rhodecode/templates/admin/users/user_edit_audit.mako:17 #: rhodecode/templates/journal/journal.mako:17 msgid "Example Queries" msgstr "" #: rhodecode/templates/admin/admin_log.mako:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 #: rhodecode/templates/admin/repos/repos.mako:69 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 -#: rhodecode/templates/admin/user_groups/user_groups.mako:66 -#: rhodecode/templates/admin/users/users.mako:107 -#: rhodecode/templates/files/files_detail.mako:63 +#: 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/files/files_detail.mako:58 msgid "Action" msgstr "Action" #: rhodecode/templates/admin/admin_log.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/bookmarks/bookmarks.mako:61 #: rhodecode/templates/branches/branches.mako:60 #: rhodecode/templates/tags/tags.mako:61 @@ -4727,10 +4857,12 @@ 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 msgid "No actions yet" msgstr "Aucune action n’a été enregistrée pour le moment." @@ -4771,7 +4903,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:135 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 -#: rhodecode/templates/admin/repos/repo_add_base.mako:90 +#: 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 @@ -4781,6 +4913,7 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:120 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:102 #: rhodecode/templates/admin/users/user_add.mako:128 +#: rhodecode/templates/admin/users/user_edit_groups.mako:27 #: rhodecode/templates/admin/users/user_edit_profile.mako:134 #: rhodecode/templates/base/default_perms_box.mako:88 msgid "Save" @@ -4802,18 +4935,18 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/index.mako:110 #: rhodecode/templates/admin/integrations/list.mako:103 -#: rhodecode/templates/admin/repos/repo_add_base.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:75 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "Type" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 -#: rhodecode/templates/admin/repos/repo_add_base.mako:82 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 msgid "Private Repository" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:86 +#: rhodecode/templates/admin/repos/repo_add_base.mako:97 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:112 #: rhodecode/templates/forks/fork.mako:87 msgid "" @@ -4879,7 +5012,7 @@ msgid "Update Gist" msgstr "" #: rhodecode/templates/admin/gists/edit.mako:102 -#: rhodecode/templates/base/issue_tracker_settings.mako:74 +#: rhodecode/templates/base/issue_tracker_settings.mako:73 #: rhodecode/templates/changeset/changeset_file_comment.mako:385 #: rhodecode/templates/codeblocks/diffs.mako:76 #: rhodecode/templates/files/files_add.mako:102 @@ -4955,8 +5088,8 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:180 #: rhodecode/templates/compare/compare_commits.mako:17 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:304 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:457 #: rhodecode/templates/pullrequests/pullrequests.mako:102 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/tags/tags.mako:63 @@ -5013,7 +5146,7 @@ msgstr "" #: rhodecode/templates/admin/gists/show.mako:56 #: rhodecode/templates/admin/integrations/list.mako:204 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 -#: rhodecode/templates/base/issue_tracker_settings.mako:61 +#: rhodecode/templates/base/issue_tracker_settings.mako:60 #: rhodecode/templates/data_table/_dt_elements.mako:118 #: rhodecode/templates/data_table/_dt_elements.mako:180 #: rhodecode/templates/data_table/_dt_elements.mako:193 @@ -5021,10 +5154,10 @@ msgstr "" #: rhodecode/templates/debug_style/buttons.html:128 #: rhodecode/templates/files/files_add.mako:204 #: rhodecode/templates/files/files_edit.mako:165 -#: rhodecode/templates/files/files_source.mako:38 -#: rhodecode/templates/files/files_source.mako:41 +#: 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:319 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:324 #: rhodecode/templates/users/user_profile.mako:7 msgid "Edit" msgstr "" @@ -5043,7 +5176,7 @@ msgstr "" #: rhodecode/templates/admin/gists/show.mako:91 #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:87 msgid "Show as raw" msgstr "" @@ -5068,8 +5201,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:43 #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 -#: rhodecode/templates/base/base.mako:81 -#: rhodecode/templates/base/base.mako:246 +#: rhodecode/templates/base/base.mako:84 +#: rhodecode/templates/base/base.mako:249 msgid "Settings" msgstr "Options" @@ -5101,6 +5234,8 @@ msgid "Create new integration" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:104 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14 msgid "Scope" msgstr "" @@ -5170,7 +5305,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:340 +#: rhodecode/templates/base/base.mako:343 msgid "My account" msgstr "Mon compte" @@ -5179,9 +5314,10 @@ msgid "My Account" msgstr "Mon compte" #: rhodecode/templates/admin/my_account/my_account.mako:29 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 -msgid "My Profile" +#: rhodecode/templates/email_templates/user_registration.mako:26 +#: rhodecode/templates/users/user.mako:29 +#: rhodecode/templates/users/user_profile.mako:5 +msgid "Profile" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:31 @@ -5193,11 +5329,8 @@ msgid "OAuth Identities" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:37 -msgid "My Emails" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account.mako:38 -msgid "My Repositories" +#: rhodecode/templates/admin/users/user_edit.mako:38 +msgid "Emails" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:39 @@ -5206,81 +5339,82 @@ msgstr "Surveillé" #: rhodecode/templates/admin/my_account/my_account.mako:40 #: rhodecode/templates/admin/notifications/notifications.mako:33 -#: rhodecode/templates/base/base.mako:238 +#: rhodecode/templates/base/base.mako:241 msgid "Pull Requests" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:41 -msgid "My Permissions" -msgstr "" +#: 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/user_groups/user_group_edit.mako:34 +#: rhodecode/templates/base/base.mako:80 +msgid "Permissions" +msgstr "Permissions" #: rhodecode/templates/admin/my_account/my_account.mako:42 -msgid "My Live Notifications" +msgid "Live Notifications" msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:3 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 msgid "Authentication Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:7 -msgid "Built-in tokens can be used to authenticate with all possible options." -msgstr "" - #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:8 -msgid "" -"Each token can have a role. VCS tokens can be used together with the " -"authtoken auth plugin for git/hg/svn operations." -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:11 -msgid "Built-in" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:51 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:47 -msgid "expires" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:29 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:26 -#, python-format -msgid "Confirm to reset this auth token: %s" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 -msgid "expired" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:59 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:55 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:8 +msgid "" +"Each token can have a role. Token with a role can be used only in given " +"context, e.g. VCS tokens can be used together with the authtoken auth plugin" +" for git/hg/svn operations only." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:13 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:13 +msgid "Token" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:17 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:17 +msgid "Expiration" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:48 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:44 #, python-format msgid "Confirm to remove this auth token: %s" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:67 -msgid "No additional auth token specified" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:78 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:56 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:52 +msgid "No additional auth tokens specified" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:68 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:64 msgid "New authentication token" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:82 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +msgid "Repository scope works only with tokens with VCS type." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86 #: rhodecode/templates/admin/my_account/my_account_emails.mako:64 #: rhodecode/templates/admin/permissions/permissions_ips.mako:60 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:84 +#: 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 msgid "Add" msgstr "Ajouter" +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:128 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:125 +msgid "repository scope" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_emails.mako:5 msgid "Account Emails" msgstr "" @@ -5334,6 +5468,11 @@ msgstr "" msgid "Source type" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 +msgid "My Profile" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_profile.mako:11 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:55 #: rhodecode/templates/admin/users/user_edit_profile.mako:25 @@ -5423,14 +5562,6 @@ msgstr "Notifications" msgid "Permissions Administration" msgstr "" -#: 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/user_groups/user_group_edit.mako:34 -#: rhodecode/templates/base/base.mako:77 -msgid "Permissions" -msgstr "Permissions" - #: rhodecode/templates/admin/permissions/permissions.mako:33 msgid "Application" msgstr "" @@ -5570,8 +5701,8 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:74 -#: rhodecode/templates/base/base.mako:148 +#: rhodecode/templates/base/base.mako:77 +#: rhodecode/templates/base/base.mako:151 msgid "Repository groups" msgstr "" @@ -5585,7 +5716,7 @@ msgid "Group Parent" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 -#: rhodecode/templates/admin/repos/repo_add_base.mako:55 +#: rhodecode/templates/admin/repos/repo_add_base.mako:66 msgid "Copy Parent Group Permissions" msgstr "" @@ -5702,7 +5833,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:107 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117 -#: rhodecode/templates/base/issue_tracker_settings.mako:84 +#: rhodecode/templates/base/issue_tracker_settings.mako:83 msgid "Add new" msgstr "" @@ -5765,52 +5896,48 @@ msgid "Import Existing Repository ?" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:193 +#: rhodecode/templates/base/base.mako:196 msgid "Clone from" msgstr "Cloner depuis" -#: rhodecode/templates/admin/repos/repo_add_base.mako:27 -msgid "Optional http[s] URL from which to clone a repository." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_add_base.mako:36 +#: rhodecode/templates/admin/repos/repo_add_base.mako:47 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:102 #: rhodecode/templates/forks/fork.mako:52 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "Gardez cette description précise et concise. Utilisez un fichier README pour des descriptions plus détaillées." -#: rhodecode/templates/admin/repos/repo_add_base.mako:41 +#: rhodecode/templates/admin/repos/repo_add_base.mako:52 msgid "Repository Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 +#: 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)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:50 +#: rhodecode/templates/admin/repos/repo_add_base.mako:61 #: rhodecode/templates/forks/fork.mako:67 msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:59 +#: rhodecode/templates/admin/repos/repo_add_base.mako:70 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:68 +#: rhodecode/templates/admin/repos/repo_add_base.mako:79 msgid "Set the type of repository to create." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:73 +#: rhodecode/templates/admin/repos/repo_add_base.mako:84 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:70 #: rhodecode/templates/forks/fork.mako:73 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:77 +#: rhodecode/templates/admin/repos/repo_add_base.mako:88 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." @@ -5854,7 +5981,16 @@ msgstr "Dépôt distant" msgid "Statistics" msgstr "Statistiques" -#: rhodecode/templates/admin/repos/repo_edit.mako:87 +#: rhodecode/templates/admin/repos/repo_edit.mako:75 +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3 +msgid "Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:78 +msgid "Strip" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:93 msgid "Reviewers" msgstr "" @@ -5881,12 +6017,10 @@ msgid "This repository is a fork of %(re msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 -#: rhodecode/templates/admin/repos/repo_edit_fork.mako:5 msgid "Set" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:39 -#: rhodecode/templates/admin/repos/repo_edit_fork.mako:9 msgid "Manually set this repository as a fork of another from the list" msgstr "Marquer ce dépôt comme fork d’un autre dépôt de la liste." @@ -6023,10 +6157,11 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:37 #: 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:62 +#: 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:101 +#: rhodecode/templates/admin/users/users.mako:73 msgid "Active" msgstr "Actif" @@ -6102,6 +6237,23 @@ 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 +msgid "No maintenance tasks for this repo available" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:26 +msgid "Run Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:41 +msgid "Performing Maintenance" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:5 msgid "Repository Permissions" msgstr "" @@ -6122,16 +6274,21 @@ msgstr "" msgid "Remote mirror url" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 +#: 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 msgid "Pull changes from remote location" msgstr "Récupérer les changements depuis le site distant" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:22 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:19 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:27 msgid "This repository does not have any remote mirror url set." msgstr "" @@ -6255,11 +6412,80 @@ msgstr "" msgid "Confirm to remove current statistics" msgstr "Souhaitez-vous vraiment réinitialiser les statistiques de ce dépôt ?" -#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:3 +msgid "Strip commits from repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:7 +#, python-format +msgid "Please provide up to %d commits commits to strip" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:9 +msgid "" +"In the first step commits will be verified for existance in the repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:10 +msgid "In the second step, correct commits will be available for stripping" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:16 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:52 +msgid "Enter full 40 character commit sha" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:18 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:54 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:95 +msgid "Add another commit" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:27 +msgid "Check commits" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:33 +msgid "Sorry this functionality is not available for SVN repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:46 +msgid "Remove" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:112 +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 +msgid " commit verified positive" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:131 +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" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:13 msgid "Select to inherit global vcs settings." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:45 +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:43 #: rhodecode/templates/admin/settings/settings_global.mako:139 #: rhodecode/templates/admin/settings/settings_labs.mako:48 #: rhodecode/templates/admin/settings/settings_vcs.mako:13 @@ -6796,8 +7022,8 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_add.mako:13 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:76 -#: rhodecode/templates/base/base.mako:151 +#: rhodecode/templates/base/base.mako:79 +#: rhodecode/templates/base/base.mako:154 msgid "User groups" msgstr "" @@ -6838,30 +7064,72 @@ msgid "Members" msgstr "Membres" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:9 +msgid "Automatic member sync" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:11 msgid "Assigned to repositories" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:10 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:12 msgid "Assigned to repo groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:17 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:19 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6 #, python-format msgid "User Group: %s" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:26 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:29 +msgid "Group members sync" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:36 +msgid "This group is set to be automatically synchronised." +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 +msgid "This group is not set to be automatically synchronised" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51 +msgid "Disable synchronization" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53 +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 msgid "Delete User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:32 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:81 #, 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:34 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:83 msgid "Delete This User Group" msgstr "" @@ -6887,6 +7155,7 @@ msgid "No members yet" msgstr "" #: rhodecode/templates/admin/user_groups/user_groups.mako:5 +#: rhodecode/templates/admin/users/user_edit_groups.mako:6 msgid "User groups administration" msgstr "" @@ -6894,18 +7163,22 @@ msgstr "" msgid "user groups" msgstr "" +#: rhodecode/templates/admin/user_groups/user_groups.mako:62 +msgid "Sync" +msgstr "" + #: rhodecode/templates/admin/users/user_add.mako:5 msgid "Add user" msgstr "Ajouter un utilisateur" #: rhodecode/templates/admin/users/user_add.mako:13 #: rhodecode/templates/admin/users/user_edit.mako:14 -#: rhodecode/templates/base/base.mako:75 +#: rhodecode/templates/base/base.mako:78 msgid "Users" msgstr "Utilisateurs" #: rhodecode/templates/admin/users/user_add.mako:15 -#: rhodecode/templates/admin/users/users.mako:27 +#: rhodecode/templates/admin/users/users.mako:28 msgid "Add User" msgstr "" @@ -6957,14 +7230,18 @@ msgstr "" msgid "Auth tokens" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:38 -msgid "Emails" -msgstr "" - #: rhodecode/templates/admin/users/user_edit.mako:39 msgid "Ip Whitelist" msgstr "" +#: rhodecode/templates/admin/users/user_edit.mako:40 +msgid "User Groups Management" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.mako:41 +msgid "User audit" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 #: rhodecode/templates/admin/users/user_edit_profile.mako:106 msgid "Source of Record" @@ -6975,7 +7252,7 @@ msgid "Last login" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 -#: rhodecode/templates/admin/users/users.mako:99 +#: rhodecode/templates/admin/users/users.mako:71 msgid "Last activity" msgstr "" @@ -7084,22 +7361,23 @@ msgid "" "will delete the user's repositories!" msgstr "" -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 -msgid "Authentication Access Tokens" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:63 -msgid "No additional auth tokens specified" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:75 -msgid "New auth token" +#: rhodecode/templates/admin/users/user_edit_audit.mako:7 +msgid "User Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +msgid "audit filter..." msgstr "" #: rhodecode/templates/admin/users/user_edit_emails.mako:5 msgid "Additional Email Addresses" msgstr "" +#: rhodecode/templates/admin/users/user_edit_groups.mako:12 +#, python-format +msgid "Add `%s` to user group" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_ips.mako:3 msgid "Custom IP Whitelist" msgstr "" @@ -7156,98 +7434,98 @@ msgstr "" msgid "Users administration" msgstr "Administration des utilisateurs" -#: rhodecode/templates/admin/users/users.mako:105 +#: rhodecode/templates/admin/users/users.mako:77 msgid "Auth type" msgstr "" -#: rhodecode/templates/base/base.mako:50 +#: rhodecode/templates/base/base.mako:53 #, python-format msgid "RhodeCode instance id: %s" msgstr "" -#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:81 msgid "Authentication" msgstr "" -#: rhodecode/templates/base/base.mako:80 +#: rhodecode/templates/base/base.mako:83 msgid "Defaults" msgstr "" -#: rhodecode/templates/base/base.mako:98 +#: rhodecode/templates/base/base.mako:101 #: rhodecode/templates/files/files_pjax.mako:24 #: rhodecode/templates/summary/components.mako:42 msgid "Show More" msgstr "" -#: rhodecode/templates/base/base.mako:185 +#: rhodecode/templates/base/base.mako:188 msgid "Fork of" msgstr "Fork de" -#: rhodecode/templates/base/base.mako:202 +#: rhodecode/templates/base/base.mako:205 #, python-format msgid "Repository locked by %(user)s" msgstr "" -#: rhodecode/templates/base/base.mako:207 +#: rhodecode/templates/base/base.mako:210 msgid "Repository not locked. Pull repository to lock it." msgstr "" -#: rhodecode/templates/base/base.mako:225 +#: rhodecode/templates/base/base.mako:228 #: rhodecode/templates/data_table/_dt_elements.mako:12 #: rhodecode/templates/data_table/_dt_elements.mako:13 #: rhodecode/templates/data_table/_dt_elements.mako:153 msgid "Summary" msgstr "Résumé" -#: rhodecode/templates/base/base.mako:226 +#: rhodecode/templates/base/base.mako:229 #: rhodecode/templates/data_table/_dt_elements.mako:17 #: rhodecode/templates/data_table/_dt_elements.mako:18 msgid "Changelog" msgstr "Historique" -#: rhodecode/templates/base/base.mako:227 +#: rhodecode/templates/base/base.mako:230 #: rhodecode/templates/data_table/_dt_elements.mako:22 #: rhodecode/templates/data_table/_dt_elements.mako:23 #: rhodecode/templates/files/files.mako:15 msgid "Files" msgstr "Fichiers" -#: rhodecode/templates/base/base.mako:229 +#: rhodecode/templates/base/base.mako:232 #: rhodecode/templates/bookmarks/bookmarks.mako:68 #: rhodecode/templates/branches/branches.mako:67 #: rhodecode/templates/tags/tags.mako:68 msgid "Compare" msgstr "Comparer" -#: rhodecode/templates/base/base.mako:234 +#: rhodecode/templates/base/base.mako:237 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: rhodecode/templates/base/base.mako:243 +#: rhodecode/templates/base/base.mako:246 msgid "Options" msgstr "Options" -#: rhodecode/templates/base/base.mako:250 +#: rhodecode/templates/base/base.mako:253 #: rhodecode/templates/forks/forks_data.mako:30 msgid "Compare fork" msgstr "Comparer le fork" -#: rhodecode/templates/base/base.mako:253 -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:256 +#: rhodecode/templates/base/base.mako:403 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "Rechercher" -#: rhodecode/templates/base/base.mako:257 +#: rhodecode/templates/base/base.mako:260 msgid "Unlock" msgstr "" -#: rhodecode/templates/base/base.mako:259 +#: rhodecode/templates/base/base.mako:262 msgid "Lock" msgstr "" -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:267 #: rhodecode/templates/data_table/_dt_elements.mako:27 #: rhodecode/templates/data_table/_dt_elements.mako:28 #: rhodecode/templates/forks/forks_data.mako:8 @@ -7257,77 +7535,77 @@ msgid_plural "Forks" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/base/base.mako:265 +#: rhodecode/templates/base/base.mako:268 msgid "Create Pull Request" msgstr "" -#: rhodecode/templates/base/base.mako:287 +#: rhodecode/templates/base/base.mako:290 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:295 +#: rhodecode/templates/base/base.mako:298 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:312 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:322 +#: 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:342 +#: rhodecode/templates/base/base.mako:345 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:346 +#: rhodecode/templates/base/base.mako:349 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:382 +#: rhodecode/templates/base/base.mako:385 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:383 +#: rhodecode/templates/base/base.mako:386 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:14 msgid "Journal" msgstr "Historique" -#: rhodecode/templates/base/base.mako:388 +#: rhodecode/templates/base/base.mako:391 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:389 +#: rhodecode/templates/base/base.mako:392 msgid "Public journal" msgstr "Journal public" -#: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/base/base.mako:397 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:395 +#: rhodecode/templates/base/base.mako:398 msgid "Gists" msgstr "" -#: rhodecode/templates/base/base.mako:399 +#: rhodecode/templates/base/base.mako:402 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:408 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:412 +#: rhodecode/templates/base/base.mako:415 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:422 -#: rhodecode/templates/base/base.mako:423 +#: rhodecode/templates/base/base.mako:425 +#: rhodecode/templates/base/base.mako:426 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7349,15 +7627,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:480 +#: rhodecode/templates/base/base.mako:483 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:533 +#: rhodecode/templates/base/base.mako:536 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:541 +#: rhodecode/templates/base/base.mako:544 msgid "Site-wide shortcuts" msgstr "" @@ -7426,9 +7704,7 @@ msgid "User Group Creation" msgstr "" #: rhodecode/templates/base/default_perms_box.mako:72 -msgid "" -"Permission to allow user group creation. When disabled, user group admins " -"can still create subgroups within their user groups." +msgid "Permission to allow user group creation." msgstr "" #: rhodecode/templates/base/default_perms_box.mako:78 @@ -7453,19 +7729,19 @@ msgid "" "permission by members of user groups." msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:22 +#: rhodecode/templates/base/issue_tracker_settings.mako:21 msgid "Read more" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:92 +#: rhodecode/templates/base/issue_tracker_settings.mako:91 msgid "New Entry" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:96 +#: rhodecode/templates/base/issue_tracker_settings.mako:95 msgid "Confirm to remove this pattern:" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:192 +#: 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 @@ -7475,7 +7751,7 @@ msgstr "" msgid "Preview" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:193 +#: rhodecode/templates/base/issue_tracker_settings.mako:192 msgid "Test Pattern Preview" msgstr "" @@ -7623,101 +7899,130 @@ msgstr "" msgid "Enable largefiles extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:99 +#: rhodecode/templates/base/vcs_settings.mako:100 msgid "Enable Largefiles extensions for all repositories." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:103 +#: rhodecode/templates/base/vcs_settings.mako:102 +msgid "Enable Largefiles extensions for this repository." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:113 +msgid "" +"Filesystem location where Mercurial largefile objects should be stored." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:119 msgid "Set repositories as publishing" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:103 +#: rhodecode/templates/base/vcs_settings.mako:119 msgid "Set repository as publishing" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:106 +#: rhodecode/templates/base/vcs_settings.mako:122 msgid "" "When this is enabled all commits in the repository are seen as public " "commits by clients." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:111 +#: rhodecode/templates/base/vcs_settings.mako:127 msgid "Enable hgsubversion extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:114 +#: rhodecode/templates/base/vcs_settings.mako:130 msgid "" "Requires hgsubversion library to be installed. Allows cloning remote SVN " "repositories and migrates them to Mercurial type." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:123 +#: rhodecode/templates/base/vcs_settings.mako:139 msgid "Mercurial Labs Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:123 +#: rhodecode/templates/base/vcs_settings.mako:139 msgid "" "These features are considered experimental and may not work as expected." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:129 +#: rhodecode/templates/base/vcs_settings.mako:145 msgid "Use rebase as merge strategy" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:132 +#: rhodecode/templates/base/vcs_settings.mako:148 msgid "" "Use rebase instead of creating a merge commit when merging via web " "interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:144 +#: rhodecode/templates/base/vcs_settings.mako:160 +msgid "Git Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:165 +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 "Filesystem location where Git lfs objects should be stored." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:193 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:150 +#: rhodecode/templates/base/vcs_settings.mako:199 msgid "Proxy subversion HTTP requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:154 +#: 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:155 +#: rhodecode/templates/base/vcs_settings.mako:204 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:161 +#: rhodecode/templates/base/vcs_settings.mako:210 msgid "Subversion HTTP Server URL" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:167 +#: rhodecode/templates/base/vcs_settings.mako:216 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:179 +#: rhodecode/templates/base/vcs_settings.mako:228 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:184 +#: rhodecode/templates/base/vcs_settings.mako:233 msgid "Repository patterns" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:188 +#: rhodecode/templates/base/vcs_settings.mako:237 msgid "" "Patterns for identifying SVN branches and tags. For recursive search, use " "\"*\". Eg.: \"/branches/*\"" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:254 +#: rhodecode/templates/base/vcs_settings.mako:301 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:259 +#: rhodecode/templates/base/vcs_settings.mako:306 msgid "Enable server-side merge for pull requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:262 +#: rhodecode/templates/base/vcs_settings.mako:309 msgid "" "Note: when this feature is enabled, it only runs hooks defined in the " "rcextension package. Custom hooks added on the Admin -> Settings -> Hooks " @@ -7725,11 +8030,11 @@ msgid "" "web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:266 +#: rhodecode/templates/base/vcs_settings.mako:313 msgid "Invalidate and relocate inline comments during update" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:269 +#: rhodecode/templates/base/vcs_settings.mako:316 msgid "" "During the update of a pull request, the position of inline comments will be" " updated and outdated inline comments will be hidden." @@ -7866,7 +8171,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:53 #: rhodecode/templates/compare/compare_commits.mako:46 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:495 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" @@ -7959,8 +8264,8 @@ msgid "Diff options" msgstr "" #: rhodecode/templates/changeset/changeset.mako:119 -#: rhodecode/templates/codeblocks/diffs.mako:436 -#: rhodecode/templates/codeblocks/diffs.mako:439 +#: rhodecode/templates/codeblocks/diffs.mako:445 +#: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "" @@ -7977,8 +8282,8 @@ msgid "Patch Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:127 -#: rhodecode/templates/codeblocks/diffs.mako:443 -#: rhodecode/templates/codeblocks/diffs.mako:446 +#: rhodecode/templates/codeblocks/diffs.mako:452 +#: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "" @@ -7988,7 +8293,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:145 #: rhodecode/templates/changeset/changeset.mako:147 -#: rhodecode/tests/functional/test_commit_comments.py:270 +#: rhodecode/tests/functional/test_commit_comments.py:275 #, python-format msgid "%d Commit comment" msgid_plural "%d Commit comments" @@ -7997,7 +8302,7 @@ msgstr[1] "" #: rhodecode/templates/changeset/changeset.mako:150 #: rhodecode/templates/changeset/changeset.mako:152 -#: rhodecode/tests/functional/test_commit_comments.py:277 +#: rhodecode/tests/functional/test_commit_comments.py:282 #, python-format msgid "%d Inline Comment" msgid_plural "%d Inline Comments" @@ -8103,18 +8408,16 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:363 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:148 +#: 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:388 +#: rhodecode/templates/changeset/changeset_file_comment.mako:393 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 #: rhodecode/templates/compare/compare_diff.mako:122 -#: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:97 msgid "Comment" msgstr "Commentaire" @@ -8149,7 +8452,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_range.mako:99 #: rhodecode/templates/compare/compare_diff.mako:312 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:414 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:419 #, python-format msgid "Expand %s commit" msgid_plural "Expand %s commits" @@ -8158,7 +8461,7 @@ msgstr[1] "" #: rhodecode/templates/changeset/changeset_range.mako:105 #: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 #, python-format msgid "Collapse %s commit" msgid_plural "Collapse %s commits" @@ -8260,64 +8563,68 @@ msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:406 -#: rhodecode/templates/codeblocks/diffs.mako:422 +#: rhodecode/templates/codeblocks/diffs.mako:415 +#: rhodecode/templates/codeblocks/diffs.mako:431 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:408 -#: rhodecode/templates/codeblocks/diffs.mako:415 +#: rhodecode/templates/codeblocks/diffs.mako:417 +#: rhodecode/templates/codeblocks/diffs.mako:424 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:413 -#: rhodecode/templates/codeblocks/diffs.mako:429 +#: rhodecode/templates/codeblocks/diffs.mako:422 +#: rhodecode/templates/codeblocks/diffs.mako:438 #, python-format msgid "File no longer present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:424 -#: rhodecode/templates/codeblocks/diffs.mako:431 +#: rhodecode/templates/codeblocks/diffs.mako:433 +#: rhodecode/templates/codeblocks/diffs.mako:440 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:462 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:462 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:634 +#: rhodecode/templates/codeblocks/diffs.mako:643 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:636 +#: rhodecode/templates/codeblocks/diffs.mako:645 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:640 +#: rhodecode/templates/codeblocks/diffs.mako:649 msgid "View unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:641 +#: rhodecode/templates/codeblocks/diffs.mako:650 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:651 +#: rhodecode/templates/codeblocks/diffs.mako:660 msgid "Expand All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:655 +#: rhodecode/templates/codeblocks/diffs.mako:664 msgid "Collapse All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:659 +#: rhodecode/templates/codeblocks/diffs.mako:668 msgid "Wide Mode Diff" msgstr "" +#: rhodecode/templates/codeblocks/source.mako:24 +msgid "view annotation from before this change" +msgstr "" + #: rhodecode/templates/compare/compare_commits.mako:5 msgid "Common Ancestor Commit" msgstr "" @@ -8327,7 +8634,7 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:16 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:451 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:456 msgid "Time" msgstr "" @@ -8339,7 +8646,7 @@ msgstr[0] "" msgstr[1] "" #: rhodecode/templates/compare/compare_commits.mako:68 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:568 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:573 msgid "show it" msgid_plural "show them" msgstr[0] "" @@ -8375,14 +8682,14 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:98 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:103 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.mako:76 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 -#: rhodecode/templates/files/files_source.mako:20 +#: rhodecode/templates/files/files_source.mako:23 msgid "Source" msgstr "" @@ -8605,133 +8912,150 @@ msgstr "" msgid "RhodeCode" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:16 -#: rhodecode/templates/email_templates/pull_request_comment.mako:18 +#: rhodecode/templates/email_templates/commit_comment.mako:18 +#: rhodecode/templates/email_templates/pull_request_comment.mako:19 msgid "[mention]" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:19 -#, python-format -msgid "" -"%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:19 -#: rhodecode/templates/email_templates/commit_comment.mako:22 +#: rhodecode/templates/email_templates/commit_comment.mako:21 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on commit `%(commit_id)s` (file: " +"`%(comment_file)s`)" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:24 +#: rhodecode/templates/email_templates/commit_comment.mako:26 #, python-format msgid "in the %(repo_name)s repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:22 -#, python-format -msgid "%(user)s commented on commit `%(commit_id)s` (status: %(status)s)" -msgstr "" - #: rhodecode/templates/email_templates/commit_comment.mako:24 -#: rhodecode/templates/email_templates/commit_comment.mako:78 -#, python-format -msgid "%(user)s commented on commit `%(commit_id)s`" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:43 -#: rhodecode/templates/email_templates/pull_request_comment.mako:44 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on commit `%(commit_id)s` (status: " +"%(status)s)" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:26 +#, python-format +msgid "%(user)s left %(comment_type)s on commit `%(commit_id)s`" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:47 +#: rhodecode/templates/email_templates/pull_request_comment.mako:47 msgid "Comment link" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:48 -#: rhodecode/templates/email_templates/pull_request_comment.mako:49 +#: rhodecode/templates/email_templates/commit_comment.mako:52 +#: rhodecode/templates/email_templates/pull_request_comment.mako:52 #, python-format msgid "File: %(comment_file)s on line %(comment_line)s" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:54 +#: rhodecode/templates/email_templates/commit_comment.mako:58 msgid "Commit status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:76 +#: rhodecode/templates/email_templates/commit_comment.mako:82 #, python-format msgid "%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:76 -#: rhodecode/templates/email_templates/commit_comment.mako:78 +#: rhodecode/templates/email_templates/commit_comment.mako:82 +#: rhodecode/templates/email_templates/commit_comment.mako:84 #, python-format msgid "in the %(repo)s repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:85 +#: rhodecode/templates/email_templates/commit_comment.mako:84 +#, python-format +msgid "%(user)s commented on commit `%(commit_id)s`" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:92 +#: rhodecode/templates/email_templates/pull_request_comment.mako:94 msgid "Status" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:85 +#: rhodecode/templates/email_templates/commit_comment.mako:93 msgid "The commit status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:97 -#, python-format -msgid "Comment on line: %(comment_line)s" -msgstr "" - -#: rhodecode/templates/email_templates/password_reset.mako:30 +#: rhodecode/templates/email_templates/commit_comment.mako:99 +#: rhodecode/templates/email_templates/pull_request_comment.mako:107 +#, python-format +msgid "TODO comment on line: %(comment_line)s" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:101 +#: rhodecode/templates/email_templates/pull_request_comment.mako:109 +#, python-format +msgid "Note comment on line: %(comment_line)s" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:101 +#: rhodecode/templates/email_templates/pull_request_comment.mako:109 +msgid "Note comment" +msgstr "" + +#: rhodecode/templates/email_templates/password_reset.mako:31 msgid "Generate new password here" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:21 -#, python-format -msgid "" -"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: " -"`%(comment_file)s`)" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:24 -#, python-format -msgid "" -"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: " -"%(status)s)" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:26 -#: rhodecode/templates/email_templates/pull_request_comment.mako:83 -#, python-format -msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:46 +#: rhodecode/templates/email_templates/pull_request_comment.mako:22 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\" " +"(file: `%(comment_file)s`)" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:25 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\" " +"(status: %(status)s)" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:27 +#, python-format +msgid "%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:49 msgid "Source repository" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:55 +#: rhodecode/templates/email_templates/pull_request_comment.mako:58 #, python-format msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:57 +#: rhodecode/templates/email_templates/pull_request_comment.mako:60 #, python-format msgid "" "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:81 +#: rhodecode/templates/email_templates/pull_request_comment.mako:84 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" " "(file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:87 -#, python-format -msgid "submitted pull request status: %(status)s" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:89 -#, python-format -msgid "submitted pull request status: %(status)s and closed" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:95 -msgid "Submitted status" +#: rhodecode/templates/email_templates/pull_request_comment.mako:86 +#, python-format +msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 +msgid "Closed pull request with status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:99 +msgid "Submitted review status" msgstr "" #: rhodecode/templates/email_templates/pull_request_review.mako:14 @@ -8798,12 +9122,6 @@ msgstr "" msgid "Full Name" msgstr "" -#: rhodecode/templates/email_templates/user_registration.mako:26 -#: rhodecode/templates/users/user.mako:29 -#: rhodecode/templates/users/user_profile.mako:5 -msgid "Profile" -msgstr "" - #: rhodecode/templates/errors/error_document.mako:46 #, python-format msgid "You will be redirected to %s in %s seconds" @@ -8960,13 +9278,13 @@ msgid "Delete file" msgstr "" #: rhodecode/templates/files/files_delete.mako:45 -#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:65 #, python-format msgid "Binary file (%s)" msgstr "Fichier binaire (%s)" #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:87 msgid "File is too big to display" msgstr "Ce fichier est trop gros pour être affiché." @@ -8979,19 +9297,19 @@ msgstr "" msgid "Commit Description" msgstr "" -#: rhodecode/templates/files/files_detail.mako:35 +#: rhodecode/templates/files/files_detail.mako:32 msgid "File last commit" msgstr "" -#: rhodecode/templates/files/files_detail.mako:51 +#: rhodecode/templates/files/files_detail.mako:46 msgid "Show/Diff file" msgstr "" -#: rhodecode/templates/files/files_detail.mako:66 +#: rhodecode/templates/files/files_detail.mako:61 msgid "Diff to Commit" msgstr "" -#: rhodecode/templates/files/files_detail.mako:67 +#: rhodecode/templates/files/files_detail.mako:62 msgid "Show at Commit" msgstr "" @@ -9033,72 +9351,66 @@ msgstr "Édition du fichier" msgid "Location" msgstr "Emplacement" -#: rhodecode/templates/files/files_source.mako:7 +#: rhodecode/templates/files/files_source.mako:8 +msgid "This file is a pointer to large binary file" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:8 +msgid "LargeFile" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:10 #: rhodecode/templates/search/search_content.mako:57 msgid "line" msgid_plural "lines" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/files/files_source.mako:14 +#: rhodecode/templates/files/files_source.mako:17 msgid "History" msgstr "Historique" -#: rhodecode/templates/files/files_source.mako:17 +#: rhodecode/templates/files/files_source.mako:20 #: rhodecode/templates/search/search_content.mako:68 msgid "Show Full History" msgstr "" -#: rhodecode/templates/files/files_source.mako:22 +#: rhodecode/templates/files/files_source.mako:25 #: rhodecode/templates/search/search_content.mako:70 msgid "Annotation" msgstr "" -#: rhodecode/templates/files/files_source.mako:24 +#: rhodecode/templates/files/files_source.mako:27 #: rhodecode/templates/search/search_content.mako:71 msgid "Raw" msgstr "" -#: rhodecode/templates/files/files_source.mako:26 +#: rhodecode/templates/files/files_source.mako:31 +msgid "Download largefile" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:35 #: rhodecode/templates/search/search_content.mako:73 msgid "Download" msgstr "Téléchargements" -#: rhodecode/templates/files/files_source.mako:33 +#: rhodecode/templates/files/files_source.mako:43 #, python-format msgid "Edit on Branch:%s" msgstr "" -#: rhodecode/templates/files/files_source.mako:38 +#: rhodecode/templates/files/files_source.mako:48 msgid "Editing binary files not allowed" msgstr "" -#: rhodecode/templates/files/files_source.mako:41 +#: rhodecode/templates/files/files_source.mako:51 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_source.mako:52 msgid "Deleting files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/followers/followers.mako:5 -#: rhodecode/templates/followers/followers.mako:27 -#, python-format -msgid "%s Followers" -msgstr "Followers de %s" - -#: rhodecode/templates/followers/followers.mako:12 -msgid "Followers" -msgstr "Followers" - -#: rhodecode/templates/followers/followers_data.mako:5 -msgid "Follower Name" -msgstr "" - -#: rhodecode/templates/followers/followers_data.mako:6 -msgid "Following Since" -msgstr "" - #: rhodecode/templates/forks/fork.mako:5 #, python-format msgid "Fork repository %s" @@ -9179,98 +9491,99 @@ msgstr "Flux RSS du journal public" msgid "New pull request" msgstr "Nouvelle requête de pull" -#: rhodecode/templates/pullrequests/pullrequest.mako:52 +#: rhodecode/templates/pullrequests/pullrequest.mako:51 msgid "Write a short description on this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:59 +#: rhodecode/templates/pullrequests/pullrequest.mako:57 msgid "Commit flow" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:67 +#: rhodecode/templates/pullrequests/pullrequest.mako:65 msgid "Origin repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:85 +#: rhodecode/templates/pullrequests/pullrequest.mako:83 msgid "Loading refs..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:96 +#: rhodecode/templates/pullrequests/pullrequest.mako:94 msgid "Submit Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:109 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:317 +#: rhodecode/templates/pullrequests/pullrequest.mako:107 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:322 msgid "Pull request reviewers" msgstr "Relecteurs de la requête de pull" -#: rhodecode/templates/pullrequests/pullrequest.mako:110 -msgid "loading..." -msgstr "Chargement…" - -#: rhodecode/templates/pullrequests/pullrequest.mako:120 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:361 +#: rhodecode/templates/pullrequests/pullrequest.mako:118 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:366 msgid "Add reviewer" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:299 -#: rhodecode/templates/pullrequests/pullrequest.mako:572 +#: rhodecode/templates/pullrequests/pullrequest.mako:297 +#: rhodecode/templates/pullrequests/pullrequest.mako:570 msgid "Please select origin and destination" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:305 +#: rhodecode/templates/pullrequests/pullrequest.mako:303 msgid "Loading compare ..." msgstr "" +#: rhodecode/templates/pullrequests/pullrequest.mako:350 #: rhodecode/templates/pullrequests/pullrequest.mako:352 -#: rhodecode/templates/pullrequests/pullrequest.mako:354 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:357 +#: rhodecode/templates/pullrequests/pullrequest.mako:355 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:364 +#: rhodecode/templates/pullrequests/pullrequest.mako:362 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:464 +#: rhodecode/templates/pullrequests/pullrequest.mako:462 msgid "Destination repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:475 +#: rhodecode/templates/pullrequests/pullrequest.mako:473 msgid "Select commit reference" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:8 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:7 msgid "This pull request can be merged automatically." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:13 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:12 msgid "Merge is not currently possible because of below failed checks." msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:37 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:42 +msgid "refresh checks" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:38 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 -msgid "refresh checks" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:39 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:44 msgid "Merge Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:44 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 msgid "You are not allowed to merge this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:46 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:45 msgid "Login to Merge this Pull Request" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:54 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 +msgid "Close with status {}" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show.mako:5 #, python-format msgid "%s Pull Request #%s" @@ -9288,171 +9601,175 @@ msgstr "Veuillez confirmer la suppression de cette requête de pull." msgid "Origin" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:120 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:88 +msgid "Common ancestor" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:125 msgid "Merge" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:133 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:138 msgid "Shadow repository data not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:141 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:146 msgid "Review" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:157 #, python-format msgid "calculated based on %s reviewer vote" msgid_plural "calculated based on %s reviewers votes" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:170 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:175 msgid "Versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:183 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:186 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:188 msgid "{} version available for this pull request, show it." msgid_plural "{} versions available for this pull request, show them." msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:182 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:187 msgid "Hide all versions of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:207 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:212 msgid "Your review status at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:213 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:218 msgid "Comment from pull request version {0}, general:{1} inline:{2}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:230 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:234 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:235 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:239 msgid "select versions to show changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:231 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:236 msgid "show changes between versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:232 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:237 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:247 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:252 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:251 -msgid "Comments for this pull request" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:256 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 +msgid "Comments for this pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:261 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:263 #, python-format msgid "%d General " msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:264 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:267 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:269 #, python-format msgid "%d Inline" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:268 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:272 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:273 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 #, python-format msgid "%d Outdated" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:269 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:274 msgid "show outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:270 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:281 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:286 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:295 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:365 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:300 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:370 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:382 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:387 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:383 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:388 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:391 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:396 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 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:393 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 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:404 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:409 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:427 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:432 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:440 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:445 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:444 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:449 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:462 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:464 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:469 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:567 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:572 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:570 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:575 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:571 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:576 msgid "show them" msgstr "" 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-02-05 17:11+0100\n" -"PO-Revision-Date: 2017-02-01 20:10+0000\n" +"POT-Creation-Date: 2017-04-07 12:33+0200\n" +"PO-Revision-Date: 2017-04-07 10:34+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Italian (http://www.transifex.com/rhodecode/RhodeCode/language/it/)\n" "MIME-Version: 1.0\n" @@ -20,51 +20,52 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: rhodecode/admin/navigation.py:83 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:167 +#: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 +#: rhodecode/integrations/views.py:166 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "Globale" -#: rhodecode/admin/navigation.py:84 +#: rhodecode/apps/admin/navigation.py:84 #: rhodecode/templates/admin/repos/repo_edit.mako:52 msgid "VCS" msgstr "VCS" -#: rhodecode/admin/navigation.py:85 +#: rhodecode/apps/admin/navigation.py:85 msgid "Visual" msgstr "Interfaccia" -#: rhodecode/admin/navigation.py:86 +#: rhodecode/apps/admin/navigation.py:86 msgid "Remap and Rescan" msgstr "" -#: rhodecode/admin/navigation.py:87 +#: rhodecode/apps/admin/navigation.py:87 #: rhodecode/templates/admin/repos/repo_edit.mako:58 msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:89 rhodecode/integrations/types/email.py:232 -#: rhodecode/templates/register.mako:75 +#: rhodecode/apps/admin/navigation.py:89 +#: rhodecode/integrations/types/email.py:232 +#: rhodecode/templates/register.mako:76 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: 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:92 +#: rhodecode/templates/admin/users/users.mako:64 #: rhodecode/templates/email_templates/user_registration.mako:25 #: rhodecode/templates/users/user_profile.mako:51 msgid "Email" msgstr "Email" -#: rhodecode/admin/navigation.py:90 +#: rhodecode/apps/admin/navigation.py:90 msgid "Hooks" msgstr "Hooks" -#: rhodecode/admin/navigation.py:91 +#: rhodecode/apps/admin/navigation.py:91 msgid "Full Text Search" msgstr "" -#: rhodecode/admin/navigation.py:93 +#: rhodecode/apps/admin/navigation.py:93 #: rhodecode/templates/admin/integrations/base.mako:23 #: rhodecode/templates/admin/integrations/form.mako:8 #: rhodecode/templates/admin/integrations/form.mako:21 @@ -78,177 +79,290 @@ msgstr "" #: 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/base/base.mako:79 +#: rhodecode/templates/base/base.mako:82 msgid "Integrations" msgstr "" -#: rhodecode/admin/navigation.py:95 +#: rhodecode/apps/admin/navigation.py:95 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" msgstr "Informazioni sistema" -#: rhodecode/admin/navigation.py:97 +#: rhodecode/apps/admin/navigation.py:97 msgid "User Sessions" msgstr "" -#: rhodecode/admin/navigation.py:99 +#: rhodecode/apps/admin/navigation.py:99 msgid "Open Source Licenses" msgstr "" -#: rhodecode/admin/navigation.py:107 +#: rhodecode/apps/admin/navigation.py:107 msgid "Labs" msgstr "Laboratori" -#: rhodecode/admin/views/sessions.py:90 +#: rhodecode/apps/admin/views/sessions.py:86 msgid "Cleaned up old sessions" msgstr "" -#: rhodecode/admin/views/sessions.py:96 +#: rhodecode/apps/admin/views/sessions.py:92 msgid "Failed to cleanup up old sessions" msgstr "" -#: rhodecode/admin/views/svn_config.py:47 +#: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." msgstr "" -#: rhodecode/admin/views/svn_config.py:55 +#: rhodecode/apps/admin/views/svn_config.py:54 msgid "Failed to generate the Apache configuration for Subversion." msgstr "" -#: rhodecode/admin/views/system_info.py:96 +#: rhodecode/apps/admin/views/system_info.py:95 msgid "" "Note: please make sure this server can access `${url}` for the update link " "to work" msgstr "" -#: rhodecode/admin/views/system_info.py:99 +#: rhodecode/apps/admin/views/system_info.py:98 msgid "Update info" msgstr "" -#: rhodecode/admin/views/system_info.py:101 +#: rhodecode/apps/admin/views/system_info.py:100 msgid "Check for updates" msgstr "" -#: rhodecode/admin/views/system_info.py:106 +#: rhodecode/apps/admin/views/system_info.py:105 msgid "RhodeCode Version" msgstr "" -#: rhodecode/admin/views/system_info.py:107 +#: rhodecode/apps/admin/views/system_info.py:106 msgid "RhodeCode Server IP" msgstr "" -#: rhodecode/admin/views/system_info.py:108 +#: rhodecode/apps/admin/views/system_info.py:107 msgid "RhodeCode Server ID" msgstr "" -#: rhodecode/admin/views/system_info.py:109 +#: rhodecode/apps/admin/views/system_info.py:108 msgid "RhodeCode Configuration" msgstr "" -#: rhodecode/admin/views/system_info.py:113 +#: rhodecode/apps/admin/views/system_info.py:109 +msgid "Workers" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:110 +msgid "Worker Type" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:114 msgid "Database" msgstr "Database" -#: rhodecode/admin/views/system_info.py:114 +#: rhodecode/apps/admin/views/system_info.py:115 msgid "Database version" msgstr "Versione Database" -#: rhodecode/admin/views/system_info.py:118 +#: rhodecode/apps/admin/views/system_info.py:119 msgid "Platform" msgstr "Piattaforma" -#: rhodecode/admin/views/system_info.py:119 +#: rhodecode/apps/admin/views/system_info.py:120 msgid "Platform UUID" msgstr "" -#: rhodecode/admin/views/system_info.py:120 +#: rhodecode/apps/admin/views/system_info.py:121 msgid "Python version" msgstr "Versione python" -#: rhodecode/admin/views/system_info.py:121 +#: rhodecode/apps/admin/views/system_info.py:122 msgid "Python path" msgstr "Percorso Python" -#: rhodecode/admin/views/system_info.py:125 +#: rhodecode/apps/admin/views/system_info.py:126 msgid "CPU" msgstr "CPU" -#: rhodecode/admin/views/system_info.py:126 +#: rhodecode/apps/admin/views/system_info.py:127 msgid "Load" msgstr "Carico" -#: rhodecode/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:128 msgid "Memory" msgstr "" -#: rhodecode/admin/views/system_info.py:128 +#: rhodecode/apps/admin/views/system_info.py:129 msgid "Uptime" msgstr "Attivo da" -#: rhodecode/admin/views/system_info.py:132 +#: rhodecode/apps/admin/views/system_info.py:133 msgid "Storage location" msgstr "Percorso di storage" -#: rhodecode/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:135 msgid "Storage inodes" msgstr "" -#: rhodecode/admin/views/system_info.py:136 +#: rhodecode/apps/admin/views/system_info.py:137 msgid "Gist storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:137 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Gist storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:139 +#: rhodecode/apps/admin/views/system_info.py:140 msgid "Archive cache storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:140 +#: rhodecode/apps/admin/views/system_info.py:141 msgid "Archive cache info" msgstr "" -#: rhodecode/admin/views/system_info.py:142 +#: rhodecode/apps/admin/views/system_info.py:143 msgid "Temp storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:143 +#: rhodecode/apps/admin/views/system_info.py:144 msgid "Temp storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:145 +#: rhodecode/apps/admin/views/system_info.py:146 msgid "Search info" msgstr "" -#: rhodecode/admin/views/system_info.py:146 +#: rhodecode/apps/admin/views/system_info.py:147 msgid "Search location" msgstr "" -#: rhodecode/admin/views/system_info.py:150 +#: rhodecode/apps/admin/views/system_info.py:151 msgid "VCS Backends" msgstr "" -#: rhodecode/admin/views/system_info.py:151 +#: rhodecode/apps/admin/views/system_info.py:152 msgid "VCS Server" msgstr "" -#: rhodecode/admin/views/system_info.py:152 +#: rhodecode/apps/admin/views/system_info.py:153 msgid "GIT" msgstr "" -#: rhodecode/admin/views/system_info.py:153 +#: rhodecode/apps/admin/views/system_info.py:154 msgid "HG" msgstr "" -#: rhodecode/admin/views/system_info.py:154 +#: rhodecode/apps/admin/views/system_info.py:155 msgid "SVN" msgstr "" +#: rhodecode/apps/admin/views/users.py:60 +#: rhodecode/controllers/admin/users.py:359 +#: rhodecode/controllers/admin/users.py:380 +#: 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/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/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/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/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/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/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/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 +msgid "Auth token successfully created" +msgstr "Token Autorizzativo creato" + +#: rhodecode/apps/admin/views/users.py:240 +#: rhodecode/apps/my_account/views.py:192 +msgid "Auth token successfully deleted" +msgstr "Token autorizzativo cancellato" + +#: rhodecode/apps/admin/views/users.py:284 +msgid "Groups successfully changed" +msgstr "" + +#: rhodecode/apps/login/views.py:247 rhodecode/apps/login/views.py:316 +msgid "Bad captcha" +msgstr "" + +#: rhodecode/apps/login/views.py:256 +msgid "You have successfully registered with RhodeCode" +msgstr "La registrazione con RhodeCode ha avuto successo" + +#: rhodecode/apps/login/views.py:292 +msgid "If such email exists, a password reset link was sent to it." +msgstr "" + +#: rhodecode/apps/login/views.py:298 +msgid "Password reset has been disabled." +msgstr "" + +#: rhodecode/apps/login/views.py:381 +msgid "Given reset token is invalid" +msgstr "" + +#: rhodecode/apps/login/views.py:389 +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 +msgid "Error occurred during update of user password" +msgstr "Errore durante l'aggiornamento della password" + +#: rhodecode/apps/my_account/views.py:122 +msgid "Successfully updated password" +msgstr "Password aggiornata correttamente" + +#: rhodecode/apps/svn_support/events.py:30 +msgid "Configuration for Apaache mad_dav_svn changed." +msgstr "" + #: rhodecode/authentication/schema.py:35 msgid "Enable or disable this authentication plugin." msgstr "" @@ -264,12 +378,11 @@ msgstr "Abilitato" #: rhodecode/authentication/schema.py:43 msgid "" -"Amount of seconds to cache the authentication call for this plugin. Useful " -"for long calls like LDAP to improve the responsiveness of the authentication" -" system (0 means disabled)." -msgstr "" - -#: rhodecode/authentication/schema.py:48 +"Amount of seconds to cache the authentication responsecall for this plugin. \n" +"Useful for long calls like LDAP to improve the performance of the authentication system (0 means disabled)." +msgstr "" + +#: rhodecode/authentication/schema.py:49 msgid "Auth Cache TTL" msgstr "" @@ -290,99 +403,101 @@ msgstr "" msgid "Error occurred during update of auth settings." msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:61 +#: rhodecode/authentication/plugins/auth_crowd.py:60 msgid "The FQDN or IP of the Atlassian CROWD Server" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:63 +#: rhodecode/authentication/plugins/auth_crowd.py:62 msgid "Host" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:68 +#: rhodecode/authentication/plugins/auth_crowd.py:67 msgid "The Port in use by the Atlassian CROWD Server" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:70 +#: rhodecode/authentication/plugins/auth_crowd.py:69 #: rhodecode/authentication/plugins/auth_ldap.py:84 msgid "Port" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:76 +#: rhodecode/authentication/plugins/auth_crowd.py:75 msgid "The Application Name to authenticate to CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:78 +#: rhodecode/authentication/plugins/auth_crowd.py:77 msgid "Application Name" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:83 +#: rhodecode/authentication/plugins/auth_crowd.py:82 msgid "The password to authenticate to CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:85 +#: rhodecode/authentication/plugins/auth_crowd.py:84 msgid "Application Password" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:90 +#: rhodecode/authentication/plugins/auth_crowd.py:89 msgid "" "A comma separated list of group names that identify users as RhodeCode " "Administrators" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:94 +#: rhodecode/authentication/plugins/auth_crowd.py:93 msgid "Admin Groups" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:216 +#: rhodecode/authentication/plugins/auth_crowd.py:215 msgid "CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:55 +#: rhodecode/authentication/plugins/auth_headers.py:54 msgid "Header to extract the user from" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:57 +#: rhodecode/authentication/plugins/auth_headers.py:56 msgid "Header" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:62 +#: rhodecode/authentication/plugins/auth_headers.py:61 msgid "Header to extract the user from when main one fails" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:64 +#: rhodecode/authentication/plugins/auth_headers.py:63 msgid "Fallback header" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:69 +#: rhodecode/authentication/plugins/auth_headers.py:68 msgid "" "Perform cleaning of user, if passed user has @ in username then first part " "before @ is taken. If there's \\ in the username only the part after \\ is " "taken" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:74 +#: rhodecode/authentication/plugins/auth_headers.py:73 msgid "Clean username" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:99 +#: rhodecode/authentication/plugins/auth_headers.py:98 msgid "Headers" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:63 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:62 msgid "The url of the Jasig CAS REST service" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:65 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:64 #: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" msgstr "URL" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:93 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:92 msgid "Jasig-CAS" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:75 -msgid "Host of the LDAP Server" +#: 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 @@ -390,107 +505,117 @@ msgid "LDAP Host" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:82 -msgid "Port that the LDAP server is listening on" +msgid "Custom port that the LDAP server is listening on. Default: 389" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:90 -msgid "User to connect to LDAP" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:93 +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 msgid "Account" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:98 -msgid "Password to connect to LDAP" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:101 -#: rhodecode/templates/login.mako:49 rhodecode/templates/register.mako:47 +#: rhodecode/authentication/plugins/auth_ldap.py:100 +msgid "Password to authenticate for given user DN." +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:103 +#: 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:310 +#: rhodecode/templates/base/base.mako:313 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "Password" -#: rhodecode/authentication/plugins/auth_ldap.py:106 +#: rhodecode/authentication/plugins/auth_ldap.py:108 msgid "TLS Type" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:107 +#: rhodecode/authentication/plugins/auth_ldap.py:109 msgid "Connection Security" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:113 +#: rhodecode/authentication/plugins/auth_ldap.py:115 msgid "Require Cert over TLS?" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:114 +#: rhodecode/authentication/plugins/auth_ldap.py:116 msgid "Certificate Checks" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:120 -msgid "Base DN to search (e.g., dc=mydomain,dc=com)" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:123 +#: rhodecode/authentication/plugins/auth_ldap.py:122 +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 msgid "Base DN" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:128 -msgid "Filter to narrow results (e.g., ou=Users, etc)" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:131 -msgid "LDAP Search Filter" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:136 -msgid "How deep to search LDAP" +#: rhodecode/authentication/plugins/auth_ldap.py:132 +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 -msgid "LDAP Search Scope" +msgid "LDAP Search Filter" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:143 -msgid "LDAP Attribute to map to user name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:145 +msgid "How deep to search LDAP. If unsure set to SUBTREE" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:144 +msgid "LDAP Search Scope" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:150 +msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:152 msgid "Login Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:146 +#: rhodecode/authentication/plugins/auth_ldap.py:153 msgid "The LDAP Login attribute of the CN must be specified" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:151 -msgid "LDAP Attribute to map to first name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:154 +#: rhodecode/authentication/plugins/auth_ldap.py:158 +msgid "LDAP Attribute to map to first name (e.g., givenName)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:161 msgid "First Name Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:159 -msgid "LDAP Attribute to map to last name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:162 +#: rhodecode/authentication/plugins/auth_ldap.py:166 +msgid "LDAP Attribute to map to last name (e.g., sn)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:169 msgid "Last Name Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:167 -msgid "LDAP Attribute to map to email address" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:170 +#: rhodecode/authentication/plugins/auth_ldap.py:174 +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 msgid "Email Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:351 +#: rhodecode/authentication/plugins/auth_ldap.py:360 msgid "LDAP" msgstr "" @@ -515,16 +640,16 @@ msgstr "" msgid "PAM" msgstr "" -#: rhodecode/authentication/plugins/auth_rhodecode.py:68 +#: rhodecode/authentication/plugins/auth_rhodecode.py:67 msgid "Rhodecode" msgstr "" -#: rhodecode/authentication/plugins/auth_token.py:71 +#: rhodecode/authentication/plugins/auth_token.py:70 msgid "Rhodecode Token Auth" msgstr "" #: rhodecode/controllers/changelog.py:91 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:202 +#: rhodecode/controllers/pullrequests.py:204 msgid "There are no commits yet" msgstr "Nessun commit" @@ -558,8 +683,8 @@ msgid "No such commit exists for this re msgstr "" #: rhodecode/controllers/changeset.py:344 -#: rhodecode/controllers/pullrequests.py:948 -#: rhodecode/model/pull_request.py:1009 +#: rhodecode/controllers/pullrequests.py:985 +#: rhodecode/model/pull_request.py:1055 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "Cambiamento stato %(transition_icon)s %(status)s" @@ -599,12 +724,12 @@ msgid "" "%(repo1)s with commit %(commit2)s from repository %(repo2)s." msgstr "" -#: rhodecode/controllers/feed.py:70 +#: rhodecode/controllers/feed.py:69 #, python-format msgid "Changes on %s repository" msgstr "Cambiamenti sul repository %s " -#: rhodecode/controllers/feed.py:71 +#: rhodecode/controllers/feed.py:70 #, python-format msgid "%s %s feed" msgstr "%s %s feed" @@ -618,93 +743,93 @@ msgstr "Clicca qui per aggiungere un fil msgid "There are no files yet. %s" msgstr "Nessun file selezionato. %s" -#: rhodecode/controllers/files.py:394 rhodecode/controllers/files.py:447 -#: rhodecode/controllers/files.py:478 rhodecode/controllers/files.py:553 -#: rhodecode/controllers/files.py:598 rhodecode/controllers/files.py:689 +#: 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 #, 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:402 rhodecode/controllers/files.py:455 +#: rhodecode/controllers/files.py:443 rhodecode/controllers/files.py:496 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:411 rhodecode/controllers/files.py:464 +#: 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:431 +#: rhodecode/controllers/files.py:472 #, python-format msgid "Successfully deleted file %s" msgstr "File eliminato %s" -#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:540 -#: rhodecode/controllers/files.py:677 +#: rhodecode/controllers/files.py:475 rhodecode/controllers/files.py:581 +#: rhodecode/controllers/files.py:718 msgid "Error occurred during commit" msgstr "Un errore e' avvenuto durante l'operazione di commit" -#: rhodecode/controllers/files.py:486 rhodecode/controllers/files.py:561 +#: rhodecode/controllers/files.py:527 rhodecode/controllers/files.py:602 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:498 rhodecode/controllers/files.py:573 +#: 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:515 +#: rhodecode/controllers/files.py:556 msgid "No changes" msgstr "Nessuna modifica" -#: rhodecode/controllers/files.py:537 rhodecode/controllers/files.py:666 +#: 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:611 rhodecode/controllers/files.py:700 +#: rhodecode/controllers/files.py:652 rhodecode/controllers/files.py:741 msgid "Added file via RhodeCode Enterprise" msgstr "File aggiunto via RhodeCode Enterprise" -#: rhodecode/controllers/files.py:636 +#: rhodecode/controllers/files.py:677 msgid "No filename" msgstr "Nome file mancante" -#: rhodecode/controllers/files.py:669 +#: 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:723 +#: rhodecode/controllers/files.py:764 msgid "Downloads disabled" msgstr "Downloads disabilitati" -#: rhodecode/controllers/files.py:729 +#: rhodecode/controllers/files.py:770 #, python-format msgid "Unknown revision %s" msgstr "Revisione %s sconosciuta" -#: rhodecode/controllers/files.py:731 +#: rhodecode/controllers/files.py:772 msgid "Empty repository" msgstr "Repository vuoto" -#: rhodecode/controllers/files.py:733 rhodecode/controllers/files.py:767 +#: rhodecode/controllers/files.py:774 rhodecode/controllers/files.py:808 msgid "Unknown archive type" msgstr "Formato archivio sconosciuto" -#: rhodecode/controllers/files.py:952 +#: rhodecode/controllers/files.py:993 msgid "Changesets" msgstr "Changesets" -#: rhodecode/controllers/files.py:973 rhodecode/controllers/summary.py:269 -#: rhodecode/model/pull_request.py:1234 rhodecode/model/scm.py:782 -#: rhodecode/templates/base/vcs_settings.mako:193 +#: 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:977 rhodecode/model/scm.py:797 -#: rhodecode/templates/base/vcs_settings.mako:218 +#: rhodecode/controllers/files.py:1018 rhodecode/model/scm.py:797 +#: rhodecode/templates/base/vcs_settings.mako:267 msgid "Tags" msgstr "Tags" @@ -713,23 +838,24 @@ msgstr "Tags" msgid "An error occurred during repository forking %s" msgstr "Errore durante il fork del repository %s" -#: rhodecode/controllers/home.py:205 +#: rhodecode/controllers/home.py:207 msgid "Groups" msgstr "Gruppi" -#: rhodecode/controllers/home.py:212 rhodecode/controllers/home.py:247 -#: rhodecode/controllers/pullrequests.py:308 +#: 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:73 -#: rhodecode/templates/base/base.mako:145 -#: rhodecode/templates/base/base.mako:569 +#: 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:225 +#: rhodecode/controllers/home.py:227 #, python-format msgid "Commits in %(repo)s" msgstr "" @@ -742,81 +868,81 @@ msgstr "journal pubblico" msgid "journal" msgstr "journal" -#: rhodecode/controllers/pullrequests.py:216 +#: rhodecode/controllers/pullrequests.py:218 msgid "Commit does not exist" msgstr "" -#: rhodecode/controllers/pullrequests.py:333 -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:335 +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 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/controllers/pullrequests.py:383 +#: rhodecode/controllers/pullrequests.py:385 msgid "Successfully opened new pull request" msgstr "'Pull request' aperta correttamente" -#: rhodecode/controllers/pullrequests.py:386 +#: 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:429 +#: rhodecode/controllers/pullrequests.py:431 msgid "Cannot update closed pull requests." msgstr "Non è possibile aggiornare richieste PULL già chiuse" -#: rhodecode/controllers/pullrequests.py:435 +#: rhodecode/controllers/pullrequests.py:437 msgid "Pull request title & description updated." msgstr "Titolo e Descrizione della richiesta PULL aggiornati." -#: rhodecode/controllers/pullrequests.py:443 +#: rhodecode/controllers/pullrequests.py:455 msgid "" "Pull request updated to \"{source_commit_id}\" with {count_added} added, " -"{count_removed} removed commits." -msgstr "Richiesta PULL aggiornata a \"{source_commit_id}\" con {count_added} commit aggiunti e {count_removed} rimossi." - -#: rhodecode/controllers/pullrequests.py:458 +"{count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:472 msgid "Reload page" msgstr "" -#: rhodecode/controllers/pullrequests.py:532 +#: rhodecode/controllers/pullrequests.py:546 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/controllers/pullrequests.py:569 +#: rhodecode/controllers/pullrequests.py:588 msgid "Successfully deleted pull request" msgstr "'Pull request' eliminata con successo" -#: rhodecode/controllers/pullrequests.py:864 -msgid "Close Pull Request" -msgstr "Chiudi Richiesta PULL" - -#: rhodecode/controllers/pullrequests.py:952 -#: rhodecode/model/pull_request.py:1013 +#: rhodecode/controllers/pullrequests.py:592 +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:1002 +#: 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:243 +#: rhodecode/controllers/summary.py:251 msgid "Branch" msgstr "Branch" -#: rhodecode/controllers/summary.py:244 +#: rhodecode/controllers/summary.py:252 msgid "Tag" msgstr "Tag" -#: rhodecode/controllers/summary.py:245 +#: rhodecode/controllers/summary.py:253 msgid "Bookmark" msgstr "Segnalibro" -#: rhodecode/controllers/summary.py:270 +#: rhodecode/controllers/summary.py:278 msgid "Closed branches" msgstr "Branch chiusi" @@ -828,42 +954,6 @@ msgstr "Impostazioni di default aggiorna msgid "Error occurred during update of default values" msgstr "Errore avvenuto durante l'aggiornamento dei valori di default" -#: rhodecode/controllers/admin/gists.py:62 -#: rhodecode/controllers/admin/my_account.py:384 -#: rhodecode/controllers/admin/users.py:465 -msgid "forever" -msgstr "per sempre" - -#: rhodecode/controllers/admin/gists.py:63 -#: rhodecode/controllers/admin/my_account.py:385 -#: rhodecode/controllers/admin/users.py:466 -msgid "5 minutes" -msgstr "5 minuti" - -#: rhodecode/controllers/admin/gists.py:64 -#: rhodecode/controllers/admin/my_account.py:386 -#: rhodecode/controllers/admin/users.py:467 -msgid "1 hour" -msgstr "1 ora" - -#: rhodecode/controllers/admin/gists.py:65 -#: rhodecode/controllers/admin/my_account.py:387 -#: rhodecode/controllers/admin/users.py:468 -msgid "1 day" -msgstr "1 giorno" - -#: rhodecode/controllers/admin/gists.py:66 -#: rhodecode/controllers/admin/my_account.py:388 -#: rhodecode/controllers/admin/users.py:469 -msgid "1 month" -msgstr "1 mese" - -#: rhodecode/controllers/admin/gists.py:70 -#: rhodecode/controllers/admin/my_account.py:390 -#: rhodecode/controllers/admin/users.py:471 -msgid "Lifetime" -msgstr "a vita" - #: rhodecode/controllers/admin/gists.py:72 msgid "Requires registered account" msgstr "Richiede un account registrato" @@ -900,10 +990,8 @@ msgstr "Errore durante l'aggiornamento #: rhodecode/controllers/admin/gists.py:343 #: rhodecode/templates/admin/gists/show.mako:67 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 #: rhodecode/templates/data_table/_dt_elements.mako:263 msgid "never" msgstr "mai" @@ -913,65 +1001,36 @@ msgstr "mai" msgid "%(expiry)s - current value" msgstr "%(expiry)s - valore corrente" -#: rhodecode/controllers/admin/my_account.py:80 +#: rhodecode/controllers/admin/my_account.py:78 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:140 +#: rhodecode/controllers/admin/my_account.py:138 msgid "Your account was updated successfully" msgstr "Account aggiornato correttamente" -#: rhodecode/controllers/admin/my_account.py:155 -#: rhodecode/controllers/admin/users.py:231 +#: rhodecode/controllers/admin/my_account.py:153 +#: rhodecode/controllers/admin/users.py:184 #, python-format msgid "Error occurred during update of user %s" msgstr "Errore durante l'aggiornamento dell'utente %s" -#: rhodecode/controllers/admin/my_account.py:221 -#: rhodecode/controllers/admin/my_account.py:227 -msgid "Error occurred during update of user password" -msgstr "Errore durante l'aggiornamento della password" - -#: rhodecode/controllers/admin/my_account.py:234 -msgid "Successfully updated password" -msgstr "Password aggiornata correttamente" - -#: rhodecode/controllers/admin/my_account.py:278 -#: rhodecode/controllers/admin/users.py:645 +#: 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:285 -#: rhodecode/controllers/admin/users.py:652 +#: 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:295 -#: rhodecode/controllers/admin/users.py:667 +#: rhodecode/controllers/admin/my_account.py:239 +#: rhodecode/controllers/admin/users.py:549 msgid "Removed email address from user account" msgstr "" -#: rhodecode/controllers/admin/my_account.py:393 -#: rhodecode/controllers/admin/users.py:474 -msgid "Role" -msgstr "Ruolo" - -#: rhodecode/controllers/admin/my_account.py:406 -#: rhodecode/controllers/admin/users.py:498 -msgid "Auth token successfully created" -msgstr "Token Autorizzativo creato" - -#: rhodecode/controllers/admin/my_account.py:419 -#: rhodecode/controllers/admin/users.py:517 -msgid "Auth token successfully reset" -msgstr "Token autorizzativo resettato" - -#: rhodecode/controllers/admin/my_account.py:423 -#: rhodecode/controllers/admin/users.py:521 -msgid "Auth token successfully deleted" -msgstr "Token autorizzativo cancellato" - #: rhodecode/controllers/admin/permissions.py:112 msgid "Application permissions updated successfully" msgstr "Permessi applicati con successo." @@ -1035,7 +1094,7 @@ msgid "Error occurred during deletion of msgstr "Errore durante l'eliminazione del gruppo di repository %s" #: rhodecode/controllers/admin/repo_groups.py:388 -#: rhodecode/controllers/admin/user_groups.py:322 +#: rhodecode/controllers/admin/user_groups.py:323 msgid "Cannot change permission for yourself as admin" msgstr "Impossibile cambiare i permessi per se stessi come admin" @@ -1187,18 +1246,18 @@ msgid "Error occurred during deleting is msgstr "Errore durante la rimozione dell'entry dall'issue tracker" #: rhodecode/controllers/admin/repos.py:728 -#: rhodecode/controllers/admin/settings.py:380 +#: rhodecode/controllers/admin/settings.py:381 msgid "Removed issue tracker entry" msgstr "Entry dell'issue tracker rimossa" #: rhodecode/controllers/admin/repos.py:758 -#: rhodecode/controllers/admin/settings.py:427 +#: rhodecode/controllers/admin/settings.py:428 msgid "Updated issue tracker entries" msgstr "Dati dell'Issue Tracker aggiornati" #: rhodecode/controllers/admin/repos.py:819 #: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:618 +#: rhodecode/controllers/admin/settings.py:619 msgid "Some form inputs contain invalid data." msgstr "Ci son dati non validi tra i dati immessi" @@ -1207,281 +1266,277 @@ msgid "Error occurred during updating re msgstr "Errore durante l'aggiornamento delle impostazioni del repository VCS" #: rhodecode/controllers/admin/repos.py:841 -#: rhodecode/controllers/admin/settings.py:175 +#: rhodecode/controllers/admin/settings.py:176 msgid "Updated VCS settings" msgstr "Impostazioni VCS aggiornate" -#: rhodecode/controllers/admin/settings.py:171 -#: rhodecode/controllers/admin/settings.py:282 +#: rhodecode/controllers/admin/settings.py:172 +#: rhodecode/controllers/admin/settings.py:283 msgid "Error occurred during updating application settings" msgstr "Errore durante l'aggiornamento delle impostazioni" -#: rhodecode/controllers/admin/settings.py:222 +#: rhodecode/controllers/admin/settings.py:223 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "Scansione dei repository completata. Aggiunti: %s ; rimossi: %s" -#: rhodecode/controllers/admin/settings.py:278 +#: rhodecode/controllers/admin/settings.py:279 msgid "Updated application settings" msgstr "Impostazioni applicazione aggiornate" -#: rhodecode/controllers/admin/settings.py:344 +#: rhodecode/controllers/admin/settings.py:345 msgid "Updated visualisation settings" msgstr "Impostazioni di visualizzazione aggiornate" -#: rhodecode/controllers/admin/settings.py:347 +#: rhodecode/controllers/admin/settings.py:348 msgid "Error occurred during updating visualisation settings" msgstr "Errore durante l'aggiornamento delle impostazioni di visualizzazione" -#: rhodecode/controllers/admin/settings.py:440 +#: rhodecode/controllers/admin/settings.py:441 msgid "Please enter email address" msgstr "Prego fornire un indirizzo email" -#: rhodecode/controllers/admin/settings.py:458 +#: rhodecode/controllers/admin/settings.py:459 msgid "Send email task created" msgstr "Task 'invio posta' creato" -#: rhodecode/controllers/admin/settings.py:491 +#: rhodecode/controllers/admin/settings.py:492 msgid "Added new hook" msgstr "Aggiunto nuovo 'hook'" -#: rhodecode/controllers/admin/settings.py:506 +#: rhodecode/controllers/admin/settings.py:507 msgid "Updated hooks" msgstr "'Hook' aggiornato" -#: rhodecode/controllers/admin/settings.py:510 +#: rhodecode/controllers/admin/settings.py:511 msgid "Error occurred during hook creation" msgstr "Errore durante creazione hook'" -#: rhodecode/controllers/admin/settings.py:639 +#: rhodecode/controllers/admin/settings.py:640 msgid "Error occurred during updating labs settings" msgstr "Errore durante l'aggiornamento delle impostazioni sui lab" -#: rhodecode/controllers/admin/settings.py:644 +#: rhodecode/controllers/admin/settings.py:645 msgid "Updated Labs settings" msgstr "Impostazioni sui Lab aggiornate" -#: rhodecode/controllers/admin/user_groups.py:164 +#: rhodecode/controllers/admin/user_groups.py:165 #, 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:178 +#: rhodecode/controllers/admin/user_groups.py:179 #, 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:219 +#: rhodecode/controllers/admin/user_groups.py:220 #, python-format msgid "Updated user group %s" msgstr "Gruppo utenti %s aggiornato" -#: rhodecode/controllers/admin/user_groups.py:235 +#: rhodecode/controllers/admin/user_groups.py:236 #, 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:257 +#: rhodecode/controllers/admin/user_groups.py:258 msgid "Successfully deleted user group" msgstr "Gruppo utenti eliminato" -#: rhodecode/controllers/admin/user_groups.py:262 +#: rhodecode/controllers/admin/user_groups.py:263 msgid "An error occurred during deletion of user group" msgstr "Errore avvenuto durante l'eliminazione del gruppo utenti" -#: rhodecode/controllers/admin/user_groups.py:330 +#: rhodecode/controllers/admin/user_groups.py:331 msgid "Target group cannot be the same" msgstr "Il gruppo di destinazione non può coincidere con l'origine" -#: rhodecode/controllers/admin/user_groups.py:336 +#: rhodecode/controllers/admin/user_groups.py:337 msgid "User Group permissions updated" msgstr "Permessi del gruppo utenti aggiornati" -#: rhodecode/controllers/admin/user_groups.py:421 +#: rhodecode/controllers/admin/user_groups.py:422 msgid "User Group global permissions updated successfully" msgstr "Permessi globali dei Gruppi Utenti aggiornati." #: rhodecode/controllers/admin/user_groups.py:437 -#: rhodecode/controllers/admin/users.py:595 +#: rhodecode/controllers/admin/users.py:477 msgid "An error occurred during permissions saving" msgstr "Errore avvenuto durante il salvataggio dei permessi" -#: rhodecode/controllers/admin/users.py:153 +#: rhodecode/controllers/admin/user_groups.py:481 +msgid "User Group synchronization updated successfully" +msgstr "" + +#: rhodecode/controllers/admin/user_groups.py:485 +msgid "An error occurred during synchronization update" +msgstr "" + +#: rhodecode/controllers/admin/users.py:106 #, python-format msgid "Created user %(user_link)s" msgstr "Creato l'utente %(user_link)s" -#: rhodecode/controllers/admin/users.py:169 +#: rhodecode/controllers/admin/users.py:122 #, python-format msgid "Error occurred during creation of user %s" msgstr "Errore durante la creazione dell'utente %s" -#: rhodecode/controllers/admin/users.py:214 +#: rhodecode/controllers/admin/users.py:167 msgid "User updated successfully" msgstr "Utente aggiornato correttamente" -#: rhodecode/controllers/admin/users.py:265 +#: rhodecode/controllers/admin/users.py:218 #, python-format msgid "Detached %s repositories" msgstr "Distaccati %s repository" -#: rhodecode/controllers/admin/users.py:270 +#: rhodecode/controllers/admin/users.py:223 #, python-format msgid "Deleted %s repositories" msgstr "%s repository cancellati" -#: rhodecode/controllers/admin/users.py:278 +#: rhodecode/controllers/admin/users.py:231 #, python-format msgid "Detached %s repository groups" msgstr "Distaccati %s gruppi di repository" -#: rhodecode/controllers/admin/users.py:283 +#: rhodecode/controllers/admin/users.py:236 #, python-format msgid "Deleted %s repository groups" msgstr "%s gruppo di repository cancellati" -#: rhodecode/controllers/admin/users.py:291 +#: rhodecode/controllers/admin/users.py:244 #, python-format msgid "Detached %s user groups" msgstr "Distaccati %s gruppi utente" -#: rhodecode/controllers/admin/users.py:296 +#: rhodecode/controllers/admin/users.py:249 #, python-format msgid "Deleted %s user groups" msgstr "%s gruppi utente cancellati" -#: rhodecode/controllers/admin/users.py:307 +#: rhodecode/controllers/admin/users.py:260 msgid "Successfully deleted user" msgstr "Utente eliminato" -#: rhodecode/controllers/admin/users.py:313 +#: rhodecode/controllers/admin/users.py:266 msgid "An error occurred during deletion of user" msgstr "Errore durante la cancellazione dell'utente" -#: rhodecode/controllers/admin/users.py:332 +#: rhodecode/controllers/admin/users.py:285 msgid "Force password change disabled for user" msgstr "Obbligo del cambiamento password disabilitato per l'utente" -#: rhodecode/controllers/admin/users.py:334 +#: rhodecode/controllers/admin/users.py:287 msgid "Force password change enabled for user" msgstr "Obbligo del cambio password abilitato per l'utente" -#: rhodecode/controllers/admin/users.py:338 +#: rhodecode/controllers/admin/users.py:291 msgid "An error occurred during password reset for user" msgstr "Errore durante il ripristino della password dell'utente" -#: rhodecode/controllers/admin/users.py:371 +#: rhodecode/controllers/admin/users.py:324 #, python-format msgid "Linked repository group `%s` as personal" msgstr "" -#: rhodecode/controllers/admin/users.py:377 +#: rhodecode/controllers/admin/users.py:330 #, python-format msgid "Created repository group `%s`" msgstr "Creato il gruppo di repository `%s`" -#: rhodecode/controllers/admin/users.py:381 +#: rhodecode/controllers/admin/users.py:334 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/controllers/admin/users.py:386 +#: rhodecode/controllers/admin/users.py:339 msgid "An error occurred during repository group creation for user" msgstr "Errore durante la creazione del gruppo di repository per l'utente" -#: rhodecode/controllers/admin/users.py:406 -#: rhodecode/controllers/admin/users.py:427 -#: rhodecode/controllers/admin/users.py:459 -#: rhodecode/controllers/admin/users.py:490 -#: rhodecode/controllers/admin/users.py:507 -#: rhodecode/controllers/admin/users.py:530 -#: rhodecode/controllers/admin/users.py:604 -#: rhodecode/controllers/admin/users.py:617 -#: rhodecode/controllers/admin/users.py:675 -msgid "You can't edit this user" -msgstr "Non si hanno i permessi per editare l'utente" - -#: rhodecode/controllers/admin/users.py:443 +#: rhodecode/controllers/admin/users.py:396 msgid "" "The user participates as reviewer in pull requests and cannot be deleted. " "You can set the user to \"inactive\" instead of deleting it." msgstr "" -#: rhodecode/controllers/admin/users.py:579 +#: rhodecode/controllers/admin/users.py:461 msgid "User global permissions updated successfully" msgstr "Permessi globali Utente aggiornati" -#: rhodecode/controllers/admin/users.py:707 +#: 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:722 +#: 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:726 +#: 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:744 +#: 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:65 +#: rhodecode/events/pullrequest.py:68 msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:74 +#: rhodecode/events/pullrequest.py:77 msgid "pullrequest closed" msgstr "" -#: rhodecode/events/pullrequest.py:83 +#: rhodecode/events/pullrequest.py:86 msgid "pullrequest commits updated" msgstr "" -#: rhodecode/events/pullrequest.py:92 +#: rhodecode/events/pullrequest.py:95 msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:101 +#: rhodecode/events/pullrequest.py:104 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:110 +#: rhodecode/events/pullrequest.py:113 msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:136 +#: rhodecode/events/repo.py:138 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:145 +#: rhodecode/events/repo.py:147 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:154 +#: rhodecode/events/repo.py:156 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:163 +#: rhodecode/events/repo.py:165 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:199 +#: rhodecode/events/repo.py:201 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:208 +#: rhodecode/events/repo.py:210 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:217 +#: rhodecode/events/repo.py:219 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:228 +#: rhodecode/events/repo.py:230 msgid "repository push" msgstr "" @@ -1497,25 +1552,24 @@ msgstr "" msgid "repository group update" msgstr "" -#: rhodecode/events/user.py:34 +#: rhodecode/events/user.py:37 msgid "user registered" msgstr "" -#: rhodecode/events/user.py:48 +#: rhodecode/events/user.py:52 msgid "user pre create" msgstr "" -#: rhodecode/events/user.py:61 +#: rhodecode/events/user.py:66 msgid "user post create" msgstr "" -#: rhodecode/events/user.py:74 +#: rhodecode/events/user.py:80 msgid "user pre update" msgstr "" #: rhodecode/forms/__init__.py:32 rhodecode/templates/admin/gists/new.mako:62 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:31 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:88 +#: 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 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 @@ -1527,15 +1581,14 @@ msgstr "" #: 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_vcs.mako:46 +#: 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 #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 #: rhodecode/templates/admin/settings/settings_visual.mako:222 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:27 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:85 +#: 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_profile.mako:135 @@ -1545,17 +1598,17 @@ msgstr "Ripristina" #: rhodecode/forms/__init__.py:33 rhodecode/templates/admin/gists/show.mako:49 #: rhodecode/templates/admin/integrations/list.mako:211 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:60 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 #: rhodecode/templates/admin/permissions/permissions_ips.mako:26 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:56 +#: 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/base/issue_tracker_settings.mako:70 -#: rhodecode/templates/base/vcs_settings.mako:202 -#: rhodecode/templates/base/vcs_settings.mako:227 +#: 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/changeset/changeset_file_comment.mako:142 @@ -1564,9 +1617,9 @@ msgstr "Ripristina" #: rhodecode/templates/data_table/_dt_elements.mako:198 #: rhodecode/templates/data_table/_dt_elements.mako:210 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:35 -#: rhodecode/templates/files/files_source.mako:39 -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_source.mako:45 +#: rhodecode/templates/files/files_source.mako:49 +#: rhodecode/templates/files/files_source.mako:52 #: rhodecode/templates/pullrequests/pullrequest_show.mako:56 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" @@ -1605,28 +1658,28 @@ msgstr "" msgid "Root repositories only" msgstr "" -#: rhodecode/integrations/views.py:161 +#: rhodecode/integrations/views.py:160 msgid "{repo_name} repository" msgstr "" -#: rhodecode/integrations/views.py:164 +#: rhodecode/integrations/views.py:163 msgid "{repo_group_name} repo group" msgstr "" -#: rhodecode/integrations/views.py:171 +#: rhodecode/integrations/views.py:170 msgid "{name} integration" msgstr "" -#: rhodecode/integrations/views.py:185 +#: rhodecode/integrations/views.py:184 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:265 +#: rhodecode/integrations/views.py:264 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:290 +#: rhodecode/integrations/views.py:289 msgid "Integration {integration_name} updated successfully." msgstr "" @@ -1700,58 +1753,59 @@ msgid "" "Send events such as repo pushes and pull requests to your hipchat channel." msgstr "" -#: rhodecode/integrations/types/slack.py:44 +#: rhodecode/integrations/types/slack.py:46 msgid "Slack service URL" msgstr "" -#: rhodecode/integrations/types/slack.py:45 +#: rhodecode/integrations/types/slack.py:47 msgid "" "This can be setup at the slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:58 rhodecode/templates/login.mako:42 -#: rhodecode/templates/register.mako:40 +#: 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/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:90 -#: rhodecode/templates/base/base.mako:301 +#: rhodecode/templates/admin/users/users.mako:62 +#: rhodecode/templates/base/base.mako:304 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 msgid "Username" msgstr "Nome utente" -#: rhodecode/integrations/types/slack.py:59 +#: rhodecode/integrations/types/slack.py:61 msgid "Username to show notifications coming from." msgstr "" -#: rhodecode/integrations/types/slack.py:68 +#: rhodecode/integrations/types/slack.py:70 msgid "Channel" msgstr "" -#: rhodecode/integrations/types/slack.py:69 +#: rhodecode/integrations/types/slack.py:71 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:78 +#: rhodecode/integrations/types/slack.py:80 msgid "Emoji" msgstr "" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:81 msgid "Emoji to use eg. :studio_microphone:" msgstr "" -#: rhodecode/integrations/types/slack.py:101 +#: rhodecode/integrations/types/slack.py:92 msgid "Slack" msgstr "" -#: rhodecode/integrations/types/slack.py:102 +#: rhodecode/integrations/types/slack.py:93 msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" @@ -1915,25 +1969,25 @@ msgstr "Creato il tag: %s" msgid "Commit not found" msgstr "Commit non trovata" -#: rhodecode/lib/auth.py:1189 +#: rhodecode/lib/auth.py:1197 #, python-format msgid "IP %s not allowed" msgstr "IP %s non consentito" -#: rhodecode/lib/auth.py:1263 +#: rhodecode/lib/auth.py:1281 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:1311 +#: rhodecode/lib/auth.py:1329 #, python-format msgid "Action not supported for %s." msgstr "Azione non supportata per %s." -#: rhodecode/lib/auth.py:1348 +#: rhodecode/lib/auth.py:1379 msgid "You need to be signed in to view this page" msgstr "Bisogna autenticarsi per vedere questa pagina" -#: rhodecode/lib/base.py:557 +#: rhodecode/lib/base.py:549 #, python-format msgid "The repository at %(repo_name)s cannot be located." msgstr "Il repository in %(repo_name)s non può essere localizzato." @@ -1959,36 +2013,16 @@ msgstr "Nessun cambiamento rilevato" msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1515 +#: rhodecode/lib/helpers.py:1517 #, python-format msgid " and %s more" msgstr "e %s ulteriore/i" -#: rhodecode/lib/helpers.py:1519 +#: rhodecode/lib/helpers.py:1521 msgid "No Files" msgstr "Nessun file" -#: rhodecode/lib/helpers.py:1592 -msgid "new file" -msgstr "nuovo file" - -#: rhodecode/lib/helpers.py:1595 -msgid "mod" -msgstr "mod" - -#: rhodecode/lib/helpers.py:1598 -msgid "del" -msgstr "del" - -#: rhodecode/lib/helpers.py:1601 -msgid "rename" -msgstr "rinomina" - -#: rhodecode/lib/helpers.py:1606 -msgid "chmod" -msgstr "chmod" - -#: rhodecode/lib/helpers.py:1853 +#: rhodecode/lib/helpers.py:1800 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2007,7 +2041,7 @@ msgid "" " \"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:1873 +#: rhodecode/lib/helpers.py:1820 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the" @@ -2047,9 +2081,9 @@ msgid "in ${val} and ${detail}" msgstr "" #: rhodecode/lib/utils2.py:515 -#: rhodecode/public/js/rhodecode-components.js:33194 -#: rhodecode/public/js/scripts.js:25042 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: 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/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "proprio ora" @@ -2082,7 +2116,9 @@ msgstr "proprio ora" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/model/db.py:2298 +#: 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 msgid "Repository no access" msgstr "Repository nessun accesso" @@ -2114,7 +2150,9 @@ msgstr "Repository nessun accesso" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/model/db.py:2299 +#: 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 msgid "Repository read access" msgstr "Repository accesso in lettura" @@ -2146,7 +2184,9 @@ msgstr "Repository accesso in lettura" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/model/db.py:2300 +#: 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 msgid "Repository write access" msgstr "Repository accesso in scrittura" @@ -2178,7 +2218,9 @@ msgstr "Repository accesso in scrittura" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 -#: rhodecode/model/db.py:2301 +#: 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 msgid "Repository admin access" msgstr "Repository accesso admin" @@ -2250,7 +2292,9 @@ msgstr "RhodeCode Administrator" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/model/db.py:2319 +#: 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 msgid "Repository creation disabled" msgstr "Creazione di Repository disabilitata" @@ -2282,7 +2326,9 @@ msgstr "Creazione di Repository disabili #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 -#: rhodecode/model/db.py:2320 +#: 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 msgid "Repository creation enabled" msgstr "Creazione di Repository abilitata" @@ -2314,7 +2360,9 @@ msgstr "Creazione di Repository abilitat #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 -#: rhodecode/model/db.py:2324 +#: 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 msgid "Repository forking disabled" msgstr "Forking Repository disabilitato" @@ -2346,7 +2394,9 @@ msgstr "Forking Repository disabilitato" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/model/db.py:2325 +#: 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 msgid "Repository forking enabled" msgstr "Forking Repository abilitato" @@ -2399,7 +2449,9 @@ msgstr "Registrazione nuovo utente attra #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 -#: rhodecode/model/db.py:3009 +#: 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 msgid "Not Reviewed" msgstr "Non Revisionato" @@ -2431,7 +2483,9 @@ msgstr "Non Revisionato" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 -#: rhodecode/model/db.py:3010 +#: 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 msgid "Approved" msgstr "Approvato" @@ -2463,7 +2517,9 @@ msgstr "Approvato" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 -#: rhodecode/model/db.py:3011 +#: 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 msgid "Rejected" msgstr "Rifiutato" @@ -2495,7 +2551,9 @@ msgstr "Rifiutato" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 -#: rhodecode/model/db.py:3012 +#: 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 msgid "Under Review" msgstr "in Revisione" @@ -2524,7 +2582,9 @@ msgstr "in Revisione" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/model/db.py:2303 +#: 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 msgid "Repository group no access" msgstr "Gruppo di repository: nessun accesso" @@ -2553,7 +2613,9 @@ msgstr "Gruppo di repository: nessun acc #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/model/db.py:2304 +#: 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 msgid "Repository group read access" msgstr "Gruppo di repository: accesso in lettura" @@ -2582,7 +2644,9 @@ msgstr "Gruppo di repository: accesso in #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/model/db.py:2305 +#: 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 msgid "Repository group write access" msgstr "Gruppo di repository: accesso in scrittura" @@ -2611,7 +2675,9 @@ msgstr "Gruppo di repository: accesso in #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 -#: rhodecode/model/db.py:2306 +#: 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 msgid "Repository group admin access" msgstr "Gruppo di repository: accesso admin" @@ -2639,7 +2705,9 @@ msgstr "Gruppo di repository: accesso ad #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/model/db.py:2308 +#: 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 msgid "User group no access" msgstr "Gruppo utenti: nessun accesso" @@ -2667,7 +2735,9 @@ msgstr "Gruppo utenti: nessun accesso" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 -#: rhodecode/model/db.py:2309 +#: 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 msgid "User group read access" msgstr "Gruppo utenti: accesso in lettura" @@ -2695,7 +2765,9 @@ msgstr "Gruppo utenti: accesso in lettur #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/model/db.py:2310 +#: 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 msgid "User group write access" msgstr "Gruppo utenti: accesso in scrittura" @@ -2723,7 +2795,9 @@ msgstr "Gruppo utenti: accesso in scritt #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/model/db.py:2311 +#: 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 msgid "User group admin access" msgstr "Gruppo utenti: accesso admin" @@ -2751,7 +2825,9 @@ msgstr "Gruppo utenti: accesso admin" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/model/db.py:2313 +#: 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 msgid "Repository Group creation disabled" msgstr "Creazione gruppo di repository disabiltiata" @@ -2779,7 +2855,9 @@ msgstr "Creazione gruppo di repository d #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/model/db.py:2314 +#: 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 msgid "Repository Group creation enabled" msgstr "Creazione gruppo di repository abilitata" @@ -2807,7 +2885,9 @@ msgstr "Creazione gruppo di repository a #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/model/db.py:2316 +#: 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 msgid "User Group creation disabled" msgstr "Creazione gruppo utenti disabilitata" @@ -2835,7 +2915,9 @@ msgstr "Creazione gruppo utenti disabili #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/model/db.py:2317 +#: 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 msgid "User Group creation enabled" msgstr "Creazione gruppo utenti abilitata" @@ -2863,7 +2945,9 @@ msgstr "Creazione gruppo utenti abilitat #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 -#: rhodecode/model/db.py:2327 +#: 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 msgid "Registration disabled" msgstr "Registrazione disabilitata" @@ -2891,7 +2975,9 @@ msgstr "Registrazione disabilitata" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/model/db.py:2328 +#: 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 msgid "User Registration with manual account activation" msgstr "Registrazione utente con attivazione manuale dell'account" @@ -2919,7 +3005,9 @@ msgstr "Registrazione utente con attivaz #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/model/db.py:2329 +#: 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 msgid "User Registration with automatic account activation" msgstr "Registrazione utente con attivazione automatica dell'account" @@ -2947,7 +3035,9 @@ msgstr "Registrazione utente con attivaz #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 -#: rhodecode/model/db.py:2335 rhodecode/model/permission.py:95 +#: 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 msgid "Manual activation of external account" msgstr "Attivazione manuale di account esterni" @@ -2975,7 +3065,9 @@ msgstr "Attivazione manuale di account e #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 -#: rhodecode/model/db.py:2336 rhodecode/model/permission.py:96 +#: 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 msgid "Automatic activation of external account" msgstr "Attivazione automatrica di account esterni" @@ -2997,7 +3089,9 @@ msgstr "Attivazione automatrica di accou #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/model/db.py:2321 +#: 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 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "Creazione di repository abilitata con permessi di scrittura al gruppo di repository" @@ -3020,7 +3114,9 @@ msgstr "Creazione di repository abilitat #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/model/db.py:2322 +#: 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 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" @@ -3040,7 +3136,9 @@ msgstr "Creazione di repository disabili #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/model/db.py:2296 +#: 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 msgid "RhodeCode Super Administrator" msgstr "RhodeCode Super Administrator" @@ -3057,7 +3155,9 @@ msgstr "RhodeCode Super Administrator" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 -#: rhodecode/model/db.py:2338 +#: 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 msgid "Inherit object permissions from default user disabled" msgstr "Ereditarietà dei permessi \"user default\" sull'oggetto disabilitata." @@ -3074,7 +3174,9 @@ msgstr "Ereditarietà dei permessi \"user default\" sull'oggetto disabilitata." #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 -#: rhodecode/model/db.py:2339 +#: 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 msgid "Inherit object permissions from default user enabled" msgstr "Ereditarietà dei permessi \"user default\" sull'oggetto abilitata" @@ -3082,7 +3184,9 @@ msgstr "Ereditarietà dei permessi \"user default\" sull'oggetto abilitata" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 rhodecode/model/db.py:913 +#: 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 msgid "all" msgstr "tutti" @@ -3090,7 +3194,9 @@ msgstr "tutti" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 rhodecode/model/db.py:914 +#: 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 msgid "http/web interface" msgstr "interfaccia http/web" @@ -3098,7 +3204,9 @@ msgstr "interfaccia http/web" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 rhodecode/model/db.py:915 +#: 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 msgid "vcs (git/hg/svn protocol)" msgstr "" @@ -3106,7 +3214,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 rhodecode/model/db.py:916 +#: 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 msgid "api calls" msgstr "chiamate API" @@ -3114,7 +3224,9 @@ msgstr "chiamate API" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 rhodecode/model/db.py:917 +#: 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 msgid "feed access" msgstr "accesso al feed" @@ -3123,84 +3235,70 @@ msgstr "accesso al feed" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 -#: rhodecode/model/db.py:2067 +#: 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 msgid "No parent" msgstr "" -#: rhodecode/lib/index/whoosh.py:148 +#: 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 +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 +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 +msgid "Password reset disabled" +msgstr "" + +#: rhodecode/lib/index/whoosh.py:149 msgid "Invalid search query. Try quoting it." msgstr "Stringa di ricerca invalida. Provare a quotarla" -#: rhodecode/lib/index/whoosh.py:150 +#: rhodecode/lib/index/whoosh.py:151 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:155 +#: rhodecode/lib/index/whoosh.py:156 msgid "An error occurred during this search operation" msgstr "Errore durante la ricerca" -#: rhodecode/lib/index/whoosh.py:163 +#: rhodecode/lib/index/whoosh.py:164 msgid "Index Type" msgstr "" -#: rhodecode/lib/index/whoosh.py:164 +#: rhodecode/lib/index/whoosh.py:165 msgid "File Index" msgstr "Indice del File" -#: rhodecode/lib/index/whoosh.py:165 rhodecode/lib/index/whoosh.py:170 +#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171 msgid "Indexed documents" msgstr "Documenti indicizzati" -#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172 +#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173 msgid "Last update" msgstr "Ultimo aggiornamento" -#: rhodecode/lib/index/whoosh.py:169 +#: rhodecode/lib/index/whoosh.py:170 msgid "Commit index" msgstr "" -#: rhodecode/login/views.py:249 rhodecode/login/views.py:311 -msgid "Bad captcha" -msgstr "" - -#: rhodecode/login/views.py:258 -msgid "You have successfully registered with RhodeCode" -msgstr "La registrazione con RhodeCode ha avuto successo" - -#: rhodecode/login/views.py:300 -msgid "Password reset has been disabled." -msgstr "" - -#: rhodecode/login/views.py:327 -msgid "Your password reset link was sent" -msgstr "Il link di reset delle credenziali e' stato inviato" - -#: rhodecode/login/views.py:351 -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/model/comment.py:367 -msgid "made a comment" -msgstr "" - #: rhodecode/model/comment.py:368 +msgid "made a comment" +msgstr "" + +#: rhodecode/model/comment.py:369 msgid "Show it now" msgstr "" -#: rhodecode/model/db.py:2331 -msgid "Password reset enabled" -msgstr "" - -#: rhodecode/model/db.py:2332 -msgid "Password reset hidden" -msgstr "" - -#: rhodecode/model/db.py:2333 -msgid "Password reset disabled" -msgstr "" - #: rhodecode/model/forms.py:85 msgid "Please enter a login" msgstr "Prego specificare una login" @@ -3335,9 +3433,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:103 -#: rhodecode/templates/base/base.mako:406 -#: rhodecode/templates/base/base.mako:413 +#: rhodecode/templates/admin/users/users.mako:75 +#: rhodecode/templates/base/base.mako:409 +#: rhodecode/templates/base/base.mako:416 msgid "Admin" msgstr "Admin" @@ -3368,74 +3466,74 @@ msgstr "" msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:77 +#: rhodecode/model/pull_request.py:78 msgid "This pull request can be automatically merged." msgstr "Questa richiesta PULL può essere incorporata automaticamente." -#: rhodecode/model/pull_request.py:79 +#: rhodecode/model/pull_request.py:80 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:82 +#: rhodecode/model/pull_request.py:83 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:84 +#: rhodecode/model/pull_request.py:85 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:87 +#: rhodecode/model/pull_request.py:88 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:90 +#: rhodecode/model/pull_request.py:91 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:93 +#: rhodecode/model/pull_request.py:94 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:96 +#: rhodecode/model/pull_request.py:97 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:99 +#: rhodecode/model/pull_request.py:100 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:102 +#: rhodecode/model/pull_request.py:103 msgid "" "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:105 +#: rhodecode/model/pull_request.py:106 msgid "" "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:108 +#: rhodecode/model/pull_request.py:109 msgid "" "This pull request cannot be merged because of conflicts related to sub " "repositories." msgstr "" -#: rhodecode/model/pull_request.py:114 +#: rhodecode/model/pull_request.py:115 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:116 +#: rhodecode/model/pull_request.py:117 msgid "Pull request update failed because of an unknown error." msgstr "" -#: rhodecode/model/pull_request.py:118 -msgid "No update needed because the source reference is already up to date." +#: rhodecode/model/pull_request.py:119 +msgid "No update needed because the source and target have not changed." msgstr "" #: rhodecode/model/pull_request.py:121 @@ -3466,51 +3564,51 @@ msgstr "" msgid "Pull request merged and closed" msgstr "Richiesta PULL chiusa. Merge effettuato." -#: rhodecode/model/pull_request.py:1041 +#: rhodecode/model/pull_request.py:1087 msgid "Server-side pull request merging is disabled." msgstr "L'Incorporamento lato server delle richiesta di PULL è disabilitato" -#: rhodecode/model/pull_request.py:1043 +#: rhodecode/model/pull_request.py:1089 msgid "This pull request is closed." msgstr "Questa richiesta PULL è chiusa." -#: rhodecode/model/pull_request.py:1055 +#: rhodecode/model/pull_request.py:1101 msgid "Pull request merging is not supported." msgstr "L'incorporamento delle richieste PULL non è supportato." -#: rhodecode/model/pull_request.py:1073 +#: rhodecode/model/pull_request.py:1119 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:1076 +#: rhodecode/model/pull_request.py:1122 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:1233 rhodecode/model/scm.py:790 +#: rhodecode/model/pull_request.py:1279 rhodecode/model/scm.py:790 msgid "Bookmarks" msgstr "Segnalibri" -#: rhodecode/model/pull_request.py:1238 +#: rhodecode/model/pull_request.py:1284 msgid "Commit IDs" msgstr "Commit IDs" -#: rhodecode/model/pull_request.py:1241 +#: rhodecode/model/pull_request.py:1287 msgid "Closed Branches" msgstr "Branch chiusi" -#: rhodecode/model/pull_request.py:1364 +#: rhodecode/model/pull_request.py:1411 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1375 +#: rhodecode/model/pull_request.py:1424 msgid "Pull request reviewer approval is pending." msgstr "Approvazione della richiesta PULL in attesa." -#: rhodecode/model/pull_request.py:1390 +#: rhodecode/model/pull_request.py:1439 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1393 +#: rhodecode/model/pull_request.py:1442 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" @@ -3518,36 +3616,36 @@ msgstr "" msgid "latest tip" msgstr "ultimo consiglio" -#: rhodecode/model/user.py:125 +#: rhodecode/model/user.py:126 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:291 +#: rhodecode/model/user.py:292 #, 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:464 +#: rhodecode/model/user.py:462 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:472 +#: rhodecode/model/user.py:470 #, 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:481 +#: rhodecode/model/user.py:479 #, 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:490 +#: rhodecode/model/user.py:488 #, python-format msgid "" "user \"%s\" still owns %s user groups and cannot be removed. Switch owners " @@ -3880,369 +3978,371 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:31198 -#: rhodecode/public/js/scripts.js:23046 +#: 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/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "Nessun risultato" -#: rhodecode/public/js/rhodecode-components.js:33129 -#: rhodecode/public/js/scripts.js:24977 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: 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/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33130 -#: rhodecode/public/js/scripts.js:24978 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: 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/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33131 -#: rhodecode/public/js/scripts.js:24979 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: 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/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33132 -#: rhodecode/public/js/scripts.js:24980 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: 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/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33133 -#: rhodecode/public/js/scripts.js:24981 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: 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/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33134 -#: rhodecode/public/js/scripts.js:24982 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: 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/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33154 -#: rhodecode/public/js/scripts.js:25002 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: 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/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33162 -#: rhodecode/public/js/scripts.js:25010 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: 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/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33174 -#: rhodecode/public/js/scripts.js:25022 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: 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/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33176 -#: rhodecode/public/js/scripts.js:25024 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: 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/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33180 -#: rhodecode/public/js/scripts.js:25028 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: 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/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33182 -#: rhodecode/public/js/scripts.js:25030 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: 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/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33184 -#: rhodecode/public/js/scripts.js:25032 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: 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/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47027 -#: rhodecode/public/js/scripts.js:38875 +#: 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/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47030 -#: rhodecode/public/js/scripts.js:38878 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: 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/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47033 -#: rhodecode/public/js/scripts.js:38881 +#: 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/select2/translations.js:10 msgid "No matches found" msgstr "Nessuna corrispondenza" -#: rhodecode/public/js/rhodecode-components.js:47036 -#: rhodecode/public/js/scripts.js:38884 +#: 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/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47040 -#: rhodecode/public/js/scripts.js:38888 +#: 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/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47042 -#: rhodecode/public/js/scripts.js:38890 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: 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/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47047 -#: rhodecode/public/js/scripts.js:38895 +#: 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/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47049 -#: rhodecode/public/js/scripts.js:38897 +#: 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/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47054 -#: rhodecode/public/js/scripts.js:38902 +#: 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/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47056 -#: rhodecode/public/js/scripts.js:38904 +#: 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/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47060 -#: rhodecode/public/js/scripts.js:38908 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: 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/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47062 -#: rhodecode/public/js/scripts.js:38910 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: 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/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47991 -#: rhodecode/public/js/scripts.js:39839 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: 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/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47993 -#: rhodecode/public/js/scripts.js:39841 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: 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/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48426 -#: rhodecode/public/js/scripts.js:40274 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: 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/src/rhodecode/codemirror.js:296 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48445 -#: rhodecode/public/js/scripts.js:40293 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: 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/src/rhodecode/codemirror.js:315 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48464 -#: rhodecode/public/js/scripts.js:40312 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: 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/src/rhodecode/codemirror.js:334 +#: rhodecode/templates/email_templates/commit_comment.mako:99 +#: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48484 -#: rhodecode/public/js/scripts.js:40332 +#: 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/src/rhodecode/codemirror.js:354 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48848 -#: rhodecode/public/js/scripts.js:40696 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/comments.js:123 +#: 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/src/rhodecode/comments.js:125 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48927 -#: rhodecode/public/js/scripts.js:40775 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 -#: rhodecode/public/js/src/rhodecode/comments.js:202 +#: 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/src/rhodecode/comments.js:209 msgid "Status Review" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48941 -#: rhodecode/public/js/scripts.js:40789 +#: 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/src/rhodecode/comments.js:216 +#: rhodecode/public/js/src/rhodecode/comments.js:224 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49089 -#: rhodecode/public/js/scripts.js:40937 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/comments.js:364 +#: 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/src/rhodecode/comments.js:381 msgid "Submitting..." msgstr "Inoltro..." -#: rhodecode/public/js/rhodecode-components.js:49140 -#: rhodecode/public/js/scripts.js:40988 +#: 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/src/rhodecode/comments.js:415 +#: rhodecode/public/js/src/rhodecode/comments.js:432 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "Caricamento ..." -#: rhodecode/public/js/rhodecode-components.js:49245 -#: rhodecode/public/js/scripts.js:41093 +#: 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/src/rhodecode/comments.js:520 +#: rhodecode/public/js/src/rhodecode/comments.js:537 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49316 -#: rhodecode/public/js/scripts.js:41164 +#: 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/src/rhodecode/comments.js:591 +#: 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:49393 -#: rhodecode/public/js/scripts.js:41241 +#: 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/src/rhodecode/comments.js:668 +#: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49507 -#: rhodecode/public/js/scripts.js:41355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 -#: rhodecode/public/js/src/rhodecode/comments.js:782 +#: 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/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49713 -#: rhodecode/public/js/scripts.js:41561 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: 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/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49715 -#: rhodecode/public/js/scripts.js:41563 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: 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/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49724 -#: rhodecode/public/js/scripts.js:41572 +#: 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/src/rhodecode/files.js:161 msgid "No matching files" msgstr "Nessuna corrispondenza tra i file" -#: rhodecode/public/js/rhodecode-components.js:49859 -#: rhodecode/public/js/scripts.js:41707 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: 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/src/rhodecode/files.js:296 msgid "Selection link" msgstr "Collegamento selezione" -#: rhodecode/public/js/rhodecode-components.js:49899 -#: rhodecode/public/js/scripts.js:41747 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: 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/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "Smetti di seguire il repository" -#: rhodecode/public/js/rhodecode-components.js:49900 -#: rhodecode/public/js/scripts.js:41748 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 +#: 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/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "Smetti di seguire" -#: rhodecode/public/js/rhodecode-components.js:49909 -#: rhodecode/public/js/scripts.js:41757 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: 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/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "Inizia a seguire il repository" -#: rhodecode/public/js/rhodecode-components.js:49910 -#: rhodecode/public/js/scripts.js:41758 +#: 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/src/rhodecode/followers.js:37 msgid "Follow" msgstr "Segui" -#: rhodecode/public/js/rhodecode-components.js:50366 -#: rhodecode/public/js/scripts.js:42214 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:212 +#: 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 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50937 -#: rhodecode/public/js/scripts.js:42785 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: 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/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50957 -#: rhodecode/public/js/scripts.js:42805 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: 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/src/rhodecode.js:162 msgid "Show more" msgstr "Mostra ancora" @@ -4252,14 +4352,14 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:479 -#: rhodecode/templates/codeblocks/diffs.mako:484 +#: rhodecode/templates/codeblocks/diffs.mako:488 +#: rhodecode/templates/codeblocks/diffs.mako:493 msgid "Add another comment" msgstr "Aggiungi un altro commento" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:320 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:325 msgid "Close" msgstr "" @@ -4317,81 +4417,102 @@ msgstr "Apri una richiesta PULL" msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +msgid "Saving..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: 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:40 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 -msgid "Show selected commit __S" -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:48 -#: rhodecode/public/js/src/i18n_messages.js:7 -msgid "Switch to chat" -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 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 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:54 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "disabilitato" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "abilitato" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 msgid "files" msgstr "i file" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/templates/pullrequests/pullrequest.mako:108 +msgid "loading..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -msgid "{0} days" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +msgid "{0} out of {1} users" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 msgid "{0} years" msgstr "" +#: rhodecode/public/js/src/math_jax/extensions/HelpDialog.js:19 +msgid "HelpDialog" +msgstr "" + +#: rhodecode/public/js/src/math_jax/jax/output/HTML-CSS/autoload/mglyph.js:19 +msgid "MathML" +msgstr "" + #: rhodecode/public/js/vendors/webcomponentsjs/webcomponents.min.js:11 msgid "UIEvent" msgstr "" @@ -4408,10 +4529,6 @@ msgstr "" msgid "FocusEvent" msgstr "" -#: rhodecode/svn_support/events.py:30 -msgid "Configuration for Apaache mad_dav_svn changed." -msgstr "" - #: rhodecode/templates/index.mako:5 msgid "Dashboard" msgstr "Dashboard" @@ -4469,6 +4586,7 @@ msgstr "Modifica il Gruppo di Repository #: rhodecode/templates/admin/repos/repo_edit_settings.mako:15 #: 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 #: rhodecode/templates/base/perms_summary.mako:102 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 @@ -4481,22 +4599,25 @@ msgstr "Nome" #: rhodecode/templates/index_base.mako:100 #: rhodecode/templates/index_base.mako:125 #: rhodecode/templates/admin/gists/index.mako:114 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:81 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 -#: rhodecode/templates/admin/repos/repo_add_base.mako:32 +#: 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/repos.mako:57 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 #: rhodecode/templates/admin/user_groups/user_groups.mako:57 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +#: 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/base/issue_tracker_settings.mako:10 #: rhodecode/templates/changeset/changeset.mako:53 #: rhodecode/templates/compare/compare_commits.mako:20 -#: rhodecode/templates/email_templates/commit_comment.mako:82 +#: 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 #: rhodecode/templates/files/file_tree_detail.mako:5 @@ -4504,8 +4625,8 @@ msgstr "Nome" #: rhodecode/templates/forks/fork.mako:48 #: rhodecode/templates/forks/forks_data.mako:9 #: rhodecode/templates/pullrequests/pullrequest.mako:47 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:158 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:163 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:460 #: rhodecode/templates/summary/components.mako:73 msgid "Description" msgstr "Descrizione" @@ -4520,7 +4641,8 @@ msgstr "Descrizione" #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/users/user_edit_groups.mako:65 #: rhodecode/templates/forks/forks_data.mako:7 #: rhodecode/templates/summary/components.mako:195 msgid "Owner" @@ -4541,9 +4663,9 @@ msgstr "Ultimo cambiamento" #: rhodecode/templates/changelog/changelog_summary_data.mako:8 #: rhodecode/templates/changeset/changeset.mako:36 #: rhodecode/templates/compare/compare_commits.mako:18 -#: rhodecode/templates/email_templates/commit_comment.mako:45 -#: rhodecode/templates/email_templates/commit_comment.mako:81 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: 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/search/search_commit.mako:6 #: rhodecode/templates/tags/tags.mako:66 msgid "Commit" @@ -4558,45 +4680,45 @@ msgstr "Bacheca del gruppo di repository msgid "Home" msgstr "Base" -#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:34 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:326 +#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:329 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "Autenticati" -#: rhodecode/templates/login.mako:36 +#: rhodecode/templates/login.mako:37 msgid "Go to the registration page to create a new account." msgstr "" -#: rhodecode/templates/login.mako:57 +#: rhodecode/templates/login.mako:58 msgid "Remember me" msgstr "Ricordami" -#: rhodecode/templates/login.mako:61 +#: rhodecode/templates/login.mako:62 msgid "Forgot your password?" msgstr "Password dimenticata?" -#: rhodecode/templates/login.mako:65 -#: rhodecode/templates/password_reset.mako:34 +#: rhodecode/templates/login.mako:66 +#: rhodecode/templates/password_reset.mako:35 msgid "Password reset is disabled. Please contact " msgstr "" -#: rhodecode/templates/login.mako:67 -#: rhodecode/templates/password_reset.mako:36 -#: rhodecode/templates/base/base.mako:43 +#: rhodecode/templates/login.mako:68 +#: rhodecode/templates/password_reset.mako:37 +#: rhodecode/templates/base/base.mako:46 #: rhodecode/templates/errors/error_document.mako:64 msgid "Support" msgstr "Supporto" -#: rhodecode/templates/login.mako:68 -#: rhodecode/templates/password_reset.mako:37 +#: 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 msgid "or" msgstr "oppure" -#: rhodecode/templates/login.mako:70 -#: rhodecode/templates/password_reset.mako:39 +#: rhodecode/templates/login.mako:71 +#: rhodecode/templates/password_reset.mako:40 msgid "an administrator if you need help." msgstr "" @@ -4604,28 +4726,28 @@ msgstr "" msgid "Reset Password" msgstr "" -#: rhodecode/templates/password_reset.mako:46 +#: rhodecode/templates/password_reset.mako:47 msgid "Reset your Password" msgstr "Ripristina la tua Password" -#: rhodecode/templates/password_reset.mako:47 +#: rhodecode/templates/password_reset.mako:48 msgid "Go to the login page to sign in." msgstr "" -#: rhodecode/templates/password_reset.mako:51 +#: rhodecode/templates/password_reset.mako:52 msgid "Email Address" msgstr "Indirizzo Email" -#: rhodecode/templates/password_reset.mako:60 -#: rhodecode/templates/register.mako:84 +#: rhodecode/templates/password_reset.mako:61 +#: rhodecode/templates/register.mako:85 msgid "Captcha" msgstr "Captcha" -#: rhodecode/templates/password_reset.mako:70 +#: rhodecode/templates/password_reset.mako:71 msgid "Send password reset email" msgstr "Invia mail per il ripristino della password" -#: rhodecode/templates/password_reset.mako:71 +#: rhodecode/templates/password_reset.mako:72 msgid "Password reset link will be sent to matching email address" msgstr "" @@ -4633,49 +4755,49 @@ msgstr "" msgid "Create an Account" msgstr "" -#: rhodecode/templates/register.mako:34 +#: rhodecode/templates/register.mako:35 msgid "Create an account" msgstr "" -#: rhodecode/templates/register.mako:35 +#: rhodecode/templates/register.mako:36 msgid "Go to the login page to sign in with an existing account." msgstr "" -#: rhodecode/templates/register.mako:54 +#: rhodecode/templates/register.mako:55 msgid "Re-enter password" msgstr "Ripetere la password" -#: rhodecode/templates/register.mako:61 +#: rhodecode/templates/register.mako:62 #: rhodecode/templates/admin/my_account/my_account_profile.mako:32 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:33 #: 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:94 +#: rhodecode/templates/admin/users/users.mako:66 msgid "First Name" msgstr "Nome" -#: rhodecode/templates/register.mako:68 +#: rhodecode/templates/register.mako:69 #: rhodecode/templates/admin/my_account/my_account_profile.mako:40 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:42 #: 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:96 +#: rhodecode/templates/admin/users/users.mako:68 msgid "Last Name" msgstr "Cognome" -#: rhodecode/templates/register.mako:96 +#: rhodecode/templates/register.mako:97 msgid "Account activation requires admin approval." msgstr "L'attivazione dell'account richiede l'approvazione di un admin" -#: rhodecode/templates/register.mako:103 +#: rhodecode/templates/register.mako:104 msgid "Create Account" msgstr "" #: rhodecode/templates/admin/admin.mako:5 #: rhodecode/templates/admin/admin.mako:15 -#: rhodecode/templates/base/base.mako:72 +#: rhodecode/templates/base/base.mako:75 msgid "Admin journal" msgstr "admin Journal" @@ -4684,6 +4806,7 @@ msgid "journal filter..." msgstr "Filtra il journal..." #: rhodecode/templates/admin/admin.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "filtro" @@ -4696,31 +4819,38 @@ msgstr[0] "%s elemento" msgstr[1] "%s elementi" #: rhodecode/templates/admin/admin.mako:17 +#: rhodecode/templates/admin/users/user_edit_audit.mako:17 #: rhodecode/templates/journal/journal.mako:17 msgid "Example Queries" msgstr "Query di esempio" #: rhodecode/templates/admin/admin_log.mako:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 #: rhodecode/templates/admin/repos/repos.mako:69 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 -#: rhodecode/templates/admin/user_groups/user_groups.mako:66 -#: rhodecode/templates/admin/users/users.mako:107 -#: rhodecode/templates/files/files_detail.mako:63 +#: 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/files/files_detail.mako:58 msgid "Action" msgstr "Azione" #: rhodecode/templates/admin/admin_log.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/bookmarks/bookmarks.mako:61 #: rhodecode/templates/branches/branches.mako:60 #: rhodecode/templates/tags/tags.mako:61 @@ -4728,10 +4858,12 @@ 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 msgid "No actions yet" msgstr "Nessuna azione" @@ -4772,7 +4904,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:135 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 -#: rhodecode/templates/admin/repos/repo_add_base.mako:90 +#: 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 @@ -4782,6 +4914,7 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:120 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:102 #: rhodecode/templates/admin/users/user_add.mako:128 +#: rhodecode/templates/admin/users/user_edit_groups.mako:27 #: rhodecode/templates/admin/users/user_edit_profile.mako:134 #: rhodecode/templates/base/default_perms_box.mako:88 msgid "Save" @@ -4803,18 +4936,18 @@ msgstr "Impostazioni base per nuovi repo #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/index.mako:110 #: rhodecode/templates/admin/integrations/list.mako:103 -#: rhodecode/templates/admin/repos/repo_add_base.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:75 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "Tipo" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 -#: rhodecode/templates/admin/repos/repo_add_base.mako:82 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 msgid "Private Repository" msgstr "Repository privato" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:86 +#: rhodecode/templates/admin/repos/repo_add_base.mako:97 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:112 #: rhodecode/templates/forks/fork.mako:87 msgid "" @@ -4880,7 +5013,7 @@ msgid "Update Gist" msgstr "Aggiorna il Gist" #: rhodecode/templates/admin/gists/edit.mako:102 -#: rhodecode/templates/base/issue_tracker_settings.mako:74 +#: rhodecode/templates/base/issue_tracker_settings.mako:73 #: rhodecode/templates/changeset/changeset_file_comment.mako:385 #: rhodecode/templates/codeblocks/diffs.mako:76 #: rhodecode/templates/files/files_add.mako:102 @@ -4956,8 +5089,8 @@ msgstr "Mio Pubblico" #: rhodecode/templates/changeset/changeset.mako:180 #: rhodecode/templates/compare/compare_commits.mako:17 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:304 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:457 #: rhodecode/templates/pullrequests/pullrequests.mako:102 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/tags/tags.mako:63 @@ -5014,7 +5147,7 @@ msgstr "Conferma di voler eliminare ques #: rhodecode/templates/admin/gists/show.mako:56 #: rhodecode/templates/admin/integrations/list.mako:204 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 -#: rhodecode/templates/base/issue_tracker_settings.mako:61 +#: rhodecode/templates/base/issue_tracker_settings.mako:60 #: rhodecode/templates/data_table/_dt_elements.mako:118 #: rhodecode/templates/data_table/_dt_elements.mako:180 #: rhodecode/templates/data_table/_dt_elements.mako:193 @@ -5022,10 +5155,10 @@ msgstr "Conferma di voler eliminare ques #: rhodecode/templates/debug_style/buttons.html:128 #: rhodecode/templates/files/files_add.mako:204 #: rhodecode/templates/files/files_edit.mako:165 -#: rhodecode/templates/files/files_source.mako:38 -#: rhodecode/templates/files/files_source.mako:41 +#: 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:319 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:324 #: rhodecode/templates/users/user_profile.mako:7 msgid "Edit" msgstr "Modifica" @@ -5044,7 +5177,7 @@ msgstr "creato" #: rhodecode/templates/admin/gists/show.mako:91 #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:87 msgid "Show as raw" msgstr "Mostra sorgente" @@ -5069,8 +5202,8 @@ msgstr "Gruppi di Repository" #: rhodecode/templates/admin/repos/repo_edit.mako:43 #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 -#: rhodecode/templates/base/base.mako:81 -#: rhodecode/templates/base/base.mako:246 +#: rhodecode/templates/base/base.mako:84 +#: rhodecode/templates/base/base.mako:249 msgid "Settings" msgstr "Impostazioni" @@ -5102,6 +5235,8 @@ msgid "Create new integration" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:104 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14 msgid "Scope" msgstr "" @@ -5171,7 +5306,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:340 +#: rhodecode/templates/base/base.mako:343 msgid "My account" msgstr "il mio Account" @@ -5180,9 +5315,10 @@ msgid "My Account" msgstr "il mio Account" #: rhodecode/templates/admin/my_account/my_account.mako:29 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 -msgid "My Profile" +#: rhodecode/templates/email_templates/user_registration.mako:26 +#: rhodecode/templates/users/user.mako:29 +#: rhodecode/templates/users/user_profile.mako:5 +msgid "Profile" msgstr "Profilo" #: rhodecode/templates/admin/my_account/my_account.mako:31 @@ -5194,12 +5330,9 @@ msgid "OAuth Identities" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:37 -msgid "My Emails" -msgstr "le mie Email" - -#: rhodecode/templates/admin/my_account/my_account.mako:38 -msgid "My Repositories" -msgstr "i miei Repository" +#: rhodecode/templates/admin/users/user_edit.mako:38 +msgid "Emails" +msgstr "le Email" #: rhodecode/templates/admin/my_account/my_account.mako:39 msgid "Watched" @@ -5207,81 +5340,82 @@ msgstr "Osservato" #: rhodecode/templates/admin/my_account/my_account.mako:40 #: rhodecode/templates/admin/notifications/notifications.mako:33 -#: rhodecode/templates/base/base.mako:238 +#: rhodecode/templates/base/base.mako:241 msgid "Pull Requests" msgstr "Richieste 'Pull'" #: rhodecode/templates/admin/my_account/my_account.mako:41 -msgid "My Permissions" +#: 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/user_groups/user_group_edit.mako:34 +#: rhodecode/templates/base/base.mako:80 +msgid "Permissions" msgstr "Permessi" #: rhodecode/templates/admin/my_account/my_account.mako:42 -msgid "My Live Notifications" +msgid "Live Notifications" msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:3 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 msgid "Authentication Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:7 -msgid "Built-in tokens can be used to authenticate with all possible options." -msgstr "I Token integrati possono essere usati per autenticarsi con tutte le possibili opzioni" - #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:8 -msgid "" -"Each token can have a role. VCS tokens can be used together with the " -"authtoken auth plugin for git/hg/svn operations." -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:11 -msgid "Built-in" -msgstr "Integrati" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:51 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:47 -msgid "expires" -msgstr "scade" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:29 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:26 -#, python-format -msgid "Confirm to reset this auth token: %s" -msgstr "Conferma di voler resettare il Token autorizzativo: %s" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 -msgid "expired" -msgstr "scaduto" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:59 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:55 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:8 +msgid "" +"Each token can have a role. Token with a role can be used only in given " +"context, e.g. VCS tokens can be used together with the authtoken auth plugin" +" for git/hg/svn operations only." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:13 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:13 +msgid "Token" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:17 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:17 +msgid "Expiration" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:48 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:44 #, python-format msgid "Confirm to remove this auth token: %s" msgstr "Conferma di voler rimuovere il Token autorizzativo: %s" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:67 -msgid "No additional auth token specified" -msgstr "Token autorizzativo aggiuntivo non specificato" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:78 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:56 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:52 +msgid "No additional auth tokens specified" +msgstr "Nessun auth token aggiuntivo è stato specificato" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:68 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:64 msgid "New authentication token" msgstr "Nuovo token di autenticazione" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:82 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +msgid "Repository scope works only with tokens with VCS type." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86 #: rhodecode/templates/admin/my_account/my_account_emails.mako:64 #: rhodecode/templates/admin/permissions/permissions_ips.mako:60 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:84 +#: 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 msgid "Add" msgstr "Aggiungi" +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:128 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:125 +msgid "repository scope" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_emails.mako:5 msgid "Account Emails" msgstr "" @@ -5335,6 +5469,11 @@ msgstr "" msgid "Source type" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 +msgid "My Profile" +msgstr "Profilo" + #: rhodecode/templates/admin/my_account/my_account_profile.mako:11 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:55 #: rhodecode/templates/admin/users/user_edit_profile.mako:25 @@ -5424,14 +5563,6 @@ msgstr "Notifiche" msgid "Permissions Administration" msgstr "Amministrazione Permessi" -#: 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/user_groups/user_group_edit.mako:34 -#: rhodecode/templates/base/base.mako:77 -msgid "Permissions" -msgstr "Permessi" - #: rhodecode/templates/admin/permissions/permissions.mako:33 msgid "Application" msgstr "Applicazione" @@ -5571,8 +5702,8 @@ msgstr "Aggiungi Gruppo di Repository" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:74 -#: rhodecode/templates/base/base.mako:148 +#: rhodecode/templates/base/base.mako:77 +#: rhodecode/templates/base/base.mako:151 msgid "Repository groups" msgstr "Gruppi di Repository" @@ -5586,7 +5717,7 @@ msgid "Group Parent" msgstr "Gruppo genitore" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 -#: rhodecode/templates/admin/repos/repo_add_base.mako:55 +#: rhodecode/templates/admin/repos/repo_add_base.mako:66 msgid "Copy Parent Group Permissions" msgstr "Copia i permessi del gruppo genitore" @@ -5703,7 +5834,7 @@ 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/user_groups/user_group_edit_perms.mako:117 -#: rhodecode/templates/base/issue_tracker_settings.mako:84 +#: rhodecode/templates/base/issue_tracker_settings.mako:83 msgid "Add new" msgstr "Aggiungi nuovo" @@ -5766,52 +5897,48 @@ msgid "Import Existing Repository ?" msgstr "Importare un repository esistente?" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:193 +#: rhodecode/templates/base/base.mako:196 msgid "Clone from" msgstr "Clona da" -#: rhodecode/templates/admin/repos/repo_add_base.mako:27 -msgid "Optional http[s] URL from which to clone a repository." -msgstr "URL http[s] opzionale da cui clonare un repository." - -#: rhodecode/templates/admin/repos/repo_add_base.mako:36 +#: rhodecode/templates/admin/repos/repo_add_base.mako:47 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:102 #: rhodecode/templates/forks/fork.mako:52 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "Mantenersi concisi e dritti al punto. Usare un file README per descrizioni più verbose" -#: rhodecode/templates/admin/repos/repo_add_base.mako:41 +#: rhodecode/templates/admin/repos/repo_add_base.mako:52 msgid "Repository Group" msgstr "Gruppo di Repository" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 +#: 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)" msgstr "Seleziona il mio gruppo personale (%(repo_group_name)s)" -#: rhodecode/templates/admin/repos/repo_add_base.mako:50 +#: rhodecode/templates/admin/repos/repo_add_base.mako:61 #: rhodecode/templates/forks/fork.mako:67 msgid "Optionally select a group to put this repository into." msgstr "Seleziona, opzionalmente, un gruppo in cui porre questo repository" -#: rhodecode/templates/admin/repos/repo_add_base.mako:59 +#: rhodecode/templates/admin/repos/repo_add_base.mako:70 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:68 +#: rhodecode/templates/admin/repos/repo_add_base.mako:79 msgid "Set the type of repository to create." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:73 +#: rhodecode/templates/admin/repos/repo_add_base.mako:84 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:70 #: rhodecode/templates/forks/fork.mako:73 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:77 +#: rhodecode/templates/admin/repos/repo_add_base.mako:88 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." @@ -5855,7 +5982,16 @@ msgstr "Remoto" msgid "Statistics" msgstr "Statistiche" -#: rhodecode/templates/admin/repos/repo_edit.mako:87 +#: rhodecode/templates/admin/repos/repo_edit.mako:75 +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3 +msgid "Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:78 +msgid "Strip" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:93 msgid "Reviewers" msgstr "" @@ -5882,12 +6018,10 @@ msgid "This repository is a fork of %(re msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 -#: rhodecode/templates/admin/repos/repo_edit_fork.mako:5 msgid "Set" msgstr "Set" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:39 -#: rhodecode/templates/admin/repos/repo_edit_fork.mako:9 msgid "Manually set this repository as a fork of another from the list" msgstr "Imposta manualmente questo repository come fork di un altro della lista" @@ -6024,10 +6158,11 @@ msgstr "Chiave" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:37 #: 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:62 +#: 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:101 +#: rhodecode/templates/admin/users/users.mako:73 msgid "Active" msgstr "Attivo" @@ -6103,6 +6238,23 @@ 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 +msgid "No maintenance tasks for this repo available" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:26 +msgid "Run Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:41 +msgid "Performing Maintenance" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:5 msgid "Repository Permissions" msgstr "" @@ -6123,16 +6275,21 @@ msgstr "URL remoto" msgid "Remote mirror url" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 +#: 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 msgid "Pull changes from remote location" msgstr "PULL - Incorpora i cambiamenti dalla origine remota" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:22 msgid "Confirm to pull changes from remote side" msgstr "Conferma il 'Pull' dalla origine remota" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:19 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:27 msgid "This repository does not have any remote mirror url set." msgstr "" @@ -6256,11 +6413,80 @@ msgstr "Azzeza le statistiche" msgid "Confirm to remove current statistics" msgstr "Conferma di eliminare le statistiche correnti" -#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:3 +msgid "Strip commits from repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:7 +#, python-format +msgid "Please provide up to %d commits commits to strip" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:9 +msgid "" +"In the first step commits will be verified for existance in the repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:10 +msgid "In the second step, correct commits will be available for stripping" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:16 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:52 +msgid "Enter full 40 character commit sha" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:18 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:54 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:95 +msgid "Add another commit" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:27 +msgid "Check commits" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:33 +msgid "Sorry this functionality is not available for SVN repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:46 +msgid "Remove" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:112 +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 +msgid " commit verified positive" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:131 +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" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:13 msgid "Select to inherit global vcs settings." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:45 +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:43 #: rhodecode/templates/admin/settings/settings_global.mako:139 #: rhodecode/templates/admin/settings/settings_labs.mako:48 #: rhodecode/templates/admin/settings/settings_vcs.mako:13 @@ -6797,8 +7023,8 @@ msgstr "Aggiungi gruppo utente" #: rhodecode/templates/admin/user_groups/user_group_add.mako:13 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:76 -#: rhodecode/templates/base/base.mako:151 +#: rhodecode/templates/base/base.mako:79 +#: rhodecode/templates/base/base.mako:154 msgid "User groups" msgstr "Gruppi utente" @@ -6839,30 +7065,72 @@ msgid "Members" msgstr "Membri" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:9 +msgid "Automatic member sync" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:11 msgid "Assigned to repositories" msgstr "Assegnati ai repository" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:10 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:12 msgid "Assigned to repo groups" msgstr "Assegnati ai gruppi di repository" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:17 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:19 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6 #, python-format msgid "User Group: %s" msgstr "Gruppo utente: %s" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:26 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:29 +msgid "Group members sync" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:36 +msgid "This group is set to be automatically synchronised." +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 +msgid "This group is not set to be automatically synchronised" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51 +msgid "Disable synchronization" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53 +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 msgid "Delete User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:32 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:81 #, 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:34 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:83 msgid "Delete This User Group" msgstr "" @@ -6888,6 +7156,7 @@ msgid "No members yet" msgstr "nessun membro" #: rhodecode/templates/admin/user_groups/user_groups.mako:5 +#: rhodecode/templates/admin/users/user_edit_groups.mako:6 msgid "User groups administration" msgstr "Amministrazione gruppi utente" @@ -6895,18 +7164,22 @@ msgstr "Amministrazione gruppi utente" msgid "user groups" msgstr "gruppi utente" +#: rhodecode/templates/admin/user_groups/user_groups.mako:62 +msgid "Sync" +msgstr "" + #: rhodecode/templates/admin/users/user_add.mako:5 msgid "Add user" msgstr "Aggiungi utente" #: rhodecode/templates/admin/users/user_add.mako:13 #: rhodecode/templates/admin/users/user_edit.mako:14 -#: rhodecode/templates/base/base.mako:75 +#: rhodecode/templates/base/base.mako:78 msgid "Users" msgstr "Utenti" #: rhodecode/templates/admin/users/user_add.mako:15 -#: rhodecode/templates/admin/users/users.mako:27 +#: rhodecode/templates/admin/users/users.mako:28 msgid "Add User" msgstr "Aggiungi utente" @@ -6958,14 +7231,18 @@ msgstr "" msgid "Auth tokens" msgstr "Token autorizzativi" -#: rhodecode/templates/admin/users/user_edit.mako:38 -msgid "Emails" -msgstr "le Email" - #: rhodecode/templates/admin/users/user_edit.mako:39 msgid "Ip Whitelist" msgstr "" +#: rhodecode/templates/admin/users/user_edit.mako:40 +msgid "User Groups Management" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.mako:41 +msgid "User audit" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 #: rhodecode/templates/admin/users/user_edit_profile.mako:106 msgid "Source of Record" @@ -6976,7 +7253,7 @@ msgid "Last login" msgstr "Ultimo login" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 -#: rhodecode/templates/admin/users/users.mako:99 +#: rhodecode/templates/admin/users/users.mako:71 msgid "Last activity" msgstr "Ultima attivit" @@ -7085,22 +7362,23 @@ msgid "" "will delete the user's repositories!" msgstr "Quando l'opzione di \"distacco\" viene selezionata, gli oggetti dipendenti dell'utente saranno assegnati al `%s` super admin del sistema. L'opzione \"Ellimina\" cancellerà i repository dell'utente!" -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 -msgid "Authentication Access Tokens" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:63 -msgid "No additional auth tokens specified" -msgstr "Nessun auth token aggiuntivo è stato specificato" - -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:75 -msgid "New auth token" -msgstr "Nuovo Token atuorizzativo" +#: rhodecode/templates/admin/users/user_edit_audit.mako:7 +msgid "User Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +msgid "audit filter..." +msgstr "" #: rhodecode/templates/admin/users/user_edit_emails.mako:5 msgid "Additional Email Addresses" msgstr "" +#: rhodecode/templates/admin/users/user_edit_groups.mako:12 +#, python-format +msgid "Add `%s` to user group" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_ips.mako:3 msgid "Custom IP Whitelist" msgstr "" @@ -7157,98 +7435,98 @@ msgstr "Aiuta a tradurre %(rc_link)s nel msgid "Users administration" msgstr "Amministrazione utenti" -#: rhodecode/templates/admin/users/users.mako:105 +#: rhodecode/templates/admin/users/users.mako:77 msgid "Auth type" msgstr "Tipo di Auth" -#: rhodecode/templates/base/base.mako:50 +#: rhodecode/templates/base/base.mako:53 #, python-format msgid "RhodeCode instance id: %s" msgstr "" -#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:81 msgid "Authentication" msgstr "Autenticazione" -#: rhodecode/templates/base/base.mako:80 +#: rhodecode/templates/base/base.mako:83 msgid "Defaults" msgstr "Parametri di default" -#: rhodecode/templates/base/base.mako:98 +#: rhodecode/templates/base/base.mako:101 #: rhodecode/templates/files/files_pjax.mako:24 #: rhodecode/templates/summary/components.mako:42 msgid "Show More" msgstr "" -#: rhodecode/templates/base/base.mako:185 +#: rhodecode/templates/base/base.mako:188 msgid "Fork of" msgstr "Fork di" -#: rhodecode/templates/base/base.mako:202 +#: rhodecode/templates/base/base.mako:205 #, python-format msgid "Repository locked by %(user)s" msgstr "Repository bloccato da %(user)s" -#: rhodecode/templates/base/base.mako:207 +#: rhodecode/templates/base/base.mako:210 msgid "Repository not locked. Pull repository to lock it." msgstr "" -#: rhodecode/templates/base/base.mako:225 +#: rhodecode/templates/base/base.mako:228 #: rhodecode/templates/data_table/_dt_elements.mako:12 #: rhodecode/templates/data_table/_dt_elements.mako:13 #: rhodecode/templates/data_table/_dt_elements.mako:153 msgid "Summary" msgstr "Riassunto" -#: rhodecode/templates/base/base.mako:226 +#: rhodecode/templates/base/base.mako:229 #: rhodecode/templates/data_table/_dt_elements.mako:17 #: rhodecode/templates/data_table/_dt_elements.mako:18 msgid "Changelog" msgstr "Registro" -#: rhodecode/templates/base/base.mako:227 +#: rhodecode/templates/base/base.mako:230 #: rhodecode/templates/data_table/_dt_elements.mako:22 #: rhodecode/templates/data_table/_dt_elements.mako:23 #: rhodecode/templates/files/files.mako:15 msgid "Files" msgstr "i File" -#: rhodecode/templates/base/base.mako:229 +#: rhodecode/templates/base/base.mako:232 #: rhodecode/templates/bookmarks/bookmarks.mako:68 #: rhodecode/templates/branches/branches.mako:67 #: rhodecode/templates/tags/tags.mako:68 msgid "Compare" msgstr "Confronta" -#: rhodecode/templates/base/base.mako:234 +#: rhodecode/templates/base/base.mako:237 #, python-format msgid "Show Pull Requests for %s" msgstr "Mostra le richieste PULL da %s" -#: rhodecode/templates/base/base.mako:243 +#: rhodecode/templates/base/base.mako:246 msgid "Options" msgstr "Opzioni" -#: rhodecode/templates/base/base.mako:250 +#: rhodecode/templates/base/base.mako:253 #: rhodecode/templates/forks/forks_data.mako:30 msgid "Compare fork" msgstr "Confronta FORK" -#: rhodecode/templates/base/base.mako:253 -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:256 +#: rhodecode/templates/base/base.mako:403 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "Ricerca" -#: rhodecode/templates/base/base.mako:257 +#: rhodecode/templates/base/base.mako:260 msgid "Unlock" msgstr "Sblocca" -#: rhodecode/templates/base/base.mako:259 +#: rhodecode/templates/base/base.mako:262 msgid "Lock" msgstr "Blocca" -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:267 #: rhodecode/templates/data_table/_dt_elements.mako:27 #: rhodecode/templates/data_table/_dt_elements.mako:28 #: rhodecode/templates/forks/forks_data.mako:8 @@ -7258,77 +7536,77 @@ msgid_plural "Forks" msgstr[0] "Fork" msgstr[1] "Forks" -#: rhodecode/templates/base/base.mako:265 +#: rhodecode/templates/base/base.mako:268 msgid "Create Pull Request" msgstr "Crea richiesta di PULL" -#: rhodecode/templates/base/base.mako:287 +#: rhodecode/templates/base/base.mako:290 msgid "Sign in" msgstr "Accedi" -#: rhodecode/templates/base/base.mako:295 +#: rhodecode/templates/base/base.mako:298 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "Accedi al tuo account" -#: rhodecode/templates/base/base.mako:312 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "(Password dimenticata?)" -#: rhodecode/templates/base/base.mako:322 +#: rhodecode/templates/base/base.mako:325 #: rhodecode/templates/debug_style/login.html:56 msgid "Don't have an account ?" msgstr "Non possiedi un account?" -#: rhodecode/templates/base/base.mako:342 +#: rhodecode/templates/base/base.mako:345 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:346 +#: rhodecode/templates/base/base.mako:349 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:382 +#: rhodecode/templates/base/base.mako:385 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:383 +#: rhodecode/templates/base/base.mako:386 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:14 msgid "Journal" msgstr "Journal" -#: rhodecode/templates/base/base.mako:388 +#: rhodecode/templates/base/base.mako:391 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:389 +#: rhodecode/templates/base/base.mako:392 msgid "Public journal" msgstr "Journal pubblico" -#: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/base/base.mako:397 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:395 +#: rhodecode/templates/base/base.mako:398 msgid "Gists" msgstr "i Gist" -#: rhodecode/templates/base/base.mako:399 +#: rhodecode/templates/base/base.mako:402 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:408 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:412 +#: rhodecode/templates/base/base.mako:415 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:422 -#: rhodecode/templates/base/base.mako:423 +#: rhodecode/templates/base/base.mako:425 +#: rhodecode/templates/base/base.mako:426 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7350,15 +7628,15 @@ msgstr "" msgid "Style" msgstr "Stile" -#: rhodecode/templates/base/base.mako:480 +#: rhodecode/templates/base/base.mako:483 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:533 +#: rhodecode/templates/base/base.mako:536 msgid "Keyboard shortcuts" msgstr "Scorciatoie da tastiera" -#: rhodecode/templates/base/base.mako:541 +#: rhodecode/templates/base/base.mako:544 msgid "Site-wide shortcuts" msgstr "Scorciatoie per tutto il sito" @@ -7427,9 +7705,7 @@ msgid "User Group Creation" msgstr "" #: rhodecode/templates/base/default_perms_box.mako:72 -msgid "" -"Permission to allow user group creation. When disabled, user group admins " -"can still create subgroups within their user groups." +msgid "Permission to allow user group creation." msgstr "" #: rhodecode/templates/base/default_perms_box.mako:78 @@ -7454,19 +7730,19 @@ msgid "" "permission by members of user groups." msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:22 +#: rhodecode/templates/base/issue_tracker_settings.mako:21 msgid "Read more" msgstr "Leggi di pi" -#: rhodecode/templates/base/issue_tracker_settings.mako:92 +#: rhodecode/templates/base/issue_tracker_settings.mako:91 msgid "New Entry" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:96 +#: rhodecode/templates/base/issue_tracker_settings.mako:95 msgid "Confirm to remove this pattern:" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:192 +#: 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 @@ -7476,7 +7752,7 @@ msgstr "" msgid "Preview" msgstr "Anteprima" -#: rhodecode/templates/base/issue_tracker_settings.mako:193 +#: rhodecode/templates/base/issue_tracker_settings.mako:192 msgid "Test Pattern Preview" msgstr "" @@ -7624,101 +7900,130 @@ msgstr "" msgid "Enable largefiles extension" msgstr "Abilita l'estensione \"largefiles\"" -#: rhodecode/templates/base/vcs_settings.mako:99 +#: rhodecode/templates/base/vcs_settings.mako:100 msgid "Enable Largefiles extensions for all repositories." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:103 +#: rhodecode/templates/base/vcs_settings.mako:102 +msgid "Enable Largefiles extensions for this repository." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:113 +msgid "" +"Filesystem location where Mercurial largefile objects should be stored." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:119 msgid "Set repositories as publishing" msgstr "Imposta la pubblicazione dei repository" -#: rhodecode/templates/base/vcs_settings.mako:103 +#: rhodecode/templates/base/vcs_settings.mako:119 msgid "Set repository as publishing" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:106 +#: rhodecode/templates/base/vcs_settings.mako:122 msgid "" "When this is enabled all commits in the repository are seen as public " "commits by clients." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:111 +#: rhodecode/templates/base/vcs_settings.mako:127 msgid "Enable hgsubversion extension" msgstr "Abilita l'estensione \"hgsubversion\"" -#: rhodecode/templates/base/vcs_settings.mako:114 +#: rhodecode/templates/base/vcs_settings.mako:130 msgid "" "Requires hgsubversion library to be installed. Allows cloning remote SVN " "repositories and migrates them to Mercurial type." msgstr "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:123 +#: rhodecode/templates/base/vcs_settings.mako:139 msgid "Mercurial Labs Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:123 +#: rhodecode/templates/base/vcs_settings.mako:139 msgid "" "These features are considered experimental and may not work as expected." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:129 +#: rhodecode/templates/base/vcs_settings.mako:145 msgid "Use rebase as merge strategy" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:132 +#: rhodecode/templates/base/vcs_settings.mako:148 msgid "" "Use rebase instead of creating a merge commit when merging via web " "interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:144 +#: rhodecode/templates/base/vcs_settings.mako:160 +msgid "Git Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:165 +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 "Filesystem location where Git lfs objects should be stored." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:193 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:150 +#: rhodecode/templates/base/vcs_settings.mako:199 msgid "Proxy subversion HTTP requests" msgstr "Proxy per le richieste HTTP Subversion" -#: rhodecode/templates/base/vcs_settings.mako:154 +#: 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:155 +#: rhodecode/templates/base/vcs_settings.mako:204 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:161 +#: rhodecode/templates/base/vcs_settings.mako:210 msgid "Subversion HTTP Server URL" msgstr "URL del server HTTP Subversion" -#: rhodecode/templates/base/vcs_settings.mako:167 +#: rhodecode/templates/base/vcs_settings.mako:216 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:179 +#: rhodecode/templates/base/vcs_settings.mako:228 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:184 +#: rhodecode/templates/base/vcs_settings.mako:233 msgid "Repository patterns" msgstr "Pattern del Repository" -#: rhodecode/templates/base/vcs_settings.mako:188 +#: rhodecode/templates/base/vcs_settings.mako:237 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:254 +#: rhodecode/templates/base/vcs_settings.mako:301 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:259 +#: rhodecode/templates/base/vcs_settings.mako:306 msgid "Enable server-side merge for pull requests" msgstr "Abilita l'incorporamento lato server delle \"richieste di PULL\"" -#: rhodecode/templates/base/vcs_settings.mako:262 +#: rhodecode/templates/base/vcs_settings.mako:309 msgid "" "Note: when this feature is enabled, it only runs hooks defined in the " "rcextension package. Custom hooks added on the Admin -> Settings -> Hooks " @@ -7726,11 +8031,11 @@ msgid "" "web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:266 +#: rhodecode/templates/base/vcs_settings.mako:313 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:269 +#: rhodecode/templates/base/vcs_settings.mako:316 msgid "" "During the update of a pull request, the position of inline comments will be" " updated and outdated inline comments will be hidden." @@ -7867,7 +8172,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:53 #: rhodecode/templates/compare/compare_commits.mako:46 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:495 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "Espandi il messaggio commit" @@ -7960,8 +8265,8 @@ msgid "Diff options" msgstr "" #: rhodecode/templates/changeset/changeset.mako:119 -#: rhodecode/templates/codeblocks/diffs.mako:436 -#: rhodecode/templates/codeblocks/diffs.mako:439 +#: rhodecode/templates/codeblocks/diffs.mako:445 +#: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "diff semplice" @@ -7978,8 +8283,8 @@ msgid "Patch Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:127 -#: rhodecode/templates/codeblocks/diffs.mako:443 -#: rhodecode/templates/codeblocks/diffs.mako:446 +#: rhodecode/templates/codeblocks/diffs.mako:452 +#: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "Download diff" @@ -7989,7 +8294,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:145 #: rhodecode/templates/changeset/changeset.mako:147 -#: rhodecode/tests/functional/test_commit_comments.py:270 +#: rhodecode/tests/functional/test_commit_comments.py:275 #, python-format msgid "%d Commit comment" msgid_plural "%d Commit comments" @@ -7998,7 +8303,7 @@ msgstr[1] "" #: rhodecode/templates/changeset/changeset.mako:150 #: rhodecode/templates/changeset/changeset.mako:152 -#: rhodecode/tests/functional/test_commit_comments.py:277 +#: rhodecode/tests/functional/test_commit_comments.py:282 #, python-format msgid "%d Inline Comment" msgid_plural "%d Inline Comments" @@ -8104,18 +8409,16 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:363 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:148 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:153 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "Chiuso" -#: rhodecode/templates/changeset/changeset_file_comment.mako:388 +#: rhodecode/templates/changeset/changeset_file_comment.mako:393 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 #: rhodecode/templates/compare/compare_diff.mako:122 -#: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:97 msgid "Comment" msgstr "Commento" @@ -8150,7 +8453,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:414 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:419 #, python-format msgid "Expand %s commit" msgid_plural "Expand %s commits" @@ -8159,7 +8462,7 @@ msgstr[1] "" #: rhodecode/templates/changeset/changeset_range.mako:105 #: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 #, python-format msgid "Collapse %s commit" msgid_plural "Collapse %s commits" @@ -8261,64 +8564,68 @@ msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:406 -#: rhodecode/templates/codeblocks/diffs.mako:422 +#: rhodecode/templates/codeblocks/diffs.mako:415 +#: rhodecode/templates/codeblocks/diffs.mako:431 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:408 -#: rhodecode/templates/codeblocks/diffs.mako:415 +#: rhodecode/templates/codeblocks/diffs.mako:417 +#: rhodecode/templates/codeblocks/diffs.mako:424 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:413 -#: rhodecode/templates/codeblocks/diffs.mako:429 +#: rhodecode/templates/codeblocks/diffs.mako:422 +#: rhodecode/templates/codeblocks/diffs.mako:438 #, python-format msgid "File no longer present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:424 -#: rhodecode/templates/codeblocks/diffs.mako:431 +#: rhodecode/templates/codeblocks/diffs.mako:433 +#: rhodecode/templates/codeblocks/diffs.mako:440 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:462 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:462 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:634 +#: rhodecode/templates/codeblocks/diffs.mako:643 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:636 +#: rhodecode/templates/codeblocks/diffs.mako:645 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:640 +#: rhodecode/templates/codeblocks/diffs.mako:649 msgid "View unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:641 +#: rhodecode/templates/codeblocks/diffs.mako:650 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:651 +#: rhodecode/templates/codeblocks/diffs.mako:660 msgid "Expand All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:655 +#: rhodecode/templates/codeblocks/diffs.mako:664 msgid "Collapse All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:659 +#: rhodecode/templates/codeblocks/diffs.mako:668 msgid "Wide Mode Diff" msgstr "" +#: rhodecode/templates/codeblocks/source.mako:24 +msgid "view annotation from before this change" +msgstr "" + #: rhodecode/templates/compare/compare_commits.mako:5 msgid "Common Ancestor Commit" msgstr "" @@ -8328,7 +8635,7 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:16 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:451 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:456 msgid "Time" msgstr "" @@ -8340,7 +8647,7 @@ msgstr[0] "" msgstr[1] "" #: rhodecode/templates/compare/compare_commits.mako:68 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:568 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:573 msgid "show it" msgid_plural "show them" msgstr[0] "" @@ -8376,14 +8683,14 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:98 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:103 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.mako:76 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 -#: rhodecode/templates/files/files_source.mako:20 +#: rhodecode/templates/files/files_source.mako:23 msgid "Source" msgstr "" @@ -8606,133 +8913,150 @@ msgstr "" msgid "RhodeCode" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:16 -#: rhodecode/templates/email_templates/pull_request_comment.mako:18 +#: rhodecode/templates/email_templates/commit_comment.mako:18 +#: rhodecode/templates/email_templates/pull_request_comment.mako:19 msgid "[mention]" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:19 -#, python-format -msgid "" -"%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:19 -#: rhodecode/templates/email_templates/commit_comment.mako:22 +#: rhodecode/templates/email_templates/commit_comment.mako:21 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on commit `%(commit_id)s` (file: " +"`%(comment_file)s`)" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:24 +#: rhodecode/templates/email_templates/commit_comment.mako:26 #, python-format msgid "in the %(repo_name)s repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:22 -#, python-format -msgid "%(user)s commented on commit `%(commit_id)s` (status: %(status)s)" -msgstr "" - #: rhodecode/templates/email_templates/commit_comment.mako:24 -#: rhodecode/templates/email_templates/commit_comment.mako:78 -#, python-format -msgid "%(user)s commented on commit `%(commit_id)s`" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:43 -#: rhodecode/templates/email_templates/pull_request_comment.mako:44 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on commit `%(commit_id)s` (status: " +"%(status)s)" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:26 +#, python-format +msgid "%(user)s left %(comment_type)s on commit `%(commit_id)s`" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:47 +#: rhodecode/templates/email_templates/pull_request_comment.mako:47 msgid "Comment link" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:48 -#: rhodecode/templates/email_templates/pull_request_comment.mako:49 +#: rhodecode/templates/email_templates/commit_comment.mako:52 +#: rhodecode/templates/email_templates/pull_request_comment.mako:52 #, python-format msgid "File: %(comment_file)s on line %(comment_line)s" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:54 +#: rhodecode/templates/email_templates/commit_comment.mako:58 msgid "Commit status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:76 +#: rhodecode/templates/email_templates/commit_comment.mako:82 #, python-format msgid "%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:76 -#: rhodecode/templates/email_templates/commit_comment.mako:78 +#: rhodecode/templates/email_templates/commit_comment.mako:82 +#: rhodecode/templates/email_templates/commit_comment.mako:84 #, python-format msgid "in the %(repo)s repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:85 +#: rhodecode/templates/email_templates/commit_comment.mako:84 +#, python-format +msgid "%(user)s commented on commit `%(commit_id)s`" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:92 +#: rhodecode/templates/email_templates/pull_request_comment.mako:94 msgid "Status" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:85 +#: rhodecode/templates/email_templates/commit_comment.mako:93 msgid "The commit status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:97 -#, python-format -msgid "Comment on line: %(comment_line)s" -msgstr "" - -#: rhodecode/templates/email_templates/password_reset.mako:30 +#: rhodecode/templates/email_templates/commit_comment.mako:99 +#: rhodecode/templates/email_templates/pull_request_comment.mako:107 +#, python-format +msgid "TODO comment on line: %(comment_line)s" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:101 +#: rhodecode/templates/email_templates/pull_request_comment.mako:109 +#, python-format +msgid "Note comment on line: %(comment_line)s" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:101 +#: rhodecode/templates/email_templates/pull_request_comment.mako:109 +msgid "Note comment" +msgstr "" + +#: rhodecode/templates/email_templates/password_reset.mako:31 msgid "Generate new password here" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:21 -#, python-format -msgid "" -"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: " -"`%(comment_file)s`)" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:24 -#, python-format -msgid "" -"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: " -"%(status)s)" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:26 -#: rhodecode/templates/email_templates/pull_request_comment.mako:83 -#, python-format -msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:46 +#: rhodecode/templates/email_templates/pull_request_comment.mako:22 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\" " +"(file: `%(comment_file)s`)" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:25 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\" " +"(status: %(status)s)" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:27 +#, python-format +msgid "%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:49 msgid "Source repository" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:55 +#: rhodecode/templates/email_templates/pull_request_comment.mako:58 #, python-format msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:57 +#: rhodecode/templates/email_templates/pull_request_comment.mako:60 #, python-format msgid "" "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:81 +#: rhodecode/templates/email_templates/pull_request_comment.mako:84 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" " "(file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:87 -#, python-format -msgid "submitted pull request status: %(status)s" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:89 -#, python-format -msgid "submitted pull request status: %(status)s and closed" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:95 -msgid "Submitted status" +#: rhodecode/templates/email_templates/pull_request_comment.mako:86 +#, python-format +msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 +msgid "Closed pull request with status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:99 +msgid "Submitted review status" msgstr "" #: rhodecode/templates/email_templates/pull_request_review.mako:14 @@ -8799,12 +9123,6 @@ msgstr "" msgid "Full Name" msgstr "" -#: rhodecode/templates/email_templates/user_registration.mako:26 -#: rhodecode/templates/users/user.mako:29 -#: rhodecode/templates/users/user_profile.mako:5 -msgid "Profile" -msgstr "Profilo" - #: rhodecode/templates/errors/error_document.mako:46 #, python-format msgid "You will be redirected to %s in %s seconds" @@ -8961,13 +9279,13 @@ msgid "Delete file" msgstr "Elimina file" #: rhodecode/templates/files/files_delete.mako:45 -#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:65 #, python-format msgid "Binary file (%s)" msgstr "File binario (%s)" #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:87 msgid "File is too big to display" msgstr "Il file è troppo grande per essere mostrato" @@ -8980,19 +9298,19 @@ msgstr "" msgid "Commit Description" msgstr "" -#: rhodecode/templates/files/files_detail.mako:35 +#: rhodecode/templates/files/files_detail.mako:32 msgid "File last commit" msgstr "" -#: rhodecode/templates/files/files_detail.mako:51 +#: rhodecode/templates/files/files_detail.mako:46 msgid "Show/Diff file" msgstr "" -#: rhodecode/templates/files/files_detail.mako:66 +#: rhodecode/templates/files/files_detail.mako:61 msgid "Diff to Commit" msgstr "" -#: rhodecode/templates/files/files_detail.mako:67 +#: rhodecode/templates/files/files_detail.mako:62 msgid "Show at Commit" msgstr "" @@ -9034,72 +9352,66 @@ msgstr "Modifica file" msgid "Location" msgstr "Ubicazione" -#: rhodecode/templates/files/files_source.mako:7 +#: rhodecode/templates/files/files_source.mako:8 +msgid "This file is a pointer to large binary file" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:8 +msgid "LargeFile" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:10 #: rhodecode/templates/search/search_content.mako:57 msgid "line" msgid_plural "lines" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/files/files_source.mako:14 +#: rhodecode/templates/files/files_source.mako:17 msgid "History" msgstr "" -#: rhodecode/templates/files/files_source.mako:17 +#: rhodecode/templates/files/files_source.mako:20 #: rhodecode/templates/search/search_content.mako:68 msgid "Show Full History" msgstr "" -#: rhodecode/templates/files/files_source.mako:22 +#: rhodecode/templates/files/files_source.mako:25 #: rhodecode/templates/search/search_content.mako:70 msgid "Annotation" msgstr "" -#: rhodecode/templates/files/files_source.mako:24 +#: rhodecode/templates/files/files_source.mako:27 #: rhodecode/templates/search/search_content.mako:71 msgid "Raw" msgstr "" -#: rhodecode/templates/files/files_source.mako:26 +#: rhodecode/templates/files/files_source.mako:31 +msgid "Download largefile" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:35 #: rhodecode/templates/search/search_content.mako:73 msgid "Download" msgstr "Download" -#: rhodecode/templates/files/files_source.mako:33 +#: rhodecode/templates/files/files_source.mako:43 #, python-format msgid "Edit on Branch:%s" msgstr "" -#: rhodecode/templates/files/files_source.mako:38 +#: rhodecode/templates/files/files_source.mako:48 msgid "Editing binary files not allowed" msgstr "Impossibile modificare file binari" -#: rhodecode/templates/files/files_source.mako:41 +#: rhodecode/templates/files/files_source.mako:51 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_source.mako:52 msgid "Deleting files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/followers/followers.mako:5 -#: rhodecode/templates/followers/followers.mako:27 -#, python-format -msgid "%s Followers" -msgstr "%s Follower" - -#: rhodecode/templates/followers/followers.mako:12 -msgid "Followers" -msgstr "i Follower" - -#: rhodecode/templates/followers/followers_data.mako:5 -msgid "Follower Name" -msgstr "" - -#: rhodecode/templates/followers/followers_data.mako:6 -msgid "Following Since" -msgstr "" - #: rhodecode/templates/forks/fork.mako:5 #, python-format msgid "Fork repository %s" @@ -9180,98 +9492,99 @@ msgstr "Feed RSS del journal pubblico" msgid "New pull request" msgstr "Nuova richiesta PULL" -#: rhodecode/templates/pullrequests/pullrequest.mako:52 +#: rhodecode/templates/pullrequests/pullrequest.mako:51 msgid "Write a short description on this pull request" msgstr "Scrivi una breve descrizione sulla richiesta PULL" -#: rhodecode/templates/pullrequests/pullrequest.mako:59 +#: rhodecode/templates/pullrequests/pullrequest.mako:57 msgid "Commit flow" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:67 +#: rhodecode/templates/pullrequests/pullrequest.mako:65 msgid "Origin repository" msgstr "Origine del repository" -#: rhodecode/templates/pullrequests/pullrequest.mako:85 +#: rhodecode/templates/pullrequests/pullrequest.mako:83 msgid "Loading refs..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:96 +#: rhodecode/templates/pullrequests/pullrequest.mako:94 msgid "Submit Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:109 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:317 +#: rhodecode/templates/pullrequests/pullrequest.mako:107 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:322 msgid "Pull request reviewers" msgstr "Revisori della richiesta PULL" -#: rhodecode/templates/pullrequests/pullrequest.mako:110 -msgid "loading..." -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.mako:120 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:361 +#: rhodecode/templates/pullrequests/pullrequest.mako:118 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:366 msgid "Add reviewer" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:299 -#: rhodecode/templates/pullrequests/pullrequest.mako:572 +#: rhodecode/templates/pullrequests/pullrequest.mako:297 +#: rhodecode/templates/pullrequests/pullrequest.mako:570 msgid "Please select origin and destination" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:305 +#: rhodecode/templates/pullrequests/pullrequest.mako:303 msgid "Loading compare ..." msgstr "" +#: rhodecode/templates/pullrequests/pullrequest.mako:350 #: rhodecode/templates/pullrequests/pullrequest.mako:352 -#: rhodecode/templates/pullrequests/pullrequest.mako:354 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:357 +#: rhodecode/templates/pullrequests/pullrequest.mako:355 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:364 +#: rhodecode/templates/pullrequests/pullrequest.mako:362 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:464 +#: rhodecode/templates/pullrequests/pullrequest.mako:462 msgid "Destination repository" msgstr "Repository di destinazione" -#: rhodecode/templates/pullrequests/pullrequest.mako:475 +#: rhodecode/templates/pullrequests/pullrequest.mako:473 msgid "Select commit reference" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:8 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:7 msgid "This pull request can be merged automatically." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:13 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:12 msgid "Merge is not currently possible because of below failed checks." msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:37 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:42 +msgid "refresh checks" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:38 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 -msgid "refresh checks" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:39 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:44 msgid "Merge Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:44 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 msgid "You are not allowed to merge this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:46 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:45 msgid "Login to Merge this Pull Request" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:54 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 +msgid "Close with status {}" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show.mako:5 #, python-format msgid "%s Pull Request #%s" @@ -9289,171 +9602,175 @@ msgstr "Conferma l'eliminazione di quest msgid "Origin" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:120 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:88 +msgid "Common ancestor" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:125 msgid "Merge" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:133 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:138 msgid "Shadow repository data not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:141 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:146 msgid "Review" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:157 #, python-format msgid "calculated based on %s reviewer vote" msgid_plural "calculated based on %s reviewers votes" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:170 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:175 msgid "Versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:183 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:186 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:188 msgid "{} version available for this pull request, show it." msgid_plural "{} versions available for this pull request, show them." msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:182 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:187 msgid "Hide all versions of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:207 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:212 msgid "Your review status at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:213 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:218 msgid "Comment from pull request version {0}, general:{1} inline:{2}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:230 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:234 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:235 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:239 msgid "select versions to show changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:231 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:236 msgid "show changes between versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:232 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:237 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:247 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:252 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:251 -msgid "Comments for this pull request" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:256 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 +msgid "Comments for this pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:261 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:263 #, python-format msgid "%d General " msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:264 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:267 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:269 #, python-format msgid "%d Inline" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:268 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:272 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:273 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 #, python-format msgid "%d Outdated" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:269 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:274 msgid "show outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:270 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:281 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:286 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:295 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:365 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:300 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:370 msgid "Save Changes" msgstr "Salva i Cambiamenti" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:382 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:387 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:383 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:388 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:391 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:396 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 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:393 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 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:404 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:409 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:427 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:432 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 msgid "Update commits" msgstr "Aggiorna i commit" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:440 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:445 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:444 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:449 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:462 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:464 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:469 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:567 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:572 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:570 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:575 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:571 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:576 msgid "show them" msgstr "" 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-02-05 17:11+0100\n" -"PO-Revision-Date: 2017-02-01 20:10+0000\n" +"POT-Creation-Date: 2017-04-07 12:33+0200\n" +"PO-Revision-Date: 2017-04-07 10:34+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Japanese (http://www.transifex.com/rhodecode/RhodeCode/language/ja/)\n" "MIME-Version: 1.0\n" @@ -27,51 +27,52 @@ msgstr "" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: rhodecode/admin/navigation.py:83 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:167 +#: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 +#: rhodecode/integrations/views.py:166 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "全般" -#: rhodecode/admin/navigation.py:84 +#: rhodecode/apps/admin/navigation.py:84 #: rhodecode/templates/admin/repos/repo_edit.mako:52 msgid "VCS" msgstr "VCS" -#: rhodecode/admin/navigation.py:85 +#: rhodecode/apps/admin/navigation.py:85 msgid "Visual" msgstr "表示" -#: rhodecode/admin/navigation.py:86 +#: rhodecode/apps/admin/navigation.py:86 msgid "Remap and Rescan" msgstr "再マップと再スキャン" -#: rhodecode/admin/navigation.py:87 +#: rhodecode/apps/admin/navigation.py:87 #: rhodecode/templates/admin/repos/repo_edit.mako:58 msgid "Issue Tracker" msgstr "問題追跡システム" -#: rhodecode/admin/navigation.py:89 rhodecode/integrations/types/email.py:232 -#: rhodecode/templates/register.mako:75 +#: rhodecode/apps/admin/navigation.py:89 +#: rhodecode/integrations/types/email.py:232 +#: rhodecode/templates/register.mako:76 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: 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:92 +#: rhodecode/templates/admin/users/users.mako:64 #: rhodecode/templates/email_templates/user_registration.mako:25 #: rhodecode/templates/users/user_profile.mako:51 msgid "Email" msgstr "メールアドレス" -#: rhodecode/admin/navigation.py:90 +#: rhodecode/apps/admin/navigation.py:90 msgid "Hooks" msgstr "フック" -#: rhodecode/admin/navigation.py:91 +#: rhodecode/apps/admin/navigation.py:91 msgid "Full Text Search" msgstr "全文検索" -#: rhodecode/admin/navigation.py:93 +#: rhodecode/apps/admin/navigation.py:93 #: rhodecode/templates/admin/integrations/base.mako:23 #: rhodecode/templates/admin/integrations/form.mako:8 #: rhodecode/templates/admin/integrations/form.mako:21 @@ -85,177 +86,290 @@ msgstr "全文検索" #: 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/base/base.mako:79 +#: rhodecode/templates/base/base.mako:82 msgid "Integrations" msgstr "インテグレーション" -#: rhodecode/admin/navigation.py:95 +#: rhodecode/apps/admin/navigation.py:95 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" msgstr "システム情報" -#: rhodecode/admin/navigation.py:97 +#: rhodecode/apps/admin/navigation.py:97 msgid "User Sessions" msgstr "" -#: rhodecode/admin/navigation.py:99 +#: rhodecode/apps/admin/navigation.py:99 msgid "Open Source Licenses" msgstr "オープンソースライセンス" -#: rhodecode/admin/navigation.py:107 +#: rhodecode/apps/admin/navigation.py:107 msgid "Labs" msgstr "ラボ" -#: rhodecode/admin/views/sessions.py:90 +#: rhodecode/apps/admin/views/sessions.py:86 msgid "Cleaned up old sessions" msgstr "" -#: rhodecode/admin/views/sessions.py:96 +#: rhodecode/apps/admin/views/sessions.py:92 msgid "Failed to cleanup up old sessions" msgstr "" -#: rhodecode/admin/views/svn_config.py:47 +#: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." msgstr "" -#: rhodecode/admin/views/svn_config.py:55 +#: rhodecode/apps/admin/views/svn_config.py:54 msgid "Failed to generate the Apache configuration for Subversion." msgstr "" -#: rhodecode/admin/views/system_info.py:96 +#: rhodecode/apps/admin/views/system_info.py:95 msgid "" "Note: please make sure this server can access `${url}` for the update link " "to work" msgstr "" -#: rhodecode/admin/views/system_info.py:99 +#: rhodecode/apps/admin/views/system_info.py:98 msgid "Update info" msgstr "" -#: rhodecode/admin/views/system_info.py:101 +#: rhodecode/apps/admin/views/system_info.py:100 msgid "Check for updates" msgstr "" -#: rhodecode/admin/views/system_info.py:106 +#: rhodecode/apps/admin/views/system_info.py:105 msgid "RhodeCode Version" msgstr "" -#: rhodecode/admin/views/system_info.py:107 +#: rhodecode/apps/admin/views/system_info.py:106 msgid "RhodeCode Server IP" msgstr "" -#: rhodecode/admin/views/system_info.py:108 +#: rhodecode/apps/admin/views/system_info.py:107 msgid "RhodeCode Server ID" msgstr "" -#: rhodecode/admin/views/system_info.py:109 +#: rhodecode/apps/admin/views/system_info.py:108 msgid "RhodeCode Configuration" msgstr "" -#: rhodecode/admin/views/system_info.py:113 +#: rhodecode/apps/admin/views/system_info.py:109 +msgid "Workers" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:110 +msgid "Worker Type" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:114 msgid "Database" msgstr "データーベース" -#: rhodecode/admin/views/system_info.py:114 +#: rhodecode/apps/admin/views/system_info.py:115 msgid "Database version" msgstr "データーベースバージョン" -#: rhodecode/admin/views/system_info.py:118 +#: rhodecode/apps/admin/views/system_info.py:119 msgid "Platform" msgstr "プラットフォーム" -#: rhodecode/admin/views/system_info.py:119 +#: rhodecode/apps/admin/views/system_info.py:120 msgid "Platform UUID" msgstr "" -#: rhodecode/admin/views/system_info.py:120 +#: rhodecode/apps/admin/views/system_info.py:121 msgid "Python version" msgstr "Python バージョン" -#: rhodecode/admin/views/system_info.py:121 +#: rhodecode/apps/admin/views/system_info.py:122 msgid "Python path" msgstr "Python パス" -#: rhodecode/admin/views/system_info.py:125 +#: rhodecode/apps/admin/views/system_info.py:126 msgid "CPU" msgstr "CPU" -#: rhodecode/admin/views/system_info.py:126 +#: rhodecode/apps/admin/views/system_info.py:127 msgid "Load" msgstr "Load" -#: rhodecode/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:128 msgid "Memory" msgstr "" -#: rhodecode/admin/views/system_info.py:128 +#: rhodecode/apps/admin/views/system_info.py:129 msgid "Uptime" msgstr "稼働時間" -#: rhodecode/admin/views/system_info.py:132 +#: rhodecode/apps/admin/views/system_info.py:133 msgid "Storage location" msgstr "ストレージの場所" -#: rhodecode/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:135 msgid "Storage inodes" msgstr "" -#: rhodecode/admin/views/system_info.py:136 +#: rhodecode/apps/admin/views/system_info.py:137 msgid "Gist storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:137 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Gist storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:139 +#: rhodecode/apps/admin/views/system_info.py:140 msgid "Archive cache storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:140 +#: rhodecode/apps/admin/views/system_info.py:141 msgid "Archive cache info" msgstr "" -#: rhodecode/admin/views/system_info.py:142 +#: rhodecode/apps/admin/views/system_info.py:143 msgid "Temp storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:143 +#: rhodecode/apps/admin/views/system_info.py:144 msgid "Temp storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:145 +#: rhodecode/apps/admin/views/system_info.py:146 msgid "Search info" msgstr "" -#: rhodecode/admin/views/system_info.py:146 +#: rhodecode/apps/admin/views/system_info.py:147 msgid "Search location" msgstr "" -#: rhodecode/admin/views/system_info.py:150 +#: rhodecode/apps/admin/views/system_info.py:151 msgid "VCS Backends" msgstr "" -#: rhodecode/admin/views/system_info.py:151 +#: rhodecode/apps/admin/views/system_info.py:152 msgid "VCS Server" msgstr "" -#: rhodecode/admin/views/system_info.py:152 +#: rhodecode/apps/admin/views/system_info.py:153 msgid "GIT" msgstr "" -#: rhodecode/admin/views/system_info.py:153 +#: rhodecode/apps/admin/views/system_info.py:154 msgid "HG" msgstr "" -#: rhodecode/admin/views/system_info.py:154 +#: rhodecode/apps/admin/views/system_info.py:155 msgid "SVN" msgstr "" +#: rhodecode/apps/admin/views/users.py:60 +#: rhodecode/controllers/admin/users.py:359 +#: rhodecode/controllers/admin/users.py:380 +#: 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/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 "5 分" + +#: rhodecode/apps/admin/views/users.py:180 +#: rhodecode/apps/my_account/views.py:140 +#: 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/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/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/controllers/admin/gists.py:70 +msgid "Lifetime" +msgstr "有効期間" + +#: rhodecode/apps/admin/views/users.py:188 +#: rhodecode/apps/my_account/views.py:148 +#: 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 +msgid "Auth token successfully created" +msgstr "認証トークンの作成に成功しました" + +#: rhodecode/apps/admin/views/users.py:240 +#: rhodecode/apps/my_account/views.py:192 +msgid "Auth token successfully deleted" +msgstr "認証トークンの削除に成功しました" + +#: rhodecode/apps/admin/views/users.py:284 +msgid "Groups successfully changed" +msgstr "" + +#: rhodecode/apps/login/views.py:247 rhodecode/apps/login/views.py:316 +msgid "Bad captcha" +msgstr "" + +#: rhodecode/apps/login/views.py:256 +msgid "You have successfully registered with RhodeCode" +msgstr "RhodeCode に登録されました" + +#: rhodecode/apps/login/views.py:292 +msgid "If such email exists, a password reset link was sent to it." +msgstr "" + +#: rhodecode/apps/login/views.py:298 +msgid "Password reset has been disabled." +msgstr "" + +#: rhodecode/apps/login/views.py:381 +msgid "Given reset token is invalid" +msgstr "" + +#: rhodecode/apps/login/views.py:389 +msgid "" +"Your password reset was successful, a new password has been sent to your " +"email" +msgstr "パスワードリセットが成功しました、新しいパスワードをあなたのメールアドレスに送信しました" + +#: rhodecode/apps/my_account/views.py:115 +msgid "Error occurred during update of user password" +msgstr "ユーザーパスワードの更新中にエラーが発生しました" + +#: rhodecode/apps/my_account/views.py:122 +msgid "Successfully updated password" +msgstr "パスワードの更新に成功しました" + +#: rhodecode/apps/svn_support/events.py:30 +msgid "Configuration for Apaache mad_dav_svn changed." +msgstr "" + #: rhodecode/authentication/schema.py:35 msgid "Enable or disable this authentication plugin." msgstr "この認証プラグインを有効化します。" @@ -271,12 +385,11 @@ msgstr "有効" #: rhodecode/authentication/schema.py:43 msgid "" -"Amount of seconds to cache the authentication call for this plugin. Useful " -"for long calls like LDAP to improve the responsiveness of the authentication" -" system (0 means disabled)." -msgstr "このプラグインにおいて認証結果をキャッシュする時間を秒単位で指定してください。LDAPのような時間のかかる認証システムのレスポンス改善に有用です。0を指定するとキャッシュを無効化します。" - -#: rhodecode/authentication/schema.py:48 +"Amount of seconds to cache the authentication responsecall for this plugin. \n" +"Useful for long calls like LDAP to improve the performance of the authentication system (0 means disabled)." +msgstr "" + +#: rhodecode/authentication/schema.py:49 msgid "Auth Cache TTL" msgstr "認証キャッシュ有効期間" @@ -297,207 +410,219 @@ msgstr "プラグインの設定保存時にエラーが発生しました。フォームの入力を確認してください。" msgid "Error occurred during update of auth settings." msgstr "認証設定の更新時にエラーが発生しました。" -#: rhodecode/authentication/plugins/auth_crowd.py:61 +#: rhodecode/authentication/plugins/auth_crowd.py:60 msgid "The FQDN or IP of the Atlassian CROWD Server" msgstr "Atlassian CROWDサーバのFQDNまたはIPアドレス" -#: rhodecode/authentication/plugins/auth_crowd.py:63 +#: rhodecode/authentication/plugins/auth_crowd.py:62 msgid "Host" msgstr "ホスト" -#: rhodecode/authentication/plugins/auth_crowd.py:68 +#: rhodecode/authentication/plugins/auth_crowd.py:67 msgid "The Port in use by the Atlassian CROWD Server" msgstr "Atlassian CROWDサーバが使用するポート" -#: rhodecode/authentication/plugins/auth_crowd.py:70 +#: rhodecode/authentication/plugins/auth_crowd.py:69 #: rhodecode/authentication/plugins/auth_ldap.py:84 msgid "Port" msgstr "ポート" -#: rhodecode/authentication/plugins/auth_crowd.py:76 +#: rhodecode/authentication/plugins/auth_crowd.py:75 msgid "The Application Name to authenticate to CROWD" msgstr "CROWD認証に使用するアプリケーション名" -#: rhodecode/authentication/plugins/auth_crowd.py:78 +#: rhodecode/authentication/plugins/auth_crowd.py:77 msgid "Application Name" msgstr "アプリケーション名" -#: rhodecode/authentication/plugins/auth_crowd.py:83 +#: rhodecode/authentication/plugins/auth_crowd.py:82 msgid "The password to authenticate to CROWD" msgstr "CROWD認証に使用するパスワード" -#: rhodecode/authentication/plugins/auth_crowd.py:85 +#: rhodecode/authentication/plugins/auth_crowd.py:84 msgid "Application Password" msgstr "アプリケーションパスワード" -#: rhodecode/authentication/plugins/auth_crowd.py:90 +#: rhodecode/authentication/plugins/auth_crowd.py:89 msgid "" "A comma separated list of group names that identify users as RhodeCode " "Administrators" msgstr "RhodeCode管理者とみなされるコンマで区切られたグループ名のリスト" -#: rhodecode/authentication/plugins/auth_crowd.py:94 +#: rhodecode/authentication/plugins/auth_crowd.py:93 msgid "Admin Groups" msgstr "管理者グループ" -#: rhodecode/authentication/plugins/auth_crowd.py:216 +#: rhodecode/authentication/plugins/auth_crowd.py:215 msgid "CROWD" msgstr "CROWD" -#: rhodecode/authentication/plugins/auth_headers.py:55 +#: rhodecode/authentication/plugins/auth_headers.py:54 msgid "Header to extract the user from" msgstr "ユーザー名を取り出すヘッダ" -#: rhodecode/authentication/plugins/auth_headers.py:57 +#: rhodecode/authentication/plugins/auth_headers.py:56 msgid "Header" msgstr "ヘッダ" -#: rhodecode/authentication/plugins/auth_headers.py:62 +#: rhodecode/authentication/plugins/auth_headers.py:61 msgid "Header to extract the user from when main one fails" msgstr "最初のヘッダの処理に失敗した場合に使用するヘッダ" -#: rhodecode/authentication/plugins/auth_headers.py:64 +#: rhodecode/authentication/plugins/auth_headers.py:63 msgid "Fallback header" msgstr "予備ヘッダ" -#: rhodecode/authentication/plugins/auth_headers.py:69 +#: rhodecode/authentication/plugins/auth_headers.py:68 msgid "" "Perform cleaning of user, if passed user has @ in username then first part " "before @ is taken. If there's \\ in the username only the part after \\ is " "taken" msgstr "有効にした場合、@を含む場合は@の前をユーザー名に使います。\\を含む場合は\\の後をユーザー名に使います。" -#: rhodecode/authentication/plugins/auth_headers.py:74 +#: rhodecode/authentication/plugins/auth_headers.py:73 msgid "Clean username" msgstr "ユーザー名の整形" -#: rhodecode/authentication/plugins/auth_headers.py:99 +#: rhodecode/authentication/plugins/auth_headers.py:98 msgid "Headers" msgstr "ヘッダ" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:63 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:62 msgid "The url of the Jasig CAS REST service" msgstr "Jasig CAS RESTサービスのURL" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:65 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:64 #: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" msgstr "URL" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:93 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:92 msgid "Jasig-CAS" msgstr "Jasig-CAS" -#: rhodecode/authentication/plugins/auth_ldap.py:75 -msgid "Host of the LDAP Server" -msgstr "LDAPサーバのホスト" +#: 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 msgid "LDAP Host" msgstr "LDAPホスト" #: rhodecode/authentication/plugins/auth_ldap.py:82 -msgid "Port that the LDAP server is listening on" -msgstr "LDAPサーバが待ち受けるポート" +msgid "Custom port that the LDAP server is listening on. Default: 389" +msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:90 -msgid "User to connect to LDAP" -msgstr "LDAPに接続するユーザー" - -#: rhodecode/authentication/plugins/auth_ldap.py:93 +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 msgid "Account" msgstr "アカウント" -#: rhodecode/authentication/plugins/auth_ldap.py:98 -msgid "Password to connect to LDAP" -msgstr "LDAPに接続するパスワード" - -#: rhodecode/authentication/plugins/auth_ldap.py:101 -#: rhodecode/templates/login.mako:49 rhodecode/templates/register.mako:47 +#: rhodecode/authentication/plugins/auth_ldap.py:100 +msgid "Password to authenticate for given user DN." +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:103 +#: 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:310 +#: rhodecode/templates/base/base.mako:313 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "パスワード" -#: rhodecode/authentication/plugins/auth_ldap.py:106 +#: rhodecode/authentication/plugins/auth_ldap.py:108 msgid "TLS Type" msgstr "TLSの種類" -#: rhodecode/authentication/plugins/auth_ldap.py:107 +#: rhodecode/authentication/plugins/auth_ldap.py:109 msgid "Connection Security" msgstr "接続のセキュリティ" -#: rhodecode/authentication/plugins/auth_ldap.py:113 +#: rhodecode/authentication/plugins/auth_ldap.py:115 msgid "Require Cert over TLS?" msgstr "TLSの証明書の要求レベル" -#: rhodecode/authentication/plugins/auth_ldap.py:114 +#: rhodecode/authentication/plugins/auth_ldap.py:116 msgid "Certificate Checks" msgstr "証明書チェック" -#: rhodecode/authentication/plugins/auth_ldap.py:120 -msgid "Base DN to search (e.g., dc=mydomain,dc=com)" -msgstr "検索の基底となるDN (例: dc=mydomain,dc=com)" - -#: rhodecode/authentication/plugins/auth_ldap.py:123 +#: rhodecode/authentication/plugins/auth_ldap.py:122 +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 msgid "Base DN" msgstr "ベースDN" -#: rhodecode/authentication/plugins/auth_ldap.py:128 -msgid "Filter to narrow results (e.g., ou=Users, etc)" -msgstr "検索結果を絞り込むフィルタ (例: ou=Users など)" - -#: rhodecode/authentication/plugins/auth_ldap.py:131 +#: rhodecode/authentication/plugins/auth_ldap.py:132 +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 msgid "LDAP Search Filter" msgstr "LDAP検索フィルタ" -#: rhodecode/authentication/plugins/auth_ldap.py:136 -msgid "How deep to search LDAP" -msgstr "LDAP検索範囲の指定" - -#: rhodecode/authentication/plugins/auth_ldap.py:137 +#: rhodecode/authentication/plugins/auth_ldap.py:143 +msgid "How deep to search LDAP. If unsure set to SUBTREE" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:144 msgid "LDAP Search Scope" msgstr "LDAP検索範囲" -#: rhodecode/authentication/plugins/auth_ldap.py:143 -msgid "LDAP Attribute to map to user name" -msgstr "ユーザー名に対応するLDAP属性" - -#: rhodecode/authentication/plugins/auth_ldap.py:145 +#: rhodecode/authentication/plugins/auth_ldap.py:150 +msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:152 msgid "Login Attribute" msgstr "ログイン属性" -#: rhodecode/authentication/plugins/auth_ldap.py:146 +#: rhodecode/authentication/plugins/auth_ldap.py:153 msgid "The LDAP Login attribute of the CN must be specified" msgstr "LDAPログイン属性は必ず指定する必要があります" -#: rhodecode/authentication/plugins/auth_ldap.py:151 -msgid "LDAP Attribute to map to first name" -msgstr "名前(first name)に対応するLDAP属性" - -#: rhodecode/authentication/plugins/auth_ldap.py:154 +#: rhodecode/authentication/plugins/auth_ldap.py:158 +msgid "LDAP Attribute to map to first name (e.g., givenName)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:161 msgid "First Name Attribute" msgstr "名前属性" -#: rhodecode/authentication/plugins/auth_ldap.py:159 -msgid "LDAP Attribute to map to last name" -msgstr "名字(last name)に対応するLDAP属性" - -#: rhodecode/authentication/plugins/auth_ldap.py:162 +#: rhodecode/authentication/plugins/auth_ldap.py:166 +msgid "LDAP Attribute to map to last name (e.g., sn)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:169 msgid "Last Name Attribute" msgstr "名字属性" -#: rhodecode/authentication/plugins/auth_ldap.py:167 -msgid "LDAP Attribute to map to email address" -msgstr "メールアドレスに対応するLDAP属性" - -#: rhodecode/authentication/plugins/auth_ldap.py:170 +#: rhodecode/authentication/plugins/auth_ldap.py:174 +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 msgid "Email Attribute" msgstr "メール属性" -#: rhodecode/authentication/plugins/auth_ldap.py:351 +#: rhodecode/authentication/plugins/auth_ldap.py:360 msgid "LDAP" msgstr "LDAP" @@ -522,16 +647,16 @@ msgstr "Gecos正規表現" msgid "PAM" msgstr "PAM" -#: rhodecode/authentication/plugins/auth_rhodecode.py:68 +#: rhodecode/authentication/plugins/auth_rhodecode.py:67 msgid "Rhodecode" msgstr "Rhodecode" -#: rhodecode/authentication/plugins/auth_token.py:71 +#: rhodecode/authentication/plugins/auth_token.py:70 msgid "Rhodecode Token Auth" msgstr "Rhodecodeトークン認証" #: rhodecode/controllers/changelog.py:91 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:202 +#: rhodecode/controllers/pullrequests.py:204 msgid "There are no commits yet" msgstr "まだコミットがありません" @@ -565,8 +690,8 @@ msgid "No such commit exists for this re msgstr "リポジトリにそのようなコミットはありません" #: rhodecode/controllers/changeset.py:344 -#: rhodecode/controllers/pullrequests.py:948 -#: rhodecode/model/pull_request.py:1009 +#: rhodecode/controllers/pullrequests.py:985 +#: rhodecode/model/pull_request.py:1055 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "状態変更 %(transition_icon)s %(status)s" @@ -606,12 +731,12 @@ msgid "" "%(repo1)s with commit %(commit2)s from repository %(repo2)s." msgstr "リポジトリに関連がありません。リポジトリ %(repo1)s のコミット %(commit1)s とリポジトリ %(repo2)s のコミット %(commit2)s を比較できません。" -#: rhodecode/controllers/feed.py:70 +#: rhodecode/controllers/feed.py:69 #, python-format msgid "Changes on %s repository" msgstr "%s リポジトリでの変更" -#: rhodecode/controllers/feed.py:71 +#: rhodecode/controllers/feed.py:70 #, python-format msgid "%s %s feed" msgstr "%s %s フィード" @@ -625,93 +750,93 @@ msgstr "ファイルを追加するにはここをクリックしてください。" msgid "There are no files yet. %s" msgstr "まだファイルがありません。 %s" -#: rhodecode/controllers/files.py:394 rhodecode/controllers/files.py:447 -#: rhodecode/controllers/files.py:478 rhodecode/controllers/files.py:553 -#: rhodecode/controllers/files.py:598 rhodecode/controllers/files.py:689 +#: 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 #, python-format msgid "This repository has been locked by %s on %s" msgstr "このリポジトリは %s on %s によりロックされています" -#: rhodecode/controllers/files.py:402 rhodecode/controllers/files.py:455 +#: rhodecode/controllers/files.py:443 rhodecode/controllers/files.py:496 msgid "You can only delete files with revision being a valid branch " msgstr "有効なブランチ上のリビジョンからしかファイルを削除できません" -#: rhodecode/controllers/files.py:411 rhodecode/controllers/files.py:464 +#: 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:431 +#: rhodecode/controllers/files.py:472 #, python-format msgid "Successfully deleted file %s" msgstr "%s ファイルの削除に成功しました" -#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:540 -#: rhodecode/controllers/files.py:677 +#: rhodecode/controllers/files.py:475 rhodecode/controllers/files.py:581 +#: rhodecode/controllers/files.py:718 msgid "Error occurred during commit" msgstr "コミット中にエラーが発生しました" -#: rhodecode/controllers/files.py:486 rhodecode/controllers/files.py:561 +#: rhodecode/controllers/files.py:527 rhodecode/controllers/files.py:602 msgid "You can only edit files with revision being a valid branch " msgstr "有効なブランチを示すリビジョンでのみファイルを編集できます。" -#: rhodecode/controllers/files.py:498 rhodecode/controllers/files.py:573 +#: 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:515 +#: rhodecode/controllers/files.py:556 msgid "No changes" msgstr "変更点なし" -#: rhodecode/controllers/files.py:537 rhodecode/controllers/files.py:666 +#: rhodecode/controllers/files.py:578 rhodecode/controllers/files.py:707 #, python-format msgid "Successfully committed to %s" msgstr "%s へのコミットが成功しました" -#: rhodecode/controllers/files.py:611 rhodecode/controllers/files.py:700 +#: rhodecode/controllers/files.py:652 rhodecode/controllers/files.py:741 msgid "Added file via RhodeCode Enterprise" msgstr "RhodeCode Enterprise 経由でファイルを追加しました" -#: rhodecode/controllers/files.py:636 +#: rhodecode/controllers/files.py:677 msgid "No filename" msgstr "ファイル名がありません" -#: rhodecode/controllers/files.py:669 +#: 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:723 +#: rhodecode/controllers/files.py:764 msgid "Downloads disabled" msgstr "ダウンロードは無効化されています" -#: rhodecode/controllers/files.py:729 +#: rhodecode/controllers/files.py:770 #, python-format msgid "Unknown revision %s" msgstr "%s は未知のリビジョンです" -#: rhodecode/controllers/files.py:731 +#: rhodecode/controllers/files.py:772 msgid "Empty repository" msgstr "空のリポジトリ" -#: rhodecode/controllers/files.py:733 rhodecode/controllers/files.py:767 +#: rhodecode/controllers/files.py:774 rhodecode/controllers/files.py:808 msgid "Unknown archive type" msgstr "未知のアーカイブ種別です" -#: rhodecode/controllers/files.py:952 +#: rhodecode/controllers/files.py:993 msgid "Changesets" msgstr "チェンジセット" -#: rhodecode/controllers/files.py:973 rhodecode/controllers/summary.py:269 -#: rhodecode/model/pull_request.py:1234 rhodecode/model/scm.py:782 -#: rhodecode/templates/base/vcs_settings.mako:193 +#: 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:977 rhodecode/model/scm.py:797 -#: rhodecode/templates/base/vcs_settings.mako:218 +#: rhodecode/controllers/files.py:1018 rhodecode/model/scm.py:797 +#: rhodecode/templates/base/vcs_settings.mako:267 msgid "Tags" msgstr "タグ" @@ -720,23 +845,24 @@ msgstr "タグ" msgid "An error occurred during repository forking %s" msgstr "リポジトリ %s のフォーク中にエラーが発生しました" -#: rhodecode/controllers/home.py:205 +#: rhodecode/controllers/home.py:207 msgid "Groups" msgstr "グループ" -#: rhodecode/controllers/home.py:212 rhodecode/controllers/home.py:247 -#: rhodecode/controllers/pullrequests.py:308 +#: 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:73 -#: rhodecode/templates/base/base.mako:145 -#: rhodecode/templates/base/base.mako:569 +#: 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:225 +#: rhodecode/controllers/home.py:227 #, python-format msgid "Commits in %(repo)s" msgstr "%(repo)s のコミット" @@ -749,81 +875,81 @@ msgstr "公開ジャーナル" msgid "journal" msgstr "ジャーナル" -#: rhodecode/controllers/pullrequests.py:216 +#: rhodecode/controllers/pullrequests.py:218 msgid "Commit does not exist" msgstr "コミットが存在しません" -#: rhodecode/controllers/pullrequests.py:333 +#: rhodecode/controllers/pullrequests.py:335 msgid "Pull request requires a title with min. 3 chars" msgstr "プルリクエストには3文字以上のタイトルが必要です" -#: rhodecode/controllers/pullrequests.py:335 +#: rhodecode/controllers/pullrequests.py:337 msgid "Error creating pull request: {}" msgstr "プルリクエスト作成エラー: {}" -#: rhodecode/controllers/pullrequests.py:383 +#: rhodecode/controllers/pullrequests.py:385 msgid "Successfully opened new pull request" msgstr "新しいプルリクエストの作成に成功しました" -#: rhodecode/controllers/pullrequests.py:386 +#: rhodecode/controllers/pullrequests.py:388 msgid "Error occurred during sending pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: rhodecode/controllers/pullrequests.py:429 +#: rhodecode/controllers/pullrequests.py:431 msgid "Cannot update closed pull requests." msgstr "終了したプルリクエストは更新できません" -#: rhodecode/controllers/pullrequests.py:435 +#: rhodecode/controllers/pullrequests.py:437 msgid "Pull request title & description updated." msgstr "プルリクエストのタイトルと説明を更新しました。" -#: rhodecode/controllers/pullrequests.py:443 +#: rhodecode/controllers/pullrequests.py:455 msgid "" "Pull request updated to \"{source_commit_id}\" with {count_added} added, " -"{count_removed} removed commits." -msgstr "プルリクエストを \"{source_commit_id}\" (追加 {count_added} 削除 {count_removed}) に更新しました。" - -#: rhodecode/controllers/pullrequests.py:458 +"{count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:472 msgid "Reload page" msgstr "" -#: rhodecode/controllers/pullrequests.py:532 +#: rhodecode/controllers/pullrequests.py:546 msgid "Pull request was successfully merged and closed." msgstr "プルリクエストはマージに成功し終了しました。" -#: rhodecode/controllers/pullrequests.py:569 +#: rhodecode/controllers/pullrequests.py:588 msgid "Successfully deleted pull request" msgstr "プルリクエストの削除に成功しました" -#: rhodecode/controllers/pullrequests.py:864 -msgid "Close Pull Request" -msgstr "プルリクエストを閉じる" - -#: rhodecode/controllers/pullrequests.py:952 -#: rhodecode/model/pull_request.py:1013 +#: rhodecode/controllers/pullrequests.py:592 +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:1002 +#: 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:243 +#: rhodecode/controllers/summary.py:251 msgid "Branch" msgstr "ブランチ" -#: rhodecode/controllers/summary.py:244 +#: rhodecode/controllers/summary.py:252 msgid "Tag" msgstr "タグ" -#: rhodecode/controllers/summary.py:245 +#: rhodecode/controllers/summary.py:253 msgid "Bookmark" msgstr "ブックマーク" -#: rhodecode/controllers/summary.py:270 +#: rhodecode/controllers/summary.py:278 msgid "Closed branches" msgstr "閉鎖済みブランチ" @@ -835,42 +961,6 @@ msgstr "デフォルト設定の更新に成功しました" msgid "Error occurred during update of default values" msgstr "デフォルト値の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/gists.py:62 -#: rhodecode/controllers/admin/my_account.py:384 -#: rhodecode/controllers/admin/users.py:465 -msgid "forever" -msgstr "無期限" - -#: rhodecode/controllers/admin/gists.py:63 -#: rhodecode/controllers/admin/my_account.py:385 -#: rhodecode/controllers/admin/users.py:466 -msgid "5 minutes" -msgstr "5 分" - -#: rhodecode/controllers/admin/gists.py:64 -#: rhodecode/controllers/admin/my_account.py:386 -#: rhodecode/controllers/admin/users.py:467 -msgid "1 hour" -msgstr "1 時間" - -#: rhodecode/controllers/admin/gists.py:65 -#: rhodecode/controllers/admin/my_account.py:387 -#: rhodecode/controllers/admin/users.py:468 -msgid "1 day" -msgstr "1 日" - -#: rhodecode/controllers/admin/gists.py:66 -#: rhodecode/controllers/admin/my_account.py:388 -#: rhodecode/controllers/admin/users.py:469 -msgid "1 month" -msgstr "1 ヶ月" - -#: rhodecode/controllers/admin/gists.py:70 -#: rhodecode/controllers/admin/my_account.py:390 -#: rhodecode/controllers/admin/users.py:471 -msgid "Lifetime" -msgstr "有効期間" - #: rhodecode/controllers/admin/gists.py:72 msgid "Requires registered account" msgstr "登録されたアカウントが必要です" @@ -907,10 +997,8 @@ msgstr "Gist %s の更新中にエラーが発生しました" #: rhodecode/controllers/admin/gists.py:343 #: rhodecode/templates/admin/gists/show.mako:67 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 #: rhodecode/templates/data_table/_dt_elements.mako:263 msgid "never" msgstr "無し" @@ -920,65 +1008,36 @@ msgstr "無し" msgid "%(expiry)s - current value" msgstr "%(expiry)s - 現在値" -#: rhodecode/controllers/admin/my_account.py:80 +#: rhodecode/controllers/admin/my_account.py:78 msgid "You can't edit this user since it's crucial for entire application" msgstr "このユーザーを編集できません。このユーザーはアプリケーションにとって必要不可欠です。" -#: rhodecode/controllers/admin/my_account.py:140 +#: rhodecode/controllers/admin/my_account.py:138 msgid "Your account was updated successfully" msgstr "アカウントの更新に成功しました" -#: rhodecode/controllers/admin/my_account.py:155 -#: rhodecode/controllers/admin/users.py:231 +#: rhodecode/controllers/admin/my_account.py:153 +#: rhodecode/controllers/admin/users.py:184 #, python-format msgid "Error occurred during update of user %s" msgstr "ユーザー %s の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/my_account.py:221 -#: rhodecode/controllers/admin/my_account.py:227 -msgid "Error occurred during update of user password" -msgstr "ユーザーパスワードの更新中にエラーが発生しました" - -#: rhodecode/controllers/admin/my_account.py:234 -msgid "Successfully updated password" -msgstr "パスワードの更新に成功しました" - -#: rhodecode/controllers/admin/my_account.py:278 -#: rhodecode/controllers/admin/users.py:645 +#: 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:285 -#: rhodecode/controllers/admin/users.py:652 +#: 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:295 -#: rhodecode/controllers/admin/users.py:667 +#: rhodecode/controllers/admin/my_account.py:239 +#: rhodecode/controllers/admin/users.py:549 msgid "Removed email address from user account" msgstr "ユーザーアカウントからメールアドレスを削除しました" -#: rhodecode/controllers/admin/my_account.py:393 -#: rhodecode/controllers/admin/users.py:474 -msgid "Role" -msgstr "ロール" - -#: rhodecode/controllers/admin/my_account.py:406 -#: rhodecode/controllers/admin/users.py:498 -msgid "Auth token successfully created" -msgstr "認証トークンの作成に成功しました" - -#: rhodecode/controllers/admin/my_account.py:419 -#: rhodecode/controllers/admin/users.py:517 -msgid "Auth token successfully reset" -msgstr "認証トークンのリセットに成功しました" - -#: rhodecode/controllers/admin/my_account.py:423 -#: rhodecode/controllers/admin/users.py:521 -msgid "Auth token successfully deleted" -msgstr "認証トークンの削除に成功しました" - #: rhodecode/controllers/admin/permissions.py:112 msgid "Application permissions updated successfully" msgstr "アプリケーションの権限の更新に成功しました" @@ -1040,7 +1099,7 @@ msgid "Error occurred during deletion of msgstr "リポジトリグループ %s の削除中にエラーが発生しました" #: rhodecode/controllers/admin/repo_groups.py:388 -#: rhodecode/controllers/admin/user_groups.py:322 +#: rhodecode/controllers/admin/user_groups.py:323 msgid "Cannot change permission for yourself as admin" msgstr "自分自身の管理者の権限を変更できません" @@ -1192,18 +1251,18 @@ msgid "Error occurred during deleting is msgstr "問題追跡システムのエントリの削除中にエラーが発生しました" #: rhodecode/controllers/admin/repos.py:728 -#: rhodecode/controllers/admin/settings.py:380 +#: rhodecode/controllers/admin/settings.py:381 msgid "Removed issue tracker entry" msgstr "問題追跡システムのエントリを削除しました" #: rhodecode/controllers/admin/repos.py:758 -#: rhodecode/controllers/admin/settings.py:427 +#: rhodecode/controllers/admin/settings.py:428 msgid "Updated issue tracker entries" msgstr "問題追跡システムのエントリを更新しました" #: rhodecode/controllers/admin/repos.py:819 #: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:618 +#: rhodecode/controllers/admin/settings.py:619 msgid "Some form inputs contain invalid data." msgstr "フォーム入力に無効なデータが含まれています" @@ -1212,281 +1271,277 @@ msgid "Error occurred during updating re msgstr "リポジトリのVCS設定を更新中にエラーが発生しました" #: rhodecode/controllers/admin/repos.py:841 -#: rhodecode/controllers/admin/settings.py:175 +#: rhodecode/controllers/admin/settings.py:176 msgid "Updated VCS settings" msgstr "VCS設定を更新しました" -#: rhodecode/controllers/admin/settings.py:171 -#: rhodecode/controllers/admin/settings.py:282 +#: rhodecode/controllers/admin/settings.py:172 +#: rhodecode/controllers/admin/settings.py:283 msgid "Error occurred during updating application settings" msgstr "アプリケーション設定の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:222 +#: rhodecode/controllers/admin/settings.py:223 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "リポジトリの再スキャンに成功しました。 追加: %s 削除: %s" -#: rhodecode/controllers/admin/settings.py:278 +#: rhodecode/controllers/admin/settings.py:279 msgid "Updated application settings" msgstr "アプリケーション設定を更新しました" -#: rhodecode/controllers/admin/settings.py:344 +#: rhodecode/controllers/admin/settings.py:345 msgid "Updated visualisation settings" msgstr "表示設定を更新しました" -#: rhodecode/controllers/admin/settings.py:347 +#: rhodecode/controllers/admin/settings.py:348 msgid "Error occurred during updating visualisation settings" msgstr "表示設定の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:440 +#: rhodecode/controllers/admin/settings.py:441 msgid "Please enter email address" msgstr "メールアドレスを入力してください" -#: rhodecode/controllers/admin/settings.py:458 +#: rhodecode/controllers/admin/settings.py:459 msgid "Send email task created" msgstr "メール送信タスクを作成しました" -#: rhodecode/controllers/admin/settings.py:491 +#: rhodecode/controllers/admin/settings.py:492 msgid "Added new hook" msgstr "新しいフックを追加しました" -#: rhodecode/controllers/admin/settings.py:506 +#: rhodecode/controllers/admin/settings.py:507 msgid "Updated hooks" msgstr "フックを更新しました" -#: rhodecode/controllers/admin/settings.py:510 +#: rhodecode/controllers/admin/settings.py:511 msgid "Error occurred during hook creation" msgstr "フックの作成中にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:639 +#: rhodecode/controllers/admin/settings.py:640 msgid "Error occurred during updating labs settings" msgstr "ラボ設定の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:644 +#: rhodecode/controllers/admin/settings.py:645 msgid "Updated Labs settings" msgstr "ラボ設定を更新しました" -#: rhodecode/controllers/admin/user_groups.py:164 +#: rhodecode/controllers/admin/user_groups.py:165 #, python-format msgid "Created user group %(user_group_link)s" msgstr "ユーザーグループ %(user_group_link)s を作成しました" -#: rhodecode/controllers/admin/user_groups.py:178 +#: rhodecode/controllers/admin/user_groups.py:179 #, python-format msgid "Error occurred during creation of user group %s" msgstr "ユーザーグループ %s の作成中にエラーが発生しました" -#: rhodecode/controllers/admin/user_groups.py:219 +#: rhodecode/controllers/admin/user_groups.py:220 #, python-format msgid "Updated user group %s" msgstr "ユーザーグループ %s を更新しました" -#: rhodecode/controllers/admin/user_groups.py:235 +#: rhodecode/controllers/admin/user_groups.py:236 #, python-format msgid "Error occurred during update of user group %s" msgstr "ユーザーグループ %s の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/user_groups.py:257 +#: rhodecode/controllers/admin/user_groups.py:258 msgid "Successfully deleted user group" msgstr "ユーザーグループの削除に成功しました" -#: rhodecode/controllers/admin/user_groups.py:262 +#: rhodecode/controllers/admin/user_groups.py:263 msgid "An error occurred during deletion of user group" msgstr "ユーザーグループの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/user_groups.py:330 +#: rhodecode/controllers/admin/user_groups.py:331 msgid "Target group cannot be the same" msgstr "対象に同じ物を選ぶことはできません" -#: rhodecode/controllers/admin/user_groups.py:336 +#: rhodecode/controllers/admin/user_groups.py:337 msgid "User Group permissions updated" msgstr "ユーザーグループ権限を更新しました" -#: rhodecode/controllers/admin/user_groups.py:421 +#: rhodecode/controllers/admin/user_groups.py:422 msgid "User Group global permissions updated successfully" msgstr "ユーザーグループの全般の権限の更新に成功しました" #: rhodecode/controllers/admin/user_groups.py:437 -#: rhodecode/controllers/admin/users.py:595 +#: rhodecode/controllers/admin/users.py:477 msgid "An error occurred during permissions saving" msgstr "権限の保存時にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:153 +#: rhodecode/controllers/admin/user_groups.py:481 +msgid "User Group synchronization updated successfully" +msgstr "" + +#: rhodecode/controllers/admin/user_groups.py:485 +msgid "An error occurred during synchronization update" +msgstr "" + +#: rhodecode/controllers/admin/users.py:106 #, python-format msgid "Created user %(user_link)s" msgstr "ユーザー %(user_link)s を作成しました" -#: rhodecode/controllers/admin/users.py:169 +#: rhodecode/controllers/admin/users.py:122 #, python-format msgid "Error occurred during creation of user %s" msgstr "ユーザー %s の作成中にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:214 +#: rhodecode/controllers/admin/users.py:167 msgid "User updated successfully" msgstr "ユーザーの更新に成功しました" -#: rhodecode/controllers/admin/users.py:265 +#: rhodecode/controllers/admin/users.py:218 #, python-format msgid "Detached %s repositories" msgstr "%s 個のリポジトリを切り離しました" -#: rhodecode/controllers/admin/users.py:270 +#: rhodecode/controllers/admin/users.py:223 #, python-format msgid "Deleted %s repositories" msgstr " %s 個のリポジトリを削除しました" -#: rhodecode/controllers/admin/users.py:278 +#: rhodecode/controllers/admin/users.py:231 #, python-format msgid "Detached %s repository groups" msgstr "%s 個のリポジトリグループを切り離しました" -#: rhodecode/controllers/admin/users.py:283 +#: rhodecode/controllers/admin/users.py:236 #, python-format msgid "Deleted %s repository groups" msgstr "%s 個のリポジトリグループを削除しました" -#: rhodecode/controllers/admin/users.py:291 +#: rhodecode/controllers/admin/users.py:244 #, python-format msgid "Detached %s user groups" msgstr "%s 個のユーザーグループを切り離しました" -#: rhodecode/controllers/admin/users.py:296 +#: rhodecode/controllers/admin/users.py:249 #, python-format msgid "Deleted %s user groups" msgstr "%s 個のユーザーグループを削除しました" -#: rhodecode/controllers/admin/users.py:307 +#: rhodecode/controllers/admin/users.py:260 msgid "Successfully deleted user" msgstr "ユーザーの削除に成功しました" -#: rhodecode/controllers/admin/users.py:313 +#: rhodecode/controllers/admin/users.py:266 msgid "An error occurred during deletion of user" msgstr "ユーザーの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:332 +#: rhodecode/controllers/admin/users.py:285 msgid "Force password change disabled for user" msgstr "パスワード変更強制を無効化しました" -#: rhodecode/controllers/admin/users.py:334 +#: rhodecode/controllers/admin/users.py:287 msgid "Force password change enabled for user" msgstr "パスワード変更強制を有効化しました" -#: rhodecode/controllers/admin/users.py:338 +#: rhodecode/controllers/admin/users.py:291 msgid "An error occurred during password reset for user" msgstr "パスワードのリセット中にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:371 +#: rhodecode/controllers/admin/users.py:324 #, python-format msgid "Linked repository group `%s` as personal" msgstr "" -#: rhodecode/controllers/admin/users.py:377 +#: rhodecode/controllers/admin/users.py:330 #, python-format msgid "Created repository group `%s`" msgstr "リポジトリグループ `%s` を作成しました" -#: rhodecode/controllers/admin/users.py:381 +#: rhodecode/controllers/admin/users.py:334 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/controllers/admin/users.py:386 +#: rhodecode/controllers/admin/users.py:339 msgid "An error occurred during repository group creation for user" msgstr "ユーザーのリポジトリグループを作成中にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:406 -#: rhodecode/controllers/admin/users.py:427 -#: rhodecode/controllers/admin/users.py:459 -#: rhodecode/controllers/admin/users.py:490 -#: rhodecode/controllers/admin/users.py:507 -#: rhodecode/controllers/admin/users.py:530 -#: rhodecode/controllers/admin/users.py:604 -#: rhodecode/controllers/admin/users.py:617 -#: rhodecode/controllers/admin/users.py:675 -msgid "You can't edit this user" -msgstr "このユーザーは編集できません" - -#: rhodecode/controllers/admin/users.py:443 +#: rhodecode/controllers/admin/users.py:396 msgid "" "The user participates as reviewer in pull requests and cannot be deleted. " "You can set the user to \"inactive\" instead of deleting it." msgstr "ユーザーはレビュワーとしてプルリクエストに参加しているため削除できません。代わりに \"非アクティブ\" 状態にすることができます。" -#: rhodecode/controllers/admin/users.py:579 +#: rhodecode/controllers/admin/users.py:461 msgid "User global permissions updated successfully" msgstr "ユーザーの全般の権限の更新に成功しました" -#: rhodecode/controllers/admin/users.py:707 +#: rhodecode/controllers/admin/users.py:589 #, python-format msgid "An error occurred during ip saving:%s" msgstr "IP アドレスの保存中にエラーが発生しました: %s" -#: rhodecode/controllers/admin/users.py:722 +#: rhodecode/controllers/admin/users.py:604 msgid "An error occurred during ip saving" msgstr "IPアドレスの保存中にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:726 +#: rhodecode/controllers/admin/users.py:608 #, python-format msgid "Added ips %s to user whitelist" msgstr "ユーザーホワイトリストに IP アドレス %s を追加しました" -#: rhodecode/controllers/admin/users.py:744 +#: rhodecode/controllers/admin/users.py:626 msgid "Removed ip address from user whitelist" msgstr "ユーザーホワイトリストからIPアドレスを削除しました" -#: rhodecode/events/pullrequest.py:65 +#: rhodecode/events/pullrequest.py:68 msgid "pullrequest created" msgstr "プルリクエストの作成" -#: rhodecode/events/pullrequest.py:74 +#: rhodecode/events/pullrequest.py:77 msgid "pullrequest closed" msgstr "プルリクエストのクローズ" -#: rhodecode/events/pullrequest.py:83 +#: rhodecode/events/pullrequest.py:86 msgid "pullrequest commits updated" msgstr "プルリクエストのコミット更新" -#: rhodecode/events/pullrequest.py:92 +#: rhodecode/events/pullrequest.py:95 msgid "pullrequest review changed" msgstr "プルリクエストのレビュー変更" -#: rhodecode/events/pullrequest.py:101 +#: rhodecode/events/pullrequest.py:104 msgid "pullrequest merged" msgstr "プルリクエストのマージ" -#: rhodecode/events/pullrequest.py:110 +#: rhodecode/events/pullrequest.py:113 msgid "pullrequest commented" msgstr "プルリクエストのコメント" -#: rhodecode/events/repo.py:136 +#: rhodecode/events/repo.py:138 msgid "repository pre create" msgstr "リポジトリの作成準備" -#: rhodecode/events/repo.py:145 +#: rhodecode/events/repo.py:147 msgid "repository created" msgstr "リポジトリの作成" -#: rhodecode/events/repo.py:154 +#: rhodecode/events/repo.py:156 msgid "repository pre delete" msgstr "リポジトリの削除準備" -#: rhodecode/events/repo.py:163 +#: rhodecode/events/repo.py:165 msgid "repository deleted" msgstr "リポジトリの削除" -#: rhodecode/events/repo.py:199 +#: rhodecode/events/repo.py:201 msgid "repository pre pull" msgstr "リポジトリのプル準備" -#: rhodecode/events/repo.py:208 +#: rhodecode/events/repo.py:210 msgid "repository pull" msgstr "リポジトリのプル" -#: rhodecode/events/repo.py:217 +#: rhodecode/events/repo.py:219 msgid "repository pre push" msgstr "リポジトリのプッシュ準備" -#: rhodecode/events/repo.py:228 +#: rhodecode/events/repo.py:230 msgid "repository push" msgstr "リポジトリのプッシュ" @@ -1502,25 +1557,24 @@ msgstr "リポジトリグループの削除" msgid "repository group update" msgstr "リポジトリグループの更新" -#: rhodecode/events/user.py:34 +#: rhodecode/events/user.py:37 msgid "user registered" msgstr "ユーザーの登録" -#: rhodecode/events/user.py:48 +#: rhodecode/events/user.py:52 msgid "user pre create" msgstr "ユーザーの作成準備" -#: rhodecode/events/user.py:61 +#: rhodecode/events/user.py:66 msgid "user post create" msgstr "" -#: rhodecode/events/user.py:74 +#: rhodecode/events/user.py:80 msgid "user pre update" msgstr "ユーザーの更新準備" #: rhodecode/forms/__init__.py:32 rhodecode/templates/admin/gists/new.mako:62 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:31 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:88 +#: 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 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 @@ -1532,15 +1586,14 @@ msgstr "ユーザーの更新準備" #: 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_vcs.mako:46 +#: 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 #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 #: rhodecode/templates/admin/settings/settings_visual.mako:222 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:27 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:85 +#: 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_profile.mako:135 @@ -1550,17 +1603,17 @@ msgstr "リセット" #: rhodecode/forms/__init__.py:33 rhodecode/templates/admin/gists/show.mako:49 #: rhodecode/templates/admin/integrations/list.mako:211 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:60 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 #: rhodecode/templates/admin/permissions/permissions_ips.mako:26 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:56 +#: 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/base/issue_tracker_settings.mako:70 -#: rhodecode/templates/base/vcs_settings.mako:202 -#: rhodecode/templates/base/vcs_settings.mako:227 +#: 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/changeset/changeset_file_comment.mako:142 @@ -1569,9 +1622,9 @@ msgstr "リセット" #: rhodecode/templates/data_table/_dt_elements.mako:198 #: rhodecode/templates/data_table/_dt_elements.mako:210 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:35 -#: rhodecode/templates/files/files_source.mako:39 -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_source.mako:45 +#: rhodecode/templates/files/files_source.mako:49 +#: rhodecode/templates/files/files_source.mako:52 #: rhodecode/templates/pullrequests/pullrequest_show.mako:56 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" @@ -1610,28 +1663,28 @@ msgstr "インテグレーションの動作を、ルートレベルのリポジトリのみに制限する" msgid "Root repositories only" msgstr "ルートリポジトリのみ" -#: rhodecode/integrations/views.py:161 +#: rhodecode/integrations/views.py:160 msgid "{repo_name} repository" msgstr "{repo_name} リポジトリ" -#: rhodecode/integrations/views.py:164 +#: rhodecode/integrations/views.py:163 msgid "{repo_group_name} repo group" msgstr "{repo_group_name} リポジトリグループ" -#: rhodecode/integrations/views.py:171 +#: rhodecode/integrations/views.py:170 msgid "{name} integration" msgstr "{name} インテグレーション" -#: rhodecode/integrations/views.py:185 +#: rhodecode/integrations/views.py:184 msgid "Integration {integration_name} deleted successfully." msgstr "インテグレーション {integration_name} の削除に成功しました。" -#: rhodecode/integrations/views.py:265 +#: rhodecode/integrations/views.py:264 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "インテグレーションの設定保存時にエラーが発生しました。フォームの入力を確認してください。" -#: rhodecode/integrations/views.py:290 +#: rhodecode/integrations/views.py:289 msgid "Integration {integration_name} updated successfully." msgstr "インテグレーション {integration_name} の更新に成功しました。" @@ -1705,58 +1758,59 @@ msgid "" "Send events such as repo pushes and pull requests to your hipchat channel." msgstr "リポジトリのプッシュやプルリクエストなどのイベントを Hipchat チャンネルに送信する。" -#: rhodecode/integrations/types/slack.py:44 +#: rhodecode/integrations/types/slack.py:46 msgid "Slack service URL" msgstr "Slack のサービス URL" -#: rhodecode/integrations/types/slack.py:45 +#: rhodecode/integrations/types/slack.py:47 msgid "" "This can be setup at the slack app manager" msgstr "Slack app manager でセットアップできます" -#: rhodecode/integrations/types/slack.py:58 rhodecode/templates/login.mako:42 -#: rhodecode/templates/register.mako:40 +#: 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/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:90 -#: rhodecode/templates/base/base.mako:301 +#: rhodecode/templates/admin/users/users.mako:62 +#: rhodecode/templates/base/base.mako:304 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 msgid "Username" msgstr "ユーザー名" -#: rhodecode/integrations/types/slack.py:59 +#: rhodecode/integrations/types/slack.py:61 msgid "Username to show notifications coming from." msgstr "通知の発信元となるユーザー名。" -#: rhodecode/integrations/types/slack.py:68 +#: rhodecode/integrations/types/slack.py:70 msgid "Channel" msgstr "チャンネル" -#: rhodecode/integrations/types/slack.py:69 +#: rhodecode/integrations/types/slack.py:71 msgid "Channel to send notifications to." msgstr "通知の送信先となるチャンネル。" -#: rhodecode/integrations/types/slack.py:78 +#: rhodecode/integrations/types/slack.py:80 msgid "Emoji" msgstr "絵文字" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:81 msgid "Emoji to use eg. :studio_microphone:" msgstr "使用する絵文字 :studio_microphone: など" -#: rhodecode/integrations/types/slack.py:101 +#: rhodecode/integrations/types/slack.py:92 msgid "Slack" msgstr "Slack" -#: rhodecode/integrations/types/slack.py:102 +#: rhodecode/integrations/types/slack.py:93 msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "Slack のチャンネルにリポジトリのプッシュやプルリクエストなどのイベントを送信する。" @@ -1920,25 +1974,25 @@ msgstr "作成したタグ: %s" msgid "Commit not found" msgstr "コミットが見つかりません" -#: rhodecode/lib/auth.py:1189 +#: rhodecode/lib/auth.py:1197 #, python-format msgid "IP %s not allowed" msgstr "IPアドレス %s は許可されません" -#: rhodecode/lib/auth.py:1263 +#: rhodecode/lib/auth.py:1281 msgid "You need to be a registered user to perform this action" msgstr "このアクションを実行するためには登録済みのユーザーである必要があります" -#: rhodecode/lib/auth.py:1311 +#: rhodecode/lib/auth.py:1329 #, python-format msgid "Action not supported for %s." msgstr "%s に対するアクションはできません。" -#: rhodecode/lib/auth.py:1348 +#: rhodecode/lib/auth.py:1379 msgid "You need to be signed in to view this page" msgstr "このページを閲覧するためにはサインインが必要です" -#: rhodecode/lib/base.py:557 +#: rhodecode/lib/base.py:549 #, python-format msgid "The repository at %(repo_name)s cannot be located." msgstr "リポジトリ %(repo_name)s が見つかりません。" @@ -1964,36 +2018,16 @@ msgstr "検出された変更はありません" msgid "Click to select line" msgstr "行を選択" -#: rhodecode/lib/helpers.py:1515 +#: rhodecode/lib/helpers.py:1517 #, python-format msgid " and %s more" msgstr " と %s 以上" -#: rhodecode/lib/helpers.py:1519 +#: rhodecode/lib/helpers.py:1521 msgid "No Files" msgstr "ファイルなし" -#: rhodecode/lib/helpers.py:1592 -msgid "new file" -msgstr "新しいファイル" - -#: rhodecode/lib/helpers.py:1595 -msgid "mod" -msgstr "変更" - -#: rhodecode/lib/helpers.py:1598 -msgid "del" -msgstr "削除" - -#: rhodecode/lib/helpers.py:1601 -msgid "rename" -msgstr "リネーム" - -#: rhodecode/lib/helpers.py:1606 -msgid "chmod" -msgstr "chmod" - -#: rhodecode/lib/helpers.py:1853 +#: rhodecode/lib/helpers.py:1800 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2012,7 +2046,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1873 +#: rhodecode/lib/helpers.py:1820 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the" @@ -2052,9 +2086,9 @@ msgid "in ${val} and ${detail}" msgstr "" #: rhodecode/lib/utils2.py:515 -#: rhodecode/public/js/rhodecode-components.js:33194 -#: rhodecode/public/js/scripts.js:25042 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: 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/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "たったいま" @@ -2087,7 +2121,9 @@ msgstr "たったいま" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/model/db.py:2298 +#: 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 msgid "Repository no access" msgstr "リポジトリへのアクセス権限無し" @@ -2119,7 +2155,9 @@ msgstr "リポジトリへのアクセス権限無し" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/model/db.py:2299 +#: 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 msgid "Repository read access" msgstr "リポジトリに読込権限でアクセス" @@ -2151,7 +2189,9 @@ msgstr "リポジトリに読込権限でアクセス" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/model/db.py:2300 +#: 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 msgid "Repository write access" msgstr "リポジトリに書込権限でアクセス" @@ -2183,7 +2223,9 @@ msgstr "リポジトリに書込権限でアクセス" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 -#: rhodecode/model/db.py:2301 +#: 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 msgid "Repository admin access" msgstr "リポジトリに管理権限でアクセス" @@ -2255,7 +2297,9 @@ msgstr "RhodeCode 管理者" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/model/db.py:2319 +#: 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 msgid "Repository creation disabled" msgstr "リポジトリの作成を有効にする" @@ -2287,7 +2331,9 @@ msgstr "リポジトリの作成を有効にする" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 -#: rhodecode/model/db.py:2320 +#: 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 msgid "Repository creation enabled" msgstr "リポジトリの作成を有効にする" @@ -2319,7 +2365,9 @@ msgstr "リポジトリの作成を有効にする" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 -#: rhodecode/model/db.py:2324 +#: 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 msgid "Repository forking disabled" msgstr "リポジトリのフォークを無効にする" @@ -2351,7 +2399,9 @@ msgstr "リポジトリのフォークを無効にする" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/model/db.py:2325 +#: 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 msgid "Repository forking enabled" msgstr "リポジトリのフォークを有効にする" @@ -2404,7 +2454,9 @@ msgstr "Rhodecodeに登録した新しいユーザーを自動でアクティベートする" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 -#: rhodecode/model/db.py:3009 +#: 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 msgid "Not Reviewed" msgstr "未レビュー" @@ -2436,7 +2488,9 @@ msgstr "未レビュー" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 -#: rhodecode/model/db.py:3010 +#: 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 msgid "Approved" msgstr "承認" @@ -2468,7 +2522,9 @@ msgstr "承認" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 -#: rhodecode/model/db.py:3011 +#: 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 msgid "Rejected" msgstr "却下" @@ -2500,7 +2556,9 @@ msgstr "却下" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 -#: rhodecode/model/db.py:3012 +#: 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 msgid "Under Review" msgstr "レビュー中" @@ -2529,7 +2587,9 @@ msgstr "レビュー中" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/model/db.py:2303 +#: 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 msgid "Repository group no access" msgstr "リポジトリグループへのアクセス権限なし" @@ -2558,7 +2618,9 @@ msgstr "リポジトリグループへのアクセス権限なし" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/model/db.py:2304 +#: 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 msgid "Repository group read access" msgstr "リポジトリグループに読込権限でアクセス" @@ -2587,7 +2649,9 @@ msgstr "リポジトリグループに読込権限でアクセス" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/model/db.py:2305 +#: 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 msgid "Repository group write access" msgstr "リポジトリグループに書込権限でアクセス" @@ -2616,7 +2680,9 @@ msgstr "リポジトリグループに書込権限でアクセス" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 -#: rhodecode/model/db.py:2306 +#: 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 msgid "Repository group admin access" msgstr "リポジトリグループに管理権限でアクセス" @@ -2644,7 +2710,9 @@ msgstr "リポジトリグループに管理権限でアクセス" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/model/db.py:2308 +#: 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 msgid "User group no access" msgstr "ユーザーグループへのアクセス権限なし" @@ -2672,7 +2740,9 @@ msgstr "ユーザーグループへのアクセス権限なし" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 -#: rhodecode/model/db.py:2309 +#: 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 msgid "User group read access" msgstr "ユーザーグループに読込権限でアクセス" @@ -2700,7 +2770,9 @@ msgstr "ユーザーグループに読込権限でアクセス" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/model/db.py:2310 +#: 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 msgid "User group write access" msgstr "ユーザーグループに書込権限でアクセス" @@ -2728,7 +2800,9 @@ msgstr "ユーザーグループに書込権限でアクセス" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/model/db.py:2311 +#: 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 msgid "User group admin access" msgstr "ユーザーグループに管理権限でアクセス" @@ -2756,7 +2830,9 @@ msgstr "ユーザーグループに管理権限でアクセス" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/model/db.py:2313 +#: 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 msgid "Repository Group creation disabled" msgstr "リポジトリグループの作成を無効にする" @@ -2784,7 +2860,9 @@ msgstr "リポジトリグループの作成を無効にする" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/model/db.py:2314 +#: 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 msgid "Repository Group creation enabled" msgstr "リポジトリグループの作成を有効にする" @@ -2812,7 +2890,9 @@ msgstr "リポジトリグループの作成を有効にする" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/model/db.py:2316 +#: 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 msgid "User Group creation disabled" msgstr "ユーザーグループの作成を無効にする" @@ -2840,7 +2920,9 @@ msgstr "ユーザーグループの作成を無効にする" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/model/db.py:2317 +#: 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 msgid "User Group creation enabled" msgstr "ユーザーグループの作成を有効にする" @@ -2868,7 +2950,9 @@ msgstr "ユーザーグループの作成を有効にする" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 -#: rhodecode/model/db.py:2327 +#: 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 msgid "Registration disabled" msgstr "新規登録を無効にする" @@ -2896,7 +2980,9 @@ msgstr "新規登録を無効にする" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/model/db.py:2328 +#: 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 msgid "User Registration with manual account activation" msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" @@ -2924,7 +3010,9 @@ msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/model/db.py:2329 +#: 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 msgid "User Registration with automatic account activation" msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" @@ -2952,7 +3040,9 @@ msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 -#: rhodecode/model/db.py:2335 rhodecode/model/permission.py:95 +#: 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 msgid "Manual activation of external account" msgstr "外部アカウントを手動でアクティベートする" @@ -2980,7 +3070,9 @@ msgstr "外部アカウントを手動でアクティベートする" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 -#: rhodecode/model/db.py:2336 rhodecode/model/permission.py:96 +#: 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 msgid "Automatic activation of external account" msgstr "外部アカウントを自動でアクティベートする" @@ -3002,7 +3094,9 @@ msgstr "外部アカウントを自動でアクティベートする" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/model/db.py:2321 +#: 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 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成が有効です" @@ -3025,7 +3119,9 @@ msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成が有効です" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/model/db.py:2322 +#: 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 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成は無効です" @@ -3045,7 +3141,9 @@ msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成は無効です" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/model/db.py:2296 +#: 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 msgid "RhodeCode Super Administrator" msgstr "" @@ -3062,7 +3160,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 -#: rhodecode/model/db.py:2338 +#: 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 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3079,7 +3179,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 -#: rhodecode/model/db.py:2339 +#: 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 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3087,7 +3189,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 rhodecode/model/db.py:913 +#: 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 msgid "all" msgstr "すべて" @@ -3095,7 +3199,9 @@ msgstr "すべて" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 rhodecode/model/db.py:914 +#: 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 msgid "http/web interface" msgstr "HTTP/Web インターフェース" @@ -3103,7 +3209,9 @@ msgstr "HTTP/Web インターフェース" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 rhodecode/model/db.py:915 +#: 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 msgid "vcs (git/hg/svn protocol)" msgstr "VCS (git/hg/svn プロトコル)" @@ -3111,7 +3219,9 @@ msgstr "VCS (git/hg/svn プロトコル)" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 rhodecode/model/db.py:916 +#: 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 msgid "api calls" msgstr "API 呼び出し" @@ -3119,7 +3229,9 @@ msgstr "API 呼び出し" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 rhodecode/model/db.py:917 +#: 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 msgid "feed access" msgstr "フィードへのアクセス" @@ -3128,84 +3240,70 @@ msgstr "フィードへのアクセス" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 -#: rhodecode/model/db.py:2067 +#: 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 msgid "No parent" msgstr "親がありません" -#: rhodecode/lib/index/whoosh.py:148 +#: 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 +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 +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 +msgid "Password reset disabled" +msgstr "" + +#: rhodecode/lib/index/whoosh.py:149 msgid "Invalid search query. Try quoting it." msgstr "無効な検索クエリーです。\\\"で囲んで下さい" -#: rhodecode/lib/index/whoosh.py:150 +#: rhodecode/lib/index/whoosh.py:151 msgid "There is no index to search in. Please run whoosh indexer" msgstr "検索するためのインデックスがありません。whooshでインデックスを作成して下さい" -#: rhodecode/lib/index/whoosh.py:155 +#: rhodecode/lib/index/whoosh.py:156 msgid "An error occurred during this search operation" msgstr "検索を実行する際にエラーが発生しました" -#: rhodecode/lib/index/whoosh.py:163 +#: rhodecode/lib/index/whoosh.py:164 msgid "Index Type" msgstr "インデックスタイプ" -#: rhodecode/lib/index/whoosh.py:164 +#: rhodecode/lib/index/whoosh.py:165 msgid "File Index" msgstr "ファイルインデックス" -#: rhodecode/lib/index/whoosh.py:165 rhodecode/lib/index/whoosh.py:170 +#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171 msgid "Indexed documents" msgstr "インデックス化されたドキュメント" -#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172 +#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173 msgid "Last update" msgstr "最後の更新" -#: rhodecode/lib/index/whoosh.py:169 +#: rhodecode/lib/index/whoosh.py:170 msgid "Commit index" msgstr "コミットインデックス" -#: rhodecode/login/views.py:249 rhodecode/login/views.py:311 -msgid "Bad captcha" -msgstr "" - -#: rhodecode/login/views.py:258 -msgid "You have successfully registered with RhodeCode" -msgstr "RhodeCode に登録されました" - -#: rhodecode/login/views.py:300 -msgid "Password reset has been disabled." -msgstr "" - -#: rhodecode/login/views.py:327 -msgid "Your password reset link was sent" -msgstr "パスワードリセットのリンクを送信しました" - -#: rhodecode/login/views.py:351 -msgid "" -"Your password reset was successful, a new password has been sent to your " -"email" -msgstr "パスワードリセットが成功しました、新しいパスワードをあなたのメールアドレスに送信しました" - -#: rhodecode/model/comment.py:367 +#: rhodecode/model/comment.py:368 msgid "made a comment" msgstr "コミットを作成する" -#: rhodecode/model/comment.py:368 +#: rhodecode/model/comment.py:369 msgid "Show it now" msgstr "表示する" -#: rhodecode/model/db.py:2331 -msgid "Password reset enabled" -msgstr "" - -#: rhodecode/model/db.py:2332 -msgid "Password reset hidden" -msgstr "" - -#: rhodecode/model/db.py:2333 -msgid "Password reset disabled" -msgstr "" - #: rhodecode/model/forms.py:85 msgid "Please enter a login" msgstr "ログイン名を入力してください" @@ -3340,9 +3438,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:103 -#: rhodecode/templates/base/base.mako:406 -#: rhodecode/templates/base/base.mako:413 +#: rhodecode/templates/admin/users/users.mako:75 +#: rhodecode/templates/base/base.mako:409 +#: rhodecode/templates/base/base.mako:416 msgid "Admin" msgstr "管理" @@ -3373,74 +3471,74 @@ msgstr "" msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:77 +#: rhodecode/model/pull_request.py:78 msgid "This pull request can be automatically merged." msgstr "このプルリクエストは自動的にマージできます。" -#: rhodecode/model/pull_request.py:79 +#: rhodecode/model/pull_request.py:80 msgid "This pull request cannot be merged because of an unhandled exception." msgstr "このプルリクエストは未対処の例外があるためマージできません。" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:83 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:84 +#: rhodecode/model/pull_request.py:85 msgid "This pull request could not be merged because push to target failed." msgstr "このプルリクエストはターゲットへのプッシュに失敗したためマージできませんでした。" -#: rhodecode/model/pull_request.py:87 +#: rhodecode/model/pull_request.py:88 msgid "This pull request cannot be merged because the target is not a head." msgstr "このプルリクエストはターゲットが最新でないためマージできません。" -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:91 msgid "" "This pull request cannot be merged because the source contains more branches" " than the target." msgstr "このプルリクエストはターゲットよりも多くのブランチがソースにあるためマージできません。" -#: rhodecode/model/pull_request.py:93 +#: rhodecode/model/pull_request.py:94 msgid "" "This pull request cannot be merged because the target has multiple heads." msgstr "このプルリクエストはターゲットに複数のヘッドがあるためマージできません。" -#: rhodecode/model/pull_request.py:96 +#: rhodecode/model/pull_request.py:97 msgid "" "This pull request cannot be merged because the target repository is locked." msgstr "このプルリクエストはターゲットリポジトリがロックされているためマージできません。" -#: rhodecode/model/pull_request.py:99 +#: rhodecode/model/pull_request.py:100 msgid "" "This pull request cannot be merged because the target or the source " "reference is missing." msgstr "このプルリクエストはターゲットまたはソースの参照が存在しないためマージできません。" -#: rhodecode/model/pull_request.py:102 +#: rhodecode/model/pull_request.py:103 msgid "" "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:105 +#: rhodecode/model/pull_request.py:106 msgid "" "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:108 +#: rhodecode/model/pull_request.py:109 msgid "" "This pull request cannot be merged because of conflicts related to sub " "repositories." msgstr "" -#: rhodecode/model/pull_request.py:114 +#: rhodecode/model/pull_request.py:115 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:116 +#: rhodecode/model/pull_request.py:117 msgid "Pull request update failed because of an unknown error." msgstr "" -#: rhodecode/model/pull_request.py:118 -msgid "No update needed because the source reference is already up to date." +#: rhodecode/model/pull_request.py:119 +msgid "No update needed because the source and target have not changed." msgstr "" #: rhodecode/model/pull_request.py:121 @@ -3471,51 +3569,51 @@ msgstr "%(source_repo)s %(source_ref_name)s からのプルリクエスト #%(pr_id)s をマージ\n\n %(pr_title)s" msgid "Pull request merged and closed" msgstr "プルリクエストはマージされクローズされました" -#: rhodecode/model/pull_request.py:1041 +#: rhodecode/model/pull_request.py:1087 msgid "Server-side pull request merging is disabled." msgstr "サーバでのプルリクエストのマージは無効化されています。" -#: rhodecode/model/pull_request.py:1043 +#: rhodecode/model/pull_request.py:1089 msgid "This pull request is closed." msgstr "このプルリクエストはクローズしました。" -#: rhodecode/model/pull_request.py:1055 +#: rhodecode/model/pull_request.py:1101 msgid "Pull request merging is not supported." msgstr "プルリクエストのマージはサポートされていません。" -#: rhodecode/model/pull_request.py:1073 +#: rhodecode/model/pull_request.py:1119 msgid "Target repository large files support is disabled." msgstr "ターゲットリポジトリのラージファイル拡張は無効化されています。" -#: rhodecode/model/pull_request.py:1076 +#: rhodecode/model/pull_request.py:1122 msgid "Source repository large files support is disabled." msgstr "ソースリポジトリのラージファイル拡張は無効化されています。" -#: rhodecode/model/pull_request.py:1233 rhodecode/model/scm.py:790 +#: rhodecode/model/pull_request.py:1279 rhodecode/model/scm.py:790 msgid "Bookmarks" msgstr "ブックマーク" -#: rhodecode/model/pull_request.py:1238 +#: rhodecode/model/pull_request.py:1284 msgid "Commit IDs" msgstr "コミットID" -#: rhodecode/model/pull_request.py:1241 +#: rhodecode/model/pull_request.py:1287 msgid "Closed Branches" msgstr "閉鎖済みブランチ" -#: rhodecode/model/pull_request.py:1364 +#: rhodecode/model/pull_request.py:1411 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1375 +#: rhodecode/model/pull_request.py:1424 msgid "Pull request reviewer approval is pending." msgstr "プルリクエストはレビュワーの承認待ちです。" -#: rhodecode/model/pull_request.py:1390 +#: rhodecode/model/pull_request.py:1439 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1393 +#: rhodecode/model/pull_request.py:1442 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" @@ -3523,36 +3621,36 @@ msgstr "" msgid "latest tip" msgstr "最新のtip" -#: rhodecode/model/user.py:125 +#: rhodecode/model/user.py:126 msgid "You can't Edit this user since it's crucial for entire application" msgstr "このユーザーを編集できません。このユーザーはアプリケーションにとって必要不可欠です。" -#: rhodecode/model/user.py:291 +#: rhodecode/model/user.py:292 #, 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:464 +#: rhodecode/model/user.py:462 msgid "You can't remove this user since it's crucial for entire application" msgstr "このユーザーを削除できません。このユーザーはアプリケーションにとって必要不可欠です。" -#: rhodecode/model/user.py:472 +#: rhodecode/model/user.py:470 #, 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:481 +#: rhodecode/model/user.py:479 #, 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:490 +#: rhodecode/model/user.py:488 #, python-format msgid "" "user \"%s\" still owns %s user groups and cannot be removed. Switch owners " @@ -3885,369 +3983,371 @@ msgstr "パスワードが正しくありません" msgid "New password must be different to old password" msgstr "新しいパスワードは古いパスワードと異なるものでないといけません" -#: rhodecode/public/js/rhodecode-components.js:31198 -#: rhodecode/public/js/scripts.js:23046 +#: 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/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "結果がありません" -#: rhodecode/public/js/rhodecode-components.js:33129 -#: rhodecode/public/js/scripts.js:24977 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: 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/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "{0} 年" -#: rhodecode/public/js/rhodecode-components.js:33130 -#: rhodecode/public/js/scripts.js:24978 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: 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/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "{0} ヶ月" -#: rhodecode/public/js/rhodecode-components.js:33131 -#: rhodecode/public/js/scripts.js:24979 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: 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/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "{0} 日" -#: rhodecode/public/js/rhodecode-components.js:33132 -#: rhodecode/public/js/scripts.js:24980 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: 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/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "{0} 時間" -#: rhodecode/public/js/rhodecode-components.js:33133 -#: rhodecode/public/js/scripts.js:24981 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: 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/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "{0} 分" -#: rhodecode/public/js/rhodecode-components.js:33134 -#: rhodecode/public/js/scripts.js:24982 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: 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/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "{0} 秒" -#: rhodecode/public/js/rhodecode-components.js:33154 -#: rhodecode/public/js/scripts.js:25002 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: 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/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33162 -#: rhodecode/public/js/scripts.js:25010 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: 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/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "{0} 前" -#: rhodecode/public/js/rhodecode-components.js:33174 -#: rhodecode/public/js/scripts.js:25022 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: 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/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33176 -#: rhodecode/public/js/scripts.js:25024 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: 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/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33180 -#: rhodecode/public/js/scripts.js:25028 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: 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/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33182 -#: rhodecode/public/js/scripts.js:25030 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: 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/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33184 -#: rhodecode/public/js/scripts.js:25032 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: 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/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47027 -#: rhodecode/public/js/scripts.js:38875 +#: 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/select2/translations.js:4 msgid "Loading more results..." msgstr "結果を読み込み中..." -#: rhodecode/public/js/rhodecode-components.js:47030 -#: rhodecode/public/js/scripts.js:38878 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: 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/select2/translations.js:7 msgid "Searching..." msgstr "検索中..." -#: rhodecode/public/js/rhodecode-components.js:47033 -#: rhodecode/public/js/scripts.js:38881 +#: 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/select2/translations.js:10 msgid "No matches found" msgstr "一致するものが見つかりません" -#: rhodecode/public/js/rhodecode-components.js:47036 -#: rhodecode/public/js/scripts.js:38884 +#: 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/select2/translations.js:13 msgid "Loading failed" msgstr "読み込み失敗" -#: rhodecode/public/js/rhodecode-components.js:47040 -#: rhodecode/public/js/scripts.js:38888 +#: 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/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "1 件の結果があります。 Enter で選択できます。" -#: rhodecode/public/js/rhodecode-components.js:47042 -#: rhodecode/public/js/scripts.js:38890 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: 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/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:47047 -#: rhodecode/public/js/scripts.js:38895 +#: 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/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "{0} 文字以上入力してください" -#: rhodecode/public/js/rhodecode-components.js:47049 -#: rhodecode/public/js/scripts.js:38897 +#: 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/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "{0} 文字以上入力してください" -#: rhodecode/public/js/rhodecode-components.js:47054 -#: rhodecode/public/js/scripts.js:38902 +#: 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/select2/translations.js:31 msgid "Please delete {0} character" msgstr "{0} 文字削除してください" -#: rhodecode/public/js/rhodecode-components.js:47056 -#: rhodecode/public/js/scripts.js:38904 +#: 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/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "{0} 文字削除してください" -#: rhodecode/public/js/rhodecode-components.js:47060 -#: rhodecode/public/js/scripts.js:38908 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: 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/select2/translations.js:37 msgid "You can only select {0} item" msgstr "{0} 件のみ選択できます" -#: rhodecode/public/js/rhodecode-components.js:47062 -#: rhodecode/public/js/scripts.js:38910 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: 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/select2/translations.js:39 msgid "You can only select {0} items" msgstr "{0} 件のみ選択できます" -#: rhodecode/public/js/rhodecode-components.js:47991 -#: rhodecode/public/js/scripts.js:39839 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: 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/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47993 -#: rhodecode/public/js/scripts.js:39841 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: 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/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48426 -#: rhodecode/public/js/scripts.js:40274 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: 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/src/rhodecode/codemirror.js:296 msgid "Set status to Approved" msgstr "ステータスを承認にする" -#: rhodecode/public/js/rhodecode-components.js:48445 -#: rhodecode/public/js/scripts.js:40293 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: 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/src/rhodecode/codemirror.js:315 msgid "Set status to Rejected" msgstr "ステータスを拒否にする" -#: rhodecode/public/js/rhodecode-components.js:48464 -#: rhodecode/public/js/scripts.js:40312 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: 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/src/rhodecode/codemirror.js:334 +#: rhodecode/templates/email_templates/commit_comment.mako:99 +#: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48484 -#: rhodecode/public/js/scripts.js:40332 +#: 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/src/rhodecode/codemirror.js:354 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48848 -#: rhodecode/public/js/scripts.js:40696 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/comments.js:123 +#: 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/src/rhodecode/comments.js:125 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48927 -#: rhodecode/public/js/scripts.js:40775 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 -#: rhodecode/public/js/src/rhodecode/comments.js:202 +#: 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/src/rhodecode/comments.js:209 msgid "Status Review" msgstr "ステータスレビュー" -#: rhodecode/public/js/rhodecode-components.js:48941 -#: rhodecode/public/js/scripts.js:40789 +#: 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/src/rhodecode/comments.js:216 +#: rhodecode/public/js/src/rhodecode/comments.js:224 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "選択したステータス ({0}) を元にコメントが自動的に設定されます..." -#: rhodecode/public/js/rhodecode-components.js:49089 -#: rhodecode/public/js/scripts.js:40937 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/comments.js:364 +#: 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/src/rhodecode/comments.js:381 msgid "Submitting..." msgstr "送信中..." -#: rhodecode/public/js/rhodecode-components.js:49140 -#: rhodecode/public/js/scripts.js:40988 +#: 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/src/rhodecode/comments.js:415 +#: rhodecode/public/js/src/rhodecode/comments.js:432 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "読み込み中..." -#: rhodecode/public/js/rhodecode-components.js:49245 -#: rhodecode/public/js/scripts.js:41093 +#: 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/src/rhodecode/comments.js:520 +#: rhodecode/public/js/src/rhodecode/comments.js:537 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49316 -#: rhodecode/public/js/scripts.js:41164 +#: 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/src/rhodecode/comments.js:591 +#: 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:49393 -#: rhodecode/public/js/scripts.js:41241 +#: 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/src/rhodecode/comments.js:668 +#: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49507 -#: rhodecode/public/js/scripts.js:41355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 -#: rhodecode/public/js/src/rhodecode/comments.js:782 +#: 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/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49713 -#: rhodecode/public/js/scripts.js:41561 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: 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/src/rhodecode/files.js:150 msgid "truncated result" msgstr "省略された結果" -#: rhodecode/public/js/rhodecode-components.js:49715 -#: rhodecode/public/js/scripts.js:41563 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: 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/src/rhodecode/files.js:152 msgid "truncated results" msgstr "省略された結果" -#: rhodecode/public/js/rhodecode-components.js:49724 -#: rhodecode/public/js/scripts.js:41572 +#: 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/src/rhodecode/files.js:161 msgid "No matching files" msgstr "マッチするファイルはありません" -#: rhodecode/public/js/rhodecode-components.js:49859 -#: rhodecode/public/js/scripts.js:41707 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: 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/src/rhodecode/files.js:296 msgid "Selection link" msgstr "セレクション・リンク" -#: rhodecode/public/js/rhodecode-components.js:49899 -#: rhodecode/public/js/scripts.js:41747 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: 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/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "このリポジトリのフォローをやめる" -#: rhodecode/public/js/rhodecode-components.js:49900 -#: rhodecode/public/js/scripts.js:41748 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 +#: 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/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "アンフォロー" -#: rhodecode/public/js/rhodecode-components.js:49909 -#: rhodecode/public/js/scripts.js:41757 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: 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/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "このリポジトリのフォローする" -#: rhodecode/public/js/rhodecode-components.js:49910 -#: rhodecode/public/js/scripts.js:41758 +#: 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/src/rhodecode/followers.js:37 msgid "Follow" msgstr "フォロー" -#: rhodecode/public/js/rhodecode-components.js:50366 -#: rhodecode/public/js/scripts.js:42214 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:212 +#: 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 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50937 -#: rhodecode/public/js/scripts.js:42785 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: 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/src/rhodecode.js:142 msgid "file" msgstr "ファイル" -#: rhodecode/public/js/rhodecode-components.js:50957 -#: rhodecode/public/js/scripts.js:42805 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: 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/src/rhodecode.js:162 msgid "Show more" msgstr "もっと表示" @@ -4257,14 +4357,14 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:479 -#: rhodecode/templates/codeblocks/diffs.mako:484 +#: rhodecode/templates/codeblocks/diffs.mako:488 +#: rhodecode/templates/codeblocks/diffs.mako:493 msgid "Add another comment" msgstr "別のコメントを追加" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:320 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:325 msgid "Close" msgstr "" @@ -4322,81 +4422,102 @@ msgstr "新しいプルリクエストを作成" msgid "Open new pull request for selected commit" msgstr "選択したコミットから新しいプルリクエストを作成" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +msgid "Saving..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: 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:40 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 -msgid "Show selected commit __S" -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:48 -#: rhodecode/public/js/src/i18n_messages.js:7 -msgid "Switch to chat" -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 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: 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:54 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 +#: 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:59 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "有効" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 msgid "files" msgstr "ファイル" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/templates/pullrequests/pullrequest.mako:108 +msgid "loading..." +msgstr "読み込み中..." + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -msgid "{0} days" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +msgid "{0} out of {1} users" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 msgid "{0} years" msgstr "" +#: rhodecode/public/js/src/math_jax/extensions/HelpDialog.js:19 +msgid "HelpDialog" +msgstr "" + +#: rhodecode/public/js/src/math_jax/jax/output/HTML-CSS/autoload/mglyph.js:19 +msgid "MathML" +msgstr "" + #: rhodecode/public/js/vendors/webcomponentsjs/webcomponents.min.js:11 msgid "UIEvent" msgstr "" @@ -4413,10 +4534,6 @@ msgstr "" msgid "FocusEvent" msgstr "" -#: rhodecode/svn_support/events.py:30 -msgid "Configuration for Apaache mad_dav_svn changed." -msgstr "" - #: rhodecode/templates/index.mako:5 msgid "Dashboard" msgstr "ダッシュボード" @@ -4474,6 +4591,7 @@ msgstr "リポジトリグループを編集" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:15 #: 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 #: rhodecode/templates/base/perms_summary.mako:102 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 @@ -4486,22 +4604,25 @@ msgstr "名前" #: rhodecode/templates/index_base.mako:100 #: rhodecode/templates/index_base.mako:125 #: rhodecode/templates/admin/gists/index.mako:114 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:81 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 -#: rhodecode/templates/admin/repos/repo_add_base.mako:32 +#: 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/repos.mako:57 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 #: rhodecode/templates/admin/user_groups/user_groups.mako:57 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +#: 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/base/issue_tracker_settings.mako:10 #: rhodecode/templates/changeset/changeset.mako:53 #: rhodecode/templates/compare/compare_commits.mako:20 -#: rhodecode/templates/email_templates/commit_comment.mako:82 +#: 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 #: rhodecode/templates/files/file_tree_detail.mako:5 @@ -4509,8 +4630,8 @@ msgstr "名前" #: rhodecode/templates/forks/fork.mako:48 #: rhodecode/templates/forks/forks_data.mako:9 #: rhodecode/templates/pullrequests/pullrequest.mako:47 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:158 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:163 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:460 #: rhodecode/templates/summary/components.mako:73 msgid "Description" msgstr "説明" @@ -4525,7 +4646,8 @@ msgstr "説明" #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/users/user_edit_groups.mako:65 #: rhodecode/templates/forks/forks_data.mako:7 #: rhodecode/templates/summary/components.mako:195 msgid "Owner" @@ -4546,9 +4668,9 @@ msgstr "最後の変更点" #: rhodecode/templates/changelog/changelog_summary_data.mako:8 #: rhodecode/templates/changeset/changeset.mako:36 #: rhodecode/templates/compare/compare_commits.mako:18 -#: rhodecode/templates/email_templates/commit_comment.mako:45 -#: rhodecode/templates/email_templates/commit_comment.mako:81 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: 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/search/search_commit.mako:6 #: rhodecode/templates/tags/tags.mako:66 msgid "Commit" @@ -4563,45 +4685,45 @@ msgstr "%s リポジトリグループダッシュボード" msgid "Home" msgstr "ホーム" -#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:34 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:326 +#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:329 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "サインイン" -#: rhodecode/templates/login.mako:36 +#: rhodecode/templates/login.mako:37 msgid "Go to the registration page to create a new account." msgstr "" -#: rhodecode/templates/login.mako:57 +#: rhodecode/templates/login.mako:58 msgid "Remember me" msgstr "次回から自動的にサインイン" -#: rhodecode/templates/login.mako:61 +#: rhodecode/templates/login.mako:62 msgid "Forgot your password?" msgstr "" -#: rhodecode/templates/login.mako:65 -#: rhodecode/templates/password_reset.mako:34 +#: rhodecode/templates/login.mako:66 +#: rhodecode/templates/password_reset.mako:35 msgid "Password reset is disabled. Please contact " msgstr "" -#: rhodecode/templates/login.mako:67 -#: rhodecode/templates/password_reset.mako:36 -#: rhodecode/templates/base/base.mako:43 +#: rhodecode/templates/login.mako:68 +#: rhodecode/templates/password_reset.mako:37 +#: rhodecode/templates/base/base.mako:46 #: rhodecode/templates/errors/error_document.mako:64 msgid "Support" msgstr "サポート" -#: rhodecode/templates/login.mako:68 -#: rhodecode/templates/password_reset.mako:37 +#: 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 msgid "or" msgstr "または" -#: rhodecode/templates/login.mako:70 -#: rhodecode/templates/password_reset.mako:39 +#: rhodecode/templates/login.mako:71 +#: rhodecode/templates/password_reset.mako:40 msgid "an administrator if you need help." msgstr "" @@ -4609,28 +4731,28 @@ msgstr "" msgid "Reset Password" msgstr "" -#: rhodecode/templates/password_reset.mako:46 +#: rhodecode/templates/password_reset.mako:47 msgid "Reset your Password" msgstr "パスワードをリセット" -#: rhodecode/templates/password_reset.mako:47 +#: rhodecode/templates/password_reset.mako:48 msgid "Go to the login page to sign in." msgstr "" -#: rhodecode/templates/password_reset.mako:51 +#: rhodecode/templates/password_reset.mako:52 msgid "Email Address" msgstr "メールアドレス" -#: rhodecode/templates/password_reset.mako:60 -#: rhodecode/templates/register.mako:84 +#: rhodecode/templates/password_reset.mako:61 +#: rhodecode/templates/register.mako:85 msgid "Captcha" msgstr "キャプチャ" -#: rhodecode/templates/password_reset.mako:70 +#: rhodecode/templates/password_reset.mako:71 msgid "Send password reset email" msgstr "パスワードリセットのメールを送信" -#: rhodecode/templates/password_reset.mako:71 +#: rhodecode/templates/password_reset.mako:72 msgid "Password reset link will be sent to matching email address" msgstr "" @@ -4638,49 +4760,49 @@ msgstr "" msgid "Create an Account" msgstr "" -#: rhodecode/templates/register.mako:34 +#: rhodecode/templates/register.mako:35 msgid "Create an account" msgstr "" -#: rhodecode/templates/register.mako:35 +#: rhodecode/templates/register.mako:36 msgid "Go to the login page to sign in with an existing account." msgstr "" -#: rhodecode/templates/register.mako:54 +#: rhodecode/templates/register.mako:55 msgid "Re-enter password" msgstr "パスワード再入力" -#: rhodecode/templates/register.mako:61 +#: rhodecode/templates/register.mako:62 #: rhodecode/templates/admin/my_account/my_account_profile.mako:32 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:33 #: 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:94 +#: rhodecode/templates/admin/users/users.mako:66 msgid "First Name" msgstr "名前" -#: rhodecode/templates/register.mako:68 +#: rhodecode/templates/register.mako:69 #: rhodecode/templates/admin/my_account/my_account_profile.mako:40 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:42 #: 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:96 +#: rhodecode/templates/admin/users/users.mako:68 msgid "Last Name" msgstr "名字" -#: rhodecode/templates/register.mako:96 +#: rhodecode/templates/register.mako:97 msgid "Account activation requires admin approval." msgstr "" -#: rhodecode/templates/register.mako:103 +#: rhodecode/templates/register.mako:104 msgid "Create Account" msgstr "" #: rhodecode/templates/admin/admin.mako:5 #: rhodecode/templates/admin/admin.mako:15 -#: rhodecode/templates/base/base.mako:72 +#: rhodecode/templates/base/base.mako:75 msgid "Admin journal" msgstr "管理者ジャーナル" @@ -4689,6 +4811,7 @@ msgid "journal filter..." msgstr "ジャーナルフィルタ..." #: rhodecode/templates/admin/admin.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "フィルタ" @@ -4700,31 +4823,38 @@ msgid_plural "%s entries" msgstr[0] "%s 個のエントリ" #: rhodecode/templates/admin/admin.mako:17 +#: rhodecode/templates/admin/users/user_edit_audit.mako:17 #: rhodecode/templates/journal/journal.mako:17 msgid "Example Queries" msgstr "" #: rhodecode/templates/admin/admin_log.mako:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 #: rhodecode/templates/admin/repos/repos.mako:69 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 -#: rhodecode/templates/admin/user_groups/user_groups.mako:66 -#: rhodecode/templates/admin/users/users.mako:107 -#: rhodecode/templates/files/files_detail.mako:63 +#: 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/files/files_detail.mako:58 msgid "Action" msgstr "アクション" #: rhodecode/templates/admin/admin_log.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/bookmarks/bookmarks.mako:61 #: rhodecode/templates/branches/branches.mako:60 #: rhodecode/templates/tags/tags.mako:61 @@ -4732,10 +4862,12 @@ 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 msgid "No actions yet" msgstr "まだアクションがありません" @@ -4776,7 +4908,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:135 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 -#: rhodecode/templates/admin/repos/repo_add_base.mako:90 +#: 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 @@ -4786,6 +4918,7 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:120 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:102 #: rhodecode/templates/admin/users/user_add.mako:128 +#: rhodecode/templates/admin/users/user_edit_groups.mako:27 #: rhodecode/templates/admin/users/user_edit_profile.mako:134 #: rhodecode/templates/base/default_perms_box.mako:88 msgid "Save" @@ -4807,18 +4940,18 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/index.mako:110 #: rhodecode/templates/admin/integrations/list.mako:103 -#: rhodecode/templates/admin/repos/repo_add_base.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:75 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "リポジトリの種別" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 -#: rhodecode/templates/admin/repos/repo_add_base.mako:82 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 msgid "Private Repository" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:86 +#: rhodecode/templates/admin/repos/repo_add_base.mako:97 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:112 #: rhodecode/templates/forks/fork.mako:87 msgid "" @@ -4884,7 +5017,7 @@ msgid "Update Gist" msgstr "Gistを更新" #: rhodecode/templates/admin/gists/edit.mako:102 -#: rhodecode/templates/base/issue_tracker_settings.mako:74 +#: rhodecode/templates/base/issue_tracker_settings.mako:73 #: rhodecode/templates/changeset/changeset_file_comment.mako:385 #: rhodecode/templates/codeblocks/diffs.mako:76 #: rhodecode/templates/files/files_add.mako:102 @@ -4960,8 +5093,8 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:180 #: rhodecode/templates/compare/compare_commits.mako:17 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:304 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:457 #: rhodecode/templates/pullrequests/pullrequests.mako:102 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/tags/tags.mako:63 @@ -5018,7 +5151,7 @@ msgstr "このGistを削除してもよろしいですか？" #: rhodecode/templates/admin/gists/show.mako:56 #: rhodecode/templates/admin/integrations/list.mako:204 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 -#: rhodecode/templates/base/issue_tracker_settings.mako:61 +#: rhodecode/templates/base/issue_tracker_settings.mako:60 #: rhodecode/templates/data_table/_dt_elements.mako:118 #: rhodecode/templates/data_table/_dt_elements.mako:180 #: rhodecode/templates/data_table/_dt_elements.mako:193 @@ -5026,10 +5159,10 @@ msgstr "このGistを削除してもよろしいですか？" #: rhodecode/templates/debug_style/buttons.html:128 #: rhodecode/templates/files/files_add.mako:204 #: rhodecode/templates/files/files_edit.mako:165 -#: rhodecode/templates/files/files_source.mako:38 -#: rhodecode/templates/files/files_source.mako:41 +#: 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:319 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:324 #: rhodecode/templates/users/user_profile.mako:7 msgid "Edit" msgstr "編集" @@ -5048,7 +5181,7 @@ msgstr "作成日" #: rhodecode/templates/admin/gists/show.mako:91 #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:87 msgid "Show as raw" msgstr "Raw形式で表示" @@ -5073,8 +5206,8 @@ msgstr "リポジトリグループ" #: rhodecode/templates/admin/repos/repo_edit.mako:43 #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 -#: rhodecode/templates/base/base.mako:81 -#: rhodecode/templates/base/base.mako:246 +#: rhodecode/templates/base/base.mako:84 +#: rhodecode/templates/base/base.mako:249 msgid "Settings" msgstr "設定" @@ -5106,6 +5239,8 @@ msgid "Create new integration" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:104 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14 msgid "Scope" msgstr "" @@ -5175,7 +5310,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:340 +#: rhodecode/templates/base/base.mako:343 msgid "My account" msgstr "アカウント" @@ -5184,10 +5319,11 @@ msgid "My Account" msgstr "アカウント" #: rhodecode/templates/admin/my_account/my_account.mako:29 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 -msgid "My Profile" -msgstr "" +#: rhodecode/templates/email_templates/user_registration.mako:26 +#: rhodecode/templates/users/user.mako:29 +#: rhodecode/templates/users/user_profile.mako:5 +msgid "Profile" +msgstr "プロフィール" #: rhodecode/templates/admin/my_account/my_account.mako:31 msgid "Auth Tokens" @@ -5198,94 +5334,92 @@ msgid "OAuth Identities" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:37 -msgid "My Emails" +#: rhodecode/templates/admin/users/user_edit.mako:38 +msgid "Emails" msgstr "メールアドレス" -#: rhodecode/templates/admin/my_account/my_account.mako:38 -msgid "My Repositories" -msgstr "リポジトリ" - #: rhodecode/templates/admin/my_account/my_account.mako:39 msgid "Watched" msgstr "ウォッチ中" #: rhodecode/templates/admin/my_account/my_account.mako:40 #: rhodecode/templates/admin/notifications/notifications.mako:33 -#: rhodecode/templates/base/base.mako:238 +#: rhodecode/templates/base/base.mako:241 msgid "Pull Requests" msgstr "プルリクエスト" #: rhodecode/templates/admin/my_account/my_account.mako:41 -msgid "My Permissions" -msgstr "" +#: 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/user_groups/user_group_edit.mako:34 +#: rhodecode/templates/base/base.mako:80 +msgid "Permissions" +msgstr "権限設定" #: rhodecode/templates/admin/my_account/my_account.mako:42 -msgid "My Live Notifications" +msgid "Live Notifications" msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:3 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 msgid "Authentication Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:7 -msgid "Built-in tokens can be used to authenticate with all possible options." -msgstr "" - #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:8 -msgid "" -"Each token can have a role. VCS tokens can be used together with the " -"authtoken auth plugin for git/hg/svn operations." -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:11 -msgid "Built-in" -msgstr "ビルトイン" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:51 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:47 -msgid "expires" -msgstr "失効" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:29 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:26 -#, python-format -msgid "Confirm to reset this auth token: %s" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 -msgid "expired" -msgstr "失効済み" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:59 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:55 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:8 +msgid "" +"Each token can have a role. Token with a role can be used only in given " +"context, e.g. VCS tokens can be used together with the authtoken auth plugin" +" for git/hg/svn operations only." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:13 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:13 +msgid "Token" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:17 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:17 +msgid "Expiration" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:48 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:44 #, python-format msgid "Confirm to remove this auth token: %s" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:67 -msgid "No additional auth token specified" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:78 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:56 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:52 +msgid "No additional auth tokens specified" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:68 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:64 msgid "New authentication token" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:82 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +msgid "Repository scope works only with tokens with VCS type." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86 #: rhodecode/templates/admin/my_account/my_account_emails.mako:64 #: rhodecode/templates/admin/permissions/permissions_ips.mako:60 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:84 +#: 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 msgid "Add" msgstr "追加" +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:128 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:125 +msgid "repository scope" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_emails.mako:5 msgid "Account Emails" msgstr "" @@ -5339,6 +5473,11 @@ msgstr "" msgid "Source type" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 +msgid "My Profile" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_profile.mako:11 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:55 #: rhodecode/templates/admin/users/user_edit_profile.mako:25 @@ -5428,14 +5567,6 @@ msgstr "通知" msgid "Permissions Administration" msgstr "" -#: 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/user_groups/user_group_edit.mako:34 -#: rhodecode/templates/base/base.mako:77 -msgid "Permissions" -msgstr "権限設定" - #: rhodecode/templates/admin/permissions/permissions.mako:33 msgid "Application" msgstr "" @@ -5575,8 +5706,8 @@ msgstr "リポジトリグループを追加" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:74 -#: rhodecode/templates/base/base.mako:148 +#: rhodecode/templates/base/base.mako:77 +#: rhodecode/templates/base/base.mako:151 msgid "Repository groups" msgstr "リポジトリグループ" @@ -5590,7 +5721,7 @@ msgid "Group Parent" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 -#: rhodecode/templates/admin/repos/repo_add_base.mako:55 +#: rhodecode/templates/admin/repos/repo_add_base.mako:66 msgid "Copy Parent Group Permissions" msgstr "" @@ -5705,7 +5836,7 @@ 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/user_groups/user_group_edit_perms.mako:117 -#: rhodecode/templates/base/issue_tracker_settings.mako:84 +#: rhodecode/templates/base/issue_tracker_settings.mako:83 msgid "Add new" msgstr "新規追加" @@ -5768,52 +5899,48 @@ msgid "Import Existing Repository ?" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:193 +#: rhodecode/templates/base/base.mako:196 msgid "Clone from" msgstr "クローン元" -#: rhodecode/templates/admin/repos/repo_add_base.mako:27 -msgid "Optional http[s] URL from which to clone a repository." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_add_base.mako:36 +#: rhodecode/templates/admin/repos/repo_add_base.mako:47 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:102 #: rhodecode/templates/forks/fork.mako:52 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "短く要点を絞ってください。長い説明にはREADMEファイルを利用してください。" -#: rhodecode/templates/admin/repos/repo_add_base.mako:41 +#: rhodecode/templates/admin/repos/repo_add_base.mako:52 msgid "Repository Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 +#: 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)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:50 +#: rhodecode/templates/admin/repos/repo_add_base.mako:61 #: rhodecode/templates/forks/fork.mako:67 msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:59 +#: rhodecode/templates/admin/repos/repo_add_base.mako:70 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:68 +#: rhodecode/templates/admin/repos/repo_add_base.mako:79 msgid "Set the type of repository to create." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:73 +#: rhodecode/templates/admin/repos/repo_add_base.mako:84 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:70 #: rhodecode/templates/forks/fork.mako:73 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:77 +#: rhodecode/templates/admin/repos/repo_add_base.mako:88 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." @@ -5857,7 +5984,16 @@ msgstr "リモート" msgid "Statistics" msgstr "統計" -#: rhodecode/templates/admin/repos/repo_edit.mako:87 +#: rhodecode/templates/admin/repos/repo_edit.mako:75 +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3 +msgid "Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:78 +msgid "Strip" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:93 msgid "Reviewers" msgstr "" @@ -5884,12 +6020,10 @@ msgid "This repository is a fork of %(re msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 -#: rhodecode/templates/admin/repos/repo_edit_fork.mako:5 msgid "Set" msgstr "保存" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:39 -#: rhodecode/templates/admin/repos/repo_edit_fork.mako:9 msgid "Manually set this repository as a fork of another from the list" msgstr "このリポジトリをリスト中の他のリポジトリのフォークとして、手動で設定します" @@ -6024,10 +6158,11 @@ msgstr "キー" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:37 #: 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:62 +#: 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:101 +#: rhodecode/templates/admin/users/users.mako:73 msgid "Active" msgstr "アクティブ" @@ -6103,6 +6238,23 @@ 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 +msgid "No maintenance tasks for this repo available" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:26 +msgid "Run Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:41 +msgid "Performing Maintenance" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:5 msgid "Repository Permissions" msgstr "" @@ -6123,16 +6275,21 @@ msgstr "リモート URL" msgid "Remote mirror url" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 +#: 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 msgid "Pull changes from remote location" msgstr "リモートから変更を取り込む" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:22 msgid "Confirm to pull changes from remote side" msgstr "リモートから変更を取り込んでもよろしいですか？" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:19 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:27 msgid "This repository does not have any remote mirror url set." msgstr "" @@ -6256,11 +6413,80 @@ msgstr "統計情報をリセット" msgid "Confirm to remove current statistics" msgstr "現在の統計情報をリセットしてもよろしいですか？" -#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:3 +msgid "Strip commits from repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:7 +#, python-format +msgid "Please provide up to %d commits commits to strip" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:9 +msgid "" +"In the first step commits will be verified for existance in the repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:10 +msgid "In the second step, correct commits will be available for stripping" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:16 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:52 +msgid "Enter full 40 character commit sha" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:18 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:54 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:95 +msgid "Add another commit" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:27 +msgid "Check commits" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:33 +msgid "Sorry this functionality is not available for SVN repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:46 +msgid "Remove" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:112 +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 +msgid " commit verified positive" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:131 +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" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:13 msgid "Select to inherit global vcs settings." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:45 +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:43 #: rhodecode/templates/admin/settings/settings_global.mako:139 #: rhodecode/templates/admin/settings/settings_labs.mako:48 #: rhodecode/templates/admin/settings/settings_vcs.mako:13 @@ -6797,8 +7023,8 @@ msgstr "ユーザーグループを追加" #: rhodecode/templates/admin/user_groups/user_group_add.mako:13 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:76 -#: rhodecode/templates/base/base.mako:151 +#: rhodecode/templates/base/base.mako:79 +#: rhodecode/templates/base/base.mako:154 msgid "User groups" msgstr "ユーザーグループ" @@ -6839,30 +7065,72 @@ msgid "Members" msgstr "メンバー" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:9 +msgid "Automatic member sync" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:11 msgid "Assigned to repositories" msgstr "所属するリポジトリ" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:10 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:12 msgid "Assigned to repo groups" msgstr "所属するリポジトリグループ" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:17 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:19 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6 #, python-format msgid "User Group: %s" msgstr "ユーサーグループ: %s" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:26 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:29 +msgid "Group members sync" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:36 +msgid "This group is set to be automatically synchronised." +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 +msgid "This group is not set to be automatically synchronised" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51 +msgid "Disable synchronization" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53 +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 msgid "Delete User Group" msgstr "ユーザーグループを削除" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:32 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:81 #, 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:34 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:83 msgid "Delete This User Group" msgstr "このユーザーグループを削除" @@ -6888,6 +7156,7 @@ msgid "No members yet" msgstr "まだメンバーがいません" #: rhodecode/templates/admin/user_groups/user_groups.mako:5 +#: rhodecode/templates/admin/users/user_edit_groups.mako:6 msgid "User groups administration" msgstr "ユーザーグループ管理" @@ -6895,18 +7164,22 @@ msgstr "ユーザーグループ管理" msgid "user groups" msgstr "ユーザーグループ" +#: rhodecode/templates/admin/user_groups/user_groups.mako:62 +msgid "Sync" +msgstr "" + #: rhodecode/templates/admin/users/user_add.mako:5 msgid "Add user" msgstr "ユーザーを追加" #: rhodecode/templates/admin/users/user_add.mako:13 #: rhodecode/templates/admin/users/user_edit.mako:14 -#: rhodecode/templates/base/base.mako:75 +#: rhodecode/templates/base/base.mako:78 msgid "Users" msgstr "ユーザー" #: rhodecode/templates/admin/users/user_add.mako:15 -#: rhodecode/templates/admin/users/users.mako:27 +#: rhodecode/templates/admin/users/users.mako:28 msgid "Add User" msgstr "ユーザーを追加" @@ -6958,14 +7231,18 @@ msgstr "ユーザープロフィール" msgid "Auth tokens" msgstr "認証トークン" -#: rhodecode/templates/admin/users/user_edit.mako:38 -msgid "Emails" -msgstr "メールアドレス" - #: rhodecode/templates/admin/users/user_edit.mako:39 msgid "Ip Whitelist" msgstr "IP アドレスのホワイトリスト" +#: rhodecode/templates/admin/users/user_edit.mako:40 +msgid "User Groups Management" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.mako:41 +msgid "User audit" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 #: rhodecode/templates/admin/users/user_edit_profile.mako:106 msgid "Source of Record" @@ -6976,7 +7253,7 @@ msgid "Last login" msgstr "最終ログイン日時" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 -#: rhodecode/templates/admin/users/users.mako:99 +#: rhodecode/templates/admin/users/users.mako:71 msgid "Last activity" msgstr "最後の活動" @@ -7082,22 +7359,23 @@ msgid "" "will delete the user's repositories!" msgstr "" -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 -msgid "Authentication Access Tokens" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:63 -msgid "No additional auth tokens specified" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:75 -msgid "New auth token" +#: rhodecode/templates/admin/users/user_edit_audit.mako:7 +msgid "User Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +msgid "audit filter..." msgstr "" #: rhodecode/templates/admin/users/user_edit_emails.mako:5 msgid "Additional Email Addresses" msgstr "" +#: rhodecode/templates/admin/users/user_edit_groups.mako:12 +#, python-format +msgid "Add `%s` to user group" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_ips.mako:3 msgid "Custom IP Whitelist" msgstr "" @@ -7154,98 +7432,98 @@ msgstr "" msgid "Users administration" msgstr "ユーザー管理" -#: rhodecode/templates/admin/users/users.mako:105 +#: rhodecode/templates/admin/users/users.mako:77 msgid "Auth type" msgstr "認証タイプ" -#: rhodecode/templates/base/base.mako:50 +#: rhodecode/templates/base/base.mako:53 #, python-format msgid "RhodeCode instance id: %s" msgstr "" -#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:81 msgid "Authentication" msgstr "認証" -#: rhodecode/templates/base/base.mako:80 +#: rhodecode/templates/base/base.mako:83 msgid "Defaults" msgstr "デフォルト設定" -#: rhodecode/templates/base/base.mako:98 +#: rhodecode/templates/base/base.mako:101 #: rhodecode/templates/files/files_pjax.mako:24 #: rhodecode/templates/summary/components.mako:42 msgid "Show More" msgstr "" -#: rhodecode/templates/base/base.mako:185 +#: rhodecode/templates/base/base.mako:188 msgid "Fork of" msgstr "フォーク元" -#: rhodecode/templates/base/base.mako:202 +#: rhodecode/templates/base/base.mako:205 #, python-format msgid "Repository locked by %(user)s" msgstr "" -#: rhodecode/templates/base/base.mako:207 +#: rhodecode/templates/base/base.mako:210 msgid "Repository not locked. Pull repository to lock it." msgstr "" -#: rhodecode/templates/base/base.mako:225 +#: rhodecode/templates/base/base.mako:228 #: rhodecode/templates/data_table/_dt_elements.mako:12 #: rhodecode/templates/data_table/_dt_elements.mako:13 #: rhodecode/templates/data_table/_dt_elements.mako:153 msgid "Summary" msgstr "要約" -#: rhodecode/templates/base/base.mako:226 +#: rhodecode/templates/base/base.mako:229 #: rhodecode/templates/data_table/_dt_elements.mako:17 #: rhodecode/templates/data_table/_dt_elements.mako:18 msgid "Changelog" msgstr "履歴" -#: rhodecode/templates/base/base.mako:227 +#: rhodecode/templates/base/base.mako:230 #: rhodecode/templates/data_table/_dt_elements.mako:22 #: rhodecode/templates/data_table/_dt_elements.mako:23 #: rhodecode/templates/files/files.mako:15 msgid "Files" msgstr "ファイル" -#: rhodecode/templates/base/base.mako:229 +#: rhodecode/templates/base/base.mako:232 #: rhodecode/templates/bookmarks/bookmarks.mako:68 #: rhodecode/templates/branches/branches.mako:67 #: rhodecode/templates/tags/tags.mako:68 msgid "Compare" msgstr "比較" -#: rhodecode/templates/base/base.mako:234 +#: rhodecode/templates/base/base.mako:237 #, python-format msgid "Show Pull Requests for %s" msgstr "%s のプルリクエストを表示" -#: rhodecode/templates/base/base.mako:243 +#: rhodecode/templates/base/base.mako:246 msgid "Options" msgstr "オプション" -#: rhodecode/templates/base/base.mako:250 +#: rhodecode/templates/base/base.mako:253 #: rhodecode/templates/forks/forks_data.mako:30 msgid "Compare fork" msgstr "フォークを比較" -#: rhodecode/templates/base/base.mako:253 -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:256 +#: rhodecode/templates/base/base.mako:403 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "検索" -#: rhodecode/templates/base/base.mako:257 +#: rhodecode/templates/base/base.mako:260 msgid "Unlock" msgstr "アンロック" -#: rhodecode/templates/base/base.mako:259 +#: rhodecode/templates/base/base.mako:262 msgid "Lock" msgstr "ロック" -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:267 #: rhodecode/templates/data_table/_dt_elements.mako:27 #: rhodecode/templates/data_table/_dt_elements.mako:28 #: rhodecode/templates/forks/forks_data.mako:8 @@ -7254,77 +7532,77 @@ msgid "Fork" msgid_plural "Forks" msgstr[0] "" -#: rhodecode/templates/base/base.mako:265 +#: rhodecode/templates/base/base.mako:268 msgid "Create Pull Request" msgstr "プルリクエストを作成" -#: rhodecode/templates/base/base.mako:287 +#: rhodecode/templates/base/base.mako:290 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:295 +#: rhodecode/templates/base/base.mako:298 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:312 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:322 +#: 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:342 +#: rhodecode/templates/base/base.mako:345 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:346 +#: rhodecode/templates/base/base.mako:349 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:382 +#: rhodecode/templates/base/base.mako:385 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:383 +#: rhodecode/templates/base/base.mako:386 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:14 msgid "Journal" msgstr "ジャーナル" -#: rhodecode/templates/base/base.mako:388 +#: rhodecode/templates/base/base.mako:391 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:389 +#: rhodecode/templates/base/base.mako:392 msgid "Public journal" msgstr "公開ジャーナル" -#: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/base/base.mako:397 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:395 +#: rhodecode/templates/base/base.mako:398 msgid "Gists" msgstr "Gists" -#: rhodecode/templates/base/base.mako:399 +#: rhodecode/templates/base/base.mako:402 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:408 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:412 +#: rhodecode/templates/base/base.mako:415 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:422 -#: rhodecode/templates/base/base.mako:423 +#: rhodecode/templates/base/base.mako:425 +#: rhodecode/templates/base/base.mako:426 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7346,15 +7624,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:480 +#: rhodecode/templates/base/base.mako:483 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:533 +#: rhodecode/templates/base/base.mako:536 msgid "Keyboard shortcuts" msgstr "キーボードショートカット" -#: rhodecode/templates/base/base.mako:541 +#: rhodecode/templates/base/base.mako:544 msgid "Site-wide shortcuts" msgstr "サイト全体" @@ -7423,9 +7701,7 @@ msgid "User Group Creation" msgstr "" #: rhodecode/templates/base/default_perms_box.mako:72 -msgid "" -"Permission to allow user group creation. When disabled, user group admins " -"can still create subgroups within their user groups." +msgid "Permission to allow user group creation." msgstr "" #: rhodecode/templates/base/default_perms_box.mako:78 @@ -7450,19 +7726,19 @@ msgid "" "permission by members of user groups." msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:22 +#: rhodecode/templates/base/issue_tracker_settings.mako:21 msgid "Read more" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:92 +#: rhodecode/templates/base/issue_tracker_settings.mako:91 msgid "New Entry" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:96 +#: rhodecode/templates/base/issue_tracker_settings.mako:95 msgid "Confirm to remove this pattern:" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:192 +#: 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 @@ -7472,7 +7748,7 @@ msgstr "" msgid "Preview" msgstr "プレビュー" -#: rhodecode/templates/base/issue_tracker_settings.mako:193 +#: rhodecode/templates/base/issue_tracker_settings.mako:192 msgid "Test Pattern Preview" msgstr "" @@ -7620,101 +7896,130 @@ msgstr "" msgid "Enable largefiles extension" msgstr "largefilesエクステンションを有効にする" -#: rhodecode/templates/base/vcs_settings.mako:99 +#: rhodecode/templates/base/vcs_settings.mako:100 msgid "Enable Largefiles extensions for all repositories." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:103 +#: rhodecode/templates/base/vcs_settings.mako:102 +msgid "Enable Largefiles extensions for this repository." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:113 +msgid "" +"Filesystem location where Mercurial largefile objects should be stored." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:119 msgid "Set repositories as publishing" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:103 +#: rhodecode/templates/base/vcs_settings.mako:119 msgid "Set repository as publishing" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:106 +#: rhodecode/templates/base/vcs_settings.mako:122 msgid "" "When this is enabled all commits in the repository are seen as public " "commits by clients." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:111 +#: rhodecode/templates/base/vcs_settings.mako:127 msgid "Enable hgsubversion extension" msgstr "hgsubversionエクステンションを有効にする" -#: rhodecode/templates/base/vcs_settings.mako:114 +#: rhodecode/templates/base/vcs_settings.mako:130 msgid "" "Requires hgsubversion library to be installed. Allows cloning remote SVN " "repositories and migrates them to Mercurial type." msgstr "hgsubversion ライブラリのインストールが必要です。リモートのSVNリポジトリをクローンしてMercurialリポジトリに変換するすることが可能です。" -#: rhodecode/templates/base/vcs_settings.mako:123 +#: rhodecode/templates/base/vcs_settings.mako:139 msgid "Mercurial Labs Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:123 +#: rhodecode/templates/base/vcs_settings.mako:139 msgid "" "These features are considered experimental and may not work as expected." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:129 +#: rhodecode/templates/base/vcs_settings.mako:145 msgid "Use rebase as merge strategy" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:132 +#: rhodecode/templates/base/vcs_settings.mako:148 msgid "" "Use rebase instead of creating a merge commit when merging via web " "interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:144 +#: rhodecode/templates/base/vcs_settings.mako:160 +msgid "Git Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:165 +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 "Filesystem location where Git lfs objects should be stored." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:193 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:150 +#: rhodecode/templates/base/vcs_settings.mako:199 msgid "Proxy subversion HTTP requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:154 +#: 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:155 +#: rhodecode/templates/base/vcs_settings.mako:204 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:161 +#: rhodecode/templates/base/vcs_settings.mako:210 msgid "Subversion HTTP Server URL" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:167 +#: rhodecode/templates/base/vcs_settings.mako:216 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:179 +#: rhodecode/templates/base/vcs_settings.mako:228 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:184 +#: rhodecode/templates/base/vcs_settings.mako:233 msgid "Repository patterns" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:188 +#: rhodecode/templates/base/vcs_settings.mako:237 msgid "" "Patterns for identifying SVN branches and tags. For recursive search, use " "\"*\". Eg.: \"/branches/*\"" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:254 +#: rhodecode/templates/base/vcs_settings.mako:301 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:259 +#: rhodecode/templates/base/vcs_settings.mako:306 msgid "Enable server-side merge for pull requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:262 +#: rhodecode/templates/base/vcs_settings.mako:309 msgid "" "Note: when this feature is enabled, it only runs hooks defined in the " "rcextension package. Custom hooks added on the Admin -> Settings -> Hooks " @@ -7722,11 +8027,11 @@ msgid "" "web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:266 +#: rhodecode/templates/base/vcs_settings.mako:313 msgid "Invalidate and relocate inline comments during update" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:269 +#: rhodecode/templates/base/vcs_settings.mako:316 msgid "" "During the update of a pull request, the position of inline comments will be" " updated and outdated inline comments will be hidden." @@ -7862,7 +8167,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:53 #: rhodecode/templates/compare/compare_commits.mako:46 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:495 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "コミットメッセージを展開" @@ -7955,8 +8260,8 @@ msgid "Diff options" msgstr "" #: rhodecode/templates/changeset/changeset.mako:119 -#: rhodecode/templates/codeblocks/diffs.mako:436 -#: rhodecode/templates/codeblocks/diffs.mako:439 +#: rhodecode/templates/codeblocks/diffs.mako:445 +#: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "diffとして差分を表示" @@ -7973,8 +8278,8 @@ msgid "Patch Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:127 -#: rhodecode/templates/codeblocks/diffs.mako:443 -#: rhodecode/templates/codeblocks/diffs.mako:446 +#: rhodecode/templates/codeblocks/diffs.mako:452 +#: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "差分をダウンロード" @@ -7984,7 +8289,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:145 #: rhodecode/templates/changeset/changeset.mako:147 -#: rhodecode/tests/functional/test_commit_comments.py:270 +#: rhodecode/tests/functional/test_commit_comments.py:275 #, python-format msgid "%d Commit comment" msgid_plural "%d Commit comments" @@ -7992,7 +8297,7 @@ msgstr[0] "" #: rhodecode/templates/changeset/changeset.mako:150 #: rhodecode/templates/changeset/changeset.mako:152 -#: rhodecode/tests/functional/test_commit_comments.py:277 +#: rhodecode/tests/functional/test_commit_comments.py:282 #, python-format msgid "%d Inline Comment" msgid_plural "%d Inline Comments" @@ -8097,18 +8402,16 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:363 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:148 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:153 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "クローズ" -#: rhodecode/templates/changeset/changeset_file_comment.mako:388 +#: rhodecode/templates/changeset/changeset_file_comment.mako:393 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 #: rhodecode/templates/compare/compare_diff.mako:122 -#: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:97 msgid "Comment" msgstr "コメント" @@ -8142,7 +8445,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_range.mako:99 #: rhodecode/templates/compare/compare_diff.mako:312 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:414 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:419 #, python-format msgid "Expand %s commit" msgid_plural "Expand %s commits" @@ -8150,7 +8453,7 @@ msgstr[0] "" #: rhodecode/templates/changeset/changeset_range.mako:105 #: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 #, python-format msgid "Collapse %s commit" msgid_plural "Collapse %s commits" @@ -8248,64 +8551,68 @@ msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:406 -#: rhodecode/templates/codeblocks/diffs.mako:422 +#: rhodecode/templates/codeblocks/diffs.mako:415 +#: rhodecode/templates/codeblocks/diffs.mako:431 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:408 -#: rhodecode/templates/codeblocks/diffs.mako:415 +#: rhodecode/templates/codeblocks/diffs.mako:417 +#: rhodecode/templates/codeblocks/diffs.mako:424 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:413 -#: rhodecode/templates/codeblocks/diffs.mako:429 +#: rhodecode/templates/codeblocks/diffs.mako:422 +#: rhodecode/templates/codeblocks/diffs.mako:438 #, python-format msgid "File no longer present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:424 -#: rhodecode/templates/codeblocks/diffs.mako:431 +#: rhodecode/templates/codeblocks/diffs.mako:433 +#: rhodecode/templates/codeblocks/diffs.mako:440 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:462 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:462 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:634 +#: rhodecode/templates/codeblocks/diffs.mako:643 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:636 +#: rhodecode/templates/codeblocks/diffs.mako:645 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:640 +#: rhodecode/templates/codeblocks/diffs.mako:649 msgid "View unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:641 +#: rhodecode/templates/codeblocks/diffs.mako:650 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:651 +#: rhodecode/templates/codeblocks/diffs.mako:660 msgid "Expand All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:655 +#: rhodecode/templates/codeblocks/diffs.mako:664 msgid "Collapse All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:659 +#: rhodecode/templates/codeblocks/diffs.mako:668 msgid "Wide Mode Diff" msgstr "" +#: rhodecode/templates/codeblocks/source.mako:24 +msgid "view annotation from before this change" +msgstr "" + #: rhodecode/templates/compare/compare_commits.mako:5 msgid "Common Ancestor Commit" msgstr "" @@ -8315,7 +8622,7 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:16 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:451 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:456 msgid "Time" msgstr "" @@ -8326,7 +8633,7 @@ msgid_plural "%s commits hidden" msgstr[0] "" #: rhodecode/templates/compare/compare_commits.mako:68 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:568 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:573 msgid "show it" msgid_plural "show them" msgstr[0] "" @@ -8360,14 +8667,14 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:98 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:103 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.mako:76 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 -#: rhodecode/templates/files/files_source.mako:20 +#: rhodecode/templates/files/files_source.mako:23 msgid "Source" msgstr "ソース" @@ -8589,133 +8896,150 @@ msgstr "RhodeCode からの通知です。 %(instance_url)s" msgid "RhodeCode" msgstr "RhodeCode" -#: rhodecode/templates/email_templates/commit_comment.mako:16 -#: rhodecode/templates/email_templates/pull_request_comment.mako:18 +#: rhodecode/templates/email_templates/commit_comment.mako:18 +#: rhodecode/templates/email_templates/pull_request_comment.mako:19 msgid "[mention]" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:19 -#, python-format -msgid "" -"%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:19 -#: rhodecode/templates/email_templates/commit_comment.mako:22 +#: rhodecode/templates/email_templates/commit_comment.mako:21 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on commit `%(commit_id)s` (file: " +"`%(comment_file)s`)" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:24 +#: rhodecode/templates/email_templates/commit_comment.mako:26 #, python-format msgid "in the %(repo_name)s repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:22 -#, python-format -msgid "%(user)s commented on commit `%(commit_id)s` (status: %(status)s)" -msgstr "" - #: rhodecode/templates/email_templates/commit_comment.mako:24 -#: rhodecode/templates/email_templates/commit_comment.mako:78 -#, python-format -msgid "%(user)s commented on commit `%(commit_id)s`" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:43 -#: rhodecode/templates/email_templates/pull_request_comment.mako:44 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on commit `%(commit_id)s` (status: " +"%(status)s)" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:26 +#, python-format +msgid "%(user)s left %(comment_type)s on commit `%(commit_id)s`" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:47 +#: rhodecode/templates/email_templates/pull_request_comment.mako:47 msgid "Comment link" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:48 -#: rhodecode/templates/email_templates/pull_request_comment.mako:49 +#: rhodecode/templates/email_templates/commit_comment.mako:52 +#: rhodecode/templates/email_templates/pull_request_comment.mako:52 #, python-format msgid "File: %(comment_file)s on line %(comment_line)s" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:54 +#: rhodecode/templates/email_templates/commit_comment.mako:58 msgid "Commit status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:76 +#: rhodecode/templates/email_templates/commit_comment.mako:82 #, python-format msgid "%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:76 -#: rhodecode/templates/email_templates/commit_comment.mako:78 +#: rhodecode/templates/email_templates/commit_comment.mako:82 +#: rhodecode/templates/email_templates/commit_comment.mako:84 #, python-format msgid "in the %(repo)s repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:85 +#: rhodecode/templates/email_templates/commit_comment.mako:84 +#, python-format +msgid "%(user)s commented on commit `%(commit_id)s`" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:92 +#: rhodecode/templates/email_templates/pull_request_comment.mako:94 msgid "Status" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:85 +#: rhodecode/templates/email_templates/commit_comment.mako:93 msgid "The commit status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:97 -#, python-format -msgid "Comment on line: %(comment_line)s" -msgstr "" - -#: rhodecode/templates/email_templates/password_reset.mako:30 +#: rhodecode/templates/email_templates/commit_comment.mako:99 +#: rhodecode/templates/email_templates/pull_request_comment.mako:107 +#, python-format +msgid "TODO comment on line: %(comment_line)s" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:101 +#: rhodecode/templates/email_templates/pull_request_comment.mako:109 +#, python-format +msgid "Note comment on line: %(comment_line)s" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:101 +#: rhodecode/templates/email_templates/pull_request_comment.mako:109 +msgid "Note comment" +msgstr "" + +#: rhodecode/templates/email_templates/password_reset.mako:31 msgid "Generate new password here" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:21 -#, python-format -msgid "" -"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: " -"`%(comment_file)s`)" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:24 -#, python-format -msgid "" -"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: " -"%(status)s)" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:26 -#: rhodecode/templates/email_templates/pull_request_comment.mako:83 -#, python-format -msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:46 +#: rhodecode/templates/email_templates/pull_request_comment.mako:22 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\" " +"(file: `%(comment_file)s`)" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:25 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\" " +"(status: %(status)s)" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:27 +#, python-format +msgid "%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:49 msgid "Source repository" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:55 +#: rhodecode/templates/email_templates/pull_request_comment.mako:58 #, python-format msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:57 +#: rhodecode/templates/email_templates/pull_request_comment.mako:60 #, python-format msgid "" "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:81 +#: rhodecode/templates/email_templates/pull_request_comment.mako:84 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" " "(file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:87 -#, python-format -msgid "submitted pull request status: %(status)s" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:89 -#, python-format -msgid "submitted pull request status: %(status)s and closed" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:95 -msgid "Submitted status" +#: rhodecode/templates/email_templates/pull_request_comment.mako:86 +#, python-format +msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 +msgid "Closed pull request with status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:99 +msgid "Submitted review status" msgstr "" #: rhodecode/templates/email_templates/pull_request_review.mako:14 @@ -8780,12 +9104,6 @@ msgstr "" msgid "Full Name" msgstr "" -#: rhodecode/templates/email_templates/user_registration.mako:26 -#: rhodecode/templates/users/user.mako:29 -#: rhodecode/templates/users/user_profile.mako:5 -msgid "Profile" -msgstr "プロフィール" - #: rhodecode/templates/errors/error_document.mako:46 #, python-format msgid "You will be redirected to %s in %s seconds" @@ -8941,13 +9259,13 @@ msgid "Delete file" msgstr "ファイルを削除" #: rhodecode/templates/files/files_delete.mako:45 -#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:65 #, python-format msgid "Binary file (%s)" msgstr "バイナリファイル (%s)" #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:87 msgid "File is too big to display" msgstr "表示するには大きすぎるファイルです" @@ -8960,19 +9278,19 @@ msgstr "" msgid "Commit Description" msgstr "" -#: rhodecode/templates/files/files_detail.mako:35 +#: rhodecode/templates/files/files_detail.mako:32 msgid "File last commit" msgstr "" -#: rhodecode/templates/files/files_detail.mako:51 +#: rhodecode/templates/files/files_detail.mako:46 msgid "Show/Diff file" msgstr "" -#: rhodecode/templates/files/files_detail.mako:66 +#: rhodecode/templates/files/files_detail.mako:61 msgid "Diff to Commit" msgstr "" -#: rhodecode/templates/files/files_detail.mako:67 +#: rhodecode/templates/files/files_detail.mako:62 msgid "Show at Commit" msgstr "" @@ -9014,71 +9332,65 @@ msgstr "ファイルを編集" msgid "Location" msgstr "場所" -#: rhodecode/templates/files/files_source.mako:7 +#: rhodecode/templates/files/files_source.mako:8 +msgid "This file is a pointer to large binary file" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:8 +msgid "LargeFile" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:10 #: rhodecode/templates/search/search_content.mako:57 msgid "line" msgid_plural "lines" msgstr[0] "" -#: rhodecode/templates/files/files_source.mako:14 +#: rhodecode/templates/files/files_source.mako:17 msgid "History" msgstr "変更履歴" -#: rhodecode/templates/files/files_source.mako:17 +#: rhodecode/templates/files/files_source.mako:20 #: rhodecode/templates/search/search_content.mako:68 msgid "Show Full History" msgstr "全ての履歴を表示" -#: rhodecode/templates/files/files_source.mako:22 +#: rhodecode/templates/files/files_source.mako:25 #: rhodecode/templates/search/search_content.mako:70 msgid "Annotation" msgstr "" -#: rhodecode/templates/files/files_source.mako:24 +#: rhodecode/templates/files/files_source.mako:27 #: rhodecode/templates/search/search_content.mako:71 msgid "Raw" msgstr "" -#: rhodecode/templates/files/files_source.mako:26 +#: rhodecode/templates/files/files_source.mako:31 +msgid "Download largefile" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:35 #: rhodecode/templates/search/search_content.mako:73 msgid "Download" msgstr "ダウンロード" -#: rhodecode/templates/files/files_source.mako:33 +#: rhodecode/templates/files/files_source.mako:43 #, python-format msgid "Edit on Branch:%s" msgstr "ブランチ:%s で編集" -#: rhodecode/templates/files/files_source.mako:38 +#: rhodecode/templates/files/files_source.mako:48 msgid "Editing binary files not allowed" msgstr "バイナリファイルの編集は行えません" -#: rhodecode/templates/files/files_source.mako:41 +#: rhodecode/templates/files/files_source.mako:51 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_source.mako:52 msgid "Deleting files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/followers/followers.mako:5 -#: rhodecode/templates/followers/followers.mako:27 -#, python-format -msgid "%s Followers" -msgstr "%s フォロワー" - -#: rhodecode/templates/followers/followers.mako:12 -msgid "Followers" -msgstr "フォロワー" - -#: rhodecode/templates/followers/followers_data.mako:5 -msgid "Follower Name" -msgstr "" - -#: rhodecode/templates/followers/followers_data.mako:6 -msgid "Following Since" -msgstr "" - #: rhodecode/templates/forks/fork.mako:5 #, python-format msgid "Fork repository %s" @@ -9159,97 +9471,98 @@ msgstr "RSS 公開ジャーナルフィード" msgid "New pull request" msgstr "新しいプルリクエスト" -#: rhodecode/templates/pullrequests/pullrequest.mako:52 +#: rhodecode/templates/pullrequests/pullrequest.mako:51 msgid "Write a short description on this pull request" msgstr "このプルリクエストの簡潔な説明を書いてください" -#: rhodecode/templates/pullrequests/pullrequest.mako:59 +#: rhodecode/templates/pullrequests/pullrequest.mako:57 msgid "Commit flow" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:67 +#: rhodecode/templates/pullrequests/pullrequest.mako:65 msgid "Origin repository" msgstr "元のリポジトリ" -#: rhodecode/templates/pullrequests/pullrequest.mako:85 +#: rhodecode/templates/pullrequests/pullrequest.mako:83 msgid "Loading refs..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:96 +#: rhodecode/templates/pullrequests/pullrequest.mako:94 msgid "Submit Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:109 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:317 +#: rhodecode/templates/pullrequests/pullrequest.mako:107 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:322 msgid "Pull request reviewers" msgstr "プルリクエストレビュアー" -#: rhodecode/templates/pullrequests/pullrequest.mako:110 -msgid "loading..." -msgstr "読み込み中..." - -#: rhodecode/templates/pullrequests/pullrequest.mako:120 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:361 +#: rhodecode/templates/pullrequests/pullrequest.mako:118 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:366 msgid "Add reviewer" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:299 -#: rhodecode/templates/pullrequests/pullrequest.mako:572 +#: rhodecode/templates/pullrequests/pullrequest.mako:297 +#: rhodecode/templates/pullrequests/pullrequest.mako:570 msgid "Please select origin and destination" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:305 +#: rhodecode/templates/pullrequests/pullrequest.mako:303 msgid "Loading compare ..." msgstr "" +#: rhodecode/templates/pullrequests/pullrequest.mako:350 #: rhodecode/templates/pullrequests/pullrequest.mako:352 -#: rhodecode/templates/pullrequests/pullrequest.mako:354 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:357 +#: rhodecode/templates/pullrequests/pullrequest.mako:355 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:364 +#: rhodecode/templates/pullrequests/pullrequest.mako:362 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:464 +#: rhodecode/templates/pullrequests/pullrequest.mako:462 msgid "Destination repository" msgstr "相手のリポジトリ" -#: rhodecode/templates/pullrequests/pullrequest.mako:475 +#: rhodecode/templates/pullrequests/pullrequest.mako:473 msgid "Select commit reference" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:8 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:7 msgid "This pull request can be merged automatically." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:13 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:12 msgid "Merge is not currently possible because of below failed checks." msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:37 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:42 +msgid "refresh checks" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:38 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 -msgid "refresh checks" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:39 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:44 msgid "Merge Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:44 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 msgid "You are not allowed to merge this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:46 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:45 msgid "Login to Merge this Pull Request" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:54 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 +msgid "Close with status {}" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show.mako:5 #, python-format msgid "%s Pull Request #%s" @@ -9267,169 +9580,173 @@ msgstr "このプルリクエストを削除してもよろしいですか？" msgid "Origin" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:120 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:88 +msgid "Common ancestor" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:125 msgid "Merge" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:133 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:138 msgid "Shadow repository data not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:141 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:146 msgid "Review" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:157 #, python-format msgid "calculated based on %s reviewer vote" msgid_plural "calculated based on %s reviewers votes" msgstr[0] "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:170 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:175 msgid "Versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:183 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:186 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:188 msgid "{} version available for this pull request, show it." msgid_plural "{} versions available for this pull request, show them." msgstr[0] "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:182 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:187 msgid "Hide all versions of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:207 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:212 msgid "Your review status at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:213 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:218 msgid "Comment from pull request version {0}, general:{1} inline:{2}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:230 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:234 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:235 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:239 msgid "select versions to show changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:231 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:236 msgid "show changes between versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:232 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:237 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:247 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:252 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:251 -msgid "Comments for this pull request" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:256 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 +msgid "Comments for this pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:261 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:263 #, python-format msgid "%d General " msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:264 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:267 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:269 #, python-format msgid "%d Inline" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:268 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:272 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:273 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 #, python-format msgid "%d Outdated" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:269 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:274 msgid "show outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:270 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:281 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:286 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:295 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:365 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:300 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:370 msgid "Save Changes" msgstr "変更を保存" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:382 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:387 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:383 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:388 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:391 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:396 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 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:393 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 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:404 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:409 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:427 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:432 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:440 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:445 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:444 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:449 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:462 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:464 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:469 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:567 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:572 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:570 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:575 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:571 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:576 msgid "show them" msgstr "" 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-02-05 17:11+0100\n" -"PO-Revision-Date: 2017-02-01 20:10+0000\n" +"POT-Creation-Date: 2017-04-07 12:33+0200\n" +"PO-Revision-Date: 2017-04-07 10:34+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,53 +23,54 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: rhodecode/admin/navigation.py:83 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:167 +"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 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "Globalne" -#: rhodecode/admin/navigation.py:84 +#: rhodecode/apps/admin/navigation.py:84 #: rhodecode/templates/admin/repos/repo_edit.mako:52 msgid "VCS" msgstr "VCS" -#: rhodecode/admin/navigation.py:85 +#: rhodecode/apps/admin/navigation.py:85 msgid "Visual" msgstr "Wizualne" -#: rhodecode/admin/navigation.py:86 +#: rhodecode/apps/admin/navigation.py:86 msgid "Remap and Rescan" msgstr "" -#: rhodecode/admin/navigation.py:87 +#: rhodecode/apps/admin/navigation.py:87 #: rhodecode/templates/admin/repos/repo_edit.mako:58 msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:89 rhodecode/integrations/types/email.py:232 -#: rhodecode/templates/register.mako:75 +#: rhodecode/apps/admin/navigation.py:89 +#: rhodecode/integrations/types/email.py:232 +#: rhodecode/templates/register.mako:76 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: 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:92 +#: rhodecode/templates/admin/users/users.mako:64 #: rhodecode/templates/email_templates/user_registration.mako:25 #: rhodecode/templates/users/user_profile.mako:51 msgid "Email" msgstr "E-mail" -#: rhodecode/admin/navigation.py:90 +#: rhodecode/apps/admin/navigation.py:90 msgid "Hooks" msgstr "Hooks" -#: rhodecode/admin/navigation.py:91 +#: rhodecode/apps/admin/navigation.py:91 msgid "Full Text Search" msgstr "Wyszukiwanie Pełnotekstowe" -#: rhodecode/admin/navigation.py:93 +#: rhodecode/apps/admin/navigation.py:93 #: rhodecode/templates/admin/integrations/base.mako:23 #: rhodecode/templates/admin/integrations/form.mako:8 #: rhodecode/templates/admin/integrations/form.mako:21 @@ -83,177 +84,290 @@ msgstr "Wyszukiwanie Pełnotekstowe" #: 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/base/base.mako:79 +#: rhodecode/templates/base/base.mako:82 msgid "Integrations" msgstr "Integracje" -#: rhodecode/admin/navigation.py:95 +#: rhodecode/apps/admin/navigation.py:95 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" msgstr "Informacje o systemie" -#: rhodecode/admin/navigation.py:97 +#: rhodecode/apps/admin/navigation.py:97 msgid "User Sessions" msgstr "" -#: rhodecode/admin/navigation.py:99 +#: rhodecode/apps/admin/navigation.py:99 msgid "Open Source Licenses" msgstr "Licencje Otwarto Źródłowe" -#: rhodecode/admin/navigation.py:107 +#: rhodecode/apps/admin/navigation.py:107 msgid "Labs" msgstr "Laboratorium" -#: rhodecode/admin/views/sessions.py:90 +#: rhodecode/apps/admin/views/sessions.py:86 msgid "Cleaned up old sessions" msgstr "" -#: rhodecode/admin/views/sessions.py:96 +#: rhodecode/apps/admin/views/sessions.py:92 msgid "Failed to cleanup up old sessions" msgstr "" -#: rhodecode/admin/views/svn_config.py:47 +#: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." msgstr "" -#: rhodecode/admin/views/svn_config.py:55 +#: rhodecode/apps/admin/views/svn_config.py:54 msgid "Failed to generate the Apache configuration for Subversion." msgstr "" -#: rhodecode/admin/views/system_info.py:96 +#: rhodecode/apps/admin/views/system_info.py:95 msgid "" "Note: please make sure this server can access `${url}` for the update link " "to work" msgstr "" -#: rhodecode/admin/views/system_info.py:99 +#: rhodecode/apps/admin/views/system_info.py:98 msgid "Update info" msgstr "" -#: rhodecode/admin/views/system_info.py:101 +#: rhodecode/apps/admin/views/system_info.py:100 msgid "Check for updates" msgstr "" -#: rhodecode/admin/views/system_info.py:106 +#: rhodecode/apps/admin/views/system_info.py:105 msgid "RhodeCode Version" msgstr "" -#: rhodecode/admin/views/system_info.py:107 +#: rhodecode/apps/admin/views/system_info.py:106 msgid "RhodeCode Server IP" msgstr "" -#: rhodecode/admin/views/system_info.py:108 +#: rhodecode/apps/admin/views/system_info.py:107 msgid "RhodeCode Server ID" msgstr "" -#: rhodecode/admin/views/system_info.py:109 +#: rhodecode/apps/admin/views/system_info.py:108 msgid "RhodeCode Configuration" msgstr "" -#: rhodecode/admin/views/system_info.py:113 +#: rhodecode/apps/admin/views/system_info.py:109 +msgid "Workers" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:110 +msgid "Worker Type" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:114 msgid "Database" msgstr "" -#: rhodecode/admin/views/system_info.py:114 +#: rhodecode/apps/admin/views/system_info.py:115 msgid "Database version" msgstr "" -#: rhodecode/admin/views/system_info.py:118 +#: rhodecode/apps/admin/views/system_info.py:119 msgid "Platform" msgstr "" -#: rhodecode/admin/views/system_info.py:119 +#: rhodecode/apps/admin/views/system_info.py:120 msgid "Platform UUID" msgstr "" -#: rhodecode/admin/views/system_info.py:120 +#: rhodecode/apps/admin/views/system_info.py:121 msgid "Python version" msgstr "" -#: rhodecode/admin/views/system_info.py:121 +#: rhodecode/apps/admin/views/system_info.py:122 msgid "Python path" msgstr "" -#: rhodecode/admin/views/system_info.py:125 +#: rhodecode/apps/admin/views/system_info.py:126 msgid "CPU" msgstr "" -#: rhodecode/admin/views/system_info.py:126 +#: rhodecode/apps/admin/views/system_info.py:127 msgid "Load" msgstr "" -#: rhodecode/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:128 msgid "Memory" msgstr "" -#: rhodecode/admin/views/system_info.py:128 +#: rhodecode/apps/admin/views/system_info.py:129 msgid "Uptime" msgstr "" -#: rhodecode/admin/views/system_info.py:132 +#: rhodecode/apps/admin/views/system_info.py:133 msgid "Storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:135 msgid "Storage inodes" msgstr "" -#: rhodecode/admin/views/system_info.py:136 +#: rhodecode/apps/admin/views/system_info.py:137 msgid "Gist storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:137 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Gist storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:139 +#: rhodecode/apps/admin/views/system_info.py:140 msgid "Archive cache storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:140 +#: rhodecode/apps/admin/views/system_info.py:141 msgid "Archive cache info" msgstr "" -#: rhodecode/admin/views/system_info.py:142 +#: rhodecode/apps/admin/views/system_info.py:143 msgid "Temp storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:143 +#: rhodecode/apps/admin/views/system_info.py:144 msgid "Temp storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:145 +#: rhodecode/apps/admin/views/system_info.py:146 msgid "Search info" msgstr "" -#: rhodecode/admin/views/system_info.py:146 +#: rhodecode/apps/admin/views/system_info.py:147 msgid "Search location" msgstr "" -#: rhodecode/admin/views/system_info.py:150 +#: rhodecode/apps/admin/views/system_info.py:151 msgid "VCS Backends" msgstr "" -#: rhodecode/admin/views/system_info.py:151 +#: rhodecode/apps/admin/views/system_info.py:152 msgid "VCS Server" msgstr "" -#: rhodecode/admin/views/system_info.py:152 +#: rhodecode/apps/admin/views/system_info.py:153 msgid "GIT" msgstr "" -#: rhodecode/admin/views/system_info.py:153 +#: rhodecode/apps/admin/views/system_info.py:154 msgid "HG" msgstr "" -#: rhodecode/admin/views/system_info.py:154 +#: rhodecode/apps/admin/views/system_info.py:155 msgid "SVN" msgstr "" +#: rhodecode/apps/admin/views/users.py:60 +#: rhodecode/controllers/admin/users.py:359 +#: rhodecode/controllers/admin/users.py:380 +#: 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/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/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/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/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/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/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/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 +msgid "Auth token successfully created" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:240 +#: rhodecode/apps/my_account/views.py:192 +msgid "Auth token successfully deleted" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:284 +msgid "Groups successfully changed" +msgstr "" + +#: rhodecode/apps/login/views.py:247 rhodecode/apps/login/views.py:316 +msgid "Bad captcha" +msgstr "" + +#: rhodecode/apps/login/views.py:256 +msgid "You have successfully registered with RhodeCode" +msgstr "" + +#: rhodecode/apps/login/views.py:292 +msgid "If such email exists, a password reset link was sent to it." +msgstr "" + +#: rhodecode/apps/login/views.py:298 +msgid "Password reset has been disabled." +msgstr "" + +#: rhodecode/apps/login/views.py:381 +msgid "Given reset token is invalid" +msgstr "" + +#: rhodecode/apps/login/views.py:389 +msgid "" +"Your password reset was successful, a new password has been sent to your " +"email" +msgstr "" + +#: rhodecode/apps/my_account/views.py:115 +msgid "Error occurred during update of user password" +msgstr "" + +#: rhodecode/apps/my_account/views.py:122 +msgid "Successfully updated password" +msgstr "" + +#: rhodecode/apps/svn_support/events.py:30 +msgid "Configuration for Apaache mad_dav_svn changed." +msgstr "" + #: rhodecode/authentication/schema.py:35 msgid "Enable or disable this authentication plugin." msgstr "" @@ -269,12 +383,11 @@ msgstr "Włączone" #: rhodecode/authentication/schema.py:43 msgid "" -"Amount of seconds to cache the authentication call for this plugin. Useful " -"for long calls like LDAP to improve the responsiveness of the authentication" -" system (0 means disabled)." -msgstr "" - -#: rhodecode/authentication/schema.py:48 +"Amount of seconds to cache the authentication responsecall for this plugin. \n" +"Useful for long calls like LDAP to improve the performance of the authentication system (0 means disabled)." +msgstr "" + +#: rhodecode/authentication/schema.py:49 msgid "Auth Cache TTL" msgstr "" @@ -295,99 +408,101 @@ msgstr "" msgid "Error occurred during update of auth settings." msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:61 +#: rhodecode/authentication/plugins/auth_crowd.py:60 msgid "The FQDN or IP of the Atlassian CROWD Server" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:63 +#: rhodecode/authentication/plugins/auth_crowd.py:62 msgid "Host" msgstr "Host" -#: rhodecode/authentication/plugins/auth_crowd.py:68 +#: rhodecode/authentication/plugins/auth_crowd.py:67 msgid "The Port in use by the Atlassian CROWD Server" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:70 +#: rhodecode/authentication/plugins/auth_crowd.py:69 #: rhodecode/authentication/plugins/auth_ldap.py:84 msgid "Port" msgstr "Port" -#: rhodecode/authentication/plugins/auth_crowd.py:76 +#: rhodecode/authentication/plugins/auth_crowd.py:75 msgid "The Application Name to authenticate to CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:78 +#: rhodecode/authentication/plugins/auth_crowd.py:77 msgid "Application Name" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:83 +#: rhodecode/authentication/plugins/auth_crowd.py:82 msgid "The password to authenticate to CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:85 +#: rhodecode/authentication/plugins/auth_crowd.py:84 msgid "Application Password" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:90 +#: rhodecode/authentication/plugins/auth_crowd.py:89 msgid "" "A comma separated list of group names that identify users as RhodeCode " "Administrators" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:94 +#: rhodecode/authentication/plugins/auth_crowd.py:93 msgid "Admin Groups" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:216 +#: rhodecode/authentication/plugins/auth_crowd.py:215 msgid "CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:55 +#: rhodecode/authentication/plugins/auth_headers.py:54 msgid "Header to extract the user from" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:57 +#: rhodecode/authentication/plugins/auth_headers.py:56 msgid "Header" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:62 +#: rhodecode/authentication/plugins/auth_headers.py:61 msgid "Header to extract the user from when main one fails" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:64 +#: rhodecode/authentication/plugins/auth_headers.py:63 msgid "Fallback header" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:69 +#: rhodecode/authentication/plugins/auth_headers.py:68 msgid "" "Perform cleaning of user, if passed user has @ in username then first part " "before @ is taken. If there's \\ in the username only the part after \\ is " "taken" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:74 +#: rhodecode/authentication/plugins/auth_headers.py:73 msgid "Clean username" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:99 +#: rhodecode/authentication/plugins/auth_headers.py:98 msgid "Headers" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:63 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:62 msgid "The url of the Jasig CAS REST service" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:65 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:64 #: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" msgstr "Adres URL" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:93 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:92 msgid "Jasig-CAS" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:75 -msgid "Host of the LDAP Server" +#: 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 @@ -395,107 +510,117 @@ msgid "LDAP Host" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:82 -msgid "Port that the LDAP server is listening on" +msgid "Custom port that the LDAP server is listening on. Default: 389" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:90 -msgid "User to connect to LDAP" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:93 +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 msgid "Account" msgstr "Konto" -#: rhodecode/authentication/plugins/auth_ldap.py:98 -msgid "Password to connect to LDAP" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:101 -#: rhodecode/templates/login.mako:49 rhodecode/templates/register.mako:47 +#: rhodecode/authentication/plugins/auth_ldap.py:100 +msgid "Password to authenticate for given user DN." +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:103 +#: 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:310 +#: rhodecode/templates/base/base.mako:313 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "Hasło" -#: rhodecode/authentication/plugins/auth_ldap.py:106 +#: rhodecode/authentication/plugins/auth_ldap.py:108 msgid "TLS Type" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:107 +#: rhodecode/authentication/plugins/auth_ldap.py:109 msgid "Connection Security" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:113 +#: rhodecode/authentication/plugins/auth_ldap.py:115 msgid "Require Cert over TLS?" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:114 +#: rhodecode/authentication/plugins/auth_ldap.py:116 msgid "Certificate Checks" msgstr "Kontrola certyfikatów" -#: rhodecode/authentication/plugins/auth_ldap.py:120 -msgid "Base DN to search (e.g., dc=mydomain,dc=com)" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:123 +#: rhodecode/authentication/plugins/auth_ldap.py:122 +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 msgid "Base DN" msgstr "Bazowy DN" -#: rhodecode/authentication/plugins/auth_ldap.py:128 -msgid "Filter to narrow results (e.g., ou=Users, etc)" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:131 -msgid "LDAP Search Filter" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:136 -msgid "How deep to search LDAP" +#: rhodecode/authentication/plugins/auth_ldap.py:132 +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 -msgid "LDAP Search Scope" -msgstr "Zakres wyszukiwania LDAP" +msgid "LDAP Search Filter" +msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:143 -msgid "LDAP Attribute to map to user name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:145 +msgid "How deep to search LDAP. If unsure set to SUBTREE" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:144 +msgid "LDAP Search Scope" +msgstr "Zakres wyszukiwania LDAP" + +#: rhodecode/authentication/plugins/auth_ldap.py:150 +msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:152 msgid "Login Attribute" msgstr "Atrybuty logowania" -#: rhodecode/authentication/plugins/auth_ldap.py:146 +#: rhodecode/authentication/plugins/auth_ldap.py:153 msgid "The LDAP Login attribute of the CN must be specified" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:151 -msgid "LDAP Attribute to map to first name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:154 +#: rhodecode/authentication/plugins/auth_ldap.py:158 +msgid "LDAP Attribute to map to first name (e.g., givenName)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:161 msgid "First Name Attribute" msgstr "Atrybut Nazwiska" -#: rhodecode/authentication/plugins/auth_ldap.py:159 -msgid "LDAP Attribute to map to last name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:162 +#: rhodecode/authentication/plugins/auth_ldap.py:166 +msgid "LDAP Attribute to map to last name (e.g., sn)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:169 msgid "Last Name Attribute" msgstr "Atrybut Imienia" -#: rhodecode/authentication/plugins/auth_ldap.py:167 -msgid "LDAP Attribute to map to email address" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:170 +#: rhodecode/authentication/plugins/auth_ldap.py:174 +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 msgid "Email Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:351 +#: rhodecode/authentication/plugins/auth_ldap.py:360 msgid "LDAP" msgstr "LDAP" @@ -520,16 +645,16 @@ msgstr "" msgid "PAM" msgstr "" -#: rhodecode/authentication/plugins/auth_rhodecode.py:68 +#: rhodecode/authentication/plugins/auth_rhodecode.py:67 msgid "Rhodecode" msgstr "" -#: rhodecode/authentication/plugins/auth_token.py:71 +#: rhodecode/authentication/plugins/auth_token.py:70 msgid "Rhodecode Token Auth" msgstr "" #: rhodecode/controllers/changelog.py:91 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:202 +#: rhodecode/controllers/pullrequests.py:204 msgid "There are no commits yet" msgstr "Brak commitów" @@ -563,8 +688,8 @@ msgid "No such commit exists for this re msgstr "" #: rhodecode/controllers/changeset.py:344 -#: rhodecode/controllers/pullrequests.py:948 -#: rhodecode/model/pull_request.py:1009 +#: rhodecode/controllers/pullrequests.py:985 +#: rhodecode/model/pull_request.py:1055 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" @@ -604,12 +729,12 @@ msgid "" "%(repo1)s with commit %(commit2)s from repository %(repo2)s." msgstr "" -#: rhodecode/controllers/feed.py:70 +#: rhodecode/controllers/feed.py:69 #, python-format msgid "Changes on %s repository" msgstr "Zmiany w %s repozytorium" -#: rhodecode/controllers/feed.py:71 +#: rhodecode/controllers/feed.py:70 #, python-format msgid "%s %s feed" msgstr "%s %s zasilać" @@ -623,93 +748,93 @@ msgstr "" msgid "There are no files yet. %s" msgstr "" -#: rhodecode/controllers/files.py:394 rhodecode/controllers/files.py:447 -#: rhodecode/controllers/files.py:478 rhodecode/controllers/files.py:553 -#: rhodecode/controllers/files.py:598 rhodecode/controllers/files.py:689 +#: 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 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:402 rhodecode/controllers/files.py:455 +#: rhodecode/controllers/files.py:443 rhodecode/controllers/files.py:496 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:411 rhodecode/controllers/files.py:464 +#: rhodecode/controllers/files.py:452 rhodecode/controllers/files.py:505 #, python-format msgid "Deleted file %s via RhodeCode Enterprise" msgstr "" -#: rhodecode/controllers/files.py:431 +#: rhodecode/controllers/files.py:472 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:540 -#: rhodecode/controllers/files.py:677 +#: rhodecode/controllers/files.py:475 rhodecode/controllers/files.py:581 +#: rhodecode/controllers/files.py:718 msgid "Error occurred during commit" msgstr "Wystąpił błąd w trakcie zatwierdzania" -#: rhodecode/controllers/files.py:486 rhodecode/controllers/files.py:561 +#: rhodecode/controllers/files.py:527 rhodecode/controllers/files.py:602 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:498 rhodecode/controllers/files.py:573 +#: rhodecode/controllers/files.py:539 rhodecode/controllers/files.py:614 #, python-format msgid "Edited file %s via RhodeCode Enterprise" msgstr "" -#: rhodecode/controllers/files.py:515 +#: rhodecode/controllers/files.py:556 msgid "No changes" msgstr "Bez zmian" -#: rhodecode/controllers/files.py:537 rhodecode/controllers/files.py:666 +#: 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:611 rhodecode/controllers/files.py:700 +#: rhodecode/controllers/files.py:652 rhodecode/controllers/files.py:741 msgid "Added file via RhodeCode Enterprise" msgstr "" -#: rhodecode/controllers/files.py:636 +#: rhodecode/controllers/files.py:677 msgid "No filename" msgstr "Brak nazwy pliku" -#: rhodecode/controllers/files.py:669 +#: 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:723 +#: rhodecode/controllers/files.py:764 msgid "Downloads disabled" msgstr "Pobieranie wyłączone" -#: rhodecode/controllers/files.py:729 +#: rhodecode/controllers/files.py:770 #, python-format msgid "Unknown revision %s" msgstr "Nieznana wersja %s" -#: rhodecode/controllers/files.py:731 +#: rhodecode/controllers/files.py:772 msgid "Empty repository" msgstr "Puste repozytorium" -#: rhodecode/controllers/files.py:733 rhodecode/controllers/files.py:767 +#: rhodecode/controllers/files.py:774 rhodecode/controllers/files.py:808 msgid "Unknown archive type" msgstr "Nieznany typ archiwum" -#: rhodecode/controllers/files.py:952 +#: rhodecode/controllers/files.py:993 msgid "Changesets" msgstr "Różnice" -#: rhodecode/controllers/files.py:973 rhodecode/controllers/summary.py:269 -#: rhodecode/model/pull_request.py:1234 rhodecode/model/scm.py:782 -#: rhodecode/templates/base/vcs_settings.mako:193 +#: 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:977 rhodecode/model/scm.py:797 -#: rhodecode/templates/base/vcs_settings.mako:218 +#: rhodecode/controllers/files.py:1018 rhodecode/model/scm.py:797 +#: rhodecode/templates/base/vcs_settings.mako:267 msgid "Tags" msgstr "Etykiety" @@ -718,23 +843,24 @@ msgstr "Etykiety" msgid "An error occurred during repository forking %s" msgstr "Wystąpił błąd podczas rozgałęzienia %s repozytorium" -#: rhodecode/controllers/home.py:205 +#: rhodecode/controllers/home.py:207 msgid "Groups" msgstr "Grupy" -#: rhodecode/controllers/home.py:212 rhodecode/controllers/home.py:247 -#: rhodecode/controllers/pullrequests.py:308 +#: 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:73 -#: rhodecode/templates/base/base.mako:145 -#: rhodecode/templates/base/base.mako:569 +#: 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:225 +#: rhodecode/controllers/home.py:227 #, python-format msgid "Commits in %(repo)s" msgstr "" @@ -747,81 +873,81 @@ msgstr "Dziennik publiczny" msgid "journal" msgstr "dziennik" -#: rhodecode/controllers/pullrequests.py:216 +#: rhodecode/controllers/pullrequests.py:218 msgid "Commit does not exist" msgstr "" -#: rhodecode/controllers/pullrequests.py:333 -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:335 +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 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/controllers/pullrequests.py:383 +#: rhodecode/controllers/pullrequests.py:385 msgid "Successfully opened new pull request" msgstr "Prośba o wykonanie połączenia gałęzi została wykonana prawidłowo" -#: rhodecode/controllers/pullrequests.py:386 +#: 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:429 +#: rhodecode/controllers/pullrequests.py:431 msgid "Cannot update closed pull requests." msgstr "" -#: rhodecode/controllers/pullrequests.py:435 +#: rhodecode/controllers/pullrequests.py:437 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/controllers/pullrequests.py:443 +#: rhodecode/controllers/pullrequests.py:455 msgid "" "Pull request updated to \"{source_commit_id}\" with {count_added} added, " -"{count_removed} removed commits." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:458 +"{count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:472 msgid "Reload page" msgstr "" -#: rhodecode/controllers/pullrequests.py:532 +#: rhodecode/controllers/pullrequests.py:546 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/controllers/pullrequests.py:569 +#: rhodecode/controllers/pullrequests.py:588 msgid "Successfully deleted pull request" msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo" -#: rhodecode/controllers/pullrequests.py:864 -msgid "Close Pull Request" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:952 -#: rhodecode/model/pull_request.py:1013 +#: rhodecode/controllers/pullrequests.py:592 +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:1002 +#: 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:243 +#: rhodecode/controllers/summary.py:251 msgid "Branch" msgstr "gałąź" -#: rhodecode/controllers/summary.py:244 +#: rhodecode/controllers/summary.py:252 msgid "Tag" msgstr "Tag" -#: rhodecode/controllers/summary.py:245 +#: rhodecode/controllers/summary.py:253 msgid "Bookmark" msgstr "Bookmark" -#: rhodecode/controllers/summary.py:270 +#: rhodecode/controllers/summary.py:278 msgid "Closed branches" msgstr "Zamkniętę gałęzie" @@ -833,42 +959,6 @@ msgstr "Domyślne ustawienia zostały pomyślnie zaktualizowane" msgid "Error occurred during update of default values" msgstr "" -#: rhodecode/controllers/admin/gists.py:62 -#: rhodecode/controllers/admin/my_account.py:384 -#: rhodecode/controllers/admin/users.py:465 -msgid "forever" -msgstr "na zawsze" - -#: rhodecode/controllers/admin/gists.py:63 -#: rhodecode/controllers/admin/my_account.py:385 -#: rhodecode/controllers/admin/users.py:466 -msgid "5 minutes" -msgstr "5 minut" - -#: rhodecode/controllers/admin/gists.py:64 -#: rhodecode/controllers/admin/my_account.py:386 -#: rhodecode/controllers/admin/users.py:467 -msgid "1 hour" -msgstr "1 godzina" - -#: rhodecode/controllers/admin/gists.py:65 -#: rhodecode/controllers/admin/my_account.py:387 -#: rhodecode/controllers/admin/users.py:468 -msgid "1 day" -msgstr "1 dzień" - -#: rhodecode/controllers/admin/gists.py:66 -#: rhodecode/controllers/admin/my_account.py:388 -#: rhodecode/controllers/admin/users.py:469 -msgid "1 month" -msgstr "1 miesiąc" - -#: rhodecode/controllers/admin/gists.py:70 -#: rhodecode/controllers/admin/my_account.py:390 -#: rhodecode/controllers/admin/users.py:471 -msgid "Lifetime" -msgstr "Czas życia" - #: rhodecode/controllers/admin/gists.py:72 msgid "Requires registered account" msgstr "" @@ -905,10 +995,8 @@ msgstr "" #: rhodecode/controllers/admin/gists.py:343 #: rhodecode/templates/admin/gists/show.mako:67 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 #: rhodecode/templates/data_table/_dt_elements.mako:263 msgid "never" msgstr "nigdy" @@ -918,65 +1006,36 @@ msgstr "nigdy" msgid "%(expiry)s - current value" msgstr "" -#: rhodecode/controllers/admin/my_account.py:80 +#: rhodecode/controllers/admin/my_account.py:78 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:140 +#: rhodecode/controllers/admin/my_account.py:138 msgid "Your account was updated successfully" msgstr "Twoje konto zostało pomyślnie zaktualizowane" -#: rhodecode/controllers/admin/my_account.py:155 -#: rhodecode/controllers/admin/users.py:231 +#: rhodecode/controllers/admin/my_account.py:153 +#: rhodecode/controllers/admin/users.py:184 #, 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:221 -#: rhodecode/controllers/admin/my_account.py:227 -msgid "Error occurred during update of user password" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:234 -msgid "Successfully updated password" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:278 -#: rhodecode/controllers/admin/users.py:645 +#: 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:285 -#: rhodecode/controllers/admin/users.py:652 +#: 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:295 -#: rhodecode/controllers/admin/users.py:667 +#: rhodecode/controllers/admin/my_account.py:239 +#: rhodecode/controllers/admin/users.py:549 msgid "Removed email address from user account" msgstr "" -#: rhodecode/controllers/admin/my_account.py:393 -#: rhodecode/controllers/admin/users.py:474 -msgid "Role" -msgstr "Rola" - -#: rhodecode/controllers/admin/my_account.py:406 -#: rhodecode/controllers/admin/users.py:498 -msgid "Auth token successfully created" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:419 -#: rhodecode/controllers/admin/users.py:517 -msgid "Auth token successfully reset" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:423 -#: rhodecode/controllers/admin/users.py:521 -msgid "Auth token successfully deleted" -msgstr "" - #: rhodecode/controllers/admin/permissions.py:112 msgid "Application permissions updated successfully" msgstr "" @@ -1022,6 +1081,7 @@ msgid_plural "This group contains %(num) msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/controllers/admin/repo_groups.py:305 #, python-format @@ -1030,6 +1090,7 @@ msgid_plural "This group contains %(num) msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/controllers/admin/repo_groups.py:312 #, python-format @@ -1042,7 +1103,7 @@ msgid "Error occurred during deletion of msgstr "Wystąpił błąd podczas usuwania z repozytorium grupy %s" #: rhodecode/controllers/admin/repo_groups.py:388 -#: rhodecode/controllers/admin/user_groups.py:322 +#: rhodecode/controllers/admin/user_groups.py:323 msgid "Cannot change permission for yourself as admin" msgstr "" @@ -1194,18 +1255,18 @@ msgid "Error occurred during deleting is msgstr "" #: rhodecode/controllers/admin/repos.py:728 -#: rhodecode/controllers/admin/settings.py:380 +#: rhodecode/controllers/admin/settings.py:381 msgid "Removed issue tracker entry" msgstr "" #: rhodecode/controllers/admin/repos.py:758 -#: rhodecode/controllers/admin/settings.py:427 +#: rhodecode/controllers/admin/settings.py:428 msgid "Updated issue tracker entries" msgstr "" #: rhodecode/controllers/admin/repos.py:819 #: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:618 +#: rhodecode/controllers/admin/settings.py:619 msgid "Some form inputs contain invalid data." msgstr "" @@ -1214,281 +1275,277 @@ msgid "Error occurred during updating re msgstr "" #: rhodecode/controllers/admin/repos.py:841 -#: rhodecode/controllers/admin/settings.py:175 +#: rhodecode/controllers/admin/settings.py:176 msgid "Updated VCS settings" msgstr "Aktualizacja ustawień VCS" -#: rhodecode/controllers/admin/settings.py:171 -#: rhodecode/controllers/admin/settings.py:282 +#: rhodecode/controllers/admin/settings.py:172 +#: rhodecode/controllers/admin/settings.py:283 msgid "Error occurred during updating application settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień aplikacji" -#: rhodecode/controllers/admin/settings.py:222 +#: rhodecode/controllers/admin/settings.py:223 #, 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:278 +#: rhodecode/controllers/admin/settings.py:279 msgid "Updated application settings" msgstr "Aktualizacja ustawień aplikacji" -#: rhodecode/controllers/admin/settings.py:344 +#: rhodecode/controllers/admin/settings.py:345 msgid "Updated visualisation settings" msgstr "Aktualizacja ustawień wizualizacji" -#: rhodecode/controllers/admin/settings.py:347 +#: rhodecode/controllers/admin/settings.py:348 msgid "Error occurred during updating visualisation settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień wizualizacji" -#: rhodecode/controllers/admin/settings.py:440 +#: rhodecode/controllers/admin/settings.py:441 msgid "Please enter email address" msgstr "Proszę podać adres email" -#: rhodecode/controllers/admin/settings.py:458 +#: rhodecode/controllers/admin/settings.py:459 msgid "Send email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:491 +#: rhodecode/controllers/admin/settings.py:492 msgid "Added new hook" msgstr "Dodano nowy hook" -#: rhodecode/controllers/admin/settings.py:506 +#: rhodecode/controllers/admin/settings.py:507 msgid "Updated hooks" msgstr "Aktualizacja hooku" -#: rhodecode/controllers/admin/settings.py:510 +#: rhodecode/controllers/admin/settings.py:511 msgid "Error occurred during hook creation" msgstr "Wystąpił błąd podczas tworzenia hooku" -#: rhodecode/controllers/admin/settings.py:639 +#: rhodecode/controllers/admin/settings.py:640 msgid "Error occurred during updating labs settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:644 +#: rhodecode/controllers/admin/settings.py:645 msgid "Updated Labs settings" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:164 +#: rhodecode/controllers/admin/user_groups.py:165 #, python-format msgid "Created user group %(user_group_link)s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:178 +#: rhodecode/controllers/admin/user_groups.py:179 #, 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:219 +#: rhodecode/controllers/admin/user_groups.py:220 #, python-format msgid "Updated user group %s" msgstr "Zaktualizowano grupę użytkowników %s" -#: rhodecode/controllers/admin/user_groups.py:235 +#: rhodecode/controllers/admin/user_groups.py:236 #, 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:257 +#: rhodecode/controllers/admin/user_groups.py:258 msgid "Successfully deleted user group" msgstr "Grupa użytkowników została usunięta z powodzeniem" -#: rhodecode/controllers/admin/user_groups.py:262 +#: rhodecode/controllers/admin/user_groups.py:263 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:330 +#: rhodecode/controllers/admin/user_groups.py:331 msgid "Target group cannot be the same" msgstr "Grupa docelowa nie może być taka sama" -#: rhodecode/controllers/admin/user_groups.py:336 +#: rhodecode/controllers/admin/user_groups.py:337 msgid "User Group permissions updated" msgstr "Aktualizacja uprawnień grupy użytkowników" -#: rhodecode/controllers/admin/user_groups.py:421 +#: rhodecode/controllers/admin/user_groups.py:422 msgid "User Group global permissions updated successfully" msgstr "" #: rhodecode/controllers/admin/user_groups.py:437 -#: rhodecode/controllers/admin/users.py:595 +#: rhodecode/controllers/admin/users.py:477 msgid "An error occurred during permissions saving" msgstr "Wystąpił błąd podczas zapisywania uprawnień" -#: rhodecode/controllers/admin/users.py:153 +#: rhodecode/controllers/admin/user_groups.py:481 +msgid "User Group synchronization updated successfully" +msgstr "" + +#: rhodecode/controllers/admin/user_groups.py:485 +msgid "An error occurred during synchronization update" +msgstr "" + +#: rhodecode/controllers/admin/users.py:106 #, python-format msgid "Created user %(user_link)s" msgstr "" -#: rhodecode/controllers/admin/users.py:169 +#: rhodecode/controllers/admin/users.py:122 #, 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:214 +#: rhodecode/controllers/admin/users.py:167 msgid "User updated successfully" msgstr "Użytkownik został zaktualizowany" -#: rhodecode/controllers/admin/users.py:265 +#: rhodecode/controllers/admin/users.py:218 #, python-format msgid "Detached %s repositories" msgstr "" -#: rhodecode/controllers/admin/users.py:270 +#: rhodecode/controllers/admin/users.py:223 #, python-format msgid "Deleted %s repositories" msgstr "" -#: rhodecode/controllers/admin/users.py:278 +#: rhodecode/controllers/admin/users.py:231 #, python-format msgid "Detached %s repository groups" msgstr "" -#: rhodecode/controllers/admin/users.py:283 +#: rhodecode/controllers/admin/users.py:236 #, python-format msgid "Deleted %s repository groups" msgstr "" +#: rhodecode/controllers/admin/users.py:244 +#, python-format +msgid "Detached %s user groups" +msgstr "" + +#: rhodecode/controllers/admin/users.py:249 +#, python-format +msgid "Deleted %s user groups" +msgstr "" + +#: rhodecode/controllers/admin/users.py:260 +msgid "Successfully deleted user" +msgstr "Użytkownik został usunięty" + +#: rhodecode/controllers/admin/users.py:266 +msgid "An error occurred during deletion of user" +msgstr "Wystąpił błąd podczas usuwania użytkownika" + +#: 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 -#, python-format -msgid "Detached %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:296 -#, python-format -msgid "Deleted %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:307 -msgid "Successfully deleted user" -msgstr "Użytkownik został usunięty" - -#: rhodecode/controllers/admin/users.py:313 -msgid "An error occurred during deletion of user" -msgstr "Wystąpił błąd podczas usuwania użytkownika" - -#: rhodecode/controllers/admin/users.py:332 -msgid "Force password change disabled for user" +msgid "An error occurred during password reset for user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:324 +#, python-format +msgid "Linked repository group `%s` as personal" +msgstr "" + +#: rhodecode/controllers/admin/users.py:330 +#, python-format +msgid "Created repository group `%s`" msgstr "" #: rhodecode/controllers/admin/users.py:334 -msgid "Force password change enabled for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:338 -msgid "An error occurred during password reset for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:371 -#, python-format -msgid "Linked repository group `%s` as personal" -msgstr "" - -#: rhodecode/controllers/admin/users.py:377 -#, python-format -msgid "Created repository group `%s`" -msgstr "" - -#: rhodecode/controllers/admin/users.py:381 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/controllers/admin/users.py:386 +#: rhodecode/controllers/admin/users.py:339 msgid "An error occurred during repository group creation for user" msgstr "" -#: rhodecode/controllers/admin/users.py:406 -#: rhodecode/controllers/admin/users.py:427 -#: rhodecode/controllers/admin/users.py:459 -#: rhodecode/controllers/admin/users.py:490 -#: rhodecode/controllers/admin/users.py:507 -#: rhodecode/controllers/admin/users.py:530 -#: rhodecode/controllers/admin/users.py:604 -#: rhodecode/controllers/admin/users.py:617 -#: rhodecode/controllers/admin/users.py:675 -msgid "You can't edit this user" -msgstr "Nie możesz edytować tego użytkownika" - -#: rhodecode/controllers/admin/users.py:443 +#: rhodecode/controllers/admin/users.py:396 msgid "" "The user participates as reviewer in pull requests and cannot be deleted. " "You can set the user to \"inactive\" instead of deleting it." msgstr "" -#: rhodecode/controllers/admin/users.py:579 +#: rhodecode/controllers/admin/users.py:461 msgid "User global permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/users.py:707 +#: rhodecode/controllers/admin/users.py:589 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/controllers/admin/users.py:722 +#: 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:726 +#: rhodecode/controllers/admin/users.py:608 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/controllers/admin/users.py:744 +#: 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:65 +#: rhodecode/events/pullrequest.py:68 msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:74 +#: rhodecode/events/pullrequest.py:77 msgid "pullrequest closed" msgstr "" -#: rhodecode/events/pullrequest.py:83 +#: rhodecode/events/pullrequest.py:86 msgid "pullrequest commits updated" msgstr "" -#: rhodecode/events/pullrequest.py:92 +#: rhodecode/events/pullrequest.py:95 msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:101 +#: rhodecode/events/pullrequest.py:104 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:110 +#: rhodecode/events/pullrequest.py:113 msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:136 +#: rhodecode/events/repo.py:138 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:145 +#: rhodecode/events/repo.py:147 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:154 +#: rhodecode/events/repo.py:156 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:163 +#: rhodecode/events/repo.py:165 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:199 +#: rhodecode/events/repo.py:201 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:208 +#: rhodecode/events/repo.py:210 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:217 +#: rhodecode/events/repo.py:219 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:228 +#: rhodecode/events/repo.py:230 msgid "repository push" msgstr "" @@ -1504,25 +1561,24 @@ msgstr "" msgid "repository group update" msgstr "" -#: rhodecode/events/user.py:34 +#: rhodecode/events/user.py:37 msgid "user registered" msgstr "" -#: rhodecode/events/user.py:48 +#: rhodecode/events/user.py:52 msgid "user pre create" msgstr "" -#: rhodecode/events/user.py:61 +#: rhodecode/events/user.py:66 msgid "user post create" msgstr "" -#: rhodecode/events/user.py:74 +#: rhodecode/events/user.py:80 msgid "user pre update" msgstr "" #: rhodecode/forms/__init__.py:32 rhodecode/templates/admin/gists/new.mako:62 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:31 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:88 +#: 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 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 @@ -1534,15 +1590,14 @@ msgstr "" #: 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_vcs.mako:46 +#: 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 #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 #: rhodecode/templates/admin/settings/settings_visual.mako:222 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:27 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:85 +#: 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_profile.mako:135 @@ -1552,17 +1607,17 @@ msgstr "Zresetuj" #: rhodecode/forms/__init__.py:33 rhodecode/templates/admin/gists/show.mako:49 #: rhodecode/templates/admin/integrations/list.mako:211 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:60 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 #: rhodecode/templates/admin/permissions/permissions_ips.mako:26 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:56 +#: 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/base/issue_tracker_settings.mako:70 -#: rhodecode/templates/base/vcs_settings.mako:202 -#: rhodecode/templates/base/vcs_settings.mako:227 +#: 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/changeset/changeset_file_comment.mako:142 @@ -1571,9 +1626,9 @@ msgstr "Zresetuj" #: rhodecode/templates/data_table/_dt_elements.mako:198 #: rhodecode/templates/data_table/_dt_elements.mako:210 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:35 -#: rhodecode/templates/files/files_source.mako:39 -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_source.mako:45 +#: rhodecode/templates/files/files_source.mako:49 +#: rhodecode/templates/files/files_source.mako:52 #: rhodecode/templates/pullrequests/pullrequest_show.mako:56 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" @@ -1612,28 +1667,28 @@ msgstr "" msgid "Root repositories only" msgstr "" -#: rhodecode/integrations/views.py:161 +#: rhodecode/integrations/views.py:160 msgid "{repo_name} repository" msgstr "" -#: rhodecode/integrations/views.py:164 +#: rhodecode/integrations/views.py:163 msgid "{repo_group_name} repo group" msgstr "" -#: rhodecode/integrations/views.py:171 +#: rhodecode/integrations/views.py:170 msgid "{name} integration" msgstr "" -#: rhodecode/integrations/views.py:185 +#: rhodecode/integrations/views.py:184 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:265 +#: rhodecode/integrations/views.py:264 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:290 +#: rhodecode/integrations/views.py:289 msgid "Integration {integration_name} updated successfully." msgstr "" @@ -1707,58 +1762,59 @@ msgid "" "Send events such as repo pushes and pull requests to your hipchat channel." msgstr "" -#: rhodecode/integrations/types/slack.py:44 +#: rhodecode/integrations/types/slack.py:46 msgid "Slack service URL" msgstr "" -#: rhodecode/integrations/types/slack.py:45 +#: rhodecode/integrations/types/slack.py:47 msgid "" "This can be setup at the slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:58 rhodecode/templates/login.mako:42 -#: rhodecode/templates/register.mako:40 +#: 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/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:90 -#: rhodecode/templates/base/base.mako:301 +#: rhodecode/templates/admin/users/users.mako:62 +#: rhodecode/templates/base/base.mako:304 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 msgid "Username" msgstr "Nazwa użytkownika" -#: rhodecode/integrations/types/slack.py:59 +#: rhodecode/integrations/types/slack.py:61 msgid "Username to show notifications coming from." msgstr "" -#: rhodecode/integrations/types/slack.py:68 +#: rhodecode/integrations/types/slack.py:70 msgid "Channel" msgstr "" -#: rhodecode/integrations/types/slack.py:69 +#: rhodecode/integrations/types/slack.py:71 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:78 +#: rhodecode/integrations/types/slack.py:80 msgid "Emoji" msgstr "" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:81 msgid "Emoji to use eg. :studio_microphone:" msgstr "" -#: rhodecode/integrations/types/slack.py:101 +#: rhodecode/integrations/types/slack.py:92 msgid "Slack" msgstr "" -#: rhodecode/integrations/types/slack.py:102 +#: rhodecode/integrations/types/slack.py:93 msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" @@ -1922,25 +1978,25 @@ msgstr "Utworzony tag: %s" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1189 +#: rhodecode/lib/auth.py:1197 #, python-format msgid "IP %s not allowed" msgstr "Obserwatorzy %s" -#: rhodecode/lib/auth.py:1263 +#: rhodecode/lib/auth.py:1281 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:1311 +#: rhodecode/lib/auth.py:1329 #, python-format msgid "Action not supported for %s." msgstr "" -#: rhodecode/lib/auth.py:1348 +#: rhodecode/lib/auth.py:1379 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/base.py:557 +#: rhodecode/lib/base.py:549 #, python-format msgid "The repository at %(repo_name)s cannot be located." msgstr "" @@ -1966,36 +2022,16 @@ msgstr "Nie wykryto zmian" msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1515 +#: rhodecode/lib/helpers.py:1517 #, python-format msgid " and %s more" msgstr "i %s więcej" -#: rhodecode/lib/helpers.py:1519 +#: rhodecode/lib/helpers.py:1521 msgid "No Files" msgstr "Brak Plików" -#: rhodecode/lib/helpers.py:1592 -msgid "new file" -msgstr "nowy plik" - -#: rhodecode/lib/helpers.py:1595 -msgid "mod" -msgstr "modyfikuj" - -#: rhodecode/lib/helpers.py:1598 -msgid "del" -msgstr "kasuj" - -#: rhodecode/lib/helpers.py:1601 -msgid "rename" -msgstr "zmień nazwę" - -#: rhodecode/lib/helpers.py:1606 -msgid "chmod" -msgstr "chmod" - -#: rhodecode/lib/helpers.py:1853 +#: rhodecode/lib/helpers.py:1800 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2014,7 +2050,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1873 +#: rhodecode/lib/helpers.py:1820 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the" @@ -2054,9 +2090,9 @@ msgid "in ${val} and ${detail}" msgstr "" #: rhodecode/lib/utils2.py:515 -#: rhodecode/public/js/rhodecode-components.js:33194 -#: rhodecode/public/js/scripts.js:25042 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: 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/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "przed chwilą" @@ -2089,7 +2125,9 @@ msgstr "przed chwilą" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/model/db.py:2298 +#: 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 msgid "Repository no access" msgstr "Brak dostępu do repozytorium" @@ -2121,7 +2159,9 @@ msgstr "Brak dostępu do repozytorium" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/model/db.py:2299 +#: 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 msgid "Repository read access" msgstr "Repozytorium do odczytu" @@ -2153,7 +2193,9 @@ msgstr "Repozytorium do odczytu" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/model/db.py:2300 +#: 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 msgid "Repository write access" msgstr "Repozytorium do zapisu" @@ -2185,7 +2227,9 @@ msgstr "Repozytorium do zapisu" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 -#: rhodecode/model/db.py:2301 +#: 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 msgid "Repository admin access" msgstr "Administracja dostępu do repozytorium" @@ -2257,7 +2301,9 @@ msgstr "Administrator Repo" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/model/db.py:2319 +#: 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 msgid "Repository creation disabled" msgstr "Tworzenie repozytorium jest wyłączone" @@ -2289,7 +2335,9 @@ msgstr "Tworzenie repozytorium jest wyłączone" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 -#: rhodecode/model/db.py:2320 +#: 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 msgid "Repository creation enabled" msgstr "Tworzenie repozytorium jest włączone" @@ -2321,7 +2369,9 @@ msgstr "Tworzenie repozytorium jest włączone" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 -#: rhodecode/model/db.py:2324 +#: 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 msgid "Repository forking disabled" msgstr "Rozwidlenie repozytorium wyłączone" @@ -2353,7 +2403,9 @@ msgstr "Rozwidlenie repozytorium wyłączone" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/model/db.py:2325 +#: 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 msgid "Repository forking enabled" msgstr "Rozwidlenie repozytorium włączone" @@ -2406,7 +2458,9 @@ msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 -#: rhodecode/model/db.py:3009 +#: 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 msgid "Not Reviewed" msgstr "Brak Korekty" @@ -2438,7 +2492,9 @@ msgstr "Brak Korekty" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 -#: rhodecode/model/db.py:3010 +#: 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 msgid "Approved" msgstr "Zaakceptowano" @@ -2470,7 +2526,9 @@ msgstr "Zaakceptowano" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 -#: rhodecode/model/db.py:3011 +#: 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 msgid "Rejected" msgstr "Odrzucono" @@ -2502,7 +2560,9 @@ msgstr "Odrzucono" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 -#: rhodecode/model/db.py:3012 +#: 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 msgid "Under Review" msgstr "Objęty Przeglądem" @@ -2531,7 +2591,9 @@ msgstr "Objęty Przeglądem" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/model/db.py:2303 +#: 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 msgid "Repository group no access" msgstr "Grupy repozytoriów brak dostępu" @@ -2560,7 +2622,9 @@ msgstr "Grupy repozytoriów brak dostępu" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/model/db.py:2304 +#: 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 msgid "Repository group read access" msgstr "Grupy repozytoriów dostęp do odczytu" @@ -2589,7 +2653,9 @@ msgstr "Grupy repozytoriów dostęp do odczytu" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/model/db.py:2305 +#: 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 msgid "Repository group write access" msgstr "Grupy repozytoriów dostęp do zapisu" @@ -2618,7 +2684,9 @@ msgstr "Grupy repozytoriów dostęp do zapisu" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 -#: rhodecode/model/db.py:2306 +#: 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 msgid "Repository group admin access" msgstr "Repozytoria Grupy dostęp administratora" @@ -2646,7 +2714,9 @@ msgstr "Repozytoria Grupy dostęp administratora" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/model/db.py:2308 +#: 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 msgid "User group no access" msgstr "Ta grupa użytkowników nie ma dostępu" @@ -2674,7 +2744,9 @@ msgstr "Ta grupa użytkowników nie ma dostępu" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 -#: rhodecode/model/db.py:2309 +#: 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 msgid "User group read access" msgstr "Dostęp do grupy parametrów użytkownika" @@ -2702,7 +2774,9 @@ msgstr "Dostęp do grupy parametrów użytkownika" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/model/db.py:2310 +#: 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 msgid "User group write access" msgstr "Ta grupa użytkowników ma prawo do zapisu" @@ -2730,7 +2804,9 @@ msgstr "Ta grupa użytkowników ma prawo do zapisu" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/model/db.py:2311 +#: 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 msgid "User group admin access" msgstr "Ta grupa użytkowników ma uprawnienia administratora" @@ -2758,7 +2834,9 @@ msgstr "Ta grupa użytkowników ma uprawnienia administratora" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/model/db.py:2313 +#: 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 msgid "Repository Group creation disabled" msgstr "Tworzenie grup repozytoriów wyłączone" @@ -2786,7 +2864,9 @@ msgstr "Tworzenie grup repozytoriów wyłączone" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/model/db.py:2314 +#: 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 msgid "Repository Group creation enabled" msgstr "Tworzenie grup repozytoriów włączone" @@ -2814,7 +2894,9 @@ msgstr "Tworzenie grup repozytoriów włączone" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/model/db.py:2316 +#: 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 msgid "User Group creation disabled" msgstr "Tworzenie grup użytkowników wyłączone" @@ -2842,7 +2924,9 @@ msgstr "Tworzenie grup użytkowników wyłączone" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/model/db.py:2317 +#: 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 msgid "User Group creation enabled" msgstr "Tworzenie grup użytkowników właczone" @@ -2870,7 +2954,9 @@ msgstr "Tworzenie grup użytkowników właczone" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 -#: rhodecode/model/db.py:2327 +#: 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 msgid "Registration disabled" msgstr "Rejestracja wyłączona" @@ -2898,7 +2984,9 @@ msgstr "Rejestracja wyłączona" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/model/db.py:2328 +#: 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 msgid "User Registration with manual account activation" msgstr "Rejestracja użytkownika z ręczną aktywacją konta" @@ -2926,7 +3014,9 @@ msgstr "Rejestracja użytkownika z ręczną aktywacją konta" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/model/db.py:2329 +#: 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 msgid "User Registration with automatic account activation" msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" @@ -2954,7 +3044,9 @@ msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 -#: rhodecode/model/db.py:2335 rhodecode/model/permission.py:95 +#: 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 msgid "Manual activation of external account" msgstr "Ręczna aktywacja nowego konta" @@ -2982,7 +3074,9 @@ msgstr "Ręczna aktywacja nowego konta" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 -#: rhodecode/model/db.py:2336 rhodecode/model/permission.py:96 +#: 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 msgid "Automatic activation of external account" msgstr "Automatyczna aktywacja nowego konta" @@ -3004,7 +3098,9 @@ msgstr "Automatyczna aktywacja nowego ko #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/model/db.py:2321 +#: 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 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3027,7 +3123,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/model/db.py:2322 +#: 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 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3047,7 +3145,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/model/db.py:2296 +#: 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 msgid "RhodeCode Super Administrator" msgstr "" @@ -3064,7 +3164,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 -#: rhodecode/model/db.py:2338 +#: 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 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3081,7 +3183,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 -#: rhodecode/model/db.py:2339 +#: 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 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3089,7 +3193,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 rhodecode/model/db.py:913 +#: 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 msgid "all" msgstr "" @@ -3097,7 +3203,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 rhodecode/model/db.py:914 +#: 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 msgid "http/web interface" msgstr "" @@ -3105,7 +3213,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 rhodecode/model/db.py:915 +#: 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 msgid "vcs (git/hg/svn protocol)" msgstr "" @@ -3113,7 +3223,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 rhodecode/model/db.py:916 +#: 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 msgid "api calls" msgstr "" @@ -3121,7 +3233,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 rhodecode/model/db.py:917 +#: 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 msgid "feed access" msgstr "" @@ -3130,84 +3244,70 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 -#: rhodecode/model/db.py:2067 +#: 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 msgid "No parent" msgstr "" -#: rhodecode/lib/index/whoosh.py:148 +#: 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 +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 +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 +msgid "Password reset disabled" +msgstr "" + +#: rhodecode/lib/index/whoosh.py:149 msgid "Invalid search query. Try quoting it." msgstr "Nieprawidłowe zapytania. Spróbuj zacytować go." -#: rhodecode/lib/index/whoosh.py:150 +#: rhodecode/lib/index/whoosh.py:151 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:155 +#: rhodecode/lib/index/whoosh.py:156 msgid "An error occurred during this search operation" msgstr "Wystąpił błąd podczas wyszukiwania tej operacji" -#: rhodecode/lib/index/whoosh.py:163 -msgid "Index Type" -msgstr "" - #: rhodecode/lib/index/whoosh.py:164 +msgid "Index Type" +msgstr "" + +#: rhodecode/lib/index/whoosh.py:165 msgid "File Index" msgstr "" -#: rhodecode/lib/index/whoosh.py:165 rhodecode/lib/index/whoosh.py:170 +#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171 msgid "Indexed documents" msgstr "" -#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172 +#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173 msgid "Last update" msgstr "" -#: rhodecode/lib/index/whoosh.py:169 +#: rhodecode/lib/index/whoosh.py:170 msgid "Commit index" msgstr "" -#: rhodecode/login/views.py:249 rhodecode/login/views.py:311 -msgid "Bad captcha" -msgstr "" - -#: rhodecode/login/views.py:258 -msgid "You have successfully registered with RhodeCode" -msgstr "" - -#: rhodecode/login/views.py:300 -msgid "Password reset has been disabled." -msgstr "" - -#: rhodecode/login/views.py:327 -msgid "Your password reset link was sent" -msgstr "Twój link zresetowania hasła został wysłany" - -#: rhodecode/login/views.py:351 -msgid "" -"Your password reset was successful, a new password has been sent to your " -"email" -msgstr "" - -#: rhodecode/model/comment.py:367 -msgid "made a comment" -msgstr "" - #: rhodecode/model/comment.py:368 +msgid "made a comment" +msgstr "" + +#: rhodecode/model/comment.py:369 msgid "Show it now" msgstr "" -#: rhodecode/model/db.py:2331 -msgid "Password reset enabled" -msgstr "" - -#: rhodecode/model/db.py:2332 -msgid "Password reset hidden" -msgstr "" - -#: rhodecode/model/db.py:2333 -msgid "Password reset disabled" -msgstr "" - #: rhodecode/model/forms.py:85 msgid "Please enter a login" msgstr "Wpisz login" @@ -3342,9 +3442,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:103 -#: rhodecode/templates/base/base.mako:406 -#: rhodecode/templates/base/base.mako:413 +#: rhodecode/templates/admin/users/users.mako:75 +#: rhodecode/templates/base/base.mako:409 +#: rhodecode/templates/base/base.mako:416 msgid "Admin" msgstr "Administracja" @@ -3375,74 +3475,74 @@ msgstr "" msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:77 +#: rhodecode/model/pull_request.py:78 msgid "This pull request can be automatically merged." msgstr "" -#: rhodecode/model/pull_request.py:79 +#: rhodecode/model/pull_request.py:80 msgid "This pull request cannot be merged because of an unhandled exception." msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:83 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:84 +#: rhodecode/model/pull_request.py:85 msgid "This pull request could not be merged because push to target failed." msgstr "" -#: rhodecode/model/pull_request.py:87 +#: rhodecode/model/pull_request.py:88 msgid "This pull request cannot be merged because the target is not a head." msgstr "" -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:91 msgid "" "This pull request cannot be merged because the source contains more branches" " than the target." msgstr "" -#: rhodecode/model/pull_request.py:93 +#: rhodecode/model/pull_request.py:94 msgid "" "This pull request cannot be merged because the target has multiple heads." msgstr "" -#: rhodecode/model/pull_request.py:96 +#: rhodecode/model/pull_request.py:97 msgid "" "This pull request cannot be merged because the target repository is locked." msgstr "" -#: rhodecode/model/pull_request.py:99 +#: rhodecode/model/pull_request.py:100 msgid "" "This pull request cannot be merged because the target or the source " "reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:102 +#: rhodecode/model/pull_request.py:103 msgid "" "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:105 +#: rhodecode/model/pull_request.py:106 msgid "" "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:108 +#: rhodecode/model/pull_request.py:109 msgid "" "This pull request cannot be merged because of conflicts related to sub " "repositories." msgstr "" -#: rhodecode/model/pull_request.py:114 +#: rhodecode/model/pull_request.py:115 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:116 +#: rhodecode/model/pull_request.py:117 msgid "Pull request update failed because of an unknown error." msgstr "" -#: rhodecode/model/pull_request.py:118 -msgid "No update needed because the source reference is already up to date." +#: rhodecode/model/pull_request.py:119 +msgid "No update needed because the source and target have not changed." msgstr "" #: rhodecode/model/pull_request.py:121 @@ -3473,51 +3573,51 @@ msgstr "" msgid "Pull request merged and closed" msgstr "" -#: rhodecode/model/pull_request.py:1041 +#: rhodecode/model/pull_request.py:1087 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1043 +#: rhodecode/model/pull_request.py:1089 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:1055 +#: rhodecode/model/pull_request.py:1101 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1073 +#: rhodecode/model/pull_request.py:1119 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1076 +#: rhodecode/model/pull_request.py:1122 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1233 rhodecode/model/scm.py:790 +#: rhodecode/model/pull_request.py:1279 rhodecode/model/scm.py:790 msgid "Bookmarks" msgstr "Zakładki" -#: rhodecode/model/pull_request.py:1238 +#: rhodecode/model/pull_request.py:1284 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1241 +#: rhodecode/model/pull_request.py:1287 msgid "Closed Branches" msgstr "Zamknięte Gałęzie" -#: rhodecode/model/pull_request.py:1364 +#: rhodecode/model/pull_request.py:1411 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1375 +#: rhodecode/model/pull_request.py:1424 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1390 +#: rhodecode/model/pull_request.py:1439 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1393 +#: rhodecode/model/pull_request.py:1442 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" @@ -3525,36 +3625,36 @@ msgstr "" msgid "latest tip" msgstr "ostatni tip" -#: rhodecode/model/user.py:125 +#: rhodecode/model/user.py:126 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:291 +#: rhodecode/model/user.py:292 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " "application" msgstr "" -#: rhodecode/model/user.py:464 +#: rhodecode/model/user.py:462 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:472 +#: rhodecode/model/user.py:470 #, 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:481 +#: rhodecode/model/user.py:479 #, 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:490 +#: rhodecode/model/user.py:488 #, python-format msgid "" "user \"%s\" still owns %s user groups and cannot be removed. Switch owners " @@ -3887,369 +3987,371 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:31198 -#: rhodecode/public/js/scripts.js:23046 +#: 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/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33129 -#: rhodecode/public/js/scripts.js:24977 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: 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/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33130 -#: rhodecode/public/js/scripts.js:24978 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: 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/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33131 -#: rhodecode/public/js/scripts.js:24979 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: 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/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33132 -#: rhodecode/public/js/scripts.js:24980 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: 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/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33133 -#: rhodecode/public/js/scripts.js:24981 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: 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/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33134 -#: rhodecode/public/js/scripts.js:24982 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: 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/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33154 -#: rhodecode/public/js/scripts.js:25002 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: 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/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33162 -#: rhodecode/public/js/scripts.js:25010 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: 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/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33174 -#: rhodecode/public/js/scripts.js:25022 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: 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/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33176 -#: rhodecode/public/js/scripts.js:25024 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: 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/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33180 -#: rhodecode/public/js/scripts.js:25028 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: 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/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33182 -#: rhodecode/public/js/scripts.js:25030 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: 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/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33184 -#: rhodecode/public/js/scripts.js:25032 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: 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/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47027 -#: rhodecode/public/js/scripts.js:38875 +#: 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/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47030 -#: rhodecode/public/js/scripts.js:38878 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: 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/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47033 -#: rhodecode/public/js/scripts.js:38881 +#: 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/select2/translations.js:10 msgid "No matches found" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47036 -#: rhodecode/public/js/scripts.js:38884 +#: 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/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47040 -#: rhodecode/public/js/scripts.js:38888 +#: 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/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47042 -#: rhodecode/public/js/scripts.js:38890 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: 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/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47047 -#: rhodecode/public/js/scripts.js:38895 +#: 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/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47049 -#: rhodecode/public/js/scripts.js:38897 +#: 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/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47054 -#: rhodecode/public/js/scripts.js:38902 +#: 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/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47056 -#: rhodecode/public/js/scripts.js:38904 +#: 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/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47060 -#: rhodecode/public/js/scripts.js:38908 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: 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/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47062 -#: rhodecode/public/js/scripts.js:38910 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: 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/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47991 -#: rhodecode/public/js/scripts.js:39839 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: 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/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47993 -#: rhodecode/public/js/scripts.js:39841 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: 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/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48426 -#: rhodecode/public/js/scripts.js:40274 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: 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/src/rhodecode/codemirror.js:296 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48445 -#: rhodecode/public/js/scripts.js:40293 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: 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/src/rhodecode/codemirror.js:315 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48464 -#: rhodecode/public/js/scripts.js:40312 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: 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/src/rhodecode/codemirror.js:334 +#: rhodecode/templates/email_templates/commit_comment.mako:99 +#: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48484 -#: rhodecode/public/js/scripts.js:40332 +#: 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/src/rhodecode/codemirror.js:354 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48848 -#: rhodecode/public/js/scripts.js:40696 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/comments.js:123 +#: 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/src/rhodecode/comments.js:125 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48927 -#: rhodecode/public/js/scripts.js:40775 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 -#: rhodecode/public/js/src/rhodecode/comments.js:202 +#: 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/src/rhodecode/comments.js:209 msgid "Status Review" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48941 -#: rhodecode/public/js/scripts.js:40789 +#: 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/src/rhodecode/comments.js:216 +#: rhodecode/public/js/src/rhodecode/comments.js:224 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49089 -#: rhodecode/public/js/scripts.js:40937 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/comments.js:364 +#: 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/src/rhodecode/comments.js:381 msgid "Submitting..." msgstr "Przesyłanie..." -#: rhodecode/public/js/rhodecode-components.js:49140 -#: rhodecode/public/js/scripts.js:40988 +#: 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/src/rhodecode/comments.js:415 +#: rhodecode/public/js/src/rhodecode/comments.js:432 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "Ładuję..." -#: rhodecode/public/js/rhodecode-components.js:49245 -#: rhodecode/public/js/scripts.js:41093 +#: 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/src/rhodecode/comments.js:520 +#: rhodecode/public/js/src/rhodecode/comments.js:537 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49316 -#: rhodecode/public/js/scripts.js:41164 +#: 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/src/rhodecode/comments.js:591 +#: 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:49393 -#: rhodecode/public/js/scripts.js:41241 +#: 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/src/rhodecode/comments.js:668 +#: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49507 -#: rhodecode/public/js/scripts.js:41355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 -#: rhodecode/public/js/src/rhodecode/comments.js:782 +#: 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/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49713 -#: rhodecode/public/js/scripts.js:41561 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: 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/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49715 -#: rhodecode/public/js/scripts.js:41563 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: 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/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49724 -#: rhodecode/public/js/scripts.js:41572 +#: 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/src/rhodecode/files.js:161 msgid "No matching files" msgstr "Nie ma plików pasujących" -#: rhodecode/public/js/rhodecode-components.js:49859 -#: rhodecode/public/js/scripts.js:41707 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: 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/src/rhodecode/files.js:296 msgid "Selection link" msgstr "Wybór linku" -#: rhodecode/public/js/rhodecode-components.js:49899 -#: rhodecode/public/js/scripts.js:41747 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: 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/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "Zakończyć obserwację tego repozytorium" -#: rhodecode/public/js/rhodecode-components.js:49900 -#: rhodecode/public/js/scripts.js:41748 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 +#: 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/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "Nie obserwuj" -#: rhodecode/public/js/rhodecode-components.js:49909 -#: rhodecode/public/js/scripts.js:41757 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: 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/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "Zacznij obserwację tego repozytorium" -#: rhodecode/public/js/rhodecode-components.js:49910 -#: rhodecode/public/js/scripts.js:41758 +#: 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/src/rhodecode/followers.js:37 msgid "Follow" msgstr "Obserwuj" -#: rhodecode/public/js/rhodecode-components.js:50366 -#: rhodecode/public/js/scripts.js:42214 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:212 +#: 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 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50937 -#: rhodecode/public/js/scripts.js:42785 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: 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/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50957 -#: rhodecode/public/js/scripts.js:42805 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: 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/src/rhodecode.js:162 msgid "Show more" msgstr "Pokaż więcej" @@ -4259,14 +4361,14 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:479 -#: rhodecode/templates/codeblocks/diffs.mako:484 +#: rhodecode/templates/codeblocks/diffs.mako:488 +#: rhodecode/templates/codeblocks/diffs.mako:493 msgid "Add another comment" msgstr "Dodaj kolejny komentarz" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:320 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:325 msgid "Close" msgstr "Zamknij" @@ -4324,81 +4426,102 @@ msgstr "Otwórz nową prośbę o połączenie gałęzi" msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +msgid "Saving..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: 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:40 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 -msgid "Show selected commit __S" -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:48 -#: rhodecode/public/js/src/i18n_messages.js:7 -msgid "Switch to chat" -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 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: 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:54 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 -#: rhodecode/templates/admin/auth/auth_settings.mako:71 -msgid "disabled" -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" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 msgid "files" msgstr "pliki" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/templates/pullrequests/pullrequest.mako:108 +msgid "loading..." +msgstr "wczytywanie..." + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 msgid "{0} active out of {1} users" msgstr "{0} aktywnych z {1} użytkowników" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 msgid "{0} days" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +msgid "{0} out of {1} users" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 msgid "{0} years" msgstr "" +#: rhodecode/public/js/src/math_jax/extensions/HelpDialog.js:19 +msgid "HelpDialog" +msgstr "" + +#: rhodecode/public/js/src/math_jax/jax/output/HTML-CSS/autoload/mglyph.js:19 +msgid "MathML" +msgstr "" + #: rhodecode/public/js/vendors/webcomponentsjs/webcomponents.min.js:11 msgid "UIEvent" msgstr "" @@ -4415,10 +4538,6 @@ msgstr "" msgid "FocusEvent" msgstr "" -#: rhodecode/svn_support/events.py:30 -msgid "Configuration for Apaache mad_dav_svn changed." -msgstr "" - #: rhodecode/templates/index.mako:5 msgid "Dashboard" msgstr "Repozytorium" @@ -4476,6 +4595,7 @@ msgstr "Edytuj Grupę Repozytoriów" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:15 #: 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 #: rhodecode/templates/base/perms_summary.mako:102 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 @@ -4488,22 +4608,25 @@ msgstr "Nazwa" #: rhodecode/templates/index_base.mako:100 #: rhodecode/templates/index_base.mako:125 #: rhodecode/templates/admin/gists/index.mako:114 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:81 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 -#: rhodecode/templates/admin/repos/repo_add_base.mako:32 +#: 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/repos.mako:57 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 #: rhodecode/templates/admin/user_groups/user_groups.mako:57 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +#: 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/base/issue_tracker_settings.mako:10 #: rhodecode/templates/changeset/changeset.mako:53 #: rhodecode/templates/compare/compare_commits.mako:20 -#: rhodecode/templates/email_templates/commit_comment.mako:82 +#: 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 #: rhodecode/templates/files/file_tree_detail.mako:5 @@ -4511,8 +4634,8 @@ msgstr "Nazwa" #: rhodecode/templates/forks/fork.mako:48 #: rhodecode/templates/forks/forks_data.mako:9 #: rhodecode/templates/pullrequests/pullrequest.mako:47 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:158 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:163 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:460 #: rhodecode/templates/summary/components.mako:73 msgid "Description" msgstr "Opis" @@ -4527,7 +4650,8 @@ msgstr "Opis" #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/users/user_edit_groups.mako:65 #: rhodecode/templates/forks/forks_data.mako:7 #: rhodecode/templates/summary/components.mako:195 msgid "Owner" @@ -4548,9 +4672,9 @@ msgstr "Ostatnia akytwność" #: rhodecode/templates/changelog/changelog_summary_data.mako:8 #: rhodecode/templates/changeset/changeset.mako:36 #: rhodecode/templates/compare/compare_commits.mako:18 -#: rhodecode/templates/email_templates/commit_comment.mako:45 -#: rhodecode/templates/email_templates/commit_comment.mako:81 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: 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/search/search_commit.mako:6 #: rhodecode/templates/tags/tags.mako:66 msgid "Commit" @@ -4565,45 +4689,45 @@ msgstr "" msgid "Home" msgstr "Strona Główna" -#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:34 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:326 +#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:329 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "Zaloguj się" -#: rhodecode/templates/login.mako:36 +#: rhodecode/templates/login.mako:37 msgid "Go to the registration page to create a new account." msgstr "" -#: rhodecode/templates/login.mako:57 +#: rhodecode/templates/login.mako:58 msgid "Remember me" msgstr "Zapamiętaj mnie" -#: rhodecode/templates/login.mako:61 +#: rhodecode/templates/login.mako:62 msgid "Forgot your password?" msgstr "" -#: rhodecode/templates/login.mako:65 -#: rhodecode/templates/password_reset.mako:34 +#: rhodecode/templates/login.mako:66 +#: rhodecode/templates/password_reset.mako:35 msgid "Password reset is disabled. Please contact " msgstr "" -#: rhodecode/templates/login.mako:67 -#: rhodecode/templates/password_reset.mako:36 -#: rhodecode/templates/base/base.mako:43 -#: rhodecode/templates/errors/error_document.mako:64 -msgid "Support" -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 +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 msgid "or" msgstr "lub" -#: rhodecode/templates/login.mako:70 -#: rhodecode/templates/password_reset.mako:39 +#: rhodecode/templates/login.mako:71 +#: rhodecode/templates/password_reset.mako:40 msgid "an administrator if you need help." msgstr "" @@ -4611,28 +4735,28 @@ msgstr "" msgid "Reset Password" msgstr "" -#: rhodecode/templates/password_reset.mako:46 +#: rhodecode/templates/password_reset.mako:47 msgid "Reset your Password" msgstr "" -#: rhodecode/templates/password_reset.mako:47 +#: rhodecode/templates/password_reset.mako:48 msgid "Go to the login page to sign in." msgstr "" -#: rhodecode/templates/password_reset.mako:51 +#: rhodecode/templates/password_reset.mako:52 msgid "Email Address" msgstr "Adres Email" -#: rhodecode/templates/password_reset.mako:60 -#: rhodecode/templates/register.mako:84 +#: rhodecode/templates/password_reset.mako:61 +#: rhodecode/templates/register.mako:85 msgid "Captcha" msgstr "" -#: rhodecode/templates/password_reset.mako:70 -msgid "Send password reset email" -msgstr "" - #: rhodecode/templates/password_reset.mako:71 +msgid "Send password reset email" +msgstr "" + +#: rhodecode/templates/password_reset.mako:72 msgid "Password reset link will be sent to matching email address" msgstr "" @@ -4640,49 +4764,49 @@ msgstr "" msgid "Create an Account" msgstr "" -#: rhodecode/templates/register.mako:34 +#: rhodecode/templates/register.mako:35 msgid "Create an account" msgstr "" -#: rhodecode/templates/register.mako:35 +#: rhodecode/templates/register.mako:36 msgid "Go to the login page to sign in with an existing account." msgstr "" -#: rhodecode/templates/register.mako:54 +#: rhodecode/templates/register.mako:55 msgid "Re-enter password" msgstr "Ponownie wprowadź hasło" -#: rhodecode/templates/register.mako:61 +#: rhodecode/templates/register.mako:62 #: rhodecode/templates/admin/my_account/my_account_profile.mako:32 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:33 #: 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:94 +#: rhodecode/templates/admin/users/users.mako:66 msgid "First Name" msgstr "Imię" -#: rhodecode/templates/register.mako:68 +#: rhodecode/templates/register.mako:69 #: rhodecode/templates/admin/my_account/my_account_profile.mako:40 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:42 #: 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:96 +#: rhodecode/templates/admin/users/users.mako:68 msgid "Last Name" msgstr "Nazwisko" -#: rhodecode/templates/register.mako:96 +#: rhodecode/templates/register.mako:97 msgid "Account activation requires admin approval." msgstr "" -#: rhodecode/templates/register.mako:103 +#: rhodecode/templates/register.mako:104 msgid "Create Account" msgstr "" #: rhodecode/templates/admin/admin.mako:5 #: rhodecode/templates/admin/admin.mako:15 -#: rhodecode/templates/base/base.mako:72 +#: rhodecode/templates/base/base.mako:75 msgid "Admin journal" msgstr "Dziennik administratora" @@ -4691,6 +4815,7 @@ msgid "journal filter..." msgstr "szybkie wyszukiwanie..." #: rhodecode/templates/admin/admin.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "filtr" @@ -4702,33 +4827,41 @@ 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/users/user_edit_audit.mako:17 #: rhodecode/templates/journal/journal.mako:17 msgid "Example Queries" msgstr "" #: rhodecode/templates/admin/admin_log.mako:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 #: rhodecode/templates/admin/repos/repos.mako:69 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 -#: rhodecode/templates/admin/user_groups/user_groups.mako:66 -#: rhodecode/templates/admin/users/users.mako:107 -#: rhodecode/templates/files/files_detail.mako:63 +#: 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/files/files_detail.mako:58 msgid "Action" msgstr "Działanie" #: rhodecode/templates/admin/admin_log.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/bookmarks/bookmarks.mako:61 #: rhodecode/templates/branches/branches.mako:60 #: rhodecode/templates/tags/tags.mako:61 @@ -4736,10 +4869,12 @@ 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 msgid "No actions yet" msgstr "Brak akcji" @@ -4780,7 +4915,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:135 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 -#: rhodecode/templates/admin/repos/repo_add_base.mako:90 +#: 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 @@ -4790,6 +4925,7 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:120 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:102 #: rhodecode/templates/admin/users/user_add.mako:128 +#: rhodecode/templates/admin/users/user_edit_groups.mako:27 #: rhodecode/templates/admin/users/user_edit_profile.mako:134 #: rhodecode/templates/base/default_perms_box.mako:88 msgid "Save" @@ -4811,18 +4947,18 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/index.mako:110 #: rhodecode/templates/admin/integrations/list.mako:103 -#: rhodecode/templates/admin/repos/repo_add_base.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:75 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "Typ" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 -#: rhodecode/templates/admin/repos/repo_add_base.mako:82 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 msgid "Private Repository" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:86 +#: rhodecode/templates/admin/repos/repo_add_base.mako:97 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:112 #: rhodecode/templates/forks/fork.mako:87 msgid "" @@ -4888,7 +5024,7 @@ msgid "Update Gist" msgstr "Zaktualizuj Gist" #: rhodecode/templates/admin/gists/edit.mako:102 -#: rhodecode/templates/base/issue_tracker_settings.mako:74 +#: rhodecode/templates/base/issue_tracker_settings.mako:73 #: rhodecode/templates/changeset/changeset_file_comment.mako:385 #: rhodecode/templates/codeblocks/diffs.mako:76 #: rhodecode/templates/files/files_add.mako:102 @@ -4964,8 +5100,8 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:180 #: rhodecode/templates/compare/compare_commits.mako:17 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:304 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:457 #: rhodecode/templates/pullrequests/pullrequests.mako:102 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/tags/tags.mako:63 @@ -5022,7 +5158,7 @@ msgstr "Potwierdź aby usunąć ten Gist" #: rhodecode/templates/admin/gists/show.mako:56 #: rhodecode/templates/admin/integrations/list.mako:204 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 -#: rhodecode/templates/base/issue_tracker_settings.mako:61 +#: rhodecode/templates/base/issue_tracker_settings.mako:60 #: rhodecode/templates/data_table/_dt_elements.mako:118 #: rhodecode/templates/data_table/_dt_elements.mako:180 #: rhodecode/templates/data_table/_dt_elements.mako:193 @@ -5030,10 +5166,10 @@ msgstr "Potwierdź aby usunąć ten Gist" #: rhodecode/templates/debug_style/buttons.html:128 #: rhodecode/templates/files/files_add.mako:204 #: rhodecode/templates/files/files_edit.mako:165 -#: rhodecode/templates/files/files_source.mako:38 -#: rhodecode/templates/files/files_source.mako:41 +#: 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:319 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:324 #: rhodecode/templates/users/user_profile.mako:7 msgid "Edit" msgstr "Edycja" @@ -5052,7 +5188,7 @@ msgstr "utworzono" #: rhodecode/templates/admin/gists/show.mako:91 #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:87 msgid "Show as raw" msgstr "wyświetl jako raw" @@ -5077,8 +5213,8 @@ msgstr "Grupy Repozytoriów" #: rhodecode/templates/admin/repos/repo_edit.mako:43 #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 -#: rhodecode/templates/base/base.mako:81 -#: rhodecode/templates/base/base.mako:246 +#: rhodecode/templates/base/base.mako:84 +#: rhodecode/templates/base/base.mako:249 msgid "Settings" msgstr "Ustawienia" @@ -5110,6 +5246,8 @@ msgid "Create new integration" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:104 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14 msgid "Scope" msgstr "" @@ -5179,7 +5317,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:340 +#: rhodecode/templates/base/base.mako:343 msgid "My account" msgstr "Moje konto" @@ -5188,10 +5326,11 @@ msgid "My Account" msgstr "Moje konto" #: rhodecode/templates/admin/my_account/my_account.mako:29 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 -msgid "My Profile" -msgstr "" +#: rhodecode/templates/email_templates/user_registration.mako:26 +#: rhodecode/templates/users/user.mako:29 +#: rhodecode/templates/users/user_profile.mako:5 +msgid "Profile" +msgstr "Profil" #: rhodecode/templates/admin/my_account/my_account.mako:31 msgid "Auth Tokens" @@ -5202,12 +5341,9 @@ msgid "OAuth Identities" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:37 -msgid "My Emails" -msgstr "Moje Emaile" - -#: rhodecode/templates/admin/my_account/my_account.mako:38 -msgid "My Repositories" -msgstr "Moje Repozytoria" +#: rhodecode/templates/admin/users/user_edit.mako:38 +msgid "Emails" +msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:39 msgid "Watched" @@ -5215,81 +5351,82 @@ msgstr "Obserwowane" #: rhodecode/templates/admin/my_account/my_account.mako:40 #: rhodecode/templates/admin/notifications/notifications.mako:33 -#: rhodecode/templates/base/base.mako:238 +#: rhodecode/templates/base/base.mako:241 msgid "Pull Requests" msgstr "Połączone gałęzie" #: rhodecode/templates/admin/my_account/my_account.mako:41 -msgid "My Permissions" -msgstr "" +#: 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/user_groups/user_group_edit.mako:34 +#: rhodecode/templates/base/base.mako:80 +msgid "Permissions" +msgstr "Uprawnienia" #: rhodecode/templates/admin/my_account/my_account.mako:42 -msgid "My Live Notifications" +msgid "Live Notifications" msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:3 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 msgid "Authentication Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:7 -msgid "Built-in tokens can be used to authenticate with all possible options." -msgstr "" - #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:8 -msgid "" -"Each token can have a role. VCS tokens can be used together with the " -"authtoken auth plugin for git/hg/svn operations." -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:11 -msgid "Built-in" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:51 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:47 -msgid "expires" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:29 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:26 -#, python-format -msgid "Confirm to reset this auth token: %s" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 -msgid "expired" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:59 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:55 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:8 +msgid "" +"Each token can have a role. Token with a role can be used only in given " +"context, e.g. VCS tokens can be used together with the authtoken auth plugin" +" for git/hg/svn operations only." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:13 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:13 +msgid "Token" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:17 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:17 +msgid "Expiration" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:48 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:44 #, python-format msgid "Confirm to remove this auth token: %s" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:67 -msgid "No additional auth token specified" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:78 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:56 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:52 +msgid "No additional auth tokens specified" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:68 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:64 msgid "New authentication token" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:82 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +msgid "Repository scope works only with tokens with VCS type." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86 #: rhodecode/templates/admin/my_account/my_account_emails.mako:64 #: rhodecode/templates/admin/permissions/permissions_ips.mako:60 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:84 +#: 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 msgid "Add" msgstr "Dodaj" +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:128 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:125 +msgid "repository scope" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_emails.mako:5 msgid "Account Emails" msgstr "" @@ -5343,6 +5480,11 @@ msgstr "" msgid "Source type" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 +msgid "My Profile" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_profile.mako:11 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:55 #: rhodecode/templates/admin/users/user_edit_profile.mako:25 @@ -5432,14 +5574,6 @@ msgstr "Powiadomienia" msgid "Permissions Administration" msgstr "" -#: 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/user_groups/user_group_edit.mako:34 -#: rhodecode/templates/base/base.mako:77 -msgid "Permissions" -msgstr "Uprawnienia" - #: rhodecode/templates/admin/permissions/permissions.mako:33 msgid "Application" msgstr "" @@ -5579,8 +5713,8 @@ msgstr "Repozytorium grupy" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:74 -#: rhodecode/templates/base/base.mako:148 +#: rhodecode/templates/base/base.mako:77 +#: rhodecode/templates/base/base.mako:151 msgid "Repository groups" msgstr "Repozytorium grupy" @@ -5594,7 +5728,7 @@ msgid "Group Parent" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 -#: rhodecode/templates/admin/repos/repo_add_base.mako:55 +#: rhodecode/templates/admin/repos/repo_add_base.mako:66 msgid "Copy Parent Group Permissions" msgstr "" @@ -5650,6 +5784,7 @@ msgid_plural "This repository group incl msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:45 #, python-format @@ -5658,6 +5793,7 @@ msgid_plural "This repository group incl msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:57 #, python-format @@ -5713,7 +5849,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:107 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117 -#: rhodecode/templates/base/issue_tracker_settings.mako:84 +#: rhodecode/templates/base/issue_tracker_settings.mako:83 msgid "Add new" msgstr "Dodaj nowe" @@ -5776,52 +5912,48 @@ msgid "Import Existing Repository ?" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:193 +#: rhodecode/templates/base/base.mako:196 msgid "Clone from" msgstr "Klonuj z" -#: rhodecode/templates/admin/repos/repo_add_base.mako:27 -msgid "Optional http[s] URL from which to clone a repository." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_add_base.mako:36 +#: rhodecode/templates/admin/repos/repo_add_base.mako:47 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:102 #: rhodecode/templates/forks/fork.mako:52 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "Powinna być krótka i na temat. Użyj pliku README dla dłuższych opisów." -#: rhodecode/templates/admin/repos/repo_add_base.mako:41 +#: rhodecode/templates/admin/repos/repo_add_base.mako:52 msgid "Repository Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 +#: 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)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:50 +#: rhodecode/templates/admin/repos/repo_add_base.mako:61 #: rhodecode/templates/forks/fork.mako:67 msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:59 +#: rhodecode/templates/admin/repos/repo_add_base.mako:70 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:68 +#: rhodecode/templates/admin/repos/repo_add_base.mako:79 msgid "Set the type of repository to create." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:73 +#: rhodecode/templates/admin/repos/repo_add_base.mako:84 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:70 #: rhodecode/templates/forks/fork.mako:73 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:77 +#: rhodecode/templates/admin/repos/repo_add_base.mako:88 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." @@ -5865,7 +5997,16 @@ msgstr "Zdalnie" msgid "Statistics" msgstr "Statystyki" -#: rhodecode/templates/admin/repos/repo_edit.mako:87 +#: rhodecode/templates/admin/repos/repo_edit.mako:75 +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3 +msgid "Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:78 +msgid "Strip" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:93 msgid "Reviewers" msgstr "" @@ -5892,12 +6033,10 @@ msgid "This repository is a fork of %(re msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 -#: rhodecode/templates/admin/repos/repo_edit_fork.mako:5 msgid "Set" msgstr "Ustaw" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:39 -#: rhodecode/templates/admin/repos/repo_edit_fork.mako:9 msgid "Manually set this repository as a fork of another from the list" msgstr "Ręczne ustawienie rozwidlenia z listy" @@ -5961,6 +6100,7 @@ msgid_plural "This repository has %s for msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:125 msgid "Detach forks" @@ -6021,6 +6161,7 @@ msgid_plural "List of repository caches msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:35 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:32 @@ -6036,10 +6177,11 @@ msgstr "Klucz" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:37 #: 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:62 +#: 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:101 +#: rhodecode/templates/admin/users/users.mako:73 msgid "Active" msgstr "Aktywny" @@ -6115,6 +6257,23 @@ 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 +msgid "No maintenance tasks for this repo available" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:26 +msgid "Run Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:41 +msgid "Performing Maintenance" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:5 msgid "Repository Permissions" msgstr "" @@ -6135,16 +6294,21 @@ msgstr "" msgid "Remote mirror url" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 +#: 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 msgid "Pull changes from remote location" msgstr "Pobierz z zdalnej lokalizacji" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:22 msgid "Confirm to pull changes from remote side" msgstr "Potwierdź pull z zdalnej strony" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:19 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:27 msgid "This repository does not have any remote mirror url set." msgstr "" @@ -6268,11 +6432,80 @@ msgstr "" msgid "Confirm to remove current statistics" msgstr "Potwierdź usunięcie aktualnych statystyk" -#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:3 +msgid "Strip commits from repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:7 +#, python-format +msgid "Please provide up to %d commits commits to strip" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:9 +msgid "" +"In the first step commits will be verified for existance in the repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:10 +msgid "In the second step, correct commits will be available for stripping" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:16 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:52 +msgid "Enter full 40 character commit sha" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:18 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:54 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:95 +msgid "Add another commit" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:27 +msgid "Check commits" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:33 +msgid "Sorry this functionality is not available for SVN repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:46 +msgid "Remove" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:112 +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 +msgid " commit verified positive" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:131 +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" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:13 msgid "Select to inherit global vcs settings." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:45 +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:43 #: rhodecode/templates/admin/settings/settings_global.mako:139 #: rhodecode/templates/admin/settings/settings_labs.mako:48 #: rhodecode/templates/admin/settings/settings_vcs.mako:13 @@ -6809,8 +7042,8 @@ msgstr "Dodaj grupę użytkowników" #: rhodecode/templates/admin/user_groups/user_group_add.mako:13 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:76 -#: rhodecode/templates/base/base.mako:151 +#: rhodecode/templates/base/base.mako:79 +#: rhodecode/templates/base/base.mako:154 msgid "User groups" msgstr "Grupy użytkowników" @@ -6851,30 +7084,72 @@ msgid "Members" msgstr "Użytkownik" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:9 +msgid "Automatic member sync" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:11 msgid "Assigned to repositories" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:10 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:12 msgid "Assigned to repo groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:17 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:19 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6 #, python-format msgid "User Group: %s" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:26 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:29 +msgid "Group members sync" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:36 +msgid "This group is set to be automatically synchronised." +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 +msgid "This group is not set to be automatically synchronised" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51 +msgid "Disable synchronization" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53 +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 msgid "Delete User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:32 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:81 #, 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:34 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:83 msgid "Delete This User Group" msgstr "" @@ -6900,6 +7175,7 @@ msgid "No members yet" msgstr "Nie ma jeszcze żadnego użytkownika" #: rhodecode/templates/admin/user_groups/user_groups.mako:5 +#: rhodecode/templates/admin/users/user_edit_groups.mako:6 msgid "User groups administration" msgstr "Użytkownicy grupy administracji" @@ -6907,18 +7183,22 @@ msgstr "Użytkownicy grupy administracji" msgid "user groups" msgstr "" +#: rhodecode/templates/admin/user_groups/user_groups.mako:62 +msgid "Sync" +msgstr "" + #: rhodecode/templates/admin/users/user_add.mako:5 msgid "Add user" msgstr "Dodaj użytkownika" #: rhodecode/templates/admin/users/user_add.mako:13 #: rhodecode/templates/admin/users/user_edit.mako:14 -#: rhodecode/templates/base/base.mako:75 +#: rhodecode/templates/base/base.mako:78 msgid "Users" msgstr "Użytkownicy" #: rhodecode/templates/admin/users/user_add.mako:15 -#: rhodecode/templates/admin/users/users.mako:27 +#: rhodecode/templates/admin/users/users.mako:28 msgid "Add User" msgstr "" @@ -6970,14 +7250,18 @@ msgstr "" msgid "Auth tokens" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:38 -msgid "Emails" -msgstr "" - #: rhodecode/templates/admin/users/user_edit.mako:39 msgid "Ip Whitelist" msgstr "" +#: rhodecode/templates/admin/users/user_edit.mako:40 +msgid "User Groups Management" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.mako:41 +msgid "User audit" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 #: rhodecode/templates/admin/users/user_edit_profile.mako:106 msgid "Source of Record" @@ -6988,7 +7272,7 @@ msgid "Last login" msgstr "Ostatnio zalogowany" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 -#: rhodecode/templates/admin/users/users.mako:99 +#: rhodecode/templates/admin/users/users.mako:71 msgid "Last activity" msgstr "" @@ -7047,6 +7331,7 @@ msgid_plural "This user owns %s reposito msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:93 msgid "Detach repositories" @@ -7065,6 +7350,7 @@ msgid_plural "This user owns %s reposito msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:109 msgid "Detach repository groups" @@ -7077,6 +7363,7 @@ msgid_plural "This user owns %s user gro msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:125 msgid "Detach user groups" @@ -7100,22 +7387,23 @@ msgid "" "will delete the user's repositories!" msgstr "" -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 -msgid "Authentication Access Tokens" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:63 -msgid "No additional auth tokens specified" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:75 -msgid "New auth token" +#: rhodecode/templates/admin/users/user_edit_audit.mako:7 +msgid "User Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +msgid "audit filter..." msgstr "" #: rhodecode/templates/admin/users/user_edit_emails.mako:5 msgid "Additional Email Addresses" msgstr "" +#: rhodecode/templates/admin/users/user_edit_groups.mako:12 +#, python-format +msgid "Add `%s` to user group" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_ips.mako:3 msgid "Custom IP Whitelist" msgstr "" @@ -7172,98 +7460,98 @@ msgstr "" msgid "Users administration" msgstr "Administracja użytkownikami" -#: rhodecode/templates/admin/users/users.mako:105 +#: rhodecode/templates/admin/users/users.mako:77 msgid "Auth type" msgstr "" -#: rhodecode/templates/base/base.mako:50 +#: rhodecode/templates/base/base.mako:53 #, python-format msgid "RhodeCode instance id: %s" msgstr "" -#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:81 msgid "Authentication" msgstr "Autentykacja" -#: rhodecode/templates/base/base.mako:80 +#: rhodecode/templates/base/base.mako:83 msgid "Defaults" msgstr "Domyślne" -#: rhodecode/templates/base/base.mako:98 +#: rhodecode/templates/base/base.mako:101 #: rhodecode/templates/files/files_pjax.mako:24 #: rhodecode/templates/summary/components.mako:42 msgid "Show More" msgstr "" -#: rhodecode/templates/base/base.mako:185 +#: rhodecode/templates/base/base.mako:188 msgid "Fork of" msgstr "Gałąź z" -#: rhodecode/templates/base/base.mako:202 +#: rhodecode/templates/base/base.mako:205 #, python-format msgid "Repository locked by %(user)s" msgstr "" -#: rhodecode/templates/base/base.mako:207 +#: rhodecode/templates/base/base.mako:210 msgid "Repository not locked. Pull repository to lock it." msgstr "" -#: rhodecode/templates/base/base.mako:225 +#: rhodecode/templates/base/base.mako:228 #: rhodecode/templates/data_table/_dt_elements.mako:12 #: rhodecode/templates/data_table/_dt_elements.mako:13 #: rhodecode/templates/data_table/_dt_elements.mako:153 msgid "Summary" msgstr "Podsumowanie" -#: rhodecode/templates/base/base.mako:226 +#: rhodecode/templates/base/base.mako:229 #: rhodecode/templates/data_table/_dt_elements.mako:17 #: rhodecode/templates/data_table/_dt_elements.mako:18 msgid "Changelog" msgstr "Dziennik zmian" -#: rhodecode/templates/base/base.mako:227 +#: rhodecode/templates/base/base.mako:230 #: rhodecode/templates/data_table/_dt_elements.mako:22 #: rhodecode/templates/data_table/_dt_elements.mako:23 #: rhodecode/templates/files/files.mako:15 msgid "Files" msgstr "Pliki" -#: rhodecode/templates/base/base.mako:229 +#: rhodecode/templates/base/base.mako:232 #: rhodecode/templates/bookmarks/bookmarks.mako:68 #: rhodecode/templates/branches/branches.mako:67 #: rhodecode/templates/tags/tags.mako:68 msgid "Compare" msgstr "Porównaj" -#: rhodecode/templates/base/base.mako:234 +#: rhodecode/templates/base/base.mako:237 #, python-format msgid "Show Pull Requests for %s" msgstr "Pokaż Prośby Pobrania %s" -#: rhodecode/templates/base/base.mako:243 +#: rhodecode/templates/base/base.mako:246 msgid "Options" msgstr "Opcje" -#: rhodecode/templates/base/base.mako:250 +#: rhodecode/templates/base/base.mako:253 #: rhodecode/templates/forks/forks_data.mako:30 msgid "Compare fork" msgstr "Porównaj rozwidlenie" -#: rhodecode/templates/base/base.mako:253 -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:256 +#: rhodecode/templates/base/base.mako:403 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "Szukaj" -#: rhodecode/templates/base/base.mako:257 +#: rhodecode/templates/base/base.mako:260 msgid "Unlock" msgstr "Odblokowany" -#: rhodecode/templates/base/base.mako:259 +#: rhodecode/templates/base/base.mako:262 msgid "Lock" msgstr "zablokowane" -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:267 #: rhodecode/templates/data_table/_dt_elements.mako:27 #: rhodecode/templates/data_table/_dt_elements.mako:28 #: rhodecode/templates/forks/forks_data.mako:8 @@ -7273,78 +7561,79 @@ msgid_plural "Forks" msgstr[0] "" msgstr[1] "" msgstr[2] "" - -#: rhodecode/templates/base/base.mako:265 +msgstr[3] "" + +#: rhodecode/templates/base/base.mako:268 msgid "Create Pull Request" msgstr "Stwórz nowe żądanie połączenia gałęzi" -#: rhodecode/templates/base/base.mako:287 +#: rhodecode/templates/base/base.mako:290 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:295 +#: rhodecode/templates/base/base.mako:298 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:312 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:322 +#: 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:342 +#: rhodecode/templates/base/base.mako:345 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:346 +#: rhodecode/templates/base/base.mako:349 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:382 +#: rhodecode/templates/base/base.mako:385 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:383 +#: rhodecode/templates/base/base.mako:386 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:14 msgid "Journal" msgstr "Dziennik" -#: rhodecode/templates/base/base.mako:388 +#: rhodecode/templates/base/base.mako:391 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:389 +#: rhodecode/templates/base/base.mako:392 msgid "Public journal" msgstr "Dziennik publiczny" -#: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/base/base.mako:397 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:395 +#: rhodecode/templates/base/base.mako:398 msgid "Gists" msgstr "Gists" -#: rhodecode/templates/base/base.mako:399 +#: rhodecode/templates/base/base.mako:402 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:408 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:412 +#: rhodecode/templates/base/base.mako:415 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:422 -#: rhodecode/templates/base/base.mako:423 +#: rhodecode/templates/base/base.mako:425 +#: rhodecode/templates/base/base.mako:426 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7366,15 +7655,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:480 +#: rhodecode/templates/base/base.mako:483 msgid "Go to" msgstr "Idź do" -#: rhodecode/templates/base/base.mako:533 +#: rhodecode/templates/base/base.mako:536 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:541 +#: rhodecode/templates/base/base.mako:544 msgid "Site-wide shortcuts" msgstr "" @@ -7443,9 +7732,7 @@ msgid "User Group Creation" msgstr "" #: rhodecode/templates/base/default_perms_box.mako:72 -msgid "" -"Permission to allow user group creation. When disabled, user group admins " -"can still create subgroups within their user groups." +msgid "Permission to allow user group creation." msgstr "" #: rhodecode/templates/base/default_perms_box.mako:78 @@ -7470,19 +7757,19 @@ msgid "" "permission by members of user groups." msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:22 +#: rhodecode/templates/base/issue_tracker_settings.mako:21 msgid "Read more" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:92 +#: rhodecode/templates/base/issue_tracker_settings.mako:91 msgid "New Entry" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:96 +#: rhodecode/templates/base/issue_tracker_settings.mako:95 msgid "Confirm to remove this pattern:" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:192 +#: 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 @@ -7492,7 +7779,7 @@ msgstr "" msgid "Preview" msgstr "Podgląd" -#: rhodecode/templates/base/issue_tracker_settings.mako:193 +#: rhodecode/templates/base/issue_tracker_settings.mako:192 msgid "Test Pattern Preview" msgstr "" @@ -7640,101 +7927,130 @@ msgstr "" msgid "Enable largefiles extension" msgstr "Rozszerzenia dużych pliów" -#: rhodecode/templates/base/vcs_settings.mako:99 +#: rhodecode/templates/base/vcs_settings.mako:100 msgid "Enable Largefiles extensions for all repositories." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:103 +#: rhodecode/templates/base/vcs_settings.mako:102 +msgid "Enable Largefiles extensions for this repository." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:113 +msgid "" +"Filesystem location where Mercurial largefile objects should be stored." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:119 msgid "Set repositories as publishing" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:103 +#: rhodecode/templates/base/vcs_settings.mako:119 msgid "Set repository as publishing" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:106 +#: rhodecode/templates/base/vcs_settings.mako:122 msgid "" "When this is enabled all commits in the repository are seen as public " "commits by clients." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:111 +#: rhodecode/templates/base/vcs_settings.mako:127 msgid "Enable hgsubversion extension" msgstr "Rozszerzenia hgsubversion" -#: rhodecode/templates/base/vcs_settings.mako:114 +#: rhodecode/templates/base/vcs_settings.mako:130 msgid "" "Requires hgsubversion library to be installed. Allows cloning remote SVN " "repositories and migrates them to Mercurial type." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:123 +#: rhodecode/templates/base/vcs_settings.mako:139 msgid "Mercurial Labs Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:123 +#: rhodecode/templates/base/vcs_settings.mako:139 msgid "" "These features are considered experimental and may not work as expected." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:129 +#: rhodecode/templates/base/vcs_settings.mako:145 msgid "Use rebase as merge strategy" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:132 +#: rhodecode/templates/base/vcs_settings.mako:148 msgid "" "Use rebase instead of creating a merge commit when merging via web " "interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:144 +#: rhodecode/templates/base/vcs_settings.mako:160 +msgid "Git Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:165 +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 "Filesystem location where Git lfs objects should be stored." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:193 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:150 +#: rhodecode/templates/base/vcs_settings.mako:199 msgid "Proxy subversion HTTP requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:154 +#: 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:155 +#: rhodecode/templates/base/vcs_settings.mako:204 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:161 +#: rhodecode/templates/base/vcs_settings.mako:210 msgid "Subversion HTTP Server URL" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:167 +#: rhodecode/templates/base/vcs_settings.mako:216 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:179 +#: rhodecode/templates/base/vcs_settings.mako:228 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:184 +#: rhodecode/templates/base/vcs_settings.mako:233 msgid "Repository patterns" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:188 +#: rhodecode/templates/base/vcs_settings.mako:237 msgid "" "Patterns for identifying SVN branches and tags. For recursive search, use " "\"*\". Eg.: \"/branches/*\"" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:254 +#: rhodecode/templates/base/vcs_settings.mako:301 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:259 +#: rhodecode/templates/base/vcs_settings.mako:306 msgid "Enable server-side merge for pull requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:262 +#: rhodecode/templates/base/vcs_settings.mako:309 msgid "" "Note: when this feature is enabled, it only runs hooks defined in the " "rcextension package. Custom hooks added on the Admin -> Settings -> Hooks " @@ -7742,11 +8058,11 @@ msgid "" "web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:266 +#: rhodecode/templates/base/vcs_settings.mako:313 msgid "Invalidate and relocate inline comments during update" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:269 +#: rhodecode/templates/base/vcs_settings.mako:316 msgid "" "During the update of a pull request, the position of inline comments will be" " updated and outdated inline comments will be hidden." @@ -7828,6 +8144,7 @@ msgid_plural "showing %d out of %d commi msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/changelog/changelog.mako:110 #: rhodecode/templates/files/files_add.mako:93 @@ -7884,7 +8201,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:53 #: rhodecode/templates/compare/compare_commits.mako:46 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:495 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" @@ -7977,8 +8294,8 @@ msgid "Diff options" msgstr "" #: rhodecode/templates/changeset/changeset.mako:119 -#: rhodecode/templates/codeblocks/diffs.mako:436 -#: rhodecode/templates/codeblocks/diffs.mako:439 +#: rhodecode/templates/codeblocks/diffs.mako:445 +#: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "Raw różnic" @@ -7995,8 +8312,8 @@ msgid "Patch Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:127 -#: rhodecode/templates/codeblocks/diffs.mako:443 -#: rhodecode/templates/codeblocks/diffs.mako:446 +#: rhodecode/templates/codeblocks/diffs.mako:452 +#: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "Pobierz różnice" @@ -8006,23 +8323,25 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:145 #: rhodecode/templates/changeset/changeset.mako:147 -#: rhodecode/tests/functional/test_commit_comments.py:270 +#: rhodecode/tests/functional/test_commit_comments.py:275 #, python-format msgid "%d Commit comment" msgid_plural "%d Commit comments" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/changeset/changeset.mako:150 #: rhodecode/templates/changeset/changeset.mako:152 -#: rhodecode/tests/functional/test_commit_comments.py:277 +#: rhodecode/tests/functional/test_commit_comments.py:282 #, python-format msgid "%d Inline Comment" msgid_plural "%d Inline Comments" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/changeset/changeset.mako:160 msgid "Unresolved TODOs" @@ -8123,18 +8442,16 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:363 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:148 +#: 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:388 +#: rhodecode/templates/changeset/changeset_file_comment.mako:393 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 #: rhodecode/templates/compare/compare_diff.mako:122 -#: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:97 msgid "Comment" msgstr "Komentarz" @@ -8151,6 +8468,7 @@ msgid_plural "(%s commits)" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/changeset/changeset_range.mako:16 msgid "Commits" @@ -8170,23 +8488,25 @@ msgstr "" #: rhodecode/templates/changeset/changeset_range.mako:99 #: rhodecode/templates/compare/compare_diff.mako:312 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:414 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:419 #, python-format msgid "Expand %s commit" msgid_plural "Expand %s commits" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/changeset/changeset_range.mako:105 #: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 #, python-format msgid "Collapse %s commit" msgid_plural "Collapse %s commits" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/changeset/diff_block.mako:7 #: rhodecode/templates/codeblocks/diffs.mako:128 @@ -8228,6 +8548,7 @@ msgid_plural "%(num)s files changed" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/changeset/diff_block.mako:60 #: rhodecode/templates/codeblocks/diffs.mako:133 @@ -8238,6 +8559,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/codeblocks/diffs.mako:117 msgid "Browse Files at revision {}" @@ -8254,6 +8576,7 @@ msgid_plural "%(num)s files changed." msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/codeblocks/diffs.mako:141 msgid "No files" @@ -8286,64 +8609,68 @@ msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:406 -#: rhodecode/templates/codeblocks/diffs.mako:422 +#: rhodecode/templates/codeblocks/diffs.mako:415 +#: rhodecode/templates/codeblocks/diffs.mako:431 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:408 -#: rhodecode/templates/codeblocks/diffs.mako:415 +#: rhodecode/templates/codeblocks/diffs.mako:417 +#: rhodecode/templates/codeblocks/diffs.mako:424 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:413 -#: rhodecode/templates/codeblocks/diffs.mako:429 +#: rhodecode/templates/codeblocks/diffs.mako:422 +#: rhodecode/templates/codeblocks/diffs.mako:438 #, python-format msgid "File no longer present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:424 -#: rhodecode/templates/codeblocks/diffs.mako:431 +#: rhodecode/templates/codeblocks/diffs.mako:433 +#: rhodecode/templates/codeblocks/diffs.mako:440 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:462 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:462 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:634 +#: rhodecode/templates/codeblocks/diffs.mako:643 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:636 +#: rhodecode/templates/codeblocks/diffs.mako:645 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:640 +#: rhodecode/templates/codeblocks/diffs.mako:649 msgid "View unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:641 +#: rhodecode/templates/codeblocks/diffs.mako:650 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:651 +#: rhodecode/templates/codeblocks/diffs.mako:660 msgid "Expand All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:655 +#: rhodecode/templates/codeblocks/diffs.mako:664 msgid "Collapse All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:659 +#: rhodecode/templates/codeblocks/diffs.mako:668 msgid "Wide Mode Diff" msgstr "" +#: rhodecode/templates/codeblocks/source.mako:24 +msgid "view annotation from before this change" +msgstr "" + #: rhodecode/templates/compare/compare_commits.mako:5 msgid "Common Ancestor Commit" msgstr "" @@ -8353,7 +8680,7 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:16 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:451 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:456 msgid "Time" msgstr "" @@ -8364,14 +8691,16 @@ msgid_plural "%s commits hidden" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/compare/compare_commits.mako:68 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:568 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:573 msgid "show it" msgid_plural "show them" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/compare/compare_commits.mako:74 msgid "No commits in this compare" @@ -8390,6 +8719,7 @@ msgid_plural "%s commits" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/compare/compare_diff.mako:44 #: rhodecode/templates/compare/compare_diff.mako:101 @@ -8404,14 +8734,14 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:98 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:103 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.mako:76 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 -#: rhodecode/templates/files/files_source.mako:20 +#: rhodecode/templates/files/files_source.mako:23 msgid "Source" msgstr "Źródło" @@ -8485,6 +8815,7 @@ msgid_plural "Confirm to delete this gro msgstr[0] "Potwierdź żeby usunąć grupę %s wraz z %s repozytorium" msgstr[1] "Potwierdź żeby usunąć grupę %s wraz z %s repozytoriami" msgstr[2] "Potwierdź żeby usunąć grupę %s wraz z %s repozytoriami" +msgstr[3] "Potwierdź żeby usunąć grupę %s wraz z %s repozytoriami" #: rhodecode/templates/data_table/_dt_elements.mako:211 #, python-format @@ -8635,133 +8966,150 @@ msgstr "" msgid "RhodeCode" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:16 -#: rhodecode/templates/email_templates/pull_request_comment.mako:18 +#: rhodecode/templates/email_templates/commit_comment.mako:18 +#: rhodecode/templates/email_templates/pull_request_comment.mako:19 msgid "[mention]" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:19 -#, python-format -msgid "" -"%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:19 -#: rhodecode/templates/email_templates/commit_comment.mako:22 +#: rhodecode/templates/email_templates/commit_comment.mako:21 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on commit `%(commit_id)s` (file: " +"`%(comment_file)s`)" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:24 +#: rhodecode/templates/email_templates/commit_comment.mako:26 #, python-format msgid "in the %(repo_name)s repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:22 -#, python-format -msgid "%(user)s commented on commit `%(commit_id)s` (status: %(status)s)" -msgstr "" - #: rhodecode/templates/email_templates/commit_comment.mako:24 -#: rhodecode/templates/email_templates/commit_comment.mako:78 -#, python-format -msgid "%(user)s commented on commit `%(commit_id)s`" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:43 -#: rhodecode/templates/email_templates/pull_request_comment.mako:44 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on commit `%(commit_id)s` (status: " +"%(status)s)" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:26 +#, python-format +msgid "%(user)s left %(comment_type)s on commit `%(commit_id)s`" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:47 +#: rhodecode/templates/email_templates/pull_request_comment.mako:47 msgid "Comment link" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:48 -#: rhodecode/templates/email_templates/pull_request_comment.mako:49 +#: rhodecode/templates/email_templates/commit_comment.mako:52 +#: rhodecode/templates/email_templates/pull_request_comment.mako:52 #, python-format msgid "File: %(comment_file)s on line %(comment_line)s" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:54 +#: rhodecode/templates/email_templates/commit_comment.mako:58 msgid "Commit status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:76 +#: rhodecode/templates/email_templates/commit_comment.mako:82 #, python-format msgid "%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:76 -#: rhodecode/templates/email_templates/commit_comment.mako:78 +#: rhodecode/templates/email_templates/commit_comment.mako:82 +#: rhodecode/templates/email_templates/commit_comment.mako:84 #, python-format msgid "in the %(repo)s repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:85 +#: rhodecode/templates/email_templates/commit_comment.mako:84 +#, python-format +msgid "%(user)s commented on commit `%(commit_id)s`" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:92 +#: rhodecode/templates/email_templates/pull_request_comment.mako:94 msgid "Status" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:85 +#: rhodecode/templates/email_templates/commit_comment.mako:93 msgid "The commit status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:97 -#, python-format -msgid "Comment on line: %(comment_line)s" -msgstr "" - -#: rhodecode/templates/email_templates/password_reset.mako:30 +#: rhodecode/templates/email_templates/commit_comment.mako:99 +#: rhodecode/templates/email_templates/pull_request_comment.mako:107 +#, python-format +msgid "TODO comment on line: %(comment_line)s" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:101 +#: rhodecode/templates/email_templates/pull_request_comment.mako:109 +#, python-format +msgid "Note comment on line: %(comment_line)s" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:101 +#: rhodecode/templates/email_templates/pull_request_comment.mako:109 +msgid "Note comment" +msgstr "" + +#: rhodecode/templates/email_templates/password_reset.mako:31 msgid "Generate new password here" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:21 -#, python-format -msgid "" -"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: " -"`%(comment_file)s`)" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:24 -#, python-format -msgid "" -"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: " -"%(status)s)" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:26 -#: rhodecode/templates/email_templates/pull_request_comment.mako:83 -#, python-format -msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:46 +#: rhodecode/templates/email_templates/pull_request_comment.mako:22 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\" " +"(file: `%(comment_file)s`)" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:25 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\" " +"(status: %(status)s)" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:27 +#, python-format +msgid "%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:49 msgid "Source repository" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:55 +#: rhodecode/templates/email_templates/pull_request_comment.mako:58 #, python-format msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:57 +#: rhodecode/templates/email_templates/pull_request_comment.mako:60 #, python-format msgid "" "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:81 +#: rhodecode/templates/email_templates/pull_request_comment.mako:84 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" " "(file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:87 -#, python-format -msgid "submitted pull request status: %(status)s" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:89 -#, python-format -msgid "submitted pull request status: %(status)s and closed" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:95 -msgid "Submitted status" +#: rhodecode/templates/email_templates/pull_request_comment.mako:86 +#, python-format +msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 +msgid "Closed pull request with status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:99 +msgid "Submitted review status" msgstr "" #: rhodecode/templates/email_templates/pull_request_review.mako:14 @@ -8787,6 +9135,7 @@ msgid_plural "Commits (%(num)s)" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format @@ -8812,6 +9161,7 @@ msgid_plural "%(num)s Commits" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/email_templates/test.mako:5 msgid "hello \"world\"" @@ -8830,12 +9180,6 @@ msgstr "" msgid "Full Name" msgstr "" -#: rhodecode/templates/email_templates/user_registration.mako:26 -#: rhodecode/templates/users/user.mako:29 -#: rhodecode/templates/users/user_profile.mako:5 -msgid "Profile" -msgstr "Profil" - #: rhodecode/templates/errors/error_document.mako:46 #, python-format msgid "You will be redirected to %s in %s seconds" @@ -8861,6 +9205,7 @@ msgid_plural "File Authors (%s)" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/files/file_authors_box.mako:11 msgid "Show All" @@ -8993,13 +9338,13 @@ msgid "Delete file" msgstr "Usuń plik" #: rhodecode/templates/files/files_delete.mako:45 -#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:65 #, python-format msgid "Binary file (%s)" msgstr "Plik binarny (%s)" #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:87 msgid "File is too big to display" msgstr "Plik jest za duży do wyświetlenia" @@ -9012,19 +9357,19 @@ msgstr "" msgid "Commit Description" msgstr "" -#: rhodecode/templates/files/files_detail.mako:35 +#: rhodecode/templates/files/files_detail.mako:32 msgid "File last commit" msgstr "" -#: rhodecode/templates/files/files_detail.mako:51 +#: rhodecode/templates/files/files_detail.mako:46 msgid "Show/Diff file" msgstr "" -#: rhodecode/templates/files/files_detail.mako:66 +#: rhodecode/templates/files/files_detail.mako:61 msgid "Diff to Commit" msgstr "" -#: rhodecode/templates/files/files_detail.mako:67 +#: rhodecode/templates/files/files_detail.mako:62 msgid "Show at Commit" msgstr "" @@ -9066,73 +9411,68 @@ msgstr "Edycja pliku" msgid "Location" msgstr "Położenie" -#: rhodecode/templates/files/files_source.mako:7 +#: rhodecode/templates/files/files_source.mako:8 +msgid "This file is a pointer to large binary file" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:8 +msgid "LargeFile" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:10 #: rhodecode/templates/search/search_content.mako:57 msgid "line" msgid_plural "lines" msgstr[0] "" msgstr[1] "" msgstr[2] "" - -#: rhodecode/templates/files/files_source.mako:14 +msgstr[3] "" + +#: rhodecode/templates/files/files_source.mako:17 msgid "History" msgstr "Historia" -#: rhodecode/templates/files/files_source.mako:17 +#: rhodecode/templates/files/files_source.mako:20 #: rhodecode/templates/search/search_content.mako:68 msgid "Show Full History" msgstr "" -#: rhodecode/templates/files/files_source.mako:22 +#: rhodecode/templates/files/files_source.mako:25 #: rhodecode/templates/search/search_content.mako:70 msgid "Annotation" msgstr "" -#: rhodecode/templates/files/files_source.mako:24 +#: rhodecode/templates/files/files_source.mako:27 #: rhodecode/templates/search/search_content.mako:71 msgid "Raw" msgstr "" -#: rhodecode/templates/files/files_source.mako:26 +#: rhodecode/templates/files/files_source.mako:31 +msgid "Download largefile" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:35 #: rhodecode/templates/search/search_content.mako:73 msgid "Download" msgstr "Pobierz" -#: rhodecode/templates/files/files_source.mako:33 +#: rhodecode/templates/files/files_source.mako:43 #, python-format msgid "Edit on Branch:%s" msgstr "" -#: rhodecode/templates/files/files_source.mako:38 +#: rhodecode/templates/files/files_source.mako:48 msgid "Editing binary files not allowed" msgstr "Edycja plików binarnych jest zabroniona" -#: rhodecode/templates/files/files_source.mako:41 +#: rhodecode/templates/files/files_source.mako:51 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_source.mako:52 msgid "Deleting files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/followers/followers.mako:5 -#: rhodecode/templates/followers/followers.mako:27 -#, python-format -msgid "%s Followers" -msgstr "Obserwatorzy %s" - -#: rhodecode/templates/followers/followers.mako:12 -msgid "Followers" -msgstr "Obserwuje" - -#: rhodecode/templates/followers/followers_data.mako:5 -msgid "Follower Name" -msgstr "" - -#: rhodecode/templates/followers/followers_data.mako:6 -msgid "Following Since" -msgstr "" - #: rhodecode/templates/forks/fork.mako:5 #, python-format msgid "Fork repository %s" @@ -9213,99 +9553,101 @@ msgstr "Publiczny dziennik kanału RSS" msgid "New pull request" msgstr "Nowa prośba o połączenie gałęzi" -#: rhodecode/templates/pullrequests/pullrequest.mako:52 +#: rhodecode/templates/pullrequests/pullrequest.mako:51 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:59 +#: rhodecode/templates/pullrequests/pullrequest.mako:57 msgid "Commit flow" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:67 +#: rhodecode/templates/pullrequests/pullrequest.mako:65 msgid "Origin repository" msgstr "Repozytorium git" -#: rhodecode/templates/pullrequests/pullrequest.mako:85 +#: rhodecode/templates/pullrequests/pullrequest.mako:83 msgid "Loading refs..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:96 +#: rhodecode/templates/pullrequests/pullrequest.mako:94 msgid "Submit Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:109 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:317 +#: rhodecode/templates/pullrequests/pullrequest.mako:107 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:322 msgid "Pull request reviewers" msgstr "Recenzje wniosków połączenia gałęzi" -#: rhodecode/templates/pullrequests/pullrequest.mako:110 -msgid "loading..." -msgstr "wczytywanie..." - -#: rhodecode/templates/pullrequests/pullrequest.mako:120 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:361 +#: rhodecode/templates/pullrequests/pullrequest.mako:118 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:366 msgid "Add reviewer" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:299 -#: rhodecode/templates/pullrequests/pullrequest.mako:572 +#: rhodecode/templates/pullrequests/pullrequest.mako:297 +#: rhodecode/templates/pullrequests/pullrequest.mako:570 msgid "Please select origin and destination" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:305 +#: rhodecode/templates/pullrequests/pullrequest.mako:303 msgid "Loading compare ..." msgstr "" +#: rhodecode/templates/pullrequests/pullrequest.mako:350 #: rhodecode/templates/pullrequests/pullrequest.mako:352 -#: rhodecode/templates/pullrequests/pullrequest.mako:354 msgid "This pull request will consist of __COMMITS__ commit." msgid_plural "This pull request will consist of __COMMITS__ commits." msgstr[0] "" msgstr[1] "" msgstr[2] "" - -#: rhodecode/templates/pullrequests/pullrequest.mako:357 +msgstr[3] "" + +#: rhodecode/templates/pullrequests/pullrequest.mako:355 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:364 +#: rhodecode/templates/pullrequests/pullrequest.mako:362 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:464 +#: rhodecode/templates/pullrequests/pullrequest.mako:462 msgid "Destination repository" msgstr "Repozytorium docelowe" -#: rhodecode/templates/pullrequests/pullrequest.mako:475 +#: rhodecode/templates/pullrequests/pullrequest.mako:473 msgid "Select commit reference" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:8 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:7 msgid "This pull request can be merged automatically." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:13 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:12 msgid "Merge is not currently possible because of below failed checks." msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:37 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:42 +msgid "refresh checks" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:38 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 -msgid "refresh checks" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:39 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:44 msgid "Merge Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:44 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 msgid "You are not allowed to merge this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:46 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:45 msgid "Login to Merge this Pull Request" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:54 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 +msgid "Close with status {}" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show.mako:5 #, python-format msgid "%s Pull Request #%s" @@ -9323,173 +9665,179 @@ msgstr "Potwierdź usunięcie połączenia gałęzi" msgid "Origin" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:120 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:88 +msgid "Common ancestor" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:125 msgid "Merge" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:133 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:138 msgid "Shadow repository data not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:141 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:146 msgid "Review" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:157 #, python-format msgid "calculated based on %s reviewer vote" msgid_plural "calculated based on %s reviewers votes" msgstr[0] "" msgstr[1] "" msgstr[2] "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:170 +msgstr[3] "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:175 msgid "Versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:183 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:186 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:188 msgid "{} version available for this pull request, show it." msgid_plural "{} versions available for this pull request, show them." msgstr[0] "" msgstr[1] "" msgstr[2] "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:182 +msgstr[3] "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:187 msgid "Hide all versions of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:207 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:212 msgid "Your review status at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:213 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:218 msgid "Comment from pull request version {0}, general:{1} inline:{2}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:230 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:234 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:235 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:239 msgid "select versions to show changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:231 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:236 msgid "show changes between versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:232 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:237 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:247 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:252 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:251 -msgid "Comments for this pull request" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:256 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 +msgid "Comments for this pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:261 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:263 #, python-format msgid "%d General " msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:264 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:267 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:269 #, python-format msgid "%d Inline" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:268 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:272 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:273 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 #, python-format msgid "%d Outdated" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:269 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:274 msgid "show outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:270 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:281 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:286 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:295 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:365 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:300 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:370 msgid "Save Changes" msgstr "Zapisz zmiany" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:382 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:387 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:383 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:388 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:391 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:396 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 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:393 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 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:404 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:409 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:427 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:432 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:440 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:445 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:444 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:449 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:462 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:464 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:469 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:567 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:572 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:570 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:575 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:571 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:576 msgid "show them" msgstr "" @@ -9617,6 +9965,7 @@ msgid_plural "%(num)s Branches" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/summary/components.mako:12 #, python-format @@ -9625,6 +9974,7 @@ msgid_plural "%(num)s Closed Branches" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/summary/components.mako:19 #, python-format @@ -9633,6 +9983,7 @@ msgid_plural "%(num)s Tags" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/summary/components.mako:26 #, python-format @@ -9641,6 +9992,7 @@ msgid_plural "%(num)s Bookmarks" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: rhodecode/templates/summary/components.mako:49 msgid "Read-only url" @@ -9753,3 +10105,4 @@ msgid_plural "plural" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" 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 @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-02-05 17:11+0100\n" -"PO-Revision-Date: 2017-02-01 20:10+0000\n" +"POT-Creation-Date: 2017-04-07 12:33+0200\n" +"PO-Revision-Date: 2017-04-07 10:34+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Portuguese (http://www.transifex.com/rhodecode/RhodeCode/language/pt/)\n" "MIME-Version: 1.0\n" @@ -20,51 +20,52 @@ msgstr "" "Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: rhodecode/admin/navigation.py:83 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:167 +#: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 +#: rhodecode/integrations/views.py:166 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "" -#: rhodecode/admin/navigation.py:84 +#: rhodecode/apps/admin/navigation.py:84 #: rhodecode/templates/admin/repos/repo_edit.mako:52 msgid "VCS" msgstr "" -#: rhodecode/admin/navigation.py:85 +#: rhodecode/apps/admin/navigation.py:85 msgid "Visual" msgstr "" -#: rhodecode/admin/navigation.py:86 +#: rhodecode/apps/admin/navigation.py:86 msgid "Remap and Rescan" msgstr "" -#: rhodecode/admin/navigation.py:87 +#: rhodecode/apps/admin/navigation.py:87 #: rhodecode/templates/admin/repos/repo_edit.mako:58 msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:89 rhodecode/integrations/types/email.py:232 -#: rhodecode/templates/register.mako:75 +#: rhodecode/apps/admin/navigation.py:89 +#: rhodecode/integrations/types/email.py:232 +#: rhodecode/templates/register.mako:76 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: 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:92 +#: rhodecode/templates/admin/users/users.mako:64 #: rhodecode/templates/email_templates/user_registration.mako:25 #: rhodecode/templates/users/user_profile.mako:51 msgid "Email" msgstr "E-mail" -#: rhodecode/admin/navigation.py:90 +#: rhodecode/apps/admin/navigation.py:90 msgid "Hooks" msgstr "Ganchos" -#: rhodecode/admin/navigation.py:91 +#: rhodecode/apps/admin/navigation.py:91 msgid "Full Text Search" msgstr "" -#: rhodecode/admin/navigation.py:93 +#: rhodecode/apps/admin/navigation.py:93 #: rhodecode/templates/admin/integrations/base.mako:23 #: rhodecode/templates/admin/integrations/form.mako:8 #: rhodecode/templates/admin/integrations/form.mako:21 @@ -78,177 +79,290 @@ msgstr "" #: 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/base/base.mako:79 +#: rhodecode/templates/base/base.mako:82 msgid "Integrations" msgstr "" -#: rhodecode/admin/navigation.py:95 +#: rhodecode/apps/admin/navigation.py:95 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" msgstr "" -#: rhodecode/admin/navigation.py:97 +#: rhodecode/apps/admin/navigation.py:97 msgid "User Sessions" msgstr "" -#: rhodecode/admin/navigation.py:99 +#: rhodecode/apps/admin/navigation.py:99 msgid "Open Source Licenses" msgstr "" -#: rhodecode/admin/navigation.py:107 +#: rhodecode/apps/admin/navigation.py:107 msgid "Labs" msgstr "" -#: rhodecode/admin/views/sessions.py:90 +#: rhodecode/apps/admin/views/sessions.py:86 msgid "Cleaned up old sessions" msgstr "" -#: rhodecode/admin/views/sessions.py:96 +#: rhodecode/apps/admin/views/sessions.py:92 msgid "Failed to cleanup up old sessions" msgstr "" -#: rhodecode/admin/views/svn_config.py:47 +#: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." msgstr "" -#: rhodecode/admin/views/svn_config.py:55 +#: rhodecode/apps/admin/views/svn_config.py:54 msgid "Failed to generate the Apache configuration for Subversion." msgstr "" -#: rhodecode/admin/views/system_info.py:96 +#: rhodecode/apps/admin/views/system_info.py:95 msgid "" "Note: please make sure this server can access `${url}` for the update link " "to work" msgstr "" -#: rhodecode/admin/views/system_info.py:99 +#: rhodecode/apps/admin/views/system_info.py:98 msgid "Update info" msgstr "" -#: rhodecode/admin/views/system_info.py:101 +#: rhodecode/apps/admin/views/system_info.py:100 msgid "Check for updates" msgstr "" -#: rhodecode/admin/views/system_info.py:106 +#: rhodecode/apps/admin/views/system_info.py:105 msgid "RhodeCode Version" msgstr "" -#: rhodecode/admin/views/system_info.py:107 +#: rhodecode/apps/admin/views/system_info.py:106 msgid "RhodeCode Server IP" msgstr "" -#: rhodecode/admin/views/system_info.py:108 +#: rhodecode/apps/admin/views/system_info.py:107 msgid "RhodeCode Server ID" msgstr "" -#: rhodecode/admin/views/system_info.py:109 +#: rhodecode/apps/admin/views/system_info.py:108 msgid "RhodeCode Configuration" msgstr "" -#: rhodecode/admin/views/system_info.py:113 +#: rhodecode/apps/admin/views/system_info.py:109 +msgid "Workers" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:110 +msgid "Worker Type" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:114 msgid "Database" msgstr "" -#: rhodecode/admin/views/system_info.py:114 +#: rhodecode/apps/admin/views/system_info.py:115 msgid "Database version" msgstr "" -#: rhodecode/admin/views/system_info.py:118 +#: rhodecode/apps/admin/views/system_info.py:119 msgid "Platform" msgstr "" -#: rhodecode/admin/views/system_info.py:119 +#: rhodecode/apps/admin/views/system_info.py:120 msgid "Platform UUID" msgstr "" -#: rhodecode/admin/views/system_info.py:120 +#: rhodecode/apps/admin/views/system_info.py:121 msgid "Python version" msgstr "" -#: rhodecode/admin/views/system_info.py:121 +#: rhodecode/apps/admin/views/system_info.py:122 msgid "Python path" msgstr "" -#: rhodecode/admin/views/system_info.py:125 +#: rhodecode/apps/admin/views/system_info.py:126 msgid "CPU" msgstr "" -#: rhodecode/admin/views/system_info.py:126 +#: rhodecode/apps/admin/views/system_info.py:127 msgid "Load" msgstr "" -#: rhodecode/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:128 msgid "Memory" msgstr "" -#: rhodecode/admin/views/system_info.py:128 +#: rhodecode/apps/admin/views/system_info.py:129 msgid "Uptime" msgstr "" -#: rhodecode/admin/views/system_info.py:132 +#: rhodecode/apps/admin/views/system_info.py:133 msgid "Storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:135 msgid "Storage inodes" msgstr "" -#: rhodecode/admin/views/system_info.py:136 +#: rhodecode/apps/admin/views/system_info.py:137 msgid "Gist storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:137 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Gist storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:139 +#: rhodecode/apps/admin/views/system_info.py:140 msgid "Archive cache storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:140 +#: rhodecode/apps/admin/views/system_info.py:141 msgid "Archive cache info" msgstr "" -#: rhodecode/admin/views/system_info.py:142 +#: rhodecode/apps/admin/views/system_info.py:143 msgid "Temp storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:143 +#: rhodecode/apps/admin/views/system_info.py:144 msgid "Temp storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:145 +#: rhodecode/apps/admin/views/system_info.py:146 msgid "Search info" msgstr "" -#: rhodecode/admin/views/system_info.py:146 +#: rhodecode/apps/admin/views/system_info.py:147 msgid "Search location" msgstr "" -#: rhodecode/admin/views/system_info.py:150 +#: rhodecode/apps/admin/views/system_info.py:151 msgid "VCS Backends" msgstr "" -#: rhodecode/admin/views/system_info.py:151 +#: rhodecode/apps/admin/views/system_info.py:152 msgid "VCS Server" msgstr "" -#: rhodecode/admin/views/system_info.py:152 +#: rhodecode/apps/admin/views/system_info.py:153 msgid "GIT" msgstr "" -#: rhodecode/admin/views/system_info.py:153 +#: rhodecode/apps/admin/views/system_info.py:154 msgid "HG" msgstr "" -#: rhodecode/admin/views/system_info.py:154 +#: rhodecode/apps/admin/views/system_info.py:155 msgid "SVN" msgstr "" +#: rhodecode/apps/admin/views/users.py:60 +#: rhodecode/controllers/admin/users.py:359 +#: rhodecode/controllers/admin/users.py:380 +#: 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/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/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/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/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/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/controllers/admin/gists.py:70 +msgid "Lifetime" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:188 +#: rhodecode/apps/my_account/views.py:148 +#: 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 +msgid "Auth token successfully created" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:240 +#: rhodecode/apps/my_account/views.py:192 +msgid "Auth token successfully deleted" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:284 +msgid "Groups successfully changed" +msgstr "" + +#: rhodecode/apps/login/views.py:247 rhodecode/apps/login/views.py:316 +msgid "Bad captcha" +msgstr "" + +#: rhodecode/apps/login/views.py:256 +msgid "You have successfully registered with RhodeCode" +msgstr "" + +#: rhodecode/apps/login/views.py:292 +msgid "If such email exists, a password reset link was sent to it." +msgstr "" + +#: rhodecode/apps/login/views.py:298 +msgid "Password reset has been disabled." +msgstr "" + +#: rhodecode/apps/login/views.py:381 +msgid "Given reset token is invalid" +msgstr "" + +#: rhodecode/apps/login/views.py:389 +msgid "" +"Your password reset was successful, a new password has been sent to your " +"email" +msgstr "" + +#: rhodecode/apps/my_account/views.py:115 +msgid "Error occurred during update of user password" +msgstr "" + +#: rhodecode/apps/my_account/views.py:122 +msgid "Successfully updated password" +msgstr "" + +#: rhodecode/apps/svn_support/events.py:30 +msgid "Configuration for Apaache mad_dav_svn changed." +msgstr "" + #: rhodecode/authentication/schema.py:35 msgid "Enable or disable this authentication plugin." msgstr "" @@ -264,12 +378,11 @@ msgstr "Habilitado" #: rhodecode/authentication/schema.py:43 msgid "" -"Amount of seconds to cache the authentication call for this plugin. Useful " -"for long calls like LDAP to improve the responsiveness of the authentication" -" system (0 means disabled)." -msgstr "" - -#: rhodecode/authentication/schema.py:48 +"Amount of seconds to cache the authentication responsecall for this plugin. \n" +"Useful for long calls like LDAP to improve the performance of the authentication system (0 means disabled)." +msgstr "" + +#: rhodecode/authentication/schema.py:49 msgid "Auth Cache TTL" msgstr "" @@ -290,99 +403,101 @@ msgstr "" msgid "Error occurred during update of auth settings." msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:61 +#: rhodecode/authentication/plugins/auth_crowd.py:60 msgid "The FQDN or IP of the Atlassian CROWD Server" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:63 +#: rhodecode/authentication/plugins/auth_crowd.py:62 msgid "Host" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:68 +#: rhodecode/authentication/plugins/auth_crowd.py:67 msgid "The Port in use by the Atlassian CROWD Server" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:70 +#: rhodecode/authentication/plugins/auth_crowd.py:69 #: rhodecode/authentication/plugins/auth_ldap.py:84 msgid "Port" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:76 +#: rhodecode/authentication/plugins/auth_crowd.py:75 msgid "The Application Name to authenticate to CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:78 +#: rhodecode/authentication/plugins/auth_crowd.py:77 msgid "Application Name" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:83 +#: rhodecode/authentication/plugins/auth_crowd.py:82 msgid "The password to authenticate to CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:85 +#: rhodecode/authentication/plugins/auth_crowd.py:84 msgid "Application Password" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:90 +#: rhodecode/authentication/plugins/auth_crowd.py:89 msgid "" "A comma separated list of group names that identify users as RhodeCode " "Administrators" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:94 +#: rhodecode/authentication/plugins/auth_crowd.py:93 msgid "Admin Groups" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:216 +#: rhodecode/authentication/plugins/auth_crowd.py:215 msgid "CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:55 +#: rhodecode/authentication/plugins/auth_headers.py:54 msgid "Header to extract the user from" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:57 +#: rhodecode/authentication/plugins/auth_headers.py:56 msgid "Header" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:62 +#: rhodecode/authentication/plugins/auth_headers.py:61 msgid "Header to extract the user from when main one fails" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:64 +#: rhodecode/authentication/plugins/auth_headers.py:63 msgid "Fallback header" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:69 +#: rhodecode/authentication/plugins/auth_headers.py:68 msgid "" "Perform cleaning of user, if passed user has @ in username then first part " "before @ is taken. If there's \\ in the username only the part after \\ is " "taken" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:74 +#: rhodecode/authentication/plugins/auth_headers.py:73 msgid "Clean username" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:99 +#: rhodecode/authentication/plugins/auth_headers.py:98 msgid "Headers" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:63 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:62 msgid "The url of the Jasig CAS REST service" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:65 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:64 #: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" msgstr "URL" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:93 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:92 msgid "Jasig-CAS" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:75 -msgid "Host of the LDAP Server" +#: 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 @@ -390,107 +505,117 @@ msgid "LDAP Host" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:82 -msgid "Port that the LDAP server is listening on" +msgid "Custom port that the LDAP server is listening on. Default: 389" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:90 -msgid "User to connect to LDAP" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:93 +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 msgid "Account" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:98 -msgid "Password to connect to LDAP" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:101 -#: rhodecode/templates/login.mako:49 rhodecode/templates/register.mako:47 +#: rhodecode/authentication/plugins/auth_ldap.py:100 +msgid "Password to authenticate for given user DN." +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:103 +#: 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:310 +#: rhodecode/templates/base/base.mako:313 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "Senha" -#: rhodecode/authentication/plugins/auth_ldap.py:106 +#: rhodecode/authentication/plugins/auth_ldap.py:108 msgid "TLS Type" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:107 +#: rhodecode/authentication/plugins/auth_ldap.py:109 msgid "Connection Security" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:113 +#: rhodecode/authentication/plugins/auth_ldap.py:115 msgid "Require Cert over TLS?" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:114 +#: rhodecode/authentication/plugins/auth_ldap.py:116 msgid "Certificate Checks" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:120 -msgid "Base DN to search (e.g., dc=mydomain,dc=com)" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:123 +#: rhodecode/authentication/plugins/auth_ldap.py:122 +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 msgid "Base DN" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:128 -msgid "Filter to narrow results (e.g., ou=Users, etc)" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:131 -msgid "LDAP Search Filter" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:136 -msgid "How deep to search LDAP" +#: rhodecode/authentication/plugins/auth_ldap.py:132 +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 -msgid "LDAP Search Scope" +msgid "LDAP Search Filter" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:143 -msgid "LDAP Attribute to map to user name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:145 +msgid "How deep to search LDAP. If unsure set to SUBTREE" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:144 +msgid "LDAP Search Scope" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:150 +msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:152 msgid "Login Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:146 +#: rhodecode/authentication/plugins/auth_ldap.py:153 msgid "The LDAP Login attribute of the CN must be specified" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:151 -msgid "LDAP Attribute to map to first name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:154 +#: rhodecode/authentication/plugins/auth_ldap.py:158 +msgid "LDAP Attribute to map to first name (e.g., givenName)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:161 msgid "First Name Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:159 -msgid "LDAP Attribute to map to last name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:162 +#: rhodecode/authentication/plugins/auth_ldap.py:166 +msgid "LDAP Attribute to map to last name (e.g., sn)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:169 msgid "Last Name Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:167 -msgid "LDAP Attribute to map to email address" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:170 +#: rhodecode/authentication/plugins/auth_ldap.py:174 +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 msgid "Email Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:351 +#: rhodecode/authentication/plugins/auth_ldap.py:360 msgid "LDAP" msgstr "" @@ -515,16 +640,16 @@ msgstr "" msgid "PAM" msgstr "" -#: rhodecode/authentication/plugins/auth_rhodecode.py:68 +#: rhodecode/authentication/plugins/auth_rhodecode.py:67 msgid "Rhodecode" msgstr "" -#: rhodecode/authentication/plugins/auth_token.py:71 +#: rhodecode/authentication/plugins/auth_token.py:70 msgid "Rhodecode Token Auth" msgstr "" #: rhodecode/controllers/changelog.py:91 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:202 +#: rhodecode/controllers/pullrequests.py:204 msgid "There are no commits yet" msgstr "" @@ -558,8 +683,8 @@ msgid "No such commit exists for this re msgstr "" #: rhodecode/controllers/changeset.py:344 -#: rhodecode/controllers/pullrequests.py:948 -#: rhodecode/model/pull_request.py:1009 +#: rhodecode/controllers/pullrequests.py:985 +#: rhodecode/model/pull_request.py:1055 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" @@ -599,12 +724,12 @@ msgid "" "%(repo1)s with commit %(commit2)s from repository %(repo2)s." msgstr "" -#: rhodecode/controllers/feed.py:70 +#: rhodecode/controllers/feed.py:69 #, python-format msgid "Changes on %s repository" msgstr "Modificações no repositório %s" -#: rhodecode/controllers/feed.py:71 +#: rhodecode/controllers/feed.py:70 #, python-format msgid "%s %s feed" msgstr "%s - feed %s" @@ -618,93 +743,93 @@ msgstr "" msgid "There are no files yet. %s" msgstr "" -#: rhodecode/controllers/files.py:394 rhodecode/controllers/files.py:447 -#: rhodecode/controllers/files.py:478 rhodecode/controllers/files.py:553 -#: rhodecode/controllers/files.py:598 rhodecode/controllers/files.py:689 +#: 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 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:402 rhodecode/controllers/files.py:455 +#: rhodecode/controllers/files.py:443 rhodecode/controllers/files.py:496 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:411 rhodecode/controllers/files.py:464 +#: rhodecode/controllers/files.py:452 rhodecode/controllers/files.py:505 #, python-format msgid "Deleted file %s via RhodeCode Enterprise" msgstr "" -#: rhodecode/controllers/files.py:431 +#: rhodecode/controllers/files.py:472 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:540 -#: rhodecode/controllers/files.py:677 +#: rhodecode/controllers/files.py:475 rhodecode/controllers/files.py:581 +#: rhodecode/controllers/files.py:718 msgid "Error occurred during commit" msgstr "Ocorreu um erro ao realizar commit" -#: rhodecode/controllers/files.py:486 rhodecode/controllers/files.py:561 +#: rhodecode/controllers/files.py:527 rhodecode/controllers/files.py:602 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:498 rhodecode/controllers/files.py:573 +#: rhodecode/controllers/files.py:539 rhodecode/controllers/files.py:614 #, python-format msgid "Edited file %s via RhodeCode Enterprise" msgstr "" -#: rhodecode/controllers/files.py:515 +#: rhodecode/controllers/files.py:556 msgid "No changes" msgstr "Sem modificações" -#: rhodecode/controllers/files.py:537 rhodecode/controllers/files.py:666 +#: 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:611 rhodecode/controllers/files.py:700 +#: rhodecode/controllers/files.py:652 rhodecode/controllers/files.py:741 msgid "Added file via RhodeCode Enterprise" msgstr "" -#: rhodecode/controllers/files.py:636 +#: rhodecode/controllers/files.py:677 msgid "No filename" msgstr "Nenhum nome de arquivo" -#: rhodecode/controllers/files.py:669 +#: 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:723 +#: rhodecode/controllers/files.py:764 msgid "Downloads disabled" msgstr "Downloads desabilitados" -#: rhodecode/controllers/files.py:729 +#: rhodecode/controllers/files.py:770 #, python-format msgid "Unknown revision %s" msgstr "Revisão desconhecida %s" -#: rhodecode/controllers/files.py:731 +#: rhodecode/controllers/files.py:772 msgid "Empty repository" msgstr "Repositório vazio" -#: rhodecode/controllers/files.py:733 rhodecode/controllers/files.py:767 +#: rhodecode/controllers/files.py:774 rhodecode/controllers/files.py:808 msgid "Unknown archive type" msgstr "Tipo de arquivo desconhecido" -#: rhodecode/controllers/files.py:952 +#: rhodecode/controllers/files.py:993 msgid "Changesets" msgstr "Conjuntos de mudanças" -#: rhodecode/controllers/files.py:973 rhodecode/controllers/summary.py:269 -#: rhodecode/model/pull_request.py:1234 rhodecode/model/scm.py:782 -#: rhodecode/templates/base/vcs_settings.mako:193 +#: 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:977 rhodecode/model/scm.py:797 -#: rhodecode/templates/base/vcs_settings.mako:218 +#: rhodecode/controllers/files.py:1018 rhodecode/model/scm.py:797 +#: rhodecode/templates/base/vcs_settings.mako:267 msgid "Tags" msgstr "Etiquetas" @@ -713,23 +838,24 @@ msgstr "Etiquetas" msgid "An error occurred during repository forking %s" msgstr "Ocorreu um erro ao bifurcar o repositório %s" -#: rhodecode/controllers/home.py:205 +#: rhodecode/controllers/home.py:207 msgid "Groups" msgstr "Grupos" -#: rhodecode/controllers/home.py:212 rhodecode/controllers/home.py:247 -#: rhodecode/controllers/pullrequests.py:308 +#: 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:73 -#: rhodecode/templates/base/base.mako:145 -#: rhodecode/templates/base/base.mako:569 +#: 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:225 +#: rhodecode/controllers/home.py:227 #, python-format msgid "Commits in %(repo)s" msgstr "" @@ -742,81 +868,81 @@ msgstr "diário público" msgid "journal" msgstr "diário" -#: rhodecode/controllers/pullrequests.py:216 +#: rhodecode/controllers/pullrequests.py:218 msgid "Commit does not exist" msgstr "" -#: rhodecode/controllers/pullrequests.py:333 -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:335 +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 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/controllers/pullrequests.py:383 +#: rhodecode/controllers/pullrequests.py:385 msgid "Successfully opened new pull request" msgstr "Novo pull request criado com sucesso" -#: rhodecode/controllers/pullrequests.py:386 +#: 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:429 +#: rhodecode/controllers/pullrequests.py:431 msgid "Cannot update closed pull requests." msgstr "" -#: rhodecode/controllers/pullrequests.py:435 +#: rhodecode/controllers/pullrequests.py:437 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/controllers/pullrequests.py:443 +#: rhodecode/controllers/pullrequests.py:455 msgid "" "Pull request updated to \"{source_commit_id}\" with {count_added} added, " -"{count_removed} removed commits." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:458 +"{count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:472 msgid "Reload page" msgstr "" -#: rhodecode/controllers/pullrequests.py:532 +#: rhodecode/controllers/pullrequests.py:546 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/controllers/pullrequests.py:569 +#: rhodecode/controllers/pullrequests.py:588 msgid "Successfully deleted pull request" msgstr "Pull request excluído com sucesso" -#: rhodecode/controllers/pullrequests.py:864 -msgid "Close Pull Request" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:952 -#: rhodecode/model/pull_request.py:1013 +#: rhodecode/controllers/pullrequests.py:592 +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:1002 +#: 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:243 +#: rhodecode/controllers/summary.py:251 msgid "Branch" msgstr "Ramo" -#: rhodecode/controllers/summary.py:244 +#: rhodecode/controllers/summary.py:252 msgid "Tag" msgstr "" -#: rhodecode/controllers/summary.py:245 +#: rhodecode/controllers/summary.py:253 msgid "Bookmark" msgstr "" -#: rhodecode/controllers/summary.py:270 +#: rhodecode/controllers/summary.py:278 msgid "Closed branches" msgstr "" @@ -828,42 +954,6 @@ msgstr "Configurações padrão atualizadas com sucesso" msgid "Error occurred during update of default values" msgstr "" -#: rhodecode/controllers/admin/gists.py:62 -#: rhodecode/controllers/admin/my_account.py:384 -#: rhodecode/controllers/admin/users.py:465 -msgid "forever" -msgstr "para sempre" - -#: rhodecode/controllers/admin/gists.py:63 -#: rhodecode/controllers/admin/my_account.py:385 -#: rhodecode/controllers/admin/users.py:466 -msgid "5 minutes" -msgstr "cinco minutos" - -#: rhodecode/controllers/admin/gists.py:64 -#: rhodecode/controllers/admin/my_account.py:386 -#: rhodecode/controllers/admin/users.py:467 -msgid "1 hour" -msgstr "uma hora" - -#: rhodecode/controllers/admin/gists.py:65 -#: rhodecode/controllers/admin/my_account.py:387 -#: rhodecode/controllers/admin/users.py:468 -msgid "1 day" -msgstr "um dia" - -#: rhodecode/controllers/admin/gists.py:66 -#: rhodecode/controllers/admin/my_account.py:388 -#: rhodecode/controllers/admin/users.py:469 -msgid "1 month" -msgstr "um mês" - -#: rhodecode/controllers/admin/gists.py:70 -#: rhodecode/controllers/admin/my_account.py:390 -#: rhodecode/controllers/admin/users.py:471 -msgid "Lifetime" -msgstr "" - #: rhodecode/controllers/admin/gists.py:72 msgid "Requires registered account" msgstr "" @@ -900,10 +990,8 @@ msgstr "" #: rhodecode/controllers/admin/gists.py:343 #: rhodecode/templates/admin/gists/show.mako:67 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 #: rhodecode/templates/data_table/_dt_elements.mako:263 msgid "never" msgstr "nunca" @@ -913,65 +1001,36 @@ msgstr "nunca" msgid "%(expiry)s - current value" msgstr "" -#: rhodecode/controllers/admin/my_account.py:80 +#: rhodecode/controllers/admin/my_account.py:78 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:140 +#: rhodecode/controllers/admin/my_account.py:138 msgid "Your account was updated successfully" msgstr "Sua conta foi atualizada com sucesso" -#: rhodecode/controllers/admin/my_account.py:155 -#: rhodecode/controllers/admin/users.py:231 +#: rhodecode/controllers/admin/my_account.py:153 +#: rhodecode/controllers/admin/users.py:184 #, 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:221 -#: rhodecode/controllers/admin/my_account.py:227 -msgid "Error occurred during update of user password" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:234 -msgid "Successfully updated password" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:278 -#: rhodecode/controllers/admin/users.py:645 +#: 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:285 -#: rhodecode/controllers/admin/users.py:652 +#: 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:295 -#: rhodecode/controllers/admin/users.py:667 +#: rhodecode/controllers/admin/my_account.py:239 +#: rhodecode/controllers/admin/users.py:549 msgid "Removed email address from user account" msgstr "" -#: rhodecode/controllers/admin/my_account.py:393 -#: rhodecode/controllers/admin/users.py:474 -msgid "Role" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:406 -#: rhodecode/controllers/admin/users.py:498 -msgid "Auth token successfully created" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:419 -#: rhodecode/controllers/admin/users.py:517 -msgid "Auth token successfully reset" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:423 -#: rhodecode/controllers/admin/users.py:521 -msgid "Auth token successfully deleted" -msgstr "" - #: rhodecode/controllers/admin/permissions.py:112 msgid "Application permissions updated successfully" msgstr "" @@ -1035,7 +1094,7 @@ msgid "Error occurred during deletion of 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:322 +#: rhodecode/controllers/admin/user_groups.py:323 msgid "Cannot change permission for yourself as admin" msgstr "" @@ -1187,18 +1246,18 @@ msgid "Error occurred during deleting is msgstr "" #: rhodecode/controllers/admin/repos.py:728 -#: rhodecode/controllers/admin/settings.py:380 +#: rhodecode/controllers/admin/settings.py:381 msgid "Removed issue tracker entry" msgstr "" #: rhodecode/controllers/admin/repos.py:758 -#: rhodecode/controllers/admin/settings.py:427 +#: rhodecode/controllers/admin/settings.py:428 msgid "Updated issue tracker entries" msgstr "" #: rhodecode/controllers/admin/repos.py:819 #: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:618 +#: rhodecode/controllers/admin/settings.py:619 msgid "Some form inputs contain invalid data." msgstr "" @@ -1207,281 +1266,277 @@ msgid "Error occurred during updating re msgstr "" #: rhodecode/controllers/admin/repos.py:841 -#: rhodecode/controllers/admin/settings.py:175 +#: rhodecode/controllers/admin/settings.py:176 msgid "Updated VCS settings" msgstr "Configurações de VCS atualizadas" -#: rhodecode/controllers/admin/settings.py:171 -#: rhodecode/controllers/admin/settings.py:282 +#: rhodecode/controllers/admin/settings.py:172 +#: rhodecode/controllers/admin/settings.py:283 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:222 +#: rhodecode/controllers/admin/settings.py:223 #, 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:278 +#: rhodecode/controllers/admin/settings.py:279 msgid "Updated application settings" msgstr "Configurações da aplicação atualizadas" -#: rhodecode/controllers/admin/settings.py:344 +#: rhodecode/controllers/admin/settings.py:345 msgid "Updated visualisation settings" msgstr "Configurações de visualização atualizadas" -#: rhodecode/controllers/admin/settings.py:347 +#: rhodecode/controllers/admin/settings.py:348 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:440 +#: rhodecode/controllers/admin/settings.py:441 msgid "Please enter email address" msgstr "" -#: rhodecode/controllers/admin/settings.py:458 +#: rhodecode/controllers/admin/settings.py:459 msgid "Send email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:491 +#: rhodecode/controllers/admin/settings.py:492 msgid "Added new hook" msgstr "Adicionado novo gancho" -#: rhodecode/controllers/admin/settings.py:506 +#: rhodecode/controllers/admin/settings.py:507 msgid "Updated hooks" msgstr "Atualizados os ganchos" -#: rhodecode/controllers/admin/settings.py:510 +#: rhodecode/controllers/admin/settings.py:511 msgid "Error occurred during hook creation" msgstr "Ocorreu um erro durante a criação do hook" -#: rhodecode/controllers/admin/settings.py:639 +#: rhodecode/controllers/admin/settings.py:640 msgid "Error occurred during updating labs settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:644 +#: rhodecode/controllers/admin/settings.py:645 msgid "Updated Labs settings" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:164 +#: rhodecode/controllers/admin/user_groups.py:165 #, python-format msgid "Created user group %(user_group_link)s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:178 +#: rhodecode/controllers/admin/user_groups.py:179 #, 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:219 +#: rhodecode/controllers/admin/user_groups.py:220 #, python-format msgid "Updated user group %s" msgstr "Grupo de usuários %s atualizado" -#: rhodecode/controllers/admin/user_groups.py:235 +#: rhodecode/controllers/admin/user_groups.py:236 #, 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:257 +#: rhodecode/controllers/admin/user_groups.py:258 msgid "Successfully deleted user group" msgstr "Grupo de usuários excluído com sucesso" -#: rhodecode/controllers/admin/user_groups.py:262 +#: rhodecode/controllers/admin/user_groups.py:263 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:330 +#: rhodecode/controllers/admin/user_groups.py:331 msgid "Target group cannot be the same" msgstr "O grupo destino não pode ser o mesmo" -#: rhodecode/controllers/admin/user_groups.py:336 +#: rhodecode/controllers/admin/user_groups.py:337 msgid "User Group permissions updated" msgstr "Permissões do Grupo de Usuários atualizadas" -#: rhodecode/controllers/admin/user_groups.py:421 +#: rhodecode/controllers/admin/user_groups.py:422 msgid "User Group global permissions updated successfully" msgstr "" #: rhodecode/controllers/admin/user_groups.py:437 -#: rhodecode/controllers/admin/users.py:595 +#: 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/users.py:153 +#: rhodecode/controllers/admin/user_groups.py:481 +msgid "User Group synchronization updated successfully" +msgstr "" + +#: rhodecode/controllers/admin/user_groups.py:485 +msgid "An error occurred during synchronization update" +msgstr "" + +#: rhodecode/controllers/admin/users.py:106 #, python-format msgid "Created user %(user_link)s" msgstr "" -#: rhodecode/controllers/admin/users.py:169 +#: rhodecode/controllers/admin/users.py:122 #, 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:214 +#: rhodecode/controllers/admin/users.py:167 msgid "User updated successfully" msgstr "Usuário atualizado com sucesso" -#: rhodecode/controllers/admin/users.py:265 +#: rhodecode/controllers/admin/users.py:218 #, python-format msgid "Detached %s repositories" msgstr "" -#: rhodecode/controllers/admin/users.py:270 +#: rhodecode/controllers/admin/users.py:223 #, python-format msgid "Deleted %s repositories" msgstr "" -#: rhodecode/controllers/admin/users.py:278 +#: rhodecode/controllers/admin/users.py:231 #, python-format msgid "Detached %s repository groups" msgstr "" -#: rhodecode/controllers/admin/users.py:283 +#: rhodecode/controllers/admin/users.py:236 #, python-format msgid "Deleted %s repository groups" msgstr "" +#: rhodecode/controllers/admin/users.py:244 +#, python-format +msgid "Detached %s user groups" +msgstr "" + +#: rhodecode/controllers/admin/users.py:249 +#, python-format +msgid "Deleted %s user groups" +msgstr "" + +#: rhodecode/controllers/admin/users.py:260 +msgid "Successfully deleted user" +msgstr "Usuário excluído com sucesso" + +#: rhodecode/controllers/admin/users.py:266 +msgid "An error occurred during deletion of user" +msgstr "Ocorreu um erro ao excluir o usuário" + +#: 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 -#, python-format -msgid "Detached %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:296 -#, python-format -msgid "Deleted %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:307 -msgid "Successfully deleted user" -msgstr "Usuário excluído com sucesso" - -#: rhodecode/controllers/admin/users.py:313 -msgid "An error occurred during deletion of user" -msgstr "Ocorreu um erro ao excluir o usuário" - -#: rhodecode/controllers/admin/users.py:332 -msgid "Force password change disabled for user" +msgid "An error occurred during password reset for user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:324 +#, python-format +msgid "Linked repository group `%s` as personal" +msgstr "" + +#: rhodecode/controllers/admin/users.py:330 +#, python-format +msgid "Created repository group `%s`" msgstr "" #: rhodecode/controllers/admin/users.py:334 -msgid "Force password change enabled for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:338 -msgid "An error occurred during password reset for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:371 -#, python-format -msgid "Linked repository group `%s` as personal" -msgstr "" - -#: rhodecode/controllers/admin/users.py:377 -#, python-format -msgid "Created repository group `%s`" -msgstr "" - -#: rhodecode/controllers/admin/users.py:381 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/controllers/admin/users.py:386 +#: rhodecode/controllers/admin/users.py:339 msgid "An error occurred during repository group creation for user" msgstr "" -#: rhodecode/controllers/admin/users.py:406 -#: rhodecode/controllers/admin/users.py:427 -#: rhodecode/controllers/admin/users.py:459 -#: rhodecode/controllers/admin/users.py:490 -#: rhodecode/controllers/admin/users.py:507 -#: rhodecode/controllers/admin/users.py:530 -#: rhodecode/controllers/admin/users.py:604 -#: rhodecode/controllers/admin/users.py:617 -#: rhodecode/controllers/admin/users.py:675 -msgid "You can't edit this user" -msgstr "Você não pode editar esse usuário" - -#: rhodecode/controllers/admin/users.py:443 +#: rhodecode/controllers/admin/users.py:396 msgid "" "The user participates as reviewer in pull requests and cannot be deleted. " "You can set the user to \"inactive\" instead of deleting it." msgstr "" -#: rhodecode/controllers/admin/users.py:579 +#: rhodecode/controllers/admin/users.py:461 msgid "User global permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/users.py:707 +#: rhodecode/controllers/admin/users.py:589 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/controllers/admin/users.py:722 +#: 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:726 +#: rhodecode/controllers/admin/users.py:608 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/controllers/admin/users.py:744 +#: rhodecode/controllers/admin/users.py:626 msgid "Removed ip address from user whitelist" msgstr "" -#: rhodecode/events/pullrequest.py:65 +#: rhodecode/events/pullrequest.py:68 msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:74 +#: rhodecode/events/pullrequest.py:77 msgid "pullrequest closed" msgstr "" -#: rhodecode/events/pullrequest.py:83 +#: rhodecode/events/pullrequest.py:86 msgid "pullrequest commits updated" msgstr "" -#: rhodecode/events/pullrequest.py:92 +#: rhodecode/events/pullrequest.py:95 msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:101 +#: rhodecode/events/pullrequest.py:104 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:110 +#: rhodecode/events/pullrequest.py:113 msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:136 +#: rhodecode/events/repo.py:138 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:145 +#: rhodecode/events/repo.py:147 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:154 +#: rhodecode/events/repo.py:156 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:163 +#: rhodecode/events/repo.py:165 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:199 +#: rhodecode/events/repo.py:201 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:208 +#: rhodecode/events/repo.py:210 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:217 +#: rhodecode/events/repo.py:219 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:228 +#: rhodecode/events/repo.py:230 msgid "repository push" msgstr "" @@ -1497,25 +1552,24 @@ msgstr "" msgid "repository group update" msgstr "" -#: rhodecode/events/user.py:34 +#: rhodecode/events/user.py:37 msgid "user registered" msgstr "" -#: rhodecode/events/user.py:48 +#: rhodecode/events/user.py:52 msgid "user pre create" msgstr "" -#: rhodecode/events/user.py:61 +#: rhodecode/events/user.py:66 msgid "user post create" msgstr "" -#: rhodecode/events/user.py:74 +#: rhodecode/events/user.py:80 msgid "user pre update" msgstr "" #: rhodecode/forms/__init__.py:32 rhodecode/templates/admin/gists/new.mako:62 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:31 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:88 +#: 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 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 @@ -1527,15 +1581,14 @@ msgstr "" #: 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_vcs.mako:46 +#: 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 #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 #: rhodecode/templates/admin/settings/settings_visual.mako:222 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:27 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:85 +#: 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_profile.mako:135 @@ -1545,17 +1598,17 @@ msgstr "Limpar" #: rhodecode/forms/__init__.py:33 rhodecode/templates/admin/gists/show.mako:49 #: rhodecode/templates/admin/integrations/list.mako:211 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:60 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 #: rhodecode/templates/admin/permissions/permissions_ips.mako:26 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:56 +#: 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/base/issue_tracker_settings.mako:70 -#: rhodecode/templates/base/vcs_settings.mako:202 -#: rhodecode/templates/base/vcs_settings.mako:227 +#: 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/changeset/changeset_file_comment.mako:142 @@ -1564,9 +1617,9 @@ msgstr "Limpar" #: rhodecode/templates/data_table/_dt_elements.mako:198 #: rhodecode/templates/data_table/_dt_elements.mako:210 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:35 -#: rhodecode/templates/files/files_source.mako:39 -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_source.mako:45 +#: rhodecode/templates/files/files_source.mako:49 +#: rhodecode/templates/files/files_source.mako:52 #: rhodecode/templates/pullrequests/pullrequest_show.mako:56 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" @@ -1605,28 +1658,28 @@ msgstr "" msgid "Root repositories only" msgstr "" -#: rhodecode/integrations/views.py:161 +#: rhodecode/integrations/views.py:160 msgid "{repo_name} repository" msgstr "" -#: rhodecode/integrations/views.py:164 +#: rhodecode/integrations/views.py:163 msgid "{repo_group_name} repo group" msgstr "" -#: rhodecode/integrations/views.py:171 +#: rhodecode/integrations/views.py:170 msgid "{name} integration" msgstr "" -#: rhodecode/integrations/views.py:185 +#: rhodecode/integrations/views.py:184 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:265 +#: rhodecode/integrations/views.py:264 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:290 +#: rhodecode/integrations/views.py:289 msgid "Integration {integration_name} updated successfully." msgstr "" @@ -1700,58 +1753,59 @@ msgid "" "Send events such as repo pushes and pull requests to your hipchat channel." msgstr "" -#: rhodecode/integrations/types/slack.py:44 +#: rhodecode/integrations/types/slack.py:46 msgid "Slack service URL" msgstr "" -#: rhodecode/integrations/types/slack.py:45 +#: rhodecode/integrations/types/slack.py:47 msgid "" "This can be setup at the slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:58 rhodecode/templates/login.mako:42 -#: rhodecode/templates/register.mako:40 +#: 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/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:90 -#: rhodecode/templates/base/base.mako:301 +#: rhodecode/templates/admin/users/users.mako:62 +#: rhodecode/templates/base/base.mako:304 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 msgid "Username" msgstr "Nome de usuário" -#: rhodecode/integrations/types/slack.py:59 +#: rhodecode/integrations/types/slack.py:61 msgid "Username to show notifications coming from." msgstr "" -#: rhodecode/integrations/types/slack.py:68 +#: rhodecode/integrations/types/slack.py:70 msgid "Channel" msgstr "" -#: rhodecode/integrations/types/slack.py:69 +#: rhodecode/integrations/types/slack.py:71 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:78 +#: rhodecode/integrations/types/slack.py:80 msgid "Emoji" msgstr "" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:81 msgid "Emoji to use eg. :studio_microphone:" msgstr "" -#: rhodecode/integrations/types/slack.py:101 +#: rhodecode/integrations/types/slack.py:92 msgid "Slack" msgstr "" -#: rhodecode/integrations/types/slack.py:102 +#: rhodecode/integrations/types/slack.py:93 msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" @@ -1915,25 +1969,25 @@ msgstr "Tag criada: %s" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1189 +#: rhodecode/lib/auth.py:1197 #, python-format msgid "IP %s not allowed" msgstr "IP %s não permitido" -#: rhodecode/lib/auth.py:1263 +#: rhodecode/lib/auth.py:1281 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:1311 +#: rhodecode/lib/auth.py:1329 #, python-format msgid "Action not supported for %s." msgstr "" -#: rhodecode/lib/auth.py:1348 +#: rhodecode/lib/auth.py:1379 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/base.py:557 +#: rhodecode/lib/base.py:549 #, python-format msgid "The repository at %(repo_name)s cannot be located." msgstr "" @@ -1959,36 +2013,16 @@ msgstr "Nenhuma alteração detectada" msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1515 +#: rhodecode/lib/helpers.py:1517 #, python-format msgid " and %s more" msgstr " e mais %s" -#: rhodecode/lib/helpers.py:1519 +#: rhodecode/lib/helpers.py:1521 msgid "No Files" msgstr "Nenhum Arquivo" -#: rhodecode/lib/helpers.py:1592 -msgid "new file" -msgstr "novo arquivo" - -#: rhodecode/lib/helpers.py:1595 -msgid "mod" -msgstr "mod" - -#: rhodecode/lib/helpers.py:1598 -msgid "del" -msgstr "excluir" - -#: rhodecode/lib/helpers.py:1601 -msgid "rename" -msgstr "renomear" - -#: rhodecode/lib/helpers.py:1606 -msgid "chmod" -msgstr "chmod" - -#: rhodecode/lib/helpers.py:1853 +#: rhodecode/lib/helpers.py:1800 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2007,7 +2041,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1873 +#: rhodecode/lib/helpers.py:1820 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the" @@ -2047,9 +2081,9 @@ msgid "in ${val} and ${detail}" msgstr "" #: rhodecode/lib/utils2.py:515 -#: rhodecode/public/js/rhodecode-components.js:33194 -#: rhodecode/public/js/scripts.js:25042 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: 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/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "agora há pouco" @@ -2082,7 +2116,9 @@ msgstr "agora há pouco" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/model/db.py:2298 +#: 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 msgid "Repository no access" msgstr "Nenhum acesso ao repositório" @@ -2114,7 +2150,9 @@ msgstr "Nenhum acesso ao repositório" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/model/db.py:2299 +#: 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 msgid "Repository read access" msgstr "Acesso de leitura ao repositório" @@ -2146,7 +2184,9 @@ msgstr "Acesso de leitura ao repositório" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/model/db.py:2300 +#: 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 msgid "Repository write access" msgstr "Acesso de escrita ao repositório" @@ -2178,7 +2218,9 @@ msgstr "Acesso de escrita ao repositório" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 -#: rhodecode/model/db.py:2301 +#: 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 msgid "Repository admin access" msgstr "Acesso administrativo ao repositório" @@ -2250,7 +2292,9 @@ msgstr "Administrador do RhodeCode" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/model/db.py:2319 +#: 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 msgid "Repository creation disabled" msgstr "Criação de repositórios desabilitada" @@ -2282,7 +2326,9 @@ msgstr "Criação de repositórios desabilitada" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 -#: rhodecode/model/db.py:2320 +#: 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 msgid "Repository creation enabled" msgstr "Criação de repositórios habilitada" @@ -2314,7 +2360,9 @@ msgstr "Criação de repositórios habilitada" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 -#: rhodecode/model/db.py:2324 +#: 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 msgid "Repository forking disabled" msgstr "Bifurcação de repositórios desabilitada" @@ -2346,7 +2394,9 @@ msgstr "Bifurcação de repositórios desabilitada" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/model/db.py:2325 +#: 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 msgid "Repository forking enabled" msgstr "Bifurcação de repositórios habilitada" @@ -2399,7 +2449,9 @@ msgstr "Registro de novo usuário no RhodeCode com auto-ativação" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 -#: rhodecode/model/db.py:3009 +#: 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 msgid "Not Reviewed" msgstr "Não Revisado" @@ -2431,7 +2483,9 @@ msgstr "Não Revisado" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 -#: rhodecode/model/db.py:3010 +#: 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 msgid "Approved" msgstr "Aprovado" @@ -2463,7 +2517,9 @@ msgstr "Aprovado" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 -#: rhodecode/model/db.py:3011 +#: 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 msgid "Rejected" msgstr "Rejeitado" @@ -2495,7 +2551,9 @@ msgstr "Rejeitado" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 -#: rhodecode/model/db.py:3012 +#: 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 msgid "Under Review" msgstr "Sob Revisão" @@ -2524,7 +2582,9 @@ msgstr "Sob Revisão" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/model/db.py:2303 +#: 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 msgid "Repository group no access" msgstr "Sem acesso ao grupo de repositórios" @@ -2553,7 +2613,9 @@ msgstr "Sem acesso ao grupo de repositórios" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/model/db.py:2304 +#: 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 msgid "Repository group read access" msgstr "Acesso de leitura ao grupo de repositórios" @@ -2582,7 +2644,9 @@ msgstr "Acesso de leitura ao grupo de repositórios" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/model/db.py:2305 +#: 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 msgid "Repository group write access" msgstr "Acesso de escrita ao grupo de repositórios" @@ -2611,7 +2675,9 @@ msgstr "Acesso de escrita ao grupo de repositórios" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 -#: rhodecode/model/db.py:2306 +#: 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 msgid "Repository group admin access" msgstr "Acesso administrativo ao grupo de repositórios" @@ -2639,7 +2705,9 @@ msgstr "Acesso administrativo ao grupo de repositórios" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/model/db.py:2308 +#: 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 msgid "User group no access" msgstr "Sem acesso ao grupo de usuários" @@ -2667,7 +2735,9 @@ msgstr "Sem acesso ao grupo de usuários" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 -#: rhodecode/model/db.py:2309 +#: 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 msgid "User group read access" msgstr "Acesso de leitura ao grupo de usuários" @@ -2695,7 +2765,9 @@ msgstr "Acesso de leitura ao grupo de usuários" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/model/db.py:2310 +#: 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 msgid "User group write access" msgstr "Acesso de escrita ao grupo de usuários" @@ -2723,7 +2795,9 @@ msgstr "Acesso de escrita ao grupo de usuários" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/model/db.py:2311 +#: 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 msgid "User group admin access" msgstr "Acesso administrativo ao grupo de usuários" @@ -2751,7 +2825,9 @@ msgstr "Acesso administrativo ao grupo de usuários" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/model/db.py:2313 +#: 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 msgid "Repository Group creation disabled" msgstr "Criação de Grupo de Repositórios desatilibada" @@ -2779,7 +2855,9 @@ msgstr "Criação de Grupo de Repositórios desatilibada" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/model/db.py:2314 +#: 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 msgid "Repository Group creation enabled" msgstr "Criação de Grupo de Repositórios habilitada" @@ -2807,7 +2885,9 @@ msgstr "Criação de Grupo de Repositórios habilitada" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/model/db.py:2316 +#: 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 msgid "User Group creation disabled" msgstr "Criação de Grupo de Usuários desabilitada" @@ -2835,7 +2915,9 @@ msgstr "Criação de Grupo de Usuários desabilitada" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/model/db.py:2317 +#: 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 msgid "User Group creation enabled" msgstr "Criação de Grupo de Usuários habilitada" @@ -2863,7 +2945,9 @@ msgstr "Criação de Grupo de Usuários habilitada" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 -#: rhodecode/model/db.py:2327 +#: 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 msgid "Registration disabled" msgstr "Registro desatilitado" @@ -2891,7 +2975,9 @@ msgstr "Registro desatilitado" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/model/db.py:2328 +#: 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 msgid "User Registration with manual account activation" msgstr "Registro de Usuário com ativação manual de conta" @@ -2919,7 +3005,9 @@ msgstr "Registro de Usuário com ativação manual de conta" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/model/db.py:2329 +#: 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 msgid "User Registration with automatic account activation" msgstr "Registro de Usuário com ativação automática de conta" @@ -2947,7 +3035,9 @@ msgstr "Registro de Usuário com ativação automática de conta" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 -#: rhodecode/model/db.py:2335 rhodecode/model/permission.py:95 +#: 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 msgid "Manual activation of external account" msgstr "Ativação manual de conta externa" @@ -2975,7 +3065,9 @@ msgstr "Ativação manual de conta externa" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 -#: rhodecode/model/db.py:2336 rhodecode/model/permission.py:96 +#: 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 msgid "Automatic activation of external account" msgstr "Ativação automática de conta externa" @@ -2997,7 +3089,9 @@ msgstr "Ativação automática de conta externa" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/model/db.py:2321 +#: 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 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3020,7 +3114,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/model/db.py:2322 +#: 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 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3040,7 +3136,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/model/db.py:2296 +#: 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 msgid "RhodeCode Super Administrator" msgstr "" @@ -3057,7 +3155,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 -#: rhodecode/model/db.py:2338 +#: 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 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3074,7 +3174,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 -#: rhodecode/model/db.py:2339 +#: 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 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3082,7 +3184,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 rhodecode/model/db.py:913 +#: 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 msgid "all" msgstr "" @@ -3090,7 +3194,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 rhodecode/model/db.py:914 +#: 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 msgid "http/web interface" msgstr "" @@ -3098,7 +3204,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 rhodecode/model/db.py:915 +#: 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 msgid "vcs (git/hg/svn protocol)" msgstr "" @@ -3106,7 +3214,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 rhodecode/model/db.py:916 +#: 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 msgid "api calls" msgstr "" @@ -3114,7 +3224,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 rhodecode/model/db.py:917 +#: 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 msgid "feed access" msgstr "" @@ -3123,84 +3235,70 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 -#: rhodecode/model/db.py:2067 +#: 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 msgid "No parent" msgstr "" -#: rhodecode/lib/index/whoosh.py:148 +#: 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 +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 +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 +msgid "Password reset disabled" +msgstr "" + +#: rhodecode/lib/index/whoosh.py:149 msgid "Invalid search query. Try quoting it." msgstr "Consulta de busca inválida. Tente usar aspas." -#: rhodecode/lib/index/whoosh.py:150 +#: rhodecode/lib/index/whoosh.py:151 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:155 +#: rhodecode/lib/index/whoosh.py:156 msgid "An error occurred during this search operation" msgstr "Ocorreu um erro durante essa operação de busca" -#: rhodecode/lib/index/whoosh.py:163 -msgid "Index Type" -msgstr "" - #: rhodecode/lib/index/whoosh.py:164 +msgid "Index Type" +msgstr "" + +#: rhodecode/lib/index/whoosh.py:165 msgid "File Index" msgstr "" -#: rhodecode/lib/index/whoosh.py:165 rhodecode/lib/index/whoosh.py:170 +#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171 msgid "Indexed documents" msgstr "" -#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172 +#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173 msgid "Last update" msgstr "" -#: rhodecode/lib/index/whoosh.py:169 +#: rhodecode/lib/index/whoosh.py:170 msgid "Commit index" msgstr "" -#: rhodecode/login/views.py:249 rhodecode/login/views.py:311 -msgid "Bad captcha" -msgstr "" - -#: rhodecode/login/views.py:258 -msgid "You have successfully registered with RhodeCode" -msgstr "" - -#: rhodecode/login/views.py:300 -msgid "Password reset has been disabled." -msgstr "" - -#: rhodecode/login/views.py:327 -msgid "Your password reset link was sent" -msgstr "Seu link de reinicialização de senha foi enviado" - -#: rhodecode/login/views.py:351 -msgid "" -"Your password reset was successful, a new password has been sent to your " -"email" -msgstr "" - -#: rhodecode/model/comment.py:367 -msgid "made a comment" -msgstr "" - #: rhodecode/model/comment.py:368 +msgid "made a comment" +msgstr "" + +#: rhodecode/model/comment.py:369 msgid "Show it now" msgstr "" -#: rhodecode/model/db.py:2331 -msgid "Password reset enabled" -msgstr "" - -#: rhodecode/model/db.py:2332 -msgid "Password reset hidden" -msgstr "" - -#: rhodecode/model/db.py:2333 -msgid "Password reset disabled" -msgstr "" - #: rhodecode/model/forms.py:85 msgid "Please enter a login" msgstr "Por favor entre um login" @@ -3335,9 +3433,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:103 -#: rhodecode/templates/base/base.mako:406 -#: rhodecode/templates/base/base.mako:413 +#: rhodecode/templates/admin/users/users.mako:75 +#: rhodecode/templates/base/base.mako:409 +#: rhodecode/templates/base/base.mako:416 msgid "Admin" msgstr "Administrador" @@ -3368,74 +3466,74 @@ msgstr "" msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:77 +#: rhodecode/model/pull_request.py:78 msgid "This pull request can be automatically merged." msgstr "" -#: rhodecode/model/pull_request.py:79 +#: rhodecode/model/pull_request.py:80 msgid "This pull request cannot be merged because of an unhandled exception." msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:83 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:84 +#: rhodecode/model/pull_request.py:85 msgid "This pull request could not be merged because push to target failed." msgstr "" -#: rhodecode/model/pull_request.py:87 +#: rhodecode/model/pull_request.py:88 msgid "This pull request cannot be merged because the target is not a head." msgstr "" -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:91 msgid "" "This pull request cannot be merged because the source contains more branches" " than the target." msgstr "" -#: rhodecode/model/pull_request.py:93 +#: rhodecode/model/pull_request.py:94 msgid "" "This pull request cannot be merged because the target has multiple heads." msgstr "" -#: rhodecode/model/pull_request.py:96 +#: rhodecode/model/pull_request.py:97 msgid "" "This pull request cannot be merged because the target repository is locked." msgstr "" -#: rhodecode/model/pull_request.py:99 +#: rhodecode/model/pull_request.py:100 msgid "" "This pull request cannot be merged because the target or the source " "reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:102 +#: rhodecode/model/pull_request.py:103 msgid "" "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:105 +#: rhodecode/model/pull_request.py:106 msgid "" "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:108 +#: rhodecode/model/pull_request.py:109 msgid "" "This pull request cannot be merged because of conflicts related to sub " "repositories." msgstr "" -#: rhodecode/model/pull_request.py:114 +#: rhodecode/model/pull_request.py:115 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:116 +#: rhodecode/model/pull_request.py:117 msgid "Pull request update failed because of an unknown error." msgstr "" -#: rhodecode/model/pull_request.py:118 -msgid "No update needed because the source reference is already up to date." +#: rhodecode/model/pull_request.py:119 +msgid "No update needed because the source and target have not changed." msgstr "" #: rhodecode/model/pull_request.py:121 @@ -3466,51 +3564,51 @@ msgstr "" msgid "Pull request merged and closed" msgstr "" -#: rhodecode/model/pull_request.py:1041 +#: rhodecode/model/pull_request.py:1087 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1043 +#: rhodecode/model/pull_request.py:1089 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:1055 +#: rhodecode/model/pull_request.py:1101 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1073 +#: rhodecode/model/pull_request.py:1119 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1076 +#: rhodecode/model/pull_request.py:1122 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1233 rhodecode/model/scm.py:790 +#: rhodecode/model/pull_request.py:1279 rhodecode/model/scm.py:790 msgid "Bookmarks" msgstr "Marcadores" -#: rhodecode/model/pull_request.py:1238 +#: rhodecode/model/pull_request.py:1284 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1241 +#: rhodecode/model/pull_request.py:1287 msgid "Closed Branches" msgstr "Ramos Fechados" -#: rhodecode/model/pull_request.py:1364 +#: rhodecode/model/pull_request.py:1411 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1375 +#: rhodecode/model/pull_request.py:1424 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1390 +#: rhodecode/model/pull_request.py:1439 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1393 +#: rhodecode/model/pull_request.py:1442 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" @@ -3518,36 +3616,36 @@ msgstr "" msgid "latest tip" msgstr "tip mais recente" -#: rhodecode/model/user.py:125 +#: rhodecode/model/user.py:126 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:291 +#: rhodecode/model/user.py:292 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " "application" msgstr "" -#: rhodecode/model/user.py:464 +#: rhodecode/model/user.py:462 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:472 +#: rhodecode/model/user.py:470 #, 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:481 +#: rhodecode/model/user.py:479 #, 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:490 +#: rhodecode/model/user.py:488 #, python-format msgid "" "user \"%s\" still owns %s user groups and cannot be removed. Switch owners " @@ -3880,369 +3978,371 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:31198 -#: rhodecode/public/js/scripts.js:23046 +#: 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/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33129 -#: rhodecode/public/js/scripts.js:24977 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: 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/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33130 -#: rhodecode/public/js/scripts.js:24978 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: 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/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33131 -#: rhodecode/public/js/scripts.js:24979 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: 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/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33132 -#: rhodecode/public/js/scripts.js:24980 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: 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/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33133 -#: rhodecode/public/js/scripts.js:24981 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: 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/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33134 -#: rhodecode/public/js/scripts.js:24982 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: 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/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33154 -#: rhodecode/public/js/scripts.js:25002 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: 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/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33162 -#: rhodecode/public/js/scripts.js:25010 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: 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/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33174 -#: rhodecode/public/js/scripts.js:25022 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: 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/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33176 -#: rhodecode/public/js/scripts.js:25024 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: 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/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33180 -#: rhodecode/public/js/scripts.js:25028 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: 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/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33182 -#: rhodecode/public/js/scripts.js:25030 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: 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/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33184 -#: rhodecode/public/js/scripts.js:25032 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: 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/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47027 -#: rhodecode/public/js/scripts.js:38875 +#: 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/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47030 -#: rhodecode/public/js/scripts.js:38878 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: 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/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47033 -#: rhodecode/public/js/scripts.js:38881 +#: 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/select2/translations.js:10 msgid "No matches found" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47036 -#: rhodecode/public/js/scripts.js:38884 +#: 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/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47040 -#: rhodecode/public/js/scripts.js:38888 +#: 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/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47042 -#: rhodecode/public/js/scripts.js:38890 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: 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/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47047 -#: rhodecode/public/js/scripts.js:38895 +#: 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/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47049 -#: rhodecode/public/js/scripts.js:38897 +#: 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/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47054 -#: rhodecode/public/js/scripts.js:38902 +#: 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/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47056 -#: rhodecode/public/js/scripts.js:38904 +#: 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/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47060 -#: rhodecode/public/js/scripts.js:38908 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: 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/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47062 -#: rhodecode/public/js/scripts.js:38910 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: 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/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47991 -#: rhodecode/public/js/scripts.js:39839 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: 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/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47993 -#: rhodecode/public/js/scripts.js:39841 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: 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/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48426 -#: rhodecode/public/js/scripts.js:40274 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: 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/src/rhodecode/codemirror.js:296 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48445 -#: rhodecode/public/js/scripts.js:40293 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: 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/src/rhodecode/codemirror.js:315 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48464 -#: rhodecode/public/js/scripts.js:40312 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: 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/src/rhodecode/codemirror.js:334 +#: rhodecode/templates/email_templates/commit_comment.mako:99 +#: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48484 -#: rhodecode/public/js/scripts.js:40332 +#: 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/src/rhodecode/codemirror.js:354 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48848 -#: rhodecode/public/js/scripts.js:40696 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/comments.js:123 +#: 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/src/rhodecode/comments.js:125 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48927 -#: rhodecode/public/js/scripts.js:40775 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 -#: rhodecode/public/js/src/rhodecode/comments.js:202 +#: 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/src/rhodecode/comments.js:209 msgid "Status Review" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48941 -#: rhodecode/public/js/scripts.js:40789 +#: 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/src/rhodecode/comments.js:216 +#: rhodecode/public/js/src/rhodecode/comments.js:224 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49089 -#: rhodecode/public/js/scripts.js:40937 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/comments.js:364 +#: 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/src/rhodecode/comments.js:381 msgid "Submitting..." msgstr "Enviando..." -#: rhodecode/public/js/rhodecode-components.js:49140 -#: rhodecode/public/js/scripts.js:40988 +#: 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/src/rhodecode/comments.js:415 +#: rhodecode/public/js/src/rhodecode/comments.js:432 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "Carregando..." -#: rhodecode/public/js/rhodecode-components.js:49245 -#: rhodecode/public/js/scripts.js:41093 +#: 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/src/rhodecode/comments.js:520 +#: rhodecode/public/js/src/rhodecode/comments.js:537 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49316 -#: rhodecode/public/js/scripts.js:41164 +#: 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/src/rhodecode/comments.js:591 +#: 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:49393 -#: rhodecode/public/js/scripts.js:41241 +#: 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/src/rhodecode/comments.js:668 +#: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49507 -#: rhodecode/public/js/scripts.js:41355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 -#: rhodecode/public/js/src/rhodecode/comments.js:782 +#: 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/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49713 -#: rhodecode/public/js/scripts.js:41561 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: 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/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49715 -#: rhodecode/public/js/scripts.js:41563 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: 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/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49724 -#: rhodecode/public/js/scripts.js:41572 +#: 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/src/rhodecode/files.js:161 msgid "No matching files" msgstr "Nenhum arquivo encontrado" -#: rhodecode/public/js/rhodecode-components.js:49859 -#: rhodecode/public/js/scripts.js:41707 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: 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/src/rhodecode/files.js:296 msgid "Selection link" msgstr "Link da seleção" -#: rhodecode/public/js/rhodecode-components.js:49899 -#: rhodecode/public/js/scripts.js:41747 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: 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/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "Parar de seguir este repositório" -#: rhodecode/public/js/rhodecode-components.js:49900 -#: rhodecode/public/js/scripts.js:41748 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 +#: 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/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "Parar de seguir" -#: rhodecode/public/js/rhodecode-components.js:49909 -#: rhodecode/public/js/scripts.js:41757 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: 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/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "Passar a seguir este repositório" -#: rhodecode/public/js/rhodecode-components.js:49910 -#: rhodecode/public/js/scripts.js:41758 +#: 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/src/rhodecode/followers.js:37 msgid "Follow" msgstr "Seguir" -#: rhodecode/public/js/rhodecode-components.js:50366 -#: rhodecode/public/js/scripts.js:42214 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:212 +#: 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 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50937 -#: rhodecode/public/js/scripts.js:42785 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: 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/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50957 -#: rhodecode/public/js/scripts.js:42805 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: 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/src/rhodecode.js:162 msgid "Show more" msgstr "Mostrar mais" @@ -4252,14 +4352,14 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:479 -#: rhodecode/templates/codeblocks/diffs.mako:484 +#: rhodecode/templates/codeblocks/diffs.mako:488 +#: rhodecode/templates/codeblocks/diffs.mako:493 msgid "Add another comment" msgstr "Adicionar outro comentário" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:320 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:325 msgid "Close" msgstr "" @@ -4317,81 +4417,102 @@ msgstr "Crie novo pull request" msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +msgid "Saving..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: 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:40 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 -msgid "Show selected commit __S" -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:48 -#: rhodecode/public/js/src/i18n_messages.js:7 -msgid "Switch to chat" -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 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: 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:54 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 -#: rhodecode/templates/admin/auth/auth_settings.mako:71 -msgid "disabled" -msgstr "desabilitado" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 #: rhodecode/templates/admin/auth/auth_settings.mako:71 +msgid "disabled" +msgstr "desabilitado" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 msgid "files" msgstr "arquivos" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/templates/pullrequests/pullrequest.mako:108 +msgid "loading..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -msgid "{0} days" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +msgid "{0} out of {1} users" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 msgid "{0} years" msgstr "" +#: rhodecode/public/js/src/math_jax/extensions/HelpDialog.js:19 +msgid "HelpDialog" +msgstr "" + +#: rhodecode/public/js/src/math_jax/jax/output/HTML-CSS/autoload/mglyph.js:19 +msgid "MathML" +msgstr "" + #: rhodecode/public/js/vendors/webcomponentsjs/webcomponents.min.js:11 msgid "UIEvent" msgstr "" @@ -4408,10 +4529,6 @@ msgstr "" msgid "FocusEvent" msgstr "" -#: rhodecode/svn_support/events.py:30 -msgid "Configuration for Apaache mad_dav_svn changed." -msgstr "" - #: rhodecode/templates/index.mako:5 msgid "Dashboard" msgstr "Painel de Controle" @@ -4469,6 +4586,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:15 #: 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 #: rhodecode/templates/base/perms_summary.mako:102 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 @@ -4481,22 +4599,25 @@ msgstr "Nome" #: rhodecode/templates/index_base.mako:100 #: rhodecode/templates/index_base.mako:125 #: rhodecode/templates/admin/gists/index.mako:114 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:81 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 -#: rhodecode/templates/admin/repos/repo_add_base.mako:32 +#: 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/repos.mako:57 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 #: rhodecode/templates/admin/user_groups/user_groups.mako:57 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +#: 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/base/issue_tracker_settings.mako:10 #: rhodecode/templates/changeset/changeset.mako:53 #: rhodecode/templates/compare/compare_commits.mako:20 -#: rhodecode/templates/email_templates/commit_comment.mako:82 +#: 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 #: rhodecode/templates/files/file_tree_detail.mako:5 @@ -4504,8 +4625,8 @@ msgstr "Nome" #: rhodecode/templates/forks/fork.mako:48 #: rhodecode/templates/forks/forks_data.mako:9 #: rhodecode/templates/pullrequests/pullrequest.mako:47 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:158 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:163 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:460 #: rhodecode/templates/summary/components.mako:73 msgid "Description" msgstr "Descrição" @@ -4520,7 +4641,8 @@ msgstr "Descrição" #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/users/user_edit_groups.mako:65 #: rhodecode/templates/forks/forks_data.mako:7 #: rhodecode/templates/summary/components.mako:195 msgid "Owner" @@ -4541,9 +4663,9 @@ msgstr "Última Alteração" #: rhodecode/templates/changelog/changelog_summary_data.mako:8 #: rhodecode/templates/changeset/changeset.mako:36 #: rhodecode/templates/compare/compare_commits.mako:18 -#: rhodecode/templates/email_templates/commit_comment.mako:45 -#: rhodecode/templates/email_templates/commit_comment.mako:81 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: 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/search/search_commit.mako:6 #: rhodecode/templates/tags/tags.mako:66 msgid "Commit" @@ -4558,45 +4680,45 @@ msgstr "" msgid "Home" msgstr "Início" -#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:34 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:326 +#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:329 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "Entrar" -#: rhodecode/templates/login.mako:36 +#: rhodecode/templates/login.mako:37 msgid "Go to the registration page to create a new account." msgstr "" -#: rhodecode/templates/login.mako:57 +#: rhodecode/templates/login.mako:58 msgid "Remember me" msgstr "Lembre-se de mim" -#: rhodecode/templates/login.mako:61 +#: rhodecode/templates/login.mako:62 msgid "Forgot your password?" msgstr "" -#: rhodecode/templates/login.mako:65 -#: rhodecode/templates/password_reset.mako:34 +#: rhodecode/templates/login.mako:66 +#: rhodecode/templates/password_reset.mako:35 msgid "Password reset is disabled. Please contact " msgstr "" -#: rhodecode/templates/login.mako:67 -#: rhodecode/templates/password_reset.mako:36 -#: rhodecode/templates/base/base.mako:43 -#: rhodecode/templates/errors/error_document.mako:64 -msgid "Support" -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 +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 msgid "or" msgstr "ou" -#: rhodecode/templates/login.mako:70 -#: rhodecode/templates/password_reset.mako:39 +#: rhodecode/templates/login.mako:71 +#: rhodecode/templates/password_reset.mako:40 msgid "an administrator if you need help." msgstr "" @@ -4604,28 +4726,28 @@ msgstr "" msgid "Reset Password" msgstr "" -#: rhodecode/templates/password_reset.mako:46 +#: rhodecode/templates/password_reset.mako:47 msgid "Reset your Password" msgstr "" -#: rhodecode/templates/password_reset.mako:47 +#: rhodecode/templates/password_reset.mako:48 msgid "Go to the login page to sign in." msgstr "" -#: rhodecode/templates/password_reset.mako:51 +#: rhodecode/templates/password_reset.mako:52 msgid "Email Address" msgstr "" -#: rhodecode/templates/password_reset.mako:60 -#: rhodecode/templates/register.mako:84 +#: rhodecode/templates/password_reset.mako:61 +#: rhodecode/templates/register.mako:85 msgid "Captcha" msgstr "" -#: rhodecode/templates/password_reset.mako:70 -msgid "Send password reset email" -msgstr "" - #: rhodecode/templates/password_reset.mako:71 +msgid "Send password reset email" +msgstr "" + +#: rhodecode/templates/password_reset.mako:72 msgid "Password reset link will be sent to matching email address" msgstr "" @@ -4633,49 +4755,49 @@ msgstr "" msgid "Create an Account" msgstr "" -#: rhodecode/templates/register.mako:34 +#: rhodecode/templates/register.mako:35 msgid "Create an account" msgstr "" -#: rhodecode/templates/register.mako:35 +#: rhodecode/templates/register.mako:36 msgid "Go to the login page to sign in with an existing account." msgstr "" -#: rhodecode/templates/register.mako:54 +#: rhodecode/templates/register.mako:55 msgid "Re-enter password" msgstr "Repita a senha" -#: rhodecode/templates/register.mako:61 +#: rhodecode/templates/register.mako:62 #: rhodecode/templates/admin/my_account/my_account_profile.mako:32 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:33 #: 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:94 +#: rhodecode/templates/admin/users/users.mako:66 msgid "First Name" msgstr "Primeiro Nome" -#: rhodecode/templates/register.mako:68 +#: rhodecode/templates/register.mako:69 #: rhodecode/templates/admin/my_account/my_account_profile.mako:40 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:42 #: 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:96 +#: rhodecode/templates/admin/users/users.mako:68 msgid "Last Name" msgstr "Último Nome" -#: rhodecode/templates/register.mako:96 +#: rhodecode/templates/register.mako:97 msgid "Account activation requires admin approval." msgstr "" -#: rhodecode/templates/register.mako:103 +#: rhodecode/templates/register.mako:104 msgid "Create Account" msgstr "" #: rhodecode/templates/admin/admin.mako:5 #: rhodecode/templates/admin/admin.mako:15 -#: rhodecode/templates/base/base.mako:72 +#: rhodecode/templates/base/base.mako:75 msgid "Admin journal" msgstr "Diário do administrador" @@ -4684,6 +4806,7 @@ msgid "journal filter..." msgstr "filtro de diário..." #: rhodecode/templates/admin/admin.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "filtro" @@ -4696,31 +4819,38 @@ msgstr[0] "%s entrada" msgstr[1] "%s entradas" #: rhodecode/templates/admin/admin.mako:17 +#: rhodecode/templates/admin/users/user_edit_audit.mako:17 #: rhodecode/templates/journal/journal.mako:17 msgid "Example Queries" msgstr "" #: rhodecode/templates/admin/admin_log.mako:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 #: rhodecode/templates/admin/repos/repos.mako:69 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 -#: rhodecode/templates/admin/user_groups/user_groups.mako:66 -#: rhodecode/templates/admin/users/users.mako:107 -#: rhodecode/templates/files/files_detail.mako:63 +#: 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/files/files_detail.mako:58 msgid "Action" msgstr "Ação" #: rhodecode/templates/admin/admin_log.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/bookmarks/bookmarks.mako:61 #: rhodecode/templates/branches/branches.mako:60 #: rhodecode/templates/tags/tags.mako:61 @@ -4728,10 +4858,12 @@ 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 msgid "No actions yet" msgstr "Ainda não há ações" @@ -4772,7 +4904,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:135 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 -#: rhodecode/templates/admin/repos/repo_add_base.mako:90 +#: 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 @@ -4782,6 +4914,7 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:120 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:102 #: rhodecode/templates/admin/users/user_add.mako:128 +#: rhodecode/templates/admin/users/user_edit_groups.mako:27 #: rhodecode/templates/admin/users/user_edit_profile.mako:134 #: rhodecode/templates/base/default_perms_box.mako:88 msgid "Save" @@ -4803,18 +4936,18 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/index.mako:110 #: rhodecode/templates/admin/integrations/list.mako:103 -#: rhodecode/templates/admin/repos/repo_add_base.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:75 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "Tipo" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 -#: rhodecode/templates/admin/repos/repo_add_base.mako:82 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 msgid "Private Repository" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:86 +#: rhodecode/templates/admin/repos/repo_add_base.mako:97 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:112 #: rhodecode/templates/forks/fork.mako:87 msgid "" @@ -4880,7 +5013,7 @@ msgid "Update Gist" msgstr "" #: rhodecode/templates/admin/gists/edit.mako:102 -#: rhodecode/templates/base/issue_tracker_settings.mako:74 +#: rhodecode/templates/base/issue_tracker_settings.mako:73 #: rhodecode/templates/changeset/changeset_file_comment.mako:385 #: rhodecode/templates/codeblocks/diffs.mako:76 #: rhodecode/templates/files/files_add.mako:102 @@ -4956,8 +5089,8 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:180 #: rhodecode/templates/compare/compare_commits.mako:17 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:304 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:457 #: rhodecode/templates/pullrequests/pullrequests.mako:102 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/tags/tags.mako:63 @@ -5014,7 +5147,7 @@ msgstr "" #: rhodecode/templates/admin/gists/show.mako:56 #: rhodecode/templates/admin/integrations/list.mako:204 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 -#: rhodecode/templates/base/issue_tracker_settings.mako:61 +#: rhodecode/templates/base/issue_tracker_settings.mako:60 #: rhodecode/templates/data_table/_dt_elements.mako:118 #: rhodecode/templates/data_table/_dt_elements.mako:180 #: rhodecode/templates/data_table/_dt_elements.mako:193 @@ -5022,10 +5155,10 @@ msgstr "" #: rhodecode/templates/debug_style/buttons.html:128 #: rhodecode/templates/files/files_add.mako:204 #: rhodecode/templates/files/files_edit.mako:165 -#: rhodecode/templates/files/files_source.mako:38 -#: rhodecode/templates/files/files_source.mako:41 +#: 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:319 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:324 #: rhodecode/templates/users/user_profile.mako:7 msgid "Edit" msgstr "Editar" @@ -5044,7 +5177,7 @@ msgstr "criado" #: rhodecode/templates/admin/gists/show.mako:91 #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:87 msgid "Show as raw" msgstr "Mostrar original" @@ -5069,8 +5202,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:43 #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 -#: rhodecode/templates/base/base.mako:81 -#: rhodecode/templates/base/base.mako:246 +#: rhodecode/templates/base/base.mako:84 +#: rhodecode/templates/base/base.mako:249 msgid "Settings" msgstr "Configurações" @@ -5102,6 +5235,8 @@ msgid "Create new integration" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:104 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14 msgid "Scope" msgstr "" @@ -5171,7 +5306,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:340 +#: rhodecode/templates/base/base.mako:343 msgid "My account" msgstr "Minha conta" @@ -5180,9 +5315,10 @@ msgid "My Account" msgstr "Minha Conta" #: rhodecode/templates/admin/my_account/my_account.mako:29 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 -msgid "My Profile" +#: rhodecode/templates/email_templates/user_registration.mako:26 +#: rhodecode/templates/users/user.mako:29 +#: rhodecode/templates/users/user_profile.mako:5 +msgid "Profile" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:31 @@ -5194,11 +5330,8 @@ msgid "OAuth Identities" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:37 -msgid "My Emails" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account.mako:38 -msgid "My Repositories" +#: rhodecode/templates/admin/users/user_edit.mako:38 +msgid "Emails" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:39 @@ -5207,81 +5340,82 @@ msgstr "Seguindo" #: rhodecode/templates/admin/my_account/my_account.mako:40 #: rhodecode/templates/admin/notifications/notifications.mako:33 -#: rhodecode/templates/base/base.mako:238 +#: rhodecode/templates/base/base.mako:241 msgid "Pull Requests" msgstr "Pull Requests" #: rhodecode/templates/admin/my_account/my_account.mako:41 -msgid "My Permissions" -msgstr "" +#: 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/user_groups/user_group_edit.mako:34 +#: rhodecode/templates/base/base.mako:80 +msgid "Permissions" +msgstr "Permissões" #: rhodecode/templates/admin/my_account/my_account.mako:42 -msgid "My Live Notifications" +msgid "Live Notifications" msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:3 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 msgid "Authentication Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:7 -msgid "Built-in tokens can be used to authenticate with all possible options." -msgstr "" - #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:8 -msgid "" -"Each token can have a role. VCS tokens can be used together with the " -"authtoken auth plugin for git/hg/svn operations." -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:11 -msgid "Built-in" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:51 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:47 -msgid "expires" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:29 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:26 -#, python-format -msgid "Confirm to reset this auth token: %s" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 -msgid "expired" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:59 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:55 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:8 +msgid "" +"Each token can have a role. Token with a role can be used only in given " +"context, e.g. VCS tokens can be used together with the authtoken auth plugin" +" for git/hg/svn operations only." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:13 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:13 +msgid "Token" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:17 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:17 +msgid "Expiration" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:48 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:44 #, python-format msgid "Confirm to remove this auth token: %s" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:67 -msgid "No additional auth token specified" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:78 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:56 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:52 +msgid "No additional auth tokens specified" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:68 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:64 msgid "New authentication token" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:82 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +msgid "Repository scope works only with tokens with VCS type." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86 #: rhodecode/templates/admin/my_account/my_account_emails.mako:64 #: rhodecode/templates/admin/permissions/permissions_ips.mako:60 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:84 +#: 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 msgid "Add" msgstr "Adicionar" +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:128 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:125 +msgid "repository scope" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_emails.mako:5 msgid "Account Emails" msgstr "" @@ -5335,6 +5469,11 @@ msgstr "" msgid "Source type" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 +msgid "My Profile" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_profile.mako:11 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:55 #: rhodecode/templates/admin/users/user_edit_profile.mako:25 @@ -5424,14 +5563,6 @@ msgstr "Notificações" msgid "Permissions Administration" msgstr "" -#: 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/user_groups/user_group_edit.mako:34 -#: rhodecode/templates/base/base.mako:77 -msgid "Permissions" -msgstr "Permissões" - #: rhodecode/templates/admin/permissions/permissions.mako:33 msgid "Application" msgstr "" @@ -5571,8 +5702,8 @@ msgstr "Adicionar grupo de repositórios" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:74 -#: rhodecode/templates/base/base.mako:148 +#: rhodecode/templates/base/base.mako:77 +#: rhodecode/templates/base/base.mako:151 msgid "Repository groups" msgstr "Grupo de repositórios" @@ -5586,7 +5717,7 @@ msgid "Group Parent" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 -#: rhodecode/templates/admin/repos/repo_add_base.mako:55 +#: rhodecode/templates/admin/repos/repo_add_base.mako:66 msgid "Copy Parent Group Permissions" msgstr "" @@ -5703,7 +5834,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:107 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117 -#: rhodecode/templates/base/issue_tracker_settings.mako:84 +#: rhodecode/templates/base/issue_tracker_settings.mako:83 msgid "Add new" msgstr "Adicionar novo" @@ -5766,52 +5897,48 @@ msgid "Import Existing Repository ?" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:193 +#: rhodecode/templates/base/base.mako:196 msgid "Clone from" msgstr "Clonar de" -#: rhodecode/templates/admin/repos/repo_add_base.mako:27 -msgid "Optional http[s] URL from which to clone a repository." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_add_base.mako:36 +#: rhodecode/templates/admin/repos/repo_add_base.mako:47 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:102 #: rhodecode/templates/forks/fork.mako:52 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "Seja sucinto e objetivo. Use um arquivo README para descrições mais longas." -#: rhodecode/templates/admin/repos/repo_add_base.mako:41 +#: rhodecode/templates/admin/repos/repo_add_base.mako:52 msgid "Repository Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 +#: 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)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:50 +#: rhodecode/templates/admin/repos/repo_add_base.mako:61 #: rhodecode/templates/forks/fork.mako:67 msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:59 +#: rhodecode/templates/admin/repos/repo_add_base.mako:70 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:68 +#: rhodecode/templates/admin/repos/repo_add_base.mako:79 msgid "Set the type of repository to create." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:73 +#: rhodecode/templates/admin/repos/repo_add_base.mako:84 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:70 #: rhodecode/templates/forks/fork.mako:73 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:77 +#: rhodecode/templates/admin/repos/repo_add_base.mako:88 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." @@ -5855,7 +5982,16 @@ msgstr "Remoto" msgid "Statistics" msgstr "Estatísticas" -#: rhodecode/templates/admin/repos/repo_edit.mako:87 +#: rhodecode/templates/admin/repos/repo_edit.mako:75 +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3 +msgid "Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:78 +msgid "Strip" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:93 msgid "Reviewers" msgstr "" @@ -5882,12 +6018,10 @@ msgid "This repository is a fork of %(re msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 -#: rhodecode/templates/admin/repos/repo_edit_fork.mako:5 msgid "Set" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:39 -#: rhodecode/templates/admin/repos/repo_edit_fork.mako:9 msgid "Manually set this repository as a fork of another from the list" msgstr "Marque manualmente este repositório como uma bifurcação de um outro da lista" @@ -6024,10 +6158,11 @@ msgstr "Chave" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:37 #: 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:62 +#: 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:101 +#: rhodecode/templates/admin/users/users.mako:73 msgid "Active" msgstr "Ativo" @@ -6103,6 +6238,23 @@ 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 +msgid "No maintenance tasks for this repo available" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:26 +msgid "Run Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:41 +msgid "Performing Maintenance" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:5 msgid "Repository Permissions" msgstr "" @@ -6123,16 +6275,21 @@ msgstr "" msgid "Remote mirror url" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 +#: 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 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:14 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:22 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:19 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:27 msgid "This repository does not have any remote mirror url set." msgstr "" @@ -6256,11 +6413,80 @@ msgstr "" msgid "Confirm to remove current statistics" msgstr "Confirma remover atuais estatísticas" -#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:3 +msgid "Strip commits from repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:7 +#, python-format +msgid "Please provide up to %d commits commits to strip" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:9 +msgid "" +"In the first step commits will be verified for existance in the repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:10 +msgid "In the second step, correct commits will be available for stripping" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:16 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:52 +msgid "Enter full 40 character commit sha" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:18 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:54 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:95 +msgid "Add another commit" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:27 +msgid "Check commits" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:33 +msgid "Sorry this functionality is not available for SVN repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:46 +msgid "Remove" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:112 +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 +msgid " commit verified positive" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:131 +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" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:13 msgid "Select to inherit global vcs settings." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:45 +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:43 #: rhodecode/templates/admin/settings/settings_global.mako:139 #: rhodecode/templates/admin/settings/settings_labs.mako:48 #: rhodecode/templates/admin/settings/settings_vcs.mako:13 @@ -6797,8 +7023,8 @@ msgstr "Adicionar grupo de usuários" #: rhodecode/templates/admin/user_groups/user_group_add.mako:13 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:76 -#: rhodecode/templates/base/base.mako:151 +#: rhodecode/templates/base/base.mako:79 +#: rhodecode/templates/base/base.mako:154 msgid "User groups" msgstr "Grupos de usuários" @@ -6839,30 +7065,72 @@ msgid "Members" msgstr "Membros" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:9 +msgid "Automatic member sync" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:11 msgid "Assigned to repositories" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:10 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:12 msgid "Assigned to repo groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:17 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:19 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6 #, python-format msgid "User Group: %s" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:26 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:29 +msgid "Group members sync" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:36 +msgid "This group is set to be automatically synchronised." +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 +msgid "This group is not set to be automatically synchronised" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51 +msgid "Disable synchronization" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53 +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 msgid "Delete User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:32 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:81 #, 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:34 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:83 msgid "Delete This User Group" msgstr "" @@ -6888,6 +7156,7 @@ msgid "No members yet" msgstr "Nenhum membro ainda" #: rhodecode/templates/admin/user_groups/user_groups.mako:5 +#: rhodecode/templates/admin/users/user_edit_groups.mako:6 msgid "User groups administration" msgstr "Administração de grupos de usuários" @@ -6895,18 +7164,22 @@ msgstr "Administração de grupos de usuários" msgid "user groups" msgstr "" +#: rhodecode/templates/admin/user_groups/user_groups.mako:62 +msgid "Sync" +msgstr "" + #: rhodecode/templates/admin/users/user_add.mako:5 msgid "Add user" msgstr "Adicionar usuário" #: rhodecode/templates/admin/users/user_add.mako:13 #: rhodecode/templates/admin/users/user_edit.mako:14 -#: rhodecode/templates/base/base.mako:75 +#: rhodecode/templates/base/base.mako:78 msgid "Users" msgstr "Usuários" #: rhodecode/templates/admin/users/user_add.mako:15 -#: rhodecode/templates/admin/users/users.mako:27 +#: rhodecode/templates/admin/users/users.mako:28 msgid "Add User" msgstr "" @@ -6958,14 +7231,18 @@ msgstr "" msgid "Auth tokens" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:38 -msgid "Emails" -msgstr "" - #: rhodecode/templates/admin/users/user_edit.mako:39 msgid "Ip Whitelist" msgstr "" +#: rhodecode/templates/admin/users/user_edit.mako:40 +msgid "User Groups Management" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.mako:41 +msgid "User audit" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 #: rhodecode/templates/admin/users/user_edit_profile.mako:106 msgid "Source of Record" @@ -6976,7 +7253,7 @@ msgid "Last login" msgstr "Último login" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 -#: rhodecode/templates/admin/users/users.mako:99 +#: rhodecode/templates/admin/users/users.mako:71 msgid "Last activity" msgstr "" @@ -7085,22 +7362,23 @@ msgid "" "will delete the user's repositories!" msgstr "" -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 -msgid "Authentication Access Tokens" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:63 -msgid "No additional auth tokens specified" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:75 -msgid "New auth token" +#: rhodecode/templates/admin/users/user_edit_audit.mako:7 +msgid "User Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +msgid "audit filter..." msgstr "" #: rhodecode/templates/admin/users/user_edit_emails.mako:5 msgid "Additional Email Addresses" msgstr "" +#: rhodecode/templates/admin/users/user_edit_groups.mako:12 +#, python-format +msgid "Add `%s` to user group" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_ips.mako:3 msgid "Custom IP Whitelist" msgstr "" @@ -7157,98 +7435,98 @@ msgstr "" msgid "Users administration" msgstr "Administração de usuários" -#: rhodecode/templates/admin/users/users.mako:105 +#: rhodecode/templates/admin/users/users.mako:77 msgid "Auth type" msgstr "" -#: rhodecode/templates/base/base.mako:50 +#: rhodecode/templates/base/base.mako:53 #, python-format msgid "RhodeCode instance id: %s" msgstr "" -#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:81 msgid "Authentication" msgstr "" -#: rhodecode/templates/base/base.mako:80 +#: rhodecode/templates/base/base.mako:83 msgid "Defaults" msgstr "Padrões" -#: rhodecode/templates/base/base.mako:98 +#: rhodecode/templates/base/base.mako:101 #: rhodecode/templates/files/files_pjax.mako:24 #: rhodecode/templates/summary/components.mako:42 msgid "Show More" msgstr "" -#: rhodecode/templates/base/base.mako:185 +#: rhodecode/templates/base/base.mako:188 msgid "Fork of" msgstr "Bifurcação de" -#: rhodecode/templates/base/base.mako:202 +#: rhodecode/templates/base/base.mako:205 #, python-format msgid "Repository locked by %(user)s" msgstr "" -#: rhodecode/templates/base/base.mako:207 +#: rhodecode/templates/base/base.mako:210 msgid "Repository not locked. Pull repository to lock it." msgstr "" -#: rhodecode/templates/base/base.mako:225 +#: rhodecode/templates/base/base.mako:228 #: rhodecode/templates/data_table/_dt_elements.mako:12 #: rhodecode/templates/data_table/_dt_elements.mako:13 #: rhodecode/templates/data_table/_dt_elements.mako:153 msgid "Summary" msgstr "Sumário" -#: rhodecode/templates/base/base.mako:226 +#: rhodecode/templates/base/base.mako:229 #: rhodecode/templates/data_table/_dt_elements.mako:17 #: rhodecode/templates/data_table/_dt_elements.mako:18 msgid "Changelog" msgstr "Registro de alterações" -#: rhodecode/templates/base/base.mako:227 +#: rhodecode/templates/base/base.mako:230 #: rhodecode/templates/data_table/_dt_elements.mako:22 #: rhodecode/templates/data_table/_dt_elements.mako:23 #: rhodecode/templates/files/files.mako:15 msgid "Files" msgstr "Arquivos" -#: rhodecode/templates/base/base.mako:229 +#: rhodecode/templates/base/base.mako:232 #: rhodecode/templates/bookmarks/bookmarks.mako:68 #: rhodecode/templates/branches/branches.mako:67 #: rhodecode/templates/tags/tags.mako:68 msgid "Compare" msgstr "Compare" -#: rhodecode/templates/base/base.mako:234 +#: rhodecode/templates/base/base.mako:237 #, python-format msgid "Show Pull Requests for %s" msgstr "Mostrar Pull Requests para %s" -#: rhodecode/templates/base/base.mako:243 +#: rhodecode/templates/base/base.mako:246 msgid "Options" msgstr "Opções" -#: rhodecode/templates/base/base.mako:250 +#: rhodecode/templates/base/base.mako:253 #: rhodecode/templates/forks/forks_data.mako:30 msgid "Compare fork" msgstr "Compare bifurcação" -#: rhodecode/templates/base/base.mako:253 -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:256 +#: rhodecode/templates/base/base.mako:403 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "Pesquisar" -#: rhodecode/templates/base/base.mako:257 +#: rhodecode/templates/base/base.mako:260 msgid "Unlock" msgstr "Destravar" -#: rhodecode/templates/base/base.mako:259 +#: rhodecode/templates/base/base.mako:262 msgid "Lock" msgstr "Travar" -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:267 #: rhodecode/templates/data_table/_dt_elements.mako:27 #: rhodecode/templates/data_table/_dt_elements.mako:28 #: rhodecode/templates/forks/forks_data.mako:8 @@ -7258,77 +7536,77 @@ msgid_plural "Forks" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/base/base.mako:265 +#: rhodecode/templates/base/base.mako:268 msgid "Create Pull Request" msgstr "Criar Pull Request" -#: rhodecode/templates/base/base.mako:287 +#: rhodecode/templates/base/base.mako:290 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:295 +#: rhodecode/templates/base/base.mako:298 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:312 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:322 +#: 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:342 +#: rhodecode/templates/base/base.mako:345 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:346 +#: rhodecode/templates/base/base.mako:349 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:382 +#: rhodecode/templates/base/base.mako:385 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:383 +#: rhodecode/templates/base/base.mako:386 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:14 msgid "Journal" msgstr "Diário" -#: rhodecode/templates/base/base.mako:388 +#: rhodecode/templates/base/base.mako:391 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:389 +#: rhodecode/templates/base/base.mako:392 msgid "Public journal" msgstr "Diário público" -#: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/base/base.mako:397 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:395 +#: rhodecode/templates/base/base.mako:398 msgid "Gists" msgstr "Gists" -#: rhodecode/templates/base/base.mako:399 +#: rhodecode/templates/base/base.mako:402 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:408 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:412 +#: rhodecode/templates/base/base.mako:415 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:422 -#: rhodecode/templates/base/base.mako:423 +#: rhodecode/templates/base/base.mako:425 +#: rhodecode/templates/base/base.mako:426 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7350,15 +7628,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:480 +#: rhodecode/templates/base/base.mako:483 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:533 +#: rhodecode/templates/base/base.mako:536 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:541 +#: rhodecode/templates/base/base.mako:544 msgid "Site-wide shortcuts" msgstr "" @@ -7427,9 +7705,7 @@ msgid "User Group Creation" msgstr "" #: rhodecode/templates/base/default_perms_box.mako:72 -msgid "" -"Permission to allow user group creation. When disabled, user group admins " -"can still create subgroups within their user groups." +msgid "Permission to allow user group creation." msgstr "" #: rhodecode/templates/base/default_perms_box.mako:78 @@ -7454,19 +7730,19 @@ msgid "" "permission by members of user groups." msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:22 +#: rhodecode/templates/base/issue_tracker_settings.mako:21 msgid "Read more" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:92 +#: rhodecode/templates/base/issue_tracker_settings.mako:91 msgid "New Entry" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:96 +#: rhodecode/templates/base/issue_tracker_settings.mako:95 msgid "Confirm to remove this pattern:" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:192 +#: 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 @@ -7476,7 +7752,7 @@ msgstr "" msgid "Preview" msgstr "Visualizar" -#: rhodecode/templates/base/issue_tracker_settings.mako:193 +#: rhodecode/templates/base/issue_tracker_settings.mako:192 msgid "Test Pattern Preview" msgstr "" @@ -7624,101 +7900,130 @@ msgstr "" msgid "Enable largefiles extension" msgstr "Habilitar extensão largefiles" -#: rhodecode/templates/base/vcs_settings.mako:99 +#: rhodecode/templates/base/vcs_settings.mako:100 msgid "Enable Largefiles extensions for all repositories." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:103 +#: rhodecode/templates/base/vcs_settings.mako:102 +msgid "Enable Largefiles extensions for this repository." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:113 +msgid "" +"Filesystem location where Mercurial largefile objects should be stored." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:119 msgid "Set repositories as publishing" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:103 +#: rhodecode/templates/base/vcs_settings.mako:119 msgid "Set repository as publishing" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:106 +#: rhodecode/templates/base/vcs_settings.mako:122 msgid "" "When this is enabled all commits in the repository are seen as public " "commits by clients." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:111 +#: rhodecode/templates/base/vcs_settings.mako:127 msgid "Enable hgsubversion extension" msgstr "Habilitar extensão hgsubversion" -#: rhodecode/templates/base/vcs_settings.mako:114 +#: rhodecode/templates/base/vcs_settings.mako:130 msgid "" "Requires hgsubversion library to be installed. Allows cloning remote SVN " "repositories and migrates them to Mercurial type." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:123 +#: rhodecode/templates/base/vcs_settings.mako:139 msgid "Mercurial Labs Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:123 +#: rhodecode/templates/base/vcs_settings.mako:139 msgid "" "These features are considered experimental and may not work as expected." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:129 +#: rhodecode/templates/base/vcs_settings.mako:145 msgid "Use rebase as merge strategy" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:132 +#: rhodecode/templates/base/vcs_settings.mako:148 msgid "" "Use rebase instead of creating a merge commit when merging via web " "interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:144 +#: rhodecode/templates/base/vcs_settings.mako:160 +msgid "Git Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:165 +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 "Filesystem location where Git lfs objects should be stored." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:193 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:150 +#: rhodecode/templates/base/vcs_settings.mako:199 msgid "Proxy subversion HTTP requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:154 +#: 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:155 +#: rhodecode/templates/base/vcs_settings.mako:204 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:161 +#: rhodecode/templates/base/vcs_settings.mako:210 msgid "Subversion HTTP Server URL" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:167 +#: rhodecode/templates/base/vcs_settings.mako:216 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:179 +#: rhodecode/templates/base/vcs_settings.mako:228 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:184 +#: rhodecode/templates/base/vcs_settings.mako:233 msgid "Repository patterns" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:188 +#: rhodecode/templates/base/vcs_settings.mako:237 msgid "" "Patterns for identifying SVN branches and tags. For recursive search, use " "\"*\". Eg.: \"/branches/*\"" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:254 +#: rhodecode/templates/base/vcs_settings.mako:301 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:259 +#: rhodecode/templates/base/vcs_settings.mako:306 msgid "Enable server-side merge for pull requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:262 +#: rhodecode/templates/base/vcs_settings.mako:309 msgid "" "Note: when this feature is enabled, it only runs hooks defined in the " "rcextension package. Custom hooks added on the Admin -> Settings -> Hooks " @@ -7726,11 +8031,11 @@ msgid "" "web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:266 +#: rhodecode/templates/base/vcs_settings.mako:313 msgid "Invalidate and relocate inline comments during update" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:269 +#: rhodecode/templates/base/vcs_settings.mako:316 msgid "" "During the update of a pull request, the position of inline comments will be" " updated and outdated inline comments will be hidden." @@ -7867,7 +8172,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:53 #: rhodecode/templates/compare/compare_commits.mako:46 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:495 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" @@ -7960,8 +8265,8 @@ msgid "Diff options" msgstr "" #: rhodecode/templates/changeset/changeset.mako:119 -#: rhodecode/templates/codeblocks/diffs.mako:436 -#: rhodecode/templates/codeblocks/diffs.mako:439 +#: rhodecode/templates/codeblocks/diffs.mako:445 +#: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "Diff cru" @@ -7978,8 +8283,8 @@ msgid "Patch Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:127 -#: rhodecode/templates/codeblocks/diffs.mako:443 -#: rhodecode/templates/codeblocks/diffs.mako:446 +#: rhodecode/templates/codeblocks/diffs.mako:452 +#: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "Baixar diff" @@ -7989,7 +8294,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:145 #: rhodecode/templates/changeset/changeset.mako:147 -#: rhodecode/tests/functional/test_commit_comments.py:270 +#: rhodecode/tests/functional/test_commit_comments.py:275 #, python-format msgid "%d Commit comment" msgid_plural "%d Commit comments" @@ -7998,7 +8303,7 @@ msgstr[1] "" #: rhodecode/templates/changeset/changeset.mako:150 #: rhodecode/templates/changeset/changeset.mako:152 -#: rhodecode/tests/functional/test_commit_comments.py:277 +#: rhodecode/tests/functional/test_commit_comments.py:282 #, python-format msgid "%d Inline Comment" msgid_plural "%d Inline Comments" @@ -8104,18 +8409,16 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:363 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:148 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:153 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "Fechado" -#: rhodecode/templates/changeset/changeset_file_comment.mako:388 +#: rhodecode/templates/changeset/changeset_file_comment.mako:393 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 #: rhodecode/templates/compare/compare_diff.mako:122 -#: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:97 msgid "Comment" msgstr "Comentário" @@ -8150,7 +8453,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_range.mako:99 #: rhodecode/templates/compare/compare_diff.mako:312 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:414 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:419 #, python-format msgid "Expand %s commit" msgid_plural "Expand %s commits" @@ -8159,7 +8462,7 @@ msgstr[1] "" #: rhodecode/templates/changeset/changeset_range.mako:105 #: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 #, python-format msgid "Collapse %s commit" msgid_plural "Collapse %s commits" @@ -8261,64 +8564,68 @@ msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:406 -#: rhodecode/templates/codeblocks/diffs.mako:422 +#: rhodecode/templates/codeblocks/diffs.mako:415 +#: rhodecode/templates/codeblocks/diffs.mako:431 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:408 -#: rhodecode/templates/codeblocks/diffs.mako:415 +#: rhodecode/templates/codeblocks/diffs.mako:417 +#: rhodecode/templates/codeblocks/diffs.mako:424 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:413 -#: rhodecode/templates/codeblocks/diffs.mako:429 +#: rhodecode/templates/codeblocks/diffs.mako:422 +#: rhodecode/templates/codeblocks/diffs.mako:438 #, python-format msgid "File no longer present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:424 -#: rhodecode/templates/codeblocks/diffs.mako:431 +#: rhodecode/templates/codeblocks/diffs.mako:433 +#: rhodecode/templates/codeblocks/diffs.mako:440 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:462 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:462 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:634 +#: rhodecode/templates/codeblocks/diffs.mako:643 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:636 +#: rhodecode/templates/codeblocks/diffs.mako:645 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:640 +#: rhodecode/templates/codeblocks/diffs.mako:649 msgid "View unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:641 +#: rhodecode/templates/codeblocks/diffs.mako:650 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:651 +#: rhodecode/templates/codeblocks/diffs.mako:660 msgid "Expand All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:655 +#: rhodecode/templates/codeblocks/diffs.mako:664 msgid "Collapse All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:659 +#: rhodecode/templates/codeblocks/diffs.mako:668 msgid "Wide Mode Diff" msgstr "" +#: rhodecode/templates/codeblocks/source.mako:24 +msgid "view annotation from before this change" +msgstr "" + #: rhodecode/templates/compare/compare_commits.mako:5 msgid "Common Ancestor Commit" msgstr "" @@ -8328,7 +8635,7 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:16 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:451 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:456 msgid "Time" msgstr "" @@ -8340,7 +8647,7 @@ msgstr[0] "" msgstr[1] "" #: rhodecode/templates/compare/compare_commits.mako:68 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:568 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:573 msgid "show it" msgid_plural "show them" msgstr[0] "" @@ -8376,14 +8683,14 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:98 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:103 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.mako:76 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 -#: rhodecode/templates/files/files_source.mako:20 +#: rhodecode/templates/files/files_source.mako:23 msgid "Source" msgstr "" @@ -8606,133 +8913,150 @@ msgstr "" msgid "RhodeCode" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:16 -#: rhodecode/templates/email_templates/pull_request_comment.mako:18 +#: rhodecode/templates/email_templates/commit_comment.mako:18 +#: rhodecode/templates/email_templates/pull_request_comment.mako:19 msgid "[mention]" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:19 -#, python-format -msgid "" -"%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:19 -#: rhodecode/templates/email_templates/commit_comment.mako:22 +#: rhodecode/templates/email_templates/commit_comment.mako:21 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on commit `%(commit_id)s` (file: " +"`%(comment_file)s`)" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:24 +#: rhodecode/templates/email_templates/commit_comment.mako:26 #, python-format msgid "in the %(repo_name)s repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:22 -#, python-format -msgid "%(user)s commented on commit `%(commit_id)s` (status: %(status)s)" -msgstr "" - #: rhodecode/templates/email_templates/commit_comment.mako:24 -#: rhodecode/templates/email_templates/commit_comment.mako:78 -#, python-format -msgid "%(user)s commented on commit `%(commit_id)s`" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:43 -#: rhodecode/templates/email_templates/pull_request_comment.mako:44 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on commit `%(commit_id)s` (status: " +"%(status)s)" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:26 +#, python-format +msgid "%(user)s left %(comment_type)s on commit `%(commit_id)s`" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:47 +#: rhodecode/templates/email_templates/pull_request_comment.mako:47 msgid "Comment link" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:48 -#: rhodecode/templates/email_templates/pull_request_comment.mako:49 +#: rhodecode/templates/email_templates/commit_comment.mako:52 +#: rhodecode/templates/email_templates/pull_request_comment.mako:52 #, python-format msgid "File: %(comment_file)s on line %(comment_line)s" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:54 +#: rhodecode/templates/email_templates/commit_comment.mako:58 msgid "Commit status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:76 +#: rhodecode/templates/email_templates/commit_comment.mako:82 #, python-format msgid "%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:76 -#: rhodecode/templates/email_templates/commit_comment.mako:78 +#: rhodecode/templates/email_templates/commit_comment.mako:82 +#: rhodecode/templates/email_templates/commit_comment.mako:84 #, python-format msgid "in the %(repo)s repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:85 +#: rhodecode/templates/email_templates/commit_comment.mako:84 +#, python-format +msgid "%(user)s commented on commit `%(commit_id)s`" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:92 +#: rhodecode/templates/email_templates/pull_request_comment.mako:94 msgid "Status" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:85 +#: rhodecode/templates/email_templates/commit_comment.mako:93 msgid "The commit status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:97 -#, python-format -msgid "Comment on line: %(comment_line)s" -msgstr "" - -#: rhodecode/templates/email_templates/password_reset.mako:30 +#: rhodecode/templates/email_templates/commit_comment.mako:99 +#: rhodecode/templates/email_templates/pull_request_comment.mako:107 +#, python-format +msgid "TODO comment on line: %(comment_line)s" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:101 +#: rhodecode/templates/email_templates/pull_request_comment.mako:109 +#, python-format +msgid "Note comment on line: %(comment_line)s" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:101 +#: rhodecode/templates/email_templates/pull_request_comment.mako:109 +msgid "Note comment" +msgstr "" + +#: rhodecode/templates/email_templates/password_reset.mako:31 msgid "Generate new password here" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:21 -#, python-format -msgid "" -"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: " -"`%(comment_file)s`)" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:24 -#, python-format -msgid "" -"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: " -"%(status)s)" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:26 -#: rhodecode/templates/email_templates/pull_request_comment.mako:83 -#, python-format -msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:46 +#: rhodecode/templates/email_templates/pull_request_comment.mako:22 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\" " +"(file: `%(comment_file)s`)" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:25 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\" " +"(status: %(status)s)" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:27 +#, python-format +msgid "%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:49 msgid "Source repository" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:55 +#: rhodecode/templates/email_templates/pull_request_comment.mako:58 #, python-format msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:57 +#: rhodecode/templates/email_templates/pull_request_comment.mako:60 #, python-format msgid "" "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:81 +#: rhodecode/templates/email_templates/pull_request_comment.mako:84 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" " "(file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:87 -#, python-format -msgid "submitted pull request status: %(status)s" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:89 -#, python-format -msgid "submitted pull request status: %(status)s and closed" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:95 -msgid "Submitted status" +#: rhodecode/templates/email_templates/pull_request_comment.mako:86 +#, python-format +msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 +msgid "Closed pull request with status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:99 +msgid "Submitted review status" msgstr "" #: rhodecode/templates/email_templates/pull_request_review.mako:14 @@ -8799,12 +9123,6 @@ msgstr "" msgid "Full Name" msgstr "" -#: rhodecode/templates/email_templates/user_registration.mako:26 -#: rhodecode/templates/users/user.mako:29 -#: rhodecode/templates/users/user_profile.mako:5 -msgid "Profile" -msgstr "" - #: rhodecode/templates/errors/error_document.mako:46 #, python-format msgid "You will be redirected to %s in %s seconds" @@ -8961,13 +9279,13 @@ msgid "Delete file" msgstr "" #: rhodecode/templates/files/files_delete.mako:45 -#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:65 #, python-format msgid "Binary file (%s)" msgstr "Arquivo binário (%s)" #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:87 msgid "File is too big to display" msgstr "Arquivo é grande demais para exibir" @@ -8980,19 +9298,19 @@ msgstr "" msgid "Commit Description" msgstr "" -#: rhodecode/templates/files/files_detail.mako:35 +#: rhodecode/templates/files/files_detail.mako:32 msgid "File last commit" msgstr "" -#: rhodecode/templates/files/files_detail.mako:51 +#: rhodecode/templates/files/files_detail.mako:46 msgid "Show/Diff file" msgstr "" -#: rhodecode/templates/files/files_detail.mako:66 +#: rhodecode/templates/files/files_detail.mako:61 msgid "Diff to Commit" msgstr "" -#: rhodecode/templates/files/files_detail.mako:67 +#: rhodecode/templates/files/files_detail.mako:62 msgid "Show at Commit" msgstr "" @@ -9034,72 +9352,66 @@ msgstr "Editando arquivo" msgid "Location" msgstr "Local" -#: rhodecode/templates/files/files_source.mako:7 +#: rhodecode/templates/files/files_source.mako:8 +msgid "This file is a pointer to large binary file" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:8 +msgid "LargeFile" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:10 #: rhodecode/templates/search/search_content.mako:57 msgid "line" msgid_plural "lines" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/files/files_source.mako:14 +#: rhodecode/templates/files/files_source.mako:17 msgid "History" msgstr "" -#: rhodecode/templates/files/files_source.mako:17 +#: rhodecode/templates/files/files_source.mako:20 #: rhodecode/templates/search/search_content.mako:68 msgid "Show Full History" msgstr "" -#: rhodecode/templates/files/files_source.mako:22 +#: rhodecode/templates/files/files_source.mako:25 #: rhodecode/templates/search/search_content.mako:70 msgid "Annotation" msgstr "" -#: rhodecode/templates/files/files_source.mako:24 +#: rhodecode/templates/files/files_source.mako:27 #: rhodecode/templates/search/search_content.mako:71 msgid "Raw" msgstr "" -#: rhodecode/templates/files/files_source.mako:26 +#: rhodecode/templates/files/files_source.mako:31 +msgid "Download largefile" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:35 #: rhodecode/templates/search/search_content.mako:73 msgid "Download" msgstr "Download" -#: rhodecode/templates/files/files_source.mako:33 +#: rhodecode/templates/files/files_source.mako:43 #, python-format msgid "Edit on Branch:%s" msgstr "" -#: rhodecode/templates/files/files_source.mako:38 +#: rhodecode/templates/files/files_source.mako:48 msgid "Editing binary files not allowed" msgstr "" -#: rhodecode/templates/files/files_source.mako:41 +#: rhodecode/templates/files/files_source.mako:51 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_source.mako:52 msgid "Deleting files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/followers/followers.mako:5 -#: rhodecode/templates/followers/followers.mako:27 -#, python-format -msgid "%s Followers" -msgstr "%s Seguidores" - -#: rhodecode/templates/followers/followers.mako:12 -msgid "Followers" -msgstr "Seguidores" - -#: rhodecode/templates/followers/followers_data.mako:5 -msgid "Follower Name" -msgstr "" - -#: rhodecode/templates/followers/followers_data.mako:6 -msgid "Following Since" -msgstr "" - #: rhodecode/templates/forks/fork.mako:5 #, python-format msgid "Fork repository %s" @@ -9180,98 +9492,99 @@ msgstr "RSS feed do diário público" msgid "New pull request" msgstr "Novo pull request" -#: rhodecode/templates/pullrequests/pullrequest.mako:52 +#: rhodecode/templates/pullrequests/pullrequest.mako:51 msgid "Write a short description on this pull request" msgstr "Escreva uma breve descrição para este pull request" -#: rhodecode/templates/pullrequests/pullrequest.mako:59 +#: rhodecode/templates/pullrequests/pullrequest.mako:57 msgid "Commit flow" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:67 +#: rhodecode/templates/pullrequests/pullrequest.mako:65 msgid "Origin repository" msgstr "Repositório origem" -#: rhodecode/templates/pullrequests/pullrequest.mako:85 +#: rhodecode/templates/pullrequests/pullrequest.mako:83 msgid "Loading refs..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:96 +#: rhodecode/templates/pullrequests/pullrequest.mako:94 msgid "Submit Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:109 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:317 +#: rhodecode/templates/pullrequests/pullrequest.mako:107 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:322 msgid "Pull request reviewers" msgstr "Revisores do pull request" -#: rhodecode/templates/pullrequests/pullrequest.mako:110 -msgid "loading..." -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.mako:120 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:361 +#: rhodecode/templates/pullrequests/pullrequest.mako:118 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:366 msgid "Add reviewer" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:299 -#: rhodecode/templates/pullrequests/pullrequest.mako:572 +#: rhodecode/templates/pullrequests/pullrequest.mako:297 +#: rhodecode/templates/pullrequests/pullrequest.mako:570 msgid "Please select origin and destination" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:305 +#: rhodecode/templates/pullrequests/pullrequest.mako:303 msgid "Loading compare ..." msgstr "" +#: rhodecode/templates/pullrequests/pullrequest.mako:350 #: rhodecode/templates/pullrequests/pullrequest.mako:352 -#: rhodecode/templates/pullrequests/pullrequest.mako:354 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:357 +#: rhodecode/templates/pullrequests/pullrequest.mako:355 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:364 +#: rhodecode/templates/pullrequests/pullrequest.mako:362 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:464 +#: rhodecode/templates/pullrequests/pullrequest.mako:462 msgid "Destination repository" msgstr "Repositório de destino" -#: rhodecode/templates/pullrequests/pullrequest.mako:475 +#: rhodecode/templates/pullrequests/pullrequest.mako:473 msgid "Select commit reference" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:8 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:7 msgid "This pull request can be merged automatically." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:13 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:12 msgid "Merge is not currently possible because of below failed checks." msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:37 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:42 +msgid "refresh checks" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:38 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 -msgid "refresh checks" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:39 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:44 msgid "Merge Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:44 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 msgid "You are not allowed to merge this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:46 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:45 msgid "Login to Merge this Pull Request" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:54 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 +msgid "Close with status {}" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show.mako:5 #, python-format msgid "%s Pull Request #%s" @@ -9289,171 +9602,175 @@ msgstr "Confirme para excluir este pull msgid "Origin" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:120 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:88 +msgid "Common ancestor" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:125 msgid "Merge" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:133 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:138 msgid "Shadow repository data not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:141 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:146 msgid "Review" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:157 #, python-format msgid "calculated based on %s reviewer vote" msgid_plural "calculated based on %s reviewers votes" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:170 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:175 msgid "Versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:183 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:186 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:188 msgid "{} version available for this pull request, show it." msgid_plural "{} versions available for this pull request, show them." msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:182 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:187 msgid "Hide all versions of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:207 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:212 msgid "Your review status at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:213 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:218 msgid "Comment from pull request version {0}, general:{1} inline:{2}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:230 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:234 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:235 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:239 msgid "select versions to show changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:231 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:236 msgid "show changes between versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:232 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:237 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:247 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:252 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:251 -msgid "Comments for this pull request" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:256 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 +msgid "Comments for this pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:261 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:263 #, python-format msgid "%d General " msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:264 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:267 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:269 #, python-format msgid "%d Inline" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:268 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:272 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:273 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 #, python-format msgid "%d Outdated" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:269 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:274 msgid "show outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:270 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:281 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:286 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:295 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:365 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:300 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:370 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:382 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:387 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:383 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:388 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:391 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:396 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 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:393 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 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:404 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:409 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:427 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:432 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:440 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:445 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:444 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:449 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:462 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:464 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:469 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:567 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:572 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:570 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:575 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:571 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:576 msgid "show them" msgstr "" 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-02-05 17:11+0100\n" -"PO-Revision-Date: 2017-02-01 20:10+0000\n" +"POT-Creation-Date: 2017-04-07 12:33+0200\n" +"PO-Revision-Date: 2017-04-07 10:34+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Russian (http://www.transifex.com/rhodecode/RhodeCode/language/ru/)\n" "MIME-Version: 1.0\n" @@ -38,51 +38,52 @@ msgstr "" "Language: ru\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: rhodecode/admin/navigation.py:83 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:167 +#: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 +#: rhodecode/integrations/views.py:166 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "" -#: rhodecode/admin/navigation.py:84 +#: rhodecode/apps/admin/navigation.py:84 #: rhodecode/templates/admin/repos/repo_edit.mako:52 msgid "VCS" msgstr "" -#: rhodecode/admin/navigation.py:85 +#: rhodecode/apps/admin/navigation.py:85 msgid "Visual" msgstr "" -#: rhodecode/admin/navigation.py:86 +#: rhodecode/apps/admin/navigation.py:86 msgid "Remap and Rescan" msgstr "" -#: rhodecode/admin/navigation.py:87 +#: rhodecode/apps/admin/navigation.py:87 #: rhodecode/templates/admin/repos/repo_edit.mako:58 msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:89 rhodecode/integrations/types/email.py:232 -#: rhodecode/templates/register.mako:75 +#: rhodecode/apps/admin/navigation.py:89 +#: rhodecode/integrations/types/email.py:232 +#: rhodecode/templates/register.mako:76 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: 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:92 +#: rhodecode/templates/admin/users/users.mako:64 #: rhodecode/templates/email_templates/user_registration.mako:25 #: rhodecode/templates/users/user_profile.mako:51 msgid "Email" msgstr "E-mail" -#: rhodecode/admin/navigation.py:90 +#: rhodecode/apps/admin/navigation.py:90 msgid "Hooks" msgstr "Хуки" -#: rhodecode/admin/navigation.py:91 +#: rhodecode/apps/admin/navigation.py:91 msgid "Full Text Search" msgstr "" -#: rhodecode/admin/navigation.py:93 +#: rhodecode/apps/admin/navigation.py:93 #: rhodecode/templates/admin/integrations/base.mako:23 #: rhodecode/templates/admin/integrations/form.mako:8 #: rhodecode/templates/admin/integrations/form.mako:21 @@ -96,177 +97,290 @@ msgstr "" #: 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/base/base.mako:79 +#: rhodecode/templates/base/base.mako:82 msgid "Integrations" msgstr "" -#: rhodecode/admin/navigation.py:95 +#: rhodecode/apps/admin/navigation.py:95 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" msgstr "" -#: rhodecode/admin/navigation.py:97 +#: rhodecode/apps/admin/navigation.py:97 msgid "User Sessions" msgstr "" -#: rhodecode/admin/navigation.py:99 +#: rhodecode/apps/admin/navigation.py:99 msgid "Open Source Licenses" msgstr "" -#: rhodecode/admin/navigation.py:107 +#: rhodecode/apps/admin/navigation.py:107 msgid "Labs" msgstr "" -#: rhodecode/admin/views/sessions.py:90 +#: rhodecode/apps/admin/views/sessions.py:86 msgid "Cleaned up old sessions" msgstr "" -#: rhodecode/admin/views/sessions.py:96 +#: rhodecode/apps/admin/views/sessions.py:92 msgid "Failed to cleanup up old sessions" msgstr "" -#: rhodecode/admin/views/svn_config.py:47 +#: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." msgstr "" -#: rhodecode/admin/views/svn_config.py:55 +#: rhodecode/apps/admin/views/svn_config.py:54 msgid "Failed to generate the Apache configuration for Subversion." msgstr "" -#: rhodecode/admin/views/system_info.py:96 +#: rhodecode/apps/admin/views/system_info.py:95 msgid "" "Note: please make sure this server can access `${url}` for the update link " "to work" msgstr "" -#: rhodecode/admin/views/system_info.py:99 +#: rhodecode/apps/admin/views/system_info.py:98 msgid "Update info" msgstr "" -#: rhodecode/admin/views/system_info.py:101 +#: rhodecode/apps/admin/views/system_info.py:100 msgid "Check for updates" msgstr "" -#: rhodecode/admin/views/system_info.py:106 +#: rhodecode/apps/admin/views/system_info.py:105 msgid "RhodeCode Version" msgstr "" -#: rhodecode/admin/views/system_info.py:107 +#: rhodecode/apps/admin/views/system_info.py:106 msgid "RhodeCode Server IP" msgstr "" -#: rhodecode/admin/views/system_info.py:108 +#: rhodecode/apps/admin/views/system_info.py:107 msgid "RhodeCode Server ID" msgstr "" -#: rhodecode/admin/views/system_info.py:109 +#: rhodecode/apps/admin/views/system_info.py:108 msgid "RhodeCode Configuration" msgstr "" -#: rhodecode/admin/views/system_info.py:113 +#: rhodecode/apps/admin/views/system_info.py:109 +msgid "Workers" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:110 +msgid "Worker Type" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:114 msgid "Database" msgstr "" -#: rhodecode/admin/views/system_info.py:114 +#: rhodecode/apps/admin/views/system_info.py:115 msgid "Database version" msgstr "" -#: rhodecode/admin/views/system_info.py:118 +#: rhodecode/apps/admin/views/system_info.py:119 msgid "Platform" msgstr "" -#: rhodecode/admin/views/system_info.py:119 +#: rhodecode/apps/admin/views/system_info.py:120 msgid "Platform UUID" msgstr "" -#: rhodecode/admin/views/system_info.py:120 +#: rhodecode/apps/admin/views/system_info.py:121 msgid "Python version" msgstr "" -#: rhodecode/admin/views/system_info.py:121 +#: rhodecode/apps/admin/views/system_info.py:122 msgid "Python path" msgstr "" -#: rhodecode/admin/views/system_info.py:125 +#: rhodecode/apps/admin/views/system_info.py:126 msgid "CPU" msgstr "" -#: rhodecode/admin/views/system_info.py:126 +#: rhodecode/apps/admin/views/system_info.py:127 msgid "Load" msgstr "" -#: rhodecode/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:128 msgid "Memory" msgstr "" -#: rhodecode/admin/views/system_info.py:128 +#: rhodecode/apps/admin/views/system_info.py:129 msgid "Uptime" msgstr "" -#: rhodecode/admin/views/system_info.py:132 +#: rhodecode/apps/admin/views/system_info.py:133 msgid "Storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:135 msgid "Storage inodes" msgstr "" -#: rhodecode/admin/views/system_info.py:136 +#: rhodecode/apps/admin/views/system_info.py:137 msgid "Gist storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:137 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Gist storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:139 +#: rhodecode/apps/admin/views/system_info.py:140 msgid "Archive cache storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:140 +#: rhodecode/apps/admin/views/system_info.py:141 msgid "Archive cache info" msgstr "" -#: rhodecode/admin/views/system_info.py:142 +#: rhodecode/apps/admin/views/system_info.py:143 msgid "Temp storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:143 +#: rhodecode/apps/admin/views/system_info.py:144 msgid "Temp storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:145 +#: rhodecode/apps/admin/views/system_info.py:146 msgid "Search info" msgstr "" -#: rhodecode/admin/views/system_info.py:146 +#: rhodecode/apps/admin/views/system_info.py:147 msgid "Search location" msgstr "" -#: rhodecode/admin/views/system_info.py:150 +#: rhodecode/apps/admin/views/system_info.py:151 msgid "VCS Backends" msgstr "" -#: rhodecode/admin/views/system_info.py:151 +#: rhodecode/apps/admin/views/system_info.py:152 msgid "VCS Server" msgstr "" -#: rhodecode/admin/views/system_info.py:152 +#: rhodecode/apps/admin/views/system_info.py:153 msgid "GIT" msgstr "" -#: rhodecode/admin/views/system_info.py:153 +#: rhodecode/apps/admin/views/system_info.py:154 msgid "HG" msgstr "" -#: rhodecode/admin/views/system_info.py:154 +#: rhodecode/apps/admin/views/system_info.py:155 msgid "SVN" msgstr "" +#: rhodecode/apps/admin/views/users.py:60 +#: rhodecode/controllers/admin/users.py:359 +#: rhodecode/controllers/admin/users.py:380 +#: 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/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 "5 минут" + +#: rhodecode/apps/admin/views/users.py:180 +#: rhodecode/apps/my_account/views.py:140 +#: 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/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/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/controllers/admin/gists.py:70 +msgid "Lifetime" +msgstr "Срок" + +#: rhodecode/apps/admin/views/users.py:188 +#: rhodecode/apps/my_account/views.py:148 +#: 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 +msgid "Auth token successfully created" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:240 +#: rhodecode/apps/my_account/views.py:192 +msgid "Auth token successfully deleted" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:284 +msgid "Groups successfully changed" +msgstr "" + +#: rhodecode/apps/login/views.py:247 rhodecode/apps/login/views.py:316 +msgid "Bad captcha" +msgstr "" + +#: rhodecode/apps/login/views.py:256 +msgid "You have successfully registered with RhodeCode" +msgstr "Регистрация в RhodeCode прошла успешно" + +#: rhodecode/apps/login/views.py:292 +msgid "If such email exists, a password reset link was sent to it." +msgstr "" + +#: rhodecode/apps/login/views.py:298 +msgid "Password reset has been disabled." +msgstr "" + +#: rhodecode/apps/login/views.py:381 +msgid "Given reset token is invalid" +msgstr "" + +#: rhodecode/apps/login/views.py:389 +msgid "" +"Your password reset was successful, a new password has been sent to your " +"email" +msgstr "Сброс пароля прошел успешно, новый пароль отправлен на ваш адрес электронной почты" + +#: rhodecode/apps/my_account/views.py:115 +msgid "Error occurred during update of user password" +msgstr "" + +#: rhodecode/apps/my_account/views.py:122 +msgid "Successfully updated password" +msgstr "" + +#: rhodecode/apps/svn_support/events.py:30 +msgid "Configuration for Apaache mad_dav_svn changed." +msgstr "" + #: rhodecode/authentication/schema.py:35 msgid "Enable or disable this authentication plugin." msgstr "" @@ -282,12 +396,11 @@ msgstr "Включено" #: rhodecode/authentication/schema.py:43 msgid "" -"Amount of seconds to cache the authentication call for this plugin. Useful " -"for long calls like LDAP to improve the responsiveness of the authentication" -" system (0 means disabled)." -msgstr "" - -#: rhodecode/authentication/schema.py:48 +"Amount of seconds to cache the authentication responsecall for this plugin. \n" +"Useful for long calls like LDAP to improve the performance of the authentication system (0 means disabled)." +msgstr "" + +#: rhodecode/authentication/schema.py:49 msgid "Auth Cache TTL" msgstr "" @@ -308,99 +421,101 @@ msgstr "" msgid "Error occurred during update of auth settings." msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:61 +#: rhodecode/authentication/plugins/auth_crowd.py:60 msgid "The FQDN or IP of the Atlassian CROWD Server" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:63 +#: rhodecode/authentication/plugins/auth_crowd.py:62 msgid "Host" msgstr "Хост" -#: rhodecode/authentication/plugins/auth_crowd.py:68 +#: rhodecode/authentication/plugins/auth_crowd.py:67 msgid "The Port in use by the Atlassian CROWD Server" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:70 +#: rhodecode/authentication/plugins/auth_crowd.py:69 #: rhodecode/authentication/plugins/auth_ldap.py:84 msgid "Port" msgstr "Порт" -#: rhodecode/authentication/plugins/auth_crowd.py:76 +#: rhodecode/authentication/plugins/auth_crowd.py:75 msgid "The Application Name to authenticate to CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:78 +#: rhodecode/authentication/plugins/auth_crowd.py:77 msgid "Application Name" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:83 +#: rhodecode/authentication/plugins/auth_crowd.py:82 msgid "The password to authenticate to CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:85 +#: rhodecode/authentication/plugins/auth_crowd.py:84 msgid "Application Password" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:90 +#: rhodecode/authentication/plugins/auth_crowd.py:89 msgid "" "A comma separated list of group names that identify users as RhodeCode " "Administrators" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:94 +#: rhodecode/authentication/plugins/auth_crowd.py:93 msgid "Admin Groups" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:216 +#: rhodecode/authentication/plugins/auth_crowd.py:215 msgid "CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:55 +#: rhodecode/authentication/plugins/auth_headers.py:54 msgid "Header to extract the user from" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:57 +#: rhodecode/authentication/plugins/auth_headers.py:56 msgid "Header" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:62 +#: rhodecode/authentication/plugins/auth_headers.py:61 msgid "Header to extract the user from when main one fails" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:64 +#: rhodecode/authentication/plugins/auth_headers.py:63 msgid "Fallback header" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:69 +#: rhodecode/authentication/plugins/auth_headers.py:68 msgid "" "Perform cleaning of user, if passed user has @ in username then first part " "before @ is taken. If there's \\ in the username only the part after \\ is " "taken" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:74 +#: rhodecode/authentication/plugins/auth_headers.py:73 msgid "Clean username" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:99 +#: rhodecode/authentication/plugins/auth_headers.py:98 msgid "Headers" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:63 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:62 msgid "The url of the Jasig CAS REST service" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:65 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:64 #: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" msgstr "URL" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:93 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:92 msgid "Jasig-CAS" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:75 -msgid "Host of the LDAP Server" +#: 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 @@ -408,107 +523,117 @@ msgid "LDAP Host" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:82 -msgid "Port that the LDAP server is listening on" +msgid "Custom port that the LDAP server is listening on. Default: 389" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:90 -msgid "User to connect to LDAP" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:93 +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 msgid "Account" msgstr "Учетная запись" -#: rhodecode/authentication/plugins/auth_ldap.py:98 -msgid "Password to connect to LDAP" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:101 -#: rhodecode/templates/login.mako:49 rhodecode/templates/register.mako:47 +#: rhodecode/authentication/plugins/auth_ldap.py:100 +msgid "Password to authenticate for given user DN." +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:103 +#: 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:310 +#: rhodecode/templates/base/base.mako:313 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "Пароль" -#: rhodecode/authentication/plugins/auth_ldap.py:106 +#: rhodecode/authentication/plugins/auth_ldap.py:108 msgid "TLS Type" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:107 +#: rhodecode/authentication/plugins/auth_ldap.py:109 msgid "Connection Security" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:113 +#: rhodecode/authentication/plugins/auth_ldap.py:115 msgid "Require Cert over TLS?" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:114 +#: rhodecode/authentication/plugins/auth_ldap.py:116 msgid "Certificate Checks" msgstr "Проверка сертификата" -#: rhodecode/authentication/plugins/auth_ldap.py:120 -msgid "Base DN to search (e.g., dc=mydomain,dc=com)" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:123 +#: rhodecode/authentication/plugins/auth_ldap.py:122 +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 msgid "Base DN" msgstr "База (Base DN)" -#: rhodecode/authentication/plugins/auth_ldap.py:128 -msgid "Filter to narrow results (e.g., ou=Users, etc)" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:131 -msgid "LDAP Search Filter" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:136 -msgid "How deep to search LDAP" +#: rhodecode/authentication/plugins/auth_ldap.py:132 +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 -msgid "LDAP Search Scope" -msgstr "Глубина (scope)" +msgid "LDAP Search Filter" +msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:143 -msgid "LDAP Attribute to map to user name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:145 +msgid "How deep to search LDAP. If unsure set to SUBTREE" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:144 +msgid "LDAP Search Scope" +msgstr "Глубина (scope)" + +#: rhodecode/authentication/plugins/auth_ldap.py:150 +msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:152 msgid "Login Attribute" msgstr "Атрибут \"Логин\"" -#: rhodecode/authentication/plugins/auth_ldap.py:146 +#: rhodecode/authentication/plugins/auth_ldap.py:153 msgid "The LDAP Login attribute of the CN must be specified" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:151 -msgid "LDAP Attribute to map to first name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:154 +#: rhodecode/authentication/plugins/auth_ldap.py:158 +msgid "LDAP Attribute to map to first name (e.g., givenName)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:161 msgid "First Name Attribute" msgstr "Атрибут \"Имя\"" -#: rhodecode/authentication/plugins/auth_ldap.py:159 -msgid "LDAP Attribute to map to last name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:162 +#: rhodecode/authentication/plugins/auth_ldap.py:166 +msgid "LDAP Attribute to map to last name (e.g., sn)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:169 msgid "Last Name Attribute" msgstr "Атрибут \"Фамилия\"" -#: rhodecode/authentication/plugins/auth_ldap.py:167 -msgid "LDAP Attribute to map to email address" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:170 +#: rhodecode/authentication/plugins/auth_ldap.py:174 +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 msgid "Email Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:351 +#: rhodecode/authentication/plugins/auth_ldap.py:360 msgid "LDAP" msgstr "LDAP" @@ -533,16 +658,16 @@ msgstr "" msgid "PAM" msgstr "" -#: rhodecode/authentication/plugins/auth_rhodecode.py:68 +#: rhodecode/authentication/plugins/auth_rhodecode.py:67 msgid "Rhodecode" msgstr "" -#: rhodecode/authentication/plugins/auth_token.py:71 +#: rhodecode/authentication/plugins/auth_token.py:70 msgid "Rhodecode Token Auth" msgstr "" #: rhodecode/controllers/changelog.py:91 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:202 +#: rhodecode/controllers/pullrequests.py:204 msgid "There are no commits yet" msgstr "Ещё не было коммитов" @@ -576,8 +701,8 @@ msgid "No such commit exists for this re msgstr "" #: rhodecode/controllers/changeset.py:344 -#: rhodecode/controllers/pullrequests.py:948 -#: rhodecode/model/pull_request.py:1009 +#: rhodecode/controllers/pullrequests.py:985 +#: rhodecode/model/pull_request.py:1055 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "Изменить статус %(transition_icon)s %(status)s" @@ -617,12 +742,12 @@ msgid "" "%(repo1)s with commit %(commit2)s from repository %(repo2)s." msgstr "" -#: rhodecode/controllers/feed.py:70 +#: rhodecode/controllers/feed.py:69 #, python-format msgid "Changes on %s repository" msgstr "Изменения в репозитарии %s" -#: rhodecode/controllers/feed.py:71 +#: rhodecode/controllers/feed.py:70 #, python-format msgid "%s %s feed" msgstr "Лента новостей %s %s" @@ -636,93 +761,93 @@ msgstr "" msgid "There are no files yet. %s" msgstr "Файлов пока нет. %s" -#: rhodecode/controllers/files.py:394 rhodecode/controllers/files.py:447 -#: rhodecode/controllers/files.py:478 rhodecode/controllers/files.py:553 -#: rhodecode/controllers/files.py:598 rhodecode/controllers/files.py:689 +#: 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 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Репозиторий заблокировал %s в %s" -#: rhodecode/controllers/files.py:402 rhodecode/controllers/files.py:455 +#: rhodecode/controllers/files.py:443 rhodecode/controllers/files.py:496 msgid "You can only delete files with revision being a valid branch " msgstr "Файлы с новыми версиями можно удалять только из ветки с правом доступа" -#: rhodecode/controllers/files.py:411 rhodecode/controllers/files.py:464 +#: 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:431 +#: rhodecode/controllers/files.py:472 #, python-format msgid "Successfully deleted file %s" msgstr "Файл %s успешно удален" -#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:540 -#: rhodecode/controllers/files.py:677 +#: rhodecode/controllers/files.py:475 rhodecode/controllers/files.py:581 +#: rhodecode/controllers/files.py:718 msgid "Error occurred during commit" msgstr "Во время фиксации изменений произошла ошибка" -#: rhodecode/controllers/files.py:486 rhodecode/controllers/files.py:561 +#: rhodecode/controllers/files.py:527 rhodecode/controllers/files.py:602 msgid "You can only edit files with revision being a valid branch " msgstr "Вы можете редактировать файлы только в редакции, связанной с существующей веткой" -#: rhodecode/controllers/files.py:498 rhodecode/controllers/files.py:573 +#: 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:515 +#: rhodecode/controllers/files.py:556 msgid "No changes" msgstr "Без изменений" -#: rhodecode/controllers/files.py:537 rhodecode/controllers/files.py:666 +#: rhodecode/controllers/files.py:578 rhodecode/controllers/files.py:707 #, python-format msgid "Successfully committed to %s" msgstr "Изменения применены в %s" -#: rhodecode/controllers/files.py:611 rhodecode/controllers/files.py:700 +#: rhodecode/controllers/files.py:652 rhodecode/controllers/files.py:741 msgid "Added file via RhodeCode Enterprise" msgstr "Файл добавлен с помощью RhodeCode Enterprise" -#: rhodecode/controllers/files.py:636 +#: rhodecode/controllers/files.py:677 msgid "No filename" msgstr "Безымянный" -#: rhodecode/controllers/files.py:669 +#: 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:723 +#: rhodecode/controllers/files.py:764 msgid "Downloads disabled" msgstr "Возможность скачивать отключена" -#: rhodecode/controllers/files.py:729 +#: rhodecode/controllers/files.py:770 #, python-format msgid "Unknown revision %s" msgstr "Неизвестная версия %s" -#: rhodecode/controllers/files.py:731 +#: rhodecode/controllers/files.py:772 msgid "Empty repository" msgstr "Пустой репозитарий" -#: rhodecode/controllers/files.py:733 rhodecode/controllers/files.py:767 +#: rhodecode/controllers/files.py:774 rhodecode/controllers/files.py:808 msgid "Unknown archive type" msgstr "Неизвестный тип архива" -#: rhodecode/controllers/files.py:952 +#: rhodecode/controllers/files.py:993 msgid "Changesets" msgstr "Набор изменений" -#: rhodecode/controllers/files.py:973 rhodecode/controllers/summary.py:269 -#: rhodecode/model/pull_request.py:1234 rhodecode/model/scm.py:782 -#: rhodecode/templates/base/vcs_settings.mako:193 +#: 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:977 rhodecode/model/scm.py:797 -#: rhodecode/templates/base/vcs_settings.mako:218 +#: rhodecode/controllers/files.py:1018 rhodecode/model/scm.py:797 +#: rhodecode/templates/base/vcs_settings.mako:267 msgid "Tags" msgstr "Метки" @@ -731,23 +856,24 @@ msgstr "Метки" msgid "An error occurred during repository forking %s" msgstr "Произошла ошибка во время создания форка репозитория %s" -#: rhodecode/controllers/home.py:205 +#: rhodecode/controllers/home.py:207 msgid "Groups" msgstr "Группы" -#: rhodecode/controllers/home.py:212 rhodecode/controllers/home.py:247 -#: rhodecode/controllers/pullrequests.py:308 +#: 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:73 -#: rhodecode/templates/base/base.mako:145 -#: rhodecode/templates/base/base.mako:569 +#: 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:225 +#: rhodecode/controllers/home.py:227 #, python-format msgid "Commits in %(repo)s" msgstr "" @@ -760,81 +886,81 @@ msgstr "общедоступный журнал" msgid "journal" msgstr "журнал" -#: rhodecode/controllers/pullrequests.py:216 +#: rhodecode/controllers/pullrequests.py:218 msgid "Commit does not exist" msgstr "" -#: rhodecode/controllers/pullrequests.py:333 -msgid "Pull request requires a title with min. 3 chars" -msgstr "Заголовок Pull запроса должен быть не менее 3-х символов" - #: rhodecode/controllers/pullrequests.py:335 +msgid "Pull request requires a title with min. 3 chars" +msgstr "Заголовок Pull запроса должен быть не менее 3-х символов" + +#: rhodecode/controllers/pullrequests.py:337 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/controllers/pullrequests.py:383 +#: rhodecode/controllers/pullrequests.py:385 msgid "Successfully opened new pull request" msgstr "Pull запрос создан успешно" -#: rhodecode/controllers/pullrequests.py:386 +#: rhodecode/controllers/pullrequests.py:388 msgid "Error occurred during sending pull request" msgstr "Произошла ошибка при создании Pull запроса" -#: rhodecode/controllers/pullrequests.py:429 +#: rhodecode/controllers/pullrequests.py:431 msgid "Cannot update closed pull requests." msgstr "Не могу обновить закрытые запросы на включение изменений." -#: rhodecode/controllers/pullrequests.py:435 +#: rhodecode/controllers/pullrequests.py:437 msgid "Pull request title & description updated." msgstr "Заголовок и описание запроса на включение изменений обновлены." -#: rhodecode/controllers/pullrequests.py:443 +#: rhodecode/controllers/pullrequests.py:455 msgid "" "Pull request updated to \"{source_commit_id}\" with {count_added} added, " -"{count_removed} removed commits." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:458 +"{count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:472 msgid "Reload page" msgstr "" -#: rhodecode/controllers/pullrequests.py:532 +#: rhodecode/controllers/pullrequests.py:546 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/controllers/pullrequests.py:569 +#: rhodecode/controllers/pullrequests.py:588 msgid "Successfully deleted pull request" msgstr "Pull запрос успешно удалён" -#: rhodecode/controllers/pullrequests.py:864 -msgid "Close Pull Request" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:952 -#: rhodecode/model/pull_request.py:1013 +#: rhodecode/controllers/pullrequests.py:592 +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:1002 +#: 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:243 +#: rhodecode/controllers/summary.py:251 msgid "Branch" msgstr "Ветка" -#: rhodecode/controllers/summary.py:244 +#: rhodecode/controllers/summary.py:252 msgid "Tag" msgstr "Тэги" -#: rhodecode/controllers/summary.py:245 +#: rhodecode/controllers/summary.py:253 msgid "Bookmark" msgstr "Закладки" -#: rhodecode/controllers/summary.py:270 +#: rhodecode/controllers/summary.py:278 msgid "Closed branches" msgstr "" @@ -846,42 +972,6 @@ msgstr "Стандартные настройки успешно обновлены" msgid "Error occurred during update of default values" msgstr "" -#: rhodecode/controllers/admin/gists.py:62 -#: rhodecode/controllers/admin/my_account.py:384 -#: rhodecode/controllers/admin/users.py:465 -msgid "forever" -msgstr "навсегда" - -#: rhodecode/controllers/admin/gists.py:63 -#: rhodecode/controllers/admin/my_account.py:385 -#: rhodecode/controllers/admin/users.py:466 -msgid "5 minutes" -msgstr "5 минут" - -#: rhodecode/controllers/admin/gists.py:64 -#: rhodecode/controllers/admin/my_account.py:386 -#: rhodecode/controllers/admin/users.py:467 -msgid "1 hour" -msgstr "1 час" - -#: rhodecode/controllers/admin/gists.py:65 -#: rhodecode/controllers/admin/my_account.py:387 -#: rhodecode/controllers/admin/users.py:468 -msgid "1 day" -msgstr "1 день" - -#: rhodecode/controllers/admin/gists.py:66 -#: rhodecode/controllers/admin/my_account.py:388 -#: rhodecode/controllers/admin/users.py:469 -msgid "1 month" -msgstr "1 месяц" - -#: rhodecode/controllers/admin/gists.py:70 -#: rhodecode/controllers/admin/my_account.py:390 -#: rhodecode/controllers/admin/users.py:471 -msgid "Lifetime" -msgstr "Срок" - #: rhodecode/controllers/admin/gists.py:72 msgid "Requires registered account" msgstr "" @@ -918,10 +1008,8 @@ msgstr "" #: rhodecode/controllers/admin/gists.py:343 #: rhodecode/templates/admin/gists/show.mako:67 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 #: rhodecode/templates/data_table/_dt_elements.mako:263 msgid "never" msgstr "никогда" @@ -931,65 +1019,36 @@ msgstr "никогда" msgid "%(expiry)s - current value" msgstr "" -#: rhodecode/controllers/admin/my_account.py:80 +#: rhodecode/controllers/admin/my_account.py:78 msgid "You can't edit this user since it's crucial for entire application" msgstr "Вы не можете изменить данные пользователя, поскольку это критично для работы всего приложения" -#: rhodecode/controllers/admin/my_account.py:140 +#: rhodecode/controllers/admin/my_account.py:138 msgid "Your account was updated successfully" msgstr "Ваша учетная запись успешно обновлена" -#: rhodecode/controllers/admin/my_account.py:155 -#: rhodecode/controllers/admin/users.py:231 +#: rhodecode/controllers/admin/my_account.py:153 +#: rhodecode/controllers/admin/users.py:184 #, python-format msgid "Error occurred during update of user %s" msgstr "Произошла ошибка при обновлении пользователя %s" -#: rhodecode/controllers/admin/my_account.py:221 -#: rhodecode/controllers/admin/my_account.py:227 -msgid "Error occurred during update of user password" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:234 -msgid "Successfully updated password" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:278 -#: rhodecode/controllers/admin/users.py:645 +#: 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:285 -#: rhodecode/controllers/admin/users.py:652 +#: 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:295 -#: rhodecode/controllers/admin/users.py:667 +#: rhodecode/controllers/admin/my_account.py:239 +#: rhodecode/controllers/admin/users.py:549 msgid "Removed email address from user account" msgstr "" -#: rhodecode/controllers/admin/my_account.py:393 -#: rhodecode/controllers/admin/users.py:474 -msgid "Role" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:406 -#: rhodecode/controllers/admin/users.py:498 -msgid "Auth token successfully created" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:419 -#: rhodecode/controllers/admin/users.py:517 -msgid "Auth token successfully reset" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:423 -#: rhodecode/controllers/admin/users.py:521 -msgid "Auth token successfully deleted" -msgstr "" - #: rhodecode/controllers/admin/permissions.py:112 msgid "Application permissions updated successfully" msgstr "" @@ -1057,7 +1116,7 @@ msgid "Error occurred during deletion of msgstr "Произошла ошибка при удалении группы репозиториев %s" #: rhodecode/controllers/admin/repo_groups.py:388 -#: rhodecode/controllers/admin/user_groups.py:322 +#: rhodecode/controllers/admin/user_groups.py:323 msgid "Cannot change permission for yourself as admin" msgstr "" @@ -1209,18 +1268,18 @@ msgid "Error occurred during deleting is msgstr "" #: rhodecode/controllers/admin/repos.py:728 -#: rhodecode/controllers/admin/settings.py:380 +#: rhodecode/controllers/admin/settings.py:381 msgid "Removed issue tracker entry" msgstr "" #: rhodecode/controllers/admin/repos.py:758 -#: rhodecode/controllers/admin/settings.py:427 +#: rhodecode/controllers/admin/settings.py:428 msgid "Updated issue tracker entries" msgstr "" #: rhodecode/controllers/admin/repos.py:819 #: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:618 +#: rhodecode/controllers/admin/settings.py:619 msgid "Some form inputs contain invalid data." msgstr "" @@ -1229,281 +1288,277 @@ msgid "Error occurred during updating re msgstr "" #: rhodecode/controllers/admin/repos.py:841 -#: rhodecode/controllers/admin/settings.py:175 +#: rhodecode/controllers/admin/settings.py:176 msgid "Updated VCS settings" msgstr "Обновлены настройки VCS" -#: rhodecode/controllers/admin/settings.py:171 -#: rhodecode/controllers/admin/settings.py:282 +#: rhodecode/controllers/admin/settings.py:172 +#: rhodecode/controllers/admin/settings.py:283 msgid "Error occurred during updating application settings" msgstr "Произошла ошибка при обновлении настроек приложения" -#: rhodecode/controllers/admin/settings.py:222 +#: rhodecode/controllers/admin/settings.py:223 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "Репозитории успешно пересканированы, добавлено: %s ; удалено: %s" -#: rhodecode/controllers/admin/settings.py:278 +#: rhodecode/controllers/admin/settings.py:279 msgid "Updated application settings" msgstr "Обновленные параметры настройки приложения" -#: rhodecode/controllers/admin/settings.py:344 +#: rhodecode/controllers/admin/settings.py:345 msgid "Updated visualisation settings" msgstr "Настройки визуализации обновлены" -#: rhodecode/controllers/admin/settings.py:347 +#: rhodecode/controllers/admin/settings.py:348 msgid "Error occurred during updating visualisation settings" msgstr "Произошла ошибка при обновлении настроек визуализации" -#: rhodecode/controllers/admin/settings.py:440 +#: rhodecode/controllers/admin/settings.py:441 msgid "Please enter email address" msgstr "Пожалуйста, введите адрес электронной почты" -#: rhodecode/controllers/admin/settings.py:458 +#: rhodecode/controllers/admin/settings.py:459 msgid "Send email task created" msgstr "Задача отправки Email создана" -#: rhodecode/controllers/admin/settings.py:491 +#: rhodecode/controllers/admin/settings.py:492 msgid "Added new hook" msgstr "Добавлена новая ловушка" -#: rhodecode/controllers/admin/settings.py:506 +#: rhodecode/controllers/admin/settings.py:507 msgid "Updated hooks" msgstr "Обновлённые ловушки" -#: rhodecode/controllers/admin/settings.py:510 +#: rhodecode/controllers/admin/settings.py:511 msgid "Error occurred during hook creation" msgstr "Произошла ошибка при создании хука" -#: rhodecode/controllers/admin/settings.py:639 +#: rhodecode/controllers/admin/settings.py:640 msgid "Error occurred during updating labs settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:644 +#: rhodecode/controllers/admin/settings.py:645 msgid "Updated Labs settings" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:164 +#: rhodecode/controllers/admin/user_groups.py:165 #, python-format msgid "Created user group %(user_group_link)s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:178 +#: rhodecode/controllers/admin/user_groups.py:179 #, python-format msgid "Error occurred during creation of user group %s" msgstr "Произошла ошибка при создании группы пользователей %s" -#: rhodecode/controllers/admin/user_groups.py:219 +#: rhodecode/controllers/admin/user_groups.py:220 #, python-format msgid "Updated user group %s" msgstr "Группа пользователей %s обновлена" -#: rhodecode/controllers/admin/user_groups.py:235 +#: rhodecode/controllers/admin/user_groups.py:236 #, python-format msgid "Error occurred during update of user group %s" msgstr "Произошла ошибка при обновлении группы пользователей %s" -#: rhodecode/controllers/admin/user_groups.py:257 +#: rhodecode/controllers/admin/user_groups.py:258 msgid "Successfully deleted user group" msgstr "Группа пользователей успешно удалена" -#: rhodecode/controllers/admin/user_groups.py:262 +#: rhodecode/controllers/admin/user_groups.py:263 msgid "An error occurred during deletion of user group" msgstr "Произошла ошибка при удалении группы пользователей" -#: rhodecode/controllers/admin/user_groups.py:330 +#: rhodecode/controllers/admin/user_groups.py:331 msgid "Target group cannot be the same" msgstr "Целевая группа не может быть такой же" -#: rhodecode/controllers/admin/user_groups.py:336 +#: rhodecode/controllers/admin/user_groups.py:337 msgid "User Group permissions updated" msgstr "Привилегии группы пользователей обновлены" -#: rhodecode/controllers/admin/user_groups.py:421 +#: rhodecode/controllers/admin/user_groups.py:422 msgid "User Group global permissions updated successfully" msgstr "" #: rhodecode/controllers/admin/user_groups.py:437 -#: rhodecode/controllers/admin/users.py:595 +#: rhodecode/controllers/admin/users.py:477 msgid "An error occurred during permissions saving" msgstr "Произошла ошибка при сохранении привилегий" -#: rhodecode/controllers/admin/users.py:153 +#: rhodecode/controllers/admin/user_groups.py:481 +msgid "User Group synchronization updated successfully" +msgstr "" + +#: rhodecode/controllers/admin/user_groups.py:485 +msgid "An error occurred during synchronization update" +msgstr "" + +#: rhodecode/controllers/admin/users.py:106 #, python-format msgid "Created user %(user_link)s" msgstr "" -#: rhodecode/controllers/admin/users.py:169 +#: rhodecode/controllers/admin/users.py:122 #, python-format msgid "Error occurred during creation of user %s" msgstr "Произошла ошибка при создании пользователя %s" -#: rhodecode/controllers/admin/users.py:214 +#: rhodecode/controllers/admin/users.py:167 msgid "User updated successfully" msgstr "Пользователь успешно обновлён" -#: rhodecode/controllers/admin/users.py:265 +#: rhodecode/controllers/admin/users.py:218 #, python-format msgid "Detached %s repositories" msgstr "" -#: rhodecode/controllers/admin/users.py:270 +#: rhodecode/controllers/admin/users.py:223 #, python-format msgid "Deleted %s repositories" msgstr "" -#: rhodecode/controllers/admin/users.py:278 +#: rhodecode/controllers/admin/users.py:231 #, python-format msgid "Detached %s repository groups" msgstr "" -#: rhodecode/controllers/admin/users.py:283 +#: rhodecode/controllers/admin/users.py:236 #, python-format msgid "Deleted %s repository groups" msgstr "" +#: rhodecode/controllers/admin/users.py:244 +#, python-format +msgid "Detached %s user groups" +msgstr "" + +#: rhodecode/controllers/admin/users.py:249 +#, python-format +msgid "Deleted %s user groups" +msgstr "" + +#: rhodecode/controllers/admin/users.py:260 +msgid "Successfully deleted user" +msgstr "Пользователь успешно удалён" + +#: rhodecode/controllers/admin/users.py:266 +msgid "An error occurred during deletion of 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 -#, python-format -msgid "Detached %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:296 -#, python-format -msgid "Deleted %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:307 -msgid "Successfully deleted user" -msgstr "Пользователь успешно удалён" - -#: rhodecode/controllers/admin/users.py:313 -msgid "An error occurred during deletion of user" -msgstr "Произошла ошибка при удалении пользователя" - -#: rhodecode/controllers/admin/users.py:332 -msgid "Force password change disabled for user" +msgid "An error occurred during password reset for user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:324 +#, python-format +msgid "Linked repository group `%s` as personal" +msgstr "" + +#: rhodecode/controllers/admin/users.py:330 +#, python-format +msgid "Created repository group `%s`" msgstr "" #: rhodecode/controllers/admin/users.py:334 -msgid "Force password change enabled for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:338 -msgid "An error occurred during password reset for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:371 -#, python-format -msgid "Linked repository group `%s` as personal" -msgstr "" - -#: rhodecode/controllers/admin/users.py:377 -#, python-format -msgid "Created repository group `%s`" -msgstr "" - -#: rhodecode/controllers/admin/users.py:381 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/controllers/admin/users.py:386 +#: rhodecode/controllers/admin/users.py:339 msgid "An error occurred during repository group creation for user" msgstr "" -#: rhodecode/controllers/admin/users.py:406 -#: rhodecode/controllers/admin/users.py:427 -#: rhodecode/controllers/admin/users.py:459 -#: rhodecode/controllers/admin/users.py:490 -#: rhodecode/controllers/admin/users.py:507 -#: rhodecode/controllers/admin/users.py:530 -#: rhodecode/controllers/admin/users.py:604 -#: rhodecode/controllers/admin/users.py:617 -#: rhodecode/controllers/admin/users.py:675 -msgid "You can't edit this user" -msgstr "Вы не можете редактировать данного пользователя" - -#: rhodecode/controllers/admin/users.py:443 +#: rhodecode/controllers/admin/users.py:396 msgid "" "The user participates as reviewer in pull requests and cannot be deleted. " "You can set the user to \"inactive\" instead of deleting it." msgstr "" -#: rhodecode/controllers/admin/users.py:579 +#: rhodecode/controllers/admin/users.py:461 msgid "User global permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/users.py:707 +#: rhodecode/controllers/admin/users.py:589 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/controllers/admin/users.py:722 +#: rhodecode/controllers/admin/users.py:604 msgid "An error occurred during ip saving" msgstr "Произошла ошибка при сохранении IP" -#: rhodecode/controllers/admin/users.py:726 +#: rhodecode/controllers/admin/users.py:608 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/controllers/admin/users.py:744 +#: rhodecode/controllers/admin/users.py:626 msgid "Removed ip address from user whitelist" msgstr "IP %s удален из белого списка пользователя" -#: rhodecode/events/pullrequest.py:65 +#: rhodecode/events/pullrequest.py:68 msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:74 +#: rhodecode/events/pullrequest.py:77 msgid "pullrequest closed" msgstr "" -#: rhodecode/events/pullrequest.py:83 +#: rhodecode/events/pullrequest.py:86 msgid "pullrequest commits updated" msgstr "" -#: rhodecode/events/pullrequest.py:92 +#: rhodecode/events/pullrequest.py:95 msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:101 +#: rhodecode/events/pullrequest.py:104 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:110 +#: rhodecode/events/pullrequest.py:113 msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:136 +#: rhodecode/events/repo.py:138 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:145 +#: rhodecode/events/repo.py:147 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:154 +#: rhodecode/events/repo.py:156 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:163 +#: rhodecode/events/repo.py:165 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:199 +#: rhodecode/events/repo.py:201 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:208 +#: rhodecode/events/repo.py:210 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:217 +#: rhodecode/events/repo.py:219 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:228 +#: rhodecode/events/repo.py:230 msgid "repository push" msgstr "" @@ -1519,25 +1574,24 @@ msgstr "" msgid "repository group update" msgstr "" -#: rhodecode/events/user.py:34 +#: rhodecode/events/user.py:37 msgid "user registered" msgstr "" -#: rhodecode/events/user.py:48 +#: rhodecode/events/user.py:52 msgid "user pre create" msgstr "" -#: rhodecode/events/user.py:61 +#: rhodecode/events/user.py:66 msgid "user post create" msgstr "" -#: rhodecode/events/user.py:74 +#: rhodecode/events/user.py:80 msgid "user pre update" msgstr "" #: rhodecode/forms/__init__.py:32 rhodecode/templates/admin/gists/new.mako:62 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:31 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:88 +#: 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 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 @@ -1549,15 +1603,14 @@ msgstr "" #: 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_vcs.mako:46 +#: 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 #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 #: rhodecode/templates/admin/settings/settings_visual.mako:222 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:27 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:85 +#: 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_profile.mako:135 @@ -1567,17 +1620,17 @@ msgstr "Сброс" #: rhodecode/forms/__init__.py:33 rhodecode/templates/admin/gists/show.mako:49 #: rhodecode/templates/admin/integrations/list.mako:211 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:60 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 #: rhodecode/templates/admin/permissions/permissions_ips.mako:26 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:56 +#: 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/base/issue_tracker_settings.mako:70 -#: rhodecode/templates/base/vcs_settings.mako:202 -#: rhodecode/templates/base/vcs_settings.mako:227 +#: 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/changeset/changeset_file_comment.mako:142 @@ -1586,9 +1639,9 @@ msgstr "Сброс" #: rhodecode/templates/data_table/_dt_elements.mako:198 #: rhodecode/templates/data_table/_dt_elements.mako:210 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:35 -#: rhodecode/templates/files/files_source.mako:39 -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_source.mako:45 +#: rhodecode/templates/files/files_source.mako:49 +#: rhodecode/templates/files/files_source.mako:52 #: rhodecode/templates/pullrequests/pullrequest_show.mako:56 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" @@ -1627,28 +1680,28 @@ msgstr "" msgid "Root repositories only" msgstr "" -#: rhodecode/integrations/views.py:161 +#: rhodecode/integrations/views.py:160 msgid "{repo_name} repository" msgstr "" -#: rhodecode/integrations/views.py:164 +#: rhodecode/integrations/views.py:163 msgid "{repo_group_name} repo group" msgstr "" -#: rhodecode/integrations/views.py:171 +#: rhodecode/integrations/views.py:170 msgid "{name} integration" msgstr "" -#: rhodecode/integrations/views.py:185 +#: rhodecode/integrations/views.py:184 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:265 +#: rhodecode/integrations/views.py:264 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:290 +#: rhodecode/integrations/views.py:289 msgid "Integration {integration_name} updated successfully." msgstr "" @@ -1722,58 +1775,59 @@ msgid "" "Send events such as repo pushes and pull requests to your hipchat channel." msgstr "" -#: rhodecode/integrations/types/slack.py:44 +#: rhodecode/integrations/types/slack.py:46 msgid "Slack service URL" msgstr "" -#: rhodecode/integrations/types/slack.py:45 +#: rhodecode/integrations/types/slack.py:47 msgid "" "This can be setup at the slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:58 rhodecode/templates/login.mako:42 -#: rhodecode/templates/register.mako:40 +#: 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/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:90 -#: rhodecode/templates/base/base.mako:301 +#: rhodecode/templates/admin/users/users.mako:62 +#: rhodecode/templates/base/base.mako:304 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 msgid "Username" msgstr "Имя пользователя" -#: rhodecode/integrations/types/slack.py:59 +#: rhodecode/integrations/types/slack.py:61 msgid "Username to show notifications coming from." msgstr "" -#: rhodecode/integrations/types/slack.py:68 +#: rhodecode/integrations/types/slack.py:70 msgid "Channel" msgstr "" -#: rhodecode/integrations/types/slack.py:69 +#: rhodecode/integrations/types/slack.py:71 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:78 +#: rhodecode/integrations/types/slack.py:80 msgid "Emoji" msgstr "" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:81 msgid "Emoji to use eg. :studio_microphone:" msgstr "" -#: rhodecode/integrations/types/slack.py:101 +#: rhodecode/integrations/types/slack.py:92 msgid "Slack" msgstr "" -#: rhodecode/integrations/types/slack.py:102 +#: rhodecode/integrations/types/slack.py:93 msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" @@ -1937,25 +1991,25 @@ msgstr "Создан тег: %s" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1189 +#: rhodecode/lib/auth.py:1197 #, python-format msgid "IP %s not allowed" msgstr "IP %s заблокирован" -#: rhodecode/lib/auth.py:1263 +#: rhodecode/lib/auth.py:1281 msgid "You need to be a registered user to perform this action" msgstr "Вы должны быть зарегистрированным пользователем, чтобы выполнить это действие" -#: rhodecode/lib/auth.py:1311 +#: rhodecode/lib/auth.py:1329 #, python-format msgid "Action not supported for %s." msgstr "" -#: rhodecode/lib/auth.py:1348 +#: rhodecode/lib/auth.py:1379 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/base.py:557 +#: rhodecode/lib/base.py:549 #, python-format msgid "The repository at %(repo_name)s cannot be located." msgstr "" @@ -1981,36 +2035,16 @@ msgstr "Изменений не обнаружено" msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1515 +#: rhodecode/lib/helpers.py:1517 #, python-format msgid " and %s more" msgstr "и на %s больше" -#: rhodecode/lib/helpers.py:1519 +#: rhodecode/lib/helpers.py:1521 msgid "No Files" msgstr "Файлов нет" -#: rhodecode/lib/helpers.py:1592 -msgid "new file" -msgstr "новый файл" - -#: rhodecode/lib/helpers.py:1595 -msgid "mod" -msgstr "изменить" - -#: rhodecode/lib/helpers.py:1598 -msgid "del" -msgstr "удалить" - -#: rhodecode/lib/helpers.py:1601 -msgid "rename" -msgstr "переименовать" - -#: rhodecode/lib/helpers.py:1606 -msgid "chmod" -msgstr "chmod" - -#: rhodecode/lib/helpers.py:1853 +#: rhodecode/lib/helpers.py:1800 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2029,7 +2063,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1873 +#: rhodecode/lib/helpers.py:1820 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the" @@ -2069,9 +2103,9 @@ msgid "in ${val} and ${detail}" msgstr "" #: rhodecode/lib/utils2.py:515 -#: rhodecode/public/js/rhodecode-components.js:33194 -#: rhodecode/public/js/scripts.js:25042 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: 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/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "прямо сейчас" @@ -2104,7 +2138,9 @@ msgstr "прямо сейчас" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/model/db.py:2298 +#: 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 msgid "Repository no access" msgstr "Репозитарий - нет доступа" @@ -2136,7 +2172,9 @@ msgstr "Репозитарий - нет доступа" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/model/db.py:2299 +#: 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 msgid "Repository read access" msgstr "Репозитарий - доступ на чтение" @@ -2168,7 +2206,9 @@ msgstr "Репозитарий - доступ на чтение" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/model/db.py:2300 +#: 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 msgid "Repository write access" msgstr "Репозитарий - доступ на запись" @@ -2200,7 +2240,9 @@ msgstr "Репозитарий - доступ на запись" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 -#: rhodecode/model/db.py:2301 +#: 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 msgid "Repository admin access" msgstr "Репозитарий - администрирование" @@ -2272,7 +2314,9 @@ msgstr "Администратор RhodeCode " #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/model/db.py:2319 +#: 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 msgid "Repository creation disabled" msgstr "Создание репозиториев отключено" @@ -2304,7 +2348,9 @@ msgstr "Создание репозиториев отключено" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 -#: rhodecode/model/db.py:2320 +#: 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 msgid "Repository creation enabled" msgstr "Создание репозиториев включено" @@ -2336,7 +2382,9 @@ msgstr "Создание репозиториев включено" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 -#: rhodecode/model/db.py:2324 +#: 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 msgid "Repository forking disabled" msgstr "Возможность создавать форк репозитория отключена" @@ -2368,7 +2416,9 @@ msgstr "Возможность создавать форк репозитория отключена" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/model/db.py:2325 +#: 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 msgid "Repository forking enabled" msgstr "Возможность создавать форк репозитория включена" @@ -2421,7 +2471,9 @@ msgstr "Регистрация нового пользователя в RhodeCode с автоматической активацией" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 -#: rhodecode/model/db.py:3009 +#: 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 msgid "Not Reviewed" msgstr "Не просмотрено" @@ -2453,7 +2505,9 @@ msgstr "Не просмотрено" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 -#: rhodecode/model/db.py:3010 +#: 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 msgid "Approved" msgstr "Одобрено" @@ -2485,7 +2539,9 @@ msgstr "Одобрено" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 -#: rhodecode/model/db.py:3011 +#: 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 msgid "Rejected" msgstr "Отклонено" @@ -2517,7 +2573,9 @@ msgstr "Отклонено" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 -#: rhodecode/model/db.py:3012 +#: 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 msgid "Under Review" msgstr "На рассмотрении" @@ -2546,7 +2604,9 @@ msgstr "На рассмотрении" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/model/db.py:2303 +#: 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 msgid "Repository group no access" msgstr "Группа репозиториев - нет доступа" @@ -2575,7 +2635,9 @@ msgstr "Группа репозиториев - нет доступа" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/model/db.py:2304 +#: 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 msgid "Repository group read access" msgstr "Группа репозиториев - доступ на чтение" @@ -2604,7 +2666,9 @@ msgstr "Группа репозиториев - доступ на чтение" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/model/db.py:2305 +#: 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 msgid "Repository group write access" msgstr "Группа репозиториев - доступ на запись" @@ -2633,7 +2697,9 @@ msgstr "Группа репозиториев - доступ на запись" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 -#: rhodecode/model/db.py:2306 +#: 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 msgid "Repository group admin access" msgstr "Группа репозиториев - администрирование" @@ -2661,7 +2727,9 @@ msgstr "Группа репозиториев - администрирование" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/model/db.py:2308 +#: 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 msgid "User group no access" msgstr "Группа пользователей - нет доступа" @@ -2689,7 +2757,9 @@ msgstr "Группа пользователей - нет доступа" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 -#: rhodecode/model/db.py:2309 +#: 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 msgid "User group read access" msgstr "Группа пользователей - доступ на чтение" @@ -2717,7 +2787,9 @@ msgstr "Группа пользователей - доступ на чтение" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/model/db.py:2310 +#: 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 msgid "User group write access" msgstr "Группа пользователей - доступ на запись" @@ -2745,7 +2817,9 @@ msgstr "Группа пользователей - доступ на запись" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/model/db.py:2311 +#: 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 msgid "User group admin access" msgstr "Группа пользователей - администрирование" @@ -2773,7 +2847,9 @@ msgstr "Группа пользователей - администрирование" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/model/db.py:2313 +#: 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 msgid "Repository Group creation disabled" msgstr "Создание групп репозиториев отключено" @@ -2801,7 +2877,9 @@ msgstr "Создание групп репозиториев отключено" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/model/db.py:2314 +#: 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 msgid "Repository Group creation enabled" msgstr "Создание групп репозиториев включено" @@ -2829,7 +2907,9 @@ msgstr "Создание групп репозиториев включено" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/model/db.py:2316 +#: 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 msgid "User Group creation disabled" msgstr "Создание групп пользователей отключено" @@ -2857,7 +2937,9 @@ msgstr "Создание групп пользователей отключено" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/model/db.py:2317 +#: 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 msgid "User Group creation enabled" msgstr "Создание групп пользователей включено" @@ -2885,7 +2967,9 @@ msgstr "Создание групп пользователей включено" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 -#: rhodecode/model/db.py:2327 +#: 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 msgid "Registration disabled" msgstr "Регистрация отключена" @@ -2913,7 +2997,9 @@ msgstr "Регистрация отключена" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/model/db.py:2328 +#: 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 msgid "User Registration with manual account activation" msgstr "Регистрация пользователя с ручной активацией учётной записи" @@ -2941,7 +3027,9 @@ msgstr "Регистрация пользователя с ручной активацией учётной записи" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/model/db.py:2329 +#: 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 msgid "User Registration with automatic account activation" msgstr "Регистрация пользователя с автоматической активацией учётной записи" @@ -2969,7 +3057,9 @@ msgstr "Регистрация пользователя с автоматической активацией учётной записи" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 -#: rhodecode/model/db.py:2335 rhodecode/model/permission.py:95 +#: 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 msgid "Manual activation of external account" msgstr "Ручная активация внешней учетной записи" @@ -2997,7 +3087,9 @@ msgstr "Ручная активация внешней учетной записи" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 -#: rhodecode/model/db.py:2336 rhodecode/model/permission.py:96 +#: 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 msgid "Automatic activation of external account" msgstr "Автоматическая активация внешней учетной записи" @@ -3019,7 +3111,9 @@ msgstr "Автоматическая активация внешней учетной записи" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/model/db.py:2321 +#: 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 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3042,7 +3136,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/model/db.py:2322 +#: 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 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3062,7 +3158,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/model/db.py:2296 +#: 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 msgid "RhodeCode Super Administrator" msgstr "" @@ -3079,7 +3177,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 -#: rhodecode/model/db.py:2338 +#: 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 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3096,7 +3196,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 -#: rhodecode/model/db.py:2339 +#: 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 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3104,7 +3206,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 rhodecode/model/db.py:913 +#: 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 msgid "all" msgstr "" @@ -3112,7 +3216,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 rhodecode/model/db.py:914 +#: 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 msgid "http/web interface" msgstr "" @@ -3120,7 +3226,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 rhodecode/model/db.py:915 +#: 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 msgid "vcs (git/hg/svn protocol)" msgstr "" @@ -3128,7 +3236,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 rhodecode/model/db.py:916 +#: 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 msgid "api calls" msgstr "" @@ -3136,7 +3246,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 rhodecode/model/db.py:917 +#: 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 msgid "feed access" msgstr "" @@ -3145,84 +3257,70 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 -#: rhodecode/model/db.py:2067 +#: 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 msgid "No parent" msgstr "" -#: rhodecode/lib/index/whoosh.py:148 +#: 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 +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 +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 +msgid "Password reset disabled" +msgstr "" + +#: rhodecode/lib/index/whoosh.py:149 msgid "Invalid search query. Try quoting it." msgstr "Недопустимый поисковый запрос. Попробуйте заключить его в кавычки." -#: rhodecode/lib/index/whoosh.py:150 +#: rhodecode/lib/index/whoosh.py:151 msgid "There is no index to search in. Please run whoosh indexer" msgstr "Индексы отсутствуют. Пожалуйста, запустите индексатор Whoosh." -#: rhodecode/lib/index/whoosh.py:155 +#: rhodecode/lib/index/whoosh.py:156 msgid "An error occurred during this search operation" msgstr "Произошла ошибка при выполнении этого поиска" -#: rhodecode/lib/index/whoosh.py:163 -msgid "Index Type" -msgstr "" - #: rhodecode/lib/index/whoosh.py:164 +msgid "Index Type" +msgstr "" + +#: rhodecode/lib/index/whoosh.py:165 msgid "File Index" msgstr "" -#: rhodecode/lib/index/whoosh.py:165 rhodecode/lib/index/whoosh.py:170 +#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171 msgid "Indexed documents" msgstr "" -#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172 +#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173 msgid "Last update" msgstr "" -#: rhodecode/lib/index/whoosh.py:169 +#: rhodecode/lib/index/whoosh.py:170 msgid "Commit index" msgstr "" -#: rhodecode/login/views.py:249 rhodecode/login/views.py:311 -msgid "Bad captcha" -msgstr "" - -#: rhodecode/login/views.py:258 -msgid "You have successfully registered with RhodeCode" -msgstr "Регистрация в RhodeCode прошла успешно" - -#: rhodecode/login/views.py:300 -msgid "Password reset has been disabled." -msgstr "" - -#: rhodecode/login/views.py:327 -msgid "Your password reset link was sent" -msgstr "Ссылка для сброса пароля отправлена" - -#: rhodecode/login/views.py:351 -msgid "" -"Your password reset was successful, a new password has been sent to your " -"email" -msgstr "Сброс пароля прошел успешно, новый пароль отправлен на ваш адрес электронной почты" - -#: rhodecode/model/comment.py:367 -msgid "made a comment" -msgstr "" - #: rhodecode/model/comment.py:368 +msgid "made a comment" +msgstr "" + +#: rhodecode/model/comment.py:369 msgid "Show it now" msgstr "" -#: rhodecode/model/db.py:2331 -msgid "Password reset enabled" -msgstr "" - -#: rhodecode/model/db.py:2332 -msgid "Password reset hidden" -msgstr "" - -#: rhodecode/model/db.py:2333 -msgid "Password reset disabled" -msgstr "" - #: rhodecode/model/forms.py:85 msgid "Please enter a login" msgstr "Пожалуйста, введите логин" @@ -3357,9 +3455,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:103 -#: rhodecode/templates/base/base.mako:406 -#: rhodecode/templates/base/base.mako:413 +#: rhodecode/templates/admin/users/users.mako:75 +#: rhodecode/templates/base/base.mako:409 +#: rhodecode/templates/base/base.mako:416 msgid "Admin" msgstr "Администратор" @@ -3390,74 +3488,74 @@ msgstr "" msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:77 +#: rhodecode/model/pull_request.py:78 msgid "This pull request can be automatically merged." msgstr "" -#: rhodecode/model/pull_request.py:79 +#: rhodecode/model/pull_request.py:80 msgid "This pull request cannot be merged because of an unhandled exception." msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:83 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:84 +#: rhodecode/model/pull_request.py:85 msgid "This pull request could not be merged because push to target failed." msgstr "" -#: rhodecode/model/pull_request.py:87 +#: rhodecode/model/pull_request.py:88 msgid "This pull request cannot be merged because the target is not a head." msgstr "" -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:91 msgid "" "This pull request cannot be merged because the source contains more branches" " than the target." msgstr "" -#: rhodecode/model/pull_request.py:93 +#: rhodecode/model/pull_request.py:94 msgid "" "This pull request cannot be merged because the target has multiple heads." msgstr "" -#: rhodecode/model/pull_request.py:96 +#: rhodecode/model/pull_request.py:97 msgid "" "This pull request cannot be merged because the target repository is locked." msgstr "" -#: rhodecode/model/pull_request.py:99 +#: rhodecode/model/pull_request.py:100 msgid "" "This pull request cannot be merged because the target or the source " "reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:102 +#: rhodecode/model/pull_request.py:103 msgid "" "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:105 +#: rhodecode/model/pull_request.py:106 msgid "" "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:108 +#: rhodecode/model/pull_request.py:109 msgid "" "This pull request cannot be merged because of conflicts related to sub " "repositories." msgstr "" -#: rhodecode/model/pull_request.py:114 +#: rhodecode/model/pull_request.py:115 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:116 +#: rhodecode/model/pull_request.py:117 msgid "Pull request update failed because of an unknown error." msgstr "" -#: rhodecode/model/pull_request.py:118 -msgid "No update needed because the source reference is already up to date." +#: rhodecode/model/pull_request.py:119 +msgid "No update needed because the source and target have not changed." msgstr "" #: rhodecode/model/pull_request.py:121 @@ -3488,51 +3586,51 @@ msgstr "" msgid "Pull request merged and closed" msgstr "" -#: rhodecode/model/pull_request.py:1041 +#: rhodecode/model/pull_request.py:1087 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1043 +#: rhodecode/model/pull_request.py:1089 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:1055 +#: rhodecode/model/pull_request.py:1101 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1073 +#: rhodecode/model/pull_request.py:1119 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1076 +#: rhodecode/model/pull_request.py:1122 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1233 rhodecode/model/scm.py:790 +#: rhodecode/model/pull_request.py:1279 rhodecode/model/scm.py:790 msgid "Bookmarks" msgstr "Закладки" -#: rhodecode/model/pull_request.py:1238 +#: rhodecode/model/pull_request.py:1284 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1241 +#: rhodecode/model/pull_request.py:1287 msgid "Closed Branches" msgstr "Закрытые ветки" -#: rhodecode/model/pull_request.py:1364 +#: rhodecode/model/pull_request.py:1411 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1375 +#: rhodecode/model/pull_request.py:1424 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1390 +#: rhodecode/model/pull_request.py:1439 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1393 +#: rhodecode/model/pull_request.py:1442 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" @@ -3540,36 +3638,36 @@ msgstr "" msgid "latest tip" msgstr "последняя версия" -#: rhodecode/model/user.py:125 +#: rhodecode/model/user.py:126 msgid "You can't Edit this user since it's crucial for entire application" msgstr "Вы не можете редактировать пользователя, поскольку это критично для работы всего приложения" -#: rhodecode/model/user.py:291 +#: rhodecode/model/user.py:292 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " "application" msgstr "" -#: rhodecode/model/user.py:464 +#: rhodecode/model/user.py:462 msgid "You can't remove this user since it's crucial for entire application" msgstr "Вы не можете удалить пользователя, поскольку это критично для работы всего приложения" -#: rhodecode/model/user.py:472 +#: rhodecode/model/user.py:470 #, 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:481 +#: rhodecode/model/user.py:479 #, 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:490 +#: rhodecode/model/user.py:488 #, python-format msgid "" "user \"%s\" still owns %s user groups and cannot be removed. Switch owners " @@ -3902,369 +4000,371 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:31198 -#: rhodecode/public/js/scripts.js:23046 +#: 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/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33129 -#: rhodecode/public/js/scripts.js:24977 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: 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/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33130 -#: rhodecode/public/js/scripts.js:24978 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: 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/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33131 -#: rhodecode/public/js/scripts.js:24979 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: 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/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33132 -#: rhodecode/public/js/scripts.js:24980 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: 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/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33133 -#: rhodecode/public/js/scripts.js:24981 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: 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/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33134 -#: rhodecode/public/js/scripts.js:24982 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: 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/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33154 -#: rhodecode/public/js/scripts.js:25002 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: 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/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33162 -#: rhodecode/public/js/scripts.js:25010 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: 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/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33174 -#: rhodecode/public/js/scripts.js:25022 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: 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/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33176 -#: rhodecode/public/js/scripts.js:25024 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: 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/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33180 -#: rhodecode/public/js/scripts.js:25028 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: 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/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33182 -#: rhodecode/public/js/scripts.js:25030 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: 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/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33184 -#: rhodecode/public/js/scripts.js:25032 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: 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/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47027 -#: rhodecode/public/js/scripts.js:38875 +#: 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/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47030 -#: rhodecode/public/js/scripts.js:38878 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: 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/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47033 -#: rhodecode/public/js/scripts.js:38881 +#: 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/select2/translations.js:10 msgid "No matches found" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47036 -#: rhodecode/public/js/scripts.js:38884 +#: 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/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47040 -#: rhodecode/public/js/scripts.js:38888 +#: 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/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47042 -#: rhodecode/public/js/scripts.js:38890 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: 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/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47047 -#: rhodecode/public/js/scripts.js:38895 +#: 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/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47049 -#: rhodecode/public/js/scripts.js:38897 +#: 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/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47054 -#: rhodecode/public/js/scripts.js:38902 +#: 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/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47056 -#: rhodecode/public/js/scripts.js:38904 +#: 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/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47060 -#: rhodecode/public/js/scripts.js:38908 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: 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/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47062 -#: rhodecode/public/js/scripts.js:38910 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: 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/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47991 -#: rhodecode/public/js/scripts.js:39839 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: 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/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47993 -#: rhodecode/public/js/scripts.js:39841 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: 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/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48426 -#: rhodecode/public/js/scripts.js:40274 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: 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/src/rhodecode/codemirror.js:296 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48445 -#: rhodecode/public/js/scripts.js:40293 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: 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/src/rhodecode/codemirror.js:315 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48464 -#: rhodecode/public/js/scripts.js:40312 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: 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/src/rhodecode/codemirror.js:334 +#: rhodecode/templates/email_templates/commit_comment.mako:99 +#: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48484 -#: rhodecode/public/js/scripts.js:40332 +#: 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/src/rhodecode/codemirror.js:354 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48848 -#: rhodecode/public/js/scripts.js:40696 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/comments.js:123 +#: 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/src/rhodecode/comments.js:125 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48927 -#: rhodecode/public/js/scripts.js:40775 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 -#: rhodecode/public/js/src/rhodecode/comments.js:202 +#: 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/src/rhodecode/comments.js:209 msgid "Status Review" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48941 -#: rhodecode/public/js/scripts.js:40789 +#: 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/src/rhodecode/comments.js:216 +#: rhodecode/public/js/src/rhodecode/comments.js:224 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49089 -#: rhodecode/public/js/scripts.js:40937 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/comments.js:364 +#: 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/src/rhodecode/comments.js:381 msgid "Submitting..." msgstr "Применение..." -#: rhodecode/public/js/rhodecode-components.js:49140 -#: rhodecode/public/js/scripts.js:40988 +#: 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/src/rhodecode/comments.js:415 +#: rhodecode/public/js/src/rhodecode/comments.js:432 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "Загрузка..." -#: rhodecode/public/js/rhodecode-components.js:49245 -#: rhodecode/public/js/scripts.js:41093 +#: 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/src/rhodecode/comments.js:520 +#: rhodecode/public/js/src/rhodecode/comments.js:537 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49316 -#: rhodecode/public/js/scripts.js:41164 +#: 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/src/rhodecode/comments.js:591 +#: 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:49393 -#: rhodecode/public/js/scripts.js:41241 +#: 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/src/rhodecode/comments.js:668 +#: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49507 -#: rhodecode/public/js/scripts.js:41355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 -#: rhodecode/public/js/src/rhodecode/comments.js:782 +#: 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/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49713 -#: rhodecode/public/js/scripts.js:41561 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: 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/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49715 -#: rhodecode/public/js/scripts.js:41563 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: 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/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49724 -#: rhodecode/public/js/scripts.js:41572 +#: 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/src/rhodecode/files.js:161 msgid "No matching files" msgstr "Нет совпадений" -#: rhodecode/public/js/rhodecode-components.js:49859 -#: rhodecode/public/js/scripts.js:41707 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: 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/src/rhodecode/files.js:296 msgid "Selection link" msgstr "Ссылка выбора" -#: rhodecode/public/js/rhodecode-components.js:49899 -#: rhodecode/public/js/scripts.js:41747 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: 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/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "Отменить наблюдение за репозиторием" -#: rhodecode/public/js/rhodecode-components.js:49900 -#: rhodecode/public/js/scripts.js:41748 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 +#: 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/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "Не наблюдать" -#: rhodecode/public/js/rhodecode-components.js:49909 -#: rhodecode/public/js/scripts.js:41757 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: 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/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "Наблюдать за репозиторием" -#: rhodecode/public/js/rhodecode-components.js:49910 -#: rhodecode/public/js/scripts.js:41758 +#: 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/src/rhodecode/followers.js:37 msgid "Follow" msgstr "Наблюдать" -#: rhodecode/public/js/rhodecode-components.js:50366 -#: rhodecode/public/js/scripts.js:42214 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:212 +#: 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 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50937 -#: rhodecode/public/js/scripts.js:42785 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: 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/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50957 -#: rhodecode/public/js/scripts.js:42805 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: 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/src/rhodecode.js:162 msgid "Show more" msgstr "Показать еще" @@ -4274,14 +4374,14 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:479 -#: rhodecode/templates/codeblocks/diffs.mako:484 +#: rhodecode/templates/codeblocks/diffs.mako:488 +#: rhodecode/templates/codeblocks/diffs.mako:493 msgid "Add another comment" msgstr "Добавить другой комментарий" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:320 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:325 msgid "Close" msgstr "" @@ -4339,81 +4439,102 @@ msgstr "Создать новый pull запрос" msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +msgid "Saving..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: 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:40 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 -msgid "Show selected commit __S" -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:48 -#: rhodecode/public/js/src/i18n_messages.js:7 -msgid "Switch to chat" -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 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: 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:54 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 -#: rhodecode/templates/admin/auth/auth_settings.mako:71 -msgid "disabled" -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" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 msgid "files" msgstr "файлы" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/templates/pullrequests/pullrequest.mako:108 +msgid "loading..." +msgstr "загрузка..." + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -msgid "{0} days" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +msgid "{0} out of {1} users" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 msgid "{0} years" msgstr "" +#: rhodecode/public/js/src/math_jax/extensions/HelpDialog.js:19 +msgid "HelpDialog" +msgstr "" + +#: rhodecode/public/js/src/math_jax/jax/output/HTML-CSS/autoload/mglyph.js:19 +msgid "MathML" +msgstr "" + #: rhodecode/public/js/vendors/webcomponentsjs/webcomponents.min.js:11 msgid "UIEvent" msgstr "" @@ -4430,10 +4551,6 @@ msgstr "" msgid "FocusEvent" msgstr "" -#: rhodecode/svn_support/events.py:30 -msgid "Configuration for Apaache mad_dav_svn changed." -msgstr "" - #: rhodecode/templates/index.mako:5 msgid "Dashboard" msgstr "Панель управления" @@ -4491,6 +4608,7 @@ msgstr "Изменить группу репозиториев" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:15 #: 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 #: rhodecode/templates/base/perms_summary.mako:102 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 @@ -4503,22 +4621,25 @@ msgstr "Имя" #: rhodecode/templates/index_base.mako:100 #: rhodecode/templates/index_base.mako:125 #: rhodecode/templates/admin/gists/index.mako:114 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:81 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 -#: rhodecode/templates/admin/repos/repo_add_base.mako:32 +#: 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/repos.mako:57 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 #: rhodecode/templates/admin/user_groups/user_groups.mako:57 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +#: 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/base/issue_tracker_settings.mako:10 #: rhodecode/templates/changeset/changeset.mako:53 #: rhodecode/templates/compare/compare_commits.mako:20 -#: rhodecode/templates/email_templates/commit_comment.mako:82 +#: 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 #: rhodecode/templates/files/file_tree_detail.mako:5 @@ -4526,8 +4647,8 @@ msgstr "Имя" #: rhodecode/templates/forks/fork.mako:48 #: rhodecode/templates/forks/forks_data.mako:9 #: rhodecode/templates/pullrequests/pullrequest.mako:47 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:158 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:163 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:460 #: rhodecode/templates/summary/components.mako:73 msgid "Description" msgstr "Описание" @@ -4542,7 +4663,8 @@ msgstr "Описание" #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/users/user_edit_groups.mako:65 #: rhodecode/templates/forks/forks_data.mako:7 #: rhodecode/templates/summary/components.mako:195 msgid "Owner" @@ -4563,9 +4685,9 @@ msgstr "Последнее изменение" #: rhodecode/templates/changelog/changelog_summary_data.mako:8 #: rhodecode/templates/changeset/changeset.mako:36 #: rhodecode/templates/compare/compare_commits.mako:18 -#: rhodecode/templates/email_templates/commit_comment.mako:45 -#: rhodecode/templates/email_templates/commit_comment.mako:81 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: 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/search/search_commit.mako:6 #: rhodecode/templates/tags/tags.mako:66 msgid "Commit" @@ -4580,45 +4702,45 @@ msgstr "" msgid "Home" msgstr "Домой" -#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:34 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:326 +#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:329 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "Войти" -#: rhodecode/templates/login.mako:36 +#: rhodecode/templates/login.mako:37 msgid "Go to the registration page to create a new account." msgstr "" -#: rhodecode/templates/login.mako:57 +#: rhodecode/templates/login.mako:58 msgid "Remember me" msgstr "Запомнить" -#: rhodecode/templates/login.mako:61 +#: rhodecode/templates/login.mako:62 msgid "Forgot your password?" msgstr "" -#: rhodecode/templates/login.mako:65 -#: rhodecode/templates/password_reset.mako:34 +#: rhodecode/templates/login.mako:66 +#: rhodecode/templates/password_reset.mako:35 msgid "Password reset is disabled. Please contact " msgstr "" -#: rhodecode/templates/login.mako:67 -#: rhodecode/templates/password_reset.mako:36 -#: rhodecode/templates/base/base.mako:43 -#: rhodecode/templates/errors/error_document.mako:64 -msgid "Support" -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 +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 msgid "or" msgstr "или" -#: rhodecode/templates/login.mako:70 -#: rhodecode/templates/password_reset.mako:39 +#: rhodecode/templates/login.mako:71 +#: rhodecode/templates/password_reset.mako:40 msgid "an administrator if you need help." msgstr "" @@ -4626,28 +4748,28 @@ msgstr "" msgid "Reset Password" msgstr "" -#: rhodecode/templates/password_reset.mako:46 +#: rhodecode/templates/password_reset.mako:47 msgid "Reset your Password" msgstr "" -#: rhodecode/templates/password_reset.mako:47 +#: rhodecode/templates/password_reset.mako:48 msgid "Go to the login page to sign in." msgstr "" -#: rhodecode/templates/password_reset.mako:51 +#: rhodecode/templates/password_reset.mako:52 msgid "Email Address" msgstr "Почтовый адрес" -#: rhodecode/templates/password_reset.mako:60 -#: rhodecode/templates/register.mako:84 +#: rhodecode/templates/password_reset.mako:61 +#: rhodecode/templates/register.mako:85 msgid "Captcha" msgstr "" -#: rhodecode/templates/password_reset.mako:70 -msgid "Send password reset email" -msgstr "" - #: rhodecode/templates/password_reset.mako:71 +msgid "Send password reset email" +msgstr "" + +#: rhodecode/templates/password_reset.mako:72 msgid "Password reset link will be sent to matching email address" msgstr "" @@ -4655,49 +4777,49 @@ msgstr "" msgid "Create an Account" msgstr "" -#: rhodecode/templates/register.mako:34 +#: rhodecode/templates/register.mako:35 msgid "Create an account" msgstr "" -#: rhodecode/templates/register.mako:35 +#: rhodecode/templates/register.mako:36 msgid "Go to the login page to sign in with an existing account." msgstr "" -#: rhodecode/templates/register.mako:54 +#: rhodecode/templates/register.mako:55 msgid "Re-enter password" msgstr "Повторите пароль" -#: rhodecode/templates/register.mako:61 +#: rhodecode/templates/register.mako:62 #: rhodecode/templates/admin/my_account/my_account_profile.mako:32 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:33 #: 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:94 +#: rhodecode/templates/admin/users/users.mako:66 msgid "First Name" msgstr "Имя" -#: rhodecode/templates/register.mako:68 +#: rhodecode/templates/register.mako:69 #: rhodecode/templates/admin/my_account/my_account_profile.mako:40 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:42 #: 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:96 +#: rhodecode/templates/admin/users/users.mako:68 msgid "Last Name" msgstr "Фамилия" -#: rhodecode/templates/register.mako:96 +#: rhodecode/templates/register.mako:97 msgid "Account activation requires admin approval." msgstr "" -#: rhodecode/templates/register.mako:103 +#: rhodecode/templates/register.mako:104 msgid "Create Account" msgstr "" #: rhodecode/templates/admin/admin.mako:5 #: rhodecode/templates/admin/admin.mako:15 -#: rhodecode/templates/base/base.mako:72 +#: rhodecode/templates/base/base.mako:75 msgid "Admin journal" msgstr "Журнал администратора" @@ -4706,6 +4828,7 @@ msgid "journal filter..." msgstr "Фильтр журнала..." #: rhodecode/templates/admin/admin.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "Отфильтровать" @@ -4720,31 +4843,38 @@ msgstr[2] "%s записи" msgstr[3] "%s записи" #: rhodecode/templates/admin/admin.mako:17 +#: rhodecode/templates/admin/users/user_edit_audit.mako:17 #: rhodecode/templates/journal/journal.mako:17 msgid "Example Queries" msgstr "" #: rhodecode/templates/admin/admin_log.mako:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 #: rhodecode/templates/admin/repos/repos.mako:69 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 -#: rhodecode/templates/admin/user_groups/user_groups.mako:66 -#: rhodecode/templates/admin/users/users.mako:107 -#: rhodecode/templates/files/files_detail.mako:63 +#: 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/files/files_detail.mako:58 msgid "Action" msgstr "Действие" #: rhodecode/templates/admin/admin_log.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/bookmarks/bookmarks.mako:61 #: rhodecode/templates/branches/branches.mako:60 #: rhodecode/templates/tags/tags.mako:61 @@ -4752,10 +4882,12 @@ 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 msgid "No actions yet" msgstr "Действия ещё не производились" @@ -4796,7 +4928,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:135 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 -#: rhodecode/templates/admin/repos/repo_add_base.mako:90 +#: 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 @@ -4806,6 +4938,7 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:120 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:102 #: rhodecode/templates/admin/users/user_add.mako:128 +#: rhodecode/templates/admin/users/user_edit_groups.mako:27 #: rhodecode/templates/admin/users/user_edit_profile.mako:134 #: rhodecode/templates/base/default_perms_box.mako:88 msgid "Save" @@ -4827,18 +4960,18 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/index.mako:110 #: rhodecode/templates/admin/integrations/list.mako:103 -#: rhodecode/templates/admin/repos/repo_add_base.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:75 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "Тип" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 -#: rhodecode/templates/admin/repos/repo_add_base.mako:82 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 msgid "Private Repository" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:86 +#: rhodecode/templates/admin/repos/repo_add_base.mako:97 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:112 #: rhodecode/templates/forks/fork.mako:87 msgid "" @@ -4904,7 +5037,7 @@ msgid "Update Gist" msgstr "" #: rhodecode/templates/admin/gists/edit.mako:102 -#: rhodecode/templates/base/issue_tracker_settings.mako:74 +#: rhodecode/templates/base/issue_tracker_settings.mako:73 #: rhodecode/templates/changeset/changeset_file_comment.mako:385 #: rhodecode/templates/codeblocks/diffs.mako:76 #: rhodecode/templates/files/files_add.mako:102 @@ -4980,8 +5113,8 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:180 #: rhodecode/templates/compare/compare_commits.mako:17 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:304 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:457 #: rhodecode/templates/pullrequests/pullrequests.mako:102 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/tags/tags.mako:63 @@ -5038,7 +5171,7 @@ msgstr "" #: rhodecode/templates/admin/gists/show.mako:56 #: rhodecode/templates/admin/integrations/list.mako:204 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 -#: rhodecode/templates/base/issue_tracker_settings.mako:61 +#: rhodecode/templates/base/issue_tracker_settings.mako:60 #: rhodecode/templates/data_table/_dt_elements.mako:118 #: rhodecode/templates/data_table/_dt_elements.mako:180 #: rhodecode/templates/data_table/_dt_elements.mako:193 @@ -5046,10 +5179,10 @@ msgstr "" #: rhodecode/templates/debug_style/buttons.html:128 #: rhodecode/templates/files/files_add.mako:204 #: rhodecode/templates/files/files_edit.mako:165 -#: rhodecode/templates/files/files_source.mako:38 -#: rhodecode/templates/files/files_source.mako:41 +#: 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:319 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:324 #: rhodecode/templates/users/user_profile.mako:7 msgid "Edit" msgstr "Редактировать" @@ -5068,7 +5201,7 @@ msgstr "создал" #: rhodecode/templates/admin/gists/show.mako:91 #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:87 msgid "Show as raw" msgstr "Показать без форматирования" @@ -5093,8 +5226,8 @@ msgstr "Группы репозиториев" #: rhodecode/templates/admin/repos/repo_edit.mako:43 #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 -#: rhodecode/templates/base/base.mako:81 -#: rhodecode/templates/base/base.mako:246 +#: rhodecode/templates/base/base.mako:84 +#: rhodecode/templates/base/base.mako:249 msgid "Settings" msgstr "Настройки" @@ -5126,6 +5259,8 @@ msgid "Create new integration" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:104 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14 msgid "Scope" msgstr "" @@ -5195,7 +5330,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:340 +#: rhodecode/templates/base/base.mako:343 msgid "My account" msgstr "Мой аккаунт" @@ -5204,10 +5339,11 @@ msgid "My Account" msgstr "Мой Аккаунт" #: rhodecode/templates/admin/my_account/my_account.mako:29 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 -msgid "My Profile" -msgstr "" +#: rhodecode/templates/email_templates/user_registration.mako:26 +#: rhodecode/templates/users/user.mako:29 +#: rhodecode/templates/users/user_profile.mako:5 +msgid "Profile" +msgstr "Профиль" #: rhodecode/templates/admin/my_account/my_account.mako:31 msgid "Auth Tokens" @@ -5218,12 +5354,9 @@ msgid "OAuth Identities" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:37 -msgid "My Emails" -msgstr "Мои Email-ы" - -#: rhodecode/templates/admin/my_account/my_account.mako:38 -msgid "My Repositories" -msgstr "Мои репозитории" +#: rhodecode/templates/admin/users/user_edit.mako:38 +msgid "Emails" +msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:39 msgid "Watched" @@ -5231,81 +5364,82 @@ msgstr "Просмотрено" #: rhodecode/templates/admin/my_account/my_account.mako:40 #: rhodecode/templates/admin/notifications/notifications.mako:33 -#: rhodecode/templates/base/base.mako:238 +#: rhodecode/templates/base/base.mako:241 msgid "Pull Requests" msgstr "Pull-request'ы" #: rhodecode/templates/admin/my_account/my_account.mako:41 -msgid "My Permissions" -msgstr "" +#: 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/user_groups/user_group_edit.mako:34 +#: rhodecode/templates/base/base.mako:80 +msgid "Permissions" +msgstr "Привилегии" #: rhodecode/templates/admin/my_account/my_account.mako:42 -msgid "My Live Notifications" +msgid "Live Notifications" msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:3 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 msgid "Authentication Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:7 -msgid "Built-in tokens can be used to authenticate with all possible options." -msgstr "" - #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:8 -msgid "" -"Each token can have a role. VCS tokens can be used together with the " -"authtoken auth plugin for git/hg/svn operations." -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:11 -msgid "Built-in" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:51 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:47 -msgid "expires" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:29 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:26 -#, python-format -msgid "Confirm to reset this auth token: %s" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 -msgid "expired" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:59 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:55 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:8 +msgid "" +"Each token can have a role. Token with a role can be used only in given " +"context, e.g. VCS tokens can be used together with the authtoken auth plugin" +" for git/hg/svn operations only." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:13 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:13 +msgid "Token" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:17 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:17 +msgid "Expiration" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:48 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:44 #, python-format msgid "Confirm to remove this auth token: %s" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:67 -msgid "No additional auth token specified" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:78 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:56 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:52 +msgid "No additional auth tokens specified" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:68 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:64 msgid "New authentication token" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:82 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +msgid "Repository scope works only with tokens with VCS type." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86 #: rhodecode/templates/admin/my_account/my_account_emails.mako:64 #: rhodecode/templates/admin/permissions/permissions_ips.mako:60 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:84 +#: 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 msgid "Add" msgstr "Добавить" +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:128 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:125 +msgid "repository scope" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_emails.mako:5 msgid "Account Emails" msgstr "" @@ -5359,6 +5493,11 @@ msgstr "" msgid "Source type" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 +msgid "My Profile" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_profile.mako:11 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:55 #: rhodecode/templates/admin/users/user_edit_profile.mako:25 @@ -5448,14 +5587,6 @@ msgstr "Уведомления" msgid "Permissions Administration" msgstr "" -#: 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/user_groups/user_group_edit.mako:34 -#: rhodecode/templates/base/base.mako:77 -msgid "Permissions" -msgstr "Привилегии" - #: rhodecode/templates/admin/permissions/permissions.mako:33 msgid "Application" msgstr "" @@ -5595,8 +5726,8 @@ msgstr "Добавить группу репозиториев" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:74 -#: rhodecode/templates/base/base.mako:148 +#: rhodecode/templates/base/base.mako:77 +#: rhodecode/templates/base/base.mako:151 msgid "Repository groups" msgstr "Группы репозиториев" @@ -5610,7 +5741,7 @@ msgid "Group Parent" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 -#: rhodecode/templates/admin/repos/repo_add_base.mako:55 +#: rhodecode/templates/admin/repos/repo_add_base.mako:66 msgid "Copy Parent Group Permissions" msgstr "" @@ -5731,7 +5862,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:107 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117 -#: rhodecode/templates/base/issue_tracker_settings.mako:84 +#: rhodecode/templates/base/issue_tracker_settings.mako:83 msgid "Add new" msgstr "Добавить новый" @@ -5794,52 +5925,48 @@ msgid "Import Existing Repository ?" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:193 +#: rhodecode/templates/base/base.mako:196 msgid "Clone from" msgstr "Клонировать из" -#: rhodecode/templates/admin/repos/repo_add_base.mako:27 -msgid "Optional http[s] URL from which to clone a repository." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_add_base.mako:36 +#: rhodecode/templates/admin/repos/repo_add_base.mako:47 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:102 #: rhodecode/templates/forks/fork.mako:52 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "Короткое и осмысленное. Для развернутого описания используйте файл README." -#: rhodecode/templates/admin/repos/repo_add_base.mako:41 +#: rhodecode/templates/admin/repos/repo_add_base.mako:52 msgid "Repository Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 +#: 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)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:50 +#: rhodecode/templates/admin/repos/repo_add_base.mako:61 #: rhodecode/templates/forks/fork.mako:67 msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:59 +#: rhodecode/templates/admin/repos/repo_add_base.mako:70 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:68 +#: rhodecode/templates/admin/repos/repo_add_base.mako:79 msgid "Set the type of repository to create." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:73 +#: rhodecode/templates/admin/repos/repo_add_base.mako:84 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:70 #: rhodecode/templates/forks/fork.mako:73 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:77 +#: rhodecode/templates/admin/repos/repo_add_base.mako:88 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." @@ -5883,7 +6010,16 @@ msgstr "Удалённый" msgid "Statistics" msgstr "Статистика" -#: rhodecode/templates/admin/repos/repo_edit.mako:87 +#: rhodecode/templates/admin/repos/repo_edit.mako:75 +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3 +msgid "Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:78 +msgid "Strip" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:93 msgid "Reviewers" msgstr "" @@ -5910,12 +6046,10 @@ msgid "This repository is a fork of %(re msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 -#: rhodecode/templates/admin/repos/repo_edit_fork.mako:5 msgid "Set" msgstr "Набор" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:39 -#: rhodecode/templates/admin/repos/repo_edit_fork.mako:9 msgid "Manually set this repository as a fork of another from the list" msgstr "Вручную сделать этот репозиторий форком выбранного из списка" @@ -6056,10 +6190,11 @@ msgstr "Ключ" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:37 #: 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:62 +#: 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:101 +#: rhodecode/templates/admin/users/users.mako:73 msgid "Active" msgstr "Активный" @@ -6135,6 +6270,23 @@ 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 +msgid "No maintenance tasks for this repo available" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:26 +msgid "Run Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:41 +msgid "Performing Maintenance" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:5 msgid "Repository Permissions" msgstr "" @@ -6155,16 +6307,21 @@ msgstr "" msgid "Remote mirror url" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 +#: 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 msgid "Pull changes from remote location" msgstr "Получить изменения с удалённой стороны" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:22 msgid "Confirm to pull changes from remote side" msgstr "Подтвердите скачивание изменений" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:19 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:27 msgid "This repository does not have any remote mirror url set." msgstr "" @@ -6288,11 +6445,80 @@ msgstr "" msgid "Confirm to remove current statistics" msgstr "Подтвердите сброс статистики" -#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:3 +msgid "Strip commits from repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:7 +#, python-format +msgid "Please provide up to %d commits commits to strip" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:9 +msgid "" +"In the first step commits will be verified for existance in the repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:10 +msgid "In the second step, correct commits will be available for stripping" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:16 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:52 +msgid "Enter full 40 character commit sha" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:18 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:54 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:95 +msgid "Add another commit" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:27 +msgid "Check commits" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:33 +msgid "Sorry this functionality is not available for SVN repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:46 +msgid "Remove" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:112 +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 +msgid " commit verified positive" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:131 +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" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:13 msgid "Select to inherit global vcs settings." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:45 +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:43 #: rhodecode/templates/admin/settings/settings_global.mako:139 #: rhodecode/templates/admin/settings/settings_labs.mako:48 #: rhodecode/templates/admin/settings/settings_vcs.mako:13 @@ -6829,8 +7055,8 @@ msgstr "Добавить группу пользователей" #: rhodecode/templates/admin/user_groups/user_group_add.mako:13 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:76 -#: rhodecode/templates/base/base.mako:151 +#: rhodecode/templates/base/base.mako:79 +#: rhodecode/templates/base/base.mako:154 msgid "User groups" msgstr "Группы пользователей" @@ -6871,30 +7097,72 @@ msgid "Members" msgstr "Участники" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:9 +msgid "Automatic member sync" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:11 msgid "Assigned to repositories" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:10 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:12 msgid "Assigned to repo groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:17 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:19 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6 #, python-format msgid "User Group: %s" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:26 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:29 +msgid "Group members sync" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:36 +msgid "This group is set to be automatically synchronised." +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 +msgid "This group is not set to be automatically synchronised" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51 +msgid "Disable synchronization" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53 +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 msgid "Delete User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:32 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:81 #, 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:34 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:83 msgid "Delete This User Group" msgstr "" @@ -6920,6 +7188,7 @@ msgid "No members yet" msgstr "Нет участников" #: rhodecode/templates/admin/user_groups/user_groups.mako:5 +#: rhodecode/templates/admin/users/user_edit_groups.mako:6 msgid "User groups administration" msgstr "Администрирование групп пользователей" @@ -6927,18 +7196,22 @@ msgstr "Администрирование групп пользователей" msgid "user groups" msgstr "" +#: rhodecode/templates/admin/user_groups/user_groups.mako:62 +msgid "Sync" +msgstr "" + #: rhodecode/templates/admin/users/user_add.mako:5 msgid "Add user" msgstr "Добавить пользователя" #: rhodecode/templates/admin/users/user_add.mako:13 #: rhodecode/templates/admin/users/user_edit.mako:14 -#: rhodecode/templates/base/base.mako:75 +#: rhodecode/templates/base/base.mako:78 msgid "Users" msgstr "Пользователи" #: rhodecode/templates/admin/users/user_add.mako:15 -#: rhodecode/templates/admin/users/users.mako:27 +#: rhodecode/templates/admin/users/users.mako:28 msgid "Add User" msgstr "" @@ -6990,14 +7263,18 @@ msgstr "" msgid "Auth tokens" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:38 -msgid "Emails" -msgstr "" - #: rhodecode/templates/admin/users/user_edit.mako:39 msgid "Ip Whitelist" msgstr "" +#: rhodecode/templates/admin/users/user_edit.mako:40 +msgid "User Groups Management" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.mako:41 +msgid "User audit" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 #: rhodecode/templates/admin/users/user_edit_profile.mako:106 msgid "Source of Record" @@ -7008,7 +7285,7 @@ msgid "Last login" msgstr "Последний вход" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 -#: rhodecode/templates/admin/users/users.mako:99 +#: rhodecode/templates/admin/users/users.mako:71 msgid "Last activity" msgstr "" @@ -7123,22 +7400,23 @@ msgid "" "will delete the user's repositories!" msgstr "" -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 -msgid "Authentication Access Tokens" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:63 -msgid "No additional auth tokens specified" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:75 -msgid "New auth token" +#: rhodecode/templates/admin/users/user_edit_audit.mako:7 +msgid "User Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +msgid "audit filter..." msgstr "" #: rhodecode/templates/admin/users/user_edit_emails.mako:5 msgid "Additional Email Addresses" msgstr "" +#: rhodecode/templates/admin/users/user_edit_groups.mako:12 +#, python-format +msgid "Add `%s` to user group" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_ips.mako:3 msgid "Custom IP Whitelist" msgstr "" @@ -7195,98 +7473,98 @@ msgstr "" msgid "Users administration" msgstr "Администрирование пользователей" -#: rhodecode/templates/admin/users/users.mako:105 +#: rhodecode/templates/admin/users/users.mako:77 msgid "Auth type" msgstr "" -#: rhodecode/templates/base/base.mako:50 +#: rhodecode/templates/base/base.mako:53 #, python-format msgid "RhodeCode instance id: %s" msgstr "" -#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:81 msgid "Authentication" msgstr "Аутентификация" -#: rhodecode/templates/base/base.mako:80 +#: rhodecode/templates/base/base.mako:83 msgid "Defaults" msgstr "Значения по умолчанию" -#: rhodecode/templates/base/base.mako:98 +#: rhodecode/templates/base/base.mako:101 #: rhodecode/templates/files/files_pjax.mako:24 #: rhodecode/templates/summary/components.mako:42 msgid "Show More" msgstr "" -#: rhodecode/templates/base/base.mako:185 +#: rhodecode/templates/base/base.mako:188 msgid "Fork of" msgstr "Форк от" -#: rhodecode/templates/base/base.mako:202 +#: rhodecode/templates/base/base.mako:205 #, python-format msgid "Repository locked by %(user)s" msgstr "" -#: rhodecode/templates/base/base.mako:207 +#: rhodecode/templates/base/base.mako:210 msgid "Repository not locked. Pull repository to lock it." msgstr "" -#: rhodecode/templates/base/base.mako:225 +#: rhodecode/templates/base/base.mako:228 #: rhodecode/templates/data_table/_dt_elements.mako:12 #: rhodecode/templates/data_table/_dt_elements.mako:13 #: rhodecode/templates/data_table/_dt_elements.mako:153 msgid "Summary" msgstr "Общие сведения" -#: rhodecode/templates/base/base.mako:226 +#: rhodecode/templates/base/base.mako:229 #: rhodecode/templates/data_table/_dt_elements.mako:17 #: rhodecode/templates/data_table/_dt_elements.mako:18 msgid "Changelog" msgstr "История изменений" -#: rhodecode/templates/base/base.mako:227 +#: rhodecode/templates/base/base.mako:230 #: rhodecode/templates/data_table/_dt_elements.mako:22 #: rhodecode/templates/data_table/_dt_elements.mako:23 #: rhodecode/templates/files/files.mako:15 msgid "Files" msgstr "Файлы" -#: rhodecode/templates/base/base.mako:229 +#: rhodecode/templates/base/base.mako:232 #: rhodecode/templates/bookmarks/bookmarks.mako:68 #: rhodecode/templates/branches/branches.mako:67 #: rhodecode/templates/tags/tags.mako:68 msgid "Compare" msgstr "Сравнить" -#: rhodecode/templates/base/base.mako:234 +#: rhodecode/templates/base/base.mako:237 #, python-format msgid "Show Pull Requests for %s" msgstr "Показать pull-request'ы для %s" -#: rhodecode/templates/base/base.mako:243 +#: rhodecode/templates/base/base.mako:246 msgid "Options" msgstr "Опции" -#: rhodecode/templates/base/base.mako:250 +#: rhodecode/templates/base/base.mako:253 #: rhodecode/templates/forks/forks_data.mako:30 msgid "Compare fork" msgstr "Сравнить форк" -#: rhodecode/templates/base/base.mako:253 -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:256 +#: rhodecode/templates/base/base.mako:403 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "Поиск" -#: rhodecode/templates/base/base.mako:257 +#: rhodecode/templates/base/base.mako:260 msgid "Unlock" msgstr "Разблокировать" -#: rhodecode/templates/base/base.mako:259 +#: rhodecode/templates/base/base.mako:262 msgid "Lock" msgstr "Заблокировать" -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:267 #: rhodecode/templates/data_table/_dt_elements.mako:27 #: rhodecode/templates/data_table/_dt_elements.mako:28 #: rhodecode/templates/forks/forks_data.mako:8 @@ -7298,77 +7576,77 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/base/base.mako:265 +#: rhodecode/templates/base/base.mako:268 msgid "Create Pull Request" msgstr "Создать Pull запрос" -#: rhodecode/templates/base/base.mako:287 +#: rhodecode/templates/base/base.mako:290 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:295 +#: rhodecode/templates/base/base.mako:298 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:312 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:322 +#: 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:342 +#: rhodecode/templates/base/base.mako:345 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:346 +#: rhodecode/templates/base/base.mako:349 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:382 +#: rhodecode/templates/base/base.mako:385 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:383 +#: rhodecode/templates/base/base.mako:386 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:14 msgid "Journal" msgstr "Журнал" -#: rhodecode/templates/base/base.mako:388 +#: rhodecode/templates/base/base.mako:391 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:389 +#: rhodecode/templates/base/base.mako:392 msgid "Public journal" msgstr "Общедоступный журнал" -#: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/base/base.mako:397 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:395 +#: rhodecode/templates/base/base.mako:398 msgid "Gists" msgstr "Gist" -#: rhodecode/templates/base/base.mako:399 +#: rhodecode/templates/base/base.mako:402 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:408 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:412 +#: rhodecode/templates/base/base.mako:415 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:422 -#: rhodecode/templates/base/base.mako:423 +#: rhodecode/templates/base/base.mako:425 +#: rhodecode/templates/base/base.mako:426 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7390,15 +7668,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:480 +#: rhodecode/templates/base/base.mako:483 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:533 +#: rhodecode/templates/base/base.mako:536 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:541 +#: rhodecode/templates/base/base.mako:544 msgid "Site-wide shortcuts" msgstr "" @@ -7467,9 +7745,7 @@ msgid "User Group Creation" msgstr "" #: rhodecode/templates/base/default_perms_box.mako:72 -msgid "" -"Permission to allow user group creation. When disabled, user group admins " -"can still create subgroups within their user groups." +msgid "Permission to allow user group creation." msgstr "" #: rhodecode/templates/base/default_perms_box.mako:78 @@ -7494,19 +7770,19 @@ msgid "" "permission by members of user groups." msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:22 +#: rhodecode/templates/base/issue_tracker_settings.mako:21 msgid "Read more" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:92 +#: rhodecode/templates/base/issue_tracker_settings.mako:91 msgid "New Entry" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:96 +#: rhodecode/templates/base/issue_tracker_settings.mako:95 msgid "Confirm to remove this pattern:" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:192 +#: 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 @@ -7516,7 +7792,7 @@ msgstr "" msgid "Preview" msgstr "Предпросмотр" -#: rhodecode/templates/base/issue_tracker_settings.mako:193 +#: rhodecode/templates/base/issue_tracker_settings.mako:192 msgid "Test Pattern Preview" msgstr "" @@ -7664,101 +7940,130 @@ msgstr "" msgid "Enable largefiles extension" msgstr "Включить поддержку больших файлов" -#: rhodecode/templates/base/vcs_settings.mako:99 +#: rhodecode/templates/base/vcs_settings.mako:100 msgid "Enable Largefiles extensions for all repositories." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:103 +#: rhodecode/templates/base/vcs_settings.mako:102 +msgid "Enable Largefiles extensions for this repository." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:113 +msgid "" +"Filesystem location where Mercurial largefile objects should be stored." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:119 msgid "Set repositories as publishing" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:103 +#: rhodecode/templates/base/vcs_settings.mako:119 msgid "Set repository as publishing" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:106 +#: rhodecode/templates/base/vcs_settings.mako:122 msgid "" "When this is enabled all commits in the repository are seen as public " "commits by clients." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:111 +#: rhodecode/templates/base/vcs_settings.mako:127 msgid "Enable hgsubversion extension" msgstr "Включить поддержку hgsubversion" -#: rhodecode/templates/base/vcs_settings.mako:114 +#: rhodecode/templates/base/vcs_settings.mako:130 msgid "" "Requires hgsubversion library to be installed. Allows cloning remote SVN " "repositories and migrates them to Mercurial type." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:123 +#: rhodecode/templates/base/vcs_settings.mako:139 msgid "Mercurial Labs Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:123 +#: rhodecode/templates/base/vcs_settings.mako:139 msgid "" "These features are considered experimental and may not work as expected." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:129 +#: rhodecode/templates/base/vcs_settings.mako:145 msgid "Use rebase as merge strategy" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:132 +#: rhodecode/templates/base/vcs_settings.mako:148 msgid "" "Use rebase instead of creating a merge commit when merging via web " "interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:144 +#: rhodecode/templates/base/vcs_settings.mako:160 +msgid "Git Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:165 +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 "Filesystem location where Git lfs objects should be stored." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:193 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:150 +#: rhodecode/templates/base/vcs_settings.mako:199 msgid "Proxy subversion HTTP requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:154 +#: 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:155 +#: rhodecode/templates/base/vcs_settings.mako:204 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:161 +#: rhodecode/templates/base/vcs_settings.mako:210 msgid "Subversion HTTP Server URL" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:167 +#: rhodecode/templates/base/vcs_settings.mako:216 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:179 +#: rhodecode/templates/base/vcs_settings.mako:228 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:184 +#: rhodecode/templates/base/vcs_settings.mako:233 msgid "Repository patterns" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:188 +#: rhodecode/templates/base/vcs_settings.mako:237 msgid "" "Patterns for identifying SVN branches and tags. For recursive search, use " "\"*\". Eg.: \"/branches/*\"" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:254 +#: rhodecode/templates/base/vcs_settings.mako:301 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:259 +#: rhodecode/templates/base/vcs_settings.mako:306 msgid "Enable server-side merge for pull requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:262 +#: rhodecode/templates/base/vcs_settings.mako:309 msgid "" "Note: when this feature is enabled, it only runs hooks defined in the " "rcextension package. Custom hooks added on the Admin -> Settings -> Hooks " @@ -7766,11 +8071,11 @@ msgid "" "web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:266 +#: rhodecode/templates/base/vcs_settings.mako:313 msgid "Invalidate and relocate inline comments during update" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:269 +#: rhodecode/templates/base/vcs_settings.mako:316 msgid "" "During the update of a pull request, the position of inline comments will be" " updated and outdated inline comments will be hidden." @@ -7909,7 +8214,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:53 #: rhodecode/templates/compare/compare_commits.mako:46 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:495 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" @@ -8002,8 +8307,8 @@ msgid "Diff options" msgstr "" #: rhodecode/templates/changeset/changeset.mako:119 -#: rhodecode/templates/codeblocks/diffs.mako:436 -#: rhodecode/templates/codeblocks/diffs.mako:439 +#: rhodecode/templates/codeblocks/diffs.mako:445 +#: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "Отобразить в формате diff" @@ -8020,8 +8325,8 @@ msgid "Patch Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:127 -#: rhodecode/templates/codeblocks/diffs.mako:443 -#: rhodecode/templates/codeblocks/diffs.mako:446 +#: rhodecode/templates/codeblocks/diffs.mako:452 +#: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "Скачать diff" @@ -8031,7 +8336,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:145 #: rhodecode/templates/changeset/changeset.mako:147 -#: rhodecode/tests/functional/test_commit_comments.py:270 +#: rhodecode/tests/functional/test_commit_comments.py:275 #, python-format msgid "%d Commit comment" msgid_plural "%d Commit comments" @@ -8042,7 +8347,7 @@ msgstr[3] "" #: rhodecode/templates/changeset/changeset.mako:150 #: rhodecode/templates/changeset/changeset.mako:152 -#: rhodecode/tests/functional/test_commit_comments.py:277 +#: rhodecode/tests/functional/test_commit_comments.py:282 #, python-format msgid "%d Inline Comment" msgid_plural "%d Inline Comments" @@ -8150,18 +8455,16 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:363 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:148 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:153 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "Закрыто" -#: rhodecode/templates/changeset/changeset_file_comment.mako:388 +#: rhodecode/templates/changeset/changeset_file_comment.mako:393 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 #: rhodecode/templates/compare/compare_diff.mako:122 -#: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:97 msgid "Comment" msgstr "Комментировать" @@ -8198,7 +8501,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_range.mako:99 #: rhodecode/templates/compare/compare_diff.mako:312 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:414 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:419 #, python-format msgid "Expand %s commit" msgid_plural "Expand %s commits" @@ -8209,7 +8512,7 @@ msgstr[3] "" #: rhodecode/templates/changeset/changeset_range.mako:105 #: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 #, python-format msgid "Collapse %s commit" msgid_plural "Collapse %s commits" @@ -8319,64 +8622,68 @@ msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:406 -#: rhodecode/templates/codeblocks/diffs.mako:422 +#: rhodecode/templates/codeblocks/diffs.mako:415 +#: rhodecode/templates/codeblocks/diffs.mako:431 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:408 -#: rhodecode/templates/codeblocks/diffs.mako:415 +#: rhodecode/templates/codeblocks/diffs.mako:417 +#: rhodecode/templates/codeblocks/diffs.mako:424 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:413 -#: rhodecode/templates/codeblocks/diffs.mako:429 +#: rhodecode/templates/codeblocks/diffs.mako:422 +#: rhodecode/templates/codeblocks/diffs.mako:438 #, python-format msgid "File no longer present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:424 -#: rhodecode/templates/codeblocks/diffs.mako:431 +#: rhodecode/templates/codeblocks/diffs.mako:433 +#: rhodecode/templates/codeblocks/diffs.mako:440 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:462 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:462 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:634 +#: rhodecode/templates/codeblocks/diffs.mako:643 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:636 +#: rhodecode/templates/codeblocks/diffs.mako:645 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:640 +#: rhodecode/templates/codeblocks/diffs.mako:649 msgid "View unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:641 +#: rhodecode/templates/codeblocks/diffs.mako:650 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:651 +#: rhodecode/templates/codeblocks/diffs.mako:660 msgid "Expand All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:655 +#: rhodecode/templates/codeblocks/diffs.mako:664 msgid "Collapse All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:659 +#: rhodecode/templates/codeblocks/diffs.mako:668 msgid "Wide Mode Diff" msgstr "" +#: rhodecode/templates/codeblocks/source.mako:24 +msgid "view annotation from before this change" +msgstr "" + #: rhodecode/templates/compare/compare_commits.mako:5 msgid "Common Ancestor Commit" msgstr "" @@ -8386,7 +8693,7 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:16 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:451 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:456 msgid "Time" msgstr "" @@ -8400,7 +8707,7 @@ msgstr[2] "" msgstr[3] "" #: rhodecode/templates/compare/compare_commits.mako:68 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:568 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:573 msgid "show it" msgid_plural "show them" msgstr[0] "" @@ -8440,14 +8747,14 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:98 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:103 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.mako:76 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 -#: rhodecode/templates/files/files_source.mako:20 +#: rhodecode/templates/files/files_source.mako:23 msgid "Source" msgstr "Исходный код" @@ -8672,133 +8979,150 @@ msgstr "" msgid "RhodeCode" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:16 -#: rhodecode/templates/email_templates/pull_request_comment.mako:18 +#: rhodecode/templates/email_templates/commit_comment.mako:18 +#: rhodecode/templates/email_templates/pull_request_comment.mako:19 msgid "[mention]" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:19 -#, python-format -msgid "" -"%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:19 -#: rhodecode/templates/email_templates/commit_comment.mako:22 +#: rhodecode/templates/email_templates/commit_comment.mako:21 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on commit `%(commit_id)s` (file: " +"`%(comment_file)s`)" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:24 +#: rhodecode/templates/email_templates/commit_comment.mako:26 #, python-format msgid "in the %(repo_name)s repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:22 -#, python-format -msgid "%(user)s commented on commit `%(commit_id)s` (status: %(status)s)" -msgstr "" - #: rhodecode/templates/email_templates/commit_comment.mako:24 -#: rhodecode/templates/email_templates/commit_comment.mako:78 -#, python-format -msgid "%(user)s commented on commit `%(commit_id)s`" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:43 -#: rhodecode/templates/email_templates/pull_request_comment.mako:44 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on commit `%(commit_id)s` (status: " +"%(status)s)" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:26 +#, python-format +msgid "%(user)s left %(comment_type)s on commit `%(commit_id)s`" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:47 +#: rhodecode/templates/email_templates/pull_request_comment.mako:47 msgid "Comment link" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:48 -#: rhodecode/templates/email_templates/pull_request_comment.mako:49 +#: rhodecode/templates/email_templates/commit_comment.mako:52 +#: rhodecode/templates/email_templates/pull_request_comment.mako:52 #, python-format msgid "File: %(comment_file)s on line %(comment_line)s" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:54 +#: rhodecode/templates/email_templates/commit_comment.mako:58 msgid "Commit status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:76 +#: rhodecode/templates/email_templates/commit_comment.mako:82 #, python-format msgid "%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:76 -#: rhodecode/templates/email_templates/commit_comment.mako:78 +#: rhodecode/templates/email_templates/commit_comment.mako:82 +#: rhodecode/templates/email_templates/commit_comment.mako:84 #, python-format msgid "in the %(repo)s repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:85 +#: rhodecode/templates/email_templates/commit_comment.mako:84 +#, python-format +msgid "%(user)s commented on commit `%(commit_id)s`" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:92 +#: rhodecode/templates/email_templates/pull_request_comment.mako:94 msgid "Status" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:85 +#: rhodecode/templates/email_templates/commit_comment.mako:93 msgid "The commit status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:97 -#, python-format -msgid "Comment on line: %(comment_line)s" -msgstr "" - -#: rhodecode/templates/email_templates/password_reset.mako:30 +#: rhodecode/templates/email_templates/commit_comment.mako:99 +#: rhodecode/templates/email_templates/pull_request_comment.mako:107 +#, python-format +msgid "TODO comment on line: %(comment_line)s" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:101 +#: rhodecode/templates/email_templates/pull_request_comment.mako:109 +#, python-format +msgid "Note comment on line: %(comment_line)s" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:101 +#: rhodecode/templates/email_templates/pull_request_comment.mako:109 +msgid "Note comment" +msgstr "" + +#: rhodecode/templates/email_templates/password_reset.mako:31 msgid "Generate new password here" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:21 -#, python-format -msgid "" -"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: " -"`%(comment_file)s`)" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:24 -#, python-format -msgid "" -"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: " -"%(status)s)" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:26 -#: rhodecode/templates/email_templates/pull_request_comment.mako:83 -#, python-format -msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:46 +#: rhodecode/templates/email_templates/pull_request_comment.mako:22 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\" " +"(file: `%(comment_file)s`)" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:25 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\" " +"(status: %(status)s)" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:27 +#, python-format +msgid "%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:49 msgid "Source repository" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:55 +#: rhodecode/templates/email_templates/pull_request_comment.mako:58 #, python-format msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:57 +#: rhodecode/templates/email_templates/pull_request_comment.mako:60 #, python-format msgid "" "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:81 +#: rhodecode/templates/email_templates/pull_request_comment.mako:84 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" " "(file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:87 -#, python-format -msgid "submitted pull request status: %(status)s" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:89 -#, python-format -msgid "submitted pull request status: %(status)s and closed" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:95 -msgid "Submitted status" +#: rhodecode/templates/email_templates/pull_request_comment.mako:86 +#, python-format +msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 +msgid "Closed pull request with status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:99 +msgid "Submitted review status" msgstr "" #: rhodecode/templates/email_templates/pull_request_review.mako:14 @@ -8869,12 +9193,6 @@ msgstr "" msgid "Full Name" msgstr "" -#: rhodecode/templates/email_templates/user_registration.mako:26 -#: rhodecode/templates/users/user.mako:29 -#: rhodecode/templates/users/user_profile.mako:5 -msgid "Profile" -msgstr "Профиль" - #: rhodecode/templates/errors/error_document.mako:46 #, python-format msgid "You will be redirected to %s in %s seconds" @@ -9033,13 +9351,13 @@ msgid "Delete file" msgstr "" #: rhodecode/templates/files/files_delete.mako:45 -#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:65 #, python-format msgid "Binary file (%s)" msgstr "Бинарный файл (%s)" #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:87 msgid "File is too big to display" msgstr "Файл слишком большой для отображения" @@ -9052,19 +9370,19 @@ msgstr "" msgid "Commit Description" msgstr "" -#: rhodecode/templates/files/files_detail.mako:35 +#: rhodecode/templates/files/files_detail.mako:32 msgid "File last commit" msgstr "" -#: rhodecode/templates/files/files_detail.mako:51 +#: rhodecode/templates/files/files_detail.mako:46 msgid "Show/Diff file" msgstr "" -#: rhodecode/templates/files/files_detail.mako:66 +#: rhodecode/templates/files/files_detail.mako:61 msgid "Diff to Commit" msgstr "" -#: rhodecode/templates/files/files_detail.mako:67 +#: rhodecode/templates/files/files_detail.mako:62 msgid "Show at Commit" msgstr "" @@ -9106,7 +9424,15 @@ msgstr "Редактирование файла" msgid "Location" msgstr "Расположение" -#: rhodecode/templates/files/files_source.mako:7 +#: rhodecode/templates/files/files_source.mako:8 +msgid "This file is a pointer to large binary file" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:8 +msgid "LargeFile" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:10 #: rhodecode/templates/search/search_content.mako:57 msgid "line" msgid_plural "lines" @@ -9115,65 +9441,51 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/files/files_source.mako:14 +#: rhodecode/templates/files/files_source.mako:17 msgid "History" msgstr "История" -#: rhodecode/templates/files/files_source.mako:17 +#: rhodecode/templates/files/files_source.mako:20 #: rhodecode/templates/search/search_content.mako:68 msgid "Show Full History" msgstr "" -#: rhodecode/templates/files/files_source.mako:22 +#: rhodecode/templates/files/files_source.mako:25 #: rhodecode/templates/search/search_content.mako:70 msgid "Annotation" msgstr "" -#: rhodecode/templates/files/files_source.mako:24 +#: rhodecode/templates/files/files_source.mako:27 #: rhodecode/templates/search/search_content.mako:71 msgid "Raw" msgstr "" -#: rhodecode/templates/files/files_source.mako:26 +#: rhodecode/templates/files/files_source.mako:31 +msgid "Download largefile" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:35 #: rhodecode/templates/search/search_content.mako:73 msgid "Download" msgstr "Скачать" -#: rhodecode/templates/files/files_source.mako:33 +#: rhodecode/templates/files/files_source.mako:43 #, python-format msgid "Edit on Branch:%s" msgstr "" -#: rhodecode/templates/files/files_source.mako:38 +#: rhodecode/templates/files/files_source.mako:48 msgid "Editing binary files not allowed" msgstr "" -#: rhodecode/templates/files/files_source.mako:41 +#: rhodecode/templates/files/files_source.mako:51 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_source.mako:52 msgid "Deleting files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/followers/followers.mako:5 -#: rhodecode/templates/followers/followers.mako:27 -#, python-format -msgid "%s Followers" -msgstr "%s Наблюдатели" - -#: rhodecode/templates/followers/followers.mako:12 -msgid "Followers" -msgstr "Наблюдатели" - -#: rhodecode/templates/followers/followers_data.mako:5 -msgid "Follower Name" -msgstr "" - -#: rhodecode/templates/followers/followers_data.mako:6 -msgid "Following Since" -msgstr "" - #: rhodecode/templates/forks/fork.mako:5 #, python-format msgid "Fork repository %s" @@ -9254,51 +9566,47 @@ msgstr "Общая лента журнала RSS" msgid "New pull request" msgstr "Новый pull запрос" -#: rhodecode/templates/pullrequests/pullrequest.mako:52 +#: rhodecode/templates/pullrequests/pullrequest.mako:51 msgid "Write a short description on this pull request" msgstr "Написать короткое писание по этому запросу" -#: rhodecode/templates/pullrequests/pullrequest.mako:59 +#: rhodecode/templates/pullrequests/pullrequest.mako:57 msgid "Commit flow" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:67 +#: rhodecode/templates/pullrequests/pullrequest.mako:65 msgid "Origin repository" msgstr "Первоначальный репозиторий" -#: rhodecode/templates/pullrequests/pullrequest.mako:85 +#: rhodecode/templates/pullrequests/pullrequest.mako:83 msgid "Loading refs..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:96 +#: rhodecode/templates/pullrequests/pullrequest.mako:94 msgid "Submit Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:109 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:317 +#: rhodecode/templates/pullrequests/pullrequest.mako:107 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:322 msgid "Pull request reviewers" msgstr "Рецензенты запросов на внесение изменений Pull request" -#: rhodecode/templates/pullrequests/pullrequest.mako:110 -msgid "loading..." -msgstr "загрузка..." - -#: rhodecode/templates/pullrequests/pullrequest.mako:120 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:361 +#: rhodecode/templates/pullrequests/pullrequest.mako:118 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:366 msgid "Add reviewer" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:299 -#: rhodecode/templates/pullrequests/pullrequest.mako:572 +#: rhodecode/templates/pullrequests/pullrequest.mako:297 +#: rhodecode/templates/pullrequests/pullrequest.mako:570 msgid "Please select origin and destination" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:305 +#: rhodecode/templates/pullrequests/pullrequest.mako:303 msgid "Loading compare ..." msgstr "" +#: rhodecode/templates/pullrequests/pullrequest.mako:350 #: rhodecode/templates/pullrequests/pullrequest.mako:352 -#: rhodecode/templates/pullrequests/pullrequest.mako:354 msgid "This pull request will consist of __COMMITS__ commit." msgid_plural "This pull request will consist of __COMMITS__ commits." msgstr[0] "" @@ -9306,48 +9614,53 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/pullrequests/pullrequest.mako:357 +#: rhodecode/templates/pullrequests/pullrequest.mako:355 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:364 +#: rhodecode/templates/pullrequests/pullrequest.mako:362 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:464 +#: rhodecode/templates/pullrequests/pullrequest.mako:462 msgid "Destination repository" msgstr "Репозиторий назначения" -#: rhodecode/templates/pullrequests/pullrequest.mako:475 +#: rhodecode/templates/pullrequests/pullrequest.mako:473 msgid "Select commit reference" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:8 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:7 msgid "This pull request can be merged automatically." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:13 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:12 msgid "Merge is not currently possible because of below failed checks." msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:37 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:42 +msgid "refresh checks" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:38 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 -msgid "refresh checks" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:39 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:44 msgid "Merge Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:44 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 msgid "You are not allowed to merge this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:46 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:45 msgid "Login to Merge this Pull Request" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:54 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 +msgid "Close with status {}" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show.mako:5 #, python-format msgid "%s Pull Request #%s" @@ -9365,19 +9678,23 @@ msgstr "Подтвердите удаление этого pull-request'а" msgid "Origin" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:120 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:88 +msgid "Common ancestor" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:125 msgid "Merge" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:133 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:138 msgid "Shadow repository data not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:141 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:146 msgid "Review" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:157 #, python-format msgid "calculated based on %s reviewer vote" msgid_plural "calculated based on %s reviewers votes" @@ -9386,12 +9703,12 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:170 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:175 msgid "Versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:183 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:186 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:188 msgid "{} version available for this pull request, show it." msgid_plural "{} versions available for this pull request, show them." msgstr[0] "" @@ -9399,141 +9716,141 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:182 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:187 msgid "Hide all versions of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:207 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:212 msgid "Your review status at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:213 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:218 msgid "Comment from pull request version {0}, general:{1} inline:{2}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:230 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:234 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:235 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:239 msgid "select versions to show changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:231 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:236 msgid "show changes between versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:232 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:237 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:247 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:252 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:251 -msgid "Comments for this pull request" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:256 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 +msgid "Comments for this pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:261 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:263 #, python-format msgid "%d General " msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:264 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:267 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:269 #, python-format msgid "%d Inline" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:268 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:272 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:273 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 #, python-format msgid "%d Outdated" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:269 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:274 msgid "show outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:270 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:281 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:286 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:295 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:365 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:300 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:370 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:382 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:387 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:383 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:388 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:391 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:396 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 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:393 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 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:404 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:409 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:427 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:432 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:440 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:445 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:444 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:449 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:462 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:464 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:469 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:567 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:572 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:570 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:575 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:571 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:576 msgid "show them" msgstr "" 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 @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-02-05 17:11+0100\n" -"PO-Revision-Date: 2017-02-01 20:10+0000\n" +"POT-Creation-Date: 2017-04-07 12:33+0200\n" +"PO-Revision-Date: 2017-04-07 10:34+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Chinese (http://www.transifex.com/rhodecode/RhodeCode/language/zh/)\n" "MIME-Version: 1.0\n" @@ -21,51 +21,52 @@ msgstr "" "Language: zh\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: rhodecode/admin/navigation.py:83 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:167 +#: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 +#: rhodecode/integrations/views.py:166 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "" -#: rhodecode/admin/navigation.py:84 +#: rhodecode/apps/admin/navigation.py:84 #: rhodecode/templates/admin/repos/repo_edit.mako:52 msgid "VCS" msgstr "" -#: rhodecode/admin/navigation.py:85 +#: rhodecode/apps/admin/navigation.py:85 msgid "Visual" msgstr "" -#: rhodecode/admin/navigation.py:86 +#: rhodecode/apps/admin/navigation.py:86 msgid "Remap and Rescan" msgstr "" -#: rhodecode/admin/navigation.py:87 +#: rhodecode/apps/admin/navigation.py:87 #: rhodecode/templates/admin/repos/repo_edit.mako:58 msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:89 rhodecode/integrations/types/email.py:232 -#: rhodecode/templates/register.mako:75 +#: rhodecode/apps/admin/navigation.py:89 +#: rhodecode/integrations/types/email.py:232 +#: rhodecode/templates/register.mako:76 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: 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:92 +#: rhodecode/templates/admin/users/users.mako:64 #: rhodecode/templates/email_templates/user_registration.mako:25 #: rhodecode/templates/users/user_profile.mako:51 msgid "Email" msgstr "电子邮件" -#: rhodecode/admin/navigation.py:90 +#: rhodecode/apps/admin/navigation.py:90 msgid "Hooks" msgstr "钩子" -#: rhodecode/admin/navigation.py:91 +#: rhodecode/apps/admin/navigation.py:91 msgid "Full Text Search" msgstr "" -#: rhodecode/admin/navigation.py:93 +#: rhodecode/apps/admin/navigation.py:93 #: rhodecode/templates/admin/integrations/base.mako:23 #: rhodecode/templates/admin/integrations/form.mako:8 #: rhodecode/templates/admin/integrations/form.mako:21 @@ -79,177 +80,290 @@ msgstr "" #: 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/base/base.mako:79 +#: rhodecode/templates/base/base.mako:82 msgid "Integrations" msgstr "" -#: rhodecode/admin/navigation.py:95 +#: rhodecode/apps/admin/navigation.py:95 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" msgstr "" -#: rhodecode/admin/navigation.py:97 +#: rhodecode/apps/admin/navigation.py:97 msgid "User Sessions" msgstr "" -#: rhodecode/admin/navigation.py:99 +#: rhodecode/apps/admin/navigation.py:99 msgid "Open Source Licenses" msgstr "" -#: rhodecode/admin/navigation.py:107 +#: rhodecode/apps/admin/navigation.py:107 msgid "Labs" msgstr "" -#: rhodecode/admin/views/sessions.py:90 +#: rhodecode/apps/admin/views/sessions.py:86 msgid "Cleaned up old sessions" msgstr "" -#: rhodecode/admin/views/sessions.py:96 +#: rhodecode/apps/admin/views/sessions.py:92 msgid "Failed to cleanup up old sessions" msgstr "" -#: rhodecode/admin/views/svn_config.py:47 +#: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." msgstr "" -#: rhodecode/admin/views/svn_config.py:55 +#: rhodecode/apps/admin/views/svn_config.py:54 msgid "Failed to generate the Apache configuration for Subversion." msgstr "" -#: rhodecode/admin/views/system_info.py:96 +#: rhodecode/apps/admin/views/system_info.py:95 msgid "" "Note: please make sure this server can access `${url}` for the update link " "to work" msgstr "" -#: rhodecode/admin/views/system_info.py:99 +#: rhodecode/apps/admin/views/system_info.py:98 msgid "Update info" msgstr "" -#: rhodecode/admin/views/system_info.py:101 +#: rhodecode/apps/admin/views/system_info.py:100 msgid "Check for updates" msgstr "" -#: rhodecode/admin/views/system_info.py:106 +#: rhodecode/apps/admin/views/system_info.py:105 msgid "RhodeCode Version" msgstr "" -#: rhodecode/admin/views/system_info.py:107 +#: rhodecode/apps/admin/views/system_info.py:106 msgid "RhodeCode Server IP" msgstr "" -#: rhodecode/admin/views/system_info.py:108 +#: rhodecode/apps/admin/views/system_info.py:107 msgid "RhodeCode Server ID" msgstr "" -#: rhodecode/admin/views/system_info.py:109 +#: rhodecode/apps/admin/views/system_info.py:108 msgid "RhodeCode Configuration" msgstr "" -#: rhodecode/admin/views/system_info.py:113 +#: rhodecode/apps/admin/views/system_info.py:109 +msgid "Workers" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:110 +msgid "Worker Type" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:114 msgid "Database" msgstr "" -#: rhodecode/admin/views/system_info.py:114 +#: rhodecode/apps/admin/views/system_info.py:115 msgid "Database version" msgstr "" -#: rhodecode/admin/views/system_info.py:118 +#: rhodecode/apps/admin/views/system_info.py:119 msgid "Platform" msgstr "" -#: rhodecode/admin/views/system_info.py:119 +#: rhodecode/apps/admin/views/system_info.py:120 msgid "Platform UUID" msgstr "" -#: rhodecode/admin/views/system_info.py:120 +#: rhodecode/apps/admin/views/system_info.py:121 msgid "Python version" msgstr "" -#: rhodecode/admin/views/system_info.py:121 +#: rhodecode/apps/admin/views/system_info.py:122 msgid "Python path" msgstr "" -#: rhodecode/admin/views/system_info.py:125 +#: rhodecode/apps/admin/views/system_info.py:126 msgid "CPU" msgstr "" -#: rhodecode/admin/views/system_info.py:126 +#: rhodecode/apps/admin/views/system_info.py:127 msgid "Load" msgstr "" -#: rhodecode/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:128 msgid "Memory" msgstr "" -#: rhodecode/admin/views/system_info.py:128 +#: rhodecode/apps/admin/views/system_info.py:129 msgid "Uptime" msgstr "" -#: rhodecode/admin/views/system_info.py:132 +#: rhodecode/apps/admin/views/system_info.py:133 msgid "Storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:135 msgid "Storage inodes" msgstr "" -#: rhodecode/admin/views/system_info.py:136 +#: rhodecode/apps/admin/views/system_info.py:137 msgid "Gist storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:137 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Gist storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:139 +#: rhodecode/apps/admin/views/system_info.py:140 msgid "Archive cache storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:140 +#: rhodecode/apps/admin/views/system_info.py:141 msgid "Archive cache info" msgstr "" -#: rhodecode/admin/views/system_info.py:142 +#: rhodecode/apps/admin/views/system_info.py:143 msgid "Temp storage location" msgstr "" -#: rhodecode/admin/views/system_info.py:143 +#: rhodecode/apps/admin/views/system_info.py:144 msgid "Temp storage info" msgstr "" -#: rhodecode/admin/views/system_info.py:145 +#: rhodecode/apps/admin/views/system_info.py:146 msgid "Search info" msgstr "" -#: rhodecode/admin/views/system_info.py:146 +#: rhodecode/apps/admin/views/system_info.py:147 msgid "Search location" msgstr "" -#: rhodecode/admin/views/system_info.py:150 +#: rhodecode/apps/admin/views/system_info.py:151 msgid "VCS Backends" msgstr "" -#: rhodecode/admin/views/system_info.py:151 +#: rhodecode/apps/admin/views/system_info.py:152 msgid "VCS Server" msgstr "" -#: rhodecode/admin/views/system_info.py:152 +#: rhodecode/apps/admin/views/system_info.py:153 msgid "GIT" msgstr "" -#: rhodecode/admin/views/system_info.py:153 +#: rhodecode/apps/admin/views/system_info.py:154 msgid "HG" msgstr "" -#: rhodecode/admin/views/system_info.py:154 +#: rhodecode/apps/admin/views/system_info.py:155 msgid "SVN" msgstr "" +#: rhodecode/apps/admin/views/users.py:60 +#: rhodecode/controllers/admin/users.py:359 +#: rhodecode/controllers/admin/users.py:380 +#: 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/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/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 +msgid "Auth token successfully created" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:240 +#: rhodecode/apps/my_account/views.py:192 +msgid "Auth token successfully deleted" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:284 +msgid "Groups successfully changed" +msgstr "" + +#: rhodecode/apps/login/views.py:247 rhodecode/apps/login/views.py:316 +msgid "Bad captcha" +msgstr "" + +#: rhodecode/apps/login/views.py:256 +msgid "You have successfully registered with RhodeCode" +msgstr "" + +#: rhodecode/apps/login/views.py:292 +msgid "If such email exists, a password reset link was sent to it." +msgstr "" + +#: rhodecode/apps/login/views.py:298 +msgid "Password reset has been disabled." +msgstr "" + +#: rhodecode/apps/login/views.py:381 +msgid "Given reset token is invalid" +msgstr "" + +#: rhodecode/apps/login/views.py:389 +msgid "" +"Your password reset was successful, a new password has been sent to your " +"email" +msgstr "" + +#: rhodecode/apps/my_account/views.py:115 +msgid "Error occurred during update of user password" +msgstr "" + +#: rhodecode/apps/my_account/views.py:122 +msgid "Successfully updated password" +msgstr "" + +#: rhodecode/apps/svn_support/events.py:30 +msgid "Configuration for Apaache mad_dav_svn changed." +msgstr "" + #: rhodecode/authentication/schema.py:35 msgid "Enable or disable this authentication plugin." msgstr "" @@ -265,12 +379,11 @@ msgstr "启用" #: rhodecode/authentication/schema.py:43 msgid "" -"Amount of seconds to cache the authentication call for this plugin. Useful " -"for long calls like LDAP to improve the responsiveness of the authentication" -" system (0 means disabled)." -msgstr "" - -#: rhodecode/authentication/schema.py:48 +"Amount of seconds to cache the authentication responsecall for this plugin. \n" +"Useful for long calls like LDAP to improve the performance of the authentication system (0 means disabled)." +msgstr "" + +#: rhodecode/authentication/schema.py:49 msgid "Auth Cache TTL" msgstr "" @@ -291,99 +404,101 @@ msgstr "" msgid "Error occurred during update of auth settings." msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:61 +#: rhodecode/authentication/plugins/auth_crowd.py:60 msgid "The FQDN or IP of the Atlassian CROWD Server" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:63 +#: rhodecode/authentication/plugins/auth_crowd.py:62 msgid "Host" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:68 +#: rhodecode/authentication/plugins/auth_crowd.py:67 msgid "The Port in use by the Atlassian CROWD Server" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:70 +#: rhodecode/authentication/plugins/auth_crowd.py:69 #: rhodecode/authentication/plugins/auth_ldap.py:84 msgid "Port" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:76 +#: rhodecode/authentication/plugins/auth_crowd.py:75 msgid "The Application Name to authenticate to CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:78 +#: rhodecode/authentication/plugins/auth_crowd.py:77 msgid "Application Name" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:83 +#: rhodecode/authentication/plugins/auth_crowd.py:82 msgid "The password to authenticate to CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:85 +#: rhodecode/authentication/plugins/auth_crowd.py:84 msgid "Application Password" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:90 +#: rhodecode/authentication/plugins/auth_crowd.py:89 msgid "" "A comma separated list of group names that identify users as RhodeCode " "Administrators" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:94 +#: rhodecode/authentication/plugins/auth_crowd.py:93 msgid "Admin Groups" msgstr "" -#: rhodecode/authentication/plugins/auth_crowd.py:216 +#: rhodecode/authentication/plugins/auth_crowd.py:215 msgid "CROWD" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:55 +#: rhodecode/authentication/plugins/auth_headers.py:54 msgid "Header to extract the user from" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:57 +#: rhodecode/authentication/plugins/auth_headers.py:56 msgid "Header" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:62 +#: rhodecode/authentication/plugins/auth_headers.py:61 msgid "Header to extract the user from when main one fails" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:64 +#: rhodecode/authentication/plugins/auth_headers.py:63 msgid "Fallback header" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:69 +#: rhodecode/authentication/plugins/auth_headers.py:68 msgid "" "Perform cleaning of user, if passed user has @ in username then first part " "before @ is taken. If there's \\ in the username only the part after \\ is " "taken" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:74 +#: rhodecode/authentication/plugins/auth_headers.py:73 msgid "Clean username" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:99 +#: rhodecode/authentication/plugins/auth_headers.py:98 msgid "Headers" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:63 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:62 msgid "The url of the Jasig CAS REST service" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:65 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:64 #: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" msgstr "" -#: rhodecode/authentication/plugins/auth_jasig_cas.py:93 +#: rhodecode/authentication/plugins/auth_jasig_cas.py:92 msgid "Jasig-CAS" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:75 -msgid "Host of the LDAP Server" +#: 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 @@ -391,107 +506,117 @@ msgid "LDAP Host" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:82 -msgid "Port that the LDAP server is listening on" +msgid "Custom port that the LDAP server is listening on. Default: 389" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:90 -msgid "User to connect to LDAP" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:93 +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 msgid "Account" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:98 -msgid "Password to connect to LDAP" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:101 -#: rhodecode/templates/login.mako:49 rhodecode/templates/register.mako:47 +#: rhodecode/authentication/plugins/auth_ldap.py:100 +msgid "Password to authenticate for given user DN." +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:103 +#: 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:310 +#: rhodecode/templates/base/base.mako:313 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "密码" -#: rhodecode/authentication/plugins/auth_ldap.py:106 +#: rhodecode/authentication/plugins/auth_ldap.py:108 msgid "TLS Type" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:107 +#: rhodecode/authentication/plugins/auth_ldap.py:109 msgid "Connection Security" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:113 +#: rhodecode/authentication/plugins/auth_ldap.py:115 msgid "Require Cert over TLS?" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:114 +#: rhodecode/authentication/plugins/auth_ldap.py:116 msgid "Certificate Checks" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:120 -msgid "Base DN to search (e.g., dc=mydomain,dc=com)" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:123 +#: rhodecode/authentication/plugins/auth_ldap.py:122 +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 msgid "Base DN" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:128 -msgid "Filter to narrow results (e.g., ou=Users, etc)" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:131 -msgid "LDAP Search Filter" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:136 -msgid "How deep to search LDAP" +#: rhodecode/authentication/plugins/auth_ldap.py:132 +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 -msgid "LDAP Search Scope" +msgid "LDAP Search Filter" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:143 -msgid "LDAP Attribute to map to user name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:145 +msgid "How deep to search LDAP. If unsure set to SUBTREE" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:144 +msgid "LDAP Search Scope" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:150 +msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:152 msgid "Login Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:146 +#: rhodecode/authentication/plugins/auth_ldap.py:153 msgid "The LDAP Login attribute of the CN must be specified" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:151 -msgid "LDAP Attribute to map to first name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:154 +#: rhodecode/authentication/plugins/auth_ldap.py:158 +msgid "LDAP Attribute to map to first name (e.g., givenName)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:161 msgid "First Name Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:159 -msgid "LDAP Attribute to map to last name" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:162 +#: rhodecode/authentication/plugins/auth_ldap.py:166 +msgid "LDAP Attribute to map to last name (e.g., sn)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:169 msgid "Last Name Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:167 -msgid "LDAP Attribute to map to email address" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:170 +#: rhodecode/authentication/plugins/auth_ldap.py:174 +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 msgid "Email Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:351 +#: rhodecode/authentication/plugins/auth_ldap.py:360 msgid "LDAP" msgstr "" @@ -516,16 +641,16 @@ msgstr "" msgid "PAM" msgstr "" -#: rhodecode/authentication/plugins/auth_rhodecode.py:68 +#: rhodecode/authentication/plugins/auth_rhodecode.py:67 msgid "Rhodecode" msgstr "" -#: rhodecode/authentication/plugins/auth_token.py:71 +#: rhodecode/authentication/plugins/auth_token.py:70 msgid "Rhodecode Token Auth" msgstr "" #: rhodecode/controllers/changelog.py:91 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:202 +#: rhodecode/controllers/pullrequests.py:204 msgid "There are no commits yet" msgstr "" @@ -559,8 +684,8 @@ msgid "No such commit exists for this re msgstr "" #: rhodecode/controllers/changeset.py:344 -#: rhodecode/controllers/pullrequests.py:948 -#: rhodecode/model/pull_request.py:1009 +#: rhodecode/controllers/pullrequests.py:985 +#: rhodecode/model/pull_request.py:1055 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" @@ -600,12 +725,12 @@ msgid "" "%(repo1)s with commit %(commit2)s from repository %(repo2)s." msgstr "" -#: rhodecode/controllers/feed.py:70 +#: rhodecode/controllers/feed.py:69 #, python-format msgid "Changes on %s repository" msgstr "%s库的修改" -#: rhodecode/controllers/feed.py:71 +#: rhodecode/controllers/feed.py:70 #, python-format msgid "%s %s feed" msgstr "%s %s订阅" @@ -619,93 +744,93 @@ msgstr "" msgid "There are no files yet. %s" msgstr "" -#: rhodecode/controllers/files.py:394 rhodecode/controllers/files.py:447 -#: rhodecode/controllers/files.py:478 rhodecode/controllers/files.py:553 -#: rhodecode/controllers/files.py:598 rhodecode/controllers/files.py:689 +#: 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 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:402 rhodecode/controllers/files.py:455 +#: rhodecode/controllers/files.py:443 rhodecode/controllers/files.py:496 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:411 rhodecode/controllers/files.py:464 +#: rhodecode/controllers/files.py:452 rhodecode/controllers/files.py:505 #, python-format msgid "Deleted file %s via RhodeCode Enterprise" msgstr "" -#: rhodecode/controllers/files.py:431 +#: rhodecode/controllers/files.py:472 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:540 -#: rhodecode/controllers/files.py:677 +#: rhodecode/controllers/files.py:475 rhodecode/controllers/files.py:581 +#: rhodecode/controllers/files.py:718 msgid "Error occurred during commit" msgstr "提交时发生错误" -#: rhodecode/controllers/files.py:486 rhodecode/controllers/files.py:561 +#: rhodecode/controllers/files.py:527 rhodecode/controllers/files.py:602 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:498 rhodecode/controllers/files.py:573 +#: rhodecode/controllers/files.py:539 rhodecode/controllers/files.py:614 #, python-format msgid "Edited file %s via RhodeCode Enterprise" msgstr "" -#: rhodecode/controllers/files.py:515 +#: rhodecode/controllers/files.py:556 msgid "No changes" msgstr "无变更" -#: rhodecode/controllers/files.py:537 rhodecode/controllers/files.py:666 +#: rhodecode/controllers/files.py:578 rhodecode/controllers/files.py:707 #, python-format msgid "Successfully committed to %s" msgstr "成功提交到%s" -#: rhodecode/controllers/files.py:611 rhodecode/controllers/files.py:700 +#: rhodecode/controllers/files.py:652 rhodecode/controllers/files.py:741 msgid "Added file via RhodeCode Enterprise" msgstr "" -#: rhodecode/controllers/files.py:636 +#: rhodecode/controllers/files.py:677 msgid "No filename" msgstr "无文件名" -#: rhodecode/controllers/files.py:669 +#: 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:723 +#: rhodecode/controllers/files.py:764 msgid "Downloads disabled" msgstr "" -#: rhodecode/controllers/files.py:729 +#: rhodecode/controllers/files.py:770 #, python-format msgid "Unknown revision %s" msgstr "未知版本%s" -#: rhodecode/controllers/files.py:731 +#: rhodecode/controllers/files.py:772 msgid "Empty repository" msgstr "空版本库" -#: rhodecode/controllers/files.py:733 rhodecode/controllers/files.py:767 +#: rhodecode/controllers/files.py:774 rhodecode/controllers/files.py:808 msgid "Unknown archive type" msgstr "未知包类型" -#: rhodecode/controllers/files.py:952 +#: rhodecode/controllers/files.py:993 msgid "Changesets" msgstr "修订集" -#: rhodecode/controllers/files.py:973 rhodecode/controllers/summary.py:269 -#: rhodecode/model/pull_request.py:1234 rhodecode/model/scm.py:782 -#: rhodecode/templates/base/vcs_settings.mako:193 +#: 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:977 rhodecode/model/scm.py:797 -#: rhodecode/templates/base/vcs_settings.mako:218 +#: rhodecode/controllers/files.py:1018 rhodecode/model/scm.py:797 +#: rhodecode/templates/base/vcs_settings.mako:267 msgid "Tags" msgstr "标签" @@ -714,23 +839,24 @@ msgstr "标签" msgid "An error occurred during repository forking %s" msgstr "在复刻版本库%s的时候发生错误" -#: rhodecode/controllers/home.py:205 +#: rhodecode/controllers/home.py:207 msgid "Groups" msgstr "组" -#: rhodecode/controllers/home.py:212 rhodecode/controllers/home.py:247 -#: rhodecode/controllers/pullrequests.py:308 +#: 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:73 -#: rhodecode/templates/base/base.mako:145 -#: rhodecode/templates/base/base.mako:569 +#: 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:225 +#: rhodecode/controllers/home.py:227 #, python-format msgid "Commits in %(repo)s" msgstr "" @@ -743,81 +869,81 @@ msgstr "公共日志" msgid "journal" msgstr "日志" -#: rhodecode/controllers/pullrequests.py:216 +#: rhodecode/controllers/pullrequests.py:218 msgid "Commit does not exist" msgstr "" -#: rhodecode/controllers/pullrequests.py:333 -msgid "Pull request requires a title with min. 3 chars" -msgstr "拉取请求的标题至少3个字符" - #: rhodecode/controllers/pullrequests.py:335 +msgid "Pull request requires a title with min. 3 chars" +msgstr "拉取请求的标题至少3个字符" + +#: rhodecode/controllers/pullrequests.py:337 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/controllers/pullrequests.py:383 +#: rhodecode/controllers/pullrequests.py:385 msgid "Successfully opened new pull request" msgstr "成功提交拉取请求" -#: rhodecode/controllers/pullrequests.py:386 +#: rhodecode/controllers/pullrequests.py:388 msgid "Error occurred during sending pull request" msgstr "提交拉取请求时发生错误" -#: rhodecode/controllers/pullrequests.py:429 +#: rhodecode/controllers/pullrequests.py:431 msgid "Cannot update closed pull requests." msgstr "" -#: rhodecode/controllers/pullrequests.py:435 +#: rhodecode/controllers/pullrequests.py:437 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/controllers/pullrequests.py:443 +#: rhodecode/controllers/pullrequests.py:455 msgid "" "Pull request updated to \"{source_commit_id}\" with {count_added} added, " -"{count_removed} removed commits." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:458 +"{count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:472 msgid "Reload page" msgstr "" -#: rhodecode/controllers/pullrequests.py:532 +#: rhodecode/controllers/pullrequests.py:546 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/controllers/pullrequests.py:569 +#: rhodecode/controllers/pullrequests.py:588 msgid "Successfully deleted pull request" msgstr "成功删除拉取请求" -#: rhodecode/controllers/pullrequests.py:864 -msgid "Close Pull Request" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:952 -#: rhodecode/model/pull_request.py:1013 +#: rhodecode/controllers/pullrequests.py:592 +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:1002 +#: 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:243 +#: rhodecode/controllers/summary.py:251 msgid "Branch" msgstr "" -#: rhodecode/controllers/summary.py:244 +#: rhodecode/controllers/summary.py:252 msgid "Tag" msgstr "" -#: rhodecode/controllers/summary.py:245 +#: rhodecode/controllers/summary.py:253 msgid "Bookmark" msgstr "" -#: rhodecode/controllers/summary.py:270 +#: rhodecode/controllers/summary.py:278 msgid "Closed branches" msgstr "" @@ -829,42 +955,6 @@ msgstr "默认设置已经成功更新" msgid "Error occurred during update of default values" msgstr "" -#: rhodecode/controllers/admin/gists.py:62 -#: rhodecode/controllers/admin/my_account.py:384 -#: rhodecode/controllers/admin/users.py:465 -msgid "forever" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:63 -#: rhodecode/controllers/admin/my_account.py:385 -#: rhodecode/controllers/admin/users.py:466 -msgid "5 minutes" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:64 -#: rhodecode/controllers/admin/my_account.py:386 -#: rhodecode/controllers/admin/users.py:467 -msgid "1 hour" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:65 -#: rhodecode/controllers/admin/my_account.py:387 -#: rhodecode/controllers/admin/users.py:468 -msgid "1 day" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:66 -#: rhodecode/controllers/admin/my_account.py:388 -#: rhodecode/controllers/admin/users.py:469 -msgid "1 month" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:70 -#: rhodecode/controllers/admin/my_account.py:390 -#: rhodecode/controllers/admin/users.py:471 -msgid "Lifetime" -msgstr "" - #: rhodecode/controllers/admin/gists.py:72 msgid "Requires registered account" msgstr "" @@ -901,10 +991,8 @@ msgstr "" #: rhodecode/controllers/admin/gists.py:343 #: rhodecode/templates/admin/gists/show.mako:67 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 #: rhodecode/templates/data_table/_dt_elements.mako:263 msgid "never" msgstr "" @@ -914,65 +1002,36 @@ msgstr "" msgid "%(expiry)s - current value" msgstr "" -#: rhodecode/controllers/admin/my_account.py:80 +#: rhodecode/controllers/admin/my_account.py:78 msgid "You can't edit this user since it's crucial for entire application" msgstr "由于是系统帐号，无法编辑该用户" -#: rhodecode/controllers/admin/my_account.py:140 +#: rhodecode/controllers/admin/my_account.py:138 msgid "Your account was updated successfully" msgstr "你的帐号已经更新完成" -#: rhodecode/controllers/admin/my_account.py:155 -#: rhodecode/controllers/admin/users.py:231 +#: rhodecode/controllers/admin/my_account.py:153 +#: rhodecode/controllers/admin/users.py:184 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/my_account.py:221 -#: rhodecode/controllers/admin/my_account.py:227 -msgid "Error occurred during update of user password" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:234 -msgid "Successfully updated password" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:278 -#: rhodecode/controllers/admin/users.py:645 +#: 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:285 -#: rhodecode/controllers/admin/users.py:652 +#: 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:295 -#: rhodecode/controllers/admin/users.py:667 +#: rhodecode/controllers/admin/my_account.py:239 +#: rhodecode/controllers/admin/users.py:549 msgid "Removed email address from user account" msgstr "" -#: rhodecode/controllers/admin/my_account.py:393 -#: rhodecode/controllers/admin/users.py:474 -msgid "Role" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:406 -#: rhodecode/controllers/admin/users.py:498 -msgid "Auth token successfully created" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:419 -#: rhodecode/controllers/admin/users.py:517 -msgid "Auth token successfully reset" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:423 -#: rhodecode/controllers/admin/users.py:521 -msgid "Auth token successfully deleted" -msgstr "" - #: rhodecode/controllers/admin/permissions.py:112 msgid "Application permissions updated successfully" msgstr "" @@ -1034,7 +1093,7 @@ msgid "Error occurred during deletion of msgstr "" #: rhodecode/controllers/admin/repo_groups.py:388 -#: rhodecode/controllers/admin/user_groups.py:322 +#: rhodecode/controllers/admin/user_groups.py:323 msgid "Cannot change permission for yourself as admin" msgstr "" @@ -1186,18 +1245,18 @@ msgid "Error occurred during deleting is msgstr "" #: rhodecode/controllers/admin/repos.py:728 -#: rhodecode/controllers/admin/settings.py:380 +#: rhodecode/controllers/admin/settings.py:381 msgid "Removed issue tracker entry" msgstr "" #: rhodecode/controllers/admin/repos.py:758 -#: rhodecode/controllers/admin/settings.py:427 +#: rhodecode/controllers/admin/settings.py:428 msgid "Updated issue tracker entries" msgstr "" #: rhodecode/controllers/admin/repos.py:819 #: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:618 +#: rhodecode/controllers/admin/settings.py:619 msgid "Some form inputs contain invalid data." msgstr "" @@ -1206,281 +1265,277 @@ msgid "Error occurred during updating re msgstr "" #: rhodecode/controllers/admin/repos.py:841 -#: rhodecode/controllers/admin/settings.py:175 +#: rhodecode/controllers/admin/settings.py:176 msgid "Updated VCS settings" msgstr "成功更新版本控制系统设置" -#: rhodecode/controllers/admin/settings.py:171 -#: rhodecode/controllers/admin/settings.py:282 +#: rhodecode/controllers/admin/settings.py:172 +#: rhodecode/controllers/admin/settings.py:283 msgid "Error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:222 +#: rhodecode/controllers/admin/settings.py:223 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:278 +#: rhodecode/controllers/admin/settings.py:279 msgid "Updated application settings" msgstr "更新应用设置" -#: rhodecode/controllers/admin/settings.py:344 +#: rhodecode/controllers/admin/settings.py:345 msgid "Updated visualisation settings" msgstr "成功更新可视化设置" -#: rhodecode/controllers/admin/settings.py:347 +#: rhodecode/controllers/admin/settings.py:348 msgid "Error occurred during updating visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:440 +#: rhodecode/controllers/admin/settings.py:441 msgid "Please enter email address" msgstr "" -#: rhodecode/controllers/admin/settings.py:458 +#: rhodecode/controllers/admin/settings.py:459 msgid "Send email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:491 +#: rhodecode/controllers/admin/settings.py:492 msgid "Added new hook" msgstr "新建钩子" -#: rhodecode/controllers/admin/settings.py:506 +#: rhodecode/controllers/admin/settings.py:507 msgid "Updated hooks" msgstr "更新钩子" -#: rhodecode/controllers/admin/settings.py:510 +#: rhodecode/controllers/admin/settings.py:511 msgid "Error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:639 +#: rhodecode/controllers/admin/settings.py:640 msgid "Error occurred during updating labs settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:644 +#: rhodecode/controllers/admin/settings.py:645 msgid "Updated Labs settings" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:164 +#: rhodecode/controllers/admin/user_groups.py:165 #, python-format msgid "Created user group %(user_group_link)s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:178 +#: rhodecode/controllers/admin/user_groups.py:179 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:219 +#: rhodecode/controllers/admin/user_groups.py:220 #, python-format msgid "Updated user group %s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:235 +#: rhodecode/controllers/admin/user_groups.py:236 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:257 +#: rhodecode/controllers/admin/user_groups.py:258 msgid "Successfully deleted user group" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:262 +#: rhodecode/controllers/admin/user_groups.py:263 msgid "An error occurred during deletion of user group" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:330 +#: rhodecode/controllers/admin/user_groups.py:331 msgid "Target group cannot be the same" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:336 +#: rhodecode/controllers/admin/user_groups.py:337 msgid "User Group permissions updated" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:421 +#: rhodecode/controllers/admin/user_groups.py:422 msgid "User Group global permissions updated successfully" msgstr "" #: rhodecode/controllers/admin/user_groups.py:437 -#: rhodecode/controllers/admin/users.py:595 +#: rhodecode/controllers/admin/users.py:477 msgid "An error occurred during permissions saving" msgstr "保存权限时发生错误" -#: rhodecode/controllers/admin/users.py:153 +#: rhodecode/controllers/admin/user_groups.py:481 +msgid "User Group synchronization updated successfully" +msgstr "" + +#: rhodecode/controllers/admin/user_groups.py:485 +msgid "An error occurred during synchronization update" +msgstr "" + +#: rhodecode/controllers/admin/users.py:106 #, python-format msgid "Created user %(user_link)s" msgstr "" -#: rhodecode/controllers/admin/users.py:169 +#: rhodecode/controllers/admin/users.py:122 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:214 +#: rhodecode/controllers/admin/users.py:167 msgid "User updated successfully" msgstr "用户更新成功" -#: rhodecode/controllers/admin/users.py:265 +#: rhodecode/controllers/admin/users.py:218 #, python-format msgid "Detached %s repositories" msgstr "" -#: rhodecode/controllers/admin/users.py:270 +#: rhodecode/controllers/admin/users.py:223 #, python-format msgid "Deleted %s repositories" msgstr "" -#: rhodecode/controllers/admin/users.py:278 +#: rhodecode/controllers/admin/users.py:231 #, python-format msgid "Detached %s repository groups" msgstr "" -#: rhodecode/controllers/admin/users.py:283 +#: rhodecode/controllers/admin/users.py:236 #, python-format msgid "Deleted %s repository groups" msgstr "" +#: rhodecode/controllers/admin/users.py:244 +#, python-format +msgid "Detached %s user groups" +msgstr "" + +#: rhodecode/controllers/admin/users.py:249 +#, python-format +msgid "Deleted %s user groups" +msgstr "" + +#: rhodecode/controllers/admin/users.py:260 +msgid "Successfully deleted user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:266 +msgid "An error occurred during deletion of 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 -#, python-format -msgid "Detached %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:296 -#, python-format -msgid "Deleted %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:307 -msgid "Successfully deleted user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:313 -msgid "An error occurred during deletion of user" -msgstr "删除用户时发生错误" - -#: rhodecode/controllers/admin/users.py:332 -msgid "Force password change disabled for user" +msgid "An error occurred during password reset for user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:324 +#, python-format +msgid "Linked repository group `%s` as personal" +msgstr "" + +#: rhodecode/controllers/admin/users.py:330 +#, python-format +msgid "Created repository group `%s`" msgstr "" #: rhodecode/controllers/admin/users.py:334 -msgid "Force password change enabled for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:338 -msgid "An error occurred during password reset for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:371 -#, python-format -msgid "Linked repository group `%s` as personal" -msgstr "" - -#: rhodecode/controllers/admin/users.py:377 -#, python-format -msgid "Created repository group `%s`" -msgstr "" - -#: rhodecode/controllers/admin/users.py:381 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/controllers/admin/users.py:386 +#: rhodecode/controllers/admin/users.py:339 msgid "An error occurred during repository group creation for user" msgstr "" -#: rhodecode/controllers/admin/users.py:406 -#: rhodecode/controllers/admin/users.py:427 -#: rhodecode/controllers/admin/users.py:459 -#: rhodecode/controllers/admin/users.py:490 -#: rhodecode/controllers/admin/users.py:507 -#: rhodecode/controllers/admin/users.py:530 -#: rhodecode/controllers/admin/users.py:604 -#: rhodecode/controllers/admin/users.py:617 -#: rhodecode/controllers/admin/users.py:675 -msgid "You can't edit this user" -msgstr "无法编辑该用户" - -#: rhodecode/controllers/admin/users.py:443 +#: rhodecode/controllers/admin/users.py:396 msgid "" "The user participates as reviewer in pull requests and cannot be deleted. " "You can set the user to \"inactive\" instead of deleting it." msgstr "" -#: rhodecode/controllers/admin/users.py:579 +#: rhodecode/controllers/admin/users.py:461 msgid "User global permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/users.py:707 +#: rhodecode/controllers/admin/users.py:589 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/controllers/admin/users.py:722 +#: rhodecode/controllers/admin/users.py:604 msgid "An error occurred during ip saving" msgstr "" -#: rhodecode/controllers/admin/users.py:726 +#: rhodecode/controllers/admin/users.py:608 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/controllers/admin/users.py:744 +#: rhodecode/controllers/admin/users.py:626 msgid "Removed ip address from user whitelist" msgstr "" -#: rhodecode/events/pullrequest.py:65 +#: rhodecode/events/pullrequest.py:68 msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:74 +#: rhodecode/events/pullrequest.py:77 msgid "pullrequest closed" msgstr "" -#: rhodecode/events/pullrequest.py:83 +#: rhodecode/events/pullrequest.py:86 msgid "pullrequest commits updated" msgstr "" -#: rhodecode/events/pullrequest.py:92 +#: rhodecode/events/pullrequest.py:95 msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:101 +#: rhodecode/events/pullrequest.py:104 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:110 +#: rhodecode/events/pullrequest.py:113 msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:136 +#: rhodecode/events/repo.py:138 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:145 +#: rhodecode/events/repo.py:147 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:154 +#: rhodecode/events/repo.py:156 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:163 +#: rhodecode/events/repo.py:165 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:199 +#: rhodecode/events/repo.py:201 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:208 +#: rhodecode/events/repo.py:210 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:217 +#: rhodecode/events/repo.py:219 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:228 +#: rhodecode/events/repo.py:230 msgid "repository push" msgstr "" @@ -1496,25 +1551,24 @@ msgstr "" msgid "repository group update" msgstr "" -#: rhodecode/events/user.py:34 +#: rhodecode/events/user.py:37 msgid "user registered" msgstr "" -#: rhodecode/events/user.py:48 +#: rhodecode/events/user.py:52 msgid "user pre create" msgstr "" -#: rhodecode/events/user.py:61 +#: rhodecode/events/user.py:66 msgid "user post create" msgstr "" -#: rhodecode/events/user.py:74 +#: rhodecode/events/user.py:80 msgid "user pre update" msgstr "" #: rhodecode/forms/__init__.py:32 rhodecode/templates/admin/gists/new.mako:62 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:31 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:88 +#: 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 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 @@ -1526,15 +1580,14 @@ msgstr "" #: 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_vcs.mako:46 +#: 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 #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 #: rhodecode/templates/admin/settings/settings_visual.mako:222 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:27 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:85 +#: 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_profile.mako:135 @@ -1544,17 +1597,17 @@ msgstr "重置" #: rhodecode/forms/__init__.py:33 rhodecode/templates/admin/gists/show.mako:49 #: rhodecode/templates/admin/integrations/list.mako:211 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:60 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 #: rhodecode/templates/admin/permissions/permissions_ips.mako:26 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:56 +#: 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/base/issue_tracker_settings.mako:70 -#: rhodecode/templates/base/vcs_settings.mako:202 -#: rhodecode/templates/base/vcs_settings.mako:227 +#: 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/changeset/changeset_file_comment.mako:142 @@ -1563,9 +1616,9 @@ msgstr "重置" #: rhodecode/templates/data_table/_dt_elements.mako:198 #: rhodecode/templates/data_table/_dt_elements.mako:210 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:35 -#: rhodecode/templates/files/files_source.mako:39 -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_source.mako:45 +#: rhodecode/templates/files/files_source.mako:49 +#: rhodecode/templates/files/files_source.mako:52 #: rhodecode/templates/pullrequests/pullrequest_show.mako:56 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" @@ -1604,28 +1657,28 @@ msgstr "" msgid "Root repositories only" msgstr "" -#: rhodecode/integrations/views.py:161 +#: rhodecode/integrations/views.py:160 msgid "{repo_name} repository" msgstr "" -#: rhodecode/integrations/views.py:164 +#: rhodecode/integrations/views.py:163 msgid "{repo_group_name} repo group" msgstr "" -#: rhodecode/integrations/views.py:171 +#: rhodecode/integrations/views.py:170 msgid "{name} integration" msgstr "" -#: rhodecode/integrations/views.py:185 +#: rhodecode/integrations/views.py:184 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:265 +#: rhodecode/integrations/views.py:264 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:290 +#: rhodecode/integrations/views.py:289 msgid "Integration {integration_name} updated successfully." msgstr "" @@ -1699,58 +1752,59 @@ msgid "" "Send events such as repo pushes and pull requests to your hipchat channel." msgstr "" -#: rhodecode/integrations/types/slack.py:44 +#: rhodecode/integrations/types/slack.py:46 msgid "Slack service URL" msgstr "" -#: rhodecode/integrations/types/slack.py:45 +#: rhodecode/integrations/types/slack.py:47 msgid "" "This can be setup at the slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:58 rhodecode/templates/login.mako:42 -#: rhodecode/templates/register.mako:40 +#: 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/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:90 -#: rhodecode/templates/base/base.mako:301 +#: rhodecode/templates/admin/users/users.mako:62 +#: rhodecode/templates/base/base.mako:304 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 msgid "Username" msgstr "帐号" -#: rhodecode/integrations/types/slack.py:59 +#: rhodecode/integrations/types/slack.py:61 msgid "Username to show notifications coming from." msgstr "" -#: rhodecode/integrations/types/slack.py:68 +#: rhodecode/integrations/types/slack.py:70 msgid "Channel" msgstr "" -#: rhodecode/integrations/types/slack.py:69 +#: rhodecode/integrations/types/slack.py:71 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:78 +#: rhodecode/integrations/types/slack.py:80 msgid "Emoji" msgstr "" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:81 msgid "Emoji to use eg. :studio_microphone:" msgstr "" -#: rhodecode/integrations/types/slack.py:101 +#: rhodecode/integrations/types/slack.py:92 msgid "Slack" msgstr "" -#: rhodecode/integrations/types/slack.py:102 +#: rhodecode/integrations/types/slack.py:93 msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" @@ -1914,25 +1968,25 @@ msgstr "创建标签%s" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1189 +#: rhodecode/lib/auth.py:1197 #, python-format msgid "IP %s not allowed" msgstr "" -#: rhodecode/lib/auth.py:1263 +#: rhodecode/lib/auth.py:1281 msgid "You need to be a registered user to perform this action" msgstr "必须是注册用户才能进行此操作" -#: rhodecode/lib/auth.py:1311 +#: rhodecode/lib/auth.py:1329 #, python-format msgid "Action not supported for %s." msgstr "" -#: rhodecode/lib/auth.py:1348 +#: rhodecode/lib/auth.py:1379 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/base.py:557 +#: rhodecode/lib/base.py:549 #, python-format msgid "The repository at %(repo_name)s cannot be located." msgstr "" @@ -1958,36 +2012,16 @@ msgstr "未发现差异" msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1515 +#: rhodecode/lib/helpers.py:1517 #, python-format msgid " and %s more" msgstr "还有%s个" -#: rhodecode/lib/helpers.py:1519 +#: rhodecode/lib/helpers.py:1521 msgid "No Files" msgstr "没有文件" -#: rhodecode/lib/helpers.py:1592 -msgid "new file" -msgstr "" - -#: rhodecode/lib/helpers.py:1595 -msgid "mod" -msgstr "" - -#: rhodecode/lib/helpers.py:1598 -msgid "del" -msgstr "" - -#: rhodecode/lib/helpers.py:1601 -msgid "rename" -msgstr "" - -#: rhodecode/lib/helpers.py:1606 -msgid "chmod" -msgstr "" - -#: rhodecode/lib/helpers.py:1853 +#: rhodecode/lib/helpers.py:1800 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2006,7 +2040,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1873 +#: rhodecode/lib/helpers.py:1820 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the" @@ -2046,9 +2080,9 @@ msgid "in ${val} and ${detail}" msgstr "" #: rhodecode/lib/utils2.py:515 -#: rhodecode/public/js/rhodecode-components.js:33194 -#: rhodecode/public/js/scripts.js:25042 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: 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/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "刚才" @@ -2081,7 +2115,9 @@ msgstr "刚才" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/model/db.py:2298 +#: 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 msgid "Repository no access" msgstr "无版本库访问权限" @@ -2113,7 +2149,9 @@ msgstr "无版本库访问权限" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/model/db.py:2299 +#: 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 msgid "Repository read access" msgstr "版本库读取权限" @@ -2145,7 +2183,9 @@ msgstr "版本库读取权限" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/model/db.py:2300 +#: 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 msgid "Repository write access" msgstr "版本库写入权限" @@ -2177,7 +2217,9 @@ msgstr "版本库写入权限" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 -#: rhodecode/model/db.py:2301 +#: 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 msgid "Repository admin access" msgstr "版本库管理权限" @@ -2249,7 +2291,9 @@ msgstr "RhodeCode 管理员" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/model/db.py:2319 +#: 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 msgid "Repository creation disabled" msgstr "禁用创建版本库" @@ -2281,7 +2325,9 @@ msgstr "禁用创建版本库" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 -#: rhodecode/model/db.py:2320 +#: 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 msgid "Repository creation enabled" msgstr "允许创建版本库" @@ -2313,7 +2359,9 @@ msgstr "允许创建版本库" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 -#: rhodecode/model/db.py:2324 +#: 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 msgid "Repository forking disabled" msgstr "禁用复刻版本库" @@ -2345,7 +2393,9 @@ msgstr "禁用复刻版本库" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/model/db.py:2325 +#: 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 msgid "Repository forking enabled" msgstr "允许复刻版本库" @@ -2398,7 +2448,9 @@ msgstr "用自动激活注册新用户" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 -#: rhodecode/model/db.py:3009 +#: 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 msgid "Not Reviewed" msgstr "未检视" @@ -2430,7 +2482,9 @@ msgstr "未检视" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 -#: rhodecode/model/db.py:3010 +#: 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 msgid "Approved" msgstr "已批准" @@ -2462,7 +2516,9 @@ msgstr "已批准" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 -#: rhodecode/model/db.py:3011 +#: 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 msgid "Rejected" msgstr "驳回" @@ -2494,7 +2550,9 @@ msgstr "驳回" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 -#: rhodecode/model/db.py:3012 +#: 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 msgid "Under Review" msgstr "检视中" @@ -2523,7 +2581,9 @@ msgstr "检视中" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/model/db.py:2303 +#: 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 msgid "Repository group no access" msgstr "" @@ -2552,7 +2612,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/model/db.py:2304 +#: 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 msgid "Repository group read access" msgstr "" @@ -2581,7 +2643,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/model/db.py:2305 +#: 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 msgid "Repository group write access" msgstr "" @@ -2610,7 +2674,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 -#: rhodecode/model/db.py:2306 +#: 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 msgid "Repository group admin access" msgstr "" @@ -2638,7 +2704,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/model/db.py:2308 +#: 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 msgid "User group no access" msgstr "" @@ -2666,7 +2734,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 -#: rhodecode/model/db.py:2309 +#: 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 msgid "User group read access" msgstr "" @@ -2694,7 +2764,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/model/db.py:2310 +#: 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 msgid "User group write access" msgstr "" @@ -2722,7 +2794,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/model/db.py:2311 +#: 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 msgid "User group admin access" msgstr "" @@ -2750,7 +2824,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/model/db.py:2313 +#: 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 msgid "Repository Group creation disabled" msgstr "" @@ -2778,7 +2854,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/model/db.py:2314 +#: 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 msgid "Repository Group creation enabled" msgstr "" @@ -2806,7 +2884,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/model/db.py:2316 +#: 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 msgid "User Group creation disabled" msgstr "" @@ -2834,7 +2914,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/model/db.py:2317 +#: 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 msgid "User Group creation enabled" msgstr "" @@ -2862,7 +2944,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 -#: rhodecode/model/db.py:2327 +#: 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 msgid "Registration disabled" msgstr "" @@ -2890,7 +2974,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/model/db.py:2328 +#: 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 msgid "User Registration with manual account activation" msgstr "" @@ -2918,7 +3004,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/model/db.py:2329 +#: 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 msgid "User Registration with automatic account activation" msgstr "" @@ -2946,7 +3034,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 -#: rhodecode/model/db.py:2335 rhodecode/model/permission.py:95 +#: 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 msgid "Manual activation of external account" msgstr "" @@ -2974,7 +3064,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 -#: rhodecode/model/db.py:2336 rhodecode/model/permission.py:96 +#: 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 msgid "Automatic activation of external account" msgstr "" @@ -2996,7 +3088,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/model/db.py:2321 +#: 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 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3019,7 +3113,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/model/db.py:2322 +#: 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 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3039,7 +3135,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/model/db.py:2296 +#: 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 msgid "RhodeCode Super Administrator" msgstr "" @@ -3056,7 +3154,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 -#: rhodecode/model/db.py:2338 +#: 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 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3073,7 +3173,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 -#: rhodecode/model/db.py:2339 +#: 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 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3081,7 +3183,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 rhodecode/model/db.py:913 +#: 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 msgid "all" msgstr "" @@ -3089,7 +3193,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 rhodecode/model/db.py:914 +#: 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 msgid "http/web interface" msgstr "" @@ -3097,7 +3203,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 rhodecode/model/db.py:915 +#: 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 msgid "vcs (git/hg/svn protocol)" msgstr "" @@ -3105,7 +3213,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 rhodecode/model/db.py:916 +#: 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 msgid "api calls" msgstr "" @@ -3113,7 +3223,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 rhodecode/model/db.py:917 +#: 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 msgid "feed access" msgstr "" @@ -3122,84 +3234,70 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 -#: rhodecode/model/db.py:2067 +#: 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 msgid "No parent" msgstr "" -#: rhodecode/lib/index/whoosh.py:148 +#: 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 +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 +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 +msgid "Password reset disabled" +msgstr "" + +#: rhodecode/lib/index/whoosh.py:149 msgid "Invalid search query. Try quoting it." msgstr "错误的搜索。请尝试用引号包含它。" -#: rhodecode/lib/index/whoosh.py:150 +#: rhodecode/lib/index/whoosh.py:151 msgid "There is no index to search in. Please run whoosh indexer" msgstr "没有索引用于搜索。请运行whoosh索引器" -#: rhodecode/lib/index/whoosh.py:155 +#: rhodecode/lib/index/whoosh.py:156 msgid "An error occurred during this search operation" msgstr "在搜索操作中发生异常" -#: rhodecode/lib/index/whoosh.py:163 -msgid "Index Type" -msgstr "" - #: rhodecode/lib/index/whoosh.py:164 +msgid "Index Type" +msgstr "" + +#: rhodecode/lib/index/whoosh.py:165 msgid "File Index" msgstr "" -#: rhodecode/lib/index/whoosh.py:165 rhodecode/lib/index/whoosh.py:170 +#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171 msgid "Indexed documents" msgstr "" -#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172 +#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173 msgid "Last update" msgstr "" -#: rhodecode/lib/index/whoosh.py:169 +#: rhodecode/lib/index/whoosh.py:170 msgid "Commit index" msgstr "" -#: rhodecode/login/views.py:249 rhodecode/login/views.py:311 -msgid "Bad captcha" -msgstr "" - -#: rhodecode/login/views.py:258 -msgid "You have successfully registered with RhodeCode" -msgstr "" - -#: rhodecode/login/views.py:300 -msgid "Password reset has been disabled." -msgstr "" - -#: rhodecode/login/views.py:327 -msgid "Your password reset link was sent" -msgstr "密码重置链接已经发送" - -#: rhodecode/login/views.py:351 -msgid "" -"Your password reset was successful, a new password has been sent to your " -"email" -msgstr "" - -#: rhodecode/model/comment.py:367 -msgid "made a comment" -msgstr "" - #: rhodecode/model/comment.py:368 +msgid "made a comment" +msgstr "" + +#: rhodecode/model/comment.py:369 msgid "Show it now" msgstr "" -#: rhodecode/model/db.py:2331 -msgid "Password reset enabled" -msgstr "" - -#: rhodecode/model/db.py:2332 -msgid "Password reset hidden" -msgstr "" - -#: rhodecode/model/db.py:2333 -msgid "Password reset disabled" -msgstr "" - #: rhodecode/model/forms.py:85 msgid "Please enter a login" msgstr "请登录" @@ -3334,9 +3432,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:103 -#: rhodecode/templates/base/base.mako:406 -#: rhodecode/templates/base/base.mako:413 +#: rhodecode/templates/admin/users/users.mako:75 +#: rhodecode/templates/base/base.mako:409 +#: rhodecode/templates/base/base.mako:416 msgid "Admin" msgstr "管理" @@ -3367,74 +3465,74 @@ msgstr "" msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:77 +#: rhodecode/model/pull_request.py:78 msgid "This pull request can be automatically merged." msgstr "" -#: rhodecode/model/pull_request.py:79 +#: rhodecode/model/pull_request.py:80 msgid "This pull request cannot be merged because of an unhandled exception." msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:83 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:84 +#: rhodecode/model/pull_request.py:85 msgid "This pull request could not be merged because push to target failed." msgstr "" -#: rhodecode/model/pull_request.py:87 +#: rhodecode/model/pull_request.py:88 msgid "This pull request cannot be merged because the target is not a head." msgstr "" -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:91 msgid "" "This pull request cannot be merged because the source contains more branches" " than the target." msgstr "" -#: rhodecode/model/pull_request.py:93 +#: rhodecode/model/pull_request.py:94 msgid "" "This pull request cannot be merged because the target has multiple heads." msgstr "" -#: rhodecode/model/pull_request.py:96 +#: rhodecode/model/pull_request.py:97 msgid "" "This pull request cannot be merged because the target repository is locked." msgstr "" -#: rhodecode/model/pull_request.py:99 +#: rhodecode/model/pull_request.py:100 msgid "" "This pull request cannot be merged because the target or the source " "reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:102 +#: rhodecode/model/pull_request.py:103 msgid "" "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:105 +#: rhodecode/model/pull_request.py:106 msgid "" "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:108 +#: rhodecode/model/pull_request.py:109 msgid "" "This pull request cannot be merged because of conflicts related to sub " "repositories." msgstr "" -#: rhodecode/model/pull_request.py:114 +#: rhodecode/model/pull_request.py:115 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:116 +#: rhodecode/model/pull_request.py:117 msgid "Pull request update failed because of an unknown error." msgstr "" -#: rhodecode/model/pull_request.py:118 -msgid "No update needed because the source reference is already up to date." +#: rhodecode/model/pull_request.py:119 +msgid "No update needed because the source and target have not changed." msgstr "" #: rhodecode/model/pull_request.py:121 @@ -3465,51 +3563,51 @@ msgstr "" msgid "Pull request merged and closed" msgstr "" -#: rhodecode/model/pull_request.py:1041 +#: rhodecode/model/pull_request.py:1087 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1043 +#: rhodecode/model/pull_request.py:1089 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:1055 +#: rhodecode/model/pull_request.py:1101 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1073 +#: rhodecode/model/pull_request.py:1119 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1076 +#: rhodecode/model/pull_request.py:1122 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1233 rhodecode/model/scm.py:790 +#: rhodecode/model/pull_request.py:1279 rhodecode/model/scm.py:790 msgid "Bookmarks" msgstr "书签" -#: rhodecode/model/pull_request.py:1238 +#: rhodecode/model/pull_request.py:1284 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1241 +#: rhodecode/model/pull_request.py:1287 msgid "Closed Branches" msgstr "" -#: rhodecode/model/pull_request.py:1364 +#: rhodecode/model/pull_request.py:1411 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1375 +#: rhodecode/model/pull_request.py:1424 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1390 +#: rhodecode/model/pull_request.py:1439 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1393 +#: rhodecode/model/pull_request.py:1442 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" @@ -3517,36 +3615,36 @@ msgstr "" msgid "latest tip" msgstr "最新tip版本" -#: rhodecode/model/user.py:125 +#: rhodecode/model/user.py:126 msgid "You can't Edit this user since it's crucial for entire application" msgstr "由于是系统帐号，无法编辑该用户" -#: rhodecode/model/user.py:291 +#: rhodecode/model/user.py:292 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " "application" msgstr "" -#: rhodecode/model/user.py:464 +#: rhodecode/model/user.py:462 msgid "You can't remove this user since it's crucial for entire application" msgstr "由于是系统帐号，无法删除该用户" -#: rhodecode/model/user.py:472 +#: rhodecode/model/user.py:470 #, 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:481 +#: rhodecode/model/user.py:479 #, 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:490 +#: rhodecode/model/user.py:488 #, python-format msgid "" "user \"%s\" still owns %s user groups and cannot be removed. Switch owners " @@ -3879,369 +3977,371 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:31198 -#: rhodecode/public/js/scripts.js:23046 +#: 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/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33129 -#: rhodecode/public/js/scripts.js:24977 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: 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/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33130 -#: rhodecode/public/js/scripts.js:24978 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: 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/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33131 -#: rhodecode/public/js/scripts.js:24979 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: 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/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33132 -#: rhodecode/public/js/scripts.js:24980 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: 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/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33133 -#: rhodecode/public/js/scripts.js:24981 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: 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/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33134 -#: rhodecode/public/js/scripts.js:24982 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: 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/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33154 -#: rhodecode/public/js/scripts.js:25002 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: 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/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33162 -#: rhodecode/public/js/scripts.js:25010 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: 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/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33174 -#: rhodecode/public/js/scripts.js:25022 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: 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/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33176 -#: rhodecode/public/js/scripts.js:25024 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: 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/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33180 -#: rhodecode/public/js/scripts.js:25028 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: 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/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33182 -#: rhodecode/public/js/scripts.js:25030 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: 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/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33184 -#: rhodecode/public/js/scripts.js:25032 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: 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/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47027 -#: rhodecode/public/js/scripts.js:38875 +#: 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/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47030 -#: rhodecode/public/js/scripts.js:38878 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: 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/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47033 -#: rhodecode/public/js/scripts.js:38881 +#: 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/select2/translations.js:10 msgid "No matches found" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47036 -#: rhodecode/public/js/scripts.js:38884 +#: 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/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47040 -#: rhodecode/public/js/scripts.js:38888 +#: 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/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47042 -#: rhodecode/public/js/scripts.js:38890 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: 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/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47047 -#: rhodecode/public/js/scripts.js:38895 +#: 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/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47049 -#: rhodecode/public/js/scripts.js:38897 +#: 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/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47054 -#: rhodecode/public/js/scripts.js:38902 +#: 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/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47056 -#: rhodecode/public/js/scripts.js:38904 +#: 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/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47060 -#: rhodecode/public/js/scripts.js:38908 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: 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/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47062 -#: rhodecode/public/js/scripts.js:38910 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: 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/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47991 -#: rhodecode/public/js/scripts.js:39839 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: 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/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47993 -#: rhodecode/public/js/scripts.js:39841 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: 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/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48426 -#: rhodecode/public/js/scripts.js:40274 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: 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/src/rhodecode/codemirror.js:296 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48445 -#: rhodecode/public/js/scripts.js:40293 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: 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/src/rhodecode/codemirror.js:315 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48464 -#: rhodecode/public/js/scripts.js:40312 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: 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/src/rhodecode/codemirror.js:334 +#: rhodecode/templates/email_templates/commit_comment.mako:99 +#: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48484 -#: rhodecode/public/js/scripts.js:40332 +#: 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/src/rhodecode/codemirror.js:354 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48848 -#: rhodecode/public/js/scripts.js:40696 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/comments.js:123 +#: 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/src/rhodecode/comments.js:125 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48927 -#: rhodecode/public/js/scripts.js:40775 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 -#: rhodecode/public/js/src/rhodecode/comments.js:202 +#: 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/src/rhodecode/comments.js:209 msgid "Status Review" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48941 -#: rhodecode/public/js/scripts.js:40789 +#: 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/src/rhodecode/comments.js:216 +#: rhodecode/public/js/src/rhodecode/comments.js:224 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49089 -#: rhodecode/public/js/scripts.js:40937 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/comments.js:364 +#: 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/src/rhodecode/comments.js:381 msgid "Submitting..." msgstr "提交中……" -#: rhodecode/public/js/rhodecode-components.js:49140 -#: rhodecode/public/js/scripts.js:40988 +#: 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/src/rhodecode/comments.js:415 +#: rhodecode/public/js/src/rhodecode/comments.js:432 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49245 -#: rhodecode/public/js/scripts.js:41093 +#: 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/src/rhodecode/comments.js:520 +#: rhodecode/public/js/src/rhodecode/comments.js:537 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49316 -#: rhodecode/public/js/scripts.js:41164 +#: 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/src/rhodecode/comments.js:591 +#: 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:49393 -#: rhodecode/public/js/scripts.js:41241 +#: 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/src/rhodecode/comments.js:668 +#: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49507 -#: rhodecode/public/js/scripts.js:41355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 -#: rhodecode/public/js/src/rhodecode/comments.js:782 +#: 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/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49713 -#: rhodecode/public/js/scripts.js:41561 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: 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/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49715 -#: rhodecode/public/js/scripts.js:41563 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: 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/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49724 -#: rhodecode/public/js/scripts.js:41572 +#: 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/src/rhodecode/files.js:161 msgid "No matching files" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49859 -#: rhodecode/public/js/scripts.js:41707 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: 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/src/rhodecode/files.js:296 msgid "Selection link" msgstr "选择链接" -#: rhodecode/public/js/rhodecode-components.js:49899 -#: rhodecode/public/js/scripts.js:41747 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: 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/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "停止关注该版本库" -#: rhodecode/public/js/rhodecode-components.js:49900 -#: rhodecode/public/js/scripts.js:41748 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 +#: 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/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49909 -#: rhodecode/public/js/scripts.js:41757 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: 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/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "开始关注该版本库" -#: rhodecode/public/js/rhodecode-components.js:49910 -#: rhodecode/public/js/scripts.js:41758 +#: 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/src/rhodecode/followers.js:37 msgid "Follow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50366 -#: rhodecode/public/js/scripts.js:42214 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:212 +#: 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 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50937 -#: rhodecode/public/js/scripts.js:42785 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: 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/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50957 -#: rhodecode/public/js/scripts.js:42805 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: 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/src/rhodecode.js:162 msgid "Show more" msgstr "" @@ -4251,14 +4351,14 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:479 -#: rhodecode/templates/codeblocks/diffs.mako:484 +#: rhodecode/templates/codeblocks/diffs.mako:488 +#: rhodecode/templates/codeblocks/diffs.mako:493 msgid "Add another comment" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:320 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:325 msgid "Close" msgstr "" @@ -4316,81 +4416,102 @@ msgstr "新建拉取请求" msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +msgid "Saving..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: 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:40 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 -msgid "Show selected commit __S" -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:48 -#: rhodecode/public/js/src/i18n_messages.js:7 -msgid "Switch to chat" -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 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: 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:54 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 -#: rhodecode/templates/admin/auth/auth_settings.mako:71 -msgid "disabled" -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" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 msgid "files" msgstr "文件" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/templates/pullrequests/pullrequest.mako:108 +msgid "loading..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -msgid "{0} days" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +msgid "{0} out of {1} users" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 msgid "{0} years" msgstr "" +#: rhodecode/public/js/src/math_jax/extensions/HelpDialog.js:19 +msgid "HelpDialog" +msgstr "" + +#: rhodecode/public/js/src/math_jax/jax/output/HTML-CSS/autoload/mglyph.js:19 +msgid "MathML" +msgstr "" + #: rhodecode/public/js/vendors/webcomponentsjs/webcomponents.min.js:11 msgid "UIEvent" msgstr "" @@ -4407,10 +4528,6 @@ msgstr "" msgid "FocusEvent" msgstr "" -#: rhodecode/svn_support/events.py:30 -msgid "Configuration for Apaache mad_dav_svn changed." -msgstr "" - #: rhodecode/templates/index.mako:5 msgid "Dashboard" msgstr "控制面板" @@ -4468,6 +4585,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:15 #: 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 #: rhodecode/templates/base/perms_summary.mako:102 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 @@ -4480,22 +4598,25 @@ msgstr "名称" #: rhodecode/templates/index_base.mako:100 #: rhodecode/templates/index_base.mako:125 #: rhodecode/templates/admin/gists/index.mako:114 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:81 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 -#: rhodecode/templates/admin/repos/repo_add_base.mako:32 +#: 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/repos.mako:57 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 #: rhodecode/templates/admin/user_groups/user_groups.mako:57 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +#: 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/base/issue_tracker_settings.mako:10 #: rhodecode/templates/changeset/changeset.mako:53 #: rhodecode/templates/compare/compare_commits.mako:20 -#: rhodecode/templates/email_templates/commit_comment.mako:82 +#: 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 #: rhodecode/templates/files/file_tree_detail.mako:5 @@ -4503,8 +4624,8 @@ msgstr "名称" #: rhodecode/templates/forks/fork.mako:48 #: rhodecode/templates/forks/forks_data.mako:9 #: rhodecode/templates/pullrequests/pullrequest.mako:47 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:158 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:163 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:460 #: rhodecode/templates/summary/components.mako:73 msgid "Description" msgstr "描述" @@ -4519,7 +4640,8 @@ msgstr "描述" #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/users/user_edit_groups.mako:65 #: rhodecode/templates/forks/forks_data.mako:7 #: rhodecode/templates/summary/components.mako:195 msgid "Owner" @@ -4540,9 +4662,9 @@ msgstr "最后修改" #: rhodecode/templates/changelog/changelog_summary_data.mako:8 #: rhodecode/templates/changeset/changeset.mako:36 #: rhodecode/templates/compare/compare_commits.mako:18 -#: rhodecode/templates/email_templates/commit_comment.mako:45 -#: rhodecode/templates/email_templates/commit_comment.mako:81 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: 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/search/search_commit.mako:6 #: rhodecode/templates/tags/tags.mako:66 msgid "Commit" @@ -4557,45 +4679,45 @@ msgstr "" msgid "Home" msgstr "首页" -#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:34 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:326 +#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:329 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "登录" -#: rhodecode/templates/login.mako:36 +#: rhodecode/templates/login.mako:37 msgid "Go to the registration page to create a new account." msgstr "" -#: rhodecode/templates/login.mako:57 +#: rhodecode/templates/login.mako:58 msgid "Remember me" msgstr "记住密码" -#: rhodecode/templates/login.mako:61 +#: rhodecode/templates/login.mako:62 msgid "Forgot your password?" msgstr "" -#: rhodecode/templates/login.mako:65 -#: rhodecode/templates/password_reset.mako:34 +#: rhodecode/templates/login.mako:66 +#: rhodecode/templates/password_reset.mako:35 msgid "Password reset is disabled. Please contact " msgstr "" -#: rhodecode/templates/login.mako:67 -#: rhodecode/templates/password_reset.mako:36 -#: rhodecode/templates/base/base.mako:43 -#: rhodecode/templates/errors/error_document.mako:64 -msgid "Support" -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 +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 msgid "or" msgstr "或者" -#: rhodecode/templates/login.mako:70 -#: rhodecode/templates/password_reset.mako:39 +#: rhodecode/templates/login.mako:71 +#: rhodecode/templates/password_reset.mako:40 msgid "an administrator if you need help." msgstr "" @@ -4603,28 +4725,28 @@ msgstr "" msgid "Reset Password" msgstr "" -#: rhodecode/templates/password_reset.mako:46 +#: rhodecode/templates/password_reset.mako:47 msgid "Reset your Password" msgstr "" -#: rhodecode/templates/password_reset.mako:47 +#: rhodecode/templates/password_reset.mako:48 msgid "Go to the login page to sign in." msgstr "" -#: rhodecode/templates/password_reset.mako:51 +#: rhodecode/templates/password_reset.mako:52 msgid "Email Address" msgstr "" -#: rhodecode/templates/password_reset.mako:60 -#: rhodecode/templates/register.mako:84 +#: rhodecode/templates/password_reset.mako:61 +#: rhodecode/templates/register.mako:85 msgid "Captcha" msgstr "" -#: rhodecode/templates/password_reset.mako:70 -msgid "Send password reset email" -msgstr "" - #: rhodecode/templates/password_reset.mako:71 +msgid "Send password reset email" +msgstr "" + +#: rhodecode/templates/password_reset.mako:72 msgid "Password reset link will be sent to matching email address" msgstr "" @@ -4632,49 +4754,49 @@ msgstr "" msgid "Create an Account" msgstr "" -#: rhodecode/templates/register.mako:34 +#: rhodecode/templates/register.mako:35 msgid "Create an account" msgstr "" -#: rhodecode/templates/register.mako:35 +#: rhodecode/templates/register.mako:36 msgid "Go to the login page to sign in with an existing account." msgstr "" -#: rhodecode/templates/register.mako:54 +#: rhodecode/templates/register.mako:55 msgid "Re-enter password" msgstr "确认密码" -#: rhodecode/templates/register.mako:61 +#: rhodecode/templates/register.mako:62 #: rhodecode/templates/admin/my_account/my_account_profile.mako:32 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:33 #: 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:94 +#: rhodecode/templates/admin/users/users.mako:66 msgid "First Name" msgstr "名" -#: rhodecode/templates/register.mako:68 +#: rhodecode/templates/register.mako:69 #: rhodecode/templates/admin/my_account/my_account_profile.mako:40 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:42 #: 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:96 +#: rhodecode/templates/admin/users/users.mako:68 msgid "Last Name" msgstr "姓" -#: rhodecode/templates/register.mako:96 +#: rhodecode/templates/register.mako:97 msgid "Account activation requires admin approval." msgstr "" -#: rhodecode/templates/register.mako:103 +#: rhodecode/templates/register.mako:104 msgid "Create Account" msgstr "" #: rhodecode/templates/admin/admin.mako:5 #: rhodecode/templates/admin/admin.mako:15 -#: rhodecode/templates/base/base.mako:72 +#: rhodecode/templates/base/base.mako:75 msgid "Admin journal" msgstr "系统日志" @@ -4683,6 +4805,7 @@ msgid "journal filter..." msgstr "日志过滤..." #: rhodecode/templates/admin/admin.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "过滤" @@ -4694,31 +4817,38 @@ msgid_plural "%s entries" msgstr[0] "%s条" #: rhodecode/templates/admin/admin.mako:17 +#: rhodecode/templates/admin/users/user_edit_audit.mako:17 #: rhodecode/templates/journal/journal.mako:17 msgid "Example Queries" msgstr "" #: rhodecode/templates/admin/admin_log.mako:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 #: rhodecode/templates/admin/repos/repos.mako:69 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 -#: rhodecode/templates/admin/user_groups/user_groups.mako:66 -#: rhodecode/templates/admin/users/users.mako:107 -#: rhodecode/templates/files/files_detail.mako:63 +#: 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/files/files_detail.mako:58 msgid "Action" msgstr "操作" #: rhodecode/templates/admin/admin_log.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/bookmarks/bookmarks.mako:61 #: rhodecode/templates/branches/branches.mako:60 #: rhodecode/templates/tags/tags.mako:61 @@ -4726,10 +4856,12 @@ 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 msgid "No actions yet" msgstr "无操作" @@ -4770,7 +4902,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:135 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 -#: rhodecode/templates/admin/repos/repo_add_base.mako:90 +#: 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 @@ -4780,6 +4912,7 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:120 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:102 #: rhodecode/templates/admin/users/user_add.mako:128 +#: rhodecode/templates/admin/users/user_edit_groups.mako:27 #: rhodecode/templates/admin/users/user_edit_profile.mako:134 #: rhodecode/templates/base/default_perms_box.mako:88 msgid "Save" @@ -4801,18 +4934,18 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/index.mako:110 #: rhodecode/templates/admin/integrations/list.mako:103 -#: rhodecode/templates/admin/repos/repo_add_base.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:75 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "类型" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 -#: rhodecode/templates/admin/repos/repo_add_base.mako:82 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 msgid "Private Repository" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:86 +#: rhodecode/templates/admin/repos/repo_add_base.mako:97 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:112 #: rhodecode/templates/forks/fork.mako:87 msgid "" @@ -4878,7 +5011,7 @@ msgid "Update Gist" msgstr "" #: rhodecode/templates/admin/gists/edit.mako:102 -#: rhodecode/templates/base/issue_tracker_settings.mako:74 +#: rhodecode/templates/base/issue_tracker_settings.mako:73 #: rhodecode/templates/changeset/changeset_file_comment.mako:385 #: rhodecode/templates/codeblocks/diffs.mako:76 #: rhodecode/templates/files/files_add.mako:102 @@ -4954,8 +5087,8 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:180 #: rhodecode/templates/compare/compare_commits.mako:17 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:304 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:457 #: rhodecode/templates/pullrequests/pullrequests.mako:102 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/tags/tags.mako:63 @@ -5012,7 +5145,7 @@ msgstr "" #: rhodecode/templates/admin/gists/show.mako:56 #: rhodecode/templates/admin/integrations/list.mako:204 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 -#: rhodecode/templates/base/issue_tracker_settings.mako:61 +#: rhodecode/templates/base/issue_tracker_settings.mako:60 #: rhodecode/templates/data_table/_dt_elements.mako:118 #: rhodecode/templates/data_table/_dt_elements.mako:180 #: rhodecode/templates/data_table/_dt_elements.mako:193 @@ -5020,10 +5153,10 @@ msgstr "" #: rhodecode/templates/debug_style/buttons.html:128 #: rhodecode/templates/files/files_add.mako:204 #: rhodecode/templates/files/files_edit.mako:165 -#: rhodecode/templates/files/files_source.mako:38 -#: rhodecode/templates/files/files_source.mako:41 +#: 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:319 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:324 #: rhodecode/templates/users/user_profile.mako:7 msgid "Edit" msgstr "" @@ -5042,7 +5175,7 @@ msgstr "" #: rhodecode/templates/admin/gists/show.mako:91 #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:87 msgid "Show as raw" msgstr "" @@ -5067,8 +5200,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:43 #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 -#: rhodecode/templates/base/base.mako:81 -#: rhodecode/templates/base/base.mako:246 +#: rhodecode/templates/base/base.mako:84 +#: rhodecode/templates/base/base.mako:249 msgid "Settings" msgstr "设置" @@ -5100,6 +5233,8 @@ msgid "Create new integration" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:104 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14 msgid "Scope" msgstr "" @@ -5169,7 +5304,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:340 +#: rhodecode/templates/base/base.mako:343 msgid "My account" msgstr "我的账户" @@ -5178,9 +5313,10 @@ msgid "My Account" msgstr "我的账户" #: rhodecode/templates/admin/my_account/my_account.mako:29 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 -msgid "My Profile" +#: rhodecode/templates/email_templates/user_registration.mako:26 +#: rhodecode/templates/users/user.mako:29 +#: rhodecode/templates/users/user_profile.mako:5 +msgid "Profile" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:31 @@ -5192,11 +5328,8 @@ msgid "OAuth Identities" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:37 -msgid "My Emails" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account.mako:38 -msgid "My Repositories" +#: rhodecode/templates/admin/users/user_edit.mako:38 +msgid "Emails" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:39 @@ -5205,81 +5338,82 @@ msgstr "关注的" #: rhodecode/templates/admin/my_account/my_account.mako:40 #: rhodecode/templates/admin/notifications/notifications.mako:33 -#: rhodecode/templates/base/base.mako:238 +#: rhodecode/templates/base/base.mako:241 msgid "Pull Requests" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:41 -msgid "My Permissions" -msgstr "" +#: 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/user_groups/user_group_edit.mako:34 +#: rhodecode/templates/base/base.mako:80 +msgid "Permissions" +msgstr "权限" #: rhodecode/templates/admin/my_account/my_account.mako:42 -msgid "My Live Notifications" +msgid "Live Notifications" msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:3 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 msgid "Authentication Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:7 -msgid "Built-in tokens can be used to authenticate with all possible options." -msgstr "" - #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:8 -msgid "" -"Each token can have a role. VCS tokens can be used together with the " -"authtoken auth plugin for git/hg/svn operations." -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:11 -msgid "Built-in" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:51 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:47 -msgid "expires" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:29 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:26 -#, python-format -msgid "Confirm to reset this auth token: %s" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 -msgid "expired" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:59 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:55 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:8 +msgid "" +"Each token can have a role. Token with a role can be used only in given " +"context, e.g. VCS tokens can be used together with the authtoken auth plugin" +" for git/hg/svn operations only." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:13 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:13 +msgid "Token" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:17 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:17 +msgid "Expiration" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:48 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:44 #, python-format msgid "Confirm to remove this auth token: %s" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:67 -msgid "No additional auth token specified" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:78 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:56 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:52 +msgid "No additional auth tokens specified" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:68 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:64 msgid "New authentication token" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:82 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +msgid "Repository scope works only with tokens with VCS type." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86 #: rhodecode/templates/admin/my_account/my_account_emails.mako:64 #: rhodecode/templates/admin/permissions/permissions_ips.mako:60 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:84 +#: 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 msgid "Add" msgstr "增加" +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:128 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:125 +msgid "repository scope" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_emails.mako:5 msgid "Account Emails" msgstr "" @@ -5333,6 +5467,11 @@ msgstr "" msgid "Source type" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 +msgid "My Profile" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_profile.mako:11 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:55 #: rhodecode/templates/admin/users/user_edit_profile.mako:25 @@ -5422,14 +5561,6 @@ msgstr "通知" msgid "Permissions Administration" msgstr "" -#: 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/user_groups/user_group_edit.mako:34 -#: rhodecode/templates/base/base.mako:77 -msgid "Permissions" -msgstr "权限" - #: rhodecode/templates/admin/permissions/permissions.mako:33 msgid "Application" msgstr "" @@ -5569,8 +5700,8 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:74 -#: rhodecode/templates/base/base.mako:148 +#: rhodecode/templates/base/base.mako:77 +#: rhodecode/templates/base/base.mako:151 msgid "Repository groups" msgstr "" @@ -5584,7 +5715,7 @@ msgid "Group Parent" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 -#: rhodecode/templates/admin/repos/repo_add_base.mako:55 +#: rhodecode/templates/admin/repos/repo_add_base.mako:66 msgid "Copy Parent Group Permissions" msgstr "" @@ -5699,7 +5830,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:107 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117 -#: rhodecode/templates/base/issue_tracker_settings.mako:84 +#: rhodecode/templates/base/issue_tracker_settings.mako:83 msgid "Add new" msgstr "" @@ -5762,52 +5893,48 @@ msgid "Import Existing Repository ?" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:193 +#: rhodecode/templates/base/base.mako:196 msgid "Clone from" msgstr "克隆自" -#: rhodecode/templates/admin/repos/repo_add_base.mako:27 -msgid "Optional http[s] URL from which to clone a repository." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_add_base.mako:36 +#: rhodecode/templates/admin/repos/repo_add_base.mako:47 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:102 #: rhodecode/templates/forks/fork.mako:52 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "保持简短。用README文件来写更长的描述。" -#: rhodecode/templates/admin/repos/repo_add_base.mako:41 +#: rhodecode/templates/admin/repos/repo_add_base.mako:52 msgid "Repository Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 +#: 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)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:50 +#: rhodecode/templates/admin/repos/repo_add_base.mako:61 #: rhodecode/templates/forks/fork.mako:67 msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:59 +#: rhodecode/templates/admin/repos/repo_add_base.mako:70 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:68 +#: rhodecode/templates/admin/repos/repo_add_base.mako:79 msgid "Set the type of repository to create." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:73 +#: rhodecode/templates/admin/repos/repo_add_base.mako:84 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:70 #: rhodecode/templates/forks/fork.mako:73 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:77 +#: rhodecode/templates/admin/repos/repo_add_base.mako:88 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." @@ -5851,7 +5978,16 @@ msgstr "远程" msgid "Statistics" msgstr "统计" -#: rhodecode/templates/admin/repos/repo_edit.mako:87 +#: rhodecode/templates/admin/repos/repo_edit.mako:75 +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3 +msgid "Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:78 +msgid "Strip" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:93 msgid "Reviewers" msgstr "" @@ -5878,12 +6014,10 @@ msgid "This repository is a fork of %(re msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 -#: rhodecode/templates/admin/repos/repo_edit_fork.mako:5 msgid "Set" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:39 -#: rhodecode/templates/admin/repos/repo_edit_fork.mako:9 msgid "Manually set this repository as a fork of another from the list" msgstr "从列表中手动设置这个版本库复刻自另一版本库" @@ -6018,10 +6152,11 @@ msgstr "键" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:37 #: 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:62 +#: 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:101 +#: rhodecode/templates/admin/users/users.mako:73 msgid "Active" msgstr "启用" @@ -6097,6 +6232,23 @@ 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 +msgid "No maintenance tasks for this repo available" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:26 +msgid "Run Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:41 +msgid "Performing Maintenance" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:5 msgid "Repository Permissions" msgstr "" @@ -6117,16 +6269,21 @@ msgstr "" msgid "Remote mirror url" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 +#: 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 msgid "Pull changes from remote location" msgstr "从远程路径拉取修订集" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:22 msgid "Confirm to pull changes from remote side" msgstr "确认从远程拉取修订集" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:19 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:27 msgid "This repository does not have any remote mirror url set." msgstr "" @@ -6250,11 +6407,80 @@ msgstr "" msgid "Confirm to remove current statistics" msgstr "确认移除当前统计" -#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:3 +msgid "Strip commits from repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:7 +#, python-format +msgid "Please provide up to %d commits commits to strip" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:9 +msgid "" +"In the first step commits will be verified for existance in the repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:10 +msgid "In the second step, correct commits will be available for stripping" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:16 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:52 +msgid "Enter full 40 character commit sha" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:18 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:54 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:95 +msgid "Add another commit" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:27 +msgid "Check commits" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:33 +msgid "Sorry this functionality is not available for SVN repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:46 +msgid "Remove" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:112 +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 +msgid " commit verified positive" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:131 +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" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:13 msgid "Select to inherit global vcs settings." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:45 +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:43 #: rhodecode/templates/admin/settings/settings_global.mako:139 #: rhodecode/templates/admin/settings/settings_labs.mako:48 #: rhodecode/templates/admin/settings/settings_vcs.mako:13 @@ -6791,8 +7017,8 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_add.mako:13 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:76 -#: rhodecode/templates/base/base.mako:151 +#: rhodecode/templates/base/base.mako:79 +#: rhodecode/templates/base/base.mako:154 msgid "User groups" msgstr "" @@ -6833,30 +7059,72 @@ msgid "Members" msgstr "成员" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:9 +msgid "Automatic member sync" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:11 msgid "Assigned to repositories" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:10 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:12 msgid "Assigned to repo groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:17 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:19 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6 #, python-format msgid "User Group: %s" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:26 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:29 +msgid "Group members sync" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:36 +msgid "This group is set to be automatically synchronised." +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 +msgid "This group is not set to be automatically synchronised" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51 +msgid "Disable synchronization" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53 +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 msgid "Delete User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:32 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:81 #, 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:34 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:83 msgid "Delete This User Group" msgstr "" @@ -6882,6 +7150,7 @@ msgid "No members yet" msgstr "还没有成员" #: rhodecode/templates/admin/user_groups/user_groups.mako:5 +#: rhodecode/templates/admin/users/user_edit_groups.mako:6 msgid "User groups administration" msgstr "" @@ -6889,18 +7158,22 @@ msgstr "" msgid "user groups" msgstr "" +#: rhodecode/templates/admin/user_groups/user_groups.mako:62 +msgid "Sync" +msgstr "" + #: rhodecode/templates/admin/users/user_add.mako:5 msgid "Add user" msgstr "添加用户" #: rhodecode/templates/admin/users/user_add.mako:13 #: rhodecode/templates/admin/users/user_edit.mako:14 -#: rhodecode/templates/base/base.mako:75 +#: rhodecode/templates/base/base.mako:78 msgid "Users" msgstr "用户" #: rhodecode/templates/admin/users/user_add.mako:15 -#: rhodecode/templates/admin/users/users.mako:27 +#: rhodecode/templates/admin/users/users.mako:28 msgid "Add User" msgstr "" @@ -6952,14 +7225,18 @@ msgstr "" msgid "Auth tokens" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:38 -msgid "Emails" -msgstr "" - #: rhodecode/templates/admin/users/user_edit.mako:39 msgid "Ip Whitelist" msgstr "" +#: rhodecode/templates/admin/users/user_edit.mako:40 +msgid "User Groups Management" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.mako:41 +msgid "User audit" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 #: rhodecode/templates/admin/users/user_edit_profile.mako:106 msgid "Source of Record" @@ -6970,7 +7247,7 @@ msgid "Last login" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 -#: rhodecode/templates/admin/users/users.mako:99 +#: rhodecode/templates/admin/users/users.mako:71 msgid "Last activity" msgstr "" @@ -7076,22 +7353,23 @@ msgid "" "will delete the user's repositories!" msgstr "" -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 -msgid "Authentication Access Tokens" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:63 -msgid "No additional auth tokens specified" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:75 -msgid "New auth token" +#: rhodecode/templates/admin/users/user_edit_audit.mako:7 +msgid "User Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +msgid "audit filter..." msgstr "" #: rhodecode/templates/admin/users/user_edit_emails.mako:5 msgid "Additional Email Addresses" msgstr "" +#: rhodecode/templates/admin/users/user_edit_groups.mako:12 +#, python-format +msgid "Add `%s` to user group" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_ips.mako:3 msgid "Custom IP Whitelist" msgstr "" @@ -7148,98 +7426,98 @@ msgstr "" msgid "Users administration" msgstr "用户管理员" -#: rhodecode/templates/admin/users/users.mako:105 +#: rhodecode/templates/admin/users/users.mako:77 msgid "Auth type" msgstr "" -#: rhodecode/templates/base/base.mako:50 +#: rhodecode/templates/base/base.mako:53 #, python-format msgid "RhodeCode instance id: %s" msgstr "" -#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:81 msgid "Authentication" msgstr "" -#: rhodecode/templates/base/base.mako:80 +#: rhodecode/templates/base/base.mako:83 msgid "Defaults" msgstr "默认设置" -#: rhodecode/templates/base/base.mako:98 +#: rhodecode/templates/base/base.mako:101 #: rhodecode/templates/files/files_pjax.mako:24 #: rhodecode/templates/summary/components.mako:42 msgid "Show More" msgstr "" -#: rhodecode/templates/base/base.mako:185 +#: rhodecode/templates/base/base.mako:188 msgid "Fork of" msgstr "复刻自" -#: rhodecode/templates/base/base.mako:202 +#: rhodecode/templates/base/base.mako:205 #, python-format msgid "Repository locked by %(user)s" msgstr "" -#: rhodecode/templates/base/base.mako:207 +#: rhodecode/templates/base/base.mako:210 msgid "Repository not locked. Pull repository to lock it." msgstr "" -#: rhodecode/templates/base/base.mako:225 +#: rhodecode/templates/base/base.mako:228 #: rhodecode/templates/data_table/_dt_elements.mako:12 #: rhodecode/templates/data_table/_dt_elements.mako:13 #: rhodecode/templates/data_table/_dt_elements.mako:153 msgid "Summary" msgstr "概况" -#: rhodecode/templates/base/base.mako:226 +#: rhodecode/templates/base/base.mako:229 #: rhodecode/templates/data_table/_dt_elements.mako:17 #: rhodecode/templates/data_table/_dt_elements.mako:18 msgid "Changelog" msgstr "修订记录" -#: rhodecode/templates/base/base.mako:227 +#: rhodecode/templates/base/base.mako:230 #: rhodecode/templates/data_table/_dt_elements.mako:22 #: rhodecode/templates/data_table/_dt_elements.mako:23 #: rhodecode/templates/files/files.mako:15 msgid "Files" msgstr "浏览" -#: rhodecode/templates/base/base.mako:229 +#: rhodecode/templates/base/base.mako:232 #: rhodecode/templates/bookmarks/bookmarks.mako:68 #: rhodecode/templates/branches/branches.mako:67 #: rhodecode/templates/tags/tags.mako:68 msgid "Compare" msgstr "比较显示" -#: rhodecode/templates/base/base.mako:234 +#: rhodecode/templates/base/base.mako:237 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: rhodecode/templates/base/base.mako:243 +#: rhodecode/templates/base/base.mako:246 msgid "Options" msgstr "选项" -#: rhodecode/templates/base/base.mako:250 +#: rhodecode/templates/base/base.mako:253 #: rhodecode/templates/forks/forks_data.mako:30 msgid "Compare fork" msgstr "比较复刻" -#: rhodecode/templates/base/base.mako:253 -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:256 +#: rhodecode/templates/base/base.mako:403 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "搜索" -#: rhodecode/templates/base/base.mako:257 +#: rhodecode/templates/base/base.mako:260 msgid "Unlock" msgstr "" -#: rhodecode/templates/base/base.mako:259 +#: rhodecode/templates/base/base.mako:262 msgid "Lock" msgstr "" -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:267 #: rhodecode/templates/data_table/_dt_elements.mako:27 #: rhodecode/templates/data_table/_dt_elements.mako:28 #: rhodecode/templates/forks/forks_data.mako:8 @@ -7248,77 +7526,77 @@ msgid "Fork" msgid_plural "Forks" msgstr[0] "" -#: rhodecode/templates/base/base.mako:265 +#: rhodecode/templates/base/base.mako:268 msgid "Create Pull Request" msgstr "" -#: rhodecode/templates/base/base.mako:287 +#: rhodecode/templates/base/base.mako:290 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:295 +#: rhodecode/templates/base/base.mako:298 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:312 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:322 +#: 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:342 +#: rhodecode/templates/base/base.mako:345 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:346 +#: rhodecode/templates/base/base.mako:349 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:382 +#: rhodecode/templates/base/base.mako:385 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:383 +#: rhodecode/templates/base/base.mako:386 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:14 msgid "Journal" msgstr "日志" -#: rhodecode/templates/base/base.mako:388 +#: rhodecode/templates/base/base.mako:391 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:389 +#: rhodecode/templates/base/base.mako:392 msgid "Public journal" msgstr "公共日志" -#: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/base/base.mako:397 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:395 +#: rhodecode/templates/base/base.mako:398 msgid "Gists" msgstr "" -#: rhodecode/templates/base/base.mako:399 +#: rhodecode/templates/base/base.mako:402 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:408 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:412 +#: rhodecode/templates/base/base.mako:415 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:422 -#: rhodecode/templates/base/base.mako:423 +#: rhodecode/templates/base/base.mako:425 +#: rhodecode/templates/base/base.mako:426 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7340,15 +7618,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:480 +#: rhodecode/templates/base/base.mako:483 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:533 +#: rhodecode/templates/base/base.mako:536 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:541 +#: rhodecode/templates/base/base.mako:544 msgid "Site-wide shortcuts" msgstr "" @@ -7417,9 +7695,7 @@ msgid "User Group Creation" msgstr "" #: rhodecode/templates/base/default_perms_box.mako:72 -msgid "" -"Permission to allow user group creation. When disabled, user group admins " -"can still create subgroups within their user groups." +msgid "Permission to allow user group creation." msgstr "" #: rhodecode/templates/base/default_perms_box.mako:78 @@ -7444,19 +7720,19 @@ msgid "" "permission by members of user groups." msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:22 +#: rhodecode/templates/base/issue_tracker_settings.mako:21 msgid "Read more" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:92 +#: rhodecode/templates/base/issue_tracker_settings.mako:91 msgid "New Entry" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:96 +#: rhodecode/templates/base/issue_tracker_settings.mako:95 msgid "Confirm to remove this pattern:" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:192 +#: 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 @@ -7466,7 +7742,7 @@ msgstr "" msgid "Preview" msgstr "" -#: rhodecode/templates/base/issue_tracker_settings.mako:193 +#: rhodecode/templates/base/issue_tracker_settings.mako:192 msgid "Test Pattern Preview" msgstr "" @@ -7614,101 +7890,130 @@ msgstr "" msgid "Enable largefiles extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:99 +#: rhodecode/templates/base/vcs_settings.mako:100 msgid "Enable Largefiles extensions for all repositories." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:103 +#: rhodecode/templates/base/vcs_settings.mako:102 +msgid "Enable Largefiles extensions for this repository." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:113 +msgid "" +"Filesystem location where Mercurial largefile objects should be stored." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:119 msgid "Set repositories as publishing" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:103 +#: rhodecode/templates/base/vcs_settings.mako:119 msgid "Set repository as publishing" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:106 +#: rhodecode/templates/base/vcs_settings.mako:122 msgid "" "When this is enabled all commits in the repository are seen as public " "commits by clients." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:111 +#: rhodecode/templates/base/vcs_settings.mako:127 msgid "Enable hgsubversion extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:114 +#: rhodecode/templates/base/vcs_settings.mako:130 msgid "" "Requires hgsubversion library to be installed. Allows cloning remote SVN " "repositories and migrates them to Mercurial type." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:123 +#: rhodecode/templates/base/vcs_settings.mako:139 msgid "Mercurial Labs Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:123 +#: rhodecode/templates/base/vcs_settings.mako:139 msgid "" "These features are considered experimental and may not work as expected." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:129 +#: rhodecode/templates/base/vcs_settings.mako:145 msgid "Use rebase as merge strategy" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:132 +#: rhodecode/templates/base/vcs_settings.mako:148 msgid "" "Use rebase instead of creating a merge commit when merging via web " "interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:144 +#: rhodecode/templates/base/vcs_settings.mako:160 +msgid "Git Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:165 +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 "Filesystem location where Git lfs objects should be stored." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:193 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:150 +#: rhodecode/templates/base/vcs_settings.mako:199 msgid "Proxy subversion HTTP requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:154 +#: 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:155 +#: rhodecode/templates/base/vcs_settings.mako:204 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:161 +#: rhodecode/templates/base/vcs_settings.mako:210 msgid "Subversion HTTP Server URL" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:167 +#: rhodecode/templates/base/vcs_settings.mako:216 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:179 +#: rhodecode/templates/base/vcs_settings.mako:228 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:184 +#: rhodecode/templates/base/vcs_settings.mako:233 msgid "Repository patterns" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:188 +#: rhodecode/templates/base/vcs_settings.mako:237 msgid "" "Patterns for identifying SVN branches and tags. For recursive search, use " "\"*\". Eg.: \"/branches/*\"" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:254 +#: rhodecode/templates/base/vcs_settings.mako:301 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:259 +#: rhodecode/templates/base/vcs_settings.mako:306 msgid "Enable server-side merge for pull requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:262 +#: rhodecode/templates/base/vcs_settings.mako:309 msgid "" "Note: when this feature is enabled, it only runs hooks defined in the " "rcextension package. Custom hooks added on the Admin -> Settings -> Hooks " @@ -7716,11 +8021,11 @@ msgid "" "web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:266 +#: rhodecode/templates/base/vcs_settings.mako:313 msgid "Invalidate and relocate inline comments during update" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:269 +#: rhodecode/templates/base/vcs_settings.mako:316 msgid "" "During the update of a pull request, the position of inline comments will be" " updated and outdated inline comments will be hidden." @@ -7856,7 +8161,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:53 #: rhodecode/templates/compare/compare_commits.mako:46 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:495 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" @@ -7949,8 +8254,8 @@ msgid "Diff options" msgstr "" #: rhodecode/templates/changeset/changeset.mako:119 -#: rhodecode/templates/codeblocks/diffs.mako:436 -#: rhodecode/templates/codeblocks/diffs.mako:439 +#: rhodecode/templates/codeblocks/diffs.mako:445 +#: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "" @@ -7967,8 +8272,8 @@ msgid "Patch Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:127 -#: rhodecode/templates/codeblocks/diffs.mako:443 -#: rhodecode/templates/codeblocks/diffs.mako:446 +#: rhodecode/templates/codeblocks/diffs.mako:452 +#: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "" @@ -7978,7 +8283,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:145 #: rhodecode/templates/changeset/changeset.mako:147 -#: rhodecode/tests/functional/test_commit_comments.py:270 +#: rhodecode/tests/functional/test_commit_comments.py:275 #, python-format msgid "%d Commit comment" msgid_plural "%d Commit comments" @@ -7986,7 +8291,7 @@ msgstr[0] "" #: rhodecode/templates/changeset/changeset.mako:150 #: rhodecode/templates/changeset/changeset.mako:152 -#: rhodecode/tests/functional/test_commit_comments.py:277 +#: rhodecode/tests/functional/test_commit_comments.py:282 #, python-format msgid "%d Inline Comment" msgid_plural "%d Inline Comments" @@ -8091,18 +8396,16 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:363 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:148 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:153 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "已关闭" -#: rhodecode/templates/changeset/changeset_file_comment.mako:388 +#: rhodecode/templates/changeset/changeset_file_comment.mako:393 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 #: rhodecode/templates/compare/compare_diff.mako:122 -#: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:97 msgid "Comment" msgstr "评论" @@ -8136,7 +8439,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_range.mako:99 #: rhodecode/templates/compare/compare_diff.mako:312 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:414 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:419 #, python-format msgid "Expand %s commit" msgid_plural "Expand %s commits" @@ -8144,7 +8447,7 @@ msgstr[0] "" #: rhodecode/templates/changeset/changeset_range.mako:105 #: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 #, python-format msgid "Collapse %s commit" msgid_plural "Collapse %s commits" @@ -8242,64 +8545,68 @@ msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:406 -#: rhodecode/templates/codeblocks/diffs.mako:422 +#: rhodecode/templates/codeblocks/diffs.mako:415 +#: rhodecode/templates/codeblocks/diffs.mako:431 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:408 -#: rhodecode/templates/codeblocks/diffs.mako:415 +#: rhodecode/templates/codeblocks/diffs.mako:417 +#: rhodecode/templates/codeblocks/diffs.mako:424 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:413 -#: rhodecode/templates/codeblocks/diffs.mako:429 +#: rhodecode/templates/codeblocks/diffs.mako:422 +#: rhodecode/templates/codeblocks/diffs.mako:438 #, python-format msgid "File no longer present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:424 -#: rhodecode/templates/codeblocks/diffs.mako:431 +#: rhodecode/templates/codeblocks/diffs.mako:433 +#: rhodecode/templates/codeblocks/diffs.mako:440 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:462 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:462 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:634 +#: rhodecode/templates/codeblocks/diffs.mako:643 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:636 +#: rhodecode/templates/codeblocks/diffs.mako:645 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:640 +#: rhodecode/templates/codeblocks/diffs.mako:649 msgid "View unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:641 +#: rhodecode/templates/codeblocks/diffs.mako:650 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:651 +#: rhodecode/templates/codeblocks/diffs.mako:660 msgid "Expand All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:655 +#: rhodecode/templates/codeblocks/diffs.mako:664 msgid "Collapse All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:659 +#: rhodecode/templates/codeblocks/diffs.mako:668 msgid "Wide Mode Diff" msgstr "" +#: rhodecode/templates/codeblocks/source.mako:24 +msgid "view annotation from before this change" +msgstr "" + #: rhodecode/templates/compare/compare_commits.mako:5 msgid "Common Ancestor Commit" msgstr "" @@ -8309,7 +8616,7 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:16 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:451 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:456 msgid "Time" msgstr "" @@ -8320,7 +8627,7 @@ msgid_plural "%s commits hidden" msgstr[0] "" #: rhodecode/templates/compare/compare_commits.mako:68 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:568 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:573 msgid "show it" msgid_plural "show them" msgstr[0] "" @@ -8354,14 +8661,14 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:98 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:103 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.mako:76 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 -#: rhodecode/templates/files/files_source.mako:20 +#: rhodecode/templates/files/files_source.mako:23 msgid "Source" msgstr "" @@ -8583,133 +8890,150 @@ msgstr "" msgid "RhodeCode" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:16 -#: rhodecode/templates/email_templates/pull_request_comment.mako:18 +#: rhodecode/templates/email_templates/commit_comment.mako:18 +#: rhodecode/templates/email_templates/pull_request_comment.mako:19 msgid "[mention]" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:19 -#, python-format -msgid "" -"%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:19 -#: rhodecode/templates/email_templates/commit_comment.mako:22 +#: rhodecode/templates/email_templates/commit_comment.mako:21 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on commit `%(commit_id)s` (file: " +"`%(comment_file)s`)" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:24 +#: rhodecode/templates/email_templates/commit_comment.mako:26 #, python-format msgid "in the %(repo_name)s repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:22 -#, python-format -msgid "%(user)s commented on commit `%(commit_id)s` (status: %(status)s)" -msgstr "" - #: rhodecode/templates/email_templates/commit_comment.mako:24 -#: rhodecode/templates/email_templates/commit_comment.mako:78 -#, python-format -msgid "%(user)s commented on commit `%(commit_id)s`" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:43 -#: rhodecode/templates/email_templates/pull_request_comment.mako:44 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on commit `%(commit_id)s` (status: " +"%(status)s)" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:26 +#, python-format +msgid "%(user)s left %(comment_type)s on commit `%(commit_id)s`" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:47 +#: rhodecode/templates/email_templates/pull_request_comment.mako:47 msgid "Comment link" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:48 -#: rhodecode/templates/email_templates/pull_request_comment.mako:49 +#: rhodecode/templates/email_templates/commit_comment.mako:52 +#: rhodecode/templates/email_templates/pull_request_comment.mako:52 #, python-format msgid "File: %(comment_file)s on line %(comment_line)s" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:54 +#: rhodecode/templates/email_templates/commit_comment.mako:58 msgid "Commit status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:76 +#: rhodecode/templates/email_templates/commit_comment.mako:82 #, python-format msgid "%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:76 -#: rhodecode/templates/email_templates/commit_comment.mako:78 +#: rhodecode/templates/email_templates/commit_comment.mako:82 +#: rhodecode/templates/email_templates/commit_comment.mako:84 #, python-format msgid "in the %(repo)s repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:85 +#: rhodecode/templates/email_templates/commit_comment.mako:84 +#, python-format +msgid "%(user)s commented on commit `%(commit_id)s`" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:92 +#: rhodecode/templates/email_templates/pull_request_comment.mako:94 msgid "Status" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:85 +#: rhodecode/templates/email_templates/commit_comment.mako:93 msgid "The commit status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:97 -#, python-format -msgid "Comment on line: %(comment_line)s" -msgstr "" - -#: rhodecode/templates/email_templates/password_reset.mako:30 +#: rhodecode/templates/email_templates/commit_comment.mako:99 +#: rhodecode/templates/email_templates/pull_request_comment.mako:107 +#, python-format +msgid "TODO comment on line: %(comment_line)s" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:101 +#: rhodecode/templates/email_templates/pull_request_comment.mako:109 +#, python-format +msgid "Note comment on line: %(comment_line)s" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:101 +#: rhodecode/templates/email_templates/pull_request_comment.mako:109 +msgid "Note comment" +msgstr "" + +#: rhodecode/templates/email_templates/password_reset.mako:31 msgid "Generate new password here" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:21 -#, python-format -msgid "" -"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: " -"`%(comment_file)s`)" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:24 -#, python-format -msgid "" -"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: " -"%(status)s)" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:26 -#: rhodecode/templates/email_templates/pull_request_comment.mako:83 -#, python-format -msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:46 +#: rhodecode/templates/email_templates/pull_request_comment.mako:22 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\" " +"(file: `%(comment_file)s`)" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:25 +#, python-format +msgid "" +"%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\" " +"(status: %(status)s)" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:27 +#, python-format +msgid "%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:49 msgid "Source repository" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:55 +#: rhodecode/templates/email_templates/pull_request_comment.mako:58 #, python-format msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:57 +#: rhodecode/templates/email_templates/pull_request_comment.mako:60 #, python-format msgid "" "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:81 +#: rhodecode/templates/email_templates/pull_request_comment.mako:84 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" " "(file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:87 -#, python-format -msgid "submitted pull request status: %(status)s" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:89 -#, python-format -msgid "submitted pull request status: %(status)s and closed" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:95 -msgid "Submitted status" +#: rhodecode/templates/email_templates/pull_request_comment.mako:86 +#, python-format +msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 +msgid "Closed pull request with status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:99 +msgid "Submitted review status" msgstr "" #: rhodecode/templates/email_templates/pull_request_review.mako:14 @@ -8774,12 +9098,6 @@ msgstr "" msgid "Full Name" msgstr "" -#: rhodecode/templates/email_templates/user_registration.mako:26 -#: rhodecode/templates/users/user.mako:29 -#: rhodecode/templates/users/user_profile.mako:5 -msgid "Profile" -msgstr "" - #: rhodecode/templates/errors/error_document.mako:46 #, python-format msgid "You will be redirected to %s in %s seconds" @@ -8935,13 +9253,13 @@ msgid "Delete file" msgstr "" #: rhodecode/templates/files/files_delete.mako:45 -#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:65 #, python-format msgid "Binary file (%s)" msgstr "二进制文件（%s）" #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:87 msgid "File is too big to display" msgstr "文件过大，不能显示" @@ -8954,19 +9272,19 @@ msgstr "" msgid "Commit Description" msgstr "" -#: rhodecode/templates/files/files_detail.mako:35 +#: rhodecode/templates/files/files_detail.mako:32 msgid "File last commit" msgstr "" -#: rhodecode/templates/files/files_detail.mako:51 +#: rhodecode/templates/files/files_detail.mako:46 msgid "Show/Diff file" msgstr "" -#: rhodecode/templates/files/files_detail.mako:66 +#: rhodecode/templates/files/files_detail.mako:61 msgid "Diff to Commit" msgstr "" -#: rhodecode/templates/files/files_detail.mako:67 +#: rhodecode/templates/files/files_detail.mako:62 msgid "Show at Commit" msgstr "" @@ -9008,71 +9326,65 @@ msgstr "编辑文件" msgid "Location" msgstr "位置" -#: rhodecode/templates/files/files_source.mako:7 +#: rhodecode/templates/files/files_source.mako:8 +msgid "This file is a pointer to large binary file" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:8 +msgid "LargeFile" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:10 #: rhodecode/templates/search/search_content.mako:57 msgid "line" msgid_plural "lines" msgstr[0] "" -#: rhodecode/templates/files/files_source.mako:14 +#: rhodecode/templates/files/files_source.mako:17 msgid "History" msgstr "" -#: rhodecode/templates/files/files_source.mako:17 +#: rhodecode/templates/files/files_source.mako:20 #: rhodecode/templates/search/search_content.mako:68 msgid "Show Full History" msgstr "" -#: rhodecode/templates/files/files_source.mako:22 +#: rhodecode/templates/files/files_source.mako:25 #: rhodecode/templates/search/search_content.mako:70 msgid "Annotation" msgstr "" -#: rhodecode/templates/files/files_source.mako:24 +#: rhodecode/templates/files/files_source.mako:27 #: rhodecode/templates/search/search_content.mako:71 msgid "Raw" msgstr "" -#: rhodecode/templates/files/files_source.mako:26 +#: rhodecode/templates/files/files_source.mako:31 +msgid "Download largefile" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:35 #: rhodecode/templates/search/search_content.mako:73 msgid "Download" msgstr "下载" -#: rhodecode/templates/files/files_source.mako:33 +#: rhodecode/templates/files/files_source.mako:43 #, python-format msgid "Edit on Branch:%s" msgstr "" -#: rhodecode/templates/files/files_source.mako:38 +#: rhodecode/templates/files/files_source.mako:48 msgid "Editing binary files not allowed" msgstr "" -#: rhodecode/templates/files/files_source.mako:41 +#: rhodecode/templates/files/files_source.mako:51 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_source.mako:52 msgid "Deleting files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/followers/followers.mako:5 -#: rhodecode/templates/followers/followers.mako:27 -#, python-format -msgid "%s Followers" -msgstr "%s个关注者" - -#: rhodecode/templates/followers/followers.mako:12 -msgid "Followers" -msgstr "关注者" - -#: rhodecode/templates/followers/followers_data.mako:5 -msgid "Follower Name" -msgstr "" - -#: rhodecode/templates/followers/followers_data.mako:6 -msgid "Following Since" -msgstr "" - #: rhodecode/templates/forks/fork.mako:5 #, python-format msgid "Fork repository %s" @@ -9153,97 +9465,98 @@ msgstr "订阅公共日志RSS" msgid "New pull request" msgstr "新建拉取请求" -#: rhodecode/templates/pullrequests/pullrequest.mako:52 +#: rhodecode/templates/pullrequests/pullrequest.mako:51 msgid "Write a short description on this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:59 +#: rhodecode/templates/pullrequests/pullrequest.mako:57 msgid "Commit flow" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:67 +#: rhodecode/templates/pullrequests/pullrequest.mako:65 msgid "Origin repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:85 +#: rhodecode/templates/pullrequests/pullrequest.mako:83 msgid "Loading refs..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:96 +#: rhodecode/templates/pullrequests/pullrequest.mako:94 msgid "Submit Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:109 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:317 +#: rhodecode/templates/pullrequests/pullrequest.mako:107 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:322 msgid "Pull request reviewers" msgstr "拉取请求检视人员" -#: rhodecode/templates/pullrequests/pullrequest.mako:110 -msgid "loading..." -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.mako:120 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:361 +#: rhodecode/templates/pullrequests/pullrequest.mako:118 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:366 msgid "Add reviewer" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:299 -#: rhodecode/templates/pullrequests/pullrequest.mako:572 +#: rhodecode/templates/pullrequests/pullrequest.mako:297 +#: rhodecode/templates/pullrequests/pullrequest.mako:570 msgid "Please select origin and destination" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:305 +#: rhodecode/templates/pullrequests/pullrequest.mako:303 msgid "Loading compare ..." msgstr "" +#: rhodecode/templates/pullrequests/pullrequest.mako:350 #: rhodecode/templates/pullrequests/pullrequest.mako:352 -#: rhodecode/templates/pullrequests/pullrequest.mako:354 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:357 +#: rhodecode/templates/pullrequests/pullrequest.mako:355 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:364 +#: rhodecode/templates/pullrequests/pullrequest.mako:362 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:464 +#: rhodecode/templates/pullrequests/pullrequest.mako:462 msgid "Destination repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:475 +#: rhodecode/templates/pullrequests/pullrequest.mako:473 msgid "Select commit reference" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:8 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:7 msgid "This pull request can be merged automatically." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:13 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:12 msgid "Merge is not currently possible because of below failed checks." msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:37 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:42 +msgid "refresh checks" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:38 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 -msgid "refresh checks" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:39 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:44 msgid "Merge Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:44 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 msgid "You are not allowed to merge this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:46 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:45 msgid "Login to Merge this Pull Request" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:54 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 +msgid "Close with status {}" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show.mako:5 #, python-format msgid "%s Pull Request #%s" @@ -9261,169 +9574,173 @@ msgstr "确认删除拉取请求" msgid "Origin" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:120 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:88 +msgid "Common ancestor" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:125 msgid "Merge" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:133 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:138 msgid "Shadow repository data not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:141 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:146 msgid "Review" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:157 #, python-format msgid "calculated based on %s reviewer vote" msgid_plural "calculated based on %s reviewers votes" msgstr[0] "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:170 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:175 msgid "Versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:183 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:186 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:188 msgid "{} version available for this pull request, show it." msgid_plural "{} versions available for this pull request, show them." msgstr[0] "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:182 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:187 msgid "Hide all versions of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:207 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:212 msgid "Your review status at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:213 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:218 msgid "Comment from pull request version {0}, general:{1} inline:{2}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:230 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:234 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:235 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:239 msgid "select versions to show changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:231 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:236 msgid "show changes between versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:232 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:237 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:247 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:252 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:251 -msgid "Comments for this pull request" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:256 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 +msgid "Comments for this pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:261 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:263 #, python-format msgid "%d General " msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:264 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:267 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:269 #, python-format msgid "%d Inline" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:268 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:272 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:273 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 #, python-format msgid "%d Outdated" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:269 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:274 msgid "show outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:270 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:281 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:286 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:295 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:365 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:300 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:370 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:382 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:387 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:383 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:388 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:391 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:396 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 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:393 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 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:404 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:409 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:427 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:432 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:440 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:445 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:444 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:449 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:462 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:464 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:469 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:567 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:572 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:570 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:575 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:571 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:576 msgid "show them" msgstr ""