diff --git a/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2016-08-02 20:55+0000\n" -"PO-Revision-Date: 2016-08-02 20:57+0000\n" +"POT-Creation-Date: 2016-09-15 14:11+0000\n" +"PO-Revision-Date: 2016-09-15 14:12+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Belarusian (http://www.transifex.com/rhodecode/RhodeCode/language/be/)\n" "MIME-Version: 1.0\n" @@ -19,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" #: rhodecode/admin/navigation.py: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 "" @@ -42,7 +42,8 @@ msgstr "" msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:80 rhodecode/templates/register.html:76 +#: 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 #: rhodecode/templates/admin/users/user_add.html:86 @@ -62,12 +63,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 +97,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 "" @@ -395,12 +402,12 @@ msgstr "" #: rhodecode/controllers/changeset.py:335 #: rhodecode/controllers/pullrequests.py:750 -#: rhodecode/model/pull_request.py:843 +#: rhodecode/model/pull_request.py:842 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" -#: rhodecode/controllers/changeset.py:372 +#: rhodecode/controllers/changeset.py:373 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" @@ -543,14 +550,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 "" @@ -656,30 +663,30 @@ msgid "Close Pull Request" msgstr "" #: rhodecode/controllers/pullrequests.py:754 -#: rhodecode/model/pull_request.py:847 +#: rhodecode/model/pull_request.py:846 msgid "Closing with" msgstr "" -#: rhodecode/controllers/pullrequests.py:802 +#: rhodecode/controllers/pullrequests.py:804 #, python-format msgid "" "Closing pull request on other statuses than rejected or approved is " "forbidden. Calculated status from all reviewers is currently: %s" msgstr "" -#: rhodecode/controllers/summary.py: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 "" @@ -692,37 +699,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 "" @@ -776,60 +783,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 "" @@ -1053,18 +1061,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 "" @@ -1073,86 +1081,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" @@ -1335,38 +1327,50 @@ 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:193 +#: rhodecode/events/repo.py:199 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:202 +#: rhodecode/events/repo.py:208 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:211 +#: rhodecode/events/repo.py:217 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:222 +#: rhodecode/events/repo.py:228 msgid "repository push" msgstr "" +#: rhodecode/events/repo_group.py:62 +msgid "repository group created" +msgstr "" + +#: rhodecode/events/repo_group.py:71 +msgid "repository group deleted" +msgstr "" + +#: rhodecode/events/repo_group.py:80 +msgid "repository group update" +msgstr "" + #: rhodecode/events/user.py:34 msgid "user registered" msgstr "" @@ -1379,42 +1383,202 @@ 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:214 +msgid "Recipients" +msgstr "" + +#: rhodecode/integrations/types/email.py:215 +msgid "Email addresses to send push events to" +msgstr "" + +#: 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 "Red" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:45 +msgid "Green" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:46 +msgid "Purple" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:47 +msgid "Gray" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:52 +msgid "Hipchat server URL" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:53 +msgid "Hipchat integration url." +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:63 +msgid "Notify" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:64 +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 "Background color of message." +msgstr "" + +#: 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 @@ -1430,35 +1594,40 @@ 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 "" @@ -1470,10 +1639,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 "" @@ -1597,80 +1770,80 @@ 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:545 +#: 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:1481 +#: rhodecode/lib/helpers.py:1489 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:1485 +#: rhodecode/lib/helpers.py:1493 msgid "No Files" msgstr "" -#: rhodecode/lib/helpers.py:1558 +#: rhodecode/lib/helpers.py:1566 msgid "new file" msgstr "" -#: rhodecode/lib/helpers.py:1561 +#: rhodecode/lib/helpers.py:1569 msgid "mod" msgstr "" -#: rhodecode/lib/helpers.py:1564 -msgid "del" -msgstr "" - -#: rhodecode/lib/helpers.py:1567 -msgid "rename" -msgstr "" - #: rhodecode/lib/helpers.py:1572 +msgid "del" +msgstr "" + +#: rhodecode/lib/helpers.py:1575 +msgid "rename" +msgstr "" + +#: rhodecode/lib/helpers.py:1580 msgid "chmod" msgstr "" -#: rhodecode/lib/helpers.py:1819 +#: rhodecode/lib/helpers.py:1827 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -1689,14 +1862,14 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1839 +#: 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" @@ -1705,7 +1878,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/lib/utils2.py:455 +#: rhodecode/lib/utils2.py:464 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1714,7 +1887,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/lib/utils2.py:456 +#: rhodecode/lib/utils2.py:465 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1723,7 +1896,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/lib/utils2.py:457 +#: rhodecode/lib/utils2.py:466 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1732,7 +1905,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/lib/utils2.py:458 +#: rhodecode/lib/utils2.py:467 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1741,7 +1914,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/lib/utils2.py:459 +#: rhodecode/lib/utils2.py:468 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1750,42 +1923,42 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: 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" @@ -1815,7 +1988,9 @@ msgstr "" #: 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_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 "" @@ -1843,7 +2018,9 @@ msgstr "" #: 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_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 "" @@ -1871,7 +2048,9 @@ msgstr "" #: 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_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 "" @@ -1899,7 +2078,9 @@ msgstr "" #: 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_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 "" @@ -1967,7 +2148,9 @@ msgstr "" #: 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_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 "" @@ -1995,7 +2178,9 @@ msgstr "" #: 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_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 "" @@ -2023,7 +2208,9 @@ msgstr "" #: 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_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 "" @@ -2051,7 +2238,9 @@ msgstr "" #: 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_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 "" @@ -2100,7 +2289,9 @@ msgstr "" #: 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:2944 +#: 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 "" @@ -2128,7 +2319,9 @@ msgstr "" #: 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:2945 +#: 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 "" @@ -2156,7 +2349,9 @@ msgstr "" #: 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:2946 +#: 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 "" @@ -2184,7 +2379,9 @@ msgstr "" #: 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:2947 +#: 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 "" @@ -2209,7 +2406,9 @@ msgstr "" #: 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_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 "" @@ -2234,7 +2433,9 @@ msgstr "" #: 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_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 "" @@ -2259,7 +2460,9 @@ msgstr "" #: 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_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 "" @@ -2284,7 +2487,9 @@ msgstr "" #: 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_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 "" @@ -2308,7 +2513,9 @@ msgstr "" #: 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_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 "" @@ -2332,7 +2539,9 @@ msgstr "" #: 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_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 "" @@ -2356,7 +2565,9 @@ msgstr "" #: 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_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 "" @@ -2380,7 +2591,9 @@ msgstr "" #: 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_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 "" @@ -2404,7 +2617,9 @@ msgstr "" #: 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_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 "" @@ -2428,7 +2643,9 @@ msgstr "" #: 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_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 "" @@ -2452,7 +2669,9 @@ msgstr "" #: 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_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 "" @@ -2476,7 +2695,9 @@ msgstr "" #: 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_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 "" @@ -2500,7 +2721,9 @@ msgstr "" #: 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_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 "" @@ -2524,7 +2747,9 @@ msgstr "" #: 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_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 +2773,9 @@ msgstr "" #: 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_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 "" @@ -2572,7 +2799,9 @@ msgstr "" #: 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_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 "" @@ -2596,7 +2825,9 @@ msgstr "" #: 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_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 "" @@ -2614,7 +2845,9 @@ msgstr "" #: 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_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 "" @@ -2633,7 +2866,9 @@ msgstr "" #: 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_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 "" @@ -2649,7 +2884,9 @@ msgstr "" #: 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_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 "" @@ -2662,7 +2899,9 @@ msgstr "" #: 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_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 "" @@ -2675,32 +2914,46 @@ msgstr "" #: 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_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_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 "" @@ -2754,12 +3007,12 @@ msgid "" "email" msgstr "" -#: rhodecode/model/comment.py:263 +#: rhodecode/model/comment.py:266 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:264 -msgid "Refresh page" +#: rhodecode/model/comment.py:267 +msgid "Show it now" msgstr "" #: rhodecode/model/forms.py:85 @@ -2890,7 +3143,7 @@ msgid "" " %(pr_title)s" msgstr "" -#: rhodecode/model/pull_request.py:449 +#: rhodecode/model/pull_request.py:448 msgid "Pull request merged and closed" msgstr "" @@ -2934,7 +3187,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 " @@ -3188,6 +3441,56 @@ 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 @@ -3358,19 +3661,19 @@ 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}) ..." @@ -3378,13 +3681,13 @@ 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 "" @@ -3544,6 +3847,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 "" @@ -3592,6 +3911,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 @@ -3611,7 +3931,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 @@ -3628,8 +3947,8 @@ msgstr "" #: rhodecode/templates/changeset/changeset.html:53 #: rhodecode/templates/compare/compare_commits.html:24 #: rhodecode/templates/email_templates/commit_comment.mako:82 -#: rhodecode/templates/email_templates/pull_request_review.mako:30 -#: rhodecode/templates/email_templates/pull_request_review.mako:51 +#: rhodecode/templates/email_templates/pull_request_review.mako:41 +#: rhodecode/templates/email_templates/pull_request_review.mako:75 #: rhodecode/templates/files/file_tree_detail.html:5 #: rhodecode/templates/files/file_tree_detail.html:12 #: rhodecode/templates/forks/fork.html:48 @@ -3845,9 +4164,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 @@ -3897,7 +4220,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 @@ -3934,7 +4256,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" @@ -4079,7 +4401,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 @@ -4132,75 +4454,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 @@ -4212,8 +4476,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 @@ -4234,17 +4498,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 -msgid "Integrations settings" -msgstr "" - -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/base.html:14 +msgid "Integrations Settings" +msgstr "" + +#: 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 @@ -4254,27 +4528,101 @@ msgstr "" msgid "Settings" msgstr "" -#: rhodecode/templates/admin/integrations/edit.html:36 -#, python-format -msgid "Create new %(integration_type)s integration" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:31 +#: rhodecode/templates/admin/integrations/form.html:60 +#, python-format +msgid "Create New %(integration_type)s Integration" +msgstr "" + +#: 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: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:56 -msgid "Current integrations" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:65 +#: 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" @@ -4294,7 +4642,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 "" @@ -4412,36 +4760,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 @@ -4481,27 +4811,28 @@ 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:28 -#: rhodecode/templates/email_templates/pull_request_review.mako:48 +#: rhodecode/templates/email_templates/pull_request_review.mako:39 +#: rhodecode/templates/email_templates/pull_request_review.mako:72 #: rhodecode/templates/pullrequests/pullrequest.html:38 #: rhodecode/templates/pullrequests/pullrequests.html:104 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 @@ -4509,7 +4840,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 @@ -4517,19 +4848,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 "" @@ -4547,10 +4878,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 @@ -4570,12 +4897,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 @@ -4688,12 +5019,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 " @@ -4756,7 +5081,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 @@ -5029,7 +5354,6 @@ msgid "Statistics" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.html:7 -#: rhodecode/templates/pullrequests/pullrequests.html:108 msgid "Updated on" msgstr "" @@ -5436,7 +5760,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" @@ -5653,6 +5977,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 "" @@ -6394,6 +6722,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 "" @@ -6424,7 +6756,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 "" @@ -6810,7 +7142,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 "" @@ -6912,29 +7244,65 @@ msgid "" "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 " @@ -6942,34 +7310,16 @@ msgid "" "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" @@ -7383,7 +7733,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:293 #: rhodecode/templates/compare/compare_diff.html:57 #: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 msgid "Comment" msgstr "" @@ -7543,17 +7893,17 @@ msgid "Compare Commits" msgstr "" #: rhodecode/templates/compare/compare_diff.html:46 -#: rhodecode/templates/email_templates/pull_request_review.mako:50 +#: rhodecode/templates/email_templates/pull_request_review.mako:74 #: rhodecode/templates/files/file_diff.html:56 #: rhodecode/templates/pullrequests/pullrequest_show.html:85 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.html:47 -#: rhodecode/templates/email_templates/pull_request_comment.mako:92 -#: rhodecode/templates/email_templates/pull_request_review.mako:49 +#: 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 "" @@ -7736,17 +8086,17 @@ msgstr "" msgid "Form vertical" msgstr "" -#: rhodecode/templates/email_templates/base.mako:7 +#: rhodecode/templates/email_templates/base.mako:32 #, python-format msgid "This is a notification from RhodeCode. %(instance_url)s" msgstr "" -#: rhodecode/templates/email_templates/base.mako:90 +#: rhodecode/templates/email_templates/base.mako:115 msgid "RhodeCode" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:16 -#: rhodecode/templates/email_templates/pull_request_comment.mako:17 +#: rhodecode/templates/email_templates/pull_request_comment.mako:18 msgid "[mention]" msgstr "" @@ -7775,12 +8125,12 @@ msgid "%(user)s commented on commit `%(c msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:43 -#: rhodecode/templates/email_templates/pull_request_comment.mako:43 +#: rhodecode/templates/email_templates/pull_request_comment.mako:44 msgid "Comment link" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:48 -#: rhodecode/templates/email_templates/pull_request_comment.mako:48 +#: rhodecode/templates/email_templates/pull_request_comment.mako:49 #, python-format msgid "File: %(comment_file)s on line %(comment_line)s" msgstr "" @@ -7809,7 +8159,7 @@ msgid "The commit status was changed to" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 #, python-format msgid "Comment on line: %(comment_line)s" msgstr "" @@ -7818,75 +8168,79 @@ msgstr "" msgid "Generate new password here" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:20 +#: rhodecode/templates/email_templates/pull_request_comment.mako:21 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: " "`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:23 +#: rhodecode/templates/email_templates/pull_request_comment.mako:24 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: " "%(status)s)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:25 -#: rhodecode/templates/email_templates/pull_request_comment.mako:82 +#: rhodecode/templates/email_templates/pull_request_comment.mako:26 +#: rhodecode/templates/email_templates/pull_request_comment.mako:83 #, python-format msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:45 +#: rhodecode/templates/email_templates/pull_request_comment.mako:46 msgid "Source repository" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:54 +#: rhodecode/templates/email_templates/pull_request_comment.mako:55 #, python-format msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:56 +#: rhodecode/templates/email_templates/pull_request_comment.mako:57 #, python-format msgid "" "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:80 +#: rhodecode/templates/email_templates/pull_request_comment.mako:81 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" " "(file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:86 +#: rhodecode/templates/email_templates/pull_request_comment.mako:87 #, python-format msgid "submitted pull request status: %(status)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:88 +#: rhodecode/templates/email_templates/pull_request_comment.mako:89 #, python-format msgid "submitted pull request status: %(status)s and closed" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:5 -#, python-format -msgid "%(user)s wants you to review pull request #%(pr_url)s: \"%(pr_title)s\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_review.mako:17 +#: rhodecode/templates/email_templates/pull_request_comment.mako:95 +msgid "Submitted status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:14 +#, python-format +msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:34 #, python-format msgid "" "Pull request from %(source_ref_type)s:%(source_ref_name)s of %(repo_url)s " "into %(target_ref_type)s:%(target_ref_name)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:26 +#: rhodecode/templates/email_templates/pull_request_review.mako:37 msgid "Link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:35 +#: rhodecode/templates/email_templates/pull_request_review.mako:46 #, python-format msgid "Commit (%(num)s)" msgid_plural "Commits (%(num)s)" @@ -7895,22 +8249,22 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/email_templates/pull_request_review.mako:47 +#: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"." msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:49 +#: rhodecode/templates/email_templates/pull_request_review.mako:73 #, python-format msgid "%(source_ref_type)s of %(source_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:50 +#: rhodecode/templates/email_templates/pull_request_review.mako:74 #, python-format msgid "%(target_ref_type)s of %(target_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:52 +#: rhodecode/templates/email_templates/pull_request_review.mako:76 #: rhodecode/templates/summary/components.html:95 #: rhodecode/templates/summary/components.html:98 #, python-format @@ -8155,13 +8509,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 "" @@ -8233,44 +8587,44 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: 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 "" diff --git a/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2016-08-02 20:55+0000\n" -"PO-Revision-Date: 2016-08-02 20:57+0000\n" +"POT-Creation-Date: 2016-09-15 14:11+0000\n" +"PO-Revision-Date: 2016-09-15 14:12+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: German (http://www.transifex.com/rhodecode/RhodeCode/language/de/)\n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\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 "" @@ -44,7 +44,8 @@ msgstr "" msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:80 rhodecode/templates/register.html:76 +#: 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 #: rhodecode/templates/admin/users/user_add.html:86 @@ -64,12 +65,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" @@ -92,9 +99,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 "Aktiviert" @@ -397,12 +404,12 @@ msgstr "" #: rhodecode/controllers/changeset.py:335 #: rhodecode/controllers/pullrequests.py:750 -#: rhodecode/model/pull_request.py:843 +#: rhodecode/model/pull_request.py:842 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "Status Änderung %(transition_icon)s %(status)s" -#: rhodecode/controllers/changeset.py:372 +#: rhodecode/controllers/changeset.py:373 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" @@ -545,14 +552,14 @@ msgstr "" msgid "Changesets" msgstr "Changesets" -#: 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 "Entwicklungszweige" #: 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 "Tags" @@ -658,30 +665,30 @@ msgid "Close Pull Request" msgstr "" #: rhodecode/controllers/pullrequests.py:754 -#: rhodecode/model/pull_request.py:847 +#: rhodecode/model/pull_request.py:846 msgid "Closing with" msgstr "Schließen mit" -#: rhodecode/controllers/pullrequests.py:802 +#: rhodecode/controllers/pullrequests.py:804 #, python-format msgid "" "Closing pull request on other statuses than rejected or approved is " "forbidden. Calculated status from all reviewers is currently: %s" msgstr "Ein Pullrequest kann nur in den Stati rejected oder approved geschlossen werden. Berechneter Status aus den Reviews ist: %s" -#: rhodecode/controllers/summary.py:235 +#: rhodecode/controllers/summary.py:243 msgid "Branch" msgstr "Branch" -#: rhodecode/controllers/summary.py:236 +#: rhodecode/controllers/summary.py:244 msgid "Tag" msgstr "Tag" -#: rhodecode/controllers/summary.py:237 +#: rhodecode/controllers/summary.py:245 msgid "Bookmark" msgstr "Lesezeichen" -#: rhodecode/controllers/summary.py:252 +#: rhodecode/controllers/summary.py:260 msgid "Closed branches" msgstr "Geschlossene Branches" @@ -694,37 +701,37 @@ msgid "Error occurred during update of d msgstr "Fehler bei der Aktualisierung der Standardwerte aufgetreten" #: 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 "für immer" #: 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 "5 Minuten" #: 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 "1 Stunde" #: 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 "1 Tag" #: 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 "1 Monat" #: 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 "Lebensdauer" @@ -778,60 +785,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 "Sie können diesen Benutzer nicht editieren, da er für die ganze Applikation von entscheidender bedeutung ist." -#: rhodecode/controllers/admin/my_account.py:128 +#: rhodecode/controllers/admin/my_account.py:132 msgid "Your account was updated successfully" msgstr "Ihr Account wurde erfolgreich aktualisiert" -#: 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 "Fehler bei der Aktualisierung des Benutzers %s" -#: 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 "Fehler bei der Aktualisierung des Benutzerpassworts aufgetreten" + +#: rhodecode/controllers/admin/my_account.py:226 msgid "Successfully updated password" msgstr "Passwort erfolgreich aktualisiert" -#: rhodecode/controllers/admin/my_account.py:213 -msgid "Error occurred during update of user password" -msgstr "Fehler bei der Aktualisierung des Benutzerpassworts aufgetreten" - -#: 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 "Währen der Speicherung der E-Mail-Addresse trat ein Fehler auf" -#: 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 "Rolle" -#: 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 "Authentifizierungstoken erfolgreich erstellt" -#: 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 "Authentifizierungstoken erfolgreich zurückgesetzt" -#: 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 "Authentifizierungstoken erfolgreich gelöscht" @@ -1051,18 +1059,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 "Ein Eintrag wurde aus dem Issue Tracker gelöscht." #: 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 "Einige Eingabefelder enthalten ungültige Daten." @@ -1071,86 +1079,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 "VCS-Einstellungen aktualisiert" -#: 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 "Fehler während der Aktualisierung der Applikations-Einstellungen aufgetreten" -#: rhodecode/controllers/admin/settings.py:211 +#: rhodecode/controllers/admin/settings.py:214 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "Repositories erfolgreich gescannt, hinzugefügt: %s; entfernt: %s" -#: rhodecode/controllers/admin/settings.py:263 +#: rhodecode/controllers/admin/settings.py:266 msgid "Updated application settings" msgstr "Applikations-Einstellungen aktualisiert" -#: rhodecode/controllers/admin/settings.py:327 +#: rhodecode/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "Visualisierungs-Einstellungen aktualisiert" -#: rhodecode/controllers/admin/settings.py:330 +#: rhodecode/controllers/admin/settings.py:333 msgid "Error occurred during updating visualisation settings" msgstr "Fehler bei der Aktualisierung der Visualisierungs-Einstellungen" -#: rhodecode/controllers/admin/settings.py:422 +#: rhodecode/controllers/admin/settings.py:425 msgid "Please enter email address" msgstr "Bitte E-Mail-Adresse eingeben" -#: rhodecode/controllers/admin/settings.py:440 +#: rhodecode/controllers/admin/settings.py:443 msgid "Send email task created" msgstr "Aufgabe zum Senden der E-Mail erstellt" -#: rhodecode/controllers/admin/settings.py:473 +#: rhodecode/controllers/admin/settings.py:476 msgid "Added new hook" msgstr "Neuer Hook hinzugefügt" -#: rhodecode/controllers/admin/settings.py:488 +#: rhodecode/controllers/admin/settings.py:491 msgid "Updated hooks" msgstr "Die Hooks wurden aktutalisiert" -#: 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 "Kritisch: Ihr Plattenplatz ist sehr gering %s%% belegt" -#: 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 "Warnung: Ihr Plattenplatz geht zur Neige %s%% belegt" -#: rhodecode/controllers/admin/settings.py:740 +#: rhodecode/controllers/admin/settings.py:743 msgid "Error occurred during updating labs settings" msgstr "Fehler bei der Aktualisierung der Labs-Einstellungen aufgetreten" -#: rhodecode/controllers/admin/settings.py:745 +#: rhodecode/controllers/admin/settings.py:748 msgid "Updated Labs settings" msgstr "Labs-Einstellungen aktualisiert" -#: 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" @@ -1333,38 +1325,50 @@ 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:193 +#: rhodecode/events/repo.py:199 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:202 +#: rhodecode/events/repo.py:208 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:211 +#: rhodecode/events/repo.py:217 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:222 +#: rhodecode/events/repo.py:228 msgid "repository push" msgstr "" +#: rhodecode/events/repo_group.py:62 +msgid "repository group created" +msgstr "" + +#: rhodecode/events/repo_group.py:71 +msgid "repository group deleted" +msgstr "" + +#: rhodecode/events/repo_group.py:80 +msgid "repository group update" +msgstr "" + #: rhodecode/events/user.py:34 msgid "user registered" msgstr "" @@ -1377,42 +1381,202 @@ 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 "Zurücksetzen" + +#: 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 "Löschen" + +#: 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:214 +msgid "Recipients" +msgstr "" + +#: rhodecode/integrations/types/email.py:215 +msgid "Email addresses to send push events to" +msgstr "" + +#: 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 "Red" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:45 +msgid "Green" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:46 +msgid "Purple" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:47 +msgid "Gray" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:52 +msgid "Hipchat server URL" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:53 +msgid "Hipchat integration url." +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:63 +msgid "Notify" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:64 +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 "Background color of message." +msgstr "" + +#: 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 @@ -1428,35 +1592,40 @@ msgstr "" msgid "Username" msgstr "Benutzername" -#: 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 "" @@ -1468,10 +1637,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 "[gelöscht] Repository" @@ -1595,80 +1768,80 @@ msgstr "Tag erstellt: %s" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1180 +#: rhodecode/lib/auth.py:1185 #, python-format msgid "IP %s not allowed" msgstr "IP-Adresse %s nicht erlaubt" -#: rhodecode/lib/auth.py:1254 +#: rhodecode/lib/auth.py:1259 msgid "You need to be a registered user to perform this action" msgstr "Sie müssen ein Registrierter Nutzer sein um diese Aktion durchzuführen" -#: rhodecode/lib/auth.py:1302 +#: rhodecode/lib/auth.py:1307 #, python-format msgid "Action not supported for %s." msgstr "Aktion wird für %s nicht unterstützt." -#: rhodecode/lib/auth.py:1339 +#: rhodecode/lib/auth.py:1344 msgid "You need to be signed in to view this page" msgstr "Sie müssen angemeldet sein, um diese Seite zu betrachten" -#: rhodecode/lib/base.py:545 +#: 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 "Binärdatei" -#: 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 "Der Änderungssatz war zu groß und wurde abgeschnitten, benutzen sie das Diff Menü um die Unterschiede anzuzeigen" -#: rhodecode/lib/diffs.py:102 +#: rhodecode/lib/diffs.py:109 msgid "No changes detected" msgstr "Keine Änderungen erkannt" -#: rhodecode/lib/diffs.py:631 +#: rhodecode/lib/diffs.py:643 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1481 +#: rhodecode/lib/helpers.py:1489 #, python-format msgid " and %s more" msgstr "und %s weitere" -#: rhodecode/lib/helpers.py:1485 +#: rhodecode/lib/helpers.py:1493 msgid "No Files" msgstr "Keine Dateien" -#: rhodecode/lib/helpers.py:1558 +#: rhodecode/lib/helpers.py:1566 msgid "new file" msgstr "neue Datei" -#: rhodecode/lib/helpers.py:1561 +#: rhodecode/lib/helpers.py:1569 msgid "mod" msgstr "moderieren" -#: rhodecode/lib/helpers.py:1564 +#: rhodecode/lib/helpers.py:1572 msgid "del" msgstr "löschen" -#: rhodecode/lib/helpers.py:1567 +#: rhodecode/lib/helpers.py:1575 msgid "rename" msgstr "umbennen" -#: rhodecode/lib/helpers.py:1572 +#: rhodecode/lib/helpers.py:1580 msgid "chmod" msgstr "chmod" -#: rhodecode/lib/helpers.py:1819 +#: rhodecode/lib/helpers.py:1827 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -1687,91 +1860,91 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1839 +#: 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 "Das %s Repository ist nicht in der Datenbank vorhanden, eventuell wurde es im Dateisystem erstellt oder umbenannt. Bitte starten sie die Applikation erneut um die Repositories neu zu Indizieren" -#: rhodecode/lib/utils2.py:454 +#: rhodecode/lib/utils2.py:463 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d Jahr" msgstr[1] "%d Jahre" -#: rhodecode/lib/utils2.py:455 +#: rhodecode/lib/utils2.py:464 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d Monat" msgstr[1] "%d Monate" -#: rhodecode/lib/utils2.py:456 +#: rhodecode/lib/utils2.py:465 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d Tag" msgstr[1] "%d Tage" -#: rhodecode/lib/utils2.py:457 +#: rhodecode/lib/utils2.py:466 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: rhodecode/lib/utils2.py:458 +#: rhodecode/lib/utils2.py:467 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d Minute" msgstr[1] "%d Minuten" -#: rhodecode/lib/utils2.py:459 +#: rhodecode/lib/utils2.py:468 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d Sekunde" msgstr[1] "%d Sekunden" -#: 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 "vor %s" -#: 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 "%s und %s her" -#: 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" @@ -1801,7 +1974,9 @@ msgstr "jetzt gerade" #: 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_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 "Kein Zugriff auf Repository" @@ -1829,7 +2004,9 @@ msgstr "Kein Zugriff auf Repository" #: 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_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 "Lesender Zugriff auf Repository" @@ -1857,7 +2034,9 @@ msgstr "Lesender Zugriff auf Repository" #: 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_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 "Schreibdender Zugriff auf Repository" @@ -1885,7 +2064,9 @@ msgstr "Schreibdender Zugriff auf Reposi #: 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_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 "Administrativer Zugang zum Repository" @@ -1953,7 +2134,9 @@ msgstr "RhodeCode Administrator" #: 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_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 "Repository erstelllung deaktiviert" @@ -1981,7 +2164,9 @@ msgstr "Repository erstelllung deaktivie #: 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_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 "Repository erstellung aktiviert" @@ -2009,7 +2194,9 @@ msgstr "Repository erstellung aktiviert" #: 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_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 "" @@ -2037,7 +2224,9 @@ msgstr "" #: 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_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 "" @@ -2086,7 +2275,9 @@ msgstr "Registrierung neuer Benutzer in #: 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:2944 +#: 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 "Nicht Begutachtet" @@ -2114,7 +2305,9 @@ msgstr "Nicht Begutachtet" #: 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:2945 +#: 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 "Akzeptiert" @@ -2142,7 +2335,9 @@ msgstr "Akzeptiert" #: 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:2946 +#: 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 "Abgelehnt" @@ -2170,7 +2365,9 @@ msgstr "Abgelehnt" #: 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:2947 +#: 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 "In Begutachtung" @@ -2195,7 +2392,9 @@ msgstr "In Begutachtung" #: 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_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 "" @@ -2220,7 +2419,9 @@ msgstr "" #: 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_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 "" @@ -2245,7 +2446,9 @@ msgstr "" #: 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_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 "" @@ -2270,7 +2473,9 @@ msgstr "" #: 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_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 "" @@ -2294,7 +2499,9 @@ msgstr "" #: 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_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 "" @@ -2318,7 +2525,9 @@ msgstr "" #: 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_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 "" @@ -2342,7 +2551,9 @@ msgstr "" #: 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_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 "" @@ -2366,7 +2577,9 @@ msgstr "" #: 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_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 "" @@ -2390,7 +2603,9 @@ msgstr "" #: 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_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 "" @@ -2414,7 +2629,9 @@ msgstr "" #: 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_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 "" @@ -2438,7 +2655,9 @@ msgstr "" #: 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_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 "" @@ -2462,7 +2681,9 @@ msgstr "" #: 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_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 "" @@ -2486,7 +2707,9 @@ msgstr "" #: 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_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 "" @@ -2510,7 +2733,9 @@ msgstr "" #: 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_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 "" @@ -2534,7 +2759,9 @@ msgstr "" #: 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_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 "" @@ -2558,7 +2785,9 @@ msgstr "" #: 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_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 "" @@ -2582,7 +2811,9 @@ msgstr "" #: 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_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 "" @@ -2600,7 +2831,9 @@ msgstr "" #: 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_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 "" @@ -2619,7 +2852,9 @@ msgstr "" #: 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_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 "" @@ -2635,7 +2870,9 @@ msgstr "" #: 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_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 "" @@ -2648,7 +2885,9 @@ msgstr "" #: 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_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 "" @@ -2661,32 +2900,46 @@ msgstr "" #: 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_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_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 "" @@ -2740,12 +2993,12 @@ msgid "" "email" msgstr "Ihr Passwort wurde zurückgesetzt, ein neues Passwort wurde and ihre E-Mail Adresse gesendet" -#: rhodecode/model/comment.py:263 +#: rhodecode/model/comment.py:266 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:264 -msgid "Refresh page" +#: rhodecode/model/comment.py:267 +msgid "Show it now" msgstr "" #: rhodecode/model/forms.py:85 @@ -2876,7 +3129,7 @@ msgid "" " %(pr_title)s" msgstr "" -#: rhodecode/model/pull_request.py:449 +#: rhodecode/model/pull_request.py:448 msgid "Pull request merged and closed" msgstr "Pullrequest zusammengeführt und geschlossen" @@ -2920,7 +3173,7 @@ msgstr "" msgid "You can't Edit this user since it's crucial for entire application" msgstr "Sie können diesen User nicht editieren da er für die ganze Applikation von entscheidender bedeutung ist." -#: rhodecode/model/user.py:285 +#: rhodecode/model/user.py:284 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " @@ -3174,6 +3427,56 @@ 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 @@ -3344,19 +3647,19 @@ 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}) ..." @@ -3364,13 +3667,13 @@ 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 "" @@ -3530,6 +3833,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 "Übersichtsseite" @@ -3578,6 +3897,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 @@ -3597,7 +3917,6 @@ msgstr "Name" #: 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 @@ -3614,8 +3933,8 @@ msgstr "Name" #: rhodecode/templates/changeset/changeset.html:53 #: rhodecode/templates/compare/compare_commits.html:24 #: rhodecode/templates/email_templates/commit_comment.mako:82 -#: rhodecode/templates/email_templates/pull_request_review.mako:30 -#: rhodecode/templates/email_templates/pull_request_review.mako:51 +#: rhodecode/templates/email_templates/pull_request_review.mako:41 +#: rhodecode/templates/email_templates/pull_request_review.mako:75 #: rhodecode/templates/files/file_tree_detail.html:5 #: rhodecode/templates/files/file_tree_detail.html:12 #: rhodecode/templates/forks/fork.html:48 @@ -3829,9 +4148,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 @@ -3881,7 +4204,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 @@ -3918,7 +4240,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" @@ -4063,7 +4385,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 @@ -4116,75 +4438,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 "Zurücksetzen" - #: 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 "Löschen" - -#: 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 @@ -4196,8 +4460,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 @@ -4218,17 +4482,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 -msgid "Integrations settings" -msgstr "" - -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/base.html:14 +msgid "Integrations Settings" +msgstr "" + +#: 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 @@ -4238,27 +4512,101 @@ msgstr "" msgid "Settings" msgstr "Einstellungen" -#: rhodecode/templates/admin/integrations/edit.html:36 -#, python-format -msgid "Create new %(integration_type)s integration" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:31 +#: rhodecode/templates/admin/integrations/form.html:60 +#, python-format +msgid "Create New %(integration_type)s Integration" +msgstr "" + +#: 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:64 +#: rhodecode/templates/admin/notifications/notifications.html:31 +msgid "All" +msgstr "Alle" + +#: 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:56 -msgid "Current integrations" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:65 +#: 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" @@ -4278,7 +4626,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 "" @@ -4396,36 +4744,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 "Benachrichtigungen" - -#: rhodecode/templates/admin/my_account/my_account_notifications.html:14 -msgid "Disabled" -msgstr "Deaktiviert" +#: 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 @@ -4465,27 +4795,28 @@ 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:28 -#: rhodecode/templates/email_templates/pull_request_review.mako:48 +#: rhodecode/templates/email_templates/pull_request_review.mako:39 +#: rhodecode/templates/email_templates/pull_request_review.mako:72 #: rhodecode/templates/pullrequests/pullrequest.html:38 #: rhodecode/templates/pullrequests/pullrequests.html:104 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 @@ -4493,7 +4824,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 @@ -4501,19 +4832,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 "" @@ -4531,10 +4862,6 @@ msgstr "" msgid "My Notifications" msgstr "Meine Benachrichtigungen" -#: rhodecode/templates/admin/notifications/notifications.html:31 -msgid "All" -msgstr "Alle" - #: rhodecode/templates/admin/notifications/notifications.html:32 #: rhodecode/templates/changeset/changeset.html:140 #: rhodecode/templates/pullrequests/pullrequest_show.html:133 @@ -4554,12 +4881,16 @@ msgstr "Bisher gibt es keine Benachricht msgid "Show notification" msgstr "Zeige Benachrichtigung" +#: rhodecode/templates/admin/notifications/show_notification.html:12 +msgid "Notifications" +msgstr "Benachrichtigungen" + #: 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 @@ -4672,12 +5003,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 " @@ -4740,7 +5065,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 @@ -5009,7 +5334,6 @@ msgid "Statistics" msgstr "Statistiken" #: rhodecode/templates/admin/repos/repo_edit_advanced.html:7 -#: rhodecode/templates/pullrequests/pullrequests.html:108 msgid "Updated on" msgstr "" @@ -5412,7 +5736,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" @@ -5629,6 +5953,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 "" @@ -6364,6 +6692,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 "" @@ -6394,7 +6726,7 @@ msgid "Authentication type" msgstr "Autentifizierungstyp" #: rhodecode/templates/base/base.html:44 -#: rhodecode/templates/errors/error_document.html:51 +#: rhodecode/templates/errors/error_document.html:57 msgid "Support" msgstr "Support" @@ -6778,7 +7110,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 "" @@ -6880,29 +7212,65 @@ msgid "" "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 " @@ -6910,34 +7278,16 @@ msgid "" "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 "Mercurial merge auf der Serverseite" - -#: 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" @@ -7345,7 +7695,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:293 #: rhodecode/templates/compare/compare_diff.html:57 #: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 msgid "Comment" msgstr "" @@ -7493,17 +7843,17 @@ msgid "Compare Commits" msgstr "" #: rhodecode/templates/compare/compare_diff.html:46 -#: rhodecode/templates/email_templates/pull_request_review.mako:50 +#: rhodecode/templates/email_templates/pull_request_review.mako:74 #: rhodecode/templates/files/file_diff.html:56 #: rhodecode/templates/pullrequests/pullrequest_show.html:85 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.html:47 -#: rhodecode/templates/email_templates/pull_request_comment.mako:92 -#: rhodecode/templates/email_templates/pull_request_review.mako:49 +#: 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 "" @@ -7684,17 +8034,17 @@ msgstr "" msgid "Form vertical" msgstr "" -#: rhodecode/templates/email_templates/base.mako:7 +#: rhodecode/templates/email_templates/base.mako:32 #, python-format msgid "This is a notification from RhodeCode. %(instance_url)s" msgstr "" -#: rhodecode/templates/email_templates/base.mako:90 +#: rhodecode/templates/email_templates/base.mako:115 msgid "RhodeCode" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:16 -#: rhodecode/templates/email_templates/pull_request_comment.mako:17 +#: rhodecode/templates/email_templates/pull_request_comment.mako:18 msgid "[mention]" msgstr "" @@ -7723,12 +8073,12 @@ msgid "%(user)s commented on commit `%(c msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:43 -#: rhodecode/templates/email_templates/pull_request_comment.mako:43 +#: rhodecode/templates/email_templates/pull_request_comment.mako:44 msgid "Comment link" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:48 -#: rhodecode/templates/email_templates/pull_request_comment.mako:48 +#: rhodecode/templates/email_templates/pull_request_comment.mako:49 #, python-format msgid "File: %(comment_file)s on line %(comment_line)s" msgstr "" @@ -7757,7 +8107,7 @@ msgid "The commit status was changed to" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 #, python-format msgid "Comment on line: %(comment_line)s" msgstr "" @@ -7766,97 +8116,101 @@ msgstr "" msgid "Generate new password here" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:20 +#: rhodecode/templates/email_templates/pull_request_comment.mako:21 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: " "`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:23 +#: rhodecode/templates/email_templates/pull_request_comment.mako:24 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: " "%(status)s)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:25 -#: rhodecode/templates/email_templates/pull_request_comment.mako:82 +#: rhodecode/templates/email_templates/pull_request_comment.mako:26 +#: rhodecode/templates/email_templates/pull_request_comment.mako:83 #, python-format msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:45 +#: rhodecode/templates/email_templates/pull_request_comment.mako:46 msgid "Source repository" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:54 +#: rhodecode/templates/email_templates/pull_request_comment.mako:55 #, python-format msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:56 +#: rhodecode/templates/email_templates/pull_request_comment.mako:57 #, python-format msgid "" "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:80 +#: rhodecode/templates/email_templates/pull_request_comment.mako:81 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" " "(file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:86 +#: rhodecode/templates/email_templates/pull_request_comment.mako:87 #, python-format msgid "submitted pull request status: %(status)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:88 +#: rhodecode/templates/email_templates/pull_request_comment.mako:89 #, python-format msgid "submitted pull request status: %(status)s and closed" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:5 -#, python-format -msgid "%(user)s wants you to review pull request #%(pr_url)s: \"%(pr_title)s\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_review.mako:17 +#: rhodecode/templates/email_templates/pull_request_comment.mako:95 +msgid "Submitted status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:14 +#, python-format +msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:34 #, python-format msgid "" "Pull request from %(source_ref_type)s:%(source_ref_name)s of %(repo_url)s " "into %(target_ref_type)s:%(target_ref_name)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:26 +#: rhodecode/templates/email_templates/pull_request_review.mako:37 msgid "Link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:35 +#: rhodecode/templates/email_templates/pull_request_review.mako:46 #, python-format msgid "Commit (%(num)s)" msgid_plural "Commits (%(num)s)" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/email_templates/pull_request_review.mako:47 +#: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"." msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:49 +#: rhodecode/templates/email_templates/pull_request_review.mako:73 #, python-format msgid "%(source_ref_type)s of %(source_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:50 +#: rhodecode/templates/email_templates/pull_request_review.mako:74 #, python-format msgid "%(target_ref_type)s of %(target_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:52 +#: rhodecode/templates/email_templates/pull_request_review.mako:76 #: rhodecode/templates/summary/components.html:95 #: rhodecode/templates/summary/components.html:98 #, python-format @@ -8097,13 +8451,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 "" @@ -8173,44 +8527,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 "" diff --git a/rhodecode/i18n/es/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/es/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/es/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/es/LC_MESSAGES/rhodecode.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2016-08-02 20:55+0000\n" -"PO-Revision-Date: 2016-08-02 20:57+0000\n" +"POT-Creation-Date: 2016-09-15 14:11+0000\n" +"PO-Revision-Date: 2016-09-15 14:12+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Spanish (http://www.transifex.com/rhodecode/RhodeCode/language/es/)\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\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 "" @@ -43,7 +43,8 @@ msgstr "" msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:80 rhodecode/templates/register.html:76 +#: 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 #: rhodecode/templates/admin/users/user_add.html:86 @@ -63,12 +64,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" @@ -91,9 +98,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 "" @@ -396,12 +403,12 @@ msgstr "" #: rhodecode/controllers/changeset.py:335 #: rhodecode/controllers/pullrequests.py:750 -#: rhodecode/model/pull_request.py:843 +#: rhodecode/model/pull_request.py:842 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "Cambio de estado %(transition_icon)s %(status)s" -#: rhodecode/controllers/changeset.py:372 +#: rhodecode/controllers/changeset.py:373 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" @@ -544,14 +551,14 @@ msgstr "" msgid "Changesets" msgstr "Conjuntos de cambios" -#: 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 "Ramas" #: 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 "Etiquetas" @@ -657,30 +664,30 @@ msgid "Close Pull Request" msgstr "" #: rhodecode/controllers/pullrequests.py:754 -#: rhodecode/model/pull_request.py:847 +#: rhodecode/model/pull_request.py:846 msgid "Closing with" msgstr "Cerrando con" -#: rhodecode/controllers/pullrequests.py:802 +#: rhodecode/controllers/pullrequests.py:804 #, python-format msgid "" "Closing pull request on other statuses than rejected or approved is " "forbidden. Calculated status from all reviewers is currently: %s" msgstr "Está prohibido el cerrar solicitudes de extracción otros estados que no sean rechazado o aprobado. El estado calculado por parte de todos los revisadores es actualmente: %s" -#: rhodecode/controllers/summary.py:235 +#: rhodecode/controllers/summary.py:243 msgid "Branch" msgstr "Rama" -#: rhodecode/controllers/summary.py:236 +#: rhodecode/controllers/summary.py:244 msgid "Tag" msgstr "Etiqueta" -#: rhodecode/controllers/summary.py:237 +#: rhodecode/controllers/summary.py:245 msgid "Bookmark" msgstr "Marcador" -#: rhodecode/controllers/summary.py:252 +#: rhodecode/controllers/summary.py:260 msgid "Closed branches" msgstr "Ramas cerradas" @@ -693,37 +700,37 @@ msgid "Error occurred during update of d msgstr "Error ocurrido durante actalización de valores por defecto" #: 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 "para siempre" #: 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 "5 minutos" #: 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 "1 hora" #: 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 "1 día" #: 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 "1 mes" #: 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 "De por vida" @@ -777,60 +784,61 @@ msgstr "nunca" msgid "%(expiry)s - current value" msgstr "%(expiry)s - valor actual" -#: 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 "Usted no puede editar este usuario porque es crucial para la aplicación entera" -#: rhodecode/controllers/admin/my_account.py:128 +#: rhodecode/controllers/admin/my_account.py:132 msgid "Your account was updated successfully" msgstr "Su cuenta fue actualizada exitosamente" -#: 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 "Error ocurrido durante actualización de usuario %s" -#: 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 "Error ocurrido durante actualización de contraseña de usuario" + +#: rhodecode/controllers/admin/my_account.py:226 msgid "Successfully updated password" msgstr "Contraseña actualizada exitosamente" -#: rhodecode/controllers/admin/my_account.py:213 -msgid "Error occurred during update of user password" -msgstr "Error ocurrido durante actualización de contraseña de usuario" - -#: rhodecode/controllers/admin/my_account.py: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 "Ocurrió un error durante guardado de correo electrónico" -#: 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 "Rol" -#: 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 "Ficha de autenticación creada exitosamente" -#: 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 "Ficha de autenticación reiniciada exitosamente" -#: 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 "Ficha de autenticación eliminada exitosamente" @@ -1050,18 +1058,18 @@ msgid "Error occurred during deleting is msgstr "Error ocurrido al eliminar entrada en el seguidor de incidencias" #: rhodecode/controllers/admin/repos.py:721 -#: rhodecode/controllers/admin/settings.py:363 +#: rhodecode/controllers/admin/settings.py:366 msgid "Removed issue tracker entry" msgstr "Se eliminó entrada en el seguidor de incidencias" #: rhodecode/controllers/admin/repos.py:751 -#: rhodecode/controllers/admin/settings.py:409 +#: rhodecode/controllers/admin/settings.py:412 msgid "Updated issue tracker entries" msgstr "Se actualizaron entradas en el seguidor de incidencias" #: 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 "Algunos campos de entrada contienen datos inválidos" @@ -1070,86 +1078,70 @@ msgid "Error occurred during updating re msgstr "Error ocurrido al actualizar ajustes VCS del repositorio" #: rhodecode/controllers/admin/repos.py:834 -#: rhodecode/controllers/admin/settings.py:168 +#: rhodecode/controllers/admin/settings.py:171 msgid "Updated VCS settings" msgstr "Se actualizaron ajustes VCS" -#: 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 "Error ocurrido durante actualización de ajustes de aplicación" -#: rhodecode/controllers/admin/settings.py:211 +#: rhodecode/controllers/admin/settings.py:214 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "Repositorios reescaneados exitosamente agregados: %s ; eliminados: %s" -#: rhodecode/controllers/admin/settings.py:263 +#: rhodecode/controllers/admin/settings.py:266 msgid "Updated application settings" msgstr "Se actualizaron los ajustes de aplicación" -#: rhodecode/controllers/admin/settings.py:327 +#: rhodecode/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "Se actualizaron los ajustes de visualización" -#: rhodecode/controllers/admin/settings.py:330 +#: rhodecode/controllers/admin/settings.py:333 msgid "Error occurred during updating visualisation settings" msgstr "Error ocurrido al actualizar ajustes de visualización" -#: rhodecode/controllers/admin/settings.py:422 +#: rhodecode/controllers/admin/settings.py:425 msgid "Please enter email address" msgstr "Por favor ingrese una dirección de correo electrónico" -#: rhodecode/controllers/admin/settings.py:440 +#: rhodecode/controllers/admin/settings.py:443 msgid "Send email task created" msgstr "Tarea de envío de correo electrónico creada" -#: rhodecode/controllers/admin/settings.py:473 +#: rhodecode/controllers/admin/settings.py:476 msgid "Added new hook" msgstr "Se agregó nuevo gancho" -#: rhodecode/controllers/admin/settings.py:488 +#: rhodecode/controllers/admin/settings.py:491 msgid "Updated hooks" msgstr "Se actualizaron ganchos" -#: rhodecode/controllers/admin/settings.py:492 +#: rhodecode/controllers/admin/settings.py:495 msgid "Error occurred during hook creation" msgstr "Error ocurrido durante creación de gancho" -#: 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 "Crítico: su espacio en disco está demasiado bajo %s%% usedpercent" -#: 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 "Advertencia: su espacio en disco está bajo %s%% usedpercent" -#: rhodecode/controllers/admin/settings.py:740 +#: rhodecode/controllers/admin/settings.py:743 msgid "Error occurred during updating labs settings" msgstr "Error ocurrido al actiualizar ajustes de laboratorios" -#: rhodecode/controllers/admin/settings.py:745 +#: rhodecode/controllers/admin/settings.py:748 msgid "Updated Labs settings" msgstr "Se Actualizaron Ajustes de Laboratorios" -#: rhodecode/controllers/admin/settings.py:795 -msgid "Subversion HTTP Support" -msgstr "Soporte Subversion HTTP" - -#: rhodecode/controllers/admin/settings.py:796 -msgid "Proxy subversion HTTP requests" -msgstr "Solicitudes por proxy HTTP subversion" - -#: rhodecode/controllers/admin/settings.py:802 -msgid "Subversion HTTP Server URL" -msgstr "URL de Servidor HTTP Subversion" - -#: rhodecode/controllers/admin/settings.py:804 -msgid "e.g. http://localhost:8080/" -msgstr "p.e. http://localhost:8080/" - #: rhodecode/controllers/admin/user_groups.py:168 #, python-format msgid "Created user group %(user_group_link)s" @@ -1332,38 +1324,50 @@ 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:193 +#: rhodecode/events/repo.py:199 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:202 +#: rhodecode/events/repo.py:208 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:211 +#: rhodecode/events/repo.py:217 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:222 +#: rhodecode/events/repo.py:228 msgid "repository push" msgstr "" +#: rhodecode/events/repo_group.py:62 +msgid "repository group created" +msgstr "" + +#: rhodecode/events/repo_group.py:71 +msgid "repository group deleted" +msgstr "" + +#: rhodecode/events/repo_group.py:80 +msgid "repository group update" +msgstr "" + #: rhodecode/events/user.py:34 msgid "user registered" msgstr "" @@ -1376,42 +1380,202 @@ 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:214 +msgid "Recipients" +msgstr "" + +#: rhodecode/integrations/types/email.py:215 +msgid "Email addresses to send push events to" +msgstr "" + +#: 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 "Red" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:45 +msgid "Green" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:46 +msgid "Purple" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:47 +msgid "Gray" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:52 +msgid "Hipchat server URL" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:53 +msgid "Hipchat integration url." +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:63 +msgid "Notify" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:64 +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 "Background color of message." +msgstr "" + +#: 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 @@ -1427,35 +1591,40 @@ 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 "" @@ -1467,10 +1636,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 "[deleted] repositorio" @@ -1594,80 +1767,80 @@ msgstr "" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1180 +#: rhodecode/lib/auth.py:1185 #, python-format msgid "IP %s not allowed" msgstr "IP %s no permitida" -#: rhodecode/lib/auth.py:1254 +#: rhodecode/lib/auth.py:1259 msgid "You need to be a registered user to perform this action" msgstr "Usted necesita ser un usuario registrado para llevar a cabo esta acción" -#: rhodecode/lib/auth.py:1302 +#: rhodecode/lib/auth.py:1307 #, python-format msgid "Action not supported for %s." msgstr "Acción no soportada para %s" -#: rhodecode/lib/auth.py:1339 +#: rhodecode/lib/auth.py:1344 msgid "You need to be signed in to view this page" msgstr "Usted necesita estar en sesión para ver esta página" -#: rhodecode/lib/base.py:545 +#: 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:1481 +#: rhodecode/lib/helpers.py:1489 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:1485 +#: rhodecode/lib/helpers.py:1493 msgid "No Files" msgstr "" -#: rhodecode/lib/helpers.py:1558 +#: rhodecode/lib/helpers.py:1566 msgid "new file" msgstr "" -#: rhodecode/lib/helpers.py:1561 +#: rhodecode/lib/helpers.py:1569 msgid "mod" msgstr "" -#: rhodecode/lib/helpers.py:1564 -msgid "del" -msgstr "" - -#: rhodecode/lib/helpers.py:1567 -msgid "rename" -msgstr "" - #: rhodecode/lib/helpers.py:1572 +msgid "del" +msgstr "" + +#: rhodecode/lib/helpers.py:1575 +msgid "rename" +msgstr "" + +#: rhodecode/lib/helpers.py:1580 msgid "chmod" msgstr "" -#: rhodecode/lib/helpers.py:1819 +#: rhodecode/lib/helpers.py:1827 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -1686,91 +1859,91 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1839 +#: 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" @@ -1800,7 +1973,9 @@ msgstr "" #: 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_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 "" @@ -1828,7 +2003,9 @@ msgstr "" #: 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_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 "" @@ -1856,7 +2033,9 @@ msgstr "" #: 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_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 "" @@ -1884,7 +2063,9 @@ msgstr "" #: 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_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 "" @@ -1952,7 +2133,9 @@ msgstr "" #: 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_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 "" @@ -1980,7 +2163,9 @@ msgstr "" #: 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_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 "" @@ -2008,7 +2193,9 @@ msgstr "" #: 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_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 "" @@ -2036,7 +2223,9 @@ msgstr "" #: 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_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 "" @@ -2085,7 +2274,9 @@ msgstr "" #: 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:2944 +#: 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 "" @@ -2113,7 +2304,9 @@ msgstr "" #: 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:2945 +#: 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 "" @@ -2141,7 +2334,9 @@ msgstr "" #: 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:2946 +#: 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 "" @@ -2169,7 +2364,9 @@ msgstr "" #: 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:2947 +#: 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 "" @@ -2194,7 +2391,9 @@ msgstr "" #: 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_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 "" @@ -2219,7 +2418,9 @@ msgstr "" #: 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_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 "" @@ -2244,7 +2445,9 @@ msgstr "" #: 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_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 "" @@ -2269,7 +2472,9 @@ msgstr "" #: 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_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 "" @@ -2293,7 +2498,9 @@ msgstr "" #: 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_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 "" @@ -2317,7 +2524,9 @@ msgstr "" #: 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_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 "" @@ -2341,7 +2550,9 @@ msgstr "" #: 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_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 "" @@ -2365,7 +2576,9 @@ msgstr "" #: 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_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 "" @@ -2389,7 +2602,9 @@ msgstr "" #: 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_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 "" @@ -2413,7 +2628,9 @@ msgstr "" #: 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_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 "" @@ -2437,7 +2654,9 @@ msgstr "" #: 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_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 "" @@ -2461,7 +2680,9 @@ msgstr "" #: 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_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 "" @@ -2485,7 +2706,9 @@ msgstr "" #: 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_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 "" @@ -2509,7 +2732,9 @@ msgstr "" #: 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_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 "" @@ -2533,7 +2758,9 @@ msgstr "" #: 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_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 "" @@ -2557,7 +2784,9 @@ msgstr "" #: 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_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 "" @@ -2581,7 +2810,9 @@ msgstr "" #: 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_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 "" @@ -2599,7 +2830,9 @@ msgstr "" #: 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_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 "" @@ -2618,7 +2851,9 @@ msgstr "" #: 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_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 "" @@ -2634,7 +2869,9 @@ msgstr "" #: 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_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 "" @@ -2647,7 +2884,9 @@ msgstr "" #: 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_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 "" @@ -2660,32 +2899,46 @@ msgstr "" #: 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_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_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 "" @@ -2739,12 +2992,12 @@ msgid "" "email" msgstr "Su reinicio de contraseña fue exitoso, una nueva contraseña ha sido enviada a su correo electrónico" -#: rhodecode/model/comment.py:263 +#: rhodecode/model/comment.py:266 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:264 -msgid "Refresh page" +#: rhodecode/model/comment.py:267 +msgid "Show it now" msgstr "" #: rhodecode/model/forms.py:85 @@ -2875,7 +3128,7 @@ msgid "" " %(pr_title)s" msgstr "" -#: rhodecode/model/pull_request.py:449 +#: rhodecode/model/pull_request.py:448 msgid "Pull request merged and closed" msgstr "" @@ -2919,7 +3172,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 " @@ -3173,6 +3426,56 @@ 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 @@ -3343,19 +3646,19 @@ 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}) ..." @@ -3363,13 +3666,13 @@ 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 "" @@ -3529,6 +3832,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 "" @@ -3577,6 +3896,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 @@ -3596,7 +3916,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 @@ -3613,8 +3932,8 @@ msgstr "" #: rhodecode/templates/changeset/changeset.html:53 #: rhodecode/templates/compare/compare_commits.html:24 #: rhodecode/templates/email_templates/commit_comment.mako:82 -#: rhodecode/templates/email_templates/pull_request_review.mako:30 -#: rhodecode/templates/email_templates/pull_request_review.mako:51 +#: rhodecode/templates/email_templates/pull_request_review.mako:41 +#: rhodecode/templates/email_templates/pull_request_review.mako:75 #: rhodecode/templates/files/file_tree_detail.html:5 #: rhodecode/templates/files/file_tree_detail.html:12 #: rhodecode/templates/forks/fork.html:48 @@ -3828,9 +4147,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 @@ -3880,7 +4203,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 @@ -3917,7 +4239,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" @@ -4062,7 +4384,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 @@ -4115,75 +4437,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 @@ -4195,8 +4459,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 @@ -4217,17 +4481,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 -msgid "Integrations settings" -msgstr "" - -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/base.html:14 +msgid "Integrations Settings" +msgstr "" + +#: 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 @@ -4237,27 +4511,101 @@ msgstr "" msgid "Settings" msgstr "" -#: rhodecode/templates/admin/integrations/edit.html:36 -#, python-format -msgid "Create new %(integration_type)s integration" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:31 +#: rhodecode/templates/admin/integrations/form.html:60 +#, python-format +msgid "Create New %(integration_type)s Integration" +msgstr "" + +#: 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: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:56 -msgid "Current integrations" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:65 +#: 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" @@ -4277,7 +4625,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 "" @@ -4395,36 +4743,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 @@ -4464,27 +4794,28 @@ 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:28 -#: rhodecode/templates/email_templates/pull_request_review.mako:48 +#: rhodecode/templates/email_templates/pull_request_review.mako:39 +#: rhodecode/templates/email_templates/pull_request_review.mako:72 #: rhodecode/templates/pullrequests/pullrequest.html:38 #: rhodecode/templates/pullrequests/pullrequests.html:104 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 @@ -4492,7 +4823,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 @@ -4500,19 +4831,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 "" @@ -4530,10 +4861,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 @@ -4553,12 +4880,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 @@ -4671,12 +5002,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 " @@ -4739,7 +5064,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 @@ -5008,7 +5333,6 @@ msgid "Statistics" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.html:7 -#: rhodecode/templates/pullrequests/pullrequests.html:108 msgid "Updated on" msgstr "" @@ -5411,7 +5735,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" @@ -5628,6 +5952,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 "" @@ -6363,6 +6691,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 "" @@ -6393,7 +6725,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 "" @@ -6777,7 +7109,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 "" @@ -6879,29 +7211,65 @@ msgid "" "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 "Solicitudes por proxy HTTP subversion" + +#: 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 "URL de Servidor HTTP Subversion" + +#: 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 " @@ -6909,34 +7277,16 @@ msgid "" "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 "Unión de lado de servidor Mercurial" - -#: 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" @@ -7344,7 +7694,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:293 #: rhodecode/templates/compare/compare_diff.html:57 #: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 msgid "Comment" msgstr "" @@ -7492,17 +7842,17 @@ msgid "Compare Commits" msgstr "" #: rhodecode/templates/compare/compare_diff.html:46 -#: rhodecode/templates/email_templates/pull_request_review.mako:50 +#: rhodecode/templates/email_templates/pull_request_review.mako:74 #: rhodecode/templates/files/file_diff.html:56 #: rhodecode/templates/pullrequests/pullrequest_show.html:85 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.html:47 -#: rhodecode/templates/email_templates/pull_request_comment.mako:92 -#: rhodecode/templates/email_templates/pull_request_review.mako:49 +#: 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 "" @@ -7683,17 +8033,17 @@ msgstr "" msgid "Form vertical" msgstr "" -#: rhodecode/templates/email_templates/base.mako:7 +#: rhodecode/templates/email_templates/base.mako:32 #, python-format msgid "This is a notification from RhodeCode. %(instance_url)s" msgstr "" -#: rhodecode/templates/email_templates/base.mako:90 +#: rhodecode/templates/email_templates/base.mako:115 msgid "RhodeCode" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:16 -#: rhodecode/templates/email_templates/pull_request_comment.mako:17 +#: rhodecode/templates/email_templates/pull_request_comment.mako:18 msgid "[mention]" msgstr "" @@ -7722,12 +8072,12 @@ msgid "%(user)s commented on commit `%(c msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:43 -#: rhodecode/templates/email_templates/pull_request_comment.mako:43 +#: rhodecode/templates/email_templates/pull_request_comment.mako:44 msgid "Comment link" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:48 -#: rhodecode/templates/email_templates/pull_request_comment.mako:48 +#: rhodecode/templates/email_templates/pull_request_comment.mako:49 #, python-format msgid "File: %(comment_file)s on line %(comment_line)s" msgstr "" @@ -7756,7 +8106,7 @@ msgid "The commit status was changed to" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 #, python-format msgid "Comment on line: %(comment_line)s" msgstr "" @@ -7765,97 +8115,101 @@ msgstr "" msgid "Generate new password here" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:20 +#: rhodecode/templates/email_templates/pull_request_comment.mako:21 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: " "`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:23 +#: rhodecode/templates/email_templates/pull_request_comment.mako:24 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: " "%(status)s)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:25 -#: rhodecode/templates/email_templates/pull_request_comment.mako:82 +#: rhodecode/templates/email_templates/pull_request_comment.mako:26 +#: rhodecode/templates/email_templates/pull_request_comment.mako:83 #, python-format msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:45 +#: rhodecode/templates/email_templates/pull_request_comment.mako:46 msgid "Source repository" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:54 +#: rhodecode/templates/email_templates/pull_request_comment.mako:55 #, python-format msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:56 +#: rhodecode/templates/email_templates/pull_request_comment.mako:57 #, python-format msgid "" "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:80 +#: rhodecode/templates/email_templates/pull_request_comment.mako:81 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" " "(file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:86 +#: rhodecode/templates/email_templates/pull_request_comment.mako:87 #, python-format msgid "submitted pull request status: %(status)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:88 +#: rhodecode/templates/email_templates/pull_request_comment.mako:89 #, python-format msgid "submitted pull request status: %(status)s and closed" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:5 -#, python-format -msgid "%(user)s wants you to review pull request #%(pr_url)s: \"%(pr_title)s\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_review.mako:17 +#: rhodecode/templates/email_templates/pull_request_comment.mako:95 +msgid "Submitted status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:14 +#, python-format +msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:34 #, python-format msgid "" "Pull request from %(source_ref_type)s:%(source_ref_name)s of %(repo_url)s " "into %(target_ref_type)s:%(target_ref_name)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:26 +#: rhodecode/templates/email_templates/pull_request_review.mako:37 msgid "Link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:35 +#: rhodecode/templates/email_templates/pull_request_review.mako:46 #, python-format msgid "Commit (%(num)s)" msgid_plural "Commits (%(num)s)" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/email_templates/pull_request_review.mako:47 +#: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"." msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:49 +#: rhodecode/templates/email_templates/pull_request_review.mako:73 #, python-format msgid "%(source_ref_type)s of %(source_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:50 +#: rhodecode/templates/email_templates/pull_request_review.mako:74 #, python-format msgid "%(target_ref_type)s of %(target_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:52 +#: rhodecode/templates/email_templates/pull_request_review.mako:76 #: rhodecode/templates/summary/components.html:95 #: rhodecode/templates/summary/components.html:98 #, python-format @@ -8096,13 +8450,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 "" @@ -8172,44 +8526,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 "" diff --git a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2016-08-02 20:55+0000\n" -"PO-Revision-Date: 2016-08-02 20:57+0000\n" +"POT-Creation-Date: 2016-09-15 14:11+0000\n" +"PO-Revision-Date: 2016-09-15 14:12+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: French (http://www.transifex.com/rhodecode/RhodeCode/language/fr/)\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\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 "" @@ -43,7 +43,8 @@ msgstr "" msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:80 rhodecode/templates/register.html:76 +#: 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 #: rhodecode/templates/admin/users/user_add.html:86 @@ -63,12 +64,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" @@ -91,9 +98,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 "Autorisée" @@ -396,12 +403,12 @@ msgstr "" #: rhodecode/controllers/changeset.py:335 #: rhodecode/controllers/pullrequests.py:750 -#: rhodecode/model/pull_request.py:843 +#: rhodecode/model/pull_request.py:842 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" -#: rhodecode/controllers/changeset.py:372 +#: rhodecode/controllers/changeset.py:373 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" @@ -544,14 +551,14 @@ msgstr "" msgid "Changesets" msgstr "Changesets" -#: 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 "Branches" #: 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 "Tags" @@ -657,30 +664,30 @@ msgid "Close Pull Request" msgstr "" #: rhodecode/controllers/pullrequests.py:754 -#: rhodecode/model/pull_request.py:847 +#: rhodecode/model/pull_request.py:846 msgid "Closing with" msgstr "" -#: rhodecode/controllers/pullrequests.py:802 +#: rhodecode/controllers/pullrequests.py:804 #, python-format msgid "" "Closing pull request on other statuses than rejected or approved is " "forbidden. Calculated status from all reviewers is currently: %s" msgstr "" -#: rhodecode/controllers/summary.py: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 "" @@ -693,37 +700,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 "5 minute" #: 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 "1 heure" #: 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 "1 jour" #: 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 "1 mois" #: 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 "" @@ -777,60 +784,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 "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon fonctionnement de l’application." -#: rhodecode/controllers/admin/my_account.py:128 +#: rhodecode/controllers/admin/my_account.py:132 msgid "Your account was updated successfully" msgstr "Votre compte a été mis à jour avec succès" -#: 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 "Une erreur est survenue durant l’enregistrement de l’e-mail." -#: 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 "" @@ -1050,18 +1058,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 "" @@ -1070,86 +1078,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 "Réglages des gestionnaires de versions mis à jour." -#: 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 "Réglages mis à jour" -#: rhodecode/controllers/admin/settings.py:327 +#: rhodecode/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "Réglages d’affichage mis à jour." -#: rhodecode/controllers/admin/settings.py:330 +#: 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 "Le nouveau hook a été ajouté." -#: rhodecode/controllers/admin/settings.py:488 +#: rhodecode/controllers/admin/settings.py:491 msgid "Updated hooks" msgstr "Hooks mis à jour" -#: 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" @@ -1332,38 +1324,50 @@ 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:193 +#: rhodecode/events/repo.py:199 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:202 +#: rhodecode/events/repo.py:208 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:211 +#: rhodecode/events/repo.py:217 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:222 +#: rhodecode/events/repo.py:228 msgid "repository push" msgstr "" +#: rhodecode/events/repo_group.py:62 +msgid "repository group created" +msgstr "" + +#: rhodecode/events/repo_group.py:71 +msgid "repository group deleted" +msgstr "" + +#: rhodecode/events/repo_group.py:80 +msgid "repository group update" +msgstr "" + #: rhodecode/events/user.py:34 msgid "user registered" msgstr "" @@ -1376,42 +1380,202 @@ 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 "Réinitialiser" + +#: 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 "Supprimer" + +#: 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:214 +msgid "Recipients" +msgstr "" + +#: rhodecode/integrations/types/email.py:215 +msgid "Email addresses to send push events to" +msgstr "" + +#: rhodecode/integrations/types/email.py:220 +#: rhodecode/integrations/types/email.py:221 +msgid "Email address" +msgstr "Adresse e-mail" + +#: 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 "Red" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:45 +msgid "Green" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:46 +msgid "Purple" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:47 +msgid "Gray" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:52 +msgid "Hipchat server URL" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:53 +msgid "Hipchat integration url." +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:63 +msgid "Notify" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:64 +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 "Background color of message." +msgstr "" + +#: 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 @@ -1427,35 +1591,40 @@ msgstr "" msgid "Username" msgstr "Nom d’utilisateur" -#: 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 "" @@ -1467,10 +1636,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 "[a supprimé] le dépôt" @@ -1594,80 +1767,80 @@ 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 "Vous devez être un utilisateur enregistré pour effectuer cette action." -#: 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:545 +#: 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 "Cet ensemble de changements était trop gros pour être affiché et a été découpé, utilisez le menu « Diff » pour afficher les différences." -#: rhodecode/lib/diffs.py:102 +#: rhodecode/lib/diffs.py:109 msgid "No changes detected" msgstr "Aucun changement détecté." -#: rhodecode/lib/diffs.py:631 +#: rhodecode/lib/diffs.py:643 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1481 +#: rhodecode/lib/helpers.py:1489 #, python-format msgid " and %s more" msgstr "et %s de plus" -#: rhodecode/lib/helpers.py:1485 +#: rhodecode/lib/helpers.py:1493 msgid "No Files" msgstr "Aucun fichier" -#: rhodecode/lib/helpers.py:1558 +#: rhodecode/lib/helpers.py:1566 msgid "new file" msgstr "" -#: rhodecode/lib/helpers.py:1561 +#: rhodecode/lib/helpers.py:1569 msgid "mod" msgstr "" -#: rhodecode/lib/helpers.py:1564 -msgid "del" -msgstr "" - -#: rhodecode/lib/helpers.py:1567 -msgid "rename" -msgstr "" - #: rhodecode/lib/helpers.py:1572 +msgid "del" +msgstr "" + +#: rhodecode/lib/helpers.py:1575 +msgid "rename" +msgstr "" + +#: rhodecode/lib/helpers.py:1580 msgid "chmod" msgstr "" -#: rhodecode/lib/helpers.py:1819 +#: rhodecode/lib/helpers.py:1827 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -1686,91 +1859,91 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1839 +#: 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 "Le dépôt %s n’est pas représenté dans la base de données. Il a probablement été créé ou renommé manuellement. Veuillez relancer l’application pour rescanner les dépôts." -#: rhodecode/lib/utils2.py:454 +#: rhodecode/lib/utils2.py:463 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d an" msgstr[1] "%d ans" -#: rhodecode/lib/utils2.py:455 +#: rhodecode/lib/utils2.py:464 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mois" msgstr[1] "%d mois" -#: rhodecode/lib/utils2.py:456 +#: rhodecode/lib/utils2.py:465 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d jours" -#: rhodecode/lib/utils2.py:457 +#: rhodecode/lib/utils2.py:466 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: rhodecode/lib/utils2.py:458 +#: rhodecode/lib/utils2.py:467 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: rhodecode/lib/utils2.py:459 +#: rhodecode/lib/utils2.py:468 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d secondes" -#: 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 "Il y a %s" -#: 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 "Il y a %s et %s" -#: 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" @@ -1800,7 +1973,9 @@ msgstr "à l’instant" #: 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_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 "Aucun accès au dépôt" @@ -1828,7 +2003,9 @@ msgstr "Aucun accès au dépôt" #: 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_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 "Accès en lecture au dépôt" @@ -1856,7 +2033,9 @@ msgstr "Accès en lecture au dépôt" #: 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_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 "Accès en écriture au dépôt" @@ -1884,7 +2063,9 @@ msgstr "Accès en écriture au dépôt" #: 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_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 "Accès administrateur au dépôt" @@ -1952,7 +2133,9 @@ msgstr "Administrateur RhodeCode" #: 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_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 "Création de dépôt désactivée" @@ -1980,7 +2163,9 @@ msgstr "Création de dépôt désactivée" #: 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_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 "Création de dépôt activée" @@ -2008,7 +2193,9 @@ msgstr "Création de dépôt activée" #: 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_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 "Fork de dépôt désactivé" @@ -2036,7 +2223,9 @@ msgstr "Fork de dépôt désactivé" #: 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_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 "Fork de dépôt activé" @@ -2085,7 +2274,9 @@ msgstr "Enregistrer un nouvel utilisateur Rhodecode auto-activé" #: 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:2944 +#: 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 "Pas encore relue" @@ -2113,7 +2304,9 @@ msgstr "Pas encore relue" #: 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:2945 +#: 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 "Approuvée " @@ -2141,7 +2334,9 @@ msgstr "Approuvée " #: 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:2946 +#: 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 "Rejetée" @@ -2169,7 +2364,9 @@ msgstr "Rejetée" #: 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:2947 +#: 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 "En cours de relecture" @@ -2194,7 +2391,9 @@ msgstr "En cours de relecture" #: 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_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 "" @@ -2219,7 +2418,9 @@ msgstr "" #: 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_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 "" @@ -2244,7 +2445,9 @@ msgstr "" #: 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_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 "" @@ -2269,7 +2472,9 @@ msgstr "" #: 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_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 "" @@ -2293,7 +2498,9 @@ msgstr "" #: 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_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 "" @@ -2317,7 +2524,9 @@ msgstr "" #: 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_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 "" @@ -2341,7 +2550,9 @@ msgstr "" #: 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_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 "" @@ -2365,7 +2576,9 @@ msgstr "" #: 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_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 "" @@ -2389,7 +2602,9 @@ msgstr "" #: 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_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 "" @@ -2413,7 +2628,9 @@ msgstr "" #: 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_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 "" @@ -2437,7 +2654,9 @@ msgstr "" #: 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_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 "" @@ -2461,7 +2680,9 @@ msgstr "" #: 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_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 "" @@ -2485,7 +2706,9 @@ msgstr "" #: 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_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 "" @@ -2509,7 +2732,9 @@ msgstr "" #: 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_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 "" @@ -2533,7 +2758,9 @@ msgstr "" #: 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_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 "" @@ -2557,7 +2784,9 @@ msgstr "" #: 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_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 "" @@ -2581,7 +2810,9 @@ msgstr "" #: 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_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 "" @@ -2599,7 +2830,9 @@ msgstr "" #: 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_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 "" @@ -2618,7 +2851,9 @@ msgstr "" #: 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_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 "" @@ -2634,7 +2869,9 @@ msgstr "" #: 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_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 "" @@ -2647,7 +2884,9 @@ msgstr "" #: 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_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 "" @@ -2660,32 +2899,46 @@ msgstr "" #: 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_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_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 "" @@ -2739,12 +2992,12 @@ msgid "" "email" msgstr "" -#: rhodecode/model/comment.py:263 +#: rhodecode/model/comment.py:266 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:264 -msgid "Refresh page" +#: rhodecode/model/comment.py:267 +msgid "Show it now" msgstr "" #: rhodecode/model/forms.py:85 @@ -2875,7 +3128,7 @@ msgid "" " %(pr_title)s" msgstr "" -#: rhodecode/model/pull_request.py:449 +#: rhodecode/model/pull_request.py:448 msgid "Pull request merged and closed" msgstr "" @@ -2919,7 +3172,7 @@ msgstr "Dernier sommet" msgid "You can't Edit this user since it's crucial for entire application" msgstr "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon fonctionnement de l’application." -#: rhodecode/model/user.py:285 +#: rhodecode/model/user.py:284 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " @@ -3173,6 +3426,56 @@ 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 @@ -3343,19 +3646,19 @@ 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}) ..." @@ -3363,13 +3666,13 @@ 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 "Envoi…" #: 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 "" @@ -3529,6 +3832,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 "Tableau de bord" @@ -3577,6 +3896,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 @@ -3596,7 +3916,6 @@ msgstr "Nom" #: 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 @@ -3613,8 +3932,8 @@ msgstr "Nom" #: rhodecode/templates/changeset/changeset.html:53 #: rhodecode/templates/compare/compare_commits.html:24 #: rhodecode/templates/email_templates/commit_comment.mako:82 -#: rhodecode/templates/email_templates/pull_request_review.mako:30 -#: rhodecode/templates/email_templates/pull_request_review.mako:51 +#: rhodecode/templates/email_templates/pull_request_review.mako:41 +#: rhodecode/templates/email_templates/pull_request_review.mako:75 #: rhodecode/templates/files/file_tree_detail.html:5 #: rhodecode/templates/files/file_tree_detail.html:12 #: rhodecode/templates/forks/fork.html:48 @@ -3828,9 +4147,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 @@ -3880,7 +4203,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 @@ -3917,7 +4239,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" @@ -4062,7 +4384,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 @@ -4115,75 +4437,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 "Réinitialiser" - #: 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 "Supprimer" - -#: 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 @@ -4195,8 +4459,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 @@ -4217,17 +4481,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 -msgid "Integrations settings" -msgstr "" - -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/base.html:14 +msgid "Integrations Settings" +msgstr "" + +#: 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 @@ -4237,27 +4511,101 @@ msgstr "" msgid "Settings" msgstr "Options" -#: rhodecode/templates/admin/integrations/edit.html:36 -#, python-format -msgid "Create new %(integration_type)s integration" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:31 +#: rhodecode/templates/admin/integrations/form.html:60 +#, python-format +msgid "Create New %(integration_type)s Integration" +msgstr "" + +#: 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:64 +#: rhodecode/templates/admin/notifications/notifications.html:31 +msgid "All" +msgstr "Tous" + +#: 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:56 -msgid "Current integrations" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:65 +#: 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" @@ -4277,7 +4625,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 "" @@ -4395,36 +4743,18 @@ msgstr "" msgid "New email address" msgstr "Nouvelle adrese" -#: 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 "Notifications" - -#: rhodecode/templates/admin/my_account/my_account_notifications.html:14 -msgid "Disabled" -msgstr "Interdite" +#: 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 @@ -4464,27 +4794,28 @@ 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:28 -#: rhodecode/templates/email_templates/pull_request_review.mako:48 +#: rhodecode/templates/email_templates/pull_request_review.mako:39 +#: rhodecode/templates/email_templates/pull_request_review.mako:72 #: rhodecode/templates/pullrequests/pullrequest.html:38 #: rhodecode/templates/pullrequests/pullrequests.html:104 msgid "Title" msgstr "Titre" #: 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 @@ -4492,7 +4823,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 @@ -4500,19 +4831,19 @@ msgstr "" msgid "Closed" msgstr "Fermée" -#: 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 "Veuillez confirmer la suppression de cette requête de pull." -#: 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 "" @@ -4530,10 +4861,6 @@ msgstr "" msgid "My Notifications" msgstr "Mes notifications" -#: rhodecode/templates/admin/notifications/notifications.html:31 -msgid "All" -msgstr "Tous" - #: rhodecode/templates/admin/notifications/notifications.html:32 #: rhodecode/templates/changeset/changeset.html:140 #: rhodecode/templates/pullrequests/pullrequest_show.html:133 @@ -4553,12 +4880,16 @@ msgstr "Aucune notification pour le mome msgid "Show notification" msgstr "Notification" +#: rhodecode/templates/admin/notifications/show_notification.html:12 +msgid "Notifications" +msgstr "Notifications" + #: 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 @@ -4671,12 +5002,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 " @@ -4739,7 +5064,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 @@ -5008,7 +5333,6 @@ msgid "Statistics" msgstr "Statistiques" #: rhodecode/templates/admin/repos/repo_edit_advanced.html:7 -#: rhodecode/templates/pullrequests/pullrequests.html:108 msgid "Updated on" msgstr "" @@ -5411,7 +5735,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" @@ -5628,6 +5952,10 @@ msgstr "Hooks personnalisés" 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 "" @@ -6363,6 +6691,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 "" @@ -6393,7 +6725,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 "" @@ -6777,7 +7109,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 "" @@ -6879,29 +7211,65 @@ msgid "" "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 " @@ -6909,34 +7277,16 @@ msgid "" "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" @@ -7344,7 +7694,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:293 #: rhodecode/templates/compare/compare_diff.html:57 #: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 msgid "Comment" msgstr "Commentaire" @@ -7492,17 +7842,17 @@ msgid "Compare Commits" msgstr "" #: rhodecode/templates/compare/compare_diff.html:46 -#: rhodecode/templates/email_templates/pull_request_review.mako:50 +#: rhodecode/templates/email_templates/pull_request_review.mako:74 #: rhodecode/templates/files/file_diff.html:56 #: rhodecode/templates/pullrequests/pullrequest_show.html:85 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.html:47 -#: rhodecode/templates/email_templates/pull_request_comment.mako:92 -#: rhodecode/templates/email_templates/pull_request_review.mako:49 +#: 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 "" @@ -7683,17 +8033,17 @@ msgstr "" msgid "Form vertical" msgstr "" -#: rhodecode/templates/email_templates/base.mako:7 +#: rhodecode/templates/email_templates/base.mako:32 #, python-format msgid "This is a notification from RhodeCode. %(instance_url)s" msgstr "" -#: rhodecode/templates/email_templates/base.mako:90 +#: rhodecode/templates/email_templates/base.mako:115 msgid "RhodeCode" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:16 -#: rhodecode/templates/email_templates/pull_request_comment.mako:17 +#: rhodecode/templates/email_templates/pull_request_comment.mako:18 msgid "[mention]" msgstr "" @@ -7722,12 +8072,12 @@ msgid "%(user)s commented on commit `%(c msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:43 -#: rhodecode/templates/email_templates/pull_request_comment.mako:43 +#: rhodecode/templates/email_templates/pull_request_comment.mako:44 msgid "Comment link" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:48 -#: rhodecode/templates/email_templates/pull_request_comment.mako:48 +#: rhodecode/templates/email_templates/pull_request_comment.mako:49 #, python-format msgid "File: %(comment_file)s on line %(comment_line)s" msgstr "" @@ -7756,7 +8106,7 @@ msgid "The commit status was changed to" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 #, python-format msgid "Comment on line: %(comment_line)s" msgstr "" @@ -7765,97 +8115,101 @@ msgstr "" msgid "Generate new password here" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:20 +#: rhodecode/templates/email_templates/pull_request_comment.mako:21 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: " "`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:23 +#: rhodecode/templates/email_templates/pull_request_comment.mako:24 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: " "%(status)s)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:25 -#: rhodecode/templates/email_templates/pull_request_comment.mako:82 +#: rhodecode/templates/email_templates/pull_request_comment.mako:26 +#: rhodecode/templates/email_templates/pull_request_comment.mako:83 #, python-format msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:45 +#: rhodecode/templates/email_templates/pull_request_comment.mako:46 msgid "Source repository" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:54 +#: rhodecode/templates/email_templates/pull_request_comment.mako:55 #, python-format msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:56 +#: rhodecode/templates/email_templates/pull_request_comment.mako:57 #, python-format msgid "" "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:80 +#: rhodecode/templates/email_templates/pull_request_comment.mako:81 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" " "(file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:86 +#: rhodecode/templates/email_templates/pull_request_comment.mako:87 #, python-format msgid "submitted pull request status: %(status)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:88 +#: rhodecode/templates/email_templates/pull_request_comment.mako:89 #, python-format msgid "submitted pull request status: %(status)s and closed" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:5 -#, python-format -msgid "%(user)s wants you to review pull request #%(pr_url)s: \"%(pr_title)s\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_review.mako:17 +#: rhodecode/templates/email_templates/pull_request_comment.mako:95 +msgid "Submitted status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:14 +#, python-format +msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:34 #, python-format msgid "" "Pull request from %(source_ref_type)s:%(source_ref_name)s of %(repo_url)s " "into %(target_ref_type)s:%(target_ref_name)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:26 +#: rhodecode/templates/email_templates/pull_request_review.mako:37 msgid "Link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:35 +#: rhodecode/templates/email_templates/pull_request_review.mako:46 #, python-format msgid "Commit (%(num)s)" msgid_plural "Commits (%(num)s)" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/email_templates/pull_request_review.mako:47 +#: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"." msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:49 +#: rhodecode/templates/email_templates/pull_request_review.mako:73 #, python-format msgid "%(source_ref_type)s of %(source_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:50 +#: rhodecode/templates/email_templates/pull_request_review.mako:74 #, python-format msgid "%(target_ref_type)s of %(target_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:52 +#: rhodecode/templates/email_templates/pull_request_review.mako:76 #: rhodecode/templates/summary/components.html:95 #: rhodecode/templates/summary/components.html:98 #, python-format @@ -8096,13 +8450,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 "Fichier binaire (%s)" #: 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 "Ce fichier est trop gros pour être affiché." @@ -8172,44 +8526,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 "Historique" -#: 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 "Téléchargements" -#: 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 "" diff --git a/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2016-08-02 20:55+0000\n" -"PO-Revision-Date: 2016-08-02 20:57+0000\n" +"POT-Creation-Date: 2016-09-15 14:11+0000\n" +"PO-Revision-Date: 2016-09-15 14:12+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Italian (http://www.transifex.com/rhodecode/RhodeCode/language/it/)\n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\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 "Globale" @@ -44,7 +44,8 @@ msgstr "" msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:80 rhodecode/templates/register.html:76 +#: 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 #: rhodecode/templates/admin/users/user_add.html:86 @@ -64,12 +65,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" @@ -92,9 +99,9 @@ msgstr "Laboratori" 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 "Abilitato" @@ -397,12 +404,12 @@ msgstr "" #: rhodecode/controllers/changeset.py:335 #: rhodecode/controllers/pullrequests.py:750 -#: rhodecode/model/pull_request.py:843 +#: rhodecode/model/pull_request.py:842 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "Cambiamento stato %(transition_icon)s %(status)s" -#: rhodecode/controllers/changeset.py:372 +#: rhodecode/controllers/changeset.py:373 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" @@ -545,14 +552,14 @@ msgstr "" msgid "Changesets" msgstr "Changesets" -#: 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 "Branches" #: 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 "Tags" @@ -658,30 +665,30 @@ msgid "Close Pull Request" msgstr "Chiudi Richiesta PULL" #: rhodecode/controllers/pullrequests.py:754 -#: rhodecode/model/pull_request.py:847 +#: rhodecode/model/pull_request.py:846 msgid "Closing with" msgstr "Chiusura con" -#: rhodecode/controllers/pullrequests.py:802 +#: rhodecode/controllers/pullrequests.py:804 #, python-format msgid "" "Closing pull request on other statuses than rejected or approved is " "forbidden. Calculated status from all reviewers is currently: %s" msgstr "Non è consentito chiudere la richiesta PULL con stati diversi da \"rigettato\" o \"approvato\". Lo stato ricavato da tutti i revisori al momento è: %s." -#: rhodecode/controllers/summary.py:235 +#: rhodecode/controllers/summary.py:243 msgid "Branch" msgstr "Branch" -#: rhodecode/controllers/summary.py:236 +#: rhodecode/controllers/summary.py:244 msgid "Tag" msgstr "Tag" -#: rhodecode/controllers/summary.py:237 +#: rhodecode/controllers/summary.py:245 msgid "Bookmark" msgstr "Segnalibro" -#: rhodecode/controllers/summary.py:252 +#: rhodecode/controllers/summary.py:260 msgid "Closed branches" msgstr "Branch chiusi" @@ -694,37 +701,37 @@ msgid "Error occurred during update of d msgstr "Errore avvenuto durante l'aggiornamento dei valori di default" #: 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 "per sempre" #: 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 "5 minuti" #: 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 "1 ora" #: 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 "1 giorno" #: 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 "1 mese" #: 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 "a vita" @@ -778,60 +785,61 @@ msgstr "mai" msgid "%(expiry)s - current value" msgstr "%(expiry)s - valore corrente" -#: 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 "Utente critico per l'intera applicazione. Editing disabilitato." -#: rhodecode/controllers/admin/my_account.py:128 +#: rhodecode/controllers/admin/my_account.py:132 msgid "Your account was updated successfully" msgstr "Account aggiornato correttamente" -#: 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 "Errore durante l'aggiornamento dell'utente %s" -#: 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 "Errore durante l'aggiornamento della password" + +#: rhodecode/controllers/admin/my_account.py:226 msgid "Successfully updated password" msgstr "Password aggiornata correttamente" -#: rhodecode/controllers/admin/my_account.py:213 -msgid "Error occurred during update of user password" -msgstr "Errore durante l'aggiornamento della password" - -#: 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 "Errore durante il salvataggio dell'email" -#: 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 "Ruolo" -#: 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 "Token Autorizzativo creato" -#: 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 "Token autorizzativo resettato" -#: 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 "Token autorizzativo cancellato" @@ -1051,18 +1059,18 @@ msgid "Error occurred during deleting is msgstr "Errore durante la rimozione dell'entry dall'issue tracker" #: rhodecode/controllers/admin/repos.py:721 -#: rhodecode/controllers/admin/settings.py:363 +#: rhodecode/controllers/admin/settings.py:366 msgid "Removed issue tracker entry" msgstr "Entry dell'issue tracker rimossa" #: rhodecode/controllers/admin/repos.py:751 -#: rhodecode/controllers/admin/settings.py:409 +#: rhodecode/controllers/admin/settings.py:412 msgid "Updated issue tracker entries" msgstr "Dati dell'Issue Tracker aggiornati" #: 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 "Ci son dati non validi tra i dati immessi" @@ -1071,86 +1079,70 @@ msgid "Error occurred during updating re msgstr "Errore durante l'aggiornamento delle impostazioni del repository VCS" #: rhodecode/controllers/admin/repos.py:834 -#: rhodecode/controllers/admin/settings.py:168 +#: rhodecode/controllers/admin/settings.py:171 msgid "Updated VCS settings" msgstr "Impostazioni VCS aggiornate" -#: 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 "Errore durante l'aggiornamento delle impostazioni" -#: rhodecode/controllers/admin/settings.py:211 +#: rhodecode/controllers/admin/settings.py:214 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "Scansione dei repository completata. Aggiunti: %s ; rimossi: %s" -#: rhodecode/controllers/admin/settings.py:263 +#: rhodecode/controllers/admin/settings.py:266 msgid "Updated application settings" msgstr "Impostazioni applicazione aggiornate" -#: rhodecode/controllers/admin/settings.py:327 +#: rhodecode/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "Impostazioni di visualizzazione aggiornate" -#: rhodecode/controllers/admin/settings.py:330 +#: rhodecode/controllers/admin/settings.py:333 msgid "Error occurred during updating visualisation settings" msgstr "Errore durante l'aggiornamento delle impostazioni di visualizzazione" -#: rhodecode/controllers/admin/settings.py:422 +#: rhodecode/controllers/admin/settings.py:425 msgid "Please enter email address" msgstr "Prego fornire un indirizzo email" -#: rhodecode/controllers/admin/settings.py:440 +#: rhodecode/controllers/admin/settings.py:443 msgid "Send email task created" msgstr "Task 'invio posta' creato" -#: rhodecode/controllers/admin/settings.py:473 +#: rhodecode/controllers/admin/settings.py:476 msgid "Added new hook" msgstr "Aggiunto nuovo 'hook'" -#: rhodecode/controllers/admin/settings.py:488 +#: rhodecode/controllers/admin/settings.py:491 msgid "Updated hooks" msgstr "'Hook' aggiornato" -#: rhodecode/controllers/admin/settings.py:492 +#: rhodecode/controllers/admin/settings.py:495 msgid "Error occurred during hook creation" msgstr "Errore durante creazione hook'" -#: 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 "Critico: lo spazio disco e' troppo basso. Occupazione %s%% " -#: 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 "Attenzione: lo spazio disco si sta esaurendo. Occupazione %s%% " -#: rhodecode/controllers/admin/settings.py:740 +#: rhodecode/controllers/admin/settings.py:743 msgid "Error occurred during updating labs settings" msgstr "Errore durante l'aggiornamento delle impostazioni sui lab" -#: rhodecode/controllers/admin/settings.py:745 +#: rhodecode/controllers/admin/settings.py:748 msgid "Updated Labs settings" msgstr "Impostazioni sui Lab aggiornate" -#: rhodecode/controllers/admin/settings.py:795 -msgid "Subversion HTTP Support" -msgstr "Supporto all'HTTP Subversion" - -#: rhodecode/controllers/admin/settings.py:796 -msgid "Proxy subversion HTTP requests" -msgstr "Proxy per le richieste HTTP Subversion" - -#: rhodecode/controllers/admin/settings.py:802 -msgid "Subversion HTTP Server URL" -msgstr "URL del server HTTP Subversion" - -#: rhodecode/controllers/admin/settings.py:804 -msgid "e.g. http://localhost:8080/" -msgstr "es. http://localhost:8080/" - #: rhodecode/controllers/admin/user_groups.py:168 #, python-format msgid "Created user group %(user_group_link)s" @@ -1333,38 +1325,50 @@ 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:193 +#: rhodecode/events/repo.py:199 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:202 +#: rhodecode/events/repo.py:208 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:211 +#: rhodecode/events/repo.py:217 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:222 +#: rhodecode/events/repo.py:228 msgid "repository push" msgstr "" +#: rhodecode/events/repo_group.py:62 +msgid "repository group created" +msgstr "" + +#: rhodecode/events/repo_group.py:71 +msgid "repository group deleted" +msgstr "" + +#: rhodecode/events/repo_group.py:80 +msgid "repository group update" +msgstr "" + #: rhodecode/events/user.py:34 msgid "user registered" msgstr "" @@ -1377,42 +1381,202 @@ 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 "Ripristina" + +#: 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 "Elimina" + +#: 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:214 +msgid "Recipients" +msgstr "" + +#: rhodecode/integrations/types/email.py:215 +msgid "Email addresses to send push events to" +msgstr "" + +#: 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 "Red" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:45 +msgid "Green" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:46 +msgid "Purple" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:47 +msgid "Gray" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:52 +msgid "Hipchat server URL" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:53 +msgid "Hipchat integration url." +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:63 +msgid "Notify" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:64 +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 "Background color of message." +msgstr "" + +#: 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 @@ -1428,35 +1592,40 @@ msgstr "" msgid "Username" msgstr "Nome utente" -#: 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 "" @@ -1468,10 +1637,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 " [eliminato] repository" @@ -1595,80 +1768,80 @@ msgstr "Creato il tag: %s" msgid "Commit not found" msgstr "Commit non trovata" -#: rhodecode/lib/auth.py:1180 +#: rhodecode/lib/auth.py:1185 #, python-format msgid "IP %s not allowed" msgstr "IP %s non consentito" -#: rhodecode/lib/auth.py:1254 +#: rhodecode/lib/auth.py:1259 msgid "You need to be a registered user to perform this action" msgstr "È necessario essere utenti registrati per eseguire l'azione" -#: rhodecode/lib/auth.py:1302 +#: rhodecode/lib/auth.py:1307 #, python-format msgid "Action not supported for %s." msgstr "Azione non supportata per %s." -#: rhodecode/lib/auth.py:1339 +#: rhodecode/lib/auth.py:1344 msgid "You need to be signed in to view this page" msgstr "Bisogna autenticarsi per vedere questa pagina" -#: rhodecode/lib/base.py:545 +#: rhodecode/lib/base.py:550 #, python-format msgid "The repository at %(repo_name)s cannot be located." msgstr "Il repository in %(repo_name)s non può essere localizzato." -#: 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 "File binario" -#: 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 "Il changeset è troppo lungo ed è stato troncato. Usa il menù 'diff' per visualizzare tutte le differenze" -#: rhodecode/lib/diffs.py:102 +#: rhodecode/lib/diffs.py:109 msgid "No changes detected" msgstr "Nessun cambiamento rilevato" -#: rhodecode/lib/diffs.py:631 +#: rhodecode/lib/diffs.py:643 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1481 +#: rhodecode/lib/helpers.py:1489 #, python-format msgid " and %s more" msgstr "e %s ulteriore/i" -#: rhodecode/lib/helpers.py:1485 +#: rhodecode/lib/helpers.py:1493 msgid "No Files" msgstr "Nessun file" -#: rhodecode/lib/helpers.py:1558 +#: rhodecode/lib/helpers.py:1566 msgid "new file" msgstr "nuovo file" -#: rhodecode/lib/helpers.py:1561 +#: rhodecode/lib/helpers.py:1569 msgid "mod" msgstr "mod" -#: rhodecode/lib/helpers.py:1564 +#: rhodecode/lib/helpers.py:1572 msgid "del" msgstr "del" -#: rhodecode/lib/helpers.py:1567 +#: rhodecode/lib/helpers.py:1575 msgid "rename" msgstr "rinomina" -#: rhodecode/lib/helpers.py:1572 +#: rhodecode/lib/helpers.py:1580 msgid "chmod" msgstr "chmod" -#: rhodecode/lib/helpers.py:1819 +#: rhodecode/lib/helpers.py:1827 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -1687,91 +1860,91 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "Esempio termini di ricerca:\n repository:vcs\n username:marcin\n action:*push*\n ip:127.0.0.1\n date:20120101\n date:[20120101100000 TO 20120102]\n\nUso del carattere joly '*':\n \"repository:vcs*\" - search everything starting with 'vcs'\n \"repository:*vcs*\" - search for repository containing 'vcs'\n\nInterrogazioni con operatori opzionali AND / OR:\n \"repository:vcs OR repository:test\"\n \"username:test AND repository:test*\"\n" -#: rhodecode/lib/helpers.py:1839 +#: 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 "Il repository %s non ha corrispondenze nel db. Probabilmente è stato creato o rinominato direttamente sul filesystem. Provare ad avviare nuovamente l'applicazione per consentire la ri-scansione dei repository" -#: rhodecode/lib/utils2.py:454 +#: rhodecode/lib/utils2.py:463 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d anno" msgstr[1] "%d anni" -#: rhodecode/lib/utils2.py:455 +#: rhodecode/lib/utils2.py:464 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mese" msgstr[1] "%d mesi" -#: rhodecode/lib/utils2.py:456 +#: rhodecode/lib/utils2.py:465 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d giorno" msgstr[1] "%d giorni" -#: rhodecode/lib/utils2.py:457 +#: rhodecode/lib/utils2.py:466 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d ora" msgstr[1] "%d ore" -#: rhodecode/lib/utils2.py:458 +#: rhodecode/lib/utils2.py:467 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minuti" -#: rhodecode/lib/utils2.py:459 +#: rhodecode/lib/utils2.py:468 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d secondo" msgstr[1] "%d secondi" -#: rhodecode/lib/utils2.py:477 +#: rhodecode/lib/utils2.py:486 #, python-format msgid "in %s" msgstr "in %s" -#: rhodecode/lib/utils2.py:483 +#: rhodecode/lib/utils2.py:492 #, python-format msgid "%s ago" msgstr "%s fa" -#: rhodecode/lib/utils2.py:493 +#: rhodecode/lib/utils2.py:502 #, python-format msgid "%s, %s ago" msgstr "%s, %s fa" -#: rhodecode/lib/utils2.py:495 +#: rhodecode/lib/utils2.py:504 #, python-format msgid "in %s, %s" msgstr "in %s, %s" -#: rhodecode/lib/utils2.py:497 +#: rhodecode/lib/utils2.py:506 #, python-format msgid "%s and %s" msgstr "%s e %s" -#: rhodecode/lib/utils2.py:499 +#: rhodecode/lib/utils2.py:508 #, python-format msgid "%s and %s ago" msgstr "%s e %s fa" -#: rhodecode/lib/utils2.py:501 +#: rhodecode/lib/utils2.py:510 #, python-format msgid "in %s and %s" msgstr "in %s e %s" -#: 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" @@ -1801,7 +1974,9 @@ msgstr "proprio ora" #: 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_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 "Repository nessun accesso" @@ -1829,7 +2004,9 @@ msgstr "Repository nessun accesso" #: 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_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 "Repository accesso in lettura" @@ -1857,7 +2034,9 @@ msgstr "Repository accesso in lettura" #: 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_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 "Repository accesso in scrittura" @@ -1885,7 +2064,9 @@ msgstr "Repository accesso in scrittura" #: 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_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 "Repository accesso admin" @@ -1953,7 +2134,9 @@ msgstr "RhodeCode Administrator" #: 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_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 "Creazione di Repository disabilitata" @@ -1981,7 +2164,9 @@ msgstr "Creazione di Repository disabili #: 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_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 "Creazione di Repository abilitata" @@ -2009,7 +2194,9 @@ msgstr "Creazione di Repository abilitat #: 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_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 "Forking Repository disabilitato" @@ -2037,7 +2224,9 @@ msgstr "Forking Repository disabilitato" #: 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_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 "Forking Repository abilitato" @@ -2086,7 +2275,9 @@ msgstr "Registrazione nuovo utente attra #: 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:2944 +#: 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 "Non Revisionato" @@ -2114,7 +2305,9 @@ msgstr "Non Revisionato" #: 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:2945 +#: 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 "Approvato" @@ -2142,7 +2335,9 @@ msgstr "Approvato" #: 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:2946 +#: 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 "Rifiutato" @@ -2170,7 +2365,9 @@ msgstr "Rifiutato" #: 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:2947 +#: 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 "in Revisione" @@ -2195,7 +2392,9 @@ msgstr "in Revisione" #: 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_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 "Gruppo di repository: nessun accesso" @@ -2220,7 +2419,9 @@ msgstr "Gruppo di repository: nessun acc #: 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_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 "Gruppo di repository: accesso in lettura" @@ -2245,7 +2446,9 @@ msgstr "Gruppo di repository: accesso in #: 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_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 "Gruppo di repository: accesso in scrittura" @@ -2270,7 +2473,9 @@ msgstr "Gruppo di repository: accesso in #: 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_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 "Gruppo di repository: accesso admin" @@ -2294,7 +2499,9 @@ msgstr "Gruppo di repository: accesso ad #: 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_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 "Gruppo utenti: nessun accesso" @@ -2318,7 +2525,9 @@ msgstr "Gruppo utenti: nessun accesso" #: 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_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 "Gruppo utenti: accesso in lettura" @@ -2342,7 +2551,9 @@ msgstr "Gruppo utenti: accesso in lettur #: 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_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 "Gruppo utenti: accesso in scrittura" @@ -2366,7 +2577,9 @@ msgstr "Gruppo utenti: accesso in scritt #: 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_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 "Gruppo utenti: accesso admin" @@ -2390,7 +2603,9 @@ msgstr "Gruppo utenti: accesso admin" #: 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_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 "Creazione gruppo di repository disabiltiata" @@ -2414,7 +2629,9 @@ msgstr "Creazione gruppo di repository d #: 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_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 "Creazione gruppo di repository abilitata" @@ -2438,7 +2655,9 @@ msgstr "Creazione gruppo di repository a #: 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_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 "Creazione gruppo utenti disabilitata" @@ -2462,7 +2681,9 @@ msgstr "Creazione gruppo utenti disabili #: 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_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 "Creazione gruppo utenti abilitata" @@ -2486,7 +2707,9 @@ msgstr "Creazione gruppo utenti abilitat #: 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_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 "Registrazione disabilitata" @@ -2510,7 +2733,9 @@ msgstr "Registrazione disabilitata" #: 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_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 "Registrazione utente con attivazione manuale dell'account" @@ -2534,7 +2759,9 @@ msgstr "Registrazione utente con attivaz #: 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_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 "Registrazione utente con attivazione automatica dell'account" @@ -2558,7 +2785,9 @@ msgstr "Registrazione utente con attivaz #: 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_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 "Attivazione manuale di account esterni" @@ -2582,7 +2811,9 @@ msgstr "Attivazione manuale di account e #: 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_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 "Attivazione automatrica di account esterni" @@ -2600,7 +2831,9 @@ msgstr "Attivazione automatrica di accou #: 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_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 "Creazione di repository abilitata con permessi di scrittura al gruppo di repository" @@ -2619,7 +2852,9 @@ msgstr "Creazione di repository abilitat #: 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_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 "Creazione di repository disabilitata abilitata con permessi di scrittura al gruppo di repository" @@ -2635,7 +2870,9 @@ msgstr "Creazione di repository disabili #: 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_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 "RhodeCode Super Administrator" @@ -2648,7 +2885,9 @@ msgstr "RhodeCode Super Administrator" #: 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_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 "Ereditarietà dei permessi \"user default\" sull'oggetto disabilitata." @@ -2661,32 +2900,46 @@ msgstr "Ereditarietà dei permessi \"user default\" sull'oggetto disabilitata." #: 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_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 "Ereditarietà dei permessi \"user default\" sull'oggetto abilitata" -#: 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 "tutti" -#: 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 "interfaccia http/web" -#: 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 "chiamate API" -#: 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 "accesso al feed" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069 -#: rhodecode/model/db.py:2061 +#: 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 "" @@ -2740,12 +2993,12 @@ msgid "" "email" msgstr "Reset della password confermato. Una nuova password è stata inviata alla tua email" -#: rhodecode/model/comment.py:263 +#: rhodecode/model/comment.py:266 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:264 -msgid "Refresh page" +#: rhodecode/model/comment.py:267 +msgid "Show it now" msgstr "" #: rhodecode/model/forms.py:85 @@ -2876,7 +3129,7 @@ msgid "" " %(pr_title)s" msgstr "" -#: rhodecode/model/pull_request.py:449 +#: rhodecode/model/pull_request.py:448 msgid "Pull request merged and closed" msgstr "Richiesta PULL chiusa. Merge effettuato." @@ -2920,7 +3173,7 @@ msgstr "ultimo consiglio" msgid "You can't Edit this user since it's crucial for entire application" msgstr "Utente critico per l'intera applicazione. Editing disabilitato." -#: rhodecode/model/user.py:285 +#: rhodecode/model/user.py:284 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " @@ -3174,6 +3427,56 @@ 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 @@ -3344,19 +3647,19 @@ 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 "Aggiungi un altro commento" #: 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}) ..." @@ -3364,13 +3667,13 @@ 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 "Inoltro..." #: 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 "Caricamento ..." @@ -3530,6 +3833,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 "Dashboard" @@ -3578,6 +3897,7 @@ msgstr "Modifica il Gruppo di Repository #: 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 @@ -3597,7 +3917,6 @@ msgstr "Nome" #: 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 @@ -3614,8 +3933,8 @@ msgstr "Nome" #: rhodecode/templates/changeset/changeset.html:53 #: rhodecode/templates/compare/compare_commits.html:24 #: rhodecode/templates/email_templates/commit_comment.mako:82 -#: rhodecode/templates/email_templates/pull_request_review.mako:30 -#: rhodecode/templates/email_templates/pull_request_review.mako:51 +#: rhodecode/templates/email_templates/pull_request_review.mako:41 +#: rhodecode/templates/email_templates/pull_request_review.mako:75 #: rhodecode/templates/files/file_tree_detail.html:5 #: rhodecode/templates/files/file_tree_detail.html:12 #: rhodecode/templates/forks/fork.html:48 @@ -3829,9 +4148,13 @@ msgstr "Impostazioni di Autenticazione" #: 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 @@ -3881,7 +4204,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 @@ -3918,7 +4240,7 @@ msgstr "Impostazioni base per nuovi repo #: 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" @@ -4063,7 +4385,7 @@ msgstr "Mio Pubblico" #: 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 @@ -4116,75 +4438,17 @@ msgstr "Crea un Gist Privato" msgid "Create Public Gist" msgstr "Crea un Gist Pubblico" -#: 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 "Ripristina" - #: rhodecode/templates/admin/gists/show.html:13 #: rhodecode/templates/admin/gists/show.html:20 msgid "Gist" msgstr "Gist" #: 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 "Elimina" - -#: rhodecode/templates/admin/gists/show.html:49 msgid "Confirm to delete this Gist" msgstr "Conferma di voler eliminare questo Gist" #: 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 @@ -4196,8 +4460,8 @@ msgstr "Conferma di voler eliminare ques #: 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 @@ -4218,17 +4482,27 @@ msgstr "creato" #: 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 "Mostra sorgente" -#: rhodecode/templates/admin/integrations/base.html:12 -msgid "Integrations settings" -msgstr "" - -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/base.html:14 +msgid "Integrations Settings" +msgstr "" + +#: 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 "Gruppi di Repository" + +#: 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 @@ -4238,27 +4512,101 @@ msgstr "" msgid "Settings" msgstr "Impostazioni" -#: rhodecode/templates/admin/integrations/edit.html:36 -#, python-format -msgid "Create new %(integration_type)s integration" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:31 +#: rhodecode/templates/admin/integrations/form.html:60 +#, python-format +msgid "Create New %(integration_type)s Integration" +msgstr "" + +#: 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:64 +#: rhodecode/templates/admin/notifications/notifications.html:31 +msgid "All" +msgstr "Tutto" + +#: 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:56 -msgid "Current integrations" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:65 +#: rhodecode/templates/admin/integrations/list.html:104 +msgid "Scope" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:105 msgid "Actions" msgstr "Azioni" -#: 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" @@ -4278,7 +4626,7 @@ msgstr "Profilo" msgid "Auth Tokens" msgstr "Tocken autorizzativi" -#: rhodecode/templates/admin/my_account/my_account.html:34 +#: rhodecode/templates/admin/my_account/my_account.html:35 msgid "OAuth Identities" msgstr "" @@ -4396,36 +4744,18 @@ msgstr "Indirizzi email aggiuntivi non s msgid "New email address" msgstr "Nuovo indirizzo email" -#: 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 "Notifiche" - -#: rhodecode/templates/admin/my_account/my_account_notifications.html:14 -msgid "Disabled" -msgstr "Disabilitato" +#: 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 "Cambia la tua Password" -#: rhodecode/templates/admin/my_account/my_account_password.html:10 -msgid "Current Password" -msgstr "Password corrente" - -#: rhodecode/templates/admin/my_account/my_account_password.html:19 -#: rhodecode/templates/admin/users/user_edit_profile.html:74 -msgid "New Password" -msgstr "Nuova password" - -#: rhodecode/templates/admin/my_account/my_account_password.html:28 -msgid "Confirm New Password" -msgstr "Conferma nuova password" - #: 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 @@ -4465,27 +4795,28 @@ 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:28 -#: rhodecode/templates/email_templates/pull_request_review.mako:48 +#: rhodecode/templates/email_templates/pull_request_review.mako:39 +#: rhodecode/templates/email_templates/pull_request_review.mako:72 #: rhodecode/templates/pullrequests/pullrequest.html:38 #: rhodecode/templates/pullrequests/pullrequests.html:104 msgid "Title" msgstr "Titolo" #: 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 @@ -4493,7 +4824,7 @@ msgid "Expand commit message" msgstr "Espandi il messaggio commit" #: 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 @@ -4501,19 +4832,19 @@ msgstr "Espandi il messaggio commit" msgid "Closed" msgstr "Chiuso" -#: 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 "Conferma l'eliminazione di questa richiesta 'Pull'" -#: 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 "Al momento non hai richieste di PULL pendenti." -#: 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 "Al momento non ci sono richieste di PULL che richiedono il tuo intervento" @@ -4531,10 +4862,6 @@ msgstr "I Repository che osservi" msgid "My Notifications" msgstr "Le mie Notifiche" -#: rhodecode/templates/admin/notifications/notifications.html:31 -msgid "All" -msgstr "Tutto" - #: rhodecode/templates/admin/notifications/notifications.html:32 #: rhodecode/templates/changeset/changeset.html:140 #: rhodecode/templates/pullrequests/pullrequest_show.html:133 @@ -4554,12 +4881,16 @@ msgstr "Nessuna notifica" msgid "Show notification" msgstr "Mostra notifica" +#: rhodecode/templates/admin/notifications/show_notification.html:12 +msgid "Notifications" +msgstr "Notifiche" + #: rhodecode/templates/admin/permissions/permissions.html:5 msgid "Permissions Administration" msgstr "Amministrazione Permessi" #: 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 @@ -4672,12 +5003,6 @@ msgstr "Tutti i permessi di base saranno msgid "Overwrite Existing Settings" msgstr "Sovrascrivi impostazioni esistenti" -#: 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 "Gruppi di Repository" - #: rhodecode/templates/admin/permissions/permissions_objects.html:34 msgid "" "All default permissions on each repository group will be reset to chosen " @@ -4740,7 +5065,7 @@ msgstr "Impostazioni del gruppo di repos msgid "Add Child Group" msgstr "Aggiungi Gruppo Figlio" -#: 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 @@ -5009,7 +5334,6 @@ msgid "Statistics" msgstr "Statistiche" #: rhodecode/templates/admin/repos/repo_edit_advanced.html:7 -#: rhodecode/templates/pullrequests/pullrequests.html:108 msgid "Updated on" msgstr "" @@ -5412,7 +5736,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" @@ -5629,6 +5953,10 @@ msgstr "Hooks personali" 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 "" @@ -6364,6 +6692,10 @@ msgstr "" msgid "Change the avatar at" msgstr "" +#: rhodecode/templates/admin/users/user_edit_profile.html:74 +msgid "New Password" +msgstr "Nuova password" + #: rhodecode/templates/admin/users/user_edit_profile.html:82 msgid "New Password Confirmation" msgstr "" @@ -6394,7 +6726,7 @@ msgid "Authentication type" msgstr "Tipo di autenticazione" #: rhodecode/templates/base/base.html:44 -#: rhodecode/templates/errors/error_document.html:51 +#: rhodecode/templates/errors/error_document.html:57 msgid "Support" msgstr "Supporto" @@ -6778,7 +7110,7 @@ msgstr "Crea gruppi utente" msgid "No permission defined" msgstr "Nessun permesso definito" -#: rhodecode/templates/base/root.html:120 +#: rhodecode/templates/base/root.html:161 msgid "Please enable JavaScript to use RhodeCode Enterprise" msgstr "" @@ -6880,29 +7212,65 @@ msgid "" "repositories and migrates them to Mercurial type." msgstr "Richiede che sia installata la libreria hgsubversion. Permette il \"clone\" di repository SVN remoti e la loro migrazione a Mercurial" -#: rhodecode/templates/base/vcs_settings.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 "Proxy per le richieste HTTP Subversion" + +#: 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 "URL del server HTTP Subversion" + +#: rhodecode/templates/base/vcs_settings.html:171 +msgid "Subversion Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.html:176 msgid "Repository patterns" msgstr "Pattern del Repository" -#: 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 "\"Pattern\" per identificare \"branch\" e \"tag\" svn. Per ricerche ricorsive, usare \"*\". Es.: \"/branches/*\"" -#: 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 "Abilita l'incorporamento lato server delle \"richieste di PULL\"" -#: 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 " @@ -6910,34 +7278,16 @@ msgid "" "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 "Invalida e realloca i commenti in linea durante l'aggiornmento" -#: 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 "Aggiorna la posizione dei commenti inline durante l'aggiornamento di una \"richiesta di PULL\". I commenti inline non più sognificativi saranno nascosti." -#: 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 "Merge mercurial, lato server " - -#: rhodecode/templates/base/vcs_settings.html:234 -msgid "" -"Use rebase instead of creating a merge commit when merging via web interface" -msgstr "Utilizzare \"rebase\" tramite l'interfaccia web per includere le modifiche, anziché committare un merge fatto in locale." - #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" @@ -7345,7 +7695,7 @@ msgstr "Preview del commento" #: rhodecode/templates/changeset/changeset_file_comment.html:293 #: rhodecode/templates/compare/compare_diff.html:57 #: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 msgid "Comment" msgstr "Commento" @@ -7493,17 +7843,17 @@ msgid "Compare Commits" msgstr "" #: rhodecode/templates/compare/compare_diff.html:46 -#: rhodecode/templates/email_templates/pull_request_review.mako:50 +#: rhodecode/templates/email_templates/pull_request_review.mako:74 #: rhodecode/templates/files/file_diff.html:56 #: rhodecode/templates/pullrequests/pullrequest_show.html:85 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.html:47 -#: rhodecode/templates/email_templates/pull_request_comment.mako:92 -#: rhodecode/templates/email_templates/pull_request_review.mako:49 +#: 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 "" @@ -7684,17 +8034,17 @@ msgstr "" msgid "Form vertical" msgstr "" -#: rhodecode/templates/email_templates/base.mako:7 +#: rhodecode/templates/email_templates/base.mako:32 #, python-format msgid "This is a notification from RhodeCode. %(instance_url)s" msgstr "" -#: rhodecode/templates/email_templates/base.mako:90 +#: rhodecode/templates/email_templates/base.mako:115 msgid "RhodeCode" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:16 -#: rhodecode/templates/email_templates/pull_request_comment.mako:17 +#: rhodecode/templates/email_templates/pull_request_comment.mako:18 msgid "[mention]" msgstr "" @@ -7723,12 +8073,12 @@ msgid "%(user)s commented on commit `%(c msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:43 -#: rhodecode/templates/email_templates/pull_request_comment.mako:43 +#: rhodecode/templates/email_templates/pull_request_comment.mako:44 msgid "Comment link" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:48 -#: rhodecode/templates/email_templates/pull_request_comment.mako:48 +#: rhodecode/templates/email_templates/pull_request_comment.mako:49 #, python-format msgid "File: %(comment_file)s on line %(comment_line)s" msgstr "" @@ -7757,7 +8107,7 @@ msgid "The commit status was changed to" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 #, python-format msgid "Comment on line: %(comment_line)s" msgstr "" @@ -7766,97 +8116,101 @@ msgstr "" msgid "Generate new password here" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:20 +#: rhodecode/templates/email_templates/pull_request_comment.mako:21 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: " "`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:23 +#: rhodecode/templates/email_templates/pull_request_comment.mako:24 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: " "%(status)s)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:25 -#: rhodecode/templates/email_templates/pull_request_comment.mako:82 +#: rhodecode/templates/email_templates/pull_request_comment.mako:26 +#: rhodecode/templates/email_templates/pull_request_comment.mako:83 #, python-format msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:45 +#: rhodecode/templates/email_templates/pull_request_comment.mako:46 msgid "Source repository" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:54 +#: rhodecode/templates/email_templates/pull_request_comment.mako:55 #, python-format msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:56 +#: rhodecode/templates/email_templates/pull_request_comment.mako:57 #, python-format msgid "" "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:80 +#: rhodecode/templates/email_templates/pull_request_comment.mako:81 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" " "(file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:86 +#: rhodecode/templates/email_templates/pull_request_comment.mako:87 #, python-format msgid "submitted pull request status: %(status)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:88 +#: rhodecode/templates/email_templates/pull_request_comment.mako:89 #, python-format msgid "submitted pull request status: %(status)s and closed" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:5 -#, python-format -msgid "%(user)s wants you to review pull request #%(pr_url)s: \"%(pr_title)s\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_review.mako:17 +#: rhodecode/templates/email_templates/pull_request_comment.mako:95 +msgid "Submitted status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:14 +#, python-format +msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:34 #, python-format msgid "" "Pull request from %(source_ref_type)s:%(source_ref_name)s of %(repo_url)s " "into %(target_ref_type)s:%(target_ref_name)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:26 +#: rhodecode/templates/email_templates/pull_request_review.mako:37 msgid "Link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:35 +#: rhodecode/templates/email_templates/pull_request_review.mako:46 #, python-format msgid "Commit (%(num)s)" msgid_plural "Commits (%(num)s)" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/email_templates/pull_request_review.mako:47 +#: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"." msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:49 +#: rhodecode/templates/email_templates/pull_request_review.mako:73 #, python-format msgid "%(source_ref_type)s of %(source_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:50 +#: rhodecode/templates/email_templates/pull_request_review.mako:74 #, python-format msgid "%(target_ref_type)s of %(target_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:52 +#: rhodecode/templates/email_templates/pull_request_review.mako:76 #: rhodecode/templates/summary/components.html:95 #: rhodecode/templates/summary/components.html:98 #, python-format @@ -8097,13 +8451,13 @@ msgid "Delete file" msgstr "Elimina file" #: 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 "File binario (%s)" #: 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 "Il file è troppo grande per essere mostrato" @@ -8173,44 +8527,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 "Download" -#: 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 "Impossibile modificare file binari" -#: rhodecode/templates/files/files_source.html:39 +#: rhodecode/templates/files/files_source.html:40 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.html:40 +#: rhodecode/templates/files/files_source.html:41 msgid "Deleting files allowed only when on branch head commit" msgstr "" diff --git a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2016-08-02 20:55+0000\n" -"PO-Revision-Date: 2016-08-02 20:57+0000\n" +"POT-Creation-Date: 2016-09-15 14:11+0000\n" +"PO-Revision-Date: 2016-09-15 14:12+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Japanese (http://www.transifex.com/rhodecode/RhodeCode/language/ja/)\n" "MIME-Version: 1.0\n" @@ -27,7 +27,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\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 "全般" @@ -50,7 +50,8 @@ msgstr "" msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:80 rhodecode/templates/register.html:76 +#: 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 #: rhodecode/templates/admin/users/user_add.html:86 @@ -70,12 +71,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" @@ -98,9 +105,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 "有効" @@ -403,12 +410,12 @@ msgstr "" #: rhodecode/controllers/changeset.py:335 #: rhodecode/controllers/pullrequests.py:750 -#: rhodecode/model/pull_request.py:843 +#: rhodecode/model/pull_request.py:842 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" -#: rhodecode/controllers/changeset.py:372 +#: rhodecode/controllers/changeset.py:373 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" @@ -551,14 +558,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 "タグ" @@ -664,30 +671,30 @@ msgid "Close Pull Request" msgstr "" #: rhodecode/controllers/pullrequests.py:754 -#: rhodecode/model/pull_request.py:847 +#: rhodecode/model/pull_request.py:846 msgid "Closing with" msgstr "この状態で閉じる：" -#: rhodecode/controllers/pullrequests.py:802 +#: rhodecode/controllers/pullrequests.py:804 #, python-format msgid "" "Closing pull request on other statuses than rejected or approved is " "forbidden. Calculated status from all reviewers is currently: %s" msgstr "" -#: rhodecode/controllers/summary.py: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 "閉鎖済みブランチ" @@ -700,37 +707,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 "5 分" #: 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 "1 時間" #: 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 "1 日" #: 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 "1 ヶ月" #: 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 "有効期間" @@ -784,60 +791,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 "ユーザー %s の更新中にエラーが発生しました" -#: 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 "" @@ -1055,18 +1063,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 "" @@ -1075,86 +1083,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 "VCS設定を更新しました" -#: 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 "リポジトリの再スキャンに成功しました。 追加: %s 削除: %s" -#: rhodecode/controllers/admin/settings.py:263 +#: rhodecode/controllers/admin/settings.py:266 msgid "Updated application settings" msgstr "アプリケーション設定を更新しました" -#: rhodecode/controllers/admin/settings.py:327 +#: rhodecode/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "表示設定を更新しました" -#: rhodecode/controllers/admin/settings.py:330 +#: 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" @@ -1337,38 +1329,50 @@ 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:193 +#: rhodecode/events/repo.py:199 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:202 +#: rhodecode/events/repo.py:208 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:211 +#: rhodecode/events/repo.py:217 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:222 +#: rhodecode/events/repo.py:228 msgid "repository push" msgstr "" +#: rhodecode/events/repo_group.py:62 +msgid "repository group created" +msgstr "" + +#: rhodecode/events/repo_group.py:71 +msgid "repository group deleted" +msgstr "" + +#: rhodecode/events/repo_group.py:80 +msgid "repository group update" +msgstr "" + #: rhodecode/events/user.py:34 msgid "user registered" msgstr "" @@ -1381,42 +1385,202 @@ 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:214 +msgid "Recipients" +msgstr "" + +#: rhodecode/integrations/types/email.py:215 +msgid "Email addresses to send push events to" +msgstr "" + +#: 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 "Red" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:45 +msgid "Green" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:46 +msgid "Purple" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:47 +msgid "Gray" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:52 +msgid "Hipchat server URL" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:53 +msgid "Hipchat integration url." +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:63 +msgid "Notify" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:64 +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 "Background color of message." +msgstr "" + +#: 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 @@ -1432,35 +1596,40 @@ 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 "" @@ -1472,10 +1641,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 "リポジトリを[削除]" @@ -1599,80 +1772,80 @@ msgstr "作成したタグ: %s" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1180 +#: rhodecode/lib/auth.py:1185 #, python-format msgid "IP %s not allowed" msgstr "IPアドレス %s は許可されません" -#: 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:545 +#: 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:1481 +#: rhodecode/lib/helpers.py:1489 #, python-format msgid " and %s more" msgstr " と %s 以上" -#: rhodecode/lib/helpers.py:1485 +#: rhodecode/lib/helpers.py:1493 msgid "No Files" msgstr "ファイルなし" -#: rhodecode/lib/helpers.py:1558 +#: rhodecode/lib/helpers.py:1566 msgid "new file" msgstr "新しいファイル" -#: rhodecode/lib/helpers.py:1561 +#: rhodecode/lib/helpers.py:1569 msgid "mod" msgstr "変更" -#: rhodecode/lib/helpers.py:1564 +#: rhodecode/lib/helpers.py:1572 msgid "del" msgstr "削除" -#: rhodecode/lib/helpers.py:1567 +#: rhodecode/lib/helpers.py:1575 msgid "rename" msgstr "リネーム" -#: rhodecode/lib/helpers.py:1572 +#: rhodecode/lib/helpers.py:1580 msgid "chmod" msgstr "chmod" -#: rhodecode/lib/helpers.py:1819 +#: rhodecode/lib/helpers.py:1827 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -1691,85 +1864,85 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1839 +#: 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 "%s リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" -#: rhodecode/lib/utils2.py:454 +#: rhodecode/lib/utils2.py:463 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d 年" -#: rhodecode/lib/utils2.py:455 +#: rhodecode/lib/utils2.py:464 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d ヶ月" -#: rhodecode/lib/utils2.py:456 +#: rhodecode/lib/utils2.py:465 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d 日" -#: rhodecode/lib/utils2.py:457 +#: rhodecode/lib/utils2.py:466 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d 時間" -#: rhodecode/lib/utils2.py:458 +#: rhodecode/lib/utils2.py:467 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分" -#: rhodecode/lib/utils2.py:459 +#: rhodecode/lib/utils2.py:468 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d 秒" -#: rhodecode/lib/utils2.py:477 +#: rhodecode/lib/utils2.py:486 #, python-format msgid "in %s" msgstr "%s 以内" -#: rhodecode/lib/utils2.py:483 +#: rhodecode/lib/utils2.py:492 #, python-format msgid "%s ago" msgstr "%s 前" -#: 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 "%s と %s 前" -#: rhodecode/lib/utils2.py:501 +#: rhodecode/lib/utils2.py:510 #, python-format msgid "in %s and %s" msgstr "%s と %s の間" -#: 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" @@ -1799,7 +1972,9 @@ msgstr "たったいま" #: 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_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 "リポジトリへのアクセス権限無し" @@ -1827,7 +2002,9 @@ msgstr "リポジトリへのアクセス権限無し" #: 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_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 "リポジトリに読込権限でアクセス" @@ -1855,7 +2032,9 @@ msgstr "リポジトリに読込権限でアクセス" #: 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_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 "リポジトリに書込権限でアクセス" @@ -1883,7 +2062,9 @@ msgstr "リポジトリに書込権限でアクセス" #: 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_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 "リポジトリに管理権限でアクセス" @@ -1951,7 +2132,9 @@ msgstr "RhodeCode 管理者" #: 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_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 "リポジトリの作成を有効にする" @@ -1979,7 +2162,9 @@ msgstr "リポジトリの作成を有効にする" #: 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_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 "リポジトリの作成を有効にする" @@ -2007,7 +2192,9 @@ msgstr "リポジトリの作成を有効にする" #: 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_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 "リポジトリのフォークを無効にする" @@ -2035,7 +2222,9 @@ msgstr "リポジトリのフォークを無効にする" #: 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_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 "リポジトリのフォークを有効にする" @@ -2084,7 +2273,9 @@ msgstr "Rhodecodeに登録した新しいユーザーを自動でアクティベートする" #: 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:2944 +#: 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 "未レビュー" @@ -2112,7 +2303,9 @@ msgstr "未レビュー" #: 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:2945 +#: 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 "承認" @@ -2140,7 +2333,9 @@ msgstr "承認" #: 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:2946 +#: 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 "却下" @@ -2168,7 +2363,9 @@ msgstr "却下" #: 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:2947 +#: 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 "レビュー中" @@ -2193,7 +2390,9 @@ msgstr "レビュー中" #: 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_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 "リポジトリグループへのアクセス権限なし" @@ -2218,7 +2417,9 @@ msgstr "リポジトリグループへのアクセス権限なし" #: 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_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 "リポジトリグループに読込権限でアクセス" @@ -2243,7 +2444,9 @@ msgstr "リポジトリグループに読込権限でアクセス" #: 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_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 "リポジトリグループに書込権限でアクセス" @@ -2268,7 +2471,9 @@ msgstr "リポジトリグループに書込権限でアクセス" #: 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_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 "リポジトリグループに管理権限でアクセス" @@ -2292,7 +2497,9 @@ msgstr "リポジトリグループに管理権限でアクセス" #: 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_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 "ユーザーグループへのアクセス権限なし" @@ -2316,7 +2523,9 @@ msgstr "ユーザーグループへのアクセス権限なし" #: 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_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 "ユーザーグループに読込権限でアクセス" @@ -2340,7 +2549,9 @@ msgstr "ユーザーグループに読込権限でアクセス" #: 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_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 "ユーザーグループに書込権限でアクセス" @@ -2364,7 +2575,9 @@ msgstr "ユーザーグループに書込権限でアクセス" #: 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_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 "ユーザーグループに管理権限でアクセス" @@ -2388,7 +2601,9 @@ msgstr "ユーザーグループに管理権限でアクセス" #: 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_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 "リポジトリグループの作成を無効にする" @@ -2412,7 +2627,9 @@ msgstr "リポジトリグループの作成を無効にする" #: 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_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 "リポジトリグループの作成を有効にする" @@ -2436,7 +2653,9 @@ msgstr "リポジトリグループの作成を有効にする" #: 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_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 "ユーザーグループの作成を無効にする" @@ -2460,7 +2679,9 @@ msgstr "ユーザーグループの作成を無効にする" #: 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_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 "ユーザーグループの作成を有効にする" @@ -2484,7 +2705,9 @@ msgstr "ユーザーグループの作成を有効にする" #: 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_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 "新規登録を無効にする" @@ -2508,7 +2731,9 @@ msgstr "新規登録を無効にする" #: 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_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 "ユーザーの新規登録時に手動でアカウントをアクティベートする" @@ -2532,7 +2757,9 @@ msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" #: 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_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 "ユーザーの新規登録時に自動でアカウントをアクティベートする" @@ -2556,7 +2783,9 @@ msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" #: 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_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 "外部アカウントを手動でアクティベートする" @@ -2580,7 +2809,9 @@ msgstr "外部アカウントを手動でアクティベートする" #: 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_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 "外部アカウントを自動でアクティベートする" @@ -2598,7 +2829,9 @@ msgstr "外部アカウントを自動でアクティベートする" #: 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_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 "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成が有効です" @@ -2617,7 +2850,9 @@ msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成が有効です" #: 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_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 "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成は無効です" @@ -2633,7 +2868,9 @@ msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成は無効です" #: 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_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 "" @@ -2646,7 +2883,9 @@ msgstr "" #: 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_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 "" @@ -2659,32 +2898,46 @@ msgstr "" #: 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_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_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 "" @@ -2738,12 +2991,12 @@ msgid "" "email" msgstr "" -#: rhodecode/model/comment.py:263 +#: rhodecode/model/comment.py:266 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:264 -msgid "Refresh page" +#: rhodecode/model/comment.py:267 +msgid "Show it now" msgstr "" #: rhodecode/model/forms.py:85 @@ -2874,7 +3127,7 @@ msgid "" " %(pr_title)s" msgstr "" -#: rhodecode/model/pull_request.py:449 +#: rhodecode/model/pull_request.py:448 msgid "Pull request merged and closed" msgstr "" @@ -2918,7 +3171,7 @@ msgstr "最新のtip" 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 " @@ -3172,6 +3425,56 @@ 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 @@ -3342,19 +3645,19 @@ 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}) ..." @@ -3362,13 +3665,13 @@ 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 "読み込み中..." @@ -3528,6 +3831,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 "ダッシュボード" @@ -3576,6 +3895,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 @@ -3595,7 +3915,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 @@ -3612,8 +3931,8 @@ msgstr "名前" #: rhodecode/templates/changeset/changeset.html:53 #: rhodecode/templates/compare/compare_commits.html:24 #: rhodecode/templates/email_templates/commit_comment.mako:82 -#: rhodecode/templates/email_templates/pull_request_review.mako:30 -#: rhodecode/templates/email_templates/pull_request_review.mako:51 +#: rhodecode/templates/email_templates/pull_request_review.mako:41 +#: rhodecode/templates/email_templates/pull_request_review.mako:75 #: rhodecode/templates/files/file_tree_detail.html:5 #: rhodecode/templates/files/file_tree_detail.html:12 #: rhodecode/templates/forks/fork.html:48 @@ -3826,9 +4145,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 @@ -3878,7 +4201,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 @@ -3915,7 +4237,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" @@ -4060,7 +4382,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 @@ -4113,75 +4435,17 @@ msgstr "非公開 Gist を作成" msgid "Create Public Gist" msgstr "公開 Gist を作成" -#: 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 "Gist" #: 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 "このGistを削除してもよろしいですか？" #: 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 @@ -4193,8 +4457,8 @@ msgstr "このGistを削除してもよろしいですか？" #: 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 @@ -4215,17 +4479,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 "Raw形式で表示" -#: rhodecode/templates/admin/integrations/base.html:12 -msgid "Integrations settings" -msgstr "" - -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/base.html:14 +msgid "Integrations Settings" +msgstr "" + +#: 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 @@ -4235,27 +4509,101 @@ msgstr "" msgid "Settings" msgstr "設定" -#: rhodecode/templates/admin/integrations/edit.html:36 -#, python-format -msgid "Create new %(integration_type)s integration" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:31 +#: rhodecode/templates/admin/integrations/form.html:60 +#, python-format +msgid "Create New %(integration_type)s Integration" +msgstr "" + +#: 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: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:56 -msgid "Current integrations" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:65 +#: 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" @@ -4275,7 +4623,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 "" @@ -4393,36 +4741,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" -msgstr "無効" +#: 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 @@ -4462,27 +4792,28 @@ 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:28 -#: rhodecode/templates/email_templates/pull_request_review.mako:48 +#: rhodecode/templates/email_templates/pull_request_review.mako:39 +#: rhodecode/templates/email_templates/pull_request_review.mako:72 #: rhodecode/templates/pullrequests/pullrequest.html:38 #: rhodecode/templates/pullrequests/pullrequests.html:104 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 @@ -4490,7 +4821,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 @@ -4498,19 +4829,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 "" @@ -4528,10 +4859,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 @@ -4551,12 +4878,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 @@ -4669,12 +5000,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 " @@ -4737,7 +5062,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 @@ -5004,7 +5329,6 @@ msgid "Statistics" msgstr "統計" #: rhodecode/templates/admin/repos/repo_edit_advanced.html:7 -#: rhodecode/templates/pullrequests/pullrequests.html:108 msgid "Updated on" msgstr "" @@ -5405,7 +5729,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" @@ -5622,6 +5946,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 "" @@ -6354,6 +6682,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 "" @@ -6384,7 +6716,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 "サポート" @@ -6767,7 +7099,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 "" @@ -6869,29 +7201,65 @@ msgid "" "repositories and migrates them to Mercurial type." msgstr "hgsubversion ライブラリのインストールが必要です。リモートのSVNリポジトリをクローンしてMercurialリポジトリに変換するすることが可能です。" -#: 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 " @@ -6899,34 +7267,16 @@ msgid "" "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" @@ -7331,7 +7681,7 @@ msgstr "コメントのプレビュー" #: rhodecode/templates/changeset/changeset_file_comment.html:293 #: rhodecode/templates/compare/compare_diff.html:57 #: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 msgid "Comment" msgstr "コメント" @@ -7473,17 +7823,17 @@ msgid "Compare Commits" msgstr "" #: rhodecode/templates/compare/compare_diff.html:46 -#: rhodecode/templates/email_templates/pull_request_review.mako:50 +#: rhodecode/templates/email_templates/pull_request_review.mako:74 #: rhodecode/templates/files/file_diff.html:56 #: rhodecode/templates/pullrequests/pullrequest_show.html:85 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.html:47 -#: rhodecode/templates/email_templates/pull_request_comment.mako:92 -#: rhodecode/templates/email_templates/pull_request_review.mako:49 +#: 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 "ソース" @@ -7663,17 +8013,17 @@ msgstr "" msgid "Form vertical" msgstr "" -#: rhodecode/templates/email_templates/base.mako:7 +#: rhodecode/templates/email_templates/base.mako:32 #, python-format msgid "This is a notification from RhodeCode. %(instance_url)s" msgstr "" -#: rhodecode/templates/email_templates/base.mako:90 +#: rhodecode/templates/email_templates/base.mako:115 msgid "RhodeCode" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:16 -#: rhodecode/templates/email_templates/pull_request_comment.mako:17 +#: rhodecode/templates/email_templates/pull_request_comment.mako:18 msgid "[mention]" msgstr "" @@ -7702,12 +8052,12 @@ msgid "%(user)s commented on commit `%(c msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:43 -#: rhodecode/templates/email_templates/pull_request_comment.mako:43 +#: rhodecode/templates/email_templates/pull_request_comment.mako:44 msgid "Comment link" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:48 -#: rhodecode/templates/email_templates/pull_request_comment.mako:48 +#: rhodecode/templates/email_templates/pull_request_comment.mako:49 #, python-format msgid "File: %(comment_file)s on line %(comment_line)s" msgstr "" @@ -7736,7 +8086,7 @@ msgid "The commit status was changed to" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 #, python-format msgid "Comment on line: %(comment_line)s" msgstr "" @@ -7745,96 +8095,100 @@ msgstr "" msgid "Generate new password here" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:20 +#: rhodecode/templates/email_templates/pull_request_comment.mako:21 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: " "`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:23 +#: rhodecode/templates/email_templates/pull_request_comment.mako:24 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: " "%(status)s)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:25 -#: rhodecode/templates/email_templates/pull_request_comment.mako:82 +#: rhodecode/templates/email_templates/pull_request_comment.mako:26 +#: rhodecode/templates/email_templates/pull_request_comment.mako:83 #, python-format msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:45 +#: rhodecode/templates/email_templates/pull_request_comment.mako:46 msgid "Source repository" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:54 +#: rhodecode/templates/email_templates/pull_request_comment.mako:55 #, python-format msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:56 +#: rhodecode/templates/email_templates/pull_request_comment.mako:57 #, python-format msgid "" "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:80 +#: rhodecode/templates/email_templates/pull_request_comment.mako:81 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" " "(file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:86 +#: rhodecode/templates/email_templates/pull_request_comment.mako:87 #, python-format msgid "submitted pull request status: %(status)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:88 +#: rhodecode/templates/email_templates/pull_request_comment.mako:89 #, python-format msgid "submitted pull request status: %(status)s and closed" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:5 -#, python-format -msgid "%(user)s wants you to review pull request #%(pr_url)s: \"%(pr_title)s\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_review.mako:17 +#: rhodecode/templates/email_templates/pull_request_comment.mako:95 +msgid "Submitted status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:14 +#, python-format +msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:34 #, python-format msgid "" "Pull request from %(source_ref_type)s:%(source_ref_name)s of %(repo_url)s " "into %(target_ref_type)s:%(target_ref_name)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:26 +#: rhodecode/templates/email_templates/pull_request_review.mako:37 msgid "Link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:35 +#: rhodecode/templates/email_templates/pull_request_review.mako:46 #, python-format msgid "Commit (%(num)s)" msgid_plural "Commits (%(num)s)" msgstr[0] "" -#: rhodecode/templates/email_templates/pull_request_review.mako:47 +#: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"." msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:49 +#: rhodecode/templates/email_templates/pull_request_review.mako:73 #, python-format msgid "%(source_ref_type)s of %(source_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:50 +#: rhodecode/templates/email_templates/pull_request_review.mako:74 #, python-format msgid "%(target_ref_type)s of %(target_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:52 +#: rhodecode/templates/email_templates/pull_request_review.mako:76 #: rhodecode/templates/summary/components.html:95 #: rhodecode/templates/summary/components.html:98 #, python-format @@ -8073,13 +8427,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 "バイナリファイル (%s)" #: 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 "表示するには大きすぎるファイルです" @@ -8148,44 +8502,44 @@ msgid "line" msgid_plural "lines" msgstr[0] "" -#: 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 "ブランチ:%s で編集" -#: 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 +#: rhodecode/templates/files/files_source.html:40 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.html:40 +#: rhodecode/templates/files/files_source.html:41 msgid "Deleting files allowed only when on branch head commit" msgstr "" diff --git a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2016-08-02 20:55+0000\n" -"PO-Revision-Date: 2016-08-02 20:57+0000\n" +"POT-Creation-Date: 2016-09-15 14:11+0000\n" +"PO-Revision-Date: 2016-09-15 14:12+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Polish (http://www.transifex.com/rhodecode/RhodeCode/language/pl/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: rhodecode/admin/navigation.py: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 "Globalne" @@ -48,7 +48,8 @@ msgstr "" msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:80 rhodecode/templates/register.html:76 +#: 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 #: rhodecode/templates/admin/users/user_add.html:86 @@ -68,12 +69,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" @@ -96,9 +103,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 "Włączone" @@ -401,12 +408,12 @@ msgstr "" #: rhodecode/controllers/changeset.py:335 #: rhodecode/controllers/pullrequests.py:750 -#: rhodecode/model/pull_request.py:843 +#: rhodecode/model/pull_request.py:842 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" -#: rhodecode/controllers/changeset.py:372 +#: rhodecode/controllers/changeset.py:373 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" @@ -549,14 +556,14 @@ msgstr "" msgid "Changesets" msgstr "Różnice" -#: 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 "Gałęzie" #: 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 "Etykiety" @@ -662,30 +669,30 @@ msgid "Close Pull Request" msgstr "" #: rhodecode/controllers/pullrequests.py:754 -#: rhodecode/model/pull_request.py:847 +#: rhodecode/model/pull_request.py:846 msgid "Closing with" msgstr "Zamykanie" -#: rhodecode/controllers/pullrequests.py:802 +#: rhodecode/controllers/pullrequests.py:804 #, python-format msgid "" "Closing pull request on other statuses than rejected or approved is " "forbidden. Calculated status from all reviewers is currently: %s" msgstr "" -#: rhodecode/controllers/summary.py:235 +#: rhodecode/controllers/summary.py:243 msgid "Branch" msgstr "gałąź" -#: rhodecode/controllers/summary.py:236 +#: rhodecode/controllers/summary.py:244 msgid "Tag" msgstr "Tag" -#: rhodecode/controllers/summary.py:237 +#: rhodecode/controllers/summary.py:245 msgid "Bookmark" msgstr "Bookmark" -#: rhodecode/controllers/summary.py:252 +#: rhodecode/controllers/summary.py:260 msgid "Closed branches" msgstr "Zamkniętę gałęzie" @@ -698,37 +705,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 "na zawsze" #: 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 "5 minut" #: 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 "1 godzina" #: 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 "1 dzień" #: 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 "1 miesiąc" #: 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 "Czas życia" @@ -782,60 +789,61 @@ msgstr "nigdy" 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 "Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej aplikacji" -#: rhodecode/controllers/admin/my_account.py:128 +#: rhodecode/controllers/admin/my_account.py:132 msgid "Your account was updated successfully" msgstr "Twoje konto zostało pomyślnie zaktualizowane" -#: 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 "wystąpił błąd podczas aktualizacji użytkownika %s" -#: 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 "Wystąpił błąd podczas zapisywania e-maila" -#: 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 "Rola" -#: 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 "" @@ -1057,18 +1065,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 "" @@ -1077,86 +1085,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 "Aktualizacja ustawień VCS" -#: 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 "Wystąpił błąd podczas aktualizacji ustawień aplikacji" -#: rhodecode/controllers/admin/settings.py:211 +#: rhodecode/controllers/admin/settings.py:214 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "Repozytoria z powodzeniem zostały ponownie zeskanowane dodano: %s, usunięto: %s" -#: rhodecode/controllers/admin/settings.py:263 +#: rhodecode/controllers/admin/settings.py:266 msgid "Updated application settings" msgstr "Aktualizacja ustawień aplikacji" -#: rhodecode/controllers/admin/settings.py:327 +#: rhodecode/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "Aktualizacja ustawień wizualizacji" -#: rhodecode/controllers/admin/settings.py:330 +#: rhodecode/controllers/admin/settings.py:333 msgid "Error occurred during updating visualisation settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień wizualizacji" -#: rhodecode/controllers/admin/settings.py:422 +#: rhodecode/controllers/admin/settings.py:425 msgid "Please enter email address" msgstr "Proszę podać adres email" -#: 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 "Dodano nowy hook" -#: rhodecode/controllers/admin/settings.py:488 +#: rhodecode/controllers/admin/settings.py:491 msgid "Updated hooks" msgstr "Aktualizacja hooku" -#: rhodecode/controllers/admin/settings.py:492 +#: rhodecode/controllers/admin/settings.py:495 msgid "Error occurred during hook creation" msgstr "Wystąpił błąd podczas tworzenia hooku" -#: 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" @@ -1339,38 +1331,50 @@ 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:193 +#: rhodecode/events/repo.py:199 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:202 +#: rhodecode/events/repo.py:208 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:211 +#: rhodecode/events/repo.py:217 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:222 +#: rhodecode/events/repo.py:228 msgid "repository push" msgstr "" +#: rhodecode/events/repo_group.py:62 +msgid "repository group created" +msgstr "" + +#: rhodecode/events/repo_group.py:71 +msgid "repository group deleted" +msgstr "" + +#: rhodecode/events/repo_group.py:80 +msgid "repository group update" +msgstr "" + #: rhodecode/events/user.py:34 msgid "user registered" msgstr "" @@ -1383,42 +1387,202 @@ 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 "Zresetuj" + +#: 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 "Usuń" + +#: 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:214 +msgid "Recipients" +msgstr "" + +#: rhodecode/integrations/types/email.py:215 +msgid "Email addresses to send push events to" +msgstr "" + +#: rhodecode/integrations/types/email.py:220 +#: rhodecode/integrations/types/email.py:221 +msgid "Email address" +msgstr "Adres e-mail" + +#: 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 "Red" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:45 +msgid "Green" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:46 +msgid "Purple" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:47 +msgid "Gray" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:52 +msgid "Hipchat server URL" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:53 +msgid "Hipchat integration url." +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:63 +msgid "Notify" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:64 +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 "Background color of message." +msgstr "" + +#: 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 @@ -1434,35 +1598,40 @@ msgstr "" msgid "Username" msgstr "Nazwa użytkownika" -#: 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 "" @@ -1474,10 +1643,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 "[usunięte] repozytorium" @@ -1601,80 +1774,80 @@ msgstr "Utworzony tag: %s" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1180 +#: rhodecode/lib/auth.py:1185 #, python-format msgid "IP %s not allowed" msgstr "Obserwatorzy %s" -#: rhodecode/lib/auth.py:1254 +#: rhodecode/lib/auth.py:1259 msgid "You need to be a registered user to perform this action" msgstr "Musisz być zarejestrowanym użytkownikiem, żeby wykonać to działanie" -#: rhodecode/lib/auth.py: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:545 +#: 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 "Plik binarny" -#: 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 "Lista zmian była zbyt duża i została obcięta, użyj menu porównań żeby wyświetlić różnice" -#: rhodecode/lib/diffs.py:102 +#: rhodecode/lib/diffs.py:109 msgid "No changes detected" msgstr "Nie wykryto zmian" -#: rhodecode/lib/diffs.py:631 +#: rhodecode/lib/diffs.py:643 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1481 +#: rhodecode/lib/helpers.py:1489 #, python-format msgid " and %s more" msgstr "i %s więcej" -#: rhodecode/lib/helpers.py:1485 +#: rhodecode/lib/helpers.py:1493 msgid "No Files" msgstr "Brak Plików" -#: rhodecode/lib/helpers.py:1558 +#: rhodecode/lib/helpers.py:1566 msgid "new file" msgstr "nowy plik" -#: rhodecode/lib/helpers.py:1561 +#: rhodecode/lib/helpers.py:1569 msgid "mod" msgstr "modyfikuj" -#: rhodecode/lib/helpers.py:1564 +#: rhodecode/lib/helpers.py:1572 msgid "del" msgstr "kasuj" -#: rhodecode/lib/helpers.py:1567 +#: rhodecode/lib/helpers.py:1575 msgid "rename" msgstr "zmień nazwę" -#: rhodecode/lib/helpers.py:1572 +#: rhodecode/lib/helpers.py:1580 msgid "chmod" msgstr "chmod" -#: rhodecode/lib/helpers.py:1819 +#: rhodecode/lib/helpers.py:1827 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -1693,14 +1866,14 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1839 +#: 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 "%s repozytorium nie jest mapowane do db może zostało utworzone lub zmienione z systemie plików proszę uruchomić aplikację ponownie, aby ponownie przeskanować repozytoria" -#: rhodecode/lib/utils2.py:454 +#: rhodecode/lib/utils2.py:463 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1708,7 +1881,7 @@ msgstr[0] "%d rok" msgstr[1] "%d lata" msgstr[2] "%d lat" -#: rhodecode/lib/utils2.py:455 +#: rhodecode/lib/utils2.py:464 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1716,7 +1889,7 @@ msgstr[0] "%d miesiąc" msgstr[1] "%d miesięcy" msgstr[2] "%d miesięcy" -#: rhodecode/lib/utils2.py:456 +#: rhodecode/lib/utils2.py:465 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1724,7 +1897,7 @@ msgstr[0] "%d dzień" msgstr[1] "%d dni" msgstr[2] "%d dni" -#: rhodecode/lib/utils2.py:457 +#: rhodecode/lib/utils2.py:466 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1732,7 +1905,7 @@ msgstr[0] "%d godzina" msgstr[1] "%d godziny" msgstr[2] "%d godzin" -#: rhodecode/lib/utils2.py:458 +#: rhodecode/lib/utils2.py:467 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1740,7 +1913,7 @@ msgstr[0] "%d minuta" msgstr[1] "%d minuty" msgstr[2] "%d minut" -#: rhodecode/lib/utils2.py:459 +#: rhodecode/lib/utils2.py:468 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1748,42 +1921,42 @@ msgstr[0] "%d sekunda" msgstr[1] "%d sekund" msgstr[2] "%d sekund" -#: rhodecode/lib/utils2.py:477 +#: rhodecode/lib/utils2.py:486 #, python-format msgid "in %s" msgstr "w %s" -#: rhodecode/lib/utils2.py:483 +#: rhodecode/lib/utils2.py:492 #, python-format msgid "%s ago" msgstr "%s temu" -#: 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 "%s i %s temu" -#: rhodecode/lib/utils2.py:501 +#: rhodecode/lib/utils2.py:510 #, python-format msgid "in %s and %s" msgstr "w %s i %s" -#: 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" @@ -1813,7 +1986,9 @@ msgstr "przed chwilą" #: 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_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 "Brak dostępu do repozytorium" @@ -1841,7 +2016,9 @@ msgstr "Brak dostępu do repozytorium" #: 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_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 "Repozytorium do odczytu" @@ -1869,7 +2046,9 @@ msgstr "Repozytorium do odczytu" #: 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_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 "Repozytorium do zapisu" @@ -1897,7 +2076,9 @@ msgstr "Repozytorium do zapisu" #: 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_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 "Administracja dostępu do repozytorium" @@ -1965,7 +2146,9 @@ msgstr "Administrator Repo" #: 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_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 "Tworzenie repozytorium jest wyłączone" @@ -1993,7 +2176,9 @@ msgstr "Tworzenie repozytorium jest wyłączone" #: 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_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 "Tworzenie repozytorium jest włączone" @@ -2021,7 +2206,9 @@ msgstr "Tworzenie repozytorium jest włączone" #: 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_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 "Rozwidlenie repozytorium wyłączone" @@ -2049,7 +2236,9 @@ msgstr "Rozwidlenie repozytorium wyłączone" #: 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_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 "Rozwidlenie repozytorium włączone" @@ -2098,7 +2287,9 @@ msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją" #: 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:2944 +#: 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 "Brak Korekty" @@ -2126,7 +2317,9 @@ msgstr "Brak Korekty" #: 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:2945 +#: 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 "Zaakceptowano" @@ -2154,7 +2347,9 @@ msgstr "Zaakceptowano" #: 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:2946 +#: 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 "Odrzucono" @@ -2182,7 +2377,9 @@ msgstr "Odrzucono" #: 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:2947 +#: 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 "Objęty Przeglądem" @@ -2207,7 +2404,9 @@ msgstr "Objęty Przeglądem" #: 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_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 "Grupy repozytoriów brak dostępu" @@ -2232,7 +2431,9 @@ msgstr "Grupy repozytoriów brak dostępu" #: 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_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 "Grupy repozytoriów dostęp do odczytu" @@ -2257,7 +2458,9 @@ msgstr "Grupy repozytoriów dostęp do odczytu" #: 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_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 "Grupy repozytoriów dostęp do zapisu" @@ -2282,7 +2485,9 @@ msgstr "Grupy repozytoriów dostęp do zapisu" #: 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_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 "Repozytoria Grupy dostęp administratora" @@ -2306,7 +2511,9 @@ msgstr "Repozytoria Grupy dostęp administratora" #: 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_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 "Ta grupa użytkowników nie ma dostępu" @@ -2330,7 +2537,9 @@ msgstr "Ta grupa użytkowników nie ma dostępu" #: 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_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 "Dostęp do grupy parametrów użytkownika" @@ -2354,7 +2563,9 @@ msgstr "Dostęp do grupy parametrów użytkownika" #: 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_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 "Ta grupa użytkowników ma prawo do zapisu" @@ -2378,7 +2589,9 @@ msgstr "Ta grupa użytkowników ma prawo do zapisu" #: 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_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 "Ta grupa użytkowników ma uprawnienia administratora" @@ -2402,7 +2615,9 @@ msgstr "Ta grupa użytkowników ma uprawnienia administratora" #: 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_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 "Tworzenie grup repozytoriów wyłączone" @@ -2426,7 +2641,9 @@ msgstr "Tworzenie grup repozytoriów wyłączone" #: 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_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 "Tworzenie grup repozytoriów włączone" @@ -2450,7 +2667,9 @@ msgstr "Tworzenie grup repozytoriów włączone" #: 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_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 "Tworzenie grup użytkowników wyłączone" @@ -2474,7 +2693,9 @@ msgstr "Tworzenie grup użytkowników wyłączone" #: 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_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 "Tworzenie grup użytkowników właczone" @@ -2498,7 +2719,9 @@ msgstr "Tworzenie grup użytkowników właczone" #: 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_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 "Rejestracja wyłączona" @@ -2522,7 +2745,9 @@ msgstr "Rejestracja wyłączona" #: 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_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 "Rejestracja użytkownika z ręczną aktywacją konta" @@ -2546,7 +2771,9 @@ msgstr "Rejestracja użytkownika z ręczną aktywacją konta" #: 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_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 "Rejestracja użytkownika z automatyczną aktywacją konta" @@ -2570,7 +2797,9 @@ msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" #: 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_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 "Ręczna aktywacja nowego konta" @@ -2594,7 +2823,9 @@ msgstr "Ręczna aktywacja nowego konta" #: 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_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 "Automatyczna aktywacja nowego konta" @@ -2612,7 +2843,9 @@ msgstr "Automatyczna aktywacja nowego ko #: 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_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 "" @@ -2631,7 +2864,9 @@ msgstr "" #: 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_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 "" @@ -2647,7 +2882,9 @@ msgstr "" #: 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_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 "" @@ -2660,7 +2897,9 @@ msgstr "" #: 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_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 "" @@ -2673,32 +2912,46 @@ msgstr "" #: 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_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_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 "" @@ -2752,12 +3005,12 @@ msgid "" "email" msgstr "" -#: rhodecode/model/comment.py:263 +#: rhodecode/model/comment.py:266 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:264 -msgid "Refresh page" +#: rhodecode/model/comment.py:267 +msgid "Show it now" msgstr "" #: rhodecode/model/forms.py:85 @@ -2888,7 +3141,7 @@ msgid "" " %(pr_title)s" msgstr "" -#: rhodecode/model/pull_request.py:449 +#: rhodecode/model/pull_request.py:448 msgid "Pull request merged and closed" msgstr "" @@ -2932,7 +3185,7 @@ msgstr "ostatni tip" msgid "You can't Edit this user since it's crucial for entire application" msgstr "Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej aplikacji" -#: rhodecode/model/user.py:285 +#: rhodecode/model/user.py:284 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " @@ -3186,6 +3439,56 @@ 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 @@ -3356,19 +3659,19 @@ 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 "Dodaj kolejny komentarz" #: 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}) ..." @@ -3376,13 +3679,13 @@ 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 "Przesyłanie..." #: 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 "Ładuję..." @@ -3542,6 +3845,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 "Repozytorium" @@ -3590,6 +3909,7 @@ msgstr "Edytuj Grupę Repozytoriów" #: 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 @@ -3609,7 +3929,6 @@ msgstr "Nazwa" #: 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 @@ -3626,8 +3945,8 @@ msgstr "Nazwa" #: rhodecode/templates/changeset/changeset.html:53 #: rhodecode/templates/compare/compare_commits.html:24 #: rhodecode/templates/email_templates/commit_comment.mako:82 -#: rhodecode/templates/email_templates/pull_request_review.mako:30 -#: rhodecode/templates/email_templates/pull_request_review.mako:51 +#: rhodecode/templates/email_templates/pull_request_review.mako:41 +#: rhodecode/templates/email_templates/pull_request_review.mako:75 #: rhodecode/templates/files/file_tree_detail.html:5 #: rhodecode/templates/files/file_tree_detail.html:12 #: rhodecode/templates/forks/fork.html:48 @@ -3842,9 +4161,13 @@ msgstr "Ustawienia Autentykacji" #: 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 @@ -3894,7 +4217,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 @@ -3931,7 +4253,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" @@ -4076,7 +4398,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 @@ -4129,75 +4451,17 @@ msgstr "Utwórz Prywatny Gist" msgid "Create Public Gist" msgstr "Utwórz Publiczny Gist" -#: 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 "Zresetuj" - #: rhodecode/templates/admin/gists/show.html:13 #: rhodecode/templates/admin/gists/show.html:20 msgid "Gist" msgstr "Gist" #: 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 "Usuń" - -#: rhodecode/templates/admin/gists/show.html:49 msgid "Confirm to delete this Gist" msgstr "Potwierdź aby usunąć ten Gist" #: 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 @@ -4209,8 +4473,8 @@ msgstr "Potwierdź aby usunąć ten Gist" #: 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 @@ -4231,17 +4495,27 @@ msgstr "utworzono" #: 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 "wyświetl jako raw" -#: rhodecode/templates/admin/integrations/base.html:12 -msgid "Integrations settings" -msgstr "" - -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/base.html:14 +msgid "Integrations Settings" +msgstr "" + +#: 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 "Grupy Repozytoriów" + +#: 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 @@ -4251,27 +4525,101 @@ msgstr "" msgid "Settings" msgstr "Ustawienia" -#: rhodecode/templates/admin/integrations/edit.html:36 -#, python-format -msgid "Create new %(integration_type)s integration" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:31 +#: rhodecode/templates/admin/integrations/form.html:60 +#, python-format +msgid "Create New %(integration_type)s Integration" +msgstr "" + +#: 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:64 +#: rhodecode/templates/admin/notifications/notifications.html:31 +msgid "All" +msgstr "Wszystkie" + +#: 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:56 -msgid "Current integrations" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:65 +#: 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" @@ -4291,7 +4639,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 "" @@ -4409,36 +4757,18 @@ msgstr "Brak dodatkowych emaili" msgid "New email address" msgstr "Nowy adres e-mail" -#: 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 "Powiadomienia" - -#: rhodecode/templates/admin/my_account/my_account_notifications.html:14 -msgid "Disabled" -msgstr "Wyłączone" +#: 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 @@ -4478,27 +4808,28 @@ 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:28 -#: rhodecode/templates/email_templates/pull_request_review.mako:48 +#: rhodecode/templates/email_templates/pull_request_review.mako:39 +#: rhodecode/templates/email_templates/pull_request_review.mako:72 #: rhodecode/templates/pullrequests/pullrequest.html:38 #: rhodecode/templates/pullrequests/pullrequests.html:104 msgid "Title" msgstr "Tytuł" #: 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 @@ -4506,7 +4837,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 @@ -4514,19 +4845,19 @@ msgstr "" msgid "Closed" msgstr "Zamknięte" -#: 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 "Potwierdź usunięcie połączenia gałęzi" -#: 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 "" @@ -4544,10 +4875,6 @@ msgstr "" msgid "My Notifications" msgstr "Opcje powiadomień" -#: rhodecode/templates/admin/notifications/notifications.html:31 -msgid "All" -msgstr "Wszystkie" - #: rhodecode/templates/admin/notifications/notifications.html:32 #: rhodecode/templates/changeset/changeset.html:140 #: rhodecode/templates/pullrequests/pullrequest_show.html:133 @@ -4567,12 +4894,16 @@ msgstr "Brak powiadomień" msgid "Show notification" msgstr "Pokaż powiadomienia" +#: rhodecode/templates/admin/notifications/show_notification.html:12 +msgid "Notifications" +msgstr "Powiadomienia" + #: 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 @@ -4685,12 +5016,6 @@ msgstr "Wszystkie uprawnienia domyślne każdego repozytorium zostaną przywrócone. Wybrane uprawnienie zostaną skasowane. Pamiętaj, że wszystkie niestandardowe uprawnienia w repozytoriach zostaną utracone." 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 "Grupy Repozytoriów" - #: rhodecode/templates/admin/permissions/permissions_objects.html:34 msgid "" "All default permissions on each repository group will be reset to chosen " @@ -4753,7 +5078,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 @@ -5024,7 +5349,6 @@ msgid "Statistics" msgstr "Statystyki" #: rhodecode/templates/admin/repos/repo_edit_advanced.html:7 -#: rhodecode/templates/pullrequests/pullrequests.html:108 msgid "Updated on" msgstr "" @@ -5429,7 +5753,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" @@ -5646,6 +5970,10 @@ msgstr "Niestandardowa aktualizacja" 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 "" @@ -6384,6 +6712,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 "" @@ -6414,7 +6746,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 "" @@ -6799,7 +7131,7 @@ msgstr "Tworzenie grup użytkowników" 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 "" @@ -6901,29 +7233,65 @@ msgid "" "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 " @@ -6931,34 +7299,16 @@ msgid "" "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" @@ -7369,7 +7719,7 @@ msgstr "Podgląd komentarza" #: rhodecode/templates/changeset/changeset_file_comment.html:293 #: rhodecode/templates/compare/compare_diff.html:57 #: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 msgid "Comment" msgstr "Komentarz" @@ -7523,17 +7873,17 @@ msgid "Compare Commits" msgstr "" #: rhodecode/templates/compare/compare_diff.html:46 -#: rhodecode/templates/email_templates/pull_request_review.mako:50 +#: rhodecode/templates/email_templates/pull_request_review.mako:74 #: rhodecode/templates/files/file_diff.html:56 #: rhodecode/templates/pullrequests/pullrequest_show.html:85 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.html:47 -#: rhodecode/templates/email_templates/pull_request_comment.mako:92 -#: rhodecode/templates/email_templates/pull_request_review.mako:49 +#: 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 "Źródło" @@ -7715,17 +8065,17 @@ msgstr "" msgid "Form vertical" msgstr "" -#: rhodecode/templates/email_templates/base.mako:7 +#: rhodecode/templates/email_templates/base.mako:32 #, python-format msgid "This is a notification from RhodeCode. %(instance_url)s" msgstr "" -#: rhodecode/templates/email_templates/base.mako:90 +#: rhodecode/templates/email_templates/base.mako:115 msgid "RhodeCode" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:16 -#: rhodecode/templates/email_templates/pull_request_comment.mako:17 +#: rhodecode/templates/email_templates/pull_request_comment.mako:18 msgid "[mention]" msgstr "" @@ -7754,12 +8104,12 @@ msgid "%(user)s commented on commit `%(c msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:43 -#: rhodecode/templates/email_templates/pull_request_comment.mako:43 +#: rhodecode/templates/email_templates/pull_request_comment.mako:44 msgid "Comment link" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:48 -#: rhodecode/templates/email_templates/pull_request_comment.mako:48 +#: rhodecode/templates/email_templates/pull_request_comment.mako:49 #, python-format msgid "File: %(comment_file)s on line %(comment_line)s" msgstr "" @@ -7788,7 +8138,7 @@ msgid "The commit status was changed to" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 #, python-format msgid "Comment on line: %(comment_line)s" msgstr "" @@ -7797,75 +8147,79 @@ msgstr "" msgid "Generate new password here" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:20 +#: rhodecode/templates/email_templates/pull_request_comment.mako:21 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: " "`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:23 +#: rhodecode/templates/email_templates/pull_request_comment.mako:24 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: " "%(status)s)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:25 -#: rhodecode/templates/email_templates/pull_request_comment.mako:82 +#: rhodecode/templates/email_templates/pull_request_comment.mako:26 +#: rhodecode/templates/email_templates/pull_request_comment.mako:83 #, python-format msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:45 +#: rhodecode/templates/email_templates/pull_request_comment.mako:46 msgid "Source repository" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:54 +#: rhodecode/templates/email_templates/pull_request_comment.mako:55 #, python-format msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:56 +#: rhodecode/templates/email_templates/pull_request_comment.mako:57 #, python-format msgid "" "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:80 +#: rhodecode/templates/email_templates/pull_request_comment.mako:81 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" " "(file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:86 +#: rhodecode/templates/email_templates/pull_request_comment.mako:87 #, python-format msgid "submitted pull request status: %(status)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:88 +#: rhodecode/templates/email_templates/pull_request_comment.mako:89 #, python-format msgid "submitted pull request status: %(status)s and closed" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:5 -#, python-format -msgid "%(user)s wants you to review pull request #%(pr_url)s: \"%(pr_title)s\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_review.mako:17 +#: rhodecode/templates/email_templates/pull_request_comment.mako:95 +msgid "Submitted status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:14 +#, python-format +msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:34 #, python-format msgid "" "Pull request from %(source_ref_type)s:%(source_ref_name)s of %(repo_url)s " "into %(target_ref_type)s:%(target_ref_name)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:26 +#: rhodecode/templates/email_templates/pull_request_review.mako:37 msgid "Link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:35 +#: rhodecode/templates/email_templates/pull_request_review.mako:46 #, python-format msgid "Commit (%(num)s)" msgid_plural "Commits (%(num)s)" @@ -7873,22 +8227,22 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: rhodecode/templates/email_templates/pull_request_review.mako:47 +#: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"." msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:49 +#: rhodecode/templates/email_templates/pull_request_review.mako:73 #, python-format msgid "%(source_ref_type)s of %(source_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:50 +#: rhodecode/templates/email_templates/pull_request_review.mako:74 #, python-format msgid "%(target_ref_type)s of %(target_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:52 +#: rhodecode/templates/email_templates/pull_request_review.mako:76 #: rhodecode/templates/summary/components.html:95 #: rhodecode/templates/summary/components.html:98 #, python-format @@ -8131,13 +8485,13 @@ msgid "Delete file" msgstr "Usuń plik" #: 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 "Plik binarny (%s)" #: 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 "Plik jest za duży do wyświetlenia" @@ -8208,44 +8562,44 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: rhodecode/templates/files/files_source.html:12 +#: rhodecode/templates/files/files_source.html:13 msgid "History" msgstr "Historia" -#: 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 "Pobierz" -#: 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 "Edycja plików binarnych jest zabroniona" -#: rhodecode/templates/files/files_source.html:39 +#: rhodecode/templates/files/files_source.html:40 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.html:40 +#: rhodecode/templates/files/files_source.html:41 msgid "Deleting files allowed only when on branch head commit" msgstr "" diff --git a/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2016-08-02 20:55+0000\n" -"PO-Revision-Date: 2016-08-02 20:57+0000\n" +"POT-Creation-Date: 2016-09-15 14:11+0000\n" +"PO-Revision-Date: 2016-09-15 14:12+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Portuguese (http://www.transifex.com/rhodecode/RhodeCode/language/pt/)\n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\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 "" @@ -44,7 +44,8 @@ msgstr "" msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:80 rhodecode/templates/register.html:76 +#: 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 #: rhodecode/templates/admin/users/user_add.html:86 @@ -64,12 +65,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" @@ -92,9 +99,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 "Habilitado" @@ -397,12 +404,12 @@ msgstr "" #: rhodecode/controllers/changeset.py:335 #: rhodecode/controllers/pullrequests.py:750 -#: rhodecode/model/pull_request.py:843 +#: rhodecode/model/pull_request.py:842 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" -#: rhodecode/controllers/changeset.py:372 +#: rhodecode/controllers/changeset.py:373 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" @@ -545,14 +552,14 @@ msgstr "" msgid "Changesets" msgstr "Conjuntos de mudanças" -#: 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 "Ramos" #: 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 "Etiquetas" @@ -658,30 +665,30 @@ msgid "Close Pull Request" msgstr "" #: rhodecode/controllers/pullrequests.py:754 -#: rhodecode/model/pull_request.py:847 +#: rhodecode/model/pull_request.py:846 msgid "Closing with" msgstr "Fechando com" -#: rhodecode/controllers/pullrequests.py:802 +#: rhodecode/controllers/pullrequests.py:804 #, python-format msgid "" "Closing pull request on other statuses than rejected or approved is " "forbidden. Calculated status from all reviewers is currently: %s" msgstr "" -#: rhodecode/controllers/summary.py:235 +#: rhodecode/controllers/summary.py:243 msgid "Branch" msgstr "Ramo" -#: 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 "" @@ -694,37 +701,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 "para sempre" #: 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 "cinco minutos" #: 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 "uma hora" #: 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 "um dia" #: 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 "um mês" #: 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 "" @@ -778,60 +785,61 @@ msgstr "nunca" 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 "Você não pode editar esse usuário pois ele é crucial para toda a aplicação" -#: rhodecode/controllers/admin/my_account.py:128 +#: rhodecode/controllers/admin/my_account.py:132 msgid "Your account was updated successfully" msgstr "Sua conta foi atualizada com sucesso" -#: 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 "Ocorreu um erro durante a atualização do usuário %s" -#: 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 "Ocorreu um erro durante o salvamento do email" -#: 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 "" @@ -1051,18 +1059,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 "" @@ -1071,86 +1079,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 "Configurações de VCS atualizadas" -#: 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 "Ocorreu um erro durante a atualização das configurações da aplicação" -#: rhodecode/controllers/admin/settings.py:211 +#: rhodecode/controllers/admin/settings.py:214 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "Repositórios varridos com sucesso adicionados: %s ; removidos: %s" -#: rhodecode/controllers/admin/settings.py:263 +#: rhodecode/controllers/admin/settings.py:266 msgid "Updated application settings" msgstr "Configurações da aplicação atualizadas" -#: rhodecode/controllers/admin/settings.py:327 +#: rhodecode/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "Configurações de visualização atualizadas" -#: rhodecode/controllers/admin/settings.py:330 +#: rhodecode/controllers/admin/settings.py:333 msgid "Error occurred during updating visualisation settings" msgstr "Ocorreu um erro durante a atualização das configurações de visualização" -#: rhodecode/controllers/admin/settings.py: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 "Adicionado novo gancho" -#: rhodecode/controllers/admin/settings.py:488 +#: rhodecode/controllers/admin/settings.py:491 msgid "Updated hooks" msgstr "Atualizados os ganchos" -#: rhodecode/controllers/admin/settings.py:492 +#: rhodecode/controllers/admin/settings.py:495 msgid "Error occurred during hook creation" msgstr "Ocorreu um erro durante a criação do hook" -#: 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" @@ -1333,38 +1325,50 @@ 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:193 +#: rhodecode/events/repo.py:199 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:202 +#: rhodecode/events/repo.py:208 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:211 +#: rhodecode/events/repo.py:217 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:222 +#: rhodecode/events/repo.py:228 msgid "repository push" msgstr "" +#: rhodecode/events/repo_group.py:62 +msgid "repository group created" +msgstr "" + +#: rhodecode/events/repo_group.py:71 +msgid "repository group deleted" +msgstr "" + +#: rhodecode/events/repo_group.py:80 +msgid "repository group update" +msgstr "" + #: rhodecode/events/user.py:34 msgid "user registered" msgstr "" @@ -1377,42 +1381,202 @@ 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 "Limpar" + +#: 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 "Excluir" + +#: 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:214 +msgid "Recipients" +msgstr "" + +#: rhodecode/integrations/types/email.py:215 +msgid "Email addresses to send push events to" +msgstr "" + +#: 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 "Red" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:45 +msgid "Green" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:46 +msgid "Purple" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:47 +msgid "Gray" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:52 +msgid "Hipchat server URL" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:53 +msgid "Hipchat integration url." +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:63 +msgid "Notify" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:64 +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 "Background color of message." +msgstr "" + +#: 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 @@ -1428,35 +1592,40 @@ msgstr "" msgid "Username" msgstr "Nome de usuário" -#: 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 "" @@ -1468,10 +1637,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 "repositório [excluído]" @@ -1595,80 +1768,80 @@ msgstr "Tag criada: %s" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1180 +#: rhodecode/lib/auth.py:1185 #, python-format msgid "IP %s not allowed" msgstr "IP %s não permitido" -#: rhodecode/lib/auth.py:1254 +#: rhodecode/lib/auth.py:1259 msgid "You need to be a registered user to perform this action" msgstr "Você precisa ser um usuário registrado para realizar essa ação" -#: rhodecode/lib/auth.py: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:545 +#: 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 "Arquivo binário" -#: 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 "Conjunto de mudanças é grande demais e foi cortado, use o menu de diferenças para ver as diferenças" -#: rhodecode/lib/diffs.py:102 +#: rhodecode/lib/diffs.py:109 msgid "No changes detected" msgstr "Nenhuma alteração detectada" -#: rhodecode/lib/diffs.py:631 +#: rhodecode/lib/diffs.py:643 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1481 +#: rhodecode/lib/helpers.py:1489 #, python-format msgid " and %s more" msgstr " e mais %s" -#: rhodecode/lib/helpers.py:1485 +#: rhodecode/lib/helpers.py:1493 msgid "No Files" msgstr "Nenhum Arquivo" -#: rhodecode/lib/helpers.py:1558 +#: rhodecode/lib/helpers.py:1566 msgid "new file" msgstr "novo arquivo" -#: rhodecode/lib/helpers.py:1561 +#: rhodecode/lib/helpers.py:1569 msgid "mod" msgstr "mod" -#: rhodecode/lib/helpers.py:1564 +#: rhodecode/lib/helpers.py:1572 msgid "del" msgstr "excluir" -#: rhodecode/lib/helpers.py:1567 +#: rhodecode/lib/helpers.py:1575 msgid "rename" msgstr "renomear" -#: rhodecode/lib/helpers.py:1572 +#: rhodecode/lib/helpers.py:1580 msgid "chmod" msgstr "chmod" -#: rhodecode/lib/helpers.py:1819 +#: rhodecode/lib/helpers.py:1827 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -1687,91 +1860,91 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1839 +#: 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 "O repositório %s não está mapeado ao BD. Talvez ele tenha sido criado ou renomeado a partir do sistema de arquivos. Por favor, execute a aplicação outra vez para varrer novamente por repositórios" -#: rhodecode/lib/utils2.py:454 +#: rhodecode/lib/utils2.py:463 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d ano" msgstr[1] "%d anos" -#: rhodecode/lib/utils2.py:455 +#: rhodecode/lib/utils2.py:464 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mês" msgstr[1] "%d meses" -#: rhodecode/lib/utils2.py:456 +#: rhodecode/lib/utils2.py:465 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: rhodecode/lib/utils2.py:457 +#: rhodecode/lib/utils2.py:466 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: rhodecode/lib/utils2.py:458 +#: rhodecode/lib/utils2.py:467 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: rhodecode/lib/utils2.py:459 +#: rhodecode/lib/utils2.py:468 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: rhodecode/lib/utils2.py:477 +#: rhodecode/lib/utils2.py:486 #, python-format msgid "in %s" msgstr "em %s" -#: rhodecode/lib/utils2.py:483 +#: rhodecode/lib/utils2.py:492 #, python-format msgid "%s ago" msgstr "%s atrás" -#: 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 "%s e %s atrás" -#: rhodecode/lib/utils2.py:501 +#: rhodecode/lib/utils2.py:510 #, python-format msgid "in %s and %s" msgstr "em %s e %s" -#: 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" @@ -1801,7 +1974,9 @@ msgstr "agora há pouco" #: 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_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 "Nenhum acesso ao repositório" @@ -1829,7 +2004,9 @@ msgstr "Nenhum acesso ao repositório" #: 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_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 "Acesso de leitura ao repositório" @@ -1857,7 +2034,9 @@ msgstr "Acesso de leitura ao repositório" #: 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_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 "Acesso de escrita ao repositório" @@ -1885,7 +2064,9 @@ msgstr "Acesso de escrita ao repositório" #: 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_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 "Acesso administrativo ao repositório" @@ -1953,7 +2134,9 @@ msgstr "Administrador do RhodeCode" #: 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_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 "Criação de repositórios desabilitada" @@ -1981,7 +2164,9 @@ msgstr "Criação de repositórios desabilitada" #: 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_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 "Criação de repositórios habilitada" @@ -2009,7 +2194,9 @@ msgstr "Criação de repositórios habilitada" #: 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_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 "Bifurcação de repositórios desabilitada" @@ -2037,7 +2224,9 @@ msgstr "Bifurcação de repositórios desabilitada" #: 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_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 "Bifurcação de repositórios habilitada" @@ -2086,7 +2275,9 @@ msgstr "Registro de novo usuário no RhodeCode com auto-ativação" #: 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:2944 +#: 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 "Não Revisado" @@ -2114,7 +2305,9 @@ msgstr "Não Revisado" #: 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:2945 +#: 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 "Aprovado" @@ -2142,7 +2335,9 @@ msgstr "Aprovado" #: 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:2946 +#: 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 "Rejeitado" @@ -2170,7 +2365,9 @@ msgstr "Rejeitado" #: 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:2947 +#: 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 "Sob Revisão" @@ -2195,7 +2392,9 @@ msgstr "Sob Revisão" #: 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_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 "Sem acesso ao grupo de repositórios" @@ -2220,7 +2419,9 @@ msgstr "Sem acesso ao grupo de repositórios" #: 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_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 "Acesso de leitura ao grupo de repositórios" @@ -2245,7 +2446,9 @@ msgstr "Acesso de leitura ao grupo de repositórios" #: 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_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 "Acesso de escrita ao grupo de repositórios" @@ -2270,7 +2473,9 @@ msgstr "Acesso de escrita ao grupo de repositórios" #: 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_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 "Acesso administrativo ao grupo de repositórios" @@ -2294,7 +2499,9 @@ msgstr "Acesso administrativo ao grupo de repositórios" #: 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_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 "Sem acesso ao grupo de usuários" @@ -2318,7 +2525,9 @@ msgstr "Sem acesso ao grupo de usuários" #: 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_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 "Acesso de leitura ao grupo de usuários" @@ -2342,7 +2551,9 @@ msgstr "Acesso de leitura ao grupo de usuários" #: 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_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 "Acesso de escrita ao grupo de usuários" @@ -2366,7 +2577,9 @@ msgstr "Acesso de escrita ao grupo de usuários" #: 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_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 "Acesso administrativo ao grupo de usuários" @@ -2390,7 +2603,9 @@ msgstr "Acesso administrativo ao grupo de usuários" #: 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_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 "Criação de Grupo de Repositórios desatilibada" @@ -2414,7 +2629,9 @@ msgstr "Criação de Grupo de Repositórios desatilibada" #: 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_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 "Criação de Grupo de Repositórios habilitada" @@ -2438,7 +2655,9 @@ msgstr "Criação de Grupo de Repositórios habilitada" #: 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_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 "Criação de Grupo de Usuários desabilitada" @@ -2462,7 +2681,9 @@ msgstr "Criação de Grupo de Usuários desabilitada" #: 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_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 "Criação de Grupo de Usuários habilitada" @@ -2486,7 +2707,9 @@ msgstr "Criação de Grupo de Usuários habilitada" #: 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_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 "Registro desatilitado" @@ -2510,7 +2733,9 @@ msgstr "Registro desatilitado" #: 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_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 "Registro de Usuário com ativação manual de conta" @@ -2534,7 +2759,9 @@ msgstr "Registro de Usuário com ativação manual de conta" #: 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_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 "Registro de Usuário com ativação automática de conta" @@ -2558,7 +2785,9 @@ msgstr "Registro de Usuário com ativação automática de conta" #: 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_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 "Ativação manual de conta externa" @@ -2582,7 +2811,9 @@ msgstr "Ativação manual de conta externa" #: 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_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 "Ativação automática de conta externa" @@ -2600,7 +2831,9 @@ msgstr "Ativação automática de conta externa" #: 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_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 "" @@ -2619,7 +2852,9 @@ msgstr "" #: 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_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 "" @@ -2635,7 +2870,9 @@ msgstr "" #: 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_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 "" @@ -2648,7 +2885,9 @@ msgstr "" #: 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_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 "" @@ -2661,32 +2900,46 @@ msgstr "" #: 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_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_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 "" @@ -2740,12 +2993,12 @@ msgid "" "email" msgstr "" -#: rhodecode/model/comment.py:263 +#: rhodecode/model/comment.py:266 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:264 -msgid "Refresh page" +#: rhodecode/model/comment.py:267 +msgid "Show it now" msgstr "" #: rhodecode/model/forms.py:85 @@ -2876,7 +3129,7 @@ msgid "" " %(pr_title)s" msgstr "" -#: rhodecode/model/pull_request.py:449 +#: rhodecode/model/pull_request.py:448 msgid "Pull request merged and closed" msgstr "" @@ -2920,7 +3173,7 @@ msgstr "tip mais recente" msgid "You can't Edit this user since it's crucial for entire application" msgstr "Você não pode Editar esse usuário, pois ele é crucial para toda a aplicação" -#: rhodecode/model/user.py:285 +#: rhodecode/model/user.py:284 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " @@ -3174,6 +3427,56 @@ 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 @@ -3344,19 +3647,19 @@ 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 "Adicionar outro comentário" #: 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}) ..." @@ -3364,13 +3667,13 @@ 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 "Enviando..." #: 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 "Carregando..." @@ -3530,6 +3833,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 "Painel de Controle" @@ -3578,6 +3897,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 @@ -3597,7 +3917,6 @@ msgstr "Nome" #: 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 @@ -3614,8 +3933,8 @@ msgstr "Nome" #: rhodecode/templates/changeset/changeset.html:53 #: rhodecode/templates/compare/compare_commits.html:24 #: rhodecode/templates/email_templates/commit_comment.mako:82 -#: rhodecode/templates/email_templates/pull_request_review.mako:30 -#: rhodecode/templates/email_templates/pull_request_review.mako:51 +#: rhodecode/templates/email_templates/pull_request_review.mako:41 +#: rhodecode/templates/email_templates/pull_request_review.mako:75 #: rhodecode/templates/files/file_tree_detail.html:5 #: rhodecode/templates/files/file_tree_detail.html:12 #: rhodecode/templates/forks/fork.html:48 @@ -3829,9 +4148,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 @@ -3881,7 +4204,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 @@ -3918,7 +4240,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" @@ -4063,7 +4385,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 @@ -4116,75 +4438,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 "Limpar" - #: rhodecode/templates/admin/gists/show.html:13 #: rhodecode/templates/admin/gists/show.html:20 msgid "Gist" msgstr "Gist" #: 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 "Excluir" - -#: 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 @@ -4196,8 +4460,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 @@ -4218,17 +4482,27 @@ msgstr "criado" #: 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 "Mostrar original" -#: rhodecode/templates/admin/integrations/base.html:12 -msgid "Integrations settings" -msgstr "" - -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/base.html:14 +msgid "Integrations Settings" +msgstr "" + +#: 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 @@ -4238,27 +4512,101 @@ msgstr "" msgid "Settings" msgstr "Configurações" -#: rhodecode/templates/admin/integrations/edit.html:36 -#, python-format -msgid "Create new %(integration_type)s integration" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:31 +#: rhodecode/templates/admin/integrations/form.html:60 +#, python-format +msgid "Create New %(integration_type)s Integration" +msgstr "" + +#: 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:64 +#: rhodecode/templates/admin/notifications/notifications.html:31 +msgid "All" +msgstr "Todos" + +#: 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:56 -msgid "Current integrations" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:65 +#: 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" @@ -4278,7 +4626,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 "" @@ -4396,36 +4744,18 @@ msgstr "" msgid "New email address" msgstr "Novo endereço de email" -#: 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 "Notificações" - -#: rhodecode/templates/admin/my_account/my_account_notifications.html:14 -msgid "Disabled" -msgstr "Desabilitado" +#: 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 @@ -4465,27 +4795,28 @@ 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:28 -#: rhodecode/templates/email_templates/pull_request_review.mako:48 +#: rhodecode/templates/email_templates/pull_request_review.mako:39 +#: rhodecode/templates/email_templates/pull_request_review.mako:72 #: rhodecode/templates/pullrequests/pullrequest.html:38 #: rhodecode/templates/pullrequests/pullrequests.html:104 msgid "Title" msgstr "Título" #: 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 @@ -4493,7 +4824,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 @@ -4501,19 +4832,19 @@ msgstr "" msgid "Closed" msgstr "Fechado" -#: 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 "Confirme para excluir este pull request" -#: 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 "" @@ -4531,10 +4862,6 @@ msgstr "" msgid "My Notifications" msgstr "Minhas Notificações" -#: rhodecode/templates/admin/notifications/notifications.html:31 -msgid "All" -msgstr "Todos" - #: rhodecode/templates/admin/notifications/notifications.html:32 #: rhodecode/templates/changeset/changeset.html:140 #: rhodecode/templates/pullrequests/pullrequest_show.html:133 @@ -4554,12 +4881,16 @@ msgstr "Ainda não há notificações aqui" msgid "Show notification" msgstr "Mostrar notificação" +#: rhodecode/templates/admin/notifications/show_notification.html:12 +msgid "Notifications" +msgstr "Notificações" + #: 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 @@ -4672,12 +5003,6 @@ msgstr "Todas as permissões padrão em cada repositório serão modificadas para a permissão escolhida, note que todas as permissões padrão customizadas nos repositórios serão perdidas" 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 " @@ -4740,7 +5065,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 @@ -5009,7 +5334,6 @@ msgid "Statistics" msgstr "Estatísticas" #: rhodecode/templates/admin/repos/repo_edit_advanced.html:7 -#: rhodecode/templates/pullrequests/pullrequests.html:108 msgid "Updated on" msgstr "" @@ -5412,7 +5736,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" @@ -5629,6 +5953,10 @@ msgstr "Ganchos customizados" 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 "" @@ -6364,6 +6692,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 "" @@ -6394,7 +6726,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 "" @@ -6778,7 +7110,7 @@ msgstr "Criar grupos de usuários" 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 "" @@ -6880,29 +7212,65 @@ msgid "" "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 " @@ -6910,34 +7278,16 @@ msgid "" "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" @@ -7345,7 +7695,7 @@ msgstr "Visualizar comentário" #: rhodecode/templates/changeset/changeset_file_comment.html:293 #: rhodecode/templates/compare/compare_diff.html:57 #: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 msgid "Comment" msgstr "Comentário" @@ -7493,17 +7843,17 @@ msgid "Compare Commits" msgstr "" #: rhodecode/templates/compare/compare_diff.html:46 -#: rhodecode/templates/email_templates/pull_request_review.mako:50 +#: rhodecode/templates/email_templates/pull_request_review.mako:74 #: rhodecode/templates/files/file_diff.html:56 #: rhodecode/templates/pullrequests/pullrequest_show.html:85 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.html:47 -#: rhodecode/templates/email_templates/pull_request_comment.mako:92 -#: rhodecode/templates/email_templates/pull_request_review.mako:49 +#: 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 "" @@ -7684,17 +8034,17 @@ msgstr "" msgid "Form vertical" msgstr "" -#: rhodecode/templates/email_templates/base.mako:7 +#: rhodecode/templates/email_templates/base.mako:32 #, python-format msgid "This is a notification from RhodeCode. %(instance_url)s" msgstr "" -#: rhodecode/templates/email_templates/base.mako:90 +#: rhodecode/templates/email_templates/base.mako:115 msgid "RhodeCode" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:16 -#: rhodecode/templates/email_templates/pull_request_comment.mako:17 +#: rhodecode/templates/email_templates/pull_request_comment.mako:18 msgid "[mention]" msgstr "" @@ -7723,12 +8073,12 @@ msgid "%(user)s commented on commit `%(c msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:43 -#: rhodecode/templates/email_templates/pull_request_comment.mako:43 +#: rhodecode/templates/email_templates/pull_request_comment.mako:44 msgid "Comment link" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:48 -#: rhodecode/templates/email_templates/pull_request_comment.mako:48 +#: rhodecode/templates/email_templates/pull_request_comment.mako:49 #, python-format msgid "File: %(comment_file)s on line %(comment_line)s" msgstr "" @@ -7757,7 +8107,7 @@ msgid "The commit status was changed to" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 #, python-format msgid "Comment on line: %(comment_line)s" msgstr "" @@ -7766,97 +8116,101 @@ msgstr "" msgid "Generate new password here" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:20 +#: rhodecode/templates/email_templates/pull_request_comment.mako:21 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: " "`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:23 +#: rhodecode/templates/email_templates/pull_request_comment.mako:24 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: " "%(status)s)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:25 -#: rhodecode/templates/email_templates/pull_request_comment.mako:82 +#: rhodecode/templates/email_templates/pull_request_comment.mako:26 +#: rhodecode/templates/email_templates/pull_request_comment.mako:83 #, python-format msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:45 +#: rhodecode/templates/email_templates/pull_request_comment.mako:46 msgid "Source repository" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:54 +#: rhodecode/templates/email_templates/pull_request_comment.mako:55 #, python-format msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:56 +#: rhodecode/templates/email_templates/pull_request_comment.mako:57 #, python-format msgid "" "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:80 +#: rhodecode/templates/email_templates/pull_request_comment.mako:81 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" " "(file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:86 +#: rhodecode/templates/email_templates/pull_request_comment.mako:87 #, python-format msgid "submitted pull request status: %(status)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:88 +#: rhodecode/templates/email_templates/pull_request_comment.mako:89 #, python-format msgid "submitted pull request status: %(status)s and closed" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:5 -#, python-format -msgid "%(user)s wants you to review pull request #%(pr_url)s: \"%(pr_title)s\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_review.mako:17 +#: rhodecode/templates/email_templates/pull_request_comment.mako:95 +msgid "Submitted status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:14 +#, python-format +msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:34 #, python-format msgid "" "Pull request from %(source_ref_type)s:%(source_ref_name)s of %(repo_url)s " "into %(target_ref_type)s:%(target_ref_name)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:26 +#: rhodecode/templates/email_templates/pull_request_review.mako:37 msgid "Link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:35 +#: rhodecode/templates/email_templates/pull_request_review.mako:46 #, python-format msgid "Commit (%(num)s)" msgid_plural "Commits (%(num)s)" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/email_templates/pull_request_review.mako:47 +#: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"." msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:49 +#: rhodecode/templates/email_templates/pull_request_review.mako:73 #, python-format msgid "%(source_ref_type)s of %(source_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:50 +#: rhodecode/templates/email_templates/pull_request_review.mako:74 #, python-format msgid "%(target_ref_type)s of %(target_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:52 +#: rhodecode/templates/email_templates/pull_request_review.mako:76 #: rhodecode/templates/summary/components.html:95 #: rhodecode/templates/summary/components.html:98 #, python-format @@ -8097,13 +8451,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 "Arquivo binário (%s)" #: 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 "Arquivo é grande demais para exibir" @@ -8173,44 +8527,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 "Download" -#: 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 "" diff --git a/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po @@ -27,8 +27,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2016-08-02 20:55+0000\n" -"PO-Revision-Date: 2016-08-02 20:57+0000\n" +"POT-Creation-Date: 2016-09-15 14:11+0000\n" +"PO-Revision-Date: 2016-09-15 14:12+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Russian (http://www.transifex.com/rhodecode/RhodeCode/language/ru/)\n" "MIME-Version: 1.0\n" @@ -39,7 +39,7 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" #: rhodecode/admin/navigation.py: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 "" @@ -62,7 +62,8 @@ msgstr "" msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:80 rhodecode/templates/register.html:76 +#: 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 #: rhodecode/templates/admin/users/user_add.html:86 @@ -82,12 +83,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" @@ -110,9 +117,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 "Включено" @@ -415,12 +422,12 @@ msgstr "" #: rhodecode/controllers/changeset.py:335 #: rhodecode/controllers/pullrequests.py:750 -#: rhodecode/model/pull_request.py:843 +#: rhodecode/model/pull_request.py:842 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "Изменить статус %(transition_icon)s %(status)s" -#: rhodecode/controllers/changeset.py:372 +#: rhodecode/controllers/changeset.py:373 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" @@ -563,14 +570,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 "Метки" @@ -676,30 +683,30 @@ msgid "Close Pull Request" msgstr "" #: rhodecode/controllers/pullrequests.py:754 -#: rhodecode/model/pull_request.py:847 +#: rhodecode/model/pull_request.py:846 msgid "Closing with" msgstr "Закрытый с" -#: rhodecode/controllers/pullrequests.py:802 +#: rhodecode/controllers/pullrequests.py:804 #, python-format msgid "" "Closing pull request on other statuses than rejected or approved is " "forbidden. Calculated status from all reviewers is currently: %s" msgstr "" -#: rhodecode/controllers/summary.py: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 "" @@ -712,37 +719,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 "5 минут" #: 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 "1 час" #: 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 "1 день" #: 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 "1 месяц" #: 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 "Срок" @@ -796,60 +803,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 "Произошла ошибка при обновлении пользователя %s" -#: 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 "Произошла ошибка при сохранении E-mail" -#: 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 "" @@ -1073,18 +1081,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 "" @@ -1093,86 +1101,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 "Обновлены настройки VCS" -#: 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 "Репозитории успешно пересканированы, добавлено: %s ; удалено: %s" -#: rhodecode/controllers/admin/settings.py:263 +#: rhodecode/controllers/admin/settings.py:266 msgid "Updated application settings" msgstr "Обновленные параметры настройки приложения" -#: rhodecode/controllers/admin/settings.py:327 +#: rhodecode/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "Настройки визуализации обновлены" -#: rhodecode/controllers/admin/settings.py:330 +#: 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 "Задача отправки Email создана" -#: 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" @@ -1355,38 +1347,50 @@ 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:193 +#: rhodecode/events/repo.py:199 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:202 +#: rhodecode/events/repo.py:208 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:211 +#: rhodecode/events/repo.py:217 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:222 +#: rhodecode/events/repo.py:228 msgid "repository push" msgstr "" +#: rhodecode/events/repo_group.py:62 +msgid "repository group created" +msgstr "" + +#: rhodecode/events/repo_group.py:71 +msgid "repository group deleted" +msgstr "" + +#: rhodecode/events/repo_group.py:80 +msgid "repository group update" +msgstr "" + #: rhodecode/events/user.py:34 msgid "user registered" msgstr "" @@ -1399,42 +1403,202 @@ 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:214 +msgid "Recipients" +msgstr "" + +#: rhodecode/integrations/types/email.py:215 +msgid "Email addresses to send push events to" +msgstr "" + +#: rhodecode/integrations/types/email.py:220 +#: rhodecode/integrations/types/email.py:221 +msgid "Email address" +msgstr "Адрес E-mail" + +#: 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 "Red" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:45 +msgid "Green" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:46 +msgid "Purple" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:47 +msgid "Gray" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:52 +msgid "Hipchat server URL" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:53 +msgid "Hipchat integration url." +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:63 +msgid "Notify" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:64 +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 "Background color of message." +msgstr "" + +#: 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 @@ -1450,35 +1614,40 @@ 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 "" @@ -1490,10 +1659,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 "[удален] репозиторий" @@ -1617,80 +1790,80 @@ msgstr "Создан тег: %s" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1180 +#: rhodecode/lib/auth.py:1185 #, python-format msgid "IP %s not allowed" msgstr "IP %s заблокирован" -#: 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:545 +#: 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:1481 +#: rhodecode/lib/helpers.py:1489 #, python-format msgid " and %s more" msgstr "и на %s больше" -#: rhodecode/lib/helpers.py:1485 +#: rhodecode/lib/helpers.py:1493 msgid "No Files" msgstr "Файлов нет" -#: rhodecode/lib/helpers.py:1558 +#: rhodecode/lib/helpers.py:1566 msgid "new file" msgstr "новый файл" -#: rhodecode/lib/helpers.py:1561 +#: rhodecode/lib/helpers.py:1569 msgid "mod" msgstr "изменить" -#: rhodecode/lib/helpers.py:1564 +#: rhodecode/lib/helpers.py:1572 msgid "del" msgstr "удалить" -#: rhodecode/lib/helpers.py:1567 +#: rhodecode/lib/helpers.py:1575 msgid "rename" msgstr "переименовать" -#: rhodecode/lib/helpers.py:1572 +#: rhodecode/lib/helpers.py:1580 msgid "chmod" msgstr "chmod" -#: rhodecode/lib/helpers.py:1819 +#: rhodecode/lib/helpers.py:1827 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -1709,14 +1882,14 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1839 +#: 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 "Репозиторий %s отсутствует в базе данных; возможно, он был создан или переименован из файловой системы. Пожалуйста, перезапустите приложение для сканирования репозиториев." -#: rhodecode/lib/utils2.py:454 +#: rhodecode/lib/utils2.py:463 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1725,7 +1898,7 @@ msgstr[1] "%d лет" msgstr[2] "%d года" msgstr[3] "%d года" -#: rhodecode/lib/utils2.py:455 +#: rhodecode/lib/utils2.py:464 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1734,7 +1907,7 @@ msgstr[1] "%d месяца" msgstr[2] "%d месяцев" msgstr[3] "%d месяцев" -#: rhodecode/lib/utils2.py:456 +#: rhodecode/lib/utils2.py:465 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1743,7 +1916,7 @@ msgstr[1] "%d дня" msgstr[2] "%d дней" msgstr[3] "%d дней" -#: rhodecode/lib/utils2.py:457 +#: rhodecode/lib/utils2.py:466 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1752,7 +1925,7 @@ msgstr[1] "%d часов" msgstr[2] "%d часа" msgstr[3] "%d часа" -#: rhodecode/lib/utils2.py:458 +#: rhodecode/lib/utils2.py:467 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1761,7 +1934,7 @@ msgstr[1] "%d минут" msgstr[2] "%d минуты" msgstr[3] "%d минуты" -#: rhodecode/lib/utils2.py:459 +#: rhodecode/lib/utils2.py:468 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1770,42 +1943,42 @@ msgstr[1] "%d секунды" msgstr[2] "%d секунды" msgstr[3] "%d секунды" -#: rhodecode/lib/utils2.py:477 +#: rhodecode/lib/utils2.py:486 #, python-format msgid "in %s" msgstr "в %s" -#: rhodecode/lib/utils2.py:483 +#: rhodecode/lib/utils2.py:492 #, python-format msgid "%s ago" msgstr "%s назад" -#: 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 "%s и %s назад" -#: rhodecode/lib/utils2.py:501 +#: rhodecode/lib/utils2.py:510 #, python-format msgid "in %s and %s" msgstr "в %s и %s" -#: 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" @@ -1835,7 +2008,9 @@ msgstr "прямо сейчас" #: 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_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 "Репозитарий - нет доступа" @@ -1863,7 +2038,9 @@ msgstr "Репозитарий - нет доступа" #: 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_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 "Репозитарий - доступ на чтение" @@ -1891,7 +2068,9 @@ msgstr "Репозитарий - доступ на чтение" #: 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_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 "Репозитарий - доступ на запись" @@ -1919,7 +2098,9 @@ msgstr "Репозитарий - доступ на запись" #: 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_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 "Репозитарий - администрирование" @@ -1987,7 +2168,9 @@ msgstr "Администратор RhodeCode " #: 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_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 "Создание репозиториев отключено" @@ -2015,7 +2198,9 @@ msgstr "Создание репозиториев отключено" #: 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_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 +2228,9 @@ msgstr "Создание репозиториев включено" #: 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_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 "Возможность создавать форк репозитория отключена" @@ -2071,7 +2258,9 @@ msgstr "Возможность создавать форк репозитория отключена" #: 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_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 "Возможность создавать форк репозитория включена" @@ -2120,7 +2309,9 @@ msgstr "Регистрация нового пользователя в RhodeCode с автоматической активацией" #: 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:2944 +#: 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 "Не просмотрено" @@ -2148,7 +2339,9 @@ msgstr "Не просмотрено" #: 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:2945 +#: 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 "Одобрено" @@ -2176,7 +2369,9 @@ msgstr "Одобрено" #: 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:2946 +#: 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 "Отклонено" @@ -2204,7 +2399,9 @@ msgstr "Отклонено" #: 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:2947 +#: 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 "На рассмотрении" @@ -2229,7 +2426,9 @@ msgstr "На рассмотрении" #: 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_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 "Группа репозиториев - нет доступа" @@ -2254,7 +2453,9 @@ msgstr "Группа репозиториев - нет доступа" #: 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_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 "Группа репозиториев - доступ на чтение" @@ -2279,7 +2480,9 @@ msgstr "Группа репозиториев - доступ на чтение" #: 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_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 "Группа репозиториев - доступ на запись" @@ -2304,7 +2507,9 @@ msgstr "Группа репозиториев - доступ на запись" #: 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_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 "Группа репозиториев - администрирование" @@ -2328,7 +2533,9 @@ msgstr "Группа репозиториев - администрирование" #: 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_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 "Группа пользователей - нет доступа" @@ -2352,7 +2559,9 @@ msgstr "Группа пользователей - нет доступа" #: 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_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 "Группа пользователей - доступ на чтение" @@ -2376,7 +2585,9 @@ msgstr "Группа пользователей - доступ на чтение" #: 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_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 "Группа пользователей - доступ на запись" @@ -2400,7 +2611,9 @@ msgstr "Группа пользователей - доступ на запись" #: 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_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 "Группа пользователей - администрирование" @@ -2424,7 +2637,9 @@ msgstr "Группа пользователей - администрирование" #: 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_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 "Создание групп репозиториев отключено" @@ -2448,7 +2663,9 @@ msgstr "Создание групп репозиториев отключено" #: 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_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 "Создание групп репозиториев включено" @@ -2472,7 +2689,9 @@ msgstr "Создание групп репозиториев включено" #: 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_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 "Создание групп пользователей отключено" @@ -2496,7 +2715,9 @@ msgstr "Создание групп пользователей отключено" #: 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_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 "Создание групп пользователей включено" @@ -2520,7 +2741,9 @@ msgstr "Создание групп пользователей включено" #: 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_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 "Регистрация отключена" @@ -2544,7 +2767,9 @@ msgstr "Регистрация отключена" #: 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_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 "Регистрация пользователя с ручной активацией учётной записи" @@ -2568,7 +2793,9 @@ msgstr "Регистрация пользователя с ручной активацией учётной записи" #: 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_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 "Регистрация пользователя с автоматической активацией учётной записи" @@ -2592,7 +2819,9 @@ msgstr "Регистрация пользователя с автоматической активацией учётной записи" #: 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_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 "Ручная активация внешней учетной записи" @@ -2616,7 +2845,9 @@ msgstr "Ручная активация внешней учетной записи" #: 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_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 "Автоматическая активация внешней учетной записи" @@ -2634,7 +2865,9 @@ msgstr "Автоматическая активация внешней учетной записи" #: 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_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 "" @@ -2653,7 +2886,9 @@ msgstr "" #: 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_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 "" @@ -2669,7 +2904,9 @@ msgstr "" #: 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_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 "" @@ -2682,7 +2919,9 @@ msgstr "" #: 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_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 "" @@ -2695,32 +2934,46 @@ msgstr "" #: 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_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_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 "" @@ -2774,12 +3027,12 @@ msgid "" "email" msgstr "Сброс пароля прошел успешно, новый пароль отправлен на ваш адрес электронной почты" -#: rhodecode/model/comment.py:263 +#: rhodecode/model/comment.py:266 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:264 -msgid "Refresh page" +#: rhodecode/model/comment.py:267 +msgid "Show it now" msgstr "" #: rhodecode/model/forms.py:85 @@ -2910,7 +3163,7 @@ msgid "" " %(pr_title)s" msgstr "" -#: rhodecode/model/pull_request.py:449 +#: rhodecode/model/pull_request.py:448 msgid "Pull request merged and closed" msgstr "" @@ -2954,7 +3207,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 " @@ -3208,6 +3461,56 @@ 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 @@ -3378,19 +3681,19 @@ 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}) ..." @@ -3398,13 +3701,13 @@ 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 "Загрузка..." @@ -3564,6 +3867,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 "Панель управления" @@ -3612,6 +3931,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 @@ -3631,7 +3951,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 @@ -3648,8 +3967,8 @@ msgstr "Имя" #: rhodecode/templates/changeset/changeset.html:53 #: rhodecode/templates/compare/compare_commits.html:24 #: rhodecode/templates/email_templates/commit_comment.mako:82 -#: rhodecode/templates/email_templates/pull_request_review.mako:30 -#: rhodecode/templates/email_templates/pull_request_review.mako:51 +#: rhodecode/templates/email_templates/pull_request_review.mako:41 +#: rhodecode/templates/email_templates/pull_request_review.mako:75 #: rhodecode/templates/files/file_tree_detail.html:5 #: rhodecode/templates/files/file_tree_detail.html:12 #: rhodecode/templates/forks/fork.html:48 @@ -3865,9 +4184,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 @@ -3917,7 +4240,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 @@ -3954,7 +4276,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" @@ -4099,7 +4421,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 @@ -4152,75 +4474,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 "Gist" #: 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 @@ -4232,8 +4496,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 @@ -4254,17 +4518,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 -msgid "Integrations settings" -msgstr "" - -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/base.html:14 +msgid "Integrations Settings" +msgstr "" + +#: 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 @@ -4274,27 +4548,101 @@ msgstr "" msgid "Settings" msgstr "Настройки" -#: rhodecode/templates/admin/integrations/edit.html:36 -#, python-format -msgid "Create new %(integration_type)s integration" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:31 +#: rhodecode/templates/admin/integrations/form.html:60 +#, python-format +msgid "Create New %(integration_type)s Integration" +msgstr "" + +#: 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: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:56 -msgid "Current integrations" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:65 +#: 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" @@ -4314,7 +4662,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 "" @@ -4432,36 +4780,18 @@ msgstr "Дополнительных Email не указано" msgid "New email address" msgstr "Новый E-mail" -#: 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" -msgstr "Отключено" +#: 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 @@ -4501,27 +4831,28 @@ 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:28 -#: rhodecode/templates/email_templates/pull_request_review.mako:48 +#: rhodecode/templates/email_templates/pull_request_review.mako:39 +#: rhodecode/templates/email_templates/pull_request_review.mako:72 #: rhodecode/templates/pullrequests/pullrequest.html:38 #: rhodecode/templates/pullrequests/pullrequests.html:104 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 @@ -4529,7 +4860,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 @@ -4537,19 +4868,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 "Подтвердите удаление этого pull-request'а" -#: 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 "" @@ -4567,10 +4898,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 @@ -4590,12 +4917,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 @@ -4708,12 +5039,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 " @@ -4776,7 +5101,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 @@ -5049,7 +5374,6 @@ msgid "Statistics" msgstr "Статистика" #: rhodecode/templates/admin/repos/repo_edit_advanced.html:7 -#: rhodecode/templates/pullrequests/pullrequests.html:108 msgid "Updated on" msgstr "" @@ -5456,7 +5780,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" @@ -5673,6 +5997,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 "" @@ -6414,6 +6742,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 "" @@ -6444,7 +6776,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 "" @@ -6830,7 +7162,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 "" @@ -6932,29 +7264,65 @@ msgid "" "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 " @@ -6962,34 +7330,16 @@ msgid "" "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" @@ -7403,7 +7753,7 @@ msgstr "Предварительный просмотр комментария" #: rhodecode/templates/changeset/changeset_file_comment.html:293 #: rhodecode/templates/compare/compare_diff.html:57 #: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 msgid "Comment" msgstr "Комментировать" @@ -7563,17 +7913,17 @@ msgid "Compare Commits" msgstr "" #: rhodecode/templates/compare/compare_diff.html:46 -#: rhodecode/templates/email_templates/pull_request_review.mako:50 +#: rhodecode/templates/email_templates/pull_request_review.mako:74 #: rhodecode/templates/files/file_diff.html:56 #: rhodecode/templates/pullrequests/pullrequest_show.html:85 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.html:47 -#: rhodecode/templates/email_templates/pull_request_comment.mako:92 -#: rhodecode/templates/email_templates/pull_request_review.mako:49 +#: 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 "Исходный код" @@ -7756,17 +8106,17 @@ msgstr "" msgid "Form vertical" msgstr "" -#: rhodecode/templates/email_templates/base.mako:7 +#: rhodecode/templates/email_templates/base.mako:32 #, python-format msgid "This is a notification from RhodeCode. %(instance_url)s" msgstr "" -#: rhodecode/templates/email_templates/base.mako:90 +#: rhodecode/templates/email_templates/base.mako:115 msgid "RhodeCode" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:16 -#: rhodecode/templates/email_templates/pull_request_comment.mako:17 +#: rhodecode/templates/email_templates/pull_request_comment.mako:18 msgid "[mention]" msgstr "" @@ -7795,12 +8145,12 @@ msgid "%(user)s commented on commit `%(c msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:43 -#: rhodecode/templates/email_templates/pull_request_comment.mako:43 +#: rhodecode/templates/email_templates/pull_request_comment.mako:44 msgid "Comment link" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:48 -#: rhodecode/templates/email_templates/pull_request_comment.mako:48 +#: rhodecode/templates/email_templates/pull_request_comment.mako:49 #, python-format msgid "File: %(comment_file)s on line %(comment_line)s" msgstr "" @@ -7829,7 +8179,7 @@ msgid "The commit status was changed to" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 #, python-format msgid "Comment on line: %(comment_line)s" msgstr "" @@ -7838,75 +8188,79 @@ msgstr "" msgid "Generate new password here" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:20 +#: rhodecode/templates/email_templates/pull_request_comment.mako:21 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: " "`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:23 +#: rhodecode/templates/email_templates/pull_request_comment.mako:24 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: " "%(status)s)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:25 -#: rhodecode/templates/email_templates/pull_request_comment.mako:82 +#: rhodecode/templates/email_templates/pull_request_comment.mako:26 +#: rhodecode/templates/email_templates/pull_request_comment.mako:83 #, python-format msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:45 +#: rhodecode/templates/email_templates/pull_request_comment.mako:46 msgid "Source repository" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:54 +#: rhodecode/templates/email_templates/pull_request_comment.mako:55 #, python-format msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:56 +#: rhodecode/templates/email_templates/pull_request_comment.mako:57 #, python-format msgid "" "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:80 +#: rhodecode/templates/email_templates/pull_request_comment.mako:81 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" " "(file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:86 +#: rhodecode/templates/email_templates/pull_request_comment.mako:87 #, python-format msgid "submitted pull request status: %(status)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:88 +#: rhodecode/templates/email_templates/pull_request_comment.mako:89 #, python-format msgid "submitted pull request status: %(status)s and closed" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:5 -#, python-format -msgid "%(user)s wants you to review pull request #%(pr_url)s: \"%(pr_title)s\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_review.mako:17 +#: rhodecode/templates/email_templates/pull_request_comment.mako:95 +msgid "Submitted status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:14 +#, python-format +msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:34 #, python-format msgid "" "Pull request from %(source_ref_type)s:%(source_ref_name)s of %(repo_url)s " "into %(target_ref_type)s:%(target_ref_name)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:26 +#: rhodecode/templates/email_templates/pull_request_review.mako:37 msgid "Link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:35 +#: rhodecode/templates/email_templates/pull_request_review.mako:46 #, python-format msgid "Commit (%(num)s)" msgid_plural "Commits (%(num)s)" @@ -7915,22 +8269,22 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/email_templates/pull_request_review.mako:47 +#: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"." msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:49 +#: rhodecode/templates/email_templates/pull_request_review.mako:73 #, python-format msgid "%(source_ref_type)s of %(source_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:50 +#: rhodecode/templates/email_templates/pull_request_review.mako:74 #, python-format msgid "%(target_ref_type)s of %(target_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:52 +#: rhodecode/templates/email_templates/pull_request_review.mako:76 #: rhodecode/templates/summary/components.html:95 #: rhodecode/templates/summary/components.html:98 #, python-format @@ -8175,13 +8529,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 "Бинарный файл (%s)" #: 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 "Файл слишком большой для отображения" @@ -8253,44 +8607,44 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: 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 "" diff --git a/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2016-08-02 20:55+0000\n" -"PO-Revision-Date: 2016-08-02 20:57+0000\n" +"POT-Creation-Date: 2016-09-15 14:11+0000\n" +"PO-Revision-Date: 2016-09-15 14:12+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Chinese (http://www.transifex.com/rhodecode/RhodeCode/language/zh/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\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 "" @@ -45,7 +45,8 @@ msgstr "" msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:80 rhodecode/templates/register.html:76 +#: 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 #: rhodecode/templates/admin/users/user_add.html:86 @@ -65,12 +66,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" @@ -93,9 +100,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 "启用" @@ -398,12 +405,12 @@ msgstr "" #: rhodecode/controllers/changeset.py:335 #: rhodecode/controllers/pullrequests.py:750 -#: rhodecode/model/pull_request.py:843 +#: rhodecode/model/pull_request.py:842 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" -#: rhodecode/controllers/changeset.py:372 +#: rhodecode/controllers/changeset.py:373 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" @@ -546,14 +553,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 "标签" @@ -659,30 +666,30 @@ msgid "Close Pull Request" msgstr "" #: rhodecode/controllers/pullrequests.py:754 -#: rhodecode/model/pull_request.py:847 +#: rhodecode/model/pull_request.py:846 msgid "Closing with" msgstr "" -#: rhodecode/controllers/pullrequests.py:802 +#: rhodecode/controllers/pullrequests.py:804 #, python-format msgid "" "Closing pull request on other statuses than rejected or approved is " "forbidden. Calculated status from all reviewers is currently: %s" msgstr "" -#: rhodecode/controllers/summary.py: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 "" @@ -695,37 +702,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 "" @@ -779,60 +786,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 "" @@ -1050,18 +1058,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 "" @@ -1070,86 +1078,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 +#: rhodecode/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "成功更新可视化设置" -#: rhodecode/controllers/admin/settings.py:330 +#: 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" @@ -1332,38 +1324,50 @@ 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:193 +#: rhodecode/events/repo.py:199 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:202 +#: rhodecode/events/repo.py:208 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:211 +#: rhodecode/events/repo.py:217 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:222 +#: rhodecode/events/repo.py:228 msgid "repository push" msgstr "" +#: rhodecode/events/repo_group.py:62 +msgid "repository group created" +msgstr "" + +#: rhodecode/events/repo_group.py:71 +msgid "repository group deleted" +msgstr "" + +#: rhodecode/events/repo_group.py:80 +msgid "repository group update" +msgstr "" + #: rhodecode/events/user.py:34 msgid "user registered" msgstr "" @@ -1376,42 +1380,202 @@ 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:214 +msgid "Recipients" +msgstr "" + +#: rhodecode/integrations/types/email.py:215 +msgid "Email addresses to send push events to" +msgstr "" + +#: 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 "Red" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:45 +msgid "Green" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:46 +msgid "Purple" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:47 +msgid "Gray" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:52 +msgid "Hipchat server URL" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:53 +msgid "Hipchat integration url." +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:63 +msgid "Notify" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:64 +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 "Background color of message." +msgstr "" + +#: 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 @@ -1427,35 +1591,40 @@ 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 "" @@ -1467,10 +1636,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 "[删除]版本库" @@ -1594,80 +1767,80 @@ msgstr "创建标签%s" 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:545 +#: 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:1481 +#: rhodecode/lib/helpers.py:1489 #, python-format msgid " and %s more" msgstr "还有%s个" -#: rhodecode/lib/helpers.py:1485 +#: rhodecode/lib/helpers.py:1493 msgid "No Files" msgstr "没有文件" -#: rhodecode/lib/helpers.py:1558 +#: rhodecode/lib/helpers.py:1566 msgid "new file" msgstr "" -#: rhodecode/lib/helpers.py:1561 +#: rhodecode/lib/helpers.py:1569 msgid "mod" msgstr "" -#: rhodecode/lib/helpers.py:1564 -msgid "del" -msgstr "" - -#: rhodecode/lib/helpers.py:1567 -msgid "rename" -msgstr "" - #: rhodecode/lib/helpers.py:1572 +msgid "del" +msgstr "" + +#: rhodecode/lib/helpers.py:1575 +msgid "rename" +msgstr "" + +#: rhodecode/lib/helpers.py:1580 msgid "chmod" msgstr "" -#: rhodecode/lib/helpers.py:1819 +#: rhodecode/lib/helpers.py:1827 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -1686,85 +1859,85 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1839 +#: 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 "版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以重新扫描版本库" -#: rhodecode/lib/utils2.py:454 +#: rhodecode/lib/utils2.py:463 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d年" -#: rhodecode/lib/utils2.py:455 +#: rhodecode/lib/utils2.py:464 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d月" -#: rhodecode/lib/utils2.py:456 +#: rhodecode/lib/utils2.py:465 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d天" -#: rhodecode/lib/utils2.py:457 +#: rhodecode/lib/utils2.py:466 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d时" -#: rhodecode/lib/utils2.py:458 +#: rhodecode/lib/utils2.py:467 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d分" -#: rhodecode/lib/utils2.py:459 +#: rhodecode/lib/utils2.py:468 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d秒" -#: rhodecode/lib/utils2.py:477 +#: rhodecode/lib/utils2.py:486 #, python-format msgid "in %s" msgstr "%s" -#: rhodecode/lib/utils2.py:483 +#: rhodecode/lib/utils2.py:492 #, python-format msgid "%s ago" msgstr "%s前" -#: 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 "%s零%s前" -#: rhodecode/lib/utils2.py:501 +#: rhodecode/lib/utils2.py:510 #, python-format msgid "in %s and %s" msgstr "%s零%s" -#: 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" @@ -1794,7 +1967,9 @@ msgstr "刚才" #: 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_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 "无版本库访问权限" @@ -1822,7 +1997,9 @@ msgstr "无版本库访问权限" #: 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_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 "版本库读取权限" @@ -1850,7 +2027,9 @@ msgstr "版本库读取权限" #: 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_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 "版本库写入权限" @@ -1878,7 +2057,9 @@ msgstr "版本库写入权限" #: 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_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 "版本库管理权限" @@ -1946,7 +2127,9 @@ msgstr "RhodeCode 管理员" #: 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_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 "禁用创建版本库" @@ -1974,7 +2157,9 @@ msgstr "禁用创建版本库" #: 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_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 "允许创建版本库" @@ -2002,7 +2187,9 @@ msgstr "允许创建版本库" #: 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_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 "禁用复刻版本库" @@ -2030,7 +2217,9 @@ msgstr "禁用复刻版本库" #: 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_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 "允许复刻版本库" @@ -2079,7 +2268,9 @@ msgstr "用自动激活注册新用户" #: 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:2944 +#: 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 "未检视" @@ -2107,7 +2298,9 @@ msgstr "未检视" #: 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:2945 +#: 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 "已批准" @@ -2135,7 +2328,9 @@ msgstr "已批准" #: 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:2946 +#: 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 "驳回" @@ -2163,7 +2358,9 @@ msgstr "驳回" #: 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:2947 +#: 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 "检视中" @@ -2188,7 +2385,9 @@ msgstr "检视中" #: 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_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 "" @@ -2213,7 +2412,9 @@ msgstr "" #: 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_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 "" @@ -2238,7 +2439,9 @@ msgstr "" #: 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_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 "" @@ -2263,7 +2466,9 @@ msgstr "" #: 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_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 "" @@ -2287,7 +2492,9 @@ msgstr "" #: 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_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 "" @@ -2311,7 +2518,9 @@ msgstr "" #: 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_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 "" @@ -2335,7 +2544,9 @@ msgstr "" #: 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_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 "" @@ -2359,7 +2570,9 @@ msgstr "" #: 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_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 "" @@ -2383,7 +2596,9 @@ msgstr "" #: 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_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 "" @@ -2407,7 +2622,9 @@ msgstr "" #: 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_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 "" @@ -2431,7 +2648,9 @@ msgstr "" #: 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_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 "" @@ -2455,7 +2674,9 @@ msgstr "" #: 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_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 "" @@ -2479,7 +2700,9 @@ msgstr "" #: 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_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 "" @@ -2503,7 +2726,9 @@ msgstr "" #: 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_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 "" @@ -2527,7 +2752,9 @@ msgstr "" #: 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_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 "" @@ -2551,7 +2778,9 @@ msgstr "" #: 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_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 "" @@ -2575,7 +2804,9 @@ msgstr "" #: 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_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 "" @@ -2593,7 +2824,9 @@ msgstr "" #: 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_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 "" @@ -2612,7 +2845,9 @@ msgstr "" #: 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_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 "" @@ -2628,7 +2863,9 @@ msgstr "" #: 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_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 "" @@ -2641,7 +2878,9 @@ msgstr "" #: 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_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 "" @@ -2654,32 +2893,46 @@ msgstr "" #: 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_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_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 "" @@ -2733,12 +2986,12 @@ msgid "" "email" msgstr "" -#: rhodecode/model/comment.py:263 +#: rhodecode/model/comment.py:266 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:264 -msgid "Refresh page" +#: rhodecode/model/comment.py:267 +msgid "Show it now" msgstr "" #: rhodecode/model/forms.py:85 @@ -2869,7 +3122,7 @@ msgid "" " %(pr_title)s" msgstr "" -#: rhodecode/model/pull_request.py:449 +#: rhodecode/model/pull_request.py:448 msgid "Pull request merged and closed" msgstr "" @@ -2913,7 +3166,7 @@ msgstr "最新tip版本" 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 " @@ -3167,6 +3420,56 @@ 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 @@ -3337,19 +3640,19 @@ 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}) ..." @@ -3357,13 +3660,13 @@ 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 "" @@ -3523,6 +3826,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 "控制面板" @@ -3571,6 +3890,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 @@ -3590,7 +3910,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 @@ -3607,8 +3926,8 @@ msgstr "名称" #: rhodecode/templates/changeset/changeset.html:53 #: rhodecode/templates/compare/compare_commits.html:24 #: rhodecode/templates/email_templates/commit_comment.mako:82 -#: rhodecode/templates/email_templates/pull_request_review.mako:30 -#: rhodecode/templates/email_templates/pull_request_review.mako:51 +#: rhodecode/templates/email_templates/pull_request_review.mako:41 +#: rhodecode/templates/email_templates/pull_request_review.mako:75 #: rhodecode/templates/files/file_tree_detail.html:5 #: rhodecode/templates/files/file_tree_detail.html:12 #: rhodecode/templates/forks/fork.html:48 @@ -3821,9 +4140,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 @@ -3873,7 +4196,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 @@ -3910,7 +4232,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" @@ -4055,7 +4377,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 @@ -4108,75 +4430,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 @@ -4188,8 +4452,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 @@ -4210,17 +4474,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 -msgid "Integrations settings" -msgstr "" - -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/base.html:14 +msgid "Integrations Settings" +msgstr "" + +#: 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 @@ -4230,27 +4504,101 @@ msgstr "" msgid "Settings" msgstr "设置" -#: rhodecode/templates/admin/integrations/edit.html:36 -#, python-format -msgid "Create new %(integration_type)s integration" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:31 +#: rhodecode/templates/admin/integrations/form.html:60 +#, python-format +msgid "Create New %(integration_type)s Integration" +msgstr "" + +#: 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: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:56 -msgid "Current integrations" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.html:65 +#: 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" @@ -4270,7 +4618,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 "" @@ -4388,36 +4736,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" -msgstr "停用" +#: 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 @@ -4457,27 +4787,28 @@ 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:28 -#: rhodecode/templates/email_templates/pull_request_review.mako:48 +#: rhodecode/templates/email_templates/pull_request_review.mako:39 +#: rhodecode/templates/email_templates/pull_request_review.mako:72 #: rhodecode/templates/pullrequests/pullrequest.html:38 #: rhodecode/templates/pullrequests/pullrequests.html:104 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 @@ -4485,7 +4816,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 @@ -4493,19 +4824,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 "" @@ -4523,10 +4854,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 @@ -4546,12 +4873,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 @@ -4664,12 +4995,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 " @@ -4732,7 +5057,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 @@ -4999,7 +5324,6 @@ msgid "Statistics" msgstr "统计" #: rhodecode/templates/admin/repos/repo_edit_advanced.html:7 -#: rhodecode/templates/pullrequests/pullrequests.html:108 msgid "Updated on" msgstr "" @@ -5400,7 +5724,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" @@ -5617,6 +5941,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 "" @@ -6349,6 +6677,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 "" @@ -6379,7 +6711,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 "" @@ -6762,7 +7094,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 "" @@ -6864,29 +7196,65 @@ msgid "" "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 " @@ -6894,34 +7262,16 @@ msgid "" "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" @@ -7326,7 +7676,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:293 #: rhodecode/templates/compare/compare_diff.html:57 #: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 msgid "Comment" msgstr "评论" @@ -7468,17 +7818,17 @@ msgid "Compare Commits" msgstr "" #: rhodecode/templates/compare/compare_diff.html:46 -#: rhodecode/templates/email_templates/pull_request_review.mako:50 +#: rhodecode/templates/email_templates/pull_request_review.mako:74 #: rhodecode/templates/files/file_diff.html:56 #: rhodecode/templates/pullrequests/pullrequest_show.html:85 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.html:47 -#: rhodecode/templates/email_templates/pull_request_comment.mako:92 -#: rhodecode/templates/email_templates/pull_request_review.mako:49 +#: 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 "" @@ -7658,17 +8008,17 @@ msgstr "" msgid "Form vertical" msgstr "" -#: rhodecode/templates/email_templates/base.mako:7 +#: rhodecode/templates/email_templates/base.mako:32 #, python-format msgid "This is a notification from RhodeCode. %(instance_url)s" msgstr "" -#: rhodecode/templates/email_templates/base.mako:90 +#: rhodecode/templates/email_templates/base.mako:115 msgid "RhodeCode" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:16 -#: rhodecode/templates/email_templates/pull_request_comment.mako:17 +#: rhodecode/templates/email_templates/pull_request_comment.mako:18 msgid "[mention]" msgstr "" @@ -7697,12 +8047,12 @@ msgid "%(user)s commented on commit `%(c msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:43 -#: rhodecode/templates/email_templates/pull_request_comment.mako:43 +#: rhodecode/templates/email_templates/pull_request_comment.mako:44 msgid "Comment link" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:48 -#: rhodecode/templates/email_templates/pull_request_comment.mako:48 +#: rhodecode/templates/email_templates/pull_request_comment.mako:49 #, python-format msgid "File: %(comment_file)s on line %(comment_line)s" msgstr "" @@ -7731,7 +8081,7 @@ msgid "The commit status was changed to" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:87 -#: rhodecode/templates/email_templates/pull_request_comment.mako:93 +#: rhodecode/templates/email_templates/pull_request_comment.mako:97 #, python-format msgid "Comment on line: %(comment_line)s" msgstr "" @@ -7740,96 +8090,100 @@ msgstr "" msgid "Generate new password here" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:20 +#: rhodecode/templates/email_templates/pull_request_comment.mako:21 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: " "`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:23 +#: rhodecode/templates/email_templates/pull_request_comment.mako:24 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: " "%(status)s)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:25 -#: rhodecode/templates/email_templates/pull_request_comment.mako:82 +#: rhodecode/templates/email_templates/pull_request_comment.mako:26 +#: rhodecode/templates/email_templates/pull_request_comment.mako:83 #, python-format msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\"" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:45 +#: rhodecode/templates/email_templates/pull_request_comment.mako:46 msgid "Source repository" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:54 +#: rhodecode/templates/email_templates/pull_request_comment.mako:55 #, python-format msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:56 +#: rhodecode/templates/email_templates/pull_request_comment.mako:57 #, python-format msgid "" "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:80 +#: rhodecode/templates/email_templates/pull_request_comment.mako:81 #, python-format msgid "" "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" " "(file:`%(comment_file)s`)" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:86 +#: rhodecode/templates/email_templates/pull_request_comment.mako:87 #, python-format msgid "submitted pull request status: %(status)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:88 +#: rhodecode/templates/email_templates/pull_request_comment.mako:89 #, python-format msgid "submitted pull request status: %(status)s and closed" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:5 -#, python-format -msgid "%(user)s wants you to review pull request #%(pr_url)s: \"%(pr_title)s\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_review.mako:17 +#: rhodecode/templates/email_templates/pull_request_comment.mako:95 +msgid "Submitted status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:14 +#, python-format +msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:34 #, python-format msgid "" "Pull request from %(source_ref_type)s:%(source_ref_name)s of %(repo_url)s " "into %(target_ref_type)s:%(target_ref_name)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:26 +#: rhodecode/templates/email_templates/pull_request_review.mako:37 msgid "Link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:35 +#: rhodecode/templates/email_templates/pull_request_review.mako:46 #, python-format msgid "Commit (%(num)s)" msgid_plural "Commits (%(num)s)" msgstr[0] "" -#: rhodecode/templates/email_templates/pull_request_review.mako:47 +#: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"." msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:49 +#: rhodecode/templates/email_templates/pull_request_review.mako:73 #, python-format msgid "%(source_ref_type)s of %(source_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:50 +#: rhodecode/templates/email_templates/pull_request_review.mako:74 #, python-format msgid "%(target_ref_type)s of %(target_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:52 +#: rhodecode/templates/email_templates/pull_request_review.mako:76 #: rhodecode/templates/summary/components.html:95 #: rhodecode/templates/summary/components.html:98 #, python-format @@ -8068,13 +8422,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 "二进制文件（%s）" #: 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 "文件过大，不能显示" @@ -8143,44 +8497,44 @@ msgid "line" msgid_plural "lines" msgstr[0] "" -#: 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 ""