diff --git a/.release.cfg b/.release.cfg --- a/.release.cfg +++ b/.release.cfg @@ -5,6 +5,7 @@ done = false done = true [task:rc_tools_pinned] +done = true [task:fixes_on_stable] @@ -13,6 +14,7 @@ done = true [task:changelog_updated] [task:generate_api_docs] +done = true [task:updated_translation] diff --git a/rhodecode/i18n/rhodecode.pot b/rhodecode/i18n/rhodecode.pot --- a/rhodecode/i18n/rhodecode.pot +++ b/rhodecode/i18n/rhodecode.pot @@ -1,14 +1,14 @@ # Translations template for rhodecode-enterprise-ce. -# Copyright (C) 2019 RhodeCode GmbH +# Copyright (C) 2020 RhodeCode GmbH # This file is distributed under the same license as the rhodecode-enterprise-ce project. -# FIRST AUTHOR , 2019. +# FIRST AUTHOR , 2020. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: rhodecode-enterprise-ce 4.17.0\n" +"Project-Id-Version: rhodecode-enterprise-ce 4.18.0\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2019-07-03 14:48+0000\n" +"POT-Creation-Date: 2020-01-08 13:56+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -33,60 +33,60 @@ msgstr "" msgid "Removed Exception {}" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:120 +#: rhodecode/apps/admin/views/permissions.py:121 msgid "Application permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:141 -#: rhodecode/apps/admin/views/permissions.py:217 -#: rhodecode/apps/admin/views/permissions.py:319 +#: rhodecode/apps/admin/views/permissions.py:142 +#: rhodecode/apps/admin/views/permissions.py:218 +#: rhodecode/apps/admin/views/permissions.py:320 msgid "Error occurred during update of permissions" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:197 +#: rhodecode/apps/admin/views/permissions.py:198 msgid "Object permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:299 +#: rhodecode/apps/admin/views/permissions.py:300 msgid "Global permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:484 -#: rhodecode/templates/admin/gists/show.mako:63 +#: rhodecode/apps/admin/views/permissions.py:485 +#: rhodecode/templates/admin/gists/gist_show.mako:50 #: rhodecode/templates/admin/integrations/list.mako:172 -#: 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:167 -#: rhodecode/templates/data_table/_dt_elements.mako:241 -#: rhodecode/templates/data_table/_dt_elements.mako:254 -#: rhodecode/templates/data_table/_dt_elements.mako:255 -#: rhodecode/templates/data_table/_dt_elements.mako:267 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:7 +#: rhodecode/templates/base/issue_tracker_settings.mako:137 +#: rhodecode/templates/data_table/_dt_elements.mako:173 +#: rhodecode/templates/data_table/_dt_elements.mako:249 +#: rhodecode/templates/data_table/_dt_elements.mako:262 +#: rhodecode/templates/data_table/_dt_elements.mako:263 +#: rhodecode/templates/data_table/_dt_elements.mako:276 #: rhodecode/templates/debug_style/buttons.html:128 #: rhodecode/templates/files/files_add.mako:57 #: rhodecode/templates/files/files_edit.mako:58 #: rhodecode/templates/files/files_source.mako:29 #: rhodecode/templates/files/files_source.mako:42 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:60 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:343 -#: rhodecode/templates/user_group/profile.mako:7 -#: rhodecode/templates/users/user_profile.mako:7 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:74 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:302 +#: rhodecode/templates/user_group/profile.mako:8 +#: rhodecode/templates/users/user_profile.mako:8 msgid "Edit" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:512 +#: rhodecode/apps/admin/views/permissions.py:513 msgid "Updated SSH keys file: {}" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:515 +#: rhodecode/apps/admin/views/permissions.py:516 msgid "SSH key support is disabled in .ini file" msgstr "" -#: rhodecode/apps/admin/views/repo_groups.py:329 +#: rhodecode/apps/admin/views/repo_groups.py:328 #, python-format msgid "Created repository group %s" msgstr "" -#: rhodecode/apps/admin/views/repo_groups.py:347 +#: rhodecode/apps/admin/views/repo_groups.py:346 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" @@ -102,7 +102,7 @@ msgstr "" #: rhodecode/apps/admin/views/settings.py:162 #: rhodecode/apps/admin/views/settings.py:317 #: rhodecode/apps/admin/views/settings.py:392 -#: rhodecode/apps/admin/views/settings.py:724 +#: rhodecode/apps/admin/views/settings.py:726 #: rhodecode/apps/repository/views/repo_settings_vcs.py:124 msgid "Some form inputs contain invalid data." msgstr "" @@ -135,45 +135,45 @@ msgid "Error occurred during updating vi msgstr "" #: rhodecode/apps/admin/views/settings.py:496 -#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:125 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:127 msgid "Invalid issue tracker pattern: {}" msgstr "" #: rhodecode/apps/admin/views/settings.py:513 -#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:134 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:136 msgid "Updated issue tracker entries" msgstr "" -#: rhodecode/apps/admin/views/settings.py:531 -#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:89 -msgid "Removed issue tracker entry" -msgstr "" - -#: rhodecode/apps/admin/views/settings.py:568 +#: rhodecode/apps/admin/views/settings.py:533 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:91 +msgid "Removed issue tracker entry." +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:571 msgid "Please enter email address" msgstr "" -#: rhodecode/apps/admin/views/settings.py:586 +#: rhodecode/apps/admin/views/settings.py:588 msgid "Send email task created" msgstr "" -#: rhodecode/apps/admin/views/settings.py:636 +#: rhodecode/apps/admin/views/settings.py:638 msgid "Added new hook" msgstr "" -#: rhodecode/apps/admin/views/settings.py:651 +#: rhodecode/apps/admin/views/settings.py:653 msgid "Updated hooks" msgstr "" -#: rhodecode/apps/admin/views/settings.py:655 +#: rhodecode/apps/admin/views/settings.py:657 msgid "Error occurred during hook creation" msgstr "" -#: rhodecode/apps/admin/views/settings.py:748 +#: rhodecode/apps/admin/views/settings.py:750 msgid "Error occurred during updating labs settings" msgstr "" -#: rhodecode/apps/admin/views/settings.py:753 +#: rhodecode/apps/admin/views/settings.py:755 msgid "Updated Labs settings" msgstr "" @@ -330,6 +330,7 @@ msgid "VCS Backends" msgstr "" #: rhodecode/apps/admin/views/system_info.py:151 +#: rhodecode/templates/admin/settings/settings_system.mako:32 msgid "VCS Server" msgstr "" @@ -345,200 +346,210 @@ msgstr "" msgid "SVN" msgstr "" -#: rhodecode/apps/admin/views/user_groups.py:243 +#: rhodecode/apps/admin/views/user_groups.py:238 #, python-format msgid "Created user group %(user_group_link)s" msgstr "" -#: rhodecode/apps/admin/views/user_groups.py:265 +#: rhodecode/apps/admin/views/user_groups.py:260 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: rhodecode/apps/admin/views/users.py:219 +#: rhodecode/apps/admin/views/users.py:221 #, python-format msgid "Created user %(user_link)s" msgstr "" -#: rhodecode/apps/admin/views/users.py:240 +#: rhodecode/apps/admin/views/users.py:242 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: rhodecode/apps/admin/views/users.py:314 +#: rhodecode/apps/admin/views/users.py:344 msgid "User updated successfully" msgstr "" -#: rhodecode/apps/admin/views/users.py:332 +#: rhodecode/apps/admin/views/users.py:362 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: rhodecode/apps/admin/views/users.py:364 +#: rhodecode/apps/admin/views/users.py:391 #, python-format msgid "Detached %s repositories" msgstr "" -#: rhodecode/apps/admin/views/users.py:369 +#: rhodecode/apps/admin/views/users.py:394 #, python-format msgid "Deleted %s repositories" msgstr "" -#: rhodecode/apps/admin/views/users.py:377 +#: rhodecode/apps/admin/views/users.py:400 #, python-format msgid "Detached %s repository groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:382 +#: rhodecode/apps/admin/views/users.py:403 #, python-format msgid "Deleted %s repository groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:390 +#: rhodecode/apps/admin/views/users.py:409 #, python-format msgid "Detached %s user groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:395 -#, python-format -msgid "Deleted %s user groups" -msgstr "" - #: rhodecode/apps/admin/views/users.py:412 -msgid "Successfully deleted user" +#, python-format +msgid "Deleted %s user groups" msgstr "" #: rhodecode/apps/admin/views/users.py:418 +#, python-format +msgid "Detached %s artifacts" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:421 +#, python-format +msgid "Deleted %s artifacts" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:454 +msgid "Successfully deleted user `{}`" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:460 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/apps/admin/views/users.py:483 +#: rhodecode/apps/admin/views/users.py:525 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:489 +#: rhodecode/apps/admin/views/users.py:531 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:578 +#: rhodecode/apps/admin/views/users.py:620 msgid "User global permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/users.py:596 +#: rhodecode/apps/admin/views/users.py:638 #: rhodecode/apps/user_group/views/__init__.py:479 msgid "An error occurred during permissions saving" msgstr "" -#: rhodecode/apps/admin/views/users.py:619 +#: rhodecode/apps/admin/views/users.py:661 msgid "Force password change enabled for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:627 -#: rhodecode/apps/admin/views/users.py:657 +#: rhodecode/apps/admin/views/users.py:669 +#: rhodecode/apps/admin/views/users.py:699 msgid "An error occurred during password reset for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:648 +#: rhodecode/apps/admin/views/users.py:690 msgid "Force password change disabled for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:695 +#: rhodecode/apps/admin/views/users.py:737 #, python-format msgid "Linked repository group `%s` as personal" msgstr "" -#: rhodecode/apps/admin/views/users.py:701 +#: rhodecode/apps/admin/views/users.py:743 #, python-format msgid "Created repository group `%s`" msgstr "" -#: rhodecode/apps/admin/views/users.py:705 +#: rhodecode/apps/admin/views/users.py:747 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/apps/admin/views/users.py:710 +#: rhodecode/apps/admin/views/users.py:752 msgid "An error occurred during repository group creation for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:733 -#: rhodecode/apps/my_account/views/my_account.py:161 +#: rhodecode/apps/admin/views/users.py:775 +#: rhodecode/apps/my_account/views/my_account.py:160 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16 msgid "Role" msgstr "" -#: rhodecode/apps/admin/views/users.py:772 -#: rhodecode/apps/my_account/views/my_account.py:196 +#: rhodecode/apps/admin/views/users.py:814 +#: rhodecode/apps/my_account/views/my_account.py:195 msgid "Auth token successfully created" msgstr "" -#: rhodecode/apps/admin/views/users.py:801 -#: rhodecode/apps/my_account/views/my_account.py:220 +#: rhodecode/apps/admin/views/users.py:843 +#: rhodecode/apps/my_account/views/my_account.py:219 msgid "Auth token successfully deleted" msgstr "" -#: rhodecode/apps/admin/views/users.py:874 +#: rhodecode/apps/admin/views/users.py:916 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:114 msgid "Ssh Key successfully created" msgstr "" -#: rhodecode/apps/admin/views/users.py:880 -#: rhodecode/apps/admin/views/users.py:884 +#: rhodecode/apps/admin/views/users.py:922 +#: rhodecode/apps/admin/views/users.py:926 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:120 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:124 msgid "An error occurred during ssh key saving: {}" msgstr "" -#: rhodecode/apps/admin/views/users.py:918 +#: rhodecode/apps/admin/views/users.py:960 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:154 msgid "Ssh key successfully deleted" msgstr "" -#: rhodecode/apps/admin/views/users.py:964 +#: rhodecode/apps/admin/views/users.py:1006 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:970 +#: rhodecode/apps/admin/views/users.py:1012 msgid "Email `{}` is already registered for another user." msgstr "" -#: rhodecode/apps/admin/views/users.py:974 +#: rhodecode/apps/admin/views/users.py:1016 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/apps/admin/views/users.py:1001 +#: rhodecode/apps/admin/views/users.py:1043 msgid "Removed email address from user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:1047 +#: rhodecode/apps/admin/views/users.py:1089 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/apps/admin/views/users.py:1069 +#: rhodecode/apps/admin/views/users.py:1111 msgid "An error occurred during ip saving" msgstr "" -#: rhodecode/apps/admin/views/users.py:1073 +#: rhodecode/apps/admin/views/users.py:1115 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:1103 +#: rhodecode/apps/admin/views/users.py:1145 msgid "Removed ip address from user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:1168 +#: rhodecode/apps/admin/views/users.py:1210 msgid "Groups successfully changed" msgstr "" -#: rhodecode/apps/admin/views/users.py:1262 +#: rhodecode/apps/admin/views/users.py:1330 msgid "Deleted {} cache keys" msgstr "" @@ -562,9 +573,10 @@ msgstr "" msgid "1 month" msgstr "" -#: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:44668 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 -#: rhodecode/public/js/src/rhodecode.js:502 +#: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:50068 +#: rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +#: rhodecode/public/js/src/rhodecode.js:621 msgid "Lifetime" msgstr "" @@ -576,158 +588,170 @@ msgstr "" msgid "Can be accessed by anonymous users" msgstr "" -#: rhodecode/apps/gist/views.py:213 +#: rhodecode/apps/gist/views.py:218 msgid "Error occurred during gist creation" msgstr "" -#: rhodecode/apps/gist/views.py:237 +#: rhodecode/apps/gist/views.py:242 #, python-format msgid "Deleted gist %s" msgstr "" -#: rhodecode/apps/gist/views.py:325 -#: rhodecode/templates/admin/gists/show.mako:74 +#: rhodecode/apps/gist/views.py:330 +#: rhodecode/templates/admin/gists/gist_show.mako:73 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:36 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:36 -#: rhodecode/templates/data_table/_dt_elements.mako:324 +#: rhodecode/templates/data_table/_dt_elements.mako:333 msgid "never" msgstr "" -#: rhodecode/apps/gist/views.py:331 +#: rhodecode/apps/gist/views.py:336 #, python-format msgid "%(expiry)s - current value" msgstr "" -#: rhodecode/apps/gist/views.py:376 -msgid "Successfully updated gist content" -msgstr "" - #: rhodecode/apps/gist/views.py:381 +msgid "Successfully updated gist content" +msgstr "" + +#: rhodecode/apps/gist/views.py:386 msgid "Successfully updated gist data" msgstr "" -#: rhodecode/apps/gist/views.py:384 +#: rhodecode/apps/gist/views.py:389 msgid "Error occurred during update of gist {}: {}" msgstr "" -#: rhodecode/apps/gist/views.py:388 +#: rhodecode/apps/gist/views.py:393 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: rhodecode/apps/home/views.py:388 -#: rhodecode/apps/repository/views/repo_pull_requests.py:878 -#: rhodecode/templates/admin/my_account/my_account.mako:42 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:198 +#: rhodecode/apps/home/views.py:397 +#: rhodecode/apps/repository/views/repo_pull_requests.py:879 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:199 #: rhodecode/templates/admin/repos/repo_add.mako:15 #: rhodecode/templates/admin/repos/repo_add.mako:19 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:103 -#: rhodecode/templates/base/base.mako:122 -#: rhodecode/templates/base/base.mako:944 +#: rhodecode/templates/base/base.mako:107 +#: rhodecode/templates/base/base.mako:126 +#: rhodecode/templates/base/base.mako:1111 msgid "Repositories" msgstr "" -#: rhodecode/apps/home/views.py:415 +#: rhodecode/apps/home/views.py:424 #: rhodecode/templates/admin/integrations/form.mako:17 #: rhodecode/templates/admin/integrations/list.mako:10 #: rhodecode/templates/admin/permissions/permissions_objects.mako:31 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:197 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:198 msgid "Repository Groups" msgstr "" -#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:178 +#: rhodecode/apps/journal/views.py:133 rhodecode/apps/journal/views.py:179 msgid "public journal" msgstr "" -#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:182 +#: rhodecode/apps/journal/views.py:137 rhodecode/apps/journal/views.py:183 msgid "journal" msgstr "" -#: rhodecode/apps/login/views.py:304 rhodecode/apps/login/views.py:400 +#: rhodecode/apps/login/views.py:304 rhodecode/apps/login/views.py:403 msgid "Bad captcha" msgstr "" -#: rhodecode/apps/login/views.py:332 -msgid "You have successfully registered with RhodeCode" -msgstr "" - -#: rhodecode/apps/login/views.py:369 +#: rhodecode/apps/login/views.py:330 +msgid "You have successfully registered with RhodeCode. You can log-in now." +msgstr "" + +#: rhodecode/apps/login/views.py:334 +msgid "Please use the {identity} button to log-in" +msgstr "" + +#: rhodecode/apps/login/views.py:372 msgid "If such email exists, a password reset link was sent to it." msgstr "" -#: rhodecode/apps/login/views.py:382 +#: rhodecode/apps/login/views.py:385 msgid "Password reset has been disabled." msgstr "" -#: rhodecode/apps/login/views.py:471 +#: rhodecode/apps/login/views.py:474 msgid "Given reset token is invalid" msgstr "" -#: rhodecode/apps/login/views.py:479 +#: rhodecode/apps/login/views.py:482 msgid "Your password reset was successful, a new password has been sent to your email" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:136 +#: rhodecode/apps/my_account/views/my_account.py:135 msgid "Error occurred during update of user password" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:143 +#: rhodecode/apps/my_account/views/my_account.py:142 msgid "Successfully updated password" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:284 +#: rhodecode/apps/my_account/views/my_account.py:283 msgid "Error occurred during adding email" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:287 +#: rhodecode/apps/my_account/views/my_account.py:286 msgid "Successfully added email" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:309 +#: rhodecode/apps/my_account/views/my_account.py:308 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:476 +#: rhodecode/apps/my_account/views/my_account.py:518 +msgid "Position {} is defined twice. Please correct this error." +msgstr "" + +#: rhodecode/apps/my_account/views/my_account.py:531 msgid "Update Bookmarks" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:478 -msgid "Failed to update bookmarks. Make sure an unique position is used" -msgstr "" - -#: rhodecode/apps/my_account/views/my_account.py:629 +#: rhodecode/apps/my_account/views/my_account.py:533 +msgid "Failed to update bookmarks. Make sure an unique position is used." +msgstr "" + +#: rhodecode/apps/my_account/views/my_account.py:685 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:636 +#: rhodecode/apps/my_account/views/my_account.py:692 msgid "Error occurred during update of user" msgstr "" -#: rhodecode/apps/repo_group/views/repo_group_advanced.py:98 +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:57 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:77 +msgid "updated commit cache" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:105 #, python-format msgid "Removed repository group `%s`" msgstr "" -#: rhodecode/apps/repo_group/views/repo_group_advanced.py:102 +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:109 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: rhodecode/apps/repo_group/views/repo_group_permissions.py:76 +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:74 #: rhodecode/apps/user_group/views/__init__.py:346 msgid "Cannot change permission for yourself as admin" msgstr "" -#: rhodecode/apps/repo_group/views/repo_group_permissions.py:100 +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:98 msgid "Repository Group permissions updated" msgstr "" -#: rhodecode/apps/repo_group/views/repo_group_settings.py:173 +#: 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:178 +#: rhodecode/apps/repo_group/views/repo_group_settings.py:179 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" @@ -742,7 +766,7 @@ msgstr "" #: rhodecode/apps/repository/views/repo_changelog.py:66 #: rhodecode/apps/repository/views/repo_compare.py:64 -#: rhodecode/apps/repository/views/repo_pull_requests.py:727 +#: rhodecode/apps/repository/views/repo_pull_requests.py:728 msgid "There are no commits yet" msgstr "" @@ -752,32 +776,32 @@ msgstr "" msgid "No such commit exists for this repository" msgstr "" -#: rhodecode/apps/repository/views/repo_checks.py:102 +#: rhodecode/apps/repository/views/repo_checks.py:103 #, python-format msgid "Created repository %s from %s" msgstr "" -#: rhodecode/apps/repository/views/repo_checks.py:111 +#: rhodecode/apps/repository/views/repo_checks.py:112 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: rhodecode/apps/repository/views/repo_checks.py:114 +#: rhodecode/apps/repository/views/repo_checks.py:115 #, python-format msgid "Created repository %s" msgstr "" -#: rhodecode/apps/repository/views/repo_commits.py:110 +#: rhodecode/apps/repository/views/repo_commits.py:111 msgid "No such commit exists. Org exception: `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_commits.py:326 -#: rhodecode/apps/repository/views/repo_pull_requests.py:1347 +#: rhodecode/apps/repository/views/repo_commits.py:330 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1362 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" -#: rhodecode/apps/repository/views/repo_commits.py:371 +#: rhodecode/apps/repository/views/repo_commits.py:375 msgid "Changing the status of a commit associated with a closed pull request is not allowed" msgstr "" @@ -806,12 +830,12 @@ msgstr "" msgid "Repositories unrelated. Cannot compare commit %(commit1)s from repository %(repo1)s with commit %(commit2)s from repository %(repo2)s." msgstr "" -#: rhodecode/apps/repository/views/repo_feed.py:69 +#: rhodecode/apps/repository/views/repo_feed.py:68 #, python-format msgid "Changes on %s repository" msgstr "" -#: rhodecode/apps/repository/views/repo_feed.py:70 +#: rhodecode/apps/repository/views/repo_feed.py:69 #, python-format msgid "%s %s feed" msgstr "" @@ -838,108 +862,108 @@ msgstr "" msgid "There are no files yet. %s" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:325 +#: rhodecode/apps/repository/views/repo_files.py:341 msgid "Downloads disabled" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:331 +#: rhodecode/apps/repository/views/repo_files.py:347 msgid "Unknown archive type for: `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:337 +#: rhodecode/apps/repository/views/repo_files.py:353 msgid "Unknown commit_id {}" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:340 +#: rhodecode/apps/repository/views/repo_files.py:356 msgid "Empty repository" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:345 +#: rhodecode/apps/repository/views/repo_files.py:361 msgid "No node at path {} for this repository" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:394 +#: rhodecode/apps/repository/views/repo_files.py:410 msgid "Unknown archive type" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:963 +#: rhodecode/apps/repository/views/repo_files.py:989 msgid "Changesets" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:984 -#: rhodecode/apps/repository/views/repo_summary.py:346 -#: rhodecode/model/pull_request.py:1456 rhodecode/model/scm.py:918 +#: rhodecode/apps/repository/views/repo_files.py:1010 +#: rhodecode/apps/repository/views/repo_summary.py:264 +#: rhodecode/model/pull_request.py:1572 rhodecode/model/scm.py:995 #: rhodecode/templates/base/vcs_settings.mako:235 #: rhodecode/templates/summary/components.mako:10 msgid "Branches" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:988 rhodecode/model/scm.py:933 -#: rhodecode/templates/base/vcs_settings.mako:260 +#: rhodecode/apps/repository/views/repo_files.py:1014 +#: rhodecode/model/scm.py:1012 rhodecode/templates/base/vcs_settings.mako:260 #: rhodecode/templates/summary/components.mako:34 msgid "Tags" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1092 -#: rhodecode/apps/repository/views/repo_files.py:1120 +#: rhodecode/apps/repository/views/repo_files.py:1118 +#: rhodecode/apps/repository/views/repo_files.py:1146 msgid "Deleted file {} via RhodeCode Enterprise" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1141 +#: rhodecode/apps/repository/views/repo_files.py:1167 msgid "Successfully deleted file `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1145 -#: rhodecode/apps/repository/views/repo_files.py:1262 -#: rhodecode/apps/repository/views/repo_files.py:1393 -#: rhodecode/apps/repository/views/repo_files.py:1516 +#: rhodecode/apps/repository/views/repo_files.py:1171 +#: rhodecode/apps/repository/views/repo_files.py:1288 +#: rhodecode/apps/repository/views/repo_files.py:1419 +#: rhodecode/apps/repository/views/repo_files.py:1542 msgid "Error occurred during commit" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1177 -#: rhodecode/apps/repository/views/repo_files.py:1208 +#: rhodecode/apps/repository/views/repo_files.py:1203 +#: rhodecode/apps/repository/views/repo_files.py:1234 msgid "Edited file {} via RhodeCode Enterprise" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1231 +#: rhodecode/apps/repository/views/repo_files.py:1257 msgid "No changes detected on {}" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1255 +#: rhodecode/apps/repository/views/repo_files.py:1281 msgid "Successfully committed changes to file `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1296 -#: rhodecode/apps/repository/views/repo_files.py:1337 +#: rhodecode/apps/repository/views/repo_files.py:1322 +#: rhodecode/apps/repository/views/repo_files.py:1363 msgid "Added file via RhodeCode Enterprise" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1353 +#: rhodecode/apps/repository/views/repo_files.py:1379 msgid "No filename specified" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1378 +#: rhodecode/apps/repository/views/repo_files.py:1404 msgid "Successfully committed new file `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1386 -#: rhodecode/apps/repository/views/repo_files.py:1498 +#: rhodecode/apps/repository/views/repo_files.py:1412 +#: rhodecode/apps/repository/views/repo_files.py:1524 msgid "The location specified must be a relative path and must not contain .. in the path" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1443 +#: rhodecode/apps/repository/views/repo_files.py:1469 msgid "Uploaded file via RhodeCode Enterprise" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1487 +#: rhodecode/apps/repository/views/repo_files.py:1513 msgid "Successfully committed {} new files" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1489 +#: rhodecode/apps/repository/views/repo_files.py:1515 msgid "Successfully committed 1 new file" msgstr "" -#: rhodecode/apps/repository/views/repo_forks.py:147 +#: rhodecode/apps/repository/views/repo_forks.py:146 msgid "Compare fork" msgstr "" @@ -948,185 +972,186 @@ msgstr "" msgid "An error occurred during repository forking %s" msgstr "" -#: rhodecode/apps/repository/views/repo_permissions.py:57 +#: rhodecode/apps/repository/views/repo_permissions.py:55 msgid "Explicitly add user or user group with write+ permission to modify their branch permissions." msgstr "" -#: rhodecode/apps/repository/views/repo_permissions.py:92 -msgid "Repository permissions updated" -msgstr "" - -#: rhodecode/apps/repository/views/repo_pull_requests.py:278 -msgid "Cannot show pull requests in state other than `{}`. Current state is: `{}`" -msgstr "" - -#: rhodecode/apps/repository/views/repo_pull_requests.py:757 +#: rhodecode/apps/repository/views/repo_permissions.py:90 +msgid "Repository access permissions updated" +msgstr "" + +#: rhodecode/apps/repository/views/repo_permissions.py:112 +msgid "Repository `{}` private mode set successfully" +msgstr "" + +#: rhodecode/apps/repository/views/repo_permissions.py:116 +#: rhodecode/apps/repository/views/repo_settings.py:176 +msgid "Error occurred during update of repository {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:758 msgid "Commit does not exist" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:909 +#: rhodecode/apps/repository/views/repo_pull_requests.py:910 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:928 +#: rhodecode/apps/repository/views/repo_pull_requests.py:929 msgid "source_repo or target repo not found" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:939 +#: rhodecode/apps/repository/views/repo_pull_requests.py:940 msgid "Not Enough permissions to source repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:954 +#: rhodecode/apps/repository/views/repo_pull_requests.py:955 msgid "Not Enough permissions to target repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1017 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1018 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1020 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1021 msgid "Error occurred during creation of this pull request." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1051 -#: rhodecode/apps/repository/views/repo_pull_requests.py:1094 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1053 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1108 msgid "Cannot update closed pull requests." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1058 -msgid "Cannot update pull requests in state other than `{}`. Current state is: `{}`" -msgstr "" - -#: rhodecode/apps/repository/views/repo_pull_requests.py:1100 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1075 +msgid "Cannot update pull requests commits in state other than `{}`. Current state is: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1114 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1121 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1136 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:1135 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1150 msgid "Reload page" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1170 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1185 msgid "Cannot merge pull requests in state other than `{}`. Current state is: `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1216 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1231 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1240 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1255 msgid "Pull request reviewers updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1273 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1288 msgid "Successfully deleted pull request" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:171 +#: rhodecode/apps/repository/views/repo_settings.py:172 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.py:208 +#: rhodecode/apps/repository/views/repo_settings.py:209 msgid "Unlocked" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:213 +#: rhodecode/apps/repository/views/repo_settings.py:214 msgid "Locked" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:215 +#: rhodecode/apps/repository/views/repo_settings.py:216 #, python-format msgid "Repository has been %s" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:219 -#: rhodecode/apps/repository/views/repo_settings_advanced.py:290 +#: rhodecode/apps/repository/views/repo_settings.py:220 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:297 msgid "An error occurred during unlocking" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:263 +#: rhodecode/apps/repository/views/repo_settings.py:264 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:99 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:106 #, python-format msgid "Archived repository `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:104 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:111 #, python-format msgid "An error occurred during archiving of `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:142 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:149 #, python-format msgid "Detached %s forks" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:144 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:151 #, python-format msgid "Deleted %s forks" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:153 -#, python-format -msgid "Deleted repository `%s`" -msgstr "" - #: rhodecode/apps/repository/views/repo_settings_advanced.py:160 +#, python-format +msgid "Deleted repository `%s`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:167 msgid "detach or delete" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:161 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:168 msgid "Cannot delete `{repo}` it still contains attached forks. Try using {delete_or_detach} option." msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:176 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:183 msgid "Cannot delete `{repo}` it still contains {num} attached pull requests. Consider archiving the repository instead." msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:185 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:192 #, python-format msgid "An error occurred during deletion of `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:210 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:217 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:214 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:221 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:250 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:257 msgid "Nothing" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:253 -#, python-format -msgid "Marked repo %s as fork of %s" -msgstr "" - #: rhodecode/apps/repository/views/repo_settings_advanced.py:260 +#, python-format +msgid "Marked repo %s as fork of %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:267 msgid "An error occurred during this operation" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:284 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:291 msgid "Locked repository" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:287 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:294 msgid "Unlocked repository" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:307 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:314 msgid "installed updated hooks into this repository" msgstr "" @@ -1154,23 +1179,23 @@ msgstr "" msgid "Error occurred during updating repository VCS settings" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:322 +#: rhodecode/apps/repository/views/repo_summary.py:240 #: rhodecode/templates/admin/permissions/permissions.mako:42 #: rhodecode/templates/summary/components.mako:8 msgid "Branch" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:323 +#: rhodecode/apps/repository/views/repo_summary.py:241 #: rhodecode/templates/summary/components.mako:32 msgid "Tag" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:324 +#: rhodecode/apps/repository/views/repo_summary.py:242 #: rhodecode/templates/summary/components.mako:44 msgid "Bookmark" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:347 +#: rhodecode/apps/repository/views/repo_summary.py:265 msgid "Closed branches" msgstr "" @@ -1230,12 +1255,13 @@ msgid "Enable or disable this authentica msgstr "" #: rhodecode/authentication/schema.py:38 rhodecode/integrations/schema.py:32 -#: rhodecode/model/permission.py:110 rhodecode/model/permission.py:114 -#: rhodecode/model/permission.py:118 rhodecode/model/permission.py:122 -#: rhodecode/model/permission.py:126 rhodecode/model/permission.py:130 +#: rhodecode/model/permission.py:111 rhodecode/model/permission.py:115 +#: rhodecode/model/permission.py:119 rhodecode/model/permission.py:123 +#: rhodecode/model/permission.py:127 rhodecode/model/permission.py:131 #: rhodecode/model/validation_schema/schemas/integration_schema.py:195 #: rhodecode/templates/admin/auth/auth_settings.mako:64 #: rhodecode/templates/admin/integrations/list.mako:71 +#: rhodecode/templates/admin/my_account/my_account_notifications.mako:23 msgid "Enabled" msgstr "" @@ -1334,7 +1360,7 @@ msgstr "" msgid "Clean username" msgstr "" -#: rhodecode/authentication/plugins/auth_headers.py:98 +#: rhodecode/authentication/plugins/auth_headers.py:99 msgid "Headers" msgstr "" @@ -1390,7 +1416,7 @@ msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:283 #: rhodecode/integrations/types/webhook.py:89 rhodecode/templates/login.mako:51 #: rhodecode/templates/register.mako:62 -#: rhodecode/templates/admin/my_account/my_account.mako:30 +#: rhodecode/templates/admin/my_account/my_account.mako:31 #: rhodecode/templates/admin/users/user_add.mako:44 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" @@ -1641,17 +1667,17 @@ msgstr "" msgid "user permissions change" msgstr "" -#: rhodecode/forms/__init__.py:35 rhodecode/templates/admin/gists/new.mako:62 +#: rhodecode/forms/__init__.py:35 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:88 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:72 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 #: rhodecode/templates/admin/permissions/permissions_ips.mako:64 #: rhodecode/templates/admin/permissions/permissions_objects.mako:60 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:206 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:84 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:207 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:72 #: 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:188 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:192 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:244 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44 #: rhodecode/templates/admin/settings/settings_global.mako:141 @@ -1663,19 +1689,20 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:88 #: 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_profile.mako:146 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:67 #: rhodecode/templates/base/default_perms_box.mako:89 msgid "Reset" msgstr "" -#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:54 +#: rhodecode/forms/__init__.py:36 +#: rhodecode/templates/admin/gists/gist_show.mako:57 #: rhodecode/templates/admin/integrations/list.mako:179 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:50 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:33 #: rhodecode/templates/admin/notifications/notifications_data.mako:22 -#: rhodecode/templates/admin/notifications/notifications_show.mako:35 +#: rhodecode/templates/admin/notifications/notifications_show.mako:37 #: 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 @@ -1683,23 +1710,21 @@ msgstr "" #: 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:30 -#: rhodecode/templates/base/issue_tracker_settings.mako:69 +#: rhodecode/templates/base/issue_tracker_settings.mako:146 #: rhodecode/templates/base/vcs_settings.mako:244 #: rhodecode/templates/base/vcs_settings.mako:269 -#: rhodecode/templates/changeset/changeset_file_comment.mako:144 -#: rhodecode/templates/changeset/changeset_file_comment.mako:146 -#: rhodecode/templates/changeset/changeset_file_comment.mako:149 -#: rhodecode/templates/data_table/_dt_elements.mako:172 -#: rhodecode/templates/data_table/_dt_elements.mako:245 -#: rhodecode/templates/data_table/_dt_elements.mako:259 -#: rhodecode/templates/data_table/_dt_elements.mako:271 -#: rhodecode/templates/data_table/_dt_elements.mako:397 +#: rhodecode/templates/changeset/changeset_file_comment.mako:140 +#: rhodecode/templates/changeset/changeset_file_comment.mako:142 +#: rhodecode/templates/changeset/changeset_file_comment.mako:145 +#: rhodecode/templates/data_table/_dt_elements.mako:179 +#: rhodecode/templates/data_table/_dt_elements.mako:253 +#: rhodecode/templates/data_table/_dt_elements.mako:268 +#: rhodecode/templates/data_table/_dt_elements.mako:280 +#: rhodecode/templates/data_table/_dt_elements.mako:426 #: rhodecode/templates/debug_style/buttons.html:132 #: rhodecode/templates/files/files_source.mako:30 #: rhodecode/templates/files/files_source.mako:37 #: rhodecode/templates/files/files_source.mako:43 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:53 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:57 msgid "Delete" msgstr "" @@ -1755,11 +1780,11 @@ msgstr "" msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:301 +#: rhodecode/integrations/views.py:305 msgid "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:326 +#: rhodecode/integrations/views.py:330 msgid "Integration {integration_name} updated successfully." msgstr "" @@ -1778,12 +1803,12 @@ msgstr "" #: rhodecode/integrations/types/email.py:174 #: rhodecode/templates/register.mako:95 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:55 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:67 #: rhodecode/templates/admin/users/user_add.mako:86 -#: rhodecode/templates/admin/users/user_edit_profile.mako:64 +#: rhodecode/templates/admin/users/user_edit_profile.mako:62 #: rhodecode/templates/admin/users/users.mako:76 -#: rhodecode/templates/email_templates/user_registration.mako:25 -#: rhodecode/templates/users/user_profile.mako:58 +#: rhodecode/templates/email_templates/user_registration.mako:50 +#: rhodecode/templates/users/user_profile.mako:69 msgid "Email" msgstr "" @@ -1855,17 +1880,17 @@ msgstr "" #: rhodecode/integrations/types/webhook.py:79 rhodecode/templates/login.mako:44 #: rhodecode/templates/register.mako:48 #: rhodecode/templates/admin/admin_log_base.mako:7 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:25 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:27 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:23 #: 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:38 +#: rhodecode/templates/admin/users/user_edit_profile.mako:36 #: rhodecode/templates/admin/users/users.mako:74 #: rhodecode/templates/debug_style/login.html:36 -#: rhodecode/templates/email_templates/user_registration.mako:23 -#: rhodecode/templates/user_group/profile.mako:51 -#: rhodecode/templates/users/user_profile.mako:28 +#: rhodecode/templates/email_templates/user_registration.mako:42 +#: rhodecode/templates/user_group/profile.mako:61 +#: rhodecode/templates/users/user_profile.mako:29 msgid "Username" msgstr "" @@ -2043,7 +2068,6 @@ msgid "fork name %s" msgstr "" #: rhodecode/lib/action_parser.py:191 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:48 #, python-format msgid "Pull request #%s" msgstr "" @@ -2076,24 +2100,23 @@ msgstr "" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1619 -#, python-format -msgid "IP %s not allowed" -msgstr "" - -#: rhodecode/lib/auth.py:1703 +#: rhodecode/lib/auth.py:1672 +msgid "IP {} not allowed" +msgstr "" + +#: rhodecode/lib/auth.py:1764 msgid "You need to be a registered user to perform this action" msgstr "" -#: rhodecode/lib/auth.py:1747 +#: rhodecode/lib/auth.py:1808 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/diffs.py:900 +#: rhodecode/lib/diffs.py:902 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1857 +#: rhodecode/lib/helpers.py:1706 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2115,45 +2138,46 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1881 +#: rhodecode/lib/helpers.py:1730 #, 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:536 -msgid "in ${ago}" -msgstr "" - #: rhodecode/lib/utils2.py:542 +msgid "in ${ago}" +msgstr "" + +#: rhodecode/lib/utils2.py:548 msgid "${ago} ago" msgstr "" -#: rhodecode/lib/utils2.py:551 -msgid "${val}, ${detail}" -msgstr "" - -#: rhodecode/lib/utils2.py:553 -msgid "${val}, ${detail} ago" -msgstr "" - -#: rhodecode/lib/utils2.py:555 -msgid "in ${val}, ${detail}" -msgstr "" - #: rhodecode/lib/utils2.py:557 -msgid "${val} and ${detail}" +msgid "${val}, ${detail}" msgstr "" #: rhodecode/lib/utils2.py:559 -msgid "${val} and ${detail} ago" +msgid "${val}, ${detail} ago" msgstr "" #: rhodecode/lib/utils2.py:561 +msgid "in ${val}, ${detail}" +msgstr "" + +#: rhodecode/lib/utils2.py:563 +msgid "${val} and ${detail}" +msgstr "" + +#: rhodecode/lib/utils2.py:565 +msgid "${val} and ${detail} ago" +msgstr "" + +#: rhodecode/lib/utils2.py:567 msgid "in ${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:565 rhodecode/public/js/scripts.js:25634 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 +#: rhodecode/lib/utils2.py:571 rhodecode/public/js/scripts.js:25634 +#: rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "" @@ -2186,6 +2210,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2739 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2772 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2772 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2987 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2275 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2267 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2266 @@ -2193,7 +2218,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2270 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2321 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2522 rhodecode/model/db.py:2959 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2522 rhodecode/model/db.py:3061 msgid "Repository no access" msgstr "" @@ -2225,6 +2250,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2740 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2773 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2773 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2988 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2276 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2268 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2267 @@ -2232,7 +2258,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2271 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2523 rhodecode/model/db.py:2960 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2523 rhodecode/model/db.py:3062 msgid "Repository read access" msgstr "" @@ -2264,6 +2290,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2741 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2774 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2774 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2989 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2277 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2269 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2268 @@ -2271,7 +2298,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2272 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2323 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2324 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2524 rhodecode/model/db.py:2961 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2524 rhodecode/model/db.py:3063 msgid "Repository write access" msgstr "" @@ -2303,6 +2330,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2742 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2775 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2775 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2990 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2278 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2270 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2269 @@ -2310,7 +2338,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2273 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2324 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2325 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2525 rhodecode/model/db.py:2962 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2525 rhodecode/model/db.py:3064 msgid "Repository admin access" msgstr "" @@ -2382,6 +2410,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2765 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2798 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2798 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3013 #: 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:2287 @@ -2389,7 +2418,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2342 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2343 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:2985 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:3087 msgid "Repository creation disabled" msgstr "" @@ -2421,6 +2450,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2766 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2799 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2799 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3014 #: 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:2288 @@ -2428,7 +2458,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 #: 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:2544 rhodecode/model/db.py:2986 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2544 rhodecode/model/db.py:3088 msgid "Repository creation enabled" msgstr "" @@ -2460,6 +2490,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2770 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2803 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2803 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3018 #: 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:2292 @@ -2467,7 +2498,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2347 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2348 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:2990 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:3092 msgid "Repository forking disabled" msgstr "" @@ -2499,6 +2530,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2771 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2804 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2804 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3019 #: 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:2293 @@ -2506,7 +2538,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 #: 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:2549 rhodecode/model/db.py:2991 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2549 rhodecode/model/db.py:3093 msgid "Repository forking enabled" msgstr "" @@ -2559,6 +2591,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:3491 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:3524 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:3525 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3757 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2915 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2907 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2907 @@ -2566,10 +2599,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2910 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3011 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3012 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3230 rhodecode/model/db.py:3712 -#: rhodecode/public/js/scripts.js:43644 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:319 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3230 rhodecode/model/db.py:3831 +#: rhodecode/public/js/scripts.js:44680 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:320 msgid "Not Reviewed" msgstr "" @@ -2601,6 +2634,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:3492 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:3525 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:3526 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3758 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2916 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2908 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2908 @@ -2608,7 +2642,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2911 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3012 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3013 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3231 rhodecode/model/db.py:3713 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3231 rhodecode/model/db.py:3832 msgid "Approved" msgstr "" @@ -2640,6 +2674,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:3493 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:3526 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:3527 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3759 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2917 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2909 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2909 @@ -2647,7 +2682,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2912 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3013 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3014 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3232 rhodecode/model/db.py:3714 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3232 rhodecode/model/db.py:3833 msgid "Rejected" msgstr "" @@ -2679,6 +2714,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:3494 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:3527 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:3528 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3760 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2918 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2910 @@ -2686,7 +2722,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2913 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3014 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3015 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3233 rhodecode/model/db.py:3715 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3233 rhodecode/model/db.py:3834 msgid "Under Review" msgstr "" @@ -2715,6 +2751,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2744 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2777 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2777 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2992 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2280 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2272 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2271 @@ -2722,7 +2759,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2275 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2326 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2327 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2527 rhodecode/model/db.py:2964 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2527 rhodecode/model/db.py:3066 msgid "Repository group no access" msgstr "" @@ -2751,6 +2788,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2745 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2778 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2778 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2993 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2281 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2273 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2272 @@ -2758,7 +2796,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2276 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2327 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2328 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2528 rhodecode/model/db.py:2965 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2528 rhodecode/model/db.py:3067 msgid "Repository group read access" msgstr "" @@ -2787,6 +2825,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2746 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2779 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2779 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2994 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2282 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2274 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2273 @@ -2794,7 +2833,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2277 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2328 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2329 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2529 rhodecode/model/db.py:2966 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2529 rhodecode/model/db.py:3068 msgid "Repository group write access" msgstr "" @@ -2823,6 +2862,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2747 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2780 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2780 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2995 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2283 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2275 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2274 @@ -2830,7 +2870,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2278 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2329 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2330 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2530 rhodecode/model/db.py:2967 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2530 rhodecode/model/db.py:3069 msgid "Repository group admin access" msgstr "" @@ -2858,6 +2898,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2749 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2782 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2782 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2997 #: 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:2276 @@ -2865,7 +2906,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2280 #: 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:2532 rhodecode/model/db.py:2969 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2532 rhodecode/model/db.py:3071 msgid "User group no access" msgstr "" @@ -2893,6 +2934,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2750 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2783 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2783 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2998 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2286 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2278 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2277 @@ -2900,7 +2942,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2281 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2332 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2333 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 rhodecode/model/db.py:2970 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 rhodecode/model/db.py:3072 msgid "User group read access" msgstr "" @@ -2928,6 +2970,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2751 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2784 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2784 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2999 #: 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:2278 @@ -2935,7 +2978,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2282 #: 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:2534 rhodecode/model/db.py:2971 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2534 rhodecode/model/db.py:3073 msgid "User group write access" msgstr "" @@ -2963,6 +3006,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2752 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2785 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2785 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3000 #: 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:2279 @@ -2970,7 +3014,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283 #: 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:2535 rhodecode/model/db.py:2972 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:3074 msgid "User group admin access" msgstr "" @@ -2998,6 +3042,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2759 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2792 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2792 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3007 #: 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:2281 @@ -3005,7 +3050,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285 #: 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:2537 rhodecode/model/db.py:2979 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:3081 msgid "Repository Group creation disabled" msgstr "" @@ -3033,6 +3078,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2760 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2793 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2793 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3008 #: 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:2282 @@ -3040,7 +3086,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2286 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2337 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 rhodecode/model/db.py:2980 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 rhodecode/model/db.py:3082 msgid "Repository Group creation enabled" msgstr "" @@ -3068,6 +3114,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2762 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2795 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2795 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3010 #: 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:2284 @@ -3075,7 +3122,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288 #: 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:2540 rhodecode/model/db.py:2982 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:3084 msgid "User Group creation disabled" msgstr "" @@ -3103,6 +3150,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2763 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2796 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2796 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3011 #: 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:2285 @@ -3110,7 +3158,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 #: 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:2541 rhodecode/model/db.py:2983 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 rhodecode/model/db.py:3085 msgid "User Group creation enabled" msgstr "" @@ -3138,6 +3186,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2773 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2806 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2806 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3021 #: 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:2295 @@ -3145,7 +3194,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2350 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2351 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:2993 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:3095 msgid "Registration disabled" msgstr "" @@ -3173,6 +3222,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2774 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2807 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2807 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3022 #: 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:2296 @@ -3180,7 +3230,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 #: 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:2552 rhodecode/model/db.py:2994 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2552 rhodecode/model/db.py:3096 msgid "User Registration with manual account activation" msgstr "" @@ -3208,6 +3258,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2775 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2808 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2808 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3023 #: 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:2297 @@ -3215,7 +3266,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 #: 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:2553 rhodecode/model/db.py:2995 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:3097 msgid "User Registration with automatic account activation" msgstr "" @@ -3243,6 +3294,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2781 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2814 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2814 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3029 #: 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:2299 @@ -3250,8 +3302,8 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2303 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2358 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2359 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:3001 -#: rhodecode/model/permission.py:105 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:3103 +#: rhodecode/model/permission.py:106 msgid "Manual activation of external account" msgstr "" @@ -3279,6 +3331,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2782 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2815 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2815 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3030 #: 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:2300 @@ -3286,8 +3339,8 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 #: 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:2560 rhodecode/model/db.py:3002 -#: rhodecode/model/permission.py:106 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2560 rhodecode/model/db.py:3104 +#: rhodecode/model/permission.py:107 msgid "Automatic activation of external account" msgstr "" @@ -3309,6 +3362,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2767 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2800 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2800 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3015 #: 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:2289 @@ -3316,7 +3370,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293 #: 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:2545 rhodecode/model/db.py:2987 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:3089 msgid "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3338,6 +3392,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2768 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2801 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2801 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3016 #: 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:2290 @@ -3345,7 +3400,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 #: 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:2546 rhodecode/model/db.py:2988 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:3090 msgid "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3364,6 +3419,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2737 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2770 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2770 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2985 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2273 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2265 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2264 @@ -3371,7 +3427,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2268 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2520 rhodecode/model/db.py:2957 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2520 rhodecode/model/db.py:3059 msgid "RhodeCode Super Administrator" msgstr "" @@ -3388,6 +3444,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2784 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2817 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2817 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3032 #: 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:2302 @@ -3395,7 +3452,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2361 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2362 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:3004 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:3106 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3412,6 +3469,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2785 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2818 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2818 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3033 #: 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:2303 @@ -3419,7 +3477,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 #: 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:2563 rhodecode/model/db.py:3005 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2563 rhodecode/model/db.py:3107 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3428,6 +3486,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1118 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1120 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1120 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1137 #: 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:910 @@ -3435,7 +3494,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1050 rhodecode/model/db.py:1134 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1050 rhodecode/model/db.py:1178 msgid "all" msgstr "" @@ -3444,6 +3503,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1119 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1121 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1121 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1138 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 @@ -3451,7 +3511,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1135 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1179 msgid "http/web interface" msgstr "" @@ -3460,6 +3520,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1120 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1122 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1122 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1139 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 @@ -3467,7 +3528,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1136 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1180 msgid "vcs (git/hg/svn protocol)" msgstr "" @@ -3476,6 +3537,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1121 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1123 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1123 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1140 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 @@ -3483,7 +3545,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1137 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1181 msgid "api calls" msgstr "" @@ -3492,6 +3554,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1122 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1124 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1124 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1141 #: 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:914 @@ -3499,7 +3562,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 #: 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:1054 rhodecode/model/db.py:1138 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1182 msgid "feed access" msgstr "" @@ -3508,6 +3571,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2488 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2511 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2511 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2638 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2051 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2043 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2042 @@ -3515,7 +3579,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2046 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2090 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2091 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2284 rhodecode/model/db.py:2610 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2284 rhodecode/model/db.py:2717 msgid "No parent" msgstr "" @@ -3524,9 +3588,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2777 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2810 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2810 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3025 #: 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:2555 rhodecode/model/db.py:2997 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2555 rhodecode/model/db.py:3099 msgid "Password reset enabled" msgstr "" @@ -3535,9 +3600,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2778 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2811 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2811 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3026 #: 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:2556 rhodecode/model/db.py:2998 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 rhodecode/model/db.py:3100 msgid "Password reset hidden" msgstr "" @@ -3546,9 +3612,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2779 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2812 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2812 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3027 #: 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:2557 rhodecode/model/db.py:2999 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:3101 msgid "Password reset disabled" msgstr "" @@ -3556,7 +3623,8 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2754 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2787 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2787 -#: rhodecode/model/db.py:2974 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3002 +#: rhodecode/model/db.py:3076 msgid "Branch no permissions" msgstr "" @@ -3564,7 +3632,8 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2755 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2788 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2788 -#: rhodecode/model/db.py:2975 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3003 +#: rhodecode/model/db.py:3077 msgid "Branch access by web merge" msgstr "" @@ -3572,7 +3641,8 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2756 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2789 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2789 -#: rhodecode/model/db.py:2976 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3004 +#: rhodecode/model/db.py:3078 msgid "Branch access by push" msgstr "" @@ -3580,27 +3650,28 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2757 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2790 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2790 -#: rhodecode/model/db.py:2977 +#: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3005 +#: rhodecode/model/db.py:3079 msgid "Branch access by push with force" msgstr "" -#: rhodecode/lib/index/whoosh.py:164 +#: rhodecode/lib/index/whoosh.py:189 msgid "Index Type" msgstr "" -#: rhodecode/lib/index/whoosh.py:167 +#: rhodecode/lib/index/whoosh.py:192 msgid "File Index" msgstr "" -#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:174 +#: rhodecode/lib/index/whoosh.py:193 rhodecode/lib/index/whoosh.py:199 msgid "Indexed documents" msgstr "" -#: rhodecode/lib/index/whoosh.py:169 rhodecode/lib/index/whoosh.py:175 +#: rhodecode/lib/index/whoosh.py:194 rhodecode/lib/index/whoosh.py:200 msgid "Last update" msgstr "" -#: rhodecode/lib/index/whoosh.py:173 +#: rhodecode/lib/index/whoosh.py:198 msgid "Commit index" msgstr "" @@ -3613,7 +3684,7 @@ msgid "This pull request cannot be merge msgstr "" #: rhodecode/lib/vcs/backends/base.py:155 -msgid "This pull request cannot be merged because of merge conflicts." +msgid "This pull request cannot be merged because of merge conflicts. {unresolved_files}" msgstr "" #: rhodecode/lib/vcs/backends/base.py:157 @@ -3668,14 +3739,18 @@ msgstr "" msgid "1 month {end_date}" msgstr "" -#: rhodecode/model/comment.py:422 +#: rhodecode/model/comment.py:473 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:423 +#: rhodecode/model/comment.py:474 msgid "Show it now" msgstr "" +#: rhodecode/model/db.py:1183 +msgid "artifacts downloads" +msgstr "" + #: rhodecode/model/forms.py:88 msgid "Please enter a login" msgstr "" @@ -3694,96 +3769,106 @@ msgstr "" msgid "Enter %(min)i characters or more" msgstr "" -#: rhodecode/model/notification.py:244 +#: rhodecode/model/notification.py:245 #, python-format msgid "%(user)s commented on commit %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:245 +#: rhodecode/model/notification.py:246 #, python-format msgid "%(user)s commented on commit at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:248 -#, python-format -msgid "%(user)s sent message %(date_or_age)s" -msgstr "" - #: rhodecode/model/notification.py:249 #, python-format +msgid "%(user)s sent message %(date_or_age)s" +msgstr "" + +#: rhodecode/model/notification.py:250 +#, python-format msgid "%(user)s sent message at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:252 -#, python-format -msgid "%(user)s mentioned you %(date_or_age)s" -msgstr "" - #: rhodecode/model/notification.py:253 #, python-format +msgid "%(user)s mentioned you %(date_or_age)s" +msgstr "" + +#: rhodecode/model/notification.py:254 +#, python-format msgid "%(user)s mentioned you at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:256 -#, python-format -msgid "%(user)s registered in RhodeCode %(date_or_age)s" -msgstr "" - #: rhodecode/model/notification.py:257 #, python-format +msgid "%(user)s registered in RhodeCode %(date_or_age)s" +msgstr "" + +#: rhodecode/model/notification.py:258 +#, python-format msgid "%(user)s registered in RhodeCode at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:260 -#, python-format -msgid "%(user)s opened new pull request %(date_or_age)s" -msgstr "" - #: rhodecode/model/notification.py:261 #, python-format +msgid "%(user)s opened new pull request %(date_or_age)s" +msgstr "" + +#: rhodecode/model/notification.py:262 +#, python-format msgid "%(user)s opened new pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:264 -#, python-format -msgid "%(user)s commented on pull request %(date_or_age)s" -msgstr "" - #: rhodecode/model/notification.py:265 #, python-format +msgid "%(user)s updated pull request %(date_or_age)s" +msgstr "" + +#: rhodecode/model/notification.py:266 +#, python-format +msgid "%(user)s updated pull request at %(date_or_age)s" +msgstr "" + +#: rhodecode/model/notification.py:269 +#, python-format +msgid "%(user)s commented on pull request %(date_or_age)s" +msgstr "" + +#: rhodecode/model/notification.py:270 +#, python-format msgid "%(user)s commented on pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77 -#: rhodecode/model/permission.py:83 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:196 -#: 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:72 rhodecode/model/permission.py:78 #: rhodecode/model/permission.py:84 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12 -msgid "Read" +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:197 +#: 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:73 rhodecode/model/permission.py:79 #: rhodecode/model/permission.py:85 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:13 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:13 -#: rhodecode/templates/changeset/changeset_file_comment.mako:273 -#: rhodecode/templates/changeset/changeset_file_comment.mako:323 -#: rhodecode/templates/data_table/_dt_elements.mako:411 -msgid "Write" +#: 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:74 rhodecode/model/permission.py:80 #: rhodecode/model/permission.py:86 +#: 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:268 +#: rhodecode/templates/changeset/changeset_file_comment.mako:319 +#: rhodecode/templates/data_table/_dt_elements.mako:440 +msgid "Write" +msgstr "" + +#: rhodecode/model/permission.py:75 rhodecode/model/permission.py:81 +#: rhodecode/model/permission.py:87 #: rhodecode/templates/admin/auth/plugin_settings.mako:12 #: rhodecode/templates/admin/defaults/defaults.mako:12 #: rhodecode/templates/admin/integrations/base.mako:21 @@ -3805,153 +3890,154 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:14 #: rhodecode/templates/admin/users/user_add.mako:11 #: rhodecode/templates/admin/users/user_edit.mako:12 -#: rhodecode/templates/base/base.mako:639 +#: rhodecode/templates/base/base.mako:801 msgid "Admin" msgstr "" -#: rhodecode/model/permission.py:89 -msgid "Protected/No Access" -msgstr "" - #: rhodecode/model/permission.py:90 -msgid "Web merge" +msgid "Protected/No Access" msgstr "" #: rhodecode/model/permission.py:91 -msgid "Push" +msgid "Web merge" msgstr "" #: rhodecode/model/permission.py:92 +msgid "Push" +msgstr "" + +#: rhodecode/model/permission.py:93 msgid "Force Push" msgstr "" -#: rhodecode/model/permission.py:95 rhodecode/model/permission.py:109 -#: rhodecode/model/permission.py:113 rhodecode/model/permission.py:117 -#: rhodecode/model/permission.py:121 rhodecode/model/permission.py:125 -#: rhodecode/model/permission.py:129 +#: rhodecode/model/permission.py:96 rhodecode/model/permission.py:110 +#: rhodecode/model/permission.py:114 rhodecode/model/permission.py:118 +#: rhodecode/model/permission.py:122 rhodecode/model/permission.py:126 +#: rhodecode/model/permission.py:130 +#: rhodecode/templates/admin/my_account/my_account_notifications.mako:27 msgid "Disabled" msgstr "" -#: rhodecode/model/permission.py:96 -msgid "Allowed with manual account activation" -msgstr "" - #: rhodecode/model/permission.py:97 +msgid "Allowed with manual account activation" +msgstr "" + +#: rhodecode/model/permission.py:98 msgid "Allowed with automatic account activation" msgstr "" -#: rhodecode/model/permission.py:100 -msgid "Allow password recovery" -msgstr "" - #: rhodecode/model/permission.py:101 -msgid "Hide password recovery link" +msgid "Allow password recovery" msgstr "" #: rhodecode/model/permission.py:102 +msgid "Hide password recovery link" +msgstr "" + +#: rhodecode/model/permission.py:103 msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:80 +#: rhodecode/model/pull_request.py:90 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:82 -msgid "Pull request update failed because of an unknown error." -msgstr "" - -#: rhodecode/model/pull_request.py:84 -msgid "No update needed because the source and target have not changed." -msgstr "" - -#: rhodecode/model/pull_request.py:86 -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:89 -msgid "This pull request cannot be updated because the target reference is missing." -msgstr "" - #: rhodecode/model/pull_request.py:92 +msgid "Pull request update failed because of an unknown error." +msgstr "" + +#: rhodecode/model/pull_request.py:94 +msgid "No update needed because the source and target have not changed." +msgstr "" + +#: rhodecode/model/pull_request.py:96 +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:99 +msgid "This pull request cannot be updated because the target reference is missing." +msgstr "" + +#: rhodecode/model/pull_request.py:102 msgid "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:1240 +#: rhodecode/model/pull_request.py:1355 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1242 +#: rhodecode/model/pull_request.py:1357 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:1256 +#: rhodecode/model/pull_request.py:1371 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1275 +#: rhodecode/model/pull_request.py:1390 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1278 +#: rhodecode/model/pull_request.py:1393 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1455 rhodecode/model/scm.py:926 -#: rhodecode/templates/admin/my_account/my_account.mako:31 -#: rhodecode/templates/base/base.mako:469 +#: rhodecode/model/pull_request.py:1571 rhodecode/model/scm.py:1004 +#: rhodecode/templates/admin/my_account/my_account.mako:32 +#: rhodecode/templates/base/base.mako:633 #: rhodecode/templates/summary/components.mako:46 msgid "Bookmarks" msgstr "" -#: rhodecode/model/pull_request.py:1460 +#: rhodecode/model/pull_request.py:1576 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1463 +#: rhodecode/model/pull_request.py:1579 #: rhodecode/templates/summary/components.mako:22 msgid "Closed Branches" msgstr "" -#: rhodecode/model/pull_request.py:1629 +#: rhodecode/model/pull_request.py:1744 +msgid "WIP marker in title prevents from accidental merge." +msgstr "" + +#: rhodecode/model/pull_request.py:1755 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1647 +#: rhodecode/model/pull_request.py:1773 msgid "Target branch `{}` changes rejected by rule {}." msgstr "" -#: rhodecode/model/pull_request.py:1661 +#: rhodecode/model/pull_request.py:1787 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1675 +#: rhodecode/model/pull_request.py:1801 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1678 +#: rhodecode/model/pull_request.py:1804 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1713 +#: rhodecode/model/pull_request.py:1839 msgid "Merge strategy: rebase" msgstr "" -#: rhodecode/model/pull_request.py:1718 +#: rhodecode/model/pull_request.py:1844 msgid "Merge strategy: explicit merge commit" msgstr "" -#: rhodecode/model/pull_request.py:1726 +#: rhodecode/model/pull_request.py:1852 msgid "Source branch will be closed after merge." msgstr "" -#: rhodecode/model/pull_request.py:1728 +#: rhodecode/model/pull_request.py:1854 msgid "Source branch will be deleted after merge." msgstr "" -#: rhodecode/model/scm.py:904 -msgid "latest tip" -msgstr "" - #: rhodecode/model/validators.py:93 rhodecode/model/validators.py:94 msgid "Value cannot be an empty list" msgstr "" @@ -4066,7 +4152,7 @@ msgid "Repository group with name \"%(re msgstr "" #: rhodecode/model/validators.py:567 -#: rhodecode/model/validation_schema/schemas/repo_schema.py:219 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:230 msgid "Repository name cannot end with .git" msgstr "" @@ -4089,7 +4175,7 @@ msgid "You do not have the permission to msgstr "" #: rhodecode/model/validators.py:680 -#: rhodecode/model/validation_schema/schemas/repo_schema.py:125 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:136 msgid "You do not have the permission to store repositories in the root location." msgstr "" @@ -4102,8 +4188,8 @@ msgid "This is not a valid path" msgstr "" #: rhodecode/model/validators.py:871 -#: rhodecode/model/validation_schema/schemas/user_schema.py:141 -#: rhodecode/model/validation_schema/schemas/user_schema.py:145 +#: rhodecode/model/validation_schema/schemas/user_schema.py:144 +#: rhodecode/model/validation_schema/schemas/user_schema.py:148 msgid "This e-mail address is already taken" msgstr "" @@ -4240,29 +4326,29 @@ msgid "Repo group owner with id `{}` doe msgstr "" #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 -#: rhodecode/model/validation_schema/schemas/repo_schema.py:204 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:215 msgid "Repository with name `{}` already exists" msgstr "" #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:141 -#: rhodecode/model/validation_schema/schemas/repo_schema.py:209 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:220 msgid "Repository group with name `{}` already exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_schema.py:55 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:60 msgid "Repo owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_schema.py:91 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:102 msgid "Fork with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_schema.py:94 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:105 msgid "Cannot set fork of parameter of this repository to itself" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_schema.py:119 -#: rhodecode/model/validation_schema/schemas/repo_schema.py:123 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:130 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:134 msgid "Repository group `{}` does not exist" msgstr "" @@ -4282,7 +4368,7 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: rhodecode/model/validation_schema/schemas/user_schema.py:174 +#: rhodecode/model/validation_schema/schemas/user_schema.py:183 msgid "Additional emails can be specified at extra emails page." msgstr "" @@ -4290,398 +4376,418 @@ msgstr "" msgid ": , " msgstr "" -#: rhodecode/public/js/scripts.js:24109 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: rhodecode/public/js/scripts.js:24109 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/scripts.js:25569 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:121 +#: rhodecode/public/js/scripts.js:25569 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:130 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/scripts.js:25570 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:113 +#: rhodecode/public/js/scripts.js:25570 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:120 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/scripts.js:25571 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108 +#: rhodecode/public/js/scripts.js:25571 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:115 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/scripts.js:25572 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110 +#: rhodecode/public/js/scripts.js:25572 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:117 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/scripts.js:25573 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:112 +#: rhodecode/public/js/scripts.js:25573 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:119 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/scripts.js:25574 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:118 +#: rhodecode/public/js/scripts.js:25574 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:127 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/scripts.js:25594 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/scripts.js:25594 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/scripts.js:25602 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 +#: rhodecode/public/js/scripts.js:25602 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:112 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/scripts.js:25614 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:123 +#: rhodecode/public/js/scripts.js:25614 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:132 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/scripts.js:25616 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 +#: rhodecode/public/js/scripts.js:25616 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/scripts.js:25620 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 +#: rhodecode/public/js/scripts.js:25620 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:113 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/scripts.js:25622 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107 +#: rhodecode/public/js/scripts.js:25622 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:114 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/scripts.js:25624 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 +#: rhodecode/public/js/scripts.js:25624 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/scripts.js:39683 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 +#: rhodecode/public/js/scripts.js:40622 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/scripts.js:39686 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/scripts.js:40625 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/scripts.js:39689 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +#: rhodecode/public/js/scripts.js:40628 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "" -#: rhodecode/public/js/scripts.js:39692 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 +#: rhodecode/public/js/scripts.js:40631 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/scripts.js:39696 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 +#: rhodecode/public/js/scripts.js:40635 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/scripts.js:39698 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:117 +#: rhodecode/public/js/scripts.js:40637 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:126 #: 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/scripts.js:39703 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/scripts.js:40642 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/scripts.js:39705 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/scripts.js:40644 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/scripts.js:39710 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/scripts.js:40649 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/scripts.js:39712 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/scripts.js:40651 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/scripts.js:39716 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: rhodecode/public/js/scripts.js:40655 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/scripts.js:39718 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/scripts.js:40657 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/scripts.js:40656 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 +#: rhodecode/public/js/scripts.js:41595 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/scripts.js:40658 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 +#: rhodecode/public/js/scripts.js:41597 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/scripts.js:41194 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/rhodecode/codemirror.js:364 +#: rhodecode/public/js/scripts.js:42136 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 +#: rhodecode/public/js/src/rhodecode/codemirror.js:363 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/scripts.js:41213 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 +#: rhodecode/public/js/scripts.js:42156 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 #: rhodecode/public/js/src/rhodecode/codemirror.js:383 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/scripts.js:41232 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/scripts.js:42175 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 #: rhodecode/public/js/src/rhodecode/codemirror.js:402 -#: rhodecode/templates/email_templates/commit_comment.mako:102 -#: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/scripts.js:41252 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: rhodecode/public/js/scripts.js:42195 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/src/rhodecode/codemirror.js:422 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/scripts.js:41553 rhodecode/public/js/scripts.js:41907 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/scripts.js:42496 rhodecode/public/js/scripts.js:42850 +#: rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 #: rhodecode/public/js/src/rhodecode/codemirror.js:723 #: rhodecode/public/js/src/rhodecode/comments.js:233 msgid "Status Review" msgstr "" -#: rhodecode/public/js/scripts.js:41568 rhodecode/public/js/scripts.js:41922 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 +#: rhodecode/public/js/scripts.js:42511 rhodecode/public/js/scripts.js:42865 +#: rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 #: rhodecode/public/js/src/rhodecode/codemirror.js:738 #: rhodecode/public/js/src/rhodecode/comments.js:248 msgid "Comment text will be set automatically based on currently selected status ({0}) ..." msgstr "" -#: rhodecode/public/js/scripts.js:41649 rhodecode/public/js/scripts.js:42117 -#: rhodecode/public/js/scripts.js:43030 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +#: rhodecode/public/js/scripts.js:42592 rhodecode/public/js/scripts.js:43061 +#: rhodecode/public/js/scripts.js:44066 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 #: rhodecode/public/js/src/rhodecode/codemirror.js:819 -#: rhodecode/public/js/src/rhodecode/comments.js:443 -#: rhodecode/public/js/src/rhodecode/files.js:493 -#: rhodecode/templates/files/files_browser_tree.mako:52 +#: rhodecode/public/js/src/rhodecode/comments.js:444 +#: rhodecode/public/js/src/rhodecode/files.js:495 +#: rhodecode/templates/files/files_browser_tree.mako:55 msgid "Loading ..." msgstr "" -#: rhodecode/public/js/scripts.js:41823 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/scripts.js:42766 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 #: rhodecode/public/js/src/rhodecode/comments.js:149 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/scripts.js:42066 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 -#: rhodecode/public/js/src/rhodecode/comments.js:392 +#: rhodecode/public/js/scripts.js:43010 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/src/rhodecode/comments.js:393 msgid "Submitting..." msgstr "" -#: rhodecode/public/js/scripts.js:42231 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 -#: rhodecode/public/js/src/rhodecode/comments.js:557 +#: rhodecode/public/js/scripts.js:43175 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 +#: rhodecode/public/js/src/rhodecode/comments.js:560 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/scripts.js:42305 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 -#: rhodecode/public/js/src/rhodecode/comments.js:631 +#: rhodecode/public/js/scripts.js:43249 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: rhodecode/public/js/scripts.js:42382 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 -#: rhodecode/public/js/src/rhodecode/comments.js:708 +#: rhodecode/public/js/scripts.js:43415 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/src/rhodecode/comments.js:800 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/scripts.js:42507 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 -#: rhodecode/public/js/src/rhodecode/comments.js:833 +#: rhodecode/public/js/scripts.js:43541 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 +#: rhodecode/public/js/src/rhodecode/comments.js:926 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/scripts.js:42785 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +#: rhodecode/public/js/scripts.js:43819 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107 #: rhodecode/public/js/src/rhodecode/files.js:248 msgid "truncated result" msgstr "" -#: rhodecode/public/js/scripts.js:42787 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 +#: rhodecode/public/js/scripts.js:43821 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108 #: rhodecode/public/js/src/rhodecode/files.js:250 msgid "truncated results" msgstr "" -#: rhodecode/public/js/scripts.js:42796 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/scripts.js:43830 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 #: rhodecode/public/js/src/rhodecode/files.js:259 msgid "No matching files" msgstr "" -#: rhodecode/public/js/scripts.js:42854 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: rhodecode/public/js/scripts.js:43888 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 #: rhodecode/public/js/src/rhodecode/files.js:317 msgid "Selection link" msgstr "" -#: rhodecode/public/js/scripts.js:42946 -#: rhodecode/public/js/src/rhodecode/files.js:409 +#: rhodecode/public/js/scripts.js:43981 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 +#: rhodecode/public/js/src/rhodecode/files.js:410 msgid "All Authors" msgstr "" -#: rhodecode/public/js/scripts.js:43081 +#: rhodecode/public/js/scripts.js:44117 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stopped watching this repository" msgstr "" -#: rhodecode/public/js/scripts.js:43082 +#: rhodecode/public/js/scripts.js:44118 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/public/js/src/rhodecode/followers.js:27 -#: rhodecode/templates/base/base.mako:226 +#: rhodecode/templates/base/base.mako:301 msgid "Watch" msgstr "" -#: rhodecode/public/js/scripts.js:43085 +#: rhodecode/public/js/scripts.js:44121 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/src/rhodecode/followers.js:30 msgid "Started watching this repository" msgstr "" -#: rhodecode/public/js/scripts.js:43086 +#: rhodecode/public/js/scripts.js:44122 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/public/js/src/rhodecode/followers.js:31 -#: rhodecode/templates/base/base.mako:224 +#: rhodecode/templates/base/base.mako:299 msgid "Unwatch" msgstr "" -#: rhodecode/public/js/scripts.js:43459 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:134 -msgid "All reviewers must vote." -msgstr "" - -#: rhodecode/public/js/scripts.js:43468 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:143 -msgid "All individual reviewers must vote." -msgstr "" - -#: rhodecode/public/js/scripts.js:43473 +#: rhodecode/public/js/scripts.js:44495 rhodecode/public/js/scripts.min.js:1 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:148 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:135 +msgid "All reviewers must vote." +msgstr "" + +#: rhodecode/public/js/scripts.js:44504 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:144 +msgid "All individual reviewers must vote." +msgstr "" + +#: rhodecode/public/js/scripts.js:44509 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:149 msgid "At least {0} reviewer must vote." msgstr "" -#: rhodecode/public/js/scripts.js:43479 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:154 +#: rhodecode/public/js/scripts.js:44515 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:155 msgid "At least {0} reviewers must vote." msgstr "" -#: rhodecode/public/js/scripts.js:43495 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:170 +#: rhodecode/public/js/scripts.js:44531 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:171 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/scripts.js:43502 +#: rhodecode/public/js/scripts.js:44538 rhodecode/public/js/scripts.min.js:1 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:177 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:178 msgid "Adding new reviewers is forbidden." msgstr "" -#: rhodecode/public/js/scripts.js:43509 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:184 +#: rhodecode/public/js/scripts.js:44545 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:185 msgid "Author is not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/scripts.js:43523 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:198 +#: rhodecode/public/js/scripts.js:44559 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:199 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/scripts.js:43631 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:306 +#: rhodecode/public/js/scripts.js:44667 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:307 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/scripts.js:43637 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:312 +#: rhodecode/public/js/scripts.js:44673 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:313 msgid "User `{0}` already in reviewers" msgstr "" -#: rhodecode/public/js/scripts.js:43725 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:400 +#: rhodecode/public/js/scripts.js:44773 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:413 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/scripts.js:43729 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:404 +#: rhodecode/public/js/scripts.js:44777 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:417 msgid "member of \"{0}\"" msgstr "" -#: rhodecode/public/js/scripts.js:44310 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: rhodecode/public/js/scripts.js:44953 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:608 +msgid "Updating..." +msgstr "" + +#: rhodecode/public/js/scripts.js:44963 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:618 +msgid "Force updating..." +msgstr "" + +#: rhodecode/public/js/scripts.js:49591 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 #: rhodecode/public/js/src/rhodecode.js:144 msgid "file" msgstr "" -#: rhodecode/public/js/scripts.js:44704 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 -#: rhodecode/public/js/src/rhodecode.js:538 +#: rhodecode/public/js/scripts.js:49735 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/src/rhodecode.js:288 +msgid "Loading..." +msgstr "" + +#: rhodecode/public/js/scripts.js:50104 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 +#: rhodecode/public/js/src/rhodecode.js:657 msgid "date not in future" msgstr "" -#: rhodecode/public/js/scripts.js:44712 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 -#: rhodecode/public/js/src/rhodecode.js:546 +#: rhodecode/public/js/scripts.js:50112 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/src/rhodecode.js:665 msgid "Specified expiration date" msgstr "" @@ -4690,248 +4796,260 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:506 -#: rhodecode/templates/codeblocks/diffs.mako:511 +#: rhodecode/templates/codeblocks/diffs.mako:594 +#: rhodecode/templates/codeblocks/diffs.mako:598 msgid "Add another comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 -msgid "Changed files" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 +msgid "Changed files" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:329 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:288 msgid "Close" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 msgid "Context file: " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 -msgid "Diff to Commit " -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 -msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." +msgid "Diff to Commit " msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 -msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." +msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 -msgid "Follow" +msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 -msgid "Hide full context diff" +msgid "Follow" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 -msgid "Hide whitespace changes" +msgid "Hide full context diff" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 +msgid "Hide whitespace changes" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 -msgid "No bookmarks available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 -msgid "No branches available yet." +msgid "No bookmarks available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 -msgid "No forks available yet." +msgid "No branches available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 +msgid "No forks available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 msgid "No gists available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 -msgid "No pull requests available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 -msgid "No repositories available yet." +msgid "No pull requests available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +msgid "No repositories available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 msgid "No repository groups available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 -msgid "No ssh keys available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 -msgid "No tags available yet." +msgid "No ssh keys available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 -msgid "No user groups available yet." +msgid "No tags available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 +msgid "No user groups available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 msgid "No users available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 -#: rhodecode/templates/commits/changelog.mako:78 -msgid "Open new pull request" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 +#: rhodecode/templates/commits/changelog.mako:78 +msgid "Open new pull request" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 #: rhodecode/public/js/src/i18n_messages.js:6 #: rhodecode/templates/admin/settings/settings_email.mako:50 msgid "Send" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 -msgid "Show full context diff" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 -#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:39 -msgid "Show more" +msgid "Show commit range {0} ... {1}" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 -msgid "Show selected commit __S" +msgid "Show full context diff" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 -msgid "Show selected commits __S ... __E" +#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:39 +msgid "Show more" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 -msgid "Show whitespace changes" +msgid "Show selected commit __S" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +msgid "Show selected commits __S ... __E" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -msgid "Start following this repository" +msgid "Show whitespace changes" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 -msgid "Stop following this repository" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 -#: rhodecode/public/js/src/i18n_messages.js:7 -msgid "Switch to chat" +msgid "Start following this repository" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 -#: rhodecode/public/js/src/i18n_messages.js:8 -msgid "Switch to comment" +msgid "Stop following this repository" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 -msgid "There are currently no open pull requests requiring your participation." +#: rhodecode/public/js/src/i18n_messages.js:7 +msgid "Switch to chat" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/src/i18n_messages.js:8 +msgid "Switch to comment" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +msgid "There are currently no open pull requests requiring your participation." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 msgid "Toggle Wide Mode diff" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 msgid "Unfollow" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -msgid "Updating..." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 -#: rhodecode/templates/admin/auth/auth_settings.mako:69 -msgid "activated" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 -msgid "disabled" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 -msgid "enabled" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 +#: rhodecode/templates/admin/auth/auth_settings.mako:69 +msgid "activated" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 +msgid "disabled" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 +msgid "enabled" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 msgid "files" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 -#: rhodecode/templates/pullrequests/pullrequest.mako:135 -msgid "loading..." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 -#: rhodecode/templates/admin/auth/auth_settings.mako:69 -msgid "not active" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 -msgid "specify commit" +msgid "go to numeric commit" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +#: rhodecode/templates/pullrequests/pullrequest.mako:136 +msgid "loading..." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 -msgid "{0} ({1} inactive) of {2} user groups ({3} inactive)" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 -msgid "{0} ({1} inactive) of {2} users ({3} inactive)" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 -msgid "{0} active out of {1} users" +#: rhodecode/templates/admin/auth/auth_settings.mako:69 +msgid "not active" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 +msgid "specify commit" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:109 -msgid "{0} days" +msgid "{0} ({1} inactive) of {2} user groups ({3} inactive)" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110 +msgid "{0} ({1} inactive) of {2} users ({3} inactive)" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:111 -msgid "{0} hours" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:114 -msgid "{0} months" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:115 -msgid "{0} out of {1} ssh keys" +msgid "{0} active out of {1} users" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:116 -msgid "{0} out of {1} users" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:119 -msgid "{0} user groups ({1} inactive)" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:120 -msgid "{0} users ({1} inactive)" +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:118 +msgid "{0} hours" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:121 +msgid "{0} months" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:122 +msgid "{0} of {1} repository groups" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:123 +msgid "{0} out of {1} ssh keys" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:124 +msgid "{0} out of {1} users" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:125 +msgid "{0} repository groups" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:128 +msgid "{0} user groups ({1} inactive)" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:129 +msgid "{0} users ({1} inactive)" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:131 msgid "{0} years" msgstr "" @@ -4943,58 +5061,45 @@ msgstr "" msgid "MathML" msgstr "" +#: rhodecode/public/js/src/rhodecode/comments.js:634 +msgid "Leave a resolution comment, or click resolve button to resolve TODO comment #{0}" +msgstr "" + #: rhodecode/templates/index.mako:5 msgid "Dashboard" msgstr "" #: rhodecode/templates/index_base.mako:20 -#: rhodecode/templates/admin/main.mako:34 -#: rhodecode/templates/admin/repos/repo_add.mako:22 -#: rhodecode/templates/admin/repos/repos.mako:31 -#: rhodecode/templates/base/base.mako:410 -msgid "Add Repository" -msgstr "" - -#: rhodecode/templates/index_base.mako:24 -#: rhodecode/templates/admin/main.mako:43 -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:16 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:31 -#: rhodecode/templates/base/base.mako:413 -msgid "Add Repository Group" -msgstr "" - -#: rhodecode/templates/index_base.mako:47 msgid "No repositories or repositories groups exists here." msgstr "" -#: rhodecode/templates/index_base.mako:65 -#: rhodecode/templates/index_base.mako:98 -#: rhodecode/templates/admin/gists/index.mako:107 +#: rhodecode/templates/index_base.mako:62 +#: rhodecode/templates/index_base.mako:153 +#: rhodecode/templates/admin/gists/gist_index.mako:107 #: rhodecode/templates/admin/integrations/list.mako:72 -#: 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_repos.mako:28 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:39 -#: rhodecode/templates/admin/my_account/my_account_watched.mako:31 +#: rhodecode/templates/admin/my_account/my_account_watched.mako:28 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:74 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:16 -#: rhodecode/templates/admin/repos/repos.mako:58 +#: rhodecode/templates/admin/repos/repos.mako:76 #: rhodecode/templates/admin/user_groups/user_groups.mako:76 #: rhodecode/templates/admin/users/user_edit_groups.mako:54 #: rhodecode/templates/base/perms_summary.mako:168 #: rhodecode/templates/base/perms_summary.mako:242 #: rhodecode/templates/bookmarks/bookmarks.mako:57 #: rhodecode/templates/branches/branches.mako:56 -#: rhodecode/templates/files/files_browser_tree.mako:11 -#: rhodecode/templates/pullrequests/pullrequests.mako:81 +#: rhodecode/templates/files/files_browser_tree.mako:13 #: rhodecode/templates/tags/tags.mako:57 msgid "Name" msgstr "" -#: rhodecode/templates/index_base.mako:68 -#: rhodecode/templates/index_base.mako:101 -#: rhodecode/templates/admin/gists/index.mako:109 +#: rhodecode/templates/index_base.mako:71 +#: rhodecode/templates/index_base.mako:162 +#: rhodecode/templates/admin/gists/gist_index.mako:109 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:72 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:57 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:10 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:57 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:44 @@ -5005,7 +5110,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:66 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:170 -#: rhodecode/templates/admin/repos/repos.mako:61 +#: rhodecode/templates/admin/repos/repos.mako:84 #: rhodecode/templates/admin/user_groups/user_group_add.mako:42 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 #: rhodecode/templates/admin/user_groups/user_groups.mako:78 @@ -5013,61 +5118,61 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:72 #: rhodecode/templates/admin/users/user_edit_groups.mako:59 #: rhodecode/templates/admin/users/user_edit_ips.mako:12 +#: rhodecode/templates/admin/users/user_edit_profile.mako:71 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:10 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:52 -#: rhodecode/templates/base/issue_tracker_settings.mako:10 -#: rhodecode/templates/changeset/changeset.mako:76 +#: rhodecode/templates/base/issue_tracker_settings.mako:78 #: rhodecode/templates/compare/compare_commits.mako:21 -#: rhodecode/templates/email_templates/commit_comment.mako:89 -#: rhodecode/templates/email_templates/pull_request_review.mako:41 -#: rhodecode/templates/email_templates/pull_request_review.mako:75 +#: rhodecode/templates/email_templates/pull_request_review.mako:43 +#: rhodecode/templates/email_templates/pull_request_review.mako:123 +#: rhodecode/templates/email_templates/pull_request_update.mako:43 +#: rhodecode/templates/email_templates/pull_request_update.mako:135 #: rhodecode/templates/forks/fork.mako:56 #: rhodecode/templates/forks/forks.mako:62 -#: rhodecode/templates/pullrequests/pullrequest.mako:49 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:166 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:480 +#: rhodecode/templates/pullrequests/pullrequest.mako:50 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:547 #: rhodecode/templates/summary/components.mako:159 +#: rhodecode/templates/user_group/profile.mako:25 +#: rhodecode/templates/users/user_profile.mako:59 msgid "Description" msgstr "" -#: rhodecode/templates/index_base.mako:71 -#: rhodecode/templates/index_base.mako:104 +#: rhodecode/templates/index_base.mako:78 +#: rhodecode/templates/index_base.mako:169 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:80 -#: rhodecode/templates/admin/repos/repos.mako:64 +#: rhodecode/templates/admin/repos/repos.mako:91 msgid "Last Change" msgstr "" -#: rhodecode/templates/index_base.mako:76 -#: rhodecode/templates/index_base.mako:109 +#: rhodecode/templates/index_base.mako:91 +#: rhodecode/templates/index_base.mako:182 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:50 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:8 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:84 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:6 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:152 -#: rhodecode/templates/admin/repos/repos.mako:69 +#: rhodecode/templates/admin/repos/repos.mako:104 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:6 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 #: rhodecode/templates/admin/user_groups/user_groups.mako:86 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 #: rhodecode/templates/forks/forks.mako:58 #: rhodecode/templates/summary/components.mako:148 -#: rhodecode/templates/user_group/profile.mako:24 +#: rhodecode/templates/user_group/profile.mako:35 msgid "Owner" msgstr "" -#: rhodecode/templates/index_base.mako:107 -#: 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:67 +#: rhodecode/templates/index_base.mako:176 +#: rhodecode/templates/admin/repos/repos.mako:98 #: rhodecode/templates/bookmarks/bookmarks.mako:64 #: rhodecode/templates/branches/branches.mako:63 -#: rhodecode/templates/changeset/changeset.mako:33 #: 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/files/file_authors_box.mako:26 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 +#: rhodecode/templates/email_templates/commit_comment.mako:56 +#: rhodecode/templates/email_templates/commit_comment.mako:109 +#: rhodecode/templates/email_templates/commit_comment.mako:135 +#: rhodecode/templates/files/file_authors_box.mako:28 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:545 #: rhodecode/templates/search/search_commit.mako:9 #: rhodecode/templates/summary/components.mako:117 #: rhodecode/templates/summary/components.mako:125 @@ -5082,8 +5187,8 @@ msgid "%s Repository group dashboard" msgstr "" #: rhodecode/templates/index_repo_group.mako:13 -#: rhodecode/templates/base/base.mako:611 -#: rhodecode/templates/base/base.mako:612 +#: rhodecode/templates/base/base.mako:773 +#: rhodecode/templates/base/base.mako:774 msgid "Home" msgstr "" @@ -5121,7 +5226,7 @@ msgid "Please contact " msgstr "" #: rhodecode/templates/login.mako:84 rhodecode/templates/password_reset.mako:39 -#: rhodecode/templates/base/base.mako:50 +#: rhodecode/templates/base/base.mako:59 msgid "Support" msgstr "" @@ -5191,19 +5296,19 @@ msgid "Re-enter password" msgstr "" #: rhodecode/templates/register.mako:81 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:35 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:37 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:32 #: rhodecode/templates/admin/users/user_add.mako:68 -#: rhodecode/templates/admin/users/user_edit_profile.mako:46 +#: rhodecode/templates/admin/users/user_edit_profile.mako:44 #: rhodecode/templates/admin/users/users.mako:78 msgid "First Name" msgstr "" #: rhodecode/templates/register.mako:88 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:45 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:47 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:41 #: rhodecode/templates/admin/users/user_add.mako:77 -#: rhodecode/templates/admin/users/user_edit_profile.mako:55 +#: rhodecode/templates/admin/users/user_edit_profile.mako:53 #: rhodecode/templates/admin/users/users.mako:80 msgid "Last Name" msgstr "" @@ -5229,7 +5334,7 @@ msgid "Audit long entry" msgstr "" #: rhodecode/templates/admin/admin_audit_log_entry.mako:34 -#: rhodecode/templates/users/user.mako:4 rhodecode/templates/users/user.mako:11 +#: rhodecode/templates/users/user.mako:4 msgid "User" msgstr "" @@ -5249,12 +5354,11 @@ msgstr "" #: rhodecode/templates/admin/admin_audit_log_entry.mako:63 #: rhodecode/templates/admin/admin_log_base.mako:8 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:19 -#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:13 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:55 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:86 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 -#: rhodecode/templates/admin/repos/repos.mako:73 +#: rhodecode/templates/admin/repos/repos.mako:116 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 #: rhodecode/templates/admin/user_groups/user_groups.mako:88 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:19 @@ -5279,16 +5383,16 @@ msgstr "" #: rhodecode/templates/admin/admin_log_base.mako:10 #: rhodecode/templates/admin/defaults/defaults.mako:32 #: rhodecode/templates/admin/permissions/permissions_objects.mako:16 -#: rhodecode/templates/base/base.mako:486 -#: rhodecode/templates/base/base.mako:488 -#: rhodecode/templates/base/base.mako:490 +#: rhodecode/templates/base/base.mako:653 +#: rhodecode/templates/base/base.mako:655 +#: rhodecode/templates/base/base.mako:657 #: rhodecode/templates/search/search_commit.mako:8 #: rhodecode/templates/search/search_path.mako:7 msgid "Repository" msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:5 -#: rhodecode/templates/base/base.mako:102 +#: rhodecode/templates/base/base.mako:106 msgid "Admin audit logs" msgstr "" @@ -5298,7 +5402,7 @@ msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:26 #: rhodecode/templates/admin/repos/repo_edit_audit.mako:15 -#: rhodecode/templates/admin/users/user_edit_audit.mako:15 +#: rhodecode/templates/admin/users/user_edit_audit.mako:16 #: rhodecode/templates/journal/journal.mako:13 msgid "filter" msgstr "" @@ -5311,7 +5415,7 @@ msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:29 #: rhodecode/templates/admin/repos/repo_edit_audit.mako:18 -#: rhodecode/templates/admin/users/user_edit_audit.mako:18 +#: rhodecode/templates/admin/users/user_edit_audit.mako:19 #: rhodecode/templates/journal/journal.mako:16 msgid "Example Queries" msgstr "" @@ -5341,10 +5445,22 @@ msgstr "" msgid "Repositories under administration" msgstr "" +#: rhodecode/templates/admin/main.mako:34 +#: rhodecode/templates/admin/repos/repo_add.mako:22 +#: rhodecode/templates/admin/repos/repos.mako:31 +msgid "Add Repository" +msgstr "" + #: rhodecode/templates/admin/main.mako:39 msgid "Repository groups under administration" msgstr "" +#: rhodecode/templates/admin/main.mako:43 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:16 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:31 +msgid "Add Repository Group" +msgstr "" + #: rhodecode/templates/admin/main.mako:48 msgid "User groups under administration" msgstr "" @@ -5393,24 +5509,20 @@ msgstr "" #: rhodecode/templates/admin/auth/auth_settings.mako:85 #: rhodecode/templates/admin/auth/plugin_settings.mako:96 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:63 -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:108 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:109 #: rhodecode/templates/admin/permissions/permissions_application.mako:59 #: rhodecode/templates/admin/permissions/permissions_objects.mako:59 -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:77 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:205 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:83 -#: rhodecode/templates/admin/repos/repo_add_base.mako:106 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:206 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:71 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:79 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:187 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:191 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:243 #: rhodecode/templates/admin/settings/settings_hooks.mako:63 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15 -#: rhodecode/templates/admin/user_groups/user_group_add.mako:59 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:192 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:102 -#: rhodecode/templates/admin/users/user_add.mako:128 #: rhodecode/templates/admin/users/user_edit_groups.mako:27 -#: rhodecode/templates/admin/users/user_edit_profile.mako:134 +#: rhodecode/templates/admin/users/user_edit_profile.mako:145 #: rhodecode/templates/base/default_perms_box.mako:88 msgid "Save" msgstr "" @@ -5429,22 +5541,23 @@ msgid "Default Settings For New Reposito msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 -#: rhodecode/templates/admin/gists/index.mako:105 +#: rhodecode/templates/admin/gists/gist_index.mako:105 #: rhodecode/templates/admin/integrations/list.mako:73 -#: rhodecode/templates/admin/repos/repo_add_base.mako:43 +#: rhodecode/templates/admin/repos/repo_add_base.mako:57 #: 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:98 +#: rhodecode/templates/admin/repos/repo_add_base.mako:89 msgid "Private Repository" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:102 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:192 -#: rhodecode/templates/forks/fork.mako:95 +#: rhodecode/templates/forks/fork.mako:85 msgid "Private repositories are only visible to people explicitly added as collaborators." msgstr "" @@ -5472,88 +5585,85 @@ msgstr "" msgid "Enable automatic repository locking. Pulling from a repository will lock it, and it is unlocked by pushing back by the same user." msgstr "" -#: rhodecode/templates/admin/gists/edit.mako:5 -#: rhodecode/templates/admin/gists/edit.mako:12 +#: rhodecode/templates/admin/gists/gist_edit.mako:5 msgid "Edit Gist" msgstr "" -#: rhodecode/templates/admin/gists/edit.mako:33 -#: rhodecode/templates/admin/gists/new.mako:30 +#: rhodecode/templates/admin/gists/gist_edit.mako:33 +#: rhodecode/templates/admin/gists/gist_new.mako:34 +msgid "Gist lifetime" +msgstr "" + +#: rhodecode/templates/admin/gists/gist_edit.mako:36 +msgid "Gist access level" +msgstr "" + +#: rhodecode/templates/admin/gists/gist_edit.mako:40 +#: rhodecode/templates/admin/gists/gist_new.mako:40 msgid "Gist description ..." msgstr "" -#: rhodecode/templates/admin/gists/edit.mako:38 -#: rhodecode/templates/admin/gists/new.mako:38 -msgid "Gist lifetime" -msgstr "" - -#: rhodecode/templates/admin/gists/edit.mako:41 -#: rhodecode/templates/admin/gists/new.mako:41 -msgid "Gist access level" -msgstr "" - -#: rhodecode/templates/admin/gists/edit.mako:56 -#: rhodecode/templates/admin/gists/new.mako:50 +#: rhodecode/templates/admin/gists/gist_edit.mako:54 +#: rhodecode/templates/admin/gists/gist_new.mako:48 #: rhodecode/templates/files/files_add.mako:68 #: rhodecode/templates/files/files_edit.mako:69 msgid "plain" msgstr "" -#: rhodecode/templates/admin/gists/edit.mako:101 +#: rhodecode/templates/admin/gists/gist_edit.mako:99 msgid "Update Gist" msgstr "" -#: rhodecode/templates/admin/gists/edit.mako:102 -#: rhodecode/templates/base/issue_tracker_settings.mako:73 -#: rhodecode/templates/changeset/changeset_file_comment.mako:392 -#: rhodecode/templates/codeblocks/diffs.mako:72 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:61 +#: rhodecode/templates/admin/gists/gist_edit.mako:100 +#: rhodecode/templates/base/issue_tracker_settings.mako:150 +#: rhodecode/templates/changeset/changeset_file_comment.mako:391 +#: rhodecode/templates/codeblocks/diffs.mako:84 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:75 msgid "Cancel" msgstr "" -#: rhodecode/templates/admin/gists/edit.mako:125 +#: rhodecode/templates/admin/gists/gist_edit.mako:123 #, python-format msgid "Gist was updated since you started editing. Copy your changes and click %(here)s to reload the new version." msgstr "" -#: rhodecode/templates/admin/gists/index.mako:6 +#: rhodecode/templates/admin/gists/gist_index.mako:6 msgid "Private Gists for user {}" msgstr "" -#: rhodecode/templates/admin/gists/index.mako:8 +#: rhodecode/templates/admin/gists/gist_index.mako:8 msgid "Public Gists for user {}" msgstr "" -#: rhodecode/templates/admin/gists/index.mako:10 +#: rhodecode/templates/admin/gists/gist_index.mako:10 msgid "Public Gists" msgstr "" -#: rhodecode/templates/admin/gists/index.mako:30 +#: rhodecode/templates/admin/gists/gist_index.mako:30 msgid "All gists" msgstr "" -#: rhodecode/templates/admin/gists/index.mako:32 +#: rhodecode/templates/admin/gists/gist_index.mako:32 msgid "All public" msgstr "" -#: rhodecode/templates/admin/gists/index.mako:34 +#: rhodecode/templates/admin/gists/gist_index.mako:34 msgid "My gists" msgstr "" -#: rhodecode/templates/admin/gists/index.mako:35 +#: rhodecode/templates/admin/gists/gist_index.mako:35 msgid "My private" msgstr "" -#: rhodecode/templates/admin/gists/index.mako:36 +#: rhodecode/templates/admin/gists/gist_index.mako:36 msgid "My public" msgstr "" -#: rhodecode/templates/admin/gists/index.mako:43 -#: rhodecode/templates/admin/gists/show.mako:35 +#: rhodecode/templates/admin/gists/gist_index.mako:43 msgid "Create New Gist" msgstr "" -#: rhodecode/templates/admin/gists/index.mako:54 +#: rhodecode/templates/admin/gists/gist_index.mako:54 #: 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 @@ -5564,27 +5674,27 @@ msgstr "" #: rhodecode/templates/bookmarks/bookmarks.mako:33 #: rhodecode/templates/branches/branches.mako:33 #: rhodecode/templates/journal/journal.mako:12 +#: rhodecode/templates/pullrequests/pullrequests.mako:53 #: rhodecode/templates/tags/tags.mako:33 msgid "quick filter..." msgstr "" -#: rhodecode/templates/admin/gists/index.mako:103 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:57 +#: rhodecode/templates/admin/gists/gist_index.mako:103 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:59 #: rhodecode/templates/bookmarks/bookmarks.mako:61 #: rhodecode/templates/branches/branches.mako:60 -#: rhodecode/templates/changeset/changeset.mako:195 #: rhodecode/templates/commits/changelog.mako:119 #: rhodecode/templates/compare/compare_commits.mako:18 -#: rhodecode/templates/files/files_browser_tree.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:477 -#: rhodecode/templates/pullrequests/pullrequests.mako:83 -#: rhodecode/templates/search/search_commit.mako:19 +#: rhodecode/templates/files/files_browser_tree.mako:17 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:544 +#: rhodecode/templates/pullrequests/pullrequests.mako:98 +#: rhodecode/templates/search/search_commit.mako:18 #: rhodecode/templates/summary/summary_commits.mako:11 #: rhodecode/templates/tags/tags.mako:61 msgid "Author" msgstr "" -#: rhodecode/templates/admin/gists/index.mako:111 +#: rhodecode/templates/admin/gists/gist_index.mako:111 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:51 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:9 @@ -5592,71 +5702,92 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:7 #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:11 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:52 msgid "Created on" msgstr "" -#: rhodecode/templates/admin/gists/index.mako:113 -#: rhodecode/templates/admin/gists/show.mako:72 +#: rhodecode/templates/admin/gists/gist_index.mako:113 msgid "Expires" msgstr "" -#: rhodecode/templates/admin/gists/new.mako:5 -#: rhodecode/templates/admin/gists/new.mako:12 +#: rhodecode/templates/admin/gists/gist_new.mako:5 +#: rhodecode/templates/base/base.mako:572 msgid "New Gist" msgstr "" -#: rhodecode/templates/admin/gists/new.mako:35 +#: rhodecode/templates/admin/gists/gist_new.mako:31 msgid "Gist id" msgstr "" -#: rhodecode/templates/admin/gists/new.mako:36 +#: rhodecode/templates/admin/gists/gist_new.mako:32 msgid "Auto generated" msgstr "" -#: rhodecode/templates/admin/gists/new.mako:49 -msgid "name this file..." -msgstr "" - -#: rhodecode/templates/admin/gists/new.mako:60 -msgid "Create Private Gist" -msgstr "" - -#: rhodecode/templates/admin/gists/new.mako:61 -msgid "Create Public Gist" -msgstr "" - -#: rhodecode/templates/admin/gists/show.mako:13 -#: rhodecode/templates/admin/gists/show.mako:20 +#: rhodecode/templates/admin/gists/gist_new.mako:37 +msgid "Private Gist access level" +msgstr "" + +#: rhodecode/templates/admin/gists/gist_new.mako:47 +msgid "name gist file..." +msgstr "" + +#: rhodecode/templates/admin/gists/gist_new.mako:61 +msgid "Create Gist" +msgstr "" + +#: rhodecode/templates/admin/gists/gist_new.mako:69 +#: rhodecode/templates/admin/gists/gist_new.mako:70 +#: rhodecode/templates/data_table/_dt_elements.mako:344 +msgid "Private Gist" +msgstr "" + +#: rhodecode/templates/admin/gists/gist_new.mako:70 +msgid "Private Gists are not listed and only accessible through their secret url." +msgstr "" + +#: rhodecode/templates/admin/gists/gist_new.mako:73 +#: rhodecode/templates/admin/gists/gist_new.mako:74 +#: rhodecode/templates/data_table/_dt_elements.mako:342 +msgid "Public Gist" +msgstr "" + +#: rhodecode/templates/admin/gists/gist_new.mako:74 +msgid "Public Gists are accessible to anyone and listed in Gists page." +msgstr "" + +#: rhodecode/templates/admin/gists/gist_show.mako:14 +#: rhodecode/templates/admin/gists/gist_show.mako:21 msgid "Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:47 +#: rhodecode/templates/admin/gists/gist_show.mako:41 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:60 +#: rhodecode/templates/admin/gists/gist_show.mako:47 +#: rhodecode/templates/files/files_source.mako:106 msgid "Copy content" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:65 +#: rhodecode/templates/admin/gists/gist_show.mako:52 msgid "Show as Raw" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:69 -msgid "Private Gist" -msgstr "" - -#: rhodecode/templates/admin/gists/show.mako:85 +#: rhodecode/templates/admin/gists/gist_show.mako:57 +msgid "Confirm to delete this Gist" +msgstr "" + +#: rhodecode/templates/admin/gists/gist_show.mako:70 msgid "created" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:100 +#: rhodecode/templates/admin/gists/gist_show.mako:71 +msgid "expires" +msgstr "" + +#: rhodecode/templates/admin/gists/gist_show.mako:92 #: rhodecode/templates/files/files_delete.mako:58 -#: rhodecode/templates/files/files_source.mako:133 +#: rhodecode/templates/files/files_source.mako:125 msgid "Show as raw" msgstr "" @@ -5676,7 +5807,7 @@ msgstr "" #: rhodecode/templates/admin/integrations/new.mako:15 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:33 #: rhodecode/templates/admin/repos/repo_edit.mako:74 -#: rhodecode/templates/base/base.mako:109 +#: rhodecode/templates/base/base.mako:113 msgid "Integrations" msgstr "" @@ -5690,7 +5821,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:42 #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:34 -#: rhodecode/templates/base/base.mako:111 +#: rhodecode/templates/base/base.mako:115 msgid "Settings" msgstr "" @@ -5746,6 +5877,7 @@ msgid "Create one" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:132 +#: rhodecode/templates/hovercards/hovercard_pull_request.mako:19 msgid "repo" msgstr "" @@ -5790,7 +5922,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:462 +#: rhodecode/templates/base/base.mako:617 msgid "My account" msgstr "" @@ -5799,16 +5931,21 @@ msgid "My Account" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:29 -#: rhodecode/templates/email_templates/user_registration.mako:26 -#: rhodecode/templates/users/user.mako:29 +#: rhodecode/templates/email_templates/user_registration.mako:54 msgid "Profile" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:32 -msgid "Auth Tokens" +#: rhodecode/templates/admin/my_account/my_account.mako:30 +#: rhodecode/templates/admin/users/user_edit.mako:45 +#: rhodecode/templates/debug_style/index.html:55 +msgid "Emails" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:33 +msgid "Auth Tokens" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:34 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:3 #: rhodecode/templates/admin/permissions/permissions.mako:51 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:4 @@ -5817,41 +5954,39 @@ msgstr "" msgid "SSH Keys" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:34 +#: rhodecode/templates/admin/my_account/my_account.mako:35 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:5 msgid "User Group Membership" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:39 +#: rhodecode/templates/admin/my_account/my_account.mako:40 msgid "External Identities" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:41 -#: rhodecode/templates/admin/users/user_edit.mako:45 -msgid "Emails" -msgstr "" - #: rhodecode/templates/admin/my_account/my_account.mako:43 -msgid "Watched" +msgid "Owned Repositories" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:44 -#: rhodecode/templates/admin/notifications/notifications_show_all.mako:42 -#: rhodecode/templates/base/base.mako:303 -#: rhodecode/templates/base/base.mako:466 -msgid "Pull Requests" +msgid "Watched Repositories" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:45 -#: rhodecode/templates/admin/permissions/permissions.mako:14 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:31 -#: rhodecode/templates/admin/repos/repo_edit.mako:45 -#: rhodecode/templates/admin/user_groups/user_group_edit.mako:35 -#: rhodecode/templates/base/base.mako:107 -msgid "Permissions" +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:42 +#: rhodecode/templates/base/base.mako:376 +#: rhodecode/templates/base/base.mako:621 +msgid "Pull Requests" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:46 +#: rhodecode/templates/admin/permissions/permissions.mako:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:31 +#: rhodecode/templates/admin/user_groups/user_group_edit.mako:35 +#: rhodecode/templates/base/base.mako:111 +msgid "Permissions" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:47 msgid "Live Notifications" msgstr "" @@ -5926,63 +6061,63 @@ msgstr "" msgid "Position" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:16 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:17 msgid "Bookmark title (max 30 characters, optional)" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:23 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:24 msgid "Clear" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:29 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:30 msgid "Server URL is available as ${server_url} variable. E.g. Redirect url: ${server_url}/_admin/exception_tracker" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:33 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:34 msgid "Redirect URL" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:43 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:44 msgid "Repository template" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:49 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:50 msgid "Repository group template" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:55 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:56 msgid "Template Repository or Repository group" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:65 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:66 msgid "Available as ${repo_url} e.g. Redirect url: ${repo_url}/changelog" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:67 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:68 msgid "Available as ${repo_group_url} e.g. Redirect url: ${repo_group_url}" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:69 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:70 msgid "Available as full url variables in redirect url. i.e: ${repo_url}, ${repo_group_url}." msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:79 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:80 msgid "Your Bookmarks" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:84 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:85 msgid "Store upto 10 bookmark links to favorite repositories, external issue tracker or CI server. " msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:86 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:87 msgid "Bookmarks are accessible from your username dropdown or by keyboard shortcut `g 0-9`" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:140 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:141 msgid "repository" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:191 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:192 msgid "repository group" msgstr "" @@ -6016,15 +6151,15 @@ msgstr "" msgid "Source type" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_notifications.mako:22 +#: rhodecode/templates/admin/my_account/my_account_notifications.mako:4 msgid "Your Live Notification Settings" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_notifications.mako:34 +#: rhodecode/templates/admin/my_account/my_account_notifications.mako:16 msgid "Notifications Status" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_notifications.mako:47 +#: rhodecode/templates/admin/my_account/my_account_notifications.mako:40 msgid "Test Notifications" msgstr "" @@ -6032,20 +6167,20 @@ msgstr "" msgid "Change Your Account Password" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:6 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 msgid "My Profile" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_profile.mako:11 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:13 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:54 -#: rhodecode/templates/admin/users/user_edit_profile.mako:25 -#: rhodecode/templates/users/user_profile.mako:14 +#: rhodecode/templates/admin/users/user_edit_profile.mako:23 +#: rhodecode/templates/users/user_profile.mako:15 msgid "Photo" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_profile.mako:59 -#: rhodecode/templates/users/user_profile.mako:62 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:71 +#: rhodecode/templates/users/user_profile.mako:73 msgid "Missing email, please update your user email address." msgstr "" @@ -6062,21 +6197,26 @@ msgstr "" msgid "Pull Requests You Participate In" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:53 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:51 msgid "Target Repo" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:59 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:55 +#: rhodecode/templates/pullrequests/pullrequests.mako:94 +msgid "Id" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:57 #: rhodecode/templates/admin/settings/settings_global.mako:9 -#: rhodecode/templates/email_templates/pull_request_review.mako:39 -#: rhodecode/templates/email_templates/pull_request_review.mako:72 -#: rhodecode/templates/pullrequests/pullrequest.mako:40 -#: rhodecode/templates/pullrequests/pullrequests.mako:85 +#: rhodecode/templates/email_templates/pull_request_review.mako:41 +#: rhodecode/templates/email_templates/pull_request_update.mako:41 +#: rhodecode/templates/pullrequests/pullrequest.mako:38 +#: rhodecode/templates/pullrequests/pullrequests.mako:96 msgid "Title" msgstr "" #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:63 -#: rhodecode/templates/pullrequests/pullrequests.mako:89 +#: rhodecode/templates/pullrequests/pullrequests.mako:102 msgid "Last Update" msgstr "" @@ -6131,15 +6271,15 @@ msgid "Click add to use this generated S msgstr "" #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:49 -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:41 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:47 #: rhodecode/templates/admin/user_groups/user_group_add.mako:51 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:51 #: rhodecode/templates/admin/user_groups/user_groups.mako:84 #: 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:89 +#: rhodecode/templates/admin/users/user_edit_profile.mako:101 #: rhodecode/templates/admin/users/users.mako:85 -#: rhodecode/templates/user_group/profile.mako:34 +#: rhodecode/templates/user_group/profile.mako:44 msgid "Active" msgstr "" @@ -6161,16 +6301,20 @@ msgstr "" #: rhodecode/templates/admin/notifications/notifications_show.mako:5 #: rhodecode/templates/admin/notifications/notifications_show.mako:14 +#: rhodecode/templates/debug_style/email_plain_rendered.mako:5 +#: rhodecode/templates/debug_style/email_plain_rendered.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:20 +#: rhodecode/templates/debug_style/email_plain_rendered.mako:12 msgid "My Notifications" msgstr "" -#: rhodecode/templates/admin/notifications/notifications_show.mako:40 +#: rhodecode/templates/admin/notifications/notifications_show.mako:42 +#: rhodecode/templates/debug_style/email_plain_rendered.mako:38 msgid "Subject" msgstr "" @@ -6188,7 +6332,8 @@ msgid "All" msgstr "" #: rhodecode/templates/admin/notifications/notifications_show_all.mako:41 -#: rhodecode/templates/changeset/changeset.mako:158 +#: rhodecode/templates/changeset/changeset.mako:172 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:656 msgid "Comments" msgstr "" @@ -6357,8 +6502,8 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:104 -#: rhodecode/templates/base/base.mako:125 +#: rhodecode/templates/base/base.mako:108 +#: rhodecode/templates/base/base.mako:129 msgid "Repository groups" msgstr "" @@ -6371,10 +6516,10 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:44 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:25 -#: rhodecode/templates/admin/repos/repo_add_base.mako:52 +#: rhodecode/templates/admin/repos/repo_add_base.mako:43 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:33 -#: rhodecode/templates/base/base.mako:499 -#: rhodecode/templates/data_table/_dt_elements.mako:208 +#: rhodecode/templates/base/base.mako:666 +#: rhodecode/templates/data_table/_dt_elements.mako:215 #: rhodecode/templates/forks/fork.mako:41 msgid "Repository group" msgstr "" @@ -6385,15 +6530,19 @@ msgid "Plain text format with support of msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:68 -#: rhodecode/templates/admin/repos/repo_add_base.mako:89 +#: rhodecode/templates/admin/repos/repo_add_base.mako:80 msgid "Copy Parent Group Permissions" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 -#: rhodecode/templates/admin/repos/repo_add_base.mako:93 +#: rhodecode/templates/admin/repos/repo_add_base.mako:84 msgid "Copy permissions from parent repository group." msgstr "" +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:77 +msgid "Create Repository Group" +msgstr "" + #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:5 #, python-format msgid "%s repository group settings" @@ -6416,44 +6565,54 @@ msgid "Updated on" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:11 -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:10 -msgid "Cached Commit date" +msgid "Cached Commit source" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:12 -msgid "Cached Commit repo_id" -msgstr "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:14 -msgid "Is Personal Group" -msgstr "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:16 -msgid "Total repositories" +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:9 +msgid "Cached Commit id" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:13 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:10 +msgid "Cached Commit date" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:15 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:11 +msgid "Cached Commit data" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:17 -msgid "Top level repositories" +msgid "Is Personal Group" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:19 +msgid "Total repositories" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:20 +msgid "Top level repositories" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:22 msgid "Children groups" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:25 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:28 msgid "Repository Group Advanced: {}" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:35 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:38 msgid "Delete repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:64 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:67 #, python-format msgid "Confirm to delete this group: %s" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:65 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:68 msgid "Delete this repository group" msgstr "" @@ -6470,7 +6629,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:32 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:31 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:33 -msgid "super admin" +msgid "super-admin" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:35 @@ -6496,9 +6655,9 @@ msgid "inactive duplicate" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:77 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:156 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:157 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:106 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:151 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:155 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:46 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:79 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:158 @@ -6510,27 +6669,27 @@ msgstr "" msgid "delegated admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:151 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:146 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:152 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:150 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:153 msgid "members" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:183 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:178 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:184 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:182 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:184 msgid "Add user/user group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:193 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:194 msgid "Apply to children" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:199 -msgid "Both" -msgstr "" - #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:200 +msgid "Both" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:201 msgid "Set or revoke permissions to selected types of children of this group, including non-private repositories and other groups if chosen." msgstr "" @@ -6546,22 +6705,10 @@ msgstr "" 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: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 "" - #: rhodecode/templates/admin/repo_groups/repo_groups.mako:5 msgid "Repository groups administration" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:26 -msgid "repository groups" -msgstr "" - #: rhodecode/templates/admin/repo_groups/repo_groups.mako:82 msgid "Number of top level repositories" msgstr "" @@ -6579,41 +6726,34 @@ msgid "Import Existing Repository ?" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:248 +#: rhodecode/templates/base/base.mako:323 msgid "Clone from" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 -msgid "Set the type of repository to create." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_add_base.mako:58 +#: rhodecode/templates/admin/repos/repo_add_base.mako:49 #: rhodecode/templates/forks/fork.mako:47 #, python-format msgid "Select my personal group (%(repo_group_name)s)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:61 +#: rhodecode/templates/admin/repos/repo_add_base.mako:52 #: rhodecode/templates/forks/fork.mako:50 msgid "Optionally select a group to put this repository into." msgstr "" +#: rhodecode/templates/admin/repos/repo_add_base.mako:61 +msgid "Set the type of repository to create." +msgstr "" + #: rhodecode/templates/admin/repos/repo_add_base.mako:71 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:177 +#: rhodecode/templates/admin/users/user_edit_profile.mako:76 #: rhodecode/templates/forks/fork.mako:61 msgid "Plain text format with support of {metatags}. Add a README file for longer descriptions" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:80 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:141 -#: rhodecode/templates/forks/fork.mako:71 -msgid "Landing commit" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_add_base.mako:84 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:146 -#: rhodecode/templates/forks/fork.mako:75 -msgid "The default commit for file pages, downloads, full text search index, and README generation." +#: rhodecode/templates/admin/repos/repo_add_base.mako:97 +msgid "Create Repository" msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:5 @@ -6630,8 +6770,11 @@ msgid "Repository \"%(repo_name)s\" is b msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:8 -#, python-format -msgid "%s repository settings" +msgid "{} repository settings" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:45 +msgid "Access Permissions" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:48 @@ -6685,133 +6828,129 @@ msgstr "" msgid "Repository ID" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:9 -msgid "Cached Commit id" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:11 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:12 msgid "Attached scoped tokens" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:12 -msgid "Pull requests source" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:13 -msgid "Pull requests target" +msgid "Pull requests source" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:14 +msgid "Pull requests target" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:15 msgid "Attached Artifacts" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:20 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:21 #, python-format msgid "Repository: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:30 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:31 msgid "Fork Reference" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:37 #, python-format msgid "This repository is a fork of %(repo_link)s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:42 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:43 msgid "Set" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:45 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:46 msgid "Manually set this repository as a fork of another from the list" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:54 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:55 msgid "Public Journal Visibility" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:61 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:62 msgid "Remove from Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:65 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:66 msgid "Add to Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:70 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:71 msgid "All actions made on this repository will be visible to everyone following the public journal." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:79 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:80 msgid "Locking state" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:88 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:89 msgid "This Repository is not currently locked." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:95 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:96 msgid "Confirm to unlock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:97 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:98 msgid "Unlock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:102 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:103 msgid "Confirm to lock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:104 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:105 msgid "Lock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:110 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:111 msgid "Force repository locking. This only works when anonymous access is disabled. Pulling from the repository locks the repository to that user until the same user pushes to that repository again." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:120 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:121 msgid "Hooks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:124 -msgid "Hook type" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:125 -msgid "Hook version" +msgid "Hook type" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:126 +msgid "Hook version" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:127 msgid "Current version" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130 msgid "PRE HOOK" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:134 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:135 msgid "POST HOOK" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:140 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:141 msgid "Unable to read hook information from VCS Server" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:146 -msgid "Confirm to reinstall hooks for this repository." -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:147 +msgid "Confirm to reinstall hooks for this repository." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:148 msgid "Update Hooks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:154 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:155 msgid "Archive repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:163 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:164 #, python-format msgid "Confirm to archive this repository: %s" msgstr "" @@ -6841,24 +6980,24 @@ msgid "Consider to archive this reposito msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:219 -#: rhodecode/templates/data_table/_dt_elements.mako:173 +#: rhodecode/templates/data_table/_dt_elements.mako:180 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:221 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:220 msgid "Delete this repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:226 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:225 msgid "This repository will be renamed in a special way in order to make it inaccessible to RhodeCode Enterprise and its VCS systems. If you need to fully delete it from the file system, please do it manually, or with rhodecode-cleanup-repos command available in rhodecode-tools." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:260 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:259 msgid "Change repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:260 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:259 msgid "Pick repository" msgstr "" @@ -6867,7 +7006,7 @@ msgid "Repository Audit Logs" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_audit.mako:14 -#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "audit filter..." msgstr "" @@ -6895,45 +7034,59 @@ msgstr "" msgid "Confirm to invalidate repository cache" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:39 -#: rhodecode/templates/admin/repos/repo_edit_fields.mako:11 -msgid "Key" +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:32 +msgid "Invalidation keys" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:40 -msgid "Namespace" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:58 -msgid "Cache keys" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:77 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:84 #: rhodecode/templates/admin/users/user_edit_caches.mako:19 msgid "Show all" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:95 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:44 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:88 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:11 +msgid "Key" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:45 +msgid "State UID" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:46 +msgid "Namespace" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:65 +msgid "Cache keys" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:89 +msgid "Region" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:106 msgid "Shadow Repositories" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:107 -msgid "No Shadow repositories exist for this repository." -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit_caches.mako:118 +msgid "No Shadow repositories exist for this repository." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:129 msgid "Diff Caches" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:123 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:137 msgid "Cached diff name" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:131 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:145 msgid "Cached diff files" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:135 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:149 msgid "Cached diff size" msgstr "" @@ -6988,18 +7141,17 @@ msgid "Inherited Issue Tracker Patterns" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:30 -#: rhodecode/templates/base/issue_tracker_settings.mako:11 +#: rhodecode/templates/base/issue_tracker_settings.mako:79 #: rhodecode/templates/base/perms_summary.mako:169 msgid "Pattern" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:31 -#: rhodecode/templates/base/issue_tracker_settings.mako:12 +#: rhodecode/templates/base/issue_tracker_settings.mako:80 msgid "Url" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:32 -#: rhodecode/templates/base/issue_tracker_settings.mako:13 msgid "Prefix" msgstr "" @@ -7038,7 +7190,7 @@ msgid "Performing Maintenance" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:5 -msgid "Repository Permissions" +msgid "Repository Access Permissions" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:55 @@ -7057,6 +7209,10 @@ msgstr "" msgid "used by {} branch rules, requires write+ permissions" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110 +msgid "set private mode" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako:3 msgid "Repository Branch Permissions." msgstr "" @@ -7180,12 +7336,20 @@ msgstr "" msgid "http[s] url to sync data back. This field can used for doing {sync_link}." msgstr "" +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:141 +msgid "Landing commit" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:146 +msgid "The default commit for file pages, downloads, full text search index, and README generation." +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_settings.mako:164 msgid "Change owner of this repository." msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:187 -#: rhodecode/templates/data_table/_dt_elements.mako:92 +#: rhodecode/templates/data_table/_dt_elements.mako:104 msgid "Private repository" msgstr "" @@ -7307,11 +7471,7 @@ msgstr "" msgid "Repositories administration" msgstr "" -#: rhodecode/templates/admin/repos/repos.mako:26 -msgid "repositories" -msgstr "" - -#: rhodecode/templates/admin/repos/repos.mako:71 +#: rhodecode/templates/admin/repos/repos.mako:110 msgid "State" msgstr "" @@ -7444,7 +7604,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:69 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:80 msgid "Personal Repository Group" msgstr "" @@ -7553,11 +7713,11 @@ msgid "Custom logos" msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:111 -msgid "Custom js/css code added at the end of the
tag." +msgid "Custom js/css code added at the end of the tag." msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:112 -msgid "Use