diff --git a/rhodecode/i18n/rhodecode.pot b/rhodecode/i18n/rhodecode.pot --- a/rhodecode/i18n/rhodecode.pot +++ b/rhodecode/i18n/rhodecode.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: rhodecode-enterprise-ce 4.8.0\n" +"Project-Id-Version: rhodecode-enterprise-ce 4.10.0\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-06-28 21:55+0200\n" +"POT-Creation-Date: 2017-11-03 16:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,7 @@ msgstr "" "Generated-By: Babel 1.3\n" #: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:166 +#: rhodecode/integrations/views.py:154 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "" @@ -86,17 +86,86 @@ msgid "System Info" msgstr "" #: rhodecode/apps/admin/navigation.py:97 -msgid "User Sessions" +msgid "Processes" msgstr "" #: rhodecode/apps/admin/navigation.py:99 +msgid "User Sessions" +msgstr "" + +#: rhodecode/apps/admin/navigation.py:101 msgid "Open Source Licenses" msgstr "" -#: rhodecode/apps/admin/navigation.py:107 +#: rhodecode/apps/admin/navigation.py:109 msgid "Labs" msgstr "" +#: rhodecode/apps/admin/views/defaults.py:90 +msgid "Default settings updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/defaults.py:108 +msgid "Error occurred during update of default values" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:121 +msgid "Application permissions updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:142 +#: rhodecode/apps/admin/views/permissions.py:213 +#: rhodecode/apps/admin/views/permissions.py:287 +msgid "Error occurred during update of permissions" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:193 +msgid "Object permissions updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:267 +msgid "Global permissions updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:448 +#: rhodecode/templates/admin/gists/show.mako:63 +#: rhodecode/templates/admin/integrations/list.mako:208 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:5 +#: rhodecode/templates/base/issue_tracker_settings.mako:60 +#: rhodecode/templates/data_table/_dt_elements.mako:166 +#: rhodecode/templates/data_table/_dt_elements.mako:240 +#: rhodecode/templates/data_table/_dt_elements.mako:253 +#: rhodecode/templates/data_table/_dt_elements.mako:254 +#: rhodecode/templates/data_table/_dt_elements.mako:266 +#: rhodecode/templates/debug_style/buttons.html:128 +#: rhodecode/templates/files/files_add.mako:208 +#: rhodecode/templates/files/files_edit.mako:168 +#: rhodecode/templates/files/files_source.mako:54 +#: rhodecode/templates/files/files_source.mako:57 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:345 +#: rhodecode/templates/users/user_profile.mako:7 +msgid "Edit" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:476 +msgid "Updated SSH keys file: {}" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:479 +msgid "SSH key support is disabled in .ini file" +msgstr "" + +#: rhodecode/apps/admin/views/repo_groups.py:180 +#, python-format +msgid "Created repository group %s" +msgstr "" + +#: rhodecode/apps/admin/views/repo_groups.py:198 +#, python-format +msgid "Error occurred during creation of repository group %s" +msgstr "" + #: rhodecode/apps/admin/views/sessions.py:92 msgid "Cleaned up old sessions" msgstr "" @@ -257,267 +326,845 @@ msgstr "" msgid "SVN" msgstr "" -#: rhodecode/apps/admin/views/users.py:63 -#: rhodecode/controllers/admin/users.py:360 -#: rhodecode/controllers/admin/users.py:381 -#: rhodecode/controllers/admin/users.py:412 -#: rhodecode/controllers/admin/users.py:486 -msgid "You can't edit this user" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:168 -#: rhodecode/apps/my_account/views.py:148 -#: rhodecode/controllers/admin/gists.py:62 -msgid "forever" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:169 -#: rhodecode/apps/my_account/views.py:149 -#: rhodecode/controllers/admin/gists.py:63 -msgid "5 minutes" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:170 -#: rhodecode/apps/my_account/views.py:150 -#: rhodecode/controllers/admin/gists.py:64 -msgid "1 hour" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:171 -#: rhodecode/apps/my_account/views.py:151 -#: rhodecode/controllers/admin/gists.py:65 -msgid "1 day" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:172 -#: rhodecode/apps/my_account/views.py:152 -#: rhodecode/controllers/admin/gists.py:66 -msgid "1 month" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:174 -#: rhodecode/apps/my_account/views.py:154 -#: rhodecode/controllers/admin/gists.py:70 -msgid "Lifetime" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:178 -#: rhodecode/apps/my_account/views.py:158 +#: rhodecode/apps/admin/views/user_groups.py:220 +#, python-format +msgid "Created user group %(user_group_link)s" +msgstr "" + +#: rhodecode/apps/admin/views/user_groups.py:242 +#, python-format +msgid "Error occurred during creation of user group %s" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:208 +#, python-format +msgid "Created user %(user_link)s" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:229 +#, python-format +msgid "Error occurred during creation of user %s" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:303 +msgid "User updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:321 +#: rhodecode/apps/my_account/views/my_account.py:485 +#, python-format +msgid "Error occurred during update of user %s" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:353 +#, python-format +msgid "Detached %s repositories" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:358 +#, python-format +msgid "Deleted %s repositories" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:366 +#, python-format +msgid "Detached %s repository groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:371 +#, python-format +msgid "Deleted %s repository groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:379 +#, python-format +msgid "Detached %s user groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:384 +#, python-format +msgid "Deleted %s user groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:401 +msgid "Successfully deleted user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:407 +msgid "An error occurred during deletion of user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:472 +msgid "" +"The user participates as reviewer in {} pull request and cannot be deleted. \n" +"You can set the user to \"{}\" instead of deleting it." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:478 +msgid "" +"The user participates as reviewer in {} pull requests and cannot be deleted. \n" +"You can set the user to \"{}\" instead of deleting it." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:565 +msgid "User global permissions updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:583 +#: rhodecode/apps/user_group/views/__init__.py:472 +msgid "An error occurred during permissions saving" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:608 +msgid "Force password change disabled for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:613 +msgid "Force password change enabled for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:622 +msgid "An error occurred during password reset for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:661 +#, python-format +msgid "Linked repository group `%s` as personal" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:667 +#, python-format +msgid "Created repository group `%s`" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:671 +#, python-format +msgid "Repository group `%s` is already taken" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:676 +msgid "An error occurred during repository group creation for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:699 +#: rhodecode/apps/my_account/views/my_account.py:159 #: 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:217 -#: rhodecode/apps/my_account/views.py:191 +#: rhodecode/apps/admin/views/users.py:737 +#: rhodecode/apps/my_account/views/my_account.py:193 msgid "Auth token successfully created" msgstr "" -#: rhodecode/apps/admin/views/users.py:246 -#: rhodecode/apps/my_account/views.py:215 +#: rhodecode/apps/admin/views/users.py:766 +#: rhodecode/apps/my_account/views/my_account.py:217 msgid "Auth token successfully deleted" msgstr "" -#: rhodecode/apps/admin/views/users.py:290 -#: rhodecode/apps/my_account/views.py:253 +#: rhodecode/apps/admin/views/users.py:838 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:113 +msgid "Ssh Key successfully created" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:842 +#: rhodecode/apps/admin/views/users.py:847 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:117 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:122 +msgid "An error occurred during ssh key saving: {}" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:881 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:152 +msgid "Ssh key successfully deleted" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:922 +#: rhodecode/apps/my_account/views/my_account.py:255 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:296 -#: rhodecode/apps/my_account/views.py:259 +#: rhodecode/apps/admin/views/users.py:928 +msgid "Email `{}` is already registered for another user." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:932 +#: rhodecode/apps/my_account/views/my_account.py:261 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/apps/admin/views/users.py:323 +#: rhodecode/apps/admin/views/users.py:959 msgid "Removed email address from user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:372 +#: rhodecode/apps/admin/views/users.py:1005 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/apps/admin/views/users.py:389 +#: rhodecode/apps/admin/views/users.py:1023 msgid "An error occurred during ip saving" msgstr "" -#: rhodecode/apps/admin/views/users.py:393 +#: rhodecode/apps/admin/views/users.py:1027 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:423 +#: rhodecode/apps/admin/views/users.py:1057 msgid "Removed ip address from user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:472 +#: rhodecode/apps/admin/views/users.py:1122 msgid "Groups successfully changed" msgstr "" -#: rhodecode/apps/home/views.py:197 rhodecode/apps/home/views.py:230 -#: rhodecode/controllers/pullrequests.py:191 -#: rhodecode/templates/admin/my_account/my_account.mako:38 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:128 +#: rhodecode/apps/gist/views.py:57 rhodecode/model/auth_token.py:51 +msgid "forever" +msgstr "" + +#: rhodecode/apps/gist/views.py:58 +msgid "5 minutes" +msgstr "" + +#: rhodecode/apps/gist/views.py:59 +msgid "1 hour" +msgstr "" + +#: rhodecode/apps/gist/views.py:60 +msgid "1 day" +msgstr "" + +#: rhodecode/apps/gist/views.py:61 +msgid "1 month" +msgstr "" + +#: rhodecode/apps/gist/views.py:64 +#: rhodecode/public/js/rhodecode-components.js:47769 +#: rhodecode/public/js/scripts.js:39617 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/src/rhodecode.js:507 +msgid "Lifetime" +msgstr "" + +#: rhodecode/apps/gist/views.py:66 +msgid "Requires registered account" +msgstr "" + +#: rhodecode/apps/gist/views.py:67 +msgid "Can be accessed by anonymous users" +msgstr "" + +#: rhodecode/apps/gist/views.py:214 +msgid "Error occurred during gist creation" +msgstr "" + +#: rhodecode/apps/gist/views.py:238 +#, python-format +msgid "Deleted gist %s" +msgstr "" + +#: rhodecode/apps/gist/views.py:324 +#: rhodecode/templates/admin/gists/show.mako:74 +#: 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:323 +msgid "never" +msgstr "" + +#: rhodecode/apps/gist/views.py:330 +#, python-format +msgid "%(expiry)s - current value" +msgstr "" + +#: rhodecode/apps/gist/views.py:375 +msgid "Successfully updated gist content" +msgstr "" + +#: rhodecode/apps/gist/views.py:380 +msgid "Successfully updated gist data" +msgstr "" + +#: rhodecode/apps/gist/views.py:383 +msgid "Error occurred during update of gist {}: {}" +msgstr "" + +#: rhodecode/apps/gist/views.py:387 +#, python-format +msgid "Error occurred during update of gist %s" +msgstr "" + +#: rhodecode/apps/home/views.py:215 rhodecode/apps/home/views.py:248 +#: rhodecode/apps/repository/views/repo_pull_requests.py:731 +#: rhodecode/templates/admin/my_account/my_account.mako:39 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:126 #: rhodecode/templates/admin/repos/repo_add.mako:15 #: rhodecode/templates/admin/repos/repo_add.mako:19 #: rhodecode/templates/admin/users/user_edit_advanced.mako:11 #: rhodecode/templates/base/base.mako:76 rhodecode/templates/base/base.mako:148 -#: rhodecode/templates/base/base.mako:575 +#: rhodecode/templates/base/base.mako:580 msgid "Repositories" msgstr "" -#: rhodecode/apps/home/views.py:223 +#: rhodecode/apps/home/views.py:241 msgid "Groups" msgstr "" -#: rhodecode/apps/home/views.py:243 +#: rhodecode/apps/home/views.py:261 #, python-format msgid "Commits in %(repo)s" msgstr "" -#: rhodecode/apps/login/views.py:270 rhodecode/apps/login/views.py:339 +#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:177 +msgid "public journal" +msgstr "" + +#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:181 +msgid "journal" +msgstr "" + +#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:341 msgid "Bad captcha" msgstr "" -#: rhodecode/apps/login/views.py:279 +#: rhodecode/apps/login/views.py:281 msgid "You have successfully registered with RhodeCode" msgstr "" -#: rhodecode/apps/login/views.py:315 +#: rhodecode/apps/login/views.py:317 msgid "If such email exists, a password reset link was sent to it." msgstr "" -#: rhodecode/apps/login/views.py:321 +#: rhodecode/apps/login/views.py:323 msgid "Password reset has been disabled." msgstr "" -#: rhodecode/apps/login/views.py:410 +#: rhodecode/apps/login/views.py:412 msgid "Given reset token is invalid" msgstr "" -#: rhodecode/apps/login/views.py:418 +#: rhodecode/apps/login/views.py:420 msgid "Your password reset was successful, a new password has been sent to your email" msgstr "" -#: rhodecode/apps/my_account/views.py:125 +#: rhodecode/apps/my_account/views/my_account.py:134 msgid "Error occurred during update of user password" msgstr "" -#: rhodecode/apps/my_account/views.py:132 +#: rhodecode/apps/my_account/views/my_account.py:141 msgid "Successfully updated password" msgstr "" -#: rhodecode/apps/my_account/views.py:281 +#: rhodecode/apps/my_account/views/my_account.py:283 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/repository/views/repo_caches.py:70 +#: rhodecode/apps/my_account/views/my_account.py:465 +msgid "Your account was updated successfully" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:98 +#, python-format +msgid "Removed repository group `%s`" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:102 +#, python-format +msgid "Error occurred during deletion of repository group %s" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:73 +#: rhodecode/apps/user_group/views/__init__.py:353 +msgid "Cannot change permission for yourself as admin" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:97 +msgid "Repository Group permissions updated" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_settings.py:174 +msgid "Repository Group `{}` updated successfully" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_settings.py:179 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_caches.py:67 msgid "Cache invalidation successful" msgstr "" -#: rhodecode/apps/repository/views/repo_caches.py:74 +#: rhodecode/apps/repository/views/repo_caches.py:71 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/apps/repository/views/repo_permissions.py:95 +#: rhodecode/apps/repository/views/repo_changelog.py:66 +#: rhodecode/apps/repository/views/repo_compare.py:66 +#: rhodecode/apps/repository/views/repo_pull_requests.py:607 +msgid "There are no commits yet" +msgstr "" + +#: rhodecode/apps/repository/views/repo_changelog.py:71 +#: rhodecode/apps/repository/views/repo_commits.py:193 +#: rhodecode/apps/repository/views/repo_files.py:150 +#: rhodecode/apps/repository/views/repo_files.py:170 +msgid "No such commit exists for this repository" +msgstr "" + +#: rhodecode/apps/repository/views/repo_checks.py:95 +#, python-format +msgid "Created repository %s from %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_checks.py:104 +#, python-format +msgid "Forked repository %s as %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_checks.py:107 +#, python-format +msgid "Created repository %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:73 +msgid "Show whitespace" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:74 +msgid "Show whitespace for all diffs" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:80 +msgid "Ignore whitespace" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:81 +msgid "Ignore whitespace for all diffs" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:139 +msgid "Increase context" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:140 +msgid "Increase context for all diffs" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:389 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1126 +#, python-format +msgid "Status change %(transition_icon)s %(status)s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:433 +msgid "Changing the status of a commit associated with a closed pull request is not allowed" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:104 +msgid "Select commit" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:171 +msgid "Could not find the source repo: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:179 +msgid "Could not find the target repo: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:190 +msgid "The comparison of two different kinds of remote repos is not available" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:229 +msgid "Could not compare repos with different large file settings" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:275 +#, python-format +msgid "Repositories unrelated. Cannot compare commit %(commit1)s from repository %(repo1)s with commit %(commit2)s from repository %(repo2)s." +msgstr "" + +#: rhodecode/apps/repository/views/repo_feed.py:70 +#, python-format +msgid "Changes on %s repository" +msgstr "" + +#: rhodecode/apps/repository/views/repo_feed.py:71 +#, python-format +msgid "%s %s feed" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:94 +#, python-format +msgid "This repository has been locked by %s on %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:140 +msgid "Click here to add a new file." +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:145 +#, python-format +msgid "There are no files yet. %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:259 +msgid "Downloads disabled" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:265 +msgid "Unknown archive type for: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:271 +msgid "Unknown commit_id {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:274 +msgid "Empty repository" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:305 +msgid "Unknown archive type" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:865 +msgid "Changesets" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:886 +#: rhodecode/apps/repository/views/repo_summary.py:321 +#: rhodecode/model/pull_request.py:1366 rhodecode/model/scm.py:776 +#: rhodecode/templates/base/vcs_settings.mako:235 +msgid "Branches" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:890 rhodecode/model/scm.py:791 +#: rhodecode/templates/base/vcs_settings.mako:260 +msgid "Tags" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:987 +#: rhodecode/apps/repository/views/repo_files.py:1018 +msgid "You can only delete files with commit being a valid branch " +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:997 +#: rhodecode/apps/repository/views/repo_files.py:1028 +msgid "Deleted file {} via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1049 +msgid "Successfully deleted file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1053 +#: rhodecode/apps/repository/views/repo_files.py:1171 +#: rhodecode/apps/repository/views/repo_files.py:1290 +msgid "Error occurred during commit" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1071 +#: rhodecode/apps/repository/views/repo_files.py:1108 +msgid "You can only edit files with commit being a valid branch " +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1088 +#: rhodecode/apps/repository/views/repo_files.py:1125 +msgid "Edited file {} via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1143 +msgid "No changes" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1167 +msgid "Successfully committed changes to file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1191 +#: rhodecode/apps/repository/views/repo_files.py:1215 +msgid "Added file via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1248 +msgid "No filename" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1278 +msgid "Successfully committed new file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1282 +msgid "The location specified must be a relative path and must not contain .. in the path" +msgstr "" + +#: rhodecode/apps/repository/views/repo_forks.py:144 +#: rhodecode/templates/base/base.mako:262 +msgid "Compare fork" +msgstr "" + +#: rhodecode/apps/repository/views/repo_forks.py:250 +#, python-format +msgid "An error occurred during repository forking %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_permissions.py:86 msgid "Repository permissions updated" msgstr "" +#: rhodecode/apps/repository/views/repo_pull_requests.py:636 +msgid "Commit does not exist" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:757 +msgid "Pull request requires a title with min. 3 chars" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:759 +msgid "Error creating pull request: {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:784 +msgid "Not Enough permissions to source repo `{}`." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:798 +msgid "Not Enough permissions to target repo `{}`." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:849 +msgid "Successfully opened new pull request" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:852 +msgid "Error occurred during creation of this pull request." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:904 +msgid "Cannot update closed pull requests." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:910 +msgid "Pull request title & description updated." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:929 +msgid "Pull request updated to \"{source_commit_id}\" with {count_added} added, {count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:945 +msgid "Reload page" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1008 +msgid "Pull request was successfully merged and closed." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1032 +msgid "Pull request reviewers updated." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1057 +msgid "Successfully deleted pull request" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings.py:167 +msgid "Repository `{}` updated successfully" +msgstr "" + #: rhodecode/apps/repository/views/repo_settings.py:171 -msgid "Repository {} updated successfully" -msgstr "" - -#: rhodecode/apps/repository/views/repo_settings.py:175 msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:93 +#: rhodecode/apps/repository/views/repo_settings.py:193 +msgid "Unlocked" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings.py:198 +msgid "Locked" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings.py:200 +#, python-format +msgid "Repository has been %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings.py:204 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:230 +msgid "An error occurred during unlocking" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings.py:248 +msgid "An error occurred during deletion of repository stats" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:91 #, python-format msgid "Detached %s forks" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:96 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:94 #, python-format msgid "Deleted %s forks" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:109 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:107 #, python-format msgid "Deleted repository `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:116 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:114 msgid "detach or delete" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:117 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:115 msgid "Cannot delete `{repo}` it still contains attached forks. Try using {delete_or_detach} option." msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:127 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:125 #, python-format msgid "An error occurred during deletion of `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:152 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:150 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:156 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:154 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:184 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:190 msgid "Nothing" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:186 -#, python-format -msgid "Marked repo %s as fork of %s" -msgstr "" - #: rhodecode/apps/repository/views/repo_settings_advanced.py:193 +#, python-format +msgid "Marked repo %s as fork of %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:200 msgid "An error occurred during this operation" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:217 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:224 msgid "Locked repository" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:220 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:227 msgid "Unlocked repository" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:223 -#: rhodecode/controllers/admin/repos.py:363 -msgid "An error occurred during unlocking" -msgstr "" - -#: rhodecode/apps/repository/views/repo_summary.py:293 +#: rhodecode/apps/repository/views/repo_settings_fields.py:85 +msgid "An error occurred during creation of field" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_fields.py:107 +msgid "An error occurred during removal of field" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:85 +msgid "Error occurred during deleting issue tracker entry" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:88 +#: rhodecode/controllers/admin/settings.py:384 +msgid "Removed issue tracker entry" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:123 +#: rhodecode/controllers/admin/settings.py:431 +msgid "Updated issue tracker entries" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_remote.py:66 +msgid "Pulled from remote location" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_remote.py:69 +msgid "An error occurred during pull from remote location" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:124 +#: rhodecode/controllers/admin/settings.py:147 +#: rhodecode/controllers/admin/settings.py:622 +msgid "Some form inputs contain invalid data." +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:143 +#: rhodecode/controllers/admin/settings.py:176 +msgid "Updated VCS settings" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:147 +msgid "Error occurred during updating repository VCS settings" +msgstr "" + +#: rhodecode/apps/repository/views/repo_summary.py:296 msgid "Branch" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:294 +#: rhodecode/apps/repository/views/repo_summary.py:297 msgid "Tag" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:295 +#: rhodecode/apps/repository/views/repo_summary.py:298 msgid "Bookmark" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:318 -#: rhodecode/controllers/files.py:1021 rhodecode/model/pull_request.py:1345 -#: rhodecode/model/scm.py:775 rhodecode/templates/base/vcs_settings.mako:255 -msgid "Branches" -msgstr "" - -#: rhodecode/apps/repository/views/repo_summary.py:319 +#: rhodecode/apps/repository/views/repo_summary.py:322 msgid "Closed branches" msgstr "" +#: rhodecode/apps/ssh_support/events.py:29 +msgid "RhodeCode SSH Key files changed." +msgstr "" + #: rhodecode/apps/svn_support/events.py:30 -msgid "Configuration for Apaache mad_dav_svn changed." +msgid "Configuration for Apache mad_dav_svn changed." +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:209 +#, python-format +msgid "Updated user group %s" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:231 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:257 +msgid "Successfully deleted user group" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:262 +msgid "An error occurred during deletion of user group" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:366 +msgid "Target group cannot be the same" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:381 +msgid "User Group permissions updated" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:452 +msgid "User Group global permissions updated successfully" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:534 +msgid "User Group synchronization updated successfully" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:538 +msgid "An error occurred during synchronization update" msgstr "" #: rhodecode/authentication/schema.py:35 @@ -525,21 +1172,21 @@ msgid "Enable or disable this authentica msgstr "" #: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:32 -#: rhodecode/model/permission.py:100 rhodecode/model/permission.py:104 -#: rhodecode/model/permission.py:108 rhodecode/model/permission.py:112 -#: rhodecode/model/permission.py:116 rhodecode/model/permission.py:120 +#: rhodecode/model/permission.py:101 rhodecode/model/permission.py:105 +#: rhodecode/model/permission.py:109 rhodecode/model/permission.py:113 +#: rhodecode/model/permission.py:117 rhodecode/model/permission.py:121 #: rhodecode/model/validation_schema/schemas/integration_schema.py:197 -#: rhodecode/templates/admin/integrations/list.mako:101 +#: rhodecode/templates/admin/integrations/list.mako:105 msgid "Enabled" msgstr "" #: rhodecode/authentication/schema.py:43 msgid "" -"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 +"Amount of seconds to cache the authentication and permissions check response call for this plugin. \n" +"Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled)." +msgstr "" + +#: rhodecode/authentication/schema.py:48 msgid "Auth Cache TTL" msgstr "" @@ -547,15 +1194,15 @@ msgstr "" msgid "Errors exist when saving plugin settings. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:172 +#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:176 msgid "Auth settings updated successfully." msgstr "" -#: rhodecode/authentication/views.py:177 +#: rhodecode/authentication/views.py:181 msgid "Errors exist when saving plugin setting. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:187 +#: rhodecode/authentication/views.py:191 msgid "Error occurred during update of auth settings." msgstr "" @@ -637,7 +1284,6 @@ msgid "The url of the Jasig CAS REST ser msgstr "" #: rhodecode/authentication/plugins/auth_jasig_cas.py:64 -#: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" msgstr "" @@ -675,10 +1321,11 @@ msgid "Password to authenticate for give msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:105 +#: rhodecode/integrations/types/webhook.py:214 #: 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:315 +#: rhodecode/templates/base/base.mako:324 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "" @@ -769,7 +1416,7 @@ msgstr "" msgid "Email Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:365 +#: rhodecode/authentication/plugins/auth_ldap.py:367 msgid "LDAP" msgstr "" @@ -801,468 +1448,6 @@ msgstr "" msgid "Rhodecode Token Auth" msgstr "" -#: rhodecode/controllers/changelog.py:70 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:85 -msgid "There are no commits yet" -msgstr "" - -#: rhodecode/controllers/changeset.py:76 -msgid "Show whitespace" -msgstr "" - -#: rhodecode/controllers/changeset.py:77 -msgid "Show whitespace for all diffs" -msgstr "" - -#: rhodecode/controllers/changeset.py:83 -msgid "Ignore whitespace" -msgstr "" - -#: rhodecode/controllers/changeset.py:84 -msgid "Ignore whitespace for all diffs" -msgstr "" - -#: rhodecode/controllers/changeset.py:140 -msgid "Increase context" -msgstr "" - -#: rhodecode/controllers/changeset.py:141 -msgid "Increase context for all diffs" -msgstr "" - -#: rhodecode/controllers/changeset.py:189 rhodecode/controllers/files.py:106 -#: rhodecode/controllers/files.py:128 -msgid "No such commit exists for this repository" -msgstr "" - -#: rhodecode/controllers/changeset.py:345 -#: rhodecode/controllers/pullrequests.py:919 -#, python-format -msgid "Status change %(transition_icon)s %(status)s" -msgstr "" - -#: rhodecode/controllers/changeset.py:389 -msgid "Changing the status of a commit associated with a closed pull request is not allowed" -msgstr "" - -#: rhodecode/controllers/compare.py:92 -msgid "Select commit" -msgstr "" - -#: rhodecode/controllers/compare.py:149 -msgid "Could not find the source repo: `{}`" -msgstr "" - -#: rhodecode/controllers/compare.py:156 -msgid "Could not find the target repo: `{}`" -msgstr "" - -#: rhodecode/controllers/compare.py:166 -msgid "The comparison of two different kinds of remote repos is not available" -msgstr "" - -#: rhodecode/controllers/compare.py:204 -msgid "Could not compare repos with different large file settings" -msgstr "" - -#: rhodecode/controllers/compare.py:244 -#, python-format -msgid "Repositories unrelated. Cannot compare commit %(commit1)s from repository %(repo1)s with commit %(commit2)s from repository %(repo2)s." -msgstr "" - -#: rhodecode/controllers/feed.py:69 -#, python-format -msgid "Changes on %s repository" -msgstr "" - -#: rhodecode/controllers/feed.py:70 -#, python-format -msgid "%s %s feed" -msgstr "" - -#: rhodecode/controllers/files.py:98 -msgid "Click here to add a new file." -msgstr "" - -#: rhodecode/controllers/files.py:103 -#, python-format -msgid "There are no files yet. %s" -msgstr "" - -#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:487 -#: rhodecode/controllers/files.py:518 rhodecode/controllers/files.py:593 -#: rhodecode/controllers/files.py:638 rhodecode/controllers/files.py:729 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "" - -#: rhodecode/controllers/files.py:442 rhodecode/controllers/files.py:495 -msgid "You can only delete files with revision being a valid branch " -msgstr "" - -#: rhodecode/controllers/files.py:451 rhodecode/controllers/files.py:504 -msgid "Deleted file {} via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:472 -msgid "Successfully deleted file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:476 rhodecode/controllers/files.py:582 -#: rhodecode/controllers/files.py:719 -msgid "Error occurred during commit" -msgstr "" - -#: rhodecode/controllers/files.py:526 rhodecode/controllers/files.py:601 -msgid "You can only edit files with revision being a valid branch " -msgstr "" - -#: rhodecode/controllers/files.py:538 rhodecode/controllers/files.py:613 -msgid "Edited file {} via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:555 -msgid "No changes" -msgstr "" - -#: rhodecode/controllers/files.py:578 -msgid "Successfully committed changes to file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:651 rhodecode/controllers/files.py:740 -msgid "Added file via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:677 -msgid "No filename" -msgstr "" - -#: rhodecode/controllers/files.py:707 -msgid "Successfully committed new file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:710 -msgid "The location specified must be a relative path and must not contain .. in the path" -msgstr "" - -#: rhodecode/controllers/files.py:763 -msgid "Downloads disabled" -msgstr "" - -#: rhodecode/controllers/files.py:769 -#, python-format -msgid "Unknown revision %s" -msgstr "" - -#: rhodecode/controllers/files.py:771 -msgid "Empty repository" -msgstr "" - -#: rhodecode/controllers/files.py:773 rhodecode/controllers/files.py:807 -msgid "Unknown archive type" -msgstr "" - -#: rhodecode/controllers/files.py:1000 -msgid "Changesets" -msgstr "" - -#: rhodecode/controllers/files.py:1025 rhodecode/model/scm.py:790 -#: rhodecode/templates/base/vcs_settings.mako:280 -msgid "Tags" -msgstr "" - -#: rhodecode/controllers/forks.py:190 -#, python-format -msgid "An error occurred during repository forking %s" -msgstr "" - -#: rhodecode/controllers/journal.py:107 rhodecode/controllers/journal.py:150 -msgid "public journal" -msgstr "" - -#: rhodecode/controllers/journal.py:111 rhodecode/controllers/journal.py:154 -msgid "journal" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:99 -msgid "Commit does not exist" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:216 -msgid "Pull request requires a title with min. 3 chars" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:218 -msgid "Error creating pull request: {}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:276 -msgid "Successfully opened new pull request" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:279 -msgid "Error occurred during creation of this pull request." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:322 -msgid "Cannot update closed pull requests." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:328 -msgid "Pull request title & description updated." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:346 -msgid "Pull request updated to \"{source_commit_id}\" with {count_added} added, {count_removed} removed commits. Source of changes: {change_source}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:363 -msgid "Reload page" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:437 -msgid "Pull request was successfully merged and closed." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:461 -msgid "Pull request reviewers updated." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:482 -msgid "Successfully deleted pull request" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:486 -msgid "Your are not allowed to delete this pull request" -msgstr "" - -#: rhodecode/controllers/admin/defaults.py:84 -msgid "Default settings updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/defaults.py:99 -msgid "Error occurred during update of default values" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:72 -msgid "Requires registered account" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:73 -msgid "Can be accessed by anonymous users" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:199 -msgid "Error occurred during gist creation" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:230 -#, python-format -msgid "Deleted gist %s" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:306 -msgid "Successfully updated gist content" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:311 -msgid "Successfully updated gist data" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:314 -msgid "Error occurred during update of gist {}: {}" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:318 -#, python-format -msgid "Error occurred during update of gist %s" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:343 -#: rhodecode/templates/admin/gists/show.mako:67 -#: 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 "" - -#: rhodecode/controllers/admin/gists.py:350 -#, python-format -msgid "%(expiry)s - current value" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:70 -msgid "You can't edit this user since it's crucial for entire application" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:110 -msgid "Your account was updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:125 -#: rhodecode/controllers/admin/users.py:182 -#, python-format -msgid "Error occurred during update of user %s" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:107 -msgid "Application permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:122 -#: rhodecode/controllers/admin/permissions.py:171 -#: rhodecode/controllers/admin/permissions.py:225 -msgid "Error occurred during update of permissions" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:156 -msgid "Object permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:210 -msgid "Global permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:202 -#, python-format -msgid "Created repository group %s" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:215 -#, python-format -msgid "Error occurred during creation of repository group %s" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:261 -#, python-format -msgid "Updated repository group %s" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:276 -#, python-format -msgid "Error occurred during update of repository group %s" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:291 -#, python-format -msgid "This group contains %(num)d repository and cannot be deleted" -msgid_plural "This group contains %(num)d repositories and cannot be deleted" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/controllers/admin/repo_groups.py:300 -#, python-format -msgid "This group contains %(num)d subgroup and cannot be deleted" -msgid_plural "This group contains %(num)d subgroups and cannot be deleted" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/controllers/admin/repo_groups.py:313 -#, python-format -msgid "Removed repository group %s" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:317 -#, python-format -msgid "Error occurred during deletion of repository group %s" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:381 -#: rhodecode/controllers/admin/user_groups.py:318 -msgid "Cannot change permission for yourself as admin" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:404 -msgid "Repository Group permissions updated" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:125 -#, python-format -msgid "Error creating repository %s: invalid certificate" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:129 -#, python-format -msgid "Error creating repository %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:270 -#, python-format -msgid "Created repository %s from %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:279 -#, python-format -msgid "Forked repository %s as %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:282 -#, python-format -msgid "Created repository %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:319 -msgid "An error occurred during creation of field" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:334 -msgid "An error occurred during removal of field" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:353 -msgid "Unlocked" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:357 -msgid "Locked" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:359 -#, python-format -msgid "Repository has been %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:373 -msgid "Pulled from remote location" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:376 -msgid "An error occurred during pull from remote location" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:397 -msgid "An error occurred during deletion of repository stats" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:443 -msgid "Error occurred during deleting issue tracker entry" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:446 -#: rhodecode/controllers/admin/settings.py:384 -msgid "Removed issue tracker entry" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:476 -#: rhodecode/controllers/admin/settings.py:431 -msgid "Updated issue tracker entries" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:537 -#: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:622 -msgid "Some form inputs contain invalid data." -msgstr "" - -#: rhodecode/controllers/admin/repos.py:555 -msgid "Error occurred during updating repository VCS settings" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:559 -#: rhodecode/controllers/admin/settings.py:176 -msgid "Updated VCS settings" -msgstr "" - #: rhodecode/controllers/admin/settings.py:172 #: rhodecode/controllers/admin/settings.py:286 msgid "Error occurred during updating application settings" @@ -1313,203 +1498,59 @@ msgstr "" msgid "Updated Labs settings" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:164 -#, python-format -msgid "Created user group %(user_group_link)s" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:178 -#, python-format -msgid "Error occurred during creation of user group %s" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:218 -#, python-format -msgid "Updated user group %s" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:234 -#, python-format -msgid "Error occurred during update of user group %s" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:253 -msgid "Successfully deleted user group" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:258 -msgid "An error occurred during deletion of user group" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:326 -msgid "Target group cannot be the same" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:332 -msgid "User Group permissions updated" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:415 -msgid "User Group global permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:430 -#: rhodecode/controllers/admin/users.py:477 -msgid "An error occurred during permissions saving" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:474 -msgid "User Group synchronization updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:478 -msgid "An error occurred during synchronization update" -msgstr "" - -#: rhodecode/controllers/admin/users.py:108 -#, python-format -msgid "Created user %(user_link)s" -msgstr "" - -#: rhodecode/controllers/admin/users.py:124 -#, python-format -msgid "Error occurred during creation of user %s" -msgstr "" - -#: rhodecode/controllers/admin/users.py:166 -msgid "User updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/users.py:209 -#, python-format -msgid "Detached %s repositories" -msgstr "" - -#: rhodecode/controllers/admin/users.py:214 -#, python-format -msgid "Deleted %s repositories" -msgstr "" - -#: rhodecode/controllers/admin/users.py:222 -#, python-format -msgid "Detached %s repository groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:227 -#, python-format -msgid "Deleted %s repository groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:235 -#, python-format -msgid "Detached %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:240 -#, python-format -msgid "Deleted %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:257 -msgid "Successfully deleted user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:263 -msgid "An error occurred during deletion of user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:280 -msgid "Force password change disabled for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:285 -msgid "Force password change enabled for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:294 -msgid "An error occurred during password reset for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:325 -#, python-format -msgid "Linked repository group `%s` as personal" -msgstr "" - -#: rhodecode/controllers/admin/users.py:331 -#, python-format -msgid "Created repository group `%s`" -msgstr "" - -#: rhodecode/controllers/admin/users.py:335 -#, python-format -msgid "Repository group `%s` is already taken" -msgstr "" - -#: rhodecode/controllers/admin/users.py:340 -msgid "An error occurred during repository group creation for user" -msgstr "" - -#: 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:462 -msgid "User global permissions updated successfully" -msgstr "" - -#: rhodecode/events/pullrequest.py:71 +#: rhodecode/events/pullrequest.py:72 msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:80 +#: rhodecode/events/pullrequest.py:81 msgid "pullrequest closed" msgstr "" -#: rhodecode/events/pullrequest.py:89 +#: rhodecode/events/pullrequest.py:90 msgid "pullrequest commits updated" msgstr "" -#: rhodecode/events/pullrequest.py:98 +#: rhodecode/events/pullrequest.py:99 msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:107 +#: rhodecode/events/pullrequest.py:108 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:116 +#: rhodecode/events/pullrequest.py:117 msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:148 +#: rhodecode/events/repo.py:149 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:157 +#: rhodecode/events/repo.py:158 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:166 +#: rhodecode/events/repo.py:167 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:175 +#: rhodecode/events/repo.py:176 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:211 +#: rhodecode/events/repo.py:216 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:220 +#: rhodecode/events/repo.py:225 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:229 +#: rhodecode/events/repo.py:234 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:240 +#: rhodecode/events/repo.py:245 msgid "repository push" msgstr "" @@ -1545,54 +1586,60 @@ msgstr "" #: 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/my_account/my_account_ssh_keys.mako:68 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:61 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:64 #: rhodecode/templates/admin/permissions/permissions_objects.mako:57 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:136 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:68 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:134 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:84 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:66 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:80 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:195 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:201 #: 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/settings/settings_visual.mako:211 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:83 #: rhodecode/templates/admin/users/user_edit_emails.mako:63 #: rhodecode/templates/admin/users/user_edit_ips.mako:71 #: rhodecode/templates/admin/users/user_edit_profile.mako:135 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:63 #: rhodecode/templates/base/default_perms_box.mako:89 msgid "Reset" msgstr "" -#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:49 -#: rhodecode/templates/admin/integrations/list.mako:211 +#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:54 +#: rhodecode/templates/admin/integrations/list.mako:215 #: 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/my_account/my_account_ssh_keys.mako:31 +#: rhodecode/templates/admin/notifications/notifications_data.mako:22 +#: rhodecode/templates/admin/notifications/notifications_show.mako:35 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:29 #: 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:45 #: rhodecode/templates/admin/users/user_edit_emails.mako:31 #: rhodecode/templates/admin/users/user_edit_ips.mako:35 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:28 #: rhodecode/templates/base/issue_tracker_settings.mako:69 -#: rhodecode/templates/base/vcs_settings.mako:264 -#: rhodecode/templates/base/vcs_settings.mako:289 +#: rhodecode/templates/base/vcs_settings.mako:244 +#: rhodecode/templates/base/vcs_settings.mako:269 #: rhodecode/templates/changeset/changeset_file_comment.mako:142 #: rhodecode/templates/changeset/changeset_file_comment.mako:144 #: rhodecode/templates/changeset/changeset_file_comment.mako:147 -#: rhodecode/templates/data_table/_dt_elements.mako:123 -#: rhodecode/templates/data_table/_dt_elements.mako:184 -#: rhodecode/templates/data_table/_dt_elements.mako:198 -#: rhodecode/templates/data_table/_dt_elements.mako:210 +#: rhodecode/templates/data_table/_dt_elements.mako:171 +#: rhodecode/templates/data_table/_dt_elements.mako:244 +#: rhodecode/templates/data_table/_dt_elements.mako:258 +#: rhodecode/templates/data_table/_dt_elements.mako:270 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:45 -#: rhodecode/templates/files/files_source.mako:49 -#: rhodecode/templates/files/files_source.mako:52 +#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:55 +#: rhodecode/templates/files/files_source.mako:58 #: rhodecode/templates/pullrequests/pullrequest_show.mako:56 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" @@ -1629,27 +1676,27 @@ msgstr "" msgid "Root repositories only" msgstr "" -#: rhodecode/integrations/views.py:160 +#: rhodecode/integrations/views.py:148 msgid "{repo_name} repository" msgstr "" -#: rhodecode/integrations/views.py:163 +#: rhodecode/integrations/views.py:151 msgid "{repo_group_name} repo group" msgstr "" -#: rhodecode/integrations/views.py:170 +#: rhodecode/integrations/views.py:158 msgid "{name} integration" msgstr "" -#: rhodecode/integrations/views.py:184 +#: rhodecode/integrations/views.py:173 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:264 +#: rhodecode/integrations/views.py:301 msgid "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:289 +#: rhodecode/integrations/views.py:326 msgid "Integration {integration_name} updated successfully." msgstr "" @@ -1730,17 +1777,19 @@ msgstr "" msgid "This can be setup at the slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:60 rhodecode/templates/login.mako:43 -#: rhodecode/templates/register.mako:41 -#: rhodecode/templates/admin/admin_log_base.mako:6 +#: rhodecode/integrations/types/slack.py:60 +#: rhodecode/integrations/types/webhook.py:204 +#: rhodecode/templates/login.mako:43 rhodecode/templates/register.mako:41 +#: rhodecode/templates/admin/admin_log_base.mako:7 #: rhodecode/templates/admin/my_account/my_account_profile.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:69 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:45 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:70 #: rhodecode/templates/admin/users/user_add.mako:35 #: rhodecode/templates/admin/users/user_edit_profile.mako:39 #: rhodecode/templates/admin/users/users.mako:63 -#: rhodecode/templates/base/base.mako:306 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 @@ -1775,128 +1824,152 @@ msgstr "" msgid "Send events such as repo pushes and pull requests to your slack channel." msgstr "" -#: rhodecode/integrations/types/webhook.py:164 +#: rhodecode/integrations/types/webhook.py:177 msgid "Webhook URL" msgstr "" -#: rhodecode/integrations/types/webhook.py:166 -msgid "URL of the webhook to receive POST event. Following variables are allowed to be used: {vars}. Some of the variables would trigger multiple calls, like ${{branch}} or ${{commit_id}}. Webhook will be called as many times as unique objects in data in such cases." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:180 +#: rhodecode/integrations/types/webhook.py:179 +msgid "URL to which Webhook should submit data. Following variables are allowed to be used: {vars}. Some of the variables would trigger multiple calls, like ${{branch}} or ${{commit_id}}. Webhook will be called as many times as unique objects in data in such cases." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:193 msgid "Secret Token" msgstr "" -#: rhodecode/integrations/types/webhook.py:181 -msgid "String used to validate received payloads." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:190 -msgid "Call Method" -msgstr "" - -#: rhodecode/integrations/types/webhook.py:191 -msgid "Select if the webhook call should be made with POST or GET." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:204 -msgid "Webhook" +#: rhodecode/integrations/types/webhook.py:194 +msgid "Optional string used to validate received payloads. It will be sent together with event data in JSON" msgstr "" #: rhodecode/integrations/types/webhook.py:205 -msgid "Post json events to a webhook endpoint" -msgstr "" - -#: rhodecode/lib/action_parser.py:94 +msgid "Optional username to authenticate the call." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:215 +msgid "Optional password to authenticate the call." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:225 +msgid "Custom Header Key" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:226 +msgid "Custom Header name to be set when calling endpoint." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:235 +msgid "Custom Header Value" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:236 +msgid "Custom Header value to be set when calling endpoint." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:245 +msgid "Call Method" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:246 +msgid "Select if the Webhook call should be made with POST or GET." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:259 +msgid "Webhook" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:260 +msgid "Post json events to a Webhook endpoint" +msgstr "" + +#: rhodecode/lib/action_parser.py:93 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/action_parser.py:97 rhodecode/lib/action_parser.py:115 +#: rhodecode/lib/action_parser.py:96 rhodecode/lib/action_parser.py:114 msgid "[created] repository" msgstr "" -#: rhodecode/lib/action_parser.py:100 +#: rhodecode/lib/action_parser.py:99 msgid "[created] repository as fork" msgstr "" -#: rhodecode/lib/action_parser.py:103 rhodecode/lib/action_parser.py:118 +#: rhodecode/lib/action_parser.py:102 rhodecode/lib/action_parser.py:117 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/action_parser.py:106 rhodecode/lib/action_parser.py:121 +#: rhodecode/lib/action_parser.py:105 rhodecode/lib/action_parser.py:120 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/action_parser.py:109 +#: rhodecode/lib/action_parser.py:108 msgid "[downloaded] archive from repository" msgstr "" -#: rhodecode/lib/action_parser.py:112 +#: rhodecode/lib/action_parser.py:111 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/action_parser.py:124 +#: rhodecode/lib/action_parser.py:123 msgid "[created] user" msgstr "" -#: rhodecode/lib/action_parser.py:127 +#: rhodecode/lib/action_parser.py:126 msgid "[updated] user" msgstr "" -#: rhodecode/lib/action_parser.py:130 +#: rhodecode/lib/action_parser.py:129 msgid "[created] user group" msgstr "" -#: rhodecode/lib/action_parser.py:133 +#: rhodecode/lib/action_parser.py:132 msgid "[updated] user group" msgstr "" -#: rhodecode/lib/action_parser.py:136 +#: rhodecode/lib/action_parser.py:135 msgid "[commented] on commit in repository" msgstr "" -#: rhodecode/lib/action_parser.py:139 +#: rhodecode/lib/action_parser.py:138 msgid "[commented] on pull request for" msgstr "" -#: rhodecode/lib/action_parser.py:142 +#: rhodecode/lib/action_parser.py:141 msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/action_parser.py:145 +#: rhodecode/lib/action_parser.py:144 msgid "[merged] pull request for" msgstr "" -#: rhodecode/lib/action_parser.py:148 +#: rhodecode/lib/action_parser.py:147 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/action_parser.py:151 +#: rhodecode/lib/action_parser.py:150 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/action_parser.py:154 +#: rhodecode/lib/action_parser.py:153 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/action_parser.py:157 +#: rhodecode/lib/action_parser.py:156 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/action_parser.py:160 +#: rhodecode/lib/action_parser.py:159 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/action_parser.py:163 +#: rhodecode/lib/action_parser.py:162 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/action_parser.py:172 +#: rhodecode/lib/action_parser.py:171 #, python-format msgid "fork name %s" msgstr "" -#: rhodecode/lib/action_parser.py:190 +#: rhodecode/lib/action_parser.py:189 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" @@ -1907,52 +1980,42 @@ msgstr "" msgid "Show all combined commits %s->%s" msgstr "" -#: rhodecode/lib/action_parser.py:227 +#: rhodecode/lib/action_parser.py:228 msgid "compare view" msgstr "" -#: rhodecode/lib/action_parser.py:234 +#: rhodecode/lib/action_parser.py:235 #, python-format msgid " and %(num)s more commits" msgstr "" -#: rhodecode/lib/action_parser.py:286 +#: rhodecode/lib/action_parser.py:288 #, python-format msgid "Deleted branch: %s" msgstr "" -#: rhodecode/lib/action_parser.py:289 +#: rhodecode/lib/action_parser.py:291 #, python-format msgid "Created tag: %s" msgstr "" -#: rhodecode/lib/action_parser.py:302 +#: rhodecode/lib/action_parser.py:304 msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1220 +#: rhodecode/lib/auth.py:1445 #, python-format msgid "IP %s not allowed" msgstr "" -#: rhodecode/lib/auth.py:1309 +#: rhodecode/lib/auth.py:1535 msgid "You need to be a registered user to perform this action" msgstr "" -#: rhodecode/lib/auth.py:1366 -#, python-format -msgid "Action not supported for %s." -msgstr "" - -#: rhodecode/lib/auth.py:1412 +#: rhodecode/lib/auth.py:1577 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/base.py:561 -#, python-format -msgid "The repository at %(repo_name)s cannot be located." -msgstr "" - #: rhodecode/lib/diffs.py:62 msgid "Click to comment" msgstr "" @@ -1969,20 +2032,11 @@ msgstr "" msgid "No changes detected" msgstr "" -#: rhodecode/lib/diffs.py:921 +#: rhodecode/lib/diffs.py:927 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1527 -#, python-format -msgid " and %s more" -msgstr "" - -#: rhodecode/lib/helpers.py:1531 -msgid "No Files" -msgstr "" - -#: rhodecode/lib/helpers.py:1836 +#: rhodecode/lib/helpers.py:1869 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2002,7 +2056,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1859 +#: rhodecode/lib/helpers.py:1893 msgid "" "Example filter terms for `{searcher}` search:\n" "{terms}\n" @@ -2016,52 +2070,52 @@ msgid "" "More: {search_doc}" msgstr "" -#: rhodecode/lib/helpers.py:1875 +#: rhodecode/lib/helpers.py:1910 #, python-format msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories" msgstr "" -#: rhodecode/lib/utils2.py:486 +#: rhodecode/lib/utils2.py:525 msgid "in ${ago}" msgstr "" -#: rhodecode/lib/utils2.py:492 +#: rhodecode/lib/utils2.py:531 msgid "${ago} ago" msgstr "" -#: rhodecode/lib/utils2.py:501 +#: rhodecode/lib/utils2.py:540 msgid "${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:503 +#: rhodecode/lib/utils2.py:542 msgid "${val}, ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:505 +#: rhodecode/lib/utils2.py:544 msgid "in ${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:507 +#: rhodecode/lib/utils2.py:546 msgid "${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:509 +#: rhodecode/lib/utils2.py:548 msgid "${val} and ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:511 +#: rhodecode/lib/utils2.py:550 msgid "in ${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:515 -#: rhodecode/public/js/rhodecode-components.js:33659 -#: rhodecode/public/js/scripts.js:25507 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/lib/utils2.py:554 +#: rhodecode/public/js/rhodecode-components.js:29149 +#: rhodecode/public/js/scripts.js:20997 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:569 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:582 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:599 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:684 @@ -2078,23 +2132,24 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:765 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:775 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 rhodecode/model/db.py:2482 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:816 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:945 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:970 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:2595 msgid "Repository no access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:583 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:600 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:685 @@ -2111,23 +2166,24 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:766 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:776 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 rhodecode/model/db.py:2483 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2536 rhodecode/model/db.py:2596 msgid "Repository read access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:584 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:601 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:686 @@ -2144,23 +2200,24 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:767 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:777 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 rhodecode/model/db.py:2484 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:2597 msgid "Repository write access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:573 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:585 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:602 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:687 @@ -2177,47 +2234,48 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:768 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:778 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2288 -#: 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/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:2485 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2337 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 rhodecode/model/db.py:2598 msgid "Repository admin access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:574 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:587 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:604 msgid "Repositories Group no access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:588 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:605 msgid "Repositories Group read access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:589 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:606 msgid "Repositories Group write access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:578 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:590 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:607 msgid "Repositories Group admin access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:579 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:592 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:609 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:694 @@ -2233,7 +2291,7 @@ msgstr "" msgid "RhodeCode Administrator" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:593 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:610 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:695 @@ -2250,23 +2308,24 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:786 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:796 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 rhodecode/model/db.py:2503 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:837 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:966 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:991 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 rhodecode/model/db.py:2616 msgid "Repository creation disabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:594 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:611 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:696 @@ -2283,23 +2342,24 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:787 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:797 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2307 -#: 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/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:2504 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:2617 msgid "Repository creation enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:595 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:612 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:697 @@ -2316,23 +2376,24 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:791 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:801 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2311 -#: 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/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:2508 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:842 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:849 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:971 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:996 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2561 rhodecode/model/db.py:2621 msgid "Repository forking disabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:596 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:613 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:698 @@ -2349,44 +2410,45 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:792 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:802 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 rhodecode/model/db.py:2509 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:2622 msgid "Repository forking enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:597 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:614 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:699 msgid "Register disabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:586 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:598 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:615 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:700 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:589 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:588 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:601 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:618 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:703 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:844 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:865 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:874 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:959 @@ -2403,23 +2465,24 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1121 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1135 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2946 -#: 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/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:3212 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1176 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1317 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1342 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2940 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2940 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2944 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2944 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3044 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3045 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3264 rhodecode/model/db.py:3324 msgid "Not Reviewed" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:866 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:875 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:960 @@ -2436,23 +2499,24 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1122 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1136 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2947 -#: 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/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:3213 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2941 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2941 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2945 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2945 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3045 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3046 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3265 rhodecode/model/db.py:3325 msgid "Approved" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:867 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:876 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:961 @@ -2469,23 +2533,24 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1123 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1137 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1180 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2954 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2948 -#: 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/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:3214 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2948 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2942 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2942 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3046 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3047 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3266 rhodecode/model/db.py:3326 msgid "Rejected" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:848 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:868 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:877 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:962 @@ -2502,19 +2567,20 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1124 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1138 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1181 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1180 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1199 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1321 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1346 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2955 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2949 -#: 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/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:3215 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2949 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2943 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2943 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3047 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3048 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3267 rhodecode/model/db.py:3327 msgid "Under Review" msgstr "" @@ -2532,19 +2598,20 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:770 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:780 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 rhodecode/model/db.py:2487 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:821 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:950 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:975 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2338 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:2600 msgid "Repository group no access" msgstr "" @@ -2562,19 +2629,20 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:771 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:781 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 rhodecode/model/db.py:2488 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 rhodecode/model/db.py:2601 msgid "Repository group read access" msgstr "" @@ -2592,19 +2660,20 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:772 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:782 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 rhodecode/model/db.py:2489 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2542 rhodecode/model/db.py:2602 msgid "Repository group write access" msgstr "" @@ -2622,19 +2691,20 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:773 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:783 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:832 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:954 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2293 -#: 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/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:2490 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:2603 msgid "Repository group admin access" msgstr "" @@ -2651,19 +2721,20 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:775 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:785 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 rhodecode/model/db.py:2492 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:826 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:955 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:980 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:2605 msgid "User group no access" msgstr "" @@ -2680,19 +2751,20 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:776 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:786 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2296 -#: 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/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:2493 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:2606 msgid "User group read access" msgstr "" @@ -2709,19 +2781,20 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:777 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:787 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 rhodecode/model/db.py:2494 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2547 rhodecode/model/db.py:2607 msgid "User group write access" msgstr "" @@ -2738,19 +2811,20 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:778 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:788 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:959 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 rhodecode/model/db.py:2495 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:2608 msgid "User group admin access" msgstr "" @@ -2767,19 +2841,20 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:780 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:790 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 rhodecode/model/db.py:2497 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:831 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:960 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:985 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2550 rhodecode/model/db.py:2610 msgid "Repository Group creation disabled" msgstr "" @@ -2796,19 +2871,20 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:781 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:791 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:962 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 rhodecode/model/db.py:2498 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:2611 msgid "Repository Group creation enabled" msgstr "" @@ -2825,19 +2901,20 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:783 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:793 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 rhodecode/model/db.py:2500 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:834 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:963 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:988 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:2613 msgid "User Group creation disabled" msgstr "" @@ -2854,19 +2931,20 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:784 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:794 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:843 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:965 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2358 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2359 rhodecode/model/db.py:2501 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2554 rhodecode/model/db.py:2614 msgid "User Group creation enabled" msgstr "" @@ -2883,19 +2961,20 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:794 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:804 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2314 -#: 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/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:2511 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:852 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:974 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:999 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2564 rhodecode/model/db.py:2624 msgid "Registration disabled" msgstr "" @@ -2912,19 +2991,20 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:795 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:805 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2369 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2370 rhodecode/model/db.py:2512 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2565 rhodecode/model/db.py:2625 msgid "User Registration with manual account activation" msgstr "" @@ -2941,19 +3021,20 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:796 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:806 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 rhodecode/model/db.py:2513 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2318 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2365 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2566 rhodecode/model/db.py:2626 msgid "User Registration with automatic account activation" msgstr "" @@ -2970,20 +3051,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:798 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:808 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2318 -#: 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/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:2519 -#: rhodecode/model/permission.py:95 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:849 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:856 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:978 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1003 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2572 rhodecode/model/db.py:2632 +#: rhodecode/model/permission.py:96 msgid "Manual activation of external account" msgstr "" @@ -3000,20 +3082,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:799 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:809 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:858 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:980 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2327 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2319 -#: 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/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:2520 -#: rhodecode/model/permission.py:96 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2321 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2371 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2372 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2573 rhodecode/model/db.py:2633 +#: rhodecode/model/permission.py:97 msgid "Automatic activation of external account" msgstr "" @@ -3024,19 +3107,20 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:788 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:798 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 rhodecode/model/db.py:2505 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2558 rhodecode/model/db.py:2618 msgid "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3047,19 +3131,20 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:789 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:799 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 rhodecode/model/db.py:2506 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:2619 msgid "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3067,76 +3152,70 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:763 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:773 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:815 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:822 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:944 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2337 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338 rhodecode/model/db.py:2480 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:814 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:815 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:815 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:821 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:943 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:968 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2331 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2332 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 rhodecode/model/db.py:2593 msgid "RhodeCode Super Administrator" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:811 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:854 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:852 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:859 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:981 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1006 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2575 rhodecode/model/db.py:2635 +msgid "Inherit object permissions from default user disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812 +#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:853 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:860 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:982 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2329 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2321 -#: 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/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:2522 -msgid "Inherit object permissions from default user disabled" -msgstr "" - -#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812 -#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:854 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:861 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1008 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2330 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2322 -#: 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/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:2523 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2576 rhodecode/model/db.py:2636 msgid "Inherit object permissions from default user enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:909 -#: 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/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:1043 -msgid "all" -msgstr "" - #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 rhodecode/model/db.py:1044 -msgid "http/web interface" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1099 +msgid "all" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 @@ -3145,8 +3224,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 rhodecode/model/db.py:1045 -msgid "vcs (git/hg/svn protocol)" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1100 +msgid "http/web interface" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 @@ -3155,8 +3235,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 rhodecode/model/db.py:1046 -msgid "api calls" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1101 +msgid "vcs (git/hg/svn protocol)" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 @@ -3165,32 +3246,48 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 rhodecode/model/db.py:1047 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1102 +msgid "api calls" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:914 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:917 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:917 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:959 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:960 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1055 rhodecode/model/db.py:1103 msgid "feed access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2061 -#: 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/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:2248 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2063 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2055 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2055 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2059 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2059 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2102 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2103 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2297 rhodecode/model/db.py:2356 msgid "No parent" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2372 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2373 rhodecode/model/db.py:2515 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2568 rhodecode/model/db.py:2628 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:2516 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2367 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2368 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2569 rhodecode/model/db.py:2629 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:2517 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2570 rhodecode/model/db.py:2630 msgid "Password reset disabled" msgstr "" @@ -3226,112 +3323,128 @@ msgstr "" msgid "Commit index" msgstr "" -#: rhodecode/model/comment.py:374 -msgid "made a comment" +#: rhodecode/model/auth_token.py:53 +msgid "5 minutes {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:55 +msgid "1 hour {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:57 +msgid "1 day {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:59 +msgid "1 month {end_date}" msgstr "" #: rhodecode/model/comment.py:375 +msgid "made a comment" +msgstr "" + +#: rhodecode/model/comment.py:376 msgid "Show it now" msgstr "" -#: rhodecode/model/forms.py:85 +#: rhodecode/model/forms.py:87 msgid "Please enter a login" msgstr "" -#: rhodecode/model/forms.py:86 +#: rhodecode/model/forms.py:88 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: rhodecode/model/forms.py:95 +#: rhodecode/model/forms.py:98 msgid "Please enter a password" msgstr "" -#: rhodecode/model/forms.py:96 +#: rhodecode/model/forms.py:99 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: rhodecode/model/notification.py:247 +#: rhodecode/model/notification.py:245 #, python-format msgid "%(user)s commented on commit %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:248 +#: rhodecode/model/notification.py:246 #, python-format msgid "%(user)s commented on commit at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:251 +#: rhodecode/model/notification.py:249 #, python-format msgid "%(user)s sent message %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:252 +#: rhodecode/model/notification.py:250 #, python-format msgid "%(user)s sent message at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:255 +#: rhodecode/model/notification.py:253 #, python-format msgid "%(user)s mentioned you %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:256 +#: rhodecode/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:259 +#: rhodecode/model/notification.py:257 #, python-format msgid "%(user)s registered in RhodeCode %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:260 +#: rhodecode/model/notification.py:258 #, python-format msgid "%(user)s registered in RhodeCode at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:263 +#: rhodecode/model/notification.py:261 #, python-format msgid "%(user)s opened new pull request %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:264 +#: rhodecode/model/notification.py:262 #, python-format msgid "%(user)s opened new pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:267 +#: rhodecode/model/notification.py:265 #, python-format msgid "%(user)s commented on pull request %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:268 +#: rhodecode/model/notification.py:266 #, python-format msgid "%(user)s commented on pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/permission.py:67 rhodecode/model/permission.py:73 -#: rhodecode/model/permission.py:79 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:11 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:126 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11 -msgid "None" -msgstr "" - #: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 #: rhodecode/model/permission.py:80 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:12 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12 -msgid "Read" +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:124 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11 +msgid "None" msgstr "" #: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 #: rhodecode/model/permission.py:81 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:13 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12 +msgid "Read" +msgstr "" + +#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 +#: rhodecode/model/permission.py:82 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:13 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:13 #: rhodecode/templates/changeset/changeset_file_comment.mako:271 @@ -3339,8 +3452,8 @@ msgstr "" msgid "Write" msgstr "" -#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 -#: rhodecode/model/permission.py:82 +#: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77 +#: rhodecode/model/permission.py:83 #: rhodecode/templates/admin/auth/auth_settings.mako:12 #: rhodecode/templates/admin/auth/plugin_settings.mako:12 #: rhodecode/templates/admin/defaults/defaults.mako:12 @@ -3354,7 +3467,7 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions.mako:12 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:12 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:12 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:17 @@ -3369,175 +3482,175 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit.mako:12 #: rhodecode/templates/admin/users/users.mako:13 #: rhodecode/templates/admin/users/users.mako:76 -#: rhodecode/templates/base/base.mako:412 -#: rhodecode/templates/base/base.mako:419 +#: rhodecode/templates/base/base.mako:417 +#: rhodecode/templates/base/base.mako:424 msgid "Admin" msgstr "" -#: rhodecode/model/permission.py:85 rhodecode/model/permission.py:99 -#: rhodecode/model/permission.py:103 rhodecode/model/permission.py:107 -#: rhodecode/model/permission.py:111 rhodecode/model/permission.py:115 -#: rhodecode/model/permission.py:119 +#: rhodecode/model/permission.py:86 rhodecode/model/permission.py:100 +#: rhodecode/model/permission.py:104 rhodecode/model/permission.py:108 +#: rhodecode/model/permission.py:112 rhodecode/model/permission.py:116 +#: rhodecode/model/permission.py:120 msgid "Disabled" msgstr "" -#: rhodecode/model/permission.py:86 -msgid "Allowed with manual account activation" -msgstr "" - #: rhodecode/model/permission.py:87 +msgid "Allowed with manual account activation" +msgstr "" + +#: rhodecode/model/permission.py:88 msgid "Allowed with automatic account activation" msgstr "" -#: rhodecode/model/permission.py:90 -msgid "Allow password recovery" -msgstr "" - #: rhodecode/model/permission.py:91 -msgid "Hide password recovery link" +msgid "Allow password recovery" msgstr "" #: rhodecode/model/permission.py:92 +msgid "Hide password recovery link" +msgstr "" + +#: rhodecode/model/permission.py:93 msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:80 +#: rhodecode/model/pull_request.py:79 msgid "This pull request can be automatically merged." msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:81 msgid "This pull request cannot be merged because of an unhandled exception." msgstr "" -#: rhodecode/model/pull_request.py:85 +#: rhodecode/model/pull_request.py:84 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:87 +#: rhodecode/model/pull_request.py:86 msgid "This pull request could not be merged because push to target failed." msgstr "" -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:89 msgid "This pull request cannot be merged because the target is not a head." msgstr "" -#: rhodecode/model/pull_request.py:93 +#: rhodecode/model/pull_request.py:92 msgid "This pull request cannot be merged because the source contains more branches than the target." msgstr "" -#: rhodecode/model/pull_request.py:96 +#: rhodecode/model/pull_request.py:95 msgid "This pull request cannot be merged because the target has multiple heads." msgstr "" -#: rhodecode/model/pull_request.py:99 +#: rhodecode/model/pull_request.py:98 msgid "This pull request cannot be merged because the target repository is locked." msgstr "" -#: rhodecode/model/pull_request.py:102 +#: rhodecode/model/pull_request.py:101 msgid "This pull request cannot be merged because the target or the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:105 +#: rhodecode/model/pull_request.py:104 msgid "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:108 +#: rhodecode/model/pull_request.py:107 msgid "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:111 +#: rhodecode/model/pull_request.py:110 msgid "This pull request cannot be merged because of conflicts related to sub repositories." msgstr "" -#: rhodecode/model/pull_request.py:117 +#: rhodecode/model/pull_request.py:116 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:119 +#: rhodecode/model/pull_request.py:118 msgid "Pull request update failed because of an unknown error." msgstr "" -#: rhodecode/model/pull_request.py:121 +#: rhodecode/model/pull_request.py:120 msgid "No update needed because the source and target have not changed." msgstr "" -#: rhodecode/model/pull_request.py:123 +#: rhodecode/model/pull_request.py:122 msgid "Pull request cannot be updated because the reference type is not supported for an update. Only Branch, Tag or Bookmark is allowed." msgstr "" -#: rhodecode/model/pull_request.py:126 +#: rhodecode/model/pull_request.py:125 msgid "This pull request cannot be updated because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:129 +#: rhodecode/model/pull_request.py:128 msgid "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:544 -#, python-format -msgid "" -"Merge pull request #%(pr_id)s from %(source_repo)s %(source_ref_name)s\n" -"\n" -" %(pr_title)s" -msgstr "" - -#: rhodecode/model/pull_request.py:576 -msgid "Pull request merged and closed" -msgstr "" - -#: rhodecode/model/pull_request.py:1108 -msgid "Closing with status change {transition_icon} {status}." -msgstr "" - -#: rhodecode/model/pull_request.py:1152 -msgid "Server-side pull request merging is disabled." -msgstr "" - -#: rhodecode/model/pull_request.py:1154 -msgid "This pull request is closed." -msgstr "" - #: rhodecode/model/pull_request.py:1166 +msgid "Server-side pull request merging is disabled." +msgstr "" + +#: rhodecode/model/pull_request.py:1168 +msgid "This pull request is closed." +msgstr "" + +#: rhodecode/model/pull_request.py:1181 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1184 +#: rhodecode/model/pull_request.py:1200 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1187 +#: rhodecode/model/pull_request.py:1203 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1344 rhodecode/model/scm.py:783 +#: rhodecode/model/pull_request.py:1365 rhodecode/model/scm.py:784 msgid "Bookmarks" msgstr "" -#: rhodecode/model/pull_request.py:1349 +#: rhodecode/model/pull_request.py:1370 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1352 +#: rhodecode/model/pull_request.py:1373 msgid "Closed Branches" msgstr "" -#: rhodecode/model/pull_request.py:1493 +#: rhodecode/model/pull_request.py:1533 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1506 +#: rhodecode/model/pull_request.py:1546 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1521 +#: rhodecode/model/pull_request.py:1561 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1524 +#: rhodecode/model/pull_request.py:1564 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/scm.py:761 +#: rhodecode/model/pull_request.py:1599 +msgid "Merge strategy: rebase" +msgstr "" + +#: rhodecode/model/pull_request.py:1604 +msgid "Merge strategy: explicit merge commit" +msgstr "" + +#: rhodecode/model/pull_request.py:1611 +msgid "Source branch will be closed after merge." +msgstr "" + +#: rhodecode/model/pull_request.py:1613 +msgid "Source branch will be deleted after merge." +msgstr "" + +#: rhodecode/model/scm.py:762 msgid "latest tip" msgstr "" @@ -3545,26 +3658,26 @@ msgstr "" msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:332 +#: rhodecode/model/user.py:333 #, python-format msgid "You can't edit this user (`%(username)s`) since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:502 +#: rhodecode/model/user.py:506 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:510 +#: rhodecode/model/user.py:514 #, 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:519 +#: rhodecode/model/user.py:523 #, 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:528 +#: rhodecode/model/user.py:532 #, python-format msgid "user \"%s\" still owns %s user groups and cannot be removed. Switch owners or remove those user groups:%s" msgstr "" @@ -3612,7 +3725,7 @@ msgstr "" #: rhodecode/model/validators.py:224 #, python-format -msgid "User group \"%(usergroup)s\" already exists" +msgid "User group `%(usergroup)s` already exists" msgstr "" #: rhodecode/model/validators.py:226 @@ -3849,25 +3962,25 @@ msgstr "" msgid "{integration_type} settings" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:46 -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:50 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:47 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:51 msgid "Parent repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:53 msgid "You do not have the permission to store repository groups in the root location." msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:112 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:113 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:130 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:131 #: rhodecode/model/validation_schema/schemas/repo_schema.py:204 msgid "Repository with name `{}` already exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:135 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 #: rhodecode/model/validation_schema/schemas/repo_schema.py:209 msgid "Repository group with name `{}` already exists" msgstr "" @@ -3905,451 +4018,465 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:31663 -#: rhodecode/public/js/scripts.js:23511 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode-components.js:27153 +#: rhodecode/public/js/scripts.js:19001 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33594 -#: rhodecode/public/js/scripts.js:25442 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 +#: rhodecode/public/js/rhodecode-components.js:29084 +#: rhodecode/public/js/scripts.js:20932 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33595 -#: rhodecode/public/js/scripts.js:25443 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 +#: rhodecode/public/js/rhodecode-components.js:29085 +#: rhodecode/public/js/scripts.js:20933 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33596 -#: rhodecode/public/js/scripts.js:25444 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: rhodecode/public/js/rhodecode-components.js:29086 +#: rhodecode/public/js/scripts.js:20934 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33597 -#: rhodecode/public/js/scripts.js:25445 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/rhodecode-components.js:29087 +#: rhodecode/public/js/scripts.js:20935 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33598 -#: rhodecode/public/js/scripts.js:25446 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 +#: rhodecode/public/js/rhodecode-components.js:29088 +#: rhodecode/public/js/scripts.js:20936 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33599 -#: rhodecode/public/js/scripts.js:25447 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/rhodecode-components.js:29089 +#: rhodecode/public/js/scripts.js:20937 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33619 -#: rhodecode/public/js/scripts.js:25467 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/rhodecode-components.js:29109 +#: rhodecode/public/js/scripts.js:20957 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33627 -#: rhodecode/public/js/scripts.js:25475 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: rhodecode/public/js/rhodecode-components.js:29117 +#: rhodecode/public/js/scripts.js:20965 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33639 -#: rhodecode/public/js/scripts.js:25487 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode-components.js:29129 +#: rhodecode/public/js/scripts.js:20977 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33641 -#: rhodecode/public/js/scripts.js:25489 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode-components.js:29131 +#: rhodecode/public/js/scripts.js:20979 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33645 -#: rhodecode/public/js/scripts.js:25493 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: rhodecode/public/js/rhodecode-components.js:29135 +#: rhodecode/public/js/scripts.js:20983 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33647 -#: rhodecode/public/js/scripts.js:25495 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode-components.js:29137 +#: rhodecode/public/js/scripts.js:20985 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33649 -#: rhodecode/public/js/scripts.js:25497 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode-components.js:29139 +#: rhodecode/public/js/scripts.js:20987 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47492 -#: rhodecode/public/js/scripts.js:39340 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/rhodecode-components.js:43198 +#: rhodecode/public/js/scripts.js:35046 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47495 -#: rhodecode/public/js/scripts.js:39343 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 +#: rhodecode/public/js/rhodecode-components.js:43201 +#: rhodecode/public/js/scripts.js:35049 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47498 -#: rhodecode/public/js/scripts.js:39346 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode-components.js:43204 +#: rhodecode/public/js/scripts.js:35052 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47501 -#: rhodecode/public/js/scripts.js:39349 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/rhodecode-components.js:43207 +#: rhodecode/public/js/scripts.js:35055 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47505 -#: rhodecode/public/js/scripts.js:39353 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode-components.js:43211 +#: rhodecode/public/js/scripts.js:35059 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47507 -#: rhodecode/public/js/scripts.js:39355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 +#: rhodecode/public/js/rhodecode-components.js:43213 +#: rhodecode/public/js/scripts.js:35061 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47512 -#: rhodecode/public/js/scripts.js:39360 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode-components.js:43218 +#: rhodecode/public/js/scripts.js:35066 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47514 -#: rhodecode/public/js/scripts.js:39362 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 +#: rhodecode/public/js/rhodecode-components.js:43220 +#: rhodecode/public/js/scripts.js:35068 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47519 -#: rhodecode/public/js/scripts.js:39367 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode-components.js:43225 +#: rhodecode/public/js/scripts.js:35073 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47521 -#: rhodecode/public/js/scripts.js:39369 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: rhodecode/public/js/rhodecode-components.js:43227 +#: rhodecode/public/js/scripts.js:35075 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47525 -#: rhodecode/public/js/scripts.js:39373 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: rhodecode/public/js/rhodecode-components.js:43231 +#: rhodecode/public/js/scripts.js:35079 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47527 -#: rhodecode/public/js/scripts.js:39375 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode-components.js:43233 +#: rhodecode/public/js/scripts.js:35081 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48456 -#: rhodecode/public/js/scripts.js:40304 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: rhodecode/public/js/rhodecode-components.js:44167 +#: rhodecode/public/js/scripts.js:36015 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48458 -#: rhodecode/public/js/scripts.js:40306 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +#: rhodecode/public/js/rhodecode-components.js:44169 +#: rhodecode/public/js/scripts.js:36017 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48891 -#: rhodecode/public/js/scripts.js:40739 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 -#: rhodecode/public/js/src/rhodecode/codemirror.js:296 +#: rhodecode/public/js/rhodecode-components.js:44615 +#: rhodecode/public/js/scripts.js:36463 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/src/rhodecode/codemirror.js:297 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48910 -#: rhodecode/public/js/scripts.js:40758 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/codemirror.js:315 +#: rhodecode/public/js/rhodecode-components.js:44634 +#: rhodecode/public/js/scripts.js:36482 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/src/rhodecode/codemirror.js:316 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48929 -#: rhodecode/public/js/scripts.js:40777 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 -#: rhodecode/public/js/src/rhodecode/codemirror.js:334 +#: rhodecode/public/js/rhodecode-components.js:44653 +#: rhodecode/public/js/scripts.js:36501 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/src/rhodecode/codemirror.js:335 #: 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:48949 -#: rhodecode/public/js/scripts.js:40797 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 -#: rhodecode/public/js/src/rhodecode/codemirror.js:354 +#: rhodecode/public/js/rhodecode-components.js:44673 +#: rhodecode/public/js/scripts.js:36521 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/src/rhodecode/codemirror.js:355 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49315 -#: rhodecode/public/js/scripts.js:41163 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -#: rhodecode/public/js/src/rhodecode/comments.js:125 +#: rhodecode/public/js/rhodecode-components.js:45040 +#: rhodecode/public/js/scripts.js:36888 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/src/rhodecode/comments.js:126 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49399 -#: rhodecode/public/js/scripts.js:41247 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 -#: rhodecode/public/js/src/rhodecode/comments.js:209 +#: rhodecode/public/js/rhodecode-components.js:45124 +#: rhodecode/public/js/scripts.js:36972 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 +#: rhodecode/public/js/src/rhodecode/comments.js:210 msgid "Status Review" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49414 -#: rhodecode/public/js/scripts.js:41262 +#: rhodecode/public/js/rhodecode-components.js:45139 +#: rhodecode/public/js/scripts.js:36987 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 -#: rhodecode/public/js/src/rhodecode/comments.js:224 +#: rhodecode/public/js/src/rhodecode/comments.js:225 msgid "Comment text will be set automatically based on currently selected status ({0}) ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49571 -#: rhodecode/public/js/scripts.js:41419 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 -#: rhodecode/public/js/src/rhodecode/comments.js:381 +#: rhodecode/public/js/rhodecode-components.js:45296 +#: rhodecode/public/js/scripts.js:37144 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/src/rhodecode/comments.js:382 msgid "Submitting..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49622 -#: rhodecode/public/js/scripts.js:41470 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 -#: rhodecode/public/js/src/rhodecode/comments.js:432 +#: rhodecode/public/js/rhodecode-components.js:45347 +#: rhodecode/public/js/scripts.js:37195 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/src/rhodecode/comments.js:433 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49727 -#: rhodecode/public/js/scripts.js:41575 +#: rhodecode/public/js/rhodecode-components.js:45452 +#: rhodecode/public/js/scripts.js:37300 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 -#: rhodecode/public/js/src/rhodecode/comments.js:537 +#: rhodecode/public/js/src/rhodecode/comments.js:538 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49798 -#: rhodecode/public/js/scripts.js:41646 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 +#: rhodecode/public/js/rhodecode-components.js:45522 +#: rhodecode/public/js/scripts.js:37370 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/src/rhodecode/comments.js:608 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49875 -#: rhodecode/public/js/scripts.js:41723 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 +#: rhodecode/public/js/rhodecode-components.js:45599 +#: rhodecode/public/js/scripts.js:37447 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49989 -#: rhodecode/public/js/scripts.js:41837 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/rhodecode-components.js:45713 +#: rhodecode/public/js/scripts.js:37561 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50195 -#: rhodecode/public/js/scripts.js:42043 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/rhodecode-components.js:45919 +#: rhodecode/public/js/scripts.js:37767 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50197 -#: rhodecode/public/js/scripts.js:42045 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode-components.js:45921 +#: rhodecode/public/js/scripts.js:37769 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50206 -#: rhodecode/public/js/scripts.js:42054 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode-components.js:45930 +#: rhodecode/public/js/scripts.js:37778 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50341 -#: rhodecode/public/js/scripts.js:42189 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: rhodecode/public/js/rhodecode-components.js:46065 +#: rhodecode/public/js/scripts.js:37913 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50381 -#: rhodecode/public/js/scripts.js:42229 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode-components.js:46105 +#: rhodecode/public/js/scripts.js:37953 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50382 -#: rhodecode/public/js/scripts.js:42230 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode-components.js:46106 +#: rhodecode/public/js/scripts.js:37954 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50391 -#: rhodecode/public/js/scripts.js:42239 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: rhodecode/public/js/rhodecode-components.js:46115 +#: rhodecode/public/js/scripts.js:37963 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 #: rhodecode/public/js/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50392 -#: rhodecode/public/js/scripts.js:42240 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode-components.js:46116 +#: rhodecode/public/js/scripts.js:37964 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50770 -#: rhodecode/public/js/rhodecode-components.js:50779 -#: rhodecode/public/js/scripts.js:42618 rhodecode/public/js/scripts.js:42627 +#: rhodecode/public/js/rhodecode-components.js:46496 +#: rhodecode/public/js/rhodecode-components.js:46505 +#: rhodecode/public/js/scripts.js:38344 rhodecode/public/js/scripts.js:38353 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 #: rhodecode/public/js/src/rhodecode/pullrequests.js:134 #: rhodecode/public/js/src/rhodecode/pullrequests.js:143 msgid "All reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50784 -#: rhodecode/public/js/scripts.js:42632 +#: rhodecode/public/js/rhodecode-components.js:46510 +#: rhodecode/public/js/scripts.js:38358 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148 msgid "At least {0} reviewer must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50790 -#: rhodecode/public/js/scripts.js:42638 +#: rhodecode/public/js/rhodecode-components.js:46516 +#: rhodecode/public/js/scripts.js:38364 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154 msgid "At least {0} reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50797 -#: rhodecode/public/js/scripts.js:42645 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: rhodecode/public/js/rhodecode-components.js:46523 +#: rhodecode/public/js/scripts.js:38371 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/src/rhodecode/pullrequests.js:161 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50804 -#: rhodecode/public/js/scripts.js:42652 +#: rhodecode/public/js/rhodecode-components.js:46530 +#: rhodecode/public/js/scripts.js:38378 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/rhodecode/pullrequests.js:168 msgid "Adding new reviewers is forbidden." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50811 -#: rhodecode/public/js/scripts.js:42659 +#: rhodecode/public/js/rhodecode-components.js:46537 +#: rhodecode/public/js/scripts.js:38385 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/pullrequests.js:175 msgid "Author is not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50825 -#: rhodecode/public/js/scripts.js:42673 +#: rhodecode/public/js/rhodecode-components.js:46551 +#: rhodecode/public/js/scripts.js:38399 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 #: rhodecode/public/js/src/rhodecode/pullrequests.js:189 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50972 -#: rhodecode/public/js/scripts.js:42820 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/rhodecode-components.js:46698 +#: rhodecode/public/js/scripts.js:38546 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 #: rhodecode/public/js/src/rhodecode/pullrequests.js:336 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51099 -#: rhodecode/public/js/scripts.js:42947 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 +#: rhodecode/public/js/rhodecode-components.js:46823 +#: rhodecode/public/js/scripts.js:38671 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:461 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51101 -#: rhodecode/public/js/scripts.js:42949 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:465 +#: rhodecode/public/js/rhodecode-components.js:46825 +#: rhodecode/public/js/scripts.js:38673 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 msgid "member of \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51682 -#: rhodecode/public/js/scripts.js:43530 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode-components.js:47404 +#: rhodecode/public/js/scripts.js:39252 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51702 -#: rhodecode/public/js/scripts.js:43550 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/rhodecode-components.js:47424 +#: rhodecode/public/js/scripts.js:39272 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode.js:162 msgid "Show more" msgstr "" +#: rhodecode/public/js/rhodecode-components.js:47805 +#: rhodecode/public/js/scripts.js:39653 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/src/rhodecode.js:543 +msgid "date not in future" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:47813 +#: rhodecode/public/js/scripts.js:39661 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/src/rhodecode.js:551 +msgid "Specified expiration date" +msgstr "" + #: rhodecode/public/js/rhodecode/i18n/js_translations.js:2 msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:487 -#: rhodecode/templates/codeblocks/diffs.mako:492 +#: 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:9 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:325 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:331 msgid "Close" msgstr "" @@ -4357,140 +4484,156 @@ msgstr "" msgid "Diff to Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 -msgid "No bookmarks available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 -msgid "No branches available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 -msgid "No gists available yet." +msgid "No bookmarks available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +msgid "No branches available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +msgid "No forks available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +msgid "No gists available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 msgid "No pull requests available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 -msgid "No repositories available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 -msgid "No repository groups available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 -msgid "No tags available yet." +msgid "No repositories available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 -msgid "No user groups available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 -msgid "No users available yet." +msgid "No repository groups available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +msgid "No ssh keys available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +msgid "No tags available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 -#: rhodecode/templates/changelog/changelog.mako:61 -msgid "Open new pull request" +msgid "No user groups available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +msgid "No users available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/templates/changelog/changelog.mako:59 +msgid "Open new pull request" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 #: 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:48 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 msgid "Show selected commit __S" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Show selected commits __S ... __E" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/i18n_messages.js:7 msgid "Switch to chat" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/i18n_messages.js:8 -msgid "Switch to comment" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 -msgid "There are currently no open pull requests requiring your participation." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 -msgid "Updating..." +#: rhodecode/public/js/src/i18n_messages.js:8 +msgid "Switch to comment" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +msgid "There are currently no open pull requests requiring your participation." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +msgid "Updating..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 msgid "files" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 -msgid "{0} days" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 -msgid "{0} hours" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 -msgid "{0} months" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +msgid "{0} hours" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +msgid "{0} months" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +msgid "{0} out of {1} ssh keys" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 msgid "{0} years" msgstr "" @@ -4526,13 +4669,14 @@ msgstr "" #: rhodecode/templates/admin/gists/index.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:7 #: rhodecode/templates/admin/my_account/my_account_watched.mako:7 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:12 #: rhodecode/templates/admin/repos/repos.mako:12 #: rhodecode/templates/admin/user_groups/user_groups.mako:12 #: rhodecode/templates/admin/users/users.mako:12 #: rhodecode/templates/bookmarks/bookmarks.mako:12 #: rhodecode/templates/branches/branches.mako:12 -#: rhodecode/templates/journal/journal.mako:12 +#: rhodecode/templates/journal/journal.mako:13 #: rhodecode/templates/tags/tags.mako:12 msgid "quick filter..." msgstr "" @@ -4564,19 +4708,19 @@ msgid "Edit Repository Group" msgstr "" #: rhodecode/templates/index_base.mako:97 -#: rhodecode/templates/index_base.mako:122 +#: rhodecode/templates/index_base.mako:125 #: rhodecode/templates/admin/gists/index.mako:112 -#: rhodecode/templates/admin/integrations/list.mako:102 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:39 +#: rhodecode/templates/admin/integrations/list.mako:106 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:55 #: rhodecode/templates/admin/my_account/my_account_repos.mako:31 #: rhodecode/templates/admin/my_account/my_account_watched.mako:31 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:53 #: rhodecode/templates/admin/repos/repo_add_base.mako:9 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:16 #: rhodecode/templates/admin/repos/repos.mako:54 -#: rhodecode/templates/admin/user_groups/user_groups.mako:55 +#: rhodecode/templates/admin/user_groups/user_groups.mako:61 #: rhodecode/templates/admin/users/user_edit_groups.mako:54 -#: rhodecode/templates/base/perms_summary.mako:102 +#: rhodecode/templates/base/perms_summary.mako:149 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 #: rhodecode/templates/files/files_browser_tree.mako:5 @@ -4586,12 +4730,15 @@ msgid "Name" msgstr "" #: rhodecode/templates/index_base.mako:100 -#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/index_base.mako:128 #: rhodecode/templates/admin/gists/index.mako:114 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:10 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:55 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:49 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:55 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 #: rhodecode/templates/admin/repos/repo_add_base.mako:43 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29 @@ -4599,13 +4746,15 @@ msgstr "" #: 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/user_groups/user_groups.mako:63 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:15 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:67 #: rhodecode/templates/admin/users/user_edit_groups.mako:59 #: rhodecode/templates/admin/users/user_edit_ips.mako:12 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:10 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:50 #: rhodecode/templates/base/issue_tracker_settings.mako:10 -#: rhodecode/templates/changeset/changeset.mako:73 +#: rhodecode/templates/changeset/changeset.mako:76 #: rhodecode/templates/compare/compare_commits.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:89 #: rhodecode/templates/email_templates/pull_request_review.mako:41 @@ -4613,48 +4762,51 @@ msgstr "" #: rhodecode/templates/files/file_tree_detail.mako:5 #: rhodecode/templates/files/file_tree_detail.mako:12 #: rhodecode/templates/forks/fork.mako:48 -#: rhodecode/templates/forks/forks_data.mako:9 +#: rhodecode/templates/forks/forks.mako:72 #: rhodecode/templates/pullrequests/pullrequest.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:163 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:487 -#: rhodecode/templates/summary/components.mako:73 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:169 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:493 +#: rhodecode/templates/summary/components.mako:82 msgid "Description" msgstr "" -#: rhodecode/templates/index_base.mako:102 -#: rhodecode/templates/index_base.mako:133 +#: rhodecode/templates/index_base.mako:103 +#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:59 +#: rhodecode/templates/admin/repos/repos.mako:60 +msgid "Last Change" +msgstr "" + +#: rhodecode/templates/index_base.mako:105 +#: rhodecode/templates/index_base.mako:136 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:24 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:63 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:5 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:109 #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/user_groups/user_groups.mako:71 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 -#: rhodecode/templates/forks/forks_data.mako:7 -#: rhodecode/templates/summary/components.mako:195 +#: rhodecode/templates/forks/forks.mako:68 +#: rhodecode/templates/summary/components.mako:203 msgid "Owner" msgstr "" -#: rhodecode/templates/index_base.mako:128 -#: rhodecode/templates/admin/repos/repos.mako:60 -msgid "Last Change" -msgstr "" - -#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/index_base.mako:134 #: rhodecode/templates/admin/my_account/my_account_repos.mako:35 #: rhodecode/templates/admin/my_account/my_account_watched.mako:35 #: rhodecode/templates/admin/repos/repos.mako:63 #: rhodecode/templates/bookmarks/bookmarks.mako:66 #: rhodecode/templates/branches/branches.mako:65 -#: rhodecode/templates/changelog/changelog.mako:107 -#: rhodecode/templates/changeset/changeset.mako:36 +#: rhodecode/templates/changelog/changelog.mako:116 +#: rhodecode/templates/changeset/changeset.mako:37 #: rhodecode/templates/compare/compare_commits.mako:19 #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:485 +#: rhodecode/templates/files/file_authors_box.mako:31 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 #: rhodecode/templates/search/search_commit.mako:6 #: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 @@ -4671,7 +4823,7 @@ msgid "Home" msgstr "" #: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:332 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:341 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "" @@ -4781,6 +4933,70 @@ msgstr "" msgid "Create Account" msgstr "" +#: rhodecode/templates/admin/admin_audit_log_entry.mako:6 +msgid "Admin audit log entry" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:13 +msgid "Audit long entry" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:31 +msgid "User" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:43 +#: rhodecode/templates/admin/admin_log_base.mako:11 +#: rhodecode/templates/bookmarks/bookmarks.mako:61 +#: rhodecode/templates/branches/branches.mako:60 +#: rhodecode/templates/tags/tags.mako:61 +msgid "Date" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:51 +#: rhodecode/templates/admin/admin_log_base.mako:12 +msgid "IP" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:60 +#: rhodecode/templates/admin/admin_log_base.mako:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 +#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:12 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:55 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:65 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 +#: rhodecode/templates/admin/repos/repos.mako:69 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 +#: rhodecode/templates/admin/user_groups/user_groups.mako:73 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 +#: rhodecode/templates/admin/users/user_edit_groups.mako:73 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:12 +#: rhodecode/templates/admin/users/users.mako:80 +#: rhodecode/templates/files/files_detail.mako:58 +#: rhodecode/templates/forks/forks.mako:79 +msgid "Action" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:78 +#: rhodecode/templates/admin/admin_log_base.mako:9 +msgid "Action Data" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:86 +#: rhodecode/templates/admin/admin_log_base.mako:47 +msgid "data not available for v1 entries type" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:92 +#: rhodecode/templates/admin/admin_log_base.mako:10 +#: rhodecode/templates/admin/defaults/defaults.mako:31 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 +#: rhodecode/templates/search/search_commit.mako:5 +#: rhodecode/templates/search/search_path.mako:3 +msgid "Repository" +msgstr "" + #: rhodecode/templates/admin/admin_audit_logs.mako:5 #: rhodecode/templates/base/base.mako:75 msgid "Admin audit logs" @@ -4791,68 +5007,34 @@ msgid "filter..." msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:15 #: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:15 +#: rhodecode/templates/admin/repos/repo_edit.mako:89 +#: rhodecode/templates/admin/users/user_edit.mako:47 msgid "Audit logs" msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:17 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:17 #: rhodecode/templates/admin/users/user_edit_audit.mako:17 -#: rhodecode/templates/journal/journal.mako:17 +#: rhodecode/templates/journal/journal.mako:18 #: rhodecode/templates/search/search.mako:76 msgid "Example Queries" msgstr "" -#: rhodecode/templates/admin/admin_log_base.mako:7 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 -#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 -#: 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:68 -#: 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:80 -#: rhodecode/templates/files/files_detail.mako:58 -msgid "Action" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:8 -msgid "Action Data" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:9 -#: rhodecode/templates/admin/defaults/defaults.mako:31 -#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 -#: rhodecode/templates/search/search_commit.mako:5 -#: rhodecode/templates/search/search_path.mako:3 -msgid "Repository" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:10 -#: rhodecode/templates/bookmarks/bookmarks.mako:61 -#: rhodecode/templates/branches/branches.mako:60 -#: rhodecode/templates/tags/tags.mako:61 -msgid "Date" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:11 -msgid "IP" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:38 +#: rhodecode/templates/admin/admin_log_base.mako:6 +msgid "Uid" +msgstr "" + +#: rhodecode/templates/admin/admin_log_base.mako:42 msgid "toggle" msgstr "" -#: rhodecode/templates/admin/admin_log_base.mako:43 -msgid "data not available for v1 entries type" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:64 +#: rhodecode/templates/admin/admin_log_base.mako:68 msgid "No actions yet" msgstr "" @@ -4888,13 +5070,13 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:106 #: rhodecode/templates/admin/permissions/permissions_application.mako:59 #: rhodecode/templates/admin/permissions/permissions_objects.mako:56 -#: 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:101 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:78 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:133 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:83 +#: rhodecode/templates/admin/repos/repo_add_base.mako:106 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:79 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:194 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:200 #: rhodecode/templates/admin/settings/settings_hooks.mako:63 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15 #: rhodecode/templates/admin/user_groups/user_group_add.mako:60 @@ -4922,21 +5104,21 @@ 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:75 +#: rhodecode/templates/admin/integrations/list.mako:107 +#: rhodecode/templates/admin/repos/repo_add_base.mako:80 #: 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:93 +#: rhodecode/templates/admin/repos/repo_add_base.mako:98 msgid "Private Repository" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:97 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:143 -#: rhodecode/templates/forks/fork.mako:87 +#: rhodecode/templates/admin/repos/repo_add_base.mako:102 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:149 +#: rhodecode/templates/forks/fork.mako:92 msgid "Private repositories are only visible to people explicitly added as collaborators." msgstr "" @@ -4987,7 +5169,7 @@ msgstr "" #: rhodecode/templates/admin/gists/edit.mako:56 #: rhodecode/templates/admin/gists/new.mako:50 #: rhodecode/templates/files/files_add.mako:80 -#: rhodecode/templates/files/files_edit.mako:78 +#: rhodecode/templates/files/files_edit.mako:81 msgid "plain" msgstr "" @@ -4998,15 +5180,15 @@ msgstr "" #: rhodecode/templates/admin/gists/edit.mako:102 #: rhodecode/templates/base/issue_tracker_settings.mako:73 #: rhodecode/templates/changeset/changeset_file_comment.mako:390 -#: rhodecode/templates/codeblocks/diffs.mako:76 +#: rhodecode/templates/codeblocks/diffs.mako:70 #: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 -#: rhodecode/templates/files/files_edit.mako:105 +#: rhodecode/templates/files/files_edit.mako:108 #: rhodecode/templates/pullrequests/pullrequest_show.mako:64 msgid "Cancel" msgstr "" -#: rhodecode/templates/admin/gists/edit.mako:122 +#: rhodecode/templates/admin/gists/edit.mako:125 #, python-format msgid "Gist was updated since you started editing. Copy your changes and click %(here)s to reload the new version." msgstr "" @@ -5037,7 +5219,7 @@ msgid "All Public Gists" msgstr "" #: rhodecode/templates/admin/gists/index.mako:44 -#: rhodecode/templates/admin/gists/show.mako:36 +#: rhodecode/templates/admin/gists/show.mako:35 msgid "Create New Gist" msgstr "" @@ -5062,14 +5244,14 @@ msgid "My public" msgstr "" #: rhodecode/templates/admin/gists/index.mako:108 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:41 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:57 #: rhodecode/templates/bookmarks/bookmarks.mako:63 #: rhodecode/templates/branches/branches.mako:62 -#: rhodecode/templates/changelog/changelog.mako:113 -#: rhodecode/templates/changeset/changeset.mako:200 +#: rhodecode/templates/changelog/changelog.mako:124 +#: rhodecode/templates/changeset/changeset.mako:203 #: rhodecode/templates/compare/compare_commits.mako:18 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:484 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 #: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5078,6 +5260,7 @@ msgid "Author" msgstr "" #: rhodecode/templates/admin/gists/index.mako:116 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:51 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:6 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:6 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:6 @@ -5086,7 +5269,7 @@ msgid "Created on" msgstr "" #: rhodecode/templates/admin/gists/index.mako:118 -#: rhodecode/templates/admin/gists/show.mako:65 +#: rhodecode/templates/admin/gists/show.mako:72 msgid "Expires" msgstr "" @@ -5120,44 +5303,33 @@ msgstr "" msgid "Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:49 +#: rhodecode/templates/admin/gists/show.mako:47 +msgid "Copy the url" +msgstr "" + +#: rhodecode/templates/admin/gists/show.mako:54 msgid "Confirm to delete this Gist" 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: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 -#: rhodecode/templates/data_table/_dt_elements.mako:206 -#: rhodecode/templates/debug_style/buttons.html:128 -#: rhodecode/templates/files/files_add.mako:208 -#: rhodecode/templates/files/files_edit.mako:165 -#: rhodecode/templates/files/files_source.mako:48 -#: rhodecode/templates/files/files_source.mako:51 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:339 -#: rhodecode/templates/users/user_profile.mako:7 -msgid "Edit" -msgstr "" - -#: rhodecode/templates/admin/gists/show.mako:58 +#: rhodecode/templates/admin/gists/show.mako:60 +msgid "Copy content" +msgstr "" + +#: rhodecode/templates/admin/gists/show.mako:65 msgid "Show as Raw" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:62 +#: rhodecode/templates/admin/gists/show.mako:69 msgid "Private Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:77 +#: rhodecode/templates/admin/gists/show.mako:85 msgid "created" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:91 +#: rhodecode/templates/admin/gists/show.mako:100 #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:87 +#: rhodecode/templates/files/files_source.mako:100 msgid "Show as raw" msgstr "" @@ -5170,7 +5342,7 @@ msgstr "" #: rhodecode/templates/admin/integrations/new.mako:13 #: rhodecode/templates/admin/permissions/permissions_objects.mako:28 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:14 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:127 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:125 msgid "Repository Groups" msgstr "" @@ -5182,7 +5354,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:46 #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 -#: rhodecode/templates/base/base.mako:84 rhodecode/templates/base/base.mako:251 +#: rhodecode/templates/base/base.mako:84 rhodecode/templates/base/base.mako:249 msgid "Settings" msgstr "" @@ -5204,67 +5376,67 @@ msgid "Current Integrations" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:64 -#: rhodecode/templates/admin/notifications/notifications.mako:31 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:41 msgid "All" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:95 +#: rhodecode/templates/admin/integrations/list.mako:99 #: rhodecode/templates/admin/integrations/new.mako:26 msgid "Create new integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:104 +#: rhodecode/templates/admin/integrations/list.mako:108 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14 msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:105 +#: rhodecode/templates/admin/integrations/list.mako:109 #: rhodecode/templates/compare/compare_diff.mako:92 msgid "Actions" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:115 -msgid "No {type} integrations for repo {repo} exist yet." -msgstr "" - -#: rhodecode/templates/admin/integrations/list.mako:117 -msgid "No {type} integrations for repogroup {repogroup} exist yet." -msgstr "" - #: rhodecode/templates/admin/integrations/list.mako:119 +msgid "No {type} integrations for repo {repo} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:121 +msgid "No {type} integrations for repogroup {repogroup} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:123 msgid "No {type} integrations exist yet." msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:133 +#: rhodecode/templates/admin/integrations/list.mako:137 msgid "Create one" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:164 -msgid "repo" -msgstr "" - #: rhodecode/templates/admin/integrations/list.mako:168 -msgid "repogroup" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.mako:170 -msgid "child repos only" +msgid "repo" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:172 +msgid "repogroup" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:174 +msgid "child repos only" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:176 msgid "cascade to all" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:177 +#: rhodecode/templates/admin/integrations/list.mako:181 msgid "top level repos only" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:179 +#: rhodecode/templates/admin/integrations/list.mako:183 msgid "global" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:185 +#: rhodecode/templates/admin/integrations/list.mako:189 msgid "unknown integration" msgstr "" @@ -5280,12 +5452,12 @@ msgstr "" msgid "Create New Global Integration" msgstr "" -#: rhodecode/templates/admin/integrations/new.mako:61 +#: rhodecode/templates/admin/integrations/new.mako:63 msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:346 +#: rhodecode/templates/base/base.mako:355 msgid "My account" msgstr "" @@ -5304,26 +5476,35 @@ msgstr "" msgid "Auth Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:35 +#: rhodecode/templates/admin/my_account/my_account.mako:32 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:3 +#: rhodecode/templates/admin/permissions/permissions.mako:48 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:4 +#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:3 +msgid "SSH Keys" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:36 msgid "OAuth Identities" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:43 +#: rhodecode/templates/admin/my_account/my_account.mako:38 +#: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Emails" 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:241 -msgid "Pull Requests" +msgid "Watched" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:43 +#: rhodecode/templates/base/base.mako:239 +msgid "Pull Requests" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:42 #: rhodecode/templates/admin/permissions/permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:49 #: rhodecode/templates/admin/repos/repo_edit.mako:49 @@ -5332,7 +5513,7 @@ msgstr "" msgid "Permissions" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:42 +#: rhodecode/templates/admin/my_account/my_account.mako:43 msgid "Live Notifications" msgstr "" @@ -5379,16 +5560,23 @@ 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/my_account/my_account_ssh_keys.mako:67 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:63 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:82 #: rhodecode/templates/admin/users/user_edit_emails.mako:62 #: rhodecode/templates/admin/users/user_edit_ips.mako:70 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:62 msgid "Add" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:128 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:125 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:118 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:116 +msgid "Select or enter expiration date" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:153 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:151 msgid "repository scope" msgstr "" @@ -5478,11 +5666,11 @@ msgstr "" msgid "Pull Requests You Participate In" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:37 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:53 msgid "Target Repo" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:43 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:59 #: rhodecode/templates/admin/settings/settings_global.mako:9 #: rhodecode/templates/email_templates/pull_request_review.mako:39 #: rhodecode/templates/email_templates/pull_request_review.mako:72 @@ -5491,7 +5679,7 @@ msgstr "" msgid "Title" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:47 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:63 #: rhodecode/templates/pullrequests/pullrequests.mako:118 msgid "Last Update" msgstr "" @@ -5500,39 +5688,91 @@ msgstr "" msgid "Repositories You Own" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:9 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:47 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:9 +msgid "Fingerprint" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:11 +#: rhodecode/templates/data_table/_dt_elements.mako:183 +msgid "Created" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:15 +msgid "SSH Keys usage is currently disabled, please ask your administrator to enable them." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:30 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:27 +#, python-format +msgid "Confirm to remove ssh key %s" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:38 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:35 +msgid "No additional ssh keys specified" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:52 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:47 +msgid "New ssh key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:56 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:51 +msgid "Generate random RSA key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:62 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:57 +msgid "Public key, begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_watched.mako:3 msgid "Your Watched Repositories" msgstr "" -#: rhodecode/templates/admin/notifications/notifications.mako:5 -#: rhodecode/templates/admin/notifications/notifications.mako:12 +#: rhodecode/templates/admin/notifications/notifications_data.mako:5 +msgid "My notifications" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.mako:26 +msgid "Mark as read" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.mako:42 +msgid "No notifications here yet" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show.mako:5 +#: rhodecode/templates/admin/notifications/notifications_show.mako:14 +msgid "Show notification" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show.mako:12 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:5 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:12 msgid "My Notifications" msgstr "" -#: rhodecode/templates/admin/notifications/notifications.mako:32 -#: rhodecode/templates/changeset/changeset.mako:160 -msgid "Comments" -msgstr "" - -#: rhodecode/templates/admin/notifications/notifications.mako:37 +#: rhodecode/templates/admin/notifications/notifications_show.mako:40 +msgid "Subject" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:26 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:30 msgid "Mark all as read" msgstr "" -#: rhodecode/templates/admin/notifications/notifications_data.mako:39 -msgid "No notifications here yet" -msgstr "" - -#: rhodecode/templates/admin/notifications/show_notification.mako:5 -#: rhodecode/templates/admin/notifications/show_notification.mako:14 -msgid "Show notification" -msgstr "" - -#: rhodecode/templates/admin/notifications/show_notification.mako:12 -msgid "Notifications" -msgstr "" - -#: rhodecode/templates/admin/notifications/show_notification.mako:40 -msgid "Subject" +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:40 +msgid "Unread" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:42 +#: rhodecode/templates/changeset/changeset.mako:163 +msgid "Comments" msgstr "" #: rhodecode/templates/admin/permissions/permissions.mako:5 @@ -5552,6 +5792,10 @@ msgid "IP Whitelist" msgstr "" #: rhodecode/templates/admin/permissions/permissions.mako:45 +msgid "AuthToken Access" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.mako:51 msgid "Overview" msgstr "" @@ -5588,32 +5832,45 @@ msgstr "" msgid "External Authentication Account Activation" msgstr "" +#: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:5 +msgid "View whitelist" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:36 +msgid "List of views available for usage in whitelist access" +msgstr "" + #: rhodecode/templates/admin/permissions/permissions_ips.mako:5 msgid "Default IP Whitelist For All Users" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:27 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:9 +#: rhodecode/templates/admin/users/user_edit_ips.mako:7 +msgid "Current IP address" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_ips.mako:30 #: rhodecode/templates/admin/users/user_edit_ips.mako:36 #, python-format msgid "Confirm to delete this ip: %s" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:34 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:37 #: rhodecode/templates/admin/users/user_edit_ips.mako:44 msgid "All IP addresses are allowed" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:49 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:52 #: rhodecode/templates/admin/users/user_edit_ips.mako:60 msgid "New IP Address" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:53 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:56 #: rhodecode/templates/admin/users/user_edit_ips.mako:63 msgid "Description..." msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:54 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:57 msgid "" "Enter a comma separated list of IP Addresses like 127.0.0.1,\n" "or use an IP Address with a mask 127.0.0.1/24, to create a network range.\n" @@ -5655,6 +5912,14 @@ msgstr "" msgid "Default User Permissions Overview" msgstr "" +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:7 +msgid "Update SSH keys file" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:53 +msgid "Accessed on" +msgstr "" + #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:5 msgid "Add repository group" msgstr "" @@ -5670,16 +5935,21 @@ msgstr "" msgid "Group Name" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:54 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:50 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:62 +msgid "Plain text format with support of {metatags}" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:60 msgid "Group Parent" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 -#: rhodecode/templates/admin/repos/repo_add_base.mako:66 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:69 +#: rhodecode/templates/admin/repos/repo_add_base.mako:71 msgid "Copy Parent Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:67 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:73 msgid "Copy permission settings from parent repository group." msgstr "" @@ -5695,7 +5965,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:50 #: rhodecode/templates/admin/repos/repo_edit.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35 -#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit.mako:41 msgid "Advanced" msgstr "" @@ -5724,20 +5994,6 @@ msgstr "" msgid "Delete repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:36 -#, python-format -msgid "This repository group includes %s children repository group." -msgid_plural "This repository group includes %s children repository groups." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:45 -#, python-format -msgid "This repository group includes %s repository." -msgid_plural "This repository group includes %s repositories." -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:57 #, python-format msgid "Confirm to delete this group: %s" @@ -5747,64 +6003,64 @@ msgstr "" msgid "Delete this repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:5 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:5 msgid "Repository Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:15 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:15 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:15 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:15 msgid "User/User Group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:31 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:30 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:30 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:31 msgid "super admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:34 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:33 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:33 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:34 msgid "owner" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:52 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:76 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:50 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:74 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:60 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:76 msgid "permission for all other users" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:62 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:109 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:107 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:70 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:98 msgid "Revoke" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:80 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:78 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:80 msgid "delegated admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:116 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:106 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117 #: rhodecode/templates/base/issue_tracker_settings.mako:83 msgid "Add new" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:123 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:121 msgid "Apply to children" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:129 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:127 msgid "Both" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:130 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:128 msgid "Set or revoke permissions to selected types of children of this group, including non-private repositories and other groups if chosen." msgstr "" @@ -5813,19 +6069,23 @@ msgstr "" msgid "Settings for Repository Group: %s" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:36 -msgid "Change owner of this repository group." -msgstr "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:51 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:25 msgid "Group parent" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:59 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:31 +msgid "Optional select a parent group to move this repository group into." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:49 +msgid "Change owner of this repository group." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:72 msgid "Enable Repository Locking" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:63 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:78 msgid "Repository locking will be enabled on all subgroups and repositories inside this repository group. Pulling from a repository locks it, and it is unlocked by pushing back by the same user." msgstr "" @@ -5837,7 +6097,7 @@ msgstr "" msgid "repository groups" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:58 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:61 msgid "Number of top level repositories" msgstr "" @@ -5854,48 +6114,47 @@ msgstr "" msgid "Clone from" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:132 -#: rhodecode/templates/forks/fork.mako:52 -msgid "Keep it short and to the point. Use a README file for longer descriptions." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_add_base.mako:52 +#: rhodecode/templates/admin/repos/repo_add_base.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:134 +#: rhodecode/templates/forks/fork.mako:53 +msgid "Plain text format with support of {metatags}. Add a README file for longer descriptions" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:57 msgid "Repository Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:58 -#: rhodecode/templates/forks/fork.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:63 +#: rhodecode/templates/forks/fork.mako:69 #, python-format msgid "Select my personal group (%(repo_group_name)s)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:61 -#: rhodecode/templates/forks/fork.mako:67 +#: rhodecode/templates/admin/repos/repo_add_base.mako:66 +#: rhodecode/templates/forks/fork.mako:72 msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:70 +#: rhodecode/templates/admin/repos/repo_add_base.mako:75 msgid "Copy permission set from the parent repository group." msgstr "" -#: 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:84 +msgid "Set the type of repository to create." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:89 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:98 -#: rhodecode/templates/forks/fork.mako:73 +#: rhodecode/templates/forks/fork.mako:78 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:88 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 msgid "The default commit for file pages, downloads, full text search index, and README generation." msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:5 -#, python-format -msgid "%s Creating repository" +msgid "{} Creating repository" msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:12 @@ -5925,7 +6184,7 @@ msgid "Remote" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:72 -#: rhodecode/templates/summary/components.mako:135 +#: rhodecode/templates/summary/components.mako:143 msgid "Statistics" msgstr "" @@ -6029,7 +6288,7 @@ msgid "Delete forks" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138 -#: rhodecode/templates/data_table/_dt_elements.mako:124 +#: rhodecode/templates/data_table/_dt_elements.mako:172 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" @@ -6050,6 +6309,15 @@ msgstr "" msgid "Pick repository" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:7 +msgid "Repository Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +msgid "audit filter..." +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_caches.mako:3 msgid "Invalidate Cache for Repository" msgstr "" @@ -6084,7 +6352,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:41 #: rhodecode/templates/admin/user_groups/user_group_add.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:51 -#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/admin/user_groups/user_groups.mako:69 #: 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 @@ -6264,8 +6532,8 @@ msgid "" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:33 -#: rhodecode/templates/data_table/_dt_elements.mako:164 -#: rhodecode/templates/forks/fork.mako:58 +#: rhodecode/templates/data_table/_dt_elements.mako:207 +#: rhodecode/templates/forks/fork.mako:63 msgid "Repository group" msgstr "" @@ -6283,9 +6551,9 @@ msgid "Remote uri" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:59 -#: rhodecode/templates/base/perms_summary.mako:79 -#: rhodecode/templates/base/perms_summary.mako:149 -#: rhodecode/templates/base/perms_summary.mako:151 +#: rhodecode/templates/base/perms_summary.mako:92 +#: rhodecode/templates/base/perms_summary.mako:210 +#: rhodecode/templates/base/perms_summary.mako:212 #: rhodecode/templates/debug_style/form-elements.html:45 msgid "edit" msgstr "" @@ -6314,32 +6582,32 @@ msgstr "" msgid "Change owner of this repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:138 -#: rhodecode/templates/data_table/_dt_elements.mako:58 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:144 +#: rhodecode/templates/data_table/_dt_elements.mako:92 msgid "Private repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:148 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:154 msgid "Enable statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:153 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:159 msgid "Enable statistics window on summary page." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:158 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:164 msgid "Enable downloads" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:163 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:169 msgid "Enable download menu on summary page." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:168 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:174 msgid "Enable automatic locking" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:173 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:179 msgid "Enable automatic locking on repository. Pulling from this repository creates a lock that can be released by pushing back by the same user" msgstr "" @@ -6431,7 +6699,7 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:139 #: rhodecode/templates/admin/settings/settings_labs.mako:48 #: rhodecode/templates/admin/settings/settings_vcs.mako:13 -#: rhodecode/templates/admin/settings/settings_visual.mako:221 +#: rhodecode/templates/admin/settings/settings_visual.mako:210 msgid "Save settings" msgstr "" @@ -6528,7 +6796,7 @@ msgid "Set a custom text that is shown a msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:36 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:56 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:59 msgid "Personal Repository Group" msgstr "" @@ -6700,6 +6968,15 @@ msgstr "" msgid "Licenses of Third Party Packages" msgstr "" +#: rhodecode/templates/admin/settings/settings_process_management.mako:3 +#: rhodecode/templates/admin/settings/settings_system.mako:3 +msgid "Checking for updates..." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_process_management.mako:9 +msgid "Gunicorn process management" +msgstr "" + #: rhodecode/templates/admin/settings/settings_search.mako:3 msgid "RhodeCode Full Text Search" msgstr "" @@ -6753,10 +7030,6 @@ msgstr "" msgid "Last %(size)s bytes of process logs, use ?offset=[num] GET param to set custom size" msgstr "" -#: rhodecode/templates/admin/settings/settings_system.mako:3 -msgid "Checking for updates..." -msgstr "" - #: rhodecode/templates/admin/settings/settings_system.mako:11 msgid "create summary snapshot" msgstr "" @@ -6822,89 +7095,89 @@ msgid "Stylify recognised meta tags" msgstr "" #: rhodecode/templates/admin/settings/settings_visual.mako:66 -msgid "Parses meta tags from repository description field and turns them into colored tags." -msgstr "" - -#: rhodecode/templates/admin/settings/settings_visual.mako:88 +msgid "Parses meta tags from repository or repository group description fields and turns them into colored tags." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_visual.mako:77 msgid "Dashboard Items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:92 +#: rhodecode/templates/admin/settings/settings_visual.mako:81 msgid "Main page dashboard items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:98 +#: rhodecode/templates/admin/settings/settings_visual.mako:87 msgid "Number of items displayed in the main page dashboard before pagination is shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:102 +#: rhodecode/templates/admin/settings/settings_visual.mako:91 msgid "Admin pages items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:108 +#: rhodecode/templates/admin/settings/settings_visual.mako:97 msgid "Number of items displayed in the admin pages grids before pagination is shown." msgstr "" +#: rhodecode/templates/admin/settings/settings_visual.mako:106 +msgid "Commit ID Style" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_visual.mako:110 +msgid "Commit sha length" +msgstr "" + #: rhodecode/templates/admin/settings/settings_visual.mako:117 -msgid "Commit ID Style" -msgstr "" - -#: rhodecode/templates/admin/settings/settings_visual.mako:121 -msgid "Commit sha length" -msgstr "" - -#: rhodecode/templates/admin/settings/settings_visual.mako:128 msgid "" "Number of chars to show in commit sha displayed in web interface.\n" " By default it's shown as r123:9043a6a4c226 this value defines the\n" " length of the sha after the `r123:` part." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:136 +#: rhodecode/templates/admin/settings/settings_visual.mako:125 msgid "Show commit ID numeric reference" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:136 +#: rhodecode/templates/admin/settings/settings_visual.mako:125 msgid "Commit show revision number" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:138 +#: rhodecode/templates/admin/settings/settings_visual.mako:127 msgid "" "Show revision number in commit sha displayed in web interface.\n" " By default it's shown as r123:9043a6a4c226 this value defines the\n" " if the `r123:` part is shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:147 +#: rhodecode/templates/admin/settings/settings_visual.mako:136 #: rhodecode/templates/debug_style/index.html:63 msgid "Icons" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:152 +#: rhodecode/templates/admin/settings/settings_visual.mako:141 msgid "Show public repo icon on repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:158 +#: rhodecode/templates/admin/settings/settings_visual.mako:147 msgid "Show private repo icon on repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:160 +#: rhodecode/templates/admin/settings/settings_visual.mako:149 msgid "Show public/private icons next to repositories names." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:167 +#: rhodecode/templates/admin/settings/settings_visual.mako:156 msgid "Markup Renderer" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:174 +#: rhodecode/templates/admin/settings/settings_visual.mako:163 msgid "Default renderer used to render comments, pull request descriptions and other description elements. After change old entries will still work correctly." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:181 +#: rhodecode/templates/admin/settings/settings_visual.mako:170 msgid "Clone URL" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:190 +#: rhodecode/templates/admin/settings/settings_visual.mako:179 msgid "" "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" " {scheme} 'http' or 'https' sent from running RhodeCode server,\n" @@ -6914,11 +7187,11 @@ msgid "" " {repoid} ID of repository, can be used to contruct clone-by-id" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:203 +#: rhodecode/templates/admin/settings/settings_visual.mako:192 msgid "Custom Support Link" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:211 +#: rhodecode/templates/admin/settings/settings_visual.mako:200 #, python-format msgid "" "Custom url for the support link located at the bottom.\n" @@ -6958,17 +7231,17 @@ msgid "%s user group settings" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:36 -#: rhodecode/templates/admin/users/user_edit.mako:41 +#: rhodecode/templates/admin/users/user_edit.mako:42 msgid "Global permissions" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:42 +#: rhodecode/templates/admin/users/user_edit.mako:43 msgid "Permissions summary" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:8 -#: rhodecode/templates/admin/user_groups/user_groups.mako:60 +#: rhodecode/templates/admin/user_groups/user_groups.mako:65 #: rhodecode/templates/debug_style/form-elements.html:509 msgid "Members" msgstr "" @@ -6985,50 +7258,55 @@ msgstr "" msgid "Assigned to repo groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:19 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:14 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:16 +msgid "Assigned to review rules" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:20 #: 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:29 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:30 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 "This group is set to be automatically synchronised." +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:41 +#: 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:50 +#: 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:52 +#: 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:58 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:59 msgid "Users will be added or removed from this group when they authenticate with RhodeCode system, based on LDAP group membership. This requires `LDAP+User group` authentication plugin to be configured and enabled. (EE only feature)" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:71 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:72 msgid "Delete User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:77 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:78 #, 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:79 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:80 msgid "Delete This User Group" msgstr "" @@ -7062,7 +7340,7 @@ msgstr "" msgid "user groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_groups.mako:62 +#: rhodecode/templates/admin/user_groups/user_groups.mako:67 msgid "Sync" msgstr "" @@ -7102,7 +7380,7 @@ msgid "Add personal repository group" msgstr "" #: rhodecode/templates/admin/users/user_add.mako:121 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:67 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:70 #, python-format msgid "New group will be created at: `/%(path)s`" msgstr "" @@ -7133,16 +7411,12 @@ msgstr "" msgid "Auth tokens" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:44 +#: rhodecode/templates/admin/users/user_edit.mako:45 msgid "Ip Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:45 -msgid "User Groups Management" -msgstr "" - #: rhodecode/templates/admin/users/user_edit.mako:46 -msgid "User audit" +msgid "User Groups Management" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 @@ -7156,104 +7430,88 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 #: rhodecode/templates/admin/users/users.mako:72 +#: rhodecode/templates/forks/forks.mako:77 msgid "Last activity" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:15 +msgid "Reviewer of pull requests" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_advanced.mako:18 msgid "Member of User groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:16 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:19 msgid "Force password change" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:22 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:25 #, python-format msgid "User: %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:31 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:34 msgid "Force Password Reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:39 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:42 msgid "Disable forced password reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:41 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:44 msgid "Enable forced password reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:47 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:50 msgid "When this is enabled user will have to change they password when they next use RhodeCode system. This will also forbid vcs operations until someone makes a password change in the web interface" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:62 -msgid "Users personal repository group" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_advanced.mako:65 +msgid "Users personal repository group" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_advanced.mako:68 msgid "This user currently does not have a personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:72 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:75 msgid "Create personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:81 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:84 msgid "Delete User" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:89 -#, python-format -msgid "This user owns %s repository." -msgid_plural "This user owns %s repositories." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:93 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:96 msgid "Detach repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:98 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:114 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:130 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:101 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:117 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:133 msgid "Delete repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:105 -#, python-format -msgid "This user owns %s repository group." -msgid_plural "This user owns %s repository groups." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:109 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:112 msgid "Detach repository groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:121 -#, python-format -msgid "This user owns %s user group." -msgid_plural "This user owns %s user groups." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:125 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:128 msgid "Detach user groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:139 -#: rhodecode/templates/data_table/_dt_elements.mako:199 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:142 +#: rhodecode/templates/data_table/_dt_elements.mako:259 #, python-format msgid "Confirm to delete this user: %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:141 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:144 msgid "Delete this user" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:151 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:154 #, python-format msgid "When selecting the detach option, the depending objects owned by this user will be assigned to the `%s` super admin in the system. The delete option will delete the user's repositories!" msgstr "" @@ -7262,10 +7520,6 @@ msgstr "" 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 "" @@ -7284,10 +7538,6 @@ msgstr "" msgid "Custom IP Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ips.mako:7 -msgid "Current IP address" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_ips.mako:10 msgid "IP Address" msgstr "" @@ -7342,6 +7592,27 @@ msgstr "" msgid "Help translate %(rc_link)s into your language." msgstr "" +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:3 +msgid "New SSH Key generated" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:7 +msgid "Below is a 2048 bit generated SSH RSA key. You can use it to access RhodeCode via the SSH wrapper." +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:9 +msgid "Private key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:23 +msgid "Public key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:34 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:36 +msgid "Add this generated key" +msgstr "" + #: rhodecode/templates/admin/users/users.mako:5 msgid "Users administration" msgstr "" @@ -7383,141 +7654,141 @@ msgid "Repository not locked. Pull repos msgstr "" #: 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 +#: rhodecode/templates/data_table/_dt_elements.mako:46 +#: rhodecode/templates/data_table/_dt_elements.mako:47 +#: rhodecode/templates/data_table/_dt_elements.mako:197 msgid "Summary" msgstr "" #: rhodecode/templates/base/base.mako:229 -#: rhodecode/templates/data_table/_dt_elements.mako:17 -#: rhodecode/templates/data_table/_dt_elements.mako:18 +#: rhodecode/templates/data_table/_dt_elements.mako:51 +#: rhodecode/templates/data_table/_dt_elements.mako:52 msgid "Changelog" msgstr "" #: rhodecode/templates/base/base.mako:230 -#: rhodecode/templates/data_table/_dt_elements.mako:22 -#: rhodecode/templates/data_table/_dt_elements.mako:23 +#: rhodecode/templates/data_table/_dt_elements.mako:56 +#: rhodecode/templates/data_table/_dt_elements.mako:57 #: rhodecode/templates/files/files.mako:15 msgid "Files" msgstr "" -#: rhodecode/templates/base/base.mako:232 +#: rhodecode/templates/base/base.mako:231 #: 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:237 +#: rhodecode/templates/base/base.mako:235 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: rhodecode/templates/base/base.mako:247 +#: rhodecode/templates/base/base.mako:245 msgid "Options" msgstr "" -#: rhodecode/templates/base/base.mako:255 -#: rhodecode/templates/forks/forks_data.mako:30 -msgid "Compare fork" -msgstr "" - -#: rhodecode/templates/base/base.mako:258 -#: rhodecode/templates/base/base.mako:406 +#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/changelog/changelog.mako:40 +#, python-format +msgid "Compare fork with %s" +msgstr "" + +#: rhodecode/templates/base/base.mako:267 +#: rhodecode/templates/base/base.mako:411 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "" -#: rhodecode/templates/base/base.mako:262 +#: rhodecode/templates/base/base.mako:271 msgid "Unlock" msgstr "" -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:273 msgid "Lock" msgstr "" -#: rhodecode/templates/base/base.mako:269 -#: rhodecode/templates/data_table/_dt_elements.mako:27 -#: rhodecode/templates/data_table/_dt_elements.mako:28 -#: rhodecode/templates/forks/forks_data.mako:8 +#: rhodecode/templates/base/base.mako:278 +#: rhodecode/templates/data_table/_dt_elements.mako:61 +#: rhodecode/templates/data_table/_dt_elements.mako:62 msgid "Fork" msgstr "" -#: rhodecode/templates/base/base.mako:270 +#: rhodecode/templates/base/base.mako:279 msgid "Create Pull Request" msgstr "" -#: rhodecode/templates/base/base.mako:292 +#: rhodecode/templates/base/base.mako:301 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:300 +#: rhodecode/templates/base/base.mako:309 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:317 +#: rhodecode/templates/base/base.mako:326 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:327 +#: rhodecode/templates/base/base.mako:336 msgid "Don't have an account?" msgstr "" -#: rhodecode/templates/base/base.mako:329 +#: rhodecode/templates/base/base.mako:338 msgid "Using external auth? Sign In here." msgstr "" -#: rhodecode/templates/base/base.mako:348 +#: rhodecode/templates/base/base.mako:357 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:352 +#: rhodecode/templates/base/base.mako:361 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:388 +#: rhodecode/templates/base/base.mako:393 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:389 -#: rhodecode/templates/journal/journal.mako:4 -#: rhodecode/templates/journal/journal.mako:14 -msgid "Journal" -msgstr "" - #: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/journal/journal.mako:4 +#: rhodecode/templates/journal/journal.mako:15 +msgid "Journal" +msgstr "" + +#: rhodecode/templates/base/base.mako:399 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:395 -msgid "Public journal" -msgstr "" - #: rhodecode/templates/base/base.mako:400 -msgid "Show Gists" -msgstr "" - -#: rhodecode/templates/base/base.mako:401 -msgid "Gists" +msgid "Public journal" msgstr "" #: rhodecode/templates/base/base.mako:405 +msgid "Show Gists" +msgstr "" + +#: rhodecode/templates/base/base.mako:406 +msgid "Gists" +msgstr "" + +#: rhodecode/templates/base/base.mako:410 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:411 +#: rhodecode/templates/base/base.mako:416 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:418 +#: rhodecode/templates/base/base.mako:423 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:428 -#: rhodecode/templates/base/base.mako:429 +#: rhodecode/templates/base/base.mako:433 +#: rhodecode/templates/base/base.mako:434 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7539,15 +7810,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:486 +#: rhodecode/templates/base/base.mako:491 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:539 +#: rhodecode/templates/base/base.mako:544 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:547 +#: rhodecode/templates/base/base.mako:552 msgid "Site-wide shortcuts" msgstr "" @@ -7642,9 +7913,9 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:274 #: rhodecode/templates/changeset/changeset_file_comment.mako:324 #: rhodecode/templates/files/files_add.mako:84 -#: rhodecode/templates/files/files_add.mako:228 -#: rhodecode/templates/files/files_edit.mako:82 -#: rhodecode/templates/files/files_edit.mako:185 +#: rhodecode/templates/files/files_add.mako:230 +#: rhodecode/templates/files/files_edit.mako:85 +#: rhodecode/templates/files/files_edit.mako:189 msgid "Preview" msgstr "" @@ -7652,77 +7923,94 @@ msgstr "" msgid "Test Pattern Preview" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:18 +#: rhodecode/templates/base/perms_summary.mako:14 +msgid "in JSON format" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:23 msgid "show" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:19 +#: rhodecode/templates/base/perms_summary.mako:24 msgid "none" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:20 +#: rhodecode/templates/base/perms_summary.mako:25 msgid "read" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:21 +#: rhodecode/templates/base/perms_summary.mako:26 msgid "write" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:22 +#: rhodecode/templates/base/perms_summary.mako:27 msgid "admin" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:29 +#: rhodecode/templates/base/perms_summary.mako:34 msgid "No permissions defined" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:37 -#: rhodecode/templates/base/perms_summary.mako:103 +#: rhodecode/templates/base/perms_summary.mako:42 +#: rhodecode/templates/base/perms_summary.mako:150 msgid "Permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:39 -#: rhodecode/templates/base/perms_summary.mako:105 +#: rhodecode/templates/base/perms_summary.mako:44 +#: rhodecode/templates/base/perms_summary.mako:152 msgid "Edit Permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:85 +#: rhodecode/templates/base/perms_summary.mako:100 +#: rhodecode/templates/base/perms_summary.mako:109 +msgid "edit global" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:117 +msgid "Repository default permission" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:120 +msgid "Repository group default permission" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:123 +msgid "User group default permission" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:126 msgid "Super admin" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:87 -msgid "Repository default permission" -msgstr "" - -#: rhodecode/templates/base/perms_summary.mako:88 -msgid "Repository group default permission" -msgstr "" - -#: rhodecode/templates/base/perms_summary.mako:89 -msgid "User group default permission" -msgstr "" - -#: rhodecode/templates/base/perms_summary.mako:91 +#: rhodecode/templates/base/perms_summary.mako:129 +msgid "Inherit permissions" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:132 msgid "Create repositories" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:92 +#: rhodecode/templates/base/perms_summary.mako:135 msgid "Fork repositories" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:93 +#: rhodecode/templates/base/perms_summary.mako:138 msgid "Create repository groups" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:94 +#: rhodecode/templates/base/perms_summary.mako:141 msgid "Create user groups" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:162 +#: rhodecode/templates/base/perms_summary.mako:190 +msgid "overridden by" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:223 msgid "No permission defined" msgstr "" -#: rhodecode/templates/base/root.mako:155 +#: rhodecode/templates/base/root.mako:165 msgid "Please enable JavaScript to use RhodeCode Enterprise" msgstr "" @@ -7830,98 +8118,102 @@ msgstr "" msgid "Enable evolve extension for this repository." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:152 -msgid "Mercurial Labs Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:152 -msgid "These features are considered experimental and may not work as expected." +#: rhodecode/templates/base/vcs_settings.mako:153 +msgid "Git Settings" msgstr "" #: rhodecode/templates/base/vcs_settings.mako:158 -msgid "Use rebase as merge strategy" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:161 -msgid "Use rebase instead of creating a merge commit when merging via web interface." -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:173 -msgid "Git Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:178 msgid "Enable lfs extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:182 +#: rhodecode/templates/base/vcs_settings.mako:162 msgid "Enable lfs extensions for all repositories." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:184 +#: rhodecode/templates/base/vcs_settings.mako:164 msgid "Enable lfs extensions for this repository." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:195 +#: rhodecode/templates/base/vcs_settings.mako:175 msgid "Filesystem location where Git lfs objects should be stored." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:206 +#: rhodecode/templates/base/vcs_settings.mako:186 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:212 +#: rhodecode/templates/base/vcs_settings.mako:192 msgid "Proxy subversion HTTP requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:216 +#: rhodecode/templates/base/vcs_settings.mako:196 msgid "Subversion HTTP Support. Enables communication with SVN over HTTP protocol." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:217 +#: rhodecode/templates/base/vcs_settings.mako:197 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:223 +#: rhodecode/templates/base/vcs_settings.mako:203 msgid "Subversion HTTP Server URL" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:229 +#: rhodecode/templates/base/vcs_settings.mako:209 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:241 +#: rhodecode/templates/base/vcs_settings.mako:221 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:246 +#: rhodecode/templates/base/vcs_settings.mako:226 msgid "Repository patterns" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:250 +#: rhodecode/templates/base/vcs_settings.mako:230 msgid "Patterns for identifying SVN branches and tags. For recursive search, use \"*\". Eg.: \"/branches/*\"" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:314 +#: rhodecode/templates/base/vcs_settings.mako:294 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:319 +#: rhodecode/templates/base/vcs_settings.mako:299 msgid "Enable server-side merge for pull requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:322 +#: rhodecode/templates/base/vcs_settings.mako:302 msgid "Note: when this feature is enabled, it only runs hooks defined in the rcextension package. Custom hooks added on the Admin -> Settings -> Hooks page will not be run when pull requests are automatically merged from the web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:326 +#: rhodecode/templates/base/vcs_settings.mako:306 msgid "Invalidate and relocate inline comments during update" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:329 +#: rhodecode/templates/base/vcs_settings.mako:309 msgid "During the update of a pull request, the position of inline comments will be updated and outdated inline comments will be hidden." msgstr "" +#: rhodecode/templates/base/vcs_settings.mako:318 +msgid "Mercurial Pull Request Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:324 +msgid "Use rebase as merge strategy" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:327 +msgid "Use rebase instead of creating a merge commit when merging via web interface." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:332 +msgid "Close branch before merging it" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:335 +msgid "Close branch before merging it into destination branch. No effect when rebase strategy is use." +msgstr "" + #: rhodecode/templates/bookmarks/bookmarks.mako:5 #, python-format msgid "%s Bookmarks" @@ -7936,8 +8228,8 @@ msgid "Compare Selected Bookmarks" msgstr "" #: rhodecode/templates/bookmarks/bookmarks_data.mako:13 -#: rhodecode/templates/changelog/changelog_elements.mako:111 -#: rhodecode/templates/changeset/changeset.mako:112 +#: rhodecode/templates/changelog/changelog_elements.mako:115 +#: rhodecode/templates/changeset/changeset.mako:115 #: rhodecode/templates/files/base.mako:10 #: rhodecode/templates/summary/summary_commits.mako:62 #, python-format @@ -7958,8 +8250,8 @@ msgid "Compare Selected Branches" msgstr "" #: rhodecode/templates/branches/branches_data.mako:12 -#: rhodecode/templates/changelog/changelog_elements.mako:103 -#: rhodecode/templates/changeset/changeset.mako:125 +#: rhodecode/templates/changelog/changelog_elements.mako:107 +#: rhodecode/templates/changeset/changeset.mako:128 #: rhodecode/templates/files/base.mako:23 #: rhodecode/templates/summary/summary_commits.mako:76 #, python-format @@ -7971,55 +8263,54 @@ msgstr "" msgid "%s Changelog" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:40 -#: rhodecode/templates/forks/forks_data.mako:28 -#, python-format -msgid "Compare fork with %s" -msgstr "" - -#: rhodecode/templates/changelog/changelog.mako:52 +#: rhodecode/templates/changelog/changelog.mako:50 #, python-format msgid "Compare fork with Parent (%s)" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:67 -#: rhodecode/templates/changelog/changelog.mako:68 +#: rhodecode/templates/changelog/changelog.mako:65 +#: rhodecode/templates/changelog/changelog.mako:66 msgid "Clear selection" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:83 +#: rhodecode/templates/changelog/changelog.mako:81 msgid "Clear filter" msgstr "" #: rhodecode/templates/changelog/changelog.mako:89 -#, python-format -msgid "showing %d out of %d commit" -msgid_plural "showing %d out of %d commits" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changelog/changelog.mako:110 +msgid "Hide obsolete/hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:91 +msgid "Show obsolete/hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:94 +msgid "Show hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:121 #: rhodecode/templates/files/files_add.mako:99 #: rhodecode/templates/files/files_delete.mako:60 -#: rhodecode/templates/files/files_edit.mako:96 +#: rhodecode/templates/files/files_edit.mako:99 msgid "Commit Message" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:112 +#: rhodecode/templates/changelog/changelog.mako:123 #: rhodecode/templates/summary/summary_commits.mako:10 msgid "Age" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:115 +#: rhodecode/templates/changelog/changelog.mako:126 #: rhodecode/templates/summary/summary_commits.mako:12 msgid "Refs" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:239 +#: rhodecode/templates/changelog/changelog.mako:250 msgid "Filter changelog" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:296 +#: rhodecode/templates/changelog/changelog.mako:311 msgid "There are no changes yet" msgstr "" @@ -8037,8 +8328,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:30 #: rhodecode/templates/summary/summary_commits.mako:25 -#, python-format -msgid "Commit status: %s" +msgid "Commit status: {}" msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:36 @@ -8051,43 +8341,48 @@ msgstr "" msgid "Commit has comments" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:53 -#: rhodecode/templates/changeset/changeset.mako:40 +#: rhodecode/templates/changelog/changelog_elements.mako:52 +#: rhodecode/templates/changeset/changeset.mako:42 +msgid "Copy the full commit id" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:59 +#: rhodecode/templates/changeset/changeset.mako:44 msgid "Commit phase" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:60 -#: rhodecode/templates/changelog/changelog_elements.mako:67 -#: rhodecode/templates/changeset/changeset.mako:46 -#: rhodecode/templates/changeset/changeset.mako:53 +#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changeset/changeset.mako:50 +#: rhodecode/templates/changeset/changeset.mako:57 msgid "Evolve State" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:60 -#: rhodecode/templates/changeset/changeset.mako:46 +#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changeset/changeset.mako:50 msgid "obsolete" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:67 -#: rhodecode/templates/changeset/changeset.mako:53 -msgid "hidden" -msgstr "" - #: rhodecode/templates/changelog/changelog_elements.mako:73 -#: rhodecode/templates/compare/compare_commits.mako:47 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:522 +#: rhodecode/templates/changeset/changeset.mako:57 +msgid "hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:77 +#: rhodecode/templates/compare/compare_commits.mako:45 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:528 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:97 -#: rhodecode/templates/changeset/changeset.mako:106 +#: rhodecode/templates/changelog/changelog_elements.mako:101 +#: rhodecode/templates/changeset/changeset.mako:109 #: rhodecode/templates/files/base.mako:4 msgid "merge" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:119 -#: rhodecode/templates/changeset/changeset.mako:119 +#: rhodecode/templates/changelog/changelog_elements.mako:123 +#: rhodecode/templates/changeset/changeset.mako:122 #: rhodecode/templates/files/base.mako:17 #: rhodecode/templates/summary/summary_commits.mako:69 #: rhodecode/templates/tags/tags_data.mako:12 @@ -8095,7 +8390,7 @@ msgstr "" msgid "Tag %s" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:133 +#: rhodecode/templates/changelog/changelog_elements.mako:137 msgid "load next" msgstr "" @@ -8108,102 +8403,84 @@ msgstr "" msgid "%s Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:62 +#: rhodecode/templates/changeset/changeset.mako:65 msgid "Parent Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:62 +#: rhodecode/templates/changeset/changeset.mako:65 msgid "Parent" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:66 +#: rhodecode/templates/changeset/changeset.mako:69 msgid "Child Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:66 +#: rhodecode/templates/changeset/changeset.mako:69 msgid "Child" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:78 +#: rhodecode/templates/changeset/changeset.mako:81 msgid "Expand" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:86 -#: rhodecode/templates/changeset/changeset.mako:92 +#: rhodecode/templates/changeset/changeset.mako:89 +#: rhodecode/templates/changeset/changeset.mako:95 #: rhodecode/templates/changeset/changeset_file_comment.mako:81 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:99 +#: rhodecode/templates/changeset/changeset.mako:102 #: rhodecode/templates/files/file_tree_detail.mako:21 #: rhodecode/templates/files/files_detail.mako:20 msgid "References" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:135 +#: rhodecode/templates/changeset/changeset.mako:138 msgid "Diff options" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:139 -#: rhodecode/templates/codeblocks/diffs.mako:444 -#: rhodecode/templates/codeblocks/diffs.mako:447 +#: rhodecode/templates/changeset/changeset.mako:142 +#: rhodecode/templates/codeblocks/diffs.mako:445 +#: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:140 -msgid "Raw Diff" -msgstr "" - #: rhodecode/templates/changeset/changeset.mako:143 +msgid "Raw Diff" +msgstr "" + +#: rhodecode/templates/changeset/changeset.mako:146 msgid "Patch diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:144 -msgid "Patch Diff" -msgstr "" - #: rhodecode/templates/changeset/changeset.mako:147 -#: rhodecode/templates/codeblocks/diffs.mako:451 -#: rhodecode/templates/codeblocks/diffs.mako:454 +msgid "Patch Diff" +msgstr "" + +#: rhodecode/templates/changeset/changeset.mako:150 +#: rhodecode/templates/codeblocks/diffs.mako:452 +#: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:148 +#: rhodecode/templates/changeset/changeset.mako:151 msgid "Download Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:165 -#: rhodecode/templates/changeset/changeset.mako:167 -#: rhodecode/tests/functional/test_commit_comments.py:275 -#, python-format -msgid "%d Commit comment" -msgid_plural "%d Commit comments" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/changeset.mako:170 -#: rhodecode/templates/changeset/changeset.mako:172 -#: rhodecode/tests/functional/test_commit_comments.py:282 -#, python-format -msgid "%d Inline Comment" -msgid_plural "%d Inline Comments" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/changeset.mako:180 +#: rhodecode/templates/changeset/changeset.mako:183 msgid "Unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:189 +#: rhodecode/templates/changeset/changeset.mako:192 msgid "There are no unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:269 +#: rhodecode/templates/changeset/changeset.mako:272 msgid "No Child Commits" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:305 +#: rhodecode/templates/changeset/changeset.mako:308 msgid "No Parent Commits" msgstr "" @@ -8273,12 +8550,12 @@ msgid "Leave a comment on this Commit." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:282 -#: rhodecode/templates/codeblocks/diffs.mako:71 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "You need to be logged in to leave comments." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:283 -#: rhodecode/templates/codeblocks/diffs.mako:71 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "Login now" msgstr "" @@ -8297,7 +8574,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:368 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:153 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:159 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "" @@ -8315,15 +8592,8 @@ msgstr "" msgid "%s Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:9 -#: rhodecode/templates/changeset/changeset_range.mako:20 -#, python-format -msgid "(%s commit)" -msgid_plural "(%s commits)" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/changeset/changeset_range.mako:16 +#: rhodecode/templates/files/file_authors_box.mako:33 msgid "Commits" msgstr "" @@ -8335,31 +8605,13 @@ msgstr "" msgid "Diff option" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:59 +#: rhodecode/templates/changeset/changeset_range.mako:65 msgid "Show combined compare" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:99 -#: rhodecode/templates/compare/compare_diff.mako:312 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:446 -#, python-format -msgid "Expand %s commit" -msgid_plural "Expand %s commits" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/changeset_range.mako:105 -#: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 -#, python-format -msgid "Collapse %s commit" -msgid_plural "Collapse %s commits" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/changeset/diff_block.mako:7 -#: rhodecode/templates/codeblocks/diffs.mako:128 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:123 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "The requested commit is too big and content was truncated." msgstr "" @@ -8367,8 +8619,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:131 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:126 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "Showing a big diff might take some time and resources, continue?" msgstr "" @@ -8376,8 +8628,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:131 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:126 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "Show full diff" msgstr "" @@ -8390,120 +8642,103 @@ msgstr "" msgid "Diff was truncated. File content available only in full diff." msgstr "" -#: rhodecode/templates/changeset/diff_block.mako:58 -#, python-format -msgid "%(num)s file changed" -msgid_plural "%(num)s files changed" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/diff_block.mako:60 -#: rhodecode/templates/codeblocks/diffs.mako:133 -#, python-format -msgid "%(num)s file changed: %(linesadd)s inserted, %(linesdel)s deleted" -msgid_plural "%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/codeblocks/diffs.mako:117 +#: rhodecode/templates/codeblocks/diffs.mako:111 msgid "Browse Files at revision {}" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:118 +#: rhodecode/templates/codeblocks/diffs.mako:112 msgid "Browse Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:130 -#, python-format -msgid "%(num)s file changed." -msgid_plural "%(num)s files changed." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/codeblocks/diffs.mako:141 +#: rhodecode/templates/codeblocks/diffs.mako:136 msgid "No files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:169 +#: rhodecode/templates/codeblocks/diffs.mako:164 msgid "File was deleted" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:171 +#: rhodecode/templates/codeblocks/diffs.mako:166 msgid "Binary file hidden" msgstr "" +#: rhodecode/templates/codeblocks/diffs.mako:184 +#, python-format +msgid "This diff has been collapsed as it changes many lines, (%i lines changed)" +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:186 +msgid "Show them" +msgstr "" + #: rhodecode/templates/codeblocks/diffs.mako:189 -#, python-format -msgid "This diff has been collapsed as it changes many lines, (%i lines changed)" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:191 -msgid "Show them" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:194 msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:289 +#: rhodecode/templates/codeblocks/diffs.mako:284 msgid "File was deleted in this version, and outdated comments were made on it" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:414 -#: rhodecode/templates/codeblocks/diffs.mako:430 +#: rhodecode/templates/codeblocks/diffs.mako:350 +#: rhodecode/templates/files/files_source.mako:19 +msgid "Copy the full path" +msgstr "" + +#: 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:416 -#: rhodecode/templates/codeblocks/diffs.mako:423 +#: rhodecode/templates/codeblocks/diffs.mako:417 +#: rhodecode/templates/codeblocks/diffs.mako:424 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:421 -#: rhodecode/templates/codeblocks/diffs.mako:437 +#: 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:432 -#: rhodecode/templates/codeblocks/diffs.mako:439 +#: rhodecode/templates/codeblocks/diffs.mako:433 +#: rhodecode/templates/codeblocks/diffs.mako:440 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:470 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:470 +#: rhodecode/templates/codeblocks/diffs.mako:471 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:642 +#: rhodecode/templates/codeblocks/diffs.mako:643 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:644 +#: rhodecode/templates/codeblocks/diffs.mako:645 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:648 -msgid "View unified" -msgstr "" - #: rhodecode/templates/codeblocks/diffs.mako:649 +msgid "View unified" +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:650 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:659 +#: rhodecode/templates/codeblocks/diffs.mako:660 msgid "Expand All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:663 +#: rhodecode/templates/codeblocks/diffs.mako:664 msgid "Collapse All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:667 +#: rhodecode/templates/codeblocks/diffs.mako:668 msgid "Wide Mode Diff" msgstr "" @@ -8520,25 +8755,11 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:483 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:489 msgid "Time" msgstr "" -#: rhodecode/templates/compare/compare_commits.mako:68 -#, python-format -msgid "%s commit hidden" -msgid_plural "%s commits hidden" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/compare/compare_commits.mako:69 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:600 -msgid "show it" -msgid_plural "show them" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/compare/compare_commits.mako:75 +#: rhodecode/templates/compare/compare_commits.mako:73 msgid "No commits in this compare" msgstr "" @@ -8548,13 +8769,6 @@ msgstr "" msgid "%s Compare" msgstr "" -#: rhodecode/templates/compare/compare_diff.mako:17 -#, python-format -msgid "%s commit" -msgid_plural "%s commits" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/compare/compare_diff.mako:44 #: rhodecode/templates/compare/compare_diff.mako:101 #: rhodecode/templates/compare/compare_diff.mako:110 @@ -8568,14 +8782,14 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:103 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:107 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.mako:76 #: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 -#: rhodecode/templates/files/files_source.mako:23 +#: rhodecode/templates/files/files_source.mako:29 #: rhodecode/templates/pullrequests/pullrequest_show.mako:71 msgid "Source" msgstr "" @@ -8599,72 +8813,69 @@ msgstr "" msgid "Compare commits, branches, bookmarks or tags." msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:49 +#: rhodecode/templates/data_table/_dt_elements.mako:83 msgid "Mercurial repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:51 +#: rhodecode/templates/data_table/_dt_elements.mako:85 msgid "Git repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:53 +#: rhodecode/templates/data_table/_dt_elements.mako:87 msgid "Subversion repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:60 +#: rhodecode/templates/data_table/_dt_elements.mako:94 msgid "Public repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:70 -msgid "Repository creating in progress..." -msgstr "" - -#: rhodecode/templates/data_table/_dt_elements.mako:88 +#: rhodecode/templates/data_table/_dt_elements.mako:104 +msgid "This repository is being created in a background task" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:105 +msgid "creating..." +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:136 msgid "No commits yet" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:95 -#: rhodecode/templates/data_table/_dt_elements.mako:97 +#: rhodecode/templates/data_table/_dt_elements.mako:143 +#: rhodecode/templates/data_table/_dt_elements.mako:145 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:103 -#: rhodecode/templates/data_table/_dt_elements.mako:105 +#: rhodecode/templates/data_table/_dt_elements.mako:151 +#: rhodecode/templates/data_table/_dt_elements.mako:153 #, python-format msgid "Subscribe to %s atom feed" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:133 +#: rhodecode/templates/data_table/_dt_elements.mako:181 msgid "Creating" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:135 -msgid "Created" -msgstr "" - -#: rhodecode/templates/data_table/_dt_elements.mako:185 -#, python-format -msgid "Confirm to delete this group: %s with %s repository" -msgid_plural "Confirm to delete this group: %s with %s repositories" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/data_table/_dt_elements.mako:211 +#: rhodecode/templates/data_table/_dt_elements.mako:225 +msgid "personal" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:271 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:228 +#: rhodecode/templates/data_table/_dt_elements.mako:288 msgid "User group" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:272 -#: rhodecode/templates/forks/fork.mako:83 +#: rhodecode/templates/data_table/_dt_elements.mako:332 +#: rhodecode/templates/forks/fork.mako:88 msgid "Private" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:306 +#: rhodecode/templates/data_table/_dt_elements.mako:366 #, python-format msgid "Pull request #%(pr_number)s" msgstr "" @@ -8953,13 +9164,6 @@ msgstr "" msgid "Link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:46 -#, python-format -msgid "Commit (%(num)s)" -msgid_plural "Commits (%(num)s)" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"." @@ -8975,13 +9179,6 @@ msgstr "" msgid "%(target_ref_type)s of %(target_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:76 -#, python-format -msgid "%(num)s Commit" -msgid_plural "%(num)s Commits" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/email_templates/test.mako:5 msgid "hello \"world\"" msgstr "" @@ -9017,13 +9214,6 @@ msgstr "" msgid "Last Author" msgstr "" -#: rhodecode/templates/files/file_authors_box.mako:8 -#, python-format -msgid "File Author (%s)" -msgid_plural "File Authors (%s)" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/files/file_authors_box.mako:11 msgid "Show All" msgstr "" @@ -9091,22 +9281,22 @@ msgid "Create New File" msgstr "" #: rhodecode/templates/files/files_add.mako:81 -#: rhodecode/templates/files/files_edit.mako:79 +#: rhodecode/templates/files/files_edit.mako:82 msgid "line wraps" msgstr "" #: rhodecode/templates/files/files_add.mako:82 -#: rhodecode/templates/files/files_edit.mako:80 +#: rhodecode/templates/files/files_edit.mako:83 msgid "on" msgstr "" #: rhodecode/templates/files/files_add.mako:82 -#: rhodecode/templates/files/files_edit.mako:80 +#: rhodecode/templates/files/files_edit.mako:83 msgid "off" msgstr "" #: rhodecode/templates/files/files_add.mako:109 -#: rhodecode/templates/files/files_edit.mako:106 +#: rhodecode/templates/files/files_edit.mako:109 msgid "Commit changes" msgstr "" @@ -9161,14 +9351,14 @@ msgid "Delete file" msgstr "" #: rhodecode/templates/files/files_delete.mako:45 -#: rhodecode/templates/files/files_source.mako:65 +#: rhodecode/templates/files/files_source.mako:71 #, python-format msgid "Binary file (%s)" msgstr "" #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:87 -msgid "File is too big to display" +#: rhodecode/templates/files/files_source.mako:100 +msgid "File size {} is bigger then allowed limit {}. " msgstr "" #: rhodecode/templates/files/files_delete.mako:70 @@ -9218,15 +9408,15 @@ msgstr "" msgid "annotation" msgstr "" -#: rhodecode/templates/files/files_edit.mako:65 +#: rhodecode/templates/files/files_edit.mako:67 msgid "raw" msgstr "" -#: rhodecode/templates/files/files_edit.mako:67 +#: rhodecode/templates/files/files_edit.mako:70 msgid "download" msgstr "" -#: rhodecode/templates/files/files_edit.mako:74 +#: rhodecode/templates/files/files_edit.mako:77 msgid "Editing file" msgstr "" @@ -9234,62 +9424,55 @@ msgstr "" msgid "Location" msgstr "" -#: rhodecode/templates/files/files_source.mako:8 +#: rhodecode/templates/files/files_source.mako:13 msgid "This file is a pointer to large binary file" msgstr "" -#: rhodecode/templates/files/files_source.mako:8 +#: rhodecode/templates/files/files_source.mako:13 msgid "LargeFile" msgstr "" -#: rhodecode/templates/files/files_source.mako:10 -msgid "line" -msgid_plural "lines" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/files/files_source.mako:17 +#: rhodecode/templates/files/files_source.mako:23 msgid "History" msgstr "" -#: rhodecode/templates/files/files_source.mako:20 -#: rhodecode/templates/search/search_content.mako:68 +#: rhodecode/templates/files/files_source.mako:26 +#: rhodecode/templates/search/search_content.mako:69 msgid "Show Full History" msgstr "" -#: rhodecode/templates/files/files_source.mako:25 -#: rhodecode/templates/search/search_content.mako:70 -msgid "Annotation" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:27 -#: rhodecode/templates/search/search_content.mako:71 -msgid "Raw" -msgstr "" - #: rhodecode/templates/files/files_source.mako:31 +#: rhodecode/templates/search/search_content.mako:71 +msgid "Annotation" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:33 +#: rhodecode/templates/search/search_content.mako:72 +msgid "Raw" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:37 msgid "Download largefile" msgstr "" -#: rhodecode/templates/files/files_source.mako:35 +#: rhodecode/templates/files/files_source.mako:41 #: rhodecode/templates/search/search_content.mako:73 msgid "Download" msgstr "" -#: rhodecode/templates/files/files_source.mako:43 -#, python-format -msgid "Edit on Branch:%s" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:48 +#: rhodecode/templates/files/files_source.mako:49 +msgid "Edit on Branch:{}" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:54 msgid "Editing binary files not allowed" msgstr "" -#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:57 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:52 +#: rhodecode/templates/files/files_source.mako:58 msgid "Deleting files allowed only when on branch head commit" msgstr "" @@ -9303,22 +9486,23 @@ msgid "New Fork" msgstr "" #: rhodecode/templates/forks/fork.mako:37 +#: rhodecode/templates/forks/forks.mako:70 msgid "Fork name" msgstr "" -#: rhodecode/templates/forks/fork.mako:77 +#: rhodecode/templates/forks/fork.mako:82 msgid "Default commit for files page, downloads, whoosh and readme" msgstr "" -#: rhodecode/templates/forks/fork.mako:93 +#: rhodecode/templates/forks/fork.mako:98 msgid "Copy permissions" msgstr "" -#: rhodecode/templates/forks/fork.mako:97 -msgid "Copy permissions from forked repository" -msgstr "" - #: rhodecode/templates/forks/fork.mako:102 +msgid "Copy permissions from forked repository" +msgstr "" + +#: rhodecode/templates/forks/fork.mako:107 msgid "Fork this Repository" msgstr "" @@ -9331,34 +9515,23 @@ msgstr "" msgid "Forks" msgstr "" -#: rhodecode/templates/forks/forks.mako:32 +#: rhodecode/templates/forks/forks.mako:30 msgid "Create new fork" msgstr "" -#: rhodecode/templates/forks/forks_data.mako:10 +#: rhodecode/templates/forks/forks.mako:74 msgid "Forked" msgstr "" -#: rhodecode/templates/forks/forks_data.mako:46 -msgid "There are no forks yet" -msgstr "" - -#: rhodecode/templates/journal/journal.mako:13 -msgid "Filter" -msgstr "" - #: rhodecode/templates/journal/journal.mako:14 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/journal/journal.mako:23 -msgid "ATOM journal feed" +msgid "Filter" msgstr "" #: rhodecode/templates/journal/journal.mako:24 +msgid "ATOM journal feed" +msgstr "" + +#: rhodecode/templates/journal/journal.mako:25 msgid "RSS journal feed" msgstr "" @@ -9367,15 +9540,15 @@ msgid "No entries yet" msgstr "" #: rhodecode/templates/journal/public_journal.mako:4 -#: rhodecode/templates/journal/public_journal.mako:24 +#: rhodecode/templates/journal/public_journal.mako:12 msgid "Public Journal" msgstr "" -#: rhodecode/templates/journal/public_journal.mako:16 +#: rhodecode/templates/journal/public_journal.mako:21 msgid "ATOM public journal feed" msgstr "" -#: rhodecode/templates/journal/public_journal.mako:17 +#: rhodecode/templates/journal/public_journal.mako:22 msgid "RSS public journal feed" msgstr "" @@ -9405,22 +9578,22 @@ msgid "Submit Pull Request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:115 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:315 msgid "Author of this pull request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:129 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:323 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:329 msgid "Reviewer rules" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:139 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:337 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:343 msgid "Pull request reviewers" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:150 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 msgid "Add reviewer or reviewer group" msgstr "" @@ -9433,13 +9606,6 @@ msgstr "" msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:356 -#: rhodecode/templates/pullrequests/pullrequest.mako:358 -msgid "This pull request will consist of __COMMITS__ commit." -msgid_plural "This pull request will consist of __COMMITS__ commits." -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/pullrequests/pullrequest.mako:361 msgid "Show detailed compare." msgstr "" @@ -9464,26 +9630,26 @@ msgstr "" 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 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:52 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:57 msgid "refresh checks" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:38 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:53 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 msgid "Merge Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 msgid "You are not allowed to merge this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:45 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:60 msgid "Login to Merge this Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:69 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:73 msgid "Close with status {}" msgstr "" @@ -9504,167 +9670,167 @@ msgstr "" msgid "Common ancestor" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:125 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:100 +msgid "Copy the pull url" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:129 msgid "Merge" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:138 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:140 +#: rhodecode/templates/summary/components.mako:53 +#: rhodecode/templates/summary/components.mako:69 +msgid "Copy the clone url" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:144 msgid "Shadow repository data not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:146 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 msgid "Review" msgstr "" -#: 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:175 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 msgid "Versions" msgstr "" -#: 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:187 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:193 msgid "Hide all versions of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:212 -msgid "Your review status at this version" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:218 +msgid "Your review status at this version" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:224 msgid "Comment from pull request version {0}, general:{1} inline:{2}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:235 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:239 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:241 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:245 msgid "select versions to show changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:236 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:242 msgid "show changes between versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:237 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:243 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:252 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:256 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 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:267 #: rhodecode/templates/pullrequests/pullrequest_show.mako:269 #, python-format -msgid "%d Inline" +msgid "%d General " msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:273 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#, python-format +msgid "%d Inline" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:279 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:283 #, python-format msgid "%d Outdated" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:274 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:280 msgid "show outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:281 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:286 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:292 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:300 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:306 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:403 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:372 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:378 msgid "Mandatory reviewer" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:414 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:415 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:421 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:423 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:424 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 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:425 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:431 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:436 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:442 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:459 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:465 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:472 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 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:476 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:482 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:494 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:500 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:496 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:599 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:605 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:602 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:606 +msgid "show it" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:608 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:603 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:609 msgid "show them" msgstr "" @@ -9767,7 +9933,7 @@ msgstr "" msgid "Age (old first)" msgstr "" -#: rhodecode/templates/search/search_content.mako:33 +#: rhodecode/templates/search/search_content.mako:34 msgid "more matches in this file" msgstr "" @@ -9775,84 +9941,74 @@ msgstr "" msgid "File" msgstr "" -#: rhodecode/templates/summary/base.mako:5 -#, python-format -msgid "%s Summary" -msgstr "" - -#: rhodecode/templates/summary/base.mako:13 -#, python-format -msgid "%s ATOM feed" -msgstr "" - -#: rhodecode/templates/summary/base.mako:14 -#, python-format -msgid "%s RSS feed" -msgstr "" - #: rhodecode/templates/summary/components.mako:49 msgid "Read-only url" msgstr "" -#: rhodecode/templates/summary/components.mako:54 -#: rhodecode/templates/summary/components.mako:65 -msgid "Show by Name" -msgstr "" - -#: rhodecode/templates/summary/components.mako:55 -#: rhodecode/templates/summary/components.mako:66 -msgid "Show by ID" -msgstr "" - -#: rhodecode/templates/summary/components.mako:56 -msgid "SVN Protocol is disabled. To enable it, see the" -msgstr "" - #: rhodecode/templates/summary/components.mako:56 +#: rhodecode/templates/summary/components.mako:72 +msgid "Copy the clone by id url" +msgstr "" + +#: rhodecode/templates/summary/components.mako:58 +#: rhodecode/templates/summary/components.mako:74 +msgid "Show by Name" +msgstr "" + +#: rhodecode/templates/summary/components.mako:59 +#: rhodecode/templates/summary/components.mako:75 +msgid "Show by ID" +msgstr "" + +#: rhodecode/templates/summary/components.mako:61 +msgid "SVN Protocol is disabled. To enable it, see the" +msgstr "" + +#: rhodecode/templates/summary/components.mako:61 msgid "documentation here" msgstr "" -#: rhodecode/templates/summary/components.mako:60 +#: rhodecode/templates/summary/components.mako:65 msgid "Clone url" msgstr "" -#: rhodecode/templates/summary/components.mako:86 +#: rhodecode/templates/summary/components.mako:94 msgid "Information" msgstr "" -#: rhodecode/templates/summary/components.mako:102 -msgid "Number of Repository Forks" -msgstr "" - #: rhodecode/templates/summary/components.mako:110 +msgid "Number of Repository Forks" +msgstr "" + +#: rhodecode/templates/summary/components.mako:118 msgid "Calculating Repository Size..." msgstr "" -#: rhodecode/templates/summary/components.mako:141 +#: rhodecode/templates/summary/components.mako:149 msgid "Calculating Code Statistics..." msgstr "" -#: rhodecode/templates/summary/components.mako:145 +#: rhodecode/templates/summary/components.mako:153 msgid "Statistics are disabled for this repository" msgstr "" -#: rhodecode/templates/summary/components.mako:148 +#: rhodecode/templates/summary/components.mako:156 msgid "enable statistics" msgstr "" -#: rhodecode/templates/summary/components.mako:159 +#: rhodecode/templates/summary/components.mako:167 msgid "Downloads" msgstr "" -#: rhodecode/templates/summary/components.mako:165 +#: rhodecode/templates/summary/components.mako:173 msgid "There are no downloads yet" msgstr "" -#: rhodecode/templates/summary/components.mako:169 +#: rhodecode/templates/summary/components.mako:177 msgid "Downloads are disabled for this repository" msgstr "" -#: rhodecode/templates/summary/components.mako:172 +#: rhodecode/templates/summary/components.mako:180 msgid "enable downloads" msgstr "" @@ -9870,6 +10026,21 @@ msgstr "" msgid "Readme file from commit %s:%s" msgstr "" +#: rhodecode/templates/summary/summary_base.mako:5 +#, python-format +msgid "%s Summary" +msgstr "" + +#: rhodecode/templates/summary/summary_base.mako:13 +#, python-format +msgid "%s ATOM feed" +msgstr "" + +#: rhodecode/templates/summary/summary_base.mako:14 +#, python-format +msgid "%s RSS feed" +msgstr "" + #: rhodecode/templates/summary/summary_commits.mako:100 msgid "Add or upload files directly via RhodeCode:" msgstr ""