# HG changeset patch # User Marcin Kuzminski # Date 2016-09-15 14:26:09 # Node ID cf176a99fcac1bf30bb8734bc2e8b978af9a4e48 # Parent f608867398cb51020cb65d7f11dbca822409dc1a i18n: Updated message catalog template diff --git a/.release.cfg b/.release.cfg --- a/.release.cfg +++ b/.release.cfg @@ -11,6 +11,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 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: rhodecode-enterprise-ce 4.3.0\n" +"Project-Id-Version: rhodecode-enterprise-ce 4.4.0\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2016-08-12 12:29+0000\n" +"POT-Creation-Date: 2016-09-15 14:25+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,7 @@ msgstr "" "Generated-By: Babel 1.3\n" #: rhodecode/admin/navigation.py:74 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:126 +#: rhodecode/integrations/views.py:168 #: rhodecode/templates/admin/permissions/permissions.html:36 msgid "Global" msgstr "" @@ -41,7 +41,7 @@ msgstr "" msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:80 rhodecode/integrations/types/email.py:172 +#: rhodecode/admin/navigation.py:80 rhodecode/integrations/types/email.py:232 #: rhodecode/templates/register.html:76 #: rhodecode/templates/admin/my_account/my_account_profile.html:48 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:94 @@ -62,12 +62,18 @@ msgid "Full Text Search" msgstr "" #: rhodecode/admin/navigation.py:83 -#: rhodecode/templates/admin/integrations/base.html:21 -#: rhodecode/templates/admin/integrations/edit.html:8 -#: rhodecode/templates/admin/integrations/edit.html:19 -#: rhodecode/templates/admin/integrations/list.html:15 -#: rhodecode/templates/admin/integrations/list.html:19 -#: rhodecode/templates/admin/integrations/list.html:26 +#: rhodecode/templates/admin/integrations/base.html:23 +#: rhodecode/templates/admin/integrations/form.html:8 +#: rhodecode/templates/admin/integrations/form.html:21 +#: rhodecode/templates/admin/integrations/form.html:32 +#: rhodecode/templates/admin/integrations/list.html:21 +#: rhodecode/templates/admin/integrations/list.html:25 +#: rhodecode/templates/admin/integrations/list.html:29 +#: rhodecode/templates/admin/integrations/list.html:36 +#: rhodecode/templates/admin/integrations/new.html:9 +#: rhodecode/templates/admin/integrations/new.html:17 +#: rhodecode/templates/admin/integrations/new.html:23 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:72 #: rhodecode/templates/base/base.html:84 msgid "Integrations" @@ -90,9 +96,9 @@ msgstr "" msgid "Enable or disable this authentication plugin." msgstr "" -#: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:37 -#: rhodecode/templates/admin/integrations/list.html:62 -#: rhodecode/templates/admin/my_account/my_account_notifications.html:14 +#: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:32 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:197 +#: rhodecode/templates/admin/integrations/list.html:101 msgid "Enabled" msgstr "" @@ -527,14 +533,14 @@ msgstr "" msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:1026 rhodecode/controllers/summary.py:251 +#: rhodecode/controllers/files.py:1026 rhodecode/controllers/summary.py:259 #: rhodecode/model/pull_request.py:1059 rhodecode/model/scm.py:780 -#: rhodecode/templates/base/vcs_settings.html:138 +#: rhodecode/templates/base/vcs_settings.html:185 msgid "Branches" msgstr "" #: rhodecode/controllers/files.py:1030 rhodecode/model/scm.py:795 -#: rhodecode/templates/base/vcs_settings.html:163 +#: rhodecode/templates/base/vcs_settings.html:210 msgid "Tags" msgstr "" @@ -645,19 +651,19 @@ msgstr "" msgid "Closing pull request on other statuses than rejected or approved is forbidden. Calculated status from all reviewers is currently: %s" msgstr "" -#: rhodecode/controllers/summary.py:235 +#: rhodecode/controllers/summary.py:243 msgid "Branch" msgstr "" -#: rhodecode/controllers/summary.py:236 +#: rhodecode/controllers/summary.py:244 msgid "Tag" msgstr "" -#: rhodecode/controllers/summary.py:237 +#: rhodecode/controllers/summary.py:245 msgid "Bookmark" msgstr "" -#: rhodecode/controllers/summary.py:252 +#: rhodecode/controllers/summary.py:260 msgid "Closed branches" msgstr "" @@ -670,37 +676,37 @@ msgid "Error occurred during update of d msgstr "" #: rhodecode/controllers/admin/gists.py:63 -#: rhodecode/controllers/admin/my_account.py:307 +#: rhodecode/controllers/admin/my_account.py:317 #: rhodecode/controllers/admin/users.py:431 msgid "forever" msgstr "" #: rhodecode/controllers/admin/gists.py:64 -#: rhodecode/controllers/admin/my_account.py:308 +#: rhodecode/controllers/admin/my_account.py:318 #: rhodecode/controllers/admin/users.py:432 msgid "5 minutes" msgstr "" #: rhodecode/controllers/admin/gists.py:65 -#: rhodecode/controllers/admin/my_account.py:309 +#: rhodecode/controllers/admin/my_account.py:319 #: rhodecode/controllers/admin/users.py:433 msgid "1 hour" msgstr "" #: rhodecode/controllers/admin/gists.py:66 -#: rhodecode/controllers/admin/my_account.py:310 +#: rhodecode/controllers/admin/my_account.py:320 #: rhodecode/controllers/admin/users.py:434 msgid "1 day" msgstr "" #: rhodecode/controllers/admin/gists.py:67 -#: rhodecode/controllers/admin/my_account.py:311 +#: rhodecode/controllers/admin/my_account.py:321 #: rhodecode/controllers/admin/users.py:435 msgid "1 month" msgstr "" #: rhodecode/controllers/admin/gists.py:71 -#: rhodecode/controllers/admin/my_account.py:313 +#: rhodecode/controllers/admin/my_account.py:323 #: rhodecode/controllers/admin/users.py:437 msgid "Lifetime" msgstr "" @@ -754,60 +760,61 @@ msgstr "" msgid "%(expiry)s - current value" msgstr "" -#: rhodecode/controllers/admin/my_account.py:70 +#: rhodecode/controllers/admin/my_account.py:74 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/my_account.py:128 +#: rhodecode/controllers/admin/my_account.py:132 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/controllers/admin/my_account.py:143 +#: rhodecode/controllers/admin/my_account.py:147 #: rhodecode/controllers/admin/users.py:218 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/my_account.py:202 +#: rhodecode/controllers/admin/my_account.py:213 +#: rhodecode/controllers/admin/my_account.py:219 +msgid "Error occurred during update of user password" +msgstr "" + +#: rhodecode/controllers/admin/my_account.py:226 msgid "Successfully updated password" msgstr "" -#: rhodecode/controllers/admin/my_account.py:213 -msgid "Error occurred during update of user password" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:261 +#: rhodecode/controllers/admin/my_account.py:271 #: rhodecode/controllers/admin/users.py:611 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/controllers/admin/my_account.py:268 +#: rhodecode/controllers/admin/my_account.py:278 #: rhodecode/controllers/admin/users.py:618 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/controllers/admin/my_account.py:278 +#: rhodecode/controllers/admin/my_account.py:288 #: rhodecode/controllers/admin/users.py:633 msgid "Removed email address from user account" msgstr "" -#: rhodecode/controllers/admin/my_account.py:316 +#: rhodecode/controllers/admin/my_account.py:326 #: rhodecode/controllers/admin/users.py:440 msgid "Role" msgstr "" -#: rhodecode/controllers/admin/my_account.py:329 +#: rhodecode/controllers/admin/my_account.py:339 #: rhodecode/controllers/admin/users.py:464 msgid "Auth token successfully created" msgstr "" -#: rhodecode/controllers/admin/my_account.py:342 +#: rhodecode/controllers/admin/my_account.py:352 #: rhodecode/controllers/admin/users.py:483 msgid "Auth token successfully reset" msgstr "" -#: rhodecode/controllers/admin/my_account.py:346 +#: rhodecode/controllers/admin/my_account.py:356 #: rhodecode/controllers/admin/users.py:487 msgid "Auth token successfully deleted" msgstr "" @@ -1027,18 +1034,18 @@ msgid "Error occurred during deleting is msgstr "" #: rhodecode/controllers/admin/repos.py:721 -#: rhodecode/controllers/admin/settings.py:363 +#: rhodecode/controllers/admin/settings.py:366 msgid "Removed issue tracker entry" msgstr "" #: rhodecode/controllers/admin/repos.py:751 -#: rhodecode/controllers/admin/settings.py:409 +#: rhodecode/controllers/admin/settings.py:412 msgid "Updated issue tracker entries" msgstr "" #: rhodecode/controllers/admin/repos.py:812 -#: rhodecode/controllers/admin/settings.py:142 -#: rhodecode/controllers/admin/settings.py:719 +#: rhodecode/controllers/admin/settings.py:143 +#: rhodecode/controllers/admin/settings.py:722 msgid "Some form inputs contain invalid data." msgstr "" @@ -1047,86 +1054,70 @@ msgid "Error occurred during updating re msgstr "" #: rhodecode/controllers/admin/repos.py:834 -#: rhodecode/controllers/admin/settings.py:168 +#: rhodecode/controllers/admin/settings.py:171 msgid "Updated VCS settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:164 -#: rhodecode/controllers/admin/settings.py:267 +#: rhodecode/controllers/admin/settings.py:167 +#: rhodecode/controllers/admin/settings.py:270 msgid "Error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:211 +#: rhodecode/controllers/admin/settings.py:214 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:263 +#: rhodecode/controllers/admin/settings.py:266 msgid "Updated application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:327 -msgid "Updated visualisation settings" -msgstr "" - #: rhodecode/controllers/admin/settings.py:330 +msgid "Updated visualisation settings" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:333 msgid "Error occurred during updating visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:422 +#: rhodecode/controllers/admin/settings.py:425 msgid "Please enter email address" msgstr "" -#: rhodecode/controllers/admin/settings.py:440 +#: rhodecode/controllers/admin/settings.py:443 msgid "Send email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:473 +#: rhodecode/controllers/admin/settings.py:476 msgid "Added new hook" msgstr "" -#: rhodecode/controllers/admin/settings.py:488 +#: rhodecode/controllers/admin/settings.py:491 msgid "Updated hooks" msgstr "" -#: rhodecode/controllers/admin/settings.py:492 +#: rhodecode/controllers/admin/settings.py:495 msgid "Error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:540 +#: rhodecode/controllers/admin/settings.py:543 #, python-format msgid "Critical: your disk space is very low %s%% usedpercent" msgstr "" -#: rhodecode/controllers/admin/settings.py:544 +#: rhodecode/controllers/admin/settings.py:547 #, python-format msgid "Warning: your disk space is running low %s%% usedpercent" msgstr "" -#: rhodecode/controllers/admin/settings.py:740 +#: rhodecode/controllers/admin/settings.py:743 msgid "Error occurred during updating labs settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:745 +#: rhodecode/controllers/admin/settings.py:748 msgid "Updated Labs settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:795 -msgid "Subversion HTTP Support" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:796 -msgid "Proxy subversion HTTP requests" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:802 -msgid "Subversion HTTP Server URL" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:804 -msgid "e.g. http://localhost:8080/" -msgstr "" - #: rhodecode/controllers/admin/user_groups.py:168 #, python-format msgid "Created user group %(user_group_link)s" @@ -1307,35 +1298,35 @@ msgstr "" msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:135 +#: rhodecode/events/repo.py:136 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:144 +#: rhodecode/events/repo.py:145 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:153 +#: rhodecode/events/repo.py:154 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:162 +#: rhodecode/events/repo.py:163 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:198 +#: rhodecode/events/repo.py:199 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:207 +#: rhodecode/events/repo.py:208 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:216 +#: rhodecode/events/repo.py:217 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:227 +#: rhodecode/events/repo.py:228 msgid "repository push" msgstr "" @@ -1363,100 +1354,196 @@ msgstr "" msgid "user pre update" msgstr "" -#: rhodecode/integrations/schema.py:35 +#: rhodecode/forms/__init__.py:32 rhodecode/templates/admin/gists/new.html:62 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:27 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:84 +#: rhodecode/templates/admin/my_account/my_account_emails.html:65 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:104 +#: rhodecode/templates/admin/permissions/permissions_application.html:51 +#: rhodecode/templates/admin/permissions/permissions_ips.html:61 +#: rhodecode/templates/admin/permissions/permissions_objects.html:57 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:136 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:68 +#: rhodecode/templates/admin/repos/repo_edit_fields.html:66 +#: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:80 +#: rhodecode/templates/admin/repos/repo_edit_permissions.html:111 +#: rhodecode/templates/admin/repos/repo_edit_settings.html:159 +#: rhodecode/templates/admin/repos/repo_edit_vcs.html:46 +#: rhodecode/templates/admin/settings/settings_global.html:110 +#: rhodecode/templates/admin/settings/settings_issuetracker.html:16 +#: rhodecode/templates/admin/settings/settings_labs.html:49 +#: rhodecode/templates/admin/settings/settings_vcs.html:14 +#: rhodecode/templates/admin/settings/settings_visual.html:220 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:121 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:23 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:81 +#: rhodecode/templates/admin/users/user_edit_emails.html:63 +#: rhodecode/templates/admin/users/user_edit_ips.html:70 +#: rhodecode/templates/admin/users/user_edit_profile.html:135 +#: rhodecode/templates/base/default_perms_box.html:89 +msgid "Reset" +msgstr "" + +#: rhodecode/forms/__init__.py:33 rhodecode/templates/admin/gists/show.html:49 +#: rhodecode/templates/admin/integrations/list.html:211 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:56 +#: rhodecode/templates/admin/my_account/my_account_emails.html:32 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:62 +#: rhodecode/templates/admin/permissions/permissions_ips.html:26 +#: rhodecode/templates/admin/repos/repo_edit_fields.html:25 +#: rhodecode/templates/admin/settings/settings_hooks.html:46 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:52 +#: rhodecode/templates/admin/users/user_edit_emails.html:31 +#: rhodecode/templates/admin/users/user_edit_ips.html:34 +#: rhodecode/templates/base/issue_tracker_settings.html:70 +#: rhodecode/templates/base/vcs_settings.html:194 +#: rhodecode/templates/base/vcs_settings.html:219 +#: rhodecode/templates/changeset/changeset_file_comment.html:49 +#: rhodecode/templates/changeset/changeset_file_comment.html:99 +#: rhodecode/templates/data_table/_dt_elements.html:119 +#: rhodecode/templates/data_table/_dt_elements.html:176 +#: rhodecode/templates/data_table/_dt_elements.html:190 +#: rhodecode/templates/data_table/_dt_elements.html:202 +#: rhodecode/templates/debug_style/buttons.html:132 +#: rhodecode/templates/files/files_source.html:34 +#: rhodecode/templates/files/files_source.html:38 +#: rhodecode/templates/files/files_source.html:41 +msgid "Delete" +msgstr "" + +#: rhodecode/integrations/schema.py:30 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:195 msgid "Enable or disable this integration." msgstr "" -#: rhodecode/integrations/schema.py:42 +#: rhodecode/integrations/schema.py:37 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:176 msgid "Short name for this integration." msgstr "" -#: rhodecode/integrations/schema.py:44 +#: rhodecode/integrations/schema.py:39 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:178 msgid "Integration name" msgstr "" +#: rhodecode/integrations/schema.py:51 +msgid "Limit integrations to to work only on the direct children repositories of this repository group (no subgroups)" +msgstr "" + +#: rhodecode/integrations/schema.py:55 +msgid "Limit to childen repos only" +msgstr "" + +#: rhodecode/integrations/schema.py:63 +msgid "Limit integrations to to work only on root level repositories" +msgstr "" + +#: rhodecode/integrations/schema.py:66 +msgid "Root repositories only" +msgstr "" + +#: rhodecode/integrations/views.py:162 +msgid "{repo_name} repository" +msgstr "" + +#: rhodecode/integrations/views.py:165 +msgid "{repo_group_name} repo group" +msgstr "" + #: rhodecode/integrations/views.py:172 +msgid "{name} integration" +msgstr "" + +#: rhodecode/integrations/views.py:186 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:200 +#: rhodecode/integrations/views.py:266 msgid "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:220 +#: rhodecode/integrations/views.py:292 msgid "Integration {integration_name} updated successfully." msgstr "" -#: rhodecode/integrations/types/email.py:154 +#: rhodecode/integrations/types/email.py:214 msgid "Recipients" msgstr "" -#: rhodecode/integrations/types/email.py:155 +#: rhodecode/integrations/types/email.py:215 msgid "Email addresses to send push events to" msgstr "" -#: rhodecode/integrations/types/email.py:160 -#: rhodecode/integrations/types/email.py:161 +#: rhodecode/integrations/types/email.py:220 +#: rhodecode/integrations/types/email.py:221 msgid "Email address" msgstr "" +#: rhodecode/integrations/types/email.py:233 +msgid "Send repo push summaries to a list of recipients via email" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:43 +msgid "Yellow" +msgstr "" + #: rhodecode/integrations/types/hipchat.py:44 -msgid "Yellow" +msgid "Red" msgstr "" #: rhodecode/integrations/types/hipchat.py:45 -msgid "Red" +msgid "Green" msgstr "" #: rhodecode/integrations/types/hipchat.py:46 -msgid "Green" +msgid "Purple" msgstr "" #: rhodecode/integrations/types/hipchat.py:47 -msgid "Purple" -msgstr "" - -#: rhodecode/integrations/types/hipchat.py:48 msgid "Gray" msgstr "" +#: rhodecode/integrations/types/hipchat.py:52 +msgid "Hipchat server URL" +msgstr "" + #: rhodecode/integrations/types/hipchat.py:53 -msgid "Hipchat server URL" -msgstr "" - -#: rhodecode/integrations/types/hipchat.py:54 msgid "Hipchat integration url." msgstr "" +#: rhodecode/integrations/types/hipchat.py:63 +msgid "Notify" +msgstr "" + #: rhodecode/integrations/types/hipchat.py:64 -msgid "Notify" -msgstr "" - -#: rhodecode/integrations/types/hipchat.py:65 msgid "Make a notification to the users in room." msgstr "" +#: rhodecode/integrations/types/hipchat.py:70 +msgid "Color" +msgstr "" + #: rhodecode/integrations/types/hipchat.py:71 -msgid "Color" -msgstr "" - -#: rhodecode/integrations/types/hipchat.py:72 msgid "Background color of message." msgstr "" -#: rhodecode/integrations/types/hipchat.py:104 +#: rhodecode/integrations/types/hipchat.py:99 msgid "Hipchat" msgstr "" +#: rhodecode/integrations/types/hipchat.py:100 +msgid "Send events such as repo pushes and pull requests to your hipchat channel." +msgstr "" + +#: rhodecode/integrations/types/slack.py:44 +msgid "Slack service URL" +msgstr "" + #: rhodecode/integrations/types/slack.py:45 -msgid "Slack service URL" -msgstr "" - -#: rhodecode/integrations/types/slack.py:46 msgid "This can be setup at the slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:59 rhodecode/templates/login.html:43 +#: rhodecode/integrations/types/slack.py:58 rhodecode/templates/login.html:43 #: rhodecode/templates/register.html:41 #: rhodecode/templates/admin/admin_log.html:7 #: rhodecode/templates/admin/my_account/my_account_profile.html:24 @@ -1472,35 +1559,39 @@ msgstr "" msgid "Username" msgstr "" -#: rhodecode/integrations/types/slack.py:60 +#: rhodecode/integrations/types/slack.py:59 msgid "Username to show notifications coming from." msgstr "" +#: rhodecode/integrations/types/slack.py:68 +msgid "Channel" +msgstr "" + #: rhodecode/integrations/types/slack.py:69 -msgid "Channel" -msgstr "" - -#: rhodecode/integrations/types/slack.py:70 msgid "Channel to send notifications to." msgstr "" +#: rhodecode/integrations/types/slack.py:78 +msgid "Emoji" +msgstr "" + #: rhodecode/integrations/types/slack.py:79 -msgid "Emoji" -msgstr "" - -#: rhodecode/integrations/types/slack.py:80 msgid "Emoji to use eg. :studio_microphone:" msgstr "" -#: rhodecode/integrations/types/slack.py:107 +#: rhodecode/integrations/types/slack.py:101 msgid "Slack" msgstr "" +#: rhodecode/integrations/types/slack.py:102 +msgid "Send events such as repo pushes and pull requests to your slack channel." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:40 +msgid "Webhook URL" +msgstr "" + #: rhodecode/integrations/types/webhook.py:41 -msgid "Webhook URL" -msgstr "" - -#: rhodecode/integrations/types/webhook.py:42 msgid "URL of the webhook to receive POST event." msgstr "" @@ -1512,10 +1603,14 @@ msgstr "" msgid "String used to validate received payloads." msgstr "" -#: rhodecode/integrations/types/webhook.py:62 +#: rhodecode/integrations/types/webhook.py:65 msgid "Webhook" msgstr "" +#: rhodecode/integrations/types/webhook.py:66 +msgid "Post json events to a webhook endpoint" +msgstr "" + #: rhodecode/lib/action_parser.py:89 msgid "[deleted] repository" msgstr "" @@ -1639,79 +1734,79 @@ msgstr "" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1180 +#: rhodecode/lib/auth.py:1185 #, python-format msgid "IP %s not allowed" msgstr "" -#: rhodecode/lib/auth.py:1254 +#: rhodecode/lib/auth.py:1259 msgid "You need to be a registered user to perform this action" msgstr "" -#: rhodecode/lib/auth.py:1302 +#: rhodecode/lib/auth.py:1307 #, python-format msgid "Action not supported for %s." msgstr "" -#: rhodecode/lib/auth.py:1339 +#: rhodecode/lib/auth.py:1344 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/base.py:547 +#: rhodecode/lib/base.py:550 #, python-format msgid "The repository at %(repo_name)s cannot be located." msgstr "" -#: rhodecode/lib/diffs.py:56 +#: rhodecode/lib/diffs.py:62 msgid "Click to comment" msgstr "" -#: rhodecode/lib/diffs.py:71 +#: rhodecode/lib/diffs.py:77 msgid "Binary file" msgstr "" -#: rhodecode/lib/diffs.py:91 +#: rhodecode/lib/diffs.py:98 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: rhodecode/lib/diffs.py:102 +#: rhodecode/lib/diffs.py:109 msgid "No changes detected" msgstr "" -#: rhodecode/lib/diffs.py:631 +#: rhodecode/lib/diffs.py:643 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1484 +#: rhodecode/lib/helpers.py:1489 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:1488 +#: rhodecode/lib/helpers.py:1493 msgid "No Files" msgstr "" -#: rhodecode/lib/helpers.py:1561 +#: rhodecode/lib/helpers.py:1566 msgid "new file" msgstr "" -#: rhodecode/lib/helpers.py:1564 +#: rhodecode/lib/helpers.py:1569 msgid "mod" msgstr "" -#: rhodecode/lib/helpers.py:1567 +#: rhodecode/lib/helpers.py:1572 msgid "del" msgstr "" -#: rhodecode/lib/helpers.py:1570 -msgid "rename" -msgstr "" - #: rhodecode/lib/helpers.py:1575 +msgid "rename" +msgstr "" + +#: rhodecode/lib/helpers.py:1580 msgid "chmod" msgstr "" -#: rhodecode/lib/helpers.py:1822 +#: rhodecode/lib/helpers.py:1827 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -1730,89 +1825,89 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1842 +#: rhodecode/lib/helpers.py:1847 #, 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:454 +#: rhodecode/lib/utils2.py:463 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:455 +#: rhodecode/lib/utils2.py:464 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:456 +#: rhodecode/lib/utils2.py:465 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:457 +#: rhodecode/lib/utils2.py:466 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:458 +#: rhodecode/lib/utils2.py:467 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:459 +#: rhodecode/lib/utils2.py:468 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:477 +#: rhodecode/lib/utils2.py:486 #, python-format msgid "in %s" msgstr "" -#: rhodecode/lib/utils2.py:483 +#: rhodecode/lib/utils2.py:492 #, python-format msgid "%s ago" msgstr "" -#: rhodecode/lib/utils2.py:493 +#: rhodecode/lib/utils2.py:502 #, python-format msgid "%s, %s ago" msgstr "" -#: rhodecode/lib/utils2.py:495 +#: rhodecode/lib/utils2.py:504 #, python-format msgid "in %s, %s" msgstr "" -#: rhodecode/lib/utils2.py:497 +#: rhodecode/lib/utils2.py:506 #, python-format msgid "%s and %s" msgstr "" -#: rhodecode/lib/utils2.py:499 +#: rhodecode/lib/utils2.py:508 #, python-format msgid "%s and %s ago" msgstr "" -#: rhodecode/lib/utils2.py:501 +#: rhodecode/lib/utils2.py:510 #, python-format msgid "in %s and %s" msgstr "" -#: rhodecode/lib/utils2.py:505 rhodecode/public/js/scripts.js:25035 +#: rhodecode/lib/utils2.py:514 rhodecode/public/js/scripts.js:25035 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" @@ -1841,7 +1936,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 rhodecode/model/db.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 rhodecode/model/db.py:2287 msgid "Repository no access" msgstr "" @@ -1868,7 +1965,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 rhodecode/model/db.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 rhodecode/model/db.py:2288 msgid "Repository read access" msgstr "" @@ -1895,7 +1994,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 rhodecode/model/db.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 rhodecode/model/db.py:2289 msgid "Repository write access" msgstr "" @@ -1922,7 +2023,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296 rhodecode/model/db.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 rhodecode/model/db.py:2290 msgid "Repository admin access" msgstr "" @@ -1989,7 +2092,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 rhodecode/model/db.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 rhodecode/model/db.py:2308 msgid "Repository creation disabled" msgstr "" @@ -2016,7 +2121,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2315 rhodecode/model/db.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 rhodecode/model/db.py:2309 msgid "Repository creation enabled" msgstr "" @@ -2043,7 +2150,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2319 rhodecode/model/db.py:2311 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2311 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 rhodecode/model/db.py:2313 msgid "Repository forking disabled" msgstr "" @@ -2070,7 +2179,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:851 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:973 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 rhodecode/model/db.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 rhodecode/model/db.py:2314 msgid "Repository forking enabled" msgstr "" @@ -2118,7 +2229,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2952 rhodecode/model/db.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2952 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 rhodecode/model/db.py:2948 msgid "Not Reviewed" msgstr "" @@ -2145,7 +2258,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2953 rhodecode/model/db.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2953 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 rhodecode/model/db.py:2949 msgid "Approved" msgstr "" @@ -2172,7 +2287,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2954 rhodecode/model/db.py:2948 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2954 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2948 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 rhodecode/model/db.py:2950 msgid "Rejected" msgstr "" @@ -2199,7 +2316,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1199 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1321 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1346 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2955 rhodecode/model/db.py:2949 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2955 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2949 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 rhodecode/model/db.py:2951 msgid "Under Review" msgstr "" @@ -2223,7 +2342,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 rhodecode/model/db.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 rhodecode/model/db.py:2292 msgid "Repository group no access" msgstr "" @@ -2247,7 +2368,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 rhodecode/model/db.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 rhodecode/model/db.py:2293 msgid "Repository group read access" msgstr "" @@ -2271,7 +2394,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 rhodecode/model/db.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 rhodecode/model/db.py:2294 msgid "Repository group write access" msgstr "" @@ -2295,7 +2420,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:832 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:954 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301 rhodecode/model/db.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 rhodecode/model/db.py:2295 msgid "Repository group admin access" msgstr "" @@ -2318,7 +2445,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 rhodecode/model/db.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 rhodecode/model/db.py:2297 msgid "User group no access" msgstr "" @@ -2341,7 +2470,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304 rhodecode/model/db.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 rhodecode/model/db.py:2298 msgid "User group read access" msgstr "" @@ -2364,7 +2495,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 rhodecode/model/db.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 rhodecode/model/db.py:2299 msgid "User group write access" msgstr "" @@ -2387,7 +2520,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:837 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:959 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 rhodecode/model/db.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 rhodecode/model/db.py:2300 msgid "User group admin access" msgstr "" @@ -2410,7 +2545,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 rhodecode/model/db.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 rhodecode/model/db.py:2302 msgid "Repository Group creation disabled" msgstr "" @@ -2433,7 +2570,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:840 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:962 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 rhodecode/model/db.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 rhodecode/model/db.py:2303 msgid "Repository Group creation enabled" msgstr "" @@ -2456,7 +2595,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 rhodecode/model/db.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 rhodecode/model/db.py:2305 msgid "User Group creation disabled" msgstr "" @@ -2479,7 +2620,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:843 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:965 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312 rhodecode/model/db.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 rhodecode/model/db.py:2306 msgid "User Group creation enabled" msgstr "" @@ -2502,7 +2645,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2322 rhodecode/model/db.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2322 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 rhodecode/model/db.py:2316 msgid "Registration disabled" msgstr "" @@ -2525,7 +2670,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 rhodecode/model/db.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 rhodecode/model/db.py:2317 msgid "User Registration with manual account activation" msgstr "" @@ -2548,7 +2695,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:855 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:977 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 rhodecode/model/db.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 rhodecode/model/db.py:2318 msgid "User Registration with automatic account activation" msgstr "" @@ -2571,7 +2720,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2326 rhodecode/model/db.py:2318 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2326 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2318 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 rhodecode/model/db.py:2320 msgid "Manual activation of external account" msgstr "" @@ -2594,7 +2745,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:858 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:980 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2327 rhodecode/model/db.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2327 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 rhodecode/model/db.py:2321 msgid "Automatic activation of external account" msgstr "" @@ -2611,7 +2764,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 rhodecode/model/db.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 rhodecode/model/db.py:2310 msgid "Repository creation enabled with write permission to a repository group" msgstr "" @@ -2628,7 +2783,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 rhodecode/model/db.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 rhodecode/model/db.py:2311 msgid "Repository creation disabled with write permission to a repository group" msgstr "" @@ -2642,7 +2799,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:822 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:944 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291 rhodecode/model/db.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 rhodecode/model/db.py:2285 msgid "RhodeCode Super Administrator" msgstr "" @@ -2654,7 +2813,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:860 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:982 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2329 rhodecode/model/db.py:2321 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2329 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2321 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 rhodecode/model/db.py:2323 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -2666,31 +2827,45 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:861 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:983 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1008 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2330 rhodecode/model/db.py:2322 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2330 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2322 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 rhodecode/model/db.py:2324 msgid "Inherit object permissions from default user enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:909 rhodecode/model/db.py:910 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:909 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 rhodecode/model/db.py:910 msgid "all" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910 rhodecode/model/db.py:911 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 rhodecode/model/db.py:911 msgid "http/web interface" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 rhodecode/model/db.py:912 +#: 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:912 rhodecode/model/db.py:912 msgid "vcs (git/hg/svn protocol)" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 rhodecode/model/db.py:913 +#: 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:913 rhodecode/model/db.py:913 msgid "api calls" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 rhodecode/model/db.py:914 +#: 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:914 rhodecode/model/db.py:914 msgid "feed access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069 rhodecode/model/db.py:2061 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2061 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 rhodecode/model/db.py:2063 msgid "No parent" msgstr "" @@ -2916,7 +3091,7 @@ msgstr "" msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:285 +#: rhodecode/model/user.py:284 #, python-format msgid "You can't edit this user (`%(username)s`) since it's crucial for entire application" msgstr "" @@ -3154,6 +3329,54 @@ msgstr "" msgid "Duplicated value for filename found: `{}`" msgstr "" +#: rhodecode/model/validation_schema/schemas/integration_schema.py:36 +msgid "Pick a scope:" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/integration_schema.py:39 +msgid "Global (all repositories)" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/integration_schema.py:40 +msgid "Top level repositories only" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/integration_schema.py:79 +msgid "Only repo admins can create integrations" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/integration_schema.py:86 +msgid "Only repogroup admins can create integrations" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/integration_schema.py:91 +msgid "Only superadmins can create global integrations" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/integration_schema.py:183 +msgid "Scope of the integration. Recursive means the integration runs on all repos of that group and children recursively." +msgstr "" + +#: rhodecode/model/validation_schema/schemas/integration_schema.py:186 +msgid "Integration scope" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/integration_schema.py:217 +msgid "General integration options" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/integration_schema.py:220 +msgid "{integration_type} settings" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/user_schema.py:36 +msgid "Password is incorrect" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/user_schema.py:59 +msgid "New password must be different to old password" +msgstr "" + #: rhodecode/public/js/scripts.js:23039 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 @@ -3324,31 +3547,31 @@ msgstr "" #: rhodecode/public/js/scripts.js:41308 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:2 -#: rhodecode/public/js/src/rhodecode/comments.js:235 +#: rhodecode/public/js/src/rhodecode/comments.js:236 msgid "Add another comment" msgstr "" #: rhodecode/public/js/scripts.js:41526 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 -#: rhodecode/public/js/src/rhodecode/comments.js:453 +#: rhodecode/public/js/src/rhodecode/comments.js:470 msgid "Status Review" msgstr "" #: rhodecode/public/js/scripts.js:41540 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/public/js/src/rhodecode/comments.js:467 +#: rhodecode/public/js/src/rhodecode/comments.js:484 msgid "Comment text will be set automatically based on currently selected status ({0}) ..." msgstr "" #: rhodecode/public/js/scripts.js:41653 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 -#: rhodecode/public/js/src/rhodecode/comments.js:580 +#: rhodecode/public/js/src/rhodecode/comments.js:597 msgid "Submitting..." msgstr "" #: rhodecode/public/js/scripts.js:41703 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 -#: rhodecode/public/js/src/rhodecode/comments.js:630 +#: rhodecode/public/js/src/rhodecode/comments.js:647 #: rhodecode/templates/files/files_browser_tree.html:47 msgid "Loading ..." msgstr "" @@ -3508,6 +3731,22 @@ msgstr "" msgid "{0} years" msgstr "" +#: rhodecode/public/js/vendors/webcomponentsjs/webcomponents.min.js:11 +msgid "UIEvent" +msgstr "" + +#: rhodecode/public/js/vendors/webcomponentsjs/webcomponents.min.js:11 +msgid "CustomEvent" +msgstr "" + +#: rhodecode/public/js/vendors/webcomponentsjs/webcomponents.min.js:11 +msgid "MouseEvent" +msgstr "" + +#: rhodecode/public/js/vendors/webcomponentsjs/webcomponents.min.js:11 +msgid "FocusEvent" +msgstr "" + #: rhodecode/templates/index.html:5 msgid "Dashboard" msgstr "" @@ -3556,6 +3795,7 @@ msgstr "" #: rhodecode/templates/index_base.html:97 #: rhodecode/templates/index_base.html:122 #: rhodecode/templates/admin/gists/index.html:112 +#: rhodecode/templates/admin/integrations/list.html:102 #: rhodecode/templates/admin/my_account/my_account_repos.html:31 #: rhodecode/templates/admin/my_account/my_account_watched.html:31 #: rhodecode/templates/admin/repo_groups/repo_groups.html:53 @@ -3575,7 +3815,6 @@ msgstr "" #: rhodecode/templates/index_base.html:100 #: rhodecode/templates/index_base.html:125 #: rhodecode/templates/admin/gists/index.html:114 -#: rhodecode/templates/admin/integrations/list.html:63 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:77 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:45 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:42 @@ -3807,9 +4046,13 @@ msgstr "" #: rhodecode/templates/admin/auth/auth_settings.html:12 #: rhodecode/templates/admin/auth/plugin_settings.html:12 #: rhodecode/templates/admin/defaults/defaults.html:12 -#: rhodecode/templates/admin/integrations/base.html:19 -#: rhodecode/templates/admin/integrations/edit.html:15 +#: rhodecode/templates/admin/integrations/base.html:21 +#: rhodecode/templates/admin/integrations/form.html:15 +#: rhodecode/templates/admin/integrations/form.html:28 #: rhodecode/templates/admin/integrations/list.html:8 +#: rhodecode/templates/admin/integrations/list.html:14 +#: rhodecode/templates/admin/integrations/new.html:11 +#: rhodecode/templates/admin/integrations/new.html:19 #: rhodecode/templates/admin/permissions/permissions.html:12 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:12 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:12 @@ -3857,7 +4100,6 @@ msgstr "" #: rhodecode/templates/admin/auth/auth_settings.html:81 #: rhodecode/templates/admin/auth/plugin_settings.html:87 #: rhodecode/templates/admin/defaults/defaults_repositories.html:63 -#: rhodecode/templates/admin/my_account/my_account_password.html:36 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:103 #: rhodecode/templates/admin/permissions/permissions_application.html:50 #: rhodecode/templates/admin/permissions/permissions_objects.html:56 @@ -3894,7 +4136,7 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.html:14 #: rhodecode/templates/admin/gists/index.html:110 -#: rhodecode/templates/admin/integrations/list.html:64 +#: rhodecode/templates/admin/integrations/list.html:103 #: rhodecode/templates/admin/repos/repo_add_base.html:62 #: rhodecode/templates/admin/repos/repo_edit_fields.html:12 msgid "Type" @@ -4033,7 +4275,7 @@ msgstr "" #: rhodecode/templates/admin/gists/index.html:108 #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:24 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:89 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:88 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:62 #: rhodecode/templates/changelog/changelog.html:110 @@ -4086,75 +4328,17 @@ msgstr "" msgid "Create Public Gist" msgstr "" -#: rhodecode/templates/admin/gists/new.html:62 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:27 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:84 -#: rhodecode/templates/admin/my_account/my_account_emails.html:65 -#: rhodecode/templates/admin/my_account/my_account_password.html:37 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:104 -#: rhodecode/templates/admin/permissions/permissions_application.html:51 -#: rhodecode/templates/admin/permissions/permissions_ips.html:61 -#: rhodecode/templates/admin/permissions/permissions_objects.html:57 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:136 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:68 -#: rhodecode/templates/admin/repos/repo_edit_fields.html:66 -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:80 -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:111 -#: rhodecode/templates/admin/repos/repo_edit_settings.html:159 -#: rhodecode/templates/admin/repos/repo_edit_vcs.html:46 -#: rhodecode/templates/admin/settings/settings_global.html:110 -#: rhodecode/templates/admin/settings/settings_issuetracker.html:16 -#: rhodecode/templates/admin/settings/settings_labs.html:46 -#: rhodecode/templates/admin/settings/settings_vcs.html:14 -#: rhodecode/templates/admin/settings/settings_visual.html:220 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:121 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:23 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:81 -#: rhodecode/templates/admin/users/user_edit_emails.html:63 -#: rhodecode/templates/admin/users/user_edit_ips.html:70 -#: rhodecode/templates/admin/users/user_edit_profile.html:135 -#: rhodecode/templates/base/default_perms_box.html:89 -msgid "Reset" -msgstr "" - #: rhodecode/templates/admin/gists/show.html:13 #: rhodecode/templates/admin/gists/show.html:20 msgid "Gist" msgstr "" #: rhodecode/templates/admin/gists/show.html:49 -#: rhodecode/templates/admin/integrations/list.html:110 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:56 -#: rhodecode/templates/admin/my_account/my_account_emails.html:32 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:63 -#: rhodecode/templates/admin/permissions/permissions_ips.html:26 -#: rhodecode/templates/admin/repos/repo_edit_fields.html:25 -#: rhodecode/templates/admin/settings/settings_hooks.html:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:52 -#: rhodecode/templates/admin/users/user_edit_emails.html:31 -#: rhodecode/templates/admin/users/user_edit_ips.html:34 -#: rhodecode/templates/base/issue_tracker_settings.html:70 -#: rhodecode/templates/base/vcs_settings.html:147 -#: rhodecode/templates/base/vcs_settings.html:172 -#: rhodecode/templates/changeset/changeset_file_comment.html:49 -#: rhodecode/templates/changeset/changeset_file_comment.html:99 -#: rhodecode/templates/data_table/_dt_elements.html:119 -#: rhodecode/templates/data_table/_dt_elements.html:176 -#: rhodecode/templates/data_table/_dt_elements.html:190 -#: rhodecode/templates/data_table/_dt_elements.html:202 -#: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.html:33 -#: rhodecode/templates/files/files_source.html:37 -#: rhodecode/templates/files/files_source.html:40 -msgid "Delete" -msgstr "" - -#: rhodecode/templates/admin/gists/show.html:49 msgid "Confirm to delete this Gist" msgstr "" #: rhodecode/templates/admin/gists/show.html:56 -#: rhodecode/templates/admin/integrations/list.html:103 +#: rhodecode/templates/admin/integrations/list.html:204 #: rhodecode/templates/admin/my_account/my_account_profile.html:5 #: rhodecode/templates/base/issue_tracker_settings.html:61 #: rhodecode/templates/changeset/changeset_file_comment.html:145 @@ -4166,8 +4350,8 @@ msgstr "" #: rhodecode/templates/debug_style/buttons.html:128 #: rhodecode/templates/files/files_add.html:204 #: rhodecode/templates/files/files_edit.html:165 -#: rhodecode/templates/files/files_source.html:36 -#: rhodecode/templates/files/files_source.html:39 +#: rhodecode/templates/files/files_source.html:37 +#: rhodecode/templates/files/files_source.html:40 #: rhodecode/templates/pullrequests/pullrequest_show.html:50 #: rhodecode/templates/pullrequests/pullrequest_show.html:184 #: rhodecode/templates/users/user_profile.html:7 @@ -4188,17 +4372,27 @@ msgstr "" #: rhodecode/templates/admin/gists/show.html:91 #: rhodecode/templates/files/files_delete.html:50 -#: rhodecode/templates/files/files_source.html:61 +#: rhodecode/templates/files/files_source.html:62 msgid "Show as raw" msgstr "" -#: rhodecode/templates/admin/integrations/base.html:12 +#: rhodecode/templates/admin/integrations/base.html:14 msgid "Integrations Settings" msgstr "" -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/form.html:17 #: rhodecode/templates/admin/integrations/list.html:10 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44 +#: rhodecode/templates/admin/integrations/new.html:13 +#: rhodecode/templates/admin/permissions/permissions_objects.html:28 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:127 +msgid "Repository Groups" +msgstr "" + +#: rhodecode/templates/admin/integrations/form.html:30 +#: rhodecode/templates/admin/integrations/list.html:16 +#: rhodecode/templates/admin/integrations/new.html:21 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:48 #: rhodecode/templates/admin/repos/repo_edit.html:15 #: rhodecode/templates/admin/repos/repo_edit.html:43 #: rhodecode/templates/admin/settings/settings.html:14 @@ -4207,31 +4401,101 @@ msgstr "" msgid "Settings" msgstr "" -#: rhodecode/templates/admin/integrations/edit.html:36 +#: rhodecode/templates/admin/integrations/form.html:60 #, python-format msgid "Create New %(integration_type)s Integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:31 -msgid "Create New Integration" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:35 -msgid "No integrations available." -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:56 +#: rhodecode/templates/admin/integrations/list.html:44 +msgid "Current Integrations for Repository: {repo_name}" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:46 +msgid "Current Integrations for repository group: {repo_group_name}" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:48 msgid "Current Integrations" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:65 +#: rhodecode/templates/admin/integrations/list.html:64 +#: rhodecode/templates/admin/notifications/notifications.html:31 +msgid "All" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:95 +#: rhodecode/templates/admin/integrations/new.html:26 +msgid "Create new integration" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:104 +msgid "Scope" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:105 msgid "Actions" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:89 +#: rhodecode/templates/admin/integrations/list.html:115 +msgid "No {type} integrations for repo {repo} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:117 +msgid "No {type} integrations for repogroup {repogroup} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:119 +msgid "No {type} integrations exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:133 +msgid "Create one" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:164 +msgid "repo" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:168 +msgid "repogroup" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:170 +msgid "child repos only" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:172 +msgid "cascade to all" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:177 +msgid "top level repos only" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:179 +msgid "global" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:185 msgid "unknown integration" msgstr "" +#: rhodecode/templates/admin/integrations/new.html:31 +msgid "Create New Integration for repository: {repo_name}" +msgstr "" + +#: rhodecode/templates/admin/integrations/new.html:33 +msgid "Create New Integration for repository group: {repo_group_name}" +msgstr "" + +#: rhodecode/templates/admin/integrations/new.html:35 +msgid "Create New Global Integration" +msgstr "" + +#: rhodecode/templates/admin/integrations/new.html:61 +msgid "No description available" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account.html:5 #: rhodecode/templates/base/base.html:343 msgid "My account" @@ -4251,7 +4515,7 @@ msgstr "" msgid "Auth Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.html:34 +#: rhodecode/templates/admin/my_account/my_account.html:35 msgid "OAuth Identities" msgstr "" @@ -4367,36 +4631,18 @@ msgstr "" msgid "New email address" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_notifications.html:3 -msgid "Your live notification settings" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_notifications.html:14 -#: rhodecode/templates/admin/notifications/show_notification.html:12 -msgid "Notifications" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_notifications.html:14 -msgid "Disabled" +#: rhodecode/templates/admin/my_account/my_account_notifications.html:12 +msgid "Your Live Notification Settings" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_notifications.html:24 +msgid "Notifications Status" msgstr "" #: rhodecode/templates/admin/my_account/my_account_password.html:3 msgid "Change Your Account Password" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_password.html:10 -msgid "Current Password" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_password.html:19 -#: rhodecode/templates/admin/users/user_edit_profile.html:74 -msgid "New Password" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_password.html:28 -msgid "Confirm New Password" -msgstr "" - #: rhodecode/templates/admin/my_account/my_account_profile.html:11 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:52 #: rhodecode/templates/admin/users/user_edit_profile.html:25 @@ -4434,12 +4680,12 @@ msgid "Pull Requests You Opened" msgstr "" #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:23 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:88 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:87 msgid "Target Repo" msgstr "" #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:26 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:91 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:90 #: rhodecode/templates/admin/settings/settings_global.html:9 #: rhodecode/templates/email_templates/pull_request_review.mako:39 #: rhodecode/templates/email_templates/pull_request_review.mako:72 @@ -4449,12 +4695,13 @@ msgid "Title" msgstr "" #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:27 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:92 -msgid "Opened On" +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:91 +#: rhodecode/templates/pullrequests/pullrequests.html:108 +msgid "Last Update" msgstr "" #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:43 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:107 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:106 #: rhodecode/templates/changelog/changelog.html:153 #: rhodecode/templates/compare/compare_commits.html:49 #: rhodecode/templates/search/search_commit.html:36 @@ -4462,7 +4709,7 @@ msgid "Expand commit message" msgstr "" #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:52 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:116 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:115 #: rhodecode/templates/changeset/changeset_file_comment.html:284 #: rhodecode/templates/pullrequests/pullrequest_show.html:14 #: rhodecode/templates/pullrequests/pullrequest_show.html:112 @@ -4470,19 +4717,19 @@ msgstr "" msgid "Closed" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:64 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:63 msgid "Confirm to delete this pull request" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:71 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:70 msgid "You currently have no open pull requests." msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:79 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:78 msgid "Pull Requests You Participate In" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:129 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:127 msgid "There are currently no open pull requests requiring your participation." msgstr "" @@ -4499,10 +4746,6 @@ msgstr "" msgid "My Notifications" msgstr "" -#: rhodecode/templates/admin/notifications/notifications.html:31 -msgid "All" -msgstr "" - #: rhodecode/templates/admin/notifications/notifications.html:32 #: rhodecode/templates/changeset/changeset.html:140 #: rhodecode/templates/pullrequests/pullrequest_show.html:133 @@ -4522,12 +4765,16 @@ msgstr "" msgid "Show notification" msgstr "" +#: rhodecode/templates/admin/notifications/show_notification.html:12 +msgid "Notifications" +msgstr "" + #: rhodecode/templates/admin/permissions/permissions.html:5 msgid "Permissions Administration" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:14 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:45 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:49 #: rhodecode/templates/admin/repos/repo_edit.html:46 #: rhodecode/templates/admin/user_groups/user_group_edit.html:34 #: rhodecode/templates/base/base.html:82 @@ -4629,12 +4876,6 @@ msgstr "" msgid "Overwrite Existing Settings" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_objects.html:28 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:127 -msgid "Repository Groups" -msgstr "" - #: rhodecode/templates/admin/permissions/permissions_objects.html:34 msgid "All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost" msgstr "" @@ -4690,7 +4931,7 @@ msgstr "" msgid "Add Child Group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:46 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:50 #: rhodecode/templates/admin/repos/repo_edit.html:49 #: rhodecode/templates/admin/user_groups/user_group_edit.html:35 #: rhodecode/templates/admin/users/user_edit.html:35 @@ -4949,7 +5190,6 @@ msgid "Statistics" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.html:7 -#: rhodecode/templates/pullrequests/pullrequests.html:108 msgid "Updated on" msgstr "" @@ -5335,7 +5575,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_vcs.html:45 #: rhodecode/templates/admin/settings/settings_global.html:109 -#: rhodecode/templates/admin/settings/settings_labs.html:45 +#: rhodecode/templates/admin/settings/settings_labs.html:48 #: rhodecode/templates/admin/settings/settings_vcs.html:13 #: rhodecode/templates/admin/settings/settings_visual.html:219 msgid "Save settings" @@ -5545,6 +5785,10 @@ msgstr "" msgid "Labs Settings" msgstr "" +#: rhodecode/templates/admin/settings/settings_labs.html:10 +msgid "There are no Labs settings currently" +msgstr "" + #: rhodecode/templates/admin/settings/settings_mapping.html:5 msgid "Import New Groups or Repositories" msgstr "" @@ -6250,6 +6494,10 @@ msgstr "" msgid "Change the avatar at" msgstr "" +#: rhodecode/templates/admin/users/user_edit_profile.html:74 +msgid "New Password" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_profile.html:82 msgid "New Password Confirmation" msgstr "" @@ -6280,7 +6528,7 @@ msgid "Authentication type" msgstr "" #: rhodecode/templates/base/base.html:44 -#: rhodecode/templates/errors/error_document.html:51 +#: rhodecode/templates/errors/error_document.html:57 msgid "Support" msgstr "" @@ -6647,7 +6895,7 @@ msgstr "" msgid "No permission defined" msgstr "" -#: rhodecode/templates/base/root.html:120 +#: rhodecode/templates/base/root.html:161 msgid "Please enable JavaScript to use RhodeCode Enterprise" msgstr "" @@ -6735,54 +6983,70 @@ msgstr "" msgid "Requires hgsubversion library to be installed. Allows cloning remote SVN repositories and migrates them to Mercurial type." msgstr "" -#: rhodecode/templates/base/vcs_settings.html:124 -msgid "Subversion Settings" +#: rhodecode/templates/base/vcs_settings.html:123 +msgid "Mercurial Labs Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.html:123 +msgid "These features are considered experimental and may not work as expected." msgstr "" #: rhodecode/templates/base/vcs_settings.html:129 +msgid "Use rebase as merge strategy" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.html:132 +msgid "Use rebase instead of creating a merge commit when merging via web interface." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.html:144 +msgid "Global Subversion Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.html:150 +msgid "Proxy subversion HTTP requests" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.html:153 +msgid "Subversion HTTP Support. Enables communication with SVN over HTTP protocol." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.html:158 +msgid "Subversion HTTP Server URL" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.html:171 +msgid "Subversion Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.html:176 msgid "Repository patterns" msgstr "" -#: rhodecode/templates/base/vcs_settings.html:133 +#: rhodecode/templates/base/vcs_settings.html:180 msgid "Patterns for identifying SVN branches and tags. For recursive search, use \"*\". Eg.: \"/branches/*\"" msgstr "" -#: rhodecode/templates/base/vcs_settings.html:196 +#: rhodecode/templates/base/vcs_settings.html:246 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.html:201 +#: rhodecode/templates/base/vcs_settings.html:251 msgid "Enable server-side merge for pull requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.html:204 +#: rhodecode/templates/base/vcs_settings.html:254 msgid "Note: when this feature is enabled, it only runs hooks defined in the rcextension package. Custom hooks added on the Admin -> Settings -> Hooks page will not be run when pull requests are automatically merged from the web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.html:208 +#: rhodecode/templates/base/vcs_settings.html:258 msgid "Invalidate and relocate inline comments during update" msgstr "" -#: rhodecode/templates/base/vcs_settings.html:211 +#: rhodecode/templates/base/vcs_settings.html:261 msgid "During the update of a pull request, the position of inline comments will be updated and outdated inline comments will be hidden." msgstr "" -#: rhodecode/templates/base/vcs_settings.html:222 -msgid "Labs settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.html:222 -msgid "These features are considered experimental and may not work as expected." -msgstr "" - -#: rhodecode/templates/base/vcs_settings.html:229 -msgid "Mercurial server-side merge" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.html:234 -msgid "Use rebase instead of creating a merge commit when merging via web interface" -msgstr "" - #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" @@ -7346,7 +7610,7 @@ msgstr "" #: rhodecode/templates/email_templates/pull_request_comment.mako:93 #: rhodecode/templates/email_templates/pull_request_review.mako:73 #: rhodecode/templates/files/file_diff.html:62 -#: rhodecode/templates/files/files_source.html:18 +#: rhodecode/templates/files/files_source.html:19 msgid "Source" msgstr "" @@ -7934,13 +8198,13 @@ msgid "Delete file" msgstr "" #: rhodecode/templates/files/files_delete.html:45 -#: rhodecode/templates/files/files_source.html:49 +#: rhodecode/templates/files/files_source.html:50 #, python-format msgid "Binary file (%s)" msgstr "" #: rhodecode/templates/files/files_delete.html:50 -#: rhodecode/templates/files/files_source.html:61 +#: rhodecode/templates/files/files_source.html:62 msgid "File is too big to display" msgstr "" @@ -8010,44 +8274,44 @@ msgid_plural "lines" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/files/files_source.html:12 +#: rhodecode/templates/files/files_source.html:13 msgid "History" msgstr "" -#: rhodecode/templates/files/files_source.html:15 +#: rhodecode/templates/files/files_source.html:16 #: rhodecode/templates/search/search_content.html:68 msgid "Show Full History" msgstr "" -#: rhodecode/templates/files/files_source.html:20 +#: rhodecode/templates/files/files_source.html:21 #: rhodecode/templates/search/search_content.html:70 msgid "Annotation" msgstr "" -#: rhodecode/templates/files/files_source.html:22 +#: rhodecode/templates/files/files_source.html:23 #: rhodecode/templates/search/search_content.html:71 msgid "Raw" msgstr "" -#: rhodecode/templates/files/files_source.html:24 +#: rhodecode/templates/files/files_source.html:25 #: rhodecode/templates/search/search_content.html:73 msgid "Download" msgstr "" -#: rhodecode/templates/files/files_source.html:31 +#: rhodecode/templates/files/files_source.html:32 #, python-format msgid "Edit on Branch:%s" msgstr "" -#: rhodecode/templates/files/files_source.html:36 +#: rhodecode/templates/files/files_source.html:37 msgid "Editing binary files not allowed" msgstr "" -#: rhodecode/templates/files/files_source.html:39 -msgid "Editing files allowed only when on branch head commit" -msgstr "" - #: rhodecode/templates/files/files_source.html:40 +msgid "Editing files allowed only when on branch head commit" +msgstr "" + +#: rhodecode/templates/files/files_source.html:41 msgid "Deleting files allowed only when on branch head commit" msgstr ""