From b0a9d7600966be7ae28db6d2a7245e9dac15eca8 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Mon, 29 Aug 2016 21:26:34 +0200 Subject: [PATCH 1/8] svn-docs: update the intruction on new svn-http setup. Fixes env variables, and add note about anon module enabling. --- docs/admin/svn-http.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/admin/svn-http.rst b/docs/admin/svn-http.rst index 73121bef..e5c1b33e 100644 --- a/docs/admin/svn-http.rst +++ b/docs/admin/svn-http.rst @@ -23,11 +23,13 @@ Using Ubuntu Distribution as an example you can run: $ sudo apt-get install apache2 libapache2-mod-svn -Once installed you need to enable ``dav_svn``: +Once installed you need to enable ``dav_svn`` and ``anon``: .. code-block:: bash $ sudo a2enmod dav_svn + $ sudo a2enmod authn_anon + Configuring Apache Setup ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -64,8 +66,8 @@ permission issues could occur. To do this edit the ``/etc/apache2/envvars`` ServerAdmin rhodecode-admin@localhost DocumentRoot /var/www/html - ErrorLog ${'${APACHE_LOG_DIR}'}/error.log - CustomLog ${'${APACHE_LOG_DIR}'}/access.log combined + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined Include /home/user/.rccontrol/enterprise-1/mod_dav_svn.conf From fbac596608a2d7a63533ca61d19cee7127b7b708 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Mon, 29 Aug 2016 21:26:54 +0200 Subject: [PATCH 2/8] manifest: include missing mako template --- MANIFEST.in | 1 + 1 file changed, 1 insertion(+) diff --git a/MANIFEST.in b/MANIFEST.in index 030f13ea..fece43dd 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -24,6 +24,7 @@ recursive-include rhodecode *.cfg recursive-include rhodecode *.json recursive-include rhodecode *.ini_tmpl recursive-include rhodecode *.sh +recursive-include rhodecode *.mako # images, css include rhodecode/public/css/*.css From 93a17e9c452ce4aaf856118a7c0e417a01ec2025 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Tue, 30 Aug 2016 18:32:31 +0200 Subject: [PATCH 3/8] manifest: added 502.html into package data. --- MANIFEST.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index fece43dd..5dd14cce 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -26,6 +26,9 @@ recursive-include rhodecode *.ini_tmpl recursive-include rhodecode *.sh recursive-include rhodecode *.mako +# 502 page +include rhodecode/public/502.html + # images, css include rhodecode/public/css/*.css include rhodecode/public/images/*.* From 58da0568fd6949d7585434c8185eaf2803b292d8 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Thu, 15 Sep 2016 14:26:09 +0000 Subject: [PATCH 4/8] i18n: Updated message catalog template --- .release.cfg | 1 + rhodecode/i18n/rhodecode.pot | 1014 +++++++++++++++++++++------------- 2 files changed, 640 insertions(+), 375 deletions(-) diff --git a/.release.cfg b/.release.cfg index 1502f4f1..ea5461d7 100644 --- a/.release.cfg +++ b/.release.cfg @@ -11,6 +11,7 @@ done = true [task:changelog_updated] [task:generate_api_docs] +done = true [task:updated_translation] diff --git a/rhodecode/i18n/rhodecode.pot b/rhodecode/i18n/rhodecode.pot index da2ecdcc..5cff649b 100644 --- a/rhodecode/i18n/rhodecode.pot +++ b/rhodecode/i18n/rhodecode.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: rhodecode-enterprise-ce 4.3.0\n" +"Project-Id-Version: rhodecode-enterprise-ce 4.4.0\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2016-08-12 12:29+0000\n" +"POT-Creation-Date: 2016-09-15 14:25+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,7 @@ msgstr "" "Generated-By: Babel 1.3\n" #: rhodecode/admin/navigation.py:74 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:126 +#: rhodecode/integrations/views.py:168 #: rhodecode/templates/admin/permissions/permissions.html:36 msgid "Global" msgstr "" @@ -41,7 +41,7 @@ msgstr "" msgid "Issue Tracker" msgstr "" -#: rhodecode/admin/navigation.py:80 rhodecode/integrations/types/email.py:172 +#: rhodecode/admin/navigation.py:80 rhodecode/integrations/types/email.py:232 #: rhodecode/templates/register.html:76 #: rhodecode/templates/admin/my_account/my_account_profile.html:48 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:94 @@ -62,12 +62,18 @@ msgid "Full Text Search" msgstr "" #: rhodecode/admin/navigation.py:83 -#: rhodecode/templates/admin/integrations/base.html:21 -#: rhodecode/templates/admin/integrations/edit.html:8 -#: rhodecode/templates/admin/integrations/edit.html:19 -#: rhodecode/templates/admin/integrations/list.html:15 -#: rhodecode/templates/admin/integrations/list.html:19 -#: rhodecode/templates/admin/integrations/list.html:26 +#: rhodecode/templates/admin/integrations/base.html:23 +#: rhodecode/templates/admin/integrations/form.html:8 +#: rhodecode/templates/admin/integrations/form.html:21 +#: rhodecode/templates/admin/integrations/form.html:32 +#: rhodecode/templates/admin/integrations/list.html:21 +#: rhodecode/templates/admin/integrations/list.html:25 +#: rhodecode/templates/admin/integrations/list.html:29 +#: rhodecode/templates/admin/integrations/list.html:36 +#: rhodecode/templates/admin/integrations/new.html:9 +#: rhodecode/templates/admin/integrations/new.html:17 +#: rhodecode/templates/admin/integrations/new.html:23 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:72 #: rhodecode/templates/base/base.html:84 msgid "Integrations" @@ -90,9 +96,9 @@ msgstr "" msgid "Enable or disable this authentication plugin." msgstr "" -#: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:37 -#: rhodecode/templates/admin/integrations/list.html:62 -#: rhodecode/templates/admin/my_account/my_account_notifications.html:14 +#: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:32 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:197 +#: rhodecode/templates/admin/integrations/list.html:101 msgid "Enabled" msgstr "" @@ -527,14 +533,14 @@ msgstr "" msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:1026 rhodecode/controllers/summary.py:251 +#: rhodecode/controllers/files.py:1026 rhodecode/controllers/summary.py:259 #: rhodecode/model/pull_request.py:1059 rhodecode/model/scm.py:780 -#: rhodecode/templates/base/vcs_settings.html:138 +#: rhodecode/templates/base/vcs_settings.html:185 msgid "Branches" msgstr "" #: rhodecode/controllers/files.py:1030 rhodecode/model/scm.py:795 -#: rhodecode/templates/base/vcs_settings.html:163 +#: rhodecode/templates/base/vcs_settings.html:210 msgid "Tags" msgstr "" @@ -645,19 +651,19 @@ msgstr "" msgid "Closing pull request on other statuses than rejected or approved is forbidden. Calculated status from all reviewers is currently: %s" msgstr "" -#: rhodecode/controllers/summary.py:235 +#: rhodecode/controllers/summary.py:243 msgid "Branch" msgstr "" -#: rhodecode/controllers/summary.py:236 +#: rhodecode/controllers/summary.py:244 msgid "Tag" msgstr "" -#: rhodecode/controllers/summary.py:237 +#: rhodecode/controllers/summary.py:245 msgid "Bookmark" msgstr "" -#: rhodecode/controllers/summary.py:252 +#: rhodecode/controllers/summary.py:260 msgid "Closed branches" msgstr "" @@ -670,37 +676,37 @@ msgid "Error occurred during update of default values" msgstr "" #: rhodecode/controllers/admin/gists.py:63 -#: rhodecode/controllers/admin/my_account.py:307 +#: rhodecode/controllers/admin/my_account.py:317 #: rhodecode/controllers/admin/users.py:431 msgid "forever" msgstr "" #: rhodecode/controllers/admin/gists.py:64 -#: rhodecode/controllers/admin/my_account.py:308 +#: rhodecode/controllers/admin/my_account.py:318 #: rhodecode/controllers/admin/users.py:432 msgid "5 minutes" msgstr "" #: rhodecode/controllers/admin/gists.py:65 -#: rhodecode/controllers/admin/my_account.py:309 +#: rhodecode/controllers/admin/my_account.py:319 #: rhodecode/controllers/admin/users.py:433 msgid "1 hour" msgstr "" #: rhodecode/controllers/admin/gists.py:66 -#: rhodecode/controllers/admin/my_account.py:310 +#: rhodecode/controllers/admin/my_account.py:320 #: rhodecode/controllers/admin/users.py:434 msgid "1 day" msgstr "" #: rhodecode/controllers/admin/gists.py:67 -#: rhodecode/controllers/admin/my_account.py:311 +#: rhodecode/controllers/admin/my_account.py:321 #: rhodecode/controllers/admin/users.py:435 msgid "1 month" msgstr "" #: rhodecode/controllers/admin/gists.py:71 -#: rhodecode/controllers/admin/my_account.py:313 +#: rhodecode/controllers/admin/my_account.py:323 #: rhodecode/controllers/admin/users.py:437 msgid "Lifetime" msgstr "" @@ -754,60 +760,61 @@ msgstr "" msgid "%(expiry)s - current value" msgstr "" -#: rhodecode/controllers/admin/my_account.py:70 +#: rhodecode/controllers/admin/my_account.py:74 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/my_account.py:128 +#: rhodecode/controllers/admin/my_account.py:132 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/controllers/admin/my_account.py:143 +#: rhodecode/controllers/admin/my_account.py:147 #: rhodecode/controllers/admin/users.py:218 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/my_account.py:202 -msgid "Successfully updated password" -msgstr "" - #: 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:261 +#: rhodecode/controllers/admin/my_account.py:226 +msgid "Successfully updated password" +msgstr "" + +#: rhodecode/controllers/admin/my_account.py:271 #: rhodecode/controllers/admin/users.py:611 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/controllers/admin/my_account.py:268 +#: rhodecode/controllers/admin/my_account.py:278 #: rhodecode/controllers/admin/users.py:618 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/controllers/admin/my_account.py:278 +#: rhodecode/controllers/admin/my_account.py:288 #: rhodecode/controllers/admin/users.py:633 msgid "Removed email address from user account" msgstr "" -#: rhodecode/controllers/admin/my_account.py:316 +#: rhodecode/controllers/admin/my_account.py:326 #: rhodecode/controllers/admin/users.py:440 msgid "Role" msgstr "" -#: rhodecode/controllers/admin/my_account.py:329 +#: rhodecode/controllers/admin/my_account.py:339 #: rhodecode/controllers/admin/users.py:464 msgid "Auth token successfully created" msgstr "" -#: rhodecode/controllers/admin/my_account.py:342 +#: rhodecode/controllers/admin/my_account.py:352 #: rhodecode/controllers/admin/users.py:483 msgid "Auth token successfully reset" msgstr "" -#: rhodecode/controllers/admin/my_account.py:346 +#: rhodecode/controllers/admin/my_account.py:356 #: rhodecode/controllers/admin/users.py:487 msgid "Auth token successfully deleted" msgstr "" @@ -1027,18 +1034,18 @@ msgid "Error occurred during deleting issue tracker entry" msgstr "" #: rhodecode/controllers/admin/repos.py:721 -#: rhodecode/controllers/admin/settings.py:363 +#: rhodecode/controllers/admin/settings.py:366 msgid "Removed issue tracker entry" msgstr "" #: rhodecode/controllers/admin/repos.py:751 -#: rhodecode/controllers/admin/settings.py:409 +#: rhodecode/controllers/admin/settings.py:412 msgid "Updated issue tracker entries" msgstr "" #: rhodecode/controllers/admin/repos.py:812 -#: rhodecode/controllers/admin/settings.py:142 -#: rhodecode/controllers/admin/settings.py:719 +#: rhodecode/controllers/admin/settings.py:143 +#: rhodecode/controllers/admin/settings.py:722 msgid "Some form inputs contain invalid data." msgstr "" @@ -1047,86 +1054,70 @@ msgid "Error occurred during updating repository VCS settings" 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" @@ -1307,35 +1298,35 @@ msgstr "" msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:135 +#: rhodecode/events/repo.py:136 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:144 +#: rhodecode/events/repo.py:145 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:153 +#: rhodecode/events/repo.py:154 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:162 +#: rhodecode/events/repo.py:163 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:198 +#: rhodecode/events/repo.py:199 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:207 +#: rhodecode/events/repo.py:208 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:216 +#: rhodecode/events/repo.py:217 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:227 +#: rhodecode/events/repo.py:228 msgid "repository push" msgstr "" @@ -1363,100 +1354,196 @@ msgstr "" msgid "user pre update" msgstr "" -#: rhodecode/integrations/schema.py:35 +#: rhodecode/forms/__init__.py:32 rhodecode/templates/admin/gists/new.html:62 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:27 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:84 +#: rhodecode/templates/admin/my_account/my_account_emails.html:65 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:104 +#: rhodecode/templates/admin/permissions/permissions_application.html:51 +#: rhodecode/templates/admin/permissions/permissions_ips.html:61 +#: rhodecode/templates/admin/permissions/permissions_objects.html:57 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:136 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:68 +#: rhodecode/templates/admin/repos/repo_edit_fields.html:66 +#: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:80 +#: rhodecode/templates/admin/repos/repo_edit_permissions.html:111 +#: rhodecode/templates/admin/repos/repo_edit_settings.html:159 +#: rhodecode/templates/admin/repos/repo_edit_vcs.html:46 +#: rhodecode/templates/admin/settings/settings_global.html:110 +#: rhodecode/templates/admin/settings/settings_issuetracker.html:16 +#: rhodecode/templates/admin/settings/settings_labs.html:49 +#: rhodecode/templates/admin/settings/settings_vcs.html:14 +#: rhodecode/templates/admin/settings/settings_visual.html:220 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:121 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:23 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:81 +#: rhodecode/templates/admin/users/user_edit_emails.html:63 +#: rhodecode/templates/admin/users/user_edit_ips.html:70 +#: rhodecode/templates/admin/users/user_edit_profile.html:135 +#: rhodecode/templates/base/default_perms_box.html:89 +msgid "Reset" +msgstr "" + +#: rhodecode/forms/__init__.py:33 rhodecode/templates/admin/gists/show.html:49 +#: rhodecode/templates/admin/integrations/list.html:211 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:56 +#: rhodecode/templates/admin/my_account/my_account_emails.html:32 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:62 +#: rhodecode/templates/admin/permissions/permissions_ips.html:26 +#: rhodecode/templates/admin/repos/repo_edit_fields.html:25 +#: rhodecode/templates/admin/settings/settings_hooks.html:46 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:52 +#: rhodecode/templates/admin/users/user_edit_emails.html:31 +#: rhodecode/templates/admin/users/user_edit_ips.html:34 +#: rhodecode/templates/base/issue_tracker_settings.html:70 +#: rhodecode/templates/base/vcs_settings.html:194 +#: rhodecode/templates/base/vcs_settings.html:219 +#: rhodecode/templates/changeset/changeset_file_comment.html:49 +#: rhodecode/templates/changeset/changeset_file_comment.html:99 +#: rhodecode/templates/data_table/_dt_elements.html:119 +#: rhodecode/templates/data_table/_dt_elements.html:176 +#: rhodecode/templates/data_table/_dt_elements.html:190 +#: rhodecode/templates/data_table/_dt_elements.html:202 +#: rhodecode/templates/debug_style/buttons.html:132 +#: rhodecode/templates/files/files_source.html:34 +#: rhodecode/templates/files/files_source.html:38 +#: rhodecode/templates/files/files_source.html:41 +msgid "Delete" +msgstr "" + +#: rhodecode/integrations/schema.py:30 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:195 msgid "Enable or disable this integration." msgstr "" -#: rhodecode/integrations/schema.py:42 +#: rhodecode/integrations/schema.py:37 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:176 msgid "Short name for this integration." msgstr "" -#: rhodecode/integrations/schema.py:44 +#: rhodecode/integrations/schema.py:39 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:178 msgid "Integration name" msgstr "" +#: rhodecode/integrations/schema.py:51 +msgid "Limit integrations to to work only on the direct children repositories of this repository group (no subgroups)" +msgstr "" + +#: rhodecode/integrations/schema.py:55 +msgid "Limit to childen repos only" +msgstr "" + +#: rhodecode/integrations/schema.py:63 +msgid "Limit integrations to to work only on root level repositories" +msgstr "" + +#: rhodecode/integrations/schema.py:66 +msgid "Root repositories only" +msgstr "" + +#: rhodecode/integrations/views.py:162 +msgid "{repo_name} repository" +msgstr "" + +#: rhodecode/integrations/views.py:165 +msgid "{repo_group_name} repo group" +msgstr "" + #: rhodecode/integrations/views.py:172 +msgid "{name} integration" +msgstr "" + +#: rhodecode/integrations/views.py:186 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:200 +#: rhodecode/integrations/views.py:266 msgid "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:220 +#: rhodecode/integrations/views.py:292 msgid "Integration {integration_name} updated successfully." msgstr "" -#: rhodecode/integrations/types/email.py:154 +#: rhodecode/integrations/types/email.py:214 msgid "Recipients" msgstr "" -#: rhodecode/integrations/types/email.py:155 +#: rhodecode/integrations/types/email.py:215 msgid "Email addresses to send push events to" msgstr "" -#: rhodecode/integrations/types/email.py:160 -#: rhodecode/integrations/types/email.py:161 +#: rhodecode/integrations/types/email.py:220 +#: rhodecode/integrations/types/email.py:221 msgid "Email address" msgstr "" -#: rhodecode/integrations/types/hipchat.py:44 +#: 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:45 +#: rhodecode/integrations/types/hipchat.py:44 msgid "Red" msgstr "" -#: rhodecode/integrations/types/hipchat.py:46 +#: rhodecode/integrations/types/hipchat.py:45 msgid "Green" msgstr "" -#: rhodecode/integrations/types/hipchat.py:47 +#: rhodecode/integrations/types/hipchat.py:46 msgid "Purple" msgstr "" -#: rhodecode/integrations/types/hipchat.py:48 +#: rhodecode/integrations/types/hipchat.py:47 msgid "Gray" msgstr "" -#: rhodecode/integrations/types/hipchat.py:53 +#: rhodecode/integrations/types/hipchat.py:52 msgid "Hipchat server URL" msgstr "" -#: rhodecode/integrations/types/hipchat.py:54 +#: rhodecode/integrations/types/hipchat.py:53 msgid "Hipchat integration url." msgstr "" -#: rhodecode/integrations/types/hipchat.py:64 +#: rhodecode/integrations/types/hipchat.py:63 msgid "Notify" msgstr "" -#: rhodecode/integrations/types/hipchat.py:65 +#: rhodecode/integrations/types/hipchat.py:64 msgid "Make a notification to the users in room." msgstr "" -#: rhodecode/integrations/types/hipchat.py:71 +#: rhodecode/integrations/types/hipchat.py:70 msgid "Color" msgstr "" -#: rhodecode/integrations/types/hipchat.py:72 +#: rhodecode/integrations/types/hipchat.py:71 msgid "Background color of message." msgstr "" -#: rhodecode/integrations/types/hipchat.py:104 +#: rhodecode/integrations/types/hipchat.py:99 msgid "Hipchat" msgstr "" -#: rhodecode/integrations/types/slack.py:45 +#: 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:46 +#: rhodecode/integrations/types/slack.py:45 msgid "This can be setup at the slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:59 rhodecode/templates/login.html:43 +#: rhodecode/integrations/types/slack.py:58 rhodecode/templates/login.html:43 #: rhodecode/templates/register.html:41 #: rhodecode/templates/admin/admin_log.html:7 #: rhodecode/templates/admin/my_account/my_account_profile.html:24 @@ -1472,35 +1559,39 @@ msgstr "" msgid "Username" msgstr "" -#: rhodecode/integrations/types/slack.py:60 +#: rhodecode/integrations/types/slack.py:59 msgid "Username to show notifications coming from." msgstr "" -#: rhodecode/integrations/types/slack.py:69 +#: rhodecode/integrations/types/slack.py:68 msgid "Channel" msgstr "" -#: rhodecode/integrations/types/slack.py:70 +#: rhodecode/integrations/types/slack.py:69 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:78 msgid "Emoji" msgstr "" -#: rhodecode/integrations/types/slack.py:80 +#: rhodecode/integrations/types/slack.py:79 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/webhook.py:41 +#: 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:42 +#: rhodecode/integrations/types/webhook.py:41 msgid "URL of the webhook to receive POST event." msgstr "" @@ -1512,10 +1603,14 @@ msgstr "" msgid "String used to validate received payloads." msgstr "" -#: rhodecode/integrations/types/webhook.py:62 +#: rhodecode/integrations/types/webhook.py:65 msgid "Webhook" msgstr "" +#: rhodecode/integrations/types/webhook.py:66 +msgid "Post json events to a webhook endpoint" +msgstr "" + #: rhodecode/lib/action_parser.py:89 msgid "[deleted] repository" msgstr "" @@ -1639,79 +1734,79 @@ msgstr "" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1180 +#: rhodecode/lib/auth.py:1185 #, python-format msgid "IP %s not allowed" msgstr "" -#: rhodecode/lib/auth.py:1254 +#: rhodecode/lib/auth.py:1259 msgid "You need to be a registered user to perform this action" msgstr "" -#: rhodecode/lib/auth.py:1302 +#: rhodecode/lib/auth.py:1307 #, python-format msgid "Action not supported for %s." msgstr "" -#: rhodecode/lib/auth.py:1339 +#: rhodecode/lib/auth.py:1344 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/base.py:547 +#: rhodecode/lib/base.py:550 #, python-format msgid "The repository at %(repo_name)s cannot be located." msgstr "" -#: rhodecode/lib/diffs.py:56 +#: rhodecode/lib/diffs.py:62 msgid "Click to comment" msgstr "" -#: rhodecode/lib/diffs.py:71 +#: rhodecode/lib/diffs.py:77 msgid "Binary file" msgstr "" -#: rhodecode/lib/diffs.py:91 +#: rhodecode/lib/diffs.py:98 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: rhodecode/lib/diffs.py:102 +#: rhodecode/lib/diffs.py:109 msgid "No changes detected" msgstr "" -#: rhodecode/lib/diffs.py:631 +#: rhodecode/lib/diffs.py:643 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1484 +#: rhodecode/lib/helpers.py:1489 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:1488 +#: rhodecode/lib/helpers.py:1493 msgid "No Files" msgstr "" -#: rhodecode/lib/helpers.py:1561 +#: rhodecode/lib/helpers.py:1566 msgid "new file" msgstr "" -#: rhodecode/lib/helpers.py:1564 +#: rhodecode/lib/helpers.py:1569 msgid "mod" msgstr "" -#: rhodecode/lib/helpers.py:1567 +#: rhodecode/lib/helpers.py:1572 msgid "del" msgstr "" -#: rhodecode/lib/helpers.py:1570 +#: rhodecode/lib/helpers.py:1575 msgid "rename" msgstr "" -#: rhodecode/lib/helpers.py:1575 +#: rhodecode/lib/helpers.py:1580 msgid "chmod" msgstr "" -#: rhodecode/lib/helpers.py:1822 +#: rhodecode/lib/helpers.py:1827 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -1730,89 +1825,89 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1842 +#: rhodecode/lib/helpers.py:1847 #, python-format msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories" msgstr "" -#: rhodecode/lib/utils2.py:454 +#: rhodecode/lib/utils2.py:463 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:455 +#: rhodecode/lib/utils2.py:464 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:456 +#: rhodecode/lib/utils2.py:465 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:457 +#: rhodecode/lib/utils2.py:466 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:458 +#: rhodecode/lib/utils2.py:467 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:459 +#: rhodecode/lib/utils2.py:468 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:477 +#: rhodecode/lib/utils2.py:486 #, python-format msgid "in %s" msgstr "" -#: rhodecode/lib/utils2.py:483 +#: rhodecode/lib/utils2.py:492 #, python-format msgid "%s ago" msgstr "" -#: rhodecode/lib/utils2.py:493 +#: rhodecode/lib/utils2.py:502 #, python-format msgid "%s, %s ago" msgstr "" -#: rhodecode/lib/utils2.py:495 +#: rhodecode/lib/utils2.py:504 #, python-format msgid "in %s, %s" msgstr "" -#: rhodecode/lib/utils2.py:497 +#: rhodecode/lib/utils2.py:506 #, python-format msgid "%s and %s" msgstr "" -#: rhodecode/lib/utils2.py:499 +#: rhodecode/lib/utils2.py:508 #, python-format msgid "%s and %s ago" msgstr "" -#: rhodecode/lib/utils2.py:501 +#: rhodecode/lib/utils2.py:510 #, python-format msgid "in %s and %s" msgstr "" -#: rhodecode/lib/utils2.py:505 rhodecode/public/js/scripts.js:25035 +#: rhodecode/lib/utils2.py:514 rhodecode/public/js/scripts.js:25035 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" @@ -1841,7 +1936,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 rhodecode/model/db.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 rhodecode/model/db.py:2287 msgid "Repository no access" msgstr "" @@ -1868,7 +1965,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 rhodecode/model/db.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 rhodecode/model/db.py:2288 msgid "Repository read access" msgstr "" @@ -1895,7 +1994,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 rhodecode/model/db.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 rhodecode/model/db.py:2289 msgid "Repository write access" msgstr "" @@ -1922,7 +2023,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296 rhodecode/model/db.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 rhodecode/model/db.py:2290 msgid "Repository admin access" msgstr "" @@ -1989,7 +2092,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 rhodecode/model/db.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 rhodecode/model/db.py:2308 msgid "Repository creation disabled" msgstr "" @@ -2016,7 +2121,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2315 rhodecode/model/db.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 rhodecode/model/db.py:2309 msgid "Repository creation enabled" msgstr "" @@ -2043,7 +2150,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2319 rhodecode/model/db.py:2311 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2311 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 rhodecode/model/db.py:2313 msgid "Repository forking disabled" msgstr "" @@ -2070,7 +2179,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:851 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:973 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 rhodecode/model/db.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 rhodecode/model/db.py:2314 msgid "Repository forking enabled" msgstr "" @@ -2118,7 +2229,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2952 rhodecode/model/db.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2952 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 rhodecode/model/db.py:2948 msgid "Not Reviewed" msgstr "" @@ -2145,7 +2258,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2953 rhodecode/model/db.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2953 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 rhodecode/model/db.py:2949 msgid "Approved" msgstr "" @@ -2172,7 +2287,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2954 rhodecode/model/db.py:2948 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2954 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2948 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 rhodecode/model/db.py:2950 msgid "Rejected" msgstr "" @@ -2199,7 +2316,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1199 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1321 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1346 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2955 rhodecode/model/db.py:2949 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2955 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2949 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 rhodecode/model/db.py:2951 msgid "Under Review" msgstr "" @@ -2223,7 +2342,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 rhodecode/model/db.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 rhodecode/model/db.py:2292 msgid "Repository group no access" msgstr "" @@ -2247,7 +2368,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 rhodecode/model/db.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 rhodecode/model/db.py:2293 msgid "Repository group read access" msgstr "" @@ -2271,7 +2394,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 rhodecode/model/db.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 rhodecode/model/db.py:2294 msgid "Repository group write access" msgstr "" @@ -2295,7 +2420,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:832 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:954 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301 rhodecode/model/db.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 rhodecode/model/db.py:2295 msgid "Repository group admin access" msgstr "" @@ -2318,7 +2445,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 rhodecode/model/db.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 rhodecode/model/db.py:2297 msgid "User group no access" msgstr "" @@ -2341,7 +2470,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304 rhodecode/model/db.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 rhodecode/model/db.py:2298 msgid "User group read access" msgstr "" @@ -2364,7 +2495,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 rhodecode/model/db.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 rhodecode/model/db.py:2299 msgid "User group write access" msgstr "" @@ -2387,7 +2520,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:837 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:959 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 rhodecode/model/db.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 rhodecode/model/db.py:2300 msgid "User group admin access" msgstr "" @@ -2410,7 +2545,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 rhodecode/model/db.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 rhodecode/model/db.py:2302 msgid "Repository Group creation disabled" msgstr "" @@ -2433,7 +2570,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:840 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:962 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 rhodecode/model/db.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 rhodecode/model/db.py:2303 msgid "Repository Group creation enabled" msgstr "" @@ -2456,7 +2595,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 rhodecode/model/db.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 rhodecode/model/db.py:2305 msgid "User Group creation disabled" msgstr "" @@ -2479,7 +2620,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:843 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:965 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312 rhodecode/model/db.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 rhodecode/model/db.py:2306 msgid "User Group creation enabled" msgstr "" @@ -2502,7 +2645,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2322 rhodecode/model/db.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2322 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 rhodecode/model/db.py:2316 msgid "Registration disabled" msgstr "" @@ -2525,7 +2670,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 rhodecode/model/db.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 rhodecode/model/db.py:2317 msgid "User Registration with manual account activation" msgstr "" @@ -2548,7 +2695,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:855 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:977 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 rhodecode/model/db.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 rhodecode/model/db.py:2318 msgid "User Registration with automatic account activation" msgstr "" @@ -2571,7 +2720,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2326 rhodecode/model/db.py:2318 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2326 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2318 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 rhodecode/model/db.py:2320 msgid "Manual activation of external account" msgstr "" @@ -2594,7 +2745,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:858 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:980 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2327 rhodecode/model/db.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2327 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 rhodecode/model/db.py:2321 msgid "Automatic activation of external account" msgstr "" @@ -2611,7 +2764,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 rhodecode/model/db.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 rhodecode/model/db.py:2310 msgid "Repository creation enabled with write permission to a repository group" msgstr "" @@ -2628,7 +2783,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 rhodecode/model/db.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 rhodecode/model/db.py:2311 msgid "Repository creation disabled with write permission to a repository group" msgstr "" @@ -2642,7 +2799,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:822 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:944 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291 rhodecode/model/db.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 rhodecode/model/db.py:2285 msgid "RhodeCode Super Administrator" msgstr "" @@ -2654,7 +2813,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:860 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:982 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2329 rhodecode/model/db.py:2321 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2329 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2321 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 rhodecode/model/db.py:2323 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -2666,31 +2827,45 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:861 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:983 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1008 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2330 rhodecode/model/db.py:2322 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2330 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2322 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 rhodecode/model/db.py:2324 msgid "Inherit object permissions from default user enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:909 rhodecode/model/db.py:910 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:909 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 rhodecode/model/db.py:910 msgid "all" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910 rhodecode/model/db.py:911 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 rhodecode/model/db.py:911 msgid "http/web interface" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 rhodecode/model/db.py:912 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 rhodecode/model/db.py:912 msgid "vcs (git/hg/svn protocol)" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 rhodecode/model/db.py:913 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 rhodecode/model/db.py:913 msgid "api calls" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 rhodecode/model/db.py:914 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 rhodecode/model/db.py:914 msgid "feed access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069 rhodecode/model/db.py:2061 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2061 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 rhodecode/model/db.py:2063 msgid "No parent" msgstr "" @@ -2916,7 +3091,7 @@ msgstr "" msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:285 +#: rhodecode/model/user.py:284 #, python-format msgid "You can't edit this user (`%(username)s`) since it's crucial for entire application" msgstr "" @@ -3154,6 +3329,54 @@ msgstr "" msgid "Duplicated value for filename found: `{}`" msgstr "" +#: rhodecode/model/validation_schema/schemas/integration_schema.py:36 +msgid "Pick a scope:" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/integration_schema.py:39 +msgid "Global (all repositories)" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/integration_schema.py:40 +msgid "Top level repositories only" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/integration_schema.py:79 +msgid "Only repo admins can create integrations" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/integration_schema.py:86 +msgid "Only repogroup admins can create integrations" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/integration_schema.py:91 +msgid "Only superadmins can create global integrations" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/integration_schema.py:183 +msgid "Scope of the integration. Recursive means the integration runs on all repos of that group and children recursively." +msgstr "" + +#: rhodecode/model/validation_schema/schemas/integration_schema.py:186 +msgid "Integration scope" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/integration_schema.py:217 +msgid "General integration options" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/integration_schema.py:220 +msgid "{integration_type} settings" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/user_schema.py:36 +msgid "Password is incorrect" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/user_schema.py:59 +msgid "New password must be different to old password" +msgstr "" + #: rhodecode/public/js/scripts.js:23039 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 @@ -3324,31 +3547,31 @@ msgstr "" #: rhodecode/public/js/scripts.js:41308 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:2 -#: rhodecode/public/js/src/rhodecode/comments.js:235 +#: rhodecode/public/js/src/rhodecode/comments.js:236 msgid "Add another comment" msgstr "" #: rhodecode/public/js/scripts.js:41526 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 -#: rhodecode/public/js/src/rhodecode/comments.js:453 +#: rhodecode/public/js/src/rhodecode/comments.js:470 msgid "Status Review" msgstr "" #: rhodecode/public/js/scripts.js:41540 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/public/js/src/rhodecode/comments.js:467 +#: rhodecode/public/js/src/rhodecode/comments.js:484 msgid "Comment text will be set automatically based on currently selected status ({0}) ..." msgstr "" #: rhodecode/public/js/scripts.js:41653 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 -#: rhodecode/public/js/src/rhodecode/comments.js:580 +#: rhodecode/public/js/src/rhodecode/comments.js:597 msgid "Submitting..." msgstr "" #: rhodecode/public/js/scripts.js:41703 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 -#: rhodecode/public/js/src/rhodecode/comments.js:630 +#: rhodecode/public/js/src/rhodecode/comments.js:647 #: rhodecode/templates/files/files_browser_tree.html:47 msgid "Loading ..." msgstr "" @@ -3508,6 +3731,22 @@ msgstr "" msgid "{0} years" msgstr "" +#: rhodecode/public/js/vendors/webcomponentsjs/webcomponents.min.js:11 +msgid "UIEvent" +msgstr "" + +#: rhodecode/public/js/vendors/webcomponentsjs/webcomponents.min.js:11 +msgid "CustomEvent" +msgstr "" + +#: rhodecode/public/js/vendors/webcomponentsjs/webcomponents.min.js:11 +msgid "MouseEvent" +msgstr "" + +#: rhodecode/public/js/vendors/webcomponentsjs/webcomponents.min.js:11 +msgid "FocusEvent" +msgstr "" + #: rhodecode/templates/index.html:5 msgid "Dashboard" msgstr "" @@ -3556,6 +3795,7 @@ msgstr "" #: rhodecode/templates/index_base.html:97 #: rhodecode/templates/index_base.html:122 #: rhodecode/templates/admin/gists/index.html:112 +#: rhodecode/templates/admin/integrations/list.html:102 #: rhodecode/templates/admin/my_account/my_account_repos.html:31 #: rhodecode/templates/admin/my_account/my_account_watched.html:31 #: rhodecode/templates/admin/repo_groups/repo_groups.html:53 @@ -3575,7 +3815,6 @@ msgstr "" #: rhodecode/templates/index_base.html:100 #: rhodecode/templates/index_base.html:125 #: rhodecode/templates/admin/gists/index.html:114 -#: rhodecode/templates/admin/integrations/list.html:63 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:77 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:45 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:42 @@ -3807,9 +4046,13 @@ msgstr "" #: rhodecode/templates/admin/auth/auth_settings.html:12 #: rhodecode/templates/admin/auth/plugin_settings.html:12 #: rhodecode/templates/admin/defaults/defaults.html:12 -#: rhodecode/templates/admin/integrations/base.html:19 -#: rhodecode/templates/admin/integrations/edit.html:15 +#: rhodecode/templates/admin/integrations/base.html:21 +#: rhodecode/templates/admin/integrations/form.html:15 +#: rhodecode/templates/admin/integrations/form.html:28 #: rhodecode/templates/admin/integrations/list.html:8 +#: rhodecode/templates/admin/integrations/list.html:14 +#: rhodecode/templates/admin/integrations/new.html:11 +#: rhodecode/templates/admin/integrations/new.html:19 #: rhodecode/templates/admin/permissions/permissions.html:12 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:12 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:12 @@ -3857,7 +4100,6 @@ msgstr "" #: rhodecode/templates/admin/auth/auth_settings.html:81 #: rhodecode/templates/admin/auth/plugin_settings.html:87 #: rhodecode/templates/admin/defaults/defaults_repositories.html:63 -#: rhodecode/templates/admin/my_account/my_account_password.html:36 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:103 #: rhodecode/templates/admin/permissions/permissions_application.html:50 #: rhodecode/templates/admin/permissions/permissions_objects.html:56 @@ -3894,7 +4136,7 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.html:14 #: rhodecode/templates/admin/gists/index.html:110 -#: rhodecode/templates/admin/integrations/list.html:64 +#: rhodecode/templates/admin/integrations/list.html:103 #: rhodecode/templates/admin/repos/repo_add_base.html:62 #: rhodecode/templates/admin/repos/repo_edit_fields.html:12 msgid "Type" @@ -4033,7 +4275,7 @@ msgstr "" #: rhodecode/templates/admin/gists/index.html:108 #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:24 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:89 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:88 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:62 #: rhodecode/templates/changelog/changelog.html:110 @@ -4086,75 +4328,17 @@ msgstr "" msgid "Create Public Gist" msgstr "" -#: rhodecode/templates/admin/gists/new.html:62 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:27 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:84 -#: rhodecode/templates/admin/my_account/my_account_emails.html:65 -#: rhodecode/templates/admin/my_account/my_account_password.html:37 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:104 -#: rhodecode/templates/admin/permissions/permissions_application.html:51 -#: rhodecode/templates/admin/permissions/permissions_ips.html:61 -#: rhodecode/templates/admin/permissions/permissions_objects.html:57 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:136 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:68 -#: rhodecode/templates/admin/repos/repo_edit_fields.html:66 -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:80 -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:111 -#: rhodecode/templates/admin/repos/repo_edit_settings.html:159 -#: rhodecode/templates/admin/repos/repo_edit_vcs.html:46 -#: rhodecode/templates/admin/settings/settings_global.html:110 -#: rhodecode/templates/admin/settings/settings_issuetracker.html:16 -#: rhodecode/templates/admin/settings/settings_labs.html:46 -#: rhodecode/templates/admin/settings/settings_vcs.html:14 -#: rhodecode/templates/admin/settings/settings_visual.html:220 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:121 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:23 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:81 -#: rhodecode/templates/admin/users/user_edit_emails.html:63 -#: rhodecode/templates/admin/users/user_edit_ips.html:70 -#: rhodecode/templates/admin/users/user_edit_profile.html:135 -#: rhodecode/templates/base/default_perms_box.html:89 -msgid "Reset" -msgstr "" - #: rhodecode/templates/admin/gists/show.html:13 #: rhodecode/templates/admin/gists/show.html:20 msgid "Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.html:49 -#: rhodecode/templates/admin/integrations/list.html:110 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:56 -#: rhodecode/templates/admin/my_account/my_account_emails.html:32 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:63 -#: rhodecode/templates/admin/permissions/permissions_ips.html:26 -#: rhodecode/templates/admin/repos/repo_edit_fields.html:25 -#: rhodecode/templates/admin/settings/settings_hooks.html:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:52 -#: rhodecode/templates/admin/users/user_edit_emails.html:31 -#: rhodecode/templates/admin/users/user_edit_ips.html:34 -#: rhodecode/templates/base/issue_tracker_settings.html:70 -#: rhodecode/templates/base/vcs_settings.html:147 -#: rhodecode/templates/base/vcs_settings.html:172 -#: rhodecode/templates/changeset/changeset_file_comment.html:49 -#: rhodecode/templates/changeset/changeset_file_comment.html:99 -#: rhodecode/templates/data_table/_dt_elements.html:119 -#: rhodecode/templates/data_table/_dt_elements.html:176 -#: rhodecode/templates/data_table/_dt_elements.html:190 -#: rhodecode/templates/data_table/_dt_elements.html:202 -#: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.html:33 -#: rhodecode/templates/files/files_source.html:37 -#: rhodecode/templates/files/files_source.html:40 -msgid "Delete" -msgstr "" - #: rhodecode/templates/admin/gists/show.html:49 msgid "Confirm to delete this Gist" msgstr "" #: rhodecode/templates/admin/gists/show.html:56 -#: rhodecode/templates/admin/integrations/list.html:103 +#: rhodecode/templates/admin/integrations/list.html:204 #: rhodecode/templates/admin/my_account/my_account_profile.html:5 #: rhodecode/templates/base/issue_tracker_settings.html:61 #: rhodecode/templates/changeset/changeset_file_comment.html:145 @@ -4166,8 +4350,8 @@ msgstr "" #: rhodecode/templates/debug_style/buttons.html:128 #: rhodecode/templates/files/files_add.html:204 #: rhodecode/templates/files/files_edit.html:165 -#: rhodecode/templates/files/files_source.html:36 -#: rhodecode/templates/files/files_source.html:39 +#: rhodecode/templates/files/files_source.html:37 +#: rhodecode/templates/files/files_source.html:40 #: rhodecode/templates/pullrequests/pullrequest_show.html:50 #: rhodecode/templates/pullrequests/pullrequest_show.html:184 #: rhodecode/templates/users/user_profile.html:7 @@ -4188,17 +4372,27 @@ msgstr "" #: rhodecode/templates/admin/gists/show.html:91 #: rhodecode/templates/files/files_delete.html:50 -#: rhodecode/templates/files/files_source.html:61 +#: rhodecode/templates/files/files_source.html:62 msgid "Show as raw" msgstr "" -#: rhodecode/templates/admin/integrations/base.html:12 +#: rhodecode/templates/admin/integrations/base.html:14 msgid "Integrations Settings" msgstr "" -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/form.html:17 #: rhodecode/templates/admin/integrations/list.html:10 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44 +#: rhodecode/templates/admin/integrations/new.html:13 +#: rhodecode/templates/admin/permissions/permissions_objects.html:28 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:127 +msgid "Repository Groups" +msgstr "" + +#: rhodecode/templates/admin/integrations/form.html:30 +#: rhodecode/templates/admin/integrations/list.html:16 +#: rhodecode/templates/admin/integrations/new.html:21 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:48 #: rhodecode/templates/admin/repos/repo_edit.html:15 #: rhodecode/templates/admin/repos/repo_edit.html:43 #: rhodecode/templates/admin/settings/settings.html:14 @@ -4207,31 +4401,101 @@ msgstr "" msgid "Settings" msgstr "" -#: rhodecode/templates/admin/integrations/edit.html:36 +#: rhodecode/templates/admin/integrations/form.html:60 #, python-format msgid "Create New %(integration_type)s Integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:31 -msgid "Create New Integration" +#: rhodecode/templates/admin/integrations/list.html:44 +msgid "Current Integrations for Repository: {repo_name}" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:35 -msgid "No integrations available." +#: rhodecode/templates/admin/integrations/list.html:46 +msgid "Current Integrations for repository group: {repo_group_name}" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:56 +#: rhodecode/templates/admin/integrations/list.html:48 msgid "Current Integrations" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:65 +#: rhodecode/templates/admin/integrations/list.html:64 +#: rhodecode/templates/admin/notifications/notifications.html:31 +msgid "All" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:95 +#: rhodecode/templates/admin/integrations/new.html:26 +msgid "Create new integration" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:104 +msgid "Scope" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:105 msgid "Actions" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:89 +#: rhodecode/templates/admin/integrations/list.html:115 +msgid "No {type} integrations for repo {repo} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:117 +msgid "No {type} integrations for repogroup {repogroup} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:119 +msgid "No {type} integrations exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:133 +msgid "Create one" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:164 +msgid "repo" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:168 +msgid "repogroup" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:170 +msgid "child repos only" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:172 +msgid "cascade to all" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:177 +msgid "top level repos only" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:179 +msgid "global" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.html:185 msgid "unknown integration" msgstr "" +#: rhodecode/templates/admin/integrations/new.html:31 +msgid "Create New Integration for repository: {repo_name}" +msgstr "" + +#: rhodecode/templates/admin/integrations/new.html:33 +msgid "Create New Integration for repository group: {repo_group_name}" +msgstr "" + +#: rhodecode/templates/admin/integrations/new.html:35 +msgid "Create New Global Integration" +msgstr "" + +#: rhodecode/templates/admin/integrations/new.html:61 +msgid "No description available" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account.html:5 #: rhodecode/templates/base/base.html:343 msgid "My account" @@ -4251,7 +4515,7 @@ msgstr "" msgid "Auth Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.html:34 +#: rhodecode/templates/admin/my_account/my_account.html:35 msgid "OAuth Identities" msgstr "" @@ -4367,36 +4631,18 @@ msgstr "" msgid "New email address" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_notifications.html:3 -msgid "Your live notification settings" +#: 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: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:24 +msgid "Notifications Status" msgstr "" #: rhodecode/templates/admin/my_account/my_account_password.html:3 msgid "Change Your Account Password" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_password.html:10 -msgid "Current Password" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_password.html:19 -#: rhodecode/templates/admin/users/user_edit_profile.html:74 -msgid "New Password" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_password.html:28 -msgid "Confirm New Password" -msgstr "" - #: rhodecode/templates/admin/my_account/my_account_profile.html:11 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:52 #: rhodecode/templates/admin/users/user_edit_profile.html:25 @@ -4434,12 +4680,12 @@ msgid "Pull Requests You Opened" msgstr "" #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:23 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:88 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:87 msgid "Target Repo" msgstr "" #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:26 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:91 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:90 #: rhodecode/templates/admin/settings/settings_global.html:9 #: rhodecode/templates/email_templates/pull_request_review.mako:39 #: rhodecode/templates/email_templates/pull_request_review.mako:72 @@ -4449,12 +4695,13 @@ msgid "Title" msgstr "" #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:27 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:92 -msgid "Opened On" +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:91 +#: rhodecode/templates/pullrequests/pullrequests.html:108 +msgid "Last Update" msgstr "" #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:43 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:107 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:106 #: rhodecode/templates/changelog/changelog.html:153 #: rhodecode/templates/compare/compare_commits.html:49 #: rhodecode/templates/search/search_commit.html:36 @@ -4462,7 +4709,7 @@ msgid "Expand commit message" msgstr "" #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:52 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:116 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:115 #: rhodecode/templates/changeset/changeset_file_comment.html:284 #: rhodecode/templates/pullrequests/pullrequest_show.html:14 #: rhodecode/templates/pullrequests/pullrequest_show.html:112 @@ -4470,19 +4717,19 @@ msgstr "" msgid "Closed" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:64 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:63 msgid "Confirm to delete this pull request" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:71 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:70 msgid "You currently have no open pull requests." msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:79 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:78 msgid "Pull Requests You Participate In" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:129 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:127 msgid "There are currently no open pull requests requiring your participation." msgstr "" @@ -4499,10 +4746,6 @@ msgstr "" msgid "My Notifications" msgstr "" -#: rhodecode/templates/admin/notifications/notifications.html:31 -msgid "All" -msgstr "" - #: rhodecode/templates/admin/notifications/notifications.html:32 #: rhodecode/templates/changeset/changeset.html:140 #: rhodecode/templates/pullrequests/pullrequest_show.html:133 @@ -4522,12 +4765,16 @@ msgstr "" msgid "Show notification" msgstr "" +#: rhodecode/templates/admin/notifications/show_notification.html:12 +msgid "Notifications" +msgstr "" + #: rhodecode/templates/admin/permissions/permissions.html:5 msgid "Permissions Administration" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:14 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:45 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:49 #: rhodecode/templates/admin/repos/repo_edit.html:46 #: rhodecode/templates/admin/user_groups/user_group_edit.html:34 #: rhodecode/templates/base/base.html:82 @@ -4629,12 +4876,6 @@ msgstr "" msgid "Overwrite Existing Settings" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_objects.html:28 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:127 -msgid "Repository Groups" -msgstr "" - #: rhodecode/templates/admin/permissions/permissions_objects.html:34 msgid "All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost" msgstr "" @@ -4690,7 +4931,7 @@ msgstr "" msgid "Add Child Group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:46 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:50 #: rhodecode/templates/admin/repos/repo_edit.html:49 #: rhodecode/templates/admin/user_groups/user_group_edit.html:35 #: rhodecode/templates/admin/users/user_edit.html:35 @@ -4949,7 +5190,6 @@ msgid "Statistics" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.html:7 -#: rhodecode/templates/pullrequests/pullrequests.html:108 msgid "Updated on" msgstr "" @@ -5335,7 +5575,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_vcs.html:45 #: rhodecode/templates/admin/settings/settings_global.html:109 -#: rhodecode/templates/admin/settings/settings_labs.html:45 +#: rhodecode/templates/admin/settings/settings_labs.html:48 #: rhodecode/templates/admin/settings/settings_vcs.html:13 #: rhodecode/templates/admin/settings/settings_visual.html:219 msgid "Save settings" @@ -5545,6 +5785,10 @@ msgstr "" msgid "Labs Settings" msgstr "" +#: rhodecode/templates/admin/settings/settings_labs.html:10 +msgid "There are no Labs settings currently" +msgstr "" + #: rhodecode/templates/admin/settings/settings_mapping.html:5 msgid "Import New Groups or Repositories" msgstr "" @@ -6250,6 +6494,10 @@ msgstr "" msgid "Change the avatar at" msgstr "" +#: rhodecode/templates/admin/users/user_edit_profile.html:74 +msgid "New Password" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_profile.html:82 msgid "New Password Confirmation" msgstr "" @@ -6280,7 +6528,7 @@ msgid "Authentication type" msgstr "" #: rhodecode/templates/base/base.html:44 -#: rhodecode/templates/errors/error_document.html:51 +#: rhodecode/templates/errors/error_document.html:57 msgid "Support" msgstr "" @@ -6647,7 +6895,7 @@ msgstr "" msgid "No permission defined" msgstr "" -#: rhodecode/templates/base/root.html:120 +#: rhodecode/templates/base/root.html:161 msgid "Please enable JavaScript to use RhodeCode Enterprise" msgstr "" @@ -6735,52 +6983,68 @@ msgstr "" msgid "Requires hgsubversion library to be installed. Allows cloning remote SVN repositories and migrates them to Mercurial type." msgstr "" -#: rhodecode/templates/base/vcs_settings.html:124 -msgid "Subversion Settings" +#: rhodecode/templates/base/vcs_settings.html:123 +msgid "Mercurial Labs Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.html:129 -msgid "Repository patterns" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.html:133 -msgid "Patterns for identifying SVN branches and tags. For recursive search, use \"*\". Eg.: \"/branches/*\"" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.html:196 -msgid "Pull Request Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.html:201 -msgid "Enable server-side merge for pull requests" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.html:204 -msgid "Note: when this feature is enabled, it only runs hooks defined in the rcextension package. Custom hooks added on the Admin -> Settings -> Hooks page will not be run when pull requests are automatically merged from the web interface." -msgstr "" - -#: rhodecode/templates/base/vcs_settings.html:208 -msgid "Invalidate and relocate inline comments during update" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.html:211 -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 +#: 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:229 -msgid "Mercurial server-side merge" +#: rhodecode/templates/base/vcs_settings.html:129 +msgid "Use rebase as merge strategy" msgstr "" -#: rhodecode/templates/base/vcs_settings.html:234 -msgid "Use rebase instead of creating a merge commit when merging via web interface" +#: 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:180 +msgid "Patterns for identifying SVN branches and tags. For recursive search, use \"*\". Eg.: \"/branches/*\"" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.html:246 +msgid "Pull Request Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.html:251 +msgid "Enable server-side merge for pull requests" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.html:254 +msgid "Note: when this feature is enabled, it only runs hooks defined in the rcextension package. Custom hooks added on the Admin -> Settings -> Hooks page will not be run when pull requests are automatically merged from the web interface." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.html:258 +msgid "Invalidate and relocate inline comments during update" +msgstr "" + +#: 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/bookmarks/bookmarks.html:5 @@ -7346,7 +7610,7 @@ msgstr "" #: rhodecode/templates/email_templates/pull_request_comment.mako:93 #: rhodecode/templates/email_templates/pull_request_review.mako:73 #: rhodecode/templates/files/file_diff.html:62 -#: rhodecode/templates/files/files_source.html:18 +#: rhodecode/templates/files/files_source.html:19 msgid "Source" msgstr "" @@ -7934,13 +8198,13 @@ msgid "Delete file" msgstr "" #: rhodecode/templates/files/files_delete.html:45 -#: rhodecode/templates/files/files_source.html:49 +#: rhodecode/templates/files/files_source.html:50 #, python-format msgid "Binary file (%s)" msgstr "" #: rhodecode/templates/files/files_delete.html:50 -#: rhodecode/templates/files/files_source.html:61 +#: rhodecode/templates/files/files_source.html:62 msgid "File is too big to display" msgstr "" @@ -8010,44 +8274,44 @@ msgid_plural "lines" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/files/files_source.html:12 +#: rhodecode/templates/files/files_source.html:13 msgid "History" msgstr "" -#: rhodecode/templates/files/files_source.html:15 +#: rhodecode/templates/files/files_source.html:16 #: rhodecode/templates/search/search_content.html:68 msgid "Show Full History" msgstr "" -#: rhodecode/templates/files/files_source.html:20 +#: rhodecode/templates/files/files_source.html:21 #: rhodecode/templates/search/search_content.html:70 msgid "Annotation" msgstr "" -#: rhodecode/templates/files/files_source.html:22 +#: rhodecode/templates/files/files_source.html:23 #: rhodecode/templates/search/search_content.html:71 msgid "Raw" msgstr "" -#: rhodecode/templates/files/files_source.html:24 +#: rhodecode/templates/files/files_source.html:25 #: rhodecode/templates/search/search_content.html:73 msgid "Download" msgstr "" -#: rhodecode/templates/files/files_source.html:31 +#: rhodecode/templates/files/files_source.html:32 #, python-format msgid "Edit on Branch:%s" msgstr "" -#: rhodecode/templates/files/files_source.html:36 +#: rhodecode/templates/files/files_source.html:37 msgid "Editing binary files not allowed" msgstr "" -#: rhodecode/templates/files/files_source.html:39 +#: 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 "" From af544d1193f384c6768ab82bf7e9c1e93dbe5827 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Thu, 15 Sep 2016 14:26:37 +0000 Subject: [PATCH 5/8] i18n: Pulled translation from Transifex --- rhodecode/i18n/be/LC_MESSAGES/rhodecode.po | 1130 ++++++++++++------- rhodecode/i18n/de/LC_MESSAGES/rhodecode.po | 1132 +++++++++++++------- rhodecode/i18n/es/LC_MESSAGES/rhodecode.po | 1130 ++++++++++++------- rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po | 1132 +++++++++++++------- rhodecode/i18n/it/LC_MESSAGES/rhodecode.po | 1132 +++++++++++++------- rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po | 1132 +++++++++++++------- rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po | 1132 +++++++++++++------- rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po | 1132 +++++++++++++------- rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po | 1132 +++++++++++++------- rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po | 1132 +++++++++++++------- 10 files changed, 7428 insertions(+), 3888 deletions(-) diff --git a/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po index 2ecaca63..118d6d00 100644 --- 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 default values" 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 -msgid "Successfully updated password" -msgstr "" - #: 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:261 +#: rhodecode/controllers/admin/my_account.py:226 +msgid "Successfully updated password" +msgstr "" + +#: 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 issue tracker entry" 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 repository VCS settings" 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" @@ -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/slack.py:45 +#: 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:46 +#: rhodecode/integrations/types/slack.py:45 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:69 +#: rhodecode/integrations/types/slack.py:68 msgid "Channel" msgstr "" -#: rhodecode/integrations/types/slack.py:70 +#: rhodecode/integrations/types/slack.py:69 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:78 msgid "Emoji" msgstr "" -#: rhodecode/integrations/types/slack.py:80 +#: rhodecode/integrations/types/slack.py:79 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/webhook.py:41 +#: 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:42 +#: rhodecode/integrations/types/webhook.py:41 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 +#: 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 "" -#: 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" +#: rhodecode/templates/admin/integrations/base.html:14 +msgid "Integrations Settings" msgstr "" -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/form.html:17 #: rhodecode/templates/admin/integrations/list.html:10 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44 +#: rhodecode/templates/admin/integrations/new.html:13 +#: rhodecode/templates/admin/permissions/permissions_objects.html:28 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:127 +msgid "Repository Groups" +msgstr "" + +#: rhodecode/templates/admin/integrations/form.html:30 +#: rhodecode/templates/admin/integrations/list.html:16 +#: rhodecode/templates/admin/integrations/new.html:21 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:48 #: rhodecode/templates/admin/repos/repo_edit.html:15 #: rhodecode/templates/admin/repos/repo_edit.html:43 #: rhodecode/templates/admin/settings/settings.html:14 @@ -4254,27 +4528,101 @@ msgstr "" msgid "Settings" msgstr "" -#: rhodecode/templates/admin/integrations/edit.html:36 +#: rhodecode/templates/admin/integrations/form.html:60 #, python-format -msgid "Create new %(integration_type)s integration" +msgid "Create New %(integration_type)s Integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:31 +#: 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" +#: rhodecode/templates/admin/integrations/list.html:104 +msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:65 +#: 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" +#: 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: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: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 `%(commit_id)s`" 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\"" +#: rhodecode/templates/email_templates/pull_request_comment.mako:95 +msgid "Submitted status" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:17 +#: 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 +#: 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/de/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po index 4e5c48d2..780d862f 100644 --- 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 default values" 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 -msgid "Successfully updated password" -msgstr "Passwort erfolgreich aktualisiert" - #: 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:261 +#: rhodecode/controllers/admin/my_account.py:226 +msgid "Successfully updated password" +msgstr "Passwort erfolgreich aktualisiert" + +#: 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 issue tracker entry" 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 repository VCS settings" 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/slack.py:45 +#: 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:46 +#: rhodecode/integrations/types/slack.py:45 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:69 +#: rhodecode/integrations/types/slack.py:68 msgid "Channel" msgstr "" -#: rhodecode/integrations/types/slack.py:70 +#: rhodecode/integrations/types/slack.py:69 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:78 msgid "Emoji" msgstr "" -#: rhodecode/integrations/types/slack.py:80 +#: rhodecode/integrations/types/slack.py:79 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/webhook.py:41 +#: 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:42 +#: rhodecode/integrations/types/webhook.py:41 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 Repository" #: 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 deaktiviert" #: 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 mit Automatischer Aktivierung" #: 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" +#: rhodecode/templates/admin/integrations/base.html:14 +msgid "Integrations Settings" msgstr "" -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/form.html:17 #: rhodecode/templates/admin/integrations/list.html:10 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44 +#: rhodecode/templates/admin/integrations/new.html:13 +#: rhodecode/templates/admin/permissions/permissions_objects.html:28 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:127 +msgid "Repository Groups" +msgstr "" + +#: rhodecode/templates/admin/integrations/form.html:30 +#: rhodecode/templates/admin/integrations/list.html:16 +#: rhodecode/templates/admin/integrations/new.html:21 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:48 #: rhodecode/templates/admin/repos/repo_edit.html:15 #: rhodecode/templates/admin/repos/repo_edit.html:43 #: rhodecode/templates/admin/settings/settings.html:14 @@ -4238,27 +4512,101 @@ msgstr "" msgid "Settings" msgstr "Einstellungen" -#: rhodecode/templates/admin/integrations/edit.html:36 +#: rhodecode/templates/admin/integrations/form.html:60 #, python-format -msgid "Create new %(integration_type)s integration" +msgid "Create New %(integration_type)s Integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:31 +#: 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" +#: rhodecode/templates/admin/integrations/list.html:104 +msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:65 +#: 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" +#: 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: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: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 Benachrichtigungen" 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 `%(commit_id)s`" 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\"" +#: rhodecode/templates/email_templates/pull_request_comment.mako:95 +msgid "Submitted status" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:17 +#: 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 +#: 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/es/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/es/LC_MESSAGES/rhodecode.po index db67e0a4..756b503d 100644 --- 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 default values" 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 -msgid "Successfully updated password" -msgstr "Contraseña actualizada exitosamente" - #: 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:261 +#: rhodecode/controllers/admin/my_account.py:226 +msgid "Successfully updated password" +msgstr "Contraseña actualizada exitosamente" + +#: 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 issue tracker entry" 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 repository VCS settings" 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/slack.py:45 +#: 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:46 +#: rhodecode/integrations/types/slack.py:45 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:69 +#: rhodecode/integrations/types/slack.py:68 msgid "Channel" msgstr "" -#: rhodecode/integrations/types/slack.py:70 +#: rhodecode/integrations/types/slack.py:69 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:78 msgid "Emoji" msgstr "" -#: rhodecode/integrations/types/slack.py:80 +#: rhodecode/integrations/types/slack.py:79 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/webhook.py:41 +#: 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:42 +#: rhodecode/integrations/types/webhook.py:41 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 +#: 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 "" -#: 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" +#: rhodecode/templates/admin/integrations/base.html:14 +msgid "Integrations Settings" msgstr "" -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/form.html:17 #: rhodecode/templates/admin/integrations/list.html:10 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44 +#: rhodecode/templates/admin/integrations/new.html:13 +#: rhodecode/templates/admin/permissions/permissions_objects.html:28 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:127 +msgid "Repository Groups" +msgstr "" + +#: rhodecode/templates/admin/integrations/form.html:30 +#: rhodecode/templates/admin/integrations/list.html:16 +#: rhodecode/templates/admin/integrations/new.html:21 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:48 #: rhodecode/templates/admin/repos/repo_edit.html:15 #: rhodecode/templates/admin/repos/repo_edit.html:43 #: rhodecode/templates/admin/settings/settings.html:14 @@ -4237,27 +4511,101 @@ msgstr "" msgid "Settings" msgstr "" -#: rhodecode/templates/admin/integrations/edit.html:36 +#: rhodecode/templates/admin/integrations/form.html:60 #, python-format -msgid "Create new %(integration_type)s integration" +msgid "Create New %(integration_type)s Integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:31 +#: 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" +#: rhodecode/templates/admin/integrations/list.html:104 +msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:65 +#: 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" +#: 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: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: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 `%(commit_id)s`" 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\"" +#: rhodecode/templates/email_templates/pull_request_comment.mako:95 +msgid "Submitted status" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:17 +#: 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 +#: 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/fr/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po index dcd64338..7ea09bef 100644 --- 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 default values" 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 -msgid "Successfully updated password" -msgstr "" - #: 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:261 +#: rhodecode/controllers/admin/my_account.py:226 +msgid "Successfully updated password" +msgstr "" + +#: 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 issue tracker entry" 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 repository VCS settings" 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/slack.py:45 +#: 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:46 +#: rhodecode/integrations/types/slack.py:45 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:69 +#: rhodecode/integrations/types/slack.py:68 msgid "Channel" msgstr "" -#: rhodecode/integrations/types/slack.py:70 +#: rhodecode/integrations/types/slack.py:69 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:78 msgid "Emoji" msgstr "" -#: rhodecode/integrations/types/slack.py:80 +#: rhodecode/integrations/types/slack.py:79 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/webhook.py:41 +#: 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:42 +#: rhodecode/integrations/types/webhook.py:41 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 +#: 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 "" -#: 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" +#: rhodecode/templates/admin/integrations/base.html:14 +msgid "Integrations Settings" msgstr "" -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/form.html:17 #: rhodecode/templates/admin/integrations/list.html:10 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44 +#: rhodecode/templates/admin/integrations/new.html:13 +#: rhodecode/templates/admin/permissions/permissions_objects.html:28 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:127 +msgid "Repository Groups" +msgstr "" + +#: rhodecode/templates/admin/integrations/form.html:30 +#: rhodecode/templates/admin/integrations/list.html:16 +#: rhodecode/templates/admin/integrations/new.html:21 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:48 #: rhodecode/templates/admin/repos/repo_edit.html:15 #: rhodecode/templates/admin/repos/repo_edit.html:43 #: rhodecode/templates/admin/settings/settings.html:14 @@ -4237,27 +4511,101 @@ msgstr "" msgid "Settings" msgstr "Options" -#: rhodecode/templates/admin/integrations/edit.html:36 +#: rhodecode/templates/admin/integrations/form.html:60 #, python-format -msgid "Create new %(integration_type)s integration" +msgid "Create New %(integration_type)s Integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:31 +#: 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" +#: rhodecode/templates/admin/integrations/list.html:104 +msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:65 +#: 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" +#: 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: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: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 moment." 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 `%(commit_id)s`" 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\"" +#: rhodecode/templates/email_templates/pull_request_comment.mako:95 +msgid "Submitted status" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:17 +#: 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 +#: 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/it/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po index a6f6599a..772ef0b2 100644 --- 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 default values" 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 -msgid "Successfully updated password" -msgstr "Password aggiornata correttamente" - #: 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:261 +#: rhodecode/controllers/admin/my_account.py:226 +msgid "Successfully updated password" +msgstr "Password aggiornata correttamente" + +#: 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 issue tracker entry" 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 repository VCS settings" 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/slack.py:45 +#: 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:46 +#: rhodecode/integrations/types/slack.py:45 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:69 +#: rhodecode/integrations/types/slack.py:68 msgid "Channel" msgstr "" -#: rhodecode/integrations/types/slack.py:70 +#: rhodecode/integrations/types/slack.py:69 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:78 msgid "Emoji" msgstr "" -#: rhodecode/integrations/types/slack.py:80 +#: rhodecode/integrations/types/slack.py:79 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/webhook.py:41 +#: 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:42 +#: rhodecode/integrations/types/webhook.py:41 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 disabilitata" #: 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 abilitata" #: 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 attraverso RhodeCode e attivazione automatica #: 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 accesso" #: 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 lettura" #: 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 scrittura" #: 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 admin" #: 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 lettura" #: 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 scrittura" #: 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 disabiltiata" #: 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 abilitata" #: 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 disabilitata" #: 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 abilitata" #: 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 attivazione manuale dell'account" #: 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 attivazione automatica dell'account" #: 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 esterni" #: 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 account esterni" #: 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 abilitata con permessi di scrittura al gruppo di #: 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 disabilitata abilitata con permessi di scrittura #: 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 repository" #: 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 questo 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 @@ -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" +#: rhodecode/templates/admin/integrations/base.html:14 +msgid "Integrations Settings" msgstr "" -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/form.html:17 #: rhodecode/templates/admin/integrations/list.html:10 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44 +#: rhodecode/templates/admin/integrations/new.html:13 +#: rhodecode/templates/admin/permissions/permissions_objects.html:28 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:127 +msgid "Repository Groups" +msgstr "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 +#: rhodecode/templates/admin/integrations/form.html:60 #, python-format -msgid "Create new %(integration_type)s integration" +msgid "Create New %(integration_type)s Integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:31 +#: 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" +#: rhodecode/templates/admin/integrations/list.html:104 +msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:65 +#: 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 specificati" msgid "New email address" msgstr "Nuovo indirizzo email" -#: rhodecode/templates/admin/my_account/my_account_notifications.html:3 -msgid "Your live notification settings" +#: 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: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: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 resettati, per ciascun repository, al p 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 repository %s" 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 `%(commit_id)s`" 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\"" +#: rhodecode/templates/email_templates/pull_request_comment.mako:95 +msgid "Submitted status" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:17 +#: 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 index daa2505e..0d91822b 100644 --- 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 default values" 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 -msgid "Successfully updated password" -msgstr "" - #: 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:261 +#: rhodecode/controllers/admin/my_account.py:226 +msgid "Successfully updated password" +msgstr "" + +#: 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 issue tracker entry" 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 repository VCS settings" 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/slack.py:45 +#: 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:46 +#: rhodecode/integrations/types/slack.py:45 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:69 +#: rhodecode/integrations/types/slack.py:68 msgid "Channel" msgstr "" -#: rhodecode/integrations/types/slack.py:70 +#: rhodecode/integrations/types/slack.py:69 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:78 msgid "Emoji" msgstr "" -#: rhodecode/integrations/types/slack.py:80 +#: rhodecode/integrations/types/slack.py:79 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/webhook.py:41 +#: 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:42 +#: rhodecode/integrations/types/webhook.py:41 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" +#: rhodecode/templates/admin/integrations/base.html:14 +msgid "Integrations Settings" msgstr "" -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/form.html:17 #: rhodecode/templates/admin/integrations/list.html:10 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44 +#: rhodecode/templates/admin/integrations/new.html:13 +#: rhodecode/templates/admin/permissions/permissions_objects.html:28 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:127 +msgid "Repository Groups" +msgstr "リポジトリグループ" + +#: rhodecode/templates/admin/integrations/form.html:30 +#: rhodecode/templates/admin/integrations/list.html:16 +#: rhodecode/templates/admin/integrations/new.html:21 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:48 #: rhodecode/templates/admin/repos/repo_edit.html:15 #: rhodecode/templates/admin/repos/repo_edit.html:43 #: rhodecode/templates/admin/settings/settings.html:14 @@ -4235,27 +4509,101 @@ msgstr "" msgid "Settings" msgstr "設定" -#: rhodecode/templates/admin/integrations/edit.html:36 +#: rhodecode/templates/admin/integrations/form.html:60 #, python-format -msgid "Create new %(integration_type)s integration" +msgid "Create New %(integration_type)s Integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:31 +#: 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" +#: rhodecode/templates/admin/integrations/list.html:104 +msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:65 +#: 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" +#: 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: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: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 `%(commit_id)s`" 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\"" +#: rhodecode/templates/email_templates/pull_request_comment.mako:95 +msgid "Submitted status" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:17 +#: 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 index b10e261f..81042f89 100644 --- 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 default values" 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 -msgid "Successfully updated password" -msgstr "" - #: 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:261 +#: rhodecode/controllers/admin/my_account.py:226 +msgid "Successfully updated password" +msgstr "" + +#: 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 issue tracker entry" 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 repository VCS settings" 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/slack.py:45 +#: 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:46 +#: rhodecode/integrations/types/slack.py:45 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:69 +#: rhodecode/integrations/types/slack.py:68 msgid "Channel" msgstr "" -#: rhodecode/integrations/types/slack.py:70 +#: rhodecode/integrations/types/slack.py:69 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:78 msgid "Emoji" msgstr "" -#: rhodecode/integrations/types/slack.py:80 +#: rhodecode/integrations/types/slack.py:79 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/webhook.py:41 +#: 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:42 +#: rhodecode/integrations/types/webhook.py:41 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 konta" #: 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" +#: rhodecode/templates/admin/integrations/base.html:14 +msgid "Integrations Settings" msgstr "" -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/form.html:17 #: rhodecode/templates/admin/integrations/list.html:10 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44 +#: rhodecode/templates/admin/integrations/new.html:13 +#: rhodecode/templates/admin/permissions/permissions_objects.html:28 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:127 +msgid "Repository Groups" +msgstr "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 +#: rhodecode/templates/admin/integrations/form.html:60 #, python-format -msgid "Create new %(integration_type)s integration" +msgid "Create New %(integration_type)s Integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:31 +#: 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" +#: rhodecode/templates/admin/integrations/list.html:104 +msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:65 +#: 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" +#: 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: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: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óc 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 `%(commit_id)s`" 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\"" +#: rhodecode/templates/email_templates/pull_request_comment.mako:95 +msgid "Submitted status" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:17 +#: 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 index 309fdad0..5d824c6e 100644 --- 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 default values" 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 -msgid "Successfully updated password" -msgstr "" - #: 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:261 +#: rhodecode/controllers/admin/my_account.py:226 +msgid "Successfully updated password" +msgstr "" + +#: 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 issue tracker entry" 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 repository VCS settings" 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/slack.py:45 +#: 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:46 +#: rhodecode/integrations/types/slack.py:45 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:69 +#: rhodecode/integrations/types/slack.py:68 msgid "Channel" msgstr "" -#: rhodecode/integrations/types/slack.py:70 +#: rhodecode/integrations/types/slack.py:69 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:78 msgid "Emoji" msgstr "" -#: rhodecode/integrations/types/slack.py:80 +#: rhodecode/integrations/types/slack.py:79 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/webhook.py:41 +#: 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:42 +#: rhodecode/integrations/types/webhook.py:41 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" +#: rhodecode/templates/admin/integrations/base.html:14 +msgid "Integrations Settings" msgstr "" -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/form.html:17 #: rhodecode/templates/admin/integrations/list.html:10 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44 +#: rhodecode/templates/admin/integrations/new.html:13 +#: rhodecode/templates/admin/permissions/permissions_objects.html:28 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:127 +msgid "Repository Groups" +msgstr "" + +#: rhodecode/templates/admin/integrations/form.html:30 +#: rhodecode/templates/admin/integrations/list.html:16 +#: rhodecode/templates/admin/integrations/new.html:21 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:48 #: rhodecode/templates/admin/repos/repo_edit.html:15 #: rhodecode/templates/admin/repos/repo_edit.html:43 #: rhodecode/templates/admin/settings/settings.html:14 @@ -4238,27 +4512,101 @@ msgstr "" msgid "Settings" msgstr "Configurações" -#: rhodecode/templates/admin/integrations/edit.html:36 +#: rhodecode/templates/admin/integrations/form.html:60 #, python-format -msgid "Create new %(integration_type)s integration" +msgid "Create New %(integration_type)s Integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:31 +#: 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" +#: rhodecode/templates/admin/integrations/list.html:104 +msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:65 +#: 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" +#: 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: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: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 par 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 `%(commit_id)s`" 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\"" +#: rhodecode/templates/email_templates/pull_request_comment.mako:95 +msgid "Submitted status" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:17 +#: 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 +#: 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/ru/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po index c8d2238b..bb7421f9 100644 --- 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 default values" 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 -msgid "Successfully updated password" -msgstr "" - #: 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:261 +#: rhodecode/controllers/admin/my_account.py:226 +msgid "Successfully updated password" +msgstr "" + +#: 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 issue tracker entry" 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 repository VCS settings" 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/slack.py:45 +#: 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:46 +#: rhodecode/integrations/types/slack.py:45 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:69 +#: rhodecode/integrations/types/slack.py:68 msgid "Channel" msgstr "" -#: rhodecode/integrations/types/slack.py:70 +#: rhodecode/integrations/types/slack.py:69 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:78 msgid "Emoji" msgstr "" -#: rhodecode/integrations/types/slack.py:80 +#: rhodecode/integrations/types/slack.py:79 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/webhook.py:41 +#: 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:42 +#: rhodecode/integrations/types/webhook.py:41 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 "Регистрация нового пользователя в RhodeCod #: 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" +#: rhodecode/templates/admin/integrations/base.html:14 +msgid "Integrations Settings" msgstr "" -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/form.html:17 #: rhodecode/templates/admin/integrations/list.html:10 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44 +#: rhodecode/templates/admin/integrations/new.html:13 +#: rhodecode/templates/admin/permissions/permissions_objects.html:28 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:127 +msgid "Repository Groups" +msgstr "Группы репозиториев" + +#: rhodecode/templates/admin/integrations/form.html:30 +#: rhodecode/templates/admin/integrations/list.html:16 +#: rhodecode/templates/admin/integrations/new.html:21 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:48 #: rhodecode/templates/admin/repos/repo_edit.html:15 #: rhodecode/templates/admin/repos/repo_edit.html:43 #: rhodecode/templates/admin/settings/settings.html:14 @@ -4274,27 +4548,101 @@ msgstr "" msgid "Settings" msgstr "Настройки" -#: rhodecode/templates/admin/integrations/edit.html:36 +#: rhodecode/templates/admin/integrations/form.html:60 #, python-format -msgid "Create new %(integration_type)s integration" +msgid "Create New %(integration_type)s Integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:31 +#: 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" +#: rhodecode/templates/admin/integrations/list.html:104 +msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:65 +#: 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" +#: 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: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: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 `%(commit_id)s`" 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\"" +#: rhodecode/templates/email_templates/pull_request_comment.mako:95 +msgid "Submitted status" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:17 +#: 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 +#: 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/zh/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po index 8e22d68e..03bbae23 100644 --- 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 default values" 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 -msgid "Successfully updated password" -msgstr "" - #: 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:261 +#: rhodecode/controllers/admin/my_account.py:226 +msgid "Successfully updated password" +msgstr "" + +#: 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 issue tracker entry" 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 repository VCS settings" 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/slack.py:45 +#: 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:46 +#: rhodecode/integrations/types/slack.py:45 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:69 +#: rhodecode/integrations/types/slack.py:68 msgid "Channel" msgstr "" -#: rhodecode/integrations/types/slack.py:70 +#: rhodecode/integrations/types/slack.py:69 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:79 +#: rhodecode/integrations/types/slack.py:78 msgid "Emoji" msgstr "" -#: rhodecode/integrations/types/slack.py:80 +#: rhodecode/integrations/types/slack.py:79 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/webhook.py:41 +#: 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:42 +#: rhodecode/integrations/types/webhook.py:41 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 +#: 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 "" -#: 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" +#: rhodecode/templates/admin/integrations/base.html:14 +msgid "Integrations Settings" msgstr "" -#: rhodecode/templates/admin/integrations/edit.html:17 +#: rhodecode/templates/admin/integrations/form.html:17 #: rhodecode/templates/admin/integrations/list.html:10 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44 +#: rhodecode/templates/admin/integrations/new.html:13 +#: rhodecode/templates/admin/permissions/permissions_objects.html:28 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:127 +msgid "Repository Groups" +msgstr "" + +#: rhodecode/templates/admin/integrations/form.html:30 +#: rhodecode/templates/admin/integrations/list.html:16 +#: rhodecode/templates/admin/integrations/new.html:21 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:48 #: rhodecode/templates/admin/repos/repo_edit.html:15 #: rhodecode/templates/admin/repos/repo_edit.html:43 #: rhodecode/templates/admin/settings/settings.html:14 @@ -4230,27 +4504,101 @@ msgstr "" msgid "Settings" msgstr "设置" -#: rhodecode/templates/admin/integrations/edit.html:36 +#: rhodecode/templates/admin/integrations/form.html:60 #, python-format -msgid "Create new %(integration_type)s integration" +msgid "Create New %(integration_type)s Integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:31 +#: 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" +#: rhodecode/templates/admin/integrations/list.html:104 +msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:65 +#: 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" +#: 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: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: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 `%(commit_id)s`" 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\"" +#: rhodecode/templates/email_templates/pull_request_comment.mako:95 +msgid "Submitted status" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:17 +#: 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 +#: 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 "" From 9c4ef8e31dda9921720f5d59fed0ecd1e8a31ed2 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Thu, 15 Sep 2016 14:26:54 +0000 Subject: [PATCH 6/8] i18n: Update compiled message objects and js i18n files --- rhodecode/i18n/be/LC_MESSAGES/rhodecode.mo | Bin 132174 -> 137076 bytes rhodecode/i18n/de/LC_MESSAGES/rhodecode.mo | Bin 132557 -> 137448 bytes rhodecode/i18n/en/LC_MESSAGES/rhodecode.mo | Bin 61436 -> 61464 bytes rhodecode/i18n/es/LC_MESSAGES/rhodecode.mo | Bin 131555 -> 136448 bytes rhodecode/i18n/fr/LC_MESSAGES/rhodecode.mo | Bin 132510 -> 137412 bytes rhodecode/i18n/it/LC_MESSAGES/rhodecode.mo | Bin 134794 -> 139639 bytes rhodecode/i18n/ja/LC_MESSAGES/rhodecode.mo | Bin 138073 -> 142985 bytes rhodecode/i18n/pl/LC_MESSAGES/rhodecode.mo | Bin 133920 -> 138818 bytes rhodecode/i18n/pt/LC_MESSAGES/rhodecode.mo | Bin 132746 -> 137644 bytes rhodecode/i18n/ru/LC_MESSAGES/rhodecode.mo | Bin 147682 -> 152578 bytes rhodecode/i18n/zh/LC_MESSAGES/rhodecode.mo | Bin 127709 -> 132613 bytes 11 files changed, 0 insertions(+), 0 deletions(-) diff --git a/rhodecode/i18n/be/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/be/LC_MESSAGES/rhodecode.mo index 22ac74c06ae85f079d3ec668fd9e97887ca46419..0e41006dcb8e946f56e3d9e155dc408832ed97e4 100644 GIT binary patch delta 31715 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 DEu@1j delta 27208 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 diff --git a/rhodecode/i18n/de/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/de/LC_MESSAGES/rhodecode.mo index 8439a13263755b4cf237862afe28b323ac08d56d..ab669977d72ee42180f644dc78ba0ac2e8edf8dc 100644 GIT binary patch delta 31778 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 EFQv$$pa1{> delta 27314 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 delta 7544 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 diff --git a/rhodecode/i18n/es/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/es/LC_MESSAGES/rhodecode.mo index 8d48b2b4c1590d91de2d31dcbda1e9909b7eb0ee..80d20532a8092897b6c1b35513e0df1bd5d5b604 100644 GIT binary patch delta 31735 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 K|NEa)uKxonKAR5! delta 27390 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 diff --git a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.mo index 64a4cf382ab31fe5dd4adcb62d7f517f8d03f12f..7e683644d2fb4fd2b1629b413cc7ef5937892e0e 100644 GIT binary patch delta 31840 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 EFGH!l7ytkO delta 27332 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 XpDLN}74u1P(l{Y?G9ya({OtQ*7Q-|d diff --git a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.mo index 4afb3e826d8c14feedebba6e7f71a77f0fa0b878..a1a252f71d5fb0eb505c0475170ff30adc181065 100644 GIT binary patch delta 31803 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
)H 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 IbXRcyA3c^5&j0`b diff --git a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.mo index 53ef15cbe04f9fa49a6648f0bd2d0f8495adc1f7..8322187b982b1bc0ddcb8934ee1fa1902507b234 100644 GIT binary patch delta 31765 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 K|NS3auKxy37kwrG delta 27301 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 diff --git a/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.mo index fa162a94d9e94dd535c7b72dcc0530a882ba2fc0..62dd5cb3f5f19b463052305b691732d203f3c43b 100644 GIT binary patch delta 31811 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 C0kXUR delta 27317 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 YLb8rXxtr7HXC>??C#`iJpO?=60jn%K$^ZZW diff --git a/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.mo index 6fd4e0cb3d11dbae5220c6c1c6f873dd26dcead2..1a53545c0505eef63b9f64cfbb58fc3e67fd8c04 100644 GIT binary patch delta 31817 zcmdtq2Xs}{zVGq1HVL8kUUz_m9y&-zAoOMcDTNn{8}`B3 z_%NQshp@>=$Ek~RumSGCP`rWRSUkaTsycqhX~98lP7K3(xY(9IvgLai#`(I5j#CBu zVkew}E%6{K5_v{BP9#2rl`zA))%q3c`Rt=jd$lC(JA*jLhtFaGdtL*vpn4j`? zTRvp3pT@$RKacA8EmQ|`COb}9EQ)Hl9)@5GB+Z<5sE&0_CjNOj=)(z(*oTF294Z;- z;&ZqL)#J7)#z#;MCZQU50+nQQu@J6AHM9kTahENBfa=I0R0lpyA^yEN_>vO^v0*WfWP94*ngbkq~mRT4xb)x<}!SO$%WcT(43~&6gS`o zyo`#}@`+|6`Uop){omrC0T;ZJv>~vGU@e@CVYm*p!+mPYx3Mm2q>u+HN?s3j?pe%N$m=Wi}+?31Oa#hrvHo+R$9Tn;cs1VOZ zO+f}K`(MT4_zsr9Bd96)9#!ux)KmveW&X=^P=y280n6er)QwM~9-NP5a5)yk?WhKh zqo(W<7RGE(nAK4n^;|iuf;Ca^jE7MjAC1a^C!Qew8d*9g)bmyL!n>#j51_LBJJiU3 z!a!trgD5wuq9V`)b-oR1U3bSI?1x&ekJpYVH?cFus9`;0Dy3?m#to7?lI(?e%N+x--*6tN;=*zZ1cM9%zXV zV=v5!Yfv58WXn5I4StAf=m;tjUt)H=X3yV2EzexD%zaIf*>gIhI(h_^E1zRwt^e=s zh2KyOUnHmfLB}gI7@Z|B9+7_tPdBOQSko1J&Ucm>2t_ za%UL&b;EQHv{PlEZajuzcm*~0Mdz9Z%c9nQ9n|>_s0MqW*7qPRiQ`cnUWkgs8mx(D zP#w-S&rEsodBk7Krv@ifaVJyJtuI=4U>xVaL_OE(8M8Wup*lRrx&gJJoxqNG z3$;pGKWplb!zz@gKTG^8aj=#Xs^A!Ex!p!pP9;yR+>C3{X z4u;!u6ILxFk^*;!kQl5&8#o3NwwC_B;gokhfs=>}nO~`wp zHjt6122-#YPPS&)^J`Iayv3FeqDFoK6`^nJ_1jpSa_$$+`mcz7jjR<1@*&g>G4_UW zs0K4oAzzDCa2F~5V zBl!$<{(CHoo|jC=yr_yFz~17lf5e=W@4VzU>oRD$ z=|C;4%7xZA1>-RdFJmeWd)ef`SyTn*P?5NVio|dBeBl*lAZ1a>SPQ+_2Ni+Gu>nr^ zbD$Bti|XMnRE398Bl^OgzlK^i?klE(DyZCOfO@_eR>Ib(P!F{}j&&)|L`7~Zmc#?7 zNc+Fxpa}=Rph8~vRc^-4s0bX#FzoZ1sdyr4s^+3zBFj-B-;Sm63~H~xg%vS;rHODS zRD-Fg2+u&;^*if1=+22BF$9~fG7)Hts<;<=F$q7xbPUH~ubYPE;ro=gp&EE%wb{BC zqB^(<>)^+z$ONr1Nm&%j(7scH1IS)2Y9H$Gm$9A{? z+v91>j}_NB&Tf}FQ1{(jZ)~%{OwlveH_)%Gb{_}X@pH_D=TX^w1vMqXnP#MUF%RVj zuqQ^M8eEJ)_&Qd=wWxZIVqQFhrSJ#T6a;TH*Nbf={;mbq^Zs^OP0AHIotZY!$(^QcH(MkVP@EQC4y@0bQlqk2{w6{<$4 z5l5kV+7}Ds5L5@p+4J*I_bo+D!3tDEt56+Thw8u%ROt6(Zaii6U*JFw{ES+^cTgQD zw%PQw4yxidw%h^Lf&QrH5>Xu-i^`4Zs1eS`5%>yvvA`D7(K@J(H9`jLciM4Kk`rCA z6b?m&W-3<3g{Tp3!^Zd?dhs``kLBJq>%1pw0HaVHnS*ORBqu5Y9k!c+M4{^IgJD|# z131v!J%M^~t}VY{%derPCexnZg4$T#x97jc@|3?vf7Nznp{6U3`SNG>A%)Qtz3cUaO-j>V%3=4^)MZpps}LR>d@AML8=_TXw%arlGOe zfbs&=RDFnEypLL4-uH>WDs1?^X}ANb+z<7@2we%jNz?ZO(?AMpj;5eSG7ptJZ(;~$VJF;y*)Z2W^GoS` zs447$K^TkSI1DS|Jk-vZY5f#c?`=N^dNA95GxA~>Ot}hX#|Tt~4Nx6xf*N@T%z=Hd zCk{eQ$wuo=>p{%P`4g!9<7<2VCaONa=R-5M1yDDZMpYDsC9n>9u@kDn5!f74FabAU zX$(DJI@%ojQEqL^OE5R(<){w4i5kEzWUBnm5e_s*-=JP5zo8n+d(c!^40XOVDk9ZU zIZ_ujg0`rLMWLpsFY5k5r~!>a<;*zLKJyG##nl*C|DSLW!-+fC5(j)_l5r_&xvWK1 zcmP$=X;ed3Q5D`s4WRHLGnLg*N!Y@cdtz_OLog3+Mb)<-8<2m_Ne)zT{=;VEVVH|@ zgtakhByCambwe%F!I%$IQTI>7{5a2+m!TrL+Lkj>^=wDw)IRiUjz6*&E}$Ct3G-t1 zBc{S4sER6CYoZ!%h#FBODiTrld_1b&@u;ajo5k#$6MpcfXz0jLfnqL$Sp)G}L+d@1u4lG8^^~?797A#2l0P4BVQIYr&73%EAOhgM{G0Nds9h+l$jPrA# z9?wLLU=?b_2T@u28R|jz6SECSn6o&yB*$I2P;T zGOU6hV@ z1TH~M;U-jWY{y{QcTRDjz5GkmoS#R{(G65Zp{I>iP!Xzyy|6i|!ugmVUqB6Djdd3` zq5K(^#zJSzR7RktI8ti;_uxQt^$2PNgRmG5!)Wy5^Y|6&!3m#}@i+sgVfM59svc+K zGA#6kN!krqit=_Wj3==qUPA4dAzxCrMwFKWji5AYMAcC}u8(D~2P)JfQMvIlDhabt zQ*;>B&~4OmEb^5}=0;eF@*|jrlTi`9gAbznHSyQT+k9;*>VV;tlTbGy@`dez&YLvSP`Re0_yzXbAFQ~U)vMcQ4NNiH_I|Vs=^3V z5;aAw^IoV1Vr_XMdMVFACEc5-T-bq%@Nv}h=g^D4qH?UP{~I&%j@XP7$=Ddzp|bo3 z48_n3W=h(iA}|og;3zDI-(oms|JM8jRTHaG9)QZFr%+S142R-=td0IU-@ zM}2a&MrHXRR7E3fIT7{XI8;S`Y=F;VBm4k0RrgUzn&$^IMWLvvXo{WiAymhfU;(ZF zS2@rK-$q4XH>!dCmy3YO~-4Y zrm8h6d3&N?>w6>zdT!^t2yke56G-|HvqMqx7fqJk5@7f!_KvjGP>tpe&X5;9Bx_>UJV{f1rx1+NC z3mk_xQTL7hnL2SEYHB)PGXqPyM*Qn?Vg@G^vMs2oIE1R`5-RjT*G&gXVGYXNQOk4! zDiUvFK0Jha?sHT<*HIlQe8Y@_&Cq7%B7BK4@1@CZ^?l!bVMz$$FLa2+8f4UUdq#K zc|PW*yae;$D(fcHeY>$19zosb+%om%LET>vbzeC==raE`I8Z2V-{yx3ypM`N${iD# z@mQ7e98~DuMs;|fJ^wjsPDAdR1|v`nHLGMV z=+_2v!CttEWhmc8Jy61R10AW0MJabgFAhY_?PTj5RQ5lIs&6G~3O1mg+ku*bkkF2c$Kt^ixUm;7Di&NVAD`4YHy!`3gtXoehxJSFQMl89aOFy zMD2J-QAu4gyQ!x?PDoXQ#d48&r=&a+$db zM@>arR8DlU_O<5+qoyDp)#1_h`c%|AWiDy}8&FfZ6SHgm@8>`j9zlI@oC#cDS)wZZ z)|P)n-FFSu;rpm5DxcfTWfUs=2cqVBII2NE*2Je#Q}Qm>$M1BW_MNhM%(Cc=?I_3N zqnL^Nu>e1JX}O%jD7=bFvbOn5_Rqm)lsBL{bOp5$RmkrKz83~y80Ez{4R>JR`2wte zg?tVNn#=X5kbh{)-=pT%Q_xrz)sY9VF?PpsI1@WyP$4()GhSDWr#uE#|2Z6wISRXh zkJf3}i1OXStba9JuZSDile?fE9FLLs9X@~&Mcu%^12z;pQhp!XV*X-o;FnFkP|3Fz zb^Z=2=~@;y^*xHJXFsaLo)V_Mi6vP73e{;&RL5c^&1z_k*C>y~<``YdjBpvM{2eOf z;iXLnVo`Iv4TJC^YBl|Y+8J-6A{Si7Y}I8@%kTj|2TH2W*b@7oD#$=3(-KtHuS6y1 zTd18d6RYAj%!A*eviiC$|AtD!TxHF2ERWhB>Y?_RCaC-UUF;3LQ5}gx^*9xkG}BOf z_-a&zJ5ixMj>_(zQCq1~&UCmOmZn%0^&Jq2dOj7ETeDH^tTyNU&fE6HLF)-rPtT)9 zd=XpY6>Nod%e#TsXELgx?Kl}vp*r@6*LAw$ z4%Ndn47|-yJza?kaVFNoomd;MV+{= zj)N#~MAcuk3hQ6XsZ15KQ}sv9%_3BXGEsAX6xER;Ro%dEyKAD(Pr)v+5Gc>mw!KoRiNF%@M;t@nJW(3eJyv=-{Y zhNzG?Lp9t9)!`_72z{vgvQYJGLq+sM)Z6qERBl|s?0ydN*EJz5hU#e;DjDmbM*1jf zq$5!c`fYgzDq@RK&%KPA!nM}T);*{xI*fY$EUJSSFtGlA$CpVllq)c2%DgK+SQgH zMZG){QG5Ax)RZi@*EgX;x(}6H=TIHEhU(BSsHywama{c5Q;`ETHH8|m{?%}KPRP2b z^&V+`47DYXMMY#Dszb}IS*Q+uWc>=&ksH?Fh9+`FQ5`9V>R1>mg4O&S=z&;!LozA? z<4_yNOstQYs5$-)Rl#-CI=+p{k$jCz2g{>6R0rcQ5|i;Q9EuemaGj|*8&#h_Ut`mO zQr2qLCa7HKgzC^>)Kn#-rXmfMObbyJEkzCFb$fm@Dra_CKSZs9WA^&zrtEjV;Xqk? z1+}N&u{ShtVk(G4J=hI3XMIr}@S&z`3TjJTfO@^I$F5}GKGXn;H8)dO8E0^=IF6Be`FuE=2s7nV>%QLo>aW2-NyxDpI+fy$5p!uAC z1XcgbSPRc%Gc3~Db^2)iKg59=cpbHYIBiVBQP_aubPUCJF&sZf!%@lj1~zqh&!ajV+|5`9wOs3=2G-Wkfs(8{Dx0UG zHj0Jzh9#(Fv=TMab=GazoAQUKj(WSBkhVmvjyTk^osQLU0jlAhs16=QEnoj-4(4%i z)86o84|8J%R^3$53vDv6zV)u=pcpL;4U~QO^0O>$Jg6sQcz( z5BwPiVw(YGCtZOpC|^MB17VMu{h~AK{t4(G&%s9=w8D-9UB`#Buqpn8x?W=tBfwSI z6K`NQ>={KsyG9clq;}2eqj9;wQNIT&3$30EU#njhFS$9P+M>YYRW!{W&LX%f6fW5$E&CY zf5rZod$7rcA*c{eLFK?o48<%|$4}bxKcX7`)t)cuGb68o%KCn&<(iC&*nB?+>c9$n zA`A6?--qhZN2my$u;mM=<#-j9#dlB@h72)3FNCA6cgA+u3$@N)z-+hzgK;G)V*WQd zP)`n^viS_E!gE&7P_vbWqC(#m)$lOvhp8BWhw)*&hnl+H!(3-LCZIZS61B{~LPaQN zTwrziop27c1$RX+K7~q>*HOvyF4n;#sE&Guo6r|V&1C~Tjy}|gnvQS-|9HM1s^PV$ zsd^igTPIKv_zCmq{eP1K&1trHvlSOc4AW7|Y%{9khfxDLjq2c)(X9W#a^Zw5nPfuS5Y_YcsL1p~t%6k4 zeNWiyFJV*48&LOMMm3x(+01=yRD%zo2G|8Pb+M?9rzErfwbxJMgx2RW4D=XdC?7`c z>2*`g^+BkH#-Vay5vt;i_WS{?OZi)DiKSA_Pe}c7rOSFp)z@UK*`kN}Iq1rXH8=!s zV;dawxcN=zD_D*4WmLl@)6AaU02@+HL5+9~YIz<-?Tk0D5*8h2I@$ykiN3ZRj}0jM zXK|p4cA~b(Ur;+=#qnlYPC|8HGiv>wN6m4b3FiLNs8F`I_CZBvDC*@i9Tky1s1E#s z%AMR31Iyj-l;c1Tv@|E20T@ns5-JB?wPvA4x*yfx6;$Z&qmr-Kq(FsEDC)k}sEueC zYJZu6>iAac0SwprKgB@=7hH0oHP%LTNV%a6<5`;{ucJD)2erjsM2+Y=Hpd*3&3@1h zwTvIZW;h2m;{Db$sOPSzto5I5iaAjX72;~BFP$jV)J(v}n2Aw%3GZX8sb*QVdcrKz zE~v;PpgK4SmF+WZ`8m`wT#niq-$cK%e-j54@CbImYp4)5n`SDGK`pasn1MU7GxnYC z2L5pA6|6!z`AHMHYUeASZbr}=V=2d>8vY0a5n5n6+!ys+ z9BL|`#zwdXKf!aTNW8Pq{OI-tzEAs3gGHv{yI7ub)eQ4{fR0#)@(ZYle1yvCv)B`F z;2`YyoGGtHy|nJ3A{V{bTwj14Dc`_W*z$R^d?%wnf)fWhkasb#0li?dKMMPCeiA;0 zCr}}6w1nSW;1V2y*HMvsWU1>!<4ml97g4!Y;zjdwMR)8%c@wrn&ob73dk#7-Gs*KT z?siEo)Qy9e8`qh+z5ir75V6uyK?z5}Spoj@gPjTNl_ zAP$Ir%)Zg zfvPuTwJGO8b)+1IU|r0s_1}a8B}WI;gS~MC4n;2>LsfJg)xd4kR25lcHl)(1^9@ju z>4A!1EHXmpE!69K6MFFq*2e;Gun}qfM{=MM#GpDd3H6stvr!Rf@|Nj9TU3P|Q5AMa zjc6w7xuv$e8nxqXx988Ja_K7S?fENe043M4{RC>xq2H{zHkc6VtKvMKX}+QlZ!~*<*-a)=%TOJ96*aZ%P&u?4wQLVj(M&TDpFlh`^uw! z4j$%UIcj;_!tt1Qv-#EOOw<$|MRn*Zw!+F=%oGhnHIRXtqE}D@*?`KOBlh|!oJRRu z)CLv*uK6{cKa~T`VeYLa$;zQNjEbnYStqQ33D##(6>mg6w;i?KkD`+EJ5+LAMy;9~ zsE*x1jXcLT(}CjHQ}2H-2bz-uNa0oP*SpZ}NLVS3sal?yFw`8sNO-L~f4X*v{&S}nCv**qAv1y4XV zJO{NOylT(ywB;kHE%_p90EKrEF|Gel4z%nlqefHYkD@wq8Wq~BsD|&O>dC*?SOV2>C~DQz-s?A^Xl^g`K~+2iwZ8orfzP5g zpq*F)KSw2Pt`AH_#Zcvns41w0>Ub+u4s}M=HxL`)Xw<5D-OquR*+FcGKcRA<@;;M9 zZBTRd7^>mNQ5C<68p%3Thj(Boomj1R0qzXI(irDX#JNxV6wG4 zsz4!})5!K*otb}_}9leO1@g{1IZ~ckcz}lmxqB}<8 z5PTl@p^`E7xEuJxrN>b(qhF4*{-5Mv!l!QFFPE}?W^P=8n!9&U%jXzs6?}_&$+#!X zh(b^UD2iI=VW+2I_Dtv!FwlI{||BS@JX{CSD~``0BXcnFb#{G zG9jCb4^n;s)!^r-xxRqmSm3l-mW@zT*ACUefv712XR;N_s~ zSyOQfR1OS7^?VX)By-V=D^W?d57m+D*bK{kVLnP9L1pbMVcW2!wr z1vT<#P*b-W%WC~+a!`d6M^Ve^j=kX?YNR3OP3Y>Orl=?8#6hTKH5|3WJ&sx(i%|6} zx8+w+&#gm6Y#UC(Z!tmZf5o4}Y=UX!cMNzA(I{NhzX~%(*p*O0biKsc-hmG(&YF(H4&RnmD%_&d9cDU7= z?RztTPS}+515qP>0Y~He_#`&^!PK|?2iE@xP8{b%V|?(US?}Xfp`V8u@w=!IA3{au z3)K3)jmqv~Kbn7m;W6w=`4v>dKcl`W%Um)IwnlZVAL{kH@RHwT?>n4Ow%$PPd@U}U ziqlYYy9*!1FR(v0yJ9NNKt*gDYTwB5lZi|XRAh!@7hI3pH}2W`Rbt_Xou=~Pdw=IrGt7IwYzIJs4l3; z>_SE6ASwwzM=i^cU(G;DqRvNPxYmDP4%DC@)zEC~bEuBJiu!=a#0WfqdaK>RaIE#4 z8~DSehfxu_hFUdw@0nk0dQrJD2$ihqsANBjemzk6zRCIrQFA!~YvMDg5p74kF88A< z2z5Npbc{#l(D@m)91FUhz!XGSBT*516xE@rSPvIsDDHPX{y=hFE9gIQE`25YMoZd?g{+m(pXf7hJ=_<`K`;bH|O8OR#-BJC-6G$kCBv*q9Rm0r-@KiR3z(T z2sTIMQY31s{R22q(v3!KrIS!uy%$x{K`er2QOR}RLAC_>UjyZdfq`L_qSL|@BgBCJ%O*;+NcL7pyvJ=R1&?0n!Art58go~PnCQo z=`C~8$)Lv3J%@_PbFUK^DYU95dEMC*Sr2in2nQ9T}QZqxcK%$6kfZYAILP6Zkox0cyZUFbsPXVf|~a#}qL= z%ETs=FQDGjp+(J&18^GUCs0Y6qnIb~b=w2Ilv7b5Uxcc76KZ*$w%703^W}?s0)Jl= ziF&zhD9-xVR#>xyC-4n82IDC&L(OHLk{;(aM&M}^!m??=5>ucE#Ka)g`fl~7652(|OIK_%N0sN|c4A-E9rHM|tHg)hgdxCU7re&;v` zO1^8TjU{(wGm;V*PPq+gT@OcXFf(jf*ln0`& zugAdm|7RSi$2U+(=T!AL(a;Q=;4N$3i}%--XKdh`v3yKI^D%+}kuzIhA!P*X7p zRnb;dh|i#w+n1;fE4+c3g8HbpXH(PwdZChd0V*lipr$Uf0qcJ=2Rk^?57QcYoSk?K z6}knDOlX(mAj(%!a~$=6$C-lta3P*XP2uRqCUSFeHRU%@_4a9EM!p{3q#WGT6Zk)~ z&-8Pk2*@s#^er$)Y zp_1_uK8Lkic>+I8`}cF89H{f4dD-;CA(SVgdVU_YTw1g?A1Z@U_dk!C>)oj9cdemq zJb|Ad+N189f?D^lqdJy}8o)oW-b-euirBENTQ-P?5^l#UyDFRJON3MRW-2<&%cm>*t|5vc_KDfr{wI zeh!pemrxz}4K+fytGOW`YJ^o$QxSoR&;zK3x?5vVJ6@`FE-J(;Q4!gJ>d;Z^x2O*J zf3pV#yP1xJSsS1lh(wLNuQd*nD33$U@g;jccXt!=GN@%+9rdl)8#TqVP*b`Hm88p& zdincb4%EXBP(3<{ad-)nu}=@PQysuy-VOC0G8HzCG98Yz_O|*^xsZy=fqAF~Uqnqs zCMuT>V{Wbg&p6N&oU<3Mq1NwRYfw)U`n;$Ii`#N})QGC0w$}Rg`dHNSe$<{Rs6ADdC+}8LR0| zdiQ4zr+0d`Vz$HtU#9Qb=Uo4vT2FS`q$VZ#5>o!$rQ|@LqWj*O0r_u7&#*_)E+ zP4+Qeqf(QHd3}0F=Q5T|bz5b2TIMg9BQ`bJ)U|hAp=?Fty?>f4Z{jG;S#svl%$9D= zD$()r{|b7XFS)8?C#+{`%otx%GPinr`chKj5{4#c=Gb&BTaM^7{yl1+FCp{9J2l-p zqhg0er#Kzr0{*3))TH=`KQ1KulBmtwJE}{jXUm%4pyb%ZQR&NeJn8n#IJ?>{p4oh7 zn`{~D-*U&K2kmJZ)O*z6==4T=##S5|m-6R210!efV-u4`coP%i)A*nCqsL3Mce=#= zgIm2R!+hSsaY??|6mRUXxOjq_@Rz}--=A8ty0=OK;Z2PRq#W@uRnuzVk>8&PG@rR< z&nUO@2%k6Fn~<0iHzY1LupTr&YATgcC)0m#QexuBh|CguJGnt!qGOWNqdzE;9`iwH z`mzsB=1k-+Ggo8wCA(Fllam?UVDCs0!W*OR4jJML68$E_BiH?c)WyTyh@A|#twJaz8HGaOwGo+;5OsmXMKprvJQKQz$e*KBIxkme)f5|X{K(FxvI zvr+shdy}2+zu#z@`zLoNr;hR^{jWC;H9M23J$qp0lG95c9hbT6=q)!-oMtXIkv$x&tdm^i}A3LTY5?U|)c zeHR>*G%DVge*cTJ#be_}#c9PlQNF?aH!!=gzU0iGzx*L@v8cqvl)t2;$+Od!r+EBo z-07+R)efx$`%_>dyivZ`RMzVlADeeH0sNnC@OqO{IZI#vSn{Tt=oGWndZYCM_}8+q zwZ*4JI6ZyQNwJxOu0HSa+kqyh#t!pFCz~15HpH%^=SQUm_LI@6zU083u_NfGsVU>kCAVx{Dhs4eU_VSw9XT>OiLFe_Fxnfh zgeP9iqYb=wOk8xvPnX<|nGanb6qKDUCLwWb=9*h?1?Th)_9h2XGd=2FO8p3LWP;Wc z$(T5DWNO0i%X@5G$}n%whr4+bwWoFH)vJehR8nF}B5%)#%)R%X4=Juy&K7O9O)rtu z3XV_9ipuULJG|UAL>rc zmM1znHhQox5TE#r+F@?7d~Aj$?My$~gt;>_z6*1gWH*Z>qew%~)U4pjZjWra9ECct z_%eD_bK3?7R%yoMYHpE?d`&$iL%gZ%-YLF}Vog0WGICXSzbTyfmjMS_$huVB?VBxT z{GT#7@D(xfkEl8018>y;JmuIzvMipt_E>ir;nL7mC2uP4^ujCJml|F3^QrLWl&oi$>;o5xePYxF<- zj&hE?bo7a%GmdP_Sl-udleIgOKeYPevnu1kO>RxTtA=F!w8>qPtLq)c2~L) z`kCYRFR1_c8*62qcU(^iK9v5=&#bK4Tii+>|KEH^{qygp|FbWx-1;%eeraWO+v=|W zZ}h2EBjd@P?trXIJKa}3fBE1_fBIP8tS{el+x_dSD~qqLUp?VH{?R8_R_Oz7=^Vd* zb2ZIMIOgVX|L)5xYxXDZ>B4{W>6L!^a(dRS@7%&3f8f*Wzvct%$g(5bv+`ebkNto1 z0hYxF*u3D}J%=TZ^_nlRtV!40$sq;!xsxB|QvUc7%lPe%yXrsnDVDzXUiGXaciq)F zD)k!1&rsfI{+p2K{kxB|v>?x-{Qv&P*`SR0BA&wb3oVN;w2i@k^Kljw;T(A`-RRQHt1h-%<@ z&wj6E@x8V;D4#xq{`9$avWchL-+iuS@ws;1{ku=KNp9Ad7M^%d?En1_Hs^l;ES#|R$$0CgH`iMeF8m41u+;8iTY&~xum#Yx%%`pl`U;|u(Rq-L##$tVq zgRvm>eb$>+cR%y_!l?0@O2&6hppX%FVP-sv+3*r(#XoHQjeVY}zsr@5b`PeVhHU)1I)y8 zp(YTG;aCnea7#>$oiG*lL`|&!0OFs4!U!6);;E<(m!XnzJ1)lWP%};#XdHuzR1#`{ z^{6DUWoyf>wUizVL&6a0_)VA7f^moMiub`ffm{JRj7#UL`7te(d#;CA6&su9$Z6(_6cg` z>4&*o9WfkN;%H35+`~<7Y(wp3-4P}injx>aKE!yujJq(?NE4}J7)|{#7S{RCHOgEN z)v*WV|u1>$yjp^IHuS`au|rD^Q=mfHC+6-@i`pe)Wm)~vWV>KIkA^#+)YdIv0q15u$~feP_<)E4Z+toSwNz-yQjpQ5%T-8j>4 zF4R^RLT?0x`V?eu496L$32Z`rFa^W#7-q*?r~zJ}wk#v72*HA=(@_ESxvCh2A7E}A zj+*#;p>5IdqK(iPR- z8})vobqp$br;MlLycFispgVgf>ctDo|$q+u#??fGI<1a_c8xEHmT z$58`bM(zDQ`~0PS9yrBBEE_6fvB>*gS4|47X=sa@*>==K_S^ai45EGxHPH8{Nc@Hh z8Tu#hSJq~p|JEA7u2i4CwOvm`H*%TDACDzTTJ@cVvd=@q1 zYp4l6LcRY6)lu3RCZxGg6OTqsxDsmMwy2!xVV_SzT}%tns~0a)D1?tNHHLg*2F!yx z?-5}#plypEc1nwcgyLQ$tC8r5&TnfCm5qCpcGf*zb} z-D$mqy=i}j>Y(E+b2>(&Ccesg5+kVp2kT?-r{V>AL0f(ZtAj#G@VOi=Yu^j$`{;Zy3?)aJ*M|&TP#*Mc9B4(ui8Z%)U?_5*J zi5egZl_ZsHy$Nap-Oz&*FcR0I_WF$VC-iS27NtF8p6RzLD%4HTgFR5=OhfMjvLz=cs!kRg!;P zuPcu!xMENrsBY`6Y`qs2rhN>i$MvX?@5G9D51V8D1$>j@P)sWqnhAPQ6PkmXz+w!< z&oG$$b8Vxbl^;N@a^+vkJq^BJfC zH)2*ih*5X}z1qXq6hblWQWM$;)J$8Wvb8I!gF&c)rlTgd1U0dZm=h162Dpq`$X(n1 z3Y9}ymYIo{K=oU98Sz(gw5A~l7oa*^iu%AdR4BhgefeCm^+%Y2`U`8|amYiAX4_y(nr$Wl_mk7diytVCMR-wDd+rf`ym)u;h_Y%o{w2-FN0 zV=3H&ip(FVWPD|xXWD2&Uko*|u2=$Rp(6K{ef|UsP%pH}SRbQx{`*mg;lX0-DJ)F= z1?nozyV=+P6`5gJ8rP%V`_Z<$J~Pi_P|rWaVmKGe;Xzc6{Edw;dJEsEjPDvwp)MXm zB}=N$xr7{6iF)zcR%7HBW{VQ7b5K|5=a>qQU^+a7I?k6cHQvK${1ek-o^9p_OceUh z{}>8^JeY;~aUQCp-IxInV{SZ)+Jbxb`D;|D1Gk&dmqFD(!ZbJ=qc9nR@CeSvuTc|j zwS)Mp!w+|uE$D|DcsXiin{53n)CW$XCUg$d;tkA%cTw-ZK&?D@r`ei(7)iZ89>#&F zttq+7yw`mf@z;Q(Xvm0DP5PpqW@Em5v+o%Dbp(d6l#Y89*YNgSriI&6= ztb%&Kxoz)>dT*$gfmk(p-=MbU5^92vQ2o8P^}yX` z;OwaPi=rl08kGy)>J;?B53mn*Mh||6n&BhVgr1>R>fU1_kQNJ54@13I3oBv+^x$MH zgBwuC_&Vx-d5Ic0WG|PPoBj7t&`QtmGdI;W)Rw$Qy_jylspmk|^P?tG!nT(~4N%>- ze}oa#6RUl5BgR@cnZ#hc*m5n|cw1ShUT=*5WXOFM} zKF0v8cFg=8a4pm^oQm4ZC8%@05_QL)#Qb>Qn*O-yw*=~Q6;Tmrblht~{SggHs_v)` z`=BN^&^itkfmx`VZ5g(}^{6d*Weq%G>X}gs3BwSKMD-Vk+R}RVc?&NEb>rYV~y+wsG)fuyO!Kn6vr~zV7k*tO4uQ{rpuGT)N zzd3Uap`evaLPcP%9^e*KPV7f*%_USQf5T$<9F;ryzcHVWLDl0?@72Y0*cLT#H&j1; zQT>lYua3#56bj%D%!}WnLjDYMW2SFSN71NcD{JfZQ606kc0&z37=v*VYT!AjWL%7T zz5_Lpqu&yLb#R#mt^5wA#kZ&sruxqO)(gX;)JtOoc0x_mi<F3OGoQoN#??gr9u<8!qYWM;5d*}JP z0xW;Qygwba($6pz9>BtQ6l3u|D!IeF7tKmbS?i)!&=K{)X{d!Ci^6tiF(^xrF}t(b_~+L;)H-c1w&D13pLaVIL&$50(TwmwHi;4QYqbeBzs zolx1`3$Vu`Pkg-?= zC*wh!iZy;cqO?8j4 z5OYxPjM|zJs2o^}Iz0zbNq8FzV&FCNhs+|V2(H8GxCNDT4^jO*)pN#o<+*MmkRLU( zXw+83*?L3!yo0qHDi``-E*ybbaXz-i4cHvt+4g2XnOx|OdT$si;xo{zV>FL~I^2Od z@gQczA5a7QZtL&SLp|dS(_snJo>xcZMjO=U6VQX>P`R`Uwc>BF54sI^@dmyQ&9c>hFX~G zwuyA6+g_725j5yQQB)Gep^i%()I^$~KL=2!Wd!Q^80!?&ahr|WHeYC@rR%!Koz7E%J0 zgz>2UYoI33((3I*K}qp3>bQ)>+&B-FBwMjC?#4*GfeK~7uf_<}1miIR>tPu7!n`=e zwy#Gm-~{UP*N_ExUC$}R(-8cdInQ-bGdzcV^djcR+P|9#_Ch7q7}Uf!qqgWvRAjzG zP2eu-a{+fvZbf22>h(|)>4#Yu-!+kfl4k*Gk3UC!@HqNA!g|yL{xCCdgmtO+Lhb1e z+kOrexd*5T1>G~xvtt43Wl+!CqWVq5GK}w4BG8B?16vNY~bNL(VsPG4AkDQMD?@JwjaYl>Q`<14a`9OuC4$5nD__N@Q#M`nC^)& z2kOOwsEZ~R^iDfdO?bO)KjEbiNyB5* z0HJ@Gj`LY#Py@uHB2yn@unTJI=Au4-5|`sc%!o6dnTamOs?=AYKeDJuJ;xCAX8POw ztyKXGprIMI!B*G+zrZQ@3biHUo|~;$fy#*k){9t(`aMj88DE$Ib6`H|B~ZE23_aKn zOX~d3rl1cTM$POrY7g&V7JP{5@SSZ>`_fDx1oeJN%#IB(6uY1Yhod68*t#ASnH{M9 z4r6+q|8FShgI7_ZeuN(U2i0-dD{~)|Ms?5{b$%02dpi*|;jO3%??r9NX;eg>U|9@( zZEnbh_?UVh%&GI={*4JyB4(n#5S85sw$Y>LXDT+KX{`ALFrLkpDfet22ekG)zT* z2dNzY9=1S*y05LzMD6K%>tWOcu46@fileY-YRCU|y%D3RKf%73GmYcl$|*RS`W76f z^Bd9}G|D`2YRBPp|^@3)m6U20O0$*b{5vPHcxSupu^0Z`zlm za_kpWfA3KJ^x+SXqZr?{o`O1z$Y??|7Ikd)p|bxse1@4aIsSiI7LeJjusT+z{S#EE zPopLfl*R0ACseL{iaI^>Q5V=^ROB|HSI6xT1trl%tco{L9}LfGk|#eZ35%m{x>8sK z<1sxZpptj6t&c_}+jP{iTY*aIov8a`AL{*YvN~S>3zuoo1pYwH@EI0DcZlOZuTiKD ztDr*J0+q!BQO9r`>P}ydd2kb!z~iX%{tT5%X|tJeqEPK+vhnw?8n}Ud&>A(1^}If+|1PN0PkU-IUW`I*{EZ<5S5JEP*>?=>kHHh-r;^sm&auN2|PkQZyca^4~0UM*Tz6UB)v(W#ggC9^ohdnVozuBrOSb+K})ceO# zx$rA$?=uuINtYj$TUAl*AE1t9H}tAuI0emcmVK}j(^5Z)%8B##`F+$@Wh`h6LnUvt zwLYr9UZ?@b+WIV1F04WA{U%iMeqNCCuYvZ`pglc;s(*({z8|n5-a_R@(L&||iA8l- z3v~fCKqYM(RIcEC!+eBgu3u%+4`zNUX#6>Y0$a+76b7Q)c5s6)Q$Bos^d(N zrk(>;FJdi)T0lkA=WC-T*Z?*0rl<+EL4B?RYU16z6touuQ6HF$3h^hX7Z;;uyc(Nf z3hKR}!lr{@RK#+k&U1cLE>uPh+!3`E-BA-vL?xjYwLtF{3R>Zpr~%K~`V~~j{y=^3 zPt=~hwWf|T^{l7?!cm_uhMHg*)QaO!5vhX8rJAVmIwJ3RT>~g+prPo&aj37yRjA|h zBdUYUMNEgG=%$_vD`S|gw?_@!5tWqPY<(gsg40nGU1sZBFjVLNAO-FHWz<$Yu`dKf zn~-KlC08lbimIc3k5M6RfZEGusDVDR4nnPTGV04_k##F-oMV#lT|ZFJ01vEhP!UO2 z)C>@U8Zb91G7+fv+uG;7P%9gNMQ|LJ!Of_xyNUYzebk;mMosKJdNq?Q#T@^?URMYc zsn5Zl7*O1CO~gK^jvk{1eq&7+W9qq4dmD|KNG;S>v_M6+9V$15qWT$&>Ssm_=U)$& z(4ZBsv2HkqBFmfeJ{DuCpU1N3u3)|sDqtk__NYCdfcky# zIhMv7ww}47saMBBv=7B7T!szMdxAn$3Yp@}uiPfqg{T*PvPQ<6`XFph`&ZaipQ~gX zjK!&6!4eoy*&NT(s1*-FMIr@@;y;*A=f7|jvx54lWK2ZefYVUtcp+*}ccb?H5bC`% zsGn9h(Sv`Z_B^zz+3WnMekx&pY=BC-e)joT|8ve?G6ikH28_cys1Su$GrtS!peE8C z)!`)TJk-Qip(gYhDi;o-R(ucjn=iULKR6uz=#852q#DMhm|5q4Ck3tS7;3N2qAn6w zO?&=P&vToqW32Jmih4cNL|3A6;vnky{ee1`0kur%v!d>SD(KY=n^4d(>x*-6 zhxFkuqtZcR;W-ct#M7wv z(l?_&9EhFpDAvGy&CTb!qwaxqsQbcuhJrru21jGV7N+AzZd@Scf`ZyHR_243#ujP`{2J zp|&Jd8`E(pDk<|}1lG1DpnlFzK}}#CD#^E7zeDBPeJr8x|IoH(&uXL2aR<~&2A~EU zh3#<$>PzD{R0!XrE|fy;%#~agHSsp6_K$6S6l%qvqLTdpDmlML|M`DLK?4W2H=)ak z`o1oLnn(;PG8JvTF6tOI$Mo0%)nP9zh|}!zt*9@ZJ*eaT76UM_gZX++gIuk?|8yd7{-7yx2p!R+fYNdNoH`Z~~0Jl&R`4^Sd8M`>H`B(tc;$GDI zM^Jlz12tgUu4bG}s9cHgQqVxLs1H=flGqV7q1iYYSE6#HKsS@s%BwUA@`A*aXPoR?Y zd(=X1p-#tR)J>SJhna9RYQp7E6K;S^*z0Oz3a%ljkj_KRd@U*>yHNvQK&|j+`}`k_ zr=Fpwd9OZd-~`m3&qNKFg!&_Cl|<`+#g7N`AF)blS< z6S{)Rfv2dBGxat(5Q%yokIJDoSQS6P^7svI;;MIlZ2H~OhpU2AF~R4%mSD+Wif+@;v>`@vM#!)Duwm!4%Ylx1b_&+SYHNw=4~B zD5#^71I*Rf6LsSyp^oKajK(4Z&G~JK+Uqf>P|mb2Lk;jbDn|~Z2QQ%}@XXe;3^L!Q zv4c4O+Us^S$Udl*j78ni>(IYfs8HWR557RXmt(NGXey&7+8Q;ndDhh!NqsxU;18&8 z!=OYnp?Zm&e_aSYXvmG@P#;)=x?+!@R&)j{<4sf&sIsxBP--kN4`-YhaTt`jl0crxzY&~$eIbIo1S)U8F zkbI~syAsyJPN;}&M)i9Rb$YyiQb?vyY=rr%mJ@i6dghVlSMV*=U7lu?32i>q*J?@B zmQ=E~uY#J zfvACJpeD8n)$w6eZk)p)Oh3-_mlgGXB&xq!s7SU!eQqFTV0@RCf+p}O>dRvdHo(uZ z623qsO=*&K0(QiacngPOyYXhv&!ay70JYbDqmnH51QVfVsI3`_O>i1|Jru4|PcZ)WI))=r6Pdh^Yn@8_U$hK6^3ohDr*AjD2q(=YeQ1?JIX28nm|L^}A zQqT&zqJB&cMy-4rY7bXnB%Z{>_z+9u)}`jX+o+rI1?qTZSY~n}40Yanp#~g3b-W5acn!MyP>%A^#PNYba`^ z1=pI-$Dk(M3-#U@Tc3ftz*gAy<6a6%jti&(enQRg6-MBD)LuudGb?X_O0o{9jz2*~ zA{iCQ4XFNhqmuV9PQ%l--gLc5%63-oAPV}k-V9WSo2`3LGd+g7IPRe)SYv}ZPMvTK z^$FP8;SVMo&5zhoo6MDc8Wqt7o6UrpqPD05DhK)@r_JjcNnsBS>rhv1yU)x(!%^9~ z0JR0*pa98Csx$2?bYiFH}TF`OS`xj6Vx{JC8o?~mB|G3XhR?oxHJlKeJ zG5=Px1s|g(@(EVMBd9HKzAyunME`k4EubMP7kb<0i8z`1c+{2zZ8Lu>mJzcuzH2=N zWvLH!&c8x^`TUCd4VQYmF&fozV^sFGK^@bNQK6oI%AIMb{$`^lmSkOniokZ%L=K_1 z1%*=-v?qCXm_09ysy9Y`pdBh1d!ag+v- znQi^+ot%FilW%E|w@?EcdmKCOPWTpkE{%u>lT8ef=K8L0D+FNwQ>&r@k3Aq2Ex+^*3ru((N(* zgrn-^(Sr?81NX7*)36owrCtg;et)7m%(T}WqX<;T{ZJvCWb3m~@2$1PhM0%Wl+y6qqfdlkAjk>IV!a6?1RCm35-F7az1L{)u@hkSofm_K88AO z7g3S?*|xtz^_zO1Ij$bmJraw>bpD%AQ1XmHbuiu57oyJf8q|z;p>pIP>LR&_`bqXH z>XhW!Z%$1W)UV#IsE{u~<;ot^#4aEMyB=UVo&OvM%nI^jJ|2`p4cr3tZPy(&@JQ6} z{!i`m4X6S3S}&ot;xQ_;>Ay4)%#J#y#jq&WM4hGqm{;e24h5a}ZK#!A!XkJR^}*C% znU3?KCQu1Aa7$Fg2HN^q)XJCOJ-lF_?>}gg@M~0mf1o1r4!s#1{>XI5{2gxL!{+aT zhoOfTPN5=k50xXYQOC=5#QZ3YLPe+pDpv-gRyY;4fL*B1-9Sa;SJVO?p(Yx1l=DB9 zLZzdo;Q%TEPf;Iyi@FB_j+rDXk9yt|6@d<@2@b~qoNnv0P!m~!>gSAYzko{SU$7-U zIp#GXtaaREcQe!qyI>s7Kn-*P3*v3m1cFYO-wl~jSM7(W3#JPy#J#Z#j>n~V2NkKY zCmsKP#4;ZzQ_tf4+VTHaEQ@dz4dJKEiw9AAbP1Jwk5Jj`oHjRF9@KHnhdPd>P!o+q z9k13{1{1LaZpKphBeubGXUrc=yj>~i`0Pd{;Z@X1|G|;y`Nl+ODORVx2{qt-)E@tZ zI{#tcnk_1dnpiE=*0i+s1X~}9x*4Y;$?J73p-`8GjrPG~Y)jqw&T)0X_NamOqR#zo zR0n^d1`axFZqRI~iI+z8*A{imR-+X-9ZfP%8OF>2=BP&Za0dT#pA?Woi8BYO41 z4GLP}@2HSv`QGe#Db%^Gf;u+!P#v{Koq{2#3&?Aog^JJ;9EZoTKi0TnPQ^~tDL9Rq z;LR(Xe|_L34Gl2g4`y%sqLRmJ>vOH^P&u#{HG$LC%l7%tsE|KJou1TJO+@me_P!Kq zoOY-!T7Q-EU!KAd8gy=7*%vbXX#P&8J=URpvGo>e1(Dax?|^vJ0*2!tT!T|F%Q~+58vQ#<&~i_rZA7z~`_KzCtY^ z?@cqYvZ!M{2$if0P|0}_b+P6C+4SpeML~PI0zbqru|4LzWjanog=`7xe)tV5W18D0 zGIg*K^-odv!*$yp_KW#^H&g^?pcZxkN8tlxT(2wPj^qEYSSF!DRP|T$^Lix4Qs0ca z0e`|O_yo0OF~6C;?tv|-kHKPi5!KH-)O!_vH#sm66(KL``63*p^M8SYlA+;UlUzMf z$u$zSC6iGTScs|cGgQQO;7B}Y+w1*dPD>Nimb62icdvCNYD*8IlJh!->-;~bpri`9 zXF?Q(X{pyhwKqb2$#k*pJy6GSpskNXo&V{mzZip| z4>|v3DAamrIv9z|sjtRdSox8eX&bCc{bN*4Y(YK0iQ1Z%SR8{Nn~7J%Hq>jOl6N^y z!9P%2((j4cidj#*CMiCnLCJ9hwRcxhA^I0fW9C22Z^K%sTO|W<0kyETsQX~Q^#&@U-uJdp^_kflFY2mH#>RNqn&EHrr{E6QlJzYbI$+j33!gZJ$x1y3|H)@Z+LnYO1 z)Q$KEgRtx?6XJMOQZ_~aYnW zV0YB{{{|J}i&zP7p#}(hWB&H63@Ud_9 z$>!Rqiy{&Ad^T#L8&P|G0F^TrP+RsEbqWf;HM!CpYg3+M!ubZqA z1!Z-6RI&}TPDE|RY}5s`2(_YR_W4%ScfvkYL~fwA@Bu1P&rtonvF)kenfEfGwmkeD z=U*>I(V!PgU@eSCo%8XiJxoDG;0S6&^iHTN`3)ArQEs8QuPK-ZYbWehQWSuFP)#f5cK0D^rcg z;?}=0;dOPSFqVctQ7iAC)lA?%4yIl+#O+VMy_l8ym#Az%hq~Eb*!B$B-2NQ$pl-He zsNCv{O14DQuikN}D|jOMfB(;-5KhBhRFZv<>G2_I=C3gl3x=8qG(=q>y=;9HYC_4V zBtDE8@mtiMUq>BRS9T2u*bJ*-Atl><3Yx$^)J%WCc>D#sV0aD_GA~x4eh@X#TU5ts za+-Qx)G>}mt-KCu#f`BBHp6PT08{V^`v3nwXXJ9b#?!C?8)0N_xBoX_BI?39hYIx_ zRIa>6WqHj!=2XnYCe#n1R-Q4;Oeh=`$s#x&%i%!uVKIyfck}OmQfL+K_Wx6`v8V}L zL`5WTUbB~#P^V#x^(5+Z86!-4In>s9QAwGM`lH+h)P-~#Bk(@9z_cE7syceS<~U8I zK{MKnkq)83qSW8!bNj#DqVk(9sE+E$iwf;3)UjHJx{&UpLjMx=t@sX=j5!LJ2)4o0 z)cd2haG00EehL$@9abvnb{)Y*sL-`3WJ22=J5%3{6EHN=?f+LRlTlwL#S5E=HNY*@ zd!hOZi83qhhhI=XiYswI5tEGGjM3(NSHK257>m>KG-~F}in?9%a31!@0>#X!n2$B7 zAH-bf6gQ_N57wbx0~M(msO0+$7vn?hiBn?yTj+H?qELW_&=PL{KY*-=n)zzf@p*$~ z(Nogwd27@jk3&88S#M%R>H($9dzDe=JOMSq0jLGcz$kp>Z};+L5bO5;$t51O;<2c6 zdJvTZf1tkSLrS~-U&l>Rd*26jAq_wcG!b=5W}&_%*P)K{Zd`(gQMu8sjJZELV-VxJ z22)T+BT!j86SeotP{(PrZTF$xJ7v9&%I-&~NW4Iu|FE)Vq7_gRX@R=1x}%bBn5~aP zuNvms2a8czxf%m;D{2KhF*kmNTKQE}$3LOIjvu1#38x$@!cf#{$b;&?2x{V`P&Z#K z)O(A{asD;navBuE&8UHPp_1n;DrApPk@y?+en5GXgqcwHL>!jHwy4O>Kz;2lLfs2{ zP@g-C>h~IIt6rDq{A-1oE0_WDpk^G6>L?bq(yFM4G({y-D^y4ape8l}6@j_v!S$#l zJ&EP<9jd=_6-@+dqMLeMFNMk!8lYA>9W~$_)CyLkLUkCGlqaz;K0$>vN1XW%h(_&w zHPl2tL_Hsfis&R%ZmmRZ;WpHSyu0iRhfyK9j{4wJYhb)tX%5tvO%ZEV)IhDQy-@>< zwSJ1~X9a3OJFG`>F!f8w)_GmEE14I%p+Y$XwbDsg2ERb<-5u0cJw|o-8np%KDw~Of zVQ=asF%g$yPs~__2y&$lL-jMJs+s6?zns6twqY}BZ}*`latW2)zo0_<0+kzCtC@~+ zqgEV=YA=U6j#aF6QAyp@K5uX9T~Q0^i#2p^huaqppgK5)`rx;yJ-SjY2~7V% z!f;R1E{Tc52Mq3>v~zCGlo4~L2PPF;5SH}gf+zDAga-HSKO~{&;4VXY59pu#c&t+* zIcl7fJ0;ViVNUq}{+z4k(7}Tf`VaB^U+*TSyie}nPU*3bL!zlpnsU>m-#umoI0xp@VyO>FY^M7(6UtaPh?6-4i_h5(f87 zNWOmD`8esTbBQT&=Lb0{*Ds89QU+eS?WElPew5>De%9&ePHKN`gu6-qb>CcbCy%)7 ze2@}z1|_%s)v1tl_};qE9to_gTSB6%c|woD35mTt1H1H0NEvzm zL5ActublZQ>0do|f)ct6?$*oq?LSVGJ8A9PK}nnb&5`o@-_?P>4Q}VNpyWeR~f}@bn)r zq<4?r-TZ-Pkwb>`?%y-f)o#Gh!JdK111~$-eEo_!{Q{DA*Kvm=XDI1R%^lM-#?x!a zkb!X}O7tDjtxMlt0}_YCRVZ1ZWQpW?C7qSNa;2P$0m<3RI#qqE$~qk!U#9X->wx6b zaZb0`3dKvtdSXk)l`UJeB>zj-v`O*i3B!6Pvg^fbbs3Tn$HP+PikJL9@0Is;jCb~@ z`yUg|N5ZYn>&unkJV@(HJHYuS=>JJK-<=^&t<*N(Jjr>-Iye5ir1OzNmal7$hYLMliuw+f7JQLN#1$fDgOUWOdpAv%JKc@gtO7{9r@aM@A&vfEd|`Z zncq5}|5s*4CwIQ!bWGc1U_$?d?w%(7eP3O0HoAS}>4Lx{&+Uo6P9|d~_icPYJ5qFb|%L(t9OLQ(}sE{Y>kVtIiA4?EF0(XG{Vl<8)suL zyns(&gOMIjO`L;ua0iyh+Zc?G#d|zeJ+8;oghF*L48vNu#MTem`a=xjdd&onrwaDL z_Ba`v;sI17@+5jZt?&t~gg)z5>$j-)14o(uA|(BL22#j}3$OsL#3J}M7Q#<${gl0b z9dmL05$3^MNyf)8H}y)kULA8%Z;X1rjkOyVquw7~HIPC4wZ~^ z@kQK#8gXQb@kvyNNvIB{qLOSb7Q)w29ese=aF?xrh8oBr)BwIrA^trnoZ~`4tea{Y zYKwX>3biz`7>Z+24ZngK;0DxldvG2evG)g#_IR>VABu|H2vkJJqar;G{Y&mrD8hx6 z_JJ+-#&%rH^@FIHMvpO(NkMh^9IB!DsDZtVYH%;Ay_3jJ^IStc*Ly6>frC*48Hak_ zok~F=T8I_#Mby6Ciq-Hd)Pp(G%)T#kRw57hHRP#vY(>(8JfG9ML@ zMMl^2ioNj;YJ~5hLVE}`^B=K4{)Wr3-#Cva9q-|b`22XYmcbKDE>uT?=4prxaWihl z>!?VrnrIH9gIHPn|5plixZ!<92Lgu(M&Kk2!cC|X?n_(0ht;W<<6Sk_6>H)I)cYGT z98aMJkYkd^(*h&0GR{EV--s1>#&ec}ve=nyW}F9eQ!iudRZ(l&0K>2gD%2BDA)bp` z0v{^-U&Y7pJuHq#P)l+J)$XsTr4E?F`j?|ng@SC0WpEhk!Dmq~F2vHf3X9=(R0qdV zOLh$lW7er=cRYrAuPj!aPv$~doQsw4P5Z#-*qZuR zsDV_NZn8K8wF|;g5vz?FP&ZVE(Wv%@TW4Yg>T9tg?nga$!?ic=ppv4*vmQ?kY>QgE zai|y4Q3J?CMQR5sLZ4$W-as!Fn_;Yn3Uwb;gomS+%Ej!s7!@h^WeV!(b!>+_QOTI= zIrcIZ#q2m7%VQF1?H6G-d;=B1&8Riqf$H!uDhDpw`#;=sI@OT*K}A0wf}3NuD3;X*cG+E2Vw~vj~eh|R3tWFH9UhF zaISe~$se0X{Iz|;xS)pHqXrO#UYuxMZry>gTtA0;ul;#-msWFWLI9sOR%6 zHjxWK&A0;=#3bu9)I?uE_2+J-pwJ&cCEo?~;&oI<`Cl;SLq$}FjZkaf1@(MyEQ*6r z0~m{1!WV3PGpeH_s2n+m8rVOO-Qs#G_)JHk*q9qlu?SAY>bMXa;m4=}=to}`Mh!67 z)*IM*C#=l%C{(h|#Jczb*2ja`4YM!d3tIcX9|dizeoM{4GXyo_MAUwsgj&;?7=TMr z&#yp5Vgr`M4AlNUgl+K_D%1^LGW&lZHl#iUnTuyT2GPH#*D_wh38)S`ylg_=19gCm zM0J>g#c-057U2>pOs`}?R67g%8i+6I-~-BIrkLbacU8rUqpk8GU1~|BTu;&MT&YDyZD3gL=OaR>BsjP!F|^#hTP-q9V5yOW=M~q}@vt z8c?{43VF>}c^EsOB5)jou=i`G;fbiFnv41oS%nJub}WTwP-p$GSP_F?HxX`+>M#`* z;TcH3uIFtEUAS-+vty&RCIXSDhI^nFlkga(V=xX|XF8gPpHSb1>R{@6b96684R8zA zz|T>U3D{tgvM83Oe@_?%twlT3$XtxTb*RvtviI}6VP@3AIs`+wKMTWgi}fN_re63> zbF??K4n;*K9c$q(tW5u&+xAA8x6A__P!FVG7`}4$7_!Z{I zikm#1j~v=SJ$L7AW6RBEiRN41KvzfY9twf@HRi&LsBFH0T9RxTW~O;D5B0~fJGMe~ zxC8@m9ag}%Q0*MWym$sn;t!}L$o7u8U+f*?AHjw4Tu|trK-I@%4%~oM@Ey#CU*lZ7 zfEsYp7SmuFhEtz~>iB&ug1c?~l=UL&y&I^3-PuC?b5aO+*UTgz>cz5H6lUcHg!#7dyZAGp{j?PaW~XR z`(R-lf*RmBdwm}2xtCE(um;u9TGT)`p$4!675crH8&6x^?pmJk6YK9AO1ipe^EbxIDXbsfB>LC+$J*_E};6f)Xi9=DL znSzyZF=~d}us(i_UVMPHvFwLtpLa)1AQ3f?Irvr1Yhrp}q*U zRQu42k5IeI`w8(^gLOYK9k)f*`=VYLVO@!u*>Tj1=TS-YD~4e9PtBhlYod~KCI;bh zd<=J^B5(#Zpx^BMnxDBQY5II-I!HmS(PY$2=An}3P0Ws&*dBLaR?M}>{6*<}s3q)* z0T_+JI1DS|Jk-gUVf_--?md@+Ud+1J%)A(8qh19AF&x!k9n`=Ypl03{b6{`mjssCk z@{V<<^#JDN`bpIJao%3PgKE#svd^q-0n~$~Pz?oPajbz}Y>(=21UAMLjK|Gb3d`>| z18t0bskgB8Wtf}#D%1epL``59vQ)0;2nDUtCDf0}15`(O510mvp{|!gMI;oJBQ;So zh(txK8)}LApq?LynouGtXU3tLjyVJ_<7*7~TK zM53PSjM}DyF(0O)o}Y&Kah|QOKt*!Bt!JRx*^bJoJ?LtU584~wp*pyUc`@*aX|M>Y zp-R?jsE+HRX4DE5iEj3K9ID;%sHIwj;rJRBz~dN(-yLE7b5kgM)HGBMRS!cw_&922 z?N9^gfd#QYY5)nSZS@Rlo2|mK_z5a0FJejbd~Vt)g-XI;TW|0=@mE8wxS$dDK-EX0 z1~36NpyyEoSb|#X)%N}eSdjXD)O%l}B5@TJ>cB5dLcJR_jj;9Bz7x& zY4&#rYRx-f5$ucFZt%j)n0QmcVPM6Epic+SZKnQqT-ap=K0{8gXqbja^Zp9*N40)u<%QL@m)_R7dwv z+p);ECYkGDCF)ON8csq*^gcF6=REP(%v+u}4YkE!>Pe^vm!KlD5;efJs3m&O*7w@` zr>x(ia^wnXrgyLq7P!Fg0#?LsI01G2@CDZ-$$5L>7gUGYFPd$cAJt$uDv27R_IVFf z2hp}Z5xvysppx!QR4(j5Mff=C{R`;D-%vSL#=T@_-VPgaAsOrACRCRHfaS6LcVpt5`* zs-Y3Ko`8CB9I7D~>)-;cho7OA>JchQ^Za0zs61*Z8e)5V0yVH@SU~&#RSKHnyQm0! zgz8`~=EAS6-=UJ`7HT^M{AjYiIA*6_3oBzo)KWyFcF`>BYp4N!gyrxsmZpEt4GLPr zJXg()P}B@Mpc)v6n!yBYhzs#qJcJrx&uc^p2Vw<0fEwTp48^S1&A=m2OVt9Eyxq~& z{vJs|FU~?G+nZPk52FV13o0TxZL2c6ss7Snv`S1|x zy{}R2{DK-t;oD~BbFm=x^_UH}x)cgf_y{$CFHlMNJ!<6Fu{GwoW3G3{oYecFIv$Mb zXoB@6RKz|&h4=)jou9A>7PxEHJ_yy0+mwQCv_oyLr?D7D+Xu#BUh30qeIe$iz6|r= zTI&|nb01*@9zi|l`PH9I1X!T|F5H<2F~I#%=VjE%hjleyp2uq zT~q^ius!B`V6we0YCEmQ2DlZqly|Wj=6+}nvijJYdSlf4i*dU4|2Ya}amXXHcGFQy zu-f`Q22nqPI=Swk2J#5CT_5u}{_R#Dz0`YRbsUX){&myV@Kt;~z*(EK0o{dT{`1Z6{ghptAo(RC}+ZmS8jLy&b3}IF4StfSO=H7Kgw8 zL!nd_(?Ao{06L-8d^oD3MW~UlME~|dE!kF7WG-MG%$e2kAFWN1Gs`moi(}^i$D>FM z#r!xE%ixj#*YPx?kjaI*_$#);h-{{#RMgo%0~N}7w*De&309)k`aM*x96+6TM^Q;# zBG9x`4wbYuPy=s`iqJ@xLLh~4sB>U4YK99@2h%I44o+Y>{1Me~?(8Pi1u>L*X;eFH zQK9aFVb~uv&{?P)TaATq7pgz^7=;iDmrxBC$YGYC7^>r1s0Z7i8t#M2jUlMePQsG7 z1Uuk6sP{ZM&Ds}1Eoq3g4QeR{Bkj1JXDMiAD^Wi>JM9CPP$SNs%dAx}YAGU7InmMD z$6gsxj z?Q$Bs;Vo2>MdmZvKL;C8-;5g24b(wYA;07QUg(cO)R*8i+=2f03$Xtc@;MZ=mT#j% zzR%XLpw>1^L1P)zKpw~X*agSoOl*q*g&hB%@j77~_0g#IFW`90QP}Z+v`)i%)c;YK z{jZK|6>X+dsN?@YrdF<}c>>|6)@QRPw!rx_%#(bWI;K z?LCERXD@2NS&EzXCKhM^D^y=`Ary<1FuS1z{!D!&HpZxuW`-+J^~6T>SVlwid?qR=BO@>+J=w26qHmQuqpONHQ+-f(=t@nzm7`Iji{3_1FPaT z%!A*fvicWWe}GEDTxHC5EQdNDYN5`T2B_!Vj`o3`sDZ?yMx2UDnrWyrd_Ahcov6?r zM`iapuH0go3tBYt#tS(En?O z8tLn(5NBX5+=z-KMP>yma@$Y?_}t#Vg1NQ-or-3A~N+zj&sAT*YHIThn4$q>i5I>}# zk!A@pYwATUK{#rA)fosyY9cov)HVBk8W;2{xDgea)2Jo5kN%Fs%xi$N$G&szjoYX!%@uAQEQ?y(TBz%NFek>LIvQ>7&qr;;E!K}w zNqp3L6V-A42-9IDRJ|7Zm!>TR) zxs3Yxy^rc3cXhLS3Zjy^EGmb>k$zoIU3;Ses)P2Zqp`cK4?$&h0tVnhR0lp(hig#{ zeqie#+4?c-8Pr5BqTauW8rW_0|Nj4jf+CQmhG{4ewcqohLSG6s(+Jdybx|R2gzC6G zYQWv_35-EKmx*d;8!DpvP`{?fP`Pmf16>OFYnl)iLya^Dm5en|Gkpp*(~+nSU0a`l zir5m=d#h1P_?Gp3>u%H%9Y(!>7B#@{(7*q$Qt*ccm0Y(`9pOQ3DG?MKHvrpckU;1Iefej6)q9GqE;i zpw{>@s)1in`}iIzNAlG(11yIcPz{X5R+x+%aVS=N-0@7o*{Js1eD%!$N?Jp#4N$qz z9yOrBsHI9qEkznCnHHlOdKop5b@uxEsGQkl-G|x*U)cL!o4V_{L_t}519hg~w+}RK zU>azJda*NV&HA7Q5QAE>$*3cB5$fmlZQSaR6Q~JHZ)66z0+lNpFcLpS|6l*h-Pp{q zG-_=_ZM`{aW?fOCehQo8DAe}Mu%5**>N%Sj>tY+~(byU{px*llBd~T;^X)hodu#u% zqRP$)*aTPsHD1p+6{ND`6EqERJK;L*0R>OHnp}wMYIEIDSJn< z|CJYK>n-HL%sX7q!-3qT0D>uirx@Wne4QZZXsVg3!N9 zTDfNXw6ZsPp*}nYp&FWGor%i+g{XnOh#J^xTYuBu&qO8THk^c~Q3HOmwJ`~`U1y@+ zU+PlOh+aiy^V_I{VmGS8{kDD-wcSpl25=60;t!|>o3$|=Jb`*{7%Gy97>X{c-3_P# zZbm)l9;Psl!U_Ap(6;8mcvR?8QIVLA3i(`A!!MzB#d>>xhrPZB7jyjtYCR5z6skT0HGoB^2(7`2xDNHBauBQGRn+q( zJD7c685MyRsO#H7j=SGdBXnrKaxUKF2q{XQ3Ke93gtaiXe)O! zwnoi329?F*Q8RuPmCQa{UxQlGcQ6e1q9T03B% z1=pf}G>)Q@<|--&?xALuv!@w&S=99!s1BQ>vi)h)%!i-`mW~?03RI3|y7tCS)Bp}( z0DfWXCsCpL#@4T(Uc8AK&^^@B1okqy5QMtl9$RB~)IgS^l6W<0*Sv;`nEM6=t=&G< z0KP≻4#tHc8|~g}x=~xuK}%;xQbb$C|hmwRAU7&*$i41`vii4{D<#)CPmK{|8f0 zw$4T`zKKebL#Pm+L%nz#HIp2D&CCm+mZ}W4!Z1{%lCTF(Ks|pH)&40|=>LI=K;eFB zhy7QAg4Qk=)nQ#!!yWt&@W*fKP*liLP!U^*dVUS|!uL=E$p56V1Zs&YqB^XO>ZdMh zLaoui|NGh-(Ww2IZ0oP!H0tl58mj-4Nut)Mr0s^fJ_OZ4GHPkk?Da{gNIs8>zzWp9 z--Q~;*XVYqaE*dqY~J5&tG1~6Fw~0)s2MLnZP(SP8Eir|^fBrj_yQHVv#5bxLv6GB zsO&HBv>AA5)cxvDv;Xx%V|$?^s-wQBkq<|Wcmk^97g5Rcn!W!q>YzG~damFA`^R+D z+IL4q>Pgi8Pe672ENbBC16;Ge*Kk1}5Zh5BK8Z?}>!=ejaG-gyHfqhAqjI4as^JvW z0A{1!dmX*F!+H+uQFo%ud-YMfq_;~!2TURc;cQd`Z(}>$i)y&=AY%k-+jT%SFdX&X zRMd7`hdLP#qJA5$p$1wg+C-u{sve1T&>cjfE`=9Sp*f6N^E220AEJJA>JN7Oe|LK@ zYRTqcD87UWTnP$^hv1Xn~7drWbbc5Md%Y$hi6eaaSOFg?_p8x|ExpJ07{@jUC-9Lqh>k^ zwM3Ip1A7T|#D0XD(SB@<-=K1%%rLW!Yhokn(Wn8ev}T~*`&4!M_nfvDu3=^BPOO<> zRn*ed$NHFv-EciV!Uw2r^S^r0{s z+u{;bsL!KvAxE6qW+CXKJ_MD75AhI|8EFP^6&3P(s16Ion+{8$mMX~F$X@Rr&;HjM z53mn~KYN0?Uk=q_Bh->~$0|4sl{*Vi+k91m zYeJmK1&#PRYRzw>8VE=<9hE{2EDSZU`ly+9Lapr()Iihh_1UPTeg!q~k5KKNM&-&C z%!ZZSQKrFas27@}8XSNcP!j6oOS8^EW$$9t{$7E4em7Rd6F3>2B**`cTusGP>JL!g z70Jow{jsPCxl<@86!YwjS5Y(Bh)Tv?=*26j7jmVTgX1w&y%TDH{ZOGDhKkTwdwmWD zQ(uaDeiv$DhmZ)kp5qiWldtRpo>UX^yjYX#Wl^Df0(C?WL=A8p>VTSqT8htbCZ0n@ zVEAa0q*qZL=N@AsRUDN=p;$)yzbysr`yr^aehTU+-Gn;%j-eWOgv$CnV@=1Q*oFEK z)QsLmMPM6hDG#DL`Vo&|jx-aAuTdvwz&OYAiS~bW3YyU!ET;#@n-{BK4eG5>***r9 zl+U4-Yz5ZAEvU8s5hJkZ1QWSdsQY746MD<~Ici(qK{uR2@rmXet_^Cw~&J$@&)R{uvCz0(N&bMhzqdJK}n5jdxx4e;W!-CYjJZiyt}s^?%fZ zeWw^-LoLzI*8Ee=T85%R-vsp=&#5D)cLCeJ|?hy@xt*vP?Gv48^(BYufrQ)ROLTDQF2! zVOGrXtU0mrpaxRj8itx_J=AtlI?Hi|V)qYKhvR1`vbVO_NaVF0^$YY5?m{ zxv?GdYX5&qK{GvudhuHvfj^@c2h1{O^(54D&!Rd`M;%B@Q60a7ip*hD=+C3h_*}Ei z&vyazQg4s7aRmDR`M;GEG=puZ4o;!|&86>9YrJ@_naK)NgRh|W?|M{@96-Hy0yVIU zsP}$E<P;2>ty}t)_&$ z8|wLh`NrHhgL)yLv8ctkfYf3ETEt@ zxrCa@En9zx%HCW{%>j}R^;`v1gW;&PZG@U>8+-o=RC4x5FOEia=)=ai665hK`v3la zrgB_^QA3`nBMbydo8*1ixmYMbnqplZ6U9W!wIsDs6KINh zuOsTYUiNw%`g36g`(H0S#|1TiLylTCJ3aMv}`RFW$+8xzUM{-}(fYVSD zco8+QtymR5Lw&5?LLEpsUNHj*#`4sgU=8j6ffO2YVIgWnhfw?e9BM!pQ76}Ryo^Dw zn)~@)bNu_e5Gp5Xp-#{Sw%!F5!Csix;g9jynY#PB!wYFnXS-b$18%t4o$i+v8Gv12v#FZ#w>eaj7#-qkiyB z_W!dKy1nK2|IMXSs0Y(FnzfsRI(lD1omd-DKQen!Gdhf#z}KhCDvX%?lj~}D5`8%wHx!yK^jE+DJY#lboO{kgwglgz624nfn z=DD`0h;%`9*c-J(Lv4Mmz5kp`K@HDGErAa;(^pW*v>p54QPhA!GE9SAP&qOH_1q{_ zhtp8oat^A!4X7M?&(@Ek+COXS?ynTQT*&s0X*d{_19ed$?ucrjA9^tvm1K)hGvA4g z@CU4qmA9BIk3tRPMbwgHq9XAHj>Ze-zU%4tt_fWl>Q`+ghTx~Dj&Gql%9UyU35MEO zo%%9V!v|3jyn;FrZ=yPSggTP*zh|zOLPaD5l`HiyzxIDK3Yu|O)OH$T9~f>;M!h(} z-k*s%sXvd3kPmgjy^1;kKSs54$ksnc<;vHncFvAGpc?7~tBqQtcBp|x zV|z?P&2%>^nf9X^JY%n4LFL3v)IhR)V9blkk>b`+RMIy=S4q>CLS>9XW${c@Xg668 zpk{m-wIn~;>$yKP^~$IYnxQ7p-PVVpCNLfw;sSgY52D)Zv6cNlg2K~V&5y%A)P6sY zO0qkshAV6{Gp>V*Ol#Es9*Eku6R|w5MD3D~Py_iM6_MXi2UEW7WGr}qIF9rvEh`5wct z_{V0Own9DUx)ii+7NbJ+3aX(GQ3E-R%7vc0&4@>#l5i?231^}Ih_=@^q6YphDrt|| z>*YQ%YaWbxzBxnc4Pc$lIQ&1sXfokXj)LNcIt^GAr@?`(iTrY^)Ucsmdgre@Z zK>q<|>-|vY!C=(VCHiImO{Aa)XJG`sh56>po)v)WFK1zTHAG99yE2DhY$} zbzFvrQ16e}Zw4|Jn^JdC@9#h@$q7`lS6~*dLOOy%1DuXpo1ItJum7UsEm64an!-o9@W7_)NjTDRJ-d@{cS>y zYS)u#FPuSz`T~aGE!0TMerX!0i~23-g6eP(hF~(P;pM0$cm>t*F4S|!QA_%r^$u#u z0#E3iVgD7S(18opQ7=wFt^It|j9x=E{2pp1$5Bak9m`>kljeFA)KWD^EoC%nsivT2 zyb_fYuUj)PyY~MM3Od0)Lyh==ec)@RTzX<&anR*QON(b8Bs^nLFA%77(PHfcn7Cp>9e*0BzZhn zP&twB8x!*Ks3mHK+ID?Wza`PO{tVWl{v3|Ot>3ujD6DtR{26Z&#&KgEYM&PS)_mR8 zL=7wf>*0FT{qv|J`624PYUj;1T#AoVKZpIX#0B%W^T%K$^cFXsO3o&zC24_Gv7@QG zp3xL^LQTRvI1|0yXfV zsD8$w|L_0JprGu36*a?6sDtGI>KwRhujl>IbW{~}y^gJSu=Yj`G#WMI;n)J>u^GN? z>p!9TsdLrwOw#^;f`ZoabL@mSP!BY|W@gwIwFDzk&rL(!UxnJo+fWD2O;iN(UpE6S zi<)T&D(mZEbsT|VxD5UO{_kE2T9ad_BljUHS&H2-=Rs}M0NSDM4@8B0ENXjAv)5Ok zLY#?O!hNWvI*p3V1=LdffI2Dj-(>%*P~)cKKS;XcOzJ79tbT}kG31tMums2M^xl;+%~%^7?mqMusaU7*SA}*x)c=pl6TDhkHq%WXQI~Z z7)D@@yCx|gN6jqS)+eAkejOE=-KZa@i>QttqH?3iuf|%~nR+)IitZ{3dNAibb5N8+ z{RXtO^**R=HvzTwb5Tk58tS<%_WnNW8PpnIxAnsJP3VJA1B*cAOgm%=_~-vj!IOyU zV1jiKs^d3M9d1W;co4P5=TSLu1(oI3P-}c2wYCBOF!chcBrJ&7KB2@Ccg6jAUdwmnC!JVk={|xO#8V}{gp=l z?|-!a4JB`V3DMm78ls>A81fi6OwoGVe0+mDLeN!0U~ZT*I= zKYGCa*NcG<&4YzdGp&F+k}IP+sEHbJb5uj^P&4m}dcFrLx%#3)n~a+AbktJJMlUWx z{VZ?6dU*XI`(F(OKQe}(KLV)zT?5r&0xA-tQQK(}s)H4%8NP~|@fK7>KSJ%QrhmOV^9N`j2g&us2M$v3hg?3e=};S-p8uA2W#U`s3oqP z#k^k&wT&M~cALxp)`J=0)2I<8Vk}O>WW0_;aZuJQ{(p06AF9Dl0cOB`t+CcLR4&X! z4QLH2vYSx@e;1WYpJQ(A|I-vS^Y849JE)mGv}Vs{B2fVKVo6)CfJ)LZ)bD&fdw(42 z{VAvj&PL_NV$=Xuqn2(vmR83{Dd^|*I{KU%PN|H$gVVD6%G7pprH_xR>^oe~dCV8~ zIMf^J*N44ZP!ZX@I{nAU}xT$JiEp&Ns|@#)8p~`-}{=s$oV{pF@%MR#Yz3{hY zlbW28Q7*k#mZB{wC5&t}n!Y`eQOUywB}63+_Dz1;3C&oyxKd!omoGKU8Xh%xa1smR zX*Dt`HqL8nG0EPP1aEQ-%a)j$Jj@%THgwJRaH!KPqx}lEV26- z_Rq!gCM0Ujk~5BGG}{wniLoQ$BpEeBpUSg?A9?O%Lf~> z1tdo&B&M&}@vPH5BY0=OtiF{$tLcLYu32*8k ze-;uC(>C4u-}(I&fBzX9b|*TON5pueyzvPsu|r~`{rf@dqrOs^axxR}CM6_{49_V3 zX?rK2W7MGJ^r+8@`1mJZ3g!N@`!wI9dCu_kYJ)IN&%_n}}s%Cdi^#1)f{2?^2QOuc|XkX4~a&U@M@-Gof_I6K+ zN=Z#-2!t^$WBZ{2SzIl!HWi6KGB!Th8yywzjW(yrU-CKG)8+REO?Q9i>EzVJn56&p z!J+2(GOY*t*D^W1)X{MnD~|r^xfRZH868d@ zb%GKI=I~@T%^%y6{h8-`xW!4&h`({&aWw)@cl}=-;L5wdL?_(a zEhajZZ9F=LvptF^{!b5hy-BHDWx#)&1g4p&6muwhqxAdm=XSBJ#ifONy2nH%MQ04W zwKR)sXPcZFJjiSvj3>^rX{2%d575}gYzRkK8B;ByAHMg zOjG&2$#GH9BN(S?$yfYCr%X*6^XHHMm`qL`IWj6q@nhRWdE=Dz#EZqW(f5vyjmixB z&j8mvs<7O zpWC&H`HzCkutLszSql={kuga_V;BuTy)i@6eCtm;ot*H@yQiJ; zSu$4^cfJhB784hjFeWpljI%pyiH=%$|EBtVkoGY5)hO=_%zV4NGbL-DsO0FV!7={0 z#QB^nPO*F(jwa{KKw1VlGkuqXoMnM#hxmH_;7rNPR@v#AHJ3*r_U}Aj*AOQ%n}3V? zCWSafeB(o$64||}9Oo%9zGl~*8NOVh&ZWW$iQYIC+5YbMd&s;N>h#GvX#8I?cYryo zevgx9y#MF-uet5{U%nR1a{C8kZ{Au<@MmU3O)~{Bhj<-hb1~qDgR_8ytx^}77 zEoOAAe(b76GS~**n$>I6tycYy=W1r2j&O43_~#F)Og^L*7yNfVqB8l2DwaK4OMP5r ze$mw_<^P7tEY#Bp_;36Xl{u@QllWi$6_s8teR}4qr<`L>?!SCWWu`ps^bXAYe6UmN zfA{Mtldq@vKfjzZW7C`x|N7G@$nmY5=oJ4y{C>)uG}$TtpZI{vTt3Cw_}4F}%ukYO(X=f1?knFyGWA zPGsiMCC;6H{+!C(_L5We&+n;BzNcDcsn+#xeN1^S&3yj*t&`HrpKg&ka<%j1A0Ji? zUs&tB^shdyGB>Sty8NrJt4zMGCTDT|A65S~pH|<^U-o_G)c2g1{=fRPS{Y!!sxm*_ z;f&5!fInmM=eCqTzOH-?KXC^Ar#`PT`MiqHUa7}0{$%8h;=lYE?q7XpAklQB0ZrA$fh@uV!+T50jW|9ut9ng zL8>4~6Gds#1VlQV?{CjM=XtK{obx}v`OM5(Ysx+Mti2P!iPO_vy^+@QYxaP-F8*tj z#^nmZQ8B9h_kUM~4D(??oXb@QL$NUS#88}!rEwJ&#Gf%3|G{v~)XU|X zfEAIt$F{je@>#aj3pqp*5!m#ZrF$2PbQTcdx1%he3qqt>z> z%i%RFgt23}bv(XA03YOu<;(Ve9v8y+V_Ij57E>{NH-Ix(0tQ9ec z`un!t4AWEZjJm(KH3@T5AB`S$FqeY-3bof8F&!SY?LT1_>ep=jp}qbZbI=|*z)U?ve(BZl8Dr&U>2N?is&L#q*tQ){nkT4E8lN#IBzdpL!HY9m=z}^naIpV z4Y&r?(Pq@d_Mkfa3)SBXB;j3|2b=qbV=n3wQ4?8+y5F;cfzAA~Wu81?*VjKr5%1;a+UT(vO{OWlAWpUw8%!*5+j!|`6Z-_amcfe9O5Ebghs1R>NZNYZTj^AS*yoka02(={{Mw@=~ zqPDsidO|5Qpdb^l08T|sU=`}YR1Cobm>aL52KX1XWtmw;4lIf~9Tic})xeV281vyU z)WknW<-iIL@z=_>(4d(gwHL0Sviu%u#s8otRA`Ki5NhSsQSJ3mInV+FuoG$`-BIlc zsQZ(wqfp5^aSR<7r0_WndS`D&-FP1B;x*JnijOtf8;Q#P7*wPxqLQ>VYQT6@fBmhW zp>k(ED&(h7_dT)gFFh2L3bYs5p#ww@~ zcSJ?DKWdA{qxzYTipVn5IG%MB8c;ZdO2W*1IJd;Ss0aFEAsmX@^LeNUY(j-_8)`2P zq6R#R+WXt~`ZIeyV4{gwPE^EVko!HZ_b9Zcp)G1=8&MP4Ve5x5korl~K<7}A_!AY% zXSV$Sr`&V0_mM3JTeL>uS`Vc~LVyftv9} z)CBLN?th8uDE(9u(!8jNhodH36*X{MRL=CW*TMP!mq~smYC8s8bV;>bL%<_WXCDK@%B_Zk%P^ zZ2bunXn%t0pwo17I!2-A*d}#w)It5j{0FNkFU^|)icdI{ynTrdmjwPuWkDo%uM|SX2EoxS*8$- z8lWU9Nvhg<6VwEHpc}_xar_Fk*GH|F(YJ*dL3@tbrr#QaF!Sf89*$Z;eN-;AMNKRT)8PWtK+CZjdNC_LMZG7|B>Tqo zxbmBVD-!iUEn9D8>%FlA?V~Uwu0Vx+GgiXe*c=Pb;gb}HV0t;%Owfax&`i_>=3xM? z!65R_wSj_G{vB#12Tr+t! zevR32H4E?)c>^xEHZnZ9d+D7 zP!p+#Vb~tW;spE{(<~-GaLi)juVna_1|`iaR73)on26*;wMU>ig|GZYC=C? zWxRyif?Qwn^$jCYE8dQJFH~M;`t6E}%peRw&jbnuC@jPLxED*~Wz-un{Z}TWrBMU6 zMTPVu)WCDF37$foqR{1L#U)VvRzNql!gDwj^`7`(g>M{>E0Mxs8oopg&}*f61rJBf za2}Syt*FS{LM7vKdp*n7CiJCH6YGvqI2{$aUH1AzEJD55Dq{l-*ZJ>9A(9L8tVgf} z^?y;X(t@jv4N;L9im|u?b>Av#z{tP*wO#r4MG-2q$M_QJ{qhVoaE@)f#QfNQHwCTq)OPcxx`^76cc>dP>@f8_sCr@4M51hadDH;4 zYGXD$SxR+JSdV{Y5N1oa`b+`1DLxwEK= z-9SC}*tS1MO(erkGr@2yM7gW{-%KP1b-g#{#~G;p*X}3&%0@2@TESsdF8qPov-{W( zpQ1n3JYaqYTnBXwC!zLoKI)t=LA~P-V`02w&3MrC8-;qV5-I|X4th+eJJX<~>WS*G z4{Blqt)o#9n2vh0EyNbM0<|U2tpSHjJu7Mk;4coPP=$ zpggLh>Zmre%g;5i0i|MdGD&)gZ6Ca1VJ{_~_ z{C`D3p-V;GcmOrS6SjU8(^0=|>yJOJW2dbaG zsQyQzN5|wd3Po@e7Q}O?kUznEnB_;)Q8+5u%Gr7YR7WkXJx~KDVi1l;4LlQ-jPp>} zH=!o7|3~7l4$jh`m0!p7_!U10KLIJb}6K8S1@~ z`GlE3Db&DqP+Qmf1o6*Ep#u%&u{YkvrI;3{oHWOA7G|Qp85NPesylqDVPopIPw~3~ ztZ>@gKLxeYHJAp!!xFe3WAF|txkEf>%u35x>!DWA3H9J)R77T=COQu_(Un*huh@FF zpUi~oqn>Mu*{}`z-YclB7>C;0PcaZZt0?$W_y)7$W>lyTpgMYBeTs^}Yix-b&YBLp zpt8F+YRiUWWt@Q;=qPF{ZlJd4wKeTI-xhdW*(oU0c~CcoVmB<03veFl!PuY4Sgei{ za5qlE+UMCWJc>b>aKUWR5X?b+7Am(^pjNyGHQ_^;PUrs|1J9Y*%VO?d%pQG! zd8l_qZOw304t#|=J-bm!_!}0*fQ#mb%rI00mt!qli%PnCsD2*lI^(I=tBSBZal3VpAd zuSUx;KlQ_?2>gyi@iA(m3BQ`p`6(DheIthBHO!3}u9<-fVLbH@Fd9=){r-tsnCmwa z=`6o_OwxqXpbHVGB&v)$E_G28X@b5SK%JK1sOzJw6H&))25OJL#Pqll6`74#0C%I3 z`7$cvH$4>ez!Ovl&#@e4_??#t)b%;6%57t7=pdAAWpRH zD^LqKgnIrWvH*|kDTOLD1pR5wb3N1yPhub4h=uX}8)kyNQAsrlHSyJ`E!v5S%yHBN zZla#^ziD!-I2NT|A2pGFn2qsW<0vS3=Aia?9qPe@=<5jUQ}@4RX5I+vQSXh~(@nPh zBr0-$p(Ye~+g#6$MW~lWU2lu(Hwnu!zH1hRT6h@MVcI)puZp3YdIi)3+u{fufV%H5 z+==P_GFx*9wX(YygRZ+KVzH>LsE6vO7b65p{B_|t4e9YLYT&D=fu34( zJ}@DRMTM{_s-r%r6;DO&{Ss6^+im*+44{6&wqL$cPyp8uOrT zEQ)&3#Gvl$j_R;K>i#6uePi&r!}&)osKX-@f$kWl`%uSkF>1maZTle)h2k_kKn;-V zvFW&wH4-&I6;xyzU?g@!ZQU%?^M`Q}-owl|^@*A2Jgh-|G5R8liquogfu1b?nBQ6z zL4O*WVH<3P4e=YCh|f`5GWx06ip8j$_|AF;i&4Lg=`i!ZX23jHh_(jF%3>ao#)R`_bmwi#3Bt-g#Q_~jsj zZ9$OB@g-XhYbdHc0u}mL)PgG7>kUw!39UR7w1SUOdpH>ts#&P)O+g*Y<+gnls>2Po zo{GBfI}F9|QCo8pwS{>d$CvHJQCnOFHC|mTjh>biv=`&BEN-+H{zNzR?0$~#T^)-Z zsgJ;;cmZ`fmiarrFPqy@$rTjf__DqQR;B(iYC_wvGTy-|STxXgpU2ge!UP&7p|689 zj&BcJphDf();~q<=?d#!)C4YJC47V50E1m-?f5*Itm->}?lRu6%|%J)fgqVDnIsTZJASw>=b;L}#!DUPV1vAiGJP!l)!Hje66S!7!|X z88Hr(yot6x5|wOIP{(dDDycW4-XGgh_aDpdczidUr9l(8g__|LEQWqL9N&2@iR!RA zDwHiySv(MR3`e8h>5DKwuEHohh&u02P`Q*orx~Xts=aJZe*db08`=x4Q8Vq1T5$r_ z#(r26H(^73gc_)7F2^+n+hQZUh-xpM+pN4cD%7n}6Yqz*J`Hs$zV=Yi%r2r<{v0)- zw0TTub6_lWH}Y}mYKf(AB5K9oqPAi;>P>eG6_IzSh!qGn6No`wZ-DB*8|pN9`q>Lp zP;b63Q6ECzp>L0@XR$c#SFkAh=XG3qBbG#cTW*L`u^&d@GgQ(Q$!8`KhI&C&M@6?HMsI3Zdo8)VX z6{wFvMQl5U<5g?ALPVVLU9l82;D@NJ?}ZB0bo71bU}NehF&+yPHd{3ji%?&Ry8j?5 z7ydx)eWoHN=?bHAs|KpQG3r?MK#v-RQP2#h+Y6g9J@vz=oH%8#-$89v=AyUmK0Fl!mq0xF@Ne;+l$hNy`*MNOy;>bVZ6iTChO&|VBgJum?k;%TTG=b>i&B{suU z)O~>^Ob0=zhy|n0b7532R6`Bi3AGhHQ4>r;C7}nkK+jqVTH#LAfG2GIXH>{;p&tAj zwP&xbX-k@VcGLg`P|ue_O|UF##g$PJsgBB}_fX??Lhkdp22jvIL(q+*Q6G;>QOD;O zR0mnZOozG9k9uCLh9S1z9yM?$R8sb^^>L^OPC-p{p{=jQTsr@|DQNG{qPF6py}>`+ zgfurQxyqncR11B3j0$l>)Lu424b<5>2({7)s1KVjtm{$Z9FUCfI!{3Z{AGQKib#eC zGe8d1fca372}RxC)?V+8TG;>$!_in4SEIJ>D(d+=s6Bsxn%Fz^XeQZ8IljMMR}7P= z&%}82FYUO-VINdS4^RWYv}TAj^?azk4M$C+4r(h}pd#B2l^a7){d|JzXKEzpUl-=n zpcOB(u0>^aD(d=fTR)6S!c$lqFWKt_qRjKfP|ro8wxlBNayX8t3Hp^W69_?_mXc*S z|8*$5M}tB$1+{|ts6AV4>w8c$KY@C~UBp`W0Ck+AV~icJ6!l5gRIEq+H>`^#W6g5| zFpBzS4+VX9`yJb0!Lp9;k5-3bGwLTW21Cm^z8@l+qdpU+U~ycF+Ve9Qjju2kOO-eE zuBiHKEQW`%B;Lh_=*d~Ze9U&i_i0#ay@5)Sh>FH))+VT&>4y43F~s^AYR^|%*I74P zz1H2yRS3je2;JWoLYAgOh?Wunyv-g>-!KklRMNrRIw$?-KbxTx#{cZa& zRMJgA^*aZBfB$be1+8c!DhCewF7W39sP6^8p*nhNOinmzVmb&$C0P;FizEv5f~k!PZ3A0xf;ttgQ4{Elt*|$00eesb zokHDr6Sd+87=dq4{f1TL{A-5M6m;WRGpayDz>aYhU;BeG^*HOpvp{)njFcZj* zicldef+bL&0Uuy#{0Q~@Jk+^giCW;k8Xj}uh`r$)D(inot?UVEMSe9+dl2d~pa5#3 zg{);z9o9lkus$lXol#pd5a(w^7sX%SBm)lUuv=4{kkEm~}wcm4m z|B7Wa>Xllij(OpHh;Hh`u_(?*UEhOIcnS5s$nd`TqEiZsQE!5JUwDR4&;wtiIyit~ zc*~ltu9-j;R49j`Lc7v>2({urP!oTFT5&)KkjJj%_#8eIC?vpQ5&80qS&kF^@j~ zPg2kdZlbdDHEJ)jHZTw7!IIRAqmriyDw#e)<-jo1$|j>GzR0$3L}mG2)QXRwCiD+# zVXlVcmd<}L1zjkF8n`qDU|CzQgo;p2TW^R;%4VpEv`1}8JZcLk+3V}DF7+*_iM&E3 zum1<;w4_CkLY0Yv_9y~1fvTtu-?Mf{{fsvj74j9R`+l(3PhlkW2N;6|8ksF?in>1m zHG$7i5t@tIiq(xc|HUaBra@VH58asgLv!4sP@%1bdayOBqXg8-2ch}OQOo}lgzXktFL z^P(m&&^iM3`~=j1vr*%upcb^sLqQLGXD=MWXzJ%|J+P_y?N}~UM+;E7vI>=~skZ$H zYD>=9`eoFM>^3U0FHy%lq?wsOMQlOcQ=ft!T!cDC%WeH2>cL~EmEJ=g&o`)<2Q@bx z6-1r;NL0isp(a`%b*fsSCfo-#;bHdrr^x*t*F4*>3N_Fc)XWc~W_$rP@Do(hI4#We zf>?!mH0r*-s5jdb)ShoZ4Y&<;-jAUs_B(0|9$-G5|F;zMg&}WCGvioPk~BcQ@w%ZN zoQc}&MW`IujJ}Uq+kO)@kyoha^RzO_9A#~a6=)xXdVUT1e*b@jf?h1Yp;qt;)j^@w z<`;~WP#urAE=3*Bov1hCCDe0IP{%EA8?%+wQ163Ir~${JBJ!oJZ$VEv8h)Zs9@Dio zE3JXr`$kw9`(rq+!4h~5wb!pvp$uwg%#Ru%0+k~*Y`r;Z0=>|U6Hv!~WjoHl_WC#t z@>kSK{>BK*-QILu8x`v2=*9%wJ`ELt1*id2QG5SA>QtRXCE+iq2|PeWGGhl*FWG_f zua(rLL0ixYHM4=JS8NLULWb3-Z$TyLV^l8qcQgYBTO&~SSGV=%wjPIy+{dVhEki|o zvxh<@3b(O27VhMjf5n1Ix*?s-1LIH=`W!WZg{Wh@9(BA@Q7hkzTF4R9EBiXu$G|Qo zvW-z&I~c2==L-rc6n;V_)kj?&-@js+ikd*%ZYIQWr~yZ#2Aqi6lG)bPwtX*ZD}S{0 ztEhhNpd$0Hy`G`FFUdWw5DGfiWl<|@X6r6dN zXp5jG+#a>X-B8aDM2#~UeSiKpkAh~l5|vClP|5TYY9%*p`!iG$W$kH>XC(S^2bCMG zFc6bb{mn<+{|#y)KccT+Tfc#s^!a~J1$>Fh+H`T|+-65TPyxfRA&$kt_%Z&ALvUa( z^L^na>iN54X5~3hFPyxn{;H!w{Q<^cM^waSqTaYmdfW5Aod&&Vj-j?7Fv0vXxgcuAt5L}r z{*mdp0V*=BQMr?V3iTw^`Cfr~b?-yH5g(vlVA=ba=c}RmYuLwQ22P-%2@NYyEBXhu z;#a7SgZi3*!tfmRx>y|Z_cJf5+IX0He^iLe_BXHKx~K{E!ZJ7>6_Kr|Wc=PkL3?x+ z75XQry$%~-zQ4CXg>F3R`Zm;x?pd=AH0QZ2M$+EeIuW(UTTpM(E7o*_Ok~PpEbX4| z6m;Vk_QD?PJ$pmGMDy*nF_!1Pk*JA$i;eI$*2Qv3<~JRqP?0-?2ON$k>b{gA#y?S8 zRA#78kLyDU+RFq~=trTxP>e@KW(MlbwgR<>>ru&d0bAgor~xYuGpC?FD#Rb6`ss|i zKLIuHP<#DzOs~)XTS8YA*aP!KofO^r?L`^UOXW&3ve}@_{&Bta7@}NKU zx~LabL)1jNpq~E-b*ctodYyj{1+8Ez>Vf&Fm2W_8%^@s~_i!)f7-9DAEb6|rBhAVS zppI8zjK(skm3K$I7Y3ll`4|=Psp$Lt{~`*S*=E#-$97vki<;>r)VaTnn&4~Oo^6yl z_o1jCSc;)Oq{2}XiA4=u8x^5OsLzg0)`U@wU4XApA8 z)Woi$R(Kcn+;i-M89s4bZXAkwC8wb7TZ|fSEh++=KjHlQLTqomhx#~vjBYG7+Wac@ zL)1AQhf1QQs1A1`|BA)+18Swi#+u_e7PaTgQTJ^?4ZIU|-vLyP9QRPrji*rqTt?ma z97FLP>YRp-Gb?X_I_Diw_f11ZVz#}$)V8m(ZotW0--?Q8wejY|tG3nCo`OP`h??mH zRL8Sz`#jV{)}khO3=82cT!!f<@RN_jpXH$T*l&_~wdO#DJ_fbGil}kkL*+m#4Ab}j zZWOlC@G0t5TWhizs0)^(J_^g?x9G-OsH{&n#dKH@HE=ZQzFO9ys0FP<-M<}`lqaz` zUd7fr{{d4?a&wFPZa3+RQ~;|Zup&Op66 z=b~@Vu@?2yn4R%m**~?%2Q{;B)H}Wz>O0&J>pWD)J5kwt7!}fAP@(<{HQ?W$&jZjoSB~S~kFoW~2f$GqpZzSzedpsDs;{vRKZ%|2AZKnAwXpHJ; z80z`SsEI8`^|J!CMSHAgQ16XDZQV7?{K__mhk`|W*(2)yZ-jVWYh#^qe8g~)!|lD zM~AH^QCoHaHPB5|1fJOTOrM*6Lr~Ytp(0ZoOX>W#qM#fYXK$Ec>kCmKUxixHc6bqV%D*H#H-YaXdpw9m>3Yz&H)JikWHD5%6 zQ4iKey;$0zCNK;Yftje|xePV%O4N&HBi_cF_WG$W%yB%6+UkE$5qX84OuV~urU(tfDD9gku71?stds0kiHMfePA zqQB1P{Oi*#*8txhQXP}bvOH}ghK<(`TRL8%fB5@lv;d`i1zd`jEw$K=j zO6CgK65n6Q`PU5#XwV)mL(OnAR>nQ3fnM15T#L*W6}FZ}y@)EJUNF^ATlPM7!;ZKB z_n^jUx7hLhBbKf>f%-KMg-H~8E^&PSisdfq#!r`;J^CDduU^!#+K+nIUq(&%cT_|k zp(gqg^)a3MOY>^P0nd60IzC5GN%$8Q#mvjh51Fy334MdLa0_b1 z|Drm2Wv>_e%0!?PYM`>Ht*B$`t?czURDb=DNb~!D3R>A%RPrpuwzvT`k+jQAhow-t zP!)AwV^qkyp?;Q2KyBR=RIbdm^$n>0ciQ^T=%#)hv*`T$uQ1u01C<}O4pF|CG z3*#}{D)YtUV^qg$Q7^3TQ3L#pdV}7u?T=8AaIH4EkqLEQZqzX?jyf$>(WB(4NkKM1 zJ=omd&;`>|?}3U;Kh%q8B*l4+VAfFKWf}C|B59Rb>l$LR0B~foM~N&(bRWh zDZGa|mU&aneJxO@B>@$o;i!IQ;s~Ap4HT3NVOz|M-$x~38`PF`MonOVZ6A+X;WSjz zuD0z@P<#Fob$`HCGf=R#0xDvyQ4vhS0y_UQC}=O&qmIRXR7aO>`wi6bdTHC=p^jtv zZRWl_sPkV4wPmHPl~MQA!zgTpx^E(CfwR%~|NopvK@YCP;|@P+*&96DO#~)k7}rx! z$+jOg;j^~=HtJYq-(d!*gzE2oYje~@x}Z)$Ka9kQJ2?MJo-H(}gFCngvwmkf_y#r8 z@302$M|I%rG?B`S3Uw@&#(JnX+YoGnAEUPD3{J$5U1m$ZLT$zVU7UX<#jiBTr>O7$ z8F!n3V^AxpgoUs!Dpz`=8z-QWZzbvtdLFff*HByd0u?d;J?4d#3)SvMO(5JuK@ZeJ zO`sbpyN9D2XQ1|Mqje`Ln~&J~dDOf8I_kN{s8FZdYo5=I>bC;web5;7{2JYy(m zZx^Fxb_BKJGpLpRYJG|2sOR2iLf8l&Q162}uI=}m2qmE=G#7PBR$@&&h~+Whfcc}^ zDoA8JuCWxf$H}M=Elg^WNw zHyL%DXP~xZDaPphZ>FFD{zR?hIjZAqhs=X{P_NvAw*DR}#0{|&wna^JBI^0Ys8{+n z)PP4Z9512z4Loc@AB4WY|5uWNLRQt<2(?EYQ7?)J2y%eSiMHf`USH0F`Vw=niT{5A5}KsLzC; zBPJqIs4c99>aQ-UzYkHzvYl=3WbJu`^RFBG*c%ful=^6l!6oQRM%3s1uc$q~gW7_( zsB@q32eTEGQSXy@RQn=y<1ws@cd;YJ95w%lW#&L1#@zwXiDn5vY)RQTN@z2=qH=vOf}^P;ZCT z@WY>dx#MwtN`2Km5d`YNW8IC$F9@Lv{CMwilqmpe0>a*f7>i)nB zCU-KTk}wZy3-Y7y|NmXgHZ(zHZ#z`dbw>>}0CgNas19eKj@?|;{i{&NauaF-hfw#Q zM&-se)Nu{`#k@!Iqb6JvGxGj%wVsJ*R$y513W zDu$z8DCeI6L6?0tMT;cp{#S>`IhtN#an{EdxB4<$N{UK_v z1Fo9u`B4MJqK;7w+uj}(+CI< z=x>f|AD%`HF#C6Nj^|=m>W5Irr`UD#0_uU_(D{Cj4YAsvX0N7T6!l%GB)o@OQJx#79*r8f1Lnoyr~yAm<-%%Iq>kA7Eo@9Z z%}w(|Z7bw{{{R0Jig4j9YOkN!dd6Gkm_?&Ug`YA3`PH zNz}wHpq_t?>fiqk-v=1qm5YKp%8yF2lBgu9h#IJ-ZLfpspd~8HJD>*Wk8T`>I+pWL z_iaIaT<=5;cpTO5ueN>@J!*JvFS!0PD@ca{wC6;1l-KG;O{fIwxd>E*Vo~pj+Nf_h ztx>0;BkI17(044c8TE+@`VHR`#IwtXjRfj{2$m{;y;8Z^LV)P(**b@Uju;uoj~-k_4n@16;1 z2x`TVsI4fAZmfp-nC*=ESWZFpbIN)aeG%|b(0RUu8Zh|2i9{&s7=@t*sE=A~;8 zDX59fM@?iMCg5I7!mz*1i)Jy7qaOIk^fLuD(K$Xje=BUm7S!GzLgm7*s8HQU&G->2 zH!?jo9pyrGR0!2x29*PqthG@Q_`qIoW$T?#AA0dvyEuhJd&5>#2fI-ZevjJg(~q6h zoxSI#bs|#=z2}t4H6*cbSW;zo;bJ8RCUzN|Ft~4ASW@AX_3t?aQd0-!%aPKxl~W@% zY{DODQnP>BCLm+uxMA+5-I9`q4M^;nym?k|>hPIU0+LJ32}%BC&cn~=U(8pU$1-6!@=4T<;A@OpNP4*!@3lOG)to6 zXX>smtNEuK8SGR_jbGu(milOG7XQ?c9TlC_so(wRpW0iv`TW?V*^ra{MgS4=s%=e-xU6Or91WI@gh!gxs!#0dkjfT z=+@Vr6qh(OF0ph{LeDsNzqrKsxRee{oR5-solHutd}@%Bdg=5hPU^s)esfZPJ2%4d zw)xuWc zr(*Kn+skwHietq+;*wm=<9a2=CG~a>>=qxF`thB=GNsi1-uXN=X4U9{E}C_ z$&>ox&6fe*m442ez?3fOoW9<7>6`^=y?e4cU4v38hdBMcn?jsz{wXi-Ikmi1?>i&? zyfuqB=L1p_|8cf>&y;jB`={_vvD)S9n=mxa-G9K~gkA|fe7nJN2MYtLkoKwTQw4Bqy@n)&uwDwQ=p|aB>ref*n7_kU)i_p7c>z<*4~`)7j6PzK_#7O`02H7u}k(+S_@M zQ`X;0R>o&bezY}*x6vfWUujv;Ntrs$2_`p>`g_;TaNLgf?M!F=e`RO#--q*f8-3wK z{dbCPQ+g)X_%YhMaG{g!f8?n5!o%OBL!I!#c|L&~^icB)b3KiR_Je?iBpLAN{~?L}UpvdaB=JuFxx@TwrjWivQ-(Qy Q2b97+{ZhUS@ca9J0XfZ73IG5A From a18b9132a5919089300ae77737f8faa39f1450a6 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Thu, 15 Sep 2016 14:41:26 +0000 Subject: [PATCH 7/8] release: Finish preparation for 4.4.0 --- .release.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.release.cfg b/.release.cfg index ea5461d7..0f8adeb7 100644 --- a/.release.cfg +++ b/.release.cfg @@ -5,18 +5,22 @@ done = false done = true [task:fixes_on_stable] +done = true [task:pip2nix_generated] +done = true [task:changelog_updated] +done = true [task:generate_api_docs] done = true [task:updated_translation] +done = true [release] -state = in_progress +state = prepared version = 4.4.0 [task:rc_tools_pinned] From dc648ad1ff99a395f9f7fe53b0d373c015f76325 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Thu, 15 Sep 2016 14:41:27 +0000 Subject: [PATCH 8/8] Added tag v4.4.0 for changeset 8a876f48f5cb