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) 2018 RhodeCode GmbH +# Copyright (C) 2019 RhodeCode GmbH # This file is distributed under the same license as the rhodecode-enterprise-ce project. -# FIRST AUTHOR , 2018. +# FIRST AUTHOR , 2019. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: rhodecode-enterprise-ce 4.15.0\n" +"Project-Id-Version: rhodecode-enterprise-ce 4.16.0\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2018-12-10 18:11+0100\n" +"POT-Creation-Date: 2019-02-23 21:51+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -38,20 +38,20 @@ msgid "Application permissions updated s msgstr "" #: rhodecode/apps/admin/views/permissions.py:141 -#: rhodecode/apps/admin/views/permissions.py:214 -#: rhodecode/apps/admin/views/permissions.py:313 +#: rhodecode/apps/admin/views/permissions.py:217 +#: rhodecode/apps/admin/views/permissions.py:319 msgid "Error occurred during update of permissions" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:194 +#: rhodecode/apps/admin/views/permissions.py:197 msgid "Object permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:293 +#: rhodecode/apps/admin/views/permissions.py:299 msgid "Global permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:475 +#: rhodecode/apps/admin/views/permissions.py:484 #: rhodecode/templates/admin/gists/show.mako:63 #: rhodecode/templates/admin/integrations/list.mako:174 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 @@ -73,20 +73,20 @@ msgstr "" msgid "Edit" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:503 +#: rhodecode/apps/admin/views/permissions.py:512 msgid "Updated SSH keys file: {}" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:506 +#: rhodecode/apps/admin/views/permissions.py:515 msgid "SSH key support is disabled in .ini file" msgstr "" -#: rhodecode/apps/admin/views/repo_groups.py:182 +#: rhodecode/apps/admin/views/repo_groups.py:183 #, python-format msgid "Created repository group %s" msgstr "" -#: rhodecode/apps/admin/views/repo_groups.py:200 +#: rhodecode/apps/admin/views/repo_groups.py:201 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" @@ -355,189 +355,190 @@ msgstr "" msgid "Error occurred during creation of user group %s" msgstr "" -#: rhodecode/apps/admin/views/users.py:218 +#: rhodecode/apps/admin/views/users.py:219 #, python-format msgid "Created user %(user_link)s" msgstr "" -#: rhodecode/apps/admin/views/users.py:239 +#: rhodecode/apps/admin/views/users.py:240 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: rhodecode/apps/admin/views/users.py:313 +#: rhodecode/apps/admin/views/users.py:314 msgid "User updated successfully" msgstr "" -#: rhodecode/apps/admin/views/users.py:331 +#: rhodecode/apps/admin/views/users.py:332 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: rhodecode/apps/admin/views/users.py:363 +#: rhodecode/apps/admin/views/users.py:364 #, python-format msgid "Detached %s repositories" msgstr "" -#: rhodecode/apps/admin/views/users.py:368 +#: rhodecode/apps/admin/views/users.py:369 #, python-format msgid "Deleted %s repositories" msgstr "" -#: rhodecode/apps/admin/views/users.py:376 +#: rhodecode/apps/admin/views/users.py:377 #, python-format msgid "Detached %s repository groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:381 +#: rhodecode/apps/admin/views/users.py:382 #, python-format msgid "Deleted %s repository groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:389 +#: rhodecode/apps/admin/views/users.py:390 #, python-format msgid "Detached %s user groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:394 +#: rhodecode/apps/admin/views/users.py:395 #, python-format msgid "Deleted %s user groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:411 +#: rhodecode/apps/admin/views/users.py:412 msgid "Successfully deleted user" msgstr "" -#: rhodecode/apps/admin/views/users.py:417 +#: rhodecode/apps/admin/views/users.py:418 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/apps/admin/views/users.py:482 +#: rhodecode/apps/admin/views/users.py:483 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:488 +#: rhodecode/apps/admin/views/users.py:489 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:576 +#: rhodecode/apps/admin/views/users.py:578 msgid "User global permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/users.py:594 +#: rhodecode/apps/admin/views/users.py:596 #: rhodecode/apps/user_group/views/__init__.py:479 msgid "An error occurred during permissions saving" msgstr "" #: rhodecode/apps/admin/views/users.py:619 +msgid "Force password change enabled for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:627 +#: rhodecode/apps/admin/views/users.py:657 +msgid "An error occurred during password reset for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:648 msgid "Force password change disabled for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:624 -msgid "Force password change enabled for user" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:633 -msgid "An error occurred during password reset for user" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:672 +#: rhodecode/apps/admin/views/users.py:696 #, python-format msgid "Linked repository group `%s` as personal" msgstr "" -#: rhodecode/apps/admin/views/users.py:678 +#: rhodecode/apps/admin/views/users.py:702 #, python-format msgid "Created repository group `%s`" msgstr "" -#: rhodecode/apps/admin/views/users.py:682 +#: rhodecode/apps/admin/views/users.py:706 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/apps/admin/views/users.py:687 +#: rhodecode/apps/admin/views/users.py:711 msgid "An error occurred during repository group creation for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:710 -#: rhodecode/apps/my_account/views/my_account.py:160 +#: rhodecode/apps/admin/views/users.py:734 +#: rhodecode/apps/my_account/views/my_account.py:161 #: 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:749 -#: rhodecode/apps/my_account/views/my_account.py:195 +#: rhodecode/apps/admin/views/users.py:773 +#: rhodecode/apps/my_account/views/my_account.py:196 msgid "Auth token successfully created" msgstr "" -#: rhodecode/apps/admin/views/users.py:778 -#: rhodecode/apps/my_account/views/my_account.py:219 +#: rhodecode/apps/admin/views/users.py:802 +#: rhodecode/apps/my_account/views/my_account.py:220 msgid "Auth token successfully deleted" msgstr "" -#: rhodecode/apps/admin/views/users.py:851 -#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:113 +#: rhodecode/apps/admin/views/users.py:875 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:114 msgid "Ssh Key successfully created" msgstr "" -#: rhodecode/apps/admin/views/users.py:857 -#: rhodecode/apps/admin/views/users.py:861 -#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:119 -#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:123 +#: rhodecode/apps/admin/views/users.py:881 +#: rhodecode/apps/admin/views/users.py:885 +#: 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:895 -#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:153 +#: rhodecode/apps/admin/views/users.py:919 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:154 msgid "Ssh key successfully deleted" msgstr "" -#: rhodecode/apps/admin/views/users.py:941 +#: rhodecode/apps/admin/views/users.py:965 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:947 +#: rhodecode/apps/admin/views/users.py:971 msgid "Email `{}` is already registered for another user." msgstr "" -#: rhodecode/apps/admin/views/users.py:951 +#: rhodecode/apps/admin/views/users.py:975 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/apps/admin/views/users.py:978 +#: rhodecode/apps/admin/views/users.py:1002 msgid "Removed email address from user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:1024 +#: rhodecode/apps/admin/views/users.py:1048 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/apps/admin/views/users.py:1046 +#: rhodecode/apps/admin/views/users.py:1070 msgid "An error occurred during ip saving" msgstr "" -#: rhodecode/apps/admin/views/users.py:1050 +#: rhodecode/apps/admin/views/users.py:1074 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:1080 +#: rhodecode/apps/admin/views/users.py:1104 msgid "Removed ip address from user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:1145 +#: rhodecode/apps/admin/views/users.py:1169 msgid "Groups successfully changed" msgstr "" -#: rhodecode/apps/admin/views/users.py:1239 +#: rhodecode/apps/admin/views/users.py:1263 msgid "Deleted {} cache keys" msgstr "" @@ -561,9 +562,9 @@ msgstr "" msgid "1 month" msgstr "" -#: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:41413 +#: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:40932 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 -#: rhodecode/public/js/src/rhodecode.js:508 +#: rhodecode/public/js/src/rhodecode.js:509 msgid "Lifetime" msgstr "" @@ -586,8 +587,8 @@ msgstr "" #: rhodecode/apps/gist/views.py:324 #: rhodecode/templates/admin/gists/show.mako:74 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 +#: rhodecode/templates/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 msgid "never" msgstr "" @@ -614,18 +615,26 @@ msgstr "" msgid "Error occurred during update of gist %s" msgstr "" -#: rhodecode/apps/home/views.py:296 -#: rhodecode/apps/repository/views/repo_pull_requests.py:859 -#: rhodecode/templates/admin/my_account/my_account.mako:41 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:197 +#: rhodecode/apps/home/views.py:308 +#: 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/templates/admin/repos/repo_add.mako:15 #: rhodecode/templates/admin/repos/repo_add.mako:19 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:11 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:12 #: rhodecode/templates/base/base.mako:78 rhodecode/templates/base/base.mako:150 -#: rhodecode/templates/base/base.mako:660 +#: rhodecode/templates/base/base.mako:785 msgid "Repositories" msgstr "" +#: rhodecode/apps/home/views.py:335 +#: 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 +msgid "Repository Groups" +msgstr "" + #: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:178 msgid "public journal" msgstr "" @@ -658,31 +667,39 @@ msgstr "" msgid "Your password reset was successful, a new password has been sent to your email" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:135 +#: rhodecode/apps/my_account/views/my_account.py:136 msgid "Error occurred during update of user password" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:142 +#: rhodecode/apps/my_account/views/my_account.py:143 msgid "Successfully updated password" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:283 +#: rhodecode/apps/my_account/views/my_account.py:284 msgid "Error occurred during adding email" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:286 +#: rhodecode/apps/my_account/views/my_account.py:287 msgid "Successfully added email" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:308 +#: rhodecode/apps/my_account/views/my_account.py:309 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:491 +#: rhodecode/apps/my_account/views/my_account.py:476 +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:626 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:498 +#: rhodecode/apps/my_account/views/my_account.py:633 msgid "Error occurred during update of user" msgstr "" @@ -723,35 +740,35 @@ msgid "An error occurred during cache in msgstr "" #: rhodecode/apps/repository/views/repo_changelog.py:66 -#: rhodecode/apps/repository/views/repo_compare.py:63 -#: rhodecode/apps/repository/views/repo_pull_requests.py:722 +#: rhodecode/apps/repository/views/repo_compare.py:64 +#: rhodecode/apps/repository/views/repo_pull_requests.py:727 msgid "There are no commits yet" msgstr "" #: rhodecode/apps/repository/views/repo_changelog.py:71 #: rhodecode/apps/repository/views/repo_commits.py:111 -#: rhodecode/apps/repository/views/repo_files.py:162 -#: rhodecode/apps/repository/views/repo_files.py:182 +#: rhodecode/apps/repository/views/repo_files.py:165 +#: rhodecode/apps/repository/views/repo_files.py:185 msgid "No such commit exists for this repository" msgstr "" -#: rhodecode/apps/repository/views/repo_checks.py:99 +#: rhodecode/apps/repository/views/repo_checks.py:102 #, python-format msgid "Created repository %s from %s" msgstr "" -#: rhodecode/apps/repository/views/repo_checks.py:108 -#, python-format -msgid "Forked repository %s as %s" -msgstr "" - #: rhodecode/apps/repository/views/repo_checks.py:111 #, python-format +msgid "Forked repository %s as %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_checks.py:114 +#, python-format msgid "Created repository %s" msgstr "" #: rhodecode/apps/repository/views/repo_commits.py:327 -#: rhodecode/apps/repository/views/repo_pull_requests.py:1287 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1347 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" @@ -760,27 +777,27 @@ msgstr "" msgid "Changing the status of a commit associated with a closed pull request is not allowed" msgstr "" -#: rhodecode/apps/repository/views/repo_compare.py:101 +#: rhodecode/apps/repository/views/repo_compare.py:102 msgid "Select commit" msgstr "" -#: rhodecode/apps/repository/views/repo_compare.py:172 +#: rhodecode/apps/repository/views/repo_compare.py:173 msgid "Could not find the source repo: `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_compare.py:180 +#: rhodecode/apps/repository/views/repo_compare.py:181 msgid "Could not find the target repo: `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_compare.py:191 +#: rhodecode/apps/repository/views/repo_compare.py:192 msgid "The comparison of two different kinds of remote repos is not available" msgstr "" -#: rhodecode/apps/repository/views/repo_compare.py:230 +#: rhodecode/apps/repository/views/repo_compare.py:231 msgid "Could not compare repos with different large file settings" msgstr "" -#: rhodecode/apps/repository/views/repo_compare.py:276 +#: rhodecode/apps/repository/views/repo_compare.py:277 #, python-format msgid "Repositories unrelated. Cannot compare commit %(commit1)s from repository %(repo1)s with commit %(commit2)s from repository %(repo2)s." msgstr "" @@ -795,184 +812,204 @@ msgstr "" msgid "%s %s feed" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:92 +#: rhodecode/apps/repository/views/repo_files.py:95 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:108 +#: rhodecode/apps/repository/views/repo_files.py:111 msgid "Branch `{}` changes forbidden by rule {}." msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:152 +#: rhodecode/apps/repository/views/repo_files.py:155 msgid "Click here to add a new file." msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:157 +#: rhodecode/apps/repository/views/repo_files.py:160 #, python-format msgid "There are no files yet. %s" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:293 +#: rhodecode/apps/repository/views/repo_files.py:297 msgid "Downloads disabled" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:299 +#: rhodecode/apps/repository/views/repo_files.py:303 msgid "Unknown archive type for: `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:305 +#: rhodecode/apps/repository/views/repo_files.py:309 msgid "Unknown commit_id {}" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:308 +#: rhodecode/apps/repository/views/repo_files.py:312 msgid "Empty repository" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:340 +#: rhodecode/apps/repository/views/repo_files.py:344 msgid "Unknown archive type" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:906 +#: rhodecode/apps/repository/views/repo_files.py:915 msgid "Changesets" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:927 -#: rhodecode/apps/repository/views/repo_summary.py:340 -#: rhodecode/model/pull_request.py:1452 rhodecode/model/scm.py:811 +#: rhodecode/apps/repository/views/repo_files.py:936 +#: rhodecode/apps/repository/views/repo_summary.py:341 +#: rhodecode/model/pull_request.py:1431 rhodecode/model/scm.py:916 #: rhodecode/templates/base/vcs_settings.mako:235 msgid "Branches" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:931 rhodecode/model/scm.py:826 +#: rhodecode/apps/repository/views/repo_files.py:940 rhodecode/model/scm.py:931 #: rhodecode/templates/base/vcs_settings.mako:260 msgid "Tags" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1030 -#: rhodecode/apps/repository/views/repo_files.py:1064 +#: rhodecode/apps/repository/views/repo_files.py:1039 +#: rhodecode/apps/repository/views/repo_files.py:1073 msgid "You can only delete files with commit being a valid branch head." msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1041 -#: rhodecode/apps/repository/views/repo_files.py:1075 +#: rhodecode/apps/repository/views/repo_files.py:1050 +#: rhodecode/apps/repository/views/repo_files.py:1084 msgid "Deleted file {} via RhodeCode Enterprise" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1096 +#: rhodecode/apps/repository/views/repo_files.py:1105 msgid "Successfully deleted file `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1100 -#: rhodecode/apps/repository/views/repo_files.py:1225 -#: rhodecode/apps/repository/views/repo_files.py:1383 +#: rhodecode/apps/repository/views/repo_files.py:1109 +#: rhodecode/apps/repository/views/repo_files.py:1235 +#: rhodecode/apps/repository/views/repo_files.py:1393 msgid "Error occurred during commit" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1120 -#: rhodecode/apps/repository/views/repo_files.py:1160 +#: rhodecode/apps/repository/views/repo_files.py:1129 +#: rhodecode/apps/repository/views/repo_files.py:1169 msgid "You can only edit files with commit being a valid branch head." msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1138 -#: rhodecode/apps/repository/views/repo_files.py:1179 +#: rhodecode/apps/repository/views/repo_files.py:1147 +#: rhodecode/apps/repository/views/repo_files.py:1188 msgid "Edited file {} via RhodeCode Enterprise" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1197 +#: rhodecode/apps/repository/views/repo_files.py:1206 msgid "No changes" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1221 +#: rhodecode/apps/repository/views/repo_files.py:1231 msgid "Successfully committed changes to file `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1245 -#: rhodecode/apps/repository/views/repo_files.py:1308 +#: rhodecode/apps/repository/views/repo_files.py:1255 +#: rhodecode/apps/repository/views/repo_files.py:1318 msgid "Added file via RhodeCode Enterprise" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1258 -#: rhodecode/apps/repository/views/repo_files.py:1299 +#: rhodecode/apps/repository/views/repo_files.py:1268 +#: rhodecode/apps/repository/views/repo_files.py:1309 msgid "You can only add files with commit being a valid branch head." msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1341 +#: rhodecode/apps/repository/views/repo_files.py:1351 msgid "No filename" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1371 +#: rhodecode/apps/repository/views/repo_files.py:1381 msgid "Successfully committed new file `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1375 +#: rhodecode/apps/repository/views/repo_files.py:1385 msgid "The location specified must be a relative path and must not contain .. in the path" msgstr "" #: rhodecode/apps/repository/views/repo_forks.py:147 -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:267 msgid "Compare fork" msgstr "" -#: rhodecode/apps/repository/views/repo_forks.py:252 +#: rhodecode/apps/repository/views/repo_forks.py:251 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: rhodecode/apps/repository/views/repo_permissions.py:87 +#: rhodecode/apps/repository/views/repo_permissions.py:57 +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:752 +#: 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 msgid "Commit does not exist" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:890 +#: rhodecode/apps/repository/views/repo_pull_requests.py:909 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:915 +#: rhodecode/apps/repository/views/repo_pull_requests.py:928 +msgid "source_repo or target repo not found" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:939 msgid "Not Enough permissions to source repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:930 +#: rhodecode/apps/repository/views/repo_pull_requests.py:954 msgid "Not Enough permissions to target repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:993 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1017 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:996 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1020 msgid "Error occurred during creation of this pull request." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1027 -#: rhodecode/apps/repository/views/repo_pull_requests.py:1061 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1051 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1094 msgid "Cannot update closed pull requests." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1067 +#: 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 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1086 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1121 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:1102 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1135 msgid "Reload page" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1167 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1170 +msgid "Cannot merge pull requests in state other than `{}`. Current state is: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1216 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1191 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1240 msgid "Pull request reviewers updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1217 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1273 msgid "Successfully deleted pull request" msgstr "" @@ -984,100 +1021,100 @@ msgstr "" msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:204 +#: rhodecode/apps/repository/views/repo_settings.py:208 msgid "Unlocked" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:209 +#: rhodecode/apps/repository/views/repo_settings.py:213 msgid "Locked" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:211 -#, python-format -msgid "Repository has been %s" -msgstr "" - #: rhodecode/apps/repository/views/repo_settings.py:215 -#: rhodecode/apps/repository/views/repo_settings_advanced.py:294 +#, python-format +msgid "Repository has been %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings.py:219 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:296 msgid "An error occurred during unlocking" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:259 +#: rhodecode/apps/repository/views/repo_settings.py:263 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:103 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:105 #, python-format msgid "Archived repository `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:108 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:110 #, python-format msgid "An error occurred during archiving of `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:146 -#, python-format -msgid "Detached %s forks" -msgstr "" - #: rhodecode/apps/repository/views/repo_settings_advanced.py:148 #, python-format +msgid "Detached %s forks" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:150 +#, python-format msgid "Deleted %s forks" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:157 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:159 #, python-format msgid "Deleted repository `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:164 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:166 msgid "detach or delete" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:165 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:167 msgid "Cannot delete `{repo}` it still contains attached forks. Try using {delete_or_detach} option." msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:180 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:182 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:189 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:191 #, python-format msgid "An error occurred during deletion of `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:214 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:216 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:218 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:220 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:254 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:256 msgid "Nothing" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:257 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:259 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:264 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:266 msgid "An error occurred during this operation" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:288 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:290 msgid "Locked repository" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:291 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:293 msgid "Unlocked repository" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:311 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:313 msgid "installed updated hooks into this repository" msgstr "" @@ -1105,21 +1142,21 @@ msgstr "" msgid "Error occurred during updating repository VCS settings" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:315 +#: rhodecode/apps/repository/views/repo_summary.py:316 #: rhodecode/templates/admin/permissions/permissions.mako:42 #: rhodecode/templates/files/files_add.mako:15 msgid "Branch" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:316 +#: rhodecode/apps/repository/views/repo_summary.py:317 msgid "Tag" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:317 +#: rhodecode/apps/repository/views/repo_summary.py:318 msgid "Bookmark" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:341 +#: rhodecode/apps/repository/views/repo_summary.py:342 msgid "Closed branches" msgstr "" @@ -1338,11 +1375,10 @@ msgid "Password to authenticate for give msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:283 -#: rhodecode/integrations/types/webhook.py:89 rhodecode/templates/login.mako:50 +#: rhodecode/integrations/types/webhook.py:89 rhodecode/templates/login.mako:49 #: rhodecode/templates/register.mako:60 #: rhodecode/templates/admin/my_account/my_account.mako:30 #: rhodecode/templates/admin/users/user_add.mako:44 -#: rhodecode/templates/base/base.mako:331 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "" @@ -1475,14 +1511,35 @@ msgstr "" msgid "PAM" msgstr "" -#: rhodecode/authentication/plugins/auth_rhodecode.py:68 +#: rhodecode/authentication/plugins/auth_rhodecode.py:79 msgid "RhodeCode Internal" msgstr "" -#: rhodecode/authentication/plugins/auth_token.py:71 +#: rhodecode/authentication/plugins/auth_rhodecode.py:200 +msgid "Allowed user types for authentication using this plugin." +msgstr "" + +#: rhodecode/authentication/plugins/auth_rhodecode.py:201 +msgid "User restriction" +msgstr "" + +#: rhodecode/authentication/plugins/auth_rhodecode.py:209 +msgid "Allowed protocols for authentication using this plugin. VCS means GIT/HG/SVN. HTTP is web based login." +msgstr "" + +#: rhodecode/authentication/plugins/auth_rhodecode.py:211 +#: rhodecode/authentication/plugins/auth_token.py:173 +msgid "Scope restriction" +msgstr "" + +#: rhodecode/authentication/plugins/auth_token.py:77 msgid "Rhodecode Token" msgstr "" +#: rhodecode/authentication/plugins/auth_token.py:172 +msgid "Choose operation scope restriction when authenticating." +msgstr "" + #: rhodecode/events/pullrequest.py:79 msgid "pullrequest created" msgstr "" @@ -1499,11 +1556,11 @@ msgstr "" msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:115 +#: rhodecode/events/pullrequest.py:119 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:124 +#: rhodecode/events/pullrequest.py:128 msgid "pullrequest commented" msgstr "" @@ -1572,16 +1629,16 @@ msgid "user permissions change" msgstr "" #: rhodecode/forms/__init__.py:35 rhodecode/templates/admin/gists/new.mako:62 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:70 +#: 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:205 +#: 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/repos/repo_edit_fields.mako:66 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:80 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:187 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:188 #: 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 @@ -1589,19 +1646,19 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 #: rhodecode/templates/admin/settings/settings_visual.mako:215 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:192 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:83 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:193 +#: 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:136 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:65 +#: 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/templates/admin/integrations/list.mako:181 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 +#: 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 @@ -1609,7 +1666,7 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions_ips.mako:29 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:50 #: 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 @@ -1781,7 +1838,7 @@ msgid "This can be setup at the