From f2f42c2c8a840d19c6e1c92d59af57c88fc78065 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Mon, 18 Sep 2017 14:15:03 -0400 Subject: [PATCH 001/141] don't append to the activity stream on LDAP group disassociate for organizations w/ a large number of ldap orgs/teams, this results in a _huge_ number of extraneous activity stream entries see: https://github.com/ansible/ansible-tower/issues/7655 --- awx/sso/backends.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/sso/backends.py b/awx/sso/backends.py index 72b12a6b75..5ed0385018 100644 --- a/awx/sso/backends.py +++ b/awx/sso/backends.py @@ -307,7 +307,7 @@ def _update_m2m_from_groups(user, ldap_user, rel, opts, remove=True): should_add = True if should_add: rel.add(user) - elif remove: + elif remove and user in rel.all(): rel.remove(user) From 554a9586c69dc6aac2782a3e7d2525cca0b1ef19 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Tue, 19 Sep 2017 16:29:48 -0400 Subject: [PATCH 002/141] add awx meta variables to adhoc command extra_vars see: https://github.com/ansible/ansible-tower/issues/7513 --- awx/main/tasks.py | 17 ++++++++++-- awx/main/tests/unit/test_tasks.py | 43 +++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 66ba251f40..8a4c6ca27b 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -2138,14 +2138,27 @@ class RunAdHocCommand(BaseTask): if ad_hoc_command.verbosity: args.append('-%s' % ('v' * min(5, ad_hoc_command.verbosity))) + # Define special extra_vars for AWX, combine with ad_hoc_command.extra_vars + extra_vars = { + 'tower_job_id': ad_hoc_command.pk, + 'awx_job_id': ad_hoc_command.pk, + } + if ad_hoc_command.created_by: + extra_vars.update({ + 'tower_user_id': ad_hoc_command.created_by.pk, + 'tower_user_name': ad_hoc_command.created_by.username, + 'awx_user_id': ad_hoc_command.created_by.pk, + 'awx_user_name': ad_hoc_command.created_by.username, + }) + if ad_hoc_command.extra_vars_dict: redacted_extra_vars, removed_vars = extract_ansible_vars(ad_hoc_command.extra_vars_dict) if removed_vars: raise ValueError(_( "{} are prohibited from use in ad hoc commands." ).format(", ".join(removed_vars))) - - args.extend(['-e', json.dumps(ad_hoc_command.extra_vars_dict)]) + extra_vars.update(ad_hoc_command.extra_vars_dict) + args.extend(['-e', json.dumps(extra_vars)]) args.extend(['-m', ad_hoc_command.module_name]) args.extend(['-a', ad_hoc_command.module_args]) diff --git a/awx/main/tests/unit/test_tasks.py b/awx/main/tests/unit/test_tasks.py index 8cb748eb30..ed6c5c9929 100644 --- a/awx/main/tests/unit/test_tasks.py +++ b/awx/main/tests/unit/test_tasks.py @@ -16,6 +16,7 @@ from django.conf import settings from awx.main.models import ( + AdHocCommand, Credential, CredentialType, Inventory, @@ -26,6 +27,7 @@ from awx.main.models import ( Project, ProjectUpdate, UnifiedJob, + User ) from awx.main import tasks @@ -292,6 +294,18 @@ class TestGenericRun(TestJobExecution): assert '--ro-bind %s %s' % (settings.ANSIBLE_VENV_PATH, settings.ANSIBLE_VENV_PATH) in ' '.join(args) # noqa assert '--ro-bind %s %s' % (settings.AWX_VENV_PATH, settings.AWX_VENV_PATH) in ' '.join(args) # noqa + def test_created_by_extra_vars(self): + self.instance.created_by = User(pk=123, username='angry-spud') + self.task.run(self.pk) + + assert self.run_pexpect.call_count == 1 + call_args, _ = self.run_pexpect.call_args_list[0] + args, cwd, env, stdout = call_args + assert '"tower_user_id": 123,' in ' '.join(args) + assert '"tower_user_name": "angry-spud"' in ' '.join(args) + assert '"awx_user_id": 123,' in ' '.join(args) + assert '"awx_user_name": "angry-spud"' in ' '.join(args) + def test_awx_task_env(self): patch = mock.patch('awx.main.tasks.settings.AWX_TASK_ENV', {'FOO': 'BAR'}) patch.start() @@ -304,6 +318,35 @@ class TestGenericRun(TestJobExecution): assert env['FOO'] == 'BAR' +class TestAdhocRun(TestJobExecution): + + TASK_CLS = tasks.RunAdHocCommand + + def get_instance(self): + return AdHocCommand( + pk=1, + created=datetime.utcnow(), + inventory=Inventory(pk=1), + status='new', + cancel_flag=False, + verbosity=3, + extra_vars={'awx_foo': 'awx-bar'} + ) + + def test_created_by_extra_vars(self): + self.instance.created_by = User(pk=123, username='angry-spud') + self.task.run(self.pk) + + assert self.run_pexpect.call_count == 1 + call_args, _ = self.run_pexpect.call_args_list[0] + args, cwd, env, stdout = call_args + assert '"tower_user_id": 123,' in ' '.join(args) + assert '"tower_user_name": "angry-spud"' in ' '.join(args) + assert '"awx_user_id": 123,' in ' '.join(args) + assert '"awx_user_name": "angry-spud"' in ' '.join(args) + assert '"awx_foo": "awx-bar' in ' '.join(args) + + class TestIsolatedExecution(TestJobExecution): REMOTE_HOST = 'some-isolated-host' From 96572fe3d4c4f130a5be2b771f201836ac94876e Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Tue, 19 Sep 2017 15:58:43 -0400 Subject: [PATCH 003/141] don't show polymorphic_ctype in unique validation error messaging see: https://github.com/ansible/ansible-tower/issues/7620 --- awx/main/models/base.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/awx/main/models/base.py b/awx/main/models/base.py index 6c038dad74..ebfe0bf1c5 100644 --- a/awx/main/models/base.py +++ b/awx/main/models/base.py @@ -309,7 +309,10 @@ class PrimordialModel(CreatedModifiedModel): continue if not (self.pk and self.pk == obj.pk): errors.append( - '%s with this (%s) combination already exists.' % (model.__name__, ', '.join(ut)) + '%s with this (%s) combination already exists.' % ( + model.__name__, + ', '.join(set(ut) - {'polymorphic_ctype'}) + ) ) if errors: raise ValidationError(errors) From c8f4320b5820c43770fb4ab2671965aad54344c4 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Wed, 20 Sep 2017 14:27:14 -0400 Subject: [PATCH 004/141] allow the credential type to be changed for unused credentials see: https://github.com/ansible/ansible-tower/issues/7607 --- awx/api/serializers.py | 20 +++++-- .../tests/functional/api/test_credential.py | 52 ++++++++++++++----- 2 files changed, 54 insertions(+), 18 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index a95a7f0c41..e6b1058778 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -2162,10 +2162,22 @@ class CredentialSerializer(BaseSerializer): def validate_credential_type(self, credential_type): if self.instance and credential_type.pk != self.instance.credential_type.pk: - raise ValidationError( - _('You cannot change the credential type of the credential, as it may break the functionality' - ' of the resources using it.'), - ) + for rel in ( + 'ad_hoc_commands', + 'insights_inventories', + 'inventorysources', + 'inventoryupdates', + 'jobs', + 'jobtemplates', + 'projects', + 'projectupdates', + 'workflowjobnodes' + ): + if getattr(self.instance, rel).count() > 0: + raise ValidationError( + _('You cannot change the credential type of the credential, as it may break the functionality' + ' of the resources using it.'), + ) return credential_type diff --git a/awx/main/tests/functional/api/test_credential.py b/awx/main/tests/functional/api/test_credential.py index feebfc08f4..b60d215e14 100644 --- a/awx/main/tests/functional/api/test_credential.py +++ b/awx/main/tests/functional/api/test_credential.py @@ -4,7 +4,9 @@ import re import mock # noqa import pytest -from awx.main.models.credential import Credential, CredentialType +from awx.main.models import (AdHocCommand, Credential, CredentialType, Job, JobTemplate, + Inventory, InventorySource, Project, + WorkflowJobNode) from awx.main.utils import decrypt_field from awx.api.versioning import reverse @@ -1410,7 +1412,17 @@ def test_field_removal(put, organization, admin, credentialtype_ssh, version, pa @pytest.mark.django_db -def test_credential_type_immutable_in_v2(patch, organization, admin, credentialtype_ssh, credentialtype_aws): +@pytest.mark.parametrize('relation, related_obj', [ + ['ad_hoc_commands', AdHocCommand()], + ['insights_inventories', Inventory()], + ['inventorysources', InventorySource()], + ['jobs', Job()], + ['jobtemplates', JobTemplate()], + ['projects', Project()], + ['workflowjobnodes', WorkflowJobNode()], +]) +def test_credential_type_mutability(patch, organization, admin, credentialtype_ssh, + credentialtype_aws, relation, related_obj): cred = Credential( credential_type=credentialtype_ssh, name='Best credential ever', @@ -1422,19 +1434,31 @@ def test_credential_type_immutable_in_v2(patch, organization, admin, credentialt ) cred.save() - response = patch( - reverse('api:credential_detail', kwargs={'version': 'v2', 'pk': cred.pk}), - { - 'credential_type': credentialtype_aws.pk, - 'inputs': { - 'username': u'jim', - 'password': u'pass' - } - }, - admin - ) + related_obj.save() + getattr(cred, relation).add(related_obj) + + def _change_credential_type(): + return patch( + reverse('api:credential_detail', kwargs={'version': 'v2', 'pk': cred.pk}), + { + 'credential_type': credentialtype_aws.pk, + 'inputs': { + 'username': u'jim', + 'password': u'pass' + } + }, + admin + ) + + response = _change_credential_type() assert response.status_code == 400 - assert 'credential_type' in response.data + expected = ['You cannot change the credential type of the credential, ' + 'as it may break the functionality of the resources using it.'] + assert response.data['credential_type'] == expected + + related_obj.delete() + response = _change_credential_type() + assert response.status_code == 200 @pytest.mark.django_db From 7a21a4578129ddc3797cf387d73a5f3551036269 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Wed, 20 Sep 2017 15:53:08 -0400 Subject: [PATCH 005/141] properly encode LDAP DN values on validation see: https://github.com/ansible/ansible-tower/issues/7554 --- awx/sso/validators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/sso/validators.py b/awx/sso/validators.py index 172c21593c..dd1086a426 100644 --- a/awx/sso/validators.py +++ b/awx/sso/validators.py @@ -22,7 +22,7 @@ def validate_ldap_dn(value, with_user=False): else: dn_value = value try: - ldap.dn.str2dn(dn_value) + ldap.dn.str2dn(dn_value.encode('utf-8')) except ldap.DECODING_ERROR: raise ValidationError(_('Invalid DN: %s') % value) From 94d44e879195c8665141f129ea2f8077e33df0b4 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Thu, 21 Sep 2017 16:21:29 -0400 Subject: [PATCH 006/141] disable GCE inventory source cache by default, the GCE inventory script caches results on disk for 5 minutes; disable this behavior see: https://github.com/ansible/ansible-tower/issues/7609 --- awx/main/management/commands/inventory_import.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/awx/main/management/commands/inventory_import.py b/awx/main/management/commands/inventory_import.py index 9959001bf8..c84d12c16c 100644 --- a/awx/main/management/commands/inventory_import.py +++ b/awx/main/management/commands/inventory_import.py @@ -176,6 +176,13 @@ class AnsibleInventoryLoader(object): def load(self): base_args = self.get_base_args() logger.info('Reading Ansible inventory source: %s', self.source) + + # by default, the GCE inventory source caches results on disk for + # 5 minutes; disable this behavior + # https://github.com/ansible/tower/blob/cfb633e8a643b0190fa07b6204b339a1d336cbb3/awx/plugins/inventory/gce.py#L115 + if self.source.endswith('gce.py'): + base_args += ['--refresh-cache'] + data = self.command_to_json(base_args + ['--list']) # TODO: remove after we run custom scripts through ansible-inventory From 94b4dabee2a5a766d6ae301f2476bdbae3f72990 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Fri, 22 Sep 2017 09:22:28 -0400 Subject: [PATCH 007/141] disable GCE inventory caching w/ a .ini file see: https://github.com/ansible/ansible-tower/issues/7609 see: https://github.com/ansible/tower/pull/451#pullrequestreview-64454393 --- awx/main/management/commands/inventory_import.py | 6 ------ awx/main/tasks.py | 10 ++++++++++ awx/main/tests/unit/test_tasks.py | 6 ++++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/awx/main/management/commands/inventory_import.py b/awx/main/management/commands/inventory_import.py index c84d12c16c..797355bf3b 100644 --- a/awx/main/management/commands/inventory_import.py +++ b/awx/main/management/commands/inventory_import.py @@ -177,12 +177,6 @@ class AnsibleInventoryLoader(object): base_args = self.get_base_args() logger.info('Reading Ansible inventory source: %s', self.source) - # by default, the GCE inventory source caches results on disk for - # 5 minutes; disable this behavior - # https://github.com/ansible/tower/blob/cfb633e8a643b0190fa07b6204b339a1d336cbb3/awx/plugins/inventory/gce.py#L115 - if self.source.endswith('gce.py'): - base_args += ['--refresh-cache'] - data = self.command_to_json(base_args + ['--list']) # TODO: remove after we run custom scripts through ansible-inventory diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 8a4c6ca27b..aed99cd9ab 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -1881,6 +1881,16 @@ class RunInventoryUpdate(BaseTask): env['GCE_PROJECT'] = passwords.get('source_project', '') env['GCE_PEM_FILE_PATH'] = cloud_credential env['GCE_ZONE'] = inventory_update.source_regions if inventory_update.source_regions != 'all' else '' + + # by default, the GCE inventory source caches results on disk for + # 5 minutes; disable this behavior + cp = ConfigParser.ConfigParser() + cp.add_section('cache') + cp.set('cache', 'cache_max_age', '0') + handle, path = tempfile.mkstemp(dir=kwargs.get('private_data_dir', None)) + cp.write(os.fdopen(handle, 'w')) + os.chmod(path, stat.S_IRUSR | stat.S_IWUSR) + env['GCE_INI_PATH'] = path elif inventory_update.source == 'openstack': env['OS_CLIENT_CONFIG_FILE'] = cloud_credential elif inventory_update.source == 'satellite6': diff --git a/awx/main/tests/unit/test_tasks.py b/awx/main/tests/unit/test_tasks.py index ed6c5c9929..3a7a218133 100644 --- a/awx/main/tests/unit/test_tasks.py +++ b/awx/main/tests/unit/test_tasks.py @@ -1319,6 +1319,12 @@ class TestInventoryUpdateCredentials(TestJobExecution): assert env['GCE_ZONE'] == expected_gce_zone ssh_key_data = env['GCE_PEM_FILE_PATH'] assert open(ssh_key_data, 'rb').read() == self.EXAMPLE_PRIVATE_KEY + + config = ConfigParser.ConfigParser() + config.read(env['GCE_INI_PATH']) + assert 'cache' in config.sections() + assert config.getint('cache', 'cache_max_age') == 0 + return ['successful', 0] self.run_pexpect.side_effect = run_pexpect_side_effect From 74f250948203ead518f6da3270f6bcea717a2450 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Fri, 22 Sep 2017 15:16:15 -0400 Subject: [PATCH 008/141] support ovirt4 as a built-in inventory source see: https://github.com/ansible/ansible-tower/issues/6522 --- awx/main/constants.py | 2 +- ...9_v322_add_support_for_ovirt4_inventory.py | 28 ++ awx/main/migrations/_credentialtypes.py | 3 + awx/main/models/base.py | 2 +- awx/main/models/credential.py | 46 +++ awx/main/models/inventory.py | 6 + awx/main/tests/functional/test_credential.py | 1 + awx/main/tests/unit/test_tasks.py | 35 +++ awx/plugins/inventory/ovirt4.py | 262 ++++++++++++++++++ awx/settings/defaults.py | 10 + tools/docker-compose/Dockerfile | 2 +- 11 files changed, 394 insertions(+), 3 deletions(-) create mode 100644 awx/main/migrations/0009_v322_add_support_for_ovirt4_inventory.py create mode 100755 awx/plugins/inventory/ovirt4.py diff --git a/awx/main/constants.py b/awx/main/constants.py index 4ff22662b3..9c0b01a3d4 100644 --- a/awx/main/constants.py +++ b/awx/main/constants.py @@ -5,7 +5,7 @@ import re from django.utils.translation import ugettext_lazy as _ -CLOUD_PROVIDERS = ('azure_rm', 'ec2', 'gce', 'vmware', 'openstack', 'satellite6', 'cloudforms') +CLOUD_PROVIDERS = ('azure_rm', 'ec2', 'gce', 'vmware', 'openstack', 'ovirt4', 'satellite6', 'cloudforms') SCHEDULEABLE_PROVIDERS = CLOUD_PROVIDERS + ('custom', 'scm',) PRIVILEGE_ESCALATION_METHODS = [ ('sudo', _('Sudo')), ('su', _('Su')), ('pbrun', _('Pbrun')), ('pfexec', _('Pfexec')), ('dzdo', _('DZDO')), ('pmrun', _('Pmrun')), ('runas', _('Runas'))] ANSI_SGR_PATTERN = re.compile(r'\x1b\[[0-9;]*m') diff --git a/awx/main/migrations/0009_v322_add_support_for_ovirt4_inventory.py b/awx/main/migrations/0009_v322_add_support_for_ovirt4_inventory.py new file mode 100644 index 0000000000..e29bdfb4d3 --- /dev/null +++ b/awx/main/migrations/0009_v322_add_support_for_ovirt4_inventory.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +# AWX +from awx.main.migrations import _credentialtypes as credentialtypes + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0008_v320_drop_v1_credential_fields'), + ] + + operations = [ + migrations.RunPython(credentialtypes.create_ovirt4_credtype), + migrations.AlterField( + model_name='inventorysource', + name='source', + field=models.CharField(default=b'', max_length=32, blank=True, choices=[(b'', 'Manual'), (b'file', 'File, Directory or Script'), (b'scm', 'Sourced from a Project'), (b'ec2', 'Amazon EC2'), (b'gce', 'Google Compute Engine'), (b'azure_rm', 'Microsoft Azure Resource Manager'), (b'vmware', 'VMware vCenter'), (b'satellite6', 'Red Hat Satellite 6'), (b'cloudforms', 'Red Hat CloudForms'), (b'openstack', 'OpenStack'), (b'ovirt4', 'oVirt4'), (b'custom', 'Custom Script')]), + ), + migrations.AlterField( + model_name='inventoryupdate', + name='source', + field=models.CharField(default=b'', max_length=32, blank=True, choices=[(b'', 'Manual'), (b'file', 'File, Directory or Script'), (b'scm', 'Sourced from a Project'), (b'ec2', 'Amazon EC2'), (b'gce', 'Google Compute Engine'), (b'azure_rm', 'Microsoft Azure Resource Manager'), (b'vmware', 'VMware vCenter'), (b'satellite6', 'Red Hat Satellite 6'), (b'cloudforms', 'Red Hat CloudForms'), (b'openstack', 'OpenStack'), (b'ovirt4', 'oVirt4'), (b'custom', 'Custom Script')]), + ), + ] diff --git a/awx/main/migrations/_credentialtypes.py b/awx/main/migrations/_credentialtypes.py index f34d08903a..1c90822bab 100644 --- a/awx/main/migrations/_credentialtypes.py +++ b/awx/main/migrations/_credentialtypes.py @@ -173,3 +173,6 @@ def migrate_job_credentials(apps, schema_editor): finally: utils.get_current_apps = orig_current_apps + +def create_ovirt4_credtype(apps, schema_editor): + CredentialType.defaults['ovirt4']().save() diff --git a/awx/main/models/base.py b/awx/main/models/base.py index ebfe0bf1c5..93bb484a46 100644 --- a/awx/main/models/base.py +++ b/awx/main/models/base.py @@ -52,7 +52,7 @@ PROJECT_UPDATE_JOB_TYPE_CHOICES = [ (PERM_INVENTORY_CHECK, _('Check')), ] -CLOUD_INVENTORY_SOURCES = ['ec2', 'vmware', 'gce', 'azure_rm', 'openstack', 'custom', 'satellite6', 'cloudforms', 'scm',] +CLOUD_INVENTORY_SOURCES = ['ec2', 'vmware', 'gce', 'azure_rm', 'openstack', 'ovirt4', 'custom', 'satellite6', 'cloudforms', 'scm',] VERBOSITY_CHOICES = [ (0, '0 (Normal)'), diff --git a/awx/main/models/credential.py b/awx/main/models/credential.py index 5a3f0b9662..5a1832f323 100644 --- a/awx/main/models/credential.py +++ b/awx/main/models/credential.py @@ -59,6 +59,7 @@ class V1Credential(object): ('gce', 'Google Compute Engine'), ('azure_rm', 'Microsoft Azure Resource Manager'), ('openstack', 'OpenStack'), + ('ovirt4', 'oVirt4'), ('insights', 'Insights'), ] FIELDS = { @@ -1000,3 +1001,48 @@ def insights(cls): }, }, ) + + +@CredentialType.default +def ovirt4(cls): + return cls( + kind='cloud', + name='oVirt4', + managed_by_tower=True, + inputs={ + 'fields': [{ + 'id': 'host', + 'label': 'Host (Authentication URL)', + 'type': 'string', + 'help_text': ('The host to authenticate with.') + }, { + 'id': 'username', + 'label': 'Username', + 'type': 'string' + }, { + 'id': 'password', + 'label': 'Password', + 'type': 'string', + 'secret': True, + }, { + 'id': 'ca_file', + 'label': 'CA File', + 'type': 'string', + 'help_text': ('Absolute file path to the CA file to use (optional)') + }], + 'required': ['host', 'username', 'password'], + }, + injectors={ + 'file': { + 'template': '\n'.join([ + '[ovirt]', + 'ovirt_url={{host}}', + 'ovirt_username={{username}}', + 'ovirt_password={{password}}', + '{% if ca_file %}ovirt_ca_file={{ca_file}}{% endif %}']) + }, + 'env': { + 'OVIRT_INI_PATH': '{{tower.filename}}' + } + }, + ) diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index 7b5e3d3dfa..f5cd0d8e58 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -872,6 +872,7 @@ class InventorySourceOptions(BaseModel): ('satellite6', _('Red Hat Satellite 6')), ('cloudforms', _('Red Hat CloudForms')), ('openstack', _('OpenStack')), + ('ovirt4', _('oVirt4')), ('custom', _('Custom Script')), ] @@ -1120,6 +1121,11 @@ class InventorySourceOptions(BaseModel): """Red Hat CloudForms region choices (not implemented)""" return [('all', 'All')] + @classmethod + def get_ovirt4_region_choices(self): + """No region supprt""" + return [('all', 'All')] + def clean_credential(self): if not self.source: return None diff --git a/awx/main/tests/functional/test_credential.py b/awx/main/tests/functional/test_credential.py index b4dd0cb0e4..9bcf23e198 100644 --- a/awx/main/tests/functional/test_credential.py +++ b/awx/main/tests/functional/test_credential.py @@ -25,6 +25,7 @@ def test_default_cred_types(): 'insights', 'net', 'openstack', + 'ovirt4', 'satellite6', 'scm', 'ssh', diff --git a/awx/main/tests/unit/test_tasks.py b/awx/main/tests/unit/test_tasks.py index 3a7a218133..a9fb3dd448 100644 --- a/awx/main/tests/unit/test_tasks.py +++ b/awx/main/tests/unit/test_tasks.py @@ -689,6 +689,41 @@ class TestJobCredentials(TestJobExecution): self.run_pexpect.side_effect = run_pexpect_side_effect self.task.run(self.pk) + @pytest.mark.parametrize("ca_file", [None, '/path/to/some/file']) + def test_ovirt4_credentials(self, ca_file): + ovirt4 = CredentialType.defaults['ovirt4']() + inputs = { + 'host': 'some-ovirt-host.example.org', + 'username': 'bob', + 'password': 'some-pass', + } + if ca_file: + inputs['ca_file'] = ca_file + credential = Credential( + pk=1, + credential_type=ovirt4, + inputs=inputs + ) + credential.inputs['password'] = encrypt_field(credential, 'password') + self.instance.extra_credentials.add(credential) + + def run_pexpect_side_effect(*args, **kwargs): + args, cwd, env, stdout = args + config = ConfigParser.ConfigParser() + config.read(env['OVIRT_INI_PATH']) + assert config.get('ovirt', 'ovirt_url') == 'some-ovirt-host.example.org' + assert config.get('ovirt', 'ovirt_username') == 'bob' + assert config.get('ovirt', 'ovirt_password') == 'some-pass' + if ca_file: + assert config.get('ovirt', 'ovirt_ca_file') == ca_file + else: + with pytest.raises(ConfigParser.NoOptionError): + config.get('ovirt', 'ovirt_ca_file') + return ['successful', 0] + + self.run_pexpect.side_effect = run_pexpect_side_effect + self.task.run(self.pk) + def test_net_credentials(self): net = CredentialType.defaults['net']() credential = Credential( diff --git a/awx/plugins/inventory/ovirt4.py b/awx/plugins/inventory/ovirt4.py new file mode 100755 index 0000000000..6221325f34 --- /dev/null +++ b/awx/plugins/inventory/ovirt4.py @@ -0,0 +1,262 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# Copyright (c) 2016 Red Hat, Inc. +# +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . +# + +""" +oVirt dynamic inventory script +================================= + +Generates dynamic inventory file for oVirt. + +Script will return following attributes for each virtual machine: + - id + - name + - host + - cluster + - status + - description + - fqdn + - os_type + - template + - tags + - statistics + - devices + +When run in --list mode, virtual machines are grouped by the following categories: + - cluster + - tag + - status + + Note: If there is some virtual machine which has has more tags it will be in both tag + records. + +Examples: + # Execute update of system on webserver virtual machine: + + $ ansible -i contrib/inventory/ovirt4.py webserver -m yum -a "name=* state=latest" + + # Get webserver virtual machine information: + + $ contrib/inventory/ovirt4.py --host webserver + +Author: Ondra Machacek (@machacekondra) +""" + +import argparse +import os +import sys + +from collections import defaultdict + +try: + import ConfigParser as configparser +except ImportError: + import configparser + +try: + import json +except ImportError: + import simplejson as json + +try: + import ovirtsdk4 as sdk + import ovirtsdk4.types as otypes +except ImportError: + print('oVirt inventory script requires ovirt-engine-sdk-python >= 4.0.0') + sys.exit(1) + + +def parse_args(): + """ + Create command line parser for oVirt dynamic inventory script. + """ + parser = argparse.ArgumentParser( + description='Ansible dynamic inventory script for oVirt.', + ) + parser.add_argument( + '--list', + action='store_true', + default=True, + help='Get data of all virtual machines (default: True).', + ) + parser.add_argument( + '--host', + help='Get data of virtual machines running on specified host.', + ) + parser.add_argument( + '--pretty', + action='store_true', + default=False, + help='Pretty format (default: False).', + ) + return parser.parse_args() + + +def create_connection(): + """ + Create a connection to oVirt engine API. + """ + # Get the path of the configuration file, by default use + # 'ovirt.ini' file in script directory: + default_path = os.path.join( + os.path.dirname(os.path.realpath(__file__)), + 'ovirt.ini', + ) + config_path = os.environ.get('OVIRT_INI_PATH', default_path) + + # Create parser and add ovirt section if it doesn't exist: + config = configparser.SafeConfigParser( + defaults={ + 'ovirt_url': None, + 'ovirt_username': None, + 'ovirt_password': None, + 'ovirt_ca_file': None, + } + ) + if not config.has_section('ovirt'): + config.add_section('ovirt') + config.read(config_path) + + # Create a connection with options defined in ini file: + return sdk.Connection( + url=config.get('ovirt', 'ovirt_url'), + username=config.get('ovirt', 'ovirt_username'), + password=config.get('ovirt', 'ovirt_password'), + ca_file=config.get('ovirt', 'ovirt_ca_file'), + insecure=config.get('ovirt', 'ovirt_ca_file') is None, + ) + + +def get_dict_of_struct(connection, vm): + """ + Transform SDK Vm Struct type to Python dictionary. + """ + if vm is None: + return dict() + + vms_service = connection.system_service().vms_service() + clusters_service = connection.system_service().clusters_service() + vm_service = vms_service.vm_service(vm.id) + devices = vm_service.reported_devices_service().list() + tags = vm_service.tags_service().list() + stats = vm_service.statistics_service().list() + labels = vm_service.affinity_labels_service().list() + groups = clusters_service.cluster_service( + vm.cluster.id + ).affinity_groups_service().list() + + return { + 'id': vm.id, + 'name': vm.name, + 'host': connection.follow_link(vm.host).name if vm.host else None, + 'cluster': connection.follow_link(vm.cluster).name, + 'status': str(vm.status), + 'description': vm.description, + 'fqdn': vm.fqdn, + 'os_type': vm.os.type, + 'template': connection.follow_link(vm.template).name, + 'tags': [tag.name for tag in tags], + 'affinity_labels': [label.name for label in labels], + 'affinity_groups': [ + group.name for group in groups + if vm.name in [vm.name for vm in connection.follow_link(group.vms)] + ], + 'statistics': dict( + (stat.name, stat.values[0].datum) for stat in stats + ), + 'devices': dict( + (device.name, [ip.address for ip in device.ips]) for device in devices if device.ips + ), + 'ansible_host': next((device.ips[0].address for device in devices if device.ips), None) + } + + +def get_data(connection, vm_name=None): + """ + Obtain data of `vm_name` if specified, otherwise obtain data of all vms. + """ + vms_service = connection.system_service().vms_service() + clusters_service = connection.system_service().clusters_service() + + if vm_name: + vm = vms_service.list(search='name=%s' % vm_name) or [None] + data = get_dict_of_struct( + connection=connection, + vm=vm[0], + ) + else: + vms = dict() + data = defaultdict(list) + for vm in vms_service.list(): + name = vm.name + vm_service = vms_service.vm_service(vm.id) + cluster_service = clusters_service.cluster_service(vm.cluster.id) + + # Add vm to vms dict: + vms[name] = get_dict_of_struct(connection, vm) + + # Add vm to cluster group: + cluster_name = connection.follow_link(vm.cluster).name + data['cluster_%s' % cluster_name].append(name) + + # Add vm to tag group: + tags_service = vm_service.tags_service() + for tag in tags_service.list(): + data['tag_%s' % tag.name].append(name) + + # Add vm to status group: + data['status_%s' % vm.status].append(name) + + # Add vm to affinity group: + for group in cluster_service.affinity_groups_service().list(): + if vm.name in [ + v.name for v in connection.follow_link(group.vms) + ]: + data['affinity_group_%s' % group.name].append(vm.name) + + # Add vm to affinity label group: + affinity_labels_service = vm_service.affinity_labels_service() + for label in affinity_labels_service.list(): + data['affinity_label_%s' % label.name].append(name) + + data["_meta"] = { + 'hostvars': vms, + } + + return data + + +def main(): + args = parse_args() + connection = create_connection() + + print( + json.dumps( + obj=get_data( + connection=connection, + vm_name=args.host, + ), + sort_keys=args.pretty, + indent=args.pretty * 2, + ) + ) + +if __name__ == '__main__': + main() diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index d4747a8078..b35b0ad376 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -821,6 +821,16 @@ OPENSTACK_HOST_FILTER = r'^.+$' OPENSTACK_EXCLUDE_EMPTY_GROUPS = True OPENSTACK_INSTANCE_ID_VAR = 'openstack.id' +# --------------------- +# ----- oVirt4 ----- +# --------------------- +OVIRT4_ENABLED_VAR = 'status' +OVIRT4_ENABLED_VALUE = 'up' +OVIRT4_GROUP_FILTER = r'^.+$' +OVIRT4_HOST_FILTER = r'^.+$' +OVIRT4_EXCLUDE_EMPTY_GROUPS = True +OVIRT4_INSTANCE_ID_VAR = 'id' + # --------------------- # ----- Foreman ----- # --------------------- diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile index e6fb9c0d43..712c7cd607 100644 --- a/tools/docker-compose/Dockerfile +++ b/tools/docker-compose/Dockerfile @@ -14,7 +14,7 @@ requirements/requirements_dev_uninstall.txt \ RUN yum -y update && yum -y install curl epel-release RUN curl --silent --location https://rpm.nodesource.com/setup_6.x | bash - RUN yum -y localinstall http://download.postgresql.org/pub/repos/yum/9.4/redhat/rhel-6-x86_64/pgdg-centos94-9.4-3.noarch.rpm -RUN yum -y update && yum -y install openssh-server ansible mg vim tmux git mercurial subversion python-devel python-psycopg2 make postgresql postgresql-devel nginx nodejs python-psutil libxml2-devel libxslt-devel libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel zeromq-devel python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 xmlsec1-openssl-devel libtool-ltdl-devel rabbitmq-server bubblewrap zanata-python-client gettext gcc-c++ bzip2 +RUN yum -y update && yum -y install openssh-server ansible mg vim tmux git mercurial subversion python-devel python-psycopg2 make postgresql postgresql-devel nginx nodejs python-psutil libxml2-devel libxslt-devel libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel zeromq-devel python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 xmlsec1-openssl-devel libtool-ltdl-devel rabbitmq-server bubblewrap zanata-python-client gettext gcc-c++ libcurl-devel python-pycurl bzip2 RUN pip install virtualenv RUN /usr/bin/ssh-keygen -q -t rsa -N "" -f /root/.ssh/id_rsa RUN mkdir -p /data/db From 7438062b9736882bf23d9ac8ebe88d71e09a7084 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Tue, 26 Sep 2017 09:46:03 -0400 Subject: [PATCH 009/141] add ovirt sdk dependency for ovirt4 support --- requirements/requirements_ansible.in | 1 + requirements/requirements_ansible.txt | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/requirements/requirements_ansible.in b/requirements/requirements_ansible.in index c686e9545f..b4ab5f60f6 100644 --- a/requirements/requirements_ansible.in +++ b/requirements/requirements_ansible.in @@ -17,6 +17,7 @@ backports.ssl-match-hostname==3.5.0.1 kombu==3.0.37 boto==2.46.1 boto3==1.4.4 +ovirt-engine-sdk-python==4.1.6 python-memcached==1.58 psphere==0.5.2 psutil==5.2.2 diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt index 20c57308e8..944b95f72a 100644 --- a/requirements/requirements_ansible.txt +++ b/requirements/requirements_ansible.txt @@ -44,7 +44,7 @@ decorator==4.0.11 # via shade deprecation==1.0.1 # via openstacksdk #docutils==0.12 # via botocore dogpile.cache==0.6.3 # via python-ironicclient, shade -enum34==1.1.6 # via cryptography, msrest +enum34==1.1.6 # via cryptography, msrest, ovirt-engine-sdk-python funcsigs==1.0.2 # via debtcollector, oslo.utils functools32==3.2.3.post2 # via jsonschema futures==3.1.1 # via azure-storage, s3transfer, shade @@ -78,6 +78,7 @@ oslo.config==4.6.0 # via python-keystoneclient oslo.i18n==3.15.3 # via osc-lib, oslo.config, oslo.utils, python-cinderclient, python-glanceclient, python-ironicclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient oslo.serialization==2.18.0 # via python-ironicclient, python-keystoneclient, python-neutronclient, python-novaclient oslo.utils==3.26.0 # via osc-lib, oslo.serialization, python-cinderclient, python-designateclient, python-glanceclient, python-ironicclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient +ovirt-engine-sdk-python==4.1.6 packaging==16.8 # via setuptools pbr==3.1.1 # via cliff, debtcollector, keystoneauth1, openstacksdk, osc-lib, oslo.i18n, oslo.serialization, oslo.utils, positional, python-cinderclient, python-designateclient, python-glanceclient, python-ironicclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, requestsexceptions, shade, stevedore positional==1.1.1 # via keystoneauth1, python-keystoneclient @@ -114,7 +115,7 @@ s3transfer==0.1.10 # via boto3 secretstorage==2.3.1 shade==1.20.0 simplejson==3.11.1 # via osc-lib, python-cinderclient, python-neutronclient, python-novaclient -six==1.10.0 # via cliff, cmd2, cryptography, debtcollector, keystoneauth1, munch, ntlm-auth, openstacksdk, osc-lib, oslo.config, oslo.i18n, oslo.serialization, oslo.utils, packaging, pyopenssl, python-cinderclient, python-dateutil, python-designateclient, python-glanceclient, python-ironicclient, python-keystoneclient, python-memcached, python-neutronclient, python-novaclient, python-openstackclient, pyvmomi, pywinrm, setuptools, shade, stevedore, warlock +six==1.10.0 # via cliff, cmd2, cryptography, debtcollector, keystoneauth1, munch, ntlm-auth, openstacksdk, osc-lib, oslo.config, oslo.i18n, oslo.serialization, oslo.utils, ovirt-engine-sdk-python, packaging, pyopenssl, python-cinderclient, python-dateutil, python-designateclient, python-glanceclient, python-ironicclient, python-keystoneclient, python-memcached, python-neutronclient, python-novaclient, python-openstackclient, pyvmomi, pywinrm, setuptools, shade, stevedore, warlock stevedore==1.23.0 # via cliff, keystoneauth1, openstacksdk, osc-lib, oslo.config, python-designateclient, python-keystoneclient suds==0.4 # via psphere tabulate==0.7.7 # via azure-cli-core From e06d4d77343b3ec5680d4c664761c4ae0bc18ed5 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Tue, 26 Sep 2017 11:12:48 -0400 Subject: [PATCH 010/141] don't install pycurl from pypi; use a system package instead the ovirt4 sdk relies on pycurl, which is complicated to install w/ pip; rely on pycurl to be provided by a system package instead --- requirements/requirements_ansible_uninstall.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/requirements_ansible_uninstall.txt b/requirements/requirements_ansible_uninstall.txt index 963eac530b..30d8dedee3 100644 --- a/requirements/requirements_ansible_uninstall.txt +++ b/requirements/requirements_ansible_uninstall.txt @@ -1 +1,2 @@ certifi +pycurl # requires system package version From f4ab979b594f98e7e216b50930c8755f805fe3ba Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Tue, 26 Sep 2017 16:04:52 -0400 Subject: [PATCH 011/141] Prevent slugify username from social sso backends Relates #7684 of ansible-tower. Slugify username in python-social-auth means disallowing any non-alphanumerial characters, which is an over-kill for awx/tower, thus disabling it. Signed-off-by: Aaron Tan --- awx/settings/defaults.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index b35b0ad376..c1d6a053c9 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -519,7 +519,7 @@ SOCIAL_AUTH_INACTIVE_USER_URL = '/sso/inactive/' SOCIAL_AUTH_RAISE_EXCEPTIONS = False SOCIAL_AUTH_USERNAME_IS_FULL_EMAIL = False -SOCIAL_AUTH_SLUGIFY_USERNAMES = True +#SOCIAL_AUTH_SLUGIFY_USERNAMES = True SOCIAL_AUTH_CLEAN_USERNAMES = True SOCIAL_AUTH_SANITIZE_REDIRECTS = True From f4a252a331a8fcc6292799b9352cada3d707812e Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Tue, 26 Sep 2017 14:14:46 -0400 Subject: [PATCH 012/141] add new credential types in a more stable way in migrations instead of writing individual migrations for new built-in credential types, this change makes the "setup_tower_managed_defaults" function idempotent so that it only adds the credential types you're missing --- awx/main/migrations/_credentialtypes.py | 2 +- awx/main/models/credential.py | 8 ++++++++ awx/main/tests/functional/api/test_credential.py | 11 +++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/awx/main/migrations/_credentialtypes.py b/awx/main/migrations/_credentialtypes.py index 1c90822bab..104caa334a 100644 --- a/awx/main/migrations/_credentialtypes.py +++ b/awx/main/migrations/_credentialtypes.py @@ -175,4 +175,4 @@ def migrate_job_credentials(apps, schema_editor): def create_ovirt4_credtype(apps, schema_editor): - CredentialType.defaults['ovirt4']().save() + CredentialType.setup_tower_managed_defaults() diff --git a/awx/main/models/credential.py b/awx/main/models/credential.py index 5a1832f323..7db8db04e9 100644 --- a/awx/main/models/credential.py +++ b/awx/main/models/credential.py @@ -3,6 +3,7 @@ from collections import OrderedDict import functools import json +import logging import operator import os import stat @@ -35,6 +36,8 @@ from awx.main.utils import encrypt_field __all__ = ['Credential', 'CredentialType', 'V1Credential'] +logger = logging.getLogger('awx.main.models.credential') + class V1Credential(object): @@ -468,6 +471,11 @@ class CredentialType(CommonModelNameNotUnique): for default in cls.defaults.values(): default_ = default() if persisted: + if CredentialType.objects.filter(name=default_.name, kind=default_.kind).count(): + continue + logger.debug(_( + "adding %s credential type" % default_.name + )) default_.save() @classmethod diff --git a/awx/main/tests/functional/api/test_credential.py b/awx/main/tests/functional/api/test_credential.py index b60d215e14..ff29f9ed3f 100644 --- a/awx/main/tests/functional/api/test_credential.py +++ b/awx/main/tests/functional/api/test_credential.py @@ -14,6 +14,17 @@ EXAMPLE_PRIVATE_KEY = '-----BEGIN PRIVATE KEY-----\nxyz==\n-----END PRIVATE KEY- EXAMPLE_ENCRYPTED_PRIVATE_KEY = '-----BEGIN PRIVATE KEY-----\nProc-Type: 4,ENCRYPTED\nxyz==\n-----END PRIVATE KEY-----' +@pytest.mark.django_db +def test_idempotent_credential_type_setup(): + assert CredentialType.objects.count() == 0 + CredentialType.setup_tower_managed_defaults() + total = CredentialType.objects.count() + assert total > 0 + + CredentialType.setup_tower_managed_defaults() + assert CredentialType.objects.count() == total + + @pytest.mark.django_db @pytest.mark.parametrize('kind, total', [ ('ssh', 1), ('net', 0) From a11e33458fee23892999b1a37eefb0ffb031d64a Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Wed, 27 Sep 2017 15:11:38 -0400 Subject: [PATCH 013/141] Include Tower configurations into activity stream Relates #7386 of ansible-tower. Due to the uniqueness of Tower configuration datastore model, it is not fully compatible with activity stream workflow. This PR introduced setting field for activitystream model along with other changes to make Tower configuration a special case for activity streams. Signed-off-by: Aaron Tan --- awx/api/serializers.py | 7 +++++++ awx/conf/registry.py | 3 +++ awx/conf/utils.py | 12 ++++++++++- ...2_add_setting_field_for_activity_stream.py | 20 ++++++++++++++++++ awx/main/models/activity_stream.py | 3 +++ awx/main/signals.py | 12 +++++++++-- .../functional/api/test_activity_streams.py | 21 +++++++++++++++++++ 7 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 awx/main/migrations/0010_v322_add_setting_field_for_activity_stream.py diff --git a/awx/api/serializers.py b/awx/api/serializers.py index e6b1058778..fbc9db29f5 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -3797,6 +3797,11 @@ class ActivityStreamSerializer(BaseSerializer): if fk == 'schedule': rel['unified_job_template'] = thisItem.unified_job_template.get_absolute_url(self.context.get('request')) + if obj.setting and obj.setting.get('category', None): + rel['setting'] = self.reverse( + 'api:setting_singleton_detail', + kwargs={'category_slug': obj.setting['category']} + ) return rel def _get_rel(self, obj, fk): @@ -3848,6 +3853,8 @@ class ActivityStreamSerializer(BaseSerializer): username = obj.actor.username, first_name = obj.actor.first_name, last_name = obj.actor.last_name) + if obj.setting: + summary_fields['setting'] = [obj.setting] return summary_fields diff --git a/awx/conf/registry.py b/awx/conf/registry.py index a50753aecb..4e07f0d7da 100644 --- a/awx/conf/registry.py +++ b/awx/conf/registry.py @@ -120,6 +120,9 @@ class SettingsRegistry(object): def is_setting_read_only(self, setting): return bool(self._registry.get(setting, {}).get('read_only', False)) + def get_setting_category(self, setting): + return self._registry.get(setting, {}).get('category_slug', None) + def get_setting_field(self, setting, mixin_class=None, for_user=False, **kwargs): from rest_framework.fields import empty field_kwargs = {} diff --git a/awx/conf/utils.py b/awx/conf/utils.py index b780038e9f..b0d4ffb694 100755 --- a/awx/conf/utils.py +++ b/awx/conf/utils.py @@ -9,7 +9,10 @@ import shutil # RedBaron from redbaron import RedBaron, indent -__all__ = ['comment_assignments'] +# AWX +from awx.conf.registry import settings_registry + +__all__ = ['comment_assignments', 'conf_to_dict'] def comment_assignments(patterns, assignment_names, dry_run=True, backup_suffix='.old'): @@ -103,6 +106,13 @@ def comment_assignments_in_file(filename, assignment_names, dry_run=True, backup return '\n'.join(diff_lines) +def conf_to_dict(obj): + return { + 'category': settings_registry.get_setting_category(obj.key), + 'name': obj.key, + } + + if __name__ == '__main__': pattern = os.path.join(os.path.dirname(__file__), '..', 'settings', 'local_*.py') diffs = comment_assignments(pattern, ['AUTH_LDAP_ORGANIZATION_MAP']) diff --git a/awx/main/migrations/0010_v322_add_setting_field_for_activity_stream.py b/awx/main/migrations/0010_v322_add_setting_field_for_activity_stream.py new file mode 100644 index 0000000000..ad3856567a --- /dev/null +++ b/awx/main/migrations/0010_v322_add_setting_field_for_activity_stream.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations +import awx.main.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0009_v322_add_support_for_ovirt4_inventory'), + ] + + operations = [ + migrations.AddField( + model_name='activitystream', + name='setting', + field=awx.main.fields.JSONField(default=dict, blank=True), + ), + ] diff --git a/awx/main/models/activity_stream.py b/awx/main/models/activity_stream.py index 4d8a4e9709..94df2f985c 100644 --- a/awx/main/models/activity_stream.py +++ b/awx/main/models/activity_stream.py @@ -3,6 +3,7 @@ # Tower from awx.api.versioning import reverse +from awx.main.fields import JSONField # Django from django.db import models @@ -66,6 +67,8 @@ class ActivityStream(models.Model): role = models.ManyToManyField("Role", blank=True) instance_group = models.ManyToManyField("InstanceGroup", blank=True) + setting = JSONField(blank=True) + def get_absolute_url(self, request=None): return reverse('api:activity_stream_detail', kwargs={'pk': self.pk}, request=request) diff --git a/awx/main/signals.py b/awx/main/signals.py index 77fd91a5c3..1936f96c76 100644 --- a/awx/main/signals.py +++ b/awx/main/signals.py @@ -26,6 +26,8 @@ from awx.main.fields import is_implicit_parent from awx.main.consumers import emit_channel_notification +from awx.conf.utils import conf_to_dict + __all__ = [] logger = logging.getLogger('awx.main.signals') @@ -402,12 +404,15 @@ def activity_stream_create(sender, instance, created, **kwargs): object1=object1, changes=json.dumps(changes), actor=get_current_user_or_none()) - activity_entry.save() #TODO: Weird situation where cascade SETNULL doesn't work # it might actually be a good idea to remove all of these FK references since # we don't really use them anyway. if instance._meta.model_name != 'setting': # Is not conf.Setting instance + activity_entry.save() getattr(activity_entry, object1).add(instance) + else: + activity_entry.setting = conf_to_dict(instance) + activity_entry.save() def activity_stream_update(sender, instance, **kwargs): @@ -433,9 +438,12 @@ def activity_stream_update(sender, instance, **kwargs): object1=object1, changes=json.dumps(changes), actor=get_current_user_or_none()) - activity_entry.save() if instance._meta.model_name != 'setting': # Is not conf.Setting instance + activity_entry.save() getattr(activity_entry, object1).add(instance) + else: + activity_entry.setting = conf_to_dict(instance) + activity_entry.save() def activity_stream_delete(sender, instance, **kwargs): diff --git a/awx/main/tests/functional/api/test_activity_streams.py b/awx/main/tests/functional/api/test_activity_streams.py index 1396ac3b48..382add5dc6 100644 --- a/awx/main/tests/functional/api/test_activity_streams.py +++ b/awx/main/tests/functional/api/test_activity_streams.py @@ -5,6 +5,7 @@ from awx.api.versioning import reverse from awx.main.middleware import ActivityStreamMiddleware from awx.main.models.activity_stream import ActivityStream from awx.main.access import ActivityStreamAccess +from awx.conf.models import Setting def mock_feature_enabled(feature): @@ -47,6 +48,26 @@ def test_basic_fields(monkeypatch, organization, get, user, settings): assert response.data['summary_fields']['organization'][0]['name'] == 'test-org' +@mock.patch('awx.api.views.feature_enabled', new=mock_feature_enabled) +@pytest.mark.django_db +def test_ctint_activity_stream(monkeypatch, get, user, settings): + Setting.objects.create(key="FOO", value="bar") + settings.ACTIVITY_STREAM_ENABLED = True + u = user('admin', True) + activity_stream = ActivityStream.objects.filter(setting={'name': 'FOO', 'category': None}).latest('pk') + activity_stream.actor = u + activity_stream.save() + + aspk = activity_stream.pk + url = reverse('api:activity_stream_detail', kwargs={'pk': aspk}) + response = get(url, user('admin', True)) + + assert response.status_code == 200 + assert 'summary_fields' in response.data + assert 'setting' in response.data['summary_fields'] + assert response.data['summary_fields']['setting'][0]['name'] == 'FOO' + + @mock.patch('awx.api.views.feature_enabled', new=mock_feature_enabled) @pytest.mark.django_db def test_middleware_actor_added(monkeypatch, post, get, user, settings): From 9ee18d02c84ef1a0c3a0f48eceefd553ac734c75 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Sat, 19 Aug 2017 07:53:27 -0400 Subject: [PATCH 014/141] new method of performance logging --- awx/api/generics.py | 1 - awx/main/middleware.py | 36 ++++++++++++++++++++++++++++++++++++ awx/main/utils/formatters.py | 5 ++++- awx/settings/defaults.py | 5 +++++ 4 files changed, 45 insertions(+), 2 deletions(-) diff --git a/awx/api/generics.py b/awx/api/generics.py index d2d7f0ff40..36176016b0 100644 --- a/awx/api/generics.py +++ b/awx/api/generics.py @@ -139,7 +139,6 @@ class APIView(views.APIView): response['X-API-Query-Count'] = len(q_times) response['X-API-Query-Time'] = '%0.3fs' % sum(q_times) - analytics_logger.info("api response", extra=dict(python_objects=dict(request=request, response=response))) return response def get_authenticate_header(self, request): diff --git a/awx/main/middleware.py b/awx/main/middleware.py index dfb08b20fb..0c71eeed92 100644 --- a/awx/main/middleware.py +++ b/awx/main/middleware.py @@ -5,6 +5,10 @@ import logging import threading import uuid import six +import time +import cProfile +import pstats +import os from django.conf import settings from django.contrib.auth.models import User @@ -23,6 +27,38 @@ from awx.conf import fields, register logger = logging.getLogger('awx.main.middleware') analytics_logger = logging.getLogger('awx.analytics.activity_stream') +perf_logger = logging.getLogger('awx.analytics.performance') + + +class TimingMiddleware(threading.local): + + dest = '/var/lib/awx/profile' + + def process_request(self, request): + self.start_time = time.time() + if settings.AWX_REQUEST_PROFILE: + self.prof = cProfile.Profile() + self.prof.enable() + + def process_response(self, request, response): + total_time = time.time() - self.start_time + response['X-API-Total-Time'] = '%0.3fs' % total_time + if settings.AWX_REQUEST_PROFILE: + self.prof.disable() + cprofile_file = self.save_profile_file(request) + response['cprofile_file'] = cprofile_file + perf_logger.info('api response times', extra=dict(python_objects=dict(request=request, response=response))) + return response + + def save_profile_file(self, request): + if not os.path.isdir(self.dest): + os.makedirs(self.dest) + filename = '%.3fs-%s' % (pstats.Stats(self.prof).total_tt, uuid.uuid4()) + filepath = os.path.join(self.dest, filename) + with open(filepath, 'w') as f: + f.write('%s %s\n' % (request.method, request.get_full_path())) + pstats.Stats(self.prof, stream=f).sort_stats('cumulative').print_stats() + return filepath class ActivityStreamMiddleware(threading.local): diff --git a/awx/main/utils/formatters.py b/awx/main/utils/formatters.py index 12034dd5ea..380641fdf9 100644 --- a/awx/main/utils/formatters.py +++ b/awx/main/utils/formatters.py @@ -120,6 +120,7 @@ class LogstashFormatter(LogstashFormatterVersion1): # exist if SQL_DEBUG is turned on in settings. headers = [ (float, 'X-API-Time'), # may end with an 's' "0.33s" + (float, 'X-API-Total-Time'), (int, 'X-API-Query-Count'), (float, 'X-API-Query-Time'), # may also end with an 's' (str, 'X-API-Node'), @@ -131,9 +132,11 @@ class LogstashFormatter(LogstashFormatterVersion1): 'path': request.path, 'path_info': request.path_info, 'query_string': request.META['QUERY_STRING'], - 'data': request.data, } + if hasattr(request, 'data'): + data_for_log['request']['data'] = request.data + return data_for_log def get_extra_fields(self, record): diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index c1d6a053c9..9f25ddb525 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -211,6 +211,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( # NOQA ) MIDDLEWARE_CLASSES = ( # NOQA + 'awx.main.middleware.TimingMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.locale.LocaleMiddleware', 'django.middleware.common.CommonMiddleware', @@ -1134,4 +1135,8 @@ LOGGING = { }, } } +# Apply coloring to messages logged to the console COLOR_LOGS = False + +# Use middleware to get request statistics +AWX_REQUEST_PROFILE = False From a0cfbb93e9325672c6d195cd2d634fa52248cb3f Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Mon, 2 Oct 2017 14:30:26 -0400 Subject: [PATCH 015/141] fix busted 3.2.2 activity stream migration see: ansible/ansible-tower#7704 --- awx/main/migrations/0007_v320_data_migrations.py | 3 ++- ...0009_v322_add_setting_field_for_activity_stream.py} | 2 +- ...y => 0010_v322_add_support_for_ovirt4_inventory.py} | 2 +- awx/main/migrations/__init__.py | 10 ++++++++++ 4 files changed, 14 insertions(+), 3 deletions(-) rename awx/main/migrations/{0010_v322_add_setting_field_for_activity_stream.py => 0009_v322_add_setting_field_for_activity_stream.py} (86%) rename awx/main/migrations/{0009_v322_add_support_for_ovirt4_inventory.py => 0010_v322_add_support_for_ovirt4_inventory.py} (95%) diff --git a/awx/main/migrations/0007_v320_data_migrations.py b/awx/main/migrations/0007_v320_data_migrations.py index 9461e81bcb..e8ede86ba9 100644 --- a/awx/main/migrations/0007_v320_data_migrations.py +++ b/awx/main/migrations/0007_v320_data_migrations.py @@ -6,6 +6,7 @@ from __future__ import unicode_literals from django.db import migrations, models # AWX +from awx.main.migrations import ActivityStreamDisabledMigration from awx.main.migrations import _inventory_source as invsrc from awx.main.migrations import _migration_utils as migration_utils from awx.main.migrations import _reencrypt as reencrypt @@ -15,7 +16,7 @@ from awx.main.migrations import _azure_credentials as azurecreds import awx.main.fields -class Migration(migrations.Migration): +class Migration(ActivityStreamDisabledMigration): dependencies = [ ('main', '0006_v320_release'), diff --git a/awx/main/migrations/0010_v322_add_setting_field_for_activity_stream.py b/awx/main/migrations/0009_v322_add_setting_field_for_activity_stream.py similarity index 86% rename from awx/main/migrations/0010_v322_add_setting_field_for_activity_stream.py rename to awx/main/migrations/0009_v322_add_setting_field_for_activity_stream.py index ad3856567a..3d69de2b33 100644 --- a/awx/main/migrations/0010_v322_add_setting_field_for_activity_stream.py +++ b/awx/main/migrations/0009_v322_add_setting_field_for_activity_stream.py @@ -8,7 +8,7 @@ import awx.main.fields class Migration(migrations.Migration): dependencies = [ - ('main', '0009_v322_add_support_for_ovirt4_inventory'), + ('main', '0008_v320_drop_v1_credential_fields'), ] operations = [ diff --git a/awx/main/migrations/0009_v322_add_support_for_ovirt4_inventory.py b/awx/main/migrations/0010_v322_add_support_for_ovirt4_inventory.py similarity index 95% rename from awx/main/migrations/0009_v322_add_support_for_ovirt4_inventory.py rename to awx/main/migrations/0010_v322_add_support_for_ovirt4_inventory.py index e29bdfb4d3..e6db61e4b8 100644 --- a/awx/main/migrations/0009_v322_add_support_for_ovirt4_inventory.py +++ b/awx/main/migrations/0010_v322_add_support_for_ovirt4_inventory.py @@ -10,7 +10,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0008_v320_drop_v1_credential_fields'), + ('main', '0009_v322_add_setting_field_for_activity_stream'), ] operations = [ diff --git a/awx/main/migrations/__init__.py b/awx/main/migrations/__init__.py index 709b95a6a6..2ea54e7880 100644 --- a/awx/main/migrations/__init__.py +++ b/awx/main/migrations/__init__.py @@ -1,2 +1,12 @@ # Copyright (c) 2016 Ansible, Inc. # All Rights Reserved. + +from django.db.migrations import Migration + + +class ActivityStreamDisabledMigration(Migration): + + def apply(self, project_state, schema_editor, collect_sql=False): + from awx.main.signals import disable_activity_stream + with disable_activity_stream(): + return Migration.apply(self, project_state, schema_editor, collect_sql) From 4be4e3db7f36f092da28f3992ee4a4341bec95dc Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Thu, 28 Sep 2017 14:21:18 -0400 Subject: [PATCH 016/141] encrypt job survey data see: https://github.com/ansible/ansible-tower/issues/7046 --- awx/api/views.py | 15 ++- awx/main/models/jobs.py | 7 +- awx/main/models/mixins.py | 15 +++ awx/main/tasks.py | 2 +- .../tests/functional/api/test_survey_spec.py | 105 ++++++++++++++++++ .../tests/unit/models/test_survey_models.py | 1 + awx/main/tests/unit/test_tasks.py | 16 ++- awx/main/utils/encryption.py | 9 +- 8 files changed, 164 insertions(+), 6 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index ba7fc709e1..366ee29957 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -15,6 +15,7 @@ import logging import requests from base64 import b64encode from collections import OrderedDict +import six # Django from django.conf import settings @@ -72,6 +73,7 @@ from awx.main.utils import ( extract_ansible_vars, decrypt_field, ) +from awx.main.utils.encryption import encrypt_value from awx.main.utils.filters import SmartFilter from awx.main.utils.insights import filter_insights_api_response @@ -2899,8 +2901,15 @@ class JobTemplateSurveySpec(GenericAPIView): if "required" not in survey_item: return Response(dict(error=_("'required' missing from survey question %s.") % str(idx)), status=status.HTTP_400_BAD_REQUEST) - if survey_item["type"] == "password": - if survey_item.get("default") and survey_item["default"].startswith('$encrypted$'): + if survey_item["type"] == "password" and "default" in survey_item: + if not isinstance(survey_item['default'], six.string_types): + return Response( + _("Value %s for '%s' expected to be a string." % ( + survey_item["default"], survey_item["variable"] + )), + status=status.HTTP_400_BAD_REQUEST + ) + elif survey_item["default"].startswith('$encrypted$'): if not obj.survey_spec: return Response(dict(error=_("$encrypted$ is reserved keyword and may not be used as a default for password {}.".format(str(idx)))), status=status.HTTP_400_BAD_REQUEST) @@ -2909,6 +2918,8 @@ class JobTemplateSurveySpec(GenericAPIView): for old_item in old_spec['spec']: if old_item['variable'] == survey_item['variable']: survey_item['default'] = old_item['default'] + else: + survey_item['default'] = encrypt_value(survey_item['default']) idx += 1 obj.survey_spec = new_spec diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index b9e6a00359..249c051f20 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -37,6 +37,7 @@ from awx.main.utils import ( ignore_inventory_computed_fields, parse_yaml_or_json, ) +from awx.main.utils.encryption import encrypt_value from awx.main.fields import ImplicitRoleField from awx.main.models.mixins import ResourceMixin, SurveyJobTemplateMixin, SurveyJobMixin, TaskManagerJobMixin from awx.main.models.base import PERM_INVENTORY_SCAN @@ -385,6 +386,7 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour # Sort the runtime fields allowed and disallowed by job template ignored_fields = {} prompted_fields = {} + survey_password_variables = self.survey_password_variables() ask_for_vars_dict = self._ask_for_vars_dict() @@ -402,7 +404,10 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour extra_vars = parse_yaml_or_json(kwargs[field]) for key in extra_vars: if key in survey_vars: - prompted_fields[field][key] = extra_vars[key] + if key in survey_password_variables: + prompted_fields[field][key] = encrypt_value(extra_vars[key]) + else: + prompted_fields[field][key] = extra_vars[key] else: ignored_fields[field][key] = extra_vars[key] else: diff --git a/awx/main/models/mixins.py b/awx/main/models/mixins.py index e13b56fa87..9bdf7194d7 100644 --- a/awx/main/models/mixins.py +++ b/awx/main/models/mixins.py @@ -13,6 +13,7 @@ from awx.main.models.rbac import ( Role, RoleAncestorEntry, get_roles_on_resource ) from awx.main.utils import parse_yaml_or_json +from awx.main.utils.encryption import decrypt_value, get_encryption_key from awx.main.fields import JSONField @@ -263,6 +264,20 @@ class SurveyJobMixin(models.Model): else: return self.extra_vars + def decrypted_extra_vars(self): + ''' + Decrypts fields marked as passwords in survey. + ''' + if self.survey_passwords: + extra_vars = json.loads(self.extra_vars) + for key in self.survey_passwords: + if key in extra_vars: + value = extra_vars[key] + extra_vars[key] = decrypt_value(get_encryption_key('value', pk=None), value) + return json.dumps(extra_vars) + else: + return self.extra_vars + class TaskManagerUnifiedJobMixin(models.Model): class Meta: diff --git a/awx/main/tasks.py b/awx/main/tasks.py index aed99cd9ab..5dbadd4131 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -1180,7 +1180,7 @@ class RunJob(BaseTask): if kwargs.get('display', False) and job.job_template: extra_vars.update(json.loads(job.display_extra_vars())) else: - extra_vars.update(job.extra_vars_dict) + extra_vars.update(json.loads(job.decrypted_extra_vars())) args.extend(['-e', json.dumps(extra_vars)]) # Add path to playbook (relative to project.local_path). diff --git a/awx/main/tests/functional/api/test_survey_spec.py b/awx/main/tests/functional/api/test_survey_spec.py index f679d6806b..0b9a16cea1 100644 --- a/awx/main/tests/functional/api/test_survey_spec.py +++ b/awx/main/tests/functional/api/test_survey_spec.py @@ -91,6 +91,111 @@ def test_survey_spec_sucessful_creation(survey_spec_factory, job_template, post, assert updated_jt.survey_spec == survey_input_data +@mock.patch('awx.api.views.feature_enabled', lambda feature: True) +@pytest.mark.django_db +@pytest.mark.parametrize('value, status', [ + ('SUPERSECRET', 201), + (['some', 'invalid', 'list'], 400), + ({'some-invalid': 'dict'}, 400), + (False, 400) +]) +def test_survey_spec_passwords_are_encrypted_on_launch(job_template_factory, post, admin_user, value, status): + objects = job_template_factory('jt', organization='org1', project='prj', + inventory='inv', credential='cred') + job_template = objects.job_template + job_template.survey_enabled = True + job_template.save() + input_data = { + 'description': 'A survey', + 'spec': [{ + 'index': 0, + 'question_name': 'What is your password?', + 'required': True, + 'variable': 'secret_value', + 'type': 'password' + }], + 'name': 'my survey' + } + post(url=reverse('api:job_template_survey_spec', kwargs={'pk': job_template.id}), + data=input_data, user=admin_user, expect=200) + resp = post(reverse('api:job_template_launch', kwargs={'pk': job_template.pk}), + dict(extra_vars=dict(secret_value=value)), admin_user, expect=status) + + if status == 201: + job = Job.objects.get(pk=resp.data['id']) + assert json.loads(job.extra_vars)['secret_value'].startswith('$encrypted$') + assert json.loads(job.decrypted_extra_vars()) == { + 'secret_value': value + } + else: + assert "for 'secret_value' expected to be a string." in json.dumps(resp.data) + + +@mock.patch('awx.api.views.feature_enabled', lambda feature: True) +@pytest.mark.django_db +@pytest.mark.parametrize('default, status', [ + ('SUPERSECRET', 200), + (['some', 'invalid', 'list'], 400), + ({'some-invalid': 'dict'}, 400), + (False, 400) +]) +def test_survey_spec_default_passwords_are_encrypted(job_template, post, admin_user, default, status): + job_template.survey_enabled = True + job_template.save() + input_data = { + 'description': 'A survey', + 'spec': [{ + 'index': 0, + 'question_name': 'What is your password?', + 'required': True, + 'variable': 'secret_value', + 'default': default, + 'type': 'password' + }], + 'name': 'my survey' + } + resp = post(url=reverse('api:job_template_survey_spec', kwargs={'pk': job_template.id}), + data=input_data, user=admin_user, expect=status) + + if status == 200: + updated_jt = JobTemplate.objects.get(pk=job_template.pk) + assert updated_jt.survey_spec['spec'][0]['default'].startswith('$encrypted$') + + job = updated_jt.create_unified_job() + assert json.loads(job.extra_vars)['secret_value'].startswith('$encrypted$') + assert json.loads(job.decrypted_extra_vars()) == { + 'secret_value': default + } + else: + assert "for 'secret_value' expected to be a string." in str(resp.data) + + +@mock.patch('awx.api.views.feature_enabled', lambda feature: True) +@pytest.mark.django_db +def test_survey_spec_default_passwords_encrypted_on_update(job_template, post, put, admin_user): + input_data = { + 'description': 'A survey', + 'spec': [{ + 'index': 0, + 'question_name': 'What is your password?', + 'required': True, + 'variable': 'secret_value', + 'default': 'SUPERSECRET', + 'type': 'password' + }], + 'name': 'my survey' + } + post(url=reverse('api:job_template_survey_spec', kwargs={'pk': job_template.id}), + data=input_data, user=admin_user, expect=200) + updated_jt = JobTemplate.objects.get(pk=job_template.pk) + + # simulate a survey field edit where we're not changing the default value + input_data['spec'][0]['default'] = '$encrypted$' + post(url=reverse('api:job_template_survey_spec', kwargs={'pk': job_template.id}), + data=input_data, user=admin_user, expect=200) + assert updated_jt.survey_spec == JobTemplate.objects.get(pk=job_template.pk).survey_spec + + # Tests related to survey content validation @mock.patch('awx.api.views.feature_enabled', lambda feature: True) @pytest.mark.django_db diff --git a/awx/main/tests/unit/models/test_survey_models.py b/awx/main/tests/unit/models/test_survey_models.py index ba05940abc..d40d6f4800 100644 --- a/awx/main/tests/unit/models/test_survey_models.py +++ b/awx/main/tests/unit/models/test_survey_models.py @@ -13,6 +13,7 @@ from awx.main.models import ( @pytest.fixture def job(mocker): ret = mocker.MagicMock(**{ + 'decrypted_extra_vars.return_value': '{\"secret_key\": \"my_password\"}', 'display_extra_vars.return_value': '{\"secret_key\": \"$encrypted$\"}', 'extra_vars_dict': {"secret_key": "my_password"}, 'pk': 1, 'job_template.pk': 1, 'job_template.name': '', diff --git a/awx/main/tests/unit/test_tasks.py b/awx/main/tests/unit/test_tasks.py index a9fb3dd448..ccd49a5094 100644 --- a/awx/main/tests/unit/test_tasks.py +++ b/awx/main/tests/unit/test_tasks.py @@ -31,7 +31,7 @@ from awx.main.models import ( ) from awx.main import tasks -from awx.main.utils import encrypt_field +from awx.main.utils import encrypt_field, encrypt_value @@ -306,6 +306,20 @@ class TestGenericRun(TestJobExecution): assert '"awx_user_id": 123,' in ' '.join(args) assert '"awx_user_name": "angry-spud"' in ' '.join(args) + def test_survey_extra_vars(self): + self.instance.extra_vars = json.dumps({ + 'super_secret': encrypt_value('CLASSIFIED', pk=None) + }) + self.instance.survey_passwords = { + 'super_secret': '$encrypted$' + } + self.task.run(self.pk) + + assert self.run_pexpect.call_count == 1 + call_args, _ = self.run_pexpect.call_args_list[0] + args, cwd, env, stdout = call_args + assert '"super_secret": "CLASSIFIED"' in ' '.join(args) + def test_awx_task_env(self): patch = mock.patch('awx.main.tasks.settings.AWX_TASK_ENV', {'FOO': 'BAR'}) patch.start() diff --git a/awx/main/utils/encryption.py b/awx/main/utils/encryption.py index 025081b773..c8c5b72afd 100644 --- a/awx/main/utils/encryption.py +++ b/awx/main/utils/encryption.py @@ -1,6 +1,7 @@ import base64 import hashlib import logging +from collections import namedtuple import six from cryptography.fernet import Fernet, InvalidToken @@ -8,7 +9,8 @@ from cryptography.hazmat.backends import default_backend from django.utils.encoding import smart_str -__all__ = ['get_encryption_key', 'encrypt_field', 'decrypt_field', 'decrypt_value'] +__all__ = ['get_encryption_key', 'encrypt_value', 'encrypt_field', + 'decrypt_field', 'decrypt_value'] logger = logging.getLogger('awx.main.utils.encryption') @@ -50,6 +52,11 @@ def get_encryption_key(field_name, pk=None): return base64.urlsafe_b64encode(h.digest()) +def encrypt_value(value, pk=None): + TransientField = namedtuple('TransientField', ['pk', 'value']) + return encrypt_field(TransientField(pk=pk, value=value), 'value') + + def encrypt_field(instance, field_name, ask=False, subfield=None, skip_utf8=False): ''' Return content of the given instance and field name encrypted. From f26bdb3e966c3f649929663cd7066f464bd0146e Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Fri, 29 Sep 2017 11:41:39 -0400 Subject: [PATCH 017/141] migrate existing survey passwords to be encrypted see: https://github.com/ansible/ansible-tower/issues/7046 --- .../0011_v322_encrypt_survey_passwords.py | 17 ++++++ awx/main/migrations/_reencrypt.py | 37 ++++++++++++ .../functional/test_reencrypt_migration.py | 56 ++++++++++++++++++- 3 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 awx/main/migrations/0011_v322_encrypt_survey_passwords.py diff --git a/awx/main/migrations/0011_v322_encrypt_survey_passwords.py b/awx/main/migrations/0011_v322_encrypt_survey_passwords.py new file mode 100644 index 0000000000..344aa96bc1 --- /dev/null +++ b/awx/main/migrations/0011_v322_encrypt_survey_passwords.py @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations +from awx.main.migrations import ActivityStreamDisabledMigration +from awx.main.migrations import _reencrypt as reencrypt + + +class Migration(ActivityStreamDisabledMigration): + + dependencies = [ + ('main', '0010_v322_add_support_for_ovirt4_inventory'), + ] + + operations = [ + migrations.RunPython(reencrypt.encrypt_survey_passwords), + ] diff --git a/awx/main/migrations/_reencrypt.py b/awx/main/migrations/_reencrypt.py index c4e502f9a2..c1fad4aedf 100644 --- a/awx/main/migrations/_reencrypt.py +++ b/awx/main/migrations/_reencrypt.py @@ -1,5 +1,7 @@ import logging +import json from django.utils.translation import ugettext_lazy as _ +import six from awx.conf.migrations._reencrypt import ( decrypt_field, @@ -72,3 +74,38 @@ def _unified_jobs(apps): uj.start_args = decrypt_field(uj, 'start_args') uj.start_args = encrypt_field(uj, 'start_args') uj.save() + + +def encrypt_survey_passwords(apps, schema_editor): + _encrypt_survey_passwords( + apps.get_model('main', 'Job'), + apps.get_model('main', 'JobTemplate'), + ) + + +def _encrypt_survey_passwords(Job, JobTemplate): + from awx.main.utils.encryption import encrypt_value + for jt in JobTemplate.objects.exclude(survey_spec={}): + changed = False + if jt.survey_spec.get('spec', []): + for field in jt.survey_spec['spec']: + if field.get('type') == 'password' and field.get('default', ''): + if field['default'].startswith('$encrypted$'): + continue + field['default'] = encrypt_value(field['default'], pk=None) + changed = True + if changed: + jt.save() + + for job in Job.objects.defer('result_stdout_text').exclude(survey_passwords={}).iterator(): + changed = False + for key in job.survey_passwords: + if key in job.extra_vars: + extra_vars = json.loads(job.extra_vars) + if not extra_vars.get(key, '') or extra_vars[key].startswith('$encrypted$'): + continue + extra_vars[key] = encrypt_value(extra_vars[key], pk=None) + job.extra_vars = json.dumps(extra_vars) + changed = True + if changed: + job.save() diff --git a/awx/main/tests/functional/test_reencrypt_migration.py b/awx/main/tests/functional/test_reencrypt_migration.py index 3201866893..18aa2bc644 100644 --- a/awx/main/tests/functional/test_reencrypt_migration.py +++ b/awx/main/tests/functional/test_reencrypt_migration.py @@ -10,6 +10,8 @@ from django.apps import apps from awx.main.models import ( UnifiedJob, + Job, + JobTemplate, NotificationTemplate, Credential, ) @@ -20,9 +22,10 @@ from awx.main.migrations._reencrypt import ( _notification_templates, _credentials, _unified_jobs, + _encrypt_survey_passwords ) -from awx.main.utils import decrypt_field +from awx.main.utils import decrypt_field, get_encryption_key, decrypt_value @pytest.mark.django_db @@ -93,3 +96,54 @@ def test_unified_job_migration(old_enc, new_enc, value): # Exception if the encryption type of AESCBC is not properly skipped, ensures # our `startswith` calls don't have typos _unified_jobs(apps) + + +@pytest.mark.django_db +def test_survey_default_password_encryption(job_template_factory): + jt = job_template_factory('jt', organization='org1', project='prj', + inventory='inv', credential='cred').job_template + jt.survey_enabled = True + jt.survey_spec = { + 'description': 'A survey', + 'spec': [{ + 'index': 0, + 'question_name': 'What is your password?', + 'required': True, + 'variable': 'secret_value', + 'default': 'SUPERSECRET', + 'type': 'password' + }], + 'name': 'my survey' + } + jt.save() + + _encrypt_survey_passwords(Job, JobTemplate) + spec = JobTemplate.objects.get(pk=jt.pk).survey_spec['spec'] + assert decrypt_value(get_encryption_key('value', pk=None), spec[0]['default']) == 'SUPERSECRET' + + +@pytest.mark.django_db +def test_job_survey_vars_encryption(job_template_factory): + jt = job_template_factory('jt', organization='org1', project='prj', + inventory='inv', credential='cred').job_template + jt.survey_enabled = True + jt.survey_spec = { + 'description': 'A survey', + 'spec': [{ + 'index': 0, + 'question_name': 'What is your password?', + 'required': True, + 'variable': 'secret_value', + 'default': '', + 'type': 'password' + }], + 'name': 'my survey' + } + jt.save() + job = jt.create_unified_job() + job.extra_vars = json.dumps({'secret_value': 'SUPERSECRET'}) + job.save() + + _encrypt_survey_passwords(Job, JobTemplate) + job = Job.objects.get(pk=job.pk) + assert json.loads(job.decrypted_extra_vars()) == {'secret_value': 'SUPERSECRET'} From 3abbe87e10ef8dfab4e612e330a67f5327170b23 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Mon, 2 Oct 2017 11:17:18 -0400 Subject: [PATCH 018/141] fix bug checking WFJT node for prompted resources --- awx/main/access.py | 4 ++-- awx/main/tests/functional/test_rbac_workflow.py | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/awx/main/access.py b/awx/main/access.py index c2dae1397c..75fd3ce1e7 100644 --- a/awx/main/access.py +++ b/awx/main/access.py @@ -1605,9 +1605,9 @@ class WorkflowJobTemplateNodeAccess(BaseAccess): if 'credential' in data or 'inventory' in data: new_data = data if 'credential' not in data: - new_data['credential'] = self.credential + new_data['credential'] = obj.credential if 'inventory' not in data: - new_data['inventory'] = self.inventory + new_data['inventory'] = obj.inventory return self.can_use_prompted_resources(new_data) return True diff --git a/awx/main/tests/functional/test_rbac_workflow.py b/awx/main/tests/functional/test_rbac_workflow.py index c069a8dbad..84b02b5690 100644 --- a/awx/main/tests/functional/test_rbac_workflow.py +++ b/awx/main/tests/functional/test_rbac_workflow.py @@ -57,7 +57,21 @@ class TestWorkflowJobTemplateNodeAccess: # without access to the related job template, admin to the WFJT can # not change the prompted parameters access = WorkflowJobTemplateNodeAccess(org_admin) - assert not access.can_change(wfjt_node, {'job_type': 'scan'}) + assert not access.can_change(wfjt_node, {'job_type': 'check'}) + + def test_node_edit_allowed(self, wfjt_node, org_admin): + wfjt_node.unified_job_template.admin_role.members.add(org_admin) + access = WorkflowJobTemplateNodeAccess(org_admin) + assert access.can_change(wfjt_node, {'job_type': 'check'}) + + def test_prompted_resource_prevents_edit(self, wfjt_node, org_admin, machine_credential): + # without access to prompted resources, admin to the WFJT can + # not change the other prompted resources + wfjt_node.unified_job_template.admin_role.members.add(org_admin) + wfjt_node.credential = machine_credential + wfjt_node.save() + access = WorkflowJobTemplateNodeAccess(org_admin) + assert not access.can_change(wfjt_node, {'inventory': 45}) def test_add_JT_no_start_perm(self, wfjt, job_template, rando): wfjt.admin_role.members.add(rando) From c45fbcf2eeda2b51231c870cc9d27343c768988f Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Thu, 28 Sep 2017 12:01:58 -0400 Subject: [PATCH 019/141] add IG committed capacity to serializer --- awx/api/serializers.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index fbc9db29f5..02dc7796fd 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -3663,6 +3663,7 @@ class InstanceSerializer(BaseSerializer): class InstanceGroupSerializer(BaseSerializer): + committed_capacity = serializers.SerializerMethodField() consumed_capacity = serializers.SerializerMethodField() percent_capacity_remaining = serializers.SerializerMethodField() jobs_running = serializers.SerializerMethodField() @@ -3670,7 +3671,8 @@ class InstanceGroupSerializer(BaseSerializer): class Meta: model = InstanceGroup - fields = ("id", "type", "url", "related", "name", "created", "modified", "capacity", "consumed_capacity", + fields = ("id", "type", "url", "related", "name", "created", "modified", + "capacity", "committed_capacity", "consumed_capacity", "percent_capacity_remaining", "jobs_running", "instances", "controller") def get_related(self, obj): @@ -3699,7 +3701,10 @@ class InstanceGroupSerializer(BaseSerializer): return self.context['capacity_map'] def get_consumed_capacity(self, obj): - return self.get_capacity_dict()[obj.name]['consumed_capacity'] + return self.get_capacity_dict()[obj.name]['running_capacity'] + + def get_committed_capacity(self, obj): + return self.get_capacity_dict()[obj.name]['committed_capacity'] def get_percent_capacity_remaining(self, obj): if not obj.capacity: From b372cebf8d01c28aa7f01d8d98d6b438134dd22c Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Mon, 26 Jun 2017 15:07:23 -0400 Subject: [PATCH 020/141] fix a bug when Tower is integrated with ipsilon SAML server https://github.com/ansible/ansible-tower/issues/6683 --- awx/sso/backends.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/awx/sso/backends.py b/awx/sso/backends.py index 5ed0385018..aa62311007 100644 --- a/awx/sso/backends.py +++ b/awx/sso/backends.py @@ -240,7 +240,10 @@ class TowerSAMLIdentityProvider(BaseSAMLIdentityProvider): another attribute to use. """ key = self.conf.get(conf_key, default_attribute) - value = attributes[key][0] if key in attributes else None + value = attributes[key] if key in attributes else None + # In certain implementations (like https://pagure.io/ipsilon) this value is a string, not a list + if isinstance(value, (list, tuple)): + value = value[0] if conf_key in ('attr_first_name', 'attr_last_name', 'attr_username', 'attr_email') and value is None: logger.warn("Could not map user detail '%s' from SAML attribute '%s'; " "update SOCIAL_AUTH_SAML_ENABLED_IDPS['%s']['%s'] with the correct SAML attribute.", From 82d05e0a1031a89805acb9083870d224b096272f Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Wed, 4 Oct 2017 16:03:45 -0400 Subject: [PATCH 021/141] properly sanitize encrypted default passwords in JT.survey_spec see: https://github.com/ansible/ansible-tower/issues/7259 --- awx/api/views.py | 7 +------ awx/main/models/mixins.py | 11 +++++++++++ awx/main/tests/unit/api/test_views.py | 14 -------------- awx/main/tests/unit/models/test_survey_models.py | 9 +++++++++ 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index 366ee29957..00a862dd23 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -2851,13 +2851,8 @@ class JobTemplateSurveySpec(GenericAPIView): if not feature_enabled('surveys'): raise LicenseForbids(_('Your license does not allow ' 'adding surveys.')) - survey_spec = obj.survey_spec - for pos, field in enumerate(survey_spec.get('spec', [])): - if field.get('type') == 'password': - if 'default' in field and field['default']: - field['default'] = '$encrypted$' - return Response(survey_spec) + return Response(obj.display_survey_spec()) def post(self, request, *args, **kwargs): obj = self.get_object() diff --git a/awx/main/models/mixins.py b/awx/main/models/mixins.py index 9bdf7194d7..1186797b09 100644 --- a/awx/main/models/mixins.py +++ b/awx/main/models/mixins.py @@ -240,6 +240,17 @@ class SurveyJobTemplateMixin(models.Model): errors += self._survey_element_validation(survey_element, data) return errors + def display_survey_spec(self): + ''' + Hide encrypted default passwords in survey specs + ''' + survey_spec = self.survey_spec.copy() if self.survey_spec else {} + for field in survey_spec.get('spec', []): + if field.get('type') == 'password': + if 'default' in field and field['default']: + field['default'] = '$encrypted$' + return survey_spec + class SurveyJobMixin(models.Model): class Meta: diff --git a/awx/main/tests/unit/api/test_views.py b/awx/main/tests/unit/api/test_views.py index a2532a75d7..68ba754d48 100644 --- a/awx/main/tests/unit/api/test_views.py +++ b/awx/main/tests/unit/api/test_views.py @@ -7,7 +7,6 @@ from collections import namedtuple from awx.api.views import ( ApiVersionRootView, JobTemplateLabelList, - JobTemplateSurveySpec, InventoryInventorySourcesUpdate, InventoryHostsList, HostInsights, @@ -80,19 +79,6 @@ class TestJobTemplateLabelList: assert mixin_unattach.called_with(mock_request, None, None) -class TestJobTemplateSurveySpec(object): - @mock.patch('awx.api.views.feature_enabled', lambda feature: True) - def test_get_password_type(self, mocker, mock_response_new): - JobTemplate = namedtuple('JobTemplate', 'survey_spec') - obj = JobTemplate(survey_spec={'spec':[{'type': 'password', 'default': 'my_default'}]}) - with mocker.patch.object(JobTemplateSurveySpec, 'get_object', return_value=obj): - view = JobTemplateSurveySpec() - response = view.get(mocker.MagicMock()) - assert response == mock_response_new - # which there was a better way to do this! - assert response.call_args[0][1]['spec'][0]['default'] == '$encrypted$' - - class TestInventoryInventorySourcesUpdate: @pytest.mark.parametrize("can_update, can_access, is_source, is_up_on_proj, expected", [ diff --git a/awx/main/tests/unit/models/test_survey_models.py b/awx/main/tests/unit/models/test_survey_models.py index d40d6f4800..d283c57081 100644 --- a/awx/main/tests/unit/models/test_survey_models.py +++ b/awx/main/tests/unit/models/test_survey_models.py @@ -94,6 +94,15 @@ def test_update_kwargs_survey_invalid_default(survey_spec_factory): assert json.loads(defaulted_extra_vars['extra_vars'])['var2'] == 2 +@pytest.mark.survey +def test_display_survey_spec_encrypts_default(survey_spec_factory): + spec = survey_spec_factory('var2') + spec['spec'][0]['type'] = 'password' + spec['spec'][0]['default'] = 'some-default' + jt = JobTemplate(name="test-jt", survey_spec=spec, survey_enabled=True) + assert jt.display_survey_spec()['spec'][0]['default'] == '$encrypted$' + + @pytest.mark.survey @pytest.mark.parametrize("question_type,default,min,max,expect_use,expect_value", [ ("text", "", 0, 0, True, ''), # default used From cc8b115c6ab8265e5122e992a8ebe9960c92ada9 Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Mon, 2 Oct 2017 10:59:52 -0400 Subject: [PATCH 022/141] Fix SAML auth behind load balancer issue. Relates to #7586 of ansible-tower as a follow-up of fix #420 of tower. The original fix works for Django version 1.9 and above, this PR expanded the solution to Django verison 1.8 and below. Signed-off-by: Aaron Tan --- awx/sso/strategies/django_strategy.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/awx/sso/strategies/django_strategy.py b/awx/sso/strategies/django_strategy.py index 74fcb94117..0c8c1b492d 100644 --- a/awx/sso/strategies/django_strategy.py +++ b/awx/sso/strategies/django_strategy.py @@ -1,6 +1,10 @@ # Copyright (c) 2017 Ansible, Inc. # All Rights Reserved. +# Django +from django.conf import settings + +# Python social auth from social.strategies.django_strategy import DjangoStrategy @@ -9,8 +13,9 @@ class AWXDjangoStrategy(DjangoStrategy): fixes and updates from social-app-django TODO: Revert back to using the default DjangoStrategy after - we upgrade to social-core / social-app-django. We will also - want to ensure we update the SOCIAL_AUTH_STRATEGY setting. + we upgrade to social-core / social-app-django and upgrade Django + to 1.9 and above. We will also want to ensure we update the + SOCIAL_AUTH_STRATEGY setting. """ def request_port(self): @@ -24,4 +29,7 @@ class AWXDjangoStrategy(DjangoStrategy): try: return host_parts[1] except IndexError: - return self.request.META['SERVER_PORT'] + if settings.USE_X_FORWARDED_PORT and 'HTTP_X_FORWARDED_PORT' in self.request.META: + return self.request.META['HTTP_X_FORWARDED_PORT'] + else: + return self.request.META['SERVER_PORT'] From d2e0b2628726ba6bafc2c647bb28ae535e5ff0f7 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Mon, 2 Oct 2017 13:48:48 -0400 Subject: [PATCH 023/141] allow deleting hosts and groups from inv src sublists --- awx/api/generics.py | 53 ++++++++++++++----- .../api/sub_list_destroy_api_view.md | 6 +++ awx/api/views.py | 6 ++- awx/main/tests/functional/api/test_generic.py | 31 +++++++++++ awx/main/tests/functional/conftest.py | 2 +- 5 files changed, 81 insertions(+), 17 deletions(-) create mode 100644 awx/api/templates/api/sub_list_destroy_api_view.md diff --git a/awx/api/generics.py b/awx/api/generics.py index 36176016b0..fcc48322ce 100644 --- a/awx/api/generics.py +++ b/awx/api/generics.py @@ -37,9 +37,10 @@ from awx.api.metadata import SublistAttachDetatchMetadata __all__ = ['APIView', 'GenericAPIView', 'ListAPIView', 'SimpleListAPIView', 'ListCreateAPIView', 'SubListAPIView', 'SubListCreateAPIView', + 'SubListDestroyAPIView', 'SubListCreateAttachDetachAPIView', 'RetrieveAPIView', 'RetrieveUpdateAPIView', 'RetrieveDestroyAPIView', - 'RetrieveUpdateDestroyAPIView', 'DestroyAPIView', + 'RetrieveUpdateDestroyAPIView', 'SubDetailAPIView', 'ResourceAccessList', 'ParentMixin', @@ -440,6 +441,41 @@ class SubListAPIView(ParentMixin, ListAPIView): return qs & sublist_qs +class DestroyAPIView(generics.DestroyAPIView): + + def has_delete_permission(self, obj): + return self.request.user.can_access(self.model, 'delete', obj) + + def perform_destroy(self, instance, check_permission=True): + if check_permission and not self.has_delete_permission(instance): + raise PermissionDenied() + super(DestroyAPIView, self).perform_destroy(instance) + + +class SubListDestroyAPIView(DestroyAPIView, SubListAPIView): + """ + Concrete view for deleting everything related by `relationship`. + """ + check_sub_obj_permission = True + + def destroy(self, request, *args, **kwargs): + instance_list = self.get_queryset() + if (not self.check_sub_obj_permission and + not request.user.can_access(self.parent_model, 'delete', self.get_parent_object())): + raise PermissionDenied() + self.perform_list_destroy(instance_list) + return Response(status=status.HTTP_204_NO_CONTENT) + + def perform_list_destroy(self, instance_list): + if self.check_sub_obj_permission: + # Check permissions for all before deleting, avoiding half-deleted lists + for instance in instance_list: + if self.has_delete_permission(instance): + raise PermissionDenied() + for instance in instance_list: + self.perform_destroy(instance, check_permission=False) + + class SubListCreateAPIView(SubListAPIView, ListCreateAPIView): # Base class for a sublist view that allows for creating subobjects # associated with the parent object. @@ -678,22 +714,11 @@ class RetrieveUpdateAPIView(RetrieveAPIView, generics.RetrieveUpdateAPIView): pass -class RetrieveDestroyAPIView(RetrieveAPIView, generics.RetrieveDestroyAPIView): - - def destroy(self, request, *args, **kwargs): - # somewhat lame that delete has to call it's own permissions check - obj = self.get_object() - if not request.user.can_access(self.model, 'delete', obj): - raise PermissionDenied() - obj.delete() - return Response(status=status.HTTP_204_NO_CONTENT) - - -class RetrieveUpdateDestroyAPIView(RetrieveUpdateAPIView, RetrieveDestroyAPIView): +class RetrieveDestroyAPIView(RetrieveAPIView, DestroyAPIView): pass -class DestroyAPIView(GenericAPIView, generics.DestroyAPIView): +class RetrieveUpdateDestroyAPIView(RetrieveUpdateAPIView, DestroyAPIView): pass diff --git a/awx/api/templates/api/sub_list_destroy_api_view.md b/awx/api/templates/api/sub_list_destroy_api_view.md new file mode 100644 index 0000000000..72654f88a0 --- /dev/null +++ b/awx/api/templates/api/sub_list_destroy_api_view.md @@ -0,0 +1,6 @@ +{% include "api/sub_list_create_api_view.md" %} + +# Delete all {{ model_verbose_name_plural }} of this {{ parent_model_verbose_name|title }}: + +Make a DELETE request to this resource to delete all {{ model_verbose_name_plural }} show in the list. +The {{ parent_model_verbose_name|title }} will not be deleted by this request. diff --git a/awx/api/views.py b/awx/api/views.py index 366ee29957..9763185c30 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -2616,23 +2616,25 @@ class InventorySourceNotificationTemplatesSuccessList(InventorySourceNotificatio relationship = 'notification_templates_success' -class InventorySourceHostsList(SubListAPIView): +class InventorySourceHostsList(SubListDestroyAPIView): model = Host serializer_class = HostSerializer parent_model = InventorySource relationship = 'hosts' new_in_148 = True + check_sub_obj_permission = False capabilities_prefetch = ['inventory.admin'] -class InventorySourceGroupsList(SubListAPIView): +class InventorySourceGroupsList(SubListDestroyAPIView): model = Group serializer_class = GroupSerializer parent_model = InventorySource relationship = 'groups' new_in_148 = True + check_sub_obj_permission = False class InventorySourceUpdatesList(SubListAPIView): diff --git a/awx/main/tests/functional/api/test_generic.py b/awx/main/tests/functional/api/test_generic.py index 6b2d580d2d..4d68b43ead 100644 --- a/awx/main/tests/functional/api/test_generic.py +++ b/awx/main/tests/functional/api/test_generic.py @@ -60,3 +60,34 @@ def test_proxy_ip_whitelist(get, patch, admin): REMOTE_HOST='my.proxy.example.org', HTTP_X_FROM_THE_LOAD_BALANCER='some-actual-ip') assert middleware.environ['HTTP_X_FROM_THE_LOAD_BALANCER'] == 'some-actual-ip' + + +@pytest.mark.django_db +class TestDeleteViews: + def test_sublist_delete_permission_check(self, inventory_source, host, rando, delete): + inventory_source.hosts.add(host) + inventory_source.inventory.read_role.members.add(rando) + delete( + reverse( + 'api:inventory_source_hosts_list', + kwargs={'version': 'v2', 'pk': inventory_source.pk} + ), user=rando, expect=403 + ) + + def test_sublist_delete_functionality(self, inventory_source, host, rando, delete): + inventory_source.hosts.add(host) + inventory_source.inventory.admin_role.members.add(rando) + delete( + reverse( + 'api:inventory_source_hosts_list', + kwargs={'version': 'v2', 'pk': inventory_source.pk} + ), user=rando, expect=204 + ) + assert inventory_source.hosts.count() == 0 + + def test_destroy_permission_check(self, job_factory, system_auditor, delete): + job = job_factory() + resp = delete( + job.get_absolute_url(), user=system_auditor + ) + assert resp.status_code == 403 diff --git a/awx/main/tests/functional/conftest.py b/awx/main/tests/functional/conftest.py index 456d1a409e..2a4fea237f 100644 --- a/awx/main/tests/functional/conftest.py +++ b/awx/main/tests/functional/conftest.py @@ -377,7 +377,7 @@ def admin(user): @pytest.fixture def system_auditor(user): - u = user(False) + u = user('sys-auditor', False) Role.singleton('system_auditor').members.add(u) return u From 358ef76529d2f88c53ac9758151d2762d37c7d0d Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Fri, 22 Sep 2017 16:06:59 -0400 Subject: [PATCH 024/141] Remove search term separators Relates #7656 in ansible-tower. We have been using comma `,` and space ` ` to separate search terms in query string `__search=`, however in general we can always use `&` to achieve separation like `__search=&__search=&...`. Using specific delimiters makes it impossible for search terms to contain those delimiters, so they are better off being removed. Signed-off-by: Aaron Tan --- awx/api/filters.py | 9 ++++----- awx/api/templates/api/_list_common.md | 12 ++++++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/awx/api/filters.py b/awx/api/filters.py index a231c8af8d..105403bd17 100644 --- a/awx/api/filters.py +++ b/awx/api/filters.py @@ -242,11 +242,10 @@ class FieldLookupBackend(BaseFilterBackend): # Search across related objects. if key.endswith('__search'): for value in values: - for search_term in force_text(value).replace(',', ' ').split(): - search_value, new_keys = self.value_to_python(queryset.model, key, search_term) - assert isinstance(new_keys, list) - for new_key in new_keys: - search_filters.append((new_key, search_value)) + search_value, new_keys = self.value_to_python(queryset.model, key, force_text(value)) + assert isinstance(new_keys, list) + for new_key in new_keys: + search_filters.append((new_key, search_value)) continue # Custom chain__ and or__ filters, mutually exclusive (both can diff --git a/awx/api/templates/api/_list_common.md b/awx/api/templates/api/_list_common.md index 706ae732a5..de58292756 100644 --- a/awx/api/templates/api/_list_common.md +++ b/awx/api/templates/api/_list_common.md @@ -1,9 +1,9 @@ The resulting data structure contains: { - "count": 99, - "next": null, - "previous": null, + "count": 99, + "next": null, + "previous": null, "results": [ ... ] @@ -60,6 +60,10 @@ _Added in AWX 1.4_ ?related__search=findme +Note: If you want to provide more than one search terms, please use multiple +search fields with the same key, like `?related__search=foo&related__search=bar`, +All search terms with the same key will be ORed together. + ## Filtering Any additional query string parameters may be used to filter the list of @@ -70,7 +74,7 @@ in the specified value should be url-encoded. For example: ?field=value%20xyz Fields may also span relations, only for fields and relationships defined in -the database: +the database: ?other__field=value From a01f80db5b628f217b4531b83c69f10e1365a085 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Fri, 6 Oct 2017 13:06:07 -0400 Subject: [PATCH 025/141] Exclude credential type content from v1 credential_type_id was showing up in vault_credential summary_fields in API v1 --- awx/api/serializers.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 02dc7796fd..1805f38352 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -343,7 +343,9 @@ class BaseSerializer(serializers.ModelSerializer): continue summary_fields[fk] = OrderedDict() for field in related_fields: - if field == 'credential_type_id' and fk == 'credential' and self.version < 2: # TODO: remove version check in 3.3 + if ( + self.version < 2 and field == 'credential_type_id' and + fk in ['credential', 'vault_credential']): # TODO: remove version check in 3.3 continue fval = getattr(fkval, field, None) From 5380d57ce88a7451d1c617852196ff8d6d19d35b Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Fri, 6 Oct 2017 13:23:25 -0400 Subject: [PATCH 026/141] add period to active job conflict error Rename StateConflict to ActiveJobConflict and used shared message inside of that exception class. --- awx/main/access.py | 31 +++++++++---------- .../tests/functional/test_rbac_inventory.py | 4 +-- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/awx/main/access.py b/awx/main/access.py index 75fd3ce1e7..26675330d5 100644 --- a/awx/main/access.py +++ b/awx/main/access.py @@ -26,7 +26,7 @@ from awx.conf.license import LicenseForbids, feature_enabled __all__ = ['get_user_queryset', 'check_user_access', 'check_user_access_with_errors', 'user_accessible_objects', 'consumer_access', - 'user_admin_role', 'StateConflict',] + 'user_admin_role', 'ActiveJobConflict',] logger = logging.getLogger('awx.main.access') @@ -36,9 +36,15 @@ access_registry = { } -class StateConflict(ValidationError): +class ActiveJobConflict(ValidationError): status_code = 409 + def __init__(self, active_jobs): + super(ActiveJobConflict, self).__init__({ + "conflict": _("Resource is being used by running jobs."), + "active_jobs": active_jobs + }) + def register_access(model_class, access_class): access_registry[model_class] = access_class @@ -550,8 +556,7 @@ class OrganizationAccess(BaseAccess): active_jobs.extend([dict(type="inventory_update", id=o.id) for o in InventoryUpdate.objects.filter(inventory_source__inventory__organization=obj, status__in=ACTIVE_STATES)]) if len(active_jobs) > 0: - raise StateConflict({"conflict": _("Resource is being used by running jobs"), - "active_jobs": active_jobs}) + raise ActiveJobConflict(active_jobs) return True def can_attach(self, obj, sub_obj, relationship, *args, **kwargs): @@ -644,8 +649,7 @@ class InventoryAccess(BaseAccess): active_jobs.extend([dict(type="ad_hoc_command", id=o.id) for o in AdHocCommand.objects.filter(inventory=obj, status__in=ACTIVE_STATES)]) if len(active_jobs) > 0: - raise StateConflict({"conflict": _("Resource is being used by running jobs"), - "active_jobs": active_jobs}) + raise ActiveJobConflict(active_jobs) return True def can_run_ad_hoc_commands(self, obj): @@ -773,8 +777,7 @@ class GroupAccess(BaseAccess): active_jobs.extend([dict(type="inventory_update", id=o.id) for o in InventoryUpdate.objects.filter(inventory_source__in=obj.inventory_sources.all(), status__in=ACTIVE_STATES)]) if len(active_jobs) > 0: - raise StateConflict({"conflict": _("Resource is being used by running jobs"), - "active_jobs": active_jobs}) + raise ActiveJobConflict(active_jobs) return True def can_start(self, obj, validate_license=True): @@ -826,8 +829,7 @@ class InventorySourceAccess(BaseAccess): return False active_jobs_qs = InventoryUpdate.objects.filter(inventory_source=obj, status__in=ACTIVE_STATES) if active_jobs_qs.exists(): - raise StateConflict({"conflict": _("Resource is being used by running jobs"), - "active_jobs": [dict(type="inventory_update", id=o.id) for o in active_jobs_qs.all()]}) + raise ActiveJobConflict([dict(type="inventory_update", id=o.id) for o in active_jobs_qs.all()]) return True @check_superuser @@ -1092,8 +1094,7 @@ class ProjectAccess(BaseAccess): active_jobs.extend([dict(type="project_update", id=o.id) for o in ProjectUpdate.objects.filter(project=obj, status__in=ACTIVE_STATES)]) if len(active_jobs) > 0: - raise StateConflict({"conflict": _("Resource is being used by running jobs"), - "active_jobs": active_jobs}) + raise ActiveJobConflict(active_jobs) return True @check_superuser @@ -1298,8 +1299,7 @@ class JobTemplateAccess(BaseAccess): active_jobs = [dict(type="job", id=o.id) for o in obj.jobs.filter(status__in=ACTIVE_STATES)] if len(active_jobs) > 0: - raise StateConflict({"conflict": _("Resource is being used by running jobs"), - "active_jobs": active_jobs}) + raise ActiveJobConflict(active_jobs) return True @check_superuser @@ -1764,8 +1764,7 @@ class WorkflowJobTemplateAccess(BaseAccess): active_jobs = [dict(type="workflow_job", id=o.id) for o in obj.workflow_jobs.filter(status__in=ACTIVE_STATES)] if len(active_jobs) > 0: - raise StateConflict({"conflict": _("Resource is being used by running jobs"), - "active_jobs": active_jobs}) + raise ActiveJobConflict(active_jobs) return True diff --git a/awx/main/tests/functional/test_rbac_inventory.py b/awx/main/tests/functional/test_rbac_inventory.py index 821d8893a8..830e5a7b52 100644 --- a/awx/main/tests/functional/test_rbac_inventory.py +++ b/awx/main/tests/functional/test_rbac_inventory.py @@ -13,7 +13,7 @@ from awx.main.access import ( InventoryUpdateAccess, CustomInventoryScriptAccess, ScheduleAccess, - StateConflict + ActiveJobConflict ) @@ -21,7 +21,7 @@ from awx.main.access import ( def test_running_job_protection(inventory, admin_user): AdHocCommand.objects.create(inventory=inventory, status='running') access = InventoryAccess(admin_user) - with pytest.raises(StateConflict): + with pytest.raises(ActiveJobConflict): access.can_delete(inventory) From 2cc9e2ca0bec3074c300c2f1ed8ca97f7f57b6bb Mon Sep 17 00:00:00 2001 From: Marliana Lara Date: Mon, 2 Oct 2017 17:21:44 -0400 Subject: [PATCH 027/141] Fix hidden right border of form input lookup buttons --- awx/ui/client/legacy-styles/forms.less | 2 -- 1 file changed, 2 deletions(-) diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index 4fb40e395d..9508b254c6 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -458,7 +458,6 @@ align-items: center; justify-content: center; border:1px solid @field-border; - border-right: 0px; } .Form-lookupButton:hover { @@ -470,7 +469,6 @@ .Form-lookupButton:active, .Form-lookupButton:focus { border: 1px solid @field-border; - border-right: 0px; } .CodeMirror { From 1c374fba7d07eb506404cae7483f97a8c02e3ffe Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Fri, 6 Oct 2017 15:33:20 -0400 Subject: [PATCH 028/141] reword error message about encrypted user input --- awx/api/views.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index 9157901b3b..7574b160a1 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -2900,16 +2900,19 @@ class JobTemplateSurveySpec(GenericAPIView): if survey_item["type"] == "password" and "default" in survey_item: if not isinstance(survey_item['default'], six.string_types): - return Response( - _("Value %s for '%s' expected to be a string." % ( - survey_item["default"], survey_item["variable"] - )), - status=status.HTTP_400_BAD_REQUEST - ) + return Response(dict(error=_( + "Value {question_default} for '{variable_name}' expected to be a string." + ).format( + question_default=survey_item["default"], variable_name=survey_item["variable"]) + ), status=status.HTTP_400_BAD_REQUEST) elif survey_item["default"].startswith('$encrypted$'): if not obj.survey_spec: - return Response(dict(error=_("$encrypted$ is reserved keyword and may not be used as a default for password {}.".format(str(idx)))), - status=status.HTTP_400_BAD_REQUEST) + return Response(dict(error=_( + "$encrypted$ is reserved keyword for password questions and may not " + "be used as a default for '{variable_name}' in survey question {question_position}." + ).format( + variable_name=survey_item["variable"], question_position=str(idx)) + ), status=status.HTTP_400_BAD_REQUEST) else: old_spec = obj.survey_spec for old_item in old_spec['spec']: From dee4b7230386d04ea0414b9d9470e0a7f94c3bde Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Fri, 6 Oct 2017 16:16:17 -0400 Subject: [PATCH 029/141] add CTiT setting for max UI job events --- awx/api/views.py | 2 +- awx/settings/defaults.py | 2 +- awx/ui/conf.py | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index 9157901b3b..ceb3ed8389 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -3989,7 +3989,7 @@ class BaseJobEventsList(SubListAPIView): search_fields = ('stdout',) def finalize_response(self, request, response, *args, **kwargs): - response['X-UI-Max-Events'] = settings.RECOMMENDED_MAX_EVENTS_DISPLAY_HEADER + response['X-UI-Max-Events'] = settings.MAX_UI_JOB_EVENTS return super(BaseJobEventsList, self).finalize_response(request, response, *args, **kwargs) diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 9f25ddb525..b64656fdbc 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -166,7 +166,7 @@ STDOUT_MAX_BYTES_DISPLAY = 1048576 # Returned in the header on event api lists as a recommendation to the UI # on how many events to display before truncating/hiding -RECOMMENDED_MAX_EVENTS_DISPLAY_HEADER = 4000 +MAX_UI_JOB_EVENTS = 4000 # The maximum size of the ansible callback event's res data structure # beyond this limit and the value will be removed diff --git a/awx/ui/conf.py b/awx/ui/conf.py index 8a8677cdf1..0d626c28f0 100644 --- a/awx/ui/conf.py +++ b/awx/ui/conf.py @@ -52,3 +52,14 @@ register( category_slug='ui', feature_required='rebranding', ) + +register( + 'MAX_UI_JOB_EVENTS', + field_class=fields.IntegerField, + min_value=100, + label=_('Max Job Events Retreived by UI'), + help_text=_('Maximum number of job events for the UI to retreive within a ' + 'single request.'), + category=_('UI'), + category_slug='ui', +) From b7071a48c2ab9c339bccbe1da21655f8a7a1322a Mon Sep 17 00:00:00 2001 From: gconsidine Date: Mon, 9 Oct 2017 11:06:55 -0400 Subject: [PATCH 030/141] Set lookup value changed from something to nothing to be null --- awx/ui/client/lib/components/form/form.directive.js | 4 ++-- awx/ui/client/lib/components/input/lookup.directive.js | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/awx/ui/client/lib/components/form/form.directive.js b/awx/ui/client/lib/components/form/form.directive.js index e4956d1101..4e04dd31f0 100644 --- a/awx/ui/client/lib/components/form/form.directive.js +++ b/awx/ui/client/lib/components/form/form.directive.js @@ -32,7 +32,7 @@ function AtFormController (eventService, strings) { vm.setListeners(); }; - vm.register = (category, component, el) => { + vm.register = (category, component, el) => { component.category = category; component.form = vm.state; @@ -66,7 +66,7 @@ function AtFormController (eventService, strings) { let data = vm.components .filter(component => component.category === 'input') .reduce((values, component) => { - if (!component.state._value) { + if (component.state._value === undefined) { return values; } diff --git a/awx/ui/client/lib/components/input/lookup.directive.js b/awx/ui/client/lib/components/input/lookup.directive.js index b2c60e15bd..9d6d9089d6 100644 --- a/awx/ui/client/lib/components/input/lookup.directive.js +++ b/awx/ui/client/lib/components/input/lookup.directive.js @@ -12,7 +12,7 @@ function atInputLookupLink (scope, element, attrs, controllers) { inputController.init(scope, element, formController); } -function AtInputLookupController (baseInputController, $q, $state, $stateParams) { +function AtInputLookupController (baseInputController, $q, $state) { let vm = this || {}; let scope; @@ -75,13 +75,14 @@ function AtInputLookupController (baseInputController, $q, $state, $stateParams) vm.resetDebounce = () => { clearTimeout(vm.debounce); - vm.searchAfterDebounce(); + vm.searchAfterDebounce(); }; vm.search = () => { scope.state._touched = true; if (scope.state._displayValue === '' && !scope.state._required) { + scope.state._value = null; return vm.check({ isValid: true }); } @@ -116,8 +117,7 @@ function AtInputLookupController (baseInputController, $q, $state, $stateParams) AtInputLookupController.$inject = [ 'BaseInputController', '$q', - '$state', - '$stateParams' + '$state' ]; function atInputLookup (pathService) { From c06778842885cd5a86bb15373b87015059a48f76 Mon Sep 17 00:00:00 2001 From: Chris Church Date: Sun, 8 Oct 2017 22:21:32 -0400 Subject: [PATCH 031/141] Support dash in LDAP attribute names in filters. --- awx/sso/tests/unit/test_ldap.py | 5 +++++ awx/sso/validators.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/awx/sso/tests/unit/test_ldap.py b/awx/sso/tests/unit/test_ldap.py index 48dd3e30e2..0a50871650 100644 --- a/awx/sso/tests/unit/test_ldap.py +++ b/awx/sso/tests/unit/test_ldap.py @@ -1,6 +1,7 @@ import ldap from awx.sso.backends import LDAPSettings +from awx.sso.validators import validate_ldap_filter def test_ldap_default_settings(mocker): @@ -19,3 +20,7 @@ def test_ldap_default_network_timeout(mocker): ldap.OPT_REFERRALS: 0, ldap.OPT_NETWORK_TIMEOUT: 30 } + + +def test_ldap_filter_validator(): + validate_ldap_filter('(test-uid=%(user)s)', with_user=True) diff --git a/awx/sso/validators.py b/awx/sso/validators.py index dd1086a426..7e89958236 100644 --- a/awx/sso/validators.py +++ b/awx/sso/validators.py @@ -47,7 +47,7 @@ def validate_ldap_filter(value, with_user=False): dn_value = value.replace('%(user)s', 'USER') else: dn_value = value - if re.match(r'^\([A-Za-z0-9]+?=[^()]+?\)$', dn_value): + if re.match(r'^\([A-Za-z0-9-]+?=[^()]+?\)$', dn_value): return elif re.match(r'^\([&|!]\(.*?\)\)$', dn_value): try: From 2fb67a36488cfe3aea37539ce08aeb54780525c0 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Mon, 9 Oct 2017 11:59:02 -0400 Subject: [PATCH 032/141] prevent OrderedDict syntax in error message --- awx/conf/fields.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/awx/conf/fields.py b/awx/conf/fields.py index b9b3503bb1..58f81b3d18 100644 --- a/awx/conf/fields.py +++ b/awx/conf/fields.py @@ -1,6 +1,7 @@ # Python import logging import urlparse +from collections import OrderedDict # Django from django.core.validators import URLValidator @@ -98,5 +99,7 @@ class KeyValueField(DictField): ret = super(KeyValueField, self).to_internal_value(data) for value in data.values(): if not isinstance(value, six.string_types + six.integer_types + (float,)): + if isinstance(value, OrderedDict): + value = dict(value) self.fail('invalid_child', input=value) return ret From 766a0887497b001ff9477fd9a1ba00062fb2312d Mon Sep 17 00:00:00 2001 From: gconsidine Date: Tue, 10 Oct 2017 10:54:05 -0400 Subject: [PATCH 033/141] Use credential_type to fetch associated types in list view --- .../credentials/legacy.credentials.js | 5 +--- awx/ui/client/lib/models/Base.js | 17 +++++++---- .../list/credentials-list.controller.js | 29 +++++++++++++++---- 3 files changed, 37 insertions(+), 14 deletions(-) diff --git a/awx/ui/client/features/credentials/legacy.credentials.js b/awx/ui/client/features/credentials/legacy.credentials.js index e271da0936..4c2e2d1d81 100644 --- a/awx/ui/client/features/credentials/legacy.credentials.js +++ b/awx/ui/client/features/credentials/legacy.credentials.js @@ -41,10 +41,7 @@ function LegacyCredentialsService (pathService) { return qs.search(path, $stateParams[`${list.iterator}_search`]); } - ], - credentialType: ['CredentialTypeModel', CredentialType => { - return new CredentialType('get'); - }] + ] } }; diff --git a/awx/ui/client/lib/models/Base.js b/awx/ui/client/lib/models/Base.js index a1c60e1bd9..a8e7b3fb0b 100644 --- a/awx/ui/client/lib/models/Base.js +++ b/awx/ui/client/lib/models/Base.js @@ -43,21 +43,28 @@ function requestWithCache (method, resource) { * supported by the API. * * @arg {Object} params - An object of keys and values to to format and - * to the URL as a query string. Refer to the API documentation for the + * to the URL as a query string. Refer to the API documentation for the * resource in use for specifics. * @arg {Object} config - Configuration specific to the UI to accommodate * common use cases. * - * @yields {boolean} - Indicating a match has been found. If so, the results + * @yields {boolean} - Indicating a match has been found. If so, the results * are set on the model. */ -function search (params, config) { +function search (params = {}, config = {}) { let req = { method: 'GET', - url: this.path, - params + url: this.path }; + if (typeof params === 'string') { + req.url = `?params`; + } else if (Array.isArray(params)) { + req.url += `?${params.join('&')}`; + } else { + req.params = params; + } + return $http(req) .then(({ data }) => { if (!data.count) { diff --git a/awx/ui/client/src/credentials/list/credentials-list.controller.js b/awx/ui/client/src/credentials/list/credentials-list.controller.js index 924f58e367..ee623d8e13 100644 --- a/awx/ui/client/src/credentials/list/credentials-list.controller.js +++ b/awx/ui/client/src/credentials/list/credentials-list.controller.js @@ -5,10 +5,13 @@ *************************************************/ export default ['$scope', 'Rest', 'CredentialList', 'Prompt', 'ProcessErrors', 'GetBasePath', - 'Wait', '$state', '$filter', 'rbacUiControlService', 'Dataset', 'credentialType', 'i18n', + 'Wait', '$state', '$filter', 'rbacUiControlService', 'Dataset', 'CredentialTypeModel', + 'i18n', function($scope, Rest, CredentialList, Prompt, ProcessErrors, GetBasePath, Wait, $state, $filter, rbacUiControlService, Dataset, - credentialType, i18n) { + CredentialType, i18n) { + + const credentialType = new CredentialType(); var list = CredentialList, defaultUrl = GetBasePath('credentials'); @@ -45,9 +48,25 @@ export default ['$scope', 'Rest', 'CredentialList', 'Prompt', 'ProcessErrors', ' return; } - $scope[list.name].forEach(credential => { - credential.kind = credentialType.match('id', credential.credential_type).name; - }); + const params = $scope[list.name] + .reduce((accumulator, credential) => { + accumulator.push(credential.credential_type); + + return accumulator; + }, []) + .filter((id, i, array) => array.indexOf(id) === i) + .map(id => `or__id=${id}`); + + credentialType.search(params) + .then(found => { + if (!found) { + return; + } + + $scope[list.name].forEach(credential => { + credential.kind = credentialType.match('id', credential.credential_type).name; + }); + }); } // iterate over the list and add fields like type label, after the From b9483c28b0640a5dc93720e83382c5367ed6d257 Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Tue, 10 Oct 2017 11:30:16 -0400 Subject: [PATCH 034/141] Disable inventory var overwrite in inv import Relates #7726 of ansible-tower. Signed-off-by: Aaron Tan --- .../management/commands/inventory_import.py | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/awx/main/management/commands/inventory_import.py b/awx/main/management/commands/inventory_import.py index 797355bf3b..f4ee1401fd 100644 --- a/awx/main/management/commands/inventory_import.py +++ b/awx/main/management/commands/inventory_import.py @@ -603,27 +603,20 @@ class Command(NoArgsCommand): def _update_inventory(self): ''' - Update/overwrite variables from "all" group. If importing from a - cloud source attached to a specific group, variables will be set on - the base group, otherwise they will be set on the whole inventory. + Update inventory variables from "all" group. ''' - # FIXME: figure out how "all" variables are handled in the new inventory source system + # TODO: We disable variable overwrite here in case user-defined inventory variables get + # mangled. But we still need to figure out a better way of processing multiple inventory + # update variables mixing with each other. all_obj = self.inventory - all_name = 'inventory' db_variables = all_obj.variables_dict - if self.overwrite_vars: - db_variables = self.all_group.variables - else: - db_variables.update(self.all_group.variables) + db_variables.update(self.all_group.variables) if db_variables != all_obj.variables_dict: all_obj.variables = json.dumps(db_variables) all_obj.save(update_fields=['variables']) - if self.overwrite_vars: - logger.info('%s variables replaced from "all" group', all_name.capitalize()) - else: - logger.info('%s variables updated from "all" group', all_name.capitalize()) + logger.info('Inventory variables updated from "all" group') else: - logger.info('%s variables unmodified', all_name.capitalize()) + logger.info('Inventory variables unmodified') def _create_update_groups(self): ''' From 341ef411a41b0134f403f7b9fbcff221931d6709 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Tue, 10 Oct 2017 13:16:25 -0400 Subject: [PATCH 035/141] update isolated container requirements --- tools/docker-isolated/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/docker-isolated/Dockerfile b/tools/docker-isolated/Dockerfile index b08a33e1ed..a7313e00b9 100644 --- a/tools/docker-isolated/Dockerfile +++ b/tools/docker-isolated/Dockerfile @@ -1,4 +1,4 @@ -FROM centos/systemd +FROM centos:7 RUN yum clean all ADD Makefile /tmp/Makefile @@ -6,7 +6,8 @@ RUN mkdir /tmp/requirements ADD requirements/requirements_ansible.txt requirements/requirements_ansible_git.txt requirements/requirements_ansible_uninstall.txt requirements/requirements_isolated.txt /tmp/requirements/ RUN yum -y update && yum -y install curl epel-release RUN curl --silent --location https://rpm.nodesource.com/setup_6.x | bash - -RUN yum -y update && yum -y install openssh-server ansible mg vim tmux git python-devel python-psycopg2 make python-psutil libxml2-devel libxslt-devel libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel zeromq-devel python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 xmlsec1-openssl-devel libtool-ltdl-devel bubblewrap zanata-python-client gettext gcc-c++ +RUN yum -y localinstall http://download.postgresql.org/pub/repos/yum/9.4/redhat/rhel-6-x86_64/pgdg-centos94-9.4-3.noarch.rpm +RUN yum -y update && yum -y install openssh-server ansible mg vim tmux git python-devel python-psycopg2 make python-psutil libxml2-devel libxslt-devel libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel zeromq-devel python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 xmlsec1-openssl-devel libtool-ltdl-devel bubblewrap zanata-python-client gettext gcc-c++ libcurl-devel python-pycurl bzip2 RUN pip install virtualenv WORKDIR /tmp RUN make requirements_ansible From 03e58523b23ab757eab3ec6cdc2dab5018569ee7 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Fri, 6 Oct 2017 12:43:34 -0400 Subject: [PATCH 036/141] tweak of error message for ForeignKey filters --- awx/api/filters.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/awx/api/filters.py b/awx/api/filters.py index 105403bd17..2cf28c7c23 100644 --- a/awx/api/filters.py +++ b/awx/api/filters.py @@ -165,7 +165,13 @@ class FieldLookupBackend(BaseFilterBackend): elif isinstance(field, models.BooleanField): return to_python_boolean(value) elif isinstance(field, (ForeignObjectRel, ManyToManyField, GenericForeignKey, ForeignKey)): - return self.to_python_related(value) + try: + return self.to_python_related(value) + except ValueError: + raise ParseError(_('Invalid {field_name} id: {field_id}').format( + field_name=getattr(field, 'name', 'related field'), + field_id=value) + ) else: return field.to_python(value) From e814f28039ce29db94301c0bc357a3939abfa268 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Fri, 6 Oct 2017 16:55:31 -0400 Subject: [PATCH 037/141] add logger statement for number of events --- awx/main/tasks.py | 6 ++++++ awx/main/utils/common.py | 2 ++ 2 files changed, 8 insertions(+) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 5dbadd4131..b27ce0e967 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -886,6 +886,12 @@ class BaseTask(LogErrorsTask): try: stdout_handle.flush() stdout_handle.close() + # If stdout_handle was wrapped with event filter, log data + if hasattr(stdout_handle, '_event_ct'): + logger.info('%s finished running, producing %s events.', + instance.log_format, stdout_handle._event_ct) + else: + logger.info('%s finished running', instance.log_format) except Exception: pass diff --git a/awx/main/utils/common.py b/awx/main/utils/common.py index 22183c33dd..c370769f84 100644 --- a/awx/main/utils/common.py +++ b/awx/main/utils/common.py @@ -818,6 +818,7 @@ class OutputEventFilter(object): def __init__(self, fileobj=None, event_callback=None, raw_callback=None): self._fileobj = fileobj self._event_callback = event_callback + self._event_ct = 0 self._raw_callback = raw_callback self._counter = 1 self._start_line = 0 @@ -872,6 +873,7 @@ class OutputEventFilter(object): self._start_line += n_lines if self._event_callback: self._event_callback(event_data) + self._event_ct += 1 if next_event_data.get('uuid', None): self._current_event_data = next_event_data From 82160e2072576a6825a5eb51b414af95f4a34eaf Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Tue, 10 Oct 2017 13:26:31 -0400 Subject: [PATCH 038/141] Add LDAP deploy instructions Signed-off-by: Aaron Tan --- docs/auth/ldap.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 docs/auth/ldap.md diff --git a/docs/auth/ldap.md b/docs/auth/ldap.md new file mode 100644 index 0000000000..b9a172c3d0 --- /dev/null +++ b/docs/auth/ldap.md @@ -0,0 +1,6 @@ +# LDAP +The Lightweight Directory Access Protocol (LDAP) is an open, vendor-neutral, industry standard application protocol for accessing and maintaining distributed directory information services over an Internet Protocol (IP) network. Directory services play an important role in developing intranet and Internet applications by allowing the sharing of information about users, systems, networks, services, and applications throughout the network. + +## Test environment setup + +Please see README.md of this repository: https://github.com/jangsutsr/deploy_ldap.git. From e66a1002ee6d20067e2a82f36c1361b484f2afe7 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Tue, 10 Oct 2017 14:58:09 -0400 Subject: [PATCH 039/141] fix equation for isolated instance capacity --- awx/plugins/isolated/awx_capacity.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/awx/plugins/isolated/awx_capacity.py b/awx/plugins/isolated/awx_capacity.py index cc69d02a3b..cf370fb56e 100644 --- a/awx/plugins/isolated/awx_capacity.py +++ b/awx/plugins/isolated/awx_capacity.py @@ -41,7 +41,8 @@ def main(): total_mem_value = out.split()[7] if int(total_mem_value) <= 2048: cap = 50 - cap = 50 + ((int(total_mem_value) / 1024) - 2) * 75 + else: + cap = 50 + ((int(total_mem_value) / 1024) - 2) * 75 # Module never results in a change module.exit_json(changed=False, capacity=cap, version=version) From 9e3d90896b8316dd0385d18a9d6cb30c7617617e Mon Sep 17 00:00:00 2001 From: gconsidine Date: Tue, 10 Oct 2017 15:22:17 -0400 Subject: [PATCH 040/141] Remove unsupported tokens from search generated queries --- .../shared/smart-search/queryset.service.js | 73 ++++++++++--------- 1 file changed, 39 insertions(+), 34 deletions(-) diff --git a/awx/ui/client/src/shared/smart-search/queryset.service.js b/awx/ui/client/src/shared/smart-search/queryset.service.js index 1571ab936d..27681d18b4 100644 --- a/awx/ui/client/src/shared/smart-search/queryset.service.js +++ b/awx/ui/client/src/shared/smart-search/queryset.service.js @@ -29,43 +29,48 @@ export default ['$q', 'Rest', 'ProcessErrors', '$rootScope', 'Wait', 'DjangoSear return defer.promise; }, + replaceDefaultFlags (value) { + value = value.toString().replace(/__icontains_DEFAULT/g, "__icontains"); + value = value.toString().replace(/__search_DEFAULT/g, "__search"); + + return value; + }, + + replaceEncodedTokens(value) { + return decodeURIComponent(value).replace(/"|'/g, ""); + }, + + encodeTerms (values, key) { + key = this.replaceDefaultFlags(key); + + if (!Array.isArray(values)) { + values = this.replaceEncodedTokens(values); + + return `${key}=${values}`; + } + + return values + .map(value => { + value = this.replaceDefaultFlags(value); + value = this.replaceEncodedTokens(value); + + return `${key}=${value}`; + }) + .join('&'); + }, // encodes ui-router params from {operand__key__comparator: value} pairs to API-consumable URL encodeQueryset(params) { - let queryset; - queryset = _.reduce(params, (result, value, key) => { - return result + encodeTerm(value, key); - }, ''); - queryset = queryset.substring(0, queryset.length - 1); - return angular.isObject(params) ? `?${queryset}` : ''; - - function encodeTerm(value, key){ - - key = key.toString().replace(/__icontains_DEFAULT/g, "__icontains"); - key = key.toString().replace(/__search_DEFAULT/g, "__search"); - - value = value.toString().replace(/__icontains_DEFAULT/g, "__icontains"); - value = value.toString().replace(/__search_DEFAULT/g, "__search"); - - if (Array.isArray(value)){ - value = _.uniq(_.flattenDeep(value)); - let concated = ''; - angular.forEach(value, function(item){ - if(item && typeof item === 'string') { - item = decodeURIComponent(item).replace(/"|'/g, ""); - } - concated += `${key}=${item}&`; - }); - - return concated; - } - else { - if(value && typeof value === 'string') { - value = decodeURIComponent(value).replace(/"|'/g, ""); - } - - return `${key}=${value}&`; - } + if (typeof params !== 'object') { + return ''; } + + return _.reduce(params, (result, value, key) => { + if (result !== '?') { + result += '&'; + } + + return result += this.encodeTerms(value, key); + }, '?'); }, // encodes a ui smart-search param to a django-friendly param // operand:key:comparator:value => {operand__key__comparator: value} From eab82f3efaf5e173e974f645f3a4f38bcd2f0aaa Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Tue, 10 Oct 2017 15:45:20 -0400 Subject: [PATCH 041/141] updated fallback isolated version to 3.2.2 --- awx/main/expect/run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/main/expect/run.py b/awx/main/expect/run.py index 3c248f9610..aed89f5f84 100755 --- a/awx/main/expect/run.py +++ b/awx/main/expect/run.py @@ -271,7 +271,7 @@ def __run__(private_data_dir): if __name__ == '__main__': - __version__ = '3.2.0' + __version__ = '3.2.2' try: import awx __version__ = awx.__version__ From 54640dbca0abaf766243dce8a05c9825bae57bb3 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 10 Oct 2017 17:08:04 -0400 Subject: [PATCH 042/141] hide workflow and survey buttons from non-detail tabs since the two are basically sub-states of the edit form (detail tab), they should only show up when that tab is selected --- awx/ui/client/src/templates/workflows.form.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/src/templates/workflows.form.js b/awx/ui/client/src/templates/workflows.form.js index 106d011cb6..ae147de530 100644 --- a/awx/ui/client/src/templates/workflows.form.js +++ b/awx/ui/client/src/templates/workflows.form.js @@ -163,7 +163,7 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) { }, add_survey: { ngClick: 'addSurvey()', - ngShow: '!survey_exists && ($state.includes(\'templates.addWorkflowJobTemplate\') || $state.includes(\'templates.editWorkflowJobTemplate\'))', + ngShow: '!survey_exists && ($state.is(\'templates.addWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate\'))', awFeature: 'surveys', awToolTip: '{{surveyTooltip}}', dataPlacement: 'top', @@ -173,7 +173,7 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) { edit_survey: { ngClick: 'editSurvey()', awFeature: 'surveys', - ngShow: 'survey_exists && ($state.includes(\'templates.addWorkflowJobTemplate\') || $state.includes(\'templates.editWorkflowJobTemplate\'))', + ngShow: 'survey_exists && ($state.is(\'templates.addWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate\'))', label: i18n._('Edit Survey'), class: 'Form-primaryButton', awToolTip: '{{surveyTooltip}}', @@ -181,7 +181,7 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) { }, workflow_editor: { ngClick: 'openWorkflowMaker()', - ngShow: '$state.includes(\'templates.addWorkflowJobTemplate\') || $state.includes(\'templates.editWorkflowJobTemplate\')', + ngShow: '$state.is(\'templates.addWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate\')', awToolTip: '{{workflowEditorTooltip}}', dataPlacement: 'top', label: i18n._('Workflow Editor'), From 1603106cb4733f45d97b40b4abc44274de087425 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Wed, 11 Oct 2017 10:58:38 -0400 Subject: [PATCH 043/141] include workflow editor when showing buttons' --- awx/ui/client/src/templates/workflows.form.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/ui/client/src/templates/workflows.form.js b/awx/ui/client/src/templates/workflows.form.js index ae147de530..d41cb7fb97 100644 --- a/awx/ui/client/src/templates/workflows.form.js +++ b/awx/ui/client/src/templates/workflows.form.js @@ -157,13 +157,13 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) { view_survey: { ngClick: 'editSurvey()', awFeature: 'surveys', - ngShow: '($state.is(\'templates.addWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate\')) && survey_exists && !(workflow_job_template_obj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate)', + ngShow: '($state.is(\'templates.addWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate.workflowMaker\')) && survey_exists && !(workflow_job_template_obj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate)', label: i18n._('View Survey'), class: 'Form-primaryButton' }, add_survey: { ngClick: 'addSurvey()', - ngShow: '!survey_exists && ($state.is(\'templates.addWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate\'))', + ngShow: '$state.is(\'templates.addWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate.workflowMaker\')', awFeature: 'surveys', awToolTip: '{{surveyTooltip}}', dataPlacement: 'top', @@ -173,7 +173,7 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) { edit_survey: { ngClick: 'editSurvey()', awFeature: 'surveys', - ngShow: 'survey_exists && ($state.is(\'templates.addWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate\'))', + ngShow: '$state.is(\'templates.addWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate.workflowMaker\')', label: i18n._('Edit Survey'), class: 'Form-primaryButton', awToolTip: '{{surveyTooltip}}', @@ -181,7 +181,7 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) { }, workflow_editor: { ngClick: 'openWorkflowMaker()', - ngShow: '$state.is(\'templates.addWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate\')', + ngShow: '$state.is(\'templates.addWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate.workflowMaker\')', awToolTip: '{{workflowEditorTooltip}}', dataPlacement: 'top', label: i18n._('Workflow Editor'), From 3ede367df42f9ce2bd489c43d956a0673f11f240 Mon Sep 17 00:00:00 2001 From: mabashian Date: Thu, 12 Oct 2017 16:52:59 -0400 Subject: [PATCH 044/141] Fixed smart inv button bug navigating to page 2 of hosts. Added tooltip when button is disabled. --- awx/ui/client/src/inventories-hosts/hosts/host.list.js | 6 ++++-- .../inventories-hosts/hosts/list/host-list.controller.js | 9 ++++++--- .../nested-hosts/group-nested-hosts-list.controller.js | 9 ++++++--- .../related/hosts/list/host-list.controller.js | 9 ++++++--- .../src/inventories-hosts/inventory-hosts.strings.js | 5 +++++ 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/awx/ui/client/src/inventories-hosts/hosts/host.list.js b/awx/ui/client/src/inventories-hosts/hosts/host.list.js index e91eebb30b..2422666878 100644 --- a/awx/ui/client/src/inventories-hosts/hosts/host.list.js +++ b/awx/ui/client/src/inventories-hosts/hosts/host.list.js @@ -104,12 +104,14 @@ export default ['i18n', function(i18n) { smart_inventory: { mode: 'all', ngClick: "smartInventory()", - awToolTip: i18n._("Create a new Smart Inventory from search results."), + awToolTip: "{{ smartInventoryButtonTooltip }}", + dataTipWatch: 'smartInventoryButtonTooltip', actionClass: 'btn List-buttonDefault', buttonContent: i18n._('SMART INVENTORY'), ngShow: 'canAdd && (hosts.length > 0 || !(searchTags | isEmpty))', dataPlacement: "top", - ngDisabled: '!enableSmartInventoryButton' + ngDisabled: '!enableSmartInventoryButton', + showTipWhenDisabled: true } } }; diff --git a/awx/ui/client/src/inventories-hosts/hosts/list/host-list.controller.js b/awx/ui/client/src/inventories-hosts/hosts/list/host-list.controller.js index 52a565b40c..693d403ea5 100644 --- a/awx/ui/client/src/inventories-hosts/hosts/list/host-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/hosts/list/host-list.controller.js @@ -7,7 +7,7 @@ function HostsList($scope, HostsList, $rootScope, GetBasePath, rbacUiControlService, Dataset, $state, $filter, Prompt, Wait, - HostsService, SetStatus, canAdd) { + HostsService, SetStatus, canAdd, InventoryHostsStrings) { let list = HostsList; @@ -16,6 +16,7 @@ function HostsList($scope, HostsList, $rootScope, GetBasePath, function init(){ $scope.canAdd = canAdd; $scope.enableSmartInventoryButton = false; + $scope.smartInventoryButtonTooltip = InventoryHostsStrings.get('smartinventorybutton.DISABLED_INSTRUCTIONS'); // Search init $scope.list = list; @@ -37,14 +38,16 @@ function HostsList($scope, HostsList, $rootScope, GetBasePath, if(toParams && toParams.host_search) { let hasMoreThanDefaultKeys = false; angular.forEach(toParams.host_search, function(value, key) { - if(key !== 'order_by' && key !== 'page_size') { + if(key !== 'order_by' && key !== 'page_size' && key !== 'page') { hasMoreThanDefaultKeys = true; } }); $scope.enableSmartInventoryButton = hasMoreThanDefaultKeys ? true : false; + $scope.smartInventoryButtonTooltip = hasMoreThanDefaultKeys ? InventoryHostsStrings.get('smartinventorybutton.ENABLED_INSTRUCTIONS') : InventoryHostsStrings.get('smartinventorybutton.DISABLED_INSTRUCTIONS'); } else { $scope.enableSmartInventoryButton = false; + $scope.smartInventoryButtonTooltip = InventoryHostsStrings.get('smartinventorybutton.DISABLED_INSTRUCTIONS'); } }); @@ -114,5 +117,5 @@ function HostsList($scope, HostsList, $rootScope, GetBasePath, export default ['$scope', 'HostsList', '$rootScope', 'GetBasePath', 'rbacUiControlService', 'Dataset', '$state', '$filter', 'Prompt', 'Wait', - 'HostsService', 'SetStatus', 'canAdd', HostsList + 'HostsService', 'SetStatus', 'canAdd', 'InventoryHostsStrings', HostsList ]; diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-list.controller.js index f86a550218..056b61cf96 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-list.controller.js @@ -6,10 +6,10 @@ export default ['$scope', 'NestedHostsListDefinition', '$rootScope', 'GetBasePath', 'rbacUiControlService', 'Dataset', '$state', '$filter', 'Prompt', 'Wait', - 'HostsService', 'SetStatus', 'canAdd', 'GroupsService', 'ProcessErrors', 'groupData', 'inventoryData', + 'HostsService', 'SetStatus', 'canAdd', 'GroupsService', 'ProcessErrors', 'groupData', 'inventoryData', 'InventoryHostsStrings', function($scope, NestedHostsListDefinition, $rootScope, GetBasePath, rbacUiControlService, Dataset, $state, $filter, Prompt, Wait, - HostsService, SetStatus, canAdd, GroupsService, ProcessErrors, groupData, inventoryData) { + HostsService, SetStatus, canAdd, GroupsService, ProcessErrors, groupData, inventoryData, InventoryHostsStrings) { let list = NestedHostsListDefinition; @@ -19,6 +19,7 @@ export default ['$scope', 'NestedHostsListDefinition', '$rootScope', 'GetBasePat $scope.canAdd = canAdd; $scope.enableSmartInventoryButton = false; $scope.disassociateFrom = groupData; + $scope.smartInventoryButtonTooltip = InventoryHostsStrings.get('smartinventorybutton.DISABLED_INSTRUCTIONS'); // Search init $scope.list = list; @@ -50,14 +51,16 @@ export default ['$scope', 'NestedHostsListDefinition', '$rootScope', 'GetBasePat if(toParams && toParams.host_search) { let hasMoreThanDefaultKeys = false; angular.forEach(toParams.host_search, function(value, key) { - if(key !== 'order_by' && key !== 'page_size') { + if(key !== 'order_by' && key !== 'page_size' && key !== 'page') { hasMoreThanDefaultKeys = true; } }); $scope.enableSmartInventoryButton = hasMoreThanDefaultKeys ? true : false; + $scope.smartInventoryButtonTooltip = hasMoreThanDefaultKeys ? InventoryHostsStrings.get('smartinventorybutton.ENABLED_INSTRUCTIONS') : InventoryHostsStrings.get('smartinventorybutton.DISABLED_INSTRUCTIONS'); } else { $scope.enableSmartInventoryButton = false; + $scope.smartInventoryButtonTooltip = InventoryHostsStrings.get('smartinventorybutton.DISABLED_INSTRUCTIONS'); } }); diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js index c19110b627..11507bb8c8 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js @@ -7,10 +7,10 @@ // import HostsService from './../hosts/host.service'; export default ['$scope', 'ListDefinition', '$rootScope', 'GetBasePath', 'rbacUiControlService', 'Dataset', '$state', '$filter', 'Prompt', 'Wait', - 'HostsService', 'SetStatus', 'canAdd', 'i18n', + 'HostsService', 'SetStatus', 'canAdd', 'i18n', 'InventoryHostsStrings', function($scope, ListDefinition, $rootScope, GetBasePath, rbacUiControlService, Dataset, $state, $filter, Prompt, Wait, - HostsService, SetStatus, canAdd, i18n) { + HostsService, SetStatus, canAdd, i18n, InventoryHostsStrings) { let list = ListDefinition; @@ -19,6 +19,7 @@ export default ['$scope', 'ListDefinition', '$rootScope', 'GetBasePath', function init(){ $scope.canAdd = canAdd; $scope.enableSmartInventoryButton = false; + $scope.smartInventoryButtonTooltip = InventoryHostsStrings.get('smartinventorybutton.DISABLED_INSTRUCTIONS'); // Search init $scope.list = list; @@ -45,14 +46,16 @@ export default ['$scope', 'ListDefinition', '$rootScope', 'GetBasePath', if(toParams && toParams.host_search) { let hasMoreThanDefaultKeys = false; angular.forEach(toParams.host_search, function(value, key) { - if(key !== 'order_by' && key !== 'page_size') { + if(key !== 'order_by' && key !== 'page_size' && key !== 'page') { hasMoreThanDefaultKeys = true; } }); $scope.enableSmartInventoryButton = hasMoreThanDefaultKeys ? true : false; + $scope.smartInventoryButtonTooltip = hasMoreThanDefaultKeys ? InventoryHostsStrings.get('smartinventorybutton.ENABLED_INSTRUCTIONS') : InventoryHostsStrings.get('smartinventorybutton.DISABLED_INSTRUCTIONS'); } else { $scope.enableSmartInventoryButton = false; + $scope.smartInventoryButtonTooltip = InventoryHostsStrings.get('smartinventorybutton.DISABLED_INSTRUCTIONS'); } }); diff --git a/awx/ui/client/src/inventories-hosts/inventory-hosts.strings.js b/awx/ui/client/src/inventories-hosts/inventory-hosts.strings.js index c64b73a933..6c46f7c9d5 100644 --- a/awx/ui/client/src/inventories-hosts/inventory-hosts.strings.js +++ b/awx/ui/client/src/inventories-hosts/inventory-hosts.strings.js @@ -28,6 +28,11 @@ function InventoryHostsStrings (BaseString) { MISSING_PERMISSIONS: t.s('You do not have sufficient permissions to edit the host filter.') } }; + + ns.smartinventorybutton = { + DISABLED_INSTRUCTIONS: "Please enter at least one search term to create a new Smart Inventory.", + ENABLED_INSTRUCTIONS: "Create a new Smart Inventory from search results." + }; } InventoryHostsStrings.$inject = ['BaseStringService']; From 2cab6982c16213378d1e4899c82b0afa8ce96cea Mon Sep 17 00:00:00 2001 From: mabashian Date: Thu, 12 Oct 2017 17:01:32 -0400 Subject: [PATCH 045/141] Moved wait stop calls on jt form so that they fire right before reloading state --- .../add-job-template/job-template-add.controller.js | 1 - .../edit-job-template/job-template-edit.controller.js | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js b/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js index 9cd73e1da7..f88b1057df 100644 --- a/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js +++ b/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js @@ -341,7 +341,6 @@ Rest.post(data) .then(({data}) => { - Wait('stop'); if (data.related && data.related.callback) { Alert('Callback URL', `Host callbacks are enabled for this template. The callback URL is: diff --git a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js index fa5d74219a..75bc0ecf2a 100644 --- a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js +++ b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js @@ -496,7 +496,7 @@ export default $scope.removeTemplateSaveSuccess(); } $scope.removeTemplateSaveSuccess = $scope.$on('templateSaveSuccess', function(e, data) { - Wait('stop'); + if (data.related && data.related.callback) { Alert('Callback URL', @@ -606,6 +606,7 @@ export default } $q.all(defers) .then(function() { + Wait('stop'); saveCompleted(); }); }); From fcd03fb1c21d77a775a1a2a3ab3af94367348b0a Mon Sep 17 00:00:00 2001 From: Marliana Lara Date: Fri, 13 Oct 2017 14:50:13 -0400 Subject: [PATCH 046/141] Fix job standard out error message word-wrap --- .../job-results-stdout/job-results-stdout.block.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less index 3e9c505a76..d186677cd1 100644 --- a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less +++ b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less @@ -165,7 +165,7 @@ color: @default-interface-txt; display: inline-block; white-space: pre-wrap; - word-break: break-word; + word-break: break-all; width:100%; background-color: @default-secondary-bg; } From e8dbfa42cf57e2e22f649e59f57750cd47bb087c Mon Sep 17 00:00:00 2001 From: mabashian Date: Tue, 17 Oct 2017 10:10:34 -0400 Subject: [PATCH 047/141] Fixed disassociate host from group help text --- .../nested-groups/host-nested-groups-disassociate.partial.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html index 05566db742..b446955f8a 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html @@ -5,7 +5,7 @@
Disassociate Group Date: Tue, 17 Oct 2017 10:23:17 -0400 Subject: [PATCH 048/141] Made disassociate host/group titles more descriptive --- .../group-nested-groups-disassociate.partial.html | 4 ++-- .../nested-hosts/group-nested-hosts-disassociate.partial.html | 4 ++-- .../host-nested-groups-disassociate.partial.html | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html index 951341049b..4b1db39883 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html @@ -3,13 +3,13 @@
- Disassociate Group + Disassociate Group From Group diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html index 76220c3956..cf22da701e 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html @@ -3,13 +3,13 @@
- Disassociate Host + Disassociate Host From Group diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html index b446955f8a..5f68d4dc51 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html @@ -3,13 +3,13 @@
- Disassociate Group + Disassociate Host From Group From 5db478a4a0b0aaf14eb3598dd15105475a0e9342 Mon Sep 17 00:00:00 2001 From: mabashian Date: Mon, 16 Oct 2017 16:10:51 -0400 Subject: [PATCH 049/141] Zoom workflow graph to fit screen on initial load --- awx/ui/client/src/templates/workflows.form.js | 4 +- .../workflow-chart.directive.js | 50 ++++++++++++++++--- .../workflow-controls.block.less | 23 +++++---- .../workflow-controls.directive.js | 7 ++- .../workflow-controls.partial.html | 3 ++ .../workflow-maker/workflow-maker.block.less | 10 ++-- .../workflow-maker.controller.js | 12 ++--- .../workflow-maker.directive.js | 2 + .../workflow-maker.partial.html | 2 +- .../workflow-results.controller.js | 4 ++ .../workflow-results.partial.html | 2 +- 11 files changed, 85 insertions(+), 34 deletions(-) diff --git a/awx/ui/client/src/templates/workflows.form.js b/awx/ui/client/src/templates/workflows.form.js index d41cb7fb97..1825b8cf65 100644 --- a/awx/ui/client/src/templates/workflows.form.js +++ b/awx/ui/client/src/templates/workflows.form.js @@ -163,7 +163,7 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) { }, add_survey: { ngClick: 'addSurvey()', - ngShow: '$state.is(\'templates.addWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate.workflowMaker\')', + ngShow: '!survey_exists && ($state.is(\'templates.addWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate.workflowMaker\'))', awFeature: 'surveys', awToolTip: '{{surveyTooltip}}', dataPlacement: 'top', @@ -173,7 +173,7 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) { edit_survey: { ngClick: 'editSurvey()', awFeature: 'surveys', - ngShow: '$state.is(\'templates.addWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate.workflowMaker\')', + ngShow: 'survey_exists && ($state.is(\'templates.addWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate.workflowMaker\'))', label: i18n._('Edit Survey'), class: 'Form-primaryButton', awToolTip: '{{surveyTooltip}}', diff --git a/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js b/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js index 0a945398a2..d0e0c14af0 100644 --- a/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js +++ b/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js @@ -21,7 +21,7 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge restrict: 'E', link: function(scope, element) { - let margin = {top: 20, right: 20, bottom: 20, left: 20}, + let marginLeft = 20, i = 0, nodeW = 180, nodeH = 60, @@ -36,7 +36,8 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge line, zoomObj, baseSvg, - svgGroup; + svgGroup, + graphLoaded; scope.dimensionsSet = false; @@ -75,7 +76,8 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge ); svgGroup = baseSvg.append("g") - .attr("transform", "translate(" + margin.left + "," + (windowHeight/2 - rootH/2 - startNodeOffsetY) + ")"); + .attr("id", "aw-workflow-chart-g") + .attr("transform", "translate(" + marginLeft + "," + (windowHeight/2 - rootH/2 - startNodeOffsetY) + ")"); } function calcAvailableScreenSpace() { @@ -158,7 +160,7 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge let scale = d3.event.scale, translation = d3.event.translate; - translation = [translation[0] + (margin.left*scale), translation[1] + ((windowHeight/2 - rootH/2 - startNodeOffsetY)*scale)]; + translation = [translation[0] + (marginLeft*scale), translation[1] + ((windowHeight/2 - rootH/2 - startNodeOffsetY)*scale)]; svgGroup.attr("transform", "translate(" + translation + ")scale(" + scale + ")"); @@ -177,7 +179,7 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge translateX = unscaledOffsetX*scale - ((scale*windowWidth)-windowWidth)/2, translateY = unscaledOffsetY*scale - ((scale*windowHeight)-windowHeight)/2; - svgGroup.attr("transform", "translate(" + [translateX + (margin.left*scale), translateY + ((windowHeight/2 - rootH/2 - startNodeOffsetY)*scale)] + ")scale(" + scale + ")"); + svgGroup.attr("transform", "translate(" + [translateX + (marginLeft*scale), translateY + ((windowHeight/2 - rootH/2 - startNodeOffsetY)*scale)] + ")scale(" + scale + ")"); zoomObj.scale(scale); zoomObj.translate([translateX, translateY]); } @@ -200,12 +202,36 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge } function resetZoomAndPan() { - svgGroup.attr("transform", "translate(" + margin.left + "," + (windowHeight/2 - rootH/2 - startNodeOffsetY) + ")scale(" + 1 + ")"); + svgGroup.attr("transform", "translate(" + marginLeft + "," + (windowHeight/2 - rootH/2 - startNodeOffsetY) + ")scale(" + 1 + ")"); // Update the zoomObj zoomObj.scale(1); zoomObj.translate([0,0]); } + function zoomToFitChart() { + let graphDimensions = d3.select('#aw-workflow-chart-g')[0][0].getBoundingClientRect(), + startNodeDimensions = d3.select('.WorkflowChart-rootNode')[0][0].getBoundingClientRect(), + availableScreenSpace = calcAvailableScreenSpace(), + currentZoomValue = zoomObj.scale(), + unscaledH = graphDimensions.height/currentZoomValue, + unscaledW = graphDimensions.width/currentZoomValue, + scaleNeededForMaxHeight = (availableScreenSpace.height)/unscaledH, + scaleNeededForMaxWidth = (availableScreenSpace.width - marginLeft)/unscaledW, + lowerScale = Math.min(scaleNeededForMaxHeight, scaleNeededForMaxWidth), + scaleToFit = lowerScale < 0.5 ? 0.5 : (lowerScale > 2 ? 2 : Math.floor(lowerScale * 10)/10), + startNodeOffsetFromGraphCenter = Math.round((((rootH/2) + (startNodeDimensions.top/currentZoomValue)) - ((graphDimensions.top/currentZoomValue) + (unscaledH/2)))*scaleToFit); + + manualZoom(scaleToFit*100); + + scope.workflowZoomed({ + zoom: scaleToFit + }); + + svgGroup.attr("transform", "translate(" + marginLeft + "," + (windowHeight/2 - (nodeH*scaleToFit/2) + startNodeOffsetFromGraphCenter) + ")scale(" + scaleToFit + ")"); + zoomObj.translate([marginLeft - scaleToFit*marginLeft, windowHeight/2 - (nodeH*scaleToFit/2) + startNodeOffsetFromGraphCenter - ((windowHeight/2 - rootH/2 - startNodeOffsetY)*scaleToFit)]); + + } + function update() { let userCanAddEdit = (scope.workflowJobTemplateObj && scope.workflowJobTemplateObj.summary_fields && scope.workflowJobTemplateObj.summary_fields.user_capabilities && scope.workflowJobTemplateObj.summary_fields.user_capabilities.edit) || scope.canAddWorkflowJobTemplate; if(scope.dimensionsSet) { @@ -243,7 +269,6 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge thisNode.append("rect") .attr("width", rootW) .attr("height", rootH) - //.attr("y", (windowHeight-margin.top-margin.bottom)/2 - rootH) .attr("y", 10) .attr("rx", 5) .attr("ry", 5) @@ -252,7 +277,6 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge .call(add_node); thisNode.append("text") .attr("x", 13) - //.attr("y", (windowHeight-margin.top-margin.bottom)/2 - rootH + rootH/2) .attr("y", 30) .attr("dy", ".35em") .attr("class", "WorkflowChart-startText") @@ -544,6 +568,12 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge node.exit().remove(); + if(nodes && nodes.length > 1 && !graphLoaded) { + zoomToFitChart(); + } + + graphLoaded = true; + let link = svgGroup.selectAll("g.link") .data(links, function(d) { return d.source.id + "-" + d.target.id; @@ -927,6 +957,10 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge manualZoom(params.zoom); }); + scope.$on('zoomToFitChart', function() { + zoomToFitChart(); + }); + let clearWatchTreeData = scope.$watch('treeData', function(newVal) { if(newVal) { update(); diff --git a/awx/ui/client/src/templates/workflows/workflow-controls/workflow-controls.block.less b/awx/ui/client/src/templates/workflows/workflow-controls/workflow-controls.block.less index f8ee0523a4..555c6fa2c7 100644 --- a/awx/ui/client/src/templates/workflows/workflow-controls/workflow-controls.block.less +++ b/awx/ui/client/src/templates/workflows/workflow-controls/workflow-controls.block.less @@ -7,7 +7,7 @@ flex: 1 0 auto; } .WorkflowControls-Pan { - flex: 0 0 85px; + flex: 0 0 87px; } .WorkflowControls-Pan--button { color: @default-icon; @@ -49,17 +49,10 @@ .WorkflowControls-Zoom--button:hover { color: @default-link-hov; } -.WorkflowControls-Zoom--minus { - margin-left: 20px; - padding-right: 8px; -} -.WorkflowControls-Zoom--plus { - padding-left: 8px; -} .WorkflowControls-zoomSlider { width: 150px; - padding-left: 10px; - padding-right: 10px; + padding-left: 8px; + padding-right: 8px; } .WorkflowControls-zoomPercentage { text-align: center; @@ -67,6 +60,16 @@ height: 24px; line-height: 24px; } +.WorkflowControls-ZoomToFit { + display: flex; + flex: 0 0 62px; + align-items: center; + justify-content: center; + color: @default-icon; +} +.WorkflowControls-ZoomToFit:hover { + color: @default-link-hov; +} .ui-slider-handle.ui-state-default.ui-corner-all { border-radius: 50%; diff --git a/awx/ui/client/src/templates/workflows/workflow-controls/workflow-controls.directive.js b/awx/ui/client/src/templates/workflows/workflow-controls/workflow-controls.directive.js index 811cfbaafb..8b0e3bfe47 100644 --- a/awx/ui/client/src/templates/workflows/workflow-controls/workflow-controls.directive.js +++ b/awx/ui/client/src/templates/workflows/workflow-controls/workflow-controls.directive.js @@ -10,7 +10,8 @@ export default ['templateUrl', scope: { panChart: '&', resetChart: '&', - zoomChart: '&' + zoomChart: '&', + zoomToFitChart: '&' }, templateUrl: templateUrl('templates/workflows/workflow-controls/workflow-controls'), restrict: 'E', @@ -60,6 +61,10 @@ export default ['templateUrl', }); }; + scope.zoomToFit = function() { + scope.zoomToFitChart(); + }; + scope.$on('workflowZoomed', function(evt, params) { scope.zoom = Math.round(params.zoom * 10) * 10; $("#slider").slider('value',scope.zoom); diff --git a/awx/ui/client/src/templates/workflows/workflow-controls/workflow-controls.partial.html b/awx/ui/client/src/templates/workflows/workflow-controls/workflow-controls.partial.html index 2115bba62c..78cf63d78b 100644 --- a/awx/ui/client/src/templates/workflows/workflow-controls/workflow-controls.partial.html +++ b/awx/ui/client/src/templates/workflows/workflow-controls/workflow-controls.partial.html @@ -1,3 +1,6 @@ +
+ +
diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.block.less b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.block.less index 3de45ca157..7a6dfdd650 100644 --- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.block.less +++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.block.less @@ -168,7 +168,7 @@ flex: 1 0 auto; } .WorkflowLegend-maker--right { - flex: 0 0 215px; + flex: 0 0 217px; text-align: right; padding-right: 20px; position: relative; @@ -246,9 +246,9 @@ } .WorkflowMaker-manualControls { position: absolute; - left: -77px; + left: -106px; height: 60px; - width: 293px; + width: 322px; background-color: @default-bg; display: flex; border: 1px solid @b7grey; @@ -259,10 +259,10 @@ } .WorkflowLegend-manualControls { position: absolute; - left: -239px; + left: -272px; top: 38px; height: 60px; - width: 290px; + width: 322px; background-color: @default-bg; display: flex; border: 1px solid @d7grey; diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js index f511c7a297..9bbe6e8996 100644 --- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js +++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js @@ -31,9 +31,9 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService', showTypeOptions: false }; - $scope.editRequests = []; - $scope.associateRequests = []; - $scope.disassociateRequests = []; + $scope.editRequests = []; + $scope.associateRequests = []; + $scope.disassociateRequests = []; $scope.showKey = false; $scope.toggleKey = () => $scope.showKey = !$scope.showKey; @@ -940,9 +940,9 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService', }); }; - $scope.$on('WorkflowDialogReady', function(){ - $scope.modalOpen = true; - }); + $scope.zoomToFitChart = function() { + $scope.$broadcast('zoomToFitChart'); + }; init(); diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.directive.js b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.directive.js index 03ee776dfe..add6d5cd65 100644 --- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.directive.js +++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.directive.js @@ -57,6 +57,8 @@ export default ['templateUrl', 'CreateDialog', 'Wait', '$state', '$window', scope.removeWorkflowDialogReady = scope.$on('WorkflowDialogReady', function() { $('#workflow-modal-dialog').dialog('open'); + scope.modalOpen = true; + scope.$broadcast("refreshWorkflowChart"); }); diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html index 57e1344ac0..adc7efb47b 100644 --- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html +++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html @@ -69,7 +69,7 @@
- +
diff --git a/awx/ui/client/src/workflow-results/workflow-results.controller.js b/awx/ui/client/src/workflow-results/workflow-results.controller.js index 13bcca8c0d..be5d26e928 100644 --- a/awx/ui/client/src/workflow-results/workflow-results.controller.js +++ b/awx/ui/client/src/workflow-results/workflow-results.controller.js @@ -165,6 +165,10 @@ export default ['workflowData', 'workflowResultsService', 'workflowDataOptions', $scope.$broadcast('resetWorkflowChart'); }; + $scope.zoomToFitChart = function() { + $scope.$broadcast('zoomToFitChart'); + }; + $scope.workflowZoomed = function(zoom) { $scope.$broadcast('workflowZoomed', { zoom: zoom diff --git a/awx/ui/client/src/workflow-results/workflow-results.partial.html b/awx/ui/client/src/workflow-results/workflow-results.partial.html index 64c0700f54..2cb7f3fedb 100644 --- a/awx/ui/client/src/workflow-results/workflow-results.partial.html +++ b/awx/ui/client/src/workflow-results/workflow-results.partial.html @@ -289,7 +289,7 @@
- +
From b402d9ba6d86e7bddc5ce7157995f234a5b94da0 Mon Sep 17 00:00:00 2001 From: mabashian Date: Tue, 17 Oct 2017 14:42:24 -0400 Subject: [PATCH 050/141] Fixed error message when launching adhoc command --- .../job-submission-factories/adhoc-run.factory.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/job-submission/job-submission-factories/adhoc-run.factory.js b/awx/ui/client/src/job-submission/job-submission-factories/adhoc-run.factory.js index 333fe5caae..7db13bf51e 100644 --- a/awx/ui/client/src/job-submission/job-submission-factories/adhoc-run.factory.js +++ b/awx/ui/client/src/job-submission/job-submission-factories/adhoc-run.factory.js @@ -93,7 +93,7 @@ } }) .error(function (data, status) { - ProcessErrors(scope, data, status, { + ProcessErrors(scope, data, status, null, { hdr: 'Error!', msg: 'Failed to launch adhoc command. POST ' + 'returned status: ' + status }); From 5895654538e8ac806f501c8cd35fc279dfcd99ab Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Tue, 17 Oct 2017 17:06:48 -0400 Subject: [PATCH 051/141] store cloudforms inventory cache files in the proper location on disk with process isolation enabled (which is the awx default), cloudforms caches inventory script results on disk; awx should direct cloudforms to store these cache files in a location that's exposed to the isolated environment see: ansible/ansible#31760 --- awx/main/tasks.py | 5 +++++ awx/main/tests/unit/test_tasks.py | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index b27ce0e967..78d832a97d 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -1794,6 +1794,11 @@ class RunInventoryUpdate(BaseTask): section = 'cache' cp.add_section(section) cp.set(section, 'max_age', "0") + cache_path = tempfile.mkdtemp( + prefix='cloudforms_cache', + dir=kwargs.get('private_data_dir', None) + ) + cp.set(section, 'path', cache_path) elif inventory_update.source == 'azure_rm': section = 'azure' diff --git a/awx/main/tests/unit/test_tasks.py b/awx/main/tests/unit/test_tasks.py index ccd49a5094..28d24f62cc 100644 --- a/awx/main/tests/unit/test_tasks.py +++ b/awx/main/tests/unit/test_tasks.py @@ -1473,6 +1473,10 @@ class TestInventoryUpdateCredentials(TestJobExecution): assert config.get('cloudforms', 'username') == 'bob' assert config.get('cloudforms', 'password') == 'secret' assert config.get('cloudforms', 'ssl_verify') == 'false' + + cache_path = config.get('cache', 'path') + assert cache_path.startswith(env['AWX_PRIVATE_DATA_DIR']) + assert os.path.isdir(cache_path) return ['successful', 0] self.run_pexpect.side_effect = run_pexpect_side_effect From 38c2ea7025ef61a0652db0bb50e1621cd1277324 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Wed, 18 Oct 2017 10:20:44 -0400 Subject: [PATCH 052/141] use getattr in social auth django strategy --- awx/sso/strategies/django_strategy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/sso/strategies/django_strategy.py b/awx/sso/strategies/django_strategy.py index 0c8c1b492d..1c9c107bd1 100644 --- a/awx/sso/strategies/django_strategy.py +++ b/awx/sso/strategies/django_strategy.py @@ -29,7 +29,7 @@ class AWXDjangoStrategy(DjangoStrategy): try: return host_parts[1] except IndexError: - if settings.USE_X_FORWARDED_PORT and 'HTTP_X_FORWARDED_PORT' in self.request.META: + if getattr(settings, 'USE_X_FORWARDED_PORT', False) and 'HTTP_X_FORWARDED_PORT' in self.request.META: return self.request.META['HTTP_X_FORWARDED_PORT'] else: return self.request.META['SERVER_PORT'] From d3eea5e69470d9624cb16fc5e97e53378564c9ea Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Tue, 17 Oct 2017 16:03:39 -0700 Subject: [PATCH 053/141] generalizing class which is ignored when trying to drag the host-event-modal it was only applied to .CodeMirror, which is only used by the JSON tab --- .../client/src/job-results/host-event/host-event.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/job-results/host-event/host-event.controller.js b/awx/ui/client/src/job-results/host-event/host-event.controller.js index e8027e218e..330e581189 100644 --- a/awx/ui/client/src/job-results/host-event/host-event.controller.js +++ b/awx/ui/client/src/job-results/host-event/host-event.controller.js @@ -112,7 +112,7 @@ minWidth: 600 }); $('.modal-dialog').draggable({ - cancel: '.CodeMirror' + cancel: '.HostEvent-view--container' }); function resize(){ From 10a7544d68406d0f6941691cf64caf46d52a1b33 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Wed, 18 Oct 2017 17:03:10 -0400 Subject: [PATCH 054/141] properly follow symlinks for bwrap'd working directories see: https://github.com/ansible/ansible-tower/issues/7741 --- awx/main/utils/common.py | 1 + 1 file changed, 1 insertion(+) diff --git a/awx/main/utils/common.py b/awx/main/utils/common.py index c370769f84..f183890a7f 100644 --- a/awx/main/utils/common.py +++ b/awx/main/utils/common.py @@ -703,6 +703,7 @@ def wrap_args_with_proot(args, cwd, **kwargs): - /var/log/supervisor ''' from django.conf import settings + cwd = os.path.realpath(cwd) new_args = [getattr(settings, 'AWX_PROOT_CMD', 'bwrap'), '--unshare-pid', '--dev-bind', '/', '/'] hide_paths = [settings.AWX_PROOT_BASE_PATH] if not kwargs.get('isolated'): From c1e20fe7a0db1bf866ee4fb5c1e05d3680d24827 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Thu, 19 Oct 2017 09:47:25 -0400 Subject: [PATCH 055/141] properly support authentication for ovirt4 ansible modules see: https://github.com/ansible/ansible-tower/issues/6522 see: https://github.com/ansible/ansible-tower/issues/6522#issuecomment-337909863 --- awx/main/models/credential.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/awx/main/models/credential.py b/awx/main/models/credential.py index 7db8db04e9..77ce9ca3b0 100644 --- a/awx/main/models/credential.py +++ b/awx/main/models/credential.py @@ -1041,6 +1041,10 @@ def ovirt4(cls): 'required': ['host', 'username', 'password'], }, injectors={ + # The duplication here is intentional; the ovirt4 inventory plugin + # writes a .ini file for authentication, while the ansible modules for + # ovirt4 use a separate authentication process that support + # environment variables; by injecting both, we support both 'file': { 'template': '\n'.join([ '[ovirt]', @@ -1050,7 +1054,10 @@ def ovirt4(cls): '{% if ca_file %}ovirt_ca_file={{ca_file}}{% endif %}']) }, 'env': { - 'OVIRT_INI_PATH': '{{tower.filename}}' + 'OVIRT_INI_PATH': '{{tower.filename}}', + 'OVIRT_URL': '{{host}}', + 'OVIRT_USERNAME': '{{username}}', + 'OVIRT_PASSWORD': '{{password}}' } }, ) From c3fbb07535ec01194bdd645737df152b019a9efe Mon Sep 17 00:00:00 2001 From: mabashian Date: Thu, 19 Oct 2017 19:31:41 -0400 Subject: [PATCH 056/141] Fixed removing host filter search term with encoded character --- awx/ui/client/src/shared/smart-search/queryset.service.js | 2 +- .../src/shared/smart-search/smart-search.controller.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/src/shared/smart-search/queryset.service.js b/awx/ui/client/src/shared/smart-search/queryset.service.js index 27681d18b4..943f63818b 100644 --- a/awx/ui/client/src/shared/smart-search/queryset.service.js +++ b/awx/ui/client/src/shared/smart-search/queryset.service.js @@ -132,7 +132,7 @@ export default ['$q', 'Rest', 'ProcessErrors', '$rootScope', 'Wait', 'DjangoSear } if(params.singleSearchParam) { - return {[params.singleSearchParam]: encodeURIComponent(paramString + "=" + valueString)}; + return {[params.singleSearchParam]: paramString + "=" + valueString}; } else { return {[paramString] : encodeURIComponent(valueString)}; diff --git a/awx/ui/client/src/shared/smart-search/smart-search.controller.js b/awx/ui/client/src/shared/smart-search/smart-search.controller.js index cb42b09984..22dcb0c615 100644 --- a/awx/ui/client/src/shared/smart-search/smart-search.controller.js +++ b/awx/ui/client/src/shared/smart-search/smart-search.controller.js @@ -140,7 +140,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', ' function searchWithoutKey(term) { if($scope.singleSearchParam) { return { - [$scope.singleSearchParam]: encodeURIComponent("search=" + term) + [$scope.singleSearchParam]: "search=" + encodeURIComponent(term) }; } return { @@ -329,6 +329,10 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', ' else { if($scope.singleSearchParam && set[$scope.singleSearchParam] && set[$scope.singleSearchParam].includes("%20and%20")) { let searchParamParts = set[$scope.singleSearchParam].split("%20and%20"); + // The value side of each paramPart might have been encoded in SmartSearch.splitFilterIntoTerms + _.each(searchParamParts, (paramPart, paramPartIndex) => { + searchParamParts[paramPartIndex] = decodeURIComponent(paramPart); + }); var index = searchParamParts.indexOf(value); if (index !== -1) { searchParamParts.splice(index, 1); From b60a30cbd4a3b77ad57b6c37833ef78e928a3e7e Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Fri, 20 Oct 2017 12:13:44 -0400 Subject: [PATCH 057/141] fix a unicode handling bug in inventory source name migration see: https://github.com/ansible/ansible-tower/issues/7740 --- awx/main/migrations/_inventory_source.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/awx/main/migrations/_inventory_source.py b/awx/main/migrations/_inventory_source.py index e2401ee3ae..7534c53fca 100644 --- a/awx/main/migrations/_inventory_source.py +++ b/awx/main/migrations/_inventory_source.py @@ -1,6 +1,7 @@ import logging from django.db.models import Q +import six logger = logging.getLogger('awx.main.migrations') @@ -38,8 +39,10 @@ def rename_inventory_sources(apps, schema_editor): Q(deprecated_group__inventory__organization=org)).distinct().all()): inventory = invsrc.deprecated_group.inventory if invsrc.deprecated_group else invsrc.inventory - name = '{0} - {1} - {2}'.format(invsrc.name, inventory.name, i) - logger.debug("Renaming InventorySource({0}) {1} -> {2}".format(invsrc.pk, invsrc.name, name)) + name = six.text_type('{0} - {1} - {2}').format(invsrc.name, inventory.name, i) + logger.debug(six.text_type("Renaming InventorySource({0}) {1} -> {2}").format( + invsrc.pk, invsrc.name, name + )) invsrc.name = name invsrc.save() From 3119d5ed22d5a66e93432eade85591452c22170e Mon Sep 17 00:00:00 2001 From: mabashian Date: Fri, 20 Oct 2017 20:10:36 -0400 Subject: [PATCH 058/141] Delete inv source hosts before inv source --- .../sources/list/sources-list.controller.js | 50 +++++++++++++------ .../related/sources/sources.service.js | 9 ++++ 2 files changed, 45 insertions(+), 14 deletions(-) diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js index 6561fe6fc9..e0798e714d 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js @@ -9,12 +9,12 @@ 'ViewUpdateStatus', 'rbacUiControlService', 'GetBasePath', 'GetSyncStatusMsg', 'Dataset', 'Find', 'QuerySet', 'inventoryData', '$filter', 'Prompt', 'Wait', 'SourcesService', 'inventorySourceOptions', - 'canAdd', 'hasSyncableSources', 'i18n', + 'canAdd', 'hasSyncableSources', 'i18n', 'ProcessErrors', function($scope, $rootScope, $state, $stateParams, SourcesListDefinition, InventoryUpdate, CancelSourceUpdate, ViewUpdateStatus, rbacUiControlService, GetBasePath, GetSyncStatusMsg, Dataset, Find, qs, inventoryData, $filter, Prompt, - Wait, SourcesService, inventorySourceOptions, canAdd, hasSyncableSources, i18n){ + Wait, SourcesService, inventorySourceOptions, canAdd, hasSyncableSources, i18n, ProcessErrors){ let list = SourcesListDefinition; var inventory_source; @@ -121,20 +121,42 @@ var action = function(){ delete $rootScope.promptActionBtnClass; Wait('start'); - SourcesService.delete(inventory_source.id).then(() => { - $('#prompt-modal').modal('hide'); - let reloadListStateParams = null; + SourcesService.deleteHosts(inventory_source.id).then(() => { + SourcesService.delete(inventory_source.id).then(() => { + $('#prompt-modal').modal('hide'); + let reloadListStateParams = null; - if($scope.inventory_sources.length === 1 && $state.params.inventory_source_search && !_.isEmpty($state.params.inventory_source_search.page) && $state.params.inventory_source_search.page !== '1') { - reloadListStateParams = _.cloneDeep($state.params); - reloadListStateParams.inventory_source_search.page = (parseInt(reloadListStateParams.inventory_source_search.page)-1).toString(); - } - if (parseInt($state.params.inventory_source_id) === inventory_source.id) { - $state.go('^', reloadListStateParams, {reload: true}); - } else { - $state.go('.', reloadListStateParams, {reload: true}); - } + if($scope.inventory_sources.length === 1 && $state.params.inventory_source_search && !_.isEmpty($state.params.inventory_source_search.page) && $state.params.inventory_source_search.page !== '1') { + reloadListStateParams = _.cloneDeep($state.params); + reloadListStateParams.inventory_source_search.page = (parseInt(reloadListStateParams.inventory_source_search.page)-1).toString(); + } + if (parseInt($state.params.inventory_source_id) === inventory_source.id) { + $state.go('^', reloadListStateParams, {reload: true}); + } else { + $state.go('.', reloadListStateParams, {reload: true}); + } + Wait('stop'); + }) + .catch(({data, status}) => { + $('#prompt-modal').modal('hide'); + Wait('stop'); + ProcessErrors($scope, data, status, null, + { + hdr: i18n._('Error!'), + msg: i18n._('There was an error deleting inventory source. Returned status: ') + + status + }); + }); + }) + .catch(({data, status}) => { + $('#prompt-modal').modal('hide'); Wait('stop'); + ProcessErrors($scope, data, status, null, + { + hdr: i18n._('Error!'), + msg: i18n._('There was an error deleting inventory source hosts. Returned status: ') + + status + }); }); }; // Prompt depends on having $rootScope.promptActionBtnClass available... diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js index 8ae2d144b7..93894d7126 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js @@ -132,6 +132,15 @@ export default else { return; } + }, + deleteHosts(id) { + Wait('start'); + this.url = GetBasePath('inventory_sources') + id + '/hosts/'; + Rest.setUrl(this.url); + return Rest.destroy() + .success(this.success.bind(this)) + .error(this.error.bind(this)) + .finally(Wait('stop')); } }; }]; From 71d428433f07551e8bfdd9e9bdd6f52f8f95a955 Mon Sep 17 00:00:00 2001 From: mabashian Date: Mon, 23 Oct 2017 12:09:25 -0400 Subject: [PATCH 059/141] Made adhoc launch modal height dynamic --- awx/ui/client/legacy-styles/jquery-ui-overrides.less | 2 +- .../job-submission-factories/create-launch-dialog.factory.js | 4 +--- awx/ui/client/src/shared/Modal.js | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/awx/ui/client/legacy-styles/jquery-ui-overrides.less b/awx/ui/client/legacy-styles/jquery-ui-overrides.less index 79f7dd5931..8656b3693f 100644 --- a/awx/ui/client/legacy-styles/jquery-ui-overrides.less +++ b/awx/ui/client/legacy-styles/jquery-ui-overrides.less @@ -149,7 +149,7 @@ table.ui-datepicker-calendar { .ui-widget-content { background-image: none; - background-color: @default-secondary-bg; + background-color: @default-bg; a, a:visited, diff --git a/awx/ui/client/src/job-submission/job-submission-factories/create-launch-dialog.factory.js b/awx/ui/client/src/job-submission/job-submission-factories/create-launch-dialog.factory.js index 9620807621..062b47ece3 100644 --- a/awx/ui/client/src/job-submission/job-submission-factories/create-launch-dialog.factory.js +++ b/awx/ui/client/src/job-submission/job-submission-factories/create-launch-dialog.factory.js @@ -27,7 +27,6 @@ export default // scope.$emit('CancelJob'); // scope.$destroy(); }, - icon: "fa-times", "class": "btn btn-default", "id": "password-cancel-button" },{ @@ -36,7 +35,6 @@ export default scope.$emit(callback); $('#password-modal').dialog('close'); }, - icon: "fa-check", "class": "btn btn-primary", "id": "password-accept-button" }]; @@ -46,7 +44,7 @@ export default scope: scope, buttons: buttons, width: 620, - height: 700, //(scope.passwords.length > 1) ? 700 : 500, + height: "auto", minWidth: 500, title: 'Launch Configuration', callback: 'DialogReady', diff --git a/awx/ui/client/src/shared/Modal.js b/awx/ui/client/src/shared/Modal.js index 86c2da80a9..6e7c73ae8c 100644 --- a/awx/ui/client/src/shared/Modal.js +++ b/awx/ui/client/src/shared/Modal.js @@ -94,7 +94,7 @@ angular.module('ModalDialog', ['Utilities']) ww = $(document).width(); wh = $(document).height(); x = (width > ww) ? ww - 10 : width; - y = (height > wh) ? wh - 10 : height; + y = height === "auto" ? "auto" : ((height > wh) ? wh - 10 : height); // Create the modal $('#' + id).dialog({ From 018514d657d0875bb8cd777a92fb2283db343cf1 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Tue, 24 Oct 2017 08:05:08 -0400 Subject: [PATCH 060/141] urlencode unquote host_filter on save --- awx/main/fields.py | 2 + .../tests/functional/api/test_inventory.py | 46 +++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/awx/main/fields.py b/awx/main/fields.py index 6a746518d9..56c390aa8d 100644 --- a/awx/main/fields.py +++ b/awx/main/fields.py @@ -6,6 +6,7 @@ import copy import json import re import six +import urllib from jinja2 import Environment, StrictUndefined from jinja2.exceptions import UndefinedError @@ -352,6 +353,7 @@ class SmartFilterField(models.TextField): # https://docs.python.org/2/library/stdtypes.html#truth-value-testing if not value: return None + value = urllib.unquote(value) try: SmartFilter().query_from_string(value) except RuntimeError, e: diff --git a/awx/main/tests/functional/api/test_inventory.py b/awx/main/tests/functional/api/test_inventory.py index c1b84401a5..c96bb8057c 100644 --- a/awx/main/tests/functional/api/test_inventory.py +++ b/awx/main/tests/functional/api/test_inventory.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- import pytest import mock @@ -236,6 +237,51 @@ def test_create_inventory_smart_inventory_sources(post, get, inventory, admin_us assert jdata['count'] == 0 +@pytest.mark.django_db +def test_urlencode_host_filter(post, admin_user, organization): + """ + Host filters saved on the model must correspond to the same result + as when that host_filter is used in the URL as a querystring. + That means that it must be url-encoded patterns like %22 for quotes + must be escaped as the string is saved to the model. + + Expected host filter in this test would match a host such as: + inventory.hosts.create( + ansible_facts={"ansible_distribution_version": "7.4"} + ) + """ + # Create smart inventory with host filter that corresponds to querystring + post( + reverse('api:inventory_list'), + data={ + 'name': 'smart inventory', 'kind': 'smart', + 'organization': organization.pk, + 'host_filter': 'ansible_facts__ansible_distribution_version=%227.4%22' + }, + user=admin_user, + expect=201 + ) + # Assert that the saved version of host filter has escaped "" + si = Inventory.objects.get(name='smart inventory') + assert si.host_filter == 'ansible_facts__ansible_distribution_version="7.4"' + + +@pytest.mark.django_db +def test_host_filter_unicode(post, admin_user, organization): + post( + reverse('api:inventory_list'), + data={ + 'name': 'smart inventory', 'kind': 'smart', + 'organization': organization.pk, + 'host_filter': u'ansible_facts__ansible_distribution=レッドハット' + }, + user=admin_user, + expect=201 + ) + si = Inventory.objects.get(name='smart inventory') + assert si.host_filter == u'ansible_facts__ansible_distribution=レッドハット' + + @pytest.mark.parametrize("role_field,expected_status_code", [ (None, 403), ('admin_role', 201), From 665a4d83e38d9f9eb04545eca1f080d113e1c906 Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Tue, 24 Oct 2017 11:00:13 -0400 Subject: [PATCH 061/141] Include vault credential check in job relaunch Relates #7747 of ansible-tower. Signed-off-by: Aaron Tan --- awx/api/serializers.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 1805f38352..f4be8560bb 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -2703,8 +2703,10 @@ class JobRelaunchSerializer(JobSerializer): def validate(self, attrs): obj = self.context.get('obj') - if not obj.credential: - raise serializers.ValidationError(dict(credential=[_("Credential not found or deleted.")])) + if not obj.credential and not obj.vault_credential: + raise serializers.ValidationError( + dict(credential=[_("Neither credential nor vault credential provided.")]) + ) if obj.project is None: raise serializers.ValidationError(dict(errors=[_("Job Template Project is missing or undefined.")])) if obj.inventory is None or obj.inventory.pending_deletion: From c95d7d465a61a5b75055722e651c6dd8915c1a1e Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Wed, 25 Oct 2017 11:07:42 -0400 Subject: [PATCH 062/141] work around an ansible bug that can cause project syncs to fail https://github.com/ansible/ansible-tower/issues/7746 https://github.com/ansible/ansible/issues/30064 --- awx/main/tasks.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 78d832a97d..98699de88c 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -1017,6 +1017,9 @@ class RunJob(BaseTask): plugin_path = ':'.join(plugin_dirs) env = super(RunJob, self).build_env(job, **kwargs) env = self.add_ansible_venv(env, add_awx_lib=kwargs.get('isolated', False)) + # give ansible a hint about the intended tmpdir to work around issues + # like https://github.com/ansible/ansible/issues/30064 + env['TMPDIR'] = settings.AWX_PROOT_BASE_PATH # Set environment variables needed for inventory and job event # callbacks to work. env['JOB_ID'] = str(job.pk) From b1ef7506eaa0c8426ad876d37cb73b056198316f Mon Sep 17 00:00:00 2001 From: mabashian Date: Wed, 25 Oct 2017 11:30:26 -0400 Subject: [PATCH 063/141] Make codemirror ready-only when auth form field is disabled --- .../configuration/auth-form/configuration-auth.controller.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/awx/ui/client/src/configuration/auth-form/configuration-auth.controller.js b/awx/ui/client/src/configuration/auth-form/configuration-auth.controller.js index 03a3fb0f38..5cd9e72a11 100644 --- a/awx/ui/client/src/configuration/auth-form/configuration-auth.controller.js +++ b/awx/ui/client/src/configuration/auth-form/configuration-auth.controller.js @@ -205,7 +205,8 @@ export default [ scope: $scope.$parent, variable: name, parse_variable: 'parseType', - field_id: form.formDef.name + '_' + name + field_id: form.formDef.name + '_' + name, + readOnly: $scope.$parent.configDataResolve[name] && $scope.$parent.configDataResolve[name].disabled ? true : false }); $scope.parseTypeChange('parseType', name); } From d3a7bec67461e1a6b311d13ff086a954b59cfba3 Mon Sep 17 00:00:00 2001 From: Mike McMahon Date: Thu, 7 Sep 2017 13:41:43 -0700 Subject: [PATCH 064/141] Backport (from awx) various memory optimizations for job cleanup see: https://github.com/ansible/ansible-tower/issues/7751 0388568 Reduces the job to only looking at objects older than the cutoff date 0234311 missing colon and missing variable usage 399e0e5 switching to iterator and adding the missed Job cleanup 0cd34c1 jobs take count of gte cutoff, process only lt cutoff --- awx/main/management/commands/cleanup_jobs.py | 64 +++++++++----------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/awx/main/management/commands/cleanup_jobs.py b/awx/main/management/commands/cleanup_jobs.py index cb03e4e9d6..fb2634da4d 100644 --- a/awx/main/management/commands/cleanup_jobs.py +++ b/awx/main/management/commands/cleanup_jobs.py @@ -65,7 +65,8 @@ class Command(NoArgsCommand): #jobs_qs = Job.objects.exclude(status__in=('pending', 'running')) #jobs_qs = jobs_qs.filter(created__lte=self.cutoff) skipped, deleted = 0, 0 - for job in Job.objects.all(): + jobs = Job.objects.filter(created__lt=self.cutoff) + for job in jobs.iterator(): job_display = '"%s" (%d host summaries, %d events)' % \ (unicode(job), job.job_host_summaries.count(), job.job_events.count()) @@ -73,21 +74,20 @@ class Command(NoArgsCommand): action_text = 'would skip' if self.dry_run else 'skipping' self.logger.debug('%s %s job %s', action_text, job.status, job_display) skipped += 1 - elif job.created >= self.cutoff: - action_text = 'would skip' if self.dry_run else 'skipping' - self.logger.debug('%s %s', action_text, job_display) - skipped += 1 else: action_text = 'would delete' if self.dry_run else 'deleting' self.logger.info('%s %s', action_text, job_display) if not self.dry_run: job.delete() deleted += 1 + + skipped += Job.objects.filter(created__gte=self.cutoff).count() return skipped, deleted def cleanup_ad_hoc_commands(self): skipped, deleted = 0, 0 - for ad_hoc_command in AdHocCommand.objects.all(): + ad_hoc_commands = AdHocCommand.objects.filter(created__lt=self.cutoff) + for ad_hoc_command in ad_hoc_commands.iterator(): ad_hoc_command_display = '"%s" (%d events)' % \ (unicode(ad_hoc_command), ad_hoc_command.ad_hoc_command_events.count()) @@ -95,21 +95,20 @@ class Command(NoArgsCommand): action_text = 'would skip' if self.dry_run else 'skipping' self.logger.debug('%s %s ad hoc command %s', action_text, ad_hoc_command.status, ad_hoc_command_display) skipped += 1 - elif ad_hoc_command.created >= self.cutoff: - action_text = 'would skip' if self.dry_run else 'skipping' - self.logger.debug('%s %s', action_text, ad_hoc_command_display) - skipped += 1 else: action_text = 'would delete' if self.dry_run else 'deleting' self.logger.info('%s %s', action_text, ad_hoc_command_display) if not self.dry_run: ad_hoc_command.delete() deleted += 1 + + skipped += AdHocCommand.objects.filter(created__gte=self.cutoff).count() return skipped, deleted def cleanup_project_updates(self): skipped, deleted = 0, 0 - for pu in ProjectUpdate.objects.all(): + project_updates = ProjectUpdate.objects.filter(created__lt=self.cutoff) + for pu in project_updates.iterator(): pu_display = '"%s" (type %s)' % (unicode(pu), unicode(pu.launch_type)) if pu.status in ('pending', 'waiting', 'running'): action_text = 'would skip' if self.dry_run else 'skipping' @@ -119,21 +118,20 @@ class Command(NoArgsCommand): action_text = 'would skip' if self.dry_run else 'skipping' self.logger.debug('%s %s', action_text, pu_display) skipped += 1 - elif pu.created >= self.cutoff: - action_text = 'would skip' if self.dry_run else 'skipping' - self.logger.debug('%s %s', action_text, pu_display) - skipped += 1 else: action_text = 'would delete' if self.dry_run else 'deleting' self.logger.info('%s %s', action_text, pu_display) if not self.dry_run: pu.delete() deleted += 1 + + skipped += ProjectUpdate.objects.filter(created__gte=self.cutoff).count() return skipped, deleted def cleanup_inventory_updates(self): skipped, deleted = 0, 0 - for iu in InventoryUpdate.objects.all(): + inventory_updates = InventoryUpdate.objects.filter(created__lt=self.cutoff) + for iu in inventory_updates.iterator(): iu_display = '"%s" (source %s)' % (unicode(iu), unicode(iu.source)) if iu.status in ('pending', 'waiting', 'running'): action_text = 'would skip' if self.dry_run else 'skipping' @@ -143,36 +141,33 @@ class Command(NoArgsCommand): action_text = 'would skip' if self.dry_run else 'skipping' self.logger.debug('%s %s', action_text, iu_display) skipped += 1 - elif iu.created >= self.cutoff: - action_text = 'would skip' if self.dry_run else 'skipping' - self.logger.debug('%s %s', action_text, iu_display) - skipped += 1 else: action_text = 'would delete' if self.dry_run else 'deleting' self.logger.info('%s %s', action_text, iu_display) if not self.dry_run: iu.delete() deleted += 1 + + skipped += InventoryUpdate.objects.filter(created__gte=self.cutoff).count() return skipped, deleted def cleanup_management_jobs(self): skipped, deleted = 0, 0 - for sj in SystemJob.objects.all(): + system_jobs = SystemJob.objects.filter(created__lt=self.cutoff) + for sj in system_jobs.iterator(): sj_display = '"%s" (type %s)' % (unicode(sj), unicode(sj.job_type)) if sj.status in ('pending', 'waiting', 'running'): action_text = 'would skip' if self.dry_run else 'skipping' self.logger.debug('%s %s system_job %s', action_text, sj.status, sj_display) skipped += 1 - elif sj.created >= self.cutoff: - action_text = 'would skip' if self.dry_run else 'skipping' - self.logger.debug('%s %s', action_text, sj_display) - skipped += 1 else: action_text = 'would delete' if self.dry_run else 'deleting' self.logger.info('%s %s', action_text, sj_display) if not self.dry_run: sj.delete() deleted += 1 + + skipped += SystemJob.objects.filter(created__gte=self.cutoff).count() return skipped, deleted def init_logging(self): @@ -187,7 +182,8 @@ class Command(NoArgsCommand): def cleanup_workflow_jobs(self): skipped, deleted = 0, 0 - for workflow_job in WorkflowJob.objects.all(): + workflow_jobs = WorkflowJob.objects.filter(created__lt=self.cutoff) + for workflow_job in workflow_jobs.iterator(): workflow_job_display = '"{}" ({} nodes)'.format( unicode(workflow_job), workflow_job.workflow_nodes.count()) @@ -195,21 +191,20 @@ class Command(NoArgsCommand): action_text = 'would skip' if self.dry_run else 'skipping' self.logger.debug('%s %s job %s', action_text, workflow_job.status, workflow_job_display) skipped += 1 - elif workflow_job.created >= self.cutoff: - action_text = 'would skip' if self.dry_run else 'skipping' - self.logger.debug('%s %s', action_text, workflow_job_display) - skipped += 1 else: action_text = 'would delete' if self.dry_run else 'deleting' self.logger.info('%s %s', action_text, workflow_job_display) if not self.dry_run: workflow_job.delete() deleted += 1 + + skipped += WorkflowJob.objects.filter(created__gte=self.cutoff).count() return skipped, deleted def cleanup_notifications(self): skipped, deleted = 0, 0 - for notification in Notification.objects.all(): + notifications = Notification.objects.filter(created__lt=self.cutoff) + for notification in notifications.iterator(): notification_display = '"{}" (started {}, {} type, {} sent)'.format( unicode(notification), unicode(notification.created), notification.notification_type, notification.notifications_sent) @@ -217,16 +212,14 @@ class Command(NoArgsCommand): action_text = 'would skip' if self.dry_run else 'skipping' self.logger.debug('%s %s notification %s', action_text, notification.status, notification_display) skipped += 1 - elif notification.created >= self.cutoff: - action_text = 'would skip' if self.dry_run else 'skipping' - self.logger.debug('%s %s', action_text, notification_display) - skipped += 1 else: action_text = 'would delete' if self.dry_run else 'deleting' self.logger.info('%s %s', action_text, notification_display) if not self.dry_run: notification.delete() deleted += 1 + + skipped += Notification.objects.filter(created__gte=self.cutoff).count() return skipped, deleted @transaction.atomic @@ -255,3 +248,4 @@ class Command(NoArgsCommand): self.logger.log(99, '%s: %d would be deleted, %d would be skipped.', m.replace('_', ' '), deleted, skipped) else: self.logger.log(99, '%s: %d deleted, %d skipped.', m.replace('_', ' '), deleted, skipped) + From 947bdeed3e6e290ce0f3caccf1c4555f2ee66022 Mon Sep 17 00:00:00 2001 From: mabashian Date: Wed, 25 Oct 2017 16:59:44 -0400 Subject: [PATCH 065/141] Fixed related host list linking --- .../inventories/related/hosts/list/host-list.controller.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js index 11507bb8c8..e580b58b29 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js @@ -92,7 +92,12 @@ export default ['$scope', 'ListDefinition', '$rootScope', 'GetBasePath', $state.go('inventories.edit.hosts.add'); }; $scope.editHost = function(host){ - $state.go('.edit', {inventory_id: host.inventory_id, host_id: host.id}); + if($state.includes('inventories.edit.hosts')) { + $state.go('inventories.edit.hosts.edit', {host_id: host.id}); + } + else if($state.includes('inventories.editSmartInventory.hosts')) { + $state.go('inventories.editSmartInventory.hosts.edit', {host_id: host.id}); + } }; $scope.goToInsights = function(host){ $state.go('inventories.edit.hosts.edit.insights', {inventory_id: host.inventory_id, host_id:host.id}); From 0512f65c8f41420b223bc261e25f6dac694ecc83 Mon Sep 17 00:00:00 2001 From: mabashian Date: Thu, 26 Oct 2017 09:55:36 -0400 Subject: [PATCH 066/141] Only pass host filter param to smart inv shortcut form --- .../hosts/list/host-list.controller.js | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/awx/ui/client/src/inventories-hosts/hosts/list/host-list.controller.js b/awx/ui/client/src/inventories-hosts/hosts/list/host-list.controller.js index 693d403ea5..9af5d3ca97 100644 --- a/awx/ui/client/src/inventories-hosts/hosts/list/host-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/hosts/list/host-list.controller.js @@ -86,20 +86,7 @@ function HostsList($scope, HostsList, $rootScope, GetBasePath, }; $scope.smartInventory = function() { - // Gather up search terms and pass them to the add smart inventory form - let stateParamsCopy = angular.copy($state.params.host_search); - let defaults = _.find($state.$current.path, (step) => { - if(step && step.params && step.params.hasOwnProperty(`host_search`)){ - return step.params.hasOwnProperty(`host_search`); - } - }).params[`host_search`].config.value; - - // Strip defaults out of the state params copy - angular.forEach(Object.keys(defaults), function(value) { - delete stateParamsCopy[value]; - }); - - $state.go('inventories.addSmartInventory', {hostfilter: JSON.stringify(stateParamsCopy)}); + $state.go('inventories.addSmartInventory', {hostfilter: JSON.stringify({"host_filter":`${$state.params.host_search.host_filter}`})}); }; $scope.editInventory = function(host) { From f28b48a4730047a275623807204a18a2d3ad71a4 Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Mon, 23 Oct 2017 15:23:06 -0400 Subject: [PATCH 067/141] support `AZURE_CLOUD_ENVIRONMENT` Relates #7737 of ansible-tower. Signed-off-by: Aaron Tan --- .../migrations/0012_v322_update_cred_types.py | 18 ++++++++++++++++++ awx/main/migrations/_credentialtypes.py | 10 ++++++++++ awx/main/models/credential.py | 6 ++++++ awx/main/tasks.py | 3 +++ 4 files changed, 37 insertions(+) create mode 100644 awx/main/migrations/0012_v322_update_cred_types.py diff --git a/awx/main/migrations/0012_v322_update_cred_types.py b/awx/main/migrations/0012_v322_update_cred_types.py new file mode 100644 index 0000000000..86d9fd55fa --- /dev/null +++ b/awx/main/migrations/0012_v322_update_cred_types.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +# AWX +from awx.main.migrations import _credentialtypes as credentialtypes + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0011_v322_encrypt_survey_passwords'), + ] + + operations = [ + migrations.RunPython(credentialtypes.add_azure_cloud_environment_field), + ] diff --git a/awx/main/migrations/_credentialtypes.py b/awx/main/migrations/_credentialtypes.py index 104caa334a..c9732b6239 100644 --- a/awx/main/migrations/_credentialtypes.py +++ b/awx/main/migrations/_credentialtypes.py @@ -176,3 +176,13 @@ def migrate_job_credentials(apps, schema_editor): def create_ovirt4_credtype(apps, schema_editor): CredentialType.setup_tower_managed_defaults() + + +def add_azure_cloud_environment_field(apps, schema_editor): + azure_rm_credtype = CredentialType.defaults.get('azure_rm', None) + if azure_rm_credtype: + azure_rm_credtype = azure_rm_credtype() + azure_rm_credtype.pk = CredentialType.objects.get( + kind='cloud', name='Microsoft Azure Resource Manager' + ).pk + azure_rm_credtype.save() diff --git a/awx/main/models/credential.py b/awx/main/models/credential.py index 77ce9ca3b0..e543bbb8b8 100644 --- a/awx/main/models/credential.py +++ b/awx/main/models/credential.py @@ -977,6 +977,12 @@ def azure_rm(cls): 'id': 'tenant', 'label': 'Tenant ID', 'type': 'string' + }, { + 'id': 'cloud_environment', + 'label': 'Azure Cloud Environment', + 'type': 'string', + 'help_text': ('Environment variable AZURE_CLOUD_ENVIRONMENT when' + ' using Azure GovCloud or Azure stack.') }], 'required': ['subscription'], } diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 78d832a97d..a1836cc197 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -1887,6 +1887,9 @@ class RunInventoryUpdate(BaseTask): env['AZURE_AD_USER'] = passwords.get('source_username', '') env['AZURE_PASSWORD'] = passwords.get('source_password', '') env['AZURE_INI_PATH'] = cloud_credential + if inventory_update.credential and \ + inventory_update.credential.inputs.get('cloud_environment', None): + env['AZURE_CLOUD_ENVIRONMENT'] = inventory_update.credential.inputs['cloud_environment'] elif inventory_update.source == 'gce': env['GCE_EMAIL'] = passwords.get('source_username', '') env['GCE_PROJECT'] = passwords.get('source_project', '') From 7181bd1c9bd1158e168ae3a5a796b737cdc4c2b0 Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Thu, 26 Oct 2017 11:15:07 -0400 Subject: [PATCH 068/141] Follow up fix #7737 The original fix introduced migration failure, this PR managed to fix that. Signed-off-by: Aaron Tan --- awx/main/migrations/_credentialtypes.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/awx/main/migrations/_credentialtypes.py b/awx/main/migrations/_credentialtypes.py index c9732b6239..e0ccb873ea 100644 --- a/awx/main/migrations/_credentialtypes.py +++ b/awx/main/migrations/_credentialtypes.py @@ -179,10 +179,7 @@ def create_ovirt4_credtype(apps, schema_editor): def add_azure_cloud_environment_field(apps, schema_editor): - azure_rm_credtype = CredentialType.defaults.get('azure_rm', None) - if azure_rm_credtype: - azure_rm_credtype = azure_rm_credtype() - azure_rm_credtype.pk = CredentialType.objects.get( - kind='cloud', name='Microsoft Azure Resource Manager' - ).pk - azure_rm_credtype.save() + azure_rm_credtype = CredentialType.objects.get(kind='cloud', + name='Microsoft Azure Resource Manager') + azure_rm_credtype.inputs = CredentialType.defaults.get('azure_rm')().inputs + azure_rm_credtype.save() From 48ec69c4f55274d3e5ca42d2ae6d73eaad0afc31 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Thu, 26 Oct 2017 12:06:10 -0400 Subject: [PATCH 069/141] retry cleanup of build artifacts for bwrap race condition --- awx/playbooks/clean_isolated.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/awx/playbooks/clean_isolated.yml b/awx/playbooks/clean_isolated.yml index e40e780396..f904abe5a8 100644 --- a/awx/playbooks/clean_isolated.yml +++ b/awx/playbooks/clean_isolated.yml @@ -16,4 +16,14 @@ - name: remove build artifacts file: path="{{item}}" state=absent + register: result with_items: "{{cleanup_dirs}}" + until: result|succeeded + ignore_errors: yes + retries: 3 + delay: 5 + + - name: fail if build artifacts were not cleaned + fail: + msg: 'Unable to cleanup build artifacts' + when: not result|succeeded From 6c597ad165a0cd841abe8e2f2a2866acc2758ce6 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Wed, 25 Oct 2017 16:19:39 -0400 Subject: [PATCH 070/141] Adding initial credential and invsrc for Tower * New credential type for Tower * Inventory source definitions and migrations for Tower * Initial Tower inventory source script --- awx/main/constants.py | 2 +- ...> 0010_v322_add_ovirt4_tower_inventory.py} | 6 +- .../0011_v322_encrypt_survey_passwords.py | 2 +- awx/main/migrations/_credentialtypes.py | 2 +- awx/main/models/base.py | 2 +- awx/main/models/credential.py | 35 ++++++ awx/main/models/inventory.py | 6 + awx/plugins/inventory/tower.py | 112 ++++++++++++++++++ 8 files changed, 160 insertions(+), 7 deletions(-) rename awx/main/migrations/{0010_v322_add_support_for_ovirt4_inventory.py => 0010_v322_add_ovirt4_tower_inventory.py} (87%) create mode 100755 awx/plugins/inventory/tower.py diff --git a/awx/main/constants.py b/awx/main/constants.py index 9c0b01a3d4..aabcc0b2e3 100644 --- a/awx/main/constants.py +++ b/awx/main/constants.py @@ -5,7 +5,7 @@ import re from django.utils.translation import ugettext_lazy as _ -CLOUD_PROVIDERS = ('azure_rm', 'ec2', 'gce', 'vmware', 'openstack', 'ovirt4', 'satellite6', 'cloudforms') +CLOUD_PROVIDERS = ('azure_rm', 'ec2', 'gce', 'vmware', 'openstack', 'ovirt4', 'satellite6', 'cloudforms', 'tower') SCHEDULEABLE_PROVIDERS = CLOUD_PROVIDERS + ('custom', 'scm',) PRIVILEGE_ESCALATION_METHODS = [ ('sudo', _('Sudo')), ('su', _('Su')), ('pbrun', _('Pbrun')), ('pfexec', _('Pfexec')), ('dzdo', _('DZDO')), ('pmrun', _('Pmrun')), ('runas', _('Runas'))] ANSI_SGR_PATTERN = re.compile(r'\x1b\[[0-9;]*m') diff --git a/awx/main/migrations/0010_v322_add_support_for_ovirt4_inventory.py b/awx/main/migrations/0010_v322_add_ovirt4_tower_inventory.py similarity index 87% rename from awx/main/migrations/0010_v322_add_support_for_ovirt4_inventory.py rename to awx/main/migrations/0010_v322_add_ovirt4_tower_inventory.py index e6db61e4b8..aa00d66163 100644 --- a/awx/main/migrations/0010_v322_add_support_for_ovirt4_inventory.py +++ b/awx/main/migrations/0010_v322_add_ovirt4_tower_inventory.py @@ -14,15 +14,15 @@ class Migration(migrations.Migration): ] operations = [ - migrations.RunPython(credentialtypes.create_ovirt4_credtype), + migrations.RunPython(credentialtypes.create_ovirt4_tower_credtype), migrations.AlterField( model_name='inventorysource', name='source', - field=models.CharField(default=b'', max_length=32, blank=True, choices=[(b'', 'Manual'), (b'file', 'File, Directory or Script'), (b'scm', 'Sourced from a Project'), (b'ec2', 'Amazon EC2'), (b'gce', 'Google Compute Engine'), (b'azure_rm', 'Microsoft Azure Resource Manager'), (b'vmware', 'VMware vCenter'), (b'satellite6', 'Red Hat Satellite 6'), (b'cloudforms', 'Red Hat CloudForms'), (b'openstack', 'OpenStack'), (b'ovirt4', 'oVirt4'), (b'custom', 'Custom Script')]), + field=models.CharField(default=b'', max_length=32, blank=True, choices=[(b'', 'Manual'), (b'file', 'File, Directory or Script'), (b'scm', 'Sourced from a Project'), (b'ec2', 'Amazon EC2'), (b'gce', 'Google Compute Engine'), (b'azure_rm', 'Microsoft Azure Resource Manager'), (b'vmware', 'VMware vCenter'), (b'satellite6', 'Red Hat Satellite 6'), (b'cloudforms', 'Red Hat CloudForms'), (b'openstack', 'OpenStack'), (b'ovirt4', 'oVirt4'), (b'tower', 'Ansible Tower'), (b'custom', 'Custom Script')]), ), migrations.AlterField( model_name='inventoryupdate', name='source', - field=models.CharField(default=b'', max_length=32, blank=True, choices=[(b'', 'Manual'), (b'file', 'File, Directory or Script'), (b'scm', 'Sourced from a Project'), (b'ec2', 'Amazon EC2'), (b'gce', 'Google Compute Engine'), (b'azure_rm', 'Microsoft Azure Resource Manager'), (b'vmware', 'VMware vCenter'), (b'satellite6', 'Red Hat Satellite 6'), (b'cloudforms', 'Red Hat CloudForms'), (b'openstack', 'OpenStack'), (b'ovirt4', 'oVirt4'), (b'custom', 'Custom Script')]), + field=models.CharField(default=b'', max_length=32, blank=True, choices=[(b'', 'Manual'), (b'file', 'File, Directory or Script'), (b'scm', 'Sourced from a Project'), (b'ec2', 'Amazon EC2'), (b'gce', 'Google Compute Engine'), (b'azure_rm', 'Microsoft Azure Resource Manager'), (b'vmware', 'VMware vCenter'), (b'satellite6', 'Red Hat Satellite 6'), (b'cloudforms', 'Red Hat CloudForms'), (b'openstack', 'OpenStack'), (b'ovirt4', 'oVirt4'), (b'tower', 'Ansible Tower'), (b'custom', 'Custom Script')]), ), ] diff --git a/awx/main/migrations/0011_v322_encrypt_survey_passwords.py b/awx/main/migrations/0011_v322_encrypt_survey_passwords.py index 344aa96bc1..7140949c7e 100644 --- a/awx/main/migrations/0011_v322_encrypt_survey_passwords.py +++ b/awx/main/migrations/0011_v322_encrypt_survey_passwords.py @@ -9,7 +9,7 @@ from awx.main.migrations import _reencrypt as reencrypt class Migration(ActivityStreamDisabledMigration): dependencies = [ - ('main', '0010_v322_add_support_for_ovirt4_inventory'), + ('main', '0010_v322_add_ovirt4_tower_inventory'), ] operations = [ diff --git a/awx/main/migrations/_credentialtypes.py b/awx/main/migrations/_credentialtypes.py index 104caa334a..3046debd80 100644 --- a/awx/main/migrations/_credentialtypes.py +++ b/awx/main/migrations/_credentialtypes.py @@ -174,5 +174,5 @@ def migrate_job_credentials(apps, schema_editor): utils.get_current_apps = orig_current_apps -def create_ovirt4_credtype(apps, schema_editor): +def create_ovirt4_tower_credtype(apps, schema_editor): CredentialType.setup_tower_managed_defaults() diff --git a/awx/main/models/base.py b/awx/main/models/base.py index 93bb484a46..9c7f58d096 100644 --- a/awx/main/models/base.py +++ b/awx/main/models/base.py @@ -52,7 +52,7 @@ PROJECT_UPDATE_JOB_TYPE_CHOICES = [ (PERM_INVENTORY_CHECK, _('Check')), ] -CLOUD_INVENTORY_SOURCES = ['ec2', 'vmware', 'gce', 'azure_rm', 'openstack', 'ovirt4', 'custom', 'satellite6', 'cloudforms', 'scm',] +CLOUD_INVENTORY_SOURCES = ['ec2', 'vmware', 'gce', 'azure_rm', 'openstack', 'ovirt4', 'custom', 'satellite6', 'cloudforms', 'scm', 'tower',] VERBOSITY_CHOICES = [ (0, '0 (Normal)'), diff --git a/awx/main/models/credential.py b/awx/main/models/credential.py index 77ce9ca3b0..e4ee83fdb7 100644 --- a/awx/main/models/credential.py +++ b/awx/main/models/credential.py @@ -64,6 +64,7 @@ class V1Credential(object): ('openstack', 'OpenStack'), ('ovirt4', 'oVirt4'), ('insights', 'Insights'), + ('tower', 'Ansible Tower'), ] FIELDS = { 'kind': models.CharField( @@ -1061,3 +1062,37 @@ def ovirt4(cls): } }, ) + + +@CredentialType.default +def tower(cls): + return cls( + kind='cloud', + name='Ansible Tower', + managed_by_tower=True, + inputs={ + 'fields': [{ + 'id': 'host', + 'label': 'Ansible Tower Hostname', + 'type': 'string', + 'help_text': ('The Ansible Tower base URL to authenticate with.') + }, { + 'id': 'username', + 'label': 'Username', + 'type': 'string' + }, { + 'id': 'password', + 'label': 'Password', + 'type': 'string', + 'secret': True, + }], + 'required': ['host', 'username', 'password'], + }, + injectors={ + 'env': { + 'TOWER_HOSTNAME': '{{host}}', + 'TOWER_USERNAME': '{{username}}', + 'TOWER_PASSWORD': '{{password}}' + } + }, + ) diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index f5cd0d8e58..e6d2164750 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -873,6 +873,7 @@ class InventorySourceOptions(BaseModel): ('cloudforms', _('Red Hat CloudForms')), ('openstack', _('OpenStack')), ('ovirt4', _('oVirt4')), + ('tower', _('Ansible Tower')), ('custom', _('Custom Script')), ] @@ -1126,6 +1127,11 @@ class InventorySourceOptions(BaseModel): """No region supprt""" return [('all', 'All')] + @classmethod + def get_tower_region_choices(self): + """No region supprt""" + return [('all', 'All')] + def clean_credential(self): if not self.source: return None diff --git a/awx/plugins/inventory/tower.py b/awx/plugins/inventory/tower.py new file mode 100755 index 0000000000..86121ca24e --- /dev/null +++ b/awx/plugins/inventory/tower.py @@ -0,0 +1,112 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# Copyright (c) 2016 Red Hat, Inc. +# +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . +# +""" +Ansible Tower/AWX dynamic inventory script +========================================== + +Generates dynamic inventory for Tower + +Author: Matthew Jones (@matburt) +""" + +import argparse +import re +import os +import sys +import json +import requests +from requests.auth import HTTPBasicAuth +from urlparse import urljoin + + +def parse_configuration(): + """ + Create command line parser for oVirt dynamic inventory script. + """ + parser = argparse.ArgumentParser( + description='Ansible dynamic inventory script for Ansible Tower.', + ) + parser.add_argument( + '--list', + action='store_true', + default=True, + help='Return all hosts known to Tower given a particular inventory', + ) + parser.parse_args() + host_name = os.environ.get("TOWER_HOSTNAME", None) + username = os.environ.get("TOWER_USERNAME", None) + password = os.environ.get("TOWER_PASSWORD", None) + ignore_ssl = os.environ.get("TOWER_IGNORE_SSL", "0").lower() in ("1", "yes", "true") + inventory = os.environ.get("TOWER_INVENTORY", None) + + errors = [] + if not host_name: + errors.append("Missing TOWER_HOSTNAME in environment") + if not username: + errors.append("Missing TOWER_USERNAME in environment") + if not password: + errors.append("Missing TOWER_PASSWORD in environment") + if not inventory: + errors.append("Missing TOWER_INVENTORY in environment") + if errors: + print("\n".join(errors)) + sys.exit(1) + + return dict(tower_host=host_name, + tower_user=username, + tower_pass=password, + tower_inventory=inventory, + ignore_ssl=ignore_ssl) + + +def read_tower_inventory(tower_host, tower_user, tower_pass, inventory, ignore_ssl=False): + if not re.match('(?:http|https)://', tower_host): + tower_host = "https://{}".format(tower_host) + inventory_url = urljoin(tower_host, "/api/v2/inventories/{}/script/?hostvars=1".format(inventory)) + try: + response = requests.get(inventory_url, + auth=HTTPBasicAuth(tower_user, tower_pass), + verify=not ignore_ssl) + if response.ok: + return response.json() + json_reason = response.json() + reason = json_reason.get('detail', 'Retrieving Tower Inventory Failed') + except requests.ConnectionError, e: + reason = "Connection to remote host failed: {}".format(e) + print(reason) + sys.exit(1) + + +def main(): + config = parse_configuration() + inventory_hosts = read_tower_inventory(config['tower_host'], + config['tower_user'], + config['tower_pass'], + config['tower_inventory'], + ignore_ssl=config['ignore_ssl']) + print( + json.dumps( + inventory_hosts + ) + ) + +if __name__ == '__main__': + main() From fdc7f58bb42051ab3be0c781c01d9f7b4bf1ee85 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Wed, 25 Oct 2017 16:56:26 -0400 Subject: [PATCH 071/141] Support passing instance filters to tower inventory src * Switch ignore ssl errors to default on * Application inventory source defaults for Tower src --- awx/main/models/credential.py | 2 +- awx/main/models/inventory.py | 2 +- awx/main/tasks.py | 2 ++ awx/plugins/inventory/tower.py | 2 +- awx/settings/defaults.py | 10 ++++++++++ 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/awx/main/models/credential.py b/awx/main/models/credential.py index e4ee83fdb7..c24a0b7cec 100644 --- a/awx/main/models/credential.py +++ b/awx/main/models/credential.py @@ -1092,7 +1092,7 @@ def tower(cls): 'env': { 'TOWER_HOSTNAME': '{{host}}', 'TOWER_USERNAME': '{{username}}', - 'TOWER_PASSWORD': '{{password}}' + 'TOWER_PASSWORD': '{{password}}', } }, ) diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index e6d2164750..5f43975919 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -1203,7 +1203,7 @@ class InventorySourceOptions(BaseModel): raise ValidationError(_('Invalid filter expression: %(filter)s') % {'filter': ', '.join(invalid_filters)}) return instance_filters - elif self.source == 'vmware': + elif self.source in ('vmware', 'tower'): return instance_filters else: return '' diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 78d832a97d..c3adb98a07 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -1912,6 +1912,8 @@ class RunInventoryUpdate(BaseTask): for env_k in inventory_update.source_vars_dict: if str(env_k) not in env and str(env_k) not in settings.INV_ENV_VARIABLE_BLACKLIST: env[str(env_k)] = unicode(inventory_update.source_vars_dict[env_k]) + elif inventory_update.source == 'tower': + env['TOWER_INVENTORY'] = inventory_update.instance_filters elif inventory_update.source == 'file': raise NotImplementedError('Cannot update file sources through the task system.') # add private_data_files diff --git a/awx/plugins/inventory/tower.py b/awx/plugins/inventory/tower.py index 86121ca24e..077aa556f9 100755 --- a/awx/plugins/inventory/tower.py +++ b/awx/plugins/inventory/tower.py @@ -54,7 +54,7 @@ def parse_configuration(): host_name = os.environ.get("TOWER_HOSTNAME", None) username = os.environ.get("TOWER_USERNAME", None) password = os.environ.get("TOWER_PASSWORD", None) - ignore_ssl = os.environ.get("TOWER_IGNORE_SSL", "0").lower() in ("1", "yes", "true") + ignore_ssl = os.environ.get("TOWER_IGNORE_SSL", "1").lower() in ("1", "yes", "true") inventory = os.environ.get("TOWER_INVENTORY", None) errors = [] diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index b64656fdbc..1255e9d21d 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -832,6 +832,16 @@ OVIRT4_HOST_FILTER = r'^.+$' OVIRT4_EXCLUDE_EMPTY_GROUPS = True OVIRT4_INSTANCE_ID_VAR = 'id' +# --------------------- +# ----- Tower ----- +# --------------------- +TOWER_ENABLED_VAR = 'status' +TOWER_ENABLED_VALUE = 'enabled' +TOWER_GROUP_FILTER = r'^.+$' +TOWER_HOST_FILTER = r'^.+$' +TOWER_EXCLUDE_EMPTY_GROUPS = True +TOWER_INSTANCE_ID_VAR = 'id' + # --------------------- # ----- Foreman ----- # --------------------- From d6d84e8f5e147dd3b1546290524da323e5d0c101 Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Thu, 26 Oct 2017 20:15:53 -0400 Subject: [PATCH 072/141] use abbreviated month name for dashboard chart --- .../job-status/job-status-graph.directive.js | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/awx/ui/client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js b/awx/ui/client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js index 23a4489b4b..b97ea561ae 100644 --- a/awx/ui/client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js +++ b/awx/ui/client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js @@ -9,11 +9,12 @@ 'adjustGraphSize', 'templateUrl', 'i18n', + 'moment', 'jobStatusGraphData', JobStatusGraph ]; -function JobStatusGraph($window, adjustGraphSize, templateUrl, i18n, graphDataService) { +function JobStatusGraph($window, adjustGraphSize, templateUrl, i18n, moment, graphDataService) { return { restrict: 'E', scope: { @@ -72,11 +73,11 @@ function JobStatusGraph($window, adjustGraphSize, templateUrl, i18n, graphDataSe } }); - if(period==="day") { - timeFormat="%H:%M"; + if(period === "day") { + timeFormat="H:M"; } else { - timeFormat = '%m/%d'; + timeFormat = "MMM D"; } graphData.map(function(series) { series.values = series.values.map(function(d) { @@ -93,7 +94,8 @@ function JobStatusGraph($window, adjustGraphSize, templateUrl, i18n, graphDataSe .useInteractiveGuideline(true) //We want nice looking tooltips and a guideline! .showLegend(false) //Show the legend, allowing users to turn on/off line series. .showYAxis(true) //Show the y-axis - .showXAxis(true); //Show the x-axis + .showXAxis(true) //Show the x-axis + .margin({ right: 32 }); job_status_chart.interactiveLayer.tooltip.fixedTop(-10); //distance from the top of the chart to tooltip job_status_chart.interactiveLayer.tooltip.distance(-1); //distance from interactive line to tooltip @@ -101,8 +103,15 @@ function JobStatusGraph($window, adjustGraphSize, templateUrl, i18n, graphDataSe job_status_chart.xAxis .axisLabel(i18n._("TIME"))//.showMaxMin(true) .tickFormat(function(d) { - var dx = graphData[0].values[d] && graphData[0].values[d].x || 0; - return dx ? d3.time.format(timeFormat)(new Date(Number(dx+'000'))) : ''; + const dx = graphData[0].values[d] && graphData[0].values[d].x || 0; + + if (!dx) { + return ''; + } + + const tickDate = new Date(Number(dx + '000')); + + return moment(tickDate).format(timeFormat); }); job_status_chart.yAxis //Chart y-axis settings From 71e132ce0f658f8f214219acd0e2f4143fc0fdd8 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Wed, 25 Oct 2017 16:57:18 -0400 Subject: [PATCH 073/141] Show instance filter ui element with tower inventory source --- .../related/sources/add/sources-add.controller.js | 5 ++++- .../related/sources/edit/sources-edit.controller.js | 5 ++++- .../inventories/related/sources/sources.form.js | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js index 248ecbff60..a08a9e4eb4 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js @@ -198,7 +198,10 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition', $scope.group_by = $scope.group_by_choices; $scope.groupByPopOver = i18n._("Specify which groups to create automatically. Group names will be created similar to the options selected. If blank, all groups above are created. Refer to Ansible Tower documentation for more detail."); $scope.instanceFilterPopOver = i18n._("Provide a comma-separated list of filter expressions. Hosts are imported when all of the filters match. Refer to Ansible Tower documentation for more detail."); - } + } + if( _.get($scope, 'source') === 'tower' || _.get($scope.source, 'value') === 'tower') { + $scope.instanceFilterPopOver = i18n._("Provide the name or id of the remote Tower inventory to be imported."); + } CreateSelect2({ element: '#inventory_source_group_by', multiple: true, diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js index 4728e2747a..4b7b9c47aa 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js @@ -275,7 +275,7 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString', i18n._("for a complete list of supported filters.") + "

"; } - if( _.get($scope, 'source') === 'vmware' || _.get($scope.source, 'value') === 'vmware') { + if( _.get($scope, 'source') === 'vmware' || _.get($scope.source, 'value') === 'vmware') { add_new = true; $scope.group_by_choices = (inventorySourceData.group_by) ? inventorySourceData.group_by.split(',') .map((i) => ({name: i, label: i, value: i})) : []; @@ -283,6 +283,9 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString', $scope.groupByPopOver = i18n._(`Specify which groups to create automatically. Group names will be created similar to the options selected. If blank, all groups above are created. Refer to Ansible Tower documentation for more detail.`); $scope.instanceFilterPopOver = i18n._(`Provide a comma-separated list of filter expressions. Hosts are imported when all of the filters match. Refer to Ansible Tower documentation for more detail.`); } + if( _.get($scope, 'source') === 'tower' || _.get($scope.source, 'value') === 'tower') { + $scope.instanceFilterPopOver = i18n._(`Provide the name or id of the remote Tower inventory to be imported.`); + } CreateSelect2({ element: '#inventory_source_group_by', multiple: true, diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js index 38a786d482..d7d6e31c2b 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js @@ -144,7 +144,7 @@ return { instance_filters: { label: i18n._("Instance Filters"), type: 'text', - ngShow: "source && (source.value == 'ec2' || source.value == 'vmware')", + ngShow: "source && (source.value == 'ec2' || source.value == 'vmware' || source.value == 'tower')", dataTitle: i18n._('Instance Filters'), dataPlacement: 'right', awPopOverWatch: 'instanceFilterPopOver', From d282966aa19e08307936477ec33fafa7c078c1c3 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Thu, 26 Oct 2017 11:11:48 -0400 Subject: [PATCH 074/141] Use towervars to enable turning on remote tracking vars on Tower src * This allows the local Tower to track enabled state and unique instance id for each host imported from the remote Tower --- awx/api/views.py | 5 +++++ awx/plugins/inventory/tower.py | 2 +- awx/settings/defaults.py | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index 058ab57082..a7bc27a927 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -2377,6 +2377,7 @@ class InventoryScriptView(RetrieveAPIView): obj = self.get_object() hostname = request.query_params.get('host', '') hostvars = bool(request.query_params.get('hostvars', '')) + towervars = bool(request.query_params.get('towervars', '')) show_all = bool(request.query_params.get('all', '')) if show_all: hosts_q = dict() @@ -2441,6 +2442,10 @@ class InventoryScriptView(RetrieveAPIView): data['_meta'].setdefault('hostvars', dict()) for host in obj.hosts.filter(**hosts_q): data['_meta']['hostvars'][host.name] = host.variables_dict + if towervars: + tower_dict = dict(remote_tower_enabled=host.enabled, + remote_tower_id=host.id) + data['_meta']['hostvars'][host.name].update(tower_dict) return Response(data) diff --git a/awx/plugins/inventory/tower.py b/awx/plugins/inventory/tower.py index 077aa556f9..0fae0865b2 100755 --- a/awx/plugins/inventory/tower.py +++ b/awx/plugins/inventory/tower.py @@ -80,7 +80,7 @@ def parse_configuration(): def read_tower_inventory(tower_host, tower_user, tower_pass, inventory, ignore_ssl=False): if not re.match('(?:http|https)://', tower_host): tower_host = "https://{}".format(tower_host) - inventory_url = urljoin(tower_host, "/api/v2/inventories/{}/script/?hostvars=1".format(inventory)) + inventory_url = urljoin(tower_host, "/api/v2/inventories/{}/script/?hostvars=1&towervars=1".format(inventory)) try: response = requests.get(inventory_url, auth=HTTPBasicAuth(tower_user, tower_pass), diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 1255e9d21d..d6c1b1140e 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -835,12 +835,12 @@ OVIRT4_INSTANCE_ID_VAR = 'id' # --------------------- # ----- Tower ----- # --------------------- -TOWER_ENABLED_VAR = 'status' -TOWER_ENABLED_VALUE = 'enabled' +TOWER_ENABLED_VAR = 'remote_tower_enabled' +TOWER_ENABLED_VALUE = 'true' TOWER_GROUP_FILTER = r'^.+$' TOWER_HOST_FILTER = r'^.+$' TOWER_EXCLUDE_EMPTY_GROUPS = True -TOWER_INSTANCE_ID_VAR = 'id' +TOWER_INSTANCE_ID_VAR = 'remote_tower_id' # --------------------- # ----- Foreman ----- From 5f3ebc26e06cde4fd2728c38c9b5fbea19d16891 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Thu, 26 Oct 2017 11:32:16 -0400 Subject: [PATCH 075/141] Adding license checks for Tower inventory source * For Tower the license must match between the source and destination * For AWX the check is disabled * Hosts imported from another Tower don't count against your license in the local Tower * Fix up some issues with enablement * Prevent slashes from being used in the instance filter * Add &all=1 filter to make sure we pick up all hosts --- awx/api/views.py | 2 +- awx/main/managers.py | 6 +++--- awx/main/tasks.py | 1 + awx/main/tests/functional/test_credential.py | 1 + awx/plugins/inventory/tower.py | 22 ++++++++++++++++++-- 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index a7bc27a927..cc8288a1f7 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -2443,7 +2443,7 @@ class InventoryScriptView(RetrieveAPIView): for host in obj.hosts.filter(**hosts_q): data['_meta']['hostvars'][host.name] = host.variables_dict if towervars: - tower_dict = dict(remote_tower_enabled=host.enabled, + tower_dict = dict(remote_tower_enabled=str(host.enabled).lower(), remote_tower_id=host.id) data['_meta']['hostvars'][host.name].update(tower_dict) diff --git a/awx/main/managers.py b/awx/main/managers.py index 4825b33231..69d4a24b6b 100644 --- a/awx/main/managers.py +++ b/awx/main/managers.py @@ -7,7 +7,7 @@ import logging from django.db import models from django.utils.timezone import now -from django.db.models import Sum +from django.db.models import Sum, Q from django.conf import settings from awx.main.utils.filters import SmartFilter @@ -21,9 +21,9 @@ class HostManager(models.Manager): """Custom manager class for Hosts model.""" def active_count(self): - """Return count of active, unique hosts for licensing.""" + """Return count of active, unique hosts for licensing. Exclude ones source from another Tower""" try: - return self.order_by('name').distinct('name').count() + return self.filter(~Q(inventory_sources__source='tower')).order_by('name').distinct('name').count() except NotImplementedError: # For unit tests only, SQLite doesn't support distinct('name') return len(set(self.values_list('name', flat=True))) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index c3adb98a07..e284aee63d 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -1914,6 +1914,7 @@ class RunInventoryUpdate(BaseTask): env[str(env_k)] = unicode(inventory_update.source_vars_dict[env_k]) elif inventory_update.source == 'tower': env['TOWER_INVENTORY'] = inventory_update.instance_filters + env['TOWER_LICENSE_TYPE'] = get_licenser().validate()['license_type'] elif inventory_update.source == 'file': raise NotImplementedError('Cannot update file sources through the task system.') # add private_data_files diff --git a/awx/main/tests/functional/test_credential.py b/awx/main/tests/functional/test_credential.py index 9bcf23e198..d69ee9ce37 100644 --- a/awx/main/tests/functional/test_credential.py +++ b/awx/main/tests/functional/test_credential.py @@ -29,6 +29,7 @@ def test_default_cred_types(): 'satellite6', 'scm', 'ssh', + 'tower', 'vault', 'vmware', ] diff --git a/awx/plugins/inventory/tower.py b/awx/plugins/inventory/tower.py index 0fae0865b2..1de920728f 100755 --- a/awx/plugins/inventory/tower.py +++ b/awx/plugins/inventory/tower.py @@ -56,6 +56,7 @@ def parse_configuration(): password = os.environ.get("TOWER_PASSWORD", None) ignore_ssl = os.environ.get("TOWER_IGNORE_SSL", "1").lower() in ("1", "yes", "true") inventory = os.environ.get("TOWER_INVENTORY", None) + license_type = os.environ.get("TOWER_LICENSE_TYPE", "enterprise") errors = [] if not host_name: @@ -74,14 +75,30 @@ def parse_configuration(): tower_user=username, tower_pass=password, tower_inventory=inventory, + tower_license_type=license_type, ignore_ssl=ignore_ssl) -def read_tower_inventory(tower_host, tower_user, tower_pass, inventory, ignore_ssl=False): +def read_tower_inventory(tower_host, tower_user, tower_pass, inventory, license_type, ignore_ssl=False): if not re.match('(?:http|https)://', tower_host): tower_host = "https://{}".format(tower_host) - inventory_url = urljoin(tower_host, "/api/v2/inventories/{}/script/?hostvars=1&towervars=1".format(inventory)) + inventory_url = urljoin(tower_host, "/api/v2/inventories/{}/script/?hostvars=1&towervars=1&all=1".format(inventory.replace('/', ''))) + config_url = urljoin(tower_host, "/api/v2/config/") try: + if license_type != "open": + config_response = requests.get(config_url, + auth=HTTPBasicAuth(tower_user, tower_pass), + verify=not ignore_ssl) + if config_response.ok: + source_type = config_response.json()['license_info']['license_type'] + if not source_type == license_type: + print("Tower server licenses must match: source: {} local: {}".format(source_type, + license_type)) + sys.exit(1) + else: + print("Failed to validate the license of the remote Tower: {}".format(config_response.data)) + sys.exit(1) + response = requests.get(inventory_url, auth=HTTPBasicAuth(tower_user, tower_pass), verify=not ignore_ssl) @@ -101,6 +118,7 @@ def main(): config['tower_user'], config['tower_pass'], config['tower_inventory'], + config['tower_license_type'], ignore_ssl=config['ignore_ssl']) print( json.dumps( From 85be3c7692f7adaf25be48fc7f5af689cfbbca13 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Thu, 26 Oct 2017 16:40:10 -0400 Subject: [PATCH 076/141] Align inventory variables with Ansible modules --- awx/main/models/credential.py | 2 +- awx/plugins/inventory/tower.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/main/models/credential.py b/awx/main/models/credential.py index c24a0b7cec..6271cdc0de 100644 --- a/awx/main/models/credential.py +++ b/awx/main/models/credential.py @@ -1090,7 +1090,7 @@ def tower(cls): }, injectors={ 'env': { - 'TOWER_HOSTNAME': '{{host}}', + 'TOWER_HOST': '{{host}}', 'TOWER_USERNAME': '{{username}}', 'TOWER_PASSWORD': '{{password}}', } diff --git a/awx/plugins/inventory/tower.py b/awx/plugins/inventory/tower.py index 1de920728f..263cd5eebf 100755 --- a/awx/plugins/inventory/tower.py +++ b/awx/plugins/inventory/tower.py @@ -51,7 +51,7 @@ def parse_configuration(): help='Return all hosts known to Tower given a particular inventory', ) parser.parse_args() - host_name = os.environ.get("TOWER_HOSTNAME", None) + host_name = os.environ.get("TOWER_HOST", None) username = os.environ.get("TOWER_USERNAME", None) password = os.environ.get("TOWER_PASSWORD", None) ignore_ssl = os.environ.get("TOWER_IGNORE_SSL", "1").lower() in ("1", "yes", "true") @@ -60,7 +60,7 @@ def parse_configuration(): errors = [] if not host_name: - errors.append("Missing TOWER_HOSTNAME in environment") + errors.append("Missing TOWER_HOST in environment") if not username: errors.append("Missing TOWER_USERNAME in environment") if not password: From 7211ff22df1cd838064fb65528a961e4c3c3bb59 Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Fri, 6 Oct 2017 11:25:39 -0400 Subject: [PATCH 077/141] Special handle host related_search_fields Relates #7712 of ansible-tower. UI uses `related_search_fields` list to populate help text for resourse search, `ansible_facts` is searchable via UI but the general pickup logic would ignore it. So make it a corner case. Signed-off-by: Aaron Tan --- awx/api/views.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index cc8288a1f7..2c43be9f92 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -1925,7 +1925,17 @@ class InventoryJobTemplateList(SubListAPIView): return qs.filter(inventory=parent) -class HostList(ListCreateAPIView): +class HostRelatedSearchMixin(object): + + @property + def related_search_fields(self): + # Edge-case handle: https://github.com/ansible/ansible-tower/issues/7712 + ret = super(HostRelatedSearchMixin, self).related_search_fields + ret.append('ansible_facts') + return ret + + +class HostList(HostRelatedSearchMixin, ListCreateAPIView): always_allow_superuser = False model = Host @@ -1962,7 +1972,7 @@ class HostAnsibleFactsDetail(RetrieveAPIView): new_in_api_v2 = True -class InventoryHostsList(SubListCreateAttachDetachAPIView): +class InventoryHostsList(HostRelatedSearchMixin, SubListCreateAttachDetachAPIView): model = Host serializer_class = HostSerializer @@ -2230,7 +2240,9 @@ class GroupPotentialChildrenList(SubListAPIView): return qs.exclude(pk__in=except_pks) -class GroupHostsList(ControlledByScmMixin, SubListCreateAttachDetachAPIView): +class GroupHostsList(HostRelatedSearchMixin, + ControlledByScmMixin, + SubListCreateAttachDetachAPIView): ''' the list of hosts directly below a group ''' model = Host @@ -2257,7 +2269,7 @@ class GroupHostsList(ControlledByScmMixin, SubListCreateAttachDetachAPIView): return super(GroupHostsList, self).create(request, *args, **kwargs) -class GroupAllHostsList(SubListAPIView): +class GroupAllHostsList(HostRelatedSearchMixin, SubListAPIView): ''' the list of all hosts below a group, even including subgroups ''' model = Host @@ -2621,7 +2633,7 @@ class InventorySourceNotificationTemplatesSuccessList(InventorySourceNotificatio relationship = 'notification_templates_success' -class InventorySourceHostsList(SubListDestroyAPIView): +class InventorySourceHostsList(HostRelatedSearchMixin, SubListDestroyAPIView): model = Host serializer_class = HostSerializer @@ -3977,7 +3989,7 @@ class JobEventChildrenList(SubListAPIView): view_name = _('Job Event Children List') -class JobEventHostsList(SubListAPIView): +class JobEventHostsList(HostRelatedSearchMixin, SubListAPIView): model = Host serializer_class = HostSerializer From 14a3a6073e4610849a0f8e8cae357c1f3ac3b8d3 Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Mon, 30 Oct 2017 13:37:45 -0400 Subject: [PATCH 078/141] append credential types documentation link to help popovers --- .../client/src/credential-types/add/add.controller.js | 10 ++++++++-- .../src/credential-types/edit/edit.controller.js | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/awx/ui/client/src/credential-types/add/add.controller.js b/awx/ui/client/src/credential-types/add/add.controller.js index bc7e284fd2..8f0842c27d 100644 --- a/awx/ui/client/src/credential-types/add/add.controller.js +++ b/awx/ui/client/src/credential-types/add/add.controller.js @@ -37,8 +37,14 @@ export default ['Rest', 'Wait', callback: 'loadCredentialKindOptions' }); - $scope.inputs_help_text = _.get(options, 'actions.POST.inputs.help_text', "Specification for credential type inputs"); - $scope.injectors_help_text = _.get(options, 'actions.POST.injectors.help_text', "Specification for credential type injector"); + const docs_url = 'https://docs.ansible.com/ansible-tower/latest/html/userguide/credential_types.html#getting-started-with-credential-types'; + const docs_help_text = `

Getting Started with Credential Types`; + + const api_inputs_help_text = _.get(options, 'actions.POST.inputs.help_text', "Specification for credential type inputs."); + const api_injectors_help_text = _.get(options, 'actions.POST.injectors.help_text', "Specification for credential type injector."); + + $scope.inputs_help_text = api_inputs_help_text + docs_help_text; + $scope.injectors_help_text = api_injectors_help_text + docs_help_text; if (!options.actions.POST) { $state.go("^"); diff --git a/awx/ui/client/src/credential-types/edit/edit.controller.js b/awx/ui/client/src/credential-types/edit/edit.controller.js index 42cd0ebadd..a2d35974d2 100644 --- a/awx/ui/client/src/credential-types/edit/edit.controller.js +++ b/awx/ui/client/src/credential-types/edit/edit.controller.js @@ -36,8 +36,14 @@ export default ['Rest', 'Wait', callback: 'choicesReadyCredentialTypes' }); - $scope.inputs_help_text = _.get(options, 'actions.POST.inputs.help_text', "Specification for credential type inputs"); - $scope.injectors_help_text = _.get(options, 'actions.POST.injectors.help_text', "Specification for credential type injector"); + const docs_url = 'https://docs.ansible.com/ansible-tower/latest/html/userguide/credential_types.html#getting-started-with-credential-types'; + const docs_help_text = `

Getting Started with Credential Types`; + + const api_inputs_help_text = _.get(options, 'actions.POST.inputs.help_text', "Specification for credential type inputs."); + const api_injectors_help_text = _.get(options, 'actions.POST.injectors.help_text', "Specification for credential type injector."); + + $scope.inputs_help_text = api_inputs_help_text + docs_help_text; + $scope.injectors_help_text = api_injectors_help_text + docs_help_text; }); } From aef224732c47a7d2a30c5d8b55a0190921e72caf Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Fri, 27 Oct 2017 22:33:55 +0000 Subject: [PATCH 079/141] changing angular-tz to point to a branch with a patch for UTC timezones and also patching angular-scheduler to point to angular 1.4.14 and also patching angular-codemirror to point to angular 1.4.14, and adding fsevents:"*" to the package.json, and regenerating npm-shrinkwrap.json for the new dependencies and their branches. --- awx/ui/npm-shrinkwrap.json | 4068 +++++++++++++++--------------------- awx/ui/package.json | 7 +- 2 files changed, 1642 insertions(+), 2433 deletions(-) diff --git a/awx/ui/npm-shrinkwrap.json b/awx/ui/npm-shrinkwrap.json index c46c589ccb..032f78c202 100644 --- a/awx/ui/npm-shrinkwrap.json +++ b/awx/ui/npm-shrinkwrap.json @@ -3,36 +3,36 @@ "version": "3.1.0", "dependencies": { "abbrev": { - "version": "1.1.0", + "version": "1.1.1", "from": "abbrev@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz" + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz" }, "accepts": { - "version": "1.3.3", + "version": "1.3.4", "from": "accepts@>=1.3.3 <1.4.0", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz" + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz" }, "acorn": { - "version": "3.3.0", - "from": "acorn@>=3.1.0 <4.0.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz" + "version": "5.2.1", + "from": "acorn@>=5.1.1 <6.0.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz" }, "acorn-jsx": { "version": "3.0.1", - "from": "acorn-jsx@>=3.0.1 <4.0.0", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz" - }, - "acorn-object-spread": { - "version": "1.0.0", - "from": "acorn-object-spread@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/acorn-object-spread/-/acorn-object-spread-1.0.0.tgz", - "optional": true + "from": "acorn-jsx@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", + "dependencies": { + "acorn": { + "version": "3.3.0", + "from": "acorn@>=3.0.4 <4.0.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz" + } + } }, "adm-zip": { "version": "0.4.7", "from": "adm-zip@>=0.4.3 <0.5.0", - "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz" }, "after": { "version": "0.8.1", @@ -43,33 +43,28 @@ "version": "2.1.1", "from": "agent-base@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz", - "dev": true, "dependencies": { "semver": { "version": "5.0.3", "from": "semver@>=5.0.1 <5.1.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz" } } }, "ajv": { "version": "4.11.8", - "from": "ajv@>=4.7.0 <5.0.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", - "dev": true + "from": "ajv@>=4.9.1 <5.0.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz" }, "ajv-keywords": { "version": "1.5.1", "from": "ajv-keywords@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz" }, "align-text": { "version": "0.1.4", "from": "align-text@>=0.1.3 <0.2.0", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz" }, "almond": { "version": "0.3.3", @@ -93,15 +88,8 @@ }, "angular-codemirror": { "version": "1.0.4", - "from": "ansible/angular-codemirror#1.0.4", - "resolved": "git://github.com/ansible/angular-codemirror.git#75c3a2d0ccdf2e4c836fab7d7617d5db6c585c1b", - "dependencies": { - "angular": { - "version": "1.4.7", - "from": "angular@1.4.7", - "resolved": "https://registry.npmjs.org/angular/-/angular-1.4.7.tgz" - } - } + "from": "ansible/angular-codemirror#release_3.2.2", + "resolved": "git://github.com/ansible/angular-codemirror.git#58563be43e4b48f59395223ae83daf9dcf249dc0" }, "angular-cookies": { "version": "1.4.14", @@ -129,16 +117,14 @@ "resolved": "https://registry.npmjs.org/angular-gettext/-/angular-gettext-2.3.10.tgz" }, "angular-gettext-tools": { - "version": "2.3.5", - "from": "angular-gettext-tools@>=2.3.5 <2.4.0", - "resolved": "https://registry.npmjs.org/angular-gettext-tools/-/angular-gettext-tools-2.3.5.tgz", - "dev": true, + "version": "2.3.6", + "from": "angular-gettext-tools@>=2.3.6 <2.4.0", + "resolved": "https://registry.npmjs.org/angular-gettext-tools/-/angular-gettext-tools-2.3.6.tgz", "dependencies": { "lodash": { "version": "4.17.4", - "from": "lodash@^4.0.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true + "from": "lodash@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" } } }, @@ -147,12 +133,6 @@ "from": "angular-md5@>=0.1.8 <0.2.0", "resolved": "https://registry.npmjs.org/angular-md5/-/angular-md5-0.1.10.tgz" }, - "angular-mocks": { - "version": "1.4.14", - "from": "angular-mocks@>=1.4.14 <1.5.0", - "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.4.14.tgz", - "dev": true - }, "angular-moment": { "version": "0.10.3", "from": "angular-moment@>=0.10.1 <0.11.0", @@ -170,38 +150,14 @@ }, "angular-scheduler": { "version": "0.1.0", - "from": "ansible/angular-scheduler#0.1.1", - "resolved": "git://github.com/ansible/angular-scheduler.git#9f2893a54c758b05bd6afce897488c01a6e8959d", - "dependencies": { - "angular-tz-extensions": { - "version": "0.3.11", - "from": "ansible/angular-tz-extensions", - "resolved": "git://github.com/ansible/angular-tz-extensions.git#33caaa9ccf5dfe29a95962c17c3c9e6b9775be35", - "dependencies": { - "angular": { - "version": "1.4.7", - "from": "angular@1.4.7", - "resolved": "https://registry.npmjs.org/angular/-/angular-1.4.7.tgz" - }, - "jquery": { - "version": "3.2.1", - "from": "jquery@>=3.1.0 <4.0.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz" - } - } - } - } + "from": "ansible/angular-scheduler#release_3.2.2", + "resolved": "git://github.com/ansible/angular-scheduler.git#7c1da417581fdae1a8a0f9f7dfecd29f39e993f8" }, "angular-tz-extensions": { "version": "0.3.11", - "from": "ansible/angular-tz-extensions#0.3.13", - "resolved": "git://github.com/ansible/angular-tz-extensions.git#33caaa9ccf5dfe29a95962c17c3c9e6b9775be35", + "from": "ansible/angular-tz-extensions#release_3.2.2", + "resolved": "git://github.com/ansible/angular-tz-extensions.git#d50c424ccfa107bcf8b38de82e6218cb55d60ac1", "dependencies": { - "angular": { - "version": "1.4.7", - "from": "angular@1.4.7", - "resolved": "https://registry.npmjs.org/angular/-/angular-1.4.7.tgz" - }, "jquery": { "version": "3.2.1", "from": "jquery@>=3.1.0 <4.0.0", @@ -217,8 +173,7 @@ "ansi-escapes": { "version": "1.4.0", "from": "ansi-escapes@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz" }, "ansi-regex": { "version": "2.1.1", @@ -231,27 +186,24 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz" }, "anymatch": { - "version": "1.3.0", + "version": "1.3.2", "from": "anymatch@>=1.3.0 <2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz" + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz" }, "archiver": { "version": "1.3.0", "from": "archiver@1.3.0", "resolved": "https://registry.npmjs.org/archiver/-/archiver-1.3.0.tgz", - "dev": true, "dependencies": { "async": { - "version": "2.4.1", - "from": "async@^2.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.4.1.tgz", - "dev": true + "version": "2.5.0", + "from": "async@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz" }, "lodash": { "version": "4.17.4", - "from": "lodash@^4.8.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true + "from": "lodash@>=4.8.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" } } }, @@ -259,13 +211,11 @@ "version": "1.3.0", "from": "archiver-utils@>=1.3.0 <2.0.0", "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz", - "dev": true, "dependencies": { "lodash": { "version": "4.17.4", - "from": "lodash@^4.8.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true + "from": "lodash@>=4.8.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" } } }, @@ -287,45 +237,39 @@ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz" }, "arr-flatten": { - "version": "1.0.3", + "version": "1.1.0", "from": "arr-flatten@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz" + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz" }, "array-differ": { "version": "1.0.0", "from": "array-differ@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz" }, "array-find-index": { "version": "1.0.2", "from": "array-find-index@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz" }, "array-flatten": { "version": "1.1.1", "from": "array-flatten@1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz" }, "array-slice": { "version": "0.2.3", "from": "array-slice@>=0.2.3 <0.3.0", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz" }, "array-union": { "version": "1.0.2", "from": "array-union@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz" }, "array-uniq": { "version": "1.0.3", "from": "array-uniq@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz" }, "array-unique": { "version": "0.2.1", @@ -339,15 +283,13 @@ }, "arrify": { "version": "1.0.1", - "from": "arrify@>=1.0.0 <2.0.0", + "from": "arrify@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz" }, "asap": { - "version": "2.0.5", + "version": "2.0.6", "from": "asap@>=2.0.3 <2.1.0", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz", - "dev": true, - "optional": true + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz" }, "asn1": { "version": "0.2.3", @@ -357,8 +299,7 @@ "assert": { "version": "1.4.1", "from": "assert@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz" }, "assert-plus": { "version": "0.2.0", @@ -378,8 +319,7 @@ "async-each-series": { "version": "0.1.1", "from": "async-each-series@0.1.1", - "resolved": "https://registry.npmjs.org/async-each-series/-/async-each-series-0.1.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/async-each-series/-/async-each-series-0.1.1.tgz" }, "asynckit": { "version": "0.4.0", @@ -389,8 +329,7 @@ "autoprefixer": { "version": "6.7.7", "from": "autoprefixer@>=6.0.0 <7.0.0", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz" }, "aws-sign2": { "version": "0.6.0", @@ -403,446 +342,327 @@ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz" }, "babel-code-frame": { - "version": "6.22.0", - "from": "babel-code-frame@>=6.22.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz", - "dev": true + "version": "6.26.0", + "from": "babel-code-frame@>=6.26.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz" }, "babel-core": { - "version": "6.24.1", + "version": "6.26.0", "from": "babel-core@>=6.11.4 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.24.1.tgz", - "dev": true, + "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz", "dependencies": { + "debug": { + "version": "2.6.9", + "from": "debug@>=2.6.8 <3.0.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" + }, "lodash": { "version": "4.17.4", - "from": "lodash@>=4.2.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true + "from": "lodash@>=4.17.4 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" + }, + "ms": { + "version": "2.0.0", + "from": "ms@2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" }, "source-map": { - "version": "0.5.6", - "from": "source-map@>=0.5.0 <0.6.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "dev": true + "version": "0.5.7", + "from": "source-map@>=0.5.6 <0.6.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" } } }, "babel-generator": { - "version": "6.24.1", - "from": "babel-generator@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.24.1.tgz", - "dev": true, + "version": "6.26.0", + "from": "babel-generator@>=6.26.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz", "dependencies": { "lodash": { "version": "4.17.4", - "from": "lodash@^4.2.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true + "from": "lodash@>=4.17.4 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" }, "source-map": { - "version": "0.5.6", - "from": "source-map@^0.5.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "dev": true + "version": "0.5.7", + "from": "source-map@>=0.5.6 <0.6.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" } } }, "babel-helper-call-delegate": { "version": "6.24.1", "from": "babel-helper-call-delegate@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz" }, "babel-helper-define-map": { - "version": "6.24.1", + "version": "6.26.0", "from": "babel-helper-define-map@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz", - "dev": true, + "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz", "dependencies": { "lodash": { "version": "4.17.4", - "from": "lodash@^4.2.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true + "from": "lodash@>=4.17.4 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" } } }, "babel-helper-function-name": { "version": "6.24.1", "from": "babel-helper-function-name@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz" }, "babel-helper-get-function-arity": { "version": "6.24.1", "from": "babel-helper-get-function-arity@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz" }, "babel-helper-hoist-variables": { "version": "6.24.1", "from": "babel-helper-hoist-variables@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz" }, "babel-helper-optimise-call-expression": { "version": "6.24.1", "from": "babel-helper-optimise-call-expression@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz" }, "babel-helper-regex": { - "version": "6.24.1", + "version": "6.26.0", "from": "babel-helper-regex@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz", - "dev": true, + "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz", "dependencies": { "lodash": { "version": "4.17.4", - "from": "lodash@^4.2.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true + "from": "lodash@>=4.17.4 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" } } }, "babel-helper-replace-supers": { "version": "6.24.1", "from": "babel-helper-replace-supers@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz" }, "babel-helpers": { "version": "6.24.1", "from": "babel-helpers@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", - "dev": true - }, - "babel-istanbul": { - "version": "0.11.0", - "from": "babel-istanbul@>=0.11.0 <0.12.0", - "resolved": "https://registry.npmjs.org/babel-istanbul/-/babel-istanbul-0.11.0.tgz", - "dev": true, - "dependencies": { - "abbrev": { - "version": "1.0.9", - "from": "abbrev@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", - "dev": true - }, - "esprima": { - "version": "2.7.3", - "from": "esprima@>=2.7.0 <2.8.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "dev": true - }, - "minimist": { - "version": "0.0.8", - "from": "minimist@0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "from": "mkdirp@0.5.x", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "dev": true - }, - "source-map": { - "version": "0.4.4", - "from": "source-map@>=0.4.0 <0.5.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "dev": true - }, - "supports-color": { - "version": "3.1.2", - "from": "supports-color@>=3.1.0 <3.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz", - "dev": true - }, - "wordwrap": { - "version": "1.0.0", - "from": "wordwrap@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "dev": true - } - } - }, - "babel-loader": { - "version": "6.4.1", - "from": "babel-loader@>=6.2.4 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-6.4.1.tgz", - "dev": true, - "dependencies": { - "minimist": { - "version": "0.0.8", - "from": "minimist@0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "from": "mkdirp@^0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "dev": true - } - } + "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz" }, "babel-messages": { "version": "6.23.0", "from": "babel-messages@>=6.23.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz" }, "babel-plugin-check-es2015-constants": { "version": "6.22.0", "from": "babel-plugin-check-es2015-constants@>=6.22.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz", - "dev": true - }, - "babel-plugin-istanbul": { - "version": "2.0.3", - "from": "babel-plugin-istanbul@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-2.0.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz" }, "babel-plugin-transform-es2015-arrow-functions": { "version": "6.22.0", "from": "babel-plugin-transform-es2015-arrow-functions@>=6.22.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz" }, "babel-plugin-transform-es2015-block-scoped-functions": { "version": "6.22.0", "from": "babel-plugin-transform-es2015-block-scoped-functions@>=6.22.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz" }, "babel-plugin-transform-es2015-block-scoping": { - "version": "6.24.1", + "version": "6.26.0", "from": "babel-plugin-transform-es2015-block-scoping@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz", - "dev": true, + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz", "dependencies": { "lodash": { "version": "4.17.4", - "from": "lodash@^4.2.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true + "from": "lodash@>=4.17.4 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" } } }, "babel-plugin-transform-es2015-classes": { "version": "6.24.1", "from": "babel-plugin-transform-es2015-classes@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz" }, "babel-plugin-transform-es2015-computed-properties": { "version": "6.24.1", "from": "babel-plugin-transform-es2015-computed-properties@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz" }, "babel-plugin-transform-es2015-destructuring": { "version": "6.23.0", "from": "babel-plugin-transform-es2015-destructuring@>=6.22.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz" }, "babel-plugin-transform-es2015-duplicate-keys": { "version": "6.24.1", "from": "babel-plugin-transform-es2015-duplicate-keys@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz" }, "babel-plugin-transform-es2015-for-of": { "version": "6.23.0", "from": "babel-plugin-transform-es2015-for-of@>=6.22.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz" }, "babel-plugin-transform-es2015-function-name": { "version": "6.24.1", "from": "babel-plugin-transform-es2015-function-name@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz" }, "babel-plugin-transform-es2015-literals": { "version": "6.22.0", "from": "babel-plugin-transform-es2015-literals@>=6.22.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz" }, "babel-plugin-transform-es2015-modules-amd": { "version": "6.24.1", "from": "babel-plugin-transform-es2015-modules-amd@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz" }, "babel-plugin-transform-es2015-modules-commonjs": { - "version": "6.24.1", + "version": "6.26.0", "from": "babel-plugin-transform-es2015-modules-commonjs@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz" }, "babel-plugin-transform-es2015-modules-systemjs": { "version": "6.24.1", "from": "babel-plugin-transform-es2015-modules-systemjs@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz" }, "babel-plugin-transform-es2015-modules-umd": { "version": "6.24.1", "from": "babel-plugin-transform-es2015-modules-umd@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz" }, "babel-plugin-transform-es2015-object-super": { "version": "6.24.1", "from": "babel-plugin-transform-es2015-object-super@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz" }, "babel-plugin-transform-es2015-parameters": { "version": "6.24.1", "from": "babel-plugin-transform-es2015-parameters@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz" }, "babel-plugin-transform-es2015-shorthand-properties": { "version": "6.24.1", "from": "babel-plugin-transform-es2015-shorthand-properties@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz" }, "babel-plugin-transform-es2015-spread": { "version": "6.22.0", "from": "babel-plugin-transform-es2015-spread@>=6.22.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz" }, "babel-plugin-transform-es2015-sticky-regex": { "version": "6.24.1", "from": "babel-plugin-transform-es2015-sticky-regex@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz" }, "babel-plugin-transform-es2015-template-literals": { "version": "6.22.0", "from": "babel-plugin-transform-es2015-template-literals@>=6.22.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz" }, "babel-plugin-transform-es2015-typeof-symbol": { "version": "6.23.0", "from": "babel-plugin-transform-es2015-typeof-symbol@>=6.22.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz" }, "babel-plugin-transform-es2015-unicode-regex": { "version": "6.24.1", "from": "babel-plugin-transform-es2015-unicode-regex@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz" }, "babel-plugin-transform-regenerator": { - "version": "6.24.1", + "version": "6.26.0", "from": "babel-plugin-transform-regenerator@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz" }, "babel-plugin-transform-strict-mode": { "version": "6.24.1", "from": "babel-plugin-transform-strict-mode@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", - "dev": true - }, - "babel-preset-es2015": { - "version": "6.24.1", - "from": "babel-preset-es2015@>=6.9.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz" }, "babel-register": { - "version": "6.24.1", - "from": "babel-register@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz", - "dev": true, + "version": "6.26.0", + "from": "babel-register@>=6.26.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", "dependencies": { "lodash": { "version": "4.17.4", - "from": "lodash@^4.2.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true + "from": "lodash@>=4.17.4 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" }, "minimist": { "version": "0.0.8", "from": "minimist@0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" }, "mkdirp": { "version": "0.5.1", "from": "mkdirp@>=0.5.1 <0.6.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz" } } }, "babel-runtime": { - "version": "6.23.0", - "from": "babel-runtime@>=6.22.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz", - "dev": true + "version": "6.26.0", + "from": "babel-runtime@>=6.26.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz" }, "babel-template": { - "version": "6.24.1", - "from": "babel-template@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz", - "dev": true, + "version": "6.26.0", + "from": "babel-template@>=6.26.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", "dependencies": { "lodash": { "version": "4.17.4", - "from": "lodash@^4.2.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true + "from": "lodash@>=4.17.4 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" } } }, "babel-traverse": { - "version": "6.24.1", - "from": "babel-traverse@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz", - "dev": true, + "version": "6.26.0", + "from": "babel-traverse@>=6.26.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", "dependencies": { + "debug": { + "version": "2.6.9", + "from": "debug@>=2.6.8 <3.0.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" + }, "lodash": { "version": "4.17.4", - "from": "lodash@^4.2.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true + "from": "lodash@>=4.17.4 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" + }, + "ms": { + "version": "2.0.0", + "from": "ms@2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" } } }, "babel-types": { - "version": "6.24.1", - "from": "babel-types@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz", - "dev": true, + "version": "6.26.0", + "from": "babel-types@>=6.26.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", "dependencies": { "lodash": { "version": "4.17.4", - "from": "lodash@^4.2.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true + "from": "lodash@>=4.17.4 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" } } }, "babylon": { - "version": "6.17.2", - "from": "babylon@>=6.11.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.2.tgz", - "dev": true + "version": "6.18.0", + "from": "babylon@>=6.18.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz" }, "backo2": { "version": "1.0.2", @@ -850,9 +670,9 @@ "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz" }, "balanced-match": { - "version": "0.4.2", - "from": "balanced-match@>=0.4.1 <0.5.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" + "version": "1.0.0", + "from": "balanced-match@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz" }, "base64-arraybuffer": { "version": "0.1.5", @@ -860,34 +680,29 @@ "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz" }, "base64-js": { - "version": "1.2.0", + "version": "1.2.1", "from": "base64-js@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz" }, "base64id": { "version": "0.1.0", "from": "base64id@0.1.0", - "resolved": "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz" }, "batch": { "version": "0.5.3", "from": "batch@0.5.3", - "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz" }, "bcrypt-pbkdf": { "version": "1.0.1", "from": "bcrypt-pbkdf@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz" }, "beeper": { "version": "1.1.1", "from": "beeper@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz" }, "better-assert": { "version": "1.0.2", @@ -895,31 +710,29 @@ "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz" }, "big.js": { - "version": "3.1.3", + "version": "3.2.0", "from": "big.js@>=3.1.3 <4.0.0", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz" + "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz" }, "binary-extensions": { - "version": "1.8.0", + "version": "1.10.0", "from": "binary-extensions@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz" + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz" }, "binary-search": { "version": "1.3.2", "from": "binary-search@>=1.2.0 <2.0.0", - "resolved": "https://registry.npmjs.org/binary-search/-/binary-search-1.3.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/binary-search/-/binary-search-1.3.2.tgz" }, "bindings": { - "version": "1.2.1", + "version": "1.3.0", "from": "bindings@>=1.2.1 <2.0.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz" + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz" }, "bl": { "version": "1.2.1", "from": "bl@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz" }, "blob": { "version": "0.0.4", @@ -927,36 +740,31 @@ "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz" }, "bluebird": { - "version": "3.5.0", + "version": "3.5.1", "from": "bluebird@>=3.3.0 <4.0.0", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz" }, "body-parser": { "version": "1.14.2", "from": "body-parser@>=1.14.0 <1.15.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.14.2.tgz", - "optional": true, "dependencies": { "http-errors": { "version": "1.3.1", "from": "http-errors@>=1.3.1 <1.4.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz" }, "qs": { "version": "5.2.0", "from": "qs@5.2.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz" } } }, "boolbase": { "version": "1.0.0", "from": "boolbase@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz" }, "boom": { "version": "2.10.1", @@ -969,14 +777,14 @@ "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz" }, "bootstrap-datepicker": { - "version": "1.6.4", + "version": "1.7.1", "from": "bootstrap-datepicker@>=1.4.0 <2.0.0", - "resolved": "https://registry.npmjs.org/bootstrap-datepicker/-/bootstrap-datepicker-1.6.4.tgz" + "resolved": "https://registry.npmjs.org/bootstrap-datepicker/-/bootstrap-datepicker-1.7.1.tgz" }, "brace-expansion": { - "version": "1.1.7", + "version": "1.1.8", "from": "brace-expansion@>=1.1.7 <2.0.0", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz" + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz" }, "braces": { "version": "1.8.5", @@ -984,70 +792,49 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz" }, "browser-sync": { - "version": "2.18.12", + "version": "2.18.13", "from": "browser-sync@>=2.14.0 <3.0.0", - "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.18.12.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.18.13.tgz" }, "browser-sync-client": { "version": "2.5.1", "from": "browser-sync-client@2.5.1", - "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.5.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.5.1.tgz" }, "browser-sync-ui": { "version": "0.6.3", "from": "browser-sync-ui@0.6.3", - "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-0.6.3.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-0.6.3.tgz" }, "browserify-aes": { "version": "0.4.0", "from": "browserify-aes@0.4.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz" }, "browserify-zlib": { "version": "0.1.4", "from": "browserify-zlib@>=0.1.4 <0.2.0", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz" }, "browserslist": { "version": "1.7.7", "from": "browserslist@>=1.7.6 <2.0.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz" }, "bs-recipes": { "version": "1.3.4", "from": "bs-recipes@1.3.4", - "resolved": "https://registry.npmjs.org/bs-recipes/-/bs-recipes-1.3.4.tgz", - "optional": true - }, - "buble": { - "version": "0.12.5", - "from": "buble@>=0.12.0 <0.13.0", - "resolved": "https://registry.npmjs.org/buble/-/buble-0.12.5.tgz", - "optional": true - }, - "bubleify": { - "version": "0.5.1", - "from": "bubleify@>=0.5.1 <0.6.0", - "resolved": "https://registry.npmjs.org/bubleify/-/bubleify-0.5.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/bs-recipes/-/bs-recipes-1.3.4.tgz" }, "buffer": { "version": "4.9.1", "from": "buffer@>=4.9.0 <5.0.0", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz" }, "buffer-crc32": { "version": "0.2.13", "from": "buffer-crc32@>=0.2.1 <0.3.0", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz" }, "builtin-modules": { "version": "1.1.1", @@ -1057,20 +844,17 @@ "builtin-status-codes": { "version": "3.0.0", "from": "builtin-status-codes@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz" }, "bytes": { "version": "2.2.0", "from": "bytes@2.2.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.2.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.2.0.tgz" }, "caller-path": { "version": "0.1.0", "from": "caller-path@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz" }, "callsite": { "version": "1.0.0", @@ -1080,8 +864,7 @@ "callsites": { "version": "0.2.0", "from": "callsites@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz" }, "camelcase": { "version": "1.2.1", @@ -1092,32 +875,28 @@ "version": "2.1.0", "from": "camelcase-keys@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", - "dev": true, "dependencies": { "camelcase": { "version": "2.1.1", "from": "camelcase@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz" } } }, "caniuse-db": { - "version": "1.0.30000679", + "version": "1.0.30000756", "from": "caniuse-db@>=1.0.30000634 <2.0.0", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000679.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000756.tgz" }, "caseless": { - "version": "0.11.0", - "from": "caseless@>=0.11.0 <0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz" + "version": "0.12.0", + "from": "caseless@>=0.12.0 <0.13.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz" }, "center-align": { "version": "0.1.3", "from": "center-align@>=0.1.1 <0.2.0", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz" }, "chalk": { "version": "1.1.3", @@ -1127,8 +906,7 @@ "cheerio": { "version": "0.19.0", "from": "cheerio@>=0.19.0 <0.20.0", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz" }, "chokidar": { "version": "1.7.0", @@ -1136,42 +914,36 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz" }, "circular-json": { - "version": "0.3.1", + "version": "0.3.3", "from": "circular-json@>=0.3.1 <0.4.0", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz" }, "clean-css": { - "version": "4.1.7", + "version": "4.1.9", "from": "clean-css@>=4.1.1 <4.2.0", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.7.tgz", - "dev": true, + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz", "dependencies": { "source-map": { - "version": "0.5.6", + "version": "0.5.7", "from": "source-map@>=0.5.0 <0.6.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" } } }, "cli": { "version": "1.0.1", "from": "cli@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz" }, "cli-cursor": { "version": "1.0.2", "from": "cli-cursor@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz" }, "cli-width": { - "version": "2.1.0", + "version": "2.2.0", "from": "cli-width@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz" }, "cliui": { "version": "3.2.0", @@ -1181,14 +953,12 @@ "clone": { "version": "1.0.2", "from": "clone@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz" }, "co": { "version": "4.6.0", "from": "co@>=4.6.0 <5.0.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz" }, "code-point-at": { "version": "1.1.0", @@ -1196,33 +966,29 @@ "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz" }, "codemirror": { - "version": "5.26.0", + "version": "5.31.0", "from": "codemirror@>=5.17.0 <6.0.0", - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.26.0.tgz" + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.31.0.tgz" }, "coffee-script": { "version": "1.10.0", "from": "coffee-script@>=1.10.0 <1.11.0", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz" }, "colors": { "version": "1.1.2", "from": "colors@>=1.1.2 <1.2.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz" }, "combine-lists": { "version": "1.0.1", "from": "combine-lists@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz", - "dev": true, "dependencies": { "lodash": { "version": "4.17.4", - "from": "lodash@^4.5.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true + "from": "lodash@>=4.5.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" } } }, @@ -1232,15 +998,14 @@ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz" }, "commander": { - "version": "2.9.0", + "version": "2.11.0", "from": "commander@>=2.2.0 <3.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz" + "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz" }, "commondir": { "version": "1.0.1", "from": "commondir@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz" }, "component-bind": { "version": "1.0.0", @@ -1258,33 +1023,39 @@ "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz" }, "components-font-awesome": { - "version": "4.7.0", + "version": "4.6.3", "from": "components-font-awesome@>=4.6.1 <5.0.0", - "resolved": "https://registry.npmjs.org/components-font-awesome/-/components-font-awesome-4.7.0.tgz" + "resolved": "https://registry.npmjs.org/components-font-awesome/-/components-font-awesome-4.6.3.tgz" }, "compress-commons": { - "version": "1.2.0", - "from": "compress-commons@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.0.tgz", - "dev": true + "version": "1.2.2", + "from": "compress-commons@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz" }, "compressible": { - "version": "2.0.10", - "from": "compressible@>=2.0.8 <2.1.0", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz", - "optional": true + "version": "2.0.12", + "from": "compressible@>=2.0.11 <2.1.0", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz" }, "compression": { - "version": "1.6.2", + "version": "1.7.1", "from": "compression@>=1.5.2 <2.0.0", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.6.2.tgz", - "optional": true, + "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz", "dependencies": { "bytes": { - "version": "2.3.0", - "from": "bytes@2.3.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.3.0.tgz", - "optional": true + "version": "3.0.0", + "from": "bytes@3.0.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz" + }, + "debug": { + "version": "2.6.9", + "from": "debug@2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" + }, + "ms": { + "version": "2.0.0", + "from": "ms@2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" } } }, @@ -1296,49 +1067,42 @@ "concat-stream": { "version": "1.6.0", "from": "concat-stream@>=1.5.2 <2.0.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz" }, "connect": { "version": "3.5.0", "from": "connect@3.5.0", - "resolved": "https://registry.npmjs.org/connect/-/connect-3.5.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/connect/-/connect-3.5.0.tgz" }, "connect-history-api-fallback": { - "version": "1.3.0", + "version": "1.4.0", "from": "connect-history-api-fallback@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.4.0.tgz" }, "console-browserify": { "version": "1.1.0", "from": "console-browserify@>=1.1.0 <1.2.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz" }, "constants-browserify": { "version": "1.0.0", "from": "constants-browserify@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz" }, "contains-path": { "version": "0.1.0", "from": "contains-path@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz" }, "content-disposition": { "version": "0.5.2", "from": "content-disposition@0.5.2", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz" }, "content-type": { - "version": "1.0.2", + "version": "1.0.4", "from": "content-type@>=1.0.1 <1.1.0", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz" + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz" }, "contextify": { "version": "0.1.15", @@ -1347,9 +1111,8 @@ }, "convert-source-map": { "version": "1.5.0", - "from": "convert-source-map@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz", - "dev": true + "from": "convert-source-map@>=1.5.0 <2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz" }, "cookie": { "version": "0.3.1", @@ -1359,14 +1122,12 @@ "cookie-signature": { "version": "1.0.6", "from": "cookie-signature@1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz" }, "core-js": { - "version": "2.4.1", + "version": "2.5.1", "from": "core-js@>=2.4.0 <3.0.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz" }, "core-util-is": { "version": "1.0.2", @@ -1374,16 +1135,14 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" }, "crc": { - "version": "3.4.4", + "version": "3.5.0", "from": "crc@>=3.4.4 <4.0.0", - "resolved": "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz" }, "crc32-stream": { "version": "2.0.0", "from": "crc32-stream@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz" }, "cryptiles": { "version": "2.0.5", @@ -1393,26 +1152,22 @@ "crypto-browserify": { "version": "3.3.0", "from": "crypto-browserify@3.3.0", - "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz" }, "cson-parser": { "version": "1.3.5", "from": "cson-parser@>=1.0.9 <2.0.0", - "resolved": "https://registry.npmjs.org/cson-parser/-/cson-parser-1.3.5.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/cson-parser/-/cson-parser-1.3.5.tgz" }, "css-select": { "version": "1.0.0", "from": "css-select@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz" }, "css-what": { "version": "1.0.0", "from": "css-what@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz" }, "cssom": { "version": "0.2.5", @@ -1434,20 +1189,17 @@ "currently-unhandled": { "version": "0.4.1", "from": "currently-unhandled@>=0.4.1 <0.5.0", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz" }, "custom-event": { "version": "1.0.1", "from": "custom-event@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz" }, "d": { "version": "1.0.0", "from": "d@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz" }, "d3": { "version": "3.3.13", @@ -1469,20 +1221,17 @@ "date-now": { "version": "0.1.4", "from": "date-now@>=0.1.4 <0.2.0", - "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz" }, "date-time": { "version": "1.1.0", "from": "date-time@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/date-time/-/date-time-1.1.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/date-time/-/date-time-1.1.0.tgz" }, "dateformat": { "version": "1.0.12", "from": "dateformat@>=1.0.12 <1.1.0", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz" }, "debug": { "version": "2.2.0", @@ -1497,14 +1246,12 @@ "deep-is": { "version": "0.1.3", "from": "deep-is@>=0.1.3 <0.2.0", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz" }, "del": { "version": "2.2.2", "from": "del@>=2.0.2 <3.0.0", - "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz" }, "delayed-stream": { "version": "1.0.0", @@ -1512,9 +1259,9 @@ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" }, "depd": { - "version": "1.1.0", + "version": "1.1.1", "from": "depd@>=1.1.0 <1.2.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz" + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz" }, "destroy": { "version": "1.0.4", @@ -1524,108 +1271,91 @@ "detect-indent": { "version": "4.0.0", "from": "detect-indent@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz" }, "dev-ip": { "version": "1.0.1", "from": "dev-ip@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz" }, "di": { "version": "0.0.1", "from": "di@>=0.0.1 <0.0.2", - "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz" }, "doctrine": { "version": "2.0.0", "from": "doctrine@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz" }, "dom-serialize": { "version": "2.2.1", "from": "dom-serialize@>=2.2.0 <3.0.0", - "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz" }, "dom-serializer": { "version": "0.1.0", "from": "dom-serializer@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", - "dev": true, "dependencies": { "domelementtype": { "version": "1.1.3", "from": "domelementtype@>=1.1.1 <1.2.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz" } } }, "domain-browser": { "version": "1.1.7", "from": "domain-browser@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz" }, "domelementtype": { "version": "1.3.0", "from": "domelementtype@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz" }, "domhandler": { "version": "2.3.0", "from": "domhandler@>=2.3.0 <2.4.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz" }, "domutils": { "version": "1.4.3", "from": "domutils@>=1.4.0 <1.5.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz" }, "duplexer": { "version": "0.1.1", "from": "duplexer@>=0.1.1 <0.2.0", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz" }, "duplexify": { - "version": "3.5.0", + "version": "3.5.1", "from": "duplexify@>=3.1.2 <4.0.0", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz" }, "easy-extender": { "version": "2.3.2", "from": "easy-extender@2.3.2", "resolved": "https://registry.npmjs.org/easy-extender/-/easy-extender-2.3.2.tgz", - "optional": true, "dependencies": { "lodash": { "version": "3.10.1", "from": "lodash@>=3.10.1 <4.0.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz" } } }, "eazy-logger": { "version": "3.0.2", "from": "eazy-logger@3.0.2", - "resolved": "https://registry.npmjs.org/eazy-logger/-/eazy-logger-3.0.2.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/eazy-logger/-/eazy-logger-3.0.2.tgz" }, "ecc-jsbn": { "version": "0.1.1", "from": "ecc-jsbn@>=0.1.1 <0.2.0", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz" }, "ee-first": { "version": "1.1.1", @@ -1633,16 +1363,14 @@ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" }, "electron-to-chromium": { - "version": "1.3.13", + "version": "1.3.27", "from": "electron-to-chromium@>=1.2.7 <2.0.0", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.13.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz" }, "emitter-steward": { "version": "1.0.0", "from": "emitter-steward@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/emitter-steward/-/emitter-steward-1.0.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/emitter-steward/-/emitter-steward-1.0.0.tgz" }, "emojis-list": { "version": "2.1.0", @@ -1655,36 +1383,29 @@ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz" }, "end-of-stream": { - "version": "1.0.0", - "from": "end-of-stream@1.0.0", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz", - "dev": true, - "dependencies": { - "once": { - "version": "1.3.3", - "from": "once@>=1.3.0 <1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "dev": true - } - } + "version": "1.4.0", + "from": "end-of-stream@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz" }, "engine.io": { "version": "1.8.0", "from": "engine.io@1.8.0", "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz", - "optional": true, "dependencies": { + "accepts": { + "version": "1.3.3", + "from": "accepts@1.3.3", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz" + }, "debug": { "version": "2.3.3", "from": "debug@2.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz" }, "ms": { "version": "0.7.2", "from": "ms@0.7.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz" } } }, @@ -1731,27 +1452,23 @@ "version": "0.9.1", "from": "enhanced-resolve@>=0.9.0 <0.10.0", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz", - "dev": true, "dependencies": { "memory-fs": { "version": "0.2.0", "from": "memory-fs@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz" } } }, "ent": { "version": "2.2.0", "from": "ent@>=2.2.0 <2.3.0", - "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz" }, "entities": { "version": "1.1.1", "from": "entities@>=1.1.1 <1.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz" }, "errno": { "version": "0.1.4", @@ -1764,46 +1481,39 @@ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz" }, "es5-ext": { - "version": "0.10.23", + "version": "0.10.35", "from": "es5-ext@>=0.10.14 <0.11.0", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.23.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz" }, "es6-iterator": { - "version": "2.0.1", + "version": "2.0.3", "from": "es6-iterator@>=2.0.1 <2.1.0", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz" }, "es6-map": { "version": "0.1.5", "from": "es6-map@>=0.1.3 <0.2.0", - "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz" }, "es6-promise": { "version": "4.0.5", "from": "es6-promise@>=4.0.3 <4.1.0", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.0.5.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.0.5.tgz" }, "es6-set": { "version": "0.1.5", "from": "es6-set@>=0.1.5 <0.2.0", - "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz" }, "es6-symbol": { "version": "3.1.1", "from": "es6-symbol@>=3.1.1 <3.2.0", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz" }, "es6-weak-map": { "version": "2.0.2", "from": "es6-weak-map@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz" }, "escape-html": { "version": "1.0.3", @@ -1819,20 +1529,16 @@ "version": "1.8.1", "from": "escodegen@>=1.8.0 <1.9.0", "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", - "dev": true, "dependencies": { "esprima": { "version": "2.7.3", - "from": "esprima@^2.7.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "dev": true + "from": "esprima@>=2.7.1 <3.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz" }, "source-map": { "version": "0.2.0", "from": "source-map@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", - "dev": true, - "optional": true + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz" } } }, @@ -1840,197 +1546,116 @@ "version": "3.6.0", "from": "escope@>=3.6.0 <4.0.0", "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", - "dev": true, "dependencies": { "estraverse": { "version": "4.2.0", "from": "estraverse@>=4.1.1 <5.0.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz" } } }, - "eslint": { - "version": "3.19.0", - "from": "eslint@>=3.18.0 <4.0.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz", - "dev": true, - "dependencies": { - "estraverse": { - "version": "4.2.0", - "from": "estraverse@>=4.2.0 <5.0.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "dev": true - }, - "lodash": { - "version": "4.17.4", - "from": "lodash@^4.0.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true - }, - "minimist": { - "version": "0.0.8", - "from": "minimist@0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "from": "mkdirp@^0.5.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "dev": true - }, - "strip-bom": { - "version": "3.0.0", - "from": "strip-bom@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "dev": true - } - } - }, - "eslint-config-airbnb-base": { - "version": "11.2.0", - "from": "eslint-config-airbnb-base@>=11.1.1 <12.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-11.2.0.tgz", - "dev": true - }, "eslint-import-resolver-node": { - "version": "0.2.3", - "from": "eslint-import-resolver-node@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.2.3.tgz", - "dev": true + "version": "0.3.1", + "from": "eslint-import-resolver-node@>=0.3.1 <0.4.0", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.1.tgz", + "dependencies": { + "debug": { + "version": "2.6.9", + "from": "debug@>=2.6.8 <3.0.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" + }, + "ms": { + "version": "2.0.0", + "from": "ms@2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" + }, + "resolve": { + "version": "1.5.0", + "from": "resolve@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz" + } + } }, "eslint-module-utils": { - "version": "2.0.0", - "from": "eslint-module-utils@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.0.0.tgz", - "dev": true - }, - "eslint-plugin-import": { - "version": "2.3.0", - "from": "eslint-plugin-import@>=2.2.0 <3.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.3.0.tgz", - "dev": true, + "version": "2.1.1", + "from": "eslint-module-utils@>=2.1.1 <3.0.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz", "dependencies": { - "doctrine": { - "version": "1.5.0", - "from": "doctrine@1.5.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", - "dev": true + "debug": { + "version": "2.6.9", + "from": "debug@>=2.6.8 <3.0.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" }, - "find-up": { - "version": "2.1.0", - "from": "find-up@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "dev": true - }, - "load-json-file": { + "ms": { "version": "2.0.0", - "from": "load-json-file@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "dev": true - }, - "path-type": { - "version": "2.0.0", - "from": "path-type@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "dev": true - }, - "read-pkg": { - "version": "2.0.0", - "from": "read-pkg@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "dev": true - }, - "read-pkg-up": { - "version": "2.0.0", - "from": "read-pkg-up@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "dev": true - }, - "strip-bom": { - "version": "3.0.0", - "from": "strip-bom@^3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "dev": true + "from": "ms@2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" } } }, + "eslint-restricted-globals": { + "version": "0.1.1", + "from": "eslint-restricted-globals@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz" + }, "espree": { - "version": "3.4.3", + "version": "3.5.1", "from": "espree@>=3.4.0 <4.0.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-3.4.3.tgz", - "dev": true, - "dependencies": { - "acorn": { - "version": "5.0.3", - "from": "acorn@>=5.0.1 <6.0.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz", - "dev": true - } - } + "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz" }, "esprima": { - "version": "3.1.3", - "from": "esprima@>=3.1.1 <4.0.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz" + "version": "4.0.0", + "from": "esprima@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz" }, "esquery": { "version": "1.0.0", "from": "esquery@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz", - "dev": true, "dependencies": { "estraverse": { "version": "4.2.0", "from": "estraverse@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz" } } }, "esrecurse": { - "version": "4.1.0", + "version": "4.2.0", "from": "esrecurse@>=4.1.0 <5.0.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.1.0.tgz", - "dev": true, + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz", "dependencies": { "estraverse": { - "version": "4.1.1", - "from": "estraverse@>=4.1.0 <4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz", - "dev": true + "version": "4.2.0", + "from": "estraverse@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz" } } }, "estraverse": { "version": "1.9.3", "from": "estraverse@>=1.9.1 <2.0.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz" }, "esutils": { "version": "2.0.2", "from": "esutils@>=2.0.2 <3.0.0", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz" }, "etag": { - "version": "1.8.0", + "version": "1.8.1", "from": "etag@>=1.7.0 <2.0.0", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz" + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz" }, "event-emitter": { "version": "0.3.5", "from": "event-emitter@>=0.3.5 <0.4.0", - "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz" }, "eventemitter2": { "version": "0.4.14", "from": "eventemitter2@>=0.4.13 <0.5.0", - "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz" }, "eventemitter3": { "version": "1.2.0", @@ -2040,56 +1665,47 @@ "events": { "version": "1.1.1", "from": "events@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz" }, "eventsource": { "version": "0.1.6", "from": "eventsource@0.1.6", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz" }, "exit": { "version": "0.1.2", "from": "exit@>=0.1.1 <0.2.0", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz" }, "exit-hook": { "version": "1.1.1", "from": "exit-hook@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz" }, "expand-braces": { "version": "0.1.2", "from": "expand-braces@>=0.1.1 <0.2.0", "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz", - "dev": true, "dependencies": { "braces": { "version": "0.1.5", "from": "braces@>=0.1.2 <0.2.0", - "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz" }, "expand-range": { "version": "0.1.1", "from": "expand-range@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz" }, "is-number": { "version": "0.1.1", "from": "is-number@>=0.1.1 <0.2.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz" }, "repeat-string": { "version": "0.2.2", "from": "repeat-string@>=0.2.2 <0.3.0", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz" } } }, @@ -2103,23 +1719,15 @@ "from": "expand-range@>=1.8.1 <2.0.0", "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz" }, - "expose-loader": { - "version": "0.7.3", - "from": "expose-loader@>=0.7.1 <0.8.0", - "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-0.7.3.tgz", - "dev": true - }, "express": { "version": "2.5.11", "from": "express@>=2.5.0 <2.6.0", "resolved": "https://registry.npmjs.org/express/-/express-2.5.11.tgz", - "optional": true, "dependencies": { "connect": { "version": "1.9.2", "from": "connect@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz" }, "qs": { "version": "0.4.2", @@ -2139,89 +1747,56 @@ "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz" }, "extract-zip": { - "version": "1.5.0", - "from": "extract-zip@>=1.5.0 <1.6.0", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz", - "dev": true, + "version": "1.6.5", + "from": "extract-zip@>=1.6.5 <1.7.0", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.5.tgz", "dependencies": { - "concat-stream": { - "version": "1.5.0", - "from": "concat-stream@1.5.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz", - "dev": true - }, - "debug": { - "version": "0.7.4", - "from": "debug@0.7.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz", - "dev": true - }, "minimist": { "version": "0.0.8", "from": "minimist@0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" }, "mkdirp": { "version": "0.5.0", "from": "mkdirp@0.5.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz", - "dev": true - }, - "readable-stream": { - "version": "2.0.6", - "from": "readable-stream@>=2.0.0 <2.1.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", - "dev": true - }, - "string_decoder": { - "version": "0.10.31", - "from": "string_decoder@~0.10.x", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz" } } }, "extsprintf": { - "version": "1.0.2", - "from": "extsprintf@1.0.2", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz" + "version": "1.3.0", + "from": "extsprintf@1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz" }, "fast-levenshtein": { "version": "2.0.6", "from": "fast-levenshtein@>=2.0.4 <2.1.0", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz" }, "faye-websocket": { "version": "0.10.0", "from": "faye-websocket@>=0.10.0 <0.11.0", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz" }, "fd-slicer": { "version": "1.0.1", "from": "fd-slicer@>=1.0.1 <1.1.0", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz" }, "figures": { "version": "1.7.0", "from": "figures@>=1.3.5 <2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz" }, "file-entry-cache": { "version": "2.0.0", "from": "file-entry-cache@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz" }, "file-sync-cmp": { "version": "0.1.1", "from": "file-sync-cmp@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz" }, "filename-regex": { "version": "2.0.1", @@ -2232,19 +1807,16 @@ "version": "0.2.1", "from": "fileset@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/fileset/-/fileset-0.2.1.tgz", - "dev": true, "dependencies": { "glob": { "version": "5.0.15", "from": "glob@>=5.0.0 <6.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz" }, "minimatch": { "version": "2.0.10", "from": "minimatch@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz" } } }, @@ -2256,26 +1828,22 @@ "finalhandler": { "version": "0.5.0", "from": "finalhandler@0.5.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz" }, "find-cache-dir": { "version": "0.1.1", "from": "find-cache-dir@>=0.1.1 <0.2.0", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz", - "dev": true, "dependencies": { "minimist": { "version": "0.0.8", "from": "minimist@0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" }, "mkdirp": { "version": "0.5.1", - "from": "mkdirp@^0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "dev": true + "from": "mkdirp@>=0.5.1 <0.6.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz" } } }, @@ -2288,21 +1856,18 @@ "version": "0.3.0", "from": "findup-sync@>=0.3.0 <0.4.0", "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz", - "dev": true, "dependencies": { "glob": { "version": "5.0.15", - "from": "glob@~5.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "dev": true + "from": "glob@>=5.0.0 <5.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz" } } }, "flat-cache": { - "version": "1.2.2", + "version": "1.3.0", "from": "flat-cache@>=1.2.1 <2.0.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz" }, "for-in": { "version": "1.0.2", @@ -2327,49 +1892,624 @@ "formidable": { "version": "1.0.17", "from": "formidable@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz" }, "forwarded": { - "version": "0.1.0", - "from": "forwarded@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz", - "optional": true + "version": "0.1.2", + "from": "forwarded@>=0.1.2 <0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz" }, "fresh": { "version": "0.3.0", "from": "fresh@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz" }, "fs-access": { "version": "1.0.1", "from": "fs-access@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz" }, "fs-extra": { "version": "3.0.1", "from": "fs-extra@3.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz" }, "fs.realpath": { "version": "1.0.0", "from": "fs.realpath@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" }, + "fsevents": { + "version": "1.1.2", + "from": "fsevents@*", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz", + "dependencies": { + "abbrev": { + "version": "1.1.0", + "from": "abbrev@1.1.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz" + }, + "ajv": { + "version": "4.11.8", + "from": "ajv@4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz" + }, + "ansi-regex": { + "version": "2.1.1", + "from": "ansi-regex@2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz" + }, + "aproba": { + "version": "1.1.1", + "from": "aproba@1.1.1", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz" + }, + "are-we-there-yet": { + "version": "1.1.4", + "from": "are-we-there-yet@1.1.4", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz" + }, + "asn1": { + "version": "0.2.3", + "from": "asn1@0.2.3", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz" + }, + "assert-plus": { + "version": "0.2.0", + "from": "assert-plus@0.2.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz" + }, + "asynckit": { + "version": "0.4.0", + "from": "asynckit@0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz" + }, + "aws-sign2": { + "version": "0.6.0", + "from": "aws-sign2@0.6.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz" + }, + "aws4": { + "version": "1.6.0", + "from": "aws4@1.6.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz" + }, + "balanced-match": { + "version": "0.4.2", + "from": "balanced-match@0.4.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "from": "bcrypt-pbkdf@1.0.1", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz" + }, + "block-stream": { + "version": "0.0.9", + "from": "block-stream@0.0.9", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz" + }, + "boom": { + "version": "2.10.1", + "from": "boom@2.10.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz" + }, + "brace-expansion": { + "version": "1.1.7", + "from": "brace-expansion@1.1.7", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz" + }, + "buffer-shims": { + "version": "1.0.0", + "from": "buffer-shims@1.0.0", + "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz" + }, + "caseless": { + "version": "0.12.0", + "from": "caseless@0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz" + }, + "co": { + "version": "4.6.0", + "from": "co@4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz" + }, + "code-point-at": { + "version": "1.1.0", + "from": "code-point-at@1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz" + }, + "combined-stream": { + "version": "1.0.5", + "from": "combined-stream@1.0.5", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz" + }, + "concat-map": { + "version": "0.0.1", + "from": "concat-map@0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + }, + "console-control-strings": { + "version": "1.1.0", + "from": "console-control-strings@1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz" + }, + "core-util-is": { + "version": "1.0.2", + "from": "core-util-is@1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" + }, + "cryptiles": { + "version": "2.0.5", + "from": "cryptiles@2.0.5", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz" + }, + "dashdash": { + "version": "1.14.1", + "from": "dashdash@1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "from": "assert-plus@1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + } + } + }, + "debug": { + "version": "2.6.8", + "from": "debug@2.6.8", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz" + }, + "deep-extend": { + "version": "0.4.2", + "from": "deep-extend@0.4.2", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz" + }, + "delayed-stream": { + "version": "1.0.0", + "from": "delayed-stream@1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" + }, + "delegates": { + "version": "1.0.0", + "from": "delegates@1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz" + }, + "ecc-jsbn": { + "version": "0.1.1", + "from": "ecc-jsbn@0.1.1", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz" + }, + "extend": { + "version": "3.0.1", + "from": "extend@3.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz" + }, + "extsprintf": { + "version": "1.0.2", + "from": "extsprintf@1.0.2", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz" + }, + "forever-agent": { + "version": "0.6.1", + "from": "forever-agent@0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz" + }, + "form-data": { + "version": "2.1.4", + "from": "form-data@2.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz" + }, + "fs.realpath": { + "version": "1.0.0", + "from": "fs.realpath@1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" + }, + "fstream": { + "version": "1.0.11", + "from": "fstream@1.0.11", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz" + }, + "fstream-ignore": { + "version": "1.0.5", + "from": "fstream-ignore@1.0.5", + "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz" + }, + "gauge": { + "version": "2.7.4", + "from": "gauge@2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz" + }, + "getpass": { + "version": "0.1.7", + "from": "getpass@0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "from": "assert-plus@1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + } + } + }, + "glob": { + "version": "7.1.2", + "from": "glob@7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz" + }, + "graceful-fs": { + "version": "4.1.11", + "from": "graceful-fs@4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz" + }, + "har-schema": { + "version": "1.0.5", + "from": "har-schema@1.0.5", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz" + }, + "har-validator": { + "version": "4.2.1", + "from": "har-validator@4.2.1", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz" + }, + "has-unicode": { + "version": "2.0.1", + "from": "has-unicode@2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz" + }, + "hawk": { + "version": "3.1.3", + "from": "hawk@3.1.3", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz" + }, + "hoek": { + "version": "2.16.3", + "from": "hoek@2.16.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz" + }, + "http-signature": { + "version": "1.1.1", + "from": "http-signature@1.1.1", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz" + }, + "inflight": { + "version": "1.0.6", + "from": "inflight@1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz" + }, + "inherits": { + "version": "2.0.3", + "from": "inherits@2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" + }, + "ini": { + "version": "1.3.4", + "from": "ini@1.3.4", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz" + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "from": "is-fullwidth-code-point@1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz" + }, + "is-typedarray": { + "version": "1.0.0", + "from": "is-typedarray@1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz" + }, + "isarray": { + "version": "1.0.0", + "from": "isarray@1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + }, + "isstream": { + "version": "0.1.2", + "from": "isstream@0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz" + }, + "jodid25519": { + "version": "1.0.2", + "from": "jodid25519@1.0.2", + "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz" + }, + "jsbn": { + "version": "0.1.1", + "from": "jsbn@0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz" + }, + "json-schema": { + "version": "0.2.3", + "from": "json-schema@0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz" + }, + "json-stable-stringify": { + "version": "1.0.1", + "from": "json-stable-stringify@1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz" + }, + "json-stringify-safe": { + "version": "5.0.1", + "from": "json-stringify-safe@5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" + }, + "jsonify": { + "version": "0.0.0", + "from": "jsonify@0.0.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz" + }, + "jsprim": { + "version": "1.4.0", + "from": "jsprim@1.4.0", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz", + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "from": "assert-plus@1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + } + } + }, + "mime-db": { + "version": "1.27.0", + "from": "mime-db@1.27.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz" + }, + "mime-types": { + "version": "2.1.15", + "from": "mime-types@2.1.15", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz" + }, + "minimatch": { + "version": "3.0.4", + "from": "minimatch@3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz" + }, + "minimist": { + "version": "0.0.8", + "from": "minimist@0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" + }, + "mkdirp": { + "version": "0.5.1", + "from": "mkdirp@0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz" + }, + "ms": { + "version": "2.0.0", + "from": "ms@2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" + }, + "node-pre-gyp": { + "version": "0.6.36", + "from": "node-pre-gyp@^0.6.36", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz" + }, + "nopt": { + "version": "4.0.1", + "from": "nopt@4.0.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz" + }, + "npmlog": { + "version": "4.1.0", + "from": "npmlog@4.1.0", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz" + }, + "number-is-nan": { + "version": "1.0.1", + "from": "number-is-nan@1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz" + }, + "oauth-sign": { + "version": "0.8.2", + "from": "oauth-sign@0.8.2", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz" + }, + "object-assign": { + "version": "4.1.1", + "from": "object-assign@4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" + }, + "once": { + "version": "1.4.0", + "from": "once@1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz" + }, + "os-homedir": { + "version": "1.0.2", + "from": "os-homedir@1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz" + }, + "os-tmpdir": { + "version": "1.0.2", + "from": "os-tmpdir@1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz" + }, + "osenv": { + "version": "0.1.4", + "from": "osenv@0.1.4", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz" + }, + "path-is-absolute": { + "version": "1.0.1", + "from": "path-is-absolute@1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" + }, + "performance-now": { + "version": "0.2.0", + "from": "performance-now@0.2.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz" + }, + "process-nextick-args": { + "version": "1.0.7", + "from": "process-nextick-args@1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" + }, + "punycode": { + "version": "1.4.1", + "from": "punycode@1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz" + }, + "qs": { + "version": "6.4.0", + "from": "qs@6.4.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz" + }, + "rc": { + "version": "1.2.1", + "from": "rc@1.2.1", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz", + "dependencies": { + "minimist": { + "version": "1.2.0", + "from": "minimist@1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz" + } + } + }, + "readable-stream": { + "version": "2.2.9", + "from": "readable-stream@2.2.9", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz" + }, + "request": { + "version": "2.81.0", + "from": "request@2.81.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz" + }, + "rimraf": { + "version": "2.6.1", + "from": "rimraf@2.6.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz" + }, + "safe-buffer": { + "version": "5.0.1", + "from": "safe-buffer@5.0.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz" + }, + "semver": { + "version": "5.3.0", + "from": "semver@5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz" + }, + "set-blocking": { + "version": "2.0.0", + "from": "set-blocking@2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz" + }, + "signal-exit": { + "version": "3.0.2", + "from": "signal-exit@3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz" + }, + "sntp": { + "version": "1.0.9", + "from": "sntp@1.0.9", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz" + }, + "sshpk": { + "version": "1.13.0", + "from": "sshpk@1.13.0", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz", + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "from": "assert-plus@1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + } + } + }, + "string_decoder": { + "version": "1.0.1", + "from": "string_decoder@1.0.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz" + }, + "string-width": { + "version": "1.0.2", + "from": "string-width@1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz" + }, + "stringstream": { + "version": "0.0.5", + "from": "stringstream@0.0.5", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz" + }, + "strip-ansi": { + "version": "3.0.1", + "from": "strip-ansi@3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" + }, + "strip-json-comments": { + "version": "2.0.1", + "from": "strip-json-comments@2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz" + }, + "tar": { + "version": "2.2.1", + "from": "tar@2.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz" + }, + "tar-pack": { + "version": "3.4.0", + "from": "tar-pack@3.4.0", + "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz" + }, + "tough-cookie": { + "version": "2.3.2", + "from": "tough-cookie@2.3.2", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz" + }, + "tunnel-agent": { + "version": "0.6.0", + "from": "tunnel-agent@0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz" + }, + "tweetnacl": { + "version": "0.14.5", + "from": "tweetnacl@0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz" + }, + "uid-number": { + "version": "0.0.6", + "from": "uid-number@0.0.6", + "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz" + }, + "util-deprecate": { + "version": "1.0.2", + "from": "util-deprecate@1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + }, + "uuid": { + "version": "3.0.1", + "from": "uuid@3.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz" + }, + "verror": { + "version": "1.3.6", + "from": "verror@1.3.6", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz" + }, + "wide-align": { + "version": "1.1.2", + "from": "wide-align@1.1.2", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz" + }, + "wrappy": { + "version": "1.0.2", + "from": "wrappy@1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + } + } + }, "function-bind": { - "version": "1.1.0", + "version": "1.1.1", "from": "function-bind@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" }, "gaze": { "version": "1.1.2", "from": "gaze@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz" }, "generate-function": { "version": "2.0.0", @@ -2384,20 +2524,17 @@ "get-caller-file": { "version": "1.0.2", "from": "get-caller-file@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz" }, "get-stdin": { "version": "4.0.1", "from": "get-stdin@>=4.0.1 <5.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz" }, "getobject": { "version": "0.1.0", "from": "getobject@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz" }, "getpass": { "version": "0.1.7", @@ -2428,27 +2565,23 @@ }, "globals": { "version": "9.18.0", - "from": "globals@>=9.0.0 <10.0.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "dev": true + "from": "globals@>=9.18.0 <10.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz" }, "globby": { "version": "5.0.0", "from": "globby@>=5.0.0 <6.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz" }, "globule": { - "version": "1.1.0", + "version": "1.2.0", "from": "globule@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.1.0.tgz", - "optional": true, + "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz", "dependencies": { "lodash": { - "version": "4.16.6", - "from": "lodash@>=4.16.4 <4.17.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.6.tgz", - "optional": true + "version": "4.17.4", + "from": "lodash@>=4.17.4 <4.18.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" } } }, @@ -2457,162 +2590,42 @@ "from": "graceful-fs@>=4.1.2 <5.0.0", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz" }, - "graceful-readlink": { - "version": "1.0.1", - "from": "graceful-readlink@>=1.0.0", - "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz" - }, - "grunt": { - "version": "1.0.1", - "from": "grunt@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.1.tgz", - "dev": true, - "dependencies": { - "esprima": { - "version": "2.7.3", - "from": "esprima@^2.6.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "dev": true - }, - "glob": { - "version": "7.0.6", - "from": "glob@>=7.0.0 <7.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz", - "dev": true - }, - "js-yaml": { - "version": "3.5.5", - "from": "js-yaml@>=3.5.2 <3.6.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.5.5.tgz", - "dev": true - }, - "rimraf": { - "version": "2.2.8", - "from": "rimraf@>=2.2.8 <2.3.0", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz", - "dev": true - } - } - }, - "grunt-angular-gettext": { - "version": "2.3.5", - "from": "grunt-angular-gettext@>=2.2.3 <3.0.0", - "resolved": "https://registry.npmjs.org/grunt-angular-gettext/-/grunt-angular-gettext-2.3.5.tgz", - "dev": true - }, "grunt-browser-sync": { "version": "2.2.0", "from": "grunt-browser-sync@>=2.2.0 <3.0.0", - "resolved": "https://registry.npmjs.org/grunt-browser-sync/-/grunt-browser-sync-2.2.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/grunt-browser-sync/-/grunt-browser-sync-2.2.0.tgz" }, "grunt-cli": { "version": "1.2.0", "from": "grunt-cli@>=1.2.0 <2.0.0", - "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz", - "dev": true - }, - "grunt-concurrent": { - "version": "2.3.1", - "from": "grunt-concurrent@>=2.3.0 <3.0.0", - "resolved": "https://registry.npmjs.org/grunt-concurrent/-/grunt-concurrent-2.3.1.tgz", - "dev": true - }, - "grunt-contrib-clean": { - "version": "1.1.0", - "from": "grunt-contrib-clean@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-1.1.0.tgz", - "dev": true - }, - "grunt-contrib-concat": { - "version": "1.0.1", - "from": "grunt-contrib-concat@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-1.0.1.tgz", - "dev": true, - "dependencies": { - "source-map": { - "version": "0.5.6", - "from": "source-map@^0.5.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "dev": true - } - } - }, - "grunt-contrib-copy": { - "version": "1.0.0", - "from": "grunt-contrib-copy@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz", - "dev": true - }, - "grunt-contrib-cssmin": { - "version": "2.2.0", - "from": "grunt-contrib-cssmin@latest", - "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-2.2.0.tgz", - "dev": true - }, - "grunt-contrib-jshint": { - "version": "1.1.0", - "from": "grunt-contrib-jshint@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-1.1.0.tgz", - "dev": true - }, - "grunt-contrib-less": { - "version": "1.4.1", - "from": "grunt-contrib-less@>=1.3.0 <2.0.0", - "resolved": "https://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-1.4.1.tgz", - "dev": true, - "dependencies": { - "async": { - "version": "2.4.1", - "from": "async@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.4.1.tgz", - "dev": true - }, - "lodash": { - "version": "4.17.4", - "from": "lodash@^4.8.2", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true - } - } + "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz" }, "grunt-contrib-watch": { "version": "1.0.0", "from": "grunt-contrib-watch@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/grunt-contrib-watch/-/grunt-contrib-watch-1.0.0.tgz", - "optional": true, "dependencies": { "lodash": { "version": "3.10.1", "from": "lodash@>=3.10.1 <4.0.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz" } } }, - "grunt-extract-sourcemap": { - "version": "0.1.19", - "from": "grunt-extract-sourcemap@>=0.1.18 <0.2.0", - "resolved": "https://registry.npmjs.org/grunt-extract-sourcemap/-/grunt-extract-sourcemap-0.1.19.tgz", - "dev": true - }, "grunt-known-options": { "version": "1.1.0", "from": "grunt-known-options@>=1.1.0 <1.2.0", - "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz" }, "grunt-legacy-log": { "version": "1.0.0", "from": "grunt-legacy-log@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-1.0.0.tgz", - "dev": true, "dependencies": { "lodash": { "version": "3.10.1", "from": "lodash@>=3.10.1 <3.11.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz" } } }, @@ -2620,13 +2633,11 @@ "version": "1.0.0", "from": "grunt-legacy-log-utils@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-1.0.0.tgz", - "dev": true, "dependencies": { "lodash": { "version": "4.3.0", "from": "lodash@>=4.3.0 <4.4.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.3.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.3.0.tgz" } } }, @@ -2634,66 +2645,45 @@ "version": "1.0.0", "from": "grunt-legacy-util@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-1.0.0.tgz", - "dev": true, "dependencies": { "lodash": { "version": "4.3.0", "from": "lodash@>=4.3.0 <4.4.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.3.0.tgz", - "dev": true - } - } - }, - "grunt-newer": { - "version": "1.3.0", - "from": "grunt-newer@>=1.2.0 <2.0.0", - "resolved": "https://registry.npmjs.org/grunt-newer/-/grunt-newer-1.3.0.tgz", - "dev": true - }, - "grunt-webpack": { - "version": "1.0.18", - "from": "grunt-webpack@>=1.0.11 <2.0.0", - "resolved": "https://registry.npmjs.org/grunt-webpack/-/grunt-webpack-1.0.18.tgz", - "dev": true, - "dependencies": { - "lodash": { - "version": "4.17.4", - "from": "lodash@^4.7.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.3.0.tgz" } } }, "gzip-size": { "version": "3.0.0", "from": "gzip-size@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz" }, "handlebars": { - "version": "4.0.10", + "version": "4.0.11", "from": "handlebars@>=4.0.0 <4.1.0", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz", - "dev": true, + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", "dependencies": { "source-map": { "version": "0.4.4", "from": "source-map@>=0.4.4 <0.5.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz" } } }, + "har-schema": { + "version": "1.0.5", + "from": "har-schema@>=1.0.5 <2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz" + }, "har-validator": { - "version": "2.0.6", - "from": "har-validator@>=2.0.6 <2.1.0", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz" + "version": "4.2.1", + "from": "har-validator@>=4.2.1 <4.3.0", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz" }, "has": { "version": "1.0.1", "from": "has@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz" }, "has-ansi": { "version": "2.0.0", @@ -2725,8 +2715,7 @@ "hasha": { "version": "2.2.0", "from": "hasha@>=2.2.0 <2.3.0", - "resolved": "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz" }, "hawk": { "version": "3.1.3", @@ -2741,19 +2730,17 @@ "home-or-tmp": { "version": "2.0.0", "from": "home-or-tmp@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz" }, "hooker": { "version": "0.2.3", "from": "hooker@>=0.2.3 <0.3.0", - "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz" }, "hosted-git-info": { - "version": "2.4.2", + "version": "2.5.0", "from": "hosted-git-info@>=2.1.4 <3.0.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz" + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz" }, "htmlparser": { "version": "1.7.7", @@ -2764,45 +2751,43 @@ "version": "3.8.3", "from": "htmlparser2@>=3.8.1 <3.9.0", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", - "dev": true, "dependencies": { "domutils": { "version": "1.5.1", "from": "domutils@>=1.5.0 <1.6.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz" }, "entities": { "version": "1.0.0", "from": "entities@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz" }, "isarray": { "version": "0.0.1", "from": "isarray@0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "readable-stream": { "version": "1.1.14", "from": "readable-stream@>=1.1.0 <1.2.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz" }, "string_decoder": { "version": "0.10.31", "from": "string_decoder@>=0.10.0 <0.11.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" } } }, "http-errors": { "version": "1.5.1", "from": "http-errors@>=1.5.0 <1.6.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz" + }, + "http-parser-js": { + "version": "0.4.9", + "from": "http-parser-js@>=0.4.0", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz" }, "http-proxy": { "version": "1.15.2", @@ -2813,31 +2798,26 @@ "version": "0.17.4", "from": "http-proxy-middleware@>=0.17.1 <0.18.0", "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz", - "optional": true, "dependencies": { "http-proxy": { "version": "1.16.2", "from": "http-proxy@>=1.16.2 <2.0.0", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz" }, "is-extglob": { "version": "2.1.1", "from": "is-extglob@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz" }, "is-glob": { "version": "3.1.0", "from": "is-glob@>=3.1.0 <4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz" }, "lodash": { "version": "4.17.4", "from": "lodash@>=4.17.2 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" } } }, @@ -2849,14 +2829,12 @@ "https-browserify": { "version": "0.0.1", "from": "https-browserify@0.0.1", - "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz" }, "https-proxy-agent": { "version": "1.0.0", "from": "https-proxy-agent@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz" }, "iconv-lite": { "version": "0.4.13", @@ -2866,52 +2844,32 @@ "ieee754": { "version": "1.1.8", "from": "ieee754@>=1.1.4 <2.0.0", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz" }, "ignore": { - "version": "3.3.3", + "version": "3.3.7", "from": "ignore@>=3.2.0 <4.0.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz" }, "image-size": { - "version": "0.5.4", + "version": "0.5.5", "from": "image-size@>=0.5.0 <0.6.0", - "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.4.tgz", - "dev": true, - "optional": true + "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz" }, "immutable": { "version": "3.8.1", "from": "immutable@3.8.1", "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.1.tgz" }, - "imports-loader": { - "version": "0.6.5", - "from": "imports-loader@>=0.6.5 <0.7.0", - "resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-0.6.5.tgz", - "dev": true, - "dependencies": { - "source-map": { - "version": "0.1.43", - "from": "source-map@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "dev": true - } - } - }, "imurmurhash": { "version": "0.1.4", "from": "imurmurhash@>=0.1.4 <0.2.0", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz" }, "indent-string": { "version": "2.1.0", "from": "indent-string@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz" }, "indexof": { "version": "0.0.1", @@ -2932,27 +2890,23 @@ "version": "0.12.0", "from": "inquirer@>=0.12.0 <0.13.0", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz", - "dev": true, "dependencies": { "lodash": { "version": "4.17.4", - "from": "lodash@^4.3.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true + "from": "lodash@>=4.3.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" } } }, "interpret": { - "version": "1.0.3", + "version": "1.0.4", "from": "interpret@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz" }, "invariant": { "version": "2.2.2", - "from": "invariant@>=2.2.0 <3.0.0", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", - "dev": true + "from": "invariant@>=2.2.2 <3.0.0", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz" }, "invert-kv": { "version": "1.0.0", @@ -2960,16 +2914,14 @@ "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz" }, "ipaddr.js": { - "version": "1.3.0", - "from": "ipaddr.js@1.3.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz", - "optional": true + "version": "1.5.2", + "from": "ipaddr.js@1.5.2", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz" }, "irregular-plurals": { - "version": "1.2.0", + "version": "1.4.0", "from": "irregular-plurals@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.2.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.4.0.tgz" }, "is-arrayish": { "version": "0.2.1", @@ -2982,9 +2934,9 @@ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz" }, "is-buffer": { - "version": "1.1.5", + "version": "1.1.6", "from": "is-buffer@>=1.1.5 <2.0.0", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz" + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz" }, "is-builtin-module": { "version": "1.0.0", @@ -3014,8 +2966,7 @@ "is-finite": { "version": "1.0.2", "from": "is-finite@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz" }, "is-fullwidth-code-point": { "version": "1.0.0", @@ -3028,9 +2979,9 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz" }, "is-my-json-valid": { - "version": "2.16.0", - "from": "is-my-json-valid@>=2.12.4 <3.0.0", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz" + "version": "2.16.1", + "from": "is-my-json-valid@>=2.10.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz" }, "is-number": { "version": "2.1.0", @@ -3038,28 +2989,24 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz" }, "is-number-like": { - "version": "1.0.7", + "version": "1.0.8", "from": "is-number-like@>=1.0.3 <2.0.0", - "resolved": "https://registry.npmjs.org/is-number-like/-/is-number-like-1.0.7.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/is-number-like/-/is-number-like-1.0.8.tgz" }, "is-path-cwd": { "version": "1.0.0", "from": "is-path-cwd@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz" }, "is-path-in-cwd": { "version": "1.0.0", "from": "is-path-in-cwd@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz" }, "is-path-inside": { "version": "1.0.0", "from": "is-path-inside@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz" }, "is-posix-bracket": { "version": "0.1.1", @@ -3079,14 +3026,12 @@ "is-resolvable": { "version": "1.0.0", "from": "is-resolvable@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz" }, "is-stream": { "version": "1.1.0", "from": "is-stream@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz" }, "is-typedarray": { "version": "1.0.0", @@ -3106,14 +3051,12 @@ "isbinaryfile": { "version": "3.0.2", "from": "isbinaryfile@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz" }, "isexe": { "version": "2.0.0", "from": "isexe@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" }, "isobject": { "version": "2.1.0", @@ -3129,81 +3072,59 @@ "version": "0.4.5", "from": "istanbul@>=0.4.0 <0.5.0", "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz", - "dev": true, "dependencies": { "abbrev": { "version": "1.0.9", - "from": "abbrev@1.0.x", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", - "dev": true + "from": "abbrev@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz" }, "esprima": { "version": "2.7.3", - "from": "esprima@2.7.x", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "dev": true + "from": "esprima@>=2.7.0 <2.8.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz" }, "glob": { "version": "5.0.15", - "from": "glob@^5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "dev": true + "from": "glob@>=5.0.15 <6.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz" }, "minimist": { "version": "0.0.8", "from": "minimist@0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" }, "mkdirp": { "version": "0.5.1", - "from": "mkdirp@0.5.x", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "dev": true + "from": "mkdirp@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz" }, "supports-color": { "version": "3.2.3", "from": "supports-color@>=3.1.0 <4.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz" }, "wordwrap": { "version": "1.0.0", - "from": "wordwrap@^1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "dev": true + "from": "wordwrap@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz" } } }, "istanbul-lib-coverage": { "version": "1.1.1", "from": "istanbul-lib-coverage@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz" }, "istanbul-lib-instrument": { - "version": "1.7.2", + "version": "1.9.1", "from": "istanbul-lib-instrument@>=1.1.4 <2.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.2.tgz", - "dev": true - }, - "jasmine-core": { - "version": "2.6.2", - "from": "jasmine-core@>=2.5.2 <3.0.0", - "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.6.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz" }, "javascript-detect-element-resize": { "version": "0.5.3", "from": "javascript-detect-element-resize@>=0.5.3 <0.6.0", "resolved": "https://registry.npmjs.org/javascript-detect-element-resize/-/javascript-detect-element-resize-0.5.3.tgz" }, - "jodid25519": { - "version": "1.0.2", - "from": "jodid25519@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz", - "optional": true - }, "jquery": { "version": "2.2.4", "from": "jquery@>=2.2.4 <2.3.0", @@ -3220,27 +3141,24 @@ "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.10.5.tgz" }, "js-base64": { - "version": "2.1.9", + "version": "2.3.2", "from": "js-base64@>=2.1.9 <3.0.0", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz" }, "js-tokens": { - "version": "3.0.1", - "from": "js-tokens@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz", - "dev": true + "version": "3.0.2", + "from": "js-tokens@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz" }, "js-yaml": { - "version": "3.8.4", + "version": "3.10.0", "from": "js-yaml@>=3.2.7 <4.0.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz" + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz" }, "jsbn": { "version": "0.1.1", "from": "jsbn@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz" }, "jsdom": { "version": "0.5.7", @@ -3250,67 +3168,30 @@ "jsesc": { "version": "1.3.0", "from": "jsesc@>=1.3.0 <2.0.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz" }, "jshint": { - "version": "2.9.4", + "version": "2.9.5", "from": "jshint@>=2.9.4 <3.0.0", - "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.9.4.tgz", - "dev": true, + "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz", "dependencies": { "lodash": { "version": "3.7.0", "from": "lodash@>=3.7.0 <3.8.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz" }, "shelljs": { "version": "0.3.0", "from": "shelljs@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz" }, "strip-json-comments": { "version": "1.0.4", "from": "strip-json-comments@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz" } } }, - "jshint-loader": { - "version": "0.8.4", - "from": "jshint-loader@>=0.8.3 <0.9.0", - "resolved": "https://registry.npmjs.org/jshint-loader/-/jshint-loader-0.8.4.tgz", - "dev": true, - "dependencies": { - "loader-utils": { - "version": "1.1.0", - "from": "loader-utils@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", - "dev": true - }, - "strip-json-comments": { - "version": "0.1.3", - "from": "strip-json-comments@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz", - "dev": true - } - } - }, - "jshint-stylish": { - "version": "2.2.1", - "from": "jshint-stylish@>=2.2.0 <3.0.0", - "resolved": "https://registry.npmjs.org/jshint-stylish/-/jshint-stylish-2.2.1.tgz", - "dev": true - }, - "json-loader": { - "version": "0.5.4", - "from": "json-loader@latest", - "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz", - "dev": true - }, "json-schema": { "version": "0.2.3", "from": "json-schema@0.2.3", @@ -3318,9 +3199,8 @@ }, "json-stable-stringify": { "version": "1.0.1", - "from": "json-stable-stringify@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "dev": true + "from": "json-stable-stringify@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz" }, "json-stringify-safe": { "version": "5.0.1", @@ -3338,16 +3218,14 @@ "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz" }, "jsonfile": { - "version": "3.0.0", + "version": "3.0.1", "from": "jsonfile@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz" }, "jsonify": { "version": "0.0.0", "from": "jsonify@>=0.0.0 <0.1.0", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz" }, "jsonpointer": { "version": "4.0.1", @@ -3355,9 +3233,9 @@ "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz" }, "jsprim": { - "version": "1.4.0", + "version": "1.4.1", "from": "jsprim@>=1.2.2 <2.0.0", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", "dependencies": { "assert-plus": { "version": "1.0.0", @@ -3371,309 +3249,10 @@ "from": "jstimezonedetect@1.0.5", "resolved": "https://registry.npmjs.org/jstimezonedetect/-/jstimezonedetect-1.0.5.tgz" }, - "karma": { - "version": "1.7.0", - "from": "karma@>=1.4.1 <2.0.0", - "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.0.tgz", - "dev": true, - "dependencies": { - "after": { - "version": "0.8.2", - "from": "after@0.8.2", - "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", - "dev": true - }, - "base64id": { - "version": "1.0.0", - "from": "base64id@1.0.0", - "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz", - "dev": true - }, - "body-parser": { - "version": "1.17.2", - "from": "body-parser@>=1.16.1 <2.0.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz", - "dev": true - }, - "bytes": { - "version": "2.4.0", - "from": "bytes@2.4.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz", - "dev": true - }, - "component-emitter": { - "version": "1.2.1", - "from": "component-emitter@1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "dev": true - }, - "connect": { - "version": "3.6.2", - "from": "connect@>=3.6.0 <4.0.0", - "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.2.tgz", - "dev": true - }, - "debug": { - "version": "2.6.7", - "from": "debug@2.6.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz", - "dev": true - }, - "engine.io": { - "version": "1.8.3", - "from": "engine.io@1.8.3", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz", - "dev": true, - "dependencies": { - "debug": { - "version": "2.3.3", - "from": "debug@2.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", - "dev": true - }, - "ms": { - "version": "0.7.2", - "from": "ms@0.7.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "dev": true - } - } - }, - "engine.io-client": { - "version": "1.8.3", - "from": "engine.io-client@1.8.3", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz", - "dev": true, - "dependencies": { - "debug": { - "version": "2.3.3", - "from": "debug@2.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", - "dev": true - }, - "ms": { - "version": "0.7.2", - "from": "ms@0.7.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "dev": true - } - } - }, - "engine.io-parser": { - "version": "1.3.2", - "from": "engine.io-parser@1.3.2", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz", - "dev": true - }, - "finalhandler": { - "version": "1.0.3", - "from": "finalhandler@1.0.3", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz", - "dev": true - }, - "http-errors": { - "version": "1.6.1", - "from": "http-errors@>=1.6.1 <1.7.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz", - "dev": true - }, - "iconv-lite": { - "version": "0.4.15", - "from": "iconv-lite@0.4.15", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz", - "dev": true - }, - "mime": { - "version": "1.3.6", - "from": "mime@^1.3.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz", - "dev": true - }, - "ms": { - "version": "2.0.0", - "from": "ms@2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "dev": true - }, - "object-assign": { - "version": "4.1.0", - "from": "object-assign@4.1.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", - "dev": true - }, - "qs": { - "version": "6.4.0", - "from": "qs@6.4.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", - "dev": true - }, - "raw-body": { - "version": "2.2.0", - "from": "raw-body@>=2.2.0 <2.3.0", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz", - "dev": true - }, - "setprototypeof": { - "version": "1.0.3", - "from": "setprototypeof@1.0.3", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", - "dev": true - }, - "socket.io": { - "version": "1.7.3", - "from": "socket.io@1.7.3", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz", - "dev": true, - "dependencies": { - "debug": { - "version": "2.3.3", - "from": "debug@2.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", - "dev": true - }, - "ms": { - "version": "0.7.2", - "from": "ms@0.7.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "dev": true - } - } - }, - "socket.io-client": { - "version": "1.7.3", - "from": "socket.io-client@1.7.3", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz", - "dev": true, - "dependencies": { - "debug": { - "version": "2.3.3", - "from": "debug@2.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", - "dev": true - }, - "ms": { - "version": "0.7.2", - "from": "ms@0.7.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "dev": true - } - } - }, - "source-map": { - "version": "0.5.6", - "from": "source-map@^0.5.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "dev": true - }, - "ws": { - "version": "1.1.2", - "from": "ws@1.1.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz", - "dev": true - } - } - }, - "karma-chrome-launcher": { - "version": "1.0.1", - "from": "karma-chrome-launcher@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-1.0.1.tgz", - "dev": true - }, - "karma-coverage": { - "version": "1.1.1", - "from": "karma-coverage@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-1.1.1.tgz", - "dev": true, - "dependencies": { - "source-map": { - "version": "0.5.6", - "from": "source-map@^0.5.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "dev": true - } - } - }, - "karma-firefox-launcher": { - "version": "1.0.1", - "from": "karma-firefox-launcher@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-1.0.1.tgz", - "dev": true - }, - "karma-html2js-preprocessor": { - "version": "1.1.0", - "from": "karma-html2js-preprocessor@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/karma-html2js-preprocessor/-/karma-html2js-preprocessor-1.1.0.tgz", - "dev": true - }, - "karma-jasmine": { - "version": "1.1.0", - "from": "karma-jasmine@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.0.tgz", - "dev": true - }, - "karma-junit-reporter": { - "version": "1.2.0", - "from": "karma-junit-reporter@>=1.2.0 <2.0.0", - "resolved": "https://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-1.2.0.tgz", - "dev": true - }, - "karma-ng-html2js-preprocessor": { - "version": "1.0.0", - "from": "karma-ng-html2js-preprocessor@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/karma-ng-html2js-preprocessor/-/karma-ng-html2js-preprocessor-1.0.0.tgz", - "dev": true - }, - "karma-phantomjs-launcher": { - "version": "1.0.4", - "from": "karma-phantomjs-launcher@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.4.tgz", - "dev": true, - "dependencies": { - "lodash": { - "version": "4.17.4", - "from": "lodash@^4.0.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true - } - } - }, - "karma-sauce-launcher": { - "version": "1.1.0", - "from": "karma-sauce-launcher@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-1.1.0.tgz", - "dev": true - }, - "karma-sourcemap-loader": { - "version": "0.3.7", - "from": "karma-sourcemap-loader@>=0.3.7 <0.4.0", - "resolved": "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz", - "dev": true - }, - "karma-webpack": { - "version": "1.8.1", - "from": "karma-webpack@>=1.8.0 <2.0.0", - "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-1.8.1.tgz", - "dev": true, - "dependencies": { - "async": { - "version": "0.9.2", - "from": "async@>=0.9.0 <0.10.0", - "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", - "dev": true - }, - "source-map": { - "version": "0.1.43", - "from": "source-map@>=0.1.41 <0.2.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "dev": true - } - } - }, "kew": { "version": "0.7.0", "from": "kew@>=0.7.0 <0.8.0", - "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz" }, "kind-of": { "version": "3.2.2", @@ -3683,26 +3262,22 @@ "klaw": { "version": "1.3.1", "from": "klaw@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz" }, "lazy-cache": { "version": "1.0.4", "from": "lazy-cache@>=1.0.3 <2.0.0", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz" }, "lazy.js": { "version": "0.4.3", "from": "lazy.js@>=0.4.2 <0.5.0", - "resolved": "https://registry.npmjs.org/lazy.js/-/lazy.js-0.4.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/lazy.js/-/lazy.js-0.4.3.tgz" }, "lazystream": { "version": "1.0.0", "from": "lazystream@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz" }, "lcid": { "version": "1.0.0", @@ -3715,120 +3290,46 @@ "resolved": "https://registry.npmjs.org/legacy-loader/-/legacy-loader-0.0.2.tgz" }, "less": { - "version": "2.7.2", + "version": "2.7.3", "from": "less@>=2.7.1 <2.8.0", - "resolved": "https://registry.npmjs.org/less/-/less-2.7.2.tgz", - "dev": true, + "resolved": "https://registry.npmjs.org/less/-/less-2.7.3.tgz", "dependencies": { "mime": { - "version": "1.3.6", + "version": "1.4.1", "from": "mime@>=1.2.11 <2.0.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz", - "dev": true, - "optional": true + "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz" }, "minimist": { "version": "0.0.8", "from": "minimist@0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "dev": true, - "optional": true + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" }, "mkdirp": { "version": "0.5.1", - "from": "mkdirp@^0.5.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "dev": true, - "optional": true + "from": "mkdirp@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz" }, "source-map": { - "version": "0.5.6", - "from": "source-map@^0.5.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "dev": true, - "optional": true + "version": "0.5.7", + "from": "source-map@>=0.5.3 <0.6.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" } } }, - "less-plugin-autoprefix": { - "version": "1.5.1", - "from": "less-plugin-autoprefix@>=1.4.2 <2.0.0", - "resolved": "https://registry.npmjs.org/less-plugin-autoprefix/-/less-plugin-autoprefix-1.5.1.tgz", - "dev": true - }, "levn": { "version": "0.3.0", "from": "levn@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz" }, "limiter": { - "version": "1.1.0", + "version": "1.1.2", "from": "limiter@>=1.0.5 <2.0.0", - "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.2.tgz" }, "livereload-js": { "version": "2.2.2", "from": "livereload-js@>=2.2.0 <3.0.0", - "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.2.2.tgz", - "optional": true - }, - "load-grunt-configs": { - "version": "1.0.0", - "from": "load-grunt-configs@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/load-grunt-configs/-/load-grunt-configs-1.0.0.tgz", - "dev": true, - "dependencies": { - "ansi-regex": { - "version": "1.1.1", - "from": "ansi-regex@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz", - "dev": true - }, - "cli-width": { - "version": "1.1.1", - "from": "cli-width@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz", - "dev": true - }, - "inquirer": { - "version": "0.8.5", - "from": "inquirer@>=0.8.2 <0.9.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.8.5.tgz", - "dev": true - }, - "mute-stream": { - "version": "0.0.4", - "from": "mute-stream@0.0.4", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz", - "dev": true - }, - "readline2": { - "version": "0.1.1", - "from": "readline2@>=0.1.1 <0.2.0", - "resolved": "https://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz", - "dev": true - }, - "rx": { - "version": "2.5.3", - "from": "rx@>=2.4.3 <3.0.0", - "resolved": "https://registry.npmjs.org/rx/-/rx-2.5.3.tgz", - "dev": true - }, - "strip-ansi": { - "version": "2.0.1", - "from": "strip-ansi@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz", - "dev": true - } - } - }, - "load-grunt-tasks": { - "version": "3.5.2", - "from": "load-grunt-tasks@>=3.5.0 <4.0.0", - "resolved": "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-3.5.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.2.2.tgz" }, "load-json-file": { "version": "1.1.0", @@ -3841,16 +3342,24 @@ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz" }, "localtunnel": { - "version": "1.8.2", - "from": "localtunnel@1.8.2", - "resolved": "https://registry.npmjs.org/localtunnel/-/localtunnel-1.8.2.tgz", - "optional": true, + "version": "1.8.3", + "from": "localtunnel@1.8.3", + "resolved": "https://registry.npmjs.org/localtunnel/-/localtunnel-1.8.3.tgz", "dependencies": { + "debug": { + "version": "2.6.8", + "from": "debug@2.6.8", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz" + }, + "ms": { + "version": "2.0.0", + "from": "ms@2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" + }, "yargs": { "version": "3.29.0", "from": "yargs@3.29.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.29.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.29.0.tgz" } } }, @@ -3858,13 +3367,11 @@ "version": "2.0.0", "from": "locate-path@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "dev": true, "dependencies": { "path-exists": { "version": "3.0.0", "from": "path-exists@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz" } } }, @@ -3876,88 +3383,69 @@ "lodash.clonedeep": { "version": "4.5.0", "from": "lodash.clonedeep@>=4.3.2 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz" }, "lodash.cond": { "version": "4.5.2", "from": "lodash.cond@>=4.3.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz" }, "lodash.isfinite": { "version": "3.3.2", "from": "lodash.isfinite@>=3.3.2 <4.0.0", - "resolved": "https://registry.npmjs.org/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz", - "optional": true - }, - "lodash.tostring": { - "version": "4.1.4", - "from": "lodash.tostring@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.tostring/-/lodash.tostring-4.1.4.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz" }, "lodash.unescape": { - "version": "4.0.0", - "from": "lodash.unescape@4.0.0", - "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.0.tgz", - "dev": true + "version": "4.0.1", + "from": "lodash.unescape@4.0.1", + "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz" }, "log-symbols": { "version": "1.0.2", "from": "log-symbols@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz" }, "log4js": { "version": "0.6.38", "from": "log4js@>=0.6.31 <0.7.0", "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz", - "dev": true, "dependencies": { "isarray": { "version": "0.0.1", "from": "isarray@0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "readable-stream": { "version": "1.0.34", "from": "readable-stream@>=1.0.2 <1.1.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz" }, "semver": { "version": "4.3.6", "from": "semver@>=4.3.3 <4.4.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz" }, "string_decoder": { "version": "0.10.31", - "from": "string_decoder@~0.10.x", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "dev": true + "from": "string_decoder@>=0.10.0 <0.11.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" } } }, "longest": { "version": "1.0.1", "from": "longest@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz" }, "loose-envify": { "version": "1.3.1", "from": "loose-envify@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz" }, "loud-rejection": { "version": "1.6.0", "from": "loud-rejection@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz" }, "lr-infinite-scroll": { "version": "1.0.0", @@ -3967,26 +3455,17 @@ "lru-cache": { "version": "2.2.4", "from": "lru-cache@>=2.2.0 <2.3.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz", - "dev": true - }, - "magic-string": { - "version": "0.14.0", - "from": "magic-string@>=0.14.0 <0.15.0", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.14.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz" }, "map-obj": { "version": "1.0.1", "from": "map-obj@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz" }, "maxmin": { "version": "2.1.0", "from": "maxmin@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-2.1.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-2.1.0.tgz" }, "media-typer": { "version": "0.3.0", @@ -4001,20 +3480,17 @@ "meow": { "version": "3.7.0", "from": "meow@>=3.3.0 <4.0.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz" }, "merge-descriptors": { "version": "1.0.1", "from": "merge-descriptors@1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz" }, "methods": { "version": "1.1.2", "from": "methods@>=1.1.2 <1.2.0", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz" }, "micromatch": { "version": "2.3.11", @@ -4027,14 +3503,14 @@ "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz" }, "mime-db": { - "version": "1.27.0", - "from": "mime-db@>=1.27.0 <1.28.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz" + "version": "1.30.0", + "from": "mime-db@>=1.30.0 <1.31.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz" }, "mime-types": { - "version": "2.1.15", + "version": "2.1.17", "from": "mime-types@>=2.1.7 <2.2.0", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz" + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz" }, "minimatch": { "version": "3.0.4", @@ -4049,8 +3525,7 @@ "mkdirp": { "version": "0.3.0", "from": "mkdirp@0.3.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz" }, "moment": { "version": "2.10.6", @@ -4065,25 +3540,22 @@ "multimatch": { "version": "2.1.0", "from": "multimatch@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz" }, "mute-stream": { "version": "0.0.5", "from": "mute-stream@0.0.5", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz" }, "nan": { - "version": "2.6.2", - "from": "nan@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz" + "version": "2.7.0", + "from": "nan@>=2.3.0 <3.0.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz" }, "natural-compare": { "version": "1.4.0", "from": "natural-compare@>=1.4.0 <2.0.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz" }, "negotiator": { "version": "0.6.1", @@ -4099,59 +3571,48 @@ "version": "0.7.0", "from": "node-libs-browser@>=0.7.0 <0.8.0", "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz", - "dev": true, "dependencies": { "string_decoder": { "version": "0.10.31", - "from": "string_decoder@^0.10.25", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "dev": true + "from": "string_decoder@>=0.10.25 <0.11.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" } } }, - "node-uuid": { - "version": "1.4.8", - "from": "node-uuid@>=1.4.7 <1.5.0", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz" - }, "nopt": { "version": "3.0.6", "from": "nopt@>=3.0.0 <3.1.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz" }, "normalize-package-data": { - "version": "2.3.8", + "version": "2.4.0", "from": "normalize-package-data@>=2.3.2 <3.0.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz" + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz" }, "normalize-path": { "version": "2.1.1", - "from": "normalize-path@>=2.0.1 <3.0.0", + "from": "normalize-path@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz" }, "normalize-range": { "version": "0.1.2", "from": "normalize-range@>=0.1.2 <0.2.0", - "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz" }, "nth-check": { "version": "1.0.1", "from": "nth-check@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz" }, "null-check": { "version": "1.0.0", "from": "null-check@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz" }, "num2fraction": { "version": "1.2.2", "from": "num2fraction@>=1.2.2 <2.0.0", - "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz" }, "number-is-nan": { "version": "1.0.1", @@ -4186,8 +3647,7 @@ "object-path": { "version": "0.9.2", "from": "object-path@>=0.9.0 <0.10.0", - "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.9.2.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.9.2.tgz" }, "object.omit": { "version": "2.0.1", @@ -4202,8 +3662,7 @@ "on-headers": { "version": "1.0.1", "from": "on-headers@>=1.0.1 <1.1.0", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz" }, "once": { "version": "1.4.0", @@ -4213,26 +3672,22 @@ "onetime": { "version": "1.1.0", "from": "onetime@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz" }, "open": { "version": "0.0.5", "from": "open@0.0.5", - "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz" }, "openurl": { - "version": "1.1.0", - "from": "openurl@1.1.0", - "resolved": "https://registry.npmjs.org/openurl/-/openurl-1.1.0.tgz", - "optional": true + "version": "1.1.1", + "from": "openurl@1.1.1", + "resolved": "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz" }, "opn": { "version": "4.0.2", "from": "opn@4.0.2", - "resolved": "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz" }, "optimist": { "version": "0.6.1", @@ -4250,13 +3705,11 @@ "version": "0.8.2", "from": "optionator@>=0.8.1 <0.9.0", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "dev": true, "dependencies": { "wordwrap": { "version": "1.0.0", - "from": "wordwrap@~1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "dev": true + "from": "wordwrap@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz" } } }, @@ -4269,25 +3722,22 @@ "version": "1.0.0", "from": "original@>=0.0.5", "resolved": "https://registry.npmjs.org/original/-/original-1.0.0.tgz", - "optional": true, "dependencies": { "url-parse": { "version": "1.0.5", "from": "url-parse@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.0.5.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.0.5.tgz" } } }, "os-browserify": { "version": "0.2.1", "from": "os-browserify@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz" }, "os-homedir": { "version": "1.0.2", - "from": "os-homedir@>=1.0.1 <2.0.0", + "from": "os-homedir@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz" }, "os-locale": { @@ -4298,32 +3748,27 @@ "os-tmpdir": { "version": "1.0.2", "from": "os-tmpdir@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz" }, "p-limit": { "version": "1.1.0", "from": "p-limit@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz" }, "p-locate": { "version": "2.0.0", "from": "p-locate@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz" }, "pad-stream": { "version": "1.2.0", "from": "pad-stream@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/pad-stream/-/pad-stream-1.2.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/pad-stream/-/pad-stream-1.2.0.tgz" }, "pako": { "version": "0.2.9", "from": "pako@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz" }, "parse-glob": { "version": "3.0.4", @@ -4338,8 +3783,7 @@ "parse-ms": { "version": "1.0.1", "from": "parse-ms@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-1.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-1.0.1.tgz" }, "parsejson": { "version": "0.0.3", @@ -4357,15 +3801,14 @@ "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz" }, "parseurl": { - "version": "1.3.1", + "version": "1.3.2", "from": "parseurl@>=1.3.1 <1.4.0", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz" + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz" }, "path-browserify": { "version": "0.0.0", "from": "path-browserify@0.0.0", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz" }, "path-exists": { "version": "2.1.0", @@ -4380,14 +3823,17 @@ "path-is-inside": { "version": "1.0.2", "from": "path-is-inside@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz" + }, + "path-parse": { + "version": "1.0.5", + "from": "path-parse@>=1.0.5 <2.0.0", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz" }, "path-to-regexp": { "version": "0.1.7", "from": "path-to-regexp@0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz" }, "path-type": { "version": "1.1.0", @@ -4397,50 +3843,32 @@ "pbkdf2-compat": { "version": "2.0.1", "from": "pbkdf2-compat@2.0.1", - "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz" }, "pend": { "version": "1.2.0", "from": "pend@>=1.2.0 <1.3.0", - "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz" + }, + "performance-now": { + "version": "0.2.0", + "from": "performance-now@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz" }, "phantomjs-prebuilt": { - "version": "2.1.14", + "version": "2.1.15", "from": "phantomjs-prebuilt@>=2.1.12 <3.0.0", - "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz", - "dev": true, + "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.15.tgz", "dependencies": { "fs-extra": { "version": "1.0.0", "from": "fs-extra@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz" }, "jsonfile": { "version": "2.4.0", "from": "jsonfile@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", - "dev": true - }, - "qs": { - "version": "6.3.2", - "from": "qs@>=6.3.0 <6.4.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz", - "dev": true - }, - "request": { - "version": "2.79.0", - "from": "request@>=2.79.0 <2.80.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", - "dev": true - }, - "uuid": { - "version": "3.0.1", - "from": "uuid@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz" } } }, @@ -4462,70 +3890,59 @@ "pkg-dir": { "version": "1.0.0", "from": "pkg-dir@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz" }, "pkg-up": { "version": "1.0.0", "from": "pkg-up@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-1.0.0.tgz" }, "plur": { "version": "2.1.2", "from": "plur@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz" }, "pluralize": { "version": "1.2.1", "from": "pluralize@>=1.2.1 <2.0.0", - "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz" }, "pofile": { - "version": "1.0.8", + "version": "1.0.9", "from": "pofile@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/pofile/-/pofile-1.0.8.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/pofile/-/pofile-1.0.9.tgz" }, "portscanner": { "version": "2.1.1", "from": "portscanner@2.1.1", - "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-2.1.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-2.1.1.tgz" }, "postcss": { - "version": "5.2.17", + "version": "5.2.18", "from": "postcss@>=5.0.0 <6.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "dev": true, + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", "dependencies": { "source-map": { - "version": "0.5.6", - "from": "source-map@^0.5.6", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "dev": true + "version": "0.5.7", + "from": "source-map@>=0.5.6 <0.6.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" }, "supports-color": { "version": "3.2.3", "from": "supports-color@>=3.2.3 <4.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz" } } }, "postcss-value-parser": { "version": "3.3.0", "from": "postcss-value-parser@>=3.2.3 <4.0.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz" }, "prelude-ls": { "version": "1.1.2", "from": "prelude-ls@>=1.1.2 <1.2.0", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz" }, "preserve": { "version": "0.2.0", @@ -4535,34 +3952,29 @@ "pretty-bytes": { "version": "3.0.1", "from": "pretty-bytes@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-3.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-3.0.1.tgz" }, "pretty-ms": { "version": "2.1.0", "from": "pretty-ms@>=2.1.0 <3.0.0", "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-2.1.0.tgz", - "dev": true, "dependencies": { "plur": { "version": "1.0.0", "from": "plur@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/plur/-/plur-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/plur/-/plur-1.0.0.tgz" } } }, "private": { - "version": "0.1.7", - "from": "private@>=0.1.6 <0.2.0", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz", - "dev": true + "version": "0.1.8", + "from": "private@>=0.1.7 <0.2.0", + "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz" }, "process": { "version": "0.11.10", "from": "process@>=0.11.0 <0.12.0", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz" }, "process-nextick-args": { "version": "1.0.7", @@ -4572,21 +3984,17 @@ "progress": { "version": "1.1.8", "from": "progress@>=1.1.8 <2.0.0", - "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz" }, "promise": { - "version": "7.1.1", + "version": "7.3.1", "from": "promise@>=7.1.1 <8.0.0", - "resolved": "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz", - "dev": true, - "optional": true + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz" }, "proxy-addr": { - "version": "1.1.4", - "from": "proxy-addr@>=1.1.4 <1.2.0", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz", - "optional": true + "version": "2.0.2", + "from": "proxy-addr@>=2.0.2 <2.1.0", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz" }, "prr": { "version": "0.0.0", @@ -4596,22 +4004,12 @@ "pump": { "version": "1.0.2", "from": "pump@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz", - "dev": true, - "dependencies": { - "end-of-stream": { - "version": "1.4.0", - "from": "end-of-stream@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz", - "dev": true - } - } + "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz" }, "pumpify": { "version": "1.3.5", "from": "pumpify@>=1.3.3 <2.0.0", - "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz" }, "punycode": { "version": "1.4.1", @@ -4619,45 +4017,58 @@ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz" }, "q": { - "version": "1.5.0", - "from": "q@>=1.4.1 <2.0.0", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz", - "dev": true + "version": "1.5.1", + "from": "q@>=1.5.0 <2.0.0", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz" }, "qjobs": { "version": "1.1.5", "from": "qjobs@>=1.1.4 <2.0.0", - "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz" }, "qs": { "version": "6.2.1", "from": "qs@6.2.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz" }, "querystring": { "version": "0.2.0", "from": "querystring@0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz" }, "querystring-es3": { "version": "0.2.1", "from": "querystring-es3@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz" }, "querystringify": { "version": "0.0.4", "from": "querystringify@>=0.0.0 <0.1.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-0.0.4.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-0.0.4.tgz" }, "randomatic": { - "version": "1.1.6", + "version": "1.1.7", "from": "randomatic@>=1.1.3 <2.0.0", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz" + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", + "dependencies": { + "is-number": { + "version": "3.0.0", + "from": "is-number@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "dependencies": { + "kind-of": { + "version": "3.2.2", + "from": "kind-of@^3.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + } + } + }, + "kind-of": { + "version": "4.0.0", + "from": "kind-of@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz" + } + } }, "range-parser": { "version": "1.2.0", @@ -4668,33 +4079,28 @@ "version": "2.1.7", "from": "raw-body@>=2.1.5 <2.2.0", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz", - "optional": true, "dependencies": { "bytes": { "version": "2.4.0", "from": "bytes@2.4.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz" } } }, "rcfinder": { "version": "0.1.9", "from": "rcfinder@>=0.1.6 <0.2.0", - "resolved": "https://registry.npmjs.org/rcfinder/-/rcfinder-0.1.9.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/rcfinder/-/rcfinder-0.1.9.tgz" }, "rcloader": { "version": "0.1.2", "from": "rcloader@0.1.2", "resolved": "https://registry.npmjs.org/rcloader/-/rcloader-0.1.2.tgz", - "dev": true, "dependencies": { "lodash": { "version": "2.4.2", "from": "lodash@>=2.4.1 <2.5.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz" } } }, @@ -4709,9 +4115,9 @@ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz" }, "readable-stream": { - "version": "2.2.11", + "version": "2.3.3", "from": "readable-stream@>=2.0.2 <3.0.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz" + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz" }, "readdirp": { "version": "2.1.0", @@ -4721,14 +4127,12 @@ "readline2": { "version": "1.0.1", "from": "readline2@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz" }, "rechoir": { "version": "0.6.2", "from": "rechoir@>=0.6.2 <0.7.0", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz" }, "reconnectingwebsocket": { "version": "1.0.0", @@ -4738,62 +4142,54 @@ "redent": { "version": "1.0.0", "from": "redent@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz" }, "regenerate": { - "version": "1.3.2", + "version": "1.3.3", "from": "regenerate@>=1.2.1 <2.0.0", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz" }, "regenerator-runtime": { - "version": "0.10.5", - "from": "regenerator-runtime@>=0.10.0 <0.11.0", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz", - "dev": true + "version": "0.11.0", + "from": "regenerator-runtime@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz" }, "regenerator-transform": { - "version": "0.9.11", - "from": "regenerator-transform@0.9.11", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.9.11.tgz", - "dev": true + "version": "0.10.1", + "from": "regenerator-transform@>=0.10.0 <0.11.0", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz" }, "regex-cache": { - "version": "0.4.3", + "version": "0.4.4", "from": "regex-cache@>=0.4.2 <0.5.0", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz" + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz" }, "regexpu-core": { "version": "2.0.0", "from": "regexpu-core@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz" }, "regjsgen": { "version": "0.2.0", "from": "regjsgen@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz" }, "regjsparser": { "version": "0.1.5", "from": "regjsparser@>=0.1.4 <0.2.0", "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", - "dev": true, "dependencies": { "jsesc": { "version": "0.5.0", "from": "jsesc@>=0.5.0 <0.6.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz" } } }, "remove-trailing-separator": { - "version": "1.0.1", + "version": "1.1.0", "from": "remove-trailing-separator@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz" + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz" }, "repeat-element": { "version": "1.1.2", @@ -4808,32 +4204,29 @@ "repeating": { "version": "2.0.1", "from": "repeating@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz" }, "request": { - "version": "2.78.0", - "from": "request@2.78.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.78.0.tgz", + "version": "2.81.0", + "from": "request@2.81.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", "dependencies": { "qs": { - "version": "6.3.2", - "from": "qs@>=6.3.0 <6.4.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz" + "version": "6.4.0", + "from": "qs@>=6.4.0 <6.5.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz" } } }, "request-progress": { "version": "2.0.1", "from": "request-progress@>=2.0.1 <2.1.0", - "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz" }, "require-directory": { "version": "2.1.1", "from": "require-directory@>=2.1.1 <3.0.0", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz" }, "require-main-filename": { "version": "1.0.1", @@ -4843,8 +4236,7 @@ "require-uncached": { "version": "1.0.3", "from": "require-uncached@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz" }, "requires-port": { "version": "1.0.0", @@ -4854,58 +4246,49 @@ "resolve": { "version": "1.1.7", "from": "resolve@>=1.1.0 <1.2.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz" }, "resolve-from": { "version": "1.0.1", "from": "resolve-from@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz" }, "resolve-pkg": { "version": "0.1.0", "from": "resolve-pkg@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/resolve-pkg/-/resolve-pkg-0.1.0.tgz", - "dev": true, "dependencies": { "resolve-from": { "version": "2.0.0", "from": "resolve-from@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz" } } }, "resp-modifier": { "version": "6.0.2", "from": "resp-modifier@6.0.2", - "resolved": "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz" }, "restore-cursor": { "version": "1.0.1", "from": "restore-cursor@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz" }, "right-align": { "version": "0.1.3", "from": "right-align@>=0.1.1 <0.2.0", - "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz" }, "rimraf": { - "version": "2.6.1", + "version": "2.6.2", "from": "rimraf@>=2.2.8 <3.0.0", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz" }, "ripemd160": { "version": "0.2.0", "from": "ripemd160@0.2.0", - "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz" }, "rrule": { "version": "2.2.0-dev", @@ -4915,137 +4298,108 @@ "run-async": { "version": "0.1.0", "from": "run-async@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz" }, "rx": { "version": "4.1.0", "from": "rx@4.1.0", - "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz" }, "rx-lite": { "version": "3.1.2", "from": "rx-lite@>=3.1.2 <4.0.0", - "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz" }, "safe-buffer": { - "version": "5.0.1", - "from": "safe-buffer@>=5.0.1 <5.1.0", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz" + "version": "5.1.1", + "from": "safe-buffer@>=5.1.1 <5.2.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz" }, "sauce-connect-launcher": { - "version": "0.17.0", - "from": "sauce-connect-launcher@>=0.17.0 <0.18.0", - "resolved": "https://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.17.0.tgz", - "dev": true, + "version": "1.2.3", + "from": "sauce-connect-launcher@>=1.2.2 <2.0.0", + "resolved": "https://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-1.2.3.tgz", "dependencies": { "async": { - "version": "1.4.0", - "from": "async@1.4.0", - "resolved": "https://registry.npmjs.org/async/-/async-1.4.0.tgz", - "dev": true - }, - "glob": { - "version": "5.0.15", - "from": "glob@^5.0.14", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "dev": true + "version": "2.5.0", + "from": "async@>=2.1.2 <3.0.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz" }, "lodash": { - "version": "3.10.1", - "from": "lodash@3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "dev": true - }, - "rimraf": { - "version": "2.4.3", - "from": "rimraf@2.4.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz", - "dev": true + "version": "4.17.4", + "from": "lodash@>=4.16.6 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" } } }, "saucelabs": { "version": "1.4.0", - "from": "saucelabs@>=1.3.0 <2.0.0", - "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.4.0.tgz", - "dev": true + "from": "saucelabs@>=1.4.0 <2.0.0", + "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.4.0.tgz" }, "select2": { - "version": "4.0.3", + "version": "4.0.5", "from": "select2@>=4.0.2 <5.0.0", - "resolved": "https://registry.npmjs.org/select2/-/select2-4.0.3.tgz" + "resolved": "https://registry.npmjs.org/select2/-/select2-4.0.5.tgz" }, "semver": { - "version": "5.3.0", + "version": "5.4.1", "from": "semver@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0||>=4.0.0 <5.0.0||>=5.0.0 <6.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz" + "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz" }, "send": { "version": "0.15.2", "from": "send@0.15.2", "resolved": "https://registry.npmjs.org/send/-/send-0.15.2.tgz", - "optional": true, "dependencies": { "debug": { "version": "2.6.4", "from": "debug@2.6.4", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.4.tgz", - "optional": true, "dependencies": { "ms": { "version": "0.7.3", "from": "ms@0.7.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz" } } }, "fresh": { "version": "0.5.0", "from": "fresh@0.5.0", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz" }, "http-errors": { - "version": "1.6.1", + "version": "1.6.2", "from": "http-errors@>=1.6.1 <1.7.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz" }, "mime": { "version": "1.3.4", "from": "mime@1.3.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz" }, "ms": { "version": "1.0.0", "from": "ms@1.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-1.0.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/ms/-/ms-1.0.0.tgz" }, "setprototypeof": { "version": "1.0.3", "from": "setprototypeof@1.0.3", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz" } } }, "serve-index": { "version": "1.8.0", "from": "serve-index@1.8.0", - "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.8.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.8.0.tgz" }, "serve-static": { "version": "1.12.2", "from": "serve-static@1.12.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.2.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.2.tgz" }, "server-destroy": { "version": "1.0.1", @@ -5055,8 +4409,7 @@ "set-blocking": { "version": "2.0.0", "from": "set-blocking@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz" }, "set-immediate-shim": { "version": "1.0.1", @@ -5066,44 +4419,37 @@ "setimmediate": { "version": "1.0.5", "from": "setimmediate@>=1.0.4 <2.0.0", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz" }, "setprototypeof": { "version": "1.0.2", "from": "setprototypeof@1.0.2", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz" }, "sha.js": { "version": "2.2.6", "from": "sha.js@2.2.6", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz" }, "shelljs": { "version": "0.7.8", "from": "shelljs@>=0.7.5 <0.8.0", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz" }, "signal-exit": { "version": "3.0.2", "from": "signal-exit@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz" }, "slash": { "version": "1.0.0", "from": "slash@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz" }, "slice-ansi": { "version": "0.0.4", "from": "slice-ansi@0.0.4", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz" }, "sntp": { "version": "1.0.9", @@ -5114,25 +4460,21 @@ "version": "1.6.0", "from": "socket.io@1.6.0", "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz", - "optional": true, "dependencies": { "debug": { "version": "2.3.3", "from": "debug@2.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz" }, "ms": { "version": "0.7.2", "from": "ms@0.7.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz" }, "object-assign": { "version": "4.1.0", "from": "object-assign@4.1.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" } } }, @@ -5188,42 +4530,36 @@ } }, "sockjs": { - "version": "0.3.18", + "version": "0.3.19", "from": "sockjs@>=0.3.15 <0.4.0", - "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.18.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz" }, "sockjs-client": { "version": "1.1.4", "from": "sockjs-client@>=1.0.3 <2.0.0", "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz", - "optional": true, "dependencies": { "debug": { - "version": "2.6.8", + "version": "2.6.9", "from": "debug@>=2.6.6 <3.0.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" }, "faye-websocket": { "version": "0.11.1", "from": "faye-websocket@>=0.11.0 <0.12.0", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz" }, "ms": { "version": "2.0.0", "from": "ms@2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" } } }, "source-list-map": { "version": "0.1.8", "from": "source-list-map@>=0.1.7 <0.2.0", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz" }, "source-map": { "version": "0.3.0", @@ -5231,16 +4567,14 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz" }, "source-map-support": { - "version": "0.4.15", - "from": "source-map-support@>=0.4.2 <0.5.0", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz", - "dev": true, + "version": "0.4.18", + "from": "source-map-support@>=0.4.15 <0.5.0", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", "dependencies": { "source-map": { - "version": "0.5.6", - "from": "source-map@^0.5.6", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "dev": true + "version": "0.5.7", + "from": "source-map@>=0.5.6 <0.6.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" } } }, @@ -5262,8 +4596,7 @@ "split2": { "version": "1.1.1", "from": "split2@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/split2/-/split2-1.1.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/split2/-/split2-1.1.1.tgz" }, "sprintf-js": { "version": "1.1.1", @@ -5271,9 +4604,9 @@ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz" }, "sshpk": { - "version": "1.13.0", + "version": "1.13.1", "from": "sshpk@>=1.7.0 <2.0.0", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", "dependencies": { "assert-plus": { "version": "1.0.0", @@ -5290,43 +4623,37 @@ "stream-browserify": { "version": "2.0.1", "from": "stream-browserify@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz" }, "stream-cache": { "version": "0.0.2", "from": "stream-cache@>=0.0.1 <0.1.0", - "resolved": "https://registry.npmjs.org/stream-cache/-/stream-cache-0.0.2.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/stream-cache/-/stream-cache-0.0.2.tgz" }, "stream-http": { - "version": "2.7.1", + "version": "2.7.2", "from": "stream-http@>=2.3.1 <3.0.0", - "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz" }, "stream-shift": { "version": "1.0.0", "from": "stream-shift@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz" }, "stream-throttle": { "version": "0.1.3", "from": "stream-throttle@>=0.1.3 <0.2.0", - "resolved": "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz" }, "string_decoder": { - "version": "1.0.2", - "from": "string_decoder@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.2.tgz" + "version": "1.0.3", + "from": "string_decoder@>=1.0.3 <1.1.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz" }, "string-length": { "version": "1.0.1", "from": "string-length@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz" }, "string-width": { "version": "1.0.2", @@ -5351,14 +4678,12 @@ "strip-indent": { "version": "1.0.1", "from": "strip-indent@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz" }, "strip-json-comments": { "version": "2.0.1", "from": "strip-json-comments@>=2.0.1 <2.1.0", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz" }, "supports-color": { "version": "2.0.0", @@ -5369,93 +4694,88 @@ "version": "3.8.3", "from": "table@>=3.7.8 <4.0.0", "resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz", - "dev": true, "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "from": "ansi-regex@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz" + }, "is-fullwidth-code-point": { "version": "2.0.0", "from": "is-fullwidth-code-point@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz" }, "lodash": { "version": "4.17.4", - "from": "lodash@^4.0.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true + "from": "lodash@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" }, "string-width": { - "version": "2.0.0", + "version": "2.1.1", "from": "string-width@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz" + }, + "strip-ansi": { + "version": "4.0.0", + "from": "strip-ansi@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz" } } }, "tapable": { "version": "0.1.10", "from": "tapable@>=0.1.8 <0.2.0", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz" }, "tar-stream": { "version": "1.5.4", "from": "tar-stream@>=1.5.0 <2.0.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.4.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.4.tgz" }, "test-exclude": { "version": "2.1.3", "from": "test-exclude@>=2.1.1 <3.0.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-2.1.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-2.1.3.tgz" }, "text-table": { "version": "0.2.0", "from": "text-table@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz" }, "tfunk": { "version": "3.1.0", "from": "tfunk@>=3.0.1 <4.0.0", - "resolved": "https://registry.npmjs.org/tfunk/-/tfunk-3.1.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/tfunk/-/tfunk-3.1.0.tgz" }, "throttleit": { "version": "1.0.0", "from": "throttleit@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz" }, "through": { "version": "2.3.8", "from": "through@>=2.3.6 <3.0.0", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz" }, "through2": { "version": "2.0.3", "from": "through2@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz" }, - "time-grunt": { - "version": "1.4.0", - "from": "time-grunt@>=1.4.0 <2.0.0", - "resolved": "https://registry.npmjs.org/time-grunt/-/time-grunt-1.4.0.tgz", - "dev": true + "time-stamp": { + "version": "2.0.0", + "from": "time-stamp@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-2.0.0.tgz" }, "time-zone": { "version": "0.1.0", "from": "time-zone@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/time-zone/-/time-zone-0.1.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/time-zone/-/time-zone-0.1.0.tgz" }, "timers-browserify": { - "version": "2.0.2", + "version": "2.0.4", "from": "timers-browserify@>=2.0.2 <3.0.0", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz" }, "timezone-js": { "version": "0.4.14", @@ -5466,21 +4786,18 @@ "version": "0.2.1", "from": "tiny-lr@>=0.2.1 <0.3.0", "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-0.2.1.tgz", - "optional": true, "dependencies": { "qs": { "version": "5.1.0", "from": "qs@>=5.1.0 <5.2.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz" } } }, "tmp": { "version": "0.0.31", "from": "tmp@0.0.31", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz" }, "to-array": { "version": "0.1.4", @@ -5490,60 +4807,52 @@ "to-arraybuffer": { "version": "1.0.1", "from": "to-arraybuffer@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz" }, "to-fast-properties": { "version": "1.0.3", - "from": "to-fast-properties@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "dev": true + "from": "to-fast-properties@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz" }, "tough-cookie": { - "version": "2.3.2", + "version": "2.3.3", "from": "tough-cookie@>=2.3.0 <2.4.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz" + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz" }, "trim-newlines": { "version": "1.0.0", "from": "trim-newlines@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz" }, "trim-right": { "version": "1.0.1", "from": "trim-right@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz" }, "tryit": { "version": "1.0.3", "from": "tryit@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz" }, "tty-browserify": { "version": "0.0.0", "from": "tty-browserify@0.0.0", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz" }, "tunnel-agent": { - "version": "0.4.3", - "from": "tunnel-agent@>=0.4.1 <0.5.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz" + "version": "0.6.0", + "from": "tunnel-agent@>=0.6.0 <0.7.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz" }, "tweetnacl": { "version": "0.14.5", "from": "tweetnacl@>=0.14.0 <0.15.0", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz" }, "type-check": { "version": "0.3.2", "from": "type-check@>=0.3.2 <0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz" }, "type-is": { "version": "1.6.15", @@ -5553,76 +4862,66 @@ "typedarray": { "version": "0.0.6", "from": "typedarray@>=0.0.6 <0.0.7", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz" }, "typescript": { - "version": "2.0.10", - "from": "typescript@>=2.0.3 <2.1.0", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz", - "dev": true + "version": "2.3.4", + "from": "typescript@>=2.3.2 <2.4.0", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz" }, "typescript-eslint-parser": { - "version": "1.0.3", - "from": "typescript-eslint-parser@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/typescript-eslint-parser/-/typescript-eslint-parser-1.0.3.tgz", - "dev": true + "version": "3.0.0", + "from": "typescript-eslint-parser@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/typescript-eslint-parser/-/typescript-eslint-parser-3.0.0.tgz", + "dependencies": { + "semver": { + "version": "5.3.0", + "from": "semver@5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz" + } + } }, "ua-parser-js": { "version": "0.7.12", "from": "ua-parser-js@0.7.12", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.12.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.12.tgz" }, "uglify-js": { - "version": "2.8.28", + "version": "2.8.29", "from": "uglify-js@>=2.6.0 <3.0.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.28.tgz", - "dev": true, - "optional": true, + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", "dependencies": { "cliui": { "version": "2.1.0", "from": "cliui@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "dev": true, - "optional": true + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz" }, "source-map": { - "version": "0.5.6", - "from": "source-map@~0.5.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "dev": true, - "optional": true + "version": "0.5.7", + "from": "source-map@>=0.5.1 <0.6.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" }, "window-size": { "version": "0.1.0", "from": "window-size@0.1.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "dev": true, - "optional": true + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz" }, "wordwrap": { "version": "0.0.2", "from": "wordwrap@0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "dev": true, - "optional": true + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz" }, "yargs": { "version": "3.10.0", "from": "yargs@>=3.10.0 <3.11.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "dev": true, - "optional": true + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz" } } }, "uglify-to-browserify": { "version": "1.0.2", "from": "uglify-to-browserify@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz" }, "ultron": { "version": "1.0.2", @@ -5632,20 +4931,17 @@ "underscore": { "version": "1.7.0", "from": "underscore@>=1.7.0 <1.8.0", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz" }, "underscore.string": { "version": "3.2.3", "from": "underscore.string@>=3.2.3 <3.3.0", - "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.2.3.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.2.3.tgz" }, "universalify": { - "version": "0.1.0", + "version": "0.1.1", "from": "universalify@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz" }, "unpipe": { "version": "1.0.0", @@ -5656,13 +4952,11 @@ "version": "0.11.0", "from": "url@>=0.11.0 <0.12.0", "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "dev": true, "dependencies": { "punycode": { "version": "1.3.2", "from": "punycode@1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz" } } }, @@ -5670,39 +4964,33 @@ "version": "1.1.9", "from": "url-parse@>=1.1.8 <2.0.0", "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.1.9.tgz", - "optional": true, "dependencies": { "querystringify": { "version": "1.0.0", "from": "querystringify@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-1.0.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-1.0.0.tgz" } } }, "user-home": { "version": "2.0.0", "from": "user-home@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz" }, "useragent": { - "version": "2.1.13", + "version": "2.2.1", "from": "useragent@>=2.1.12 <3.0.0", - "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.1.13.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz" }, "util": { "version": "0.10.3", "from": "util@>=0.10.3 <0.11.0", "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "dev": true, "dependencies": { "inherits": { "version": "2.0.1", "from": "inherits@2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, @@ -5717,10 +5005,9 @@ "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz" }, "uuid": { - "version": "2.0.3", - "from": "uuid@>=2.0.2 <3.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", - "optional": true + "version": "3.1.0", + "from": "uuid@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz" }, "validate-npm-package-license": { "version": "3.0.1", @@ -5730,198 +5017,111 @@ "vargs": { "version": "0.1.0", "from": "vargs@0.1.0", - "resolved": "https://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz" }, "vary": { - "version": "1.1.1", - "from": "vary@>=1.1.0 <1.2.0", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz" + "version": "1.1.2", + "from": "vary@>=1.1.2 <1.2.0", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz" }, "verror": { - "version": "1.3.6", - "from": "verror@1.3.6", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz" - }, - "vlq": { - "version": "0.2.2", - "from": "vlq@>=0.2.1 <0.3.0", - "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.2.tgz", - "optional": true + "version": "1.10.0", + "from": "verror@1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "from": "assert-plus@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + } + } }, "vm-browserify": { "version": "0.0.4", "from": "vm-browserify@0.0.4", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz" }, "void-elements": { "version": "2.0.1", "from": "void-elements@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz" }, "walkdir": { "version": "0.0.11", "from": "walkdir@>=0.0.11 <0.0.12", - "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz" }, "watchpack": { "version": "0.2.9", "from": "watchpack@>=0.2.1 <0.3.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz", - "dev": true, "dependencies": { "async": { "version": "0.9.2", "from": "async@>=0.9.0 <0.10.0", - "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz" } } }, "wd": { - "version": "1.2.0", - "from": "wd@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/wd/-/wd-1.2.0.tgz", - "dev": true, + "version": "1.4.1", + "from": "wd@>=1.4.0 <2.0.0", + "resolved": "https://registry.npmjs.org/wd/-/wd-1.4.1.tgz", "dependencies": { "async": { "version": "2.0.1", "from": "async@2.0.1", - "resolved": "https://registry.npmjs.org/async/-/async-2.0.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/async/-/async-2.0.1.tgz" + }, + "caseless": { + "version": "0.11.0", + "from": "caseless@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz" + }, + "har-validator": { + "version": "2.0.6", + "from": "har-validator@>=2.0.6 <2.1.0", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz" }, "lodash": { "version": "4.16.2", "from": "lodash@4.16.2", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.2.tgz" }, "minimist": { "version": "0.0.8", "from": "minimist@0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" }, "mkdirp": { "version": "0.5.1", - "from": "mkdirp@^0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "dev": true + "from": "mkdirp@>=0.5.1 <0.6.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz" }, "q": { "version": "1.4.1", "from": "q@1.4.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz" }, "qs": { "version": "6.3.2", "from": "qs@>=6.3.0 <6.4.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz" }, "request": { "version": "2.79.0", "from": "request@2.79.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz" + }, + "tunnel-agent": { + "version": "0.4.3", + "from": "tunnel-agent@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz" }, "underscore.string": { "version": "3.3.4", "from": "underscore.string@3.3.4", - "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.4.tgz", - "dev": true - }, - "uuid": { - "version": "3.0.1", - "from": "uuid@^3.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz", - "dev": true - } - } - }, - "webpack": { - "version": "1.15.0", - "from": "webpack@>=1.13.1 <2.0.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-1.15.0.tgz", - "dev": true, - "dependencies": { - "cliui": { - "version": "2.1.0", - "from": "cliui@^2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "dev": true - }, - "interpret": { - "version": "0.6.6", - "from": "interpret@>=0.6.4 <0.7.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz", - "dev": true - }, - "memory-fs": { - "version": "0.3.0", - "from": "memory-fs@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz", - "dev": true - }, - "minimist": { - "version": "0.0.8", - "from": "minimist@0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "from": "mkdirp@~0.5.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "dev": true - }, - "source-map": { - "version": "0.5.6", - "from": "source-map@~0.5.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "from": "supports-color@>=3.1.0 <4.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "dev": true - }, - "uglify-js": { - "version": "2.7.5", - "from": "uglify-js@>=2.7.3 <2.8.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz", - "dev": true, - "dependencies": { - "async": { - "version": "0.2.10", - "from": "async@>=0.2.6 <0.3.0", - "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", - "dev": true - } - } - }, - "window-size": { - "version": "0.1.0", - "from": "window-size@0.1.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "dev": true - }, - "wordwrap": { - "version": "0.0.2", - "from": "wordwrap@0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "dev": true - }, - "yargs": { - "version": "3.10.0", - "from": "yargs@~3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.4.tgz" } } }, @@ -5929,25 +5129,23 @@ "version": "0.6.9", "from": "webpack-core@>=0.6.9 <0.7.0", "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz", - "dev": true, "dependencies": { "source-map": { "version": "0.4.4", "from": "source-map@>=0.4.1 <0.5.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz" } } }, "webpack-dev-middleware": { - "version": "1.10.2", + "version": "1.12.0", "from": "webpack-dev-middleware@>=1.10.2 <2.0.0", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.10.2.tgz", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz", "dependencies": { "mime": { - "version": "1.3.6", + "version": "1.4.1", "from": "mime@>=1.3.4 <2.0.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz" + "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz" } } }, @@ -5955,39 +5153,58 @@ "version": "1.16.5", "from": "webpack-dev-server@>=1.14.1 <2.0.0", "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-1.16.5.tgz", - "optional": true, "dependencies": { + "body-parser": { + "version": "1.18.2", + "from": "body-parser@1.18.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz" + }, + "bytes": { + "version": "3.0.0", + "from": "bytes@3.0.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz" + }, "debug": { - "version": "2.6.7", - "from": "debug@2.6.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz" + "version": "2.6.9", + "from": "debug@2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" }, "express": { - "version": "4.15.3", + "version": "4.16.2", "from": "express@>=4.13.3 <5.0.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.15.3.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz" }, "finalhandler": { - "version": "1.0.3", - "from": "finalhandler@>=1.0.3 <1.1.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz", - "optional": true + "version": "1.1.0", + "from": "finalhandler@1.1.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz" }, "fresh": { - "version": "0.5.0", - "from": "fresh@0.5.0", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz" + "version": "0.5.2", + "from": "fresh@0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz" }, "http-errors": { - "version": "1.6.1", - "from": "http-errors@>=1.6.1 <1.7.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz" + "version": "1.6.2", + "from": "http-errors@>=1.6.2 <1.7.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz", + "dependencies": { + "setprototypeof": { + "version": "1.0.3", + "from": "setprototypeof@1.0.3", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz" + } + } + }, + "iconv-lite": { + "version": "0.4.19", + "from": "iconv-lite@0.4.19", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz" }, "mime": { - "version": "1.3.4", - "from": "mime@1.3.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz" + "version": "1.4.1", + "from": "mime@1.4.1", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz" }, "ms": { "version": "2.0.0", @@ -5995,68 +5212,71 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" }, "qs": { - "version": "6.4.0", - "from": "qs@6.4.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", - "optional": true + "version": "6.5.1", + "from": "qs@6.5.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz" + }, + "raw-body": { + "version": "2.3.2", + "from": "raw-body@2.3.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz" }, "send": { - "version": "0.15.3", - "from": "send@0.15.3", - "resolved": "https://registry.npmjs.org/send/-/send-0.15.3.tgz" + "version": "0.16.1", + "from": "send@0.16.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz" }, "serve-static": { - "version": "1.12.3", - "from": "serve-static@1.12.3", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz", - "optional": true + "version": "1.13.1", + "from": "serve-static@1.13.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz" }, "setprototypeof": { - "version": "1.0.3", - "from": "setprototypeof@1.0.3", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz" + "version": "1.1.0", + "from": "setprototypeof@1.1.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz" }, "supports-color": { "version": "3.2.3", "from": "supports-color@>=3.1.1 <4.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz" + }, + "utils-merge": { + "version": "1.0.1", + "from": "utils-merge@1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz" } } }, "websocket-driver": { - "version": "0.6.5", + "version": "0.7.0", "from": "websocket-driver@>=0.5.1", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz" + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz" }, "websocket-extensions": { - "version": "0.1.1", + "version": "0.1.2", "from": "websocket-extensions@>=0.1.1", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz" + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz" }, "weinre": { "version": "2.0.0-pre-I0Z7U9OV", "from": "weinre@>=2.0.0-pre-I0Z7U9OV <3.0.0", - "resolved": "https://registry.npmjs.org/weinre/-/weinre-2.0.0-pre-I0Z7U9OV.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/weinre/-/weinre-2.0.0-pre-I0Z7U9OV.tgz" }, "which": { "version": "1.2.14", "from": "which@>=1.2.0 <1.3.0", - "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz" }, "which-module": { "version": "1.0.0", "from": "which-module@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz" }, "window-size": { "version": "0.1.4", "from": "window-size@>=0.1.2 <0.2.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz" }, "wordwrap": { "version": "0.0.3", @@ -6077,19 +5297,16 @@ "version": "0.2.1", "from": "write@>=0.2.1 <0.3.0", "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz", - "dev": true, "dependencies": { "minimist": { "version": "0.0.8", "from": "minimist@0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" }, "mkdirp": { "version": "0.5.1", - "from": "mkdirp@^0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "dev": true + "from": "mkdirp@>=0.5.1 <0.6.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz" } } }, @@ -6106,8 +5323,7 @@ "xmlbuilder": { "version": "8.2.2", "from": "xmlbuilder@8.2.2", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz" }, "xmlhttprequest-ssl": { "version": "1.5.3", @@ -6128,19 +5344,16 @@ "version": "6.4.0", "from": "yargs@6.4.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.4.0.tgz", - "optional": true, "dependencies": { "camelcase": { "version": "3.0.0", "from": "camelcase@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz" }, "window-size": { "version": "0.2.0", "from": "window-size@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz" } } }, @@ -6148,21 +5361,18 @@ "version": "4.2.1", "from": "yargs-parser@>=4.1.0 <5.0.0", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", - "optional": true, "dependencies": { "camelcase": { "version": "3.0.0", "from": "camelcase@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "optional": true + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz" } } }, "yauzl": { "version": "2.4.1", "from": "yauzl@2.4.1", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz", - "dev": true + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz" }, "yeast": { "version": "0.1.2", @@ -6170,16 +5380,14 @@ "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz" }, "zip-stream": { - "version": "1.1.1", + "version": "1.2.0", "from": "zip-stream@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.1.1.tgz", - "dev": true, + "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz", "dependencies": { "lodash": { "version": "4.17.4", - "from": "lodash@^4.8.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "dev": true + "from": "lodash@>=4.8.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" } } } diff --git a/awx/ui/package.json b/awx/ui/package.json index cbb998b181..c4154a7fc1 100644 --- a/awx/ui/package.json +++ b/awx/ui/package.json @@ -30,6 +30,7 @@ "component-dev": "./node_modules/.bin/karma start client/test/karma.conf.js --auto-watch --no-single-run" }, "optionalDependencies": { + "fsevents": "*", "browser-sync": "^2.14.0", "grunt-browser-sync": "^2.2.0", "grunt-contrib-watch": "^1.0.0", @@ -88,7 +89,7 @@ "dependencies": { "angular": "~1.4.14", "angular-breadcrumb": "github:ansible/angular-breadcrumb#0.4.1", - "angular-codemirror": "github:ansible/angular-codemirror#1.0.4", + "angular-codemirror": "github:ansible/angular-codemirror#release_3.2.2", "angular-cookies": "~1.4.14", "angular-drag-and-drop-lists": "github:ansible/angular-drag-and-drop-lists#1.4.0", "angular-duration-format": "^1.0.1", @@ -97,8 +98,8 @@ "angular-moment": "^0.10.1", "angular-resource": "~1.4.14", "angular-sanitize": "~1.4.14", - "angular-scheduler": "github:ansible/angular-scheduler#0.1.1", - "angular-tz-extensions": "github:ansible/angular-tz-extensions#0.3.13", + "angular-scheduler": "github:ansible/angular-scheduler#release_3.2.2", + "angular-tz-extensions": "github:ansible/angular-tz-extensions#release_3.2.2", "angular-ui-router": "1.0.0-beta.3", "bootstrap": "^3.1.1", "bootstrap-datepicker": "^1.4.0", From 8d2ab3de4275e8d6e3a7a7f1c47aaf7473b09be1 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Fri, 27 Oct 2017 13:26:22 -0400 Subject: [PATCH 080/141] improve the callback worker's ability to deal with idle/disconnected DB if database connectivity is lost, callback workers currently raise an uncaught exception and hang; this can cause the entire process to stop handling callback events see: https://github.com/ansible/ansible-tower/issues/7660 --- .../commands/run_callback_receiver.py | 42 ++++++++++++++++--- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/awx/main/management/commands/run_callback_receiver.py b/awx/main/management/commands/run_callback_receiver.py index 9539a01762..3d311ef3d6 100644 --- a/awx/main/management/commands/run_callback_receiver.py +++ b/awx/main/management/commands/run_callback_receiver.py @@ -3,13 +3,14 @@ # Python import logging +import os import signal +import time from uuid import UUID from multiprocessing import Process from multiprocessing import Queue as MPQueue from Queue import Empty as QueueEmpty from Queue import Full as QueueFull -import os from kombu import Connection, Exchange, Queue from kombu.mixins import ConsumerMixin @@ -18,7 +19,8 @@ from kombu.mixins import ConsumerMixin from django.conf import settings from django.core.management.base import NoArgsCommand from django.db import connection as django_connection -from django.db import DatabaseError +from django.db import DatabaseError, OperationalError +from django.db.utils import InterfaceError, InternalError from django.core.cache import cache as django_cache # AWX @@ -39,6 +41,9 @@ class WorkerSignalHandler: class CallbackBrokerWorker(ConsumerMixin): + + MAX_RETRIES = 2 + def __init__(self, connection, use_workers=True): self.connection = connection self.worker_queues = [] @@ -133,13 +138,40 @@ class CallbackBrokerWorker(ConsumerMixin): logger.info('Body: {}'.format( highlight(pformat(body, width=160), PythonLexer(), Terminal256Formatter(style='friendly')) )) - try: + + def _save_event_data(): if 'job_id' in body: JobEvent.create_from_data(**body) elif 'ad_hoc_command_id' in body: AdHocCommandEvent.create_from_data(**body) - except DatabaseError as e: - logger.error('Database Error Saving Job Event: {}'.format(e)) + + job_identifier = 'unknown job' + if 'job_id' in body: + job_identifier = body['job_id'] + elif 'ad_hoc_command_id' in body: + job_identifier = body['ad_hoc_command_id'] + + retries = 0 + while retries <= self.MAX_RETRIES: + try: + _save_event_data() + break + except (OperationalError, InterfaceError, InternalError) as e: + if retries >= self.MAX_RETRIES: + logger.exception('Worker could not re-establish database connectivity, shutting down gracefully: Job {}'.format(job_identifier)) + os.kill(os.getppid(), signal.SIGINT) + return + delay = 60 * retries + logger.exception('Database Error Saving Job Event, retry #{i} in {delay} seconds:'.format( + i=retries + 1, + delay=delay + )) + django_connection.close() + time.sleep(delay) + retries += 1 + except DatabaseError as e: + logger.exception('Database Error Saving Job Event for Job {}'.format(job_identifier)) + break except Exception as exc: import traceback tb = traceback.format_exc() From b8ed41fa828aeb6a0ae32734bfad0d0755572020 Mon Sep 17 00:00:00 2001 From: jlmitch5 Date: Tue, 31 Oct 2017 14:39:25 -0400 Subject: [PATCH 081/141] munge placeholder from select2 typeahead search bar --- awx/ui/client/src/shared/Utilities.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/awx/ui/client/src/shared/Utilities.js b/awx/ui/client/src/shared/Utilities.js index 08bdff71aa..4a06b59923 100644 --- a/awx/ui/client/src/shared/Utilities.js +++ b/awx/ui/client/src/shared/Utilities.js @@ -636,6 +636,22 @@ angular.module('Utilities', ['RestServices', 'Utilities']) if (!multiple) { config.minimumResultsForSearch = 1; + config.matcher = function(params, data) { + // If there are no search terms, return all of the data + if ($.trim(params.term) === '' && + data.text.indexOf("Choose an") === -1) { + return data; + } + + // Do not display the item if there is no 'text' property + if (typeof data.text === 'undefined' || + data.text.indexOf("Choose an") > -1) { + return null; + } + + // Return `null` if the term should not be displayed + return null; + }; } } From 5e37d6ea7e4f9ccf45466c391d5cf27bc5916ced Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Thu, 2 Nov 2017 10:44:06 -0400 Subject: [PATCH 082/141] Remove unused TOWER_HOST and AWX_HOST env vars These were conflicting with the new Tower credential --- awx/main/models/credential.py | 4 ++-- awx/main/tasks.py | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/awx/main/models/credential.py b/awx/main/models/credential.py index ef74d91074..b6cf191b28 100644 --- a/awx/main/models/credential.py +++ b/awx/main/models/credential.py @@ -387,8 +387,8 @@ class CredentialType(CommonModelNameNotUnique): ENV_BLACKLIST = set(( 'VIRTUAL_ENV', 'PATH', 'PYTHONPATH', 'PROOT_TMP_DIR', 'JOB_ID', 'INVENTORY_ID', 'INVENTORY_SOURCE_ID', 'INVENTORY_UPDATE_ID', - 'AD_HOC_COMMAND_ID', 'REST_API_URL', 'REST_API_TOKEN', 'TOWER_HOST', - 'AWX_HOST', 'MAX_EVENT_RES', 'CALLBACK_QUEUE', 'CALLBACK_CONNECTION', 'CACHE', + 'AD_HOC_COMMAND_ID', 'REST_API_URL', 'REST_API_TOKEN', 'MAX_EVENT_RES', + 'CALLBACK_QUEUE', 'CALLBACK_CONNECTION', 'CACHE', 'JOB_CALLBACK_DEBUG', 'INVENTORY_HOSTVARS', 'FACT_QUEUE', )) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index b403baff9a..e0432ae3cf 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -1039,8 +1039,6 @@ class RunJob(BaseTask): env['ANSIBLE_STDOUT_CALLBACK'] = 'awx_display' env['REST_API_URL'] = settings.INTERNAL_API_URL env['REST_API_TOKEN'] = job.task_auth_token or '' - env['TOWER_HOST'] = settings.TOWER_URL_BASE - env['AWX_HOST'] = settings.TOWER_URL_BASE env['CALLBACK_QUEUE'] = settings.CALLBACK_QUEUE env['CALLBACK_CONNECTION'] = settings.BROKER_URL env['CACHE'] = settings.CACHES['default']['LOCATION'] if 'LOCATION' in settings.CACHES['default'] else '' From 9518c38bb84e7938f992da23dfc2a9333e3d6603 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Thu, 2 Nov 2017 12:20:53 -0400 Subject: [PATCH 083/141] add close logic to clicking outside of the bounds of a lookup modal --- .../shared/lookup/lookup-modal.directive.js | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/src/shared/lookup/lookup-modal.directive.js b/awx/ui/client/src/shared/lookup/lookup-modal.directive.js index a15d5b7d2b..bb815ea42f 100644 --- a/awx/ui/client/src/shared/lookup/lookup-modal.directive.js +++ b/awx/ui/client/src/shared/lookup/lookup-modal.directive.js @@ -19,15 +19,35 @@ export default ['templateUrl', function(templateUrl) { element.find('.modal-body').append(clone); - scope.init(); + scope.init(element); }); $('#form-modal').modal('show'); }, - controller: ['$scope', '$state', function($scope, $state) { + controller: ['$scope', '$state', 'EventService', function($scope, $state, eventService) { + let listeners, modal; - $scope.init = function() { + function clickIsOutsideModal(e) { + const m = modal.getBoundingClientRect(); + const cx = e.clientX; + const cy = e.clientY; + + if (cx < m.left || cx > m.right || cy > m.bottom || cy < m.top) { + return true; + } + + return false; + } + + function clickToHide(event) { + if (clickIsOutsideModal(event)) { + $scope.cancelForm(); + } + } + + $scope.init = function(el) { let list = $scope.list; + [modal] = el.find('.modal-dialog'); if($state.params.selected) { let selection = $scope[list.name].find(({id}) => id === parseInt($state.params.selected)); $scope.currentSelection = _.pick(selection, 'id', 'name'); @@ -37,6 +57,10 @@ export default ['templateUrl', function(templateUrl) { }); $scope.modalTitle = list.iterator.replace(/_/g, ' '); + + listeners = eventService.addListeners([ + [window, 'click', clickToHide] + ]); }; function selectRowIfPresent(){ @@ -51,6 +75,7 @@ export default ['templateUrl', function(templateUrl) { } $scope.saveForm = function() { + eventService.remove(listeners); let list = $scope.list; if($scope.currentSelection.name !== null) { $scope.$parent[`${list.iterator}_name`] = $scope.currentSelection.name; @@ -60,6 +85,7 @@ export default ['templateUrl', function(templateUrl) { }; $scope.cancelForm = function() { + eventService.remove(listeners); $state.go('^'); }; From 84fb908261b75e3b8dc4ad553831762524e5a41b Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Mon, 30 Oct 2017 16:03:28 -0400 Subject: [PATCH 084/141] Fix 3.1 to 3.2 migration paths --- .../0005_squashed_v310_v313_updates.py | 31 ++---------- .../0005a_squashed_v310_v313_updates.py | 28 ----------- .../0005b_squashed_v310_v313_updates.py | 24 --------- awx/main/migrations/0006_v320_release.py | 6 ++- awx/main/migrations/_squashed.py | 50 +++++++++++++++++++ awx/main/migrations/_squashed_310.py | 50 +++++++++++++++++++ 6 files changed, 110 insertions(+), 79 deletions(-) delete mode 100644 awx/main/migrations/0005a_squashed_v310_v313_updates.py delete mode 100644 awx/main/migrations/0005b_squashed_v310_v313_updates.py create mode 100644 awx/main/migrations/_squashed.py create mode 100644 awx/main/migrations/_squashed_310.py diff --git a/awx/main/migrations/0005_squashed_v310_v313_updates.py b/awx/main/migrations/0005_squashed_v310_v313_updates.py index 85dac8bbaa..e49b6b227c 100644 --- a/awx/main/migrations/0005_squashed_v310_v313_updates.py +++ b/awx/main/migrations/0005_squashed_v310_v313_updates.py @@ -1,7 +1,9 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals +from django.db import migrations -from django.db import migrations, models +import _squashed +from _squashed_310 import SQUASHED_310 class Migration(migrations.Migration): @@ -10,28 +12,5 @@ class Migration(migrations.Migration): ('main', '0004_squashed_v310_release'), ] - replaces = [ - (b'main', '0035_v310_remove_tower_settings'), - ] - - operations = [ - # Remove Tower settings, these settings are now in separate awx.conf app. - migrations.RemoveField( - model_name='towersettings', - name='user', - ), - migrations.DeleteModel( - name='TowerSettings', - ), - - migrations.AlterField( - model_name='project', - name='scm_type', - field=models.CharField(default=b'', choices=[(b'', 'Manual'), (b'git', 'Git'), (b'hg', 'Mercurial'), (b'svn', 'Subversion'), (b'insights', 'Red Hat Insights')], max_length=8, blank=True, help_text='Specifies the source control system used to store the project.', verbose_name='SCM Type'), - ), - migrations.AlterField( - model_name='projectupdate', - name='scm_type', - field=models.CharField(default=b'', choices=[(b'', 'Manual'), (b'git', 'Git'), (b'hg', 'Mercurial'), (b'svn', 'Subversion'), (b'insights', 'Red Hat Insights')], max_length=8, blank=True, help_text='Specifies the source control system used to store the project.', verbose_name='SCM Type'), - ), - ] + replaces = _squashed.replaces(SQUASHED_310) + operations = _squashed.operations(SQUASHED_310) diff --git a/awx/main/migrations/0005a_squashed_v310_v313_updates.py b/awx/main/migrations/0005a_squashed_v310_v313_updates.py deleted file mode 100644 index 6599268ce1..0000000000 --- a/awx/main/migrations/0005a_squashed_v310_v313_updates.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0005_squashed_v310_v313_updates'), - ] - - replaces = [ - (b'main', '0036_v311_insights'), - ] - - operations = [ - migrations.AlterField( - model_name='project', - name='scm_type', - field=models.CharField(default=b'', choices=[(b'', 'Manual'), (b'git', 'Git'), (b'hg', 'Mercurial'), (b'svn', 'Subversion'), (b'insights', 'Red Hat Insights')], max_length=8, blank=True, help_text='Specifies the source control system used to store the project.', verbose_name='SCM Type'), - ), - migrations.AlterField( - model_name='projectupdate', - name='scm_type', - field=models.CharField(default=b'', choices=[(b'', 'Manual'), (b'git', 'Git'), (b'hg', 'Mercurial'), (b'svn', 'Subversion'), (b'insights', 'Red Hat Insights')], max_length=8, blank=True, help_text='Specifies the source control system used to store the project.', verbose_name='SCM Type'), - ), - ] \ No newline at end of file diff --git a/awx/main/migrations/0005b_squashed_v310_v313_updates.py b/awx/main/migrations/0005b_squashed_v310_v313_updates.py deleted file mode 100644 index ea9d26d2bc..0000000000 --- a/awx/main/migrations/0005b_squashed_v310_v313_updates.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0005a_squashed_v310_v313_updates'), - ] - - replaces = [ - (b'main', '0037_v313_instance_version'), - ] - - operations = [ - # Remove Tower settings, these settings are now in separate awx.conf app. - migrations.AddField( - model_name='instance', - name='version', - field=models.CharField(max_length=24, blank=True), - ), - ] diff --git a/awx/main/migrations/0006_v320_release.py b/awx/main/migrations/0006_v320_release.py index 4cb87f4fba..af0bd9def0 100644 --- a/awx/main/migrations/0006_v320_release.py +++ b/awx/main/migrations/0006_v320_release.py @@ -18,7 +18,11 @@ from awx.main.models import Host class Migration(migrations.Migration): dependencies = [ - ('main', '0005b_squashed_v310_v313_updates'), + ('main', '0005_squashed_v310_v313_updates'), + ] + + replaces = [ + ('main', '0005a_squashed_v310_v313_updates'), ] operations = [ diff --git a/awx/main/migrations/_squashed.py b/awx/main/migrations/_squashed.py new file mode 100644 index 0000000000..8344f8b6ed --- /dev/null +++ b/awx/main/migrations/_squashed.py @@ -0,0 +1,50 @@ +from itertools import chain +from django.db import ( + connection, + migrations, +) + + +def squash_data(SQUASHED): + '''Returns a tuple of the squashed_keys and the key position to begin + processing replace and operation lists''' + + cm = current_migration() + squashed_keys = sorted(SQUASHED.keys()) + try: + if cm is None: + key_index = 0 + else: + key_index = squashed_keys.index(cm.name) + 1 + except ValueError: + key_index = 0 + return squashed_keys, key_index + + +def current_migration(): + '''Get the latest migration non-squashed migration''' + try: + recorder = migrations.recorder.MigrationRecorder(connection) + return recorder.migration_qs.filter(app='main').exclude(name__contains='squashed').latest('id') + except recorder.Migration.DoesNotExist: + return None + + +def replaces(SQUASHED): + '''Build a list of replacement migrations based on the most recent non-squashed migration + and the provided list of SQUASHED migrations. If the most recent non-squashed migration + is not present anywhere in the SQUASHED dictionary, assume they have all been applied. + ''' + squashed_keys, key_index = squash_data(SQUASHED) + return [(b'main', key) for key in squashed_keys[key_index:]] + + +def operations(SQUASHED): + '''Build a list of migration operations based on the most recent non-squashed migration + and the provided list of SQUASHED migrations. If the most recent non-squashed migration + is not present anywhere in the SQUASHED dictionary, assume they have all been applied. + ''' + squashed_keys, key_index = squash_data(SQUASHED) + op_keys = squashed_keys[key_index:] + ops = [SQUASHED[op_key] for op_key in op_keys] + return [op for op in chain.from_iterable(ops)] diff --git a/awx/main/migrations/_squashed_310.py b/awx/main/migrations/_squashed_310.py new file mode 100644 index 0000000000..0813c19c3e --- /dev/null +++ b/awx/main/migrations/_squashed_310.py @@ -0,0 +1,50 @@ +from django.db import ( + migrations, + models, +) + +SQUASHED_310 = { + '0035_v310_remove_tower_settings': [ + # Remove Tower settings, these settings are now in separate awx.conf app. + migrations.RemoveField( + model_name='towersettings', + name='user', + ), + migrations.DeleteModel( + name='TowerSettings', + ), + + migrations.AlterField( + model_name='project', + name='scm_type', + field=models.CharField(default=b'', choices=[(b'', 'Manual'), (b'git', 'Git'), (b'hg', 'Mercurial'), (b'svn', 'Subversion'), (b'insights', 'Red Hat Insights')], max_length=8, blank=True, help_text='Specifies the source control system used to store the project.', verbose_name='SCM Type'), + ), + migrations.AlterField( + model_name='projectupdate', + name='scm_type', + field=models.CharField(default=b'', choices=[(b'', 'Manual'), (b'git', 'Git'), (b'hg', 'Mercurial'), (b'svn', 'Subversion'), (b'insights', 'Red Hat Insights')], max_length=8, blank=True, help_text='Specifies the source control system used to store the project.', verbose_name='SCM Type'), + ), + ], + '0036_v311_insights': [ + migrations.AlterField( + model_name='project', + name='scm_type', + field=models.CharField(default=b'', choices=[(b'', 'Manual'), (b'git', 'Git'), (b'hg', 'Mercurial'), (b'svn', 'Subversion'), (b'insights', 'Red Hat Insights')], max_length=8, blank=True, help_text='Specifies the source control system used to store the project.', verbose_name='SCM Type'), + ), + migrations.AlterField( + model_name='projectupdate', + name='scm_type', + field=models.CharField(default=b'', choices=[(b'', 'Manual'), (b'git', 'Git'), (b'hg', 'Mercurial'), (b'svn', 'Subversion'), (b'insights', 'Red Hat Insights')], max_length=8, blank=True, help_text='Specifies the source control system used to store the project.', verbose_name='SCM Type'), + ), + ], + '0037_v313_instance_version': [ + # Remove Tower settings, these settings are now in separate awx.conf app. + migrations.AddField( + model_name='instance', + name='version', + field=models.CharField(max_length=24, blank=True), + ), + ], +} + +__all__ = ['SQUASHED_310'] From fc56a1c1706601332714a6dbebb3ed087de57829 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Tue, 31 Oct 2017 00:46:33 -0400 Subject: [PATCH 085/141] Fix 3.0 to 3.2 migration paths --- .../0003_squashed_v300_v303_updates.py | 41 ++----------- awx/main/migrations/_squashed.py | 29 ++++----- awx/main/migrations/_squashed_300.py | 60 +++++++++++++++++++ 3 files changed, 79 insertions(+), 51 deletions(-) create mode 100644 awx/main/migrations/_squashed_300.py diff --git a/awx/main/migrations/0003_squashed_v300_v303_updates.py b/awx/main/migrations/0003_squashed_v300_v303_updates.py index 82d781ec85..661debec98 100644 --- a/awx/main/migrations/0003_squashed_v300_v303_updates.py +++ b/awx/main/migrations/0003_squashed_v300_v303_updates.py @@ -8,14 +8,9 @@ from __future__ import unicode_literals from django.db import migrations, models from django.conf import settings import awx.main.fields -import jsonfield.fields - -def update_dashed_host_variables(apps, schema_editor): - Host = apps.get_model('main', 'Host') - for host in Host.objects.filter(variables='---'): - host.variables = '' - host.save() +import _squashed +from _squashed_300 import SQUASHED_300 class Migration(migrations.Migration): @@ -27,12 +22,7 @@ class Migration(migrations.Migration): (b'main', '0025_v300_update_rbac_parents'), (b'main', '0026_v300_credential_unique'), (b'main', '0027_v300_team_migrations'), - (b'main', '0028_v300_org_team_cascade'), - (b'main', '0029_v302_add_ask_skip_tags'), - (b'main', '0030_v302_job_survey_passwords'), - (b'main', '0031_v302_migrate_survey_passwords'), - (b'main', '0032_v302_credential_permissions_update'), - (b'main', '0033_v303_v245_host_variable_fix'),] + (b'main', '0028_v300_org_team_cascade')] + _squashed.replaces(SQUASHED_300) dependencies = [ @@ -130,27 +120,4 @@ class Migration(migrations.Migration): field=models.ForeignKey(related_name='teams', to='main.Organization'), preserve_default=False, ), - # add ask skip tags - migrations.AddField( - model_name='jobtemplate', - name='ask_skip_tags_on_launch', - field=models.BooleanField(default=False), - ), - # job survery passwords - migrations.AddField( - model_name='job', - name='survey_passwords', - field=jsonfield.fields.JSONField(default={}, editable=False, blank=True), - ), - # RBAC credential permission updates - migrations.AlterField( - model_name='credential', - name='admin_role', - field=awx.main.fields.ImplicitRoleField(related_name='+', parent_role=[b'singleton:system_administrator', b'organization.admin_role'], to='main.Role', null=b'True'), - ), - migrations.AlterField( - model_name='credential', - name='use_role', - field=awx.main.fields.ImplicitRoleField(related_name='+', parent_role=[b'admin_role'], to='main.Role', null=b'True'), - ), - ] + ] + _squashed.operations(SQUASHED_300) diff --git a/awx/main/migrations/_squashed.py b/awx/main/migrations/_squashed.py index 8344f8b6ed..709a0a8869 100644 --- a/awx/main/migrations/_squashed.py +++ b/awx/main/migrations/_squashed.py @@ -2,20 +2,21 @@ from itertools import chain from django.db import ( connection, migrations, + OperationalError, ) -def squash_data(SQUASHED): +def squash_data(squashed): '''Returns a tuple of the squashed_keys and the key position to begin processing replace and operation lists''' cm = current_migration() - squashed_keys = sorted(SQUASHED.keys()) + squashed_keys = sorted(squashed.keys()) + if cm is None: + return squashed_keys, 0 + try: - if cm is None: - key_index = 0 - else: - key_index = squashed_keys.index(cm.name) + 1 + key_index = squashed_keys.index(cm.name) + 1 except ValueError: key_index = 0 return squashed_keys, key_index @@ -26,25 +27,25 @@ def current_migration(): try: recorder = migrations.recorder.MigrationRecorder(connection) return recorder.migration_qs.filter(app='main').exclude(name__contains='squashed').latest('id') - except recorder.Migration.DoesNotExist: + except (recorder.Migration.DoesNotExist, OperationalError): return None -def replaces(SQUASHED): +def replaces(squashed): '''Build a list of replacement migrations based on the most recent non-squashed migration and the provided list of SQUASHED migrations. If the most recent non-squashed migration is not present anywhere in the SQUASHED dictionary, assume they have all been applied. ''' - squashed_keys, key_index = squash_data(SQUASHED) + squashed_keys, key_index = squash_data(squashed) return [(b'main', key) for key in squashed_keys[key_index:]] -def operations(SQUASHED): +def operations(squashed): '''Build a list of migration operations based on the most recent non-squashed migration - and the provided list of SQUASHED migrations. If the most recent non-squashed migration - is not present anywhere in the SQUASHED dictionary, assume they have all been applied. + and the provided list of squashed migrations. If the most recent non-squashed migration + is not present anywhere in the `squashed` dictionary, assume they have all been applied. ''' - squashed_keys, key_index = squash_data(SQUASHED) + squashed_keys, key_index = squash_data(squashed) op_keys = squashed_keys[key_index:] - ops = [SQUASHED[op_key] for op_key in op_keys] + ops = [squashed[op_key] for op_key in op_keys] return [op for op in chain.from_iterable(ops)] diff --git a/awx/main/migrations/_squashed_300.py b/awx/main/migrations/_squashed_300.py new file mode 100644 index 0000000000..904c036db1 --- /dev/null +++ b/awx/main/migrations/_squashed_300.py @@ -0,0 +1,60 @@ +from django.db import ( + migrations, + models, +) +import jsonfield.fields +import awx.main.fields + +from awx.main.migrations import _save_password_keys +from awx.main.migrations import _migration_utils as migration_utils + + +def update_dashed_host_variables(apps, schema_editor): + Host = apps.get_model('main', 'Host') + for host in Host.objects.filter(variables='---'): + host.variables = '' + host.save() + + +SQUASHED_300 = { + '0029_v302_add_ask_skip_tags': [ + # add ask skip tags + migrations.AddField( + model_name='jobtemplate', + name='ask_skip_tags_on_launch', + field=models.BooleanField(default=False), + ), + ], + '0030_v302_job_survey_passwords': [ + # job survery passwords + migrations.AddField( + model_name='job', + name='survey_passwords', + field=jsonfield.fields.JSONField(default={}, editable=False, blank=True), + ), + ], + '0031_v302_migrate_survey_passwords': [ + migrations.RunPython(migration_utils.set_current_apps_for_migrations), + migrations.RunPython(_save_password_keys.migrate_survey_passwords), + ], + '0032_v302_credential_permissions_update': [ + # RBAC credential permission updates + migrations.AlterField( + model_name='credential', + name='admin_role', + field=awx.main.fields.ImplicitRoleField(related_name='+', parent_role=[b'singleton:system_administrator', b'organization.admin_role'], to='main.Role', null=b'True'), + ), + migrations.AlterField( + model_name='credential', + name='use_role', + field=awx.main.fields.ImplicitRoleField(related_name='+', parent_role=[b'admin_role'], to='main.Role', null=b'True'), + ), + ], + '0033_v303_v245_host_variable_fix': [ + migrations.RunPython(migration_utils.set_current_apps_for_migrations), + migrations.RunPython(update_dashed_host_variables), + ], +} + + +__all__ = ['SQUASHED_300'] From af3e6f792c3faf1bd70bde01865e01f49b7b9c0a Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Tue, 31 Oct 2017 11:18:31 -0400 Subject: [PATCH 086/141] Rename squash 310 to 31 --- awx/main/migrations/0005_squashed_v310_v313_updates.py | 6 +++--- awx/main/migrations/{_squashed_310.py => _squashed_31.py} | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename awx/main/migrations/{_squashed_310.py => _squashed_31.py} (98%) diff --git a/awx/main/migrations/0005_squashed_v310_v313_updates.py b/awx/main/migrations/0005_squashed_v310_v313_updates.py index e49b6b227c..3a2e05e270 100644 --- a/awx/main/migrations/0005_squashed_v310_v313_updates.py +++ b/awx/main/migrations/0005_squashed_v310_v313_updates.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.db import migrations import _squashed -from _squashed_310 import SQUASHED_310 +from _squashed_31 import SQUASHED_31 class Migration(migrations.Migration): @@ -12,5 +12,5 @@ class Migration(migrations.Migration): ('main', '0004_squashed_v310_release'), ] - replaces = _squashed.replaces(SQUASHED_310) - operations = _squashed.operations(SQUASHED_310) + replaces = _squashed.replaces(SQUASHED_31) + operations = _squashed.operations(SQUASHED_31) diff --git a/awx/main/migrations/_squashed_310.py b/awx/main/migrations/_squashed_31.py similarity index 98% rename from awx/main/migrations/_squashed_310.py rename to awx/main/migrations/_squashed_31.py index 0813c19c3e..3c43c26a48 100644 --- a/awx/main/migrations/_squashed_310.py +++ b/awx/main/migrations/_squashed_31.py @@ -3,7 +3,7 @@ from django.db import ( models, ) -SQUASHED_310 = { +SQUASHED_31 = { '0035_v310_remove_tower_settings': [ # Remove Tower settings, these settings are now in separate awx.conf app. migrations.RemoveField( @@ -47,4 +47,4 @@ SQUASHED_310 = { ], } -__all__ = ['SQUASHED_310'] +__all__ = ['SQUASHED_31'] From 47a3ba9bd51c1c0a2e5291b37066534ed8850ba2 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Tue, 31 Oct 2017 11:19:50 -0400 Subject: [PATCH 087/141] Rename squash 300 to 30 --- awx/main/migrations/0003_squashed_v300_v303_updates.py | 6 +++--- awx/main/migrations/{_squashed_300.py => _squashed_30.py} | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename awx/main/migrations/{_squashed_300.py => _squashed_30.py} (97%) diff --git a/awx/main/migrations/0003_squashed_v300_v303_updates.py b/awx/main/migrations/0003_squashed_v300_v303_updates.py index 661debec98..39635353c1 100644 --- a/awx/main/migrations/0003_squashed_v300_v303_updates.py +++ b/awx/main/migrations/0003_squashed_v300_v303_updates.py @@ -10,7 +10,7 @@ from django.conf import settings import awx.main.fields import _squashed -from _squashed_300 import SQUASHED_300 +from _squashed_30 import SQUASHED_30 class Migration(migrations.Migration): @@ -22,7 +22,7 @@ class Migration(migrations.Migration): (b'main', '0025_v300_update_rbac_parents'), (b'main', '0026_v300_credential_unique'), (b'main', '0027_v300_team_migrations'), - (b'main', '0028_v300_org_team_cascade')] + _squashed.replaces(SQUASHED_300) + (b'main', '0028_v300_org_team_cascade')] + _squashed.replaces(SQUASHED_30) dependencies = [ @@ -120,4 +120,4 @@ class Migration(migrations.Migration): field=models.ForeignKey(related_name='teams', to='main.Organization'), preserve_default=False, ), - ] + _squashed.operations(SQUASHED_300) + ] + _squashed.operations(SQUASHED_30) diff --git a/awx/main/migrations/_squashed_300.py b/awx/main/migrations/_squashed_30.py similarity index 97% rename from awx/main/migrations/_squashed_300.py rename to awx/main/migrations/_squashed_30.py index 904c036db1..5dd99762d6 100644 --- a/awx/main/migrations/_squashed_300.py +++ b/awx/main/migrations/_squashed_30.py @@ -16,7 +16,7 @@ def update_dashed_host_variables(apps, schema_editor): host.save() -SQUASHED_300 = { +SQUASHED_30 = { '0029_v302_add_ask_skip_tags': [ # add ask skip tags migrations.AddField( @@ -57,4 +57,4 @@ SQUASHED_300 = { } -__all__ = ['SQUASHED_300'] +__all__ = ['SQUASHED_30'] From f9685717b826b4fe0888134a92c7534607fb7ad5 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Thu, 2 Nov 2017 11:41:59 -0400 Subject: [PATCH 088/141] Move post 3.0 migrations to pre 3.1 position in migration files --- awx/main/migrations/0003_squashed_v300_v303_updates.py | 8 ++------ awx/main/migrations/0004_squashed_v310_release.py | 7 +++++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/awx/main/migrations/0003_squashed_v300_v303_updates.py b/awx/main/migrations/0003_squashed_v300_v303_updates.py index 39635353c1..042c036665 100644 --- a/awx/main/migrations/0003_squashed_v300_v303_updates.py +++ b/awx/main/migrations/0003_squashed_v300_v303_updates.py @@ -9,9 +9,6 @@ from django.db import migrations, models from django.conf import settings import awx.main.fields -import _squashed -from _squashed_30 import SQUASHED_30 - class Migration(migrations.Migration): replaces = [(b'main', '0020_v300_labels_changes'), @@ -22,8 +19,7 @@ class Migration(migrations.Migration): (b'main', '0025_v300_update_rbac_parents'), (b'main', '0026_v300_credential_unique'), (b'main', '0027_v300_team_migrations'), - (b'main', '0028_v300_org_team_cascade')] + _squashed.replaces(SQUASHED_30) - + (b'main', '0028_v300_org_team_cascade')] dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), @@ -120,4 +116,4 @@ class Migration(migrations.Migration): field=models.ForeignKey(related_name='teams', to='main.Organization'), preserve_default=False, ), - ] + _squashed.operations(SQUASHED_30) + ] diff --git a/awx/main/migrations/0004_squashed_v310_release.py b/awx/main/migrations/0004_squashed_v310_release.py index e4b1df2290..f4263feaa3 100644 --- a/awx/main/migrations/0004_squashed_v310_release.py +++ b/awx/main/migrations/0004_squashed_v310_release.py @@ -8,6 +8,9 @@ import django.db.models.deletion import awx.main.models.workflow import awx.main.fields +import _squashed +from _squashed_30 import SQUASHED_30 + class Migration(migrations.Migration): @@ -15,11 +18,11 @@ class Migration(migrations.Migration): ('main', '0003_squashed_v300_v303_updates'), ] - replaces = [ + replaces = _squashed.replaces(SQUASHED_30) + [ (b'main', '0034_v310_release'), ] - operations = [ + operations = _squashed.operations(SQUASHED_30) + [ # Create ChannelGroup table migrations.CreateModel( name='ChannelGroup', From e2c63c41e7a3bc047b9f12d630fb42b9709ffeca Mon Sep 17 00:00:00 2001 From: Ryan Fitzpatrick Date: Thu, 2 Nov 2017 15:01:03 -0400 Subject: [PATCH 089/141] Provide more specificity to Tower inventory filter help text --- .../inventories/related/sources/add/sources-add.controller.js | 2 +- .../inventories/related/sources/edit/sources-edit.controller.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js index a08a9e4eb4..2b8f95b900 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js @@ -200,7 +200,7 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition', $scope.instanceFilterPopOver = i18n._("Provide a comma-separated list of filter expressions. Hosts are imported when all of the filters match. Refer to Ansible Tower documentation for more detail."); } if( _.get($scope, 'source') === 'tower' || _.get($scope.source, 'value') === 'tower') { - $scope.instanceFilterPopOver = i18n._("Provide the name or id of the remote Tower inventory to be imported."); + $scope.instanceFilterPopOver = i18n._("Provide the named URL encoded name or id of the remote Tower inventory to be imported."); } CreateSelect2({ element: '#inventory_source_group_by', diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js index 4b7b9c47aa..375467cd32 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js @@ -284,7 +284,7 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString', $scope.instanceFilterPopOver = i18n._(`Provide a comma-separated list of filter expressions. Hosts are imported when all of the filters match. Refer to Ansible Tower documentation for more detail.`); } if( _.get($scope, 'source') === 'tower' || _.get($scope.source, 'value') === 'tower') { - $scope.instanceFilterPopOver = i18n._(`Provide the name or id of the remote Tower inventory to be imported.`); + $scope.instanceFilterPopOver = i18n._(`Provide the named URL encoded name or id of the remote Tower inventory to be imported.`); } CreateSelect2({ element: '#inventory_source_group_by', From 2f86774006b345e79e659eeee9724e539d4794f7 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Thu, 2 Nov 2017 15:40:30 -0400 Subject: [PATCH 090/141] 3.2.0 should not have any replacements defined unless 0005a or 0005b migrations have been run previously --- awx/main/migrations/0006_v320_release.py | 21 +++++++++++++++++---- awx/main/migrations/_squashed.py | 7 +++++-- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/awx/main/migrations/0006_v320_release.py b/awx/main/migrations/0006_v320_release.py index af0bd9def0..173e649c77 100644 --- a/awx/main/migrations/0006_v320_release.py +++ b/awx/main/migrations/0006_v320_release.py @@ -6,7 +6,12 @@ from __future__ import unicode_literals from psycopg2.extensions import AsIs # Django -from django.db import migrations, models +from django.db import ( + connection, + migrations, + models, + OperationalError +) from django.conf import settings import taggit.managers @@ -15,15 +20,23 @@ import awx.main.fields from awx.main.models import Host +def replaces(): + squashed = ['0005a_squashed_v310_v313_updates', '0005b_squashed_v310_v313_updates'] + try: + recorder = migrations.recorder.MigrationRecorder(connection) + result = recorder.migration_qs.filter(app='main').filter(name__in=squashed).all() + return [('main', m.name) for m in result] + except OperationalError: + return [] + + class Migration(migrations.Migration): dependencies = [ ('main', '0005_squashed_v310_v313_updates'), ] - replaces = [ - ('main', '0005a_squashed_v310_v313_updates'), - ] + replaces = replaces() operations = [ # Release UJT unique_together constraint diff --git a/awx/main/migrations/_squashed.py b/awx/main/migrations/_squashed.py index 709a0a8869..c7de8c9cd0 100644 --- a/awx/main/migrations/_squashed.py +++ b/awx/main/migrations/_squashed.py @@ -22,11 +22,14 @@ def squash_data(squashed): return squashed_keys, key_index -def current_migration(): +def current_migration(exclude_squashed=True): '''Get the latest migration non-squashed migration''' try: recorder = migrations.recorder.MigrationRecorder(connection) - return recorder.migration_qs.filter(app='main').exclude(name__contains='squashed').latest('id') + migration_qs = recorder.migration_qs.filter(app='main') + if exclude_squashed: + migration_qs = migration_qs.exclude(name__contains='squashed') + return migration_qs.latest('id') except (recorder.Migration.DoesNotExist, OperationalError): return None From 9d39ac83f909bd89874bcdbf882c7932ee06181c Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Thu, 2 Nov 2017 15:52:24 -0700 Subject: [PATCH 091/141] When deleting a source, delete the source's groups too --- .../sources/list/sources-list.controller.js | 46 ++++++++++++------- .../related/sources/sources.service.js | 11 ++++- awx/ui/client/src/shared/modal/modal.less | 4 ++ 3 files changed, 43 insertions(+), 18 deletions(-) diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js index e0798e714d..c3b6448bfe 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js @@ -117,25 +117,39 @@ $state.go('inventories.edit.inventory_sources.edit', {inventory_source_id: id}); }; $scope.deleteSource = function(inventory_source){ - var body = '
' + i18n._('Are you sure you want to permanently delete the inventory source below from the inventory?') + '
' + $filter('sanitize')(inventory_source.name) + '
'; + var body = '
' + i18n._('Are you sure you want to permanently delete the inventory source below from the inventory? Groups and hosts associated with this inventory source will be deleted as well.') + '
' + $filter('sanitize')(inventory_source.name) + '
'; var action = function(){ - delete $rootScope.promptActionBtnClass; + $rootScope.promptActionBtnClass = "Modal-errorButton--sourcesDelete"; Wait('start'); SourcesService.deleteHosts(inventory_source.id).then(() => { - SourcesService.delete(inventory_source.id).then(() => { - $('#prompt-modal').modal('hide'); - let reloadListStateParams = null; + Wait('start'); + SourcesService.deleteGroups(inventory_source.id).then(() => { + Wait('start'); + SourcesService.delete(inventory_source.id).then(() => { + $('#prompt-modal').modal('hide'); + let reloadListStateParams = null; - if($scope.inventory_sources.length === 1 && $state.params.inventory_source_search && !_.isEmpty($state.params.inventory_source_search.page) && $state.params.inventory_source_search.page !== '1') { - reloadListStateParams = _.cloneDeep($state.params); - reloadListStateParams.inventory_source_search.page = (parseInt(reloadListStateParams.inventory_source_search.page)-1).toString(); - } - if (parseInt($state.params.inventory_source_id) === inventory_source.id) { - $state.go('^', reloadListStateParams, {reload: true}); - } else { - $state.go('.', reloadListStateParams, {reload: true}); - } - Wait('stop'); + if($scope.inventory_sources.length === 1 && $state.params.inventory_source_search && !_.isEmpty($state.params.inventory_source_search.page) && $state.params.inventory_source_search.page !== '1') { + reloadListStateParams = _.cloneDeep($state.params); + reloadListStateParams.inventory_source_search.page = (parseInt(reloadListStateParams.inventory_source_search.page)-1).toString(); + } + if (parseInt($state.params.inventory_source_id) === inventory_source.id) { + $state.go('^', reloadListStateParams, {reload: true}); + } else { + $state.go('.', reloadListStateParams, {reload: true}); + } + Wait('stop'); + }) + .catch(({data, status}) => { + $('#prompt-modal').modal('hide'); + Wait('stop'); + ProcessErrors($scope, data, status, null, + { + hdr: i18n._('Error!'), + msg: i18n._('There was an error deleting inventory source. Returned status: ') + + status + }); + }); }) .catch(({data, status}) => { $('#prompt-modal').modal('hide'); @@ -143,7 +157,7 @@ ProcessErrors($scope, data, status, null, { hdr: i18n._('Error!'), - msg: i18n._('There was an error deleting inventory source. Returned status: ') + + msg: i18n._('There was an error deleting inventory source groups. Returned status: ') + status }); }); diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js index 93894d7126..1d2f55054f 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js @@ -134,13 +134,20 @@ export default } }, deleteHosts(id) { - Wait('start'); this.url = GetBasePath('inventory_sources') + id + '/hosts/'; Rest.setUrl(this.url); return Rest.destroy() .success(this.success.bind(this)) .error(this.error.bind(this)) - .finally(Wait('stop')); + .finally(); + }, + deleteGroups(id) { + this.url = GetBasePath('inventory_sources') + id + '/groups/'; + Rest.setUrl(this.url); + return Rest.destroy() + .success(this.success.bind(this)) + .error(this.error.bind(this)) + .finally(); } }; }]; diff --git a/awx/ui/client/src/shared/modal/modal.less b/awx/ui/client/src/shared/modal/modal.less index 9c741f4131..632720fec6 100644 --- a/awx/ui/client/src/shared/modal/modal.less +++ b/awx/ui/client/src/shared/modal/modal.less @@ -97,6 +97,10 @@ color: @btn-txt-sel; } +.Modal-errorButton--sourcesDelete:hover{ + cursor: not-allowed; +} + .Modal-primaryButton { background-color: @default-link; color: @default-bg; From d7f4707044ea8976927f06496846ecdc2551db84 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Fri, 3 Nov 2017 08:53:53 -0400 Subject: [PATCH 092/141] Handle programming error when evaluating the replaces list for 320 --- awx/main/migrations/0006_v320_release.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/awx/main/migrations/0006_v320_release.py b/awx/main/migrations/0006_v320_release.py index 173e649c77..c0a4330e04 100644 --- a/awx/main/migrations/0006_v320_release.py +++ b/awx/main/migrations/0006_v320_release.py @@ -10,7 +10,8 @@ from django.db import ( connection, migrations, models, - OperationalError + OperationalError, + ProgrammingError ) from django.conf import settings import taggit.managers @@ -26,7 +27,7 @@ def replaces(): recorder = migrations.recorder.MigrationRecorder(connection) result = recorder.migration_qs.filter(app='main').filter(name__in=squashed).all() return [('main', m.name) for m in result] - except OperationalError: + except (OperationalError, ProgrammingError): return [] From 1a5b5c32b85308ef154d77d4f5480bba031888a9 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Fri, 3 Nov 2017 10:34:25 -0400 Subject: [PATCH 093/141] Handle ProgrammingError in squashed helpers --- awx/main/migrations/_squashed.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/awx/main/migrations/_squashed.py b/awx/main/migrations/_squashed.py index c7de8c9cd0..1470df54ce 100644 --- a/awx/main/migrations/_squashed.py +++ b/awx/main/migrations/_squashed.py @@ -3,6 +3,7 @@ from django.db import ( connection, migrations, OperationalError, + ProgrammingError, ) @@ -30,7 +31,7 @@ def current_migration(exclude_squashed=True): if exclude_squashed: migration_qs = migration_qs.exclude(name__contains='squashed') return migration_qs.latest('id') - except (recorder.Migration.DoesNotExist, OperationalError): + except (recorder.Migration.DoesNotExist, OperationalError, ProgrammingError): return None From f65ef9f75cf0f82edfb841cec857d2ad89ce91d0 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Fri, 3 Nov 2017 15:11:54 -0700 Subject: [PATCH 094/141] prolong removing the delete modal until after the list refreshes, post-delete --- .../groups/list/groups-list.controller.js | 16 ++++++++++------ .../related/groups/list/groups-list.partial.html | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.controller.js index 99b1090e2d..78a51d2777 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.controller.js @@ -141,9 +141,11 @@ } else { $state.go($state.current, reloadListStateParams, {reload: true}); } - $('#group-delete-modal').modal('hide'); - $('body').removeClass('modal-open'); - $('.modal-backdrop').remove(); + setTimeout(function(){ + $('#group-delete-modal').modal('hide'); + $('body').removeClass('modal-open'); + $('.modal-backdrop').remove(); + }, 1000); }); break; default: @@ -153,9 +155,11 @@ } else { $state.go($state.current, reloadListStateParams, {reload: true}); } - $('#group-delete-modal').modal('hide'); - $('body').removeClass('modal-open'); - $('.modal-backdrop').remove(); + setTimeout(function(){ + $('#group-delete-modal').modal('hide'); + $('body').removeClass('modal-open'); + $('.modal-backdrop').remove(); + }, 1000); }); } }; diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html b/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html index ec594610a6..23579b2285 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html @@ -5,7 +5,7 @@
Delete Group Date: Fri, 3 Nov 2017 16:26:00 -0700 Subject: [PATCH 095/141] feedback from PR: launch both DELETE calls at the same time for both groups and hosts. --- .../sources/list/sources-list.controller.js | 49 +++++++++---------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js index c3b6448bfe..becf28c83b 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js @@ -117,16 +117,34 @@ $state.go('inventories.edit.inventory_sources.edit', {inventory_source_id: id}); }; $scope.deleteSource = function(inventory_source){ - var body = '
' + i18n._('Are you sure you want to permanently delete the inventory source below from the inventory? Groups and hosts associated with this inventory source will be deleted as well.') + '
' + $filter('sanitize')(inventory_source.name) + '
'; + var body = '
' + i18n._('Confirm that you want to permanently delete the inventory source below from the inventory. Deleting this inventory source also deletes its associated groups and hosts.') + '
' + $filter('sanitize')(inventory_source.name) + '
'; var action = function(){ $rootScope.promptActionBtnClass = "Modal-errorButton--sourcesDelete"; Wait('start'); - SourcesService.deleteHosts(inventory_source.id).then(() => { - Wait('start'); - SourcesService.deleteGroups(inventory_source.id).then(() => { - Wait('start'); + let hostDelete = SourcesService.deleteHosts(inventory_source.id).catch(({data, status}) => { + $('#prompt-modal').modal('hide'); + Wait('stop'); + ProcessErrors($scope, data, status, null, + { + hdr: i18n._('Error!'), + msg: i18n._('There was an error deleting inventory source hosts. Returned status: ') + + status + }); + }); + let groupDelete = SourcesService.deleteGroups(inventory_source.id).catch(({data, status}) => { + $('#prompt-modal').modal('hide'); + Wait('stop'); + ProcessErrors($scope, data, status, null, + { + hdr: i18n._('Error!'), + msg: i18n._('There was an error deleting inventory source groups. Returned status: ') + + status + }); + }); + Promise.all([hostDelete, groupDelete]).then(() => { SourcesService.delete(inventory_source.id).then(() => { $('#prompt-modal').modal('hide'); + delete $rootScope.promptActionBtnClass; let reloadListStateParams = null; if($scope.inventory_sources.length === 1 && $state.params.inventory_source_search && !_.isEmpty($state.params.inventory_source_search.page) && $state.params.inventory_source_search.page !== '1') { @@ -150,28 +168,7 @@ status }); }); - }) - .catch(({data, status}) => { - $('#prompt-modal').modal('hide'); - Wait('stop'); - ProcessErrors($scope, data, status, null, - { - hdr: i18n._('Error!'), - msg: i18n._('There was an error deleting inventory source groups. Returned status: ') + - status - }); }); - }) - .catch(({data, status}) => { - $('#prompt-modal').modal('hide'); - Wait('stop'); - ProcessErrors($scope, data, status, null, - { - hdr: i18n._('Error!'), - msg: i18n._('There was an error deleting inventory source hosts. Returned status: ') + - status - }); - }); }; // Prompt depends on having $rootScope.promptActionBtnClass available... Prompt({ From 89a05e9bbcca16d291844ece87a973b9819a0195 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Mon, 6 Nov 2017 14:15:20 -0500 Subject: [PATCH 096/141] Handle json decoder errors from tower inventory source --- awx/plugins/inventory/tower.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/awx/plugins/inventory/tower.py b/awx/plugins/inventory/tower.py index 263cd5eebf..233f623bda 100755 --- a/awx/plugins/inventory/tower.py +++ b/awx/plugins/inventory/tower.py @@ -108,6 +108,8 @@ def read_tower_inventory(tower_host, tower_user, tower_pass, inventory, license_ reason = json_reason.get('detail', 'Retrieving Tower Inventory Failed') except requests.ConnectionError, e: reason = "Connection to remote host failed: {}".format(e) + except json.JSONDecodeError, e: + reason = "Failed to parse json from host: {}".format(e) print(reason) sys.exit(1) From 91ad0a9f8953cb344f79487327325390e29dba73 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Wed, 8 Nov 2017 09:27:33 -0500 Subject: [PATCH 097/141] add a useful tool for isolated connectivity debugging --- .../commands/test_isolated_connection.py | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 awx/main/management/commands/test_isolated_connection.py diff --git a/awx/main/management/commands/test_isolated_connection.py b/awx/main/management/commands/test_isolated_connection.py new file mode 100644 index 0000000000..e2bfcc2f50 --- /dev/null +++ b/awx/main/management/commands/test_isolated_connection.py @@ -0,0 +1,50 @@ +import os +import shutil +import subprocess +import sys +import tempfile +from optparse import make_option + +from django.conf import settings +from django.core.management.base import BaseCommand, CommandError + +from awx.main.expect import run + + +class Command(BaseCommand): + """Tests SSH connectivity between a controller and target isolated node""" + help = 'Tests SSH connectivity between a controller and target isolated node' + + option_list = BaseCommand.option_list + ( + make_option('--hostname', dest='hostname', type='string', + help='Hostname of an isolated node'), + ) + + def handle(self, *args, **options): + hostname = options.get('hostname') + if not hostname: + raise CommandError("--hostname is a required argument") + + try: + path = tempfile.mkdtemp(prefix='awx_isolated_ssh', dir=settings.AWX_PROOT_BASE_PATH) + args = [ + 'ansible', 'all', '-i', '{},'.format(hostname), '-u', + settings.AWX_ISOLATED_USERNAME, '-T5', '-m', 'shell', + '-a', 'hostname', '-vvv' + ] + if all([ + getattr(settings, 'AWX_ISOLATED_KEY_GENERATION', False) is True, + getattr(settings, 'AWX_ISOLATED_PRIVATE_KEY', None) + ]): + ssh_key_path = os.path.join(path, '.isolated') + ssh_auth_sock = os.path.join(path, 'ssh_auth.sock') + run.open_fifo_write(ssh_key_path, settings.AWX_ISOLATED_PRIVATE_KEY) + args = run.wrap_args_with_ssh_agent(args, ssh_key_path, ssh_auth_sock) + try: + print ' '.join(args) + subprocess.check_call(args) + except subprocess.CalledProcessError as e: + sys.exit(e.returncode) + finally: + shutil.rmtree(path) + From 0051da95c932aece7af26cb8860214ea9f1539aa Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Thu, 2 Nov 2017 22:03:22 -0400 Subject: [PATCH 098/141] fix bug of system auditor 404 viewing job --- awx/main/access.py | 6 ------ awx/main/tests/functional/test_rbac_job.py | 16 ++++++++++++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/awx/main/access.py b/awx/main/access.py index 26675330d5..4d44dc2995 100644 --- a/awx/main/access.py +++ b/awx/main/access.py @@ -1381,12 +1381,6 @@ class JobAccess(BaseAccess): return True return False - @check_superuser - def can_read(self, obj): - if obj.job_template and self.user in obj.job_template.read_role: - return True - return self.org_access(obj, role_types=['auditor_role', 'admin_role']) - def can_add(self, data, validate_license=True): if validate_license: self.check_license() diff --git a/awx/main/tests/functional/test_rbac_job.py b/awx/main/tests/functional/test_rbac_job.py index d721f2b98e..c2a87063d7 100644 --- a/awx/main/tests/functional/test_rbac_job.py +++ b/awx/main/tests/functional/test_rbac_job.py @@ -51,12 +51,20 @@ def proj_updater(project, rando): return rando -# Read permissions testing +# Check that superuser & system auditors can see fully orphaned jobs @pytest.mark.django_db -def test_superuser_sees_orphans(normal_job, admin_user): +@pytest.mark.parametrize("superuser", [True, False]) +def test_superuser_superauditor_sees_orphans(normal_job, superuser, admin_user, system_auditor): + if superuser: + u = admin_user + else: + u = system_auditor normal_job.job_template = None - access = JobAccess(admin_user) - assert access.can_read(normal_job) + normal_job.project = None + normal_job.inventory = None + access = JobAccess(u) + assert access.can_read(normal_job), "User sys auditor: {}, sys admin: {}".format( + u.is_system_auditor, u.is_superuser) @pytest.mark.django_db From 78961c803748cf7f92f7ddc8b13130dcb37d4a5e Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Thu, 9 Nov 2017 16:56:12 -0500 Subject: [PATCH 099/141] properly perform validation on encrypted survey defaults see: https://github.com/ansible/ansible-tower/issues/7764 --- awx/main/models/mixins.py | 13 +++++++++++++ awx/main/tests/unit/models/test_survey_models.py | 16 ++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/awx/main/models/mixins.py b/awx/main/models/mixins.py index 1186797b09..82cbeca5de 100644 --- a/awx/main/models/mixins.py +++ b/awx/main/models/mixins.py @@ -163,6 +163,19 @@ class SurveyJobTemplateMixin(models.Model): def _survey_element_validation(self, survey_element, data): errors = [] + # make a copy of the data to break references (so that we don't + # inadvertently expose unencrypted default passwords as we validate) + data = data.copy() + if all([ + survey_element['type'] == "password", + data.get(survey_element['variable']) == '$encrypted$' + ]): + # replace encrypted password defaults so we don't validate on + # $encrypted$ + data[survey_element['variable']] = decrypt_value( + get_encryption_key('value', pk=None), + survey_element['default'] + ) if survey_element['variable'] not in data and survey_element['required']: errors.append("'%s' value missing" % survey_element['variable']) elif survey_element['type'] in ["textarea", "text", "password"]: diff --git a/awx/main/tests/unit/models/test_survey_models.py b/awx/main/tests/unit/models/test_survey_models.py index d283c57081..6362a25e61 100644 --- a/awx/main/tests/unit/models/test_survey_models.py +++ b/awx/main/tests/unit/models/test_survey_models.py @@ -8,6 +8,7 @@ from awx.main.models import ( JobTemplate, WorkflowJobTemplate ) +from awx.main.utils.encryption import encrypt_value @pytest.fixture @@ -143,6 +144,21 @@ def test_optional_survey_question_defaults( assert 'c' not in defaulted_extra_vars['extra_vars'] +@pytest.mark.survey +def test_encrypted_default_validation(survey_spec_factory): + element = { + "required": True, + "default": encrypt_value("test1234", pk=None), + "variable": "x", + "min": 0, + "max": 8, + "type": "password", + } + spec = survey_spec_factory([element]) + jt = JobTemplate(name="test-jt", survey_spec=spec, survey_enabled=True) + assert not len(jt.survey_variable_validation({'x': '$encrypted$'})) + + @pytest.mark.survey class TestWorkflowSurveys: def test_update_kwargs_survey_defaults(self, survey_spec_factory): From 33574d70c81580ae07cf00f8e4b43f5d98b0da8b Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Mon, 13 Nov 2017 08:15:24 -0500 Subject: [PATCH 100/141] do not propogate cancel of inventory sync back up to project --- awx/main/tasks.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index e0432ae3cf..04f6270112 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -1543,11 +1543,11 @@ class RunProjectUpdate(BaseTask): except InventoryUpdate.DoesNotExist: logger.warning('%s Dependent inventory update deleted during execution.', project_update.log_format) continue - if project_update.cancel_flag or local_inv_update.cancel_flag: - if not project_update.cancel_flag: - self.update_model(project_update.pk, cancel_flag=True, job_explanation=_( - 'Dependent inventory update {} was canceled.'.format(local_inv_update.name))) - break # Stop rest of updates if project or inventory update was canceled + if project_update.cancel_flag: + logger.info('Project update {} was canceled while updating dependent inventories.'.format(project_update.log_format)) + break + if local_inv_update.cancel_flag: + logger.info('Continuing to process project dependencies after {} was canceled'.format(local_inv_update.log_format)) if local_inv_update.status == 'successful': inv_src.scm_last_revision = scm_revision inv_src.save(update_fields=['scm_last_revision']) From be00b1ca963779717cabe8e20df2463400a2012a Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Mon, 13 Nov 2017 13:01:56 -0500 Subject: [PATCH 101/141] render survey_spec for display purposes in a safe manner survey_spec is a nested dict, so if we don't `deepcopy()` it, updates to the individual fields could corrupt the original data structure; this was causing a bug whereby activity stream updates converted encrypted survey password defaults -> `$encrypted$`, but inadvertently modified the originating model due to shared references see: https://github.com/ansible/ansible-tower/issues/7769 --- awx/main/models/mixins.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/main/models/mixins.py b/awx/main/models/mixins.py index 82cbeca5de..8d234d0b97 100644 --- a/awx/main/models/mixins.py +++ b/awx/main/models/mixins.py @@ -1,6 +1,6 @@ # Python import json -from copy import copy +from copy import copy, deepcopy # Django from django.db import models @@ -257,7 +257,7 @@ class SurveyJobTemplateMixin(models.Model): ''' Hide encrypted default passwords in survey specs ''' - survey_spec = self.survey_spec.copy() if self.survey_spec else {} + survey_spec = deepcopy(self.survey_spec) if self.survey_spec else {} for field in survey_spec.get('spec', []): if field.get('type') == 'password': if 'default' in field and field['default']: From aaaae87aa7b3a1deacb6a42370c8f281b57161af Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 14 Nov 2017 15:57:49 -0500 Subject: [PATCH 102/141] Remove some environment variables the callback plugin doesn't actually use. --- awx/main/tasks.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index e0432ae3cf..d7ca840adc 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -1039,13 +1039,7 @@ class RunJob(BaseTask): env['ANSIBLE_STDOUT_CALLBACK'] = 'awx_display' env['REST_API_URL'] = settings.INTERNAL_API_URL env['REST_API_TOKEN'] = job.task_auth_token or '' - env['CALLBACK_QUEUE'] = settings.CALLBACK_QUEUE - env['CALLBACK_CONNECTION'] = settings.BROKER_URL env['CACHE'] = settings.CACHES['default']['LOCATION'] if 'LOCATION' in settings.CACHES['default'] else '' - if getattr(settings, 'JOB_CALLBACK_DEBUG', False): - env['JOB_CALLBACK_DEBUG'] = '2' - elif settings.DEBUG: - env['JOB_CALLBACK_DEBUG'] = '1' # Create a directory for ControlPath sockets that is unique to each # job and visible inside the proot environment (when enabled). @@ -2108,14 +2102,8 @@ class RunAdHocCommand(BaseTask): env['ANSIBLE_STDOUT_CALLBACK'] = 'minimal' # Hardcoded by Ansible for ad-hoc commands (either minimal or oneline). env['REST_API_URL'] = settings.INTERNAL_API_URL env['REST_API_TOKEN'] = ad_hoc_command.task_auth_token or '' - env['CALLBACK_QUEUE'] = settings.CALLBACK_QUEUE - env['CALLBACK_CONNECTION'] = settings.BROKER_URL env['ANSIBLE_SFTP_BATCH_MODE'] = 'False' env['CACHE'] = settings.CACHES['default']['LOCATION'] if 'LOCATION' in settings.CACHES['default'] else '' - if getattr(settings, 'JOB_CALLBACK_DEBUG', False): - env['JOB_CALLBACK_DEBUG'] = '2' - elif settings.DEBUG: - env['JOB_CALLBACK_DEBUG'] = '1' # Specify empty SSH args (should disable ControlPersist entirely for # ad hoc commands). From 35c374fc79b3f7901bd19c8c88c883570ca349dd Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Wed, 15 Nov 2017 10:22:51 -0500 Subject: [PATCH 103/141] fix a bug in the survey reencryption migration see: https://github.com/ansible/ansible-tower/issues/7046 --- awx/main/migrations/0011_v322_encrypt_survey_passwords.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/awx/main/migrations/0011_v322_encrypt_survey_passwords.py b/awx/main/migrations/0011_v322_encrypt_survey_passwords.py index 7140949c7e..0d797ae5e1 100644 --- a/awx/main/migrations/0011_v322_encrypt_survey_passwords.py +++ b/awx/main/migrations/0011_v322_encrypt_survey_passwords.py @@ -4,6 +4,7 @@ from __future__ import unicode_literals from django.db import migrations from awx.main.migrations import ActivityStreamDisabledMigration from awx.main.migrations import _reencrypt as reencrypt +from awx.main.migrations import _migration_utils as migration_utils class Migration(ActivityStreamDisabledMigration): @@ -13,5 +14,6 @@ class Migration(ActivityStreamDisabledMigration): ] operations = [ + migrations.RunPython(migration_utils.set_current_apps_for_migrations), migrations.RunPython(reencrypt.encrypt_survey_passwords), ] From 9288b5301569831ac5633be53d40f3028eb75742 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Wed, 15 Nov 2017 10:50:58 -0500 Subject: [PATCH 104/141] cascade cancel proj update when job canceled * Implicit project update, launch_type='sync', get "associated" with a job via project_update. When a job is canceled, so should this implicit project update. This change enforces that logic. --- awx/main/models/mixins.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/awx/main/models/mixins.py b/awx/main/models/mixins.py index 8d234d0b97..8d2fead0e6 100644 --- a/awx/main/models/mixins.py +++ b/awx/main/models/mixins.py @@ -318,6 +318,9 @@ class TaskManagerJobMixin(TaskManagerUnifiedJobMixin): class Meta: abstract = True + def get_jobs_fail_chain(self): + return [self.project_update] if self.project_update else [] + def dependent_jobs_finished(self): for j in self.dependent_jobs.all(): if j.status in ['pending', 'waiting', 'running']: From 1fcddba558801d78aebfa508ac0e7b8b16041582 Mon Sep 17 00:00:00 2001 From: gconsidine Date: Thu, 16 Nov 2017 11:15:23 -0500 Subject: [PATCH 105/141] Update disabled button color to match style guide --- awx/ui/client/legacy-styles/lists.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/awx/ui/client/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less index d3948f6c79..758b6173b1 100644 --- a/awx/ui/client/legacy-styles/lists.less +++ b/awx/ui/client/legacy-styles/lists.less @@ -252,8 +252,7 @@ table, tbody { } .List-buttonDefault[disabled] { - color: @d7grey; - border-color: @d7grey; + opacity: 0.65; } .List-searchDropdown { From fb29f68efc9323d48cb5a17ce1dc7181bda93be4 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Thu, 16 Nov 2017 10:15:50 -0500 Subject: [PATCH 106/141] update smart inventory computed fields --- awx/main/models/inventory.py | 11 ++++++++++- awx/main/tasks.py | 13 +++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index 5f43975919..3ab007d325 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -334,8 +334,13 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin): active_hosts = self.hosts failed_hosts = active_hosts.filter(has_active_failures=True) active_groups = self.groups + if self.kind == 'smart': + active_groups = active_groups.none() failed_groups = active_groups.filter(has_active_failures=True) - active_inventory_sources = self.inventory_sources.filter(source__in=CLOUD_INVENTORY_SOURCES) + if self.kind == 'smart': + active_inventory_sources = self.inventory_sources.none() + else: + active_inventory_sources = self.inventory_sources.filter(source__in=CLOUD_INVENTORY_SOURCES) failed_inventory_sources = active_inventory_sources.filter(last_job_failed=True) computed_fields = { 'has_active_failures': bool(failed_hosts.count()), @@ -399,6 +404,10 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin): def save(self, *args, **kwargs): self._update_host_smart_inventory_memeberships() super(Inventory, self).save(*args, **kwargs) + if (self.kind == 'smart' and 'host_filter' in kwargs.get('update_fields', ['host_filter']) and + connection.vendor != 'sqlite'): + # Minimal update of host_count for smart inventory host filter changes + self.update_computed_fields(update_groups=False, update_hosts=False) def delete(self, *args, **kwargs): self._update_host_smart_inventory_memeberships() diff --git a/awx/main/tasks.py b/awx/main/tasks.py index e99c8ce887..c4e1e27b34 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -423,13 +423,22 @@ def update_host_smart_inventory_memberships(): smart_inventories = Inventory.objects.filter(kind='smart', host_filter__isnull=False, pending_deletion=False) SmartInventoryMembership.objects.all().delete() memberships = [] + changed_inventories = set([]) for smart_inventory in smart_inventories: - memberships.extend([SmartInventoryMembership(inventory_id=smart_inventory.id, host_id=host_id[0]) - for host_id in smart_inventory.hosts.values_list('id')]) + add_for_inventory = [ + SmartInventoryMembership(inventory_id=smart_inventory.id, host_id=host_id[0]) + for host_id in smart_inventory.hosts.values_list('id') + ] + memberships.extend(add_for_inventory) + if add_for_inventory: + changed_inventories.add(smart_inventory) SmartInventoryMembership.objects.bulk_create(memberships) except IntegrityError as e: logger.error("Update Host Smart Inventory Memberships failed due to an exception: " + str(e)) return + # Update computed fields for changed inventories outside atomic action + for smart_inventory in changed_inventories: + smart_inventory.update_computed_fields(update_groups=False, update_hosts=False) @task(bind=True, queue='tower', base=LogErrorsTask, max_retries=5) From 8a65c6e1c8e0bea5901902264dadef9450d315e6 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Thu, 16 Nov 2017 11:42:13 -0500 Subject: [PATCH 107/141] Present the tower inventory sync failure in a better way This allows it to be handled better by ansible 2.4+ --- awx/plugins/inventory/tower.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/awx/plugins/inventory/tower.py b/awx/plugins/inventory/tower.py index 233f623bda..63ade6b24b 100755 --- a/awx/plugins/inventory/tower.py +++ b/awx/plugins/inventory/tower.py @@ -68,8 +68,7 @@ def parse_configuration(): if not inventory: errors.append("Missing TOWER_INVENTORY in environment") if errors: - print("\n".join(errors)) - sys.exit(1) + raise RuntimeError("\n".join(errors)) return dict(tower_host=host_name, tower_user=username, @@ -92,12 +91,10 @@ def read_tower_inventory(tower_host, tower_user, tower_pass, inventory, license_ if config_response.ok: source_type = config_response.json()['license_info']['license_type'] if not source_type == license_type: - print("Tower server licenses must match: source: {} local: {}".format(source_type, - license_type)) - sys.exit(1) + raise RuntimeError("Tower server licenses must match: source: {} local: {}".format(source_type, + license_type)) else: - print("Failed to validate the license of the remote Tower: {}".format(config_response.data)) - sys.exit(1) + raise RuntimeError("Failed to validate the license of the remote Tower: {}".format(config_response.data)) response = requests.get(inventory_url, auth=HTTPBasicAuth(tower_user, tower_pass), @@ -110,8 +107,7 @@ def read_tower_inventory(tower_host, tower_user, tower_pass, inventory, license_ reason = "Connection to remote host failed: {}".format(e) except json.JSONDecodeError, e: reason = "Failed to parse json from host: {}".format(e) - print(reason) - sys.exit(1) + raise RuntimeError(reason) def main(): @@ -128,5 +124,6 @@ def main(): ) ) + if __name__ == '__main__': main() From 4187d02b8a4ed2a6ab713d4b4f7837a5ca79d787 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Thu, 16 Nov 2017 13:20:52 -0500 Subject: [PATCH 108/141] make settings.AWX_ISOLATED_KEY_GENERATION readonly see: https://github.com/ansible/ansible-tower/issues/7380 --- awx/conf/serializers.py | 6 ++++-- awx/main/tests/functional/api/test_settings.py | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/awx/conf/serializers.py b/awx/conf/serializers.py index 0f588d7ee7..184c1d5243 100644 --- a/awx/conf/serializers.py +++ b/awx/conf/serializers.py @@ -87,8 +87,10 @@ class SettingSingletonSerializer(serializers.Serializer): if self.instance and not hasattr(self.instance, key): continue extra_kwargs = {} - # Make LICENSE read-only here; update via /api/v1/config/ only. - if key == 'LICENSE': + # Make LICENSE and AWX_ISOLATED_KEY_GENERATION read-only here; + # LICENSE is only updated via /api/v1/config/ + # AWX_ISOLATED_KEY_GENERATION is only set/unset via the setup playbook + if key in ('LICENSE', 'AWX_ISOLATED_KEY_GENERATION'): extra_kwargs['read_only'] = True field = settings_registry.get_setting_field(key, mixin_class=SettingFieldMixin, for_user=bool(category_slug == 'user'), **extra_kwargs) fields[key] = field diff --git a/awx/main/tests/functional/api/test_settings.py b/awx/main/tests/functional/api/test_settings.py index f51b1f91f7..301fbc75a5 100644 --- a/awx/main/tests/functional/api/test_settings.py +++ b/awx/main/tests/functional/api/test_settings.py @@ -301,3 +301,19 @@ def test_isolated_keys_readonly(get, patch, delete, admin, key, expected): delete(url, user=admin) assert getattr(settings, key) == 'secret' + + +@pytest.mark.django_db +def test_isolated_key_flag_readonly(get, patch, delete, admin): + settings.AWX_ISOLATED_KEY_GENERATION = True + url = reverse('api:setting_singleton_detail', kwargs={'category_slug': 'jobs'}) + resp = get(url, user=admin) + assert resp.data['AWX_ISOLATED_KEY_GENERATION'] is True + + patch(url, user=admin, data={ + 'AWX_ISOLATED_KEY_GENERATION': False + }) + assert settings.AWX_ISOLATED_KEY_GENERATION is True + + delete(url, user=admin) + assert settings.AWX_ISOLATED_KEY_GENERATION is True From a80d5b1b392ad3090270bc0bc057adafa2d45289 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Thu, 16 Nov 2017 16:31:17 -0500 Subject: [PATCH 109/141] reencrypt WFJT.survey_spec too https://github.com/ansible/ansible-tower/issues/7046 --- awx/main/migrations/_reencrypt.py | 53 ++++++++++--------- .../functional/test_reencrypt_migration.py | 30 +++++++---- 2 files changed, 48 insertions(+), 35 deletions(-) diff --git a/awx/main/migrations/_reencrypt.py b/awx/main/migrations/_reencrypt.py index c1fad4aedf..7d5b0984ce 100644 --- a/awx/main/migrations/_reencrypt.py +++ b/awx/main/migrations/_reencrypt.py @@ -65,7 +65,6 @@ def _credentials(apps): credential.save() - def _unified_jobs(apps): UnifiedJob = apps.get_model('main', 'UnifiedJob') for uj in UnifiedJob.objects.all(): @@ -80,32 +79,36 @@ def encrypt_survey_passwords(apps, schema_editor): _encrypt_survey_passwords( apps.get_model('main', 'Job'), apps.get_model('main', 'JobTemplate'), + apps.get_model('main', 'WorkflowJob'), + apps.get_model('main', 'WorkflowJobTemplate'), ) -def _encrypt_survey_passwords(Job, JobTemplate): +def _encrypt_survey_passwords(Job, JobTemplate, WorkflowJob, WorkflowJobTemplate): from awx.main.utils.encryption import encrypt_value - for jt in JobTemplate.objects.exclude(survey_spec={}): - changed = False - if jt.survey_spec.get('spec', []): - for field in jt.survey_spec['spec']: - if field.get('type') == 'password' and field.get('default', ''): - if field['default'].startswith('$encrypted$'): - continue - field['default'] = encrypt_value(field['default'], pk=None) - changed = True - if changed: - jt.save() + for _type in (JobTemplate, WorkflowJobTemplate): + for jt in _type.objects.exclude(survey_spec={}): + changed = False + if jt.survey_spec.get('spec', []): + for field in jt.survey_spec['spec']: + if field.get('type') == 'password' and field.get('default', ''): + if field['default'].startswith('$encrypted$'): + continue + field['default'] = encrypt_value(field['default'], pk=None) + changed = True + if changed: + jt.save() - for job in Job.objects.defer('result_stdout_text').exclude(survey_passwords={}).iterator(): - changed = False - for key in job.survey_passwords: - if key in job.extra_vars: - extra_vars = json.loads(job.extra_vars) - if not extra_vars.get(key, '') or extra_vars[key].startswith('$encrypted$'): - continue - extra_vars[key] = encrypt_value(extra_vars[key], pk=None) - job.extra_vars = json.dumps(extra_vars) - changed = True - if changed: - job.save() + for _type in (Job, WorkflowJob): + for job in _type.objects.defer('result_stdout_text').exclude(survey_passwords={}).iterator(): + changed = False + for key in job.survey_passwords: + if key in job.extra_vars: + extra_vars = json.loads(job.extra_vars) + if not extra_vars.get(key, '') or extra_vars[key].startswith('$encrypted$'): + continue + extra_vars[key] = encrypt_value(extra_vars[key], pk=None) + job.extra_vars = json.dumps(extra_vars) + changed = True + if changed: + job.save() diff --git a/awx/main/tests/functional/test_reencrypt_migration.py b/awx/main/tests/functional/test_reencrypt_migration.py index 18aa2bc644..d0ec9ab054 100644 --- a/awx/main/tests/functional/test_reencrypt_migration.py +++ b/awx/main/tests/functional/test_reencrypt_migration.py @@ -12,6 +12,8 @@ from awx.main.models import ( UnifiedJob, Job, JobTemplate, + WorkflowJob, + WorkflowJobTemplate, NotificationTemplate, Credential, ) @@ -99,9 +101,13 @@ def test_unified_job_migration(old_enc, new_enc, value): @pytest.mark.django_db -def test_survey_default_password_encryption(job_template_factory): - jt = job_template_factory('jt', organization='org1', project='prj', - inventory='inv', credential='cred').job_template +@pytest.mark.parametrize("attr, cls", [ + ['job_template', JobTemplate], + ['workflow_job_template', WorkflowJobTemplate] +]) +def test_survey_default_password_encryption(attr, cls, request): + factory = request.getfuncargvalue('{}_factory'.format(attr)) + jt = getattr(factory('jt'), attr) jt.survey_enabled = True jt.survey_spec = { 'description': 'A survey', @@ -117,15 +123,19 @@ def test_survey_default_password_encryption(job_template_factory): } jt.save() - _encrypt_survey_passwords(Job, JobTemplate) - spec = JobTemplate.objects.get(pk=jt.pk).survey_spec['spec'] + _encrypt_survey_passwords(Job, JobTemplate, WorkflowJob, WorkflowJobTemplate) + spec = cls.objects.get(pk=jt.pk).survey_spec['spec'] assert decrypt_value(get_encryption_key('value', pk=None), spec[0]['default']) == 'SUPERSECRET' @pytest.mark.django_db -def test_job_survey_vars_encryption(job_template_factory): - jt = job_template_factory('jt', organization='org1', project='prj', - inventory='inv', credential='cred').job_template +@pytest.mark.parametrize("attr, cls", [ + ['job_template', Job], + ['workflow_job_template', WorkflowJob] +]) +def test_job_survey_vars_encryption(attr, cls, request): + factory = request.getfuncargvalue('{}_factory'.format(attr)) + jt = getattr(factory('jt'), attr) jt.survey_enabled = True jt.survey_spec = { 'description': 'A survey', @@ -144,6 +154,6 @@ def test_job_survey_vars_encryption(job_template_factory): job.extra_vars = json.dumps({'secret_value': 'SUPERSECRET'}) job.save() - _encrypt_survey_passwords(Job, JobTemplate) - job = Job.objects.get(pk=job.pk) + _encrypt_survey_passwords(Job, JobTemplate, WorkflowJob, WorkflowJobTemplate) + job = cls.objects.get(pk=job.pk) assert json.loads(job.decrypted_extra_vars()) == {'secret_value': 'SUPERSECRET'} From 51c73cb357090fd5af92c19541898678067719dc Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Fri, 17 Nov 2017 10:16:49 -0500 Subject: [PATCH 110/141] update original when updating computed fields --- awx/main/models/inventory.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index 3ab007d325..4bb3c8838f 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -357,6 +357,8 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin): for field, value in computed_fields.items(): if getattr(iobj, field) != value: setattr(iobj, field, value) + # update in-memory object + setattr(self, field, value) else: computed_fields.pop(field) if computed_fields: From 249a5e5e4d4028250579b9206ed79d811a430c32 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Fri, 17 Nov 2017 11:32:17 -0500 Subject: [PATCH 111/141] Include all previously run operations to satisfy Django migration planner. --- .../migrations/0003_squashed_v300_v303_updates.py | 7 +++++-- awx/main/migrations/_squashed.py | 14 +++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/awx/main/migrations/0003_squashed_v300_v303_updates.py b/awx/main/migrations/0003_squashed_v300_v303_updates.py index 042c036665..48210bfa48 100644 --- a/awx/main/migrations/0003_squashed_v300_v303_updates.py +++ b/awx/main/migrations/0003_squashed_v300_v303_updates.py @@ -9,6 +9,9 @@ from django.db import migrations, models from django.conf import settings import awx.main.fields +import _squashed +from _squashed_30 import SQUASHED_30 + class Migration(migrations.Migration): replaces = [(b'main', '0020_v300_labels_changes'), @@ -19,7 +22,7 @@ class Migration(migrations.Migration): (b'main', '0025_v300_update_rbac_parents'), (b'main', '0026_v300_credential_unique'), (b'main', '0027_v300_team_migrations'), - (b'main', '0028_v300_org_team_cascade')] + (b'main', '0028_v300_org_team_cascade')] + _squashed.replaces(SQUASHED_30, applied=True) dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), @@ -116,4 +119,4 @@ class Migration(migrations.Migration): field=models.ForeignKey(related_name='teams', to='main.Organization'), preserve_default=False, ), - ] + ] + _squashed.operations(SQUASHED_30, applied=True) diff --git a/awx/main/migrations/_squashed.py b/awx/main/migrations/_squashed.py index 1470df54ce..e2f19970b4 100644 --- a/awx/main/migrations/_squashed.py +++ b/awx/main/migrations/_squashed.py @@ -35,21 +35,29 @@ def current_migration(exclude_squashed=True): return None -def replaces(squashed): +def replaces(squashed, applied=False): '''Build a list of replacement migrations based on the most recent non-squashed migration and the provided list of SQUASHED migrations. If the most recent non-squashed migration is not present anywhere in the SQUASHED dictionary, assume they have all been applied. + + If applied is True, this will return a list of all the migrations that have already + been applied. ''' squashed_keys, key_index = squash_data(squashed) + if applied: + return [(b'main', key) for key in squashed_keys[:key_index]] return [(b'main', key) for key in squashed_keys[key_index:]] -def operations(squashed): +def operations(squashed, applied=False): '''Build a list of migration operations based on the most recent non-squashed migration and the provided list of squashed migrations. If the most recent non-squashed migration is not present anywhere in the `squashed` dictionary, assume they have all been applied. + + If applied is True, this will return a list of all the operations that have + already been applied. ''' squashed_keys, key_index = squash_data(squashed) - op_keys = squashed_keys[key_index:] + op_keys = squashed_keys[:key_index] if applied else squashed_keys[key_index:] ops = [squashed[op_key] for op_key in op_keys] return [op for op in chain.from_iterable(ops)] From 0641c6b0a628d44c00a9e0deffb0219391cb3900 Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Thu, 16 Nov 2017 16:43:21 -0500 Subject: [PATCH 112/141] Supress exception with concurrent deletion Relates https://github.com/ansible/ansible-tower/issues/7768 This issue, as well as https://github.com/ansible/ansible-tower/issues/7622, both rooted in a concurrency issue of Django ORM: https://github.com/ansible/ansible-tower/issues/762://code.djangoproject.com/ticket/28806 The solution related deals specifically with the related issue, but is not a general solution. A general workaround can be found in https://github.com/ansible/tower/pull/500. Signed-off-by: Aaron Tan --- awx/api/serializers.py | 66 ++++++++++++++++++++++++++++++++---------- awx/main/access.py | 8 +++-- 2 files changed, 57 insertions(+), 17 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index f4be8560bb..86fa3aee8a 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -1106,8 +1106,13 @@ class ProjectUpdateSerializer(UnifiedJobSerializer, ProjectOptionsSerializer): def get_related(self, obj): res = super(ProjectUpdateSerializer, self).get_related(obj) + try: + res.update(dict( + project = self.reverse('api:project_detail', kwargs={'pk': obj.project.pk}), + )) + except ObjectDoesNotExist: + pass res.update(dict( - project = self.reverse('api:project_detail', kwargs={'pk': obj.project.pk}), cancel = self.reverse('api:project_update_cancel', kwargs={'pk': obj.pk}), scm_inventory_updates = self.reverse('api:project_update_scm_inventory_updates', kwargs={'pk': obj.pk}), notifications = self.reverse('api:project_update_notifications_list', kwargs={'pk': obj.pk}), @@ -1728,8 +1733,15 @@ class InventoryUpdateSerializer(UnifiedJobSerializer, InventorySourceOptionsSeri def get_related(self, obj): res = super(InventoryUpdateSerializer, self).get_related(obj) + try: + res.update(dict( + inventory_source = self.reverse( + 'api:inventory_source_detail', kwargs={'pk': obj.inventory_source.pk} + ), + )) + except ObjectDoesNotExist: + pass res.update(dict( - inventory_source = self.reverse('api:inventory_source_detail', kwargs={'pk': obj.inventory_source.pk}), cancel = self.reverse('api:inventory_update_cancel', kwargs={'pk': obj.pk}), notifications = self.reverse('api:inventory_update_notifications_list', kwargs={'pk': obj.pk}), )) @@ -2339,14 +2351,30 @@ class JobOptionsSerializer(LabelsListMixin, BaseSerializer): def get_related(self, obj): res = super(JobOptionsSerializer, self).get_related(obj) res['labels'] = self.reverse('api:job_template_label_list', kwargs={'pk': obj.pk}) - if obj.inventory: - res['inventory'] = self.reverse('api:inventory_detail', kwargs={'pk': obj.inventory.pk}) - if obj.project: - res['project'] = self.reverse('api:project_detail', kwargs={'pk': obj.project.pk}) - if obj.credential: - res['credential'] = self.reverse('api:credential_detail', kwargs={'pk': obj.credential.pk}) - if obj.vault_credential: - res['vault_credential'] = self.reverse('api:credential_detail', kwargs={'pk': obj.vault_credential.pk}) + try: + if obj.inventory: + res['inventory'] = self.reverse('api:inventory_detail', kwargs={'pk': obj.inventory.pk}) + except ObjectDoesNotExist: + setattr(obj, 'inventory', None) + try: + if obj.project: + res['project'] = self.reverse('api:project_detail', kwargs={'pk': obj.project.pk}) + except ObjectDoesNotExist: + setattr(obj, 'project', None) + try: + if obj.credential: + res['credential'] = self.reverse( + 'api:credential_detail', kwargs={'pk': obj.credential.pk} + ) + except ObjectDoesNotExist: + setattr(obj, 'credential', None) + try: + if obj.vault_credential: + res['vault_credential'] = self.reverse( + 'api:credential_detail', kwargs={'pk': obj.vault_credential.pk} + ) + except ObjectDoesNotExist: + setattr(obj, 'vault_credential', None) if self.version > 1: if isinstance(obj, UnifiedJobTemplate): res['extra_credentials'] = self.reverse( @@ -2584,15 +2612,23 @@ class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer): notifications = self.reverse('api:job_notifications_list', kwargs={'pk': obj.pk}), labels = self.reverse('api:job_label_list', kwargs={'pk': obj.pk}), )) - if obj.job_template: - res['job_template'] = self.reverse('api:job_template_detail', - kwargs={'pk': obj.job_template.pk}) + try: + if obj.job_template: + res['job_template'] = self.reverse('api:job_template_detail', + kwargs={'pk': obj.job_template.pk}) + except ObjectDoesNotExist: + setattr(obj, 'job_template', None) if (obj.can_start or True) and self.version == 1: # TODO: remove in 3.3 res['start'] = self.reverse('api:job_start', kwargs={'pk': obj.pk}) if obj.can_cancel or True: res['cancel'] = self.reverse('api:job_cancel', kwargs={'pk': obj.pk}) - if obj.project_update: - res['project_update'] = self.reverse('api:project_update_detail', kwargs={'pk': obj.project_update.pk}) + try: + if obj.project_update: + res['project_update'] = self.reverse( + 'api:project_update_detail', kwargs={'pk': obj.project_update.pk} + ) + except ObjectDoesNotExist: + pass res['relaunch'] = self.reverse('api:job_relaunch', kwargs={'pk': obj.pk}) return res diff --git a/awx/main/access.py b/awx/main/access.py index 4d44dc2995..1de1e8fb3f 100644 --- a/awx/main/access.py +++ b/awx/main/access.py @@ -12,6 +12,7 @@ from django.db.models import Q, Prefetch from django.contrib.auth.models import User from django.contrib.contenttypes.models import ContentType from django.utils.translation import ugettext_lazy as _ +from django.core.exceptions import ObjectDoesNotExist # Django REST Framework from rest_framework.exceptions import ParseError, PermissionDenied, ValidationError @@ -1134,8 +1135,11 @@ class ProjectUpdateAccess(BaseAccess): def can_start(self, obj, validate_license=True): # for relaunching - if obj and obj.project: - return self.user in obj.project.update_role + try: + if obj and obj.project: + return self.user in obj.project.update_role + except ObjectDoesNotExist: + pass return False @check_superuser From 6c89935521fec471492e9965df634651f1a7012e Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Mon, 27 Nov 2017 12:34:55 -0500 Subject: [PATCH 113/141] correctly cascade job cancel * Check the reason for a dependent project update failure. If it's because of a cancel, then let the normal cancel mechanisms update the jobs status and explanation. Do not update the dependent job's status for a project update that was canceled, in the run code. --- awx/main/tasks.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index c4e1e27b34..5af5d9bed2 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -1279,10 +1279,12 @@ class RunJob(BaseTask): task_instance.run(local_project_sync.id) job = self.update_model(job.pk, scm_revision=job.project.scm_revision) except Exception: - job = self.update_model(job.pk, status='failed', - job_explanation=('Previous Task Failed: {"job_type": "%s", "job_name": "%s", "job_id": "%s"}' % - ('project_update', local_project_sync.name, local_project_sync.id))) - raise + local_project_sync.refresh_from_db() + if local_project_sync.status != 'canceled': + job = self.update_model(job.pk, status='failed', + job_explanation=('Previous Task Failed: {"job_type": "%s", "job_name": "%s", "job_id": "%s"}' % + ('project_update', local_project_sync.name, local_project_sync.id))) + raise if job.use_fact_cache and not kwargs.get('isolated'): job.start_job_fact_cache() From 044c047ac6dfd59784822db6e226100fb53e8517 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Mon, 27 Nov 2017 17:25:45 -0500 Subject: [PATCH 114/141] fix a bug in survey password default validation see: https://github.com/ansible/ansible-tower/issues/7046 see: https://github.com/ansible/ansible-tower/issues/7764 see: https://github.com/ansible/ansible-tower/issues/7784 --- awx/main/models/mixins.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/awx/main/models/mixins.py b/awx/main/models/mixins.py index 8d2fead0e6..563619a101 100644 --- a/awx/main/models/mixins.py +++ b/awx/main/models/mixins.py @@ -166,15 +166,19 @@ class SurveyJobTemplateMixin(models.Model): # make a copy of the data to break references (so that we don't # inadvertently expose unencrypted default passwords as we validate) data = data.copy() - if all([ - survey_element['type'] == "password", - data.get(survey_element['variable']) == '$encrypted$' - ]): - # replace encrypted password defaults so we don't validate on - # $encrypted$ + password_value = data.get(survey_element['variable']) + if ( + survey_element['type'] == "password" and + isinstance(password_value, basestring) and + password_value.startswith('$encrypted$') + ): + if password_value == '$encrypted$': + # replace encrypted password defaults so we don't validate on + # $encrypted$ + password_value = survey_element['default'] data[survey_element['variable']] = decrypt_value( get_encryption_key('value', pk=None), - survey_element['default'] + password_value ) if survey_element['variable'] not in data and survey_element['required']: errors.append("'%s' value missing" % survey_element['variable']) From 6fa0d9d4ed2ddde7b972b8ef97a9f1295aa01c8d Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Tue, 28 Nov 2017 10:09:33 -0500 Subject: [PATCH 115/141] rename oVirt4 to Red Hat Virtualization see: https://github.com/ansible/ansible-tower/issues/7790 --- awx/main/constants.py | 2 +- awx/main/management/commands/inventory_import.py | 1 + .../0010_v322_add_ovirt4_tower_inventory.py | 6 +++--- awx/main/migrations/_credentialtypes.py | 2 +- awx/main/models/base.py | 2 +- awx/main/models/credential.py | 6 +++--- awx/main/models/inventory.py | 4 ++-- awx/main/tests/functional/test_credential.py | 2 +- awx/main/tests/unit/test_tasks.py | 6 +++--- awx/settings/defaults.py | 12 ++++++------ 10 files changed, 22 insertions(+), 21 deletions(-) diff --git a/awx/main/constants.py b/awx/main/constants.py index aabcc0b2e3..3ddb4791a8 100644 --- a/awx/main/constants.py +++ b/awx/main/constants.py @@ -5,7 +5,7 @@ import re from django.utils.translation import ugettext_lazy as _ -CLOUD_PROVIDERS = ('azure_rm', 'ec2', 'gce', 'vmware', 'openstack', 'ovirt4', 'satellite6', 'cloudforms', 'tower') +CLOUD_PROVIDERS = ('azure_rm', 'ec2', 'gce', 'vmware', 'openstack', 'rhv', 'satellite6', 'cloudforms', 'tower') SCHEDULEABLE_PROVIDERS = CLOUD_PROVIDERS + ('custom', 'scm',) PRIVILEGE_ESCALATION_METHODS = [ ('sudo', _('Sudo')), ('su', _('Su')), ('pbrun', _('Pbrun')), ('pfexec', _('Pfexec')), ('dzdo', _('DZDO')), ('pmrun', _('Pmrun')), ('runas', _('Runas'))] ANSI_SGR_PATTERN = re.compile(r'\x1b\[[0-9;]*m') diff --git a/awx/main/management/commands/inventory_import.py b/awx/main/management/commands/inventory_import.py index f4ee1401fd..811dd03991 100644 --- a/awx/main/management/commands/inventory_import.py +++ b/awx/main/management/commands/inventory_import.py @@ -229,6 +229,7 @@ def load_inventory_source(source, group_filter_re=None, ''' # Sanity check: We sanitize these module names for our API but Ansible proper doesn't follow # good naming conventions + source = source.replace('rhv.py', 'ovirt4.py') source = source.replace('satellite6.py', 'foreman.py') source = source.replace('vmware.py', 'vmware_inventory.py') if not os.path.exists(source): diff --git a/awx/main/migrations/0010_v322_add_ovirt4_tower_inventory.py b/awx/main/migrations/0010_v322_add_ovirt4_tower_inventory.py index aa00d66163..aac423cd1c 100644 --- a/awx/main/migrations/0010_v322_add_ovirt4_tower_inventory.py +++ b/awx/main/migrations/0010_v322_add_ovirt4_tower_inventory.py @@ -14,15 +14,15 @@ class Migration(migrations.Migration): ] operations = [ - migrations.RunPython(credentialtypes.create_ovirt4_tower_credtype), + migrations.RunPython(credentialtypes.create_rhv_tower_credtype), migrations.AlterField( model_name='inventorysource', name='source', - field=models.CharField(default=b'', max_length=32, blank=True, choices=[(b'', 'Manual'), (b'file', 'File, Directory or Script'), (b'scm', 'Sourced from a Project'), (b'ec2', 'Amazon EC2'), (b'gce', 'Google Compute Engine'), (b'azure_rm', 'Microsoft Azure Resource Manager'), (b'vmware', 'VMware vCenter'), (b'satellite6', 'Red Hat Satellite 6'), (b'cloudforms', 'Red Hat CloudForms'), (b'openstack', 'OpenStack'), (b'ovirt4', 'oVirt4'), (b'tower', 'Ansible Tower'), (b'custom', 'Custom Script')]), + field=models.CharField(default=b'', max_length=32, blank=True, choices=[(b'', 'Manual'), (b'file', 'File, Directory or Script'), (b'scm', 'Sourced from a Project'), (b'ec2', 'Amazon EC2'), (b'gce', 'Google Compute Engine'), (b'azure_rm', 'Microsoft Azure Resource Manager'), (b'vmware', 'VMware vCenter'), (b'satellite6', 'Red Hat Satellite 6'), (b'cloudforms', 'Red Hat CloudForms'), (b'openstack', 'OpenStack'), (b'rhv', 'Red Hat Virtualization'), (b'tower', 'Ansible Tower'), (b'custom', 'Custom Script')]), ), migrations.AlterField( model_name='inventoryupdate', name='source', - field=models.CharField(default=b'', max_length=32, blank=True, choices=[(b'', 'Manual'), (b'file', 'File, Directory or Script'), (b'scm', 'Sourced from a Project'), (b'ec2', 'Amazon EC2'), (b'gce', 'Google Compute Engine'), (b'azure_rm', 'Microsoft Azure Resource Manager'), (b'vmware', 'VMware vCenter'), (b'satellite6', 'Red Hat Satellite 6'), (b'cloudforms', 'Red Hat CloudForms'), (b'openstack', 'OpenStack'), (b'ovirt4', 'oVirt4'), (b'tower', 'Ansible Tower'), (b'custom', 'Custom Script')]), + field=models.CharField(default=b'', max_length=32, blank=True, choices=[(b'', 'Manual'), (b'file', 'File, Directory or Script'), (b'scm', 'Sourced from a Project'), (b'ec2', 'Amazon EC2'), (b'gce', 'Google Compute Engine'), (b'azure_rm', 'Microsoft Azure Resource Manager'), (b'vmware', 'VMware vCenter'), (b'satellite6', 'Red Hat Satellite 6'), (b'cloudforms', 'Red Hat CloudForms'), (b'openstack', 'OpenStack'), (b'rhv', 'Red Hat Virtualization'), (b'tower', 'Ansible Tower'), (b'custom', 'Custom Script')]), ), ] diff --git a/awx/main/migrations/_credentialtypes.py b/awx/main/migrations/_credentialtypes.py index 9b008a2b24..ee8475f18a 100644 --- a/awx/main/migrations/_credentialtypes.py +++ b/awx/main/migrations/_credentialtypes.py @@ -174,7 +174,7 @@ def migrate_job_credentials(apps, schema_editor): utils.get_current_apps = orig_current_apps -def create_ovirt4_tower_credtype(apps, schema_editor): +def create_rhv_tower_credtype(apps, schema_editor): CredentialType.setup_tower_managed_defaults() diff --git a/awx/main/models/base.py b/awx/main/models/base.py index 9c7f58d096..4eb1d15ed5 100644 --- a/awx/main/models/base.py +++ b/awx/main/models/base.py @@ -52,7 +52,7 @@ PROJECT_UPDATE_JOB_TYPE_CHOICES = [ (PERM_INVENTORY_CHECK, _('Check')), ] -CLOUD_INVENTORY_SOURCES = ['ec2', 'vmware', 'gce', 'azure_rm', 'openstack', 'ovirt4', 'custom', 'satellite6', 'cloudforms', 'scm', 'tower',] +CLOUD_INVENTORY_SOURCES = ['ec2', 'vmware', 'gce', 'azure_rm', 'openstack', 'rhv', 'custom', 'satellite6', 'cloudforms', 'scm', 'tower',] VERBOSITY_CHOICES = [ (0, '0 (Normal)'), diff --git a/awx/main/models/credential.py b/awx/main/models/credential.py index b6cf191b28..f33ed07ee4 100644 --- a/awx/main/models/credential.py +++ b/awx/main/models/credential.py @@ -62,7 +62,7 @@ class V1Credential(object): ('gce', 'Google Compute Engine'), ('azure_rm', 'Microsoft Azure Resource Manager'), ('openstack', 'OpenStack'), - ('ovirt4', 'oVirt4'), + ('rhv', 'Red Hat Virtualization'), ('insights', 'Insights'), ('tower', 'Ansible Tower'), ] @@ -1019,10 +1019,10 @@ def insights(cls): @CredentialType.default -def ovirt4(cls): +def rhv(cls): return cls( kind='cloud', - name='oVirt4', + name='Red Hat Virtualization', managed_by_tower=True, inputs={ 'fields': [{ diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index 4bb3c8838f..fbf00f0af4 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -883,7 +883,7 @@ class InventorySourceOptions(BaseModel): ('satellite6', _('Red Hat Satellite 6')), ('cloudforms', _('Red Hat CloudForms')), ('openstack', _('OpenStack')), - ('ovirt4', _('oVirt4')), + ('rhv', _('Red Hat Virtualization')), ('tower', _('Ansible Tower')), ('custom', _('Custom Script')), ] @@ -1134,7 +1134,7 @@ class InventorySourceOptions(BaseModel): return [('all', 'All')] @classmethod - def get_ovirt4_region_choices(self): + def get_rhv_region_choices(self): """No region supprt""" return [('all', 'All')] diff --git a/awx/main/tests/functional/test_credential.py b/awx/main/tests/functional/test_credential.py index d69ee9ce37..a9463ddcfb 100644 --- a/awx/main/tests/functional/test_credential.py +++ b/awx/main/tests/functional/test_credential.py @@ -25,7 +25,7 @@ def test_default_cred_types(): 'insights', 'net', 'openstack', - 'ovirt4', + 'rhv', 'satellite6', 'scm', 'ssh', diff --git a/awx/main/tests/unit/test_tasks.py b/awx/main/tests/unit/test_tasks.py index 28d24f62cc..0b54b310d8 100644 --- a/awx/main/tests/unit/test_tasks.py +++ b/awx/main/tests/unit/test_tasks.py @@ -704,8 +704,8 @@ class TestJobCredentials(TestJobExecution): self.task.run(self.pk) @pytest.mark.parametrize("ca_file", [None, '/path/to/some/file']) - def test_ovirt4_credentials(self, ca_file): - ovirt4 = CredentialType.defaults['ovirt4']() + def test_rhv_credentials(self, ca_file): + rhv = CredentialType.defaults['rhv']() inputs = { 'host': 'some-ovirt-host.example.org', 'username': 'bob', @@ -715,7 +715,7 @@ class TestJobCredentials(TestJobExecution): inputs['ca_file'] = ca_file credential = Credential( pk=1, - credential_type=ovirt4, + credential_type=rhv, inputs=inputs ) credential.inputs['password'] = encrypt_field(credential, 'password') diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index d6c1b1140e..b381548668 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -825,12 +825,12 @@ OPENSTACK_INSTANCE_ID_VAR = 'openstack.id' # --------------------- # ----- oVirt4 ----- # --------------------- -OVIRT4_ENABLED_VAR = 'status' -OVIRT4_ENABLED_VALUE = 'up' -OVIRT4_GROUP_FILTER = r'^.+$' -OVIRT4_HOST_FILTER = r'^.+$' -OVIRT4_EXCLUDE_EMPTY_GROUPS = True -OVIRT4_INSTANCE_ID_VAR = 'id' +RHV_ENABLED_VAR = 'status' +RHV_ENABLED_VALUE = 'up' +RHV_GROUP_FILTER = r'^.+$' +RHV_HOST_FILTER = r'^.+$' +RHV_EXCLUDE_EMPTY_GROUPS = True +RHV_INSTANCE_ID_VAR = 'id' # --------------------- # ----- Tower ----- From 26845642f0909a49bc2c2a5b27036bd9e90c443a Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Tue, 28 Nov 2017 13:05:13 -0500 Subject: [PATCH 116/141] fix a bug which caused v1 cred backwards-compat to apply to v2 requests see: https://github.com/ansible/ansible-tower/issues/7793 --- awx/api/serializers.py | 2 +- awx/main/tests/functional/api/test_credential.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index f4be8560bb..311a44e83d 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -2127,7 +2127,7 @@ class CredentialSerializer(BaseSerializer): def to_internal_value(self, data): # TODO: remove when API v1 is removed - if 'credential_type' not in data: + if 'credential_type' not in data and self.version == 1: # If `credential_type` is not provided, assume the payload is a # v1 credential payload that specifies a `kind` and a flat list # of field values diff --git a/awx/main/tests/functional/api/test_credential.py b/awx/main/tests/functional/api/test_credential.py index ff29f9ed3f..e26447deea 100644 --- a/awx/main/tests/functional/api/test_credential.py +++ b/awx/main/tests/functional/api/test_credential.py @@ -588,7 +588,7 @@ def test_create_org_credential_as_admin(post, organization, org_admin, credentia params['name'] = 'Some name' params['organization'] = organization.id response = post( - reverse('api:credential_list'), + reverse('api:credential_list', kwargs={'version': version}), params, org_admin ) @@ -604,7 +604,7 @@ def test_credential_detail(post, get, organization, org_admin, credentialtype_ss params['name'] = 'Some name' params['organization'] = organization.id response = post( - reverse('api:credential_list'), + reverse('api:credential_list', kwargs={'version': version}), params, org_admin ) @@ -1467,6 +1467,14 @@ def test_credential_type_mutability(patch, organization, admin, credentialtype_s 'as it may break the functionality of the resources using it.'] assert response.data['credential_type'] == expected + response = patch( + reverse('api:credential_detail', kwargs={'version': 'v2', 'pk': cred.pk}), + {'name': 'Worst credential ever'}, + admin + ) + assert response.status_code == 200 + assert Credential.objects.get(pk=cred.pk).name == 'Worst credential ever' + related_obj.delete() response = _change_credential_type() assert response.status_code == 200 From 1425021106b01a0332dc8a54d8ef16424e101544 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Tue, 28 Nov 2017 16:52:47 -0500 Subject: [PATCH 117/141] fix another encrypted survey password bug properly encrypt extra_vars that overlap with survey passwords when `ask_variables_on_launch=true` see: https://github.com/ansible/ansible-tower/issues/7796 --- awx/main/models/jobs.py | 15 ++++++++++----- awx/main/models/mixins.py | 4 ++-- awx/main/tests/functional/api/test_survey_spec.py | 5 ++++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index 249c051f20..6108085e72 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -400,19 +400,24 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour else: if field == 'extra_vars' and self.survey_enabled and self.survey_spec: # Accept vars defined in the survey and no others - survey_vars = [question['variable'] for question in self.survey_spec.get('spec', [])] + survey_vars = [ + question['variable'] for question in self.survey_spec.get('spec', []) + ] extra_vars = parse_yaml_or_json(kwargs[field]) for key in extra_vars: if key in survey_vars: - if key in survey_password_variables: - prompted_fields[field][key] = encrypt_value(extra_vars[key]) - else: - prompted_fields[field][key] = extra_vars[key] + prompted_fields[field][key] = extra_vars[key] else: ignored_fields[field][key] = extra_vars[key] else: ignored_fields[field] = kwargs[field] + for key in prompted_fields.get('extra_vars', {}): + if key in survey_password_variables: + prompted_fields['extra_vars'][key] = encrypt_value( + prompted_fields['extra_vars'][key] + ) + return prompted_fields, ignored_fields def _extra_job_type_errors(self, data): diff --git a/awx/main/models/mixins.py b/awx/main/models/mixins.py index 563619a101..ba01ad8ce6 100644 --- a/awx/main/models/mixins.py +++ b/awx/main/models/mixins.py @@ -136,7 +136,7 @@ class SurveyJobTemplateMixin(models.Model): else: runtime_extra_vars = {} - # Overwrite with job template extra vars with survey default vars + # Overwrite job template extra vars with survey default vars if self.survey_enabled and 'spec' in self.survey_spec: for survey_element in self.survey_spec.get("spec", []): default = survey_element.get('default') @@ -145,7 +145,7 @@ class SurveyJobTemplateMixin(models.Model): if survey_element.get('type') == 'password': if variable_key in runtime_extra_vars and default: kw_value = runtime_extra_vars[variable_key] - if kw_value.startswith('$encrypted$') and kw_value != default: + if kw_value == '$encrypted$' and kw_value != default: runtime_extra_vars[variable_key] = default if default is not None: diff --git a/awx/main/tests/functional/api/test_survey_spec.py b/awx/main/tests/functional/api/test_survey_spec.py index 0b9a16cea1..81ce167656 100644 --- a/awx/main/tests/functional/api/test_survey_spec.py +++ b/awx/main/tests/functional/api/test_survey_spec.py @@ -93,13 +93,14 @@ def test_survey_spec_sucessful_creation(survey_spec_factory, job_template, post, @mock.patch('awx.api.views.feature_enabled', lambda feature: True) @pytest.mark.django_db +@pytest.mark.parametrize('with_default', [True, False]) @pytest.mark.parametrize('value, status', [ ('SUPERSECRET', 201), (['some', 'invalid', 'list'], 400), ({'some-invalid': 'dict'}, 400), (False, 400) ]) -def test_survey_spec_passwords_are_encrypted_on_launch(job_template_factory, post, admin_user, value, status): +def test_survey_spec_passwords_are_encrypted_on_launch(job_template_factory, post, admin_user, with_default, value, status): objects = job_template_factory('jt', organization='org1', project='prj', inventory='inv', credential='cred') job_template = objects.job_template @@ -116,6 +117,8 @@ def test_survey_spec_passwords_are_encrypted_on_launch(job_template_factory, pos }], 'name': 'my survey' } + if with_default: + input_data['spec'][0]['default'] = 'some-default' post(url=reverse('api:job_template_survey_spec', kwargs={'pk': job_template.id}), data=input_data, user=admin_user, expect=200) resp = post(reverse('api:job_template_launch', kwargs={'pk': job_template.pk}), From febfcf709dc2c3248a9ae86ddcb749745448ab6a Mon Sep 17 00:00:00 2001 From: Hideki Saito Date: Wed, 29 Nov 2017 09:57:41 -0500 Subject: [PATCH 118/141] fix incorrect virtualenv path for sosreport plugin --- tools/sosreport/tower.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/sosreport/tower.py b/tools/sosreport/tower.py index 9ca0915509..732bcca9f7 100644 --- a/tools/sosreport/tower.py +++ b/tools/sosreport/tower.py @@ -8,7 +8,7 @@ SOSREPORT_TOWER_COMMANDS = [ "ansible --version", # ansible core version "awx-manage --version", # tower version "supervisorctl status", # tower process status - "/var/lib/awx/venv/tower/bin/pip freeze", # pip package list + "/var/lib/awx/venv/awx/bin/pip freeze", # pip package list "/var/lib/awx/venv/ansible/bin/pip freeze", # pip package list "tree -d /var/lib/awx", # show me the dirs "ls -ll /var/lib/awx", # check permissions From 68ada92f3b14dbc254e0cb413aa5b1653104b264 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Wed, 29 Nov 2017 14:09:25 -0500 Subject: [PATCH 119/141] more survey password encryption bug squashing the nature of this latest bug is that the WorkflowJob has a *different* implementation of _accept_or_ignore_job_kwargs, and it wasn't performing encryption for extra vars provided at launch time; this change places the encryption mechanism in UJT.create_unified_job so that it works the same for _all_ UJTs see: https://github.com/ansible/ansible-tower/issues/7798 see: https://github.com/ansible/ansible-tower/issues/7046 --- awx/main/models/jobs.py | 8 -------- awx/main/models/unified_jobs.py | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index 6108085e72..d0729cc48b 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -37,7 +37,6 @@ from awx.main.utils import ( ignore_inventory_computed_fields, parse_yaml_or_json, ) -from awx.main.utils.encryption import encrypt_value from awx.main.fields import ImplicitRoleField from awx.main.models.mixins import ResourceMixin, SurveyJobTemplateMixin, SurveyJobMixin, TaskManagerJobMixin from awx.main.models.base import PERM_INVENTORY_SCAN @@ -386,7 +385,6 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour # Sort the runtime fields allowed and disallowed by job template ignored_fields = {} prompted_fields = {} - survey_password_variables = self.survey_password_variables() ask_for_vars_dict = self._ask_for_vars_dict() @@ -412,12 +410,6 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour else: ignored_fields[field] = kwargs[field] - for key in prompted_fields.get('extra_vars', {}): - if key in survey_password_variables: - prompted_fields['extra_vars'][key] = encrypt_value( - prompted_fields['extra_vars'][key] - ) - return prompted_fields, ignored_fields def _extra_job_type_errors(self, data): diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py index 4e4af4c8ef..3a90825369 100644 --- a/awx/main/models/unified_jobs.py +++ b/awx/main/models/unified_jobs.py @@ -32,7 +32,7 @@ from awx.main.models.base import * # noqa from awx.main.models.schedules import Schedule from awx.main.models.mixins import ResourceMixin, TaskManagerUnifiedJobMixin from awx.main.utils import ( - decrypt_field, _inventory_updates, + encrypt_value, decrypt_field, _inventory_updates, copy_model_by_class, copy_m2m_relationships, get_type_for_model, parse_yaml_or_json ) @@ -336,6 +336,22 @@ class UnifiedJobTemplate(PolymorphicModel, CommonModelNameNotUnique, Notificatio ''' Create a new unified job based on this unified job template. ''' + + # automatically encrypt survey fields + if hasattr(self, 'survey_spec') and getattr(self, 'survey_enabled', False): + password_list = self.survey_password_variables() + for key in kwargs.get('extra_vars', {}): + if key in password_list: + if kwargs['extra_vars'][key] == '$encrypted$': + # If we get into this block, it means there's probably + # a bug in the way we substitute default survey + # passwords; the value we anticipate here is plaintext + # that needs to be encrypted + raise NotImplementedError('extra_var encryption failed (unexpected $encrypted$ value)') + kwargs['extra_vars'][key] = encrypt_value( + kwargs['extra_vars'][key] + ) + unified_job_class = self._get_unified_job_class() fields = self._get_unified_job_field_names() unified_job = copy_model_by_class(self, unified_job_class, fields, kwargs) From a3dd9eb4b7b85470ec9c7c2213f6b5987c572863 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Wed, 29 Nov 2017 16:23:07 -0500 Subject: [PATCH 120/141] removing some cruft we thought would help us catch bugs (it didn't) --- awx/main/models/unified_jobs.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py index 3a90825369..83ac0ac29a 100644 --- a/awx/main/models/unified_jobs.py +++ b/awx/main/models/unified_jobs.py @@ -342,12 +342,6 @@ class UnifiedJobTemplate(PolymorphicModel, CommonModelNameNotUnique, Notificatio password_list = self.survey_password_variables() for key in kwargs.get('extra_vars', {}): if key in password_list: - if kwargs['extra_vars'][key] == '$encrypted$': - # If we get into this block, it means there's probably - # a bug in the way we substitute default survey - # passwords; the value we anticipate here is plaintext - # that needs to be encrypted - raise NotImplementedError('extra_var encryption failed (unexpected $encrypted$ value)') kwargs['extra_vars'][key] = encrypt_value( kwargs['extra_vars'][key] ) From ed28faa3db7629acf91b0262a8578479cc08938d Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Thu, 30 Nov 2017 16:08:05 +0000 Subject: [PATCH 121/141] Use TMP instead of TMPDIR and only set it in RunProjectUpdate --- awx/main/tasks.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 5af5d9bed2..2fafd693d1 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -1026,9 +1026,6 @@ class RunJob(BaseTask): plugin_path = ':'.join(plugin_dirs) env = super(RunJob, self).build_env(job, **kwargs) env = self.add_ansible_venv(env, add_awx_lib=kwargs.get('isolated', False)) - # give ansible a hint about the intended tmpdir to work around issues - # like https://github.com/ansible/ansible/issues/30064 - env['TMPDIR'] = settings.AWX_PROOT_BASE_PATH # Set environment variables needed for inventory and job event # callbacks to work. env['JOB_ID'] = str(job.pk) @@ -1356,6 +1353,9 @@ class RunProjectUpdate(BaseTask): env['ANSIBLE_ASK_PASS'] = str(False) env['ANSIBLE_ASK_SUDO_PASS'] = str(False) env['DISPLAY'] = '' # Prevent stupid password popup when running tests. + # give ansible a hint about the intended tmpdir to work around issues + # like https://github.com/ansible/ansible/issues/30064 + env['TMP'] = settings.AWX_PROOT_BASE_PATH return env def _build_scm_url_extra_vars(self, project_update, **kwargs): From 3cd80ef67af124800eaf75e2b36db46ca9eca96c Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Thu, 30 Nov 2017 15:29:19 -0500 Subject: [PATCH 122/141] Update pot files --- awx/locale/django.pot | 1015 ++++++++++++++------------- awx/ui/po/ansible-tower-ui.pot | 1166 +++++++++++++++++--------------- 2 files changed, 1167 insertions(+), 1014 deletions(-) diff --git a/awx/locale/django.pot b/awx/locale/django.pot index 3038bed7d1..fc8c1554da 100644 --- a/awx/locale/django.pot +++ b/awx/locale/django.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-08-27 19:27+0000\n" +"POT-Creation-Date: 2017-11-30 20:23+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -78,25 +78,30 @@ msgstr "" msgid "Loops not allowed in filters, detected on field {}." msgstr "" -#: awx/api/filters.py:297 +#: awx/api/filters.py:171 +#, python-brace-format +msgid "Invalid {field_name} id: {field_id}" +msgstr "" + +#: awx/api/filters.py:302 #, python-format msgid "cannot filter on kind %s" msgstr "" -#: awx/api/filters.py:404 +#: awx/api/filters.py:409 #, python-format msgid "cannot order by field %s" msgstr "" -#: awx/api/generics.py:515 awx/api/generics.py:577 +#: awx/api/generics.py:550 awx/api/generics.py:612 msgid "\"id\" field must be an integer." msgstr "" -#: awx/api/generics.py:574 +#: awx/api/generics.py:609 msgid "\"id\" is required to disassociate" msgstr "" -#: awx/api/generics.py:625 +#: awx/api/generics.py:660 msgid "{} 'id' field is missing." msgstr "" @@ -175,807 +180,833 @@ msgstr "" msgid "Workflow Template" msgstr "" -#: awx/api/serializers.py:697 awx/api/serializers.py:755 awx/api/views.py:4314 +#: awx/api/serializers.py:701 awx/api/serializers.py:759 awx/api/views.py:4365 #, python-format msgid "" "Standard Output too large to display (%(text_size)d bytes), only download " "supported for sizes over %(supported_size)d bytes" msgstr "" -#: awx/api/serializers.py:770 +#: awx/api/serializers.py:774 msgid "Write-only field used to change the password." msgstr "" -#: awx/api/serializers.py:772 +#: awx/api/serializers.py:776 msgid "Set if the account is managed by an external service" msgstr "" -#: awx/api/serializers.py:796 +#: awx/api/serializers.py:800 msgid "Password required for new User." msgstr "" -#: awx/api/serializers.py:882 +#: awx/api/serializers.py:886 #, python-format msgid "Unable to change %s on user managed by LDAP." msgstr "" -#: awx/api/serializers.py:1046 +#: awx/api/serializers.py:1050 msgid "Organization is missing" msgstr "" -#: awx/api/serializers.py:1050 +#: awx/api/serializers.py:1054 msgid "Update options must be set to false for manual projects." msgstr "" -#: awx/api/serializers.py:1056 +#: awx/api/serializers.py:1060 msgid "Array of playbooks available within this project." msgstr "" -#: awx/api/serializers.py:1075 +#: awx/api/serializers.py:1079 msgid "" "Array of inventory files and directories available within this project, not " "comprehensive." msgstr "" -#: awx/api/serializers.py:1282 +#: awx/api/serializers.py:1201 +msgid "Smart inventories must specify host_filter" +msgstr "" + +#: awx/api/serializers.py:1303 #, python-format msgid "Invalid port specification: %s" msgstr "" -#: awx/api/serializers.py:1293 +#: awx/api/serializers.py:1314 msgid "Cannot create Host for Smart Inventory" msgstr "" -#: awx/api/serializers.py:1315 awx/api/serializers.py:3218 -#: awx/api/serializers.py:3303 awx/main/validators.py:198 +#: awx/api/serializers.py:1336 awx/api/serializers.py:3321 +#: awx/api/serializers.py:3406 awx/main/validators.py:198 msgid "Must be valid JSON or YAML." msgstr "" -#: awx/api/serializers.py:1411 +#: awx/api/serializers.py:1432 msgid "Invalid group name." msgstr "" -#: awx/api/serializers.py:1416 +#: awx/api/serializers.py:1437 msgid "Cannot create Group for Smart Inventory" msgstr "" -#: awx/api/serializers.py:1488 +#: awx/api/serializers.py:1509 msgid "" "Script must begin with a hashbang sequence: i.e.... #!/usr/bin/env python" msgstr "" -#: awx/api/serializers.py:1534 +#: awx/api/serializers.py:1555 msgid "`{}` is a prohibited environment variable" msgstr "" -#: awx/api/serializers.py:1545 +#: awx/api/serializers.py:1566 msgid "If 'source' is 'custom', 'source_script' must be provided." msgstr "" -#: awx/api/serializers.py:1551 +#: awx/api/serializers.py:1572 msgid "Must provide an inventory." msgstr "" -#: awx/api/serializers.py:1555 +#: awx/api/serializers.py:1576 msgid "" "The 'source_script' does not belong to the same organization as the " "inventory." msgstr "" -#: awx/api/serializers.py:1557 +#: awx/api/serializers.py:1578 msgid "'source_script' doesn't exist." msgstr "" -#: awx/api/serializers.py:1581 +#: awx/api/serializers.py:1602 msgid "Automatic group relationship, will be removed in 3.3" msgstr "" -#: awx/api/serializers.py:1658 +#: awx/api/serializers.py:1679 msgid "Cannot use manual project for SCM-based inventory." msgstr "" -#: awx/api/serializers.py:1664 +#: awx/api/serializers.py:1685 msgid "" "Manual inventory sources are created automatically when a group is created " "in the v1 API." msgstr "" -#: awx/api/serializers.py:1669 +#: awx/api/serializers.py:1690 msgid "Setting not compatible with existing schedules." msgstr "" -#: awx/api/serializers.py:1674 +#: awx/api/serializers.py:1695 msgid "Cannot create Inventory Source for Smart Inventory" msgstr "" -#: awx/api/serializers.py:1688 +#: awx/api/serializers.py:1709 #, python-format msgid "Cannot set %s if not SCM type." msgstr "" -#: awx/api/serializers.py:1929 +#: awx/api/serializers.py:1950 msgid "Modifications not allowed for managed credential types" msgstr "" -#: awx/api/serializers.py:1934 +#: awx/api/serializers.py:1955 msgid "" "Modifications to inputs are not allowed for credential types that are in use" msgstr "" -#: awx/api/serializers.py:1940 +#: awx/api/serializers.py:1961 #, python-format msgid "Must be 'cloud' or 'net', not %s" msgstr "" -#: awx/api/serializers.py:1946 +#: awx/api/serializers.py:1967 msgid "'ask_at_runtime' is not supported for custom credentials." msgstr "" -#: awx/api/serializers.py:2119 +#: awx/api/serializers.py:2140 #, python-format msgid "\"%s\" is not a valid choice" msgstr "" -#: awx/api/serializers.py:2138 +#: awx/api/serializers.py:2159 #, python-format msgid "'%s' is not a valid field for %s" msgstr "" -#: awx/api/serializers.py:2150 +#: awx/api/serializers.py:2180 +msgid "" +"You cannot change the credential type of the credential, as it may break the " +"functionality of the resources using it." +msgstr "" + +#: awx/api/serializers.py:2191 msgid "" "Write-only field used to add user to owner role. If provided, do not give " "either team or organization. Only valid for creation." msgstr "" -#: awx/api/serializers.py:2155 +#: awx/api/serializers.py:2196 msgid "" "Write-only field used to add team to owner role. If provided, do not give " "either user or organization. Only valid for creation." msgstr "" -#: awx/api/serializers.py:2160 +#: awx/api/serializers.py:2201 msgid "" "Inherit permissions from organization roles. If provided on creation, do not " "give either user or team." msgstr "" -#: awx/api/serializers.py:2176 +#: awx/api/serializers.py:2217 msgid "Missing 'user', 'team', or 'organization'." msgstr "" -#: awx/api/serializers.py:2216 +#: awx/api/serializers.py:2257 msgid "" "Credential organization must be set and match before assigning to a team" msgstr "" -#: awx/api/serializers.py:2378 +#: awx/api/serializers.py:2424 msgid "You must provide a cloud credential." msgstr "" -#: awx/api/serializers.py:2379 +#: awx/api/serializers.py:2425 msgid "You must provide a network credential." msgstr "" -#: awx/api/serializers.py:2395 +#: awx/api/serializers.py:2441 msgid "This field is required." msgstr "" -#: awx/api/serializers.py:2397 awx/api/serializers.py:2399 +#: awx/api/serializers.py:2443 awx/api/serializers.py:2445 msgid "Playbook not found for project." msgstr "" -#: awx/api/serializers.py:2401 +#: awx/api/serializers.py:2447 msgid "Must select playbook for project." msgstr "" -#: awx/api/serializers.py:2476 +#: awx/api/serializers.py:2522 msgid "Must either set a default value or ask to prompt on launch." msgstr "" -#: awx/api/serializers.py:2478 awx/main/models/jobs.py:325 +#: awx/api/serializers.py:2524 awx/main/models/jobs.py:326 msgid "Job types 'run' and 'check' must have assigned a project." msgstr "" -#: awx/api/serializers.py:2549 +#: awx/api/serializers.py:2611 msgid "Invalid job template." msgstr "" -#: awx/api/serializers.py:2630 -msgid "Credential not found or deleted." +#: awx/api/serializers.py:2708 +msgid "Neither credential nor vault credential provided." msgstr "" -#: awx/api/serializers.py:2632 +#: awx/api/serializers.py:2711 msgid "Job Template Project is missing or undefined." msgstr "" -#: awx/api/serializers.py:2634 +#: awx/api/serializers.py:2713 msgid "Job Template Inventory is missing or undefined." msgstr "" -#: awx/api/serializers.py:2921 +#: awx/api/serializers.py:2782 awx/main/tasks.py:2186 +msgid "{} are prohibited from use in ad hoc commands." +msgstr "" + +#: awx/api/serializers.py:3008 #, python-format msgid "%(job_type)s is not a valid job type. The choices are %(choices)s." msgstr "" -#: awx/api/serializers.py:2926 +#: awx/api/serializers.py:3013 msgid "Workflow job template is missing during creation." msgstr "" -#: awx/api/serializers.py:2931 +#: awx/api/serializers.py:3018 #, python-format msgid "Cannot nest a %s inside a WorkflowJobTemplate" msgstr "" -#: awx/api/serializers.py:3188 +#: awx/api/serializers.py:3291 #, python-format msgid "Job Template '%s' is missing or undefined." msgstr "" -#: awx/api/serializers.py:3191 +#: awx/api/serializers.py:3294 msgid "The inventory associated with this Job Template is being deleted." msgstr "" -#: awx/api/serializers.py:3232 awx/api/views.py:2991 +#: awx/api/serializers.py:3335 awx/api/views.py:3023 #, python-format msgid "Cannot assign multiple %s credentials." msgstr "" -#: awx/api/serializers.py:3234 awx/api/views.py:2994 +#: awx/api/serializers.py:3337 awx/api/views.py:3026 msgid "Extra credentials must be network or cloud." msgstr "" -#: awx/api/serializers.py:3371 +#: awx/api/serializers.py:3474 msgid "" "Missing required fields for Notification Configuration: notification_type" msgstr "" -#: awx/api/serializers.py:3394 +#: awx/api/serializers.py:3497 msgid "No values specified for field '{}'" msgstr "" -#: awx/api/serializers.py:3399 +#: awx/api/serializers.py:3502 msgid "Missing required fields for Notification Configuration: {}." msgstr "" -#: awx/api/serializers.py:3402 +#: awx/api/serializers.py:3505 msgid "Configuration field '{}' incorrect type, expected {}." msgstr "" -#: awx/api/serializers.py:3455 +#: awx/api/serializers.py:3558 msgid "Inventory Source must be a cloud resource." msgstr "" -#: awx/api/serializers.py:3457 +#: awx/api/serializers.py:3560 msgid "Manual Project cannot have a schedule set." msgstr "" -#: awx/api/serializers.py:3460 +#: awx/api/serializers.py:3563 msgid "" "Inventory sources with `update_on_project_update` cannot be scheduled. " "Schedule its source project `{}` instead." msgstr "" -#: awx/api/serializers.py:3479 +#: awx/api/serializers.py:3582 msgid "Projects and inventory updates cannot accept extra variables." msgstr "" -#: awx/api/serializers.py:3501 +#: awx/api/serializers.py:3604 msgid "DTSTART required in rrule. Value should match: DTSTART:YYYYMMDDTHHMMSSZ" msgstr "" -#: awx/api/serializers.py:3503 +#: awx/api/serializers.py:3606 msgid "Multiple DTSTART is not supported." msgstr "" -#: awx/api/serializers.py:3505 +#: awx/api/serializers.py:3608 msgid "RRULE require in rrule." msgstr "" -#: awx/api/serializers.py:3507 +#: awx/api/serializers.py:3610 msgid "Multiple RRULE is not supported." msgstr "" -#: awx/api/serializers.py:3509 +#: awx/api/serializers.py:3612 msgid "INTERVAL required in rrule." msgstr "" -#: awx/api/serializers.py:3511 +#: awx/api/serializers.py:3614 msgid "TZID is not supported." msgstr "" -#: awx/api/serializers.py:3513 +#: awx/api/serializers.py:3616 msgid "SECONDLY is not supported." msgstr "" -#: awx/api/serializers.py:3515 +#: awx/api/serializers.py:3618 msgid "Multiple BYMONTHDAYs not supported." msgstr "" -#: awx/api/serializers.py:3517 +#: awx/api/serializers.py:3620 msgid "Multiple BYMONTHs not supported." msgstr "" -#: awx/api/serializers.py:3519 +#: awx/api/serializers.py:3622 msgid "BYDAY with numeric prefix not supported." msgstr "" -#: awx/api/serializers.py:3521 +#: awx/api/serializers.py:3624 msgid "BYYEARDAY not supported." msgstr "" -#: awx/api/serializers.py:3523 +#: awx/api/serializers.py:3626 msgid "BYWEEKNO not supported." msgstr "" -#: awx/api/serializers.py:3527 +#: awx/api/serializers.py:3630 msgid "COUNT > 999 is unsupported." msgstr "" -#: awx/api/serializers.py:3531 +#: awx/api/serializers.py:3634 msgid "rrule parsing failed validation." msgstr "" -#: awx/api/serializers.py:3631 +#: awx/api/serializers.py:3760 msgid "" "A summary of the new and changed values when an object is created, updated, " "or deleted" msgstr "" -#: awx/api/serializers.py:3633 +#: awx/api/serializers.py:3762 msgid "" "For create, update, and delete events this is the object type that was " "affected. For associate and disassociate events this is the object type " "associated or disassociated with object2." msgstr "" -#: awx/api/serializers.py:3636 +#: awx/api/serializers.py:3765 msgid "" "Unpopulated for create, update, and delete events. For associate and " "disassociate events this is the object type that object1 is being associated " "with." msgstr "" -#: awx/api/serializers.py:3639 +#: awx/api/serializers.py:3768 msgid "The action taken with respect to the given object(s)." msgstr "" -#: awx/api/serializers.py:3749 +#: awx/api/serializers.py:3885 msgid "Unable to login with provided credentials." msgstr "" -#: awx/api/serializers.py:3751 +#: awx/api/serializers.py:3887 msgid "Must include \"username\" and \"password\"." msgstr "" -#: awx/api/views.py:106 +#: awx/api/views.py:108 msgid "Your license does not allow use of the activity stream." msgstr "" -#: awx/api/views.py:116 +#: awx/api/views.py:118 msgid "Your license does not permit use of system tracking." msgstr "" -#: awx/api/views.py:126 +#: awx/api/views.py:128 msgid "Your license does not allow use of workflows." msgstr "" -#: awx/api/views.py:140 +#: awx/api/views.py:142 msgid "Cannot delete job resource when associated workflow job is running." msgstr "" -#: awx/api/views.py:144 +#: awx/api/views.py:146 msgid "Cannot delete running job resource." msgstr "" -#: awx/api/views.py:153 awx/templates/rest_framework/api.html:28 +#: awx/api/views.py:155 awx/templates/rest_framework/api.html:28 msgid "REST API" msgstr "" -#: awx/api/views.py:162 awx/templates/rest_framework/api.html:4 +#: awx/api/views.py:164 awx/templates/rest_framework/api.html:4 msgid "AWX REST API" msgstr "" -#: awx/api/views.py:224 +#: awx/api/views.py:226 msgid "Version 1" msgstr "" -#: awx/api/views.py:228 +#: awx/api/views.py:230 msgid "Version 2" msgstr "" -#: awx/api/views.py:239 +#: awx/api/views.py:241 msgid "Ping" msgstr "" -#: awx/api/views.py:270 awx/conf/apps.py:12 +#: awx/api/views.py:272 awx/conf/apps.py:12 msgid "Configuration" msgstr "" -#: awx/api/views.py:323 +#: awx/api/views.py:325 msgid "Invalid license data" msgstr "" -#: awx/api/views.py:325 +#: awx/api/views.py:327 msgid "Missing 'eula_accepted' property" msgstr "" -#: awx/api/views.py:329 +#: awx/api/views.py:331 msgid "'eula_accepted' value is invalid" msgstr "" -#: awx/api/views.py:332 +#: awx/api/views.py:334 msgid "'eula_accepted' must be True" msgstr "" -#: awx/api/views.py:339 +#: awx/api/views.py:341 msgid "Invalid JSON" msgstr "" -#: awx/api/views.py:347 +#: awx/api/views.py:349 msgid "Invalid License" msgstr "" -#: awx/api/views.py:357 +#: awx/api/views.py:359 msgid "Invalid license" msgstr "" -#: awx/api/views.py:365 +#: awx/api/views.py:367 #, python-format msgid "Failed to remove license (%s)" msgstr "" -#: awx/api/views.py:370 +#: awx/api/views.py:372 msgid "Dashboard" msgstr "" -#: awx/api/views.py:469 +#: awx/api/views.py:471 msgid "Dashboard Jobs Graphs" msgstr "" -#: awx/api/views.py:505 +#: awx/api/views.py:507 #, python-format msgid "Unknown period \"%s\"" msgstr "" -#: awx/api/views.py:519 +#: awx/api/views.py:521 msgid "Instances" msgstr "" -#: awx/api/views.py:527 +#: awx/api/views.py:529 msgid "Instance Detail" msgstr "" -#: awx/api/views.py:535 +#: awx/api/views.py:537 msgid "Instance Running Jobs" msgstr "" -#: awx/api/views.py:550 +#: awx/api/views.py:552 msgid "Instance's Instance Groups" msgstr "" -#: awx/api/views.py:560 +#: awx/api/views.py:562 msgid "Instance Groups" msgstr "" -#: awx/api/views.py:568 +#: awx/api/views.py:570 msgid "Instance Group Detail" msgstr "" -#: awx/api/views.py:576 +#: awx/api/views.py:578 msgid "Instance Group Running Jobs" msgstr "" -#: awx/api/views.py:586 +#: awx/api/views.py:588 msgid "Instance Group's Instances" msgstr "" -#: awx/api/views.py:596 +#: awx/api/views.py:598 msgid "Schedules" msgstr "" -#: awx/api/views.py:615 +#: awx/api/views.py:617 msgid "Schedule Jobs List" msgstr "" -#: awx/api/views.py:841 +#: awx/api/views.py:843 msgid "Your license only permits a single organization to exist." msgstr "" -#: awx/api/views.py:1077 awx/api/views.py:4615 +#: awx/api/views.py:1079 awx/api/views.py:4666 msgid "You cannot assign an Organization role as a child role for a Team." msgstr "" -#: awx/api/views.py:1081 awx/api/views.py:4629 +#: awx/api/views.py:1083 awx/api/views.py:4680 msgid "You cannot grant system-level permissions to a team." msgstr "" -#: awx/api/views.py:1088 awx/api/views.py:4621 +#: awx/api/views.py:1090 awx/api/views.py:4672 msgid "" "You cannot grant credential access to a team when the Organization field " "isn't set, or belongs to a different organization" msgstr "" -#: awx/api/views.py:1178 +#: awx/api/views.py:1180 msgid "Cannot delete project." msgstr "" -#: awx/api/views.py:1213 +#: awx/api/views.py:1215 msgid "Project Schedules" msgstr "" -#: awx/api/views.py:1225 +#: awx/api/views.py:1227 msgid "Project SCM Inventory Sources" msgstr "" -#: awx/api/views.py:1352 +#: awx/api/views.py:1354 msgid "Project Update SCM Inventory Updates" msgstr "" -#: awx/api/views.py:1407 +#: awx/api/views.py:1409 msgid "Me" msgstr "" -#: awx/api/views.py:1451 awx/api/views.py:4572 +#: awx/api/views.py:1453 awx/api/views.py:4623 msgid "You may not perform any action with your own admin_role." msgstr "" -#: awx/api/views.py:1457 awx/api/views.py:4576 +#: awx/api/views.py:1459 awx/api/views.py:4627 msgid "You may not change the membership of a users admin_role" msgstr "" -#: awx/api/views.py:1462 awx/api/views.py:4581 +#: awx/api/views.py:1464 awx/api/views.py:4632 msgid "" "You cannot grant credential access to a user not in the credentials' " "organization" msgstr "" -#: awx/api/views.py:1466 awx/api/views.py:4585 +#: awx/api/views.py:1468 awx/api/views.py:4636 msgid "You cannot grant private credential access to another user" msgstr "" -#: awx/api/views.py:1564 +#: awx/api/views.py:1566 #, python-format msgid "Cannot change %s." msgstr "" -#: awx/api/views.py:1570 +#: awx/api/views.py:1572 msgid "Cannot delete user." msgstr "" -#: awx/api/views.py:1599 +#: awx/api/views.py:1601 msgid "Deletion not allowed for managed credential types" msgstr "" -#: awx/api/views.py:1601 +#: awx/api/views.py:1603 msgid "Credential types that are in use cannot be deleted" msgstr "" -#: awx/api/views.py:1779 +#: awx/api/views.py:1781 msgid "Cannot delete inventory script." msgstr "" -#: awx/api/views.py:1864 +#: awx/api/views.py:1866 +#, python-brace-format msgid "{0}" msgstr "" -#: awx/api/views.py:2089 +#: awx/api/views.py:2101 msgid "Fact not found." msgstr "" -#: awx/api/views.py:2113 +#: awx/api/views.py:2125 msgid "SSLError while trying to connect to {}" msgstr "" -#: awx/api/views.py:2115 +#: awx/api/views.py:2127 msgid "Request to {} timed out." msgstr "" -#: awx/api/views.py:2117 +#: awx/api/views.py:2129 msgid "Unkown exception {} while trying to GET {}" msgstr "" -#: awx/api/views.py:2120 +#: awx/api/views.py:2132 msgid "" "Unauthorized access. Please check your Insights Credential username and " "password." msgstr "" -#: awx/api/views.py:2122 +#: awx/api/views.py:2134 msgid "" "Failed to gather reports and maintenance plans from Insights API at URL {}. " "Server responded with {} status code and message {}" msgstr "" -#: awx/api/views.py:2128 +#: awx/api/views.py:2140 msgid "Expected JSON response from Insights but instead got {}" msgstr "" -#: awx/api/views.py:2135 +#: awx/api/views.py:2147 msgid "This host is not recognized as an Insights host." msgstr "" -#: awx/api/views.py:2140 +#: awx/api/views.py:2152 msgid "The Insights Credential for \"{}\" was not found." msgstr "" -#: awx/api/views.py:2209 +#: awx/api/views.py:2221 msgid "Cyclical Group association." msgstr "" -#: awx/api/views.py:2482 +#: awx/api/views.py:2499 msgid "Inventory Source List" msgstr "" -#: awx/api/views.py:2495 +#: awx/api/views.py:2512 msgid "Inventory Sources Update" msgstr "" -#: awx/api/views.py:2525 +#: awx/api/views.py:2542 msgid "Could not start because `can_update` returned False" msgstr "" -#: awx/api/views.py:2533 +#: awx/api/views.py:2550 msgid "No inventory sources to update." msgstr "" -#: awx/api/views.py:2565 +#: awx/api/views.py:2582 msgid "Cannot delete inventory source." msgstr "" -#: awx/api/views.py:2573 +#: awx/api/views.py:2590 msgid "Inventory Source Schedules" msgstr "" -#: awx/api/views.py:2603 +#: awx/api/views.py:2620 msgid "Notification Templates can only be assigned when source is one of {}." msgstr "" -#: awx/api/views.py:2826 +#: awx/api/views.py:2851 msgid "Job Template Schedules" msgstr "" -#: awx/api/views.py:2846 awx/api/views.py:2862 +#: awx/api/views.py:2871 awx/api/views.py:2882 msgid "Your license does not allow adding surveys." msgstr "" -#: awx/api/views.py:2869 +#: awx/api/views.py:2889 msgid "'name' missing from survey spec." msgstr "" -#: awx/api/views.py:2871 +#: awx/api/views.py:2891 msgid "'description' missing from survey spec." msgstr "" -#: awx/api/views.py:2873 +#: awx/api/views.py:2893 msgid "'spec' missing from survey spec." msgstr "" -#: awx/api/views.py:2875 +#: awx/api/views.py:2895 msgid "'spec' must be a list of items." msgstr "" -#: awx/api/views.py:2877 +#: awx/api/views.py:2897 msgid "'spec' doesn't contain any items." msgstr "" -#: awx/api/views.py:2883 +#: awx/api/views.py:2903 #, python-format msgid "Survey question %s is not a json object." msgstr "" -#: awx/api/views.py:2885 +#: awx/api/views.py:2905 #, python-format msgid "'type' missing from survey question %s." msgstr "" -#: awx/api/views.py:2887 +#: awx/api/views.py:2907 #, python-format msgid "'question_name' missing from survey question %s." msgstr "" -#: awx/api/views.py:2889 +#: awx/api/views.py:2909 #, python-format msgid "'variable' missing from survey question %s." msgstr "" -#: awx/api/views.py:2891 +#: awx/api/views.py:2911 #, python-format msgid "'variable' '%(item)s' duplicated in survey question %(survey)s." msgstr "" -#: awx/api/views.py:2896 +#: awx/api/views.py:2916 #, python-format msgid "'required' missing from survey question %s." msgstr "" -#: awx/api/views.py:2901 -msgid "" -"$encrypted$ is reserved keyword and may not be used as a default for " -"password {}." +#: awx/api/views.py:2921 +#, python-brace-format +msgid "Value {question_default} for '{variable_name}' expected to be a string." msgstr "" -#: awx/api/views.py:3017 +#: awx/api/views.py:2928 +#, python-brace-format +msgid "" +"$encrypted$ is reserved keyword for password questions and may not be used " +"as a default for '{variable_name}' in survey question {question_position}." +msgstr "" + +#: awx/api/views.py:3049 msgid "Maximum number of labels for {} reached." msgstr "" -#: awx/api/views.py:3136 +#: awx/api/views.py:3170 msgid "No matching host could be found!" msgstr "" -#: awx/api/views.py:3139 +#: awx/api/views.py:3173 msgid "Multiple hosts matched the request!" msgstr "" -#: awx/api/views.py:3144 +#: awx/api/views.py:3178 msgid "Cannot start automatically, user input required!" msgstr "" -#: awx/api/views.py:3151 +#: awx/api/views.py:3185 msgid "Host callback job already pending." msgstr "" -#: awx/api/views.py:3164 +#: awx/api/views.py:3199 msgid "Error starting job!" msgstr "" -#: awx/api/views.py:3271 +#: awx/api/views.py:3306 +#, python-brace-format msgid "Cannot associate {0} when {1} have been associated." msgstr "" -#: awx/api/views.py:3296 +#: awx/api/views.py:3331 msgid "Multiple parent relationship not allowed." msgstr "" -#: awx/api/views.py:3301 +#: awx/api/views.py:3336 msgid "Cycle detected." msgstr "" -#: awx/api/views.py:3505 +#: awx/api/views.py:3540 msgid "Workflow Job Template Schedules" msgstr "" -#: awx/api/views.py:3650 awx/api/views.py:4217 +#: awx/api/views.py:3685 awx/api/views.py:4268 msgid "Superuser privileges needed." msgstr "" -#: awx/api/views.py:3682 +#: awx/api/views.py:3717 msgid "System Job Template Schedules" msgstr "" -#: awx/api/views.py:3891 +#: awx/api/views.py:3780 +msgid "POST not allowed for Job launching in version 2 of the api" +msgstr "" + +#: awx/api/views.py:3942 msgid "Job Host Summaries List" msgstr "" -#: awx/api/views.py:3938 +#: awx/api/views.py:3989 msgid "Job Event Children List" msgstr "" -#: awx/api/views.py:3947 +#: awx/api/views.py:3998 msgid "Job Event Hosts List" msgstr "" -#: awx/api/views.py:3957 +#: awx/api/views.py:4008 msgid "Job Events List" msgstr "" -#: awx/api/views.py:4171 +#: awx/api/views.py:4222 msgid "Ad Hoc Command Events List" msgstr "" -#: awx/api/views.py:4386 +#: awx/api/views.py:4437 msgid "Error generating stdout download file: {}" msgstr "" -#: awx/api/views.py:4399 +#: awx/api/views.py:4450 #, python-format msgid "Error generating stdout download file: %s" msgstr "" -#: awx/api/views.py:4444 +#: awx/api/views.py:4495 msgid "Delete not allowed while there are pending notifications" msgstr "" -#: awx/api/views.py:4451 +#: awx/api/views.py:4502 msgid "Notification Template Test" msgstr "" @@ -1131,15 +1162,16 @@ msgstr "" msgid "User" msgstr "" -#: awx/conf/fields.py:62 +#: awx/conf/fields.py:63 msgid "Enter a valid URL" msgstr "" -#: awx/conf/fields.py:94 +#: awx/conf/fields.py:95 +#, python-brace-format msgid "\"{input}\" is not a valid string." msgstr "" -#: awx/conf/license.py:19 +#: awx/conf/license.py:22 msgid "Your Tower license does not allow that." msgstr "" @@ -1155,7 +1187,11 @@ msgstr "" msgid "Skip commenting out settings in files." msgstr "" -#: awx/conf/management/commands/migrate_to_database_settings.py:61 +#: awx/conf/management/commands/migrate_to_database_settings.py:62 +msgid "Skip migrating and only comment out settings in files." +msgstr "" + +#: awx/conf/management/commands/migrate_to_database_settings.py:68 msgid "Backup existing settings files with this suffix." msgstr "" @@ -1179,7 +1215,7 @@ msgstr "" msgid "User-Defaults" msgstr "" -#: awx/conf/registry.py:151 +#: awx/conf/registry.py:154 msgid "This value has been set manually in a settings file." msgstr "" @@ -1251,93 +1287,91 @@ msgstr "" msgid "Logging Connectivity Test" msgstr "" -#: awx/main/access.py:224 +#: awx/main/access.py:44 +msgid "Resource is being used by running jobs." +msgstr "" + +#: awx/main/access.py:237 #, python-format msgid "Bad data found in related field %s." msgstr "" -#: awx/main/access.py:268 +#: awx/main/access.py:281 msgid "License is missing." msgstr "" -#: awx/main/access.py:270 +#: awx/main/access.py:283 msgid "License has expired." msgstr "" -#: awx/main/access.py:278 +#: awx/main/access.py:291 #, python-format msgid "License count of %s instances has been reached." msgstr "" -#: awx/main/access.py:280 +#: awx/main/access.py:293 #, python-format msgid "License count of %s instances has been exceeded." msgstr "" -#: awx/main/access.py:282 +#: awx/main/access.py:295 msgid "Host count exceeds available instances." msgstr "" -#: awx/main/access.py:286 +#: awx/main/access.py:299 #, python-format msgid "Feature %s is not enabled in the active license." msgstr "" -#: awx/main/access.py:288 +#: awx/main/access.py:301 msgid "Features not found in active license." msgstr "" -#: awx/main/access.py:534 awx/main/access.py:619 awx/main/access.py:748 -#: awx/main/access.py:801 awx/main/access.py:1063 awx/main/access.py:1263 -#: awx/main/access.py:1725 -msgid "Resource is being used by running jobs" -msgstr "" - -#: awx/main/access.py:675 +#: awx/main/access.py:707 msgid "Unable to change inventory on a host." msgstr "" -#: awx/main/access.py:692 awx/main/access.py:737 +#: awx/main/access.py:724 awx/main/access.py:769 msgid "Cannot associate two items from different inventories." msgstr "" -#: awx/main/access.py:725 +#: awx/main/access.py:757 msgid "Unable to change inventory on a group." msgstr "" -#: awx/main/access.py:983 +#: awx/main/access.py:1017 msgid "Unable to change organization on a team." msgstr "" -#: awx/main/access.py:996 +#: awx/main/access.py:1030 msgid "The {} role cannot be assigned to a team" msgstr "" -#: awx/main/access.py:998 +#: awx/main/access.py:1032 msgid "The admin_role for a User cannot be assigned to a team" msgstr "" -#: awx/main/access.py:1443 +#: awx/main/access.py:1479 msgid "Job has been orphaned from its job template." msgstr "" -#: awx/main/access.py:1445 +#: awx/main/access.py:1481 msgid "You do not have execute permission to related job template." msgstr "" -#: awx/main/access.py:1448 +#: awx/main/access.py:1484 msgid "Job was launched with prompted fields." msgstr "" -#: awx/main/access.py:1450 +#: awx/main/access.py:1486 msgid " Organization level permissions required." msgstr "" -#: awx/main/access.py:1452 +#: awx/main/access.py:1488 msgid " You do not have permission to related resources." msgstr "" -#: awx/main/access.py:1798 +#: awx/main/access.py:1833 msgid "" "You do not have permission to the workflow job resources required for " "relaunch." @@ -1781,149 +1815,149 @@ msgstr "" msgid "\n" msgstr "" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Sudo" msgstr "" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Su" msgstr "" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Pbrun" msgstr "" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Pfexec" msgstr "" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "DZDO" msgstr "" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Pmrun" msgstr "" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Runas" msgstr "" -#: awx/main/fields.py:56 +#: awx/main/fields.py:57 #, python-format msgid "'%s' is not one of ['%s']" msgstr "" -#: awx/main/fields.py:531 +#: awx/main/fields.py:533 #, python-format msgid "cannot be set unless \"%s\" is set" msgstr "" -#: awx/main/fields.py:547 +#: awx/main/fields.py:549 #, python-format msgid "required for %s" msgstr "" -#: awx/main/fields.py:571 +#: awx/main/fields.py:573 msgid "must be set when SSH key is encrypted." msgstr "" -#: awx/main/fields.py:577 +#: awx/main/fields.py:579 msgid "should not be set when SSH key is not encrypted." msgstr "" -#: awx/main/fields.py:635 +#: awx/main/fields.py:637 msgid "'dependencies' is not supported for custom credentials." msgstr "" -#: awx/main/fields.py:649 +#: awx/main/fields.py:651 msgid "\"tower\" is a reserved field name" msgstr "" -#: awx/main/fields.py:656 +#: awx/main/fields.py:658 #, python-format msgid "field IDs must be unique (%s)" msgstr "" -#: awx/main/fields.py:669 +#: awx/main/fields.py:671 #, python-format msgid "%s not allowed for %s type (%s)" msgstr "" -#: awx/main/fields.py:753 +#: awx/main/fields.py:755 #, python-format msgid "%s uses an undefined field (%s)" msgstr "" -#: awx/main/middleware.py:121 +#: awx/main/middleware.py:157 msgid "Formats of all available named urls" msgstr "" -#: awx/main/middleware.py:122 +#: awx/main/middleware.py:158 msgid "" "Read-only list of key-value pairs that shows the standard format of all " "available named URLs." msgstr "" -#: awx/main/middleware.py:124 awx/main/middleware.py:134 +#: awx/main/middleware.py:160 awx/main/middleware.py:170 msgid "Named URL" msgstr "" -#: awx/main/middleware.py:131 +#: awx/main/middleware.py:167 msgid "List of all named url graph nodes." msgstr "" -#: awx/main/middleware.py:132 +#: awx/main/middleware.py:168 msgid "" "Read-only list of key-value pairs that exposes named URL graph topology. Use " "this list to programmatically generate named URLs for resources" msgstr "" -#: awx/main/migrations/_reencrypt.py:23 awx/main/models/notifications.py:33 +#: awx/main/migrations/_reencrypt.py:25 awx/main/models/notifications.py:33 msgid "Email" msgstr "" -#: awx/main/migrations/_reencrypt.py:24 awx/main/models/notifications.py:34 +#: awx/main/migrations/_reencrypt.py:26 awx/main/models/notifications.py:34 msgid "Slack" msgstr "" -#: awx/main/migrations/_reencrypt.py:25 awx/main/models/notifications.py:35 +#: awx/main/migrations/_reencrypt.py:27 awx/main/models/notifications.py:35 msgid "Twilio" msgstr "" -#: awx/main/migrations/_reencrypt.py:26 awx/main/models/notifications.py:36 +#: awx/main/migrations/_reencrypt.py:28 awx/main/models/notifications.py:36 msgid "Pagerduty" msgstr "" -#: awx/main/migrations/_reencrypt.py:27 awx/main/models/notifications.py:37 +#: awx/main/migrations/_reencrypt.py:29 awx/main/models/notifications.py:37 msgid "HipChat" msgstr "" -#: awx/main/migrations/_reencrypt.py:28 awx/main/models/notifications.py:38 +#: awx/main/migrations/_reencrypt.py:30 awx/main/models/notifications.py:38 msgid "Webhook" msgstr "" -#: awx/main/migrations/_reencrypt.py:29 awx/main/models/notifications.py:39 +#: awx/main/migrations/_reencrypt.py:31 awx/main/models/notifications.py:39 msgid "IRC" msgstr "" -#: awx/main/models/activity_stream.py:24 +#: awx/main/models/activity_stream.py:25 msgid "Entity Created" msgstr "" -#: awx/main/models/activity_stream.py:25 +#: awx/main/models/activity_stream.py:26 msgid "Entity Updated" msgstr "" -#: awx/main/models/activity_stream.py:26 +#: awx/main/models/activity_stream.py:27 msgid "Entity Deleted" msgstr "" -#: awx/main/models/activity_stream.py:27 +#: awx/main/models/activity_stream.py:28 msgid "Entity Associated with another Entity" msgstr "" -#: awx/main/models/activity_stream.py:28 +#: awx/main/models/activity_stream.py:29 msgid "Entity was Disassociated with another Entity" msgstr "" @@ -1949,43 +1983,43 @@ msgstr "" msgid "No argument passed to %s module." msgstr "" -#: awx/main/models/ad_hoc_commands.py:245 awx/main/models/jobs.py:904 +#: awx/main/models/ad_hoc_commands.py:245 awx/main/models/jobs.py:911 msgid "Host Failed" msgstr "" -#: awx/main/models/ad_hoc_commands.py:246 awx/main/models/jobs.py:905 +#: awx/main/models/ad_hoc_commands.py:246 awx/main/models/jobs.py:912 msgid "Host OK" msgstr "" -#: awx/main/models/ad_hoc_commands.py:247 awx/main/models/jobs.py:908 +#: awx/main/models/ad_hoc_commands.py:247 awx/main/models/jobs.py:915 msgid "Host Unreachable" msgstr "" -#: awx/main/models/ad_hoc_commands.py:252 awx/main/models/jobs.py:907 +#: awx/main/models/ad_hoc_commands.py:252 awx/main/models/jobs.py:914 msgid "Host Skipped" msgstr "" -#: awx/main/models/ad_hoc_commands.py:262 awx/main/models/jobs.py:935 +#: awx/main/models/ad_hoc_commands.py:262 awx/main/models/jobs.py:942 msgid "Debug" msgstr "" -#: awx/main/models/ad_hoc_commands.py:263 awx/main/models/jobs.py:936 +#: awx/main/models/ad_hoc_commands.py:263 awx/main/models/jobs.py:943 msgid "Verbose" msgstr "" -#: awx/main/models/ad_hoc_commands.py:264 awx/main/models/jobs.py:937 +#: awx/main/models/ad_hoc_commands.py:264 awx/main/models/jobs.py:944 msgid "Deprecated" msgstr "" -#: awx/main/models/ad_hoc_commands.py:265 awx/main/models/jobs.py:938 +#: awx/main/models/ad_hoc_commands.py:265 awx/main/models/jobs.py:945 msgid "Warning" msgstr "" -#: awx/main/models/ad_hoc_commands.py:266 awx/main/models/jobs.py:939 +#: awx/main/models/ad_hoc_commands.py:266 awx/main/models/jobs.py:946 msgid "System Warning" msgstr "" -#: awx/main/models/ad_hoc_commands.py:267 awx/main/models/jobs.py:940 +#: awx/main/models/ad_hoc_commands.py:267 awx/main/models/jobs.py:947 #: awx/main/models/unified_jobs.py:64 msgid "Error" msgstr "" @@ -2004,162 +2038,167 @@ msgstr "" msgid "Scan" msgstr "" -#: awx/main/models/credential.py:82 +#: awx/main/models/credential.py:86 msgid "Host" msgstr "" -#: awx/main/models/credential.py:83 +#: awx/main/models/credential.py:87 msgid "The hostname or IP address to use." msgstr "" -#: awx/main/models/credential.py:89 +#: awx/main/models/credential.py:93 msgid "Username" msgstr "" -#: awx/main/models/credential.py:90 +#: awx/main/models/credential.py:94 msgid "Username for this credential." msgstr "" -#: awx/main/models/credential.py:96 +#: awx/main/models/credential.py:100 msgid "Password" msgstr "" -#: awx/main/models/credential.py:97 +#: awx/main/models/credential.py:101 msgid "" "Password for this credential (or \"ASK\" to prompt the user for machine " "credentials)." msgstr "" -#: awx/main/models/credential.py:104 +#: awx/main/models/credential.py:108 msgid "Security Token" msgstr "" -#: awx/main/models/credential.py:105 +#: awx/main/models/credential.py:109 msgid "Security Token for this credential" msgstr "" -#: awx/main/models/credential.py:111 +#: awx/main/models/credential.py:115 msgid "Project" msgstr "" -#: awx/main/models/credential.py:112 +#: awx/main/models/credential.py:116 msgid "The identifier for the project." msgstr "" -#: awx/main/models/credential.py:118 +#: awx/main/models/credential.py:122 msgid "Domain" msgstr "" -#: awx/main/models/credential.py:119 +#: awx/main/models/credential.py:123 msgid "The identifier for the domain." msgstr "" -#: awx/main/models/credential.py:124 +#: awx/main/models/credential.py:128 msgid "SSH private key" msgstr "" -#: awx/main/models/credential.py:125 +#: awx/main/models/credential.py:129 msgid "RSA or DSA private key to be used instead of password." msgstr "" -#: awx/main/models/credential.py:131 +#: awx/main/models/credential.py:135 msgid "SSH key unlock" msgstr "" -#: awx/main/models/credential.py:132 +#: awx/main/models/credential.py:136 msgid "" "Passphrase to unlock SSH private key if encrypted (or \"ASK\" to prompt the " "user for machine credentials)." msgstr "" -#: awx/main/models/credential.py:139 +#: awx/main/models/credential.py:143 msgid "None" msgstr "" -#: awx/main/models/credential.py:140 +#: awx/main/models/credential.py:144 msgid "Privilege escalation method." msgstr "" -#: awx/main/models/credential.py:146 +#: awx/main/models/credential.py:150 msgid "Privilege escalation username." msgstr "" -#: awx/main/models/credential.py:152 +#: awx/main/models/credential.py:156 msgid "Password for privilege escalation method." msgstr "" -#: awx/main/models/credential.py:158 +#: awx/main/models/credential.py:162 msgid "Vault password (or \"ASK\" to prompt the user)." msgstr "" -#: awx/main/models/credential.py:162 +#: awx/main/models/credential.py:166 msgid "Whether to use the authorize mechanism." msgstr "" -#: awx/main/models/credential.py:168 +#: awx/main/models/credential.py:172 msgid "Password used by the authorize mechanism." msgstr "" -#: awx/main/models/credential.py:174 +#: awx/main/models/credential.py:178 msgid "Client Id or Application Id for the credential" msgstr "" -#: awx/main/models/credential.py:180 +#: awx/main/models/credential.py:184 msgid "Secret Token for this credential" msgstr "" -#: awx/main/models/credential.py:186 +#: awx/main/models/credential.py:190 msgid "Subscription identifier for this credential" msgstr "" -#: awx/main/models/credential.py:192 +#: awx/main/models/credential.py:196 msgid "Tenant identifier for this credential" msgstr "" -#: awx/main/models/credential.py:216 +#: awx/main/models/credential.py:220 msgid "" "Specify the type of credential you want to create. Refer to the Ansible " "Tower documentation for details on each type." msgstr "" -#: awx/main/models/credential.py:230 awx/main/models/credential.py:416 +#: awx/main/models/credential.py:234 awx/main/models/credential.py:420 msgid "" "Enter inputs using either JSON or YAML syntax. Use the radio button to " "toggle between the two. Refer to the Ansible Tower documentation for example " "syntax." msgstr "" -#: awx/main/models/credential.py:397 +#: awx/main/models/credential.py:401 msgid "Machine" msgstr "" -#: awx/main/models/credential.py:398 +#: awx/main/models/credential.py:402 msgid "Vault" msgstr "" -#: awx/main/models/credential.py:399 +#: awx/main/models/credential.py:403 msgid "Network" msgstr "" -#: awx/main/models/credential.py:400 +#: awx/main/models/credential.py:404 msgid "Source Control" msgstr "" -#: awx/main/models/credential.py:401 +#: awx/main/models/credential.py:405 msgid "Cloud" msgstr "" -#: awx/main/models/credential.py:402 +#: awx/main/models/credential.py:406 msgid "Insights" msgstr "" -#: awx/main/models/credential.py:423 +#: awx/main/models/credential.py:427 msgid "" "Enter injectors using either JSON or YAML syntax. Use the radio button to " "toggle between the two. Refer to the Ansible Tower documentation for example " "syntax." msgstr "" +#: awx/main/models/credential.py:478 +#, python-format +msgid "adding %s credential type" +msgstr "" + #: awx/main/models/fact.py:25 msgid "Host for the facts that the fact scan captured." msgstr "" @@ -2174,11 +2213,11 @@ msgid "" "host." msgstr "" -#: awx/main/models/ha.py:76 +#: awx/main/models/ha.py:78 msgid "Instances that are members of this InstanceGroup" msgstr "" -#: awx/main/models/ha.py:81 +#: awx/main/models/ha.py:83 msgid "Instance Group to remotely control this group." msgstr "" @@ -2361,322 +2400,332 @@ msgid "Google Compute Engine" msgstr "" #: awx/main/models/inventory.py:870 -msgid "Microsoft Azure Classic (deprecated)" -msgstr "" - -#: awx/main/models/inventory.py:871 msgid "Microsoft Azure Resource Manager" msgstr "" -#: awx/main/models/inventory.py:872 +#: awx/main/models/inventory.py:871 msgid "VMware vCenter" msgstr "" -#: awx/main/models/inventory.py:873 +#: awx/main/models/inventory.py:872 msgid "Red Hat Satellite 6" msgstr "" -#: awx/main/models/inventory.py:874 +#: awx/main/models/inventory.py:873 msgid "Red Hat CloudForms" msgstr "" -#: awx/main/models/inventory.py:875 +#: awx/main/models/inventory.py:874 msgid "OpenStack" msgstr "" +#: awx/main/models/inventory.py:875 +msgid "oVirt4" +msgstr "" + #: awx/main/models/inventory.py:876 +msgid "Ansible Tower" +msgstr "" + +#: awx/main/models/inventory.py:877 msgid "Custom Script" msgstr "" -#: awx/main/models/inventory.py:993 +#: awx/main/models/inventory.py:994 msgid "Inventory source variables in YAML or JSON format." msgstr "" -#: awx/main/models/inventory.py:1012 +#: awx/main/models/inventory.py:1013 msgid "" "Comma-separated list of filter expressions (EC2 only). Hosts are imported " "when ANY of the filters match." msgstr "" -#: awx/main/models/inventory.py:1018 +#: awx/main/models/inventory.py:1019 msgid "Limit groups automatically created from inventory source (EC2 only)." msgstr "" -#: awx/main/models/inventory.py:1022 +#: awx/main/models/inventory.py:1023 msgid "Overwrite local groups and hosts from remote inventory source." msgstr "" -#: awx/main/models/inventory.py:1026 +#: awx/main/models/inventory.py:1027 msgid "Overwrite local variables from remote inventory source." msgstr "" -#: awx/main/models/inventory.py:1031 awx/main/models/jobs.py:159 +#: awx/main/models/inventory.py:1032 awx/main/models/jobs.py:160 #: awx/main/models/projects.py:117 msgid "The amount of time (in seconds) to run before the task is canceled." msgstr "" -#: awx/main/models/inventory.py:1064 +#: awx/main/models/inventory.py:1065 msgid "Image ID" msgstr "" -#: awx/main/models/inventory.py:1065 +#: awx/main/models/inventory.py:1066 msgid "Availability Zone" msgstr "" -#: awx/main/models/inventory.py:1066 +#: awx/main/models/inventory.py:1067 msgid "Account" msgstr "" -#: awx/main/models/inventory.py:1067 +#: awx/main/models/inventory.py:1068 msgid "Instance ID" msgstr "" -#: awx/main/models/inventory.py:1068 +#: awx/main/models/inventory.py:1069 msgid "Instance State" msgstr "" -#: awx/main/models/inventory.py:1069 +#: awx/main/models/inventory.py:1070 msgid "Instance Type" msgstr "" -#: awx/main/models/inventory.py:1070 +#: awx/main/models/inventory.py:1071 msgid "Key Name" msgstr "" -#: awx/main/models/inventory.py:1071 +#: awx/main/models/inventory.py:1072 msgid "Region" msgstr "" -#: awx/main/models/inventory.py:1072 +#: awx/main/models/inventory.py:1073 msgid "Security Group" msgstr "" -#: awx/main/models/inventory.py:1073 +#: awx/main/models/inventory.py:1074 msgid "Tags" msgstr "" -#: awx/main/models/inventory.py:1074 +#: awx/main/models/inventory.py:1075 msgid "Tag None" msgstr "" -#: awx/main/models/inventory.py:1075 +#: awx/main/models/inventory.py:1076 msgid "VPC ID" msgstr "" -#: awx/main/models/inventory.py:1138 +#: awx/main/models/inventory.py:1145 #, python-format msgid "" "Cloud-based inventory sources (such as %s) require credentials for the " "matching cloud service." msgstr "" -#: awx/main/models/inventory.py:1145 +#: awx/main/models/inventory.py:1152 msgid "Credential is required for a cloud source." msgstr "" -#: awx/main/models/inventory.py:1167 +#: awx/main/models/inventory.py:1155 +msgid "" +"Credentials of type machine, source control, insights and vault are " +"disallowed for custom inventory sources." +msgstr "" + +#: awx/main/models/inventory.py:1179 #, python-format msgid "Invalid %(source)s region: %(region)s" msgstr "" -#: awx/main/models/inventory.py:1191 +#: awx/main/models/inventory.py:1203 #, python-format msgid "Invalid filter expression: %(filter)s" msgstr "" -#: awx/main/models/inventory.py:1212 +#: awx/main/models/inventory.py:1224 #, python-format msgid "Invalid group by choice: %(choice)s" msgstr "" -#: awx/main/models/inventory.py:1247 +#: awx/main/models/inventory.py:1259 msgid "Project containing inventory file used as source." msgstr "" -#: awx/main/models/inventory.py:1395 +#: awx/main/models/inventory.py:1407 #, python-format msgid "" "Unable to configure this item for cloud sync. It is already managed by %s." msgstr "" -#: awx/main/models/inventory.py:1405 +#: awx/main/models/inventory.py:1417 msgid "" "More than one SCM-based inventory source with update on project update per-" "inventory not allowed." msgstr "" -#: awx/main/models/inventory.py:1412 +#: awx/main/models/inventory.py:1424 msgid "" "Cannot update SCM-based inventory source on launch if set to update on " "project update. Instead, configure the corresponding source project to " "update on launch." msgstr "" -#: awx/main/models/inventory.py:1418 +#: awx/main/models/inventory.py:1430 msgid "SCM type sources must set `overwrite_vars` to `true`." msgstr "" -#: awx/main/models/inventory.py:1423 +#: awx/main/models/inventory.py:1435 msgid "Cannot set source_path if not SCM type." msgstr "" -#: awx/main/models/inventory.py:1448 +#: awx/main/models/inventory.py:1460 msgid "" "Inventory files from this Project Update were used for the inventory update." msgstr "" -#: awx/main/models/inventory.py:1561 +#: awx/main/models/inventory.py:1573 msgid "Inventory script contents" msgstr "" -#: awx/main/models/inventory.py:1566 +#: awx/main/models/inventory.py:1578 msgid "Organization owning this inventory script" msgstr "" -#: awx/main/models/jobs.py:65 +#: awx/main/models/jobs.py:66 msgid "" "If enabled, textual changes made to any templated files on the host are " "shown in the standard output" msgstr "" -#: awx/main/models/jobs.py:163 +#: awx/main/models/jobs.py:164 msgid "" "If enabled, Tower will act as an Ansible Fact Cache Plugin; persisting facts " "at the end of a playbook run to the database and caching facts for use by " "Ansible." msgstr "" -#: awx/main/models/jobs.py:172 +#: awx/main/models/jobs.py:173 msgid "You must provide an SSH credential." msgstr "" -#: awx/main/models/jobs.py:180 +#: awx/main/models/jobs.py:181 msgid "You must provide a Vault credential." msgstr "" -#: awx/main/models/jobs.py:316 +#: awx/main/models/jobs.py:317 msgid "Job Template must provide 'inventory' or allow prompting for it." msgstr "" -#: awx/main/models/jobs.py:320 +#: awx/main/models/jobs.py:321 msgid "Job Template must provide 'credential' or allow prompting for it." msgstr "" -#: awx/main/models/jobs.py:422 +#: awx/main/models/jobs.py:427 msgid "Cannot override job_type to or from a scan job." msgstr "" -#: awx/main/models/jobs.py:488 awx/main/models/projects.py:263 +#: awx/main/models/jobs.py:493 awx/main/models/projects.py:263 msgid "SCM Revision" msgstr "" -#: awx/main/models/jobs.py:489 +#: awx/main/models/jobs.py:494 msgid "The SCM Revision from the Project used for this job, if available" msgstr "" -#: awx/main/models/jobs.py:497 +#: awx/main/models/jobs.py:502 msgid "" "The SCM Refresh task used to make sure the playbooks were available for the " "job run" msgstr "" -#: awx/main/models/jobs.py:802 +#: awx/main/models/jobs.py:809 msgid "job host summaries" msgstr "" -#: awx/main/models/jobs.py:906 +#: awx/main/models/jobs.py:913 msgid "Host Failure" msgstr "" -#: awx/main/models/jobs.py:909 awx/main/models/jobs.py:923 +#: awx/main/models/jobs.py:916 awx/main/models/jobs.py:930 msgid "No Hosts Remaining" msgstr "" -#: awx/main/models/jobs.py:910 +#: awx/main/models/jobs.py:917 msgid "Host Polling" msgstr "" -#: awx/main/models/jobs.py:911 +#: awx/main/models/jobs.py:918 msgid "Host Async OK" msgstr "" -#: awx/main/models/jobs.py:912 +#: awx/main/models/jobs.py:919 msgid "Host Async Failure" msgstr "" -#: awx/main/models/jobs.py:913 +#: awx/main/models/jobs.py:920 msgid "Item OK" msgstr "" -#: awx/main/models/jobs.py:914 +#: awx/main/models/jobs.py:921 msgid "Item Failed" msgstr "" -#: awx/main/models/jobs.py:915 +#: awx/main/models/jobs.py:922 msgid "Item Skipped" msgstr "" -#: awx/main/models/jobs.py:916 +#: awx/main/models/jobs.py:923 msgid "Host Retry" msgstr "" -#: awx/main/models/jobs.py:918 +#: awx/main/models/jobs.py:925 msgid "File Difference" msgstr "" -#: awx/main/models/jobs.py:919 +#: awx/main/models/jobs.py:926 msgid "Playbook Started" msgstr "" -#: awx/main/models/jobs.py:920 +#: awx/main/models/jobs.py:927 msgid "Running Handlers" msgstr "" -#: awx/main/models/jobs.py:921 +#: awx/main/models/jobs.py:928 msgid "Including File" msgstr "" -#: awx/main/models/jobs.py:922 +#: awx/main/models/jobs.py:929 msgid "No Hosts Matched" msgstr "" -#: awx/main/models/jobs.py:924 +#: awx/main/models/jobs.py:931 msgid "Task Started" msgstr "" -#: awx/main/models/jobs.py:926 +#: awx/main/models/jobs.py:933 msgid "Variables Prompted" msgstr "" -#: awx/main/models/jobs.py:927 +#: awx/main/models/jobs.py:934 msgid "Gathering Facts" msgstr "" -#: awx/main/models/jobs.py:928 +#: awx/main/models/jobs.py:935 msgid "internal: on Import for Host" msgstr "" -#: awx/main/models/jobs.py:929 +#: awx/main/models/jobs.py:936 msgid "internal: on Not Import for Host" msgstr "" -#: awx/main/models/jobs.py:930 +#: awx/main/models/jobs.py:937 msgid "Play Started" msgstr "" -#: awx/main/models/jobs.py:931 +#: awx/main/models/jobs.py:938 msgid "Playbook Complete" msgstr "" -#: awx/main/models/jobs.py:1363 +#: awx/main/models/jobs.py:1351 msgid "Remove jobs older than a certain number of days" msgstr "" -#: awx/main/models/jobs.py:1364 +#: awx/main/models/jobs.py:1352 msgid "Remove activity stream entries older than a certain number of days" msgstr "" -#: awx/main/models/jobs.py:1365 +#: awx/main/models/jobs.py:1353 msgid "Purge and/or reduce the granularity of system tracking data" msgstr "" @@ -3038,8 +3087,7 @@ msgstr "" msgid "The Rampart/Instance group the job was run under" msgstr "" -#: awx/main/notifications/base.py:17 -#: awx/main/notifications/email_backend.py:28 +#: awx/main/notifications/base.py:17 awx/main/notifications/email_backend.py:28 msgid "" "{} #{} had status {}, view details at {}\n" "\n" @@ -3076,13 +3124,13 @@ msgstr "" msgid "Error sending notification webhook: {}" msgstr "" -#: awx/main/scheduler/__init__.py:184 +#: awx/main/scheduler/task_manager.py:197 msgid "" "Job spawned from workflow could not start because it was not in the right " "state or required manual credentials" msgstr "" -#: awx/main/scheduler/__init__.py:188 +#: awx/main/scheduler/task_manager.py:201 msgid "" "Job spawned from workflow could not start because it was missing a related " "resource such as project or inventory" @@ -3100,7 +3148,7 @@ msgstr "" msgid "status_str must be either succeeded or failed" msgstr "" -#: awx/main/tasks.py:1531 +#: awx/main/tasks.py:1549 msgid "Dependent inventory update {} was canceled." msgstr "" @@ -3109,38 +3157,38 @@ msgstr "" msgid "Unable to convert \"%s\" to boolean" msgstr "" -#: awx/main/utils/common.py:209 +#: awx/main/utils/common.py:235 #, python-format msgid "Unsupported SCM type \"%s\"" msgstr "" -#: awx/main/utils/common.py:216 awx/main/utils/common.py:228 -#: awx/main/utils/common.py:247 +#: awx/main/utils/common.py:242 awx/main/utils/common.py:254 +#: awx/main/utils/common.py:273 #, python-format msgid "Invalid %s URL" msgstr "" -#: awx/main/utils/common.py:218 awx/main/utils/common.py:257 +#: awx/main/utils/common.py:244 awx/main/utils/common.py:283 #, python-format msgid "Unsupported %s URL" msgstr "" -#: awx/main/utils/common.py:259 +#: awx/main/utils/common.py:285 #, python-format msgid "Unsupported host \"%s\" for file:// URL" msgstr "" -#: awx/main/utils/common.py:261 +#: awx/main/utils/common.py:287 #, python-format msgid "Host is required for %s URL" msgstr "" -#: awx/main/utils/common.py:279 +#: awx/main/utils/common.py:305 #, python-format msgid "Username must be \"git\" for SSH access to %s." msgstr "" -#: awx/main/utils/common.py:285 +#: awx/main/utils/common.py:311 #, python-format msgid "Username must be \"hg\" for SSH access to %s." msgstr "" @@ -3251,287 +3299,287 @@ msgstr "" msgid "A server error has occurred." msgstr "" -#: awx/settings/defaults.py:664 +#: awx/settings/defaults.py:665 msgid "US East (Northern Virginia)" msgstr "" -#: awx/settings/defaults.py:665 +#: awx/settings/defaults.py:666 msgid "US East (Ohio)" msgstr "" -#: awx/settings/defaults.py:666 +#: awx/settings/defaults.py:667 msgid "US West (Oregon)" msgstr "" -#: awx/settings/defaults.py:667 +#: awx/settings/defaults.py:668 msgid "US West (Northern California)" msgstr "" -#: awx/settings/defaults.py:668 +#: awx/settings/defaults.py:669 msgid "Canada (Central)" msgstr "" -#: awx/settings/defaults.py:669 +#: awx/settings/defaults.py:670 msgid "EU (Frankfurt)" msgstr "" -#: awx/settings/defaults.py:670 +#: awx/settings/defaults.py:671 msgid "EU (Ireland)" msgstr "" -#: awx/settings/defaults.py:671 +#: awx/settings/defaults.py:672 msgid "EU (London)" msgstr "" -#: awx/settings/defaults.py:672 +#: awx/settings/defaults.py:673 msgid "Asia Pacific (Singapore)" msgstr "" -#: awx/settings/defaults.py:673 +#: awx/settings/defaults.py:674 msgid "Asia Pacific (Sydney)" msgstr "" -#: awx/settings/defaults.py:674 +#: awx/settings/defaults.py:675 msgid "Asia Pacific (Tokyo)" msgstr "" -#: awx/settings/defaults.py:675 +#: awx/settings/defaults.py:676 msgid "Asia Pacific (Seoul)" msgstr "" -#: awx/settings/defaults.py:676 +#: awx/settings/defaults.py:677 msgid "Asia Pacific (Mumbai)" msgstr "" -#: awx/settings/defaults.py:677 +#: awx/settings/defaults.py:678 msgid "South America (Sao Paulo)" msgstr "" -#: awx/settings/defaults.py:678 +#: awx/settings/defaults.py:679 msgid "US West (GovCloud)" msgstr "" -#: awx/settings/defaults.py:679 +#: awx/settings/defaults.py:680 msgid "China (Beijing)" msgstr "" -#: awx/settings/defaults.py:728 +#: awx/settings/defaults.py:729 msgid "US East 1 (B)" msgstr "" -#: awx/settings/defaults.py:729 +#: awx/settings/defaults.py:730 msgid "US East 1 (C)" msgstr "" -#: awx/settings/defaults.py:730 +#: awx/settings/defaults.py:731 msgid "US East 1 (D)" msgstr "" -#: awx/settings/defaults.py:731 +#: awx/settings/defaults.py:732 msgid "US East 4 (A)" msgstr "" -#: awx/settings/defaults.py:732 +#: awx/settings/defaults.py:733 msgid "US East 4 (B)" msgstr "" -#: awx/settings/defaults.py:733 +#: awx/settings/defaults.py:734 msgid "US East 4 (C)" msgstr "" -#: awx/settings/defaults.py:734 +#: awx/settings/defaults.py:735 msgid "US Central (A)" msgstr "" -#: awx/settings/defaults.py:735 +#: awx/settings/defaults.py:736 msgid "US Central (B)" msgstr "" -#: awx/settings/defaults.py:736 +#: awx/settings/defaults.py:737 msgid "US Central (C)" msgstr "" -#: awx/settings/defaults.py:737 +#: awx/settings/defaults.py:738 msgid "US Central (F)" msgstr "" -#: awx/settings/defaults.py:738 +#: awx/settings/defaults.py:739 msgid "US West (A)" msgstr "" -#: awx/settings/defaults.py:739 +#: awx/settings/defaults.py:740 msgid "US West (B)" msgstr "" -#: awx/settings/defaults.py:740 +#: awx/settings/defaults.py:741 msgid "US West (C)" msgstr "" -#: awx/settings/defaults.py:741 +#: awx/settings/defaults.py:742 msgid "Europe West 1 (B)" msgstr "" -#: awx/settings/defaults.py:742 +#: awx/settings/defaults.py:743 msgid "Europe West 1 (C)" msgstr "" -#: awx/settings/defaults.py:743 +#: awx/settings/defaults.py:744 msgid "Europe West 1 (D)" msgstr "" -#: awx/settings/defaults.py:744 +#: awx/settings/defaults.py:745 msgid "Europe West 2 (A)" msgstr "" -#: awx/settings/defaults.py:745 +#: awx/settings/defaults.py:746 msgid "Europe West 2 (B)" msgstr "" -#: awx/settings/defaults.py:746 +#: awx/settings/defaults.py:747 msgid "Europe West 2 (C)" msgstr "" -#: awx/settings/defaults.py:747 +#: awx/settings/defaults.py:748 msgid "Asia East (A)" msgstr "" -#: awx/settings/defaults.py:748 +#: awx/settings/defaults.py:749 msgid "Asia East (B)" msgstr "" -#: awx/settings/defaults.py:749 +#: awx/settings/defaults.py:750 msgid "Asia East (C)" msgstr "" -#: awx/settings/defaults.py:750 +#: awx/settings/defaults.py:751 msgid "Asia Southeast (A)" msgstr "" -#: awx/settings/defaults.py:751 +#: awx/settings/defaults.py:752 msgid "Asia Southeast (B)" msgstr "" -#: awx/settings/defaults.py:752 +#: awx/settings/defaults.py:753 msgid "Asia Northeast (A)" msgstr "" -#: awx/settings/defaults.py:753 +#: awx/settings/defaults.py:754 msgid "Asia Northeast (B)" msgstr "" -#: awx/settings/defaults.py:754 +#: awx/settings/defaults.py:755 msgid "Asia Northeast (C)" msgstr "" -#: awx/settings/defaults.py:755 +#: awx/settings/defaults.py:756 msgid "Australia Southeast (A)" msgstr "" -#: awx/settings/defaults.py:756 +#: awx/settings/defaults.py:757 msgid "Australia Southeast (B)" msgstr "" -#: awx/settings/defaults.py:757 +#: awx/settings/defaults.py:758 msgid "Australia Southeast (C)" msgstr "" -#: awx/settings/defaults.py:781 +#: awx/settings/defaults.py:780 msgid "US East" msgstr "" -#: awx/settings/defaults.py:782 +#: awx/settings/defaults.py:781 msgid "US East 2" msgstr "" -#: awx/settings/defaults.py:783 +#: awx/settings/defaults.py:782 msgid "US Central" msgstr "" -#: awx/settings/defaults.py:784 +#: awx/settings/defaults.py:783 msgid "US North Central" msgstr "" -#: awx/settings/defaults.py:785 +#: awx/settings/defaults.py:784 msgid "US South Central" msgstr "" -#: awx/settings/defaults.py:786 +#: awx/settings/defaults.py:785 msgid "US West Central" msgstr "" -#: awx/settings/defaults.py:787 +#: awx/settings/defaults.py:786 msgid "US West" msgstr "" -#: awx/settings/defaults.py:788 +#: awx/settings/defaults.py:787 msgid "US West 2" msgstr "" -#: awx/settings/defaults.py:789 +#: awx/settings/defaults.py:788 msgid "Canada East" msgstr "" -#: awx/settings/defaults.py:790 +#: awx/settings/defaults.py:789 msgid "Canada Central" msgstr "" -#: awx/settings/defaults.py:791 +#: awx/settings/defaults.py:790 msgid "Brazil South" msgstr "" -#: awx/settings/defaults.py:792 +#: awx/settings/defaults.py:791 msgid "Europe North" msgstr "" -#: awx/settings/defaults.py:793 +#: awx/settings/defaults.py:792 msgid "Europe West" msgstr "" -#: awx/settings/defaults.py:794 +#: awx/settings/defaults.py:793 msgid "UK West" msgstr "" -#: awx/settings/defaults.py:795 +#: awx/settings/defaults.py:794 msgid "UK South" msgstr "" -#: awx/settings/defaults.py:796 +#: awx/settings/defaults.py:795 msgid "Asia East" msgstr "" -#: awx/settings/defaults.py:797 +#: awx/settings/defaults.py:796 msgid "Asia Southeast" msgstr "" -#: awx/settings/defaults.py:798 +#: awx/settings/defaults.py:797 msgid "Australia East" msgstr "" -#: awx/settings/defaults.py:799 +#: awx/settings/defaults.py:798 msgid "Australia Southeast" msgstr "" -#: awx/settings/defaults.py:800 +#: awx/settings/defaults.py:799 msgid "India West" msgstr "" -#: awx/settings/defaults.py:801 +#: awx/settings/defaults.py:800 msgid "India South" msgstr "" -#: awx/settings/defaults.py:802 +#: awx/settings/defaults.py:801 msgid "Japan East" msgstr "" -#: awx/settings/defaults.py:803 +#: awx/settings/defaults.py:802 msgid "Japan West" msgstr "" -#: awx/settings/defaults.py:804 +#: awx/settings/defaults.py:803 msgid "Korea Central" msgstr "" -#: awx/settings/defaults.py:805 +#: awx/settings/defaults.py:804 msgid "Korea South" msgstr "" @@ -4167,6 +4215,7 @@ msgid "SAML Team Map" msgstr "" #: awx/sso/fields.py:123 +#, python-brace-format msgid "Invalid connection option(s): {invalid_options}." msgstr "" @@ -4183,78 +4232,96 @@ msgid "Subtree" msgstr "" #: awx/sso/fields.py:214 +#, python-brace-format msgid "Expected a list of three items but got {length} instead." msgstr "" #: awx/sso/fields.py:215 +#, python-brace-format msgid "Expected an instance of LDAPSearch but got {input_type} instead." msgstr "" #: awx/sso/fields.py:251 +#, python-brace-format msgid "" "Expected an instance of LDAPSearch or LDAPSearchUnion but got {input_type} " "instead." msgstr "" #: awx/sso/fields.py:289 +#, python-brace-format msgid "Invalid user attribute(s): {invalid_attrs}." msgstr "" #: awx/sso/fields.py:306 +#, python-brace-format msgid "Expected an instance of LDAPGroupType but got {input_type} instead." msgstr "" #: awx/sso/fields.py:334 +#, python-brace-format msgid "Invalid user flag: \"{invalid_flag}\"." msgstr "" #: awx/sso/fields.py:350 awx/sso/fields.py:517 +#, python-brace-format msgid "" "Expected None, True, False, a string or list of strings but got {input_type} " "instead." msgstr "" #: awx/sso/fields.py:386 +#, python-brace-format msgid "Missing key(s): {missing_keys}." msgstr "" #: awx/sso/fields.py:387 +#, python-brace-format msgid "Invalid key(s): {invalid_keys}." msgstr "" #: awx/sso/fields.py:436 awx/sso/fields.py:553 +#, python-brace-format msgid "Invalid key(s) for organization map: {invalid_keys}." msgstr "" #: awx/sso/fields.py:454 +#, python-brace-format msgid "Missing required key for team map: {invalid_keys}." msgstr "" #: awx/sso/fields.py:455 awx/sso/fields.py:572 +#, python-brace-format msgid "Invalid key(s) for team map: {invalid_keys}." msgstr "" #: awx/sso/fields.py:571 +#, python-brace-format msgid "Missing required key for team map: {missing_keys}." msgstr "" #: awx/sso/fields.py:589 +#, python-brace-format msgid "Missing required key(s) for org info record: {missing_keys}." msgstr "" #: awx/sso/fields.py:602 +#, python-brace-format msgid "Invalid language code(s) for org info: {invalid_lang_codes}." msgstr "" #: awx/sso/fields.py:621 +#, python-brace-format msgid "Missing required key(s) for contact: {missing_keys}." msgstr "" #: awx/sso/fields.py:633 +#, python-brace-format msgid "Missing required key(s) for IdP: {missing_keys}." msgstr "" #: awx/sso/pipeline.py:24 +#, python-brace-format msgid "An account cannot be found for {0}" msgstr "" @@ -4346,6 +4413,7 @@ msgid "Make a PATCH request on the %(name)s resource" msgstr "" #: awx/ui/apps.py:9 awx/ui/conf.py:22 awx/ui/conf.py:36 awx/ui/conf.py:51 +#: awx/ui/conf.py:63 msgid "UI" msgstr "" @@ -4392,6 +4460,15 @@ msgid "" "and JPEG formats are supported." msgstr "" +#: awx/ui/conf.py:60 +msgid "Max Job Events Retreived by UI" +msgstr "" + +#: awx/ui/conf.py:61 +msgid "" +"Maximum number of job events for the UI to retreive within a single request." +msgstr "" + #: awx/ui/fields.py:29 msgid "" "Invalid format for custom logo. Must be a data URL with a base64-encoded " diff --git a/awx/ui/po/ansible-tower-ui.pot b/awx/ui/po/ansible-tower-ui.pot index 7c6796f637..0578200c4c 100644 --- a/awx/ui/po/ansible-tower-ui.pot +++ b/awx/ui/po/ansible-tower-ui.pot @@ -5,12 +5,12 @@ msgstr "" "Project-Id-Version: \n" #: client/src/projects/add/projects-add.controller.js:153 -#: client/src/projects/edit/projects-edit.controller.js:282 +#: client/src/projects/edit/projects-edit.controller.js:288 msgid "%sNote:%s Mercurial does not support password authentication for SSH. Do not put the username and key in the URL. If using Bitbucket and SSH, do not supply your Bitbucket username." msgstr "" #: client/src/projects/add/projects-add.controller.js:132 -#: client/src/projects/edit/projects-edit.controller.js:261 +#: client/src/projects/edit/projects-edit.controller.js:267 msgid "%sNote:%s When using SSH protocol for GitHub or Bitbucket, enter an SSH key only, do not enter a username (other than git). Additionally, GitHub and Bitbucket do not support password authentication when using SSH. GIT read only protocol (git://) does not use username or password information." msgstr "" @@ -42,7 +42,7 @@ msgstr "" msgid "A schedule name is required." msgstr "" -#: client/src/users/add/users-add.controller.js:101 +#: client/src/users/add/users-add.controller.js:102 msgid "A value is required" msgstr "" @@ -68,7 +68,7 @@ msgstr "" msgid "ACTIVITY STREAM" msgstr "" -#: client/features/credentials/legacy.credentials.js:79 +#: client/features/credentials/legacy.credentials.js:76 #: client/src/credential-types/credential-types.list.js:44 #: client/src/credentials/credentials.form.js:449 #: client/src/credentials/credentials.list.js:54 @@ -84,7 +84,7 @@ msgstr "" #: client/src/scheduler/schedules.list.js:68 #: client/src/teams/teams.form.js:85 #: client/src/teams/teams.list.js:45 -#: client/src/templates/job_templates/job-template.form.js:402 +#: client/src/templates/job_templates/job-template.form.js:397 #: client/src/templates/templates.list.js:58 #: client/src/templates/workflows.form.js:125 #: client/src/users/users.list.js:50 @@ -100,7 +100,7 @@ msgid "ADD HOST" msgstr "" #: client/src/teams/teams.form.js:157 -#: client/src/users/users.form.js:212 +#: client/src/users/users.form.js:216 msgid "ADD PERMISSIONS" msgstr "" @@ -138,7 +138,7 @@ msgstr "" msgid "API Key" msgstr "" -#: client/src/notifications/notificationTemplates.form.js:246 +#: client/src/notifications/notificationTemplates.form.js:243 msgid "API Service/Integration Key" msgstr "" @@ -168,11 +168,11 @@ msgstr "" msgid "Access Key" msgstr "" -#: client/src/notifications/notificationTemplates.form.js:224 +#: client/src/notifications/notificationTemplates.form.js:221 msgid "Account SID" msgstr "" -#: client/src/notifications/notificationTemplates.form.js:183 +#: client/src/notifications/notificationTemplates.form.js:180 msgid "Account Token" msgstr "" @@ -191,12 +191,12 @@ msgstr "" msgid "Activity" msgstr "" -#: client/src/configuration/system-form/configuration-system.controller.js:86 +#: client/src/configuration/system-form/configuration-system.controller.js:88 msgid "Activity Stream" msgstr "" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:134 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:137 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:131 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:132 #: client/src/organizations/organizations.form.js:81 #: client/src/teams/teams.form.js:82 #: client/src/templates/workflows.form.js:122 @@ -219,8 +219,8 @@ msgstr "" msgid "Add Project" msgstr "" -#: client/src/shared/form-generator.js:1703 -#: client/src/templates/job_templates/job-template.form.js:450 +#: client/src/shared/form-generator.js:1711 +#: client/src/templates/job_templates/job-template.form.js:445 #: client/src/templates/workflows.form.js:170 msgid "Add Survey" msgstr "" @@ -255,12 +255,12 @@ msgstr "" msgid "Add a new schedule" msgstr "" -#: client/features/credentials/legacy.credentials.js:77 +#: client/features/credentials/legacy.credentials.js:74 #: client/src/credentials/credentials.form.js:447 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:136 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:139 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:133 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:134 #: client/src/projects/projects.form.js:241 -#: client/src/templates/job_templates/job-template.form.js:400 +#: client/src/templates/job_templates/job-template.form.js:395 #: client/src/templates/workflows.form.js:123 msgid "Add a permission" msgstr "" @@ -269,7 +269,7 @@ msgstr "" msgid "Add passwords, SSH keys, and other credentials to use when launching jobs against machines, or when syncing inventories or projects." msgstr "" -#: client/src/shared/form-generator.js:1439 +#: client/src/shared/form-generator.js:1446 msgid "Admin" msgstr "" @@ -298,8 +298,8 @@ msgstr "" msgid "All Jobs" msgstr "" -#: client/src/templates/job_templates/job-template.form.js:280 -#: client/src/templates/job_templates/job-template.form.js:287 +#: client/src/templates/job_templates/job-template.form.js:275 +#: client/src/templates/job_templates/job-template.form.js:282 msgid "Allow Provisioning Callbacks" msgstr "" @@ -311,16 +311,25 @@ msgstr "" msgid "Always" msgstr "" -#: client/src/projects/list/projects-list.controller.js:267 +#: client/src/projects/list/projects-list.controller.js:266 msgid "An SCM update does not appear to be running for project: %s. Click the %sRefresh%s button to view the latest status." msgstr "" -#: client/src/templates/survey-maker/shared/question-definition.form.js:59 -#: client/src/templates/survey-maker/shared/question-definition.form.js:65 +#: client/src/templates/survey-maker/shared/question-definition.form.js:62 +#: client/src/templates/survey-maker/shared/question-definition.form.js:68 msgid "Answer Type" msgstr "" -#: client/src/credentials/list/credentials-list.controller.js:114 +#: client/src/templates/survey-maker/shared/question-definition.form.js:44 +#: client/src/templates/survey-maker/shared/question-definition.form.js:53 +msgid "Answer Variable Name" +msgstr "" + +#: client/src/job-results/job-results.service.js:144 +msgid "Are you sure you want to cancel the job below?" +msgstr "" + +#: client/src/credentials/list/credentials-list.controller.js:133 msgid "Are you sure you want to delete the credential below?" msgstr "" @@ -328,6 +337,7 @@ msgstr "" msgid "Are you sure you want to delete the inventory below?" msgstr "" +#: client/src/job-results/job-results.service.js:95 #: client/src/jobs/factories/delete-job.factory.js:110 msgid "Are you sure you want to delete the job below?" msgstr "" @@ -344,6 +354,10 @@ msgstr "" msgid "Are you sure you want to delete the project below?" msgstr "" +#: client/src/templates/list/templates-list.controller.js:103 +msgid "Are you sure you want to delete the template below?" +msgstr "" + #: client/src/users/list/users-list.controller.js:90 msgid "Are you sure you want to delete the user below?" msgstr "" @@ -356,9 +370,9 @@ msgstr "" msgid "Are you sure you want to disassociate the group below from" msgstr "" -#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:22 +#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:23 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:25 -#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:25 +#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:26 msgid "Are you sure you want to disassociate the host below from" msgstr "" @@ -366,16 +380,15 @@ msgstr "" msgid "Are you sure you want to permanently delete the group below from the inventory?" msgstr "" -#: client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js:98 +#: client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js:106 msgid "Are you sure you want to permanently delete the host below from the inventory?" msgstr "" -#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:120 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:69 msgid "Are you sure you want to permanently delete the inventory source below from the inventory?" msgstr "" -#: client/src/projects/edit/projects-edit.controller.js:238 +#: client/src/projects/edit/projects-edit.controller.js:244 msgid "Are you sure you want to remove the %s below from %s?" msgstr "" @@ -398,7 +411,7 @@ msgstr "" msgid "Associate this host with a new group" msgstr "" -#: client/src/shared/form-generator.js:1441 +#: client/src/shared/form-generator.js:1448 msgid "Auditor" msgstr "" @@ -443,23 +456,23 @@ msgstr "" msgid "Become Privilege Escalation" msgstr "" -#: client/src/license/license.partial.html:104 +#: client/src/license/license.partial.html:107 msgid "Browse" msgstr "" #: client/lib/services/base-string.service.js:61 -#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:26 +#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:28 #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:51 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html:29 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:29 -#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:29 +#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:30 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:73 #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html:16 #: client/src/inventories-hosts/shared/associate-groups/associate-groups.partial.html:16 #: client/src/inventories-hosts/shared/associate-hosts/associate-hosts.partial.html:16 -#: client/src/job-submission/job-submission.partial.html:363 +#: client/src/job-submission/job-submission.partial.html:370 #: client/src/partials/survey-maker-modal.html:17 -#: client/src/partials/survey-maker-modal.html:84 +#: client/src/partials/survey-maker-modal.html:85 #: client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.partial.html:17 #: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:65 msgid "CANCEL" @@ -473,12 +486,12 @@ msgstr "" msgid "CLEAR ALL" msgstr "" -#: client/src/partials/survey-maker-modal.html:85 +#: client/src/partials/survey-maker-modal.html:86 msgid "CLOSE" msgstr "" #: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:19 -#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js:18 +#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js:19 #: client/src/templates/completed-jobs.list.js:20 msgid "COMPLETED JOBS" msgstr "" @@ -530,7 +543,7 @@ msgstr "" msgid "CREATE SOURCE" msgstr "" -#: client/src/job-submission/job-submission.partial.html:344 +#: client/src/job-submission/job-submission.partial.html:351 #: client/src/partials/job-template-details.html:2 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:93 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:82 @@ -579,16 +592,16 @@ msgstr "" msgid "Call to %s failed. DELETE returned status:" msgstr "" -#: client/src/projects/list/projects-list.controller.js:247 -#: client/src/projects/list/projects-list.controller.js:264 +#: client/src/projects/list/projects-list.controller.js:246 +#: client/src/projects/list/projects-list.controller.js:263 msgid "Call to %s failed. GET status:" msgstr "" -#: client/src/projects/edit/projects-edit.controller.js:232 +#: client/src/projects/edit/projects-edit.controller.js:238 msgid "Call to %s failed. POST returned status:" msgstr "" -#: client/src/projects/list/projects-list.controller.js:226 +#: client/src/projects/list/projects-list.controller.js:225 msgid "Call to %s failed. POST status:" msgstr "" @@ -596,22 +609,26 @@ msgstr "" msgid "Call to %s failed. Return status: %d" msgstr "" -#: client/src/projects/list/projects-list.controller.js:273 +#: client/src/projects/list/projects-list.controller.js:272 msgid "Call to get project failed. GET status:" msgstr "" #: client/src/access/add-rbac-resource/rbac-resource.partial.html:105 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:191 -#: client/src/configuration/configuration.controller.js:535 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:188 +#: client/src/configuration/configuration.controller.js:541 #: client/src/job-results/job-results.partial.html:42 #: client/src/jobs/factories/delete-job.factory.js:33 -#: client/src/shared/form-generator.js:1691 +#: client/src/shared/form-generator.js:1699 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:12 #: client/src/workflow-results/workflow-results.partial.html:42 msgid "Cancel" msgstr "" -#: client/src/projects/list/projects-list.controller.js:242 +#: client/src/job-results/job-results.service.js:142 +msgid "Cancel Job" +msgstr "" + +#: client/src/projects/list/projects-list.controller.js:241 msgid "Cancel Not Allowed" msgstr "" @@ -637,12 +654,8 @@ msgstr "" msgid "Cannot search running job" msgstr "" -#: client/src/instance-groups/instance-group.partial.html:10 -#: client/src/instance-groups/instance-groups.list.js:21 -#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:10 -#: client/src/instance-groups/instances/instances-list.partial.html:18 +#: client/src/instance-groups/instance-groups.list.js:22 #: client/src/instance-groups/instances/instances.list.js:20 -#: client/src/instance-groups/list/instance-groups-list.partial.html:29 msgid "Capacity" msgstr "" @@ -654,15 +667,15 @@ msgstr "" msgid "Changes" msgstr "" -#: client/src/shared/form-generator.js:1064 +#: client/src/shared/form-generator.js:1071 msgid "Choose a %s" msgstr "" -#: client/src/templates/survey-maker/shared/question-definition.form.js:61 +#: client/src/templates/survey-maker/shared/question-definition.form.js:64 msgid "Choose an answer type" msgstr "" -#: client/src/templates/survey-maker/shared/question-definition.form.js:64 +#: client/src/templates/survey-maker/shared/question-definition.form.js:67 msgid "Choose an answer type or format you want as the prompt for the user. Refer to the Ansible Tower Documentation for more additional information about each option." msgstr "" @@ -682,7 +695,7 @@ msgstr "" msgid "Clean" msgstr "" -#: client/src/templates/survey-maker/shared/question-definition.form.js:296 +#: client/src/templates/survey-maker/shared/question-definition.form.js:299 msgid "Clear" msgstr "" @@ -715,7 +728,7 @@ msgstr "" msgid "Client ID" msgstr "" -#: client/src/notifications/notificationTemplates.form.js:257 +#: client/src/notifications/notificationTemplates.form.js:254 msgid "Client Identifier" msgstr "" @@ -723,11 +736,11 @@ msgstr "" msgid "Client Secret" msgstr "" -#: client/src/shared/form-generator.js:1695 +#: client/src/shared/form-generator.js:1703 msgid "Close" msgstr "" -#: client/src/job-results/job-results.partial.html:288 +#: client/src/job-results/job-results.partial.html:291 msgid "Cloud Credential" msgstr "" @@ -739,8 +752,8 @@ msgstr "" msgid "Cloud source not configured. Click" msgstr "" -#: client/src/credentials/factories/become-method-change.factory.js:86 -#: client/src/credentials/factories/kind-change.factory.js:143 +#: client/src/credentials/factories/become-method-change.factory.js:80 +#: client/src/credentials/factories/kind-change.factory.js:137 msgid "CloudForms URL" msgstr "" @@ -763,18 +776,22 @@ msgstr "" msgid "Configure {{BRAND_NAME}}" msgstr "" -#: client/src/users/users.form.js:79 +#: client/src/users/users.form.js:81 msgid "Confirm Password" msgstr "" -#: client/src/configuration/configuration.controller.js:542 +#: client/src/configuration/configuration.controller.js:548 msgid "Confirm Reset" msgstr "" -#: client/src/configuration/configuration.controller.js:551 +#: client/src/configuration/configuration.controller.js:557 msgid "Confirm factory reset" msgstr "" +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:120 +msgid "Confirm that you want to permanently delete the inventory source below from the inventory. Deleting this inventory source also deletes its associated groups and hosts." +msgstr "" + #: client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js:82 msgid "Confirm the removal of the" msgstr "" @@ -788,7 +805,7 @@ msgstr "" msgid "Contains 0 hosts." msgstr "" -#: client/src/templates/job_templates/job-template.form.js:185 +#: client/src/templates/job_templates/job-template.form.js:180 msgid "Control the level of output ansible will produce as the playbook executes." msgstr "" @@ -822,10 +839,6 @@ msgstr "" msgid "Create New" msgstr "" -#: client/src/inventories-hosts/hosts/host.list.js:107 -msgid "Create a new Smart Inventory from search results." -msgstr "" - #: client/src/credentials/credentials.list.js:52 msgid "Create a new credential" msgstr "" @@ -894,7 +907,7 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:74 #: client/src/job-submission/job-submission.partial.html:18 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:67 -#: client/src/templates/job_templates/job-template.form.js:126 +#: client/src/templates/job_templates/job-template.form.js:121 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:53 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:62 msgid "Credential" @@ -905,11 +918,11 @@ msgstr "" msgid "Credential Types" msgstr "" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:135 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:59 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:129 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:58 #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:24 #: client/src/setup-menu/setup-menu.partial.html:22 -#: client/src/templates/job_templates/job-template.form.js:139 +#: client/src/templates/job_templates/job-template.form.js:134 msgid "Credentials" msgstr "" @@ -929,8 +942,8 @@ msgstr "" msgid "Custom Inventory Script" msgstr "" -#: client/src/inventory-scripts/inventory-scripts.form.js:53 -#: client/src/inventory-scripts/inventory-scripts.form.js:63 +#: client/src/inventory-scripts/inventory-scripts.form.js:50 +#: client/src/inventory-scripts/inventory-scripts.form.js:60 msgid "Custom Script" msgstr "" @@ -938,20 +951,23 @@ msgstr "" msgid "DASHBOARD" msgstr "" -#: client/src/credentials/list/credentials-list.controller.js:116 +#: client/src/credentials/list/credentials-list.controller.js:135 #: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:103 #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:52 -#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:145 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:178 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:74 +#: client/src/job-results/job-results.service.js:119 +#: client/src/jobs/factories/delete-job.factory.js:115 #: client/src/notifications/notification-templates-list/list.controller.js:195 #: client/src/organizations/list/organizations-list.controller.js:174 #: client/src/partials/survey-maker-modal.html:18 -#: client/src/projects/edit/projects-edit.controller.js:240 +#: client/src/projects/edit/projects-edit.controller.js:246 +#: client/src/templates/list/templates-list.controller.js:154 #: client/src/users/list/users-list.controller.js:92 msgid "DELETE" msgstr "" -#: client/src/partials/survey-maker-modal.html:83 +#: client/src/partials/survey-maker-modal.html:84 msgid "DELETE SURVEY" msgstr "" @@ -959,10 +975,10 @@ msgstr "" msgid "DETAILS" msgstr "" -#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:27 +#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:29 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html:30 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:30 -#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:30 +#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:31 msgid "DISASSOCIATE" msgstr "" @@ -972,19 +988,20 @@ msgstr "" #: client/src/credential-types/credential-types.list.js:73 #: client/src/credentials/credentials.list.js:85 -#: client/src/credentials/list/credentials-list.controller.js:113 -#: client/src/inventories-hosts/inventories/inventory.list.js:112 +#: client/src/credentials/list/credentials-list.controller.js:132 +#: client/src/inventories-hosts/inventories/inventory.list.js:111 #: client/src/inventory-scripts/inventory-scripts.list.js:71 #: client/src/job-results/job-results.partial.html:54 #: client/src/jobs/factories/delete-job.factory.js:37 #: client/src/notifications/notification-templates-list/list.controller.js:192 #: client/src/notifications/notificationTemplates.list.js:91 #: client/src/organizations/list/organizations-list.controller.js:171 -#: client/src/projects/edit/projects-edit.controller.js:237 +#: client/src/projects/edit/projects-edit.controller.js:243 #: client/src/projects/list/projects-list.controller.js:207 #: client/src/scheduler/schedules.list.js:90 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:13 #: client/src/teams/teams.list.js:72 +#: client/src/templates/list/templates-list.controller.js:102 #: client/src/templates/templates.list.js:120 #: client/src/users/list/users-list.controller.js:89 #: client/src/users/users.list.js:79 @@ -997,7 +1014,11 @@ msgstr "" msgid "Delete Group" msgstr "" -#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:142 +#: client/src/job-results/job-results.service.js:93 +msgid "Delete Job" +msgstr "" + +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:175 msgid "Delete Source" msgstr "" @@ -1035,7 +1056,7 @@ msgstr[1] "" msgid "Delete hosts" msgstr "" -#: client/src/inventories-hosts/inventories/inventory.list.js:114 +#: client/src/inventories-hosts/inventories/inventory.list.js:113 msgid "Delete inventory" msgstr "" @@ -1129,48 +1150,51 @@ msgstr "" #: client/src/templates/job_templates/job-template.form.js:41 #: client/src/templates/survey-maker/shared/question-definition.form.js:36 #: client/src/templates/workflows.form.js:39 -#: client/src/users/users.form.js:141 -#: client/src/users/users.form.js:167 +#: client/src/users/users.form.js:145 +#: client/src/users/users.form.js:171 msgid "Description" msgstr "" -#: client/src/notifications/notificationTemplates.form.js:139 -#: client/src/notifications/notificationTemplates.form.js:143 -#: client/src/notifications/notificationTemplates.form.js:155 -#: client/src/notifications/notificationTemplates.form.js:159 +#: client/src/notifications/notificationTemplates.form.js:136 +#: client/src/notifications/notificationTemplates.form.js:140 +#: client/src/notifications/notificationTemplates.form.js:152 +#: client/src/notifications/notificationTemplates.form.js:156 msgid "Destination Channels" msgstr "" -#: client/src/notifications/notificationTemplates.form.js:362 -#: client/src/notifications/notificationTemplates.form.js:366 +#: client/src/notifications/notificationTemplates.form.js:359 +#: client/src/notifications/notificationTemplates.form.js:363 msgid "Destination Channels or Users" msgstr "" -#: client/src/notifications/notificationTemplates.form.js:208 -#: client/src/notifications/notificationTemplates.form.js:209 +#: client/src/notifications/notificationTemplates.form.js:205 +#: client/src/notifications/notificationTemplates.form.js:206 msgid "Destination SMS Number" msgstr "" #: client/features/credentials/credentials.strings.js:13 #: client/src/license/license.partial.html:5 -#: client/src/shared/form-generator.js:1474 +#: client/src/shared/form-generator.js:1481 msgid "Details" msgstr "" -#: client/src/job-submission/job-submission.partial.html:257 +#: client/src/job-submission/job-submission.partial.html:263 msgid "Diff Mode" msgstr "" #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html:6 -#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:6 -msgid "Disassociate Group" +msgid "Disassociate Group From Group" msgstr "" #: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:6 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:6 msgid "Disassociate Host" msgstr "" +#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:6 +#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:6 +msgid "Disassociate Host From Group" +msgstr "" + #: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js:65 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js:110 #: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js:98 @@ -1182,9 +1206,9 @@ msgid "Disassociate host" msgstr "" #: client/src/configuration/auth-form/configuration-auth.controller.js:75 -#: client/src/configuration/configuration.controller.js:198 -#: client/src/configuration/configuration.controller.js:260 -#: client/src/configuration/system-form/configuration-system.controller.js:55 +#: client/src/configuration/configuration.controller.js:202 +#: client/src/configuration/configuration.controller.js:264 +#: client/src/configuration/system-form/configuration-system.controller.js:57 msgid "Discard changes" msgstr "" @@ -1192,13 +1216,13 @@ msgstr "" msgid "Dissasociate permission from team" msgstr "" -#: client/src/users/users.form.js:221 +#: client/src/users/users.form.js:225 msgid "Dissasociate permission from user" msgstr "" #: client/src/credentials/credentials.form.js:384 -#: client/src/credentials/factories/become-method-change.factory.js:60 -#: client/src/credentials/factories/kind-change.factory.js:117 +#: client/src/credentials/factories/become-method-change.factory.js:54 +#: client/src/credentials/factories/kind-change.factory.js:111 msgid "Domain Name" msgstr "" @@ -1209,11 +1233,11 @@ msgstr "" msgid "Download Output" msgstr "" -#: client/src/inventory-scripts/inventory-scripts.form.js:62 +#: client/src/inventory-scripts/inventory-scripts.form.js:59 msgid "Drag and drop your custom inventory script file here or create one in the field to import your custom inventory. Refer to the Ansible Tower documentation for example syntax." msgstr "" -#: client/src/partials/survey-maker-modal.html:76 +#: client/src/partials/survey-maker-modal.html:77 msgid "Drop question here to reorder" msgstr "" @@ -1276,8 +1300,8 @@ msgstr "" msgid "Edit" msgstr "" -#: client/src/shared/form-generator.js:1707 -#: client/src/templates/job_templates/job-template.form.js:457 +#: client/src/shared/form-generator.js:1715 +#: client/src/templates/job_templates/job-template.form.js:452 #: client/src/templates/workflows.form.js:177 msgid "Edit Survey" msgstr "" @@ -1330,32 +1354,32 @@ msgstr "" msgid "Edit template" msgstr "" -#: client/src/job-results/job-results.partial.html:188 +#: client/src/job-results/job-results.partial.html:191 msgid "Edit the Schedule" msgstr "" -#: client/src/job-results/job-results.partial.html:172 +#: client/src/job-results/job-results.partial.html:175 #: client/src/workflow-results/workflow-results.partial.html:124 msgid "Edit the User" msgstr "" -#: client/src/job-results/job-results.partial.html:262 -#: client/src/job-results/job-results.partial.html:277 -#: client/src/job-results/job-results.partial.html:293 -#: client/src/job-results/job-results.partial.html:308 -#: client/src/job-results/job-results.partial.html:323 +#: client/src/job-results/job-results.partial.html:265 +#: client/src/job-results/job-results.partial.html:280 +#: client/src/job-results/job-results.partial.html:296 +#: client/src/job-results/job-results.partial.html:311 +#: client/src/job-results/job-results.partial.html:326 msgid "Edit the credential" msgstr "" -#: client/src/job-results/job-results.partial.html:203 +#: client/src/job-results/job-results.partial.html:206 msgid "Edit the inventory" msgstr "" -#: client/src/job-results/job-results.partial.html:137 +#: client/src/job-results/job-results.partial.html:140 msgid "Edit the job template" msgstr "" -#: client/src/job-results/job-results.partial.html:226 +#: client/src/job-results/job-results.partial.html:229 #: client/src/projects/projects.list.js:105 msgid "Edit the project" msgstr "" @@ -1372,11 +1396,11 @@ msgstr "" msgid "Edit {{BRAND_NAME}}'s configuration." msgstr "" -#: client/src/projects/list/projects-list.controller.js:242 +#: client/src/projects/list/projects-list.controller.js:241 msgid "Either you do not have access or the SCM update process completed. Click the %sRefresh%s button to view the latest status." msgstr "" -#: client/src/job-results/job-results.partial.html:517 +#: client/src/job-results/job-results.partial.html:520 msgid "Elapsed" msgstr "" @@ -1385,18 +1409,18 @@ msgstr "" msgid "Email" msgstr "" +#: client/src/templates/job_templates/job-template.form.js:288 #: client/src/templates/job_templates/job-template.form.js:293 -#: client/src/templates/job_templates/job-template.form.js:298 msgid "Enable Concurrent Jobs" msgstr "" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:123 +#: client/src/templates/job_templates/job-template.form.js:264 #: client/src/templates/job_templates/job-template.form.js:269 -#: client/src/templates/job_templates/job-template.form.js:274 msgid "Enable Privilege Escalation" msgstr "" -#: client/src/templates/job_templates/job-template.form.js:284 +#: client/src/templates/job_templates/job-template.form.js:279 msgid "Enables creation of a provisioning callback URL. Using the URL a host can contact {{BRAND_NAME}} and request a configuration update using this job template." msgstr "" @@ -1404,57 +1428,57 @@ msgstr "" msgid "Encrypted credentials are not supported." msgstr "" -#: client/src/license/license.partial.html:108 +#: client/src/license/license.partial.html:113 msgid "End User License Agreement" msgstr "" #: client/src/inventories-hosts/hosts/host.form.js:73 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:72 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:72 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:89 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:86 msgid "Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two." msgstr "" -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:98 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:93 msgid "Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two. Refer to the Ansible Tower documentation for example syntax." msgstr "" -#: client/src/notifications/notificationTemplates.form.js:158 +#: client/src/notifications/notificationTemplates.form.js:155 msgid "Enter one HipChat channel per line. The pound symbol (#) is not required." msgstr "" -#: client/src/notifications/notificationTemplates.form.js:365 +#: client/src/notifications/notificationTemplates.form.js:362 msgid "Enter one IRC channel or username per line. The pound symbol (#) for channels, and the at (@) symbol for users, are not required." msgstr "" -#: client/src/notifications/notificationTemplates.form.js:142 +#: client/src/notifications/notificationTemplates.form.js:139 msgid "Enter one Slack channel per line. The pound symbol (#) is not required." msgstr "" -#: client/src/notifications/notificationTemplates.form.js:100 +#: client/src/notifications/notificationTemplates.form.js:97 msgid "Enter one email address per line to create a recipient list for this type of notification." msgstr "" -#: client/src/notifications/notificationTemplates.form.js:212 +#: client/src/notifications/notificationTemplates.form.js:209 msgid "Enter one phone number per line to specify where to route SMS messages." msgstr "" -#: client/src/credentials/factories/become-method-change.factory.js:87 -#: client/src/credentials/factories/kind-change.factory.js:144 +#: client/src/credentials/factories/become-method-change.factory.js:81 +#: client/src/credentials/factories/kind-change.factory.js:138 msgid "Enter the URL for the virtual machine which %scorresponds to your CloudForm instance. %sFor example, %s" msgstr "" -#: client/src/credentials/factories/become-method-change.factory.js:77 -#: client/src/credentials/factories/kind-change.factory.js:134 +#: client/src/credentials/factories/become-method-change.factory.js:71 +#: client/src/credentials/factories/kind-change.factory.js:128 msgid "Enter the URL which corresponds to your %sRed Hat Satellite 6 server. %sFor example, %s" msgstr "" -#: client/src/credentials/factories/become-method-change.factory.js:55 -#: client/src/credentials/factories/kind-change.factory.js:112 +#: client/src/credentials/factories/become-method-change.factory.js:49 +#: client/src/credentials/factories/kind-change.factory.js:106 msgid "Enter the hostname or IP address which corresponds to your VMware vCenter." msgstr "" -#: client/src/notifications/notificationTemplates.form.js:198 +#: client/src/notifications/notificationTemplates.form.js:195 msgid "Enter the number associated with the \"Messaging Service\" in Twilio in the format +18005550199." msgstr "" @@ -1469,29 +1493,32 @@ msgstr "" msgid "Environment Variables" msgstr "" -#: client/src/configuration/configuration.controller.js:344 -#: client/src/configuration/configuration.controller.js:443 -#: client/src/configuration/configuration.controller.js:477 -#: client/src/configuration/configuration.controller.js:524 -#: client/src/configuration/system-form/configuration-system.controller.js:226 +#: client/src/configuration/configuration.controller.js:348 +#: client/src/configuration/configuration.controller.js:449 +#: client/src/configuration/configuration.controller.js:483 +#: client/src/configuration/configuration.controller.js:530 +#: client/src/configuration/system-form/configuration-system.controller.js:231 #: client/src/credentials/factories/credential-form-save.factory.js:77 #: client/src/credentials/factories/credential-form-save.factory.js:93 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:191 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:210 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:129 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:139 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:166 +#: client/src/job-submission/job-submission-factories/launchjob.factory.js:194 +#: client/src/job-submission/job-submission-factories/launchjob.factory.js:213 #: client/src/management-jobs/card/card.controller.js:140 #: client/src/management-jobs/card/card.controller.js:230 #: client/src/management-jobs/card/card.controller.js:28 #: client/src/projects/add/projects-add.controller.js:108 -#: client/src/projects/edit/projects-edit.controller.js:150 -#: client/src/projects/edit/projects-edit.controller.js:216 -#: client/src/projects/edit/projects-edit.controller.js:232 +#: client/src/projects/edit/projects-edit.controller.js:156 +#: client/src/projects/edit/projects-edit.controller.js:222 +#: client/src/projects/edit/projects-edit.controller.js:238 #: client/src/projects/list/projects-list.controller.js:169 #: client/src/projects/list/projects-list.controller.js:198 -#: client/src/projects/list/projects-list.controller.js:226 -#: client/src/projects/list/projects-list.controller.js:247 -#: client/src/projects/list/projects-list.controller.js:263 -#: client/src/projects/list/projects-list.controller.js:272 -#: client/src/users/add/users-add.controller.js:98 +#: client/src/projects/list/projects-list.controller.js:225 +#: client/src/projects/list/projects-list.controller.js:246 +#: client/src/projects/list/projects-list.controller.js:262 +#: client/src/projects/list/projects-list.controller.js:271 +#: client/src/users/add/users-add.controller.js:99 #: client/src/users/edit/users-edit.controller.js:180 #: client/src/users/edit/users-edit.controller.js:80 #: client/src/users/list/users-list.controller.js:82 @@ -1511,21 +1538,21 @@ msgid "Event summary not available" msgstr "" #: client/src/projects/add/projects-add.controller.js:129 -#: client/src/projects/edit/projects-edit.controller.js:259 +#: client/src/projects/edit/projects-edit.controller.js:265 msgid "Example URLs for GIT SCM include:" msgstr "" #: client/src/projects/add/projects-add.controller.js:150 -#: client/src/projects/edit/projects-edit.controller.js:279 +#: client/src/projects/edit/projects-edit.controller.js:285 msgid "Example URLs for Mercurial SCM include:" msgstr "" #: client/src/projects/add/projects-add.controller.js:141 -#: client/src/projects/edit/projects-edit.controller.js:270 +#: client/src/projects/edit/projects-edit.controller.js:276 msgid "Example URLs for Subversion SCM include:" msgstr "" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:68 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65 msgid "Example: ansible_facts.ansible_distribution:\"RedHat\"" msgstr "" @@ -1554,18 +1581,18 @@ msgstr "" msgid "Explanation" msgstr "" -#: client/src/job-results/job-results.partial.html:272 +#: client/src/job-results/job-results.partial.html:275 msgid "Extra Credentials" msgstr "" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:132 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:144 -#: client/src/job-results/job-results.partial.html:406 -#: client/src/job-submission/job-submission.partial.html:161 +#: client/src/job-results/job-results.partial.html:409 +#: client/src/job-submission/job-submission.partial.html:165 #: client/src/partials/logviewer.html:8 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:105 -#: client/src/templates/job_templates/job-template.form.js:347 -#: client/src/templates/job_templates/job-template.form.js:354 +#: client/src/templates/job_templates/job-template.form.js:342 +#: client/src/templates/job_templates/job-template.form.js:349 #: client/src/templates/workflows.form.js:74 #: client/src/templates/workflows.form.js:81 msgid "Extra Variables" @@ -1576,7 +1603,7 @@ msgstr "" msgid "FACTS" msgstr "" -#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:63 +#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:64 msgid "FAILED" msgstr "" @@ -1592,7 +1619,7 @@ msgstr "" #: client/src/inventories-hosts/hosts/host.form.js:107 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:106 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:106 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:107 msgid "Facts" msgstr "" @@ -1604,7 +1631,7 @@ msgstr "" msgid "Failed Hosts" msgstr "" -#: client/src/users/add/users-add.controller.js:98 +#: client/src/users/add/users-add.controller.js:99 msgid "Failed to add new user. POST returned status:" msgstr "" @@ -1616,11 +1643,11 @@ msgstr "" msgid "Failed to create new project. POST returned status:" msgstr "" -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:211 +#: client/src/job-submission/job-submission-factories/launchjob.factory.js:214 msgid "Failed to retrieve job template extra variables." msgstr "" -#: client/src/projects/edit/projects-edit.controller.js:151 +#: client/src/projects/edit/projects-edit.controller.js:157 msgid "Failed to retrieve project: %s. GET status:" msgstr "" @@ -1629,11 +1656,11 @@ msgstr "" msgid "Failed to retrieve user: %s. GET status:" msgstr "" -#: client/src/configuration/configuration.controller.js:444 +#: client/src/configuration/configuration.controller.js:450 msgid "Failed to save settings. Returned status:" msgstr "" -#: client/src/configuration/configuration.controller.js:478 +#: client/src/configuration/configuration.controller.js:484 msgid "Failed to save toggle settings. Returned status:" msgstr "" @@ -1641,11 +1668,11 @@ msgstr "" msgid "Failed to update Credential. PUT status:" msgstr "" -#: client/src/projects/edit/projects-edit.controller.js:216 +#: client/src/projects/edit/projects-edit.controller.js:222 msgid "Failed to update project: %s. PUT status:" msgstr "" -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:192 +#: client/src/job-submission/job-submission-factories/launchjob.factory.js:195 #: client/src/management-jobs/card/card.controller.js:141 #: client/src/management-jobs/card/card.controller.js:231 msgid "Failed updating job %s with variables. POST returned: %d" @@ -1668,7 +1695,7 @@ msgstr "" #: client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js:54 #: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:58 #: client/src/inventories-hosts/shared/factories/set-status.factory.js:44 -#: client/src/job-results/job-results.partial.html:108 +#: client/src/job-results/job-results.partial.html:111 #: client/src/jobs/all-jobs.list.js:66 #: client/src/portal-mode/portal-jobs.list.js:40 #: client/src/templates/completed-jobs.list.js:59 @@ -1689,8 +1716,8 @@ msgstr "" msgid "For additional information on advanced search search syntax please see the Ansible Tower" msgstr "" -#: client/src/credentials/factories/become-method-change.factory.js:69 -#: client/src/credentials/factories/kind-change.factory.js:126 +#: client/src/credentials/factories/become-method-change.factory.js:63 +#: client/src/credentials/factories/kind-change.factory.js:120 msgid "For example, %s" msgstr "" @@ -1713,10 +1740,10 @@ msgstr "" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:109 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:96 -#: client/src/job-results/job-results.partial.html:333 +#: client/src/job-results/job-results.partial.html:336 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:87 -#: client/src/templates/job_templates/job-template.form.js:149 -#: client/src/templates/job_templates/job-template.form.js:159 +#: client/src/templates/job_templates/job-template.form.js:144 +#: client/src/templates/job_templates/job-template.form.js:154 msgid "Forks" msgstr "" @@ -1746,7 +1773,7 @@ msgid "Google OAuth2" msgstr "" #: client/src/teams/teams.form.js:155 -#: client/src/users/users.form.js:210 +#: client/src/users/users.form.js:214 msgid "Grant Permission" msgstr "" @@ -1776,9 +1803,9 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.form.js:88 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js:32 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:114 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:114 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:115 #: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js:32 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:172 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:167 msgid "Groups" msgstr "" @@ -1799,8 +1826,8 @@ msgstr "" msgid "HOSTS" msgstr "" -#: client/src/notifications/notificationTemplates.form.js:323 -#: client/src/notifications/notificationTemplates.form.js:324 +#: client/src/notifications/notificationTemplates.form.js:320 +#: client/src/notifications/notificationTemplates.form.js:321 msgid "HTTP Headers" msgstr "" @@ -1813,17 +1840,17 @@ msgid "High" msgstr "" #: client/src/credentials/credentials.form.js:139 -#: client/src/notifications/notificationTemplates.form.js:86 +#: client/src/notifications/notificationTemplates.form.js:83 msgid "Host" msgstr "" -#: client/src/credentials/factories/become-method-change.factory.js:58 -#: client/src/credentials/factories/kind-change.factory.js:115 +#: client/src/credentials/factories/become-method-change.factory.js:52 +#: client/src/credentials/factories/kind-change.factory.js:109 msgid "Host (Authentication URL)" msgstr "" -#: client/src/templates/job_templates/job-template.form.js:329 -#: client/src/templates/job_templates/job-template.form.js:338 +#: client/src/templates/job_templates/job-template.form.js:324 +#: client/src/templates/job_templates/job-template.form.js:333 msgid "Host Config Key" msgstr "" @@ -1869,9 +1896,9 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/groups/groups.form.js:98 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js:57 #: client/src/inventories-hosts/inventories/related/hosts/related-host.list.js:56 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:170 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:181 -#: client/src/job-results/job-results.partial.html:501 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:167 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:176 +#: client/src/job-results/job-results.partial.html:504 msgid "Hosts" msgstr "" @@ -1892,7 +1919,7 @@ msgstr "" msgid "Hosts are imported to" msgstr "" -#: client/src/license/license.partial.html:116 +#: client/src/license/license.partial.html:121 msgid "I agree to the End User License Agreement" msgstr "" @@ -1921,7 +1948,7 @@ msgstr "" msgid "INSTANCE GROUPS" msgstr "" -#: client/src/instance-groups/instance-group.partial.html:28 +#: client/src/instance-groups/instance-group.partial.html:27 msgid "INSTANCES" msgstr "" @@ -1938,7 +1965,7 @@ msgstr "" msgid "INVENTORIES" msgstr "" -#: client/src/job-submission/job-submission.partial.html:339 +#: client/src/job-submission/job-submission.partial.html:346 #: client/src/partials/job-template-details.html:2 msgid "INVENTORY" msgstr "" @@ -1957,11 +1984,11 @@ msgstr "" msgid "INVENTORY SOURCES" msgstr "" -#: client/src/notifications/notificationTemplates.form.js:351 +#: client/src/notifications/notificationTemplates.form.js:348 msgid "IRC Nick" msgstr "" -#: client/src/notifications/notificationTemplates.form.js:340 +#: client/src/notifications/notificationTemplates.form.js:337 msgid "IRC Server Address" msgstr "" @@ -1990,28 +2017,31 @@ msgstr "" msgid "If blank, all groups above are created except" msgstr "" -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:331 -msgid "If checked, all child groups and hosts not found on the external source will be deleted from the local inventory." -msgstr "" - #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:343 msgid "If checked, all variables for child groups and hosts will be removed and replaced by those found on the external source." msgstr "" -#: client/src/templates/job_templates/job-template.form.js:272 +#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:331 +msgid "If checked, any hosts and groups that were previously present on the external source but are now removed will be removed from the Tower inventory. Hosts and groups that were not managed by the inventory source will be promoted to the next manually created group or if there is no manually created group to promote them into, they will be left in the \"all\" default group for the inventory." +msgstr "" + +#: client/src/templates/job_templates/job-template.form.js:267 msgid "If enabled, run this playbook as an administrator." msgstr "" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:120 -#: client/src/templates/job_templates/job-template.form.js:256 -msgid "If enabled, show the changes made by Ansible tasks, where supported. This is equivalent to Ansible's --diff mode." +msgid "If enabled, show the changes made by Ansible tasks, where supported. This is equivalent to Ansible’s --diff mode." msgstr "" -#: client/src/templates/job_templates/job-template.form.js:296 +#: client/src/templates/job_templates/job-template.form.js:251 +msgid "If enabled, show the changes made by Ansible tasks, where supported. This is equivalent to Ansible’s --diff mode." +msgstr "" + +#: client/src/templates/job_templates/job-template.form.js:291 msgid "If enabled, simultaneous runs of this job template will be allowed." msgstr "" -#: client/src/templates/job_templates/job-template.form.js:307 +#: client/src/templates/job_templates/job-template.form.js:302 msgid "If enabled, use cached facts if available and store discovered facts in the cache." msgstr "" @@ -2053,11 +2083,11 @@ msgid "Input Configuration" msgstr "" #: client/src/inventories-hosts/hosts/host.form.js:123 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:121 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:122 msgid "Insights" msgstr "" -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:72 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:69 msgid "Insights Credential" msgstr "" @@ -2066,19 +2096,19 @@ msgstr "" msgid "Instance Filters" msgstr "" -#: client/src/job-results/job-results.partial.html:366 +#: client/src/job-results/job-results.partial.html:369 msgid "Instance Group" msgstr "" +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:72 #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:75 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:78 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:83 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:86 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:78 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:81 #: client/src/organizations/organizations.form.js:38 #: client/src/organizations/organizations.form.js:41 #: client/src/setup-menu/setup-menu.partial.html:54 -#: client/src/templates/job_templates/job-template.form.js:196 -#: client/src/templates/job_templates/job-template.form.js:199 +#: client/src/templates/job_templates/job-template.form.js:191 +#: client/src/templates/job_templates/job-template.form.js:194 msgid "Instance Groups" msgstr "" @@ -2114,8 +2144,8 @@ msgstr "" msgid "Invalid username and/or password. Please try again." msgstr "" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:128 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:53 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:122 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:52 #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:26 #: client/src/home/dashboard/counts/dashboard-counts.directive.js:50 #: client/src/organizations/linkout/organizations-linkout.route.js:155 @@ -2125,7 +2155,7 @@ msgstr "" #: client/src/inventories-hosts/hosts/host.list.js:69 #: client/src/inventories-hosts/inventories/inventory.list.js:80 #: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:69 -#: client/src/job-results/job-results.partial.html:198 +#: client/src/job-results/job-results.partial.html:201 #: client/src/job-submission/job-submission.partial.html:17 #: client/src/organizations/linkout/controllers/organizations-inventories.controller.js:70 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:58 @@ -2154,7 +2184,7 @@ msgstr "" msgid "Inventory Sync Failures" msgstr "" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:96 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:93 msgid "Inventory Variables" msgstr "" @@ -2178,9 +2208,9 @@ msgid "JOB TEMPLATES" msgstr "" #: client/src/activity-stream/get-target-title.factory.js:32 -#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:109 -#: client/src/instance-groups/instance-group.partial.html:29 -#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:28 +#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:118 +#: client/src/instance-groups/instance-group.partial.html:28 +#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:27 #: client/src/instance-groups/jobs/jobs-list.route.js:9 #: client/src/jobs/jobs.route.js:15 #: client/src/main-menu/main-menu.partial.html:122 @@ -2190,7 +2220,7 @@ msgstr "" msgid "JOBS" msgstr "" -#: client/src/job-submission/job-submission.partial.html:169 +#: client/src/job-submission/job-submission.partial.html:173 msgid "JSON" msgstr "" @@ -2200,10 +2230,10 @@ msgstr "" msgid "JSON:" msgstr "" -#: client/src/job-results/job-results.partial.html:381 -#: client/src/job-submission/job-submission.partial.html:222 -#: client/src/templates/job_templates/job-template.form.js:205 -#: client/src/templates/job_templates/job-template.form.js:212 +#: client/src/job-results/job-results.partial.html:384 +#: client/src/job-submission/job-submission.partial.html:228 +#: client/src/templates/job_templates/job-template.form.js:200 +#: client/src/templates/job_templates/job-template.form.js:207 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:127 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:135 msgid "Job Tags" @@ -2213,15 +2243,15 @@ msgstr "" msgid "Job Template" msgstr "" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:109 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:103 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:36 #: client/src/organizations/linkout/organizations-linkout.route.js:268 msgid "Job Templates" msgstr "" #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:32 -#: client/src/job-results/job-results.partial.html:156 -#: client/src/job-submission/job-submission.partial.html:196 +#: client/src/job-results/job-results.partial.html:159 +#: client/src/job-submission/job-submission.partial.html:202 #: client/src/templates/job_templates/job-template.form.js:47 #: client/src/templates/job_templates/job-template.form.js:55 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:103 @@ -2240,12 +2270,12 @@ msgid "Jobs" msgstr "" #: client/src/job-results/job-results.controller.js:269 -#: client/src/job-results/job-results.controller.js:321 +#: client/src/job-results/job-results.controller.js:366 msgid "Jump to last line of standard out." msgstr "" #: client/src/access/add-rbac-resource/rbac-resource.partial.html:61 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:102 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:154 #: client/src/shared/smart-search/smart-search.partial.html:14 msgid "Key" msgstr "" @@ -2287,11 +2317,11 @@ msgstr "" #: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:68 #: client/src/instance-groups/jobs/jobs.list.js:66 -#: client/src/job-results/job-results.partial.html:431 -#: client/src/job-results/job-results.partial.html:440 +#: client/src/job-results/job-results.partial.html:434 +#: client/src/job-results/job-results.partial.html:443 #: client/src/jobs/all-jobs.list.js:74 -#: client/src/templates/job_templates/job-template.form.js:239 -#: client/src/templates/job_templates/job-template.form.js:243 +#: client/src/templates/job_templates/job-template.form.js:234 +#: client/src/templates/job_templates/job-template.form.js:238 #: client/src/templates/templates.list.js:43 #: client/src/templates/workflows.form.js:62 #: client/src/templates/workflows.form.js:67 @@ -2313,7 +2343,7 @@ msgid "Last Updated" msgstr "" #: client/src/portal-mode/portal-job-templates.list.js:36 -#: client/src/shared/form-generator.js:1699 +#: client/src/shared/form-generator.js:1707 #: client/src/templates/templates.list.js:80 msgid "Launch" msgstr "" @@ -2322,8 +2352,8 @@ msgstr "" msgid "Launch Management Job" msgstr "" -#: client/src/job-results/job-results.partial.html:167 -#: client/src/job-results/job-results.partial.html:182 +#: client/src/job-results/job-results.partial.html:170 +#: client/src/job-results/job-results.partial.html:185 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:76 msgid "Launched By" msgstr "" @@ -2332,7 +2362,7 @@ msgstr "" msgid "Launching this job requires the passwords listed below. Enter and confirm each password before continuing." msgstr "" -#: client/features/credentials/legacy.credentials.js:360 +#: client/features/credentials/legacy.credentials.js:357 msgid "Legacy state configuration for does not exist" msgstr "" @@ -2341,7 +2371,7 @@ msgstr "" msgid "License" msgstr "" -#: client/src/license/license.partial.html:102 +#: client/src/license/license.partial.html:104 msgid "License File" msgstr "" @@ -2359,11 +2389,11 @@ msgstr "" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:45 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:55 -#: client/src/job-results/job-results.partial.html:344 -#: client/src/job-submission/job-submission.partial.html:214 +#: client/src/job-results/job-results.partial.html:347 +#: client/src/job-submission/job-submission.partial.html:220 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:92 -#: client/src/templates/job_templates/job-template.form.js:165 -#: client/src/templates/job_templates/job-template.form.js:169 +#: client/src/templates/job_templates/job-template.form.js:160 +#: client/src/templates/job_templates/job-template.form.js:164 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:113 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:120 msgid "Limit" @@ -2396,7 +2426,7 @@ msgstr "" msgid "Live events: error connecting to the server." msgstr "" -#: client/src/shared/form-generator.js:1975 +#: client/src/shared/form-generator.js:1983 msgid "Loading..." msgstr "" @@ -2408,15 +2438,15 @@ msgstr "" msgid "Log Out" msgstr "" -#: client/src/configuration/system-form/configuration-system.controller.js:220 -msgid "Log aggregator test failed.
Detail:" +#: client/src/configuration/system-form/configuration-system.controller.js:225 +msgid "Log aggregator test failed.
Detail:" msgstr "" -#: client/src/configuration/system-form/configuration-system.controller.js:212 +#: client/src/configuration/system-form/configuration-system.controller.js:218 msgid "Log aggregator test successful." msgstr "" -#: client/src/configuration/system-form/configuration-system.controller.js:87 +#: client/src/configuration/system-form/configuration-system.controller.js:89 msgid "Logging" msgstr "" @@ -2434,12 +2464,12 @@ msgid "MY VIEW" msgstr "" #: client/src/credentials/credentials.form.js:67 -#: client/src/job-submission/job-submission.partial.html:349 +#: client/src/job-submission/job-submission.partial.html:356 msgid "Machine" msgstr "" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:60 -#: client/src/job-results/job-results.partial.html:257 +#: client/src/job-results/job-results.partial.html:260 msgid "Machine Credential" msgstr "" @@ -2447,11 +2477,6 @@ msgstr "" msgid "Manage the cleanup of old job history, activity streams, data marked for deletion, and system tracking info." msgstr "" -#: client/src/credentials/factories/become-method-change.factory.js:38 -#: client/src/credentials/factories/kind-change.factory.js:95 -msgid "Management Certificate" -msgstr "" - #: client/src/setup-menu/setup-menu.partial.html:35 msgid "Management Jobs" msgstr "" @@ -2460,7 +2485,7 @@ msgstr "" msgid "Manual projects do not require a schedule" msgstr "" -#: client/src/projects/edit/projects-edit.controller.js:140 +#: client/src/projects/edit/projects-edit.controller.js:141 #: client/src/projects/list/projects-list.controller.js:88 msgid "Manual projects do not require an SCM update" msgstr "" @@ -2473,7 +2498,7 @@ msgstr "" msgid "Medium" msgstr "" -#: client/src/configuration/system-form/configuration-system.controller.js:88 +#: client/src/configuration/system-form/configuration-system.controller.js:90 msgid "Misc. System" msgstr "" @@ -2498,7 +2523,7 @@ msgstr "" msgid "Most recent job successful. Click to view jobs." msgstr "" -#: client/src/templates/survey-maker/shared/question-definition.form.js:74 +#: client/src/templates/survey-maker/shared/question-definition.form.js:77 msgid "Multiple Choice Options" msgstr "" @@ -2598,7 +2623,7 @@ msgstr "" #: client/src/credentials/credentials.list.js:26 #: client/src/home/dashboard/lists/job-templates/job-templates-list.partial.html:14 #: client/src/home/dashboard/lists/jobs/jobs-list.partial.html:13 -#: client/src/instance-groups/instance-groups.list.js:14 +#: client/src/instance-groups/instance-groups.list.js:15 #: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:35 #: client/src/instance-groups/instances/instances-list.partial.html:15 #: client/src/instance-groups/instances/instances.list.js:14 @@ -2636,9 +2661,9 @@ msgstr "" #: client/src/templates/job_templates/job-template.form.js:34 #: client/src/templates/templates.list.js:24 #: client/src/templates/workflows.form.js:32 -#: client/src/users/users.form.js:138 -#: client/src/users/users.form.js:164 -#: client/src/users/users.form.js:190 +#: client/src/users/users.form.js:142 +#: client/src/users/users.form.js:168 +#: client/src/users/users.form.js:194 msgid "Name" msgstr "" @@ -2646,7 +2671,7 @@ msgstr "" msgid "Network" msgstr "" -#: client/src/job-results/job-results.partial.html:303 +#: client/src/job-results/job-results.partial.html:306 msgid "Network Credential" msgstr "" @@ -2658,7 +2683,7 @@ msgstr "" msgid "New Host" msgstr "" -#: client/src/users/add/users-add.controller.js:90 +#: client/src/users/add/users-add.controller.js:91 msgid "New user successfully created!" msgstr "" @@ -2672,7 +2697,7 @@ msgid "No Credentials Have Been Created" msgstr "" #: client/src/job-submission/lists/credential/job-sub-cred-list.controller.js:44 -#: client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js:124 +#: client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js:140 msgid "No Credentials Matching This Type Have Been Created" msgstr "" @@ -2756,7 +2781,7 @@ msgid "No jobs were recently run." msgstr "" #: client/src/teams/teams.form.js:121 -#: client/src/users/users.form.js:187 +#: client/src/users/users.form.js:191 msgid "No permissions have been granted" msgstr "" @@ -2764,7 +2789,7 @@ msgstr "" msgid "No recent job data available for this host." msgstr "" -#: client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js:73 +#: client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js:75 msgid "No recent job data available for this inventory." msgstr "" @@ -2773,7 +2798,8 @@ msgid "No recent notifications." msgstr "" #: client/src/inventories-hosts/hosts/hosts.partial.html:36 -#: client/src/shared/form-generator.js:1871 +#: client/src/shared/form-generator.js:1879 +#: client/src/shared/list-generator/list-generator.factory.js:240 msgid "No records matched your search." msgstr "" @@ -2781,8 +2807,8 @@ msgstr "" msgid "No schedules exist" msgstr "" -#: client/src/job-submission/job-submission.partial.html:341 -#: client/src/job-submission/job-submission.partial.html:346 +#: client/src/job-submission/job-submission.partial.html:348 +#: client/src/job-submission/job-submission.partial.html:353 msgid "None selected" msgstr "" @@ -2800,8 +2826,12 @@ msgstr "" msgid "Not configured for inventory sync." msgstr "" -#: client/src/notifications/notificationTemplates.form.js:291 -#: client/src/notifications/notificationTemplates.form.js:292 +#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:25 +msgid "Note that only hosts directly in this group can be disassociated. Hosts in sub-groups must be disassociated directly from the sub-group level that they belong." +msgstr "" + +#: client/src/notifications/notificationTemplates.form.js:288 +#: client/src/notifications/notificationTemplates.form.js:289 msgid "Notification Color" msgstr "" @@ -2809,7 +2839,7 @@ msgstr "" msgid "Notification Failed." msgstr "" -#: client/src/notifications/notificationTemplates.form.js:280 +#: client/src/notifications/notificationTemplates.form.js:277 msgid "Notification Label" msgstr "" @@ -2824,26 +2854,29 @@ msgstr "" msgid "Notifications" msgstr "" -#: client/src/notifications/notificationTemplates.form.js:305 +#: client/src/notifications/notificationTemplates.form.js:302 msgid "Notify Channel" msgstr "" #: client/src/inventories-hosts/hosts/hosts.partial.html:55 -#: client/src/job-submission/job-submission.partial.html:263 +#: client/src/job-submission/job-submission.partial.html:269 #: client/src/partials/survey-maker-modal.html:27 -#: client/src/shared/form-generator.js:538 +#: client/src/shared/form-generator.js:542 +#: client/src/shared/form-generator.js:773 #: client/src/shared/generator-helpers.js:551 msgid "OFF" msgstr "" #: client/lib/services/base-string.service.js:63 +#: client/src/jobs/factories/delete-job.factory.js:115 msgid "OK" msgstr "" #: client/src/inventories-hosts/hosts/hosts.partial.html:54 -#: client/src/job-submission/job-submission.partial.html:261 +#: client/src/job-submission/job-submission.partial.html:267 #: client/src/partials/survey-maker-modal.html:26 -#: client/src/shared/form-generator.js:536 +#: client/src/shared/form-generator.js:538 +#: client/src/shared/form-generator.js:771 #: client/src/shared/generator-helpers.js:547 msgid "ON" msgstr "" @@ -2883,14 +2916,14 @@ msgstr "" msgid "OpenStack domains define administrative boundaries. It is only needed for Keystone v3 authentication URLs. Common scenarios include:" msgstr "" -#: client/src/templates/job_templates/job-template.form.js:245 +#: client/src/templates/job_templates/job-template.form.js:240 #: client/src/templates/workflows.form.js:69 msgid "Optional labels that describe this job template, such as 'dev' or 'test'. Labels can be used to group and filter job templates and completed jobs." msgstr "" -#: client/src/notifications/notificationTemplates.form.js:385 +#: client/src/notifications/notificationTemplates.form.js:382 #: client/src/partials/logviewer.html:7 -#: client/src/templates/job_templates/job-template.form.js:264 +#: client/src/templates/job_templates/job-template.form.js:259 msgid "Options" msgstr "" @@ -2912,11 +2945,11 @@ msgstr "" msgid "Organization" msgstr "" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:142 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:65 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:136 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:64 #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:30 #: client/src/setup-menu/setup-menu.partial.html:4 -#: client/src/users/users.form.js:128 +#: client/src/users/users.form.js:132 msgid "Organizations" msgstr "" @@ -2975,7 +3008,7 @@ msgstr "" msgid "PASSWORD" msgstr "" -#: client/features/credentials/legacy.credentials.js:125 +#: client/features/credentials/legacy.credentials.js:122 msgid "PERMISSIONS" msgstr "" @@ -2990,7 +3023,7 @@ msgstr "" #: client/src/instance-groups/instances/instances-list.partial.html:6 #: client/src/instance-groups/list/instance-groups-list.partial.html:16 #: client/src/organizations/list/organizations-list.partial.html:47 -#: client/src/shared/form-generator.js:1877 +#: client/src/shared/form-generator.js:1885 #: client/src/shared/list-generator/list-generator.factory.js:248 msgid "PLEASE ADD ITEMS TO THIS LIST" msgstr "" @@ -3003,6 +3036,10 @@ msgstr "" msgid "PREVIEW" msgstr "" +#: client/src/job-results/job-results.service.js:166 +msgid "PROCEED" +msgstr "" + #: client/src/partials/job-template-details.html:2 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:73 msgid "PROJECT" @@ -3023,11 +3060,11 @@ msgstr "" msgid "Page" msgstr "" -#: client/src/notifications/notificationTemplates.form.js:235 +#: client/src/notifications/notificationTemplates.form.js:232 msgid "Pagerduty subdomain" msgstr "" -#: client/src/templates/job_templates/job-template.form.js:353 +#: client/src/templates/job_templates/job-template.form.js:348 msgid "Pass extra command line variables to the playbook. Provide key/value pairs using either YAML or JSON. Refer to the Ansible Tower documentation for example syntax." msgstr "" @@ -3041,19 +3078,19 @@ msgstr "" #: client/src/credentials/credentials.form.js:226 #: client/src/credentials/factories/become-method-change.factory.js:21 -#: client/src/credentials/factories/become-method-change.factory.js:46 -#: client/src/credentials/factories/become-method-change.factory.js:54 -#: client/src/credentials/factories/become-method-change.factory.js:74 -#: client/src/credentials/factories/become-method-change.factory.js:84 -#: client/src/credentials/factories/become-method-change.factory.js:94 -#: client/src/credentials/factories/kind-change.factory.js:103 -#: client/src/credentials/factories/kind-change.factory.js:111 -#: client/src/credentials/factories/kind-change.factory.js:131 -#: client/src/credentials/factories/kind-change.factory.js:141 -#: client/src/credentials/factories/kind-change.factory.js:151 +#: client/src/credentials/factories/become-method-change.factory.js:40 +#: client/src/credentials/factories/become-method-change.factory.js:48 +#: client/src/credentials/factories/become-method-change.factory.js:68 +#: client/src/credentials/factories/become-method-change.factory.js:78 +#: client/src/credentials/factories/become-method-change.factory.js:88 +#: client/src/credentials/factories/kind-change.factory.js:105 +#: client/src/credentials/factories/kind-change.factory.js:125 +#: client/src/credentials/factories/kind-change.factory.js:135 +#: client/src/credentials/factories/kind-change.factory.js:145 #: client/src/credentials/factories/kind-change.factory.js:30 #: client/src/credentials/factories/kind-change.factory.js:78 -#: client/src/job-submission/job-submission.partial.html:103 +#: client/src/credentials/factories/kind-change.factory.js:97 +#: client/src/job-submission/job-submission.partial.html:104 #: client/src/notifications/shared/type-change.service.js:28 #: client/src/users/users.form.js:68 msgid "Password" @@ -3081,11 +3118,6 @@ msgstr "" msgid "Paste the contents of the PEM file associated with the service account email." msgstr "" -#: client/src/credentials/factories/become-method-change.factory.js:41 -#: client/src/credentials/factories/kind-change.factory.js:98 -msgid "Paste the contents of the PEM file that corresponds to the certificate you uploaded in the Microsoft Azure console." -msgstr "" - #: client/src/credentials/factories/kind-change.factory.js:51 msgid "Paste the contents of the SSH private key file." msgstr "" @@ -3094,7 +3126,7 @@ msgstr "" msgid "Paste the contents of the SSH private key file.%s or click to close%s" msgstr "" -#: client/src/inventories-hosts/inventories/inventory.list.js:121 +#: client/src/inventories-hosts/inventories/inventory.list.js:119 msgid "Pending Delete" msgstr "" @@ -3103,27 +3135,27 @@ msgid "Period" msgstr "" #: client/src/projects/add/projects-add.controller.js:29 -#: client/src/users/add/users-add.controller.js:42 +#: client/src/users/add/users-add.controller.js:43 msgid "Permission Error" msgstr "" #: client/features/credentials/credentials.strings.js:14 -#: client/features/credentials/legacy.credentials.js:69 +#: client/features/credentials/legacy.credentials.js:66 #: client/src/credentials/credentials.form.js:439 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:125 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:128 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:122 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:123 #: client/src/projects/projects.form.js:233 #: client/src/teams/teams.form.js:117 -#: client/src/templates/job_templates/job-template.form.js:391 +#: client/src/templates/job_templates/job-template.form.js:386 #: client/src/templates/workflows.form.js:114 -#: client/src/users/users.form.js:183 +#: client/src/users/users.form.js:187 msgid "Permissions" msgstr "" -#: client/src/job-results/job-results.partial.html:246 -#: client/src/shared/form-generator.js:1062 -#: client/src/templates/job_templates/job-template.form.js:109 -#: client/src/templates/job_templates/job-template.form.js:120 +#: client/src/job-results/job-results.partial.html:249 +#: client/src/shared/form-generator.js:1069 +#: client/src/templates/job_templates/job-template.form.js:107 +#: client/src/templates/job_templates/job-template.form.js:115 msgid "Playbook" msgstr "" @@ -3135,15 +3167,15 @@ msgstr "" msgid "Playbook Run" msgstr "" -#: client/src/job-results/job-results.partial.html:485 +#: client/src/job-results/job-results.partial.html:488 msgid "Plays" msgstr "" -#: client/src/users/users.form.js:122 +#: client/src/users/users.form.js:126 msgid "Please add user to an Organization." msgstr "" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:101 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:100 msgid "Please assign roles to the selected resources" msgstr "" @@ -3155,31 +3187,31 @@ msgstr "" msgid "Please click the button below to visit Ansible's website to get a Tower license key." msgstr "" -#: client/src/inventories-hosts/inventory-hosts.strings.js:25 +#: client/src/inventories-hosts/inventory-hosts.strings.js:27 msgid "Please click the icon to edit the host filter." msgstr "" -#: client/src/shared/form-generator.js:854 -#: client/src/shared/form-generator.js:949 +#: client/src/shared/form-generator.js:861 +#: client/src/shared/form-generator.js:956 msgid "Please enter a URL that begins with ssh, http or https. The URL may not contain the '@' character." msgstr "" -#: client/src/shared/form-generator.js:1151 +#: client/src/shared/form-generator.js:1158 msgid "Please enter a number greater than %d and less than %d." msgstr "" -#: client/src/shared/form-generator.js:1153 +#: client/src/shared/form-generator.js:1160 msgid "Please enter a number greater than %d." msgstr "" -#: client/src/shared/form-generator.js:1145 +#: client/src/shared/form-generator.js:1152 msgid "Please enter a number." msgstr "" -#: client/src/job-submission/job-submission.partial.html:111 -#: client/src/job-submission/job-submission.partial.html:124 -#: client/src/job-submission/job-submission.partial.html:137 -#: client/src/job-submission/job-submission.partial.html:150 +#: client/src/job-submission/job-submission.partial.html:112 +#: client/src/job-submission/job-submission.partial.html:126 +#: client/src/job-submission/job-submission.partial.html:140 +#: client/src/job-submission/job-submission.partial.html:154 #: client/src/login/loginModal/loginModal.partial.html:78 msgid "Please enter a password." msgstr "" @@ -3188,39 +3220,39 @@ msgstr "" msgid "Please enter a username." msgstr "" -#: client/src/shared/form-generator.js:844 -#: client/src/shared/form-generator.js:939 +#: client/src/shared/form-generator.js:851 +#: client/src/shared/form-generator.js:946 msgid "Please enter a valid email address." msgstr "" #: client/lib/components/components.strings.js:15 -#: client/src/shared/form-generator.js:1009 -#: client/src/shared/form-generator.js:839 -#: client/src/shared/form-generator.js:934 +#: client/src/shared/form-generator.js:1016 +#: client/src/shared/form-generator.js:846 +#: client/src/shared/form-generator.js:941 msgid "Please enter a value." msgstr "" -#: client/src/job-submission/job-submission.partial.html:282 -#: client/src/job-submission/job-submission.partial.html:287 -#: client/src/job-submission/job-submission.partial.html:298 -#: client/src/job-submission/job-submission.partial.html:304 -#: client/src/job-submission/job-submission.partial.html:310 +#: client/src/job-submission/job-submission.partial.html:289 +#: client/src/job-submission/job-submission.partial.html:294 +#: client/src/job-submission/job-submission.partial.html:305 +#: client/src/job-submission/job-submission.partial.html:311 +#: client/src/job-submission/job-submission.partial.html:317 msgid "Please enter an answer between" msgstr "" -#: client/src/job-submission/job-submission.partial.html:309 +#: client/src/job-submission/job-submission.partial.html:316 msgid "Please enter an answer that is a decimal number." msgstr "" -#: client/src/job-submission/job-submission.partial.html:303 +#: client/src/job-submission/job-submission.partial.html:310 msgid "Please enter an answer that is a valid integer." msgstr "" -#: client/src/job-submission/job-submission.partial.html:281 -#: client/src/job-submission/job-submission.partial.html:286 -#: client/src/job-submission/job-submission.partial.html:297 -#: client/src/job-submission/job-submission.partial.html:302 -#: client/src/job-submission/job-submission.partial.html:308 +#: client/src/job-submission/job-submission.partial.html:288 +#: client/src/job-submission/job-submission.partial.html:293 +#: client/src/job-submission/job-submission.partial.html:304 +#: client/src/job-submission/job-submission.partial.html:309 +#: client/src/job-submission/job-submission.partial.html:315 msgid "Please enter an answer." msgstr "" @@ -3229,7 +3261,7 @@ msgstr "" msgid "Please save and run a job to view." msgstr "" -#: client/src/templates/job_templates/add-job-template/job-template-add.controller.js:49 +#: client/src/templates/job_templates/add-job-template/job-template-add.controller.js:50 msgid "Please save before adding a survey to this job template." msgstr "" @@ -3246,36 +3278,36 @@ msgstr "" msgid "Please save before adding users." msgstr "" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:121 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:124 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:118 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:119 #: client/src/projects/projects.form.js:225 #: client/src/teams/teams.form.js:113 -#: client/src/templates/job_templates/job-template.form.js:384 +#: client/src/templates/job_templates/job-template.form.js:379 #: client/src/templates/workflows.form.js:107 msgid "Please save before assigning permissions." msgstr "" -#: client/src/users/users.form.js:120 -#: client/src/users/users.form.js:179 +#: client/src/users/users.form.js:124 +#: client/src/users/users.form.js:183 msgid "Please save before assigning to organizations." msgstr "" -#: client/src/users/users.form.js:148 +#: client/src/users/users.form.js:152 msgid "Please save before assigning to teams." msgstr "" -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:169 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:164 msgid "Please save before creating groups." msgstr "" -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:178 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:173 msgid "Please save before creating hosts." msgstr "" #: client/src/inventories-hosts/hosts/host.form.js:112 #: client/src/inventories-hosts/inventories/related/groups/groups.form.js:86 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:111 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:111 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:112 msgid "Please save before defining groups." msgstr "" @@ -3283,7 +3315,7 @@ msgstr "" msgid "Please save before defining hosts." msgstr "" -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:187 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:182 msgid "Please save before defining inventory sources." msgstr "" @@ -3292,17 +3324,17 @@ msgid "Please save before defining the workflow graph." msgstr "" #: client/src/inventories-hosts/hosts/host.form.js:121 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:119 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:120 msgid "Please save before viewing Insights." msgstr "" #: client/src/inventories-hosts/hosts/host.form.js:105 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:104 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:104 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:105 msgid "Please save before viewing facts." msgstr "" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:167 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:164 msgid "Please save before viewing hosts." msgstr "" @@ -3322,18 +3354,18 @@ msgstr "" msgid "Please select a machine (SSH) credential or check the \"Prompt on launch\" option." msgstr "" -#: client/src/shared/form-generator.js:1186 +#: client/src/shared/form-generator.js:1193 msgid "Please select a number between" msgstr "" -#: client/src/shared/form-generator.js:1182 +#: client/src/shared/form-generator.js:1189 msgid "Please select a number." msgstr "" -#: client/src/shared/form-generator.js:1074 -#: client/src/shared/form-generator.js:1142 -#: client/src/shared/form-generator.js:1263 -#: client/src/shared/form-generator.js:1371 +#: client/src/shared/form-generator.js:1081 +#: client/src/shared/form-generator.js:1149 +#: client/src/shared/form-generator.js:1270 +#: client/src/shared/form-generator.js:1378 msgid "Please select a value." msgstr "" @@ -3345,7 +3377,11 @@ msgstr "" msgid "Please select an Inventory." msgstr "" -#: client/src/shared/form-generator.js:1179 +#: client/src/inventories-hosts/inventory-hosts.strings.js:26 +msgid "Please select an organization before editing the host filter." +msgstr "" + +#: client/src/shared/form-generator.js:1186 msgid "Please select at least one value." msgstr "" @@ -3353,7 +3389,7 @@ msgstr "" msgid "Please select resources from the lists below." msgstr "" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:68 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65 msgid "Populate the hosts for this inventory by using a search filter." msgstr "" @@ -3368,7 +3404,7 @@ msgid "Private Key" msgstr "" #: client/src/credentials/credentials.form.js:264 -#: client/src/job-submission/job-submission.partial.html:116 +#: client/src/job-submission/job-submission.partial.html:118 msgid "Private Key Passphrase" msgstr "" @@ -3378,7 +3414,7 @@ msgid "Privilege Escalation" msgstr "" #: client/src/credentials/credentials.form.js:305 -#: client/src/job-submission/job-submission.partial.html:129 +#: client/src/job-submission/job-submission.partial.html:132 msgid "Privilege Escalation Password" msgstr "" @@ -3389,14 +3425,14 @@ msgstr "" #: client/src/credentials/factories/become-method-change.factory.js:30 #: client/src/credentials/factories/kind-change.factory.js:87 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:93 -#: client/src/job-results/job-results.partial.html:213 -#: client/src/templates/job_templates/job-template.form.js:103 +#: client/src/job-results/job-results.partial.html:216 +#: client/src/templates/job_templates/job-template.form.js:100 #: client/src/templates/job_templates/job-template.form.js:91 msgid "Project" msgstr "" -#: client/src/credentials/factories/become-method-change.factory.js:59 -#: client/src/credentials/factories/kind-change.factory.js:116 +#: client/src/credentials/factories/become-method-change.factory.js:53 +#: client/src/credentials/factories/kind-change.factory.js:110 msgid "Project (Tenant Name)" msgstr "" @@ -3421,8 +3457,8 @@ msgstr "" msgid "Project lookup failed. GET returned:" msgstr "" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:121 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:48 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:115 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:47 #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:31 #: client/src/home/dashboard/counts/dashboard-counts.directive.js:61 #: client/src/organizations/linkout/organizations-linkout.route.js:206 @@ -3462,13 +3498,13 @@ msgid "Prompt" msgstr "" #: client/lib/components/components.strings.js:30 -#: client/src/templates/job_templates/job-template.form.js:144 -#: client/src/templates/job_templates/job-template.form.js:174 -#: client/src/templates/job_templates/job-template.form.js:191 -#: client/src/templates/job_templates/job-template.form.js:217 -#: client/src/templates/job_templates/job-template.form.js:234 -#: client/src/templates/job_templates/job-template.form.js:259 -#: client/src/templates/job_templates/job-template.form.js:359 +#: client/src/templates/job_templates/job-template.form.js:139 +#: client/src/templates/job_templates/job-template.form.js:169 +#: client/src/templates/job_templates/job-template.form.js:186 +#: client/src/templates/job_templates/job-template.form.js:212 +#: client/src/templates/job_templates/job-template.form.js:229 +#: client/src/templates/job_templates/job-template.form.js:254 +#: client/src/templates/job_templates/job-template.form.js:354 #: client/src/templates/job_templates/job-template.form.js:60 #: client/src/templates/job_templates/job-template.form.js:86 msgid "Prompt on launch" @@ -3495,7 +3531,7 @@ msgstr "" msgid "Provide a host name, ip address, or ip address:port. Examples include:" msgstr "" -#: client/src/templates/job_templates/job-template.form.js:168 +#: client/src/templates/job_templates/job-template.form.js:163 msgid "Provide a host pattern to further constrain the list of hosts that will be managed or affected by the playbook. Multiple patterns are allowed. Refer to Ansible documentation for more information and examples on patterns." msgstr "" @@ -3507,8 +3543,13 @@ msgstr "" msgid "Provide environment variables to pass to the custom inventory script." msgstr "" -#: client/src/templates/job_templates/job-template.form.js:316 -#: client/src/templates/job_templates/job-template.form.js:324 +#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:203 +#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:287 +msgid "Provide the named URL encoded name or id of the remote Tower inventory to be imported." +msgstr "" + +#: client/src/templates/job_templates/job-template.form.js:311 +#: client/src/templates/job_templates/job-template.form.js:319 msgid "Provisioning Callback URL" msgstr "" @@ -3607,7 +3648,7 @@ msgstr "" msgid "Random" msgstr "" -#: client/src/job-results/job-results.partial.html:408 +#: client/src/job-results/job-results.partial.html:411 msgid "Read only view of extra variables added to the job template." msgstr "" @@ -3619,8 +3660,8 @@ msgstr "" msgid "Recent Notifications" msgstr "" -#: client/src/notifications/notificationTemplates.form.js:101 -#: client/src/notifications/notificationTemplates.form.js:97 +#: client/src/notifications/notificationTemplates.form.js:94 +#: client/src/notifications/notificationTemplates.form.js:98 msgid "Recipient List" msgstr "" @@ -3629,7 +3670,7 @@ msgstr "" msgid "Red" msgstr "" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:68 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65 msgid "Refer to the Ansible Tower documentation for further syntax and examples." msgstr "" @@ -3669,14 +3710,14 @@ msgstr "" msgid "Relaunch using the same parameters" msgstr "" -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:199 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:194 msgid "Remediate Inventory" msgstr "" #: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:96 #: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:97 #: client/src/teams/teams.form.js:142 -#: client/src/users/users.form.js:218 +#: client/src/users/users.form.js:222 msgid "Remove" msgstr "" @@ -3692,7 +3733,7 @@ msgstr "" msgid "Request License" msgstr "" -#: client/src/templates/survey-maker/shared/question-definition.form.js:288 +#: client/src/templates/survey-maker/shared/question-definition.form.js:291 msgid "Required" msgstr "" @@ -3700,11 +3741,11 @@ msgstr "" msgid "Reset" msgstr "" -#: client/src/job-results/job-results.partial.html:120 +#: client/src/job-results/job-results.partial.html:123 msgid "Results Traceback" msgstr "" -#: client/src/shared/form-generator.js:684 +#: client/src/shared/form-generator.js:690 msgid "Revert" msgstr "" @@ -3719,41 +3760,41 @@ msgstr "" #: client/src/configuration/auth-form/sub-forms/auth-tacacs.form.js:47 #: client/src/configuration/jobs-form/configuration-jobs.form.js:73 #: client/src/configuration/system-form/sub-forms/system-activity-stream.form.js:26 -#: client/src/configuration/system-form/sub-forms/system-logging.form.js:73 +#: client/src/configuration/system-form/sub-forms/system-logging.form.js:74 #: client/src/configuration/system-form/sub-forms/system-misc.form.js:50 #: client/src/configuration/ui-form/configuration-ui.form.js:36 msgid "Revert all to default" msgstr "" -#: client/src/job-results/job-results.partial.html:236 +#: client/src/job-results/job-results.partial.html:239 #: client/src/projects/projects.list.js:50 msgid "Revision" msgstr "" #: client/src/projects/add/projects-add.controller.js:146 -#: client/src/projects/edit/projects-edit.controller.js:275 +#: client/src/projects/edit/projects-edit.controller.js:281 msgid "Revision #" msgstr "" -#: client/features/credentials/legacy.credentials.js:91 +#: client/features/credentials/legacy.credentials.js:88 #: client/src/credentials/credentials.form.js:461 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:151 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:154 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:148 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:149 #: client/src/organizations/organizations.form.js:97 #: client/src/projects/projects.form.js:255 #: client/src/teams/teams.form.js:135 #: client/src/teams/teams.form.js:98 #: client/src/templates/workflows.form.js:138 -#: client/src/users/users.form.js:201 +#: client/src/users/users.form.js:205 msgid "Role" msgstr "" -#: client/src/instance-groups/instance-group.partial.html:15 -#: client/src/instance-groups/instance-groups.list.js:25 -#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:15 -#: client/src/instance-groups/instances/instances-list.partial.html:21 +#: client/src/instance-groups/instance-group.partial.html:14 +#: client/src/instance-groups/instance-groups.list.js:26 +#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:14 +#: client/src/instance-groups/instances/instances-list.partial.html:18 #: client/src/instance-groups/instances/instances.list.js:24 -#: client/src/instance-groups/list/instance-groups-list.partial.html:32 +#: client/src/instance-groups/list/instance-groups-list.partial.html:29 msgid "Running Jobs" msgstr "" @@ -3769,7 +3810,7 @@ msgstr "" #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html:17 #: client/src/inventories-hosts/shared/associate-groups/associate-groups.partial.html:17 #: client/src/inventories-hosts/shared/associate-hosts/associate-hosts.partial.html:17 -#: client/src/partials/survey-maker-modal.html:86 +#: client/src/partials/survey-maker-modal.html:87 #: client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.partial.html:18 msgid "SAVE" msgstr "" @@ -3797,17 +3838,17 @@ msgid "SCHEDULES" msgstr "" #: client/src/projects/add/projects-add.controller.js:118 -#: client/src/projects/edit/projects-edit.controller.js:248 +#: client/src/projects/edit/projects-edit.controller.js:254 msgid "SCM Branch" msgstr "" #: client/src/projects/add/projects-add.controller.js:137 -#: client/src/projects/edit/projects-edit.controller.js:266 +#: client/src/projects/edit/projects-edit.controller.js:272 msgid "SCM Branch/Tag/Commit" msgstr "" #: client/src/projects/add/projects-add.controller.js:158 -#: client/src/projects/edit/projects-edit.controller.js:287 +#: client/src/projects/edit/projects-edit.controller.js:293 msgid "SCM Branch/Tag/Revision" msgstr "" @@ -3841,7 +3882,7 @@ msgstr "" msgid "SCM Update Options" msgstr "" -#: client/src/projects/edit/projects-edit.controller.js:136 +#: client/src/projects/edit/projects-edit.controller.js:137 #: client/src/projects/list/projects-list.controller.js:84 msgid "SCM update currently running" msgstr "" @@ -3890,7 +3931,7 @@ msgstr "" msgid "SIGN IN WITH" msgstr "" -#: client/src/inventories-hosts/hosts/host.list.js:109 +#: client/src/inventories-hosts/hosts/host.list.js:110 #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:32 msgid "SMART INVENTORY" msgstr "" @@ -3903,8 +3944,8 @@ msgstr "" msgid "SOURCES" msgstr "" -#: client/src/credentials/factories/become-method-change.factory.js:95 -#: client/src/credentials/factories/kind-change.factory.js:152 +#: client/src/credentials/factories/become-method-change.factory.js:89 +#: client/src/credentials/factories/kind-change.factory.js:146 msgid "SSH Key" msgstr "" @@ -3912,7 +3953,7 @@ msgstr "" msgid "SSH key description" msgstr "" -#: client/src/notifications/notificationTemplates.form.js:378 +#: client/src/notifications/notificationTemplates.form.js:375 msgid "SSL Connection" msgstr "" @@ -3939,7 +3980,7 @@ msgstr "" msgid "STS Token" msgstr "" -#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:60 +#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:61 msgid "SUCCESSFUL" msgstr "" @@ -3955,26 +3996,26 @@ msgstr "" msgid "SYSTEM TRACKING" msgstr "" -#: client/src/credentials/factories/become-method-change.factory.js:76 -#: client/src/credentials/factories/kind-change.factory.js:133 +#: client/src/credentials/factories/become-method-change.factory.js:70 +#: client/src/credentials/factories/kind-change.factory.js:127 msgid "Satellite 6 URL" msgstr "" #: client/src/access/add-rbac-resource/rbac-resource.partial.html:110 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:196 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:193 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:157 -#: client/src/shared/form-generator.js:1683 +#: client/src/shared/form-generator.js:1691 msgid "Save" msgstr "" #: client/src/configuration/auth-form/configuration-auth.controller.js:86 -#: client/src/configuration/configuration.controller.js:209 -#: client/src/configuration/configuration.controller.js:268 -#: client/src/configuration/system-form/configuration-system.controller.js:66 +#: client/src/configuration/configuration.controller.js:213 +#: client/src/configuration/configuration.controller.js:272 +#: client/src/configuration/system-form/configuration-system.controller.js:68 msgid "Save changes" msgstr "" -#: client/src/license/license.partial.html:122 +#: client/src/license/license.partial.html:127 msgid "Save successful!" msgstr "" @@ -4021,7 +4062,7 @@ msgstr "" msgid "Security Token Service (STS) is a web service that enables you to request temporary, limited-privilege credentials for AWS Identity and Access Management (IAM) users." msgstr "" -#: client/src/shared/form-generator.js:1687 +#: client/src/shared/form-generator.js:1695 msgid "Select" msgstr "" @@ -4058,7 +4099,7 @@ msgstr "" msgid "Select commands" msgstr "" -#: client/src/templates/job_templates/job-template.form.js:138 +#: client/src/templates/job_templates/job-template.form.js:133 msgid "Select credentials that allow Tower to access the nodes this job will be ran against. You can only select one credential of each type. For machine credentials (SSH), checking \"Prompt on launch\" without selecting credentials will require you to select a machine credential at run time. If you select credentials and check \"Prompt on launch\", the selected credential(s) become the defaults that can be updated at run time." msgstr "" @@ -4066,8 +4107,8 @@ msgstr "" msgid "Select from the list of directories found in the Project Base Path. Together the base path and the playbook directory provide the full path used to locate playbooks." msgstr "" -#: client/src/configuration/auth-form/configuration-auth.controller.js:262 -#: client/src/configuration/auth-form/configuration-auth.controller.js:281 +#: client/src/configuration/auth-form/configuration-auth.controller.js:263 +#: client/src/configuration/auth-form/configuration-auth.controller.js:282 msgid "Select group types" msgstr "" @@ -4075,15 +4116,15 @@ msgstr "" msgid "Select roles" msgstr "" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:77 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:74 msgid "Select the Instance Groups for this Inventory to run on." msgstr "" -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:85 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:80 msgid "Select the Instance Groups for this Inventory to run on. Refer to the Ansible Tower documentation for more detail." msgstr "" -#: client/src/templates/job_templates/job-template.form.js:198 +#: client/src/templates/job_templates/job-template.form.js:193 msgid "Select the Instance Groups for this Job Template to run on." msgstr "" @@ -4104,15 +4145,15 @@ msgstr "" msgid "Select the inventory file to be synced by this source. You can select from the dropdown or enter a file within the input." msgstr "" -#: client/src/templates/job_templates/job-template.form.js:119 +#: client/src/templates/job_templates/job-template.form.js:114 msgid "Select the playbook to be executed by this job." msgstr "" -#: client/src/templates/job_templates/job-template.form.js:102 +#: client/src/templates/job_templates/job-template.form.js:99 msgid "Select the project containing the playbook you want this job to execute." msgstr "" -#: client/src/configuration/system-form/configuration-system.controller.js:191 +#: client/src/configuration/system-form/configuration-system.controller.js:197 msgid "Select types" msgstr "" @@ -4121,7 +4162,7 @@ msgstr "" msgid "Select which groups to create automatically." msgstr "" -#: client/src/notifications/notificationTemplates.form.js:113 +#: client/src/notifications/notificationTemplates.form.js:110 msgid "Sender Email" msgstr "" @@ -4142,19 +4183,19 @@ msgstr "" msgid "Settings" msgstr "" -#: client/src/job-submission/job-submission.partial.html:107 -#: client/src/job-submission/job-submission.partial.html:120 -#: client/src/job-submission/job-submission.partial.html:133 -#: client/src/job-submission/job-submission.partial.html:146 -#: client/src/job-submission/job-submission.partial.html:292 -#: client/src/shared/form-generator.js:869 +#: client/src/job-submission/job-submission.partial.html:108 +#: client/src/job-submission/job-submission.partial.html:122 +#: client/src/job-submission/job-submission.partial.html:136 +#: client/src/job-submission/job-submission.partial.html:150 +#: client/src/job-submission/job-submission.partial.html:299 +#: client/src/shared/form-generator.js:876 msgid "Show" msgstr "" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:114 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:117 -#: client/src/templates/job_templates/job-template.form.js:250 -#: client/src/templates/job_templates/job-template.form.js:253 +#: client/src/templates/job_templates/job-template.form.js:245 +#: client/src/templates/job_templates/job-template.form.js:248 msgid "Show Changes" msgstr "" @@ -4173,10 +4214,10 @@ msgstr "" msgid "Sign in with %s Teams" msgstr "" -#: client/src/job-results/job-results.partial.html:392 -#: client/src/job-submission/job-submission.partial.html:239 -#: client/src/templates/job_templates/job-template.form.js:222 -#: client/src/templates/job_templates/job-template.form.js:229 +#: client/src/job-results/job-results.partial.html:395 +#: client/src/job-submission/job-submission.partial.html:245 +#: client/src/templates/job_templates/job-template.form.js:217 +#: client/src/templates/job_templates/job-template.form.js:224 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:142 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:150 msgid "Skip Tags" @@ -4186,19 +4227,19 @@ msgstr "" msgid "Skip tags are useful when you have a large playbook, and you want to skip specific parts of a play or task." msgstr "" -#: client/src/templates/job_templates/job-template.form.js:228 +#: client/src/templates/job_templates/job-template.form.js:223 msgid "Skip tags are useful when you have a large playbook, and you want to skip specific parts of a play or task. Use commas to separate multiple tags. Refer to Ansible Tower documentation for details on the usage of tags." msgstr "" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:69 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:62 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:66 msgid "Smart Host Filter" msgstr "" #: client/src/inventories-hosts/inventories/inventory.list.js:85 #: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:69 #: client/src/organizations/linkout/controllers/organizations-inventories.controller.js:70 -#: client/src/shared/form-generator.js:1449 +#: client/src/shared/form-generator.js:1456 msgid "Smart Inventory" msgstr "" @@ -4220,8 +4261,8 @@ msgstr "" msgid "Source Details" msgstr "" -#: client/src/notifications/notificationTemplates.form.js:195 -#: client/src/notifications/notificationTemplates.form.js:196 +#: client/src/notifications/notificationTemplates.form.js:192 +#: client/src/notifications/notificationTemplates.form.js:193 msgid "Source Phone Number" msgstr "" @@ -4247,11 +4288,11 @@ msgid "Source Vars" msgstr "" #: client/src/inventories-hosts/inventories/related/sources/sources.list.js:34 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:189 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:184 msgid "Sources" msgstr "" -#: client/src/notifications/notificationTemplates.form.js:333 +#: client/src/notifications/notificationTemplates.form.js:330 msgid "Specify HTTP Headers in JSON format. Refer to the Ansible Tower documentation for example syntax." msgstr "" @@ -4259,7 +4300,7 @@ msgstr "" msgid "Specify a method for %s operations. This is equivalent to specifying the %s parameter, where %s could be %s" msgstr "" -#: client/src/notifications/notificationTemplates.form.js:295 +#: client/src/notifications/notificationTemplates.form.js:292 msgid "Specify a notification color. Acceptable colors are: yellow, green, red purple, gray or random." msgstr "" @@ -4289,7 +4330,7 @@ msgstr "" msgid "Start a job using this template" msgstr "" -#: client/src/projects/edit/projects-edit.controller.js:133 +#: client/src/projects/edit/projects-edit.controller.js:134 #: client/src/projects/list/projects-list.controller.js:74 msgid "Start an SCM update" msgstr "" @@ -4298,7 +4339,7 @@ msgstr "" msgid "Start sync process" msgstr "" -#: client/src/job-results/job-results.partial.html:97 +#: client/src/job-results/job-results.partial.html:100 msgid "Started" msgstr "" @@ -4316,7 +4357,7 @@ msgstr "" msgid "Sub Category" msgstr "" -#: client/src/license/license.partial.html:121 +#: client/src/license/license.partial.html:126 msgid "Submit" msgstr "" @@ -4353,7 +4394,7 @@ msgstr "" msgid "Survey" msgstr "" -#: client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js:57 +#: client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js:60 #: client/src/templates/workflows/edit-workflow/workflow-edit.controller.js:64 msgid "Surveys allow users to be prompted at job launch with a series of questions related to the job. This allows for variables to be defined that affect the playbook run at time of launch." msgstr "" @@ -4432,7 +4473,11 @@ msgstr "" msgid "TEMPLATES" msgstr "" -#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:102 +#: client/src/instance-groups/instance-groups.list.js:8 +msgid "THERE ARE CURRENTLY NO INSTANCE GROUPS DEFINED" +msgstr "" + +#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:104 msgid "TIME" msgstr "" @@ -4449,7 +4494,7 @@ msgstr "" msgid "Tags are useful when you have a large playbook, and you want to run a specific part of a play or task." msgstr "" -#: client/src/templates/job_templates/job-template.form.js:211 +#: client/src/templates/job_templates/job-template.form.js:206 msgid "Tags are useful when you have a large playbook, and you want to run a specific part of a play or task. Use commas to separate multiple tags. Refer to Ansible Tower documentation for details on the usage of tags." msgstr "" @@ -4458,18 +4503,18 @@ msgstr "" msgid "Tags:" msgstr "" -#: client/src/notifications/notificationTemplates.form.js:312 +#: client/src/notifications/notificationTemplates.form.js:309 msgid "Target URL" msgstr "" -#: client/src/job-results/job-results.partial.html:493 +#: client/src/job-results/job-results.partial.html:496 msgid "Tasks" msgstr "" -#: client/features/credentials/legacy.credentials.js:97 +#: client/features/credentials/legacy.credentials.js:94 #: client/src/credentials/credentials.form.js:467 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:157 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:160 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:154 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:155 #: client/src/projects/projects.form.js:261 #: client/src/templates/workflows.form.js:144 msgid "Team Roles" @@ -4480,11 +4525,11 @@ msgstr "" #: client/src/organizations/linkout/organizations-linkout.route.js:108 #: client/src/setup-menu/setup-menu.partial.html:16 #: client/src/shared/stateDefinitions.factory.js:410 -#: client/src/users/users.form.js:155 +#: client/src/users/users.form.js:159 msgid "Teams" msgstr "" -#: client/src/job-results/job-results.partial.html:132 +#: client/src/job-results/job-results.partial.html:135 #: client/src/templates/templates.list.js:14 msgid "Template" msgstr "" @@ -4497,7 +4542,7 @@ msgstr "" msgid "Tenant ID" msgstr "" -#: client/src/configuration/system-form/sub-forms/system-logging.form.js:78 +#: client/src/configuration/system-form/sub-forms/system-logging.form.js:79 msgid "Test" msgstr "" @@ -4505,8 +4550,8 @@ msgstr "" msgid "Test notification" msgstr "" -#: client/src/shared/form-generator.js:1379 -#: client/src/shared/form-generator.js:1385 +#: client/src/shared/form-generator.js:1386 +#: client/src/shared/form-generator.js:1392 msgid "That value was not found. Please enter or select a valid value." msgstr "" @@ -4523,7 +4568,7 @@ msgstr "" msgid "The Project ID is the GCE assigned identification. It is constructed as two words followed by a three digit number. Such as:" msgstr "" -#: client/src/projects/edit/projects-edit.controller.js:326 +#: client/src/projects/edit/projects-edit.controller.js:332 msgid "The SCM update process is running." msgstr "" @@ -4535,12 +4580,12 @@ msgstr "" msgid "The email address assigned to the Google Compute Engine %sservice account." msgstr "" -#: client/src/job-results/job-results.partial.html:510 +#: client/src/job-results/job-results.partial.html:513 msgid "The host count will update when the job is complete." msgstr "" -#: client/src/credentials/factories/become-method-change.factory.js:68 -#: client/src/credentials/factories/kind-change.factory.js:125 +#: client/src/credentials/factories/become-method-change.factory.js:62 +#: client/src/credentials/factories/kind-change.factory.js:119 msgid "The host to authenticate with." msgstr "" @@ -4560,11 +4605,11 @@ msgstr "" msgid "The number of parallel or simultaneous processes to use while executing the playbook. Inputting no value will use the default value from the %sansible configuration file%s." msgstr "" -#: client/src/templates/job_templates/job-template.form.js:157 +#: client/src/templates/job_templates/job-template.form.js:152 msgid "The number of parallel or simultaneous processes to use while executing the playbook. Value defaults to 0. Refer to the Ansible documentation for details about the configuration file." msgstr "" -#: client/src/job-results/job-results.controller.js:590 +#: client/src/job-results/job-results.controller.js:619 msgid "The output is too large to display. Please download." msgstr "" @@ -4580,6 +4625,10 @@ msgstr "" msgid "The standard output is too large to display. Please specify additional filters to narrow the standard out." msgstr "" +#: client/src/templates/survey-maker/shared/question-definition.form.js:52 +msgid "The suggested format for variable names is lowercase and underscore-separated (for example, foo_bar, user_id, host_name, etc.). Variable names with spaces are not allowed." +msgstr "" + #: client/src/management-jobs/scheduler/schedulerForm.partial.html:124 msgid "The time must be in HH24:MM:SS format." msgstr "" @@ -4604,15 +4653,27 @@ msgstr "" msgid "There is no SCM update information available for this project. An update has not yet been completed. If you have not already done so, start an update for this project." msgstr "" -#: client/src/configuration/configuration.controller.js:345 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:140 +msgid "There was an error deleting inventory source groups. Returned status:" +msgstr "" + +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:130 +msgid "There was an error deleting inventory source hosts. Returned status:" +msgstr "" + +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:167 +msgid "There was an error deleting inventory source. Returned status:" +msgstr "" + +#: client/src/configuration/configuration.controller.js:349 msgid "There was an error resetting value. Returned status:" msgstr "" -#: client/src/configuration/configuration.controller.js:525 +#: client/src/configuration/configuration.controller.js:531 msgid "There was an error resetting values. Returned status:" msgstr "" -#: client/src/configuration/system-form/configuration-system.controller.js:227 +#: client/src/configuration/system-form/configuration-system.controller.js:232 msgid "There was an error testing the log aggregator. Returned status:" msgstr "" @@ -4633,8 +4694,8 @@ msgstr "" msgid "This is not a valid number." msgstr "" -#: client/src/credentials/factories/become-method-change.factory.js:65 -#: client/src/credentials/factories/kind-change.factory.js:122 +#: client/src/credentials/factories/become-method-change.factory.js:59 +#: client/src/credentials/factories/kind-change.factory.js:116 msgid "This is the tenant name. This value is usually the same as the username." msgstr "" @@ -4646,20 +4707,20 @@ msgstr "" msgid "This machine has not checked in with Insights in {{last_check_in}} hours" msgstr "" -#: client/src/shared/form-generator.js:740 +#: client/src/shared/form-generator.js:746 msgid "This setting has been set manually in a settings file and is now disabled." msgstr "" -#: client/src/users/users.form.js:160 +#: client/src/users/users.form.js:164 msgid "This user is not a member of any teams" msgstr "" -#: client/src/shared/form-generator.js:849 -#: client/src/shared/form-generator.js:944 +#: client/src/shared/form-generator.js:856 +#: client/src/shared/form-generator.js:951 msgid "This value does not match the password you entered previously. Please confirm that password." msgstr "" -#: client/src/configuration/configuration.controller.js:550 +#: client/src/configuration/configuration.controller.js:556 msgid "This will reset all configuration values to their factory defaults. Are you sure you want to proceed?" msgstr "" @@ -4685,7 +4746,7 @@ msgstr "" msgid "To learn more about the IAM STS Token, refer to the %sAmazon documentation%s." msgstr "" -#: client/src/shared/form-generator.js:874 +#: client/src/shared/form-generator.js:881 msgid "Toggle the display of plaintext." msgstr "" @@ -4714,7 +4775,7 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:52 #: client/src/inventories-hosts/inventories/related/sources/sources.list.js:41 #: client/src/jobs/all-jobs.list.js:59 -#: client/src/notifications/notificationTemplates.form.js:57 +#: client/src/notifications/notificationTemplates.form.js:54 #: client/src/notifications/notificationTemplates.list.js:39 #: client/src/notifications/notifications.list.js:31 #: client/src/projects/projects.list.js:44 @@ -4723,7 +4784,7 @@ msgstr "" #: client/src/templates/completed-jobs.list.js:53 #: client/src/templates/templates.list.js:31 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:27 -#: client/src/users/users.form.js:196 +#: client/src/users/users.form.js:200 msgid "Type" msgstr "" @@ -4734,7 +4795,7 @@ msgid "Type Details" msgstr "" #: client/src/projects/add/projects-add.controller.js:169 -#: client/src/projects/edit/projects-edit.controller.js:298 +#: client/src/projects/edit/projects-edit.controller.js:304 msgid "URL popover text" msgstr "" @@ -4755,6 +4816,10 @@ msgstr "" msgid "Unable to Submit" msgstr "" +#: client/lib/components/components.strings.js:52 +msgid "Unavailable to run jobs." +msgstr "" + #: client/lib/components/components.strings.js:22 msgid "Unexpected Error" msgstr "" @@ -4771,7 +4836,7 @@ msgstr "" msgid "Unsupported input type" msgstr "" -#: client/src/projects/list/projects-list.controller.js:267 +#: client/src/projects/list/projects-list.controller.js:266 msgid "Update Not Found" msgstr "" @@ -4779,7 +4844,7 @@ msgstr "" msgid "Update Options" msgstr "" -#: client/src/projects/edit/projects-edit.controller.js:326 +#: client/src/projects/edit/projects-edit.controller.js:332 msgid "Update in Progress" msgstr "" @@ -4801,27 +4866,34 @@ msgstr "" msgid "Upgrade" msgstr "" +#: client/src/templates/job_templates/job-template.form.js:299 #: client/src/templates/job_templates/job-template.form.js:304 -#: client/src/templates/job_templates/job-template.form.js:309 msgid "Use Fact Cache" msgstr "" -#: client/src/notifications/notificationTemplates.form.js:398 +#: client/src/notifications/notificationTemplates.form.js:395 msgid "Use SSL" msgstr "" -#: client/src/notifications/notificationTemplates.form.js:393 +#: client/src/notifications/notificationTemplates.form.js:390 msgid "Use TLS" msgstr "" +#: client/src/instance-groups/instance-group.partial.html:10 +#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:10 +#: client/src/instance-groups/instances/instances-list.partial.html:21 +#: client/src/instance-groups/list/instance-groups-list.partial.html:32 +msgid "Used Capacity" +msgstr "" + #: client/src/credentials/credentials.form.js:76 msgid "Used to check out and synchronize playbook repositories with a remote source control management system such as Git, Subversion (svn), or Mercurial (hg). These credentials are used by Projects." msgstr "" -#: client/features/credentials/legacy.credentials.js:86 +#: client/features/credentials/legacy.credentials.js:83 #: client/src/credentials/credentials.form.js:456 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:146 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:149 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:143 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:144 #: client/src/organizations/organizations.form.js:92 #: client/src/projects/projects.form.js:250 #: client/src/teams/teams.form.js:93 @@ -4833,18 +4905,18 @@ msgstr "" msgid "User Interface" msgstr "" -#: client/src/users/users.form.js:91 +#: client/src/users/users.form.js:95 msgid "User Type" msgstr "" #: client/src/access/rbac-multiselect/permissionsUsers.list.js:30 #: client/src/credentials/factories/become-method-change.factory.js:17 -#: client/src/credentials/factories/become-method-change.factory.js:44 -#: client/src/credentials/factories/kind-change.factory.js:101 +#: client/src/credentials/factories/become-method-change.factory.js:38 #: client/src/credentials/factories/kind-change.factory.js:17 #: client/src/credentials/factories/kind-change.factory.js:41 #: client/src/credentials/factories/kind-change.factory.js:74 -#: client/src/notifications/notificationTemplates.form.js:67 +#: client/src/credentials/factories/kind-change.factory.js:95 +#: client/src/notifications/notificationTemplates.form.js:64 #: client/src/users/users.form.js:58 #: client/src/users/users.list.js:29 msgid "Username" @@ -4893,22 +4965,22 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.form.js:47 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:67 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:67 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:84 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:93 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:99 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:81 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:88 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:94 msgid "Variables" msgstr "" -#: client/src/job-submission/job-submission.partial.html:357 +#: client/src/job-submission/job-submission.partial.html:364 msgid "Vault" msgstr "" -#: client/src/job-results/job-results.partial.html:318 +#: client/src/job-results/job-results.partial.html:321 msgid "Vault Credential" msgstr "" #: client/src/credentials/credentials.form.js:391 -#: client/src/job-submission/job-submission.partial.html:142 +#: client/src/job-submission/job-submission.partial.html:146 msgid "Vault Password" msgstr "" @@ -4916,11 +4988,11 @@ msgstr "" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:90 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:307 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:314 -#: client/src/job-results/job-results.partial.html:355 -#: client/src/job-submission/job-submission.partial.html:178 +#: client/src/job-results/job-results.partial.html:358 +#: client/src/job-submission/job-submission.partial.html:183 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:99 -#: client/src/templates/job_templates/job-template.form.js:179 -#: client/src/templates/job_templates/job-template.form.js:186 +#: client/src/templates/job_templates/job-template.form.js:174 +#: client/src/templates/job_templates/job-template.form.js:181 msgid "Verbosity" msgstr "" @@ -4932,7 +5004,7 @@ msgstr "" #: client/src/credential-types/credential-types.list.js:64 #: client/src/credentials/credentials.list.js:75 #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:58 -#: client/src/inventories-hosts/inventories/inventory.list.js:105 +#: client/src/inventories-hosts/inventories/inventory.list.js:104 #: client/src/inventory-scripts/inventory-scripts.list.js:62 #: client/src/notifications/notificationTemplates.list.js:82 #: client/src/scheduler/schedules.list.js:83 @@ -4963,7 +5035,7 @@ msgstr "" #: client/src/inventories-hosts/hosts/host.form.js:78 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:77 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:77 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:94 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:91 msgid "View JSON examples at %s" msgstr "" @@ -4975,8 +5047,8 @@ msgstr "" msgid "View More" msgstr "" -#: client/src/shared/form-generator.js:1711 -#: client/src/templates/job_templates/job-template.form.js:441 +#: client/src/shared/form-generator.js:1719 +#: client/src/templates/job_templates/job-template.form.js:436 #: client/src/templates/workflows.form.js:161 msgid "View Survey" msgstr "" @@ -4990,7 +5062,7 @@ msgstr "" #: client/src/inventories-hosts/hosts/host.form.js:79 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:78 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:78 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:95 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:92 msgid "View YAML examples at %s" msgstr "" @@ -5030,7 +5102,7 @@ msgstr "" msgid "View information about this version of Ansible {{BRAND_NAME}}." msgstr "" -#: client/src/inventories-hosts/inventories/inventory.list.js:107 +#: client/src/inventories-hosts/inventories/inventory.list.js:106 msgid "View inventory" msgstr "" @@ -5046,7 +5118,7 @@ msgstr "" msgid "View notification" msgstr "" -#: client/src/job-results/job-results.partial.html:219 +#: client/src/job-results/job-results.partial.html:222 msgid "View project sync results" msgstr "" @@ -5089,7 +5161,7 @@ msgstr "" #: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:42 #: client/src/instance-groups/jobs/jobs.list.js:41 -#: client/src/job-results/job-results.partial.html:142 +#: client/src/job-results/job-results.partial.html:145 #: client/src/jobs/all-jobs.list.js:49 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:25 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:25 @@ -5101,9 +5173,9 @@ msgid "WORKFLOW" msgstr "" #: client/src/configuration/auth-form/configuration-auth.controller.js:73 -#: client/src/configuration/configuration.controller.js:196 -#: client/src/configuration/configuration.controller.js:258 -#: client/src/configuration/system-form/configuration-system.controller.js:53 +#: client/src/configuration/configuration.controller.js:200 +#: client/src/configuration/configuration.controller.js:262 +#: client/src/configuration/system-form/configuration-system.controller.js:55 msgid "Warning: Unsaved Changes" msgstr "" @@ -5127,7 +5199,7 @@ msgstr "" msgid "When this template is submitted as a job, setting the type to %s will execute the playbook, running tasks on the selected hosts." msgstr "" -#: client/src/shared/form-generator.js:1715 +#: client/src/shared/form-generator.js:1723 #: client/src/templates/workflows.form.js:187 msgid "Workflow Editor" msgstr "" @@ -5136,12 +5208,12 @@ msgstr "" msgid "Workflow Template" msgstr "" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:115 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:109 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:41 msgid "Workflow Templates" msgstr "" -#: client/src/job-submission/job-submission.partial.html:167 +#: client/src/job-submission/job-submission.partial.html:171 msgid "YAML" msgstr "" @@ -5160,7 +5232,7 @@ msgstr "" msgid "You can create a job template here." msgstr "" -#: client/src/projects/edit/projects-edit.controller.js:61 +#: client/src/projects/edit/projects-edit.controller.js:62 msgid "You do not have access to view this property" msgstr "" @@ -5168,14 +5240,18 @@ msgstr "" msgid "You do not have permission to add a project." msgstr "" -#: client/src/users/add/users-add.controller.js:42 +#: client/src/users/add/users-add.controller.js:43 msgid "You do not have permission to add a user." msgstr "" +#: client/src/inventories-hosts/inventory-hosts.strings.js:28 +msgid "You do not have sufficient permissions to edit the host filter." +msgstr "" + #: client/src/configuration/auth-form/configuration-auth.controller.js:72 -#: client/src/configuration/configuration.controller.js:195 -#: client/src/configuration/configuration.controller.js:257 -#: client/src/configuration/system-form/configuration-system.controller.js:52 +#: client/src/configuration/configuration.controller.js:199 +#: client/src/configuration/configuration.controller.js:261 +#: client/src/configuration/system-form/configuration-system.controller.js:54 msgid "You have unsaved changes. Would you like to proceed without saving?" msgstr "" @@ -5188,14 +5264,14 @@ msgid "Your session timed out due to inactivity. Please sign in." msgstr "" #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:24 -#: client/src/job-submission/job-submission.partial.html:310 -#: client/src/shared/form-generator.js:1186 +#: client/src/job-submission/job-submission.partial.html:317 +#: client/src/shared/form-generator.js:1193 msgid "and" msgstr "" -#: client/src/job-submission/job-submission.partial.html:282 -#: client/src/job-submission/job-submission.partial.html:287 -#: client/src/job-submission/job-submission.partial.html:298 +#: client/src/job-submission/job-submission.partial.html:289 +#: client/src/job-submission/job-submission.partial.html:294 +#: client/src/job-submission/job-submission.partial.html:305 msgid "characters long." msgstr "" @@ -5259,7 +5335,7 @@ msgstr "" msgid "organization" msgstr "" -#: client/src/shared/form-generator.js:1062 +#: client/src/shared/form-generator.js:1069 msgid "playbook" msgstr "" @@ -5277,9 +5353,9 @@ msgstr "" msgid "test" msgstr "" -#: client/src/job-submission/job-submission.partial.html:282 -#: client/src/job-submission/job-submission.partial.html:287 -#: client/src/job-submission/job-submission.partial.html:298 +#: client/src/job-submission/job-submission.partial.html:289 +#: client/src/job-submission/job-submission.partial.html:294 +#: client/src/job-submission/job-submission.partial.html:305 msgid "to" msgstr "" From 8c6a1e348d30efc34ccec6e2a2fd65a4f7083565 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Fri, 1 Dec 2017 10:48:11 -0500 Subject: [PATCH 123/141] upgrade survey encryption migration to work around an old survey bug see: https://github.com/ansible/ansible-tower/issues/7800 --- awx/main/migrations/_reencrypt.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/awx/main/migrations/_reencrypt.py b/awx/main/migrations/_reencrypt.py index 7d5b0984ce..80a4eaff5c 100644 --- a/awx/main/migrations/_reencrypt.py +++ b/awx/main/migrations/_reencrypt.py @@ -92,7 +92,18 @@ def _encrypt_survey_passwords(Job, JobTemplate, WorkflowJob, WorkflowJobTemplate if jt.survey_spec.get('spec', []): for field in jt.survey_spec['spec']: if field.get('type') == 'password' and field.get('default', ''): - if field['default'].startswith('$encrypted$'): + default = field['default'] + if default.startswith('$encrypted$'): + if default == '$encrypted$': + # If you have a survey_spec with a literal + # '$encrypted$' as the default, you have + # encountered a known bug in awx/Tower + # https://github.com/ansible/ansible-tower/issues/7800 + logger.error( + '{}.pk={} survey_spec has ambiguous $encrypted$ default for {}, needs attention...'.format(jt, jt.pk, field['variable']) + ) + field['default'] = '' + changed = True continue field['default'] = encrypt_value(field['default'], pk=None) changed = True From 67867cf0c867e1c66a9a0aeda8c25c679a1f3eb8 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Mon, 23 Oct 2017 13:57:12 -0400 Subject: [PATCH 124/141] flake8: comply with new E722 rule --- awx/api/serializers.py | 2 +- awx/api/views.py | 4 ++-- awx/conf/fields.py | 2 +- awx/conf/registry.py | 4 ++-- awx/conf/settings.py | 2 +- awx/lib/sitecustomize.py | 2 +- awx/main/conf.py | 2 +- awx/main/expect/run.py | 2 +- awx/main/management/commands/inventory_import.py | 2 +- awx/main/models/schedules.py | 2 +- awx/main/models/unified_jobs.py | 4 ++-- awx/main/tasks.py | 14 +++++++------- awx/main/tests/functional/conftest.py | 4 ++-- awx/main/utils/common.py | 6 +++--- awx/main/utils/handlers.py | 2 +- awx/plugins/fact_caching/awx.py | 2 +- tools/rdb.py | 4 ++-- 17 files changed, 30 insertions(+), 30 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 640c6ad0c6..7246cb1745 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -3816,7 +3816,7 @@ class ActivityStreamSerializer(BaseSerializer): def get_object_association(self, obj): try: return obj.object_relationship_type.split(".")[-1].split("_")[1] - except: + except Exception: pass return "" diff --git a/awx/api/views.py b/awx/api/views.py index 2c43be9f92..bb65c904a9 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -362,7 +362,7 @@ class ApiV1ConfigView(APIView): try: settings.LICENSE = {} return Response(status=status.HTTP_204_NO_CONTENT) - except: + except Exception: # FIX: Log return Response({"error": _("Failed to remove license (%s)") % has_error}, status=status.HTTP_400_BAD_REQUEST) @@ -3275,7 +3275,7 @@ class WorkflowJobTemplateNodeDetail(WorkflowsEnforcementMixin, RetrieveUpdateDes try: obj = self.get_object() data.update(obj.char_prompts) - except: + except Exception: pass return super(WorkflowJobTemplateNodeDetail, self).update_raw_data(data) diff --git a/awx/conf/fields.py b/awx/conf/fields.py index 58f81b3d18..dab8d16e37 100644 --- a/awx/conf/fields.py +++ b/awx/conf/fields.py @@ -84,7 +84,7 @@ class URLField(CharField): else: netloc = '{}@{}' % (url_parts.username, netloc) value = urlparse.urlunsplit([url_parts.scheme, netloc, url_parts.path, url_parts.query, url_parts.fragment]) - except: + except Exception: raise # If something fails here, just fall through and let the validators check it. super(URLField, self).run_validators(value) diff --git a/awx/conf/registry.py b/awx/conf/registry.py index 4e07f0d7da..23c45b078c 100644 --- a/awx/conf/registry.py +++ b/awx/conf/registry.py @@ -162,14 +162,14 @@ class SettingsRegistry(object): if category_slug == 'user' and for_user: try: field_instance.default = original_field_instance.to_representation(getattr(self.settings, setting)) - except: + except Exception: logger.warning('Unable to retrieve default value for user setting "%s".', setting, exc_info=True) elif not field_instance.read_only or field_instance.default is empty or field_instance.defined_in_file: try: field_instance.default = original_field_instance.to_representation(self.settings._awx_conf_settings._get_default(setting)) except AttributeError: pass - except: + except Exception: logger.warning('Unable to retrieve default value for setting "%s".', setting, exc_info=True) # `PENDO_TRACKING_STATE` is disabled for the open source awx license diff --git a/awx/conf/settings.py b/awx/conf/settings.py index a4e589f53e..47bf18d6d3 100644 --- a/awx/conf/settings.py +++ b/awx/conf/settings.py @@ -366,7 +366,7 @@ class SettingsWrapper(UserSettingsHolder): return internal_value else: return field.run_validation(value) - except: + except Exception: logger.warning( 'The current value "%r" for setting "%s" is invalid.', value, name, exc_info=True) diff --git a/awx/lib/sitecustomize.py b/awx/lib/sitecustomize.py index 3df0dc9aef..b0ff51b48d 100644 --- a/awx/lib/sitecustomize.py +++ b/awx/lib/sitecustomize.py @@ -16,7 +16,7 @@ class argv_placeholder(object): def __del__(self): try: argv_ready(sys.argv) - except: + except Exception: pass diff --git a/awx/main/conf.py b/awx/main/conf.py index 7b8e5f92db..63714ab4bb 100644 --- a/awx/main/conf.py +++ b/awx/main/conf.py @@ -105,7 +105,7 @@ def _load_default_license_from_file(): license_data = json.load(open(license_file)) logger.debug('Read license data from "%s".', license_file) return license_data - except: + except Exception: logger.warning('Could not read license from "%s".', license_file, exc_info=True) return {} diff --git a/awx/main/expect/run.py b/awx/main/expect/run.py index aed89f5f84..339840e890 100755 --- a/awx/main/expect/run.py +++ b/awx/main/expect/run.py @@ -122,7 +122,7 @@ def run_pexpect(args, cwd, env, logfile, if cancelled_callback: try: canceled = cancelled_callback() - except: + except Exception: logger.exception('Could not check cancel callback - canceling immediately') if isinstance(extra_update_fields, dict): extra_update_fields['job_explanation'] = "System error during job execution, check system logs" diff --git a/awx/main/management/commands/inventory_import.py b/awx/main/management/commands/inventory_import.py index 811dd03991..a773a1c8f0 100644 --- a/awx/main/management/commands/inventory_import.py +++ b/awx/main/management/commands/inventory_import.py @@ -168,7 +168,7 @@ class AnsibleInventoryLoader(object): data = json.loads(stdout) if not isinstance(data, dict): raise TypeError('Returned JSON must be a dictionary, got %s instead' % str(type(data))) - except: + except Exception: logger.error('Failed to load JSON from: %s', stdout) raise return data diff --git a/awx/main/models/schedules.py b/awx/main/models/schedules.py index b4822a57ec..65611a4c68 100644 --- a/awx/main/models/schedules.py +++ b/awx/main/models/schedules.py @@ -105,7 +105,7 @@ class Schedule(CommonModel): if not isinstance(extra_data, dict): try: extra_data = json.loads(self.extra_data) - except: + except Exception: raise ValidationError(_("Expected JSON")) if extra_data and 'days' in extra_data: diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py index 83ac0ac29a..d2930798ad 100644 --- a/awx/main/models/unified_jobs.py +++ b/awx/main/models/unified_jobs.py @@ -820,7 +820,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique def result_stdout_size(self): try: return os.stat(self.result_stdout_file).st_size - except: + except Exception: return len(self.result_stdout) def _result_stdout_raw_limited(self, start_line=0, end_line=None, redact_sensitive=True, escape_ascii=False): @@ -1082,7 +1082,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique update_fields.append('job_explanation') instance.save(update_fields=update_fields) self.websocket_emit_status("canceled") - except: # FIXME: Log this exception! + except Exception: # FIXME: Log this exception! if settings.DEBUG: raise diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 2fafd693d1..42d00e14d8 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -24,7 +24,7 @@ import yaml import fcntl try: import psutil -except: +except Exception: psutil = None # Celery @@ -101,7 +101,7 @@ def celery_startup(conf=None, **kwargs): from awx.main.signals import disable_activity_stream with disable_activity_stream(): sch.save() - except: + except Exception: logger.exception("Failed to rebuild schedule {}.".format(sch)) @@ -110,7 +110,7 @@ def task_set_logger_pre_run(*args, **kwargs): try: cache.close() configure_external_logger(settings, is_startup=False) - except: + except Exception: # General exception because LogErrorsTask not used with celery signals logger.exception('Encountered error on initial log configuration.') @@ -123,7 +123,7 @@ def inform_cluster_of_shutdown(*args, **kwargs): this_inst.save(update_fields=['capacity', 'modified']) logger.warning('Normal shutdown signal for instance {}, ' 'removed self from capacity pool.'.format(this_inst.hostname)) - except: + except Exception: # General exception because LogErrorsTask not used with celery signals logger.exception('Encountered problem with normal shutdown signal.') @@ -318,7 +318,7 @@ def _send_notification_templates(instance, status_str): raise ValueError(_("status_str must be either succeeded or failed")) try: notification_templates = instance.get_notification_templates() - except: + except Exception: logger.warn("No notification template defined for emitting notification") notification_templates = None if notification_templates: @@ -449,7 +449,7 @@ def delete_inventory(self, inventory_id, user_id): else: try: user = User.objects.get(id=user_id) - except: + except Exception: user = None with ignore_inventory_computed_fields(), ignore_inventory_group_removal(), impersonate(user): try: @@ -917,7 +917,7 @@ class BaseTask(LogErrorsTask): **extra_update_fields) try: self.final_run_hook(instance, status, **kwargs) - except: + except Exception: logger.exception('%s Final run hook errored.', instance.log_format) instance.websocket_emit_status(status) if status != 'successful' and not hasattr(settings, 'CELERY_UNIT_TEST'): diff --git a/awx/main/tests/functional/conftest.py b/awx/main/tests/functional/conftest.py index 2a4fea237f..ae92592b3a 100644 --- a/awx/main/tests/functional/conftest.py +++ b/awx/main/tests/functional/conftest.py @@ -437,7 +437,7 @@ def group_factory(inventory): def g(name): try: return Group.objects.get(name=name, inventory=inventory) - except: + except Exception: return Group.objects.create(inventory=inventory, name=name) return g @@ -478,7 +478,7 @@ def inventory_source_factory(inventory_factory): source = 'file' try: return inventory.inventory_sources.get(name=name) - except: + except Exception: return inventory.inventory_sources.create(name=name, source=source) return invsrc diff --git a/awx/main/utils/common.py b/awx/main/utils/common.py index f183890a7f..532a4df78f 100644 --- a/awx/main/utils/common.py +++ b/awx/main/utils/common.py @@ -159,7 +159,7 @@ def get_ansible_version(): stdout=subprocess.PIPE) result = proc.communicate()[0] return result.split('\n')[0].replace('ansible', '').strip() - except: + except Exception: return 'unknown' @@ -173,7 +173,7 @@ def get_ssh_version(): stderr=subprocess.PIPE) result = proc.communicate()[1] return result.split(" ")[0].split("_")[1] - except: + except Exception: return 'unknown' @@ -185,7 +185,7 @@ def get_awx_version(): try: import pkg_resources return pkg_resources.require('awx')[0].version - except: + except Exception: return __version__ diff --git a/awx/main/utils/handlers.py b/awx/main/utils/handlers.py index 4c88681f4b..20a30b499e 100644 --- a/awx/main/utils/handlers.py +++ b/awx/main/utils/handlers.py @@ -152,7 +152,7 @@ class BaseHandler(logging.Handler): return self._format_and_send_record(record) except (KeyboardInterrupt, SystemExit): raise - except: + except Exception: self.handleError(record) def _get_host(self, scheme='', hostname_only=False): diff --git a/awx/plugins/fact_caching/awx.py b/awx/plugins/fact_caching/awx.py index 8267a0d498..9b929a2728 100755 --- a/awx/plugins/fact_caching/awx.py +++ b/awx/plugins/fact_caching/awx.py @@ -41,7 +41,7 @@ from ansible import constants as C try: from ansible.cache.base import BaseCacheModule -except: +except Exception: from ansible.plugins.cache.base import BaseCacheModule diff --git a/tools/rdb.py b/tools/rdb.py index 6670805ea8..5b56703a01 100644 --- a/tools/rdb.py +++ b/tools/rdb.py @@ -158,7 +158,7 @@ class CustomPdb(Rdb): try: socket.gethostbyname('docker.for.mac.localhost') host = 'docker.for.mac.localhost' - except: + except Exception: host = os.popen('ip route').read().split(' ')[2] sock, port = Rdb.get_avail_port(self, *args, **kwargs) socket.socket(socket.AF_INET, socket.SOCK_DGRAM).sendto( @@ -217,7 +217,7 @@ def telnet(port): try: s.connect(('0.0.0.0', port)) - except: + except Exception: print 'unable to connect' return print 'connected to 0.0.0.0:%d' % port From 6269b43456ff6cc2d135baa5076c80b9bd3a465e Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Thu, 26 Oct 2017 08:00:49 -0400 Subject: [PATCH 125/141] update tests to new Ansible core code --- awx/lib/tests/test_display_callback.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/awx/lib/tests/test_display_callback.py b/awx/lib/tests/test_display_callback.py index 1607544827..fefd5d4188 100644 --- a/awx/lib/tests/test_display_callback.py +++ b/awx/lib/tests/test_display_callback.py @@ -23,9 +23,9 @@ with mock.patch.dict(os.environ, {'ANSIBLE_STDOUT_CALLBACK': CALLBACK, 'ANSIBLE_CALLBACK_PLUGINS': PLUGINS}): from ansible.cli.playbook import PlaybookCLI from ansible.executor.playbook_executor import PlaybookExecutor - from ansible.inventory import Inventory + from ansible.inventory.manager import InventoryManager from ansible.parsing.dataloader import DataLoader - from ansible.vars import VariableManager + from ansible.vars.manager import VariableManager # Add awx/lib to sys.path so we can use the plugin path = os.path.abspath(os.path.join(PLUGINS, '..', '..')) @@ -62,9 +62,8 @@ def executor(tmpdir_factory, request): cli.parse() options = cli.parser.parse_args(['-v'])[0] loader = DataLoader() - variable_manager = VariableManager() - inventory = Inventory(loader=loader, variable_manager=variable_manager, - host_list=['localhost']) + variable_manager = VariableManager(loader=loader) + inventory = InventoryManager(loader=loader, sources='localhost,') variable_manager.set_inventory(inventory) return PlaybookExecutor(playbooks=playbook_files, inventory=inventory, From 47f45bf9b3bbc3d96b3a75427dc4bce5c2f59ad3 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Fri, 1 Dec 2017 13:19:56 -0500 Subject: [PATCH 126/141] block user from entering encrypted as bare default --- awx/api/views.py | 43 ++++---- awx/main/models/mixins.py | 11 +++ awx/main/tests/unit/api/test_views.py | 137 ++++++++++++++++++++++++++ 3 files changed, 173 insertions(+), 18 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index bb65c904a9..06c6d68ec7 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -2896,9 +2896,10 @@ class JobTemplateSurveySpec(GenericAPIView): if len(new_spec["spec"]) < 1: return Response(dict(error=_("'spec' doesn't contain any items.")), status=status.HTTP_400_BAD_REQUEST) - idx = 0 variable_set = set() - for survey_item in new_spec["spec"]: + old_spec = obj.survey_spec + old_spec_dict = JobTemplate.pivot_spec(old_spec) + for idx, survey_item in enumerate(new_spec["spec"]): if not isinstance(survey_item, dict): return Response(dict(error=_("Survey question %s is not a json object.") % str(idx)), status=status.HTTP_400_BAD_REQUEST) if "type" not in survey_item: @@ -2922,22 +2923,28 @@ class JobTemplateSurveySpec(GenericAPIView): ).format( question_default=survey_item["default"], variable_name=survey_item["variable"]) ), status=status.HTTP_400_BAD_REQUEST) - elif survey_item["default"].startswith('$encrypted$'): - if not obj.survey_spec: - return Response(dict(error=_( - "$encrypted$ is reserved keyword for password questions and may not " - "be used as a default for '{variable_name}' in survey question {question_position}." - ).format( - variable_name=survey_item["variable"], question_position=str(idx)) - ), status=status.HTTP_400_BAD_REQUEST) - else: - old_spec = obj.survey_spec - for old_item in old_spec['spec']: - if old_item['variable'] == survey_item['variable']: - survey_item['default'] = old_item['default'] - else: - survey_item['default'] = encrypt_value(survey_item['default']) - idx += 1 + + if ("default" in survey_item and isinstance(survey_item['default'], six.string_types) and + survey_item['default'].startswith('$encrypted$')): + # Submission expects the existence of encrypted DB value to replace given default + if survey_item["type"] != "password": + return Response(dict(error=_( + "$encrypted$ is a reserved keyword for password question defaults, " + "survey question {question_position} is type {question_type}." + ).format( + question_position=str(idx), question_type=survey_item["type"]) + ), status=status.HTTP_400_BAD_REQUEST) + old_element = old_spec_dict.get(survey_item['variable'], {}) + if (survey_item['variable'] not in old_spec_dict or 'default' not in old_element or + not old_element['default'].startswith('$encrypted$') or + old_element['default'] == '$encrypted$'): + return Response(dict(error=_( + "$encrypted$ is a reserved keyword, may not be used for new default in position {question_position}." + ).format(question_position=str(idx))), status=status.HTTP_400_BAD_REQUEST) + survey_item['default'] = old_element['default'] + elif survey_item["type"] == "password" and 'default' in survey_item: + # Submission provides new encrypted default + survey_item['default'] = encrypt_value(survey_item['default']) obj.survey_spec = new_spec obj.save(update_fields=['survey_spec']) diff --git a/awx/main/models/mixins.py b/awx/main/models/mixins.py index ba01ad8ce6..062a9638ee 100644 --- a/awx/main/models/mixins.py +++ b/awx/main/models/mixins.py @@ -245,6 +245,17 @@ class SurveyJobTemplateMixin(models.Model): choice_list)) return errors + @staticmethod + def pivot_spec(spec): + ''' + Utility method that will return a dictionary keyed off variable names + ''' + pivoted = {} + for element_data in spec.get('spec', []): + if 'variable' in element_data: + pivoted[element_data['variable']] = element_data + return pivoted + def survey_variable_validation(self, data): errors = [] if not self.survey_enabled: diff --git a/awx/main/tests/unit/api/test_views.py b/awx/main/tests/unit/api/test_views.py index 68ba754d48..0c93730d98 100644 --- a/awx/main/tests/unit/api/test_views.py +++ b/awx/main/tests/unit/api/test_views.py @@ -1,6 +1,7 @@ import mock import pytest import requests +from copy import deepcopy from collections import namedtuple @@ -10,14 +11,19 @@ from awx.api.views import ( InventoryInventorySourcesUpdate, InventoryHostsList, HostInsights, + JobTemplateSurveySpec ) from awx.main.models import ( Host, + JobTemplate, + User ) from awx.main.managers import HostManager +from rest_framework.test import APIRequestFactory + @pytest.fixture def mock_response_new(mocker): @@ -215,3 +221,134 @@ class TestInventoryHostsList(object): view = InventoryHostsList() view.get_queryset() mock_query.assert_called_once_with('localhost') + + +class TestSurveySpecValidation: + + @pytest.fixture + def spec_view(self): + def view_factory(old_spec): + obj = JobTemplate() + if old_spec: + obj.survey_spec = old_spec + + def save(**kwargs): + pass + + def get_object(): + return get_object.object + + get_object.object = obj + obj.save = save + + user = User(username='admin') + + def can_access(*args, **kwargs): + return True + + user.can_access = can_access + + request = APIRequestFactory().get('/api/v2/job_templates/42/survey_spec/') + request.user = user + view = JobTemplateSurveySpec() + view.request = request + view.get_object = get_object + return view + return view_factory + + def test_create_text_encrypted(self, spec_view): + view = spec_view(None) + view.request.data = { + "name": "new survey", + "description": "foobar", + "spec": [ + { + "question_description": "", + "min": 0, + "default": "$encrypted$", + "max": 1024, + "required": True, + "choices": "", + "variable": "openshift_username", + "question_name": "OpenShift Username", + "type": "text" + } + ] + } + resp = view.post(view.request) + assert resp.status_code == 400 + assert '$encrypted$ is a reserved keyword for password question defaults' in str(resp.data['error']) + + + def test_change_encrypted_var_name(self, spec_view): + old = { + "name": "old survey", + "description": "foobar", + "spec": [ + { + "question_description": "", + "min": 0, + "default": "$encrypted$foooooooo", + "max": 1024, + "required": True, + "choices": "", + "variable": "openshift_username", + "question_name": "OpenShift Username", + "type": "password" + } + ] + } + view = spec_view(old) + new = deepcopy(old) + new['spec'][0]['variable'] = 'openstack_username' + view.request.data = new + resp = view.post(view.request) + assert resp.status_code == 400 + assert 'may not be used for new default' in str(resp.data['error']) + + def test_use_saved_encrypted_default(self, spec_view): + ''' + Save is allowed, the $encrypted$ replacement is done + ''' + old = { + "name": "old survey", + "description": "foobar", + "spec": [ + { + "question_description": "", + "min": 0, + "default": "$encrypted$foooooooo", + "max": 1024, + "required": True, + "choices": "", + "variable": "openshift_username", + "question_name": "OpenShift Username", + "type": "password" + } + ] + } + view = spec_view(old) + new = deepcopy(old) + new['spec'][0]['default'] = '$encrypted$' + new['spec'][0]['required'] = False + view.request.data = new + resp = view.post(view.request) + assert resp.status_code == 200 + assert resp.data is None + assert view.get_object.object.survey_spec == { + "name": "old survey", + "description": "foobar", + "spec": [ + { + "question_description": "", + "min": 0, + "default": "$encrypted$foooooooo", + "max": 1024, + "required": False, # only thing changed + "choices": "", + "variable": "openshift_username", + "question_name": "OpenShift Username", + "type": "password" + } + ] + } From 1057b9357058c130f45430313e51c5a0c06510c6 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Fri, 1 Dec 2017 15:08:03 -0500 Subject: [PATCH 127/141] refactor survey spec validation into a separate testable function --- awx/api/views.py | 14 +++--- awx/main/tests/unit/api/test_views.py | 64 +++++---------------------- 2 files changed, 20 insertions(+), 58 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index 06c6d68ec7..934c822f76 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -2884,7 +2884,14 @@ class JobTemplateSurveySpec(GenericAPIView): if not request.user.can_access(self.model, 'change', obj, None): raise PermissionDenied() - new_spec = request.data + response = self._validate_spec_data(request.data, obj.survey_spec) + if response: + return response + obj.survey_spec = request.data + obj.save(update_fields=['survey_spec']) + return Response() + + def _validate_spec_data(self, new_spec, old_spec): if "name" not in new_spec: return Response(dict(error=_("'name' missing from survey spec.")), status=status.HTTP_400_BAD_REQUEST) if "description" not in new_spec: @@ -2897,7 +2904,6 @@ class JobTemplateSurveySpec(GenericAPIView): return Response(dict(error=_("'spec' doesn't contain any items.")), status=status.HTTP_400_BAD_REQUEST) variable_set = set() - old_spec = obj.survey_spec old_spec_dict = JobTemplate.pivot_spec(old_spec) for idx, survey_item in enumerate(new_spec["spec"]): if not isinstance(survey_item, dict): @@ -2946,10 +2952,6 @@ class JobTemplateSurveySpec(GenericAPIView): # Submission provides new encrypted default survey_item['default'] = encrypt_value(survey_item['default']) - obj.survey_spec = new_spec - obj.save(update_fields=['survey_spec']) - return Response() - def delete(self, request, *args, **kwargs): obj = self.get_object() if not request.user.can_access(self.model, 'delete', obj): diff --git a/awx/main/tests/unit/api/test_views.py b/awx/main/tests/unit/api/test_views.py index 0c93730d98..10edba02cb 100644 --- a/awx/main/tests/unit/api/test_views.py +++ b/awx/main/tests/unit/api/test_views.py @@ -16,14 +16,10 @@ from awx.api.views import ( from awx.main.models import ( Host, - JobTemplate, - User ) from awx.main.managers import HostManager -from rest_framework.test import APIRequestFactory - @pytest.fixture def mock_response_new(mocker): @@ -225,40 +221,9 @@ class TestInventoryHostsList(object): class TestSurveySpecValidation: - @pytest.fixture - def spec_view(self): - def view_factory(old_spec): - obj = JobTemplate() - if old_spec: - obj.survey_spec = old_spec - - def save(**kwargs): - pass - - def get_object(): - return get_object.object - - get_object.object = obj - obj.save = save - - user = User(username='admin') - - def can_access(*args, **kwargs): - return True - - user.can_access = can_access - - request = APIRequestFactory().get('/api/v2/job_templates/42/survey_spec/') - request.user = user - view = JobTemplateSurveySpec() - view.request = request - view.get_object = get_object - return view - return view_factory - - def test_create_text_encrypted(self, spec_view): - view = spec_view(None) - view.request.data = { + def test_create_text_encrypted(self): + view = JobTemplateSurveySpec() + resp = view._validate_spec_data({ "name": "new survey", "description": "foobar", "spec": [ @@ -274,13 +239,12 @@ class TestSurveySpecValidation: "type": "text" } ] - } - resp = view.post(view.request) + }, {}) assert resp.status_code == 400 assert '$encrypted$ is a reserved keyword for password question defaults' in str(resp.data['error']) - - def test_change_encrypted_var_name(self, spec_view): + def test_change_encrypted_var_name(self): + view = JobTemplateSurveySpec() old = { "name": "old survey", "description": "foobar", @@ -298,18 +262,17 @@ class TestSurveySpecValidation: } ] } - view = spec_view(old) new = deepcopy(old) new['spec'][0]['variable'] = 'openstack_username' - view.request.data = new - resp = view.post(view.request) + resp = view._validate_spec_data(new, old) assert resp.status_code == 400 assert 'may not be used for new default' in str(resp.data['error']) - def test_use_saved_encrypted_default(self, spec_view): + def test_use_saved_encrypted_default(self): ''' Save is allowed, the $encrypted$ replacement is done ''' + view = JobTemplateSurveySpec() old = { "name": "old survey", "description": "foobar", @@ -327,15 +290,12 @@ class TestSurveySpecValidation: } ] } - view = spec_view(old) new = deepcopy(old) new['spec'][0]['default'] = '$encrypted$' new['spec'][0]['required'] = False - view.request.data = new - resp = view.post(view.request) - assert resp.status_code == 200 - assert resp.data is None - assert view.get_object.object.survey_spec == { + resp = view._validate_spec_data(new, old) + assert resp is None + assert new == { "name": "old survey", "description": "foobar", "spec": [ From 58ad214dcf1d01e354ae53ef41e7ec822adaf5f4 Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Fri, 1 Dec 2017 13:38:43 -0500 Subject: [PATCH 128/141] Follow up fix #542 Relates https://github.com/ansible/ansible-tower/issues/7737#issuecomment-348566452 Signed-off-by: Aaron Tan --- awx/main/tasks.py | 2 ++ awx/main/tests/unit/test_tasks.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 42d00e14d8..822e5b89f9 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -1080,6 +1080,8 @@ class RunJob(BaseTask): env['AZURE_SUBSCRIPTION_ID'] = cloud_cred.subscription env['AZURE_AD_USER'] = cloud_cred.username env['AZURE_PASSWORD'] = decrypt_field(cloud_cred, 'password') + if cloud_cred.inputs.get('cloud_environment', None): + env['AZURE_CLOUD_ENVIRONMENT'] = cloud_cred.inputs['cloud_environment'] elif cloud_cred and cloud_cred.kind == 'vmware': env['VMWARE_USER'] = cloud_cred.username env['VMWARE_PASSWORD'] = decrypt_field(cloud_cred, 'password') diff --git a/awx/main/tests/unit/test_tasks.py b/awx/main/tests/unit/test_tasks.py index 0b54b310d8..f5a8c309b6 100644 --- a/awx/main/tests/unit/test_tasks.py +++ b/awx/main/tests/unit/test_tasks.py @@ -635,7 +635,8 @@ class TestJobCredentials(TestJobExecution): inputs = { 'subscription': 'some-subscription', 'username': 'bob', - 'password': 'secret' + 'password': 'secret', + 'cloud_environment': 'foobar' } ) credential.inputs['password'] = encrypt_field(credential, 'password') @@ -650,6 +651,7 @@ class TestJobCredentials(TestJobExecution): assert env['AZURE_SUBSCRIPTION_ID'] == 'some-subscription' assert env['AZURE_AD_USER'] == 'bob' assert env['AZURE_PASSWORD'] == 'secret' + assert env['AZURE_CLOUD_ENVIRONMENT'] == 'foobar' def test_vmware_credentials(self): vmware = CredentialType.defaults['vmware']() From 6c7851b51f593518b90973b17cc86f3186973504 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Fri, 1 Dec 2017 17:03:57 -0500 Subject: [PATCH 129/141] fix another survey encryption-related bug --- awx/main/models/mixins.py | 4 +-- .../tests/functional/api/test_survey_spec.py | 32 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/awx/main/models/mixins.py b/awx/main/models/mixins.py index 062a9638ee..16a21d8c2b 100644 --- a/awx/main/models/mixins.py +++ b/awx/main/models/mixins.py @@ -310,8 +310,8 @@ class SurveyJobMixin(models.Model): if self.survey_passwords: extra_vars = json.loads(self.extra_vars) for key in self.survey_passwords: - if key in extra_vars: - value = extra_vars[key] + value = extra_vars.get(key) + if value and isinstance(value, basestring) and value.startswith('$encrypted$'): extra_vars[key] = decrypt_value(get_encryption_key('value', pk=None), value) return json.dumps(extra_vars) else: diff --git a/awx/main/tests/functional/api/test_survey_spec.py b/awx/main/tests/functional/api/test_survey_spec.py index 81ce167656..30c8a156bb 100644 --- a/awx/main/tests/functional/api/test_survey_spec.py +++ b/awx/main/tests/functional/api/test_survey_spec.py @@ -134,6 +134,38 @@ def test_survey_spec_passwords_are_encrypted_on_launch(job_template_factory, pos assert "for 'secret_value' expected to be a string." in json.dumps(resp.data) +@mock.patch('awx.api.views.feature_enabled', lambda feature: True) +@pytest.mark.django_db +def test_survey_spec_passwords_with_empty_default(job_template_factory, post, admin_user): + objects = job_template_factory('jt', organization='org1', project='prj', + inventory='inv', credential='cred') + job_template = objects.job_template + job_template.survey_enabled = True + job_template.save() + input_data = { + 'description': 'A survey', + 'spec': [{ + 'index': 0, + 'question_name': 'What is your password?', + 'required': False, + 'variable': 'secret_value', + 'type': 'password', + 'default': '' + }], + 'name': 'my survey' + } + post(url=reverse('api:job_template_survey_spec', kwargs={'pk': job_template.id}), + data=input_data, user=admin_user, expect=200) + + resp = post(reverse('api:job_template_launch', kwargs={'pk': job_template.pk}), + {}, admin_user, expect=201) + job = Job.objects.get(pk=resp.data['id']) + assert json.loads(job.extra_vars)['secret_value'] == '' + assert json.loads(job.decrypted_extra_vars()) == { + 'secret_value': '' + } + + @mock.patch('awx.api.views.feature_enabled', lambda feature: True) @pytest.mark.django_db @pytest.mark.parametrize('default, status', [ From 12380fe1b1226844f7708dc98961597cc74cf929 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Sun, 3 Dec 2017 10:41:06 -0500 Subject: [PATCH 130/141] add more tests for survey default encryption see: https://github.com/ansible/ansible-tower/issues/7805 see: https://github.com/ansible/ansible-tower/issues/7806 see: https://github.com/ansible/ansible-tower/issues/7807 --- awx/main/models/mixins.py | 43 ++++++++------- .../tests/functional/api/test_survey_spec.py | 53 +++++++++++++++++++ .../tests/unit/models/test_survey_models.py | 16 ------ 3 files changed, 74 insertions(+), 38 deletions(-) diff --git a/awx/main/models/mixins.py b/awx/main/models/mixins.py index 16a21d8c2b..b98219db3c 100644 --- a/awx/main/models/mixins.py +++ b/awx/main/models/mixins.py @@ -143,14 +143,20 @@ class SurveyJobTemplateMixin(models.Model): variable_key = survey_element.get('variable') if survey_element.get('type') == 'password': - if variable_key in runtime_extra_vars and default: + if variable_key in runtime_extra_vars: kw_value = runtime_extra_vars[variable_key] - if kw_value == '$encrypted$' and kw_value != default: - runtime_extra_vars[variable_key] = default + if kw_value == '$encrypted$': + runtime_extra_vars.pop(variable_key) if default is not None: - data = {variable_key: default} - errors = self._survey_element_validation(survey_element, data) + decrypted_default = default + if ( + survey_element['type'] == "password" and + isinstance(decrypted_default, basestring) and + decrypted_default.startswith('$encrypted$') + ): + decrypted_default = decrypt_value(get_encryption_key('value', pk=None), decrypted_default) + errors = self._survey_element_validation(survey_element, {variable_key: decrypted_default}) if not errors: survey_defaults[variable_key] = default extra_vars.update(survey_defaults) @@ -162,24 +168,17 @@ class SurveyJobTemplateMixin(models.Model): return create_kwargs def _survey_element_validation(self, survey_element, data): + # Don't apply validation to the `$encrypted$` placeholder; the decrypted + # default (if any) will be validated against instead + if (survey_element['type'] == "password"): + password_value = data.get(survey_element['variable']) + if ( + isinstance(password_value, basestring) and + password_value == '$encrypted$' + ): + return [] + errors = [] - # make a copy of the data to break references (so that we don't - # inadvertently expose unencrypted default passwords as we validate) - data = data.copy() - password_value = data.get(survey_element['variable']) - if ( - survey_element['type'] == "password" and - isinstance(password_value, basestring) and - password_value.startswith('$encrypted$') - ): - if password_value == '$encrypted$': - # replace encrypted password defaults so we don't validate on - # $encrypted$ - password_value = survey_element['default'] - data[survey_element['variable']] = decrypt_value( - get_encryption_key('value', pk=None), - password_value - ) if survey_element['variable'] not in data and survey_element['required']: errors.append("'%s' value missing" % survey_element['variable']) elif survey_element['type'] in ["textarea", "text", "password"]: diff --git a/awx/main/tests/functional/api/test_survey_spec.py b/awx/main/tests/functional/api/test_survey_spec.py index 30c8a156bb..d187229dee 100644 --- a/awx/main/tests/functional/api/test_survey_spec.py +++ b/awx/main/tests/functional/api/test_survey_spec.py @@ -166,6 +166,59 @@ def test_survey_spec_passwords_with_empty_default(job_template_factory, post, ad } +@mock.patch('awx.api.views.feature_enabled', lambda feature: True) +@pytest.mark.django_db +@pytest.mark.parametrize('required', [True, False]) +@pytest.mark.parametrize('default, launch_value, expected_extra_vars, status', [ + ['', '$encrypted$', {'secret_value': ''}, 201], + ['', 'y', {'secret_value': 'y'}, 201], + ['', 'y' * 100, None, 400], + [None, '$encrypted$', {}, 201], + [None, 'y', {'secret_value': 'y'}, 201], + [None, 'y' * 100, {}, 400], + ['x', '$encrypted$', {'secret_value': 'x'}, 201], + ['x', 'y', {'secret_value': 'y'}, 201], + ['x', 'y' * 100, {}, 400], + ['x' * 100, '$encrypted$', {}, 201], + ['x' * 100, 'y', {'secret_value': 'y'}, 201], + ['x' * 100, 'y' * 100, {}, 400], +]) +def test_survey_spec_passwords_with_default(job_template_factory, post, admin_user, + required, default, launch_value, expected_extra_vars, + status): + objects = job_template_factory('jt', organization='org1', project='prj', + inventory='inv', credential='cred') + job_template = objects.job_template + job_template.survey_enabled = True + job_template.save() + input_data = { + 'description': 'A survey', + 'spec': [{ + 'index': 0, + 'question_name': 'What is your password?', + 'required': required, + 'variable': 'secret_value', + 'type': 'password', + 'max': 3 + }], + 'name': 'my survey' + } + if default is not None: + input_data['spec'][0]['default'] = default + post(url=reverse('api:job_template_survey_spec', kwargs={'pk': job_template.id}), + data=input_data, user=admin_user, expect=200) + + resp = post(reverse('api:job_template_launch', kwargs={'pk': job_template.pk}), + data={'extra_vars': {'secret_value': launch_value}}, user=admin_user, expect=status) + + if status == 201: + job = Job.objects.get(pk=resp.data['job']) + assert json.loads(job.decrypted_extra_vars()) == expected_extra_vars + if default: + assert default not in json.loads(job.extra_vars).values() + assert launch_value not in json.loads(job.extra_vars).values() + + @mock.patch('awx.api.views.feature_enabled', lambda feature: True) @pytest.mark.django_db @pytest.mark.parametrize('default, status', [ diff --git a/awx/main/tests/unit/models/test_survey_models.py b/awx/main/tests/unit/models/test_survey_models.py index 6362a25e61..d283c57081 100644 --- a/awx/main/tests/unit/models/test_survey_models.py +++ b/awx/main/tests/unit/models/test_survey_models.py @@ -8,7 +8,6 @@ from awx.main.models import ( JobTemplate, WorkflowJobTemplate ) -from awx.main.utils.encryption import encrypt_value @pytest.fixture @@ -144,21 +143,6 @@ def test_optional_survey_question_defaults( assert 'c' not in defaulted_extra_vars['extra_vars'] -@pytest.mark.survey -def test_encrypted_default_validation(survey_spec_factory): - element = { - "required": True, - "default": encrypt_value("test1234", pk=None), - "variable": "x", - "min": 0, - "max": 8, - "type": "password", - } - spec = survey_spec_factory([element]) - jt = JobTemplate(name="test-jt", survey_spec=spec, survey_enabled=True) - assert not len(jt.survey_variable_validation({'x': '$encrypted$'})) - - @pytest.mark.survey class TestWorkflowSurveys: def test_update_kwargs_survey_defaults(self, survey_spec_factory): From 112757e2023e254650f07a1317778391b8e4b186 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Mon, 4 Dec 2017 09:08:36 -0500 Subject: [PATCH 131/141] properly handle JT launch POST for required survey fields w/ no default see: ansible/ansible-tower#7805 --- awx/main/models/mixins.py | 7 ++- .../tests/functional/api/test_survey_spec.py | 52 +++++++++++++++++-- 2 files changed, 52 insertions(+), 7 deletions(-) diff --git a/awx/main/models/mixins.py b/awx/main/models/mixins.py index b98219db3c..1b184c5b64 100644 --- a/awx/main/models/mixins.py +++ b/awx/main/models/mixins.py @@ -170,15 +170,18 @@ class SurveyJobTemplateMixin(models.Model): def _survey_element_validation(self, survey_element, data): # Don't apply validation to the `$encrypted$` placeholder; the decrypted # default (if any) will be validated against instead + errors = [] + if (survey_element['type'] == "password"): password_value = data.get(survey_element['variable']) if ( isinstance(password_value, basestring) and password_value == '$encrypted$' ): - return [] + if survey_element.get('default') is None and survey_element['required']: + errors.append("'%s' value missing" % survey_element['variable']) + return errors - errors = [] if survey_element['variable'] not in data and survey_element['required']: errors.append("'%s' value missing" % survey_element['variable']) elif survey_element['type'] in ["textarea", "text", "password"]: diff --git a/awx/main/tests/functional/api/test_survey_spec.py b/awx/main/tests/functional/api/test_survey_spec.py index d187229dee..c8e1a1bfed 100644 --- a/awx/main/tests/functional/api/test_survey_spec.py +++ b/awx/main/tests/functional/api/test_survey_spec.py @@ -168,7 +168,6 @@ def test_survey_spec_passwords_with_empty_default(job_template_factory, post, ad @mock.patch('awx.api.views.feature_enabled', lambda feature: True) @pytest.mark.django_db -@pytest.mark.parametrize('required', [True, False]) @pytest.mark.parametrize('default, launch_value, expected_extra_vars, status', [ ['', '$encrypted$', {'secret_value': ''}, 201], ['', 'y', {'secret_value': 'y'}, 201], @@ -183,9 +182,9 @@ def test_survey_spec_passwords_with_empty_default(job_template_factory, post, ad ['x' * 100, 'y', {'secret_value': 'y'}, 201], ['x' * 100, 'y' * 100, {}, 400], ]) -def test_survey_spec_passwords_with_default(job_template_factory, post, admin_user, - required, default, launch_value, expected_extra_vars, - status): +def test_survey_spec_passwords_with_default_optional(job_template_factory, post, admin_user, + default, launch_value, + expected_extra_vars, status): objects = job_template_factory('jt', organization='org1', project='prj', inventory='inv', credential='cred') job_template = objects.job_template @@ -196,7 +195,50 @@ def test_survey_spec_passwords_with_default(job_template_factory, post, admin_us 'spec': [{ 'index': 0, 'question_name': 'What is your password?', - 'required': required, + 'required': False, + 'variable': 'secret_value', + 'type': 'password', + 'max': 3 + }], + 'name': 'my survey' + } + if default is not None: + input_data['spec'][0]['default'] = default + post(url=reverse('api:job_template_survey_spec', kwargs={'pk': job_template.id}), + data=input_data, user=admin_user, expect=200) + + resp = post(reverse('api:job_template_launch', kwargs={'pk': job_template.pk}), + data={'extra_vars': {'secret_value': launch_value}}, user=admin_user, expect=status) + + if status == 201: + job = Job.objects.get(pk=resp.data['job']) + assert json.loads(job.decrypted_extra_vars()) == expected_extra_vars + if default: + assert default not in json.loads(job.extra_vars).values() + assert launch_value not in json.loads(job.extra_vars).values() + + +@mock.patch('awx.api.views.feature_enabled', lambda feature: True) +@pytest.mark.django_db +@pytest.mark.parametrize('default, launch_value, expected_extra_vars, status', [ + ['', '$encrypted$', {'secret_value': ''}, 201], + [None, '$encrypted$', {}, 400], + [None, 'y', {'secret_value': 'y'}, 201], +]) +def test_survey_spec_passwords_with_default_required(job_template_factory, post, admin_user, + default, launch_value, + expected_extra_vars, status): + objects = job_template_factory('jt', organization='org1', project='prj', + inventory='inv', credential='cred') + job_template = objects.job_template + job_template.survey_enabled = True + job_template.save() + input_data = { + 'description': 'A survey', + 'spec': [{ + 'index': 0, + 'question_name': 'What is your password?', + 'required': True, 'variable': 'secret_value', 'type': 'password', 'max': 3 From d23d7c422d545f768b021aef58bdb693c46aa9dc Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Mon, 4 Dec 2017 10:46:08 -0500 Subject: [PATCH 132/141] allow password default reuse with empty default --- awx/api/views.py | 12 +++++-- awx/main/tests/unit/api/test_views.py | 48 ++++++++++++++++++++++++++- 2 files changed, 56 insertions(+), 4 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index 934c822f76..f5fdcf6eb2 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -2941,9 +2941,15 @@ class JobTemplateSurveySpec(GenericAPIView): question_position=str(idx), question_type=survey_item["type"]) ), status=status.HTTP_400_BAD_REQUEST) old_element = old_spec_dict.get(survey_item['variable'], {}) - if (survey_item['variable'] not in old_spec_dict or 'default' not in old_element or - not old_element['default'].startswith('$encrypted$') or - old_element['default'] == '$encrypted$'): + encryptedish_default_exists = False + if 'default' in old_element: + old_default = old_element['default'] + if isinstance(old_default, six.string_types): + if old_default.startswith('$encrypted$'): + encryptedish_default_exists = True + elif old_default == "": # unencrypted blank string is allowed as DB value as special case + encryptedish_default_exists = True + if not encryptedish_default_exists: return Response(dict(error=_( "$encrypted$ is a reserved keyword, may not be used for new default in position {question_position}." ).format(question_position=str(idx))), status=status.HTTP_400_BAD_REQUEST) diff --git a/awx/main/tests/unit/api/test_views.py b/awx/main/tests/unit/api/test_views.py index 10edba02cb..0ad395f296 100644 --- a/awx/main/tests/unit/api/test_views.py +++ b/awx/main/tests/unit/api/test_views.py @@ -302,7 +302,7 @@ class TestSurveySpecValidation: { "question_description": "", "min": 0, - "default": "$encrypted$foooooooo", + "default": "$encrypted$foooooooo", # default remained the same "max": 1024, "required": False, # only thing changed "choices": "", @@ -312,3 +312,49 @@ class TestSurveySpecValidation: } ] } + + def test_use_saved_empty_string_default(self): + ''' + Save is allowed, the $encrypted$ replacement is done with empty string + The empty string value for default is unencrypted, + unlike all other password questions + ''' + view = JobTemplateSurveySpec() + old = { + "name": "old survey", + "description": "foobar", + "spec": [ + { + "question_description": "", + "min": 0, + "default": "", + "max": 1024, + "required": True, + "choices": "", + "variable": "openshift_username", + "question_name": "OpenShift Username", + "type": "password" + } + ] + } + new = deepcopy(old) + new['spec'][0]['default'] = '$encrypted$' + resp = view._validate_spec_data(new, old) + assert resp is None + assert new == { + "name": "old survey", + "description": "foobar", + "spec": [ + { + "question_description": "", + "min": 0, + "default": "", # still has old unencrypted default + "max": 1024, + "required": True, + "choices": "", + "variable": "openshift_username", + "question_name": "OpenShift Username", + "type": "password" + } + ] + } From dbd68c5747a406f20444a781552d6754297e3ef1 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Mon, 4 Dec 2017 11:45:07 -0500 Subject: [PATCH 133/141] encryption tests around the contract with survey functionality --- awx/main/tests/unit/utils/test_encryption.py | 21 ++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/awx/main/tests/unit/utils/test_encryption.py b/awx/main/tests/unit/utils/test_encryption.py index 29b68cc56b..b269c42b27 100644 --- a/awx/main/tests/unit/utils/test_encryption.py +++ b/awx/main/tests/unit/utils/test_encryption.py @@ -51,3 +51,24 @@ def test_encrypt_field_with_ask(): def test_encrypt_field_with_empty_value(): encrypted = encryption.encrypt_field(Setting(value=None), 'value') assert encrypted is None + + +class TestSurveyReversibilityValue: + ''' + Tests to enforce the contract with survey password question encrypted values + ''' + _key = encryption.get_encryption_key('value', None) + + def test_encrypt_empty_string(self): + assert encryption.encrypt_value('') == '' + # the reverse, decryption, does not work + + def test_encrypt_encryption_key(self): + assert encryption.encrypt_value('$encrypted$') == '$encrypted$' + # the reverse, decryption, does not work + + def test_encrypt_empty_string_twice(self): + # Encryption is idempotent + val = encryption.encrypt_value('foobar') + val2 = encryption.encrypt_value(val) + assert encryption.decrypt_value(self._key, val2) == 'foobar' From 33dedc88c8d0018bc88ff42431cda57f7569a2f0 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Mon, 4 Dec 2017 15:14:55 -0500 Subject: [PATCH 134/141] don't fetch stdout when purging jobs - it's slow and causes OOMs see: https://github.com/ansible/ansible-tower/issues/7751 --- awx/main/management/commands/cleanup_jobs.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/awx/main/management/commands/cleanup_jobs.py b/awx/main/management/commands/cleanup_jobs.py index fb2634da4d..7aa23227c6 100644 --- a/awx/main/management/commands/cleanup_jobs.py +++ b/awx/main/management/commands/cleanup_jobs.py @@ -66,7 +66,7 @@ class Command(NoArgsCommand): #jobs_qs = jobs_qs.filter(created__lte=self.cutoff) skipped, deleted = 0, 0 jobs = Job.objects.filter(created__lt=self.cutoff) - for job in jobs.iterator(): + for job in jobs.defer('result_stdout_text').iterator(): job_display = '"%s" (%d host summaries, %d events)' % \ (unicode(job), job.job_host_summaries.count(), job.job_events.count()) @@ -87,7 +87,7 @@ class Command(NoArgsCommand): def cleanup_ad_hoc_commands(self): skipped, deleted = 0, 0 ad_hoc_commands = AdHocCommand.objects.filter(created__lt=self.cutoff) - for ad_hoc_command in ad_hoc_commands.iterator(): + for ad_hoc_command in ad_hoc_commands.defer('result_stdout_text').iterator(): ad_hoc_command_display = '"%s" (%d events)' % \ (unicode(ad_hoc_command), ad_hoc_command.ad_hoc_command_events.count()) @@ -108,7 +108,7 @@ class Command(NoArgsCommand): def cleanup_project_updates(self): skipped, deleted = 0, 0 project_updates = ProjectUpdate.objects.filter(created__lt=self.cutoff) - for pu in project_updates.iterator(): + for pu in project_updates.defer('result_stdout_text').iterator(): pu_display = '"%s" (type %s)' % (unicode(pu), unicode(pu.launch_type)) if pu.status in ('pending', 'waiting', 'running'): action_text = 'would skip' if self.dry_run else 'skipping' @@ -131,7 +131,7 @@ class Command(NoArgsCommand): def cleanup_inventory_updates(self): skipped, deleted = 0, 0 inventory_updates = InventoryUpdate.objects.filter(created__lt=self.cutoff) - for iu in inventory_updates.iterator(): + for iu in inventory_updates.defer('result_stdout_text').iterator(): iu_display = '"%s" (source %s)' % (unicode(iu), unicode(iu.source)) if iu.status in ('pending', 'waiting', 'running'): action_text = 'would skip' if self.dry_run else 'skipping' @@ -154,7 +154,7 @@ class Command(NoArgsCommand): def cleanup_management_jobs(self): skipped, deleted = 0, 0 system_jobs = SystemJob.objects.filter(created__lt=self.cutoff) - for sj in system_jobs.iterator(): + for sj in system_jobs.defer('result_stdout_text').iterator(): sj_display = '"%s" (type %s)' % (unicode(sj), unicode(sj.job_type)) if sj.status in ('pending', 'waiting', 'running'): action_text = 'would skip' if self.dry_run else 'skipping' From fe93ef54883be441f1d1ab22c0794efbc6586b10 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Mon, 4 Dec 2017 17:15:25 -0500 Subject: [PATCH 135/141] more unit tests for survey default handling --- .../tests/unit/models/test_survey_models.py | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/awx/main/tests/unit/models/test_survey_models.py b/awx/main/tests/unit/models/test_survey_models.py index d283c57081..abd0b5fbba 100644 --- a/awx/main/tests/unit/models/test_survey_models.py +++ b/awx/main/tests/unit/models/test_survey_models.py @@ -2,6 +2,7 @@ import tempfile import pytest import json +from awx.main.utils.encryption import encrypt_value from awx.main.tasks import RunJob from awx.main.models import ( Job, @@ -9,6 +10,8 @@ from awx.main.models import ( WorkflowJobTemplate ) +ENCRYPTED_SECRET = encrypt_value('secret') + @pytest.fixture def job(mocker): @@ -143,6 +146,46 @@ def test_optional_survey_question_defaults( assert 'c' not in defaulted_extra_vars['extra_vars'] +@pytest.mark.survey +@pytest.mark.parametrize("question_type,default,maxlen,kwargs,expected", [ + ('text', None, 5, {}, {}), + ('text', '', 5, {}, {'x': ''}), + ('text', 'y', 5, {}, {'x': 'y'}), + ('text', 'too-long', 5, {}, {}), + ('password', None, 5, {}, {}), + ('password', '', 5, {}, {'x': ''}), + ('password', ENCRYPTED_SECRET, 5, {}, {}), # len(secret) == 6, invalid + ('password', ENCRYPTED_SECRET, 10, {}, {'x': ENCRYPTED_SECRET}), # len(secret) < 10, valid + ('password', None, 5, {'extra_vars': {'x': '$encrypted$'}}, {}), + ('password', '', 5, {'extra_vars': {'x': '$encrypted$'}}, {'x': ''}), + ('password', None, 5, {'extra_vars': {'x': 'y'}}, {'x': 'y'}), + ('password', '', 5, {'extra_vars': {'x': 'y'}}, {'x': 'y'}), + ('password', 'foo', 5, {'extra_vars': {'x': 'y'}}, {'x': 'y'}), + ('password', None, 5, {'extra_vars': {'x': ''}}, {'x': ''}), + ('password', '', 5, {'extra_vars': {'x': ''}}, {'x': ''}), + ('password', 'foo', 5, {'extra_vars': {'x': ''}}, {'x': ''}), + ('password', ENCRYPTED_SECRET, 5, {'extra_vars': {'x': '$encrypted$'}}, {}), + ('password', ENCRYPTED_SECRET, 10, {'extra_vars': {'x': '$encrypted$'}}, {'x': ENCRYPTED_SECRET}), +]) +def test_survey_encryption_defaults(survey_spec_factory, question_type, default, maxlen, kwargs, expected): + spec = survey_spec_factory([ + { + "required": True, + "variable": "x", + "min": 0, + "max": maxlen, + "type": question_type + }, + ]) + if default is not None: + spec['spec'][0]['default'] = default + else: + spec['spec'][0].pop('default', None) + jt = JobTemplate(name="test-jt", survey_spec=spec, survey_enabled=True) + extra_vars = json.loads(jt._update_unified_job_kwargs({}, kwargs).get('extra_vars')) + assert extra_vars == expected + + @pytest.mark.survey class TestWorkflowSurveys: def test_update_kwargs_survey_defaults(self, survey_spec_factory): From 15e8fd5ecacdc1fa0f9a3d86644f45cb12e36af9 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Tue, 5 Dec 2017 14:17:07 -0500 Subject: [PATCH 136/141] Pull updated translations --- awx/locale/es/LC_MESSAGES/django.po | 1015 +++++++------ awx/locale/fr/LC_MESSAGES/django.po | 1031 +++++++------- awx/locale/ja/LC_MESSAGES/django.po | 1027 +++++++------- awx/locale/nl/LC_MESSAGES/django.po | 1015 +++++++------ awx/ui/po/es.po | 2034 +++++++++----------------- awx/ui/po/fr.po | 2040 +++++++++------------------ awx/ui/po/ja.po | 2003 +++++++++----------------- awx/ui/po/nl.po | 1999 +++++++++----------------- 8 files changed, 4835 insertions(+), 7329 deletions(-) diff --git a/awx/locale/es/LC_MESSAGES/django.po b/awx/locale/es/LC_MESSAGES/django.po index 6e26752ef1..0d6c14d205 100644 --- a/awx/locale/es/LC_MESSAGES/django.po +++ b/awx/locale/es/LC_MESSAGES/django.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-08-27 19:27+0000\n" +"POT-Creation-Date: 2017-11-30 20:23+0000\n" "PO-Revision-Date: 2017-09-01 06:52+0000\n" "Last-Translator: edrh01 \n" "Language-Team: \n" @@ -89,25 +89,30 @@ msgstr "Filtrar sobre %s no está permitido." msgid "Loops not allowed in filters, detected on field {}." msgstr "Bucles no permitidos en los filtros, detectados en el campo {}." -#: awx/api/filters.py:297 +#: awx/api/filters.py:171 +#, python-brace-format +msgid "Invalid {field_name} id: {field_id}" +msgstr "" + +#: awx/api/filters.py:302 #, python-format msgid "cannot filter on kind %s" msgstr "no se puede filtrar en el tipo %s" -#: awx/api/filters.py:404 +#: awx/api/filters.py:409 #, python-format msgid "cannot order by field %s" msgstr "no se puede ordenar por el campo %s" -#: awx/api/generics.py:515 awx/api/generics.py:577 +#: awx/api/generics.py:550 awx/api/generics.py:612 msgid "\"id\" field must be an integer." msgstr "El campo \"id\" debe ser un número entero." -#: awx/api/generics.py:574 +#: awx/api/generics.py:609 msgid "\"id\" is required to disassociate" msgstr "\"id\" es necesario para desasociar" -#: awx/api/generics.py:625 +#: awx/api/generics.py:660 msgid "{} 'id' field is missing." msgstr "Falta el campo {} 'id'." @@ -189,7 +194,7 @@ msgstr "Tarea en flujo de trabajo" msgid "Workflow Template" msgstr "Plantilla de flujo de trabajo" -#: awx/api/serializers.py:697 awx/api/serializers.py:755 awx/api/views.py:4314 +#: awx/api/serializers.py:701 awx/api/serializers.py:759 awx/api/views.py:4365 #, python-format msgid "" "Standard Output too large to display (%(text_size)d bytes), only download " @@ -199,38 +204,38 @@ msgstr "" "sólo está soportada la descarga para tamaños por encima de " "%(supported_size)d bytes" -#: awx/api/serializers.py:770 +#: awx/api/serializers.py:774 msgid "Write-only field used to change the password." msgstr "Campo de sólo escritura utilizado para cambiar la contraseña." -#: awx/api/serializers.py:772 +#: awx/api/serializers.py:776 msgid "Set if the account is managed by an external service" msgstr "Establecer si la cuenta es administrada por un servicio externo" -#: awx/api/serializers.py:796 +#: awx/api/serializers.py:800 msgid "Password required for new User." msgstr "Contraseña requerida para un usuario nuevo." -#: awx/api/serializers.py:882 +#: awx/api/serializers.py:886 #, python-format msgid "Unable to change %s on user managed by LDAP." msgstr "Incapaz de cambiar %s en usuario gestionado por LDAP." -#: awx/api/serializers.py:1046 +#: awx/api/serializers.py:1050 msgid "Organization is missing" msgstr "Organización no encontrada." -#: awx/api/serializers.py:1050 +#: awx/api/serializers.py:1054 msgid "Update options must be set to false for manual projects." msgstr "" "Opciones de actualización deben ser establecidas a false para proyectos " "manuales." -#: awx/api/serializers.py:1056 +#: awx/api/serializers.py:1060 msgid "Array of playbooks available within this project." msgstr "Colección de playbooks disponibles dentro de este proyecto." -#: awx/api/serializers.py:1075 +#: awx/api/serializers.py:1079 msgid "" "Array of inventory files and directories available within this project, not " "comprehensive." @@ -238,67 +243,71 @@ msgstr "" "Colección de archivos de inventario y directorios disponibles dentro de este" " proyecto, no global." -#: awx/api/serializers.py:1282 +#: awx/api/serializers.py:1201 +msgid "Smart inventories must specify host_filter" +msgstr "" + +#: awx/api/serializers.py:1303 #, python-format msgid "Invalid port specification: %s" msgstr "Especificación de puerto inválido: %s" -#: awx/api/serializers.py:1293 +#: awx/api/serializers.py:1314 msgid "Cannot create Host for Smart Inventory" msgstr "No es posible crear un host para el Inventario inteligente" -#: awx/api/serializers.py:1315 awx/api/serializers.py:3218 -#: awx/api/serializers.py:3303 awx/main/validators.py:198 +#: awx/api/serializers.py:1336 awx/api/serializers.py:3321 +#: awx/api/serializers.py:3406 awx/main/validators.py:198 msgid "Must be valid JSON or YAML." msgstr "Debe ser un válido JSON o YAML." -#: awx/api/serializers.py:1411 +#: awx/api/serializers.py:1432 msgid "Invalid group name." msgstr "Nombre de grupo inválido." -#: awx/api/serializers.py:1416 +#: awx/api/serializers.py:1437 msgid "Cannot create Group for Smart Inventory" msgstr "No es posible crear un grupo para el Inventario inteligente" -#: awx/api/serializers.py:1488 +#: awx/api/serializers.py:1509 msgid "" "Script must begin with a hashbang sequence: i.e.... #!/usr/bin/env python" msgstr "" "El script debe empezar con una secuencia hashbang, p.e.... #!/usr/bin/env " "python" -#: awx/api/serializers.py:1534 +#: awx/api/serializers.py:1555 msgid "`{}` is a prohibited environment variable" msgstr "`{}` es una variable de entorno prohibida" -#: awx/api/serializers.py:1545 +#: awx/api/serializers.py:1566 msgid "If 'source' is 'custom', 'source_script' must be provided." msgstr "Si 'source' es 'custom', 'source_script' debe ser especificado." -#: awx/api/serializers.py:1551 +#: awx/api/serializers.py:1572 msgid "Must provide an inventory." msgstr "Debe proporcionar un inventario." -#: awx/api/serializers.py:1555 +#: awx/api/serializers.py:1576 msgid "" "The 'source_script' does not belong to the same organization as the " "inventory." msgstr "" "El 'source_script' no pertenece a la misma organización que el inventario." -#: awx/api/serializers.py:1557 +#: awx/api/serializers.py:1578 msgid "'source_script' doesn't exist." msgstr "'source_script' no existe." -#: awx/api/serializers.py:1581 +#: awx/api/serializers.py:1602 msgid "Automatic group relationship, will be removed in 3.3" msgstr "Relación de grupo automática; se eliminará en 3.3" -#: awx/api/serializers.py:1658 +#: awx/api/serializers.py:1679 msgid "Cannot use manual project for SCM-based inventory." msgstr "No se puede usar el proyecto manual para el inventario basado en SCM." -#: awx/api/serializers.py:1664 +#: awx/api/serializers.py:1685 msgid "" "Manual inventory sources are created automatically when a group is created " "in the v1 API." @@ -306,53 +315,59 @@ msgstr "" "Las fuentes de inventario manuales se crean automáticamente cuando se crea " "un grupo en la API v1." -#: awx/api/serializers.py:1669 +#: awx/api/serializers.py:1690 msgid "Setting not compatible with existing schedules." msgstr "Configuración no compatible con programaciones existentes." -#: awx/api/serializers.py:1674 +#: awx/api/serializers.py:1695 msgid "Cannot create Inventory Source for Smart Inventory" msgstr "" "No es posible crear una fuente de inventarios para el Inventario inteligente" -#: awx/api/serializers.py:1688 +#: awx/api/serializers.py:1709 #, python-format msgid "Cannot set %s if not SCM type." msgstr "No es posible definir %s si no es de tipo SCM." -#: awx/api/serializers.py:1929 +#: awx/api/serializers.py:1950 msgid "Modifications not allowed for managed credential types" msgstr "" "Modificaciones no permitidas para los tipos de credenciales administradas" -#: awx/api/serializers.py:1934 +#: awx/api/serializers.py:1955 msgid "" "Modifications to inputs are not allowed for credential types that are in use" msgstr "" "No se permiten las modificaciones a entradas para los tipos de credenciales " "que están en uso" -#: awx/api/serializers.py:1940 +#: awx/api/serializers.py:1961 #, python-format msgid "Must be 'cloud' or 'net', not %s" msgstr "Debe ser 'cloud' o 'net', no %s" -#: awx/api/serializers.py:1946 +#: awx/api/serializers.py:1967 msgid "'ask_at_runtime' is not supported for custom credentials." msgstr "" "'ask_at_runtime' no es compatible con las credenciales personalizadas." -#: awx/api/serializers.py:2119 +#: awx/api/serializers.py:2140 #, python-format msgid "\"%s\" is not a valid choice" msgstr "\"%s\" no es una opción válida" -#: awx/api/serializers.py:2138 +#: awx/api/serializers.py:2159 #, python-format msgid "'%s' is not a valid field for %s" msgstr "'%s' no es un campo válido para %s" -#: awx/api/serializers.py:2150 +#: awx/api/serializers.py:2180 +msgid "" +"You cannot change the credential type of the credential, as it may break the" +" functionality of the resources using it." +msgstr "" + +#: awx/api/serializers.py:2191 msgid "" "Write-only field used to add user to owner role. If provided, do not give " "either team or organization. Only valid for creation." @@ -360,7 +375,7 @@ msgstr "" "Campo de sólo escritura utilizado para añadir usuario a rol de propietario. " "Si se indica, no otorgar equipo u organización. Sólo válido para creación." -#: awx/api/serializers.py:2155 +#: awx/api/serializers.py:2196 msgid "" "Write-only field used to add team to owner role. If provided, do not give " "either user or organization. Only valid for creation." @@ -368,7 +383,7 @@ msgstr "" "Campo de sólo escritura para añadir equipo a un rol propietario.Si se " "indica, no otorgar usuario u organización. Sólo válido para creación." -#: awx/api/serializers.py:2160 +#: awx/api/serializers.py:2201 msgid "" "Inherit permissions from organization roles. If provided on creation, do not" " give either user or team." @@ -376,125 +391,129 @@ msgstr "" "Permisos heredados desde roles de organización. Si se indica, no otorgar " "usuario o equipo." -#: awx/api/serializers.py:2176 +#: awx/api/serializers.py:2217 msgid "Missing 'user', 'team', or 'organization'." msgstr "No encontrado 'user', 'team' u 'organization'" -#: awx/api/serializers.py:2216 +#: awx/api/serializers.py:2257 msgid "" "Credential organization must be set and match before assigning to a team" msgstr "" "Credenciales de organización deben ser establecidas y coincidir antes de ser" " asignadas a un equipo" -#: awx/api/serializers.py:2378 +#: awx/api/serializers.py:2424 msgid "You must provide a cloud credential." msgstr "Debe proporcionar una credencial de nube." -#: awx/api/serializers.py:2379 +#: awx/api/serializers.py:2425 msgid "You must provide a network credential." msgstr "Debe indicar un credencial de red." -#: awx/api/serializers.py:2395 +#: awx/api/serializers.py:2441 msgid "This field is required." msgstr "Este campo es obligatorio." -#: awx/api/serializers.py:2397 awx/api/serializers.py:2399 +#: awx/api/serializers.py:2443 awx/api/serializers.py:2445 msgid "Playbook not found for project." msgstr "Playbook no encontrado para el proyecto." -#: awx/api/serializers.py:2401 +#: awx/api/serializers.py:2447 msgid "Must select playbook for project." msgstr "Debe seleccionar un playbook para el proyecto." -#: awx/api/serializers.py:2476 +#: awx/api/serializers.py:2522 msgid "Must either set a default value or ask to prompt on launch." msgstr "" "Debe establecer un valor por defecto o preguntar por valor al ejecutar." -#: awx/api/serializers.py:2478 awx/main/models/jobs.py:325 +#: awx/api/serializers.py:2524 awx/main/models/jobs.py:326 msgid "Job types 'run' and 'check' must have assigned a project." msgstr "Tipos de trabajo 'run' y 'check' deben tener asignado un proyecto." -#: awx/api/serializers.py:2549 +#: awx/api/serializers.py:2611 msgid "Invalid job template." msgstr "Plantilla de trabajo inválida" -#: awx/api/serializers.py:2630 -msgid "Credential not found or deleted." -msgstr "Credencial no encontrado o eliminado." +#: awx/api/serializers.py:2708 +msgid "Neither credential nor vault credential provided." +msgstr "" -#: awx/api/serializers.py:2632 +#: awx/api/serializers.py:2711 msgid "Job Template Project is missing or undefined." msgstr "Proyecto en la plantilla de trabajo no encontrado o no definido." -#: awx/api/serializers.py:2634 +#: awx/api/serializers.py:2713 msgid "Job Template Inventory is missing or undefined." msgstr "Inventario en la plantilla de trabajo no encontrado o no definido." -#: awx/api/serializers.py:2921 +#: awx/api/serializers.py:2782 awx/main/tasks.py:2186 +msgid "{} are prohibited from use in ad hoc commands." +msgstr "" + +#: awx/api/serializers.py:3008 #, python-format msgid "%(job_type)s is not a valid job type. The choices are %(choices)s." msgstr "" "j%(job_type)s no es un tipo de trabajo válido. Las opciones son %(choices)s." -#: awx/api/serializers.py:2926 +#: awx/api/serializers.py:3013 msgid "Workflow job template is missing during creation." msgstr "" "Plantilla de tarea en el flujo de trabajo no encontrada durante la creación." -#: awx/api/serializers.py:2931 +#: awx/api/serializers.py:3018 #, python-format msgid "Cannot nest a %s inside a WorkflowJobTemplate" msgstr "No es posible anidar un %s dentro de un WorkflowJobTemplate" -#: awx/api/serializers.py:3188 +#: awx/api/serializers.py:3291 #, python-format msgid "Job Template '%s' is missing or undefined." msgstr "Plantilla de trabajo '%s' no encontrada o no definida." -#: awx/api/serializers.py:3191 +#: awx/api/serializers.py:3294 msgid "The inventory associated with this Job Template is being deleted." msgstr "" "Se está eliminando el inventario asociado con esta plantilla de trabajo." -#: awx/api/serializers.py:3232 awx/api/views.py:2991 +#: awx/api/serializers.py:3335 awx/api/views.py:3023 #, python-format msgid "Cannot assign multiple %s credentials." msgstr "No se pueden asignar múltiples credenciales %s." -#: awx/api/serializers.py:3234 awx/api/views.py:2994 +#: awx/api/serializers.py:3337 awx/api/views.py:3026 msgid "Extra credentials must be network or cloud." msgstr "Las credenciales adicionales deben ser red o nube." -#: awx/api/serializers.py:3371 +#: awx/api/serializers.py:3474 msgid "" "Missing required fields for Notification Configuration: notification_type" msgstr "" "Campos obligatorios no definidos para la configuración de notificación: " "notification_type" -#: awx/api/serializers.py:3394 +#: awx/api/serializers.py:3497 msgid "No values specified for field '{}'" msgstr "Ningún valor especificado para el campo '{}'" -#: awx/api/serializers.py:3399 +#: awx/api/serializers.py:3502 msgid "Missing required fields for Notification Configuration: {}." msgstr "Campos no definidos para la configuración de notificación: {}." -#: awx/api/serializers.py:3402 +#: awx/api/serializers.py:3505 msgid "Configuration field '{}' incorrect type, expected {}." msgstr "Tipo incorrecto en la configuración del campo '{} ', esperado {}." -#: awx/api/serializers.py:3455 +#: awx/api/serializers.py:3558 msgid "Inventory Source must be a cloud resource." msgstr "Fuente del inventario debe ser un recurso cloud." -#: awx/api/serializers.py:3457 +#: awx/api/serializers.py:3560 msgid "Manual Project cannot have a schedule set." msgstr "El proyecto manual no puede tener una programación establecida." -#: awx/api/serializers.py:3460 +#: awx/api/serializers.py:3563 msgid "" "Inventory sources with `update_on_project_update` cannot be scheduled. " "Schedule its source project `{}` instead." @@ -502,72 +521,72 @@ msgstr "" "No se pueden programar las fuentes de inventario con " "`update_on_project_update. En su lugar, programe su proyecto fuente `{}`." -#: awx/api/serializers.py:3479 +#: awx/api/serializers.py:3582 msgid "Projects and inventory updates cannot accept extra variables." msgstr "" "Las actualizaciones de inventarios y proyectos no pueden aceptar variables " "adicionales." -#: awx/api/serializers.py:3501 +#: awx/api/serializers.py:3604 msgid "" "DTSTART required in rrule. Value should match: DTSTART:YYYYMMDDTHHMMSSZ" msgstr "" "DTSTART necesario en 'rrule'. El valor debe coincidir: " "DTSTART:YYYYMMDDTHHMMSSZ" -#: awx/api/serializers.py:3503 +#: awx/api/serializers.py:3606 msgid "Multiple DTSTART is not supported." msgstr "Múltiple DTSTART no está soportado." -#: awx/api/serializers.py:3505 +#: awx/api/serializers.py:3608 msgid "RRULE require in rrule." msgstr "RRULE requerido en rrule" -#: awx/api/serializers.py:3507 +#: awx/api/serializers.py:3610 msgid "Multiple RRULE is not supported." msgstr "Múltiple RRULE no está soportado." -#: awx/api/serializers.py:3509 +#: awx/api/serializers.py:3612 msgid "INTERVAL required in rrule." msgstr "INTERVAL requerido en 'rrule'." -#: awx/api/serializers.py:3511 +#: awx/api/serializers.py:3614 msgid "TZID is not supported." msgstr "TZID no está soportado." -#: awx/api/serializers.py:3513 +#: awx/api/serializers.py:3616 msgid "SECONDLY is not supported." msgstr "SECONDLY no está soportado." -#: awx/api/serializers.py:3515 +#: awx/api/serializers.py:3618 msgid "Multiple BYMONTHDAYs not supported." msgstr "Multiple BYMONTHDAYs no soportado." -#: awx/api/serializers.py:3517 +#: awx/api/serializers.py:3620 msgid "Multiple BYMONTHs not supported." msgstr "Multiple BYMONTHs no soportado." -#: awx/api/serializers.py:3519 +#: awx/api/serializers.py:3622 msgid "BYDAY with numeric prefix not supported." msgstr "BYDAY con prefijo numérico no soportado." -#: awx/api/serializers.py:3521 +#: awx/api/serializers.py:3624 msgid "BYYEARDAY not supported." msgstr "BYYEARDAY no soportado." -#: awx/api/serializers.py:3523 +#: awx/api/serializers.py:3626 msgid "BYWEEKNO not supported." msgstr "BYWEEKNO no soportado." -#: awx/api/serializers.py:3527 +#: awx/api/serializers.py:3630 msgid "COUNT > 999 is unsupported." msgstr "COUNT > 999 no está soportada." -#: awx/api/serializers.py:3531 +#: awx/api/serializers.py:3634 msgid "rrule parsing failed validation." msgstr "Validación fallida analizando 'rrule'" -#: awx/api/serializers.py:3631 +#: awx/api/serializers.py:3760 msgid "" "A summary of the new and changed values when an object is created, updated, " "or deleted" @@ -575,7 +594,7 @@ msgstr "" "Un resumen de los valores nuevos y cambiados cuando un objeto es creado, " "actualizado o eliminado." -#: awx/api/serializers.py:3633 +#: awx/api/serializers.py:3762 msgid "" "For create, update, and delete events this is the object type that was " "affected. For associate and disassociate events this is the object type " @@ -585,7 +604,7 @@ msgstr "" "afectado. Para asociar o desasociar eventos éste es el tipo de objeto " "asociado o desasociado con object2." -#: awx/api/serializers.py:3636 +#: awx/api/serializers.py:3765 msgid "" "Unpopulated for create, update, and delete events. For associate and " "disassociate events this is the object type that object1 is being associated" @@ -594,163 +613,163 @@ msgstr "" "Vacío para crear, actualizar y eliminar eventos. Para asociar y desasociar " "eventos éste es el tipo de objetos que object1 con el está asociado." -#: awx/api/serializers.py:3639 +#: awx/api/serializers.py:3768 msgid "The action taken with respect to the given object(s)." msgstr "La acción tomada al respeto al/los especificado(s) objeto(s)." -#: awx/api/serializers.py:3749 +#: awx/api/serializers.py:3885 msgid "Unable to login with provided credentials." msgstr "Incapaz de iniciar sesión con los credenciales indicados." -#: awx/api/serializers.py:3751 +#: awx/api/serializers.py:3887 msgid "Must include \"username\" and \"password\"." msgstr "Debe incluir \"usuario\" y \"contraseña\"." -#: awx/api/views.py:106 +#: awx/api/views.py:108 msgid "Your license does not allow use of the activity stream." msgstr "Su licencia no permite el uso de flujo de actividad." -#: awx/api/views.py:116 +#: awx/api/views.py:118 msgid "Your license does not permit use of system tracking." msgstr "Su licencia no permite el uso de sistema de rastreo." -#: awx/api/views.py:126 +#: awx/api/views.py:128 msgid "Your license does not allow use of workflows." msgstr "Su licencia no permite el uso de flujos de trabajo." -#: awx/api/views.py:140 +#: awx/api/views.py:142 msgid "Cannot delete job resource when associated workflow job is running." msgstr "" "No es posible eliminar un recurso de trabajo cuando la tarea del flujo de " "trabajo está en ejecución." -#: awx/api/views.py:144 +#: awx/api/views.py:146 msgid "Cannot delete running job resource." msgstr "No es posible eliminar el recurso de trabajo en ejecución." -#: awx/api/views.py:153 awx/templates/rest_framework/api.html:28 +#: awx/api/views.py:155 awx/templates/rest_framework/api.html:28 msgid "REST API" msgstr "REST API" -#: awx/api/views.py:162 awx/templates/rest_framework/api.html:4 +#: awx/api/views.py:164 awx/templates/rest_framework/api.html:4 msgid "AWX REST API" msgstr "API REST de AWX" -#: awx/api/views.py:224 +#: awx/api/views.py:226 msgid "Version 1" msgstr "Version 1" -#: awx/api/views.py:228 +#: awx/api/views.py:230 msgid "Version 2" msgstr "Versión 2" -#: awx/api/views.py:239 +#: awx/api/views.py:241 msgid "Ping" msgstr "Ping" -#: awx/api/views.py:270 awx/conf/apps.py:12 +#: awx/api/views.py:272 awx/conf/apps.py:12 msgid "Configuration" msgstr "Configuración" -#: awx/api/views.py:323 +#: awx/api/views.py:325 msgid "Invalid license data" msgstr "Datos de licencia inválidos." -#: awx/api/views.py:325 +#: awx/api/views.py:327 msgid "Missing 'eula_accepted' property" msgstr "Propiedad 'eula_accepted' no encontrada" -#: awx/api/views.py:329 +#: awx/api/views.py:331 msgid "'eula_accepted' value is invalid" msgstr "Valor 'eula_accepted' no es válido" -#: awx/api/views.py:332 +#: awx/api/views.py:334 msgid "'eula_accepted' must be True" msgstr "'eula_accepted' debe ser True" -#: awx/api/views.py:339 +#: awx/api/views.py:341 msgid "Invalid JSON" msgstr "JSON inválido" -#: awx/api/views.py:347 +#: awx/api/views.py:349 msgid "Invalid License" msgstr "Licencia inválida" -#: awx/api/views.py:357 +#: awx/api/views.py:359 msgid "Invalid license" msgstr "Licencia inválida" -#: awx/api/views.py:365 +#: awx/api/views.py:367 #, python-format msgid "Failed to remove license (%s)" msgstr "Error al eliminar licencia (%s)" -#: awx/api/views.py:370 +#: awx/api/views.py:372 msgid "Dashboard" msgstr "Panel de control" -#: awx/api/views.py:469 +#: awx/api/views.py:471 msgid "Dashboard Jobs Graphs" msgstr "Panel de control de gráficas de trabajo" -#: awx/api/views.py:505 +#: awx/api/views.py:507 #, python-format msgid "Unknown period \"%s\"" msgstr "Periodo desconocido \"%s\"" -#: awx/api/views.py:519 +#: awx/api/views.py:521 msgid "Instances" msgstr "Instancias" -#: awx/api/views.py:527 +#: awx/api/views.py:529 msgid "Instance Detail" msgstr "Detalle de la instancia" -#: awx/api/views.py:535 +#: awx/api/views.py:537 msgid "Instance Running Jobs" msgstr "Tareas en ejecución de la instancia" -#: awx/api/views.py:550 +#: awx/api/views.py:552 msgid "Instance's Instance Groups" msgstr "Grupos de instancias de la instancia" -#: awx/api/views.py:560 +#: awx/api/views.py:562 msgid "Instance Groups" msgstr "Grupos de instancias" -#: awx/api/views.py:568 +#: awx/api/views.py:570 msgid "Instance Group Detail" msgstr "Detalle del grupo de instancias" -#: awx/api/views.py:576 +#: awx/api/views.py:578 msgid "Instance Group Running Jobs" msgstr "Tareas en ejecución del grupo de instancias" -#: awx/api/views.py:586 +#: awx/api/views.py:588 msgid "Instance Group's Instances" msgstr "Instancias del grupo de instancias" -#: awx/api/views.py:596 +#: awx/api/views.py:598 msgid "Schedules" msgstr "Programaciones" -#: awx/api/views.py:615 +#: awx/api/views.py:617 msgid "Schedule Jobs List" msgstr "Lista de trabajos programados" -#: awx/api/views.py:841 +#: awx/api/views.py:843 msgid "Your license only permits a single organization to exist." msgstr "Su licencia solo permite que exista una organización." -#: awx/api/views.py:1077 awx/api/views.py:4615 +#: awx/api/views.py:1079 awx/api/views.py:4666 msgid "You cannot assign an Organization role as a child role for a Team." msgstr "No puede asignar un rol de organización como rol hijo para un equipo." -#: awx/api/views.py:1081 awx/api/views.py:4629 +#: awx/api/views.py:1083 awx/api/views.py:4680 msgid "You cannot grant system-level permissions to a team." msgstr "No puede asignar permisos de nivel de sistema a un equipo." -#: awx/api/views.py:1088 awx/api/views.py:4621 +#: awx/api/views.py:1090 awx/api/views.py:4672 msgid "" "You cannot grant credential access to a team when the Organization field " "isn't set, or belongs to a different organization" @@ -758,35 +777,35 @@ msgstr "" "No puede asignar credenciales de acceso a un equipo cuando el campo de " "organización no está establecido o pertenezca a una organización diferente." -#: awx/api/views.py:1178 +#: awx/api/views.py:1180 msgid "Cannot delete project." msgstr "No se puede eliminar el proyecto." -#: awx/api/views.py:1213 +#: awx/api/views.py:1215 msgid "Project Schedules" msgstr "Programación del proyecto" -#: awx/api/views.py:1225 +#: awx/api/views.py:1227 msgid "Project SCM Inventory Sources" msgstr "Fuentes de inventario SCM del proyecto" -#: awx/api/views.py:1352 +#: awx/api/views.py:1354 msgid "Project Update SCM Inventory Updates" msgstr "Actualizaciones de inventario SCM de la actualización del proyecto" -#: awx/api/views.py:1407 +#: awx/api/views.py:1409 msgid "Me" msgstr "Yo" -#: awx/api/views.py:1451 awx/api/views.py:4572 +#: awx/api/views.py:1453 awx/api/views.py:4623 msgid "You may not perform any action with your own admin_role." msgstr "No puede realizar ninguna acción con su admin_role." -#: awx/api/views.py:1457 awx/api/views.py:4576 +#: awx/api/views.py:1459 awx/api/views.py:4627 msgid "You may not change the membership of a users admin_role" msgstr "No puede cambiar la pertenencia a usuarios admin_role" -#: awx/api/views.py:1462 awx/api/views.py:4581 +#: awx/api/views.py:1464 awx/api/views.py:4632 msgid "" "You cannot grant credential access to a user not in the credentials' " "organization" @@ -794,53 +813,54 @@ msgstr "" "No puede conceder credenciales de acceso a un usuario que no está en la " "organización del credencial." -#: awx/api/views.py:1466 awx/api/views.py:4585 +#: awx/api/views.py:1468 awx/api/views.py:4636 msgid "You cannot grant private credential access to another user" msgstr "No puede conceder acceso a un credencial privado a otro usuario" -#: awx/api/views.py:1564 +#: awx/api/views.py:1566 #, python-format msgid "Cannot change %s." msgstr "No se puede cambiar %s." -#: awx/api/views.py:1570 +#: awx/api/views.py:1572 msgid "Cannot delete user." msgstr "No se puede eliminar usuario." -#: awx/api/views.py:1599 +#: awx/api/views.py:1601 msgid "Deletion not allowed for managed credential types" msgstr "" "No se permite la eliminación para los tipos de credenciales administradas" -#: awx/api/views.py:1601 +#: awx/api/views.py:1603 msgid "Credential types that are in use cannot be deleted" msgstr "No se pueden eliminar los tipos de credenciales en uso" -#: awx/api/views.py:1779 +#: awx/api/views.py:1781 msgid "Cannot delete inventory script." msgstr "No se puede eliminar script de inventario." -#: awx/api/views.py:1864 +#: awx/api/views.py:1866 +#, python-brace-format msgid "{0}" msgstr "{0}" -#: awx/api/views.py:2089 +#: awx/api/views.py:2101 msgid "Fact not found." msgstr "Fact no encontrado." -#: awx/api/views.py:2113 +#: awx/api/views.py:2125 msgid "SSLError while trying to connect to {}" msgstr "SSLError al intentar conectarse a {}" -#: awx/api/views.py:2115 +#: awx/api/views.py:2127 msgid "Request to {} timed out." msgstr "El tiempo de solicitud {} caducó." -#: awx/api/views.py:2117 +#: awx/api/views.py:2129 msgid "Unkown exception {} while trying to GET {}" msgstr "Excepción desconocida {} al intentar OBTENER {}" -#: awx/api/views.py:2120 +#: awx/api/views.py:2132 msgid "" "Unauthorized access. Please check your Insights Credential username and " "password." @@ -848,7 +868,7 @@ msgstr "" "Acceso no autorizado. Verifique su nombre de usuario y contraseña de " "Insights." -#: awx/api/views.py:2122 +#: awx/api/views.py:2134 msgid "" "Failed to gather reports and maintenance plans from Insights API at URL {}. " "Server responded with {} status code and message {}" @@ -857,202 +877,212 @@ msgstr "" " de Insights en la dirección URL {}. El servidor respondió con el código de " "estado {} y el mensaje {}" -#: awx/api/views.py:2128 +#: awx/api/views.py:2140 msgid "Expected JSON response from Insights but instead got {}" msgstr "Respuesta JSON esperada de Insights; en cambio, se recibió {}" -#: awx/api/views.py:2135 +#: awx/api/views.py:2147 msgid "This host is not recognized as an Insights host." msgstr "Este host no se reconoce como un host de Insights." -#: awx/api/views.py:2140 +#: awx/api/views.py:2152 msgid "The Insights Credential for \"{}\" was not found." msgstr "No se encontró la credencial de Insights para \"{}\"." -#: awx/api/views.py:2209 +#: awx/api/views.py:2221 msgid "Cyclical Group association." msgstr "Asociación de grupos cíclica." -#: awx/api/views.py:2482 +#: awx/api/views.py:2499 msgid "Inventory Source List" msgstr "Listado de fuentes del inventario" -#: awx/api/views.py:2495 +#: awx/api/views.py:2512 msgid "Inventory Sources Update" msgstr "Actualización de fuentes de inventario" -#: awx/api/views.py:2525 +#: awx/api/views.py:2542 msgid "Could not start because `can_update` returned False" msgstr "No se pudo iniciar porque `can_update` devolvió False" -#: awx/api/views.py:2533 +#: awx/api/views.py:2550 msgid "No inventory sources to update." msgstr "No hay fuentes de inventario para actualizar." -#: awx/api/views.py:2565 +#: awx/api/views.py:2582 msgid "Cannot delete inventory source." msgstr "No se puede eliminar la fuente del inventario." -#: awx/api/views.py:2573 +#: awx/api/views.py:2590 msgid "Inventory Source Schedules" msgstr "Programaciones de la fuente del inventario" -#: awx/api/views.py:2603 +#: awx/api/views.py:2620 msgid "Notification Templates can only be assigned when source is one of {}." msgstr "" "Plantillas de notificación pueden ser sólo asignadas cuando la fuente es una" " de estas {}." -#: awx/api/views.py:2826 +#: awx/api/views.py:2851 msgid "Job Template Schedules" msgstr "Programación plantilla de trabajo" -#: awx/api/views.py:2846 awx/api/views.py:2862 +#: awx/api/views.py:2871 awx/api/views.py:2882 msgid "Your license does not allow adding surveys." msgstr "Su licencia no permite añadir cuestionarios." -#: awx/api/views.py:2869 +#: awx/api/views.py:2889 msgid "'name' missing from survey spec." msgstr "'name' no encontrado en el especificado cuestionario." -#: awx/api/views.py:2871 +#: awx/api/views.py:2891 msgid "'description' missing from survey spec." msgstr "'description' no encontrado en el especificado cuestionario." -#: awx/api/views.py:2873 +#: awx/api/views.py:2893 msgid "'spec' missing from survey spec." msgstr "'spec' no encontrado en el especificado cuestionario." -#: awx/api/views.py:2875 +#: awx/api/views.py:2895 msgid "'spec' must be a list of items." msgstr "'spec' debe ser una lista de elementos." -#: awx/api/views.py:2877 +#: awx/api/views.py:2897 msgid "'spec' doesn't contain any items." msgstr "'spec' no contiene ningún elemento." -#: awx/api/views.py:2883 +#: awx/api/views.py:2903 #, python-format msgid "Survey question %s is not a json object." msgstr "Pregunta de cuestionario %s no es un objeto JSON." -#: awx/api/views.py:2885 +#: awx/api/views.py:2905 #, python-format msgid "'type' missing from survey question %s." msgstr "'type' no encontrado en la pregunta de cuestionario %s." -#: awx/api/views.py:2887 +#: awx/api/views.py:2907 #, python-format msgid "'question_name' missing from survey question %s." msgstr "'question_name' no aparece en la pregunta de cuestionario %s." -#: awx/api/views.py:2889 +#: awx/api/views.py:2909 #, python-format msgid "'variable' missing from survey question %s." msgstr "'variable' no encontrado en la pregunta de cuestionario %s." -#: awx/api/views.py:2891 +#: awx/api/views.py:2911 #, python-format msgid "'variable' '%(item)s' duplicated in survey question %(survey)s." msgstr "" "'variable' '%(item)s' repetida en la pregunta de cuestionario %(survey)s." -#: awx/api/views.py:2896 +#: awx/api/views.py:2916 #, python-format msgid "'required' missing from survey question %s." msgstr "'required' no encontrado en la pregunta de cuestionario %s." -#: awx/api/views.py:2901 +#: awx/api/views.py:2921 +#, python-brace-format msgid "" -"$encrypted$ is reserved keyword and may not be used as a default for " -"password {}." +"Value {question_default} for '{variable_name}' expected to be a string." msgstr "" -"$encrypted$ es una palabra clave reservada y no puede utilizarse como un " -"valor predeterminado para la contraseña {}." -#: awx/api/views.py:3017 +#: awx/api/views.py:2928 +#, python-brace-format +msgid "" +"$encrypted$ is reserved keyword for password questions and may not be used " +"as a default for '{variable_name}' in survey question {question_position}." +msgstr "" + +#: awx/api/views.py:3049 msgid "Maximum number of labels for {} reached." msgstr "Número máximo de etiquetas para {} alcanzado." -#: awx/api/views.py:3136 +#: awx/api/views.py:3170 msgid "No matching host could be found!" msgstr "¡Ningún servidor indicado pudo ser encontrado!" -#: awx/api/views.py:3139 +#: awx/api/views.py:3173 msgid "Multiple hosts matched the request!" msgstr "¡Varios servidores corresponden a la petición!" -#: awx/api/views.py:3144 +#: awx/api/views.py:3178 msgid "Cannot start automatically, user input required!" msgstr "" "No se puede iniciar automáticamente, !Entrada de datos de usuario necesaria!" -#: awx/api/views.py:3151 +#: awx/api/views.py:3185 msgid "Host callback job already pending." msgstr "Trabajo de callback para el servidor ya está pendiente." -#: awx/api/views.py:3164 +#: awx/api/views.py:3199 msgid "Error starting job!" msgstr "¡Error iniciando trabajo!" -#: awx/api/views.py:3271 +#: awx/api/views.py:3306 +#, python-brace-format msgid "Cannot associate {0} when {1} have been associated." msgstr "No se puede asociar {0} cuando se ha asociado {1}." -#: awx/api/views.py:3296 +#: awx/api/views.py:3331 msgid "Multiple parent relationship not allowed." msgstr "No se permiten múltiples relaciones primarias." -#: awx/api/views.py:3301 +#: awx/api/views.py:3336 msgid "Cycle detected." msgstr "Ciclo detectado." -#: awx/api/views.py:3505 +#: awx/api/views.py:3540 msgid "Workflow Job Template Schedules" msgstr "Programaciones de plantilla de tareas de flujo de trabajo" -#: awx/api/views.py:3650 awx/api/views.py:4217 +#: awx/api/views.py:3685 awx/api/views.py:4268 msgid "Superuser privileges needed." msgstr "Privilegios de superusuario necesarios." -#: awx/api/views.py:3682 +#: awx/api/views.py:3717 msgid "System Job Template Schedules" msgstr "Programación de plantilla de trabajos de sistema." -#: awx/api/views.py:3891 +#: awx/api/views.py:3780 +msgid "POST not allowed for Job launching in version 2 of the api" +msgstr "" + +#: awx/api/views.py:3942 msgid "Job Host Summaries List" msgstr "Lista resumida de trabajos de servidor" -#: awx/api/views.py:3938 +#: awx/api/views.py:3989 msgid "Job Event Children List" msgstr "LIsta de hijos de eventos de trabajo" -#: awx/api/views.py:3947 +#: awx/api/views.py:3998 msgid "Job Event Hosts List" msgstr "Lista de eventos de trabajos de servidor." -#: awx/api/views.py:3957 +#: awx/api/views.py:4008 msgid "Job Events List" msgstr "Lista de eventos de trabajo" -#: awx/api/views.py:4171 +#: awx/api/views.py:4222 msgid "Ad Hoc Command Events List" msgstr "Lista de eventos para comando Ad Hoc" -#: awx/api/views.py:4386 +#: awx/api/views.py:4437 msgid "Error generating stdout download file: {}" msgstr "Error generando la descarga del fichero de salida estándar: {}" -#: awx/api/views.py:4399 +#: awx/api/views.py:4450 #, python-format msgid "Error generating stdout download file: %s" msgstr "Error generando la descarga del fichero de salida estándar: %s" -#: awx/api/views.py:4444 +#: awx/api/views.py:4495 msgid "Delete not allowed while there are pending notifications" msgstr "Eliminar no está permitido mientras existan notificaciones pendientes" -#: awx/api/views.py:4451 +#: awx/api/views.py:4502 msgid "Notification Template Test" msgstr "Prueba de plantilla de notificación" @@ -1210,15 +1240,16 @@ msgstr "Ejemplo de configuración que puede ser diferente para cada usuario." msgid "User" msgstr "Usuario" -#: awx/conf/fields.py:62 +#: awx/conf/fields.py:63 msgid "Enter a valid URL" msgstr "Introduzca una URL válida" -#: awx/conf/fields.py:94 +#: awx/conf/fields.py:95 +#, python-brace-format msgid "\"{input}\" is not a valid string." msgstr "\"{input}\" no es una cadena válida." -#: awx/conf/license.py:19 +#: awx/conf/license.py:22 msgid "Your Tower license does not allow that." msgstr "Su licencia Tower no permite eso." @@ -1235,7 +1266,11 @@ msgstr "Omitir los ajustes que causarán un error cuando comentando/migrando." msgid "Skip commenting out settings in files." msgstr "Omitir la entrada de comentarios para ajustes en ficheros." -#: awx/conf/management/commands/migrate_to_database_settings.py:61 +#: awx/conf/management/commands/migrate_to_database_settings.py:62 +msgid "Skip migrating and only comment out settings in files." +msgstr "" + +#: awx/conf/management/commands/migrate_to_database_settings.py:68 msgid "Backup existing settings files with this suffix." msgstr "" "Hacer copia de seguridad de todos los ficheros de configuración existentes " @@ -1261,7 +1296,7 @@ msgstr "Cambiado" msgid "User-Defaults" msgstr "Parámetros de usuario por defecto" -#: awx/conf/registry.py:151 +#: awx/conf/registry.py:154 msgid "This value has been set manually in a settings file." msgstr "" "Este valor ha sido establecido manualmente en el fichero de configuración." @@ -1334,94 +1369,92 @@ msgstr "Detalles del ajuste" msgid "Logging Connectivity Test" msgstr "Registrando prueba de conectividad" -#: awx/main/access.py:224 +#: awx/main/access.py:44 +msgid "Resource is being used by running jobs." +msgstr "" + +#: awx/main/access.py:237 #, python-format msgid "Bad data found in related field %s." msgstr "Dato incorrecto encontrado en el campo relacionado %s." -#: awx/main/access.py:268 +#: awx/main/access.py:281 msgid "License is missing." msgstr "Licencia no encontrada." -#: awx/main/access.py:270 +#: awx/main/access.py:283 msgid "License has expired." msgstr "La licencia ha expirado." -#: awx/main/access.py:278 +#: awx/main/access.py:291 #, python-format msgid "License count of %s instances has been reached." msgstr "El número de licencias de instancias %s ha sido alcanzado." -#: awx/main/access.py:280 +#: awx/main/access.py:293 #, python-format msgid "License count of %s instances has been exceeded." msgstr "El número de licencias de instancias %s ha sido excedido." -#: awx/main/access.py:282 +#: awx/main/access.py:295 msgid "Host count exceeds available instances." msgstr "El número de servidores excede las instancias disponibles." -#: awx/main/access.py:286 +#: awx/main/access.py:299 #, python-format msgid "Feature %s is not enabled in the active license." msgstr "Funcionalidad %s no está habilitada en la licencia activa." -#: awx/main/access.py:288 +#: awx/main/access.py:301 msgid "Features not found in active license." msgstr "Funcionalidades no encontradas en la licencia activa." -#: awx/main/access.py:534 awx/main/access.py:619 awx/main/access.py:748 -#: awx/main/access.py:801 awx/main/access.py:1063 awx/main/access.py:1263 -#: awx/main/access.py:1725 -msgid "Resource is being used by running jobs" -msgstr "Recurso está siendo usado por trabajos en ejecución" - -#: awx/main/access.py:675 +#: awx/main/access.py:707 msgid "Unable to change inventory on a host." msgstr "Imposible modificar el inventario en un servidor." -#: awx/main/access.py:692 awx/main/access.py:737 +#: awx/main/access.py:724 awx/main/access.py:769 msgid "Cannot associate two items from different inventories." msgstr "No es posible asociar dos elementos de diferentes inventarios." -#: awx/main/access.py:725 +#: awx/main/access.py:757 msgid "Unable to change inventory on a group." msgstr "Imposible cambiar el inventario en un grupo." -#: awx/main/access.py:983 +#: awx/main/access.py:1017 msgid "Unable to change organization on a team." msgstr "Imposible cambiar la organización en un equipo." -#: awx/main/access.py:996 +#: awx/main/access.py:1030 msgid "The {} role cannot be assigned to a team" msgstr "El rol {} no puede ser asignado a un equipo." -#: awx/main/access.py:998 +#: awx/main/access.py:1032 msgid "The admin_role for a User cannot be assigned to a team" msgstr "El admin_role para un usuario no puede ser asignado a un equipo" -#: awx/main/access.py:1443 +#: awx/main/access.py:1479 msgid "Job has been orphaned from its job template." msgstr "Se ha eliminado la plantilla de trabajo de la tarea." -#: awx/main/access.py:1445 +#: awx/main/access.py:1481 msgid "You do not have execute permission to related job template." msgstr "" "No tiene permiso de ejecución para la plantilla de trabajo relacionada." -#: awx/main/access.py:1448 +#: awx/main/access.py:1484 msgid "Job was launched with prompted fields." msgstr "La tarea se ejecutó con campos completados." -#: awx/main/access.py:1450 +#: awx/main/access.py:1486 msgid " Organization level permissions required." msgstr "Se requieren permisos de nivel de organización." -#: awx/main/access.py:1452 +#: awx/main/access.py:1488 msgid " You do not have permission to related resources." msgstr "No tiene permisos para los recursos relacionados." -#: awx/main/access.py:1798 +#: awx/main/access.py:1833 msgid "" "You do not have permission to the workflow job resources required for " "relaunch." @@ -1962,85 +1995,85 @@ msgstr "" msgid "\n" msgstr "\n" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Sudo" msgstr "Sudo" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Su" msgstr "Su" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Pbrun" msgstr "Pbrun" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Pfexec" msgstr "Pfexec" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "DZDO" msgstr "DZDO" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Pmrun" msgstr "Pmrun" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Runas" msgstr "Runas" -#: awx/main/fields.py:56 +#: awx/main/fields.py:57 #, python-format msgid "'%s' is not one of ['%s']" msgstr "'%s' no es uno de ['%s']" -#: awx/main/fields.py:531 +#: awx/main/fields.py:533 #, python-format msgid "cannot be set unless \"%s\" is set" msgstr "no puede establecerse excepto que se defina \"%s\"" -#: awx/main/fields.py:547 +#: awx/main/fields.py:549 #, python-format msgid "required for %s" msgstr "requerido para %s" -#: awx/main/fields.py:571 +#: awx/main/fields.py:573 msgid "must be set when SSH key is encrypted." msgstr "se debe establecer cuando la clave SSH está cifrada." -#: awx/main/fields.py:577 +#: awx/main/fields.py:579 msgid "should not be set when SSH key is not encrypted." msgstr "no se debe establecer cuando la clave SSH no está cifrada." -#: awx/main/fields.py:635 +#: awx/main/fields.py:637 msgid "'dependencies' is not supported for custom credentials." msgstr "'dependencias' no es compatible con las credenciales personalizadas." -#: awx/main/fields.py:649 +#: awx/main/fields.py:651 msgid "\"tower\" is a reserved field name" msgstr "\"tower\" es un nombre de campo reservado" -#: awx/main/fields.py:656 +#: awx/main/fields.py:658 #, python-format msgid "field IDs must be unique (%s)" msgstr "los ID de campo deben ser únicos (%s)" -#: awx/main/fields.py:669 +#: awx/main/fields.py:671 #, python-format msgid "%s not allowed for %s type (%s)" msgstr "%s no está permitido para el tipo %s (%s)" -#: awx/main/fields.py:753 +#: awx/main/fields.py:755 #, python-format msgid "%s uses an undefined field (%s)" msgstr "%s usa un campo indefinido (%s)" -#: awx/main/middleware.py:121 +#: awx/main/middleware.py:157 msgid "Formats of all available named urls" msgstr "Formatos de todas las URL con nombre disponibles" -#: awx/main/middleware.py:122 +#: awx/main/middleware.py:158 msgid "" "Read-only list of key-value pairs that shows the standard format of all " "available named URLs." @@ -2048,15 +2081,15 @@ msgstr "" "Lista de solo lectura de los pares clave-valor que muestra el formato " "estándar de todas las URL con nombre disponibles." -#: awx/main/middleware.py:124 awx/main/middleware.py:134 +#: awx/main/middleware.py:160 awx/main/middleware.py:170 msgid "Named URL" msgstr "URL con nombre" -#: awx/main/middleware.py:131 +#: awx/main/middleware.py:167 msgid "List of all named url graph nodes." msgstr "Lista de todos los nodos gráficos de URL con nombre." -#: awx/main/middleware.py:132 +#: awx/main/middleware.py:168 msgid "" "Read-only list of key-value pairs that exposes named URL graph topology. Use" " this list to programmatically generate named URLs for resources" @@ -2065,51 +2098,51 @@ msgstr "" "gráfica de URL con nombre. Use esta lista para generar URL con nombre para " "recursos mediante programación." -#: awx/main/migrations/_reencrypt.py:23 awx/main/models/notifications.py:33 +#: awx/main/migrations/_reencrypt.py:25 awx/main/models/notifications.py:33 msgid "Email" msgstr "Correo electrónico" -#: awx/main/migrations/_reencrypt.py:24 awx/main/models/notifications.py:34 +#: awx/main/migrations/_reencrypt.py:26 awx/main/models/notifications.py:34 msgid "Slack" msgstr "Slack" -#: awx/main/migrations/_reencrypt.py:25 awx/main/models/notifications.py:35 +#: awx/main/migrations/_reencrypt.py:27 awx/main/models/notifications.py:35 msgid "Twilio" msgstr "Twilio" -#: awx/main/migrations/_reencrypt.py:26 awx/main/models/notifications.py:36 +#: awx/main/migrations/_reencrypt.py:28 awx/main/models/notifications.py:36 msgid "Pagerduty" msgstr "Pagerduty" -#: awx/main/migrations/_reencrypt.py:27 awx/main/models/notifications.py:37 +#: awx/main/migrations/_reencrypt.py:29 awx/main/models/notifications.py:37 msgid "HipChat" msgstr "HipChat" -#: awx/main/migrations/_reencrypt.py:28 awx/main/models/notifications.py:38 +#: awx/main/migrations/_reencrypt.py:30 awx/main/models/notifications.py:38 msgid "Webhook" msgstr "Webhook" -#: awx/main/migrations/_reencrypt.py:29 awx/main/models/notifications.py:39 +#: awx/main/migrations/_reencrypt.py:31 awx/main/models/notifications.py:39 msgid "IRC" msgstr "IRC" -#: awx/main/models/activity_stream.py:24 +#: awx/main/models/activity_stream.py:25 msgid "Entity Created" msgstr "Entidad creada" -#: awx/main/models/activity_stream.py:25 +#: awx/main/models/activity_stream.py:26 msgid "Entity Updated" msgstr "Entidad actualizada" -#: awx/main/models/activity_stream.py:26 +#: awx/main/models/activity_stream.py:27 msgid "Entity Deleted" msgstr "Entidad eliminada" -#: awx/main/models/activity_stream.py:27 +#: awx/main/models/activity_stream.py:28 msgid "Entity Associated with another Entity" msgstr "Entidad asociada con otra entidad" -#: awx/main/models/activity_stream.py:28 +#: awx/main/models/activity_stream.py:29 msgid "Entity was Disassociated with another Entity" msgstr "La entidad fue desasociada de otra entidad" @@ -2135,43 +2168,43 @@ msgstr "Módulo no soportado para comandos ad hoc." msgid "No argument passed to %s module." msgstr "Ningún argumento pasado al módulo %s." -#: awx/main/models/ad_hoc_commands.py:245 awx/main/models/jobs.py:904 +#: awx/main/models/ad_hoc_commands.py:245 awx/main/models/jobs.py:911 msgid "Host Failed" msgstr "Servidor fallido" -#: awx/main/models/ad_hoc_commands.py:246 awx/main/models/jobs.py:905 +#: awx/main/models/ad_hoc_commands.py:246 awx/main/models/jobs.py:912 msgid "Host OK" msgstr "Servidor OK" -#: awx/main/models/ad_hoc_commands.py:247 awx/main/models/jobs.py:908 +#: awx/main/models/ad_hoc_commands.py:247 awx/main/models/jobs.py:915 msgid "Host Unreachable" msgstr "Servidor no alcanzable" -#: awx/main/models/ad_hoc_commands.py:252 awx/main/models/jobs.py:907 +#: awx/main/models/ad_hoc_commands.py:252 awx/main/models/jobs.py:914 msgid "Host Skipped" msgstr "Servidor omitido" -#: awx/main/models/ad_hoc_commands.py:262 awx/main/models/jobs.py:935 +#: awx/main/models/ad_hoc_commands.py:262 awx/main/models/jobs.py:942 msgid "Debug" msgstr "Debug" -#: awx/main/models/ad_hoc_commands.py:263 awx/main/models/jobs.py:936 +#: awx/main/models/ad_hoc_commands.py:263 awx/main/models/jobs.py:943 msgid "Verbose" msgstr "Nivel de detalle" -#: awx/main/models/ad_hoc_commands.py:264 awx/main/models/jobs.py:937 +#: awx/main/models/ad_hoc_commands.py:264 awx/main/models/jobs.py:944 msgid "Deprecated" msgstr "Obsoleto" -#: awx/main/models/ad_hoc_commands.py:265 awx/main/models/jobs.py:938 +#: awx/main/models/ad_hoc_commands.py:265 awx/main/models/jobs.py:945 msgid "Warning" msgstr "Advertencia" -#: awx/main/models/ad_hoc_commands.py:266 awx/main/models/jobs.py:939 +#: awx/main/models/ad_hoc_commands.py:266 awx/main/models/jobs.py:946 msgid "System Warning" msgstr "Advertencia del sistema" -#: awx/main/models/ad_hoc_commands.py:267 awx/main/models/jobs.py:940 +#: awx/main/models/ad_hoc_commands.py:267 awx/main/models/jobs.py:947 #: awx/main/models/unified_jobs.py:64 msgid "Error" msgstr "Error" @@ -2190,27 +2223,27 @@ msgstr "Comprobar" msgid "Scan" msgstr "Escanear" -#: awx/main/models/credential.py:82 +#: awx/main/models/credential.py:86 msgid "Host" msgstr "Servidor" -#: awx/main/models/credential.py:83 +#: awx/main/models/credential.py:87 msgid "The hostname or IP address to use." msgstr "El hostname o dirección IP a utilizar." -#: awx/main/models/credential.py:89 +#: awx/main/models/credential.py:93 msgid "Username" msgstr "Usuario" -#: awx/main/models/credential.py:90 +#: awx/main/models/credential.py:94 msgid "Username for this credential." msgstr "Usuario para este credencial" -#: awx/main/models/credential.py:96 +#: awx/main/models/credential.py:100 msgid "Password" msgstr "Contraseña" -#: awx/main/models/credential.py:97 +#: awx/main/models/credential.py:101 msgid "" "Password for this credential (or \"ASK\" to prompt the user for machine " "credentials)." @@ -2218,43 +2251,43 @@ msgstr "" "Contraseña para este credencial (o \"ASK\" para solicitar al usuario por " "credenciales de máquina)." -#: awx/main/models/credential.py:104 +#: awx/main/models/credential.py:108 msgid "Security Token" msgstr "Token de seguridad" -#: awx/main/models/credential.py:105 +#: awx/main/models/credential.py:109 msgid "Security Token for this credential" msgstr "Token de seguridad para este credencial" -#: awx/main/models/credential.py:111 +#: awx/main/models/credential.py:115 msgid "Project" msgstr "Proyecto" -#: awx/main/models/credential.py:112 +#: awx/main/models/credential.py:116 msgid "The identifier for the project." msgstr "El identificador para el proyecto" -#: awx/main/models/credential.py:118 +#: awx/main/models/credential.py:122 msgid "Domain" msgstr "Dominio" -#: awx/main/models/credential.py:119 +#: awx/main/models/credential.py:123 msgid "The identifier for the domain." msgstr "El identificador para el dominio." -#: awx/main/models/credential.py:124 +#: awx/main/models/credential.py:128 msgid "SSH private key" msgstr "Clave privada SSH" -#: awx/main/models/credential.py:125 +#: awx/main/models/credential.py:129 msgid "RSA or DSA private key to be used instead of password." msgstr "Clave privada RSA o DSA a ser utilizada en vez de una contraseña." -#: awx/main/models/credential.py:131 +#: awx/main/models/credential.py:135 msgid "SSH key unlock" msgstr "Desbloquear clave SSH" -#: awx/main/models/credential.py:132 +#: awx/main/models/credential.py:136 msgid "" "Passphrase to unlock SSH private key if encrypted (or \"ASK\" to prompt the " "user for machine credentials)." @@ -2262,51 +2295,51 @@ msgstr "" "Frase de contraseña para desbloquear la clave privada SSH si está cifrada (o" " \"ASK\" para solicitar al usuario por credenciales de máquina)." -#: awx/main/models/credential.py:139 +#: awx/main/models/credential.py:143 msgid "None" msgstr "Ninguno" -#: awx/main/models/credential.py:140 +#: awx/main/models/credential.py:144 msgid "Privilege escalation method." msgstr "Método de elevación de privilegios." -#: awx/main/models/credential.py:146 +#: awx/main/models/credential.py:150 msgid "Privilege escalation username." msgstr "Usuario para la elevación de privilegios." -#: awx/main/models/credential.py:152 +#: awx/main/models/credential.py:156 msgid "Password for privilege escalation method." msgstr "Contraseña para el método de elevación de privilegios" -#: awx/main/models/credential.py:158 +#: awx/main/models/credential.py:162 msgid "Vault password (or \"ASK\" to prompt the user)." msgstr "Contraseña de Vault (o \"ASK\" para solicitar al usuario)." -#: awx/main/models/credential.py:162 +#: awx/main/models/credential.py:166 msgid "Whether to use the authorize mechanism." msgstr "Si se utilizará el mecanismo de autentificación." -#: awx/main/models/credential.py:168 +#: awx/main/models/credential.py:172 msgid "Password used by the authorize mechanism." msgstr "Contraseña utilizada para el mecanismo de autentificación." -#: awx/main/models/credential.py:174 +#: awx/main/models/credential.py:178 msgid "Client Id or Application Id for the credential" msgstr "Id del cliente o Id de aplicación para el credencial" -#: awx/main/models/credential.py:180 +#: awx/main/models/credential.py:184 msgid "Secret Token for this credential" msgstr "Token secreto para este credencial" -#: awx/main/models/credential.py:186 +#: awx/main/models/credential.py:190 msgid "Subscription identifier for this credential" msgstr "Identificador de suscripción para este credencial" -#: awx/main/models/credential.py:192 +#: awx/main/models/credential.py:196 msgid "Tenant identifier for this credential" msgstr "Identificador de inquilino [Tenant] para este credencial" -#: awx/main/models/credential.py:216 +#: awx/main/models/credential.py:220 msgid "" "Specify the type of credential you want to create. Refer to the Ansible " "Tower documentation for details on each type." @@ -2314,7 +2347,7 @@ msgstr "" "Especifique el tipo de credencial que desea crear. Consulte la documentación" " de Ansible Tower para obtener información sobre cada tipo." -#: awx/main/models/credential.py:230 awx/main/models/credential.py:416 +#: awx/main/models/credential.py:234 awx/main/models/credential.py:420 msgid "" "Enter inputs using either JSON or YAML syntax. Use the radio button to " "toggle between the two. Refer to the Ansible Tower documentation for example" @@ -2324,31 +2357,31 @@ msgstr "" "selección para alternar entre las dos opciones. Consulte la documentación de" " Ansible Tower para ver sintaxis de ejemplo." -#: awx/main/models/credential.py:397 +#: awx/main/models/credential.py:401 msgid "Machine" msgstr "Máquina" -#: awx/main/models/credential.py:398 +#: awx/main/models/credential.py:402 msgid "Vault" msgstr "Vault" -#: awx/main/models/credential.py:399 +#: awx/main/models/credential.py:403 msgid "Network" msgstr "Red" -#: awx/main/models/credential.py:400 +#: awx/main/models/credential.py:404 msgid "Source Control" msgstr "Fuente de control" -#: awx/main/models/credential.py:401 +#: awx/main/models/credential.py:405 msgid "Cloud" msgstr "Nube" -#: awx/main/models/credential.py:402 +#: awx/main/models/credential.py:406 msgid "Insights" msgstr "Insights" -#: awx/main/models/credential.py:423 +#: awx/main/models/credential.py:427 msgid "" "Enter injectors using either JSON or YAML syntax. Use the radio button to " "toggle between the two. Refer to the Ansible Tower documentation for example" @@ -2358,6 +2391,11 @@ msgstr "" "selección para alternar entre las dos opciones. Consulte la documentación de" " Ansible Tower para ver sintaxis de ejemplo." +#: awx/main/models/credential.py:478 +#, python-format +msgid "adding %s credential type" +msgstr "" + #: awx/main/models/fact.py:25 msgid "Host for the facts that the fact scan captured." msgstr "Servidor para los facts que el escaneo de facts capture." @@ -2376,11 +2414,11 @@ msgstr "" "Estructura de JSON arbitraria de módulos facts capturados en la fecha y hora" " para un único servidor." -#: awx/main/models/ha.py:76 +#: awx/main/models/ha.py:78 msgid "Instances that are members of this InstanceGroup" msgstr "Las instancias que son miembros de este grupo de instancias" -#: awx/main/models/ha.py:81 +#: awx/main/models/ha.py:83 msgid "Instance Group to remotely control this group." msgstr "Grupo de instancias para controlar remotamente este grupo." @@ -2582,38 +2620,42 @@ msgid "Google Compute Engine" msgstr "Google Compute Engine" #: awx/main/models/inventory.py:870 -msgid "Microsoft Azure Classic (deprecated)" -msgstr "Microsoft Azure Classic (obsoleto)" - -#: awx/main/models/inventory.py:871 msgid "Microsoft Azure Resource Manager" msgstr "Microsoft Azure Resource Manager" -#: awx/main/models/inventory.py:872 +#: awx/main/models/inventory.py:871 msgid "VMware vCenter" msgstr "VMware vCenter" -#: awx/main/models/inventory.py:873 +#: awx/main/models/inventory.py:872 msgid "Red Hat Satellite 6" msgstr "Red Hat Satellite 6" -#: awx/main/models/inventory.py:874 +#: awx/main/models/inventory.py:873 msgid "Red Hat CloudForms" msgstr "Red Hat CloudForms" -#: awx/main/models/inventory.py:875 +#: awx/main/models/inventory.py:874 msgid "OpenStack" msgstr "OpenStack" +#: awx/main/models/inventory.py:875 +msgid "oVirt4" +msgstr "" + #: awx/main/models/inventory.py:876 +msgid "Ansible Tower" +msgstr "Ansible Tower" + +#: awx/main/models/inventory.py:877 msgid "Custom Script" msgstr "Script personalizado" -#: awx/main/models/inventory.py:993 +#: awx/main/models/inventory.py:994 msgid "Inventory source variables in YAML or JSON format." msgstr "Variables para la fuente del inventario en formato YAML o JSON." -#: awx/main/models/inventory.py:1012 +#: awx/main/models/inventory.py:1013 msgid "" "Comma-separated list of filter expressions (EC2 only). Hosts are imported " "when ANY of the filters match." @@ -2621,79 +2663,79 @@ msgstr "" "Lista de expresiones de filtrado separadas por coma (sólo EC2). Servidores " "son importados cuando ALGÚN filtro coincide." -#: awx/main/models/inventory.py:1018 +#: awx/main/models/inventory.py:1019 msgid "Limit groups automatically created from inventory source (EC2 only)." msgstr "" "Limitar grupos creados automáticamente desde la fuente del inventario (sólo " "EC2)" -#: awx/main/models/inventory.py:1022 +#: awx/main/models/inventory.py:1023 msgid "Overwrite local groups and hosts from remote inventory source." msgstr "" "Sobrescribir grupos locales y servidores desde una fuente remota del " "inventario." -#: awx/main/models/inventory.py:1026 +#: awx/main/models/inventory.py:1027 msgid "Overwrite local variables from remote inventory source." msgstr "" "Sobrescribir las variables locales desde una fuente remota del inventario." -#: awx/main/models/inventory.py:1031 awx/main/models/jobs.py:159 +#: awx/main/models/inventory.py:1032 awx/main/models/jobs.py:160 #: awx/main/models/projects.py:117 msgid "The amount of time (in seconds) to run before the task is canceled." msgstr "" "La cantidad de tiempo (en segundos) para ejecutar antes de que se cancele la" " tarea." -#: awx/main/models/inventory.py:1064 +#: awx/main/models/inventory.py:1065 msgid "Image ID" msgstr "Id de imagen" -#: awx/main/models/inventory.py:1065 +#: awx/main/models/inventory.py:1066 msgid "Availability Zone" msgstr "Zona de disponibilidad" -#: awx/main/models/inventory.py:1066 +#: awx/main/models/inventory.py:1067 msgid "Account" msgstr "Cuenta" -#: awx/main/models/inventory.py:1067 +#: awx/main/models/inventory.py:1068 msgid "Instance ID" msgstr "ID de instancia" -#: awx/main/models/inventory.py:1068 +#: awx/main/models/inventory.py:1069 msgid "Instance State" msgstr "Estado de la instancia" -#: awx/main/models/inventory.py:1069 +#: awx/main/models/inventory.py:1070 msgid "Instance Type" msgstr "Tipo de instancia" -#: awx/main/models/inventory.py:1070 +#: awx/main/models/inventory.py:1071 msgid "Key Name" msgstr "Nombre clave" -#: awx/main/models/inventory.py:1071 +#: awx/main/models/inventory.py:1072 msgid "Region" msgstr "Región" -#: awx/main/models/inventory.py:1072 +#: awx/main/models/inventory.py:1073 msgid "Security Group" msgstr "Grupo de seguridad" -#: awx/main/models/inventory.py:1073 +#: awx/main/models/inventory.py:1074 msgid "Tags" msgstr "Etiquetas" -#: awx/main/models/inventory.py:1074 +#: awx/main/models/inventory.py:1075 msgid "Tag None" msgstr "Etiqueta ninguna" -#: awx/main/models/inventory.py:1075 +#: awx/main/models/inventory.py:1076 msgid "VPC ID" msgstr "VPC ID" -#: awx/main/models/inventory.py:1138 +#: awx/main/models/inventory.py:1145 #, python-format msgid "" "Cloud-based inventory sources (such as %s) require credentials for the " @@ -2702,30 +2744,36 @@ msgstr "" "Fuentes de inventario basados en Cloud (como %s) requieren credenciales para" " identificar los correspondientes servicios cloud." -#: awx/main/models/inventory.py:1145 +#: awx/main/models/inventory.py:1152 msgid "Credential is required for a cloud source." msgstr "Un credencial es necesario para una fuente cloud." -#: awx/main/models/inventory.py:1167 +#: awx/main/models/inventory.py:1155 +msgid "" +"Credentials of type machine, source control, insights and vault are " +"disallowed for custom inventory sources." +msgstr "" + +#: awx/main/models/inventory.py:1179 #, python-format msgid "Invalid %(source)s region: %(region)s" msgstr "Región %(source)s inválida: %(region)s" -#: awx/main/models/inventory.py:1191 +#: awx/main/models/inventory.py:1203 #, python-format msgid "Invalid filter expression: %(filter)s" msgstr "Expresión de filtro inválida: %(filter)s" -#: awx/main/models/inventory.py:1212 +#: awx/main/models/inventory.py:1224 #, python-format msgid "Invalid group by choice: %(choice)s" msgstr "Grupo escogido inválido: %(choice)s" -#: awx/main/models/inventory.py:1247 +#: awx/main/models/inventory.py:1259 msgid "Project containing inventory file used as source." msgstr "Proyecto que contiene el archivo de inventario usado como fuente." -#: awx/main/models/inventory.py:1395 +#: awx/main/models/inventory.py:1407 #, python-format msgid "" "Unable to configure this item for cloud sync. It is already managed by %s." @@ -2733,7 +2781,7 @@ msgstr "" "Imposible configurar este elemento para sincronización cloud. Está " "administrado actualmente por %s." -#: awx/main/models/inventory.py:1405 +#: awx/main/models/inventory.py:1417 msgid "" "More than one SCM-based inventory source with update on project update per-" "inventory not allowed." @@ -2741,7 +2789,7 @@ msgstr "" "No se permite más de una fuente de inventario basada en SCM con " "actualización en la actualización del proyecto por inventario." -#: awx/main/models/inventory.py:1412 +#: awx/main/models/inventory.py:1424 msgid "" "Cannot update SCM-based inventory source on launch if set to update on " "project update. Instead, configure the corresponding source project to " @@ -2752,30 +2800,30 @@ msgstr "" "su lugar, configure el proyecto de fuente correspondiente para actualizar en" " la ejecución." -#: awx/main/models/inventory.py:1418 +#: awx/main/models/inventory.py:1430 msgid "SCM type sources must set `overwrite_vars` to `true`." msgstr "Las fuentes de tipo SCM deben configurar `overwrite_vars` en `true`." -#: awx/main/models/inventory.py:1423 +#: awx/main/models/inventory.py:1435 msgid "Cannot set source_path if not SCM type." msgstr "No se puede configurar source_path si no es del tipo SCM." -#: awx/main/models/inventory.py:1448 +#: awx/main/models/inventory.py:1460 msgid "" "Inventory files from this Project Update were used for the inventory update." msgstr "" "Los archivos de inventario de esta actualización de proyecto se utilizaron " "para la actualización del inventario." -#: awx/main/models/inventory.py:1561 +#: awx/main/models/inventory.py:1573 msgid "Inventory script contents" msgstr "Contenido del script de inventario" -#: awx/main/models/inventory.py:1566 +#: awx/main/models/inventory.py:1578 msgid "Organization owning this inventory script" msgstr "Organización propietario de este script de inventario" -#: awx/main/models/jobs.py:65 +#: awx/main/models/jobs.py:66 msgid "" "If enabled, textual changes made to any templated files on the host are " "shown in the standard output" @@ -2783,7 +2831,7 @@ msgstr "" "Si se habilita, los cambios de texto realizados en cualquier archivo de " "plantilla en el host se muestran en la salida estándar" -#: awx/main/models/jobs.py:163 +#: awx/main/models/jobs.py:164 msgid "" "If enabled, Tower will act as an Ansible Fact Cache Plugin; persisting facts" " at the end of a playbook run to the database and caching facts for use by " @@ -2794,41 +2842,41 @@ msgstr "" "base de datos y almacenará en caché los eventos que son utilizados por " "Ansible." -#: awx/main/models/jobs.py:172 +#: awx/main/models/jobs.py:173 msgid "You must provide an SSH credential." msgstr "Debe proporcionar una credencial SSH." -#: awx/main/models/jobs.py:180 +#: awx/main/models/jobs.py:181 msgid "You must provide a Vault credential." msgstr "Debe proporcionar una credencial de Vault." -#: awx/main/models/jobs.py:316 +#: awx/main/models/jobs.py:317 msgid "Job Template must provide 'inventory' or allow prompting for it." msgstr "" "La plantilla de trabajo debe proporcionar 'inventory' o permitir " "solicitarlo." -#: awx/main/models/jobs.py:320 +#: awx/main/models/jobs.py:321 msgid "Job Template must provide 'credential' or allow prompting for it." msgstr "" "La plantilla de trabajo debe proporcionar 'inventory' o permitir " "solicitarlo." -#: awx/main/models/jobs.py:422 +#: awx/main/models/jobs.py:427 msgid "Cannot override job_type to or from a scan job." msgstr "No se puede sustituir job_type a o desde un trabajo de escaneo." -#: awx/main/models/jobs.py:488 awx/main/models/projects.py:263 +#: awx/main/models/jobs.py:493 awx/main/models/projects.py:263 msgid "SCM Revision" msgstr "Revisión SCM" -#: awx/main/models/jobs.py:489 +#: awx/main/models/jobs.py:494 msgid "The SCM Revision from the Project used for this job, if available" msgstr "" "La revisión SCM desde el proyecto usado para este trabajo, si está " "disponible" -#: awx/main/models/jobs.py:497 +#: awx/main/models/jobs.py:502 msgid "" "The SCM Refresh task used to make sure the playbooks were available for the " "job run" @@ -2836,105 +2884,105 @@ msgstr "" "La tarea de actualización de SCM utilizado para asegurarse que los playbooks" " estaban disponibles para la ejecución del trabajo" -#: awx/main/models/jobs.py:802 +#: awx/main/models/jobs.py:809 msgid "job host summaries" msgstr "Resumen de trabajos de servidor" -#: awx/main/models/jobs.py:906 +#: awx/main/models/jobs.py:913 msgid "Host Failure" msgstr "Fallo del servidor" -#: awx/main/models/jobs.py:909 awx/main/models/jobs.py:923 +#: awx/main/models/jobs.py:916 awx/main/models/jobs.py:930 msgid "No Hosts Remaining" msgstr "No más servidores" -#: awx/main/models/jobs.py:910 +#: awx/main/models/jobs.py:917 msgid "Host Polling" msgstr "Sondeo al servidor" -#: awx/main/models/jobs.py:911 +#: awx/main/models/jobs.py:918 msgid "Host Async OK" msgstr "Servidor Async OK" -#: awx/main/models/jobs.py:912 +#: awx/main/models/jobs.py:919 msgid "Host Async Failure" msgstr "Servidor Async fallido" -#: awx/main/models/jobs.py:913 +#: awx/main/models/jobs.py:920 msgid "Item OK" msgstr "Elemento OK" -#: awx/main/models/jobs.py:914 +#: awx/main/models/jobs.py:921 msgid "Item Failed" msgstr "Elemento fallido" -#: awx/main/models/jobs.py:915 +#: awx/main/models/jobs.py:922 msgid "Item Skipped" msgstr "Elemento omitido" -#: awx/main/models/jobs.py:916 +#: awx/main/models/jobs.py:923 msgid "Host Retry" msgstr "Reintentar servidor" -#: awx/main/models/jobs.py:918 +#: awx/main/models/jobs.py:925 msgid "File Difference" msgstr "Diferencias del fichero" -#: awx/main/models/jobs.py:919 +#: awx/main/models/jobs.py:926 msgid "Playbook Started" msgstr "Playbook iniciado" -#: awx/main/models/jobs.py:920 +#: awx/main/models/jobs.py:927 msgid "Running Handlers" msgstr "Handlers ejecutándose" -#: awx/main/models/jobs.py:921 +#: awx/main/models/jobs.py:928 msgid "Including File" msgstr "Incluyendo fichero" -#: awx/main/models/jobs.py:922 +#: awx/main/models/jobs.py:929 msgid "No Hosts Matched" msgstr "Ningún servidor corresponde" -#: awx/main/models/jobs.py:924 +#: awx/main/models/jobs.py:931 msgid "Task Started" msgstr "Tarea iniciada" -#: awx/main/models/jobs.py:926 +#: awx/main/models/jobs.py:933 msgid "Variables Prompted" msgstr "Variables solicitadas" -#: awx/main/models/jobs.py:927 +#: awx/main/models/jobs.py:934 msgid "Gathering Facts" msgstr "Obteniendo facts" -#: awx/main/models/jobs.py:928 +#: awx/main/models/jobs.py:935 msgid "internal: on Import for Host" msgstr "internal: en la importación para el servidor" -#: awx/main/models/jobs.py:929 +#: awx/main/models/jobs.py:936 msgid "internal: on Not Import for Host" msgstr "internal: en la no importación para el servidor" -#: awx/main/models/jobs.py:930 +#: awx/main/models/jobs.py:937 msgid "Play Started" msgstr "Jugada iniciada" -#: awx/main/models/jobs.py:931 +#: awx/main/models/jobs.py:938 msgid "Playbook Complete" msgstr "Playbook terminado" -#: awx/main/models/jobs.py:1363 +#: awx/main/models/jobs.py:1351 msgid "Remove jobs older than a certain number of days" msgstr "Eliminar trabajos más antiguos que el ńumero de días especificado" -#: awx/main/models/jobs.py:1364 +#: awx/main/models/jobs.py:1352 msgid "Remove activity stream entries older than a certain number of days" msgstr "" "Eliminar entradas del flujo de actividad más antiguos que el número de días " "especificado" -#: awx/main/models/jobs.py:1365 +#: awx/main/models/jobs.py:1353 msgid "Purge and/or reduce the granularity of system tracking data" msgstr "" "Limpiar y/o reducir la granularidad de los datos del sistema de rastreo" @@ -3358,7 +3406,7 @@ msgstr "Excepción conectando a Twilio: {}" msgid "Error sending notification webhook: {}" msgstr "Error enviando notificación weebhook: {}" -#: awx/main/scheduler/__init__.py:184 +#: awx/main/scheduler/task_manager.py:197 msgid "" "Job spawned from workflow could not start because it was not in the right " "state or required manual credentials" @@ -3366,7 +3414,7 @@ msgstr "" "Trabajo generado desde un flujo de trabajo no pudo ser iniciado porque no " "tenía el estado correcto o credenciales manuales eran solicitados." -#: awx/main/scheduler/__init__.py:188 +#: awx/main/scheduler/task_manager.py:201 msgid "" "Job spawned from workflow could not start because it was missing a related " "resource such as project or inventory" @@ -3386,7 +3434,7 @@ msgstr "Licencia de Ansible Tower expirará pronto" msgid "status_str must be either succeeded or failed" msgstr "status_str debe ser 'succeeded' o 'failed'" -#: awx/main/tasks.py:1531 +#: awx/main/tasks.py:1549 msgid "Dependent inventory update {} was canceled." msgstr "Se canceló la actualización del inventario dependiente {}." @@ -3395,38 +3443,38 @@ msgstr "Se canceló la actualización del inventario dependiente {}." msgid "Unable to convert \"%s\" to boolean" msgstr "Imposible convertir \"%s\" a booleano" -#: awx/main/utils/common.py:209 +#: awx/main/utils/common.py:235 #, python-format msgid "Unsupported SCM type \"%s\"" msgstr "Tipo de SCM no soportado \"%s\"" -#: awx/main/utils/common.py:216 awx/main/utils/common.py:228 -#: awx/main/utils/common.py:247 +#: awx/main/utils/common.py:242 awx/main/utils/common.py:254 +#: awx/main/utils/common.py:273 #, python-format msgid "Invalid %s URL" msgstr "URL %s inválida" -#: awx/main/utils/common.py:218 awx/main/utils/common.py:257 +#: awx/main/utils/common.py:244 awx/main/utils/common.py:283 #, python-format msgid "Unsupported %s URL" msgstr "URL %s no soportada" -#: awx/main/utils/common.py:259 +#: awx/main/utils/common.py:285 #, python-format msgid "Unsupported host \"%s\" for file:// URL" msgstr "Servidor \"%s\" no soportado para URL file://" -#: awx/main/utils/common.py:261 +#: awx/main/utils/common.py:287 #, python-format msgid "Host is required for %s URL" msgstr "Servidor es obligatorio para URL %s" -#: awx/main/utils/common.py:279 +#: awx/main/utils/common.py:305 #, python-format msgid "Username must be \"git\" for SSH access to %s." msgstr "Usuario debe ser \"git\" para acceso SSH a %s." -#: awx/main/utils/common.py:285 +#: awx/main/utils/common.py:311 #, python-format msgid "Username must be \"hg\" for SSH access to %s." msgstr "Usuario debe ser \"hg\" para acceso SSH a %s." @@ -3550,287 +3598,287 @@ msgstr "Error de servidor" msgid "A server error has occurred." msgstr "Un error en el servidor ha ocurrido." -#: awx/settings/defaults.py:664 +#: awx/settings/defaults.py:665 msgid "US East (Northern Virginia)" msgstr "Este de EE.UU. (Virginia del norte)" -#: awx/settings/defaults.py:665 +#: awx/settings/defaults.py:666 msgid "US East (Ohio)" msgstr "Este de EE.UU. (Ohio)" -#: awx/settings/defaults.py:666 +#: awx/settings/defaults.py:667 msgid "US West (Oregon)" msgstr "Oeste de EE.UU. (Oregón)" -#: awx/settings/defaults.py:667 +#: awx/settings/defaults.py:668 msgid "US West (Northern California)" msgstr "Oeste de EE.UU (California del norte)" -#: awx/settings/defaults.py:668 +#: awx/settings/defaults.py:669 msgid "Canada (Central)" msgstr "Canada (Central)" -#: awx/settings/defaults.py:669 +#: awx/settings/defaults.py:670 msgid "EU (Frankfurt)" msgstr "UE (Fráncfort)" -#: awx/settings/defaults.py:670 +#: awx/settings/defaults.py:671 msgid "EU (Ireland)" msgstr "UE (Irlanda)" -#: awx/settings/defaults.py:671 +#: awx/settings/defaults.py:672 msgid "EU (London)" msgstr "UE (Londres)" -#: awx/settings/defaults.py:672 +#: awx/settings/defaults.py:673 msgid "Asia Pacific (Singapore)" msgstr "Asia Pacífico (Singapur)" -#: awx/settings/defaults.py:673 +#: awx/settings/defaults.py:674 msgid "Asia Pacific (Sydney)" msgstr "Asia Pacífico (Sídney)" -#: awx/settings/defaults.py:674 +#: awx/settings/defaults.py:675 msgid "Asia Pacific (Tokyo)" msgstr "Asia Pacífico (Tokio)" -#: awx/settings/defaults.py:675 +#: awx/settings/defaults.py:676 msgid "Asia Pacific (Seoul)" msgstr "Asia Pacífico (Seúl)" -#: awx/settings/defaults.py:676 +#: awx/settings/defaults.py:677 msgid "Asia Pacific (Mumbai)" msgstr "Asia Pacífico (Bombay)" -#: awx/settings/defaults.py:677 +#: awx/settings/defaults.py:678 msgid "South America (Sao Paulo)" msgstr "América del sur (São Paulo)" -#: awx/settings/defaults.py:678 +#: awx/settings/defaults.py:679 msgid "US West (GovCloud)" msgstr "Oeste de EE.UU. (GovCloud)" -#: awx/settings/defaults.py:679 +#: awx/settings/defaults.py:680 msgid "China (Beijing)" msgstr "China (Pekín)" -#: awx/settings/defaults.py:728 +#: awx/settings/defaults.py:729 msgid "US East 1 (B)" msgstr "Este de EE. UU. 1 (B)" -#: awx/settings/defaults.py:729 +#: awx/settings/defaults.py:730 msgid "US East 1 (C)" msgstr "Este de EE. UU. 1 (C)" -#: awx/settings/defaults.py:730 +#: awx/settings/defaults.py:731 msgid "US East 1 (D)" msgstr "Este de EE. UU. 1 (D)" -#: awx/settings/defaults.py:731 +#: awx/settings/defaults.py:732 msgid "US East 4 (A)" msgstr "Este de EE. UU. 4 (A)" -#: awx/settings/defaults.py:732 +#: awx/settings/defaults.py:733 msgid "US East 4 (B)" msgstr "Este de EE. UU. 4 (B)" -#: awx/settings/defaults.py:733 +#: awx/settings/defaults.py:734 msgid "US East 4 (C)" msgstr "Este de EE. UU. 4 (C)" -#: awx/settings/defaults.py:734 +#: awx/settings/defaults.py:735 msgid "US Central (A)" msgstr "EE.UU. Central (A)" -#: awx/settings/defaults.py:735 +#: awx/settings/defaults.py:736 msgid "US Central (B)" msgstr "EE.UU. Central (B)" -#: awx/settings/defaults.py:736 +#: awx/settings/defaults.py:737 msgid "US Central (C)" msgstr "EE.UU. Central (C)" -#: awx/settings/defaults.py:737 +#: awx/settings/defaults.py:738 msgid "US Central (F)" msgstr "EE.UU. Central (F)" -#: awx/settings/defaults.py:738 +#: awx/settings/defaults.py:739 msgid "US West (A)" msgstr "Oeste de EE. UU. (A)" -#: awx/settings/defaults.py:739 +#: awx/settings/defaults.py:740 msgid "US West (B)" msgstr "Oeste de EE. UU. (B)" -#: awx/settings/defaults.py:740 +#: awx/settings/defaults.py:741 msgid "US West (C)" msgstr "Oeste de EE. UU. (C)" -#: awx/settings/defaults.py:741 +#: awx/settings/defaults.py:742 msgid "Europe West 1 (B)" msgstr "Oeste de Europa 1 (B)" -#: awx/settings/defaults.py:742 +#: awx/settings/defaults.py:743 msgid "Europe West 1 (C)" msgstr "Oeste de Europa 1 (C)" -#: awx/settings/defaults.py:743 +#: awx/settings/defaults.py:744 msgid "Europe West 1 (D)" msgstr "Oeste de Europa 1 (D)" -#: awx/settings/defaults.py:744 +#: awx/settings/defaults.py:745 msgid "Europe West 2 (A)" msgstr "Oeste de Europa 2 (A)" -#: awx/settings/defaults.py:745 +#: awx/settings/defaults.py:746 msgid "Europe West 2 (B)" msgstr "Oeste de Europa 2 (B)" -#: awx/settings/defaults.py:746 +#: awx/settings/defaults.py:747 msgid "Europe West 2 (C)" msgstr "Oeste de Europa 2 (C)" -#: awx/settings/defaults.py:747 +#: awx/settings/defaults.py:748 msgid "Asia East (A)" msgstr "Este de Asia (A)" -#: awx/settings/defaults.py:748 +#: awx/settings/defaults.py:749 msgid "Asia East (B)" msgstr "Este de Asia (B)" -#: awx/settings/defaults.py:749 +#: awx/settings/defaults.py:750 msgid "Asia East (C)" msgstr "Este de Asia (C)" -#: awx/settings/defaults.py:750 +#: awx/settings/defaults.py:751 msgid "Asia Southeast (A)" msgstr "Sudeste de Asia (A)" -#: awx/settings/defaults.py:751 +#: awx/settings/defaults.py:752 msgid "Asia Southeast (B)" msgstr "Sudeste de Asia (B)" -#: awx/settings/defaults.py:752 +#: awx/settings/defaults.py:753 msgid "Asia Northeast (A)" msgstr "Noreste de Asia (A)" -#: awx/settings/defaults.py:753 +#: awx/settings/defaults.py:754 msgid "Asia Northeast (B)" msgstr "Noreste de Asia (B)" -#: awx/settings/defaults.py:754 +#: awx/settings/defaults.py:755 msgid "Asia Northeast (C)" msgstr "Noreste de Asia (C)" -#: awx/settings/defaults.py:755 +#: awx/settings/defaults.py:756 msgid "Australia Southeast (A)" msgstr "Sudeste de Australia (A)" -#: awx/settings/defaults.py:756 +#: awx/settings/defaults.py:757 msgid "Australia Southeast (B)" msgstr "Sudeste de Australia (B)" -#: awx/settings/defaults.py:757 +#: awx/settings/defaults.py:758 msgid "Australia Southeast (C)" msgstr "Sudeste de Australia (C)" -#: awx/settings/defaults.py:781 +#: awx/settings/defaults.py:780 msgid "US East" msgstr "Este de EE.UU." -#: awx/settings/defaults.py:782 +#: awx/settings/defaults.py:781 msgid "US East 2" msgstr "Este de EE.UU. 2" -#: awx/settings/defaults.py:783 +#: awx/settings/defaults.py:782 msgid "US Central" msgstr "EE.UU. Central" -#: awx/settings/defaults.py:784 +#: awx/settings/defaults.py:783 msgid "US North Central" msgstr "Norte-centro de EE.UU." -#: awx/settings/defaults.py:785 +#: awx/settings/defaults.py:784 msgid "US South Central" msgstr "Sur-Centro de EE.UU." -#: awx/settings/defaults.py:786 +#: awx/settings/defaults.py:785 msgid "US West Central" msgstr "Oeste central de EE. UU." -#: awx/settings/defaults.py:787 +#: awx/settings/defaults.py:786 msgid "US West" msgstr "Oeste de EE.UU." -#: awx/settings/defaults.py:788 +#: awx/settings/defaults.py:787 msgid "US West 2" msgstr "Oeste de EE. UU. 2" -#: awx/settings/defaults.py:789 +#: awx/settings/defaults.py:788 msgid "Canada East" msgstr "Este de Canadá" -#: awx/settings/defaults.py:790 +#: awx/settings/defaults.py:789 msgid "Canada Central" msgstr "Canadá Central" -#: awx/settings/defaults.py:791 +#: awx/settings/defaults.py:790 msgid "Brazil South" msgstr "Sur de Brasil" -#: awx/settings/defaults.py:792 +#: awx/settings/defaults.py:791 msgid "Europe North" msgstr "Norte de Europa" -#: awx/settings/defaults.py:793 +#: awx/settings/defaults.py:792 msgid "Europe West" msgstr "Oeste de Europa" -#: awx/settings/defaults.py:794 +#: awx/settings/defaults.py:793 msgid "UK West" msgstr "Oeste del Reino Unido" -#: awx/settings/defaults.py:795 +#: awx/settings/defaults.py:794 msgid "UK South" msgstr "Sur del Reino Unido" -#: awx/settings/defaults.py:796 +#: awx/settings/defaults.py:795 msgid "Asia East" msgstr "Este de Asia" -#: awx/settings/defaults.py:797 +#: awx/settings/defaults.py:796 msgid "Asia Southeast" msgstr "Sudeste de Asia" -#: awx/settings/defaults.py:798 +#: awx/settings/defaults.py:797 msgid "Australia East" msgstr "Este de Australia" -#: awx/settings/defaults.py:799 +#: awx/settings/defaults.py:798 msgid "Australia Southeast" msgstr "Sudeste de Australia" -#: awx/settings/defaults.py:800 +#: awx/settings/defaults.py:799 msgid "India West" msgstr "Oeste de India" -#: awx/settings/defaults.py:801 +#: awx/settings/defaults.py:800 msgid "India South" msgstr "Sur de India" -#: awx/settings/defaults.py:802 +#: awx/settings/defaults.py:801 msgid "Japan East" msgstr "Este de Japón" -#: awx/settings/defaults.py:803 +#: awx/settings/defaults.py:802 msgid "Japan West" msgstr "Oeste de Japón" -#: awx/settings/defaults.py:804 +#: awx/settings/defaults.py:803 msgid "Korea Central" msgstr "Corea central" -#: awx/settings/defaults.py:805 +#: awx/settings/defaults.py:804 msgid "Korea South" msgstr "Sur de Corea" @@ -4593,6 +4641,7 @@ msgid "SAML Team Map" msgstr "Mapa de equipo SAML" #: awx/sso/fields.py:123 +#, python-brace-format msgid "Invalid connection option(s): {invalid_options}." msgstr "Opción(es) de conexión inválida(s): {invalid_options}." @@ -4609,17 +4658,20 @@ msgid "Subtree" msgstr "Árbol hijo" #: awx/sso/fields.py:214 +#, python-brace-format msgid "Expected a list of three items but got {length} instead." msgstr "" "Esperado una lista de tres elementos pero en cambio se proporcionaron " "{length}" #: awx/sso/fields.py:215 +#, python-brace-format msgid "Expected an instance of LDAPSearch but got {input_type} instead." msgstr "" "Esperado una instancia de LDAPSearch pero en cambio se obtuvo {input_type}" #: awx/sso/fields.py:251 +#, python-brace-format msgid "" "Expected an instance of LDAPSearch or LDAPSearchUnion but got {input_type} " "instead." @@ -4628,20 +4680,24 @@ msgstr "" "obtuvo {input_type}" #: awx/sso/fields.py:289 +#, python-brace-format msgid "Invalid user attribute(s): {invalid_attrs}." msgstr "Atributo(s) de usuario inválido(s): {invalid_attrs}." #: awx/sso/fields.py:306 +#, python-brace-format msgid "Expected an instance of LDAPGroupType but got {input_type} instead." msgstr "" "Se esperaba una instancia de LDAPGroupType pero en cambio se obtuvo " "{input_type}." #: awx/sso/fields.py:334 +#, python-brace-format msgid "Invalid user flag: \"{invalid_flag}\"." msgstr "Indicador de usuario inválido: \"{invalid_flag}\"." #: awx/sso/fields.py:350 awx/sso/fields.py:517 +#, python-brace-format msgid "" "Expected None, True, False, a string or list of strings but got {input_type}" " instead." @@ -4650,50 +4706,61 @@ msgstr "" "texto pero en cambio se obtuvo {input_type}" #: awx/sso/fields.py:386 +#, python-brace-format msgid "Missing key(s): {missing_keys}." msgstr "Clave(s) no encontradas: {missing_keys}." #: awx/sso/fields.py:387 +#, python-brace-format msgid "Invalid key(s): {invalid_keys}." msgstr "Clave(s) inválida(s): {invalid_keys}." #: awx/sso/fields.py:436 awx/sso/fields.py:553 +#, python-brace-format msgid "Invalid key(s) for organization map: {invalid_keys}." msgstr "Clave(s) inválida(s) para map de organización: {invalid_keys}." #: awx/sso/fields.py:454 +#, python-brace-format msgid "Missing required key for team map: {invalid_keys}." msgstr "Clave necesario no encontrada para mapa de equipo: {invalid_keys}." #: awx/sso/fields.py:455 awx/sso/fields.py:572 +#, python-brace-format msgid "Invalid key(s) for team map: {invalid_keys}." msgstr "Clave(s) inválida(s) para mapa de equipo: {invalid_keys}." #: awx/sso/fields.py:571 +#, python-brace-format msgid "Missing required key for team map: {missing_keys}." msgstr "Clave necesaria no encontrada para mapa de equipo: {missing_keys}." #: awx/sso/fields.py:589 +#, python-brace-format msgid "Missing required key(s) for org info record: {missing_keys}." msgstr "" "Clave(s) necesaria(s) no encontrada(s) para el registro informacional de la " "organización: {missing_keys}." #: awx/sso/fields.py:602 +#, python-brace-format msgid "Invalid language code(s) for org info: {invalid_lang_codes}." msgstr "" "Código(s) de lenguaje(s) inválido(s) para información organizacional: " "{invalid_lang_codes}." #: awx/sso/fields.py:621 +#, python-brace-format msgid "Missing required key(s) for contact: {missing_keys}." msgstr "Clave(s) necesaria(s) no encontrada(s) para contacto: {missing_keys}." #: awx/sso/fields.py:633 +#, python-brace-format msgid "Missing required key(s) for IdP: {missing_keys}." msgstr "Clave(s) necesaria(s) no encontrada(s) para IdP: {missing_keys}." #: awx/sso/pipeline.py:24 +#, python-brace-format msgid "An account cannot be found for {0}" msgstr "Una cuenta no puede ser encontrada para {0}" @@ -4787,6 +4854,7 @@ msgid "Make a PATCH request on the %(name)s resource" msgstr "Realizar una petición PATCH en el recurso %(name)s" #: awx/ui/apps.py:9 awx/ui/conf.py:22 awx/ui/conf.py:36 awx/ui/conf.py:51 +#: awx/ui/conf.py:63 msgid "UI" msgstr "UI" @@ -4841,6 +4909,15 @@ msgstr "" " Para que los logos personalizados se vean mejor, utilice un fichero .png " "con fondo transparente. Formatos GIF, PNG y JPEG están soportados." +#: awx/ui/conf.py:60 +msgid "Max Job Events Retreived by UI" +msgstr "" + +#: awx/ui/conf.py:61 +msgid "" +"Maximum number of job events for the UI to retreive within a single request." +msgstr "" + #: awx/ui/fields.py:29 msgid "" "Invalid format for custom logo. Must be a data URL with a base64-encoded " diff --git a/awx/locale/fr/LC_MESSAGES/django.po b/awx/locale/fr/LC_MESSAGES/django.po index f01606b74f..a87c214f2c 100644 --- a/awx/locale/fr/LC_MESSAGES/django.po +++ b/awx/locale/fr/LC_MESSAGES/django.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-08-27 19:27+0000\n" -"PO-Revision-Date: 2017-08-28 04:18+0000\n" +"POT-Creation-Date: 2017-11-30 20:23+0000\n" +"PO-Revision-Date: 2017-12-04 03:58+0000\n" "Last-Translator: croe \n" "Language-Team: French\n" "MIME-Version: 1.0\n" @@ -83,25 +83,30 @@ msgstr "Le filtrage de %s n'est pas autorisé." msgid "Loops not allowed in filters, detected on field {}." msgstr "Boucles non autorisés dans les filtres, détectées sur le champ {}." -#: awx/api/filters.py:297 +#: awx/api/filters.py:171 +#, python-brace-format +msgid "Invalid {field_name} id: {field_id}" +msgstr "Id {field_name} non valide : {field_id}" + +#: awx/api/filters.py:302 #, python-format msgid "cannot filter on kind %s" msgstr "impossible de filtrer sur le genre %s" -#: awx/api/filters.py:404 +#: awx/api/filters.py:409 #, python-format msgid "cannot order by field %s" msgstr "impossible de trier par champ %s" -#: awx/api/generics.py:515 awx/api/generics.py:577 +#: awx/api/generics.py:550 awx/api/generics.py:612 msgid "\"id\" field must be an integer." msgstr "Le champ \"id\" doit être un nombre entier." -#: awx/api/generics.py:574 +#: awx/api/generics.py:609 msgid "\"id\" is required to disassociate" msgstr "\"id\" est nécessaire pour dissocier" -#: awx/api/generics.py:625 +#: awx/api/generics.py:660 msgid "{} 'id' field is missing." msgstr "Le champ {} 'id' est manquant." @@ -182,7 +187,7 @@ msgstr "Tâche de workflow" msgid "Workflow Template" msgstr "Modèle de workflow" -#: awx/api/serializers.py:697 awx/api/serializers.py:755 awx/api/views.py:4314 +#: awx/api/serializers.py:701 awx/api/serializers.py:759 awx/api/views.py:4365 #, python-format msgid "" "Standard Output too large to display (%(text_size)d bytes), only download " @@ -192,38 +197,38 @@ msgstr "" "Le téléchargement est pris en charge seulement pour une taille supérieure à " "%(supported_size)d octets" -#: awx/api/serializers.py:770 +#: awx/api/serializers.py:774 msgid "Write-only field used to change the password." msgstr "Champ en écriture seule servant à modifier le mot de passe." -#: awx/api/serializers.py:772 +#: awx/api/serializers.py:776 msgid "Set if the account is managed by an external service" msgstr "À définir si le compte est géré par un service externe" -#: awx/api/serializers.py:796 +#: awx/api/serializers.py:800 msgid "Password required for new User." msgstr "Mot de passe requis pour le nouvel utilisateur." -#: awx/api/serializers.py:882 +#: awx/api/serializers.py:886 #, python-format msgid "Unable to change %s on user managed by LDAP." msgstr "Impossible de redéfinir %s sur un utilisateur géré par LDAP." -#: awx/api/serializers.py:1046 +#: awx/api/serializers.py:1050 msgid "Organization is missing" msgstr "L'organisation est manquante" -#: awx/api/serializers.py:1050 +#: awx/api/serializers.py:1054 msgid "Update options must be set to false for manual projects." msgstr "" "La Mise à jour des options doit être définie à false pour les projets " "manuels." -#: awx/api/serializers.py:1056 +#: awx/api/serializers.py:1060 msgid "Array of playbooks available within this project." msgstr "Tableau des playbooks disponibles dans ce projet." -#: awx/api/serializers.py:1075 +#: awx/api/serializers.py:1079 msgid "" "Array of inventory files and directories available within this project, not " "comprehensive." @@ -231,67 +236,71 @@ msgstr "" "Tableau des fichiers d'inventaires et des répertoires disponibles dans ce " "projet : incomplet." -#: awx/api/serializers.py:1282 +#: awx/api/serializers.py:1201 +msgid "Smart inventories must specify host_filter" +msgstr "Les inventaires smart doivent spécifier le host_filter" + +#: awx/api/serializers.py:1303 #, python-format msgid "Invalid port specification: %s" msgstr "Spécification de port non valide : %s" -#: awx/api/serializers.py:1293 +#: awx/api/serializers.py:1314 msgid "Cannot create Host for Smart Inventory" msgstr "Impossible de créer un Hôte pour l' Inventaire Smart" -#: awx/api/serializers.py:1315 awx/api/serializers.py:3218 -#: awx/api/serializers.py:3303 awx/main/validators.py:198 +#: awx/api/serializers.py:1336 awx/api/serializers.py:3321 +#: awx/api/serializers.py:3406 awx/main/validators.py:198 msgid "Must be valid JSON or YAML." msgstr "Syntaxe JSON ou YAML valide exigée." -#: awx/api/serializers.py:1411 +#: awx/api/serializers.py:1432 msgid "Invalid group name." msgstr "Nom de groupe incorrect." -#: awx/api/serializers.py:1416 +#: awx/api/serializers.py:1437 msgid "Cannot create Group for Smart Inventory" msgstr "Impossible de créer de Groupe pour l' Inventaire Smart" -#: awx/api/serializers.py:1488 +#: awx/api/serializers.py:1509 msgid "" "Script must begin with a hashbang sequence: i.e.... #!/usr/bin/env python" msgstr "" "Le script doit commencer par une séquence hashbang : c.-à-d. ... " "#!/usr/bin/env python" -#: awx/api/serializers.py:1534 +#: awx/api/serializers.py:1555 msgid "`{}` is a prohibited environment variable" msgstr "`{}`est une variable d'environnement interdite" -#: awx/api/serializers.py:1545 +#: awx/api/serializers.py:1566 msgid "If 'source' is 'custom', 'source_script' must be provided." msgstr "Si la valeur 'source' est 'custom', 'source_script' doit être défini." -#: awx/api/serializers.py:1551 +#: awx/api/serializers.py:1572 msgid "Must provide an inventory." msgstr "Vous devez fournir un inventaire." -#: awx/api/serializers.py:1555 +#: awx/api/serializers.py:1576 msgid "" "The 'source_script' does not belong to the same organization as the " "inventory." msgstr "" "Le 'source_script' n'appartient pas à la même organisation que l'inventaire." -#: awx/api/serializers.py:1557 +#: awx/api/serializers.py:1578 msgid "'source_script' doesn't exist." msgstr "'source_script' n'existe pas." -#: awx/api/serializers.py:1581 +#: awx/api/serializers.py:1602 msgid "Automatic group relationship, will be removed in 3.3" msgstr "Relation de groupe automatique, sera supprimée dans la version 3.3" -#: awx/api/serializers.py:1658 +#: awx/api/serializers.py:1679 msgid "Cannot use manual project for SCM-based inventory." msgstr "Impossible d'utiliser un projet manuel pour un inventaire SCM." -#: awx/api/serializers.py:1664 +#: awx/api/serializers.py:1685 msgid "" "Manual inventory sources are created automatically when a group is created " "in the v1 API." @@ -299,54 +308,62 @@ msgstr "" "Les sources d'inventaire manuel sont créées automatiquement lorsqu'un groupe" " est créé dans l'API v1." -#: awx/api/serializers.py:1669 +#: awx/api/serializers.py:1690 msgid "Setting not compatible with existing schedules." msgstr "Paramètre incompatible avec les planifications existantes." -#: awx/api/serializers.py:1674 +#: awx/api/serializers.py:1695 msgid "Cannot create Inventory Source for Smart Inventory" msgstr "Impossible de créer une Source d'inventaire pour l' Inventaire Smart" -#: awx/api/serializers.py:1688 +#: awx/api/serializers.py:1709 #, python-format msgid "Cannot set %s if not SCM type." msgstr "Impossible de définir %s si pas du type SCM ." -#: awx/api/serializers.py:1929 +#: awx/api/serializers.py:1950 msgid "Modifications not allowed for managed credential types" msgstr "" "Modifications non autorisées pour les types d'informations d'identification " "gérés" -#: awx/api/serializers.py:1934 +#: awx/api/serializers.py:1955 msgid "" "Modifications to inputs are not allowed for credential types that are in use" msgstr "" "Modifications apportées aux entrées non autorisées pour les types " "d'informations d'identification en cours d'utilisation" -#: awx/api/serializers.py:1940 +#: awx/api/serializers.py:1961 #, python-format msgid "Must be 'cloud' or 'net', not %s" msgstr "Doit être 'cloud' ou 'net', pas %s" -#: awx/api/serializers.py:1946 +#: awx/api/serializers.py:1967 msgid "'ask_at_runtime' is not supported for custom credentials." msgstr "" "'ask_at_runtime' n'est pas pris en charge pour les informations " "d'identification personnalisées." -#: awx/api/serializers.py:2119 +#: awx/api/serializers.py:2140 #, python-format msgid "\"%s\" is not a valid choice" msgstr "\"%s\" n'est pas un choix valide." -#: awx/api/serializers.py:2138 +#: awx/api/serializers.py:2159 #, python-format msgid "'%s' is not a valid field for %s" msgstr "'%s' n'est pas un champ valide pour %s" -#: awx/api/serializers.py:2150 +#: awx/api/serializers.py:2180 +msgid "" +"You cannot change the credential type of the credential, as it may break the" +" functionality of the resources using it." +msgstr "" +"Vous ne pouvez pas modifier le type d'identifiants, car cela peut " +"compromettre la fonctionnalité de la ressource les utilisant." + +#: awx/api/serializers.py:2191 msgid "" "Write-only field used to add user to owner role. If provided, do not give " "either team or organization. Only valid for creation." @@ -355,7 +372,7 @@ msgstr "" "propriétaire. Si vous le définissez, n'entrez ni équipe ni organisation. " "Seulement valable pour la création." -#: awx/api/serializers.py:2155 +#: awx/api/serializers.py:2196 msgid "" "Write-only field used to add team to owner role. If provided, do not give " "either user or organization. Only valid for creation." @@ -364,7 +381,7 @@ msgstr "" "propriétaire. Si vous le définissez, n'entrez ni utilisateur ni " "organisation. Seulement valable pour la création." -#: awx/api/serializers.py:2160 +#: awx/api/serializers.py:2201 msgid "" "Inherit permissions from organization roles. If provided on creation, do not" " give either user or team." @@ -372,128 +389,132 @@ msgstr "" "Hériter des permissions à partir des rôles d'organisation. Si vous le " "définissez lors de la création, n'entrez ni utilisateur ni équipe." -#: awx/api/serializers.py:2176 +#: awx/api/serializers.py:2217 msgid "Missing 'user', 'team', or 'organization'." msgstr "Valeur 'utilisateur', 'équipe' ou 'organisation' manquante." -#: awx/api/serializers.py:2216 +#: awx/api/serializers.py:2257 msgid "" "Credential organization must be set and match before assigning to a team" msgstr "" "L'organisation des informations d'identification doit être définie et mise " "en correspondance avant de l'attribuer à une équipe" -#: awx/api/serializers.py:2378 +#: awx/api/serializers.py:2424 msgid "You must provide a cloud credential." msgstr "Vous devez fournir une information d'identification cloud." -#: awx/api/serializers.py:2379 +#: awx/api/serializers.py:2425 msgid "You must provide a network credential." msgstr "Vous devez fournir des informations d'identification réseau." -#: awx/api/serializers.py:2395 +#: awx/api/serializers.py:2441 msgid "This field is required." msgstr "Ce champ est obligatoire." -#: awx/api/serializers.py:2397 awx/api/serializers.py:2399 +#: awx/api/serializers.py:2443 awx/api/serializers.py:2445 msgid "Playbook not found for project." msgstr "Playbook introuvable pour le projet." -#: awx/api/serializers.py:2401 +#: awx/api/serializers.py:2447 msgid "Must select playbook for project." msgstr "Un playbook doit être sélectionné pour le project." -#: awx/api/serializers.py:2476 +#: awx/api/serializers.py:2522 msgid "Must either set a default value or ask to prompt on launch." msgstr "" "Une valeur par défaut doit être définie ou bien demander une invite au " "moment du lancement." -#: awx/api/serializers.py:2478 awx/main/models/jobs.py:325 +#: awx/api/serializers.py:2524 awx/main/models/jobs.py:326 msgid "Job types 'run' and 'check' must have assigned a project." msgstr "Un projet doit être assigné aux types de tâche 'run' et 'check'." -#: awx/api/serializers.py:2549 +#: awx/api/serializers.py:2611 msgid "Invalid job template." msgstr "Modèle de tâche non valide." -#: awx/api/serializers.py:2630 -msgid "Credential not found or deleted." -msgstr "Informations d'identification introuvables ou supprimées." +#: awx/api/serializers.py:2708 +msgid "Neither credential nor vault credential provided." +msgstr "Indentifiants et identifiants de l'archivage sécurisé non fournis" -#: awx/api/serializers.py:2632 +#: awx/api/serializers.py:2711 msgid "Job Template Project is missing or undefined." msgstr "Le projet de modèle de tâche est manquant ou non défini." -#: awx/api/serializers.py:2634 +#: awx/api/serializers.py:2713 msgid "Job Template Inventory is missing or undefined." msgstr "Le projet de modèle d'inventaire est manquant ou non défini." -#: awx/api/serializers.py:2921 +#: awx/api/serializers.py:2782 awx/main/tasks.py:2186 +msgid "{} are prohibited from use in ad hoc commands." +msgstr "{} ne sont pas autorisés à utiliser les commandes ad hoc." + +#: awx/api/serializers.py:3008 #, python-format msgid "%(job_type)s is not a valid job type. The choices are %(choices)s." msgstr "" "%(job_type)s n'est pas un type de tâche valide. Les choix sont %(choices)s." -#: awx/api/serializers.py:2926 +#: awx/api/serializers.py:3013 msgid "Workflow job template is missing during creation." msgstr "Le modèle de tâche Workflow est manquant lors de la création." -#: awx/api/serializers.py:2931 +#: awx/api/serializers.py:3018 #, python-format msgid "Cannot nest a %s inside a WorkflowJobTemplate" msgstr "Impossible d'imbriquer %s dans un modèle de tâche Workflow." -#: awx/api/serializers.py:3188 +#: awx/api/serializers.py:3291 #, python-format msgid "Job Template '%s' is missing or undefined." msgstr "Le modèle de tâche '%s' est manquant ou non défini." -#: awx/api/serializers.py:3191 +#: awx/api/serializers.py:3294 msgid "The inventory associated with this Job Template is being deleted." msgstr "" "L'inventaire associé à ce modèle de tâche est en cours de suppression." -#: awx/api/serializers.py:3232 awx/api/views.py:2991 +#: awx/api/serializers.py:3335 awx/api/views.py:3023 #, python-format msgid "Cannot assign multiple %s credentials." msgstr "Impossible d'attribuer plusieurs informations d'identification %s ." -#: awx/api/serializers.py:3234 awx/api/views.py:2994 +#: awx/api/serializers.py:3337 awx/api/views.py:3026 msgid "Extra credentials must be network or cloud." msgstr "" "Les informations d'identification supplémentaires doivent être des " "identifiants réseau ou cloud." -#: awx/api/serializers.py:3371 +#: awx/api/serializers.py:3474 msgid "" "Missing required fields for Notification Configuration: notification_type" msgstr "" "Champs obligatoires manquants pour la configuration des notifications : " "notification_type" -#: awx/api/serializers.py:3394 +#: awx/api/serializers.py:3497 msgid "No values specified for field '{}'" msgstr "Aucune valeur spécifiée pour le champ '{}'" -#: awx/api/serializers.py:3399 +#: awx/api/serializers.py:3502 msgid "Missing required fields for Notification Configuration: {}." msgstr "" "Champs obligatoires manquants pour la configuration des notifications : {}." -#: awx/api/serializers.py:3402 +#: awx/api/serializers.py:3505 msgid "Configuration field '{}' incorrect type, expected {}." msgstr "Type de champ de configuration '{}' incorrect, {} attendu." -#: awx/api/serializers.py:3455 +#: awx/api/serializers.py:3558 msgid "Inventory Source must be a cloud resource." msgstr "La source d'inventaire doit être une ressource cloud." -#: awx/api/serializers.py:3457 +#: awx/api/serializers.py:3560 msgid "Manual Project cannot have a schedule set." msgstr "Le projet manuel ne peut pas avoir de calendrier défini." -#: awx/api/serializers.py:3460 +#: awx/api/serializers.py:3563 msgid "" "Inventory sources with `update_on_project_update` cannot be scheduled. " "Schedule its source project `{}` instead." @@ -501,72 +522,72 @@ msgstr "" "Impossible de planifier les sources d'inventaire avec " "`update_on_project_update`. Planifiez plutôt son projet source`{}`." -#: awx/api/serializers.py:3479 +#: awx/api/serializers.py:3582 msgid "Projects and inventory updates cannot accept extra variables." msgstr "" "Les projets et mises à jour d'inventaire ne peuvent pas accepter de " "variables supplémentaires." -#: awx/api/serializers.py:3501 +#: awx/api/serializers.py:3604 msgid "" "DTSTART required in rrule. Value should match: DTSTART:YYYYMMDDTHHMMSSZ" msgstr "" "DTSTART obligatoire dans rrule. La valeur doit correspondre à : " "DTSTART:YYYYMMDDTHHMMSSZ" -#: awx/api/serializers.py:3503 +#: awx/api/serializers.py:3606 msgid "Multiple DTSTART is not supported." msgstr "Une seule valeur DTSTART est prise en charge." -#: awx/api/serializers.py:3505 +#: awx/api/serializers.py:3608 msgid "RRULE require in rrule." msgstr "RRULE obligatoire dans rrule." -#: awx/api/serializers.py:3507 +#: awx/api/serializers.py:3610 msgid "Multiple RRULE is not supported." msgstr "Une seule valeur RRULE est prise en charge." -#: awx/api/serializers.py:3509 +#: awx/api/serializers.py:3612 msgid "INTERVAL required in rrule." msgstr "INTERVAL obligatoire dans rrule." -#: awx/api/serializers.py:3511 +#: awx/api/serializers.py:3614 msgid "TZID is not supported." msgstr "TZID n'est pas pris en charge." -#: awx/api/serializers.py:3513 +#: awx/api/serializers.py:3616 msgid "SECONDLY is not supported." msgstr "SECONDLY n'est pas pris en charge." -#: awx/api/serializers.py:3515 +#: awx/api/serializers.py:3618 msgid "Multiple BYMONTHDAYs not supported." msgstr "Une seule valeur BYMONTHDAY est prise en charge." -#: awx/api/serializers.py:3517 +#: awx/api/serializers.py:3620 msgid "Multiple BYMONTHs not supported." msgstr "Une seule valeur BYMONTH est prise en charge." -#: awx/api/serializers.py:3519 +#: awx/api/serializers.py:3622 msgid "BYDAY with numeric prefix not supported." msgstr "BYDAY avec un préfixe numérique non pris en charge." -#: awx/api/serializers.py:3521 +#: awx/api/serializers.py:3624 msgid "BYYEARDAY not supported." msgstr "BYYEARDAY non pris en charge." -#: awx/api/serializers.py:3523 +#: awx/api/serializers.py:3626 msgid "BYWEEKNO not supported." msgstr "BYWEEKNO non pris en charge." -#: awx/api/serializers.py:3527 +#: awx/api/serializers.py:3630 msgid "COUNT > 999 is unsupported." msgstr "COUNT > 999 non pris en charge." -#: awx/api/serializers.py:3531 +#: awx/api/serializers.py:3634 msgid "rrule parsing failed validation." msgstr "L'analyse rrule n'a pas pu être validée." -#: awx/api/serializers.py:3631 +#: awx/api/serializers.py:3760 msgid "" "A summary of the new and changed values when an object is created, updated, " "or deleted" @@ -574,7 +595,7 @@ msgstr "" "Un récapitulatif des valeurs nouvelles et modifiées lorsqu'un objet est " "créé, mis à jour ou supprimé" -#: awx/api/serializers.py:3633 +#: awx/api/serializers.py:3762 msgid "" "For create, update, and delete events this is the object type that was " "affected. For associate and disassociate events this is the object type " @@ -584,7 +605,7 @@ msgstr "" "d'objet qui a été affecté. Pour associer et dissocier des événements, il " "s'agit du type d'objet associé à ou dissocié de object2." -#: awx/api/serializers.py:3636 +#: awx/api/serializers.py:3765 msgid "" "Unpopulated for create, update, and delete events. For associate and " "disassociate events this is the object type that object1 is being associated" @@ -594,166 +615,166 @@ msgstr "" "associer et dissocier des événements, il s'agit du type d'objet auquel " "object1 est associé." -#: awx/api/serializers.py:3639 +#: awx/api/serializers.py:3768 msgid "The action taken with respect to the given object(s)." msgstr "Action appliquée par rapport à l'objet ou aux objets donnés." -#: awx/api/serializers.py:3749 +#: awx/api/serializers.py:3885 msgid "Unable to login with provided credentials." msgstr "Connexion impossible avec les informations d'identification fournies." -#: awx/api/serializers.py:3751 +#: awx/api/serializers.py:3887 msgid "Must include \"username\" and \"password\"." msgstr "Elles doivent inclure le nom d'utilisateur et le mot de passe." -#: awx/api/views.py:106 +#: awx/api/views.py:108 msgid "Your license does not allow use of the activity stream." msgstr "Votre licence ne permet pas l'utilisation du flux d'activité." -#: awx/api/views.py:116 +#: awx/api/views.py:118 msgid "Your license does not permit use of system tracking." msgstr "Votre licence ne permet pas l'utilisation du suivi du système." -#: awx/api/views.py:126 +#: awx/api/views.py:128 msgid "Your license does not allow use of workflows." msgstr "Votre licence ne permet pas l'utilisation de workflows." -#: awx/api/views.py:140 +#: awx/api/views.py:142 msgid "Cannot delete job resource when associated workflow job is running." msgstr "" "Impossible de supprimer les ressources de tâche lorsqu'une tâche de workflow" " associée est en cours d'exécution." -#: awx/api/views.py:144 +#: awx/api/views.py:146 msgid "Cannot delete running job resource." msgstr "Impossible de supprimer la ressource de la tâche en cours." -#: awx/api/views.py:153 awx/templates/rest_framework/api.html:28 +#: awx/api/views.py:155 awx/templates/rest_framework/api.html:28 msgid "REST API" msgstr "API REST" -#: awx/api/views.py:162 awx/templates/rest_framework/api.html:4 +#: awx/api/views.py:164 awx/templates/rest_framework/api.html:4 msgid "AWX REST API" msgstr "API REST AWX" -#: awx/api/views.py:224 +#: awx/api/views.py:226 msgid "Version 1" msgstr "Version 1" -#: awx/api/views.py:228 +#: awx/api/views.py:230 msgid "Version 2" msgstr "Version 2" -#: awx/api/views.py:239 +#: awx/api/views.py:241 msgid "Ping" msgstr "Ping" -#: awx/api/views.py:270 awx/conf/apps.py:12 +#: awx/api/views.py:272 awx/conf/apps.py:12 msgid "Configuration" msgstr "Configuration" -#: awx/api/views.py:323 +#: awx/api/views.py:325 msgid "Invalid license data" msgstr "Données de licence non valides" -#: awx/api/views.py:325 +#: awx/api/views.py:327 msgid "Missing 'eula_accepted' property" msgstr "Propriété 'eula_accepted' manquante" -#: awx/api/views.py:329 +#: awx/api/views.py:331 msgid "'eula_accepted' value is invalid" msgstr "La valeur 'eula_accepted' n'est pas valide" -#: awx/api/views.py:332 +#: awx/api/views.py:334 msgid "'eula_accepted' must be True" msgstr "La valeur 'eula_accepted' doit être True" -#: awx/api/views.py:339 +#: awx/api/views.py:341 msgid "Invalid JSON" msgstr "Syntaxe JSON non valide" -#: awx/api/views.py:347 +#: awx/api/views.py:349 msgid "Invalid License" msgstr "Licence non valide" -#: awx/api/views.py:357 +#: awx/api/views.py:359 msgid "Invalid license" msgstr "Licence non valide" -#: awx/api/views.py:365 +#: awx/api/views.py:367 #, python-format msgid "Failed to remove license (%s)" msgstr "Suppression de la licence (%s) impossible" -#: awx/api/views.py:370 +#: awx/api/views.py:372 msgid "Dashboard" msgstr "Tableau de bord" -#: awx/api/views.py:469 +#: awx/api/views.py:471 msgid "Dashboard Jobs Graphs" msgstr "Graphiques de tâches du tableau de bord" -#: awx/api/views.py:505 +#: awx/api/views.py:507 #, python-format msgid "Unknown period \"%s\"" msgstr "Période \"%s\" inconnue" -#: awx/api/views.py:519 +#: awx/api/views.py:521 msgid "Instances" msgstr "Instances" -#: awx/api/views.py:527 +#: awx/api/views.py:529 msgid "Instance Detail" msgstr "Détail de l'instance" -#: awx/api/views.py:535 +#: awx/api/views.py:537 msgid "Instance Running Jobs" msgstr "Instance exécutant les tâches" -#: awx/api/views.py:550 +#: awx/api/views.py:552 msgid "Instance's Instance Groups" msgstr "Groupes d'instances de l'instance" -#: awx/api/views.py:560 +#: awx/api/views.py:562 msgid "Instance Groups" msgstr "Groupes d'instances" -#: awx/api/views.py:568 +#: awx/api/views.py:570 msgid "Instance Group Detail" msgstr "Détail du groupe d'instances" -#: awx/api/views.py:576 +#: awx/api/views.py:578 msgid "Instance Group Running Jobs" msgstr "Groupe d'instances exécutant les tâches" -#: awx/api/views.py:586 +#: awx/api/views.py:588 msgid "Instance Group's Instances" msgstr "Instances du groupe d'instances" -#: awx/api/views.py:596 +#: awx/api/views.py:598 msgid "Schedules" msgstr "Calendriers" -#: awx/api/views.py:615 +#: awx/api/views.py:617 msgid "Schedule Jobs List" msgstr "Listes des tâches de planification" -#: awx/api/views.py:841 +#: awx/api/views.py:843 msgid "Your license only permits a single organization to exist." msgstr "Votre licence permet uniquement l'existence d'une seule organisation." -#: awx/api/views.py:1077 awx/api/views.py:4615 +#: awx/api/views.py:1079 awx/api/views.py:4666 msgid "You cannot assign an Organization role as a child role for a Team." msgstr "" "Vous ne pouvez pas attribuer un rôle Organisation en tant que rôle enfant " "pour une équipe." -#: awx/api/views.py:1081 awx/api/views.py:4629 +#: awx/api/views.py:1083 awx/api/views.py:4680 msgid "You cannot grant system-level permissions to a team." msgstr "" "Vous ne pouvez pas accorder de permissions au niveau système à une équipe." -#: awx/api/views.py:1088 awx/api/views.py:4621 +#: awx/api/views.py:1090 awx/api/views.py:4672 msgid "" "You cannot grant credential access to a team when the Organization field " "isn't set, or belongs to a different organization" @@ -762,36 +783,36 @@ msgstr "" "équipe lorsque le champ Organisation n'est pas défini ou qu'elle appartient " "à une organisation différente" -#: awx/api/views.py:1178 +#: awx/api/views.py:1180 msgid "Cannot delete project." msgstr "Suppression du projet impossible." -#: awx/api/views.py:1213 +#: awx/api/views.py:1215 msgid "Project Schedules" msgstr "Calendriers des projets" -#: awx/api/views.py:1225 +#: awx/api/views.py:1227 msgid "Project SCM Inventory Sources" msgstr "Sources d'inventaire SCM du projet" -#: awx/api/views.py:1352 +#: awx/api/views.py:1354 msgid "Project Update SCM Inventory Updates" msgstr "Mises à jour de l'inventaire SCM de la mise à jour du projet" -#: awx/api/views.py:1407 +#: awx/api/views.py:1409 msgid "Me" msgstr "Moi-même" -#: awx/api/views.py:1451 awx/api/views.py:4572 +#: awx/api/views.py:1453 awx/api/views.py:4623 msgid "You may not perform any action with your own admin_role." msgstr "Vous ne pouvez pas effectuer d'action avec votre propre admin_role." -#: awx/api/views.py:1457 awx/api/views.py:4576 +#: awx/api/views.py:1459 awx/api/views.py:4627 msgid "You may not change the membership of a users admin_role" msgstr "" "Vous ne pouvez pas modifier l'appartenance de l'admin_role d'un utilisateur" -#: awx/api/views.py:1462 awx/api/views.py:4581 +#: awx/api/views.py:1464 awx/api/views.py:4632 msgid "" "You cannot grant credential access to a user not in the credentials' " "organization" @@ -800,64 +821,65 @@ msgstr "" "utilisateur ne figurant pas dans l'organisation d'informations " "d'identification." -#: awx/api/views.py:1466 awx/api/views.py:4585 +#: awx/api/views.py:1468 awx/api/views.py:4636 msgid "You cannot grant private credential access to another user" msgstr "" "Vous ne pouvez pas accorder d'accès privé par informations d'identification " "à un autre utilisateur" -#: awx/api/views.py:1564 +#: awx/api/views.py:1566 #, python-format msgid "Cannot change %s." msgstr "Impossible de modifier %s." -#: awx/api/views.py:1570 +#: awx/api/views.py:1572 msgid "Cannot delete user." msgstr "Impossible de supprimer l'utilisateur." -#: awx/api/views.py:1599 +#: awx/api/views.py:1601 msgid "Deletion not allowed for managed credential types" msgstr "" "Suppression non autorisée pour les types d'informations d'identification " "gérés." -#: awx/api/views.py:1601 +#: awx/api/views.py:1603 msgid "Credential types that are in use cannot be deleted" msgstr "" "Les types d'informations d'identification utilisés ne peuvent pas être " "supprimés." -#: awx/api/views.py:1779 +#: awx/api/views.py:1781 msgid "Cannot delete inventory script." msgstr "Impossible de supprimer le script d'inventaire." -#: awx/api/views.py:1864 +#: awx/api/views.py:1866 +#, python-brace-format msgid "{0}" msgstr "{0}" -#: awx/api/views.py:2089 +#: awx/api/views.py:2101 msgid "Fact not found." msgstr "Fait introuvable." -#: awx/api/views.py:2113 +#: awx/api/views.py:2125 msgid "SSLError while trying to connect to {}" msgstr "ErreurSSL lors de la tentative de connexion au {} " -#: awx/api/views.py:2115 +#: awx/api/views.py:2127 msgid "Request to {} timed out." msgstr "Délai de requête {} expiré." -#: awx/api/views.py:2117 +#: awx/api/views.py:2129 msgid "Unkown exception {} while trying to GET {}" msgstr "Exception inconnue {} lors de la tentative GET {}" -#: awx/api/views.py:2120 +#: awx/api/views.py:2132 msgid "" "Unauthorized access. Please check your Insights Credential username and " "password." msgstr "Accès non autorisé. Veuillez vérifier vos identifiants pour Insights." -#: awx/api/views.py:2122 +#: awx/api/views.py:2134 msgid "" "Failed to gather reports and maintenance plans from Insights API at URL {}. " "Server responded with {} status code and message {}" @@ -866,202 +888,216 @@ msgstr "" "sur l'URL {}. Le serveur a répondu avec un code de statut {} et un message " "{} " -#: awx/api/views.py:2128 +#: awx/api/views.py:2140 msgid "Expected JSON response from Insights but instead got {}" msgstr "" "Réponse JSON attendue de la part d'Insights, mais {} a été reçu à la place" -#: awx/api/views.py:2135 +#: awx/api/views.py:2147 msgid "This host is not recognized as an Insights host." msgstr "Cet hôte n'est pas reconnu comme hôte Insights." -#: awx/api/views.py:2140 +#: awx/api/views.py:2152 msgid "The Insights Credential for \"{}\" was not found." msgstr "Informations d'identification Insights pour \"{}\" introuvables." -#: awx/api/views.py:2209 +#: awx/api/views.py:2221 msgid "Cyclical Group association." msgstr "Association de groupe cyclique." -#: awx/api/views.py:2482 +#: awx/api/views.py:2499 msgid "Inventory Source List" msgstr "Liste des sources d'inventaire" -#: awx/api/views.py:2495 +#: awx/api/views.py:2512 msgid "Inventory Sources Update" msgstr "Mise à jour des sources d'inventaire" -#: awx/api/views.py:2525 +#: awx/api/views.py:2542 msgid "Could not start because `can_update` returned False" msgstr "Démarrage impossible car `can_update` a renvoyé False" -#: awx/api/views.py:2533 +#: awx/api/views.py:2550 msgid "No inventory sources to update." msgstr "Aucune source d'inventaire à actualiser." -#: awx/api/views.py:2565 +#: awx/api/views.py:2582 msgid "Cannot delete inventory source." msgstr "Impossible de supprimer la source d'inventaire." -#: awx/api/views.py:2573 +#: awx/api/views.py:2590 msgid "Inventory Source Schedules" msgstr "Calendriers des sources d'inventaire" -#: awx/api/views.py:2603 +#: awx/api/views.py:2620 msgid "Notification Templates can only be assigned when source is one of {}." msgstr "" "Les modèles de notification ne peuvent être attribués que lorsque la source " "est l'une des {}." -#: awx/api/views.py:2826 +#: awx/api/views.py:2851 msgid "Job Template Schedules" msgstr "Calendriers des modèles de tâche" -#: awx/api/views.py:2846 awx/api/views.py:2862 +#: awx/api/views.py:2871 awx/api/views.py:2882 msgid "Your license does not allow adding surveys." msgstr "Votre licence ne permet pas l'ajout de questionnaires." -#: awx/api/views.py:2869 +#: awx/api/views.py:2889 msgid "'name' missing from survey spec." msgstr "'name' manquant dans la spécification du questionnaire." -#: awx/api/views.py:2871 +#: awx/api/views.py:2891 msgid "'description' missing from survey spec." msgstr "'description' manquante dans la spécification du questionnaire." -#: awx/api/views.py:2873 +#: awx/api/views.py:2893 msgid "'spec' missing from survey spec." msgstr "'spec' manquante dans la spécification du questionnaire." -#: awx/api/views.py:2875 +#: awx/api/views.py:2895 msgid "'spec' must be a list of items." msgstr "'spec' doit être une liste d'éléments" -#: awx/api/views.py:2877 +#: awx/api/views.py:2897 msgid "'spec' doesn't contain any items." msgstr "'spec' ne contient aucun élément." -#: awx/api/views.py:2883 +#: awx/api/views.py:2903 #, python-format msgid "Survey question %s is not a json object." msgstr "La question %s n'est pas un objet json." -#: awx/api/views.py:2885 +#: awx/api/views.py:2905 #, python-format msgid "'type' missing from survey question %s." msgstr "'type' est manquant dans la question %s." -#: awx/api/views.py:2887 +#: awx/api/views.py:2907 #, python-format msgid "'question_name' missing from survey question %s." msgstr "'question_name' est manquant dans la question %s." -#: awx/api/views.py:2889 +#: awx/api/views.py:2909 #, python-format msgid "'variable' missing from survey question %s." msgstr "'variable' est manquant dans la question %s." -#: awx/api/views.py:2891 +#: awx/api/views.py:2911 #, python-format msgid "'variable' '%(item)s' duplicated in survey question %(survey)s." msgstr "'variable' '%(item)s' en double dans la question %(survey)s." -#: awx/api/views.py:2896 +#: awx/api/views.py:2916 #, python-format msgid "'required' missing from survey question %s." msgstr "'required' est manquant dans la question %s." -#: awx/api/views.py:2901 +#: awx/api/views.py:2921 +#, python-brace-format msgid "" -"$encrypted$ is reserved keyword and may not be used as a default for " -"password {}." -msgstr "" -"$encrypted$ est un mot clé réservé et ne peut pas être utilisé comme valeur " -"par défaut pour le mot de passe {}. " +"Value {question_default} for '{variable_name}' expected to be a string." +msgstr "Valeur {question_default} de '{variable_name}' de chaîne attendue. " -#: awx/api/views.py:3017 +#: awx/api/views.py:2928 +#, python-brace-format +msgid "" +"$encrypted$ is reserved keyword for password questions and may not be used " +"as a default for '{variable_name}' in survey question {question_position}." +msgstr "" +"$encrypted$ est un mot clé réservé pour les questions de mots de passe et ne" +" peuvent pas être utilisées par défaut pour '{variable_name}' dans les " +"questions d'enquêtes {question_position}." + +#: awx/api/views.py:3049 msgid "Maximum number of labels for {} reached." msgstr "Nombre maximum d'étiquettes {} atteint." -#: awx/api/views.py:3136 +#: awx/api/views.py:3170 msgid "No matching host could be found!" msgstr "Aucun hôte correspondant n'a été trouvé." -#: awx/api/views.py:3139 +#: awx/api/views.py:3173 msgid "Multiple hosts matched the request!" msgstr "Plusieurs hôtes correspondent à la requête." -#: awx/api/views.py:3144 +#: awx/api/views.py:3178 msgid "Cannot start automatically, user input required!" msgstr "" "Impossible de démarrer automatiquement, saisie de l'utilisateur obligatoire." -#: awx/api/views.py:3151 +#: awx/api/views.py:3185 msgid "Host callback job already pending." msgstr "La tâche de rappel de l'hôte est déjà en attente." -#: awx/api/views.py:3164 +#: awx/api/views.py:3199 msgid "Error starting job!" msgstr "Erreur lors du démarrage de la tâche." -#: awx/api/views.py:3271 +#: awx/api/views.py:3306 +#, python-brace-format msgid "Cannot associate {0} when {1} have been associated." msgstr " {0} ne peut pas être associé lorsque {1} est associé." -#: awx/api/views.py:3296 +#: awx/api/views.py:3331 msgid "Multiple parent relationship not allowed." msgstr "Relation de parents multiples non autorisée." -#: awx/api/views.py:3301 +#: awx/api/views.py:3336 msgid "Cycle detected." msgstr "Cycle détecté." -#: awx/api/views.py:3505 +#: awx/api/views.py:3540 msgid "Workflow Job Template Schedules" msgstr "Calendriers des modèles de tâche Workflow" -#: awx/api/views.py:3650 awx/api/views.py:4217 +#: awx/api/views.py:3685 awx/api/views.py:4268 msgid "Superuser privileges needed." msgstr "Privilèges de superutilisateur requis." -#: awx/api/views.py:3682 +#: awx/api/views.py:3717 msgid "System Job Template Schedules" msgstr "Calendriers des modèles de tâche Système" -#: awx/api/views.py:3891 +#: awx/api/views.py:3780 +msgid "POST not allowed for Job launching in version 2 of the api" +msgstr "" +"POST non autorisé pour le lancement de tâches dans la version 2 de l'api" + +#: awx/api/views.py:3942 msgid "Job Host Summaries List" msgstr "Liste récapitulative des hôtes de la tâche" -#: awx/api/views.py:3938 +#: awx/api/views.py:3989 msgid "Job Event Children List" msgstr "Liste des enfants d'événement de la tâche" -#: awx/api/views.py:3947 +#: awx/api/views.py:3998 msgid "Job Event Hosts List" msgstr "Liste des hôtes d'événement de la tâche" -#: awx/api/views.py:3957 +#: awx/api/views.py:4008 msgid "Job Events List" msgstr "Liste des événements de la tâche" -#: awx/api/views.py:4171 +#: awx/api/views.py:4222 msgid "Ad Hoc Command Events List" msgstr "Liste d'événements de la commande ad hoc" -#: awx/api/views.py:4386 +#: awx/api/views.py:4437 msgid "Error generating stdout download file: {}" msgstr "Erreur lors de la génération du fichier de téléchargement stdout : {}" -#: awx/api/views.py:4399 +#: awx/api/views.py:4450 #, python-format msgid "Error generating stdout download file: %s" msgstr "Erreur lors de la génération du fichier de téléchargement stdout : %s" -#: awx/api/views.py:4444 +#: awx/api/views.py:4495 msgid "Delete not allowed while there are pending notifications" msgstr "Suppression non autorisée tant que des notifications sont en attente" -#: awx/api/views.py:4451 +#: awx/api/views.py:4502 msgid "Notification Template Test" msgstr "Test de modèle de notification" @@ -1218,15 +1254,16 @@ msgstr "Exemple de paramètre qui peut être différent pour chaque utilisateur. msgid "User" msgstr "Utilisateur" -#: awx/conf/fields.py:62 +#: awx/conf/fields.py:63 msgid "Enter a valid URL" msgstr "Entez une URL valide" -#: awx/conf/fields.py:94 +#: awx/conf/fields.py:95 +#, python-brace-format msgid "\"{input}\" is not a valid string." msgstr "\"{input}\" n'est pas une chaîne valide." -#: awx/conf/license.py:19 +#: awx/conf/license.py:22 msgid "Your Tower license does not allow that." msgstr "Votre licence Tower ne vous y autorise pas." @@ -1246,7 +1283,12 @@ msgstr "" msgid "Skip commenting out settings in files." msgstr "Ignorer la saisie de commentaires de paramètres dans les fichiers." -#: awx/conf/management/commands/migrate_to_database_settings.py:61 +#: awx/conf/management/commands/migrate_to_database_settings.py:62 +msgid "Skip migrating and only comment out settings in files." +msgstr "" +"Ignorer la migration et ne dé-commenter que les configuration des fichiers." + +#: awx/conf/management/commands/migrate_to_database_settings.py:68 msgid "Backup existing settings files with this suffix." msgstr "Sauvegardez les fichiers de paramètres existants avec ce suffixe." @@ -1270,7 +1312,7 @@ msgstr "Modifié" msgid "User-Defaults" msgstr "Paramètres utilisateur par défaut" -#: awx/conf/registry.py:151 +#: awx/conf/registry.py:154 msgid "This value has been set manually in a settings file." msgstr "" "Cette valeur a été définie manuellement dans un fichier de configuration." @@ -1343,94 +1385,92 @@ msgstr "Détails du paramètre" msgid "Logging Connectivity Test" msgstr "Journalisation du test de connectivité" -#: awx/main/access.py:224 +#: awx/main/access.py:44 +msgid "Resource is being used by running jobs." +msgstr "Ressource utilisée par les tâches en cours." + +#: awx/main/access.py:237 #, python-format msgid "Bad data found in related field %s." msgstr "Données incorrectes trouvées dans le champ %s associé." -#: awx/main/access.py:268 +#: awx/main/access.py:281 msgid "License is missing." msgstr "La licence est manquante." -#: awx/main/access.py:270 +#: awx/main/access.py:283 msgid "License has expired." msgstr "La licence est arrivée à expiration." -#: awx/main/access.py:278 +#: awx/main/access.py:291 #, python-format msgid "License count of %s instances has been reached." msgstr "Le nombre de licences d'instances %s a été atteint." -#: awx/main/access.py:280 +#: awx/main/access.py:293 #, python-format msgid "License count of %s instances has been exceeded." msgstr "Le nombre de licences d'instances %s a été dépassé." -#: awx/main/access.py:282 +#: awx/main/access.py:295 msgid "Host count exceeds available instances." msgstr "Le nombre d'hôtes dépasse celui des instances disponibles." -#: awx/main/access.py:286 +#: awx/main/access.py:299 #, python-format msgid "Feature %s is not enabled in the active license." msgstr "La fonctionnalité %s n'est pas activée dans la licence active." -#: awx/main/access.py:288 +#: awx/main/access.py:301 msgid "Features not found in active license." msgstr "Fonctionnalités introuvables dans la licence active." -#: awx/main/access.py:534 awx/main/access.py:619 awx/main/access.py:748 -#: awx/main/access.py:801 awx/main/access.py:1063 awx/main/access.py:1263 -#: awx/main/access.py:1725 -msgid "Resource is being used by running jobs" -msgstr "La ressource est utilisée par des tâches en cours d'exécution" - -#: awx/main/access.py:675 +#: awx/main/access.py:707 msgid "Unable to change inventory on a host." msgstr "Impossible de modifier l'inventaire sur un hôte." -#: awx/main/access.py:692 awx/main/access.py:737 +#: awx/main/access.py:724 awx/main/access.py:769 msgid "Cannot associate two items from different inventories." msgstr "Impossible d'associer deux éléments d'inventaires différents." -#: awx/main/access.py:725 +#: awx/main/access.py:757 msgid "Unable to change inventory on a group." msgstr "Impossible de modifier l'inventaire sur un groupe." -#: awx/main/access.py:983 +#: awx/main/access.py:1017 msgid "Unable to change organization on a team." msgstr "Impossible de modifier l'organisation d'une équipe." -#: awx/main/access.py:996 +#: awx/main/access.py:1030 msgid "The {} role cannot be assigned to a team" msgstr "Le rôle {} ne peut pas être attribué à une équipe" -#: awx/main/access.py:998 +#: awx/main/access.py:1032 msgid "The admin_role for a User cannot be assigned to a team" msgstr "L'admin_role d'un utilisateur ne peut pas être attribué à une équipe" -#: awx/main/access.py:1443 +#: awx/main/access.py:1479 msgid "Job has been orphaned from its job template." msgstr "La tâche est orpheline de son modèle de tâche." -#: awx/main/access.py:1445 +#: awx/main/access.py:1481 msgid "You do not have execute permission to related job template." msgstr "" "Vous n'avez pas de permission d'exécution pour le modèle de tâche lié." -#: awx/main/access.py:1448 +#: awx/main/access.py:1484 msgid "Job was launched with prompted fields." msgstr "La tâche a été lancée avec les champs d'invite." -#: awx/main/access.py:1450 +#: awx/main/access.py:1486 msgid " Organization level permissions required." msgstr "Permissions au niveau de l'organisation requises." -#: awx/main/access.py:1452 +#: awx/main/access.py:1488 msgid " You do not have permission to related resources." msgstr "Vous n'avez pas de permission vers les ressources liées." -#: awx/main/access.py:1798 +#: awx/main/access.py:1833 msgid "" "You do not have permission to the workflow job resources required for " "relaunch." @@ -1974,87 +2014,87 @@ msgstr "" msgid "\n" msgstr "\n" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Sudo" msgstr "Sudo" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Su" msgstr "Su" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Pbrun" msgstr "Pbrun" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Pfexec" msgstr "Pfexec" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "DZDO" msgstr "DZDO" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Pmrun" msgstr "Pmrun" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Runas" msgstr "Runas" -#: awx/main/fields.py:56 +#: awx/main/fields.py:57 #, python-format msgid "'%s' is not one of ['%s']" msgstr "'%s' ne fait pas partie des ['%s']" -#: awx/main/fields.py:531 +#: awx/main/fields.py:533 #, python-format msgid "cannot be set unless \"%s\" is set" msgstr "ne peut être défini à moins que \"%s\" soit défini" -#: awx/main/fields.py:547 +#: awx/main/fields.py:549 #, python-format msgid "required for %s" msgstr "requis pour %s" -#: awx/main/fields.py:571 +#: awx/main/fields.py:573 msgid "must be set when SSH key is encrypted." msgstr "doit être défini lorsque la clé SSH est chiffrée." -#: awx/main/fields.py:577 +#: awx/main/fields.py:579 msgid "should not be set when SSH key is not encrypted." msgstr "ne doit pas être défini lorsque la clé SSH n'est pas chiffrée." -#: awx/main/fields.py:635 +#: awx/main/fields.py:637 msgid "'dependencies' is not supported for custom credentials." msgstr "" "les dépendances ne sont pas prises en charge pour les identifiants " "personnalisés." -#: awx/main/fields.py:649 +#: awx/main/fields.py:651 msgid "\"tower\" is a reserved field name" msgstr "\"tower\" est un nom de champ réservé" -#: awx/main/fields.py:656 +#: awx/main/fields.py:658 #, python-format msgid "field IDs must be unique (%s)" msgstr "Les ID de champ doivent être uniques (%s)" -#: awx/main/fields.py:669 +#: awx/main/fields.py:671 #, python-format msgid "%s not allowed for %s type (%s)" msgstr "%s non autorisé pour le type %s (%s)" -#: awx/main/fields.py:753 +#: awx/main/fields.py:755 #, python-format msgid "%s uses an undefined field (%s)" msgstr "%s utilise un champ non défini (%s)" -#: awx/main/middleware.py:121 +#: awx/main/middleware.py:157 msgid "Formats of all available named urls" msgstr "Formats de toutes les URL nommées disponibles" -#: awx/main/middleware.py:122 +#: awx/main/middleware.py:158 msgid "" "Read-only list of key-value pairs that shows the standard format of all " "available named URLs." @@ -2062,15 +2102,15 @@ msgstr "" "Liste en lecture seule de paires clé/valeur qui affiche le format standard " "de toutes les URL nommées disponibles." -#: awx/main/middleware.py:124 awx/main/middleware.py:134 +#: awx/main/middleware.py:160 awx/main/middleware.py:170 msgid "Named URL" msgstr "URL nommée" -#: awx/main/middleware.py:131 +#: awx/main/middleware.py:167 msgid "List of all named url graph nodes." msgstr "Liste de tous les noeuds de graphique des URL nommées." -#: awx/main/middleware.py:132 +#: awx/main/middleware.py:168 msgid "" "Read-only list of key-value pairs that exposes named URL graph topology. Use" " this list to programmatically generate named URLs for resources" @@ -2079,51 +2119,51 @@ msgstr "" "graphiques des URL nommées. Utilisez cette liste pour générer via un " "programme des URL nommées pour les ressources" -#: awx/main/migrations/_reencrypt.py:23 awx/main/models/notifications.py:33 +#: awx/main/migrations/_reencrypt.py:25 awx/main/models/notifications.py:33 msgid "Email" msgstr "Email" -#: awx/main/migrations/_reencrypt.py:24 awx/main/models/notifications.py:34 +#: awx/main/migrations/_reencrypt.py:26 awx/main/models/notifications.py:34 msgid "Slack" msgstr "Slack" -#: awx/main/migrations/_reencrypt.py:25 awx/main/models/notifications.py:35 +#: awx/main/migrations/_reencrypt.py:27 awx/main/models/notifications.py:35 msgid "Twilio" msgstr "Twilio" -#: awx/main/migrations/_reencrypt.py:26 awx/main/models/notifications.py:36 +#: awx/main/migrations/_reencrypt.py:28 awx/main/models/notifications.py:36 msgid "Pagerduty" msgstr "Pagerduty" -#: awx/main/migrations/_reencrypt.py:27 awx/main/models/notifications.py:37 +#: awx/main/migrations/_reencrypt.py:29 awx/main/models/notifications.py:37 msgid "HipChat" msgstr "HipChat" -#: awx/main/migrations/_reencrypt.py:28 awx/main/models/notifications.py:38 +#: awx/main/migrations/_reencrypt.py:30 awx/main/models/notifications.py:38 msgid "Webhook" msgstr "Webhook" -#: awx/main/migrations/_reencrypt.py:29 awx/main/models/notifications.py:39 +#: awx/main/migrations/_reencrypt.py:31 awx/main/models/notifications.py:39 msgid "IRC" msgstr "IRC" -#: awx/main/models/activity_stream.py:24 +#: awx/main/models/activity_stream.py:25 msgid "Entity Created" msgstr "Entité créée" -#: awx/main/models/activity_stream.py:25 +#: awx/main/models/activity_stream.py:26 msgid "Entity Updated" msgstr "Entité mise à jour" -#: awx/main/models/activity_stream.py:26 +#: awx/main/models/activity_stream.py:27 msgid "Entity Deleted" msgstr "Entité supprimée" -#: awx/main/models/activity_stream.py:27 +#: awx/main/models/activity_stream.py:28 msgid "Entity Associated with another Entity" msgstr "Entité associée à une autre entité" -#: awx/main/models/activity_stream.py:28 +#: awx/main/models/activity_stream.py:29 msgid "Entity was Disassociated with another Entity" msgstr "Entité dissociée d'une autre entité" @@ -2149,43 +2189,43 @@ msgstr "Module non pris en charge pour les commandes ad hoc." msgid "No argument passed to %s module." msgstr "Aucun argument transmis au module %s." -#: awx/main/models/ad_hoc_commands.py:245 awx/main/models/jobs.py:904 +#: awx/main/models/ad_hoc_commands.py:245 awx/main/models/jobs.py:911 msgid "Host Failed" msgstr "Échec de l'hôte" -#: awx/main/models/ad_hoc_commands.py:246 awx/main/models/jobs.py:905 +#: awx/main/models/ad_hoc_commands.py:246 awx/main/models/jobs.py:912 msgid "Host OK" msgstr "Hôte OK" -#: awx/main/models/ad_hoc_commands.py:247 awx/main/models/jobs.py:908 +#: awx/main/models/ad_hoc_commands.py:247 awx/main/models/jobs.py:915 msgid "Host Unreachable" msgstr "Hôte inaccessible" -#: awx/main/models/ad_hoc_commands.py:252 awx/main/models/jobs.py:907 +#: awx/main/models/ad_hoc_commands.py:252 awx/main/models/jobs.py:914 msgid "Host Skipped" msgstr "Hôte ignoré" -#: awx/main/models/ad_hoc_commands.py:262 awx/main/models/jobs.py:935 +#: awx/main/models/ad_hoc_commands.py:262 awx/main/models/jobs.py:942 msgid "Debug" msgstr "Déboguer" -#: awx/main/models/ad_hoc_commands.py:263 awx/main/models/jobs.py:936 +#: awx/main/models/ad_hoc_commands.py:263 awx/main/models/jobs.py:943 msgid "Verbose" msgstr "Verbeux" -#: awx/main/models/ad_hoc_commands.py:264 awx/main/models/jobs.py:937 +#: awx/main/models/ad_hoc_commands.py:264 awx/main/models/jobs.py:944 msgid "Deprecated" msgstr "Obsolète" -#: awx/main/models/ad_hoc_commands.py:265 awx/main/models/jobs.py:938 +#: awx/main/models/ad_hoc_commands.py:265 awx/main/models/jobs.py:945 msgid "Warning" msgstr "Avertissement" -#: awx/main/models/ad_hoc_commands.py:266 awx/main/models/jobs.py:939 +#: awx/main/models/ad_hoc_commands.py:266 awx/main/models/jobs.py:946 msgid "System Warning" msgstr "Avertissement système" -#: awx/main/models/ad_hoc_commands.py:267 awx/main/models/jobs.py:940 +#: awx/main/models/ad_hoc_commands.py:267 awx/main/models/jobs.py:947 #: awx/main/models/unified_jobs.py:64 msgid "Error" msgstr "Erreur" @@ -2204,27 +2244,27 @@ msgstr "Vérifier" msgid "Scan" msgstr "Scanner" -#: awx/main/models/credential.py:82 +#: awx/main/models/credential.py:86 msgid "Host" msgstr "Hôte" -#: awx/main/models/credential.py:83 +#: awx/main/models/credential.py:87 msgid "The hostname or IP address to use." msgstr "Nom d'hôte ou adresse IP à utiliser." -#: awx/main/models/credential.py:89 +#: awx/main/models/credential.py:93 msgid "Username" msgstr "Nom d'utilisateur" -#: awx/main/models/credential.py:90 +#: awx/main/models/credential.py:94 msgid "Username for this credential." msgstr "Nom d'utilisateur pour ces informations d'identification." -#: awx/main/models/credential.py:96 +#: awx/main/models/credential.py:100 msgid "Password" msgstr "Mot de passe" -#: awx/main/models/credential.py:97 +#: awx/main/models/credential.py:101 msgid "" "Password for this credential (or \"ASK\" to prompt the user for machine " "credentials)." @@ -2232,43 +2272,43 @@ msgstr "" "Mot de passe pour ces informations d'identification (ou \"ASK\" pour " "demander à l'utilisateur les informations d'identification de la machine)." -#: awx/main/models/credential.py:104 +#: awx/main/models/credential.py:108 msgid "Security Token" msgstr "Token de sécurité" -#: awx/main/models/credential.py:105 +#: awx/main/models/credential.py:109 msgid "Security Token for this credential" msgstr "Token de sécurité pour ces informations d'identification" -#: awx/main/models/credential.py:111 +#: awx/main/models/credential.py:115 msgid "Project" msgstr "Projet" -#: awx/main/models/credential.py:112 +#: awx/main/models/credential.py:116 msgid "The identifier for the project." msgstr "Identifiant du projet." -#: awx/main/models/credential.py:118 +#: awx/main/models/credential.py:122 msgid "Domain" msgstr "Domaine" -#: awx/main/models/credential.py:119 +#: awx/main/models/credential.py:123 msgid "The identifier for the domain." msgstr "Identifiant du domaine." -#: awx/main/models/credential.py:124 +#: awx/main/models/credential.py:128 msgid "SSH private key" msgstr "Clé privée SSH" -#: awx/main/models/credential.py:125 +#: awx/main/models/credential.py:129 msgid "RSA or DSA private key to be used instead of password." msgstr "Clé privée RSA ou DSA à utiliser au lieu du mot de passe." -#: awx/main/models/credential.py:131 +#: awx/main/models/credential.py:135 msgid "SSH key unlock" msgstr "Déverrouillage de la clé SSH" -#: awx/main/models/credential.py:132 +#: awx/main/models/credential.py:136 msgid "" "Passphrase to unlock SSH private key if encrypted (or \"ASK\" to prompt the " "user for machine credentials)." @@ -2277,52 +2317,52 @@ msgstr "" "chiffrée (ou \"ASK\" pour demander à l'utilisateur les informations " "d'identification de la machine)." -#: awx/main/models/credential.py:139 +#: awx/main/models/credential.py:143 msgid "None" msgstr "Aucun" -#: awx/main/models/credential.py:140 +#: awx/main/models/credential.py:144 msgid "Privilege escalation method." msgstr "Méthode d'élévation des privilèges." -#: awx/main/models/credential.py:146 +#: awx/main/models/credential.py:150 msgid "Privilege escalation username." msgstr "Nom d'utilisateur pour l'élévation des privilèges" -#: awx/main/models/credential.py:152 +#: awx/main/models/credential.py:156 msgid "Password for privilege escalation method." msgstr "Mot de passe pour la méthode d'élévation des privilèges." -#: awx/main/models/credential.py:158 +#: awx/main/models/credential.py:162 msgid "Vault password (or \"ASK\" to prompt the user)." msgstr "Mot de passe Vault (ou \"ASK\" pour le demander à l'utilisateur)." -#: awx/main/models/credential.py:162 +#: awx/main/models/credential.py:166 msgid "Whether to use the authorize mechanism." msgstr "Indique s'il faut ou non utiliser le mécanisme d'autorisation." -#: awx/main/models/credential.py:168 +#: awx/main/models/credential.py:172 msgid "Password used by the authorize mechanism." msgstr "Mot de passe utilisé par le mécanisme d'autorisation." -#: awx/main/models/credential.py:174 +#: awx/main/models/credential.py:178 msgid "Client Id or Application Id for the credential" msgstr "" "ID du client ou de l'application pour les informations d'identification" -#: awx/main/models/credential.py:180 +#: awx/main/models/credential.py:184 msgid "Secret Token for this credential" msgstr "Token secret pour ces informations d'identification" -#: awx/main/models/credential.py:186 +#: awx/main/models/credential.py:190 msgid "Subscription identifier for this credential" msgstr "ID d'abonnement pour ces informations d'identification" -#: awx/main/models/credential.py:192 +#: awx/main/models/credential.py:196 msgid "Tenant identifier for this credential" msgstr "ID de tenant pour ces informations d'identification" -#: awx/main/models/credential.py:216 +#: awx/main/models/credential.py:220 msgid "" "Specify the type of credential you want to create. Refer to the Ansible " "Tower documentation for details on each type." @@ -2330,7 +2370,7 @@ msgstr "" "Spécifiez le type d'information d'identification à créer. Consultez la " "documentation d’Ansible Tower pour en savoir plus sur chaque type." -#: awx/main/models/credential.py:230 awx/main/models/credential.py:416 +#: awx/main/models/credential.py:234 awx/main/models/credential.py:420 msgid "" "Enter inputs using either JSON or YAML syntax. Use the radio button to " "toggle between the two. Refer to the Ansible Tower documentation for example" @@ -2340,31 +2380,31 @@ msgstr "" "pour basculer entre les deux. Consultez la documentation d’Ansible Tower " "pour avoir un exemple de syntaxe." -#: awx/main/models/credential.py:397 +#: awx/main/models/credential.py:401 msgid "Machine" msgstr "Machine" -#: awx/main/models/credential.py:398 +#: awx/main/models/credential.py:402 msgid "Vault" msgstr "Coffre-fort" -#: awx/main/models/credential.py:399 +#: awx/main/models/credential.py:403 msgid "Network" msgstr "Réseau" -#: awx/main/models/credential.py:400 +#: awx/main/models/credential.py:404 msgid "Source Control" msgstr "Contrôle de la source" -#: awx/main/models/credential.py:401 +#: awx/main/models/credential.py:405 msgid "Cloud" msgstr "Cloud" -#: awx/main/models/credential.py:402 +#: awx/main/models/credential.py:406 msgid "Insights" msgstr "Insights" -#: awx/main/models/credential.py:423 +#: awx/main/models/credential.py:427 msgid "" "Enter injectors using either JSON or YAML syntax. Use the radio button to " "toggle between the two. Refer to the Ansible Tower documentation for example" @@ -2374,6 +2414,11 @@ msgstr "" " pour basculer entre les deux. Consultez la documentation Ansible Tower pour" " avoir un exemple de syntaxe." +#: awx/main/models/credential.py:478 +#, python-format +msgid "adding %s credential type" +msgstr "ajout type d'identifiants %s" + #: awx/main/models/fact.py:25 msgid "Host for the facts that the fact scan captured." msgstr "Hôte pour les faits que le scan de faits a capturés." @@ -2392,11 +2437,11 @@ msgstr "" "Structure JSON arbitraire des faits de module capturés au moment de " "l'horodatage pour un seul hôte." -#: awx/main/models/ha.py:76 +#: awx/main/models/ha.py:78 msgid "Instances that are members of this InstanceGroup" msgstr "Instances membres de ce GroupeInstances." -#: awx/main/models/ha.py:81 +#: awx/main/models/ha.py:83 msgid "Instance Group to remotely control this group." msgstr "Groupe d'instances pour contrôler ce groupe à distance." @@ -2596,38 +2641,42 @@ msgid "Google Compute Engine" msgstr "Google Compute Engine" #: awx/main/models/inventory.py:870 -msgid "Microsoft Azure Classic (deprecated)" -msgstr "Microsoft Azure Classic (obsolète)" - -#: awx/main/models/inventory.py:871 msgid "Microsoft Azure Resource Manager" msgstr "Microsoft Azure Resource Manager" -#: awx/main/models/inventory.py:872 +#: awx/main/models/inventory.py:871 msgid "VMware vCenter" msgstr "VMware vCenter" -#: awx/main/models/inventory.py:873 +#: awx/main/models/inventory.py:872 msgid "Red Hat Satellite 6" msgstr "Red Hat Satellite 6" -#: awx/main/models/inventory.py:874 +#: awx/main/models/inventory.py:873 msgid "Red Hat CloudForms" msgstr "Red Hat CloudForms" -#: awx/main/models/inventory.py:875 +#: awx/main/models/inventory.py:874 msgid "OpenStack" msgstr "OpenStack" +#: awx/main/models/inventory.py:875 +msgid "oVirt4" +msgstr "oVirt4" + #: awx/main/models/inventory.py:876 +msgid "Ansible Tower" +msgstr "Ansible Tower" + +#: awx/main/models/inventory.py:877 msgid "Custom Script" msgstr "Script personnalisé" -#: awx/main/models/inventory.py:993 +#: awx/main/models/inventory.py:994 msgid "Inventory source variables in YAML or JSON format." msgstr "Variables de source d'inventaire au format JSON ou YAML." -#: awx/main/models/inventory.py:1012 +#: awx/main/models/inventory.py:1013 msgid "" "Comma-separated list of filter expressions (EC2 only). Hosts are imported " "when ANY of the filters match." @@ -2635,75 +2684,75 @@ msgstr "" "Liste d'expressions de filtre séparées par des virgules (EC2 uniquement). " "Les hôtes sont importés lorsque l'UN des filtres correspondent." -#: awx/main/models/inventory.py:1018 +#: awx/main/models/inventory.py:1019 msgid "Limit groups automatically created from inventory source (EC2 only)." msgstr "" "Limiter automatiquement les groupes créés à partir de la source d'inventaire" " (EC2 uniquement)." -#: awx/main/models/inventory.py:1022 +#: awx/main/models/inventory.py:1023 msgid "Overwrite local groups and hosts from remote inventory source." msgstr "" "Écraser les groupes locaux et les hôtes de la source d'inventaire distante." -#: awx/main/models/inventory.py:1026 +#: awx/main/models/inventory.py:1027 msgid "Overwrite local variables from remote inventory source." msgstr "Écraser les variables locales de la source d'inventaire distante." -#: awx/main/models/inventory.py:1031 awx/main/models/jobs.py:159 +#: awx/main/models/inventory.py:1032 awx/main/models/jobs.py:160 #: awx/main/models/projects.py:117 msgid "The amount of time (in seconds) to run before the task is canceled." msgstr "Délai écoulé (en secondes) avant que la tâche ne soit annulée." -#: awx/main/models/inventory.py:1064 +#: awx/main/models/inventory.py:1065 msgid "Image ID" msgstr "ID d'image" -#: awx/main/models/inventory.py:1065 +#: awx/main/models/inventory.py:1066 msgid "Availability Zone" msgstr "Zone de disponibilité" -#: awx/main/models/inventory.py:1066 +#: awx/main/models/inventory.py:1067 msgid "Account" msgstr "Compte" -#: awx/main/models/inventory.py:1067 +#: awx/main/models/inventory.py:1068 msgid "Instance ID" msgstr "ID d'instance" -#: awx/main/models/inventory.py:1068 +#: awx/main/models/inventory.py:1069 msgid "Instance State" msgstr "État de l'instance" -#: awx/main/models/inventory.py:1069 +#: awx/main/models/inventory.py:1070 msgid "Instance Type" msgstr "Type d'instance" -#: awx/main/models/inventory.py:1070 +#: awx/main/models/inventory.py:1071 msgid "Key Name" msgstr "Nom de la clé" -#: awx/main/models/inventory.py:1071 +#: awx/main/models/inventory.py:1072 msgid "Region" msgstr "Région" -#: awx/main/models/inventory.py:1072 +#: awx/main/models/inventory.py:1073 msgid "Security Group" msgstr "Groupe de sécurité" -#: awx/main/models/inventory.py:1073 +#: awx/main/models/inventory.py:1074 msgid "Tags" msgstr "Balises" -#: awx/main/models/inventory.py:1074 +#: awx/main/models/inventory.py:1075 msgid "Tag None" msgstr "Ne rien baliser" -#: awx/main/models/inventory.py:1075 +#: awx/main/models/inventory.py:1076 msgid "VPC ID" msgstr "ID VPC" -#: awx/main/models/inventory.py:1138 +#: awx/main/models/inventory.py:1145 #, python-format msgid "" "Cloud-based inventory sources (such as %s) require credentials for the " @@ -2712,31 +2761,40 @@ msgstr "" "Les sources d'inventaire cloud (telles que %s) requièrent des informations " "d'identification pour le service cloud correspondant." -#: awx/main/models/inventory.py:1145 +#: awx/main/models/inventory.py:1152 msgid "Credential is required for a cloud source." msgstr "" "Les informations d'identification sont requises pour une source cloud." -#: awx/main/models/inventory.py:1167 +#: awx/main/models/inventory.py:1155 +msgid "" +"Credentials of type machine, source control, insights and vault are " +"disallowed for custom inventory sources." +msgstr "" +"Les identifiants de type machine, contrôle de la source, insights ou " +"archivage sécurisé ne sont pas autorisés par les sources d'inventaire " +"personnalisées." + +#: awx/main/models/inventory.py:1179 #, python-format msgid "Invalid %(source)s region: %(region)s" msgstr "Région %(source)s non valide : %(region)s" -#: awx/main/models/inventory.py:1191 +#: awx/main/models/inventory.py:1203 #, python-format msgid "Invalid filter expression: %(filter)s" msgstr "Expression de filtre non valide : %(filter)s" -#: awx/main/models/inventory.py:1212 +#: awx/main/models/inventory.py:1224 #, python-format msgid "Invalid group by choice: %(choice)s" msgstr "Choix de regroupement non valide : %(choice)s" -#: awx/main/models/inventory.py:1247 +#: awx/main/models/inventory.py:1259 msgid "Project containing inventory file used as source." msgstr "Projet contenant le fichier d'inventaire utilisé comme source." -#: awx/main/models/inventory.py:1395 +#: awx/main/models/inventory.py:1407 #, python-format msgid "" "Unable to configure this item for cloud sync. It is already managed by %s." @@ -2744,7 +2802,7 @@ msgstr "" "Impossible de configurer cet élément pour la synchronisation dans le cloud. " "Il est déjà géré par %s." -#: awx/main/models/inventory.py:1405 +#: awx/main/models/inventory.py:1417 msgid "" "More than one SCM-based inventory source with update on project update per-" "inventory not allowed." @@ -2752,7 +2810,7 @@ msgstr "" "On n'autorise pas plus d'une source d'inventaire basé SCM avec mise à jour " "pré-inventaire ou mise à jour projet." -#: awx/main/models/inventory.py:1412 +#: awx/main/models/inventory.py:1424 msgid "" "Cannot update SCM-based inventory source on launch if set to update on " "project update. Instead, configure the corresponding source project to " @@ -2763,30 +2821,30 @@ msgstr "" " la place, configurez le projet source correspondant pour qu'il se mette à " "jour au moment du lancement." -#: awx/main/models/inventory.py:1418 +#: awx/main/models/inventory.py:1430 msgid "SCM type sources must set `overwrite_vars` to `true`." msgstr "Les sources de type SCM doivent définir `overwrite_vars` sur`true`." -#: awx/main/models/inventory.py:1423 +#: awx/main/models/inventory.py:1435 msgid "Cannot set source_path if not SCM type." msgstr "Impossible de définir chemin_source si pas du type SCM." -#: awx/main/models/inventory.py:1448 +#: awx/main/models/inventory.py:1460 msgid "" "Inventory files from this Project Update were used for the inventory update." msgstr "" "Les fichiers d'inventaire de cette mise à jour de projet ont été utilisés " "pour la mise à jour de l'inventaire." -#: awx/main/models/inventory.py:1561 +#: awx/main/models/inventory.py:1573 msgid "Inventory script contents" msgstr "Contenus des scripts d'inventaire" -#: awx/main/models/inventory.py:1566 +#: awx/main/models/inventory.py:1578 msgid "Organization owning this inventory script" msgstr "Organisation propriétaire de ce script d'inventaire." -#: awx/main/models/jobs.py:65 +#: awx/main/models/jobs.py:66 msgid "" "If enabled, textual changes made to any templated files on the host are " "shown in the standard output" @@ -2795,7 +2853,7 @@ msgstr "" "fichiers basés sur un modèle de l'hôte sont affichées dans la sortie " "standard out" -#: awx/main/models/jobs.py:163 +#: awx/main/models/jobs.py:164 msgid "" "If enabled, Tower will act as an Ansible Fact Cache Plugin; persisting facts" " at the end of a playbook run to the database and caching facts for use by " @@ -2805,38 +2863,38 @@ msgstr "" " ; les faits persistants à la fin d'un playbook s'exécutent vers la base de " "données et les faits mis en cache pour être utilisés par Ansible." -#: awx/main/models/jobs.py:172 +#: awx/main/models/jobs.py:173 msgid "You must provide an SSH credential." msgstr "Vous devez fournir des informations d'identification SSH." -#: awx/main/models/jobs.py:180 +#: awx/main/models/jobs.py:181 msgid "You must provide a Vault credential." msgstr "Vous devez fournir des informations d'identification du coffre-fort." -#: awx/main/models/jobs.py:316 +#: awx/main/models/jobs.py:317 msgid "Job Template must provide 'inventory' or allow prompting for it." msgstr "" "Le modèle de tâche doit fournir un inventaire ou permettre d'en demander un." -#: awx/main/models/jobs.py:320 +#: awx/main/models/jobs.py:321 msgid "Job Template must provide 'credential' or allow prompting for it." msgstr "" "Le modèle de tâche doit fournir des informations d'identification ou " "permettre d'en demander." -#: awx/main/models/jobs.py:422 +#: awx/main/models/jobs.py:427 msgid "Cannot override job_type to or from a scan job." msgstr "Impossible de remplacer job_type vers ou depuis une tâche de scan." -#: awx/main/models/jobs.py:488 awx/main/models/projects.py:263 +#: awx/main/models/jobs.py:493 awx/main/models/projects.py:263 msgid "SCM Revision" msgstr "Révision SCM" -#: awx/main/models/jobs.py:489 +#: awx/main/models/jobs.py:494 msgid "The SCM Revision from the Project used for this job, if available" msgstr "Révision SCM du projet utilisé pour cette tâche, le cas échéant" -#: awx/main/models/jobs.py:497 +#: awx/main/models/jobs.py:502 msgid "" "The SCM Refresh task used to make sure the playbooks were available for the " "job run" @@ -2844,105 +2902,105 @@ msgstr "" "Activité d'actualisation du SCM qui permet de s'assurer que les playbooks " "étaient disponibles pour l'exécution de la tâche" -#: awx/main/models/jobs.py:802 +#: awx/main/models/jobs.py:809 msgid "job host summaries" msgstr "récapitulatifs des hôtes pour la tâche" -#: awx/main/models/jobs.py:906 +#: awx/main/models/jobs.py:913 msgid "Host Failure" msgstr "Échec de l'hôte" -#: awx/main/models/jobs.py:909 awx/main/models/jobs.py:923 +#: awx/main/models/jobs.py:916 awx/main/models/jobs.py:930 msgid "No Hosts Remaining" msgstr "Aucun hôte restant" -#: awx/main/models/jobs.py:910 +#: awx/main/models/jobs.py:917 msgid "Host Polling" msgstr "Interrogation de l'hôte" -#: awx/main/models/jobs.py:911 +#: awx/main/models/jobs.py:918 msgid "Host Async OK" msgstr "Désynchronisation des hôtes OK" -#: awx/main/models/jobs.py:912 +#: awx/main/models/jobs.py:919 msgid "Host Async Failure" msgstr "Échec de désynchronisation des hôtes" -#: awx/main/models/jobs.py:913 +#: awx/main/models/jobs.py:920 msgid "Item OK" msgstr "Élément OK" -#: awx/main/models/jobs.py:914 +#: awx/main/models/jobs.py:921 msgid "Item Failed" msgstr "Échec de l'élément" -#: awx/main/models/jobs.py:915 +#: awx/main/models/jobs.py:922 msgid "Item Skipped" msgstr "Élément ignoré" -#: awx/main/models/jobs.py:916 +#: awx/main/models/jobs.py:923 msgid "Host Retry" msgstr "Nouvel essai de l'hôte" -#: awx/main/models/jobs.py:918 +#: awx/main/models/jobs.py:925 msgid "File Difference" msgstr "Écart entre les fichiers" -#: awx/main/models/jobs.py:919 +#: awx/main/models/jobs.py:926 msgid "Playbook Started" msgstr "Playbook démarré" -#: awx/main/models/jobs.py:920 +#: awx/main/models/jobs.py:927 msgid "Running Handlers" msgstr "Descripteurs d'exécution" -#: awx/main/models/jobs.py:921 +#: awx/main/models/jobs.py:928 msgid "Including File" msgstr "Ajout de fichier" -#: awx/main/models/jobs.py:922 +#: awx/main/models/jobs.py:929 msgid "No Hosts Matched" msgstr "Aucun hôte correspondant" -#: awx/main/models/jobs.py:924 +#: awx/main/models/jobs.py:931 msgid "Task Started" msgstr "Tâche démarrée" -#: awx/main/models/jobs.py:926 +#: awx/main/models/jobs.py:933 msgid "Variables Prompted" msgstr "Variables demandées" -#: awx/main/models/jobs.py:927 +#: awx/main/models/jobs.py:934 msgid "Gathering Facts" msgstr "Collecte des faits" -#: awx/main/models/jobs.py:928 +#: awx/main/models/jobs.py:935 msgid "internal: on Import for Host" msgstr "interne : à l'importation pour l'hôte" -#: awx/main/models/jobs.py:929 +#: awx/main/models/jobs.py:936 msgid "internal: on Not Import for Host" msgstr "interne : à la non-importation pour l'hôte" -#: awx/main/models/jobs.py:930 +#: awx/main/models/jobs.py:937 msgid "Play Started" msgstr "Scène démarrée" -#: awx/main/models/jobs.py:931 +#: awx/main/models/jobs.py:938 msgid "Playbook Complete" msgstr "Playbook terminé" -#: awx/main/models/jobs.py:1363 +#: awx/main/models/jobs.py:1351 msgid "Remove jobs older than a certain number of days" msgstr "Supprimer les tâches plus anciennes qu'un certain nombre de jours" -#: awx/main/models/jobs.py:1364 +#: awx/main/models/jobs.py:1352 msgid "Remove activity stream entries older than a certain number of days" msgstr "" "Supprimer les entrées du flux d'activité plus anciennes qu'un certain nombre" " de jours" -#: awx/main/models/jobs.py:1365 +#: awx/main/models/jobs.py:1353 msgid "Purge and/or reduce the granularity of system tracking data" msgstr "Purger et/ou réduire la granularité des données de suivi du système" @@ -3366,7 +3424,7 @@ msgstr "Exception lors de la connexion à Twilio : {}" msgid "Error sending notification webhook: {}" msgstr "Erreur lors de l'envoi d'un webhook de notification : {}" -#: awx/main/scheduler/__init__.py:184 +#: awx/main/scheduler/task_manager.py:197 msgid "" "Job spawned from workflow could not start because it was not in the right " "state or required manual credentials" @@ -3375,7 +3433,7 @@ msgstr "" "dans l'état qui convient ou nécessitant des informations d'identification " "manuelles adéquates." -#: awx/main/scheduler/__init__.py:188 +#: awx/main/scheduler/task_manager.py:201 msgid "" "Job spawned from workflow could not start because it was missing a related " "resource such as project or inventory" @@ -3395,7 +3453,7 @@ msgstr "La licence Ansible Tower expirera bientôt" msgid "status_str must be either succeeded or failed" msgstr "status_str doit être une réussite ou un échec" -#: awx/main/tasks.py:1531 +#: awx/main/tasks.py:1549 msgid "Dependent inventory update {} was canceled." msgstr "La mise à jour d'inventaire dépendante {} a été annulée." @@ -3404,38 +3462,38 @@ msgstr "La mise à jour d'inventaire dépendante {} a été annulée." msgid "Unable to convert \"%s\" to boolean" msgstr "Impossible de convertir \"%s\" en booléen" -#: awx/main/utils/common.py:209 +#: awx/main/utils/common.py:235 #, python-format msgid "Unsupported SCM type \"%s\"" msgstr "Type de SCM \"%s\" non pris en charge" -#: awx/main/utils/common.py:216 awx/main/utils/common.py:228 -#: awx/main/utils/common.py:247 +#: awx/main/utils/common.py:242 awx/main/utils/common.py:254 +#: awx/main/utils/common.py:273 #, python-format msgid "Invalid %s URL" msgstr "URL %s non valide." -#: awx/main/utils/common.py:218 awx/main/utils/common.py:257 +#: awx/main/utils/common.py:244 awx/main/utils/common.py:283 #, python-format msgid "Unsupported %s URL" msgstr "URL %s non prise en charge" -#: awx/main/utils/common.py:259 +#: awx/main/utils/common.py:285 #, python-format msgid "Unsupported host \"%s\" for file:// URL" msgstr "Hôte \"%s\" non pris en charge pour le fichier ://URL" -#: awx/main/utils/common.py:261 +#: awx/main/utils/common.py:287 #, python-format msgid "Host is required for %s URL" msgstr "L'hôte est requis pour l'URL %s" -#: awx/main/utils/common.py:279 +#: awx/main/utils/common.py:305 #, python-format msgid "Username must be \"git\" for SSH access to %s." msgstr "Le nom d'utilisateur doit être \"git\" pour l'accès SSH à %s." -#: awx/main/utils/common.py:285 +#: awx/main/utils/common.py:311 #, python-format msgid "Username must be \"hg\" for SSH access to %s." msgstr "Le nom d'utilisateur doit être \"hg\" pour l'accès SSH à %s." @@ -3556,287 +3614,287 @@ msgstr "Erreur serveur" msgid "A server error has occurred." msgstr "Une erreur serveur s'est produite." -#: awx/settings/defaults.py:664 +#: awx/settings/defaults.py:665 msgid "US East (Northern Virginia)" msgstr "Est des États-Unis (Virginie du Nord)" -#: awx/settings/defaults.py:665 +#: awx/settings/defaults.py:666 msgid "US East (Ohio)" msgstr "Est des États-Unis (Ohio)" -#: awx/settings/defaults.py:666 +#: awx/settings/defaults.py:667 msgid "US West (Oregon)" msgstr "Ouest des États-Unis (Oregon)" -#: awx/settings/defaults.py:667 +#: awx/settings/defaults.py:668 msgid "US West (Northern California)" msgstr "Ouest des États-Unis (Nord de la Californie)" -#: awx/settings/defaults.py:668 +#: awx/settings/defaults.py:669 msgid "Canada (Central)" msgstr "Canada (Central)" -#: awx/settings/defaults.py:669 +#: awx/settings/defaults.py:670 msgid "EU (Frankfurt)" msgstr "UE (Francfort)" -#: awx/settings/defaults.py:670 +#: awx/settings/defaults.py:671 msgid "EU (Ireland)" msgstr "UE (Irlande)" -#: awx/settings/defaults.py:671 +#: awx/settings/defaults.py:672 msgid "EU (London)" msgstr "UE (Londres)" -#: awx/settings/defaults.py:672 +#: awx/settings/defaults.py:673 msgid "Asia Pacific (Singapore)" msgstr "Asie-Pacifique (Singapour)" -#: awx/settings/defaults.py:673 +#: awx/settings/defaults.py:674 msgid "Asia Pacific (Sydney)" msgstr "Asie-Pacifique (Sydney)" -#: awx/settings/defaults.py:674 +#: awx/settings/defaults.py:675 msgid "Asia Pacific (Tokyo)" msgstr "Asie-Pacifique (Tokyo)" -#: awx/settings/defaults.py:675 +#: awx/settings/defaults.py:676 msgid "Asia Pacific (Seoul)" msgstr "Asie-Pacifique (Séoul)" -#: awx/settings/defaults.py:676 +#: awx/settings/defaults.py:677 msgid "Asia Pacific (Mumbai)" msgstr "Asie-Pacifique (Mumbai)" -#: awx/settings/defaults.py:677 +#: awx/settings/defaults.py:678 msgid "South America (Sao Paulo)" msgstr "Amérique du Sud (Sao Paulo)" -#: awx/settings/defaults.py:678 +#: awx/settings/defaults.py:679 msgid "US West (GovCloud)" msgstr "Ouest des États-Unis (GovCloud)" -#: awx/settings/defaults.py:679 +#: awx/settings/defaults.py:680 msgid "China (Beijing)" msgstr "Chine (Pékin)" -#: awx/settings/defaults.py:728 +#: awx/settings/defaults.py:729 msgid "US East 1 (B)" msgstr "Est des États-Unis 1 (B)" -#: awx/settings/defaults.py:729 +#: awx/settings/defaults.py:730 msgid "US East 1 (C)" msgstr "Est des États-Unis 1 (C)" -#: awx/settings/defaults.py:730 +#: awx/settings/defaults.py:731 msgid "US East 1 (D)" msgstr "Est des États-Unis 1 (D)" -#: awx/settings/defaults.py:731 +#: awx/settings/defaults.py:732 msgid "US East 4 (A)" msgstr "Est des États-Unis 4 (A)" -#: awx/settings/defaults.py:732 +#: awx/settings/defaults.py:733 msgid "US East 4 (B)" msgstr "Est des États-Unis 4 (B)" -#: awx/settings/defaults.py:733 +#: awx/settings/defaults.py:734 msgid "US East 4 (C)" msgstr "Est des États-Unis 4 (C)" -#: awx/settings/defaults.py:734 +#: awx/settings/defaults.py:735 msgid "US Central (A)" msgstr "Centre des États-Unis (A)" -#: awx/settings/defaults.py:735 +#: awx/settings/defaults.py:736 msgid "US Central (B)" msgstr "Centre des États-Unis (B)" -#: awx/settings/defaults.py:736 +#: awx/settings/defaults.py:737 msgid "US Central (C)" msgstr "Centre des États-Unis (C)" -#: awx/settings/defaults.py:737 +#: awx/settings/defaults.py:738 msgid "US Central (F)" msgstr "Centre des États-Unis (F)" -#: awx/settings/defaults.py:738 +#: awx/settings/defaults.py:739 msgid "US West (A)" msgstr "Ouest des États-Unis (A)" -#: awx/settings/defaults.py:739 +#: awx/settings/defaults.py:740 msgid "US West (B)" msgstr "Ouest des États-Unis (B)" -#: awx/settings/defaults.py:740 +#: awx/settings/defaults.py:741 msgid "US West (C)" msgstr "Ouest des États-Unis (C)" -#: awx/settings/defaults.py:741 +#: awx/settings/defaults.py:742 msgid "Europe West 1 (B)" msgstr "Europe de l'Ouest 1 (B)" -#: awx/settings/defaults.py:742 +#: awx/settings/defaults.py:743 msgid "Europe West 1 (C)" msgstr "Europe de l'Ouest 1 (C)" -#: awx/settings/defaults.py:743 +#: awx/settings/defaults.py:744 msgid "Europe West 1 (D)" msgstr "Europe de l'Ouest 1 (D)" -#: awx/settings/defaults.py:744 +#: awx/settings/defaults.py:745 msgid "Europe West 2 (A)" msgstr "Europe de l'Ouest 2 (A)" -#: awx/settings/defaults.py:745 +#: awx/settings/defaults.py:746 msgid "Europe West 2 (B)" msgstr "Europe de l'Ouest 2 (B)" -#: awx/settings/defaults.py:746 +#: awx/settings/defaults.py:747 msgid "Europe West 2 (C)" msgstr "Europe de l'Ouest 2 (C)" -#: awx/settings/defaults.py:747 +#: awx/settings/defaults.py:748 msgid "Asia East (A)" msgstr "Asie de l'Est (A)" -#: awx/settings/defaults.py:748 +#: awx/settings/defaults.py:749 msgid "Asia East (B)" msgstr "Asie de l'Est (B)" -#: awx/settings/defaults.py:749 +#: awx/settings/defaults.py:750 msgid "Asia East (C)" msgstr "Asie de l'Est (C)" -#: awx/settings/defaults.py:750 +#: awx/settings/defaults.py:751 msgid "Asia Southeast (A)" msgstr "Asie du Sud-Est (A)" -#: awx/settings/defaults.py:751 +#: awx/settings/defaults.py:752 msgid "Asia Southeast (B)" msgstr "Asie du Sud-Est (B)" -#: awx/settings/defaults.py:752 +#: awx/settings/defaults.py:753 msgid "Asia Northeast (A)" msgstr "Asie du Nord-Est (A)" -#: awx/settings/defaults.py:753 +#: awx/settings/defaults.py:754 msgid "Asia Northeast (B)" msgstr "Asie du Nord-Est (B)" -#: awx/settings/defaults.py:754 +#: awx/settings/defaults.py:755 msgid "Asia Northeast (C)" msgstr "Asie du Nord-Est (C)" -#: awx/settings/defaults.py:755 +#: awx/settings/defaults.py:756 msgid "Australia Southeast (A)" msgstr "Sud-est de l'Australie (A)" -#: awx/settings/defaults.py:756 +#: awx/settings/defaults.py:757 msgid "Australia Southeast (B)" msgstr "Sud-est de l'Australie (B)" -#: awx/settings/defaults.py:757 +#: awx/settings/defaults.py:758 msgid "Australia Southeast (C)" msgstr "Sud-est de l'Australie (C)" -#: awx/settings/defaults.py:781 +#: awx/settings/defaults.py:780 msgid "US East" msgstr "Est des États-Unis" -#: awx/settings/defaults.py:782 +#: awx/settings/defaults.py:781 msgid "US East 2" msgstr "Est des États-Unis 2" -#: awx/settings/defaults.py:783 +#: awx/settings/defaults.py:782 msgid "US Central" msgstr "Centre des États-Unis" -#: awx/settings/defaults.py:784 +#: awx/settings/defaults.py:783 msgid "US North Central" msgstr "Centre-Nord des États-Unis" -#: awx/settings/defaults.py:785 +#: awx/settings/defaults.py:784 msgid "US South Central" msgstr "Centre-Sud des États-Unis" -#: awx/settings/defaults.py:786 +#: awx/settings/defaults.py:785 msgid "US West Central" msgstr "Centre-Ouest des États-Unis" -#: awx/settings/defaults.py:787 +#: awx/settings/defaults.py:786 msgid "US West" msgstr "Ouest des États-Unis" -#: awx/settings/defaults.py:788 +#: awx/settings/defaults.py:787 msgid "US West 2" msgstr "Ouest des États-Unis 2" -#: awx/settings/defaults.py:789 +#: awx/settings/defaults.py:788 msgid "Canada East" msgstr "Est du Canada" -#: awx/settings/defaults.py:790 +#: awx/settings/defaults.py:789 msgid "Canada Central" msgstr "Centre du Canada" -#: awx/settings/defaults.py:791 +#: awx/settings/defaults.py:790 msgid "Brazil South" msgstr "Sud du Brésil" -#: awx/settings/defaults.py:792 +#: awx/settings/defaults.py:791 msgid "Europe North" msgstr "Europe du Nord" -#: awx/settings/defaults.py:793 +#: awx/settings/defaults.py:792 msgid "Europe West" msgstr "Europe de l'Ouest" -#: awx/settings/defaults.py:794 +#: awx/settings/defaults.py:793 msgid "UK West" msgstr "Ouest du Royaume-Uni" -#: awx/settings/defaults.py:795 +#: awx/settings/defaults.py:794 msgid "UK South" msgstr "Sud du Royaume-Uni" -#: awx/settings/defaults.py:796 +#: awx/settings/defaults.py:795 msgid "Asia East" msgstr "Asie de l'Est" -#: awx/settings/defaults.py:797 +#: awx/settings/defaults.py:796 msgid "Asia Southeast" msgstr "Asie du Sud-Est" -#: awx/settings/defaults.py:798 +#: awx/settings/defaults.py:797 msgid "Australia East" msgstr "Est de l'Australie" -#: awx/settings/defaults.py:799 +#: awx/settings/defaults.py:798 msgid "Australia Southeast" msgstr "Sud-Est de l'Australie" -#: awx/settings/defaults.py:800 +#: awx/settings/defaults.py:799 msgid "India West" msgstr "Ouest de l'Inde" -#: awx/settings/defaults.py:801 +#: awx/settings/defaults.py:800 msgid "India South" msgstr "Sud de l'Inde" -#: awx/settings/defaults.py:802 +#: awx/settings/defaults.py:801 msgid "Japan East" msgstr "Est du Japon" -#: awx/settings/defaults.py:803 +#: awx/settings/defaults.py:802 msgid "Japan West" msgstr "Ouest du Japon" -#: awx/settings/defaults.py:804 +#: awx/settings/defaults.py:803 msgid "Korea Central" msgstr "Centre de la Corée" -#: awx/settings/defaults.py:805 +#: awx/settings/defaults.py:804 msgid "Korea South" msgstr "Sud de la Corée" @@ -4593,6 +4651,7 @@ msgid "SAML Team Map" msgstr "Mappe d'équipes SAML" #: awx/sso/fields.py:123 +#, python-brace-format msgid "Invalid connection option(s): {invalid_options}." msgstr "Option(s) de connexion non valide(s) : {invalid_options}." @@ -4609,18 +4668,21 @@ msgid "Subtree" msgstr "Sous-arborescence" #: awx/sso/fields.py:214 +#, python-brace-format msgid "Expected a list of three items but got {length} instead." msgstr "" "Une liste de trois éléments était attendue, mais {length} a été obtenu à la " "place." #: awx/sso/fields.py:215 +#, python-brace-format msgid "Expected an instance of LDAPSearch but got {input_type} instead." msgstr "" "Une instance de LDAPSearch était attendue, mais {input_type} a été obtenu à " "la place." #: awx/sso/fields.py:251 +#, python-brace-format msgid "" "Expected an instance of LDAPSearch or LDAPSearchUnion but got {input_type} " "instead." @@ -4629,20 +4691,24 @@ msgstr "" "{input_type} a été obtenu à la place." #: awx/sso/fields.py:289 +#, python-brace-format msgid "Invalid user attribute(s): {invalid_attrs}." msgstr "Attribut(s) d'utilisateur non valide(s) : {invalid_attrs}." #: awx/sso/fields.py:306 +#, python-brace-format msgid "Expected an instance of LDAPGroupType but got {input_type} instead." msgstr "" "Une instance de LDAPGroupType était attendue, mais {input_type} a été obtenu" " à la place." #: awx/sso/fields.py:334 +#, python-brace-format msgid "Invalid user flag: \"{invalid_flag}\"." msgstr "Marqueur d'utilisateur non valide : \"{invalid_flag}\"." #: awx/sso/fields.py:350 awx/sso/fields.py:517 +#, python-brace-format msgid "" "Expected None, True, False, a string or list of strings but got {input_type}" " instead." @@ -4651,50 +4717,61 @@ msgstr "" "attendues, mais {input_type} a été obtenu à la place." #: awx/sso/fields.py:386 +#, python-brace-format msgid "Missing key(s): {missing_keys}." msgstr "Clé(s) manquante(s) : {missing_keys}." #: awx/sso/fields.py:387 +#, python-brace-format msgid "Invalid key(s): {invalid_keys}." msgstr "Clé(s) non valide(s) : {invalid_keys}." #: awx/sso/fields.py:436 awx/sso/fields.py:553 +#, python-brace-format msgid "Invalid key(s) for organization map: {invalid_keys}." msgstr "Clé(s) non valide(s) pour la mappe d'organisations : {invalid_keys}." #: awx/sso/fields.py:454 +#, python-brace-format msgid "Missing required key for team map: {invalid_keys}." msgstr "Clé obligatoire manquante pour la mappe d'équipes : {invalid_keys}." #: awx/sso/fields.py:455 awx/sso/fields.py:572 +#, python-brace-format msgid "Invalid key(s) for team map: {invalid_keys}." msgstr "Clé(s) non valide(s) pour la mappe d'équipes : {invalid_keys}." #: awx/sso/fields.py:571 +#, python-brace-format msgid "Missing required key for team map: {missing_keys}." msgstr "Clé obligatoire manquante pour la mappe d'équipes : {missing_keys}." #: awx/sso/fields.py:589 +#, python-brace-format msgid "Missing required key(s) for org info record: {missing_keys}." msgstr "" "Clé(s) obligatoire(s) manquante(s) pour l'enregistrement des infos organis. " ": {missing_keys}." #: awx/sso/fields.py:602 +#, python-brace-format msgid "Invalid language code(s) for org info: {invalid_lang_codes}." msgstr "" "Code(s) langage non valide(s) pour les infos organis. : " "{invalid_lang_codes}." #: awx/sso/fields.py:621 +#, python-brace-format msgid "Missing required key(s) for contact: {missing_keys}." msgstr "Clé(s) obligatoire(s) manquante(s) pour le contact : {missing_keys}." #: awx/sso/fields.py:633 +#, python-brace-format msgid "Missing required key(s) for IdP: {missing_keys}." msgstr "Clé(s) obligatoire(s) manquante(s) pour l'IdP : {missing_keys}." #: awx/sso/pipeline.py:24 +#, python-brace-format msgid "An account cannot be found for {0}" msgstr "Impossible de trouver un compte pour {0}" @@ -4790,6 +4867,7 @@ msgid "Make a PATCH request on the %(name)s resource" msgstr "Appliquez une requête PATCH sur la ressource %(name)s" #: awx/ui/apps.py:9 awx/ui/conf.py:22 awx/ui/conf.py:36 awx/ui/conf.py:51 +#: awx/ui/conf.py:63 msgid "UI" msgstr "IU" @@ -4844,6 +4922,17 @@ msgstr "" " un meilleur résultat, utiliser un fichier .png avec un fond transparent. " "Les formats GIF, PNG et JPEG sont supportés." +#: awx/ui/conf.py:60 +msgid "Max Job Events Retreived by UI" +msgstr "Max Événements de tâches par UI" + +#: awx/ui/conf.py:61 +msgid "" +"Maximum number of job events for the UI to retreive within a single request." +msgstr "" +"Nombre maximum d'événements de tâches d'UI à extraire pour une requête " +"unique." + #: awx/ui/fields.py:29 msgid "" "Invalid format for custom logo. Must be a data URL with a base64-encoded " diff --git a/awx/locale/ja/LC_MESSAGES/django.po b/awx/locale/ja/LC_MESSAGES/django.po index 4ee6bbdecd..61e79a9a48 100644 --- a/awx/locale/ja/LC_MESSAGES/django.po +++ b/awx/locale/ja/LC_MESSAGES/django.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-08-27 19:27+0000\n" -"PO-Revision-Date: 2017-09-15 11:22+0000\n" +"POT-Creation-Date: 2017-11-30 20:23+0000\n" +"PO-Revision-Date: 2017-12-03 11:01+0000\n" "Last-Translator: asasaki \n" "Language-Team: Japanese\n" "MIME-Version: 1.0\n" @@ -76,25 +76,30 @@ msgstr "%s でのフィルターは許可されていません。" msgid "Loops not allowed in filters, detected on field {}." msgstr "ループがフィルターで許可されていません。フィールド {} で検出されました。" -#: awx/api/filters.py:297 +#: awx/api/filters.py:171 +#, python-brace-format +msgid "Invalid {field_name} id: {field_id}" +msgstr "無効な {field_name} ID: {field_id}" + +#: awx/api/filters.py:302 #, python-format msgid "cannot filter on kind %s" msgstr "%s の種類でフィルターできません。" -#: awx/api/filters.py:404 +#: awx/api/filters.py:409 #, python-format msgid "cannot order by field %s" msgstr "フィールド %s で順序付けできません" -#: awx/api/generics.py:515 awx/api/generics.py:577 +#: awx/api/generics.py:550 awx/api/generics.py:612 msgid "\"id\" field must be an integer." msgstr "「id」フィールドは整数でなければなりません。" -#: awx/api/generics.py:574 +#: awx/api/generics.py:609 msgid "\"id\" is required to disassociate" msgstr "関連付けを解除するには 「id」が必要です" -#: awx/api/generics.py:625 +#: awx/api/generics.py:660 msgid "{} 'id' field is missing." msgstr "{} 「id」フィールドがありません。" @@ -175,7 +180,7 @@ msgstr "ワークフロージョブ" msgid "Workflow Template" msgstr "ワークフローテンプレート" -#: awx/api/serializers.py:697 awx/api/serializers.py:755 awx/api/views.py:4314 +#: awx/api/serializers.py:701 awx/api/serializers.py:759 awx/api/views.py:4365 #, python-format msgid "" "Standard Output too large to display (%(text_size)d bytes), only download " @@ -184,276 +189,290 @@ msgstr "" "標準出力が大きすぎて表示できません (%(text_size)d バイト)。サイズが %(supported_size)d " "バイトを超える場合はダウンロードのみがサポートされます。" -#: awx/api/serializers.py:770 +#: awx/api/serializers.py:774 msgid "Write-only field used to change the password." msgstr "パスワードを変更するために使用される書き込み専用フィールド。" -#: awx/api/serializers.py:772 +#: awx/api/serializers.py:776 msgid "Set if the account is managed by an external service" msgstr "アカウントが外部サービスで管理される場合に設定されます" -#: awx/api/serializers.py:796 +#: awx/api/serializers.py:800 msgid "Password required for new User." msgstr "新規ユーザーのパスワードを入力してください。" -#: awx/api/serializers.py:882 +#: awx/api/serializers.py:886 #, python-format msgid "Unable to change %s on user managed by LDAP." msgstr "LDAP で管理されたユーザーの %s を変更できません。" -#: awx/api/serializers.py:1046 +#: awx/api/serializers.py:1050 msgid "Organization is missing" msgstr "組織がありません" -#: awx/api/serializers.py:1050 +#: awx/api/serializers.py:1054 msgid "Update options must be set to false for manual projects." msgstr "手動プロジェクトについては更新オプションを false に設定する必要があります。" -#: awx/api/serializers.py:1056 +#: awx/api/serializers.py:1060 msgid "Array of playbooks available within this project." msgstr "このプロジェクト内で利用可能な一連の Playbook。" -#: awx/api/serializers.py:1075 +#: awx/api/serializers.py:1079 msgid "" "Array of inventory files and directories available within this project, not " "comprehensive." msgstr "このプロジェクト内で利用可能な一連のインベントリーファイルおよびディレクトリー (包括的な一覧ではありません)。" -#: awx/api/serializers.py:1282 +#: awx/api/serializers.py:1201 +msgid "Smart inventories must specify host_filter" +msgstr "スマートインベントリーは host_filter を指定する必要があります" + +#: awx/api/serializers.py:1303 #, python-format msgid "Invalid port specification: %s" msgstr "無効なポート指定: %s" -#: awx/api/serializers.py:1293 +#: awx/api/serializers.py:1314 msgid "Cannot create Host for Smart Inventory" msgstr "スマートインベントリーのホストを作成できません" -#: awx/api/serializers.py:1315 awx/api/serializers.py:3218 -#: awx/api/serializers.py:3303 awx/main/validators.py:198 +#: awx/api/serializers.py:1336 awx/api/serializers.py:3321 +#: awx/api/serializers.py:3406 awx/main/validators.py:198 msgid "Must be valid JSON or YAML." msgstr "有効な JSON または YAML である必要があります。" -#: awx/api/serializers.py:1411 +#: awx/api/serializers.py:1432 msgid "Invalid group name." msgstr "無効なグループ名。" -#: awx/api/serializers.py:1416 +#: awx/api/serializers.py:1437 msgid "Cannot create Group for Smart Inventory" msgstr "スマートインベントリーのグループを作成できません" -#: awx/api/serializers.py:1488 +#: awx/api/serializers.py:1509 msgid "" "Script must begin with a hashbang sequence: i.e.... #!/usr/bin/env python" msgstr "スクリプトは hashbang シーケンスで開始する必要があります (例: .... #!/usr/bin/env python)" -#: awx/api/serializers.py:1534 +#: awx/api/serializers.py:1555 msgid "`{}` is a prohibited environment variable" msgstr "`{}` は禁止されている環境変数です" -#: awx/api/serializers.py:1545 +#: awx/api/serializers.py:1566 msgid "If 'source' is 'custom', 'source_script' must be provided." msgstr "「source」が「custom」である場合、「source_script」を指定する必要があります。" -#: awx/api/serializers.py:1551 +#: awx/api/serializers.py:1572 msgid "Must provide an inventory." msgstr "インベントリーを指定する必要があります。" -#: awx/api/serializers.py:1555 +#: awx/api/serializers.py:1576 msgid "" "The 'source_script' does not belong to the same organization as the " "inventory." msgstr "「source_script」はインベントリーと同じ組織に属しません。" -#: awx/api/serializers.py:1557 +#: awx/api/serializers.py:1578 msgid "'source_script' doesn't exist." msgstr "「source_script」は存在しません。" -#: awx/api/serializers.py:1581 +#: awx/api/serializers.py:1602 msgid "Automatic group relationship, will be removed in 3.3" msgstr "自動的なグループ関係は 3.3 で削除されます" -#: awx/api/serializers.py:1658 +#: awx/api/serializers.py:1679 msgid "Cannot use manual project for SCM-based inventory." msgstr "SCM ベースのインベントリーの手動プロジェクトを使用できません。" -#: awx/api/serializers.py:1664 +#: awx/api/serializers.py:1685 msgid "" "Manual inventory sources are created automatically when a group is created " "in the v1 API." msgstr "手動のインベントリーソースは、グループが v1 API で作成される際に自動作成されます。" -#: awx/api/serializers.py:1669 +#: awx/api/serializers.py:1690 msgid "Setting not compatible with existing schedules." msgstr "設定は既存スケジュールとの互換性がありません。" -#: awx/api/serializers.py:1674 +#: awx/api/serializers.py:1695 msgid "Cannot create Inventory Source for Smart Inventory" msgstr "スマートインベントリーのインベントリーソースを作成できません" -#: awx/api/serializers.py:1688 +#: awx/api/serializers.py:1709 #, python-format msgid "Cannot set %s if not SCM type." msgstr "SCM タイプでない場合 %s を設定できません。" -#: awx/api/serializers.py:1929 +#: awx/api/serializers.py:1950 msgid "Modifications not allowed for managed credential types" msgstr "管理されている認証情報タイプで変更は許可されません" -#: awx/api/serializers.py:1934 +#: awx/api/serializers.py:1955 msgid "" "Modifications to inputs are not allowed for credential types that are in use" msgstr "入力への変更は使用中の認証情報タイプで許可されません" -#: awx/api/serializers.py:1940 +#: awx/api/serializers.py:1961 #, python-format msgid "Must be 'cloud' or 'net', not %s" msgstr "「cloud」または「net」にする必要があります (%s ではない)" -#: awx/api/serializers.py:1946 +#: awx/api/serializers.py:1967 msgid "'ask_at_runtime' is not supported for custom credentials." msgstr "「ask_at_runtime」はカスタム認証情報ではサポートされません。" -#: awx/api/serializers.py:2119 +#: awx/api/serializers.py:2140 #, python-format msgid "\"%s\" is not a valid choice" msgstr "「%s」は有効な選択ではありません" -#: awx/api/serializers.py:2138 +#: awx/api/serializers.py:2159 #, python-format msgid "'%s' is not a valid field for %s" msgstr "「%s」は %s の有効なフィールドではありません" -#: awx/api/serializers.py:2150 +#: awx/api/serializers.py:2180 +msgid "" +"You cannot change the credential type of the credential, as it may break the" +" functionality of the resources using it." +msgstr "認証情報の認証情報タイプを変更することはできません。これにより、認証情報を使用するリソースの機能が中断する可能性があるためです。" + +#: awx/api/serializers.py:2191 msgid "" "Write-only field used to add user to owner role. If provided, do not give " "either team or organization. Only valid for creation." msgstr "" "ユーザーを所有者ロールに追加するために使用される書き込み専用フィールドです。提供されている場合は、チームまたは組織のいずれも指定しないでください。作成時にのみ有効です。" -#: awx/api/serializers.py:2155 +#: awx/api/serializers.py:2196 msgid "" "Write-only field used to add team to owner role. If provided, do not give " "either user or organization. Only valid for creation." msgstr "" "チームを所有者ロールに追加するために使用される書き込み専用フィールドです。提供されている場合は、ユーザーまたは組織のいずれも指定しないでください。作成時にのみ有効です。" -#: awx/api/serializers.py:2160 +#: awx/api/serializers.py:2201 msgid "" "Inherit permissions from organization roles. If provided on creation, do not" " give either user or team." msgstr "組織ロールからパーミッションを継承します。作成時に提供される場合は、ユーザーまたはチームのいずれも指定しないでください。" -#: awx/api/serializers.py:2176 +#: awx/api/serializers.py:2217 msgid "Missing 'user', 'team', or 'organization'." msgstr "「user」、「team」、または「organization」がありません。" -#: awx/api/serializers.py:2216 +#: awx/api/serializers.py:2257 msgid "" "Credential organization must be set and match before assigning to a team" msgstr "認証情報の組織が設定され、一致している状態でチームに割り当てる必要があります。" -#: awx/api/serializers.py:2378 +#: awx/api/serializers.py:2424 msgid "You must provide a cloud credential." msgstr "クラウド認証情報を指定する必要があります。" -#: awx/api/serializers.py:2379 +#: awx/api/serializers.py:2425 msgid "You must provide a network credential." msgstr "ネットワーク認証情報を指定する必要があります。" -#: awx/api/serializers.py:2395 +#: awx/api/serializers.py:2441 msgid "This field is required." msgstr "このフィールドは必須です。" -#: awx/api/serializers.py:2397 awx/api/serializers.py:2399 +#: awx/api/serializers.py:2443 awx/api/serializers.py:2445 msgid "Playbook not found for project." msgstr "プロジェクトの Playbook が見つかりません。" -#: awx/api/serializers.py:2401 +#: awx/api/serializers.py:2447 msgid "Must select playbook for project." msgstr "プロジェクトの Playbook を選択してください。" -#: awx/api/serializers.py:2476 +#: awx/api/serializers.py:2522 msgid "Must either set a default value or ask to prompt on launch." msgstr "起動時にプロントを出すには、デフォルト値を設定するか、またはプロンプトを出すよう指定する必要があります。" -#: awx/api/serializers.py:2478 awx/main/models/jobs.py:325 +#: awx/api/serializers.py:2524 awx/main/models/jobs.py:326 msgid "Job types 'run' and 'check' must have assigned a project." msgstr "ジョブタイプ「run」および「check」によりプロジェクトが割り当てられている必要があります。" -#: awx/api/serializers.py:2549 +#: awx/api/serializers.py:2611 msgid "Invalid job template." msgstr "無効なジョブテンプレート。" -#: awx/api/serializers.py:2630 -msgid "Credential not found or deleted." -msgstr "認証情報が見つからないか、または削除されました。" +#: awx/api/serializers.py:2708 +msgid "Neither credential nor vault credential provided." +msgstr "認証情報および Vault 認証情報のいずれも指定されていません。" -#: awx/api/serializers.py:2632 +#: awx/api/serializers.py:2711 msgid "Job Template Project is missing or undefined." msgstr "ジョブテンプレートプロジェクトが見つからないか、または定義されていません。" -#: awx/api/serializers.py:2634 +#: awx/api/serializers.py:2713 msgid "Job Template Inventory is missing or undefined." msgstr "ジョブテンプレートインベントリーが見つからないか、または定義されていません。" -#: awx/api/serializers.py:2921 +#: awx/api/serializers.py:2782 awx/main/tasks.py:2186 +msgid "{} are prohibited from use in ad hoc commands." +msgstr "{} の使用はアドホックコマンドで禁止されています。" + +#: awx/api/serializers.py:3008 #, python-format msgid "%(job_type)s is not a valid job type. The choices are %(choices)s." msgstr "%(job_type)s は有効なジョブタイプではありません。%(choices)s を選択できます。" -#: awx/api/serializers.py:2926 +#: awx/api/serializers.py:3013 msgid "Workflow job template is missing during creation." msgstr "ワークフロージョブテンプレートが作成時に見つかりません。" -#: awx/api/serializers.py:2931 +#: awx/api/serializers.py:3018 #, python-format msgid "Cannot nest a %s inside a WorkflowJobTemplate" msgstr "ワークフロージョブテンプレート内に %s をネストできません" -#: awx/api/serializers.py:3188 +#: awx/api/serializers.py:3291 #, python-format msgid "Job Template '%s' is missing or undefined." msgstr "ジョブテンプレート「%s」が見つからない、または定義されていません。" -#: awx/api/serializers.py:3191 +#: awx/api/serializers.py:3294 msgid "The inventory associated with this Job Template is being deleted." msgstr "このジョブテンプレートに関連付けられているインベントリーが削除されています。" -#: awx/api/serializers.py:3232 awx/api/views.py:2991 +#: awx/api/serializers.py:3335 awx/api/views.py:3023 #, python-format msgid "Cannot assign multiple %s credentials." msgstr "複数の %s 認証情報を割り当てることができません。" -#: awx/api/serializers.py:3234 awx/api/views.py:2994 +#: awx/api/serializers.py:3337 awx/api/views.py:3026 msgid "Extra credentials must be network or cloud." msgstr "追加の認証情報はネットワークまたはクラウドにする必要があります。" -#: awx/api/serializers.py:3371 +#: awx/api/serializers.py:3474 msgid "" "Missing required fields for Notification Configuration: notification_type" msgstr "通知設定の必須フィールドがありません: notification_type" -#: awx/api/serializers.py:3394 +#: awx/api/serializers.py:3497 msgid "No values specified for field '{}'" msgstr "フィールド '{}' に値が指定されていません" -#: awx/api/serializers.py:3399 +#: awx/api/serializers.py:3502 msgid "Missing required fields for Notification Configuration: {}." msgstr "通知設定の必須フィールドがありません: {}。" -#: awx/api/serializers.py:3402 +#: awx/api/serializers.py:3505 msgid "Configuration field '{}' incorrect type, expected {}." msgstr "設定フィールド '{}' のタイプが正しくありません。{} が予期されました。" -#: awx/api/serializers.py:3455 +#: awx/api/serializers.py:3558 msgid "Inventory Source must be a cloud resource." msgstr "インベントリーソースはクラウドリソースでなければなりません。" -#: awx/api/serializers.py:3457 +#: awx/api/serializers.py:3560 msgid "Manual Project cannot have a schedule set." msgstr "手動プロジェクトにはスケジュールを設定できません。" -#: awx/api/serializers.py:3460 +#: awx/api/serializers.py:3563 msgid "" "Inventory sources with `update_on_project_update` cannot be scheduled. " "Schedule its source project `{}` instead." @@ -461,74 +480,74 @@ msgstr "" "「update_on_project_update」が設定されたインベントリーソースはスケジュールできません。代わりのそのソースプロジェクト「{}」 " "をスケジュールします。" -#: awx/api/serializers.py:3479 +#: awx/api/serializers.py:3582 msgid "Projects and inventory updates cannot accept extra variables." msgstr "プロジェクトおよびインベントリーの更新は追加変数を受け入れません。" -#: awx/api/serializers.py:3501 +#: awx/api/serializers.py:3604 msgid "" "DTSTART required in rrule. Value should match: DTSTART:YYYYMMDDTHHMMSSZ" msgstr "DTSTART が rrule で必要です。値は、DSTART:YYYYMMDDTHHMMSSZ に一致する必要があります。" -#: awx/api/serializers.py:3503 +#: awx/api/serializers.py:3606 msgid "Multiple DTSTART is not supported." msgstr "複数の DTSTART はサポートされません。" -#: awx/api/serializers.py:3505 +#: awx/api/serializers.py:3608 msgid "RRULE require in rrule." msgstr "RRULE が rrule で必要です。" -#: awx/api/serializers.py:3507 +#: awx/api/serializers.py:3610 msgid "Multiple RRULE is not supported." msgstr "複数の RRULE はサポートされません。" -#: awx/api/serializers.py:3509 +#: awx/api/serializers.py:3612 msgid "INTERVAL required in rrule." msgstr "INTERVAL が rrule で必要です。" -#: awx/api/serializers.py:3511 +#: awx/api/serializers.py:3614 msgid "TZID is not supported." msgstr "TZID はサポートされません。" -#: awx/api/serializers.py:3513 +#: awx/api/serializers.py:3616 msgid "SECONDLY is not supported." msgstr "SECONDLY はサポートされません。" -#: awx/api/serializers.py:3515 +#: awx/api/serializers.py:3618 msgid "Multiple BYMONTHDAYs not supported." msgstr "複数の BYMONTHDAY はサポートされません。" -#: awx/api/serializers.py:3517 +#: awx/api/serializers.py:3620 msgid "Multiple BYMONTHs not supported." msgstr "複数の BYMONTH はサポートされません。" -#: awx/api/serializers.py:3519 +#: awx/api/serializers.py:3622 msgid "BYDAY with numeric prefix not supported." msgstr "数字の接頭辞のある BYDAY はサポートされません。" -#: awx/api/serializers.py:3521 +#: awx/api/serializers.py:3624 msgid "BYYEARDAY not supported." msgstr "BYYEARDAY はサポートされません。" -#: awx/api/serializers.py:3523 +#: awx/api/serializers.py:3626 msgid "BYWEEKNO not supported." msgstr "BYWEEKNO はサポートされません。" -#: awx/api/serializers.py:3527 +#: awx/api/serializers.py:3630 msgid "COUNT > 999 is unsupported." msgstr "COUNT > 999 はサポートされません。" -#: awx/api/serializers.py:3531 +#: awx/api/serializers.py:3634 msgid "rrule parsing failed validation." msgstr "rrule の構文解析で検証に失敗しました。" -#: awx/api/serializers.py:3631 +#: awx/api/serializers.py:3760 msgid "" "A summary of the new and changed values when an object is created, updated, " "or deleted" msgstr "オブジェクトの作成、更新または削除時の新規値および変更された値の概要" -#: awx/api/serializers.py:3633 +#: awx/api/serializers.py:3762 msgid "" "For create, update, and delete events this is the object type that was " "affected. For associate and disassociate events this is the object type " @@ -537,7 +556,7 @@ msgstr "" "作成、更新、および削除イベントの場合、これは影響を受けたオブジェクトタイプになります。関連付けおよび関連付け解除イベントの場合、これは object2 " "に関連付けられたか、またはその関連付けが解除されたオブジェクトタイプになります。" -#: awx/api/serializers.py:3636 +#: awx/api/serializers.py:3765 msgid "" "Unpopulated for create, update, and delete events. For associate and " "disassociate events this is the object type that object1 is being associated" @@ -546,252 +565,253 @@ msgstr "" "作成、更新、および削除イベントの場合は設定されません。関連付けおよび関連付け解除イベントの場合、これは object1 " "が関連付けられるオブジェクトタイプになります。" -#: awx/api/serializers.py:3639 +#: awx/api/serializers.py:3768 msgid "The action taken with respect to the given object(s)." msgstr "指定されたオブジェクトについて実行されたアクション。" -#: awx/api/serializers.py:3749 +#: awx/api/serializers.py:3885 msgid "Unable to login with provided credentials." msgstr "提供される認証情報でログインできません。" -#: awx/api/serializers.py:3751 +#: awx/api/serializers.py:3887 msgid "Must include \"username\" and \"password\"." msgstr "「username」および「password」を含める必要があります。" -#: awx/api/views.py:106 +#: awx/api/views.py:108 msgid "Your license does not allow use of the activity stream." msgstr "お使いのライセンスではアクティビティーストリームを使用できません。" -#: awx/api/views.py:116 +#: awx/api/views.py:118 msgid "Your license does not permit use of system tracking." msgstr "お使いのライセンスではシステムトラッキングを使用できません。" -#: awx/api/views.py:126 +#: awx/api/views.py:128 msgid "Your license does not allow use of workflows." msgstr "お使いのライセンスではワークフローを使用できません。" -#: awx/api/views.py:140 +#: awx/api/views.py:142 msgid "Cannot delete job resource when associated workflow job is running." msgstr "関連付けられたワークフロージョブが実行中の場合、ジョブリソースを削除できません。" -#: awx/api/views.py:144 +#: awx/api/views.py:146 msgid "Cannot delete running job resource." msgstr "実行中のジョブリソースを削除できません。" -#: awx/api/views.py:153 awx/templates/rest_framework/api.html:28 +#: awx/api/views.py:155 awx/templates/rest_framework/api.html:28 msgid "REST API" msgstr "REST API" -#: awx/api/views.py:162 awx/templates/rest_framework/api.html:4 +#: awx/api/views.py:164 awx/templates/rest_framework/api.html:4 msgid "AWX REST API" msgstr "AWX REST API" -#: awx/api/views.py:224 +#: awx/api/views.py:226 msgid "Version 1" msgstr "バージョン 1" -#: awx/api/views.py:228 +#: awx/api/views.py:230 msgid "Version 2" msgstr "バージョン 2" -#: awx/api/views.py:239 +#: awx/api/views.py:241 msgid "Ping" msgstr "Ping" -#: awx/api/views.py:270 awx/conf/apps.py:12 +#: awx/api/views.py:272 awx/conf/apps.py:12 msgid "Configuration" msgstr "設定" -#: awx/api/views.py:323 +#: awx/api/views.py:325 msgid "Invalid license data" msgstr "無効なライセンスデータ" -#: awx/api/views.py:325 +#: awx/api/views.py:327 msgid "Missing 'eula_accepted' property" msgstr "'eula_accepted' プロパティーがありません" -#: awx/api/views.py:329 +#: awx/api/views.py:331 msgid "'eula_accepted' value is invalid" msgstr "'eula_accepted' 値は無効です。" -#: awx/api/views.py:332 +#: awx/api/views.py:334 msgid "'eula_accepted' must be True" msgstr "'eula_accepted' は True でなければなりません" -#: awx/api/views.py:339 +#: awx/api/views.py:341 msgid "Invalid JSON" msgstr "無効な JSON" -#: awx/api/views.py:347 +#: awx/api/views.py:349 msgid "Invalid License" msgstr "無効なライセンス" -#: awx/api/views.py:357 +#: awx/api/views.py:359 msgid "Invalid license" msgstr "無効なライセンス" -#: awx/api/views.py:365 +#: awx/api/views.py:367 #, python-format msgid "Failed to remove license (%s)" msgstr "ライセンスの削除に失敗しました (%s)" -#: awx/api/views.py:370 +#: awx/api/views.py:372 msgid "Dashboard" msgstr "ダッシュボード" -#: awx/api/views.py:469 +#: awx/api/views.py:471 msgid "Dashboard Jobs Graphs" msgstr "ダッシュボードのジョブグラフ" -#: awx/api/views.py:505 +#: awx/api/views.py:507 #, python-format msgid "Unknown period \"%s\"" msgstr "不明な期間 \"%s\"" -#: awx/api/views.py:519 +#: awx/api/views.py:521 msgid "Instances" msgstr "インスタンス" -#: awx/api/views.py:527 +#: awx/api/views.py:529 msgid "Instance Detail" msgstr "インスタンスの詳細" -#: awx/api/views.py:535 +#: awx/api/views.py:537 msgid "Instance Running Jobs" msgstr "ジョブを実行しているインスタンス" -#: awx/api/views.py:550 +#: awx/api/views.py:552 msgid "Instance's Instance Groups" msgstr "インスタンスのインスタンスグループ" -#: awx/api/views.py:560 +#: awx/api/views.py:562 msgid "Instance Groups" msgstr "インスタンスグループ" -#: awx/api/views.py:568 +#: awx/api/views.py:570 msgid "Instance Group Detail" msgstr "インスタンスグループの詳細" -#: awx/api/views.py:576 +#: awx/api/views.py:578 msgid "Instance Group Running Jobs" msgstr "ジョブを実行しているインスタンスグループ" -#: awx/api/views.py:586 +#: awx/api/views.py:588 msgid "Instance Group's Instances" msgstr "インスタンスグループのインスタンス" -#: awx/api/views.py:596 +#: awx/api/views.py:598 msgid "Schedules" msgstr "スケジュール" -#: awx/api/views.py:615 +#: awx/api/views.py:617 msgid "Schedule Jobs List" msgstr "スケジュールジョブの一覧" -#: awx/api/views.py:841 +#: awx/api/views.py:843 msgid "Your license only permits a single organization to exist." msgstr "お使いのライセンスでは、単一組織のみの存在が許可されます。" -#: awx/api/views.py:1077 awx/api/views.py:4615 +#: awx/api/views.py:1079 awx/api/views.py:4666 msgid "You cannot assign an Organization role as a child role for a Team." msgstr "組織ロールをチームの子ロールとして割り当てることができません。" -#: awx/api/views.py:1081 awx/api/views.py:4629 +#: awx/api/views.py:1083 awx/api/views.py:4680 msgid "You cannot grant system-level permissions to a team." msgstr "システムレベルのパーミッションをチームに付与できません。" -#: awx/api/views.py:1088 awx/api/views.py:4621 +#: awx/api/views.py:1090 awx/api/views.py:4672 msgid "" "You cannot grant credential access to a team when the Organization field " "isn't set, or belongs to a different organization" msgstr "組織フィールドが設定されていないか、または別の組織に属する場合に認証情報のアクセス権をチームに付与できません" -#: awx/api/views.py:1178 +#: awx/api/views.py:1180 msgid "Cannot delete project." msgstr "プロジェクトを削除できません。" -#: awx/api/views.py:1213 +#: awx/api/views.py:1215 msgid "Project Schedules" msgstr "プロジェクトのスケジュール" -#: awx/api/views.py:1225 +#: awx/api/views.py:1227 msgid "Project SCM Inventory Sources" msgstr "プロジェクト SCM のインベントリーソース" -#: awx/api/views.py:1352 +#: awx/api/views.py:1354 msgid "Project Update SCM Inventory Updates" msgstr "プロジェクト更新 SCM のインベントリー更新" -#: awx/api/views.py:1407 +#: awx/api/views.py:1409 msgid "Me" msgstr "自分" -#: awx/api/views.py:1451 awx/api/views.py:4572 +#: awx/api/views.py:1453 awx/api/views.py:4623 msgid "You may not perform any action with your own admin_role." msgstr "独自の admin_role でアクションを実行することはできません。" -#: awx/api/views.py:1457 awx/api/views.py:4576 +#: awx/api/views.py:1459 awx/api/views.py:4627 msgid "You may not change the membership of a users admin_role" msgstr "ユーザーの admin_role のメンバーシップを変更することはできません" -#: awx/api/views.py:1462 awx/api/views.py:4581 +#: awx/api/views.py:1464 awx/api/views.py:4632 msgid "" "You cannot grant credential access to a user not in the credentials' " "organization" msgstr "認証情報の組織に属さないユーザーに認証情報のアクセス権を付与することはできません" -#: awx/api/views.py:1466 awx/api/views.py:4585 +#: awx/api/views.py:1468 awx/api/views.py:4636 msgid "You cannot grant private credential access to another user" msgstr "非公開の認証情報のアクセス権を別のユーザーに付与することはできません" -#: awx/api/views.py:1564 +#: awx/api/views.py:1566 #, python-format msgid "Cannot change %s." msgstr "%s を変更できません。" -#: awx/api/views.py:1570 +#: awx/api/views.py:1572 msgid "Cannot delete user." msgstr "ユーザーを削除できません。" -#: awx/api/views.py:1599 +#: awx/api/views.py:1601 msgid "Deletion not allowed for managed credential types" msgstr "管理されている認証情報タイプで削除は許可されません" -#: awx/api/views.py:1601 +#: awx/api/views.py:1603 msgid "Credential types that are in use cannot be deleted" msgstr "使用中の認証情報タイプを削除できません" -#: awx/api/views.py:1779 +#: awx/api/views.py:1781 msgid "Cannot delete inventory script." msgstr "インベントリースクリプトを削除できません。" -#: awx/api/views.py:1864 +#: awx/api/views.py:1866 +#, python-brace-format msgid "{0}" msgstr "{0}" -#: awx/api/views.py:2089 +#: awx/api/views.py:2101 msgid "Fact not found." msgstr "ファクトが見つかりませんでした。" -#: awx/api/views.py:2113 +#: awx/api/views.py:2125 msgid "SSLError while trying to connect to {}" msgstr "{} への接続試行中に SSL エラーが発生しました" -#: awx/api/views.py:2115 +#: awx/api/views.py:2127 msgid "Request to {} timed out." msgstr "{} の要求がタイムアウトになりました。" -#: awx/api/views.py:2117 +#: awx/api/views.py:2129 msgid "Unkown exception {} while trying to GET {}" msgstr "GET {} の試行中に不明の例外 {} が発生しました" -#: awx/api/views.py:2120 +#: awx/api/views.py:2132 msgid "" "Unauthorized access. Please check your Insights Credential username and " "password." msgstr "不正アクセスです。Insights 認証情報のユーザー名およびパスワードを確認してください。" -#: awx/api/views.py:2122 +#: awx/api/views.py:2134 msgid "" "Failed to gather reports and maintenance plans from Insights API at URL {}. " "Server responded with {} status code and message {}" @@ -799,196 +819,210 @@ msgstr "" "URL {} で Insights API からのレポートおよびメンテナンス計画を収集できませんでした。サーバーが {} " "ステータスコードおよびメッセージ {} を出して応答しました。" -#: awx/api/views.py:2128 +#: awx/api/views.py:2140 msgid "Expected JSON response from Insights but instead got {}" msgstr "Insights からの JSON 応答を予想していましたが、代わりに {} を取得しました。" -#: awx/api/views.py:2135 +#: awx/api/views.py:2147 msgid "This host is not recognized as an Insights host." msgstr "このホストは Insights ホストとして認識されていません。" -#: awx/api/views.py:2140 +#: awx/api/views.py:2152 msgid "The Insights Credential for \"{}\" was not found." msgstr "\"{}\" の Insights 認証情報が見つかりませんでした。" -#: awx/api/views.py:2209 +#: awx/api/views.py:2221 msgid "Cyclical Group association." msgstr "循環的なグループの関連付け" -#: awx/api/views.py:2482 +#: awx/api/views.py:2499 msgid "Inventory Source List" msgstr "インベントリーソース一覧" -#: awx/api/views.py:2495 +#: awx/api/views.py:2512 msgid "Inventory Sources Update" msgstr "インベントリーソースの更新" -#: awx/api/views.py:2525 +#: awx/api/views.py:2542 msgid "Could not start because `can_update` returned False" msgstr "`can_update` が False を返したので開始できませんでした" -#: awx/api/views.py:2533 +#: awx/api/views.py:2550 msgid "No inventory sources to update." msgstr "更新するインベントリーソースがありません。" -#: awx/api/views.py:2565 +#: awx/api/views.py:2582 msgid "Cannot delete inventory source." msgstr "インベントリーソースを削除できません。" -#: awx/api/views.py:2573 +#: awx/api/views.py:2590 msgid "Inventory Source Schedules" msgstr "インベントリーソースのスケジュール" -#: awx/api/views.py:2603 +#: awx/api/views.py:2620 msgid "Notification Templates can only be assigned when source is one of {}." msgstr "ソースが {} のいずれかである場合、通知テンプレートのみを割り当てることができます。" -#: awx/api/views.py:2826 +#: awx/api/views.py:2851 msgid "Job Template Schedules" msgstr "ジョブテンプレートスケジュール" -#: awx/api/views.py:2846 awx/api/views.py:2862 +#: awx/api/views.py:2871 awx/api/views.py:2882 msgid "Your license does not allow adding surveys." msgstr "お使いのライセンスでは Survey を追加できません。" -#: awx/api/views.py:2869 +#: awx/api/views.py:2889 msgid "'name' missing from survey spec." msgstr "Survey の指定に「name」がありません。" -#: awx/api/views.py:2871 +#: awx/api/views.py:2891 msgid "'description' missing from survey spec." msgstr "Survey の指定に「description」がありません。" -#: awx/api/views.py:2873 +#: awx/api/views.py:2893 msgid "'spec' missing from survey spec." msgstr "Survey の指定に「spec」がありません。" -#: awx/api/views.py:2875 +#: awx/api/views.py:2895 msgid "'spec' must be a list of items." msgstr "「spec」は項目の一覧にする必要があります。" -#: awx/api/views.py:2877 +#: awx/api/views.py:2897 msgid "'spec' doesn't contain any items." msgstr "「spec」には項目が含まれません。" -#: awx/api/views.py:2883 +#: awx/api/views.py:2903 #, python-format msgid "Survey question %s is not a json object." msgstr "Survey の質問 %s は json オブジェクトではありません。" -#: awx/api/views.py:2885 +#: awx/api/views.py:2905 #, python-format msgid "'type' missing from survey question %s." msgstr "Survey の質問 %s に「type」がありません。" -#: awx/api/views.py:2887 +#: awx/api/views.py:2907 #, python-format msgid "'question_name' missing from survey question %s." msgstr "Survey の質問 %s に「question_name」がありません。" -#: awx/api/views.py:2889 +#: awx/api/views.py:2909 #, python-format msgid "'variable' missing from survey question %s." msgstr "Survey の質問 %s に「variable」がありません。" -#: awx/api/views.py:2891 +#: awx/api/views.py:2911 #, python-format msgid "'variable' '%(item)s' duplicated in survey question %(survey)s." msgstr "Survey の質問%(survey)s で「variable」の「%(item)s」が重複しています。" -#: awx/api/views.py:2896 +#: awx/api/views.py:2916 #, python-format msgid "'required' missing from survey question %s." msgstr "Survey の質問 %s に「required」がありません。" -#: awx/api/views.py:2901 +#: awx/api/views.py:2921 +#, python-brace-format msgid "" -"$encrypted$ is reserved keyword and may not be used as a default for " -"password {}." -msgstr "$encrypted$ は予約されたキーワードで、パスワード {} のデフォルトして使用できません。" +"Value {question_default} for '{variable_name}' expected to be a string." +msgstr "'{variable_name}' の値 {question_default} は文字列であることが予想されます。" -#: awx/api/views.py:3017 +#: awx/api/views.py:2928 +#, python-brace-format +msgid "" +"$encrypted$ is reserved keyword for password questions and may not be used " +"as a default for '{variable_name}' in survey question {question_position}." +msgstr "" +"$encrypted$ はパスワードの質問の予約されたキーワードで、Survey の質問 {question_position} では " +"'{variable_name}' のデフォルトとして使用できません。" + +#: awx/api/views.py:3049 msgid "Maximum number of labels for {} reached." msgstr "{} のラベルの最大数に達しました。" -#: awx/api/views.py:3136 +#: awx/api/views.py:3170 msgid "No matching host could be found!" msgstr "一致するホストが見つかりませんでした!" -#: awx/api/views.py:3139 +#: awx/api/views.py:3173 msgid "Multiple hosts matched the request!" msgstr "複数のホストが要求に一致しました!" -#: awx/api/views.py:3144 +#: awx/api/views.py:3178 msgid "Cannot start automatically, user input required!" msgstr "自動的に開始できません。ユーザー入力が必要です!" -#: awx/api/views.py:3151 +#: awx/api/views.py:3185 msgid "Host callback job already pending." msgstr "ホストのコールバックジョブがすでに保留中です。" -#: awx/api/views.py:3164 +#: awx/api/views.py:3199 msgid "Error starting job!" msgstr "ジョブの開始時にエラーが発生しました!" -#: awx/api/views.py:3271 +#: awx/api/views.py:3306 +#, python-brace-format msgid "Cannot associate {0} when {1} have been associated." msgstr "{1} が関連付けられている場合に {0} を関連付けることはできません。" -#: awx/api/views.py:3296 +#: awx/api/views.py:3331 msgid "Multiple parent relationship not allowed." msgstr "複数の親関係は許可されません。" -#: awx/api/views.py:3301 +#: awx/api/views.py:3336 msgid "Cycle detected." msgstr "サイクルが検出されました。" -#: awx/api/views.py:3505 +#: awx/api/views.py:3540 msgid "Workflow Job Template Schedules" msgstr "ワークフロージョブテンプレートのスケジュール" -#: awx/api/views.py:3650 awx/api/views.py:4217 +#: awx/api/views.py:3685 awx/api/views.py:4268 msgid "Superuser privileges needed." msgstr "スーパーユーザー権限が必要です。" -#: awx/api/views.py:3682 +#: awx/api/views.py:3717 msgid "System Job Template Schedules" msgstr "システムジョブテンプレートのスケジュール" -#: awx/api/views.py:3891 +#: awx/api/views.py:3780 +msgid "POST not allowed for Job launching in version 2 of the api" +msgstr "POST は API のバージョン 2 でのジョブの起動では許可されません" + +#: awx/api/views.py:3942 msgid "Job Host Summaries List" msgstr "ジョブホスト概要一覧" -#: awx/api/views.py:3938 +#: awx/api/views.py:3989 msgid "Job Event Children List" msgstr "ジョブイベント子一覧" -#: awx/api/views.py:3947 +#: awx/api/views.py:3998 msgid "Job Event Hosts List" msgstr "ジョブイベントホスト一覧" -#: awx/api/views.py:3957 +#: awx/api/views.py:4008 msgid "Job Events List" msgstr "ジョブイベント一覧" -#: awx/api/views.py:4171 +#: awx/api/views.py:4222 msgid "Ad Hoc Command Events List" msgstr "アドホックコマンドイベント一覧" -#: awx/api/views.py:4386 +#: awx/api/views.py:4437 msgid "Error generating stdout download file: {}" msgstr "stdout ダウンロードファイルの生成中にエラーが発生しました: {}" -#: awx/api/views.py:4399 +#: awx/api/views.py:4450 #, python-format msgid "Error generating stdout download file: %s" msgstr "stdout ダウンロードファイルの生成中にエラーが発生しました: %s" -#: awx/api/views.py:4444 +#: awx/api/views.py:4495 msgid "Delete not allowed while there are pending notifications" msgstr "保留中の通知がある場合に削除は許可されません" -#: awx/api/views.py:4451 +#: awx/api/views.py:4502 msgid "Notification Template Test" msgstr "通知テンプレートテスト" @@ -1144,15 +1178,16 @@ msgstr "ユーザーごとに異なる設定例" msgid "User" msgstr "ユーザー" -#: awx/conf/fields.py:62 +#: awx/conf/fields.py:63 msgid "Enter a valid URL" msgstr "無効な URL の入力" -#: awx/conf/fields.py:94 +#: awx/conf/fields.py:95 +#, python-brace-format msgid "\"{input}\" is not a valid string." msgstr "\"{input}\" は有効な文字列ではありません。" -#: awx/conf/license.py:19 +#: awx/conf/license.py:22 msgid "Your Tower license does not allow that." msgstr "お使いの Tower ライセンスではこれを許可しません。" @@ -1169,7 +1204,11 @@ msgstr "コメント/移行時にエラーを発生させる設定をスキッ msgid "Skip commenting out settings in files." msgstr "ファイル内の設定のコメント化をスキップします。" -#: awx/conf/management/commands/migrate_to_database_settings.py:61 +#: awx/conf/management/commands/migrate_to_database_settings.py:62 +msgid "Skip migrating and only comment out settings in files." +msgstr "移行をスキップし、ファイルの設定のみをコメントアウトします。" + +#: awx/conf/management/commands/migrate_to_database_settings.py:68 msgid "Backup existing settings files with this suffix." msgstr "この接尾辞を持つ既存の設定ファイルをバックアップします。" @@ -1193,7 +1232,7 @@ msgstr "変更済み" msgid "User-Defaults" msgstr "ユーザー設定" -#: awx/conf/registry.py:151 +#: awx/conf/registry.py:154 msgid "This value has been set manually in a settings file." msgstr "この値は設定ファイルに手動で設定されました。" @@ -1265,93 +1304,91 @@ msgstr "設定の詳細" msgid "Logging Connectivity Test" msgstr "ロギング接続テスト" -#: awx/main/access.py:224 +#: awx/main/access.py:44 +msgid "Resource is being used by running jobs." +msgstr "リソースが実行中のジョブで使用されています。" + +#: awx/main/access.py:237 #, python-format msgid "Bad data found in related field %s." msgstr "関連フィールド %s に不正データが見つかりました。" -#: awx/main/access.py:268 +#: awx/main/access.py:281 msgid "License is missing." msgstr "ライセンスが見つかりません。" -#: awx/main/access.py:270 +#: awx/main/access.py:283 msgid "License has expired." msgstr "ライセンスの有効期限が切れました。" -#: awx/main/access.py:278 +#: awx/main/access.py:291 #, python-format msgid "License count of %s instances has been reached." msgstr "%s インスタンスのライセンス数に達しました。" -#: awx/main/access.py:280 +#: awx/main/access.py:293 #, python-format msgid "License count of %s instances has been exceeded." msgstr "%s インスタンスのライセンス数を超えました。" -#: awx/main/access.py:282 +#: awx/main/access.py:295 msgid "Host count exceeds available instances." msgstr "ホスト数が利用可能なインスタンスの上限を上回っています。" -#: awx/main/access.py:286 +#: awx/main/access.py:299 #, python-format msgid "Feature %s is not enabled in the active license." msgstr "機能 %s はアクティブなライセンスで有効にされていません。" -#: awx/main/access.py:288 +#: awx/main/access.py:301 msgid "Features not found in active license." msgstr "各種機能はアクティブなライセンスにありません。" -#: awx/main/access.py:534 awx/main/access.py:619 awx/main/access.py:748 -#: awx/main/access.py:801 awx/main/access.py:1063 awx/main/access.py:1263 -#: awx/main/access.py:1725 -msgid "Resource is being used by running jobs" -msgstr "リソースが実行中のジョブで使用されています" - -#: awx/main/access.py:675 +#: awx/main/access.py:707 msgid "Unable to change inventory on a host." msgstr "ホストのインベントリーを変更できません。" -#: awx/main/access.py:692 awx/main/access.py:737 +#: awx/main/access.py:724 awx/main/access.py:769 msgid "Cannot associate two items from different inventories." msgstr "異なるインベントリーの 2 つの項目を関連付けることはできません。" -#: awx/main/access.py:725 +#: awx/main/access.py:757 msgid "Unable to change inventory on a group." msgstr "グループのインベントリーを変更できません。" -#: awx/main/access.py:983 +#: awx/main/access.py:1017 msgid "Unable to change organization on a team." msgstr "チームの組織を変更できません。" -#: awx/main/access.py:996 +#: awx/main/access.py:1030 msgid "The {} role cannot be assigned to a team" msgstr "{} ロールをチームに割り当てることができません" -#: awx/main/access.py:998 +#: awx/main/access.py:1032 msgid "The admin_role for a User cannot be assigned to a team" msgstr "ユーザーの admin_role をチームに割り当てることができません" -#: awx/main/access.py:1443 +#: awx/main/access.py:1479 msgid "Job has been orphaned from its job template." msgstr "ジョブはジョブテンプレートから孤立しています。" -#: awx/main/access.py:1445 +#: awx/main/access.py:1481 msgid "You do not have execute permission to related job template." msgstr "関連するジョブテンプレートに対する実行パーミッションがありません。" -#: awx/main/access.py:1448 +#: awx/main/access.py:1484 msgid "Job was launched with prompted fields." msgstr "ジョブはプロンプトされたフィールドで起動されています。" -#: awx/main/access.py:1450 +#: awx/main/access.py:1486 msgid " Organization level permissions required." msgstr "組織レベルのパーミッションが必要です。" -#: awx/main/access.py:1452 +#: awx/main/access.py:1488 msgid " You do not have permission to related resources." msgstr "関連リソースに対するパーミッションがありません。" -#: awx/main/access.py:1798 +#: awx/main/access.py:1833 msgid "" "You do not have permission to the workflow job resources required for " "relaunch." @@ -1501,7 +1538,7 @@ msgstr "" #: awx/main/conf.py:159 msgid "Paths to hide from isolated jobs" -msgstr "分離されたジョブから非表示にするパス" +msgstr "分離されたジョブの非表示にするパス" #: awx/main/conf.py:160 msgid "" @@ -1510,7 +1547,7 @@ msgstr "分離されたプロセスから非表示にする追加パスです。 #: awx/main/conf.py:169 msgid "Paths to expose to isolated jobs" -msgstr "分離されたジョブに公開するパス" +msgstr "分離されたジョブの公開するパス" #: awx/main/conf.py:170 msgid "" @@ -1831,99 +1868,99 @@ msgstr "" msgid "\n" msgstr "\n" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Sudo" msgstr "Sudo" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Su" msgstr "Su" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Pbrun" msgstr "Pbrun" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Pfexec" msgstr "Pfexec" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "DZDO" msgstr "DZDO" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Pmrun" msgstr "Pmrun" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Runas" msgstr "Runas" -#: awx/main/fields.py:56 +#: awx/main/fields.py:57 #, python-format msgid "'%s' is not one of ['%s']" msgstr "'%s' は ['%s'] のいずれでもありません。" -#: awx/main/fields.py:531 +#: awx/main/fields.py:533 #, python-format msgid "cannot be set unless \"%s\" is set" msgstr "\"%s\" が設定されていない場合は設定できません" -#: awx/main/fields.py:547 +#: awx/main/fields.py:549 #, python-format msgid "required for %s" msgstr "%s に必須です" -#: awx/main/fields.py:571 +#: awx/main/fields.py:573 msgid "must be set when SSH key is encrypted." msgstr "SSH キーが暗号化されている場合に設定する必要があります。" -#: awx/main/fields.py:577 +#: awx/main/fields.py:579 msgid "should not be set when SSH key is not encrypted." msgstr "SSH キーが暗号化されていない場合は設定できません。" -#: awx/main/fields.py:635 +#: awx/main/fields.py:637 msgid "'dependencies' is not supported for custom credentials." msgstr "「dependencies (依存関係)」はカスタム認証情報の場合にはサポートされません。" -#: awx/main/fields.py:649 +#: awx/main/fields.py:651 msgid "\"tower\" is a reserved field name" msgstr "「tower」は予約されたフィールド名です" -#: awx/main/fields.py:656 +#: awx/main/fields.py:658 #, python-format msgid "field IDs must be unique (%s)" msgstr "フィールド ID は固有でなければなりません (%s)" -#: awx/main/fields.py:669 +#: awx/main/fields.py:671 #, python-format msgid "%s not allowed for %s type (%s)" msgstr "%s は %s タイプに許可されません (%s)" -#: awx/main/fields.py:753 +#: awx/main/fields.py:755 #, python-format msgid "%s uses an undefined field (%s)" msgstr "%s は未定義のフィールドを使用します (%s)" -#: awx/main/middleware.py:121 +#: awx/main/middleware.py:157 msgid "Formats of all available named urls" msgstr "利用可能なすべての名前付き url の形式" -#: awx/main/middleware.py:122 +#: awx/main/middleware.py:158 msgid "" "Read-only list of key-value pairs that shows the standard format of all " "available named URLs." msgstr "名前付き URL を持つ利用可能なすべての標準形式を表示するキーと値のペアの読み取り専用リストです。" -#: awx/main/middleware.py:124 awx/main/middleware.py:134 +#: awx/main/middleware.py:160 awx/main/middleware.py:170 msgid "Named URL" msgstr "名前付き URL" -#: awx/main/middleware.py:131 +#: awx/main/middleware.py:167 msgid "List of all named url graph nodes." msgstr "すべての名前付き URL グラフノードの一覧です。" -#: awx/main/middleware.py:132 +#: awx/main/middleware.py:168 msgid "" "Read-only list of key-value pairs that exposes named URL graph topology. Use" " this list to programmatically generate named URLs for resources" @@ -1931,51 +1968,51 @@ msgstr "" "名前付き URL グラフトポロジーを公開するキーと値のペアの読み取り専用一覧です。この一覧を使用してリソースの名前付き URL " "をプログラムで生成します。" -#: awx/main/migrations/_reencrypt.py:23 awx/main/models/notifications.py:33 +#: awx/main/migrations/_reencrypt.py:25 awx/main/models/notifications.py:33 msgid "Email" msgstr "メール" -#: awx/main/migrations/_reencrypt.py:24 awx/main/models/notifications.py:34 +#: awx/main/migrations/_reencrypt.py:26 awx/main/models/notifications.py:34 msgid "Slack" msgstr "Slack" -#: awx/main/migrations/_reencrypt.py:25 awx/main/models/notifications.py:35 +#: awx/main/migrations/_reencrypt.py:27 awx/main/models/notifications.py:35 msgid "Twilio" msgstr "Twilio" -#: awx/main/migrations/_reencrypt.py:26 awx/main/models/notifications.py:36 +#: awx/main/migrations/_reencrypt.py:28 awx/main/models/notifications.py:36 msgid "Pagerduty" msgstr "Pagerduty" -#: awx/main/migrations/_reencrypt.py:27 awx/main/models/notifications.py:37 +#: awx/main/migrations/_reencrypt.py:29 awx/main/models/notifications.py:37 msgid "HipChat" msgstr "HipChat" -#: awx/main/migrations/_reencrypt.py:28 awx/main/models/notifications.py:38 +#: awx/main/migrations/_reencrypt.py:30 awx/main/models/notifications.py:38 msgid "Webhook" msgstr "Webhook" -#: awx/main/migrations/_reencrypt.py:29 awx/main/models/notifications.py:39 +#: awx/main/migrations/_reencrypt.py:31 awx/main/models/notifications.py:39 msgid "IRC" msgstr "IRC" -#: awx/main/models/activity_stream.py:24 +#: awx/main/models/activity_stream.py:25 msgid "Entity Created" msgstr "エンティティーの作成" -#: awx/main/models/activity_stream.py:25 +#: awx/main/models/activity_stream.py:26 msgid "Entity Updated" msgstr "エンティティーの更新" -#: awx/main/models/activity_stream.py:26 +#: awx/main/models/activity_stream.py:27 msgid "Entity Deleted" msgstr "エンティティーの削除" -#: awx/main/models/activity_stream.py:27 +#: awx/main/models/activity_stream.py:28 msgid "Entity Associated with another Entity" msgstr "エンティティーの別のエンティティーへの関連付け" -#: awx/main/models/activity_stream.py:28 +#: awx/main/models/activity_stream.py:29 msgid "Entity was Disassociated with another Entity" msgstr "エンティティーの別のエンティティーとの関連付けの解除" @@ -2001,43 +2038,43 @@ msgstr "アドホックコマンドのサポートされていないモジュー msgid "No argument passed to %s module." msgstr "%s モジュールに渡される引数はありません。" -#: awx/main/models/ad_hoc_commands.py:245 awx/main/models/jobs.py:904 +#: awx/main/models/ad_hoc_commands.py:245 awx/main/models/jobs.py:911 msgid "Host Failed" msgstr "ホストの失敗" -#: awx/main/models/ad_hoc_commands.py:246 awx/main/models/jobs.py:905 +#: awx/main/models/ad_hoc_commands.py:246 awx/main/models/jobs.py:912 msgid "Host OK" msgstr "ホスト OK" -#: awx/main/models/ad_hoc_commands.py:247 awx/main/models/jobs.py:908 +#: awx/main/models/ad_hoc_commands.py:247 awx/main/models/jobs.py:915 msgid "Host Unreachable" msgstr "ホストに到達できません" -#: awx/main/models/ad_hoc_commands.py:252 awx/main/models/jobs.py:907 +#: awx/main/models/ad_hoc_commands.py:252 awx/main/models/jobs.py:914 msgid "Host Skipped" msgstr "ホストがスキップされました" -#: awx/main/models/ad_hoc_commands.py:262 awx/main/models/jobs.py:935 +#: awx/main/models/ad_hoc_commands.py:262 awx/main/models/jobs.py:942 msgid "Debug" msgstr "デバッグ" -#: awx/main/models/ad_hoc_commands.py:263 awx/main/models/jobs.py:936 +#: awx/main/models/ad_hoc_commands.py:263 awx/main/models/jobs.py:943 msgid "Verbose" msgstr "詳細" -#: awx/main/models/ad_hoc_commands.py:264 awx/main/models/jobs.py:937 +#: awx/main/models/ad_hoc_commands.py:264 awx/main/models/jobs.py:944 msgid "Deprecated" msgstr "非推奨" -#: awx/main/models/ad_hoc_commands.py:265 awx/main/models/jobs.py:938 +#: awx/main/models/ad_hoc_commands.py:265 awx/main/models/jobs.py:945 msgid "Warning" msgstr "警告" -#: awx/main/models/ad_hoc_commands.py:266 awx/main/models/jobs.py:939 +#: awx/main/models/ad_hoc_commands.py:266 awx/main/models/jobs.py:946 msgid "System Warning" msgstr "システム警告" -#: awx/main/models/ad_hoc_commands.py:267 awx/main/models/jobs.py:940 +#: awx/main/models/ad_hoc_commands.py:267 awx/main/models/jobs.py:947 #: awx/main/models/unified_jobs.py:64 msgid "Error" msgstr "エラー" @@ -2056,127 +2093,127 @@ msgstr "チェック" msgid "Scan" msgstr "スキャン" -#: awx/main/models/credential.py:82 +#: awx/main/models/credential.py:86 msgid "Host" msgstr "ホスト" -#: awx/main/models/credential.py:83 +#: awx/main/models/credential.py:87 msgid "The hostname or IP address to use." msgstr "使用するホスト名または IP アドレス。" -#: awx/main/models/credential.py:89 +#: awx/main/models/credential.py:93 msgid "Username" msgstr "ユーザー名" -#: awx/main/models/credential.py:90 +#: awx/main/models/credential.py:94 msgid "Username for this credential." msgstr "この認証情報のユーザー名。" -#: awx/main/models/credential.py:96 +#: awx/main/models/credential.py:100 msgid "Password" msgstr "パスワード" -#: awx/main/models/credential.py:97 +#: awx/main/models/credential.py:101 msgid "" "Password for this credential (or \"ASK\" to prompt the user for machine " "credentials)." msgstr "この認証情報のパスワード (またはマシンの認証情報を求めるプロンプトを出すには 「ASK」)。" -#: awx/main/models/credential.py:104 +#: awx/main/models/credential.py:108 msgid "Security Token" msgstr "セキュリティートークン" -#: awx/main/models/credential.py:105 +#: awx/main/models/credential.py:109 msgid "Security Token for this credential" msgstr "この認証情報のセキュリティートークン" -#: awx/main/models/credential.py:111 +#: awx/main/models/credential.py:115 msgid "Project" msgstr "プロジェクト" -#: awx/main/models/credential.py:112 +#: awx/main/models/credential.py:116 msgid "The identifier for the project." msgstr "プロジェクトの識別子。" -#: awx/main/models/credential.py:118 +#: awx/main/models/credential.py:122 msgid "Domain" msgstr "ドメイン" -#: awx/main/models/credential.py:119 +#: awx/main/models/credential.py:123 msgid "The identifier for the domain." msgstr "ドメインの識別子。" -#: awx/main/models/credential.py:124 +#: awx/main/models/credential.py:128 msgid "SSH private key" msgstr "SSH 秘密鍵" -#: awx/main/models/credential.py:125 +#: awx/main/models/credential.py:129 msgid "RSA or DSA private key to be used instead of password." msgstr "パスワードの代わりに使用される RSA または DSA 秘密鍵。" -#: awx/main/models/credential.py:131 +#: awx/main/models/credential.py:135 msgid "SSH key unlock" msgstr "SSH キーのロック解除" -#: awx/main/models/credential.py:132 +#: awx/main/models/credential.py:136 msgid "" "Passphrase to unlock SSH private key if encrypted (or \"ASK\" to prompt the " "user for machine credentials)." msgstr "" "暗号化されている場合は SSH 秘密鍵のロックを解除するためのパスフレーズ (またはマシンの認証情報を求めるプロンプトを出すには「ASK」)。" -#: awx/main/models/credential.py:139 +#: awx/main/models/credential.py:143 msgid "None" msgstr "なし" -#: awx/main/models/credential.py:140 +#: awx/main/models/credential.py:144 msgid "Privilege escalation method." msgstr "権限昇格メソッド。" -#: awx/main/models/credential.py:146 +#: awx/main/models/credential.py:150 msgid "Privilege escalation username." msgstr "権限昇格ユーザー名。" -#: awx/main/models/credential.py:152 +#: awx/main/models/credential.py:156 msgid "Password for privilege escalation method." msgstr "権限昇格メソッドのパスワード。" -#: awx/main/models/credential.py:158 +#: awx/main/models/credential.py:162 msgid "Vault password (or \"ASK\" to prompt the user)." msgstr "Vault パスワード (またはユーザーにプロンプトを出すには「ASK」)。" -#: awx/main/models/credential.py:162 +#: awx/main/models/credential.py:166 msgid "Whether to use the authorize mechanism." msgstr "認証メカニズムを使用するかどうか。" -#: awx/main/models/credential.py:168 +#: awx/main/models/credential.py:172 msgid "Password used by the authorize mechanism." msgstr "認証メカニズムで使用されるパスワード。" -#: awx/main/models/credential.py:174 +#: awx/main/models/credential.py:178 msgid "Client Id or Application Id for the credential" msgstr "認証情報のクライアント ID またはアプリケーション ID" -#: awx/main/models/credential.py:180 +#: awx/main/models/credential.py:184 msgid "Secret Token for this credential" msgstr "この認証情報のシークレットトークン" -#: awx/main/models/credential.py:186 +#: awx/main/models/credential.py:190 msgid "Subscription identifier for this credential" msgstr "この認証情報のサブスクリプション識別子" -#: awx/main/models/credential.py:192 +#: awx/main/models/credential.py:196 msgid "Tenant identifier for this credential" msgstr "この認証情報のテナント識別子" -#: awx/main/models/credential.py:216 +#: awx/main/models/credential.py:220 msgid "" "Specify the type of credential you want to create. Refer to the Ansible " "Tower documentation for details on each type." msgstr "" "作成する必要のある証明書のタイプを指定します。それぞれのタイプの詳細については、Ansible Tower ドキュメントを参照してください。" -#: awx/main/models/credential.py:230 awx/main/models/credential.py:416 +#: awx/main/models/credential.py:234 awx/main/models/credential.py:420 msgid "" "Enter inputs using either JSON or YAML syntax. Use the radio button to " "toggle between the two. Refer to the Ansible Tower documentation for example" @@ -2185,31 +2222,31 @@ msgstr "" "JSON または YAML 構文のいずれかを使用して入力を行います。ラジオボタンを使用してこれらの間で切り替えを行います。構文のサンプルについては " "Ansible Tower ドキュメントを参照してください。" -#: awx/main/models/credential.py:397 +#: awx/main/models/credential.py:401 msgid "Machine" msgstr "マシン" -#: awx/main/models/credential.py:398 +#: awx/main/models/credential.py:402 msgid "Vault" msgstr "Vault" -#: awx/main/models/credential.py:399 +#: awx/main/models/credential.py:403 msgid "Network" msgstr "ネットワーク" -#: awx/main/models/credential.py:400 +#: awx/main/models/credential.py:404 msgid "Source Control" msgstr "ソースコントロール" -#: awx/main/models/credential.py:401 +#: awx/main/models/credential.py:405 msgid "Cloud" msgstr "クラウド" -#: awx/main/models/credential.py:402 +#: awx/main/models/credential.py:406 msgid "Insights" msgstr "Insights" -#: awx/main/models/credential.py:423 +#: awx/main/models/credential.py:427 msgid "" "Enter injectors using either JSON or YAML syntax. Use the radio button to " "toggle between the two. Refer to the Ansible Tower documentation for example" @@ -2219,6 +2256,11 @@ msgstr "" "構文のいずれかを使用してインジェクターを入力します。ラジオボタンを使用してこれらの間で切り替えを行います。構文のサンプルについては Ansible " "Tower ドキュメントを参照してください。" +#: awx/main/models/credential.py:478 +#, python-format +msgid "adding %s credential type" +msgstr "%s 認証情報タイプの追加" + #: awx/main/models/fact.py:25 msgid "Host for the facts that the fact scan captured." msgstr "ファクトスキャンがキャプチャーしたファクトのホスト。" @@ -2233,11 +2275,11 @@ msgid "" "host." msgstr "単一ホストのタイムスタンプでキャプチャーされるモジュールファクトの任意の JSON 構造。" -#: awx/main/models/ha.py:76 +#: awx/main/models/ha.py:78 msgid "Instances that are members of this InstanceGroup" msgstr "このインスタンスグループのメンバーであるインスタンス" -#: awx/main/models/ha.py:81 +#: awx/main/models/ha.py:83 msgid "Instance Group to remotely control this group." msgstr "このグループをリモートで制御するためのインスタンスグループ" @@ -2420,151 +2462,161 @@ msgid "Google Compute Engine" msgstr "Google Compute Engine" #: awx/main/models/inventory.py:870 -msgid "Microsoft Azure Classic (deprecated)" -msgstr "Microsoft Azure Classic (非推奨)" - -#: awx/main/models/inventory.py:871 msgid "Microsoft Azure Resource Manager" msgstr "Microsoft Azure Resource Manager" -#: awx/main/models/inventory.py:872 +#: awx/main/models/inventory.py:871 msgid "VMware vCenter" msgstr "VMware vCenter" -#: awx/main/models/inventory.py:873 +#: awx/main/models/inventory.py:872 msgid "Red Hat Satellite 6" msgstr "Red Hat Satellite 6" -#: awx/main/models/inventory.py:874 +#: awx/main/models/inventory.py:873 msgid "Red Hat CloudForms" msgstr "Red Hat CloudForms" -#: awx/main/models/inventory.py:875 +#: awx/main/models/inventory.py:874 msgid "OpenStack" msgstr "OpenStack" +#: awx/main/models/inventory.py:875 +msgid "oVirt4" +msgstr "oVirt4" + #: awx/main/models/inventory.py:876 +msgid "Ansible Tower" +msgstr "Ansible Tower" + +#: awx/main/models/inventory.py:877 msgid "Custom Script" msgstr "カスタムスクリプト" -#: awx/main/models/inventory.py:993 +#: awx/main/models/inventory.py:994 msgid "Inventory source variables in YAML or JSON format." msgstr "YAML または JSON 形式のインベントリーソース変数。" -#: awx/main/models/inventory.py:1012 +#: awx/main/models/inventory.py:1013 msgid "" "Comma-separated list of filter expressions (EC2 only). Hosts are imported " "when ANY of the filters match." msgstr "カンマ区切りのフィルター式の一覧 (EC2 のみ) です。ホストは、フィルターのいずれかが一致する場合にインポートされます。" -#: awx/main/models/inventory.py:1018 +#: awx/main/models/inventory.py:1019 msgid "Limit groups automatically created from inventory source (EC2 only)." msgstr "インベントリーソースから自動的に作成されるグループを制限します (EC2 のみ)。" -#: awx/main/models/inventory.py:1022 +#: awx/main/models/inventory.py:1023 msgid "Overwrite local groups and hosts from remote inventory source." msgstr "リモートインベントリーソースからのローカルグループおよびホストを上書きします。" -#: awx/main/models/inventory.py:1026 +#: awx/main/models/inventory.py:1027 msgid "Overwrite local variables from remote inventory source." msgstr "リモートインベントリーソースからのローカル変数を上書きします。" -#: awx/main/models/inventory.py:1031 awx/main/models/jobs.py:159 +#: awx/main/models/inventory.py:1032 awx/main/models/jobs.py:160 #: awx/main/models/projects.py:117 msgid "The amount of time (in seconds) to run before the task is canceled." msgstr "タスクが取り消される前の実行時間 (秒数)。" -#: awx/main/models/inventory.py:1064 +#: awx/main/models/inventory.py:1065 msgid "Image ID" msgstr "イメージ ID" -#: awx/main/models/inventory.py:1065 +#: awx/main/models/inventory.py:1066 msgid "Availability Zone" msgstr "アベイラビリティーゾーン" -#: awx/main/models/inventory.py:1066 +#: awx/main/models/inventory.py:1067 msgid "Account" msgstr "アカウント" -#: awx/main/models/inventory.py:1067 +#: awx/main/models/inventory.py:1068 msgid "Instance ID" msgstr "インスタンス ID" -#: awx/main/models/inventory.py:1068 +#: awx/main/models/inventory.py:1069 msgid "Instance State" msgstr "インスタンスの状態" -#: awx/main/models/inventory.py:1069 +#: awx/main/models/inventory.py:1070 msgid "Instance Type" msgstr "インスタンスタイプ" -#: awx/main/models/inventory.py:1070 +#: awx/main/models/inventory.py:1071 msgid "Key Name" msgstr "キー名" -#: awx/main/models/inventory.py:1071 +#: awx/main/models/inventory.py:1072 msgid "Region" msgstr "リージョン" -#: awx/main/models/inventory.py:1072 +#: awx/main/models/inventory.py:1073 msgid "Security Group" msgstr "セキュリティーグループ" -#: awx/main/models/inventory.py:1073 +#: awx/main/models/inventory.py:1074 msgid "Tags" msgstr "タグ" -#: awx/main/models/inventory.py:1074 +#: awx/main/models/inventory.py:1075 msgid "Tag None" msgstr "タグ None" -#: awx/main/models/inventory.py:1075 +#: awx/main/models/inventory.py:1076 msgid "VPC ID" msgstr "VPC ID" -#: awx/main/models/inventory.py:1138 +#: awx/main/models/inventory.py:1145 #, python-format msgid "" "Cloud-based inventory sources (such as %s) require credentials for the " "matching cloud service." msgstr "クラウドベースのインベントリーソース (%s など) には一致するクラウドサービスの認証情報が必要です。" -#: awx/main/models/inventory.py:1145 +#: awx/main/models/inventory.py:1152 msgid "Credential is required for a cloud source." msgstr "認証情報がクラウドソースに必要です。" -#: awx/main/models/inventory.py:1167 +#: awx/main/models/inventory.py:1155 +msgid "" +"Credentials of type machine, source control, insights and vault are " +"disallowed for custom inventory sources." +msgstr "タイプがマシン、ソースコントロール、Insights および Vault の認証情報はカスタムインベントリーソースには許可されません。" + +#: awx/main/models/inventory.py:1179 #, python-format msgid "Invalid %(source)s region: %(region)s" msgstr "無効な %(source)s リージョン: %(region)s" -#: awx/main/models/inventory.py:1191 +#: awx/main/models/inventory.py:1203 #, python-format msgid "Invalid filter expression: %(filter)s" msgstr "無効なフィルター式: %(filter)s" -#: awx/main/models/inventory.py:1212 +#: awx/main/models/inventory.py:1224 #, python-format msgid "Invalid group by choice: %(choice)s" msgstr "無効なグループ (選択による): %(choice)s" -#: awx/main/models/inventory.py:1247 +#: awx/main/models/inventory.py:1259 msgid "Project containing inventory file used as source." msgstr "ソースとして使用されるインベントリーファイルが含まれるプロジェクト。" -#: awx/main/models/inventory.py:1395 +#: awx/main/models/inventory.py:1407 #, python-format msgid "" "Unable to configure this item for cloud sync. It is already managed by %s." msgstr "クラウド同期用にこの項目を設定できません。すでに %s によって管理されています。" -#: awx/main/models/inventory.py:1405 +#: awx/main/models/inventory.py:1417 msgid "" "More than one SCM-based inventory source with update on project update per-" "inventory not allowed." msgstr "複数の SCM ベースのインベントリーソースについて、インベントリー別のプロジェクト更新時の更新は許可されません。" -#: awx/main/models/inventory.py:1412 +#: awx/main/models/inventory.py:1424 msgid "" "Cannot update SCM-based inventory source on launch if set to update on " "project update. Instead, configure the corresponding source project to " @@ -2573,34 +2625,34 @@ msgstr "" "プロジェクト更新時の更新に設定している場合、SCM " "ベースのインベントリーソースを更新できません。その代わりに起動時に更新するように対応するソースプロジェクトを設定します。" -#: awx/main/models/inventory.py:1418 +#: awx/main/models/inventory.py:1430 msgid "SCM type sources must set `overwrite_vars` to `true`." msgstr "SCM タイプソースは「overwrite_vars」を「true」に設定する必要があります。" -#: awx/main/models/inventory.py:1423 +#: awx/main/models/inventory.py:1435 msgid "Cannot set source_path if not SCM type." msgstr "SCM タイプでない場合 source_path を設定できません。" -#: awx/main/models/inventory.py:1448 +#: awx/main/models/inventory.py:1460 msgid "" "Inventory files from this Project Update were used for the inventory update." msgstr "このプロジェクト更新のインベントリーファイルがインベントリー更新に使用されました。" -#: awx/main/models/inventory.py:1561 +#: awx/main/models/inventory.py:1573 msgid "Inventory script contents" msgstr "インベントリースクリプトの内容" -#: awx/main/models/inventory.py:1566 +#: awx/main/models/inventory.py:1578 msgid "Organization owning this inventory script" msgstr "このインベントリースクリプトを所有する組織" -#: awx/main/models/jobs.py:65 +#: awx/main/models/jobs.py:66 msgid "" "If enabled, textual changes made to any templated files on the host are " "shown in the standard output" msgstr "有効にされている場合、ホストのテンプレート化されたファイルに追加されるテキストの変更が標準出力に表示されます。" -#: awx/main/models/jobs.py:163 +#: awx/main/models/jobs.py:164 msgid "" "If enabled, Tower will act as an Ansible Fact Cache Plugin; persisting facts" " at the end of a playbook run to the database and caching facts for use by " @@ -2609,137 +2661,137 @@ msgstr "" "有効にされている場合、 Tower は Ansible ファクトキャッシュプラグインとして機能します。データベースに対する Playbook " "実行の終了時にファクトが保持され、 Ansible で使用できるようにキャッシュされます。" -#: awx/main/models/jobs.py:172 +#: awx/main/models/jobs.py:173 msgid "You must provide an SSH credential." msgstr "SSH 認証情報を指定する必要があります。" -#: awx/main/models/jobs.py:180 +#: awx/main/models/jobs.py:181 msgid "You must provide a Vault credential." msgstr "Vault 認証情報を指定する必要があります。" -#: awx/main/models/jobs.py:316 +#: awx/main/models/jobs.py:317 msgid "Job Template must provide 'inventory' or allow prompting for it." msgstr "ジョブテンプレートは「inventory」を指定するか、このプロンプトを許可する必要があります。" -#: awx/main/models/jobs.py:320 +#: awx/main/models/jobs.py:321 msgid "Job Template must provide 'credential' or allow prompting for it." msgstr "ジョブテンプレートは「credential」を指定するか、このプロンプトを許可する必要があります。" -#: awx/main/models/jobs.py:422 +#: awx/main/models/jobs.py:427 msgid "Cannot override job_type to or from a scan job." msgstr "スキャンジョブから/への job_type を上書きを実行できません。" -#: awx/main/models/jobs.py:488 awx/main/models/projects.py:263 +#: awx/main/models/jobs.py:493 awx/main/models/projects.py:263 msgid "SCM Revision" msgstr "SCM リビジョン" -#: awx/main/models/jobs.py:489 +#: awx/main/models/jobs.py:494 msgid "The SCM Revision from the Project used for this job, if available" msgstr "このジョブに使用されるプロジェクトからの SCM リビジョン (ある場合)" -#: awx/main/models/jobs.py:497 +#: awx/main/models/jobs.py:502 msgid "" "The SCM Refresh task used to make sure the playbooks were available for the " "job run" msgstr "SCM 更新タスクは、Playbook がジョブの実行で利用可能であったことを確認するために使用されます" -#: awx/main/models/jobs.py:802 +#: awx/main/models/jobs.py:809 msgid "job host summaries" msgstr "ジョブホストの概要" -#: awx/main/models/jobs.py:906 +#: awx/main/models/jobs.py:913 msgid "Host Failure" msgstr "ホストの失敗" -#: awx/main/models/jobs.py:909 awx/main/models/jobs.py:923 +#: awx/main/models/jobs.py:916 awx/main/models/jobs.py:930 msgid "No Hosts Remaining" msgstr "残りのホストがありません" -#: awx/main/models/jobs.py:910 +#: awx/main/models/jobs.py:917 msgid "Host Polling" msgstr "ホストのポーリング" -#: awx/main/models/jobs.py:911 +#: awx/main/models/jobs.py:918 msgid "Host Async OK" msgstr "ホストの非同期 OK" -#: awx/main/models/jobs.py:912 +#: awx/main/models/jobs.py:919 msgid "Host Async Failure" msgstr "ホストの非同期失敗" -#: awx/main/models/jobs.py:913 +#: awx/main/models/jobs.py:920 msgid "Item OK" msgstr "項目 OK" -#: awx/main/models/jobs.py:914 +#: awx/main/models/jobs.py:921 msgid "Item Failed" msgstr "項目の失敗" -#: awx/main/models/jobs.py:915 +#: awx/main/models/jobs.py:922 msgid "Item Skipped" msgstr "項目のスキップ" -#: awx/main/models/jobs.py:916 +#: awx/main/models/jobs.py:923 msgid "Host Retry" msgstr "ホストの再試行" -#: awx/main/models/jobs.py:918 +#: awx/main/models/jobs.py:925 msgid "File Difference" msgstr "ファイルの相違点" -#: awx/main/models/jobs.py:919 +#: awx/main/models/jobs.py:926 msgid "Playbook Started" msgstr "Playbook の開始" -#: awx/main/models/jobs.py:920 +#: awx/main/models/jobs.py:927 msgid "Running Handlers" msgstr "実行中のハンドラー" -#: awx/main/models/jobs.py:921 +#: awx/main/models/jobs.py:928 msgid "Including File" msgstr "組み込みファイル" -#: awx/main/models/jobs.py:922 +#: awx/main/models/jobs.py:929 msgid "No Hosts Matched" msgstr "一致するホストがありません" -#: awx/main/models/jobs.py:924 +#: awx/main/models/jobs.py:931 msgid "Task Started" msgstr "タスクの開始" -#: awx/main/models/jobs.py:926 +#: awx/main/models/jobs.py:933 msgid "Variables Prompted" msgstr "変数のプロモート" -#: awx/main/models/jobs.py:927 +#: awx/main/models/jobs.py:934 msgid "Gathering Facts" msgstr "ファクトの収集" -#: awx/main/models/jobs.py:928 +#: awx/main/models/jobs.py:935 msgid "internal: on Import for Host" msgstr "内部: ホストのインポート時" -#: awx/main/models/jobs.py:929 +#: awx/main/models/jobs.py:936 msgid "internal: on Not Import for Host" msgstr "内部: ホストの非インポート時" -#: awx/main/models/jobs.py:930 +#: awx/main/models/jobs.py:937 msgid "Play Started" msgstr "プレイの開始" -#: awx/main/models/jobs.py:931 +#: awx/main/models/jobs.py:938 msgid "Playbook Complete" msgstr "Playbook の完了" -#: awx/main/models/jobs.py:1363 +#: awx/main/models/jobs.py:1351 msgid "Remove jobs older than a certain number of days" msgstr "特定の日数より前のジョブを削除" -#: awx/main/models/jobs.py:1364 +#: awx/main/models/jobs.py:1352 msgid "Remove activity stream entries older than a certain number of days" msgstr "特定の日数より前のアクティビティーストリームのエントリーを削除" -#: awx/main/models/jobs.py:1365 +#: awx/main/models/jobs.py:1353 msgid "Purge and/or reduce the granularity of system tracking data" msgstr "システムトラッキングデータの詳細度の削除/削減" @@ -3029,11 +3081,11 @@ msgstr "実行中" #: awx/main/models/unified_jobs.py:65 msgid "Canceled" -msgstr "取り消されました" +msgstr "取り消し" #: awx/main/models/unified_jobs.py:69 msgid "Never Updated" -msgstr "更新されていません" +msgstr "未更新" #: awx/main/models/unified_jobs.py:73 awx/ui/templates/ui/index.html:67 #: awx/ui/templates/ui/index.html.py:86 @@ -3142,13 +3194,13 @@ msgstr "Twilio への接続時の例外: {}" msgid "Error sending notification webhook: {}" msgstr "通知 webhook の送信時のエラー: {}" -#: awx/main/scheduler/__init__.py:184 +#: awx/main/scheduler/task_manager.py:197 msgid "" "Job spawned from workflow could not start because it was not in the right " "state or required manual credentials" msgstr "ワークフローから起動されるジョブは、正常な状態にないか、または手動の認証が必要であるために開始できませんでした" -#: awx/main/scheduler/__init__.py:188 +#: awx/main/scheduler/task_manager.py:201 msgid "" "Job spawned from workflow could not start because it was missing a related " "resource such as project or inventory" @@ -3166,7 +3218,7 @@ msgstr "Ansible Tower ライセンスがまもなく期限切れになります" msgid "status_str must be either succeeded or failed" msgstr "status_str は成功または失敗のいずれかである必要があります" -#: awx/main/tasks.py:1531 +#: awx/main/tasks.py:1549 msgid "Dependent inventory update {} was canceled." msgstr "依存するインベントリーの更新 {} が取り消されました。" @@ -3175,38 +3227,38 @@ msgstr "依存するインベントリーの更新 {} が取り消されまし msgid "Unable to convert \"%s\" to boolean" msgstr "\"%s\" をブール値に変換できません" -#: awx/main/utils/common.py:209 +#: awx/main/utils/common.py:235 #, python-format msgid "Unsupported SCM type \"%s\"" msgstr "サポートされない SCM タイプ \"%s\"" -#: awx/main/utils/common.py:216 awx/main/utils/common.py:228 -#: awx/main/utils/common.py:247 +#: awx/main/utils/common.py:242 awx/main/utils/common.py:254 +#: awx/main/utils/common.py:273 #, python-format msgid "Invalid %s URL" msgstr "無効な %s URL" -#: awx/main/utils/common.py:218 awx/main/utils/common.py:257 +#: awx/main/utils/common.py:244 awx/main/utils/common.py:283 #, python-format msgid "Unsupported %s URL" msgstr "サポートされていない %s URL" -#: awx/main/utils/common.py:259 +#: awx/main/utils/common.py:285 #, python-format msgid "Unsupported host \"%s\" for file:// URL" msgstr "ファイル:// URL のサポートされていないホスト \"%s\" " -#: awx/main/utils/common.py:261 +#: awx/main/utils/common.py:287 #, python-format msgid "Host is required for %s URL" msgstr "%s URL にはホストが必要です" -#: awx/main/utils/common.py:279 +#: awx/main/utils/common.py:305 #, python-format msgid "Username must be \"git\" for SSH access to %s." msgstr "%s への SSH アクセスではユーザー名を \"git\" にする必要があります。" -#: awx/main/utils/common.py:285 +#: awx/main/utils/common.py:311 #, python-format msgid "Username must be \"hg\" for SSH access to %s." msgstr "%s への SSH アクセスではユーザー名を \"hg\" にする必要があります。" @@ -3319,287 +3371,287 @@ msgstr "サーバーエラー" msgid "A server error has occurred." msgstr "サーバーエラーが発生しました。" -#: awx/settings/defaults.py:664 +#: awx/settings/defaults.py:665 msgid "US East (Northern Virginia)" msgstr "米国東部 (バージニア北部)" -#: awx/settings/defaults.py:665 +#: awx/settings/defaults.py:666 msgid "US East (Ohio)" msgstr "米国東部 (オハイオ)" -#: awx/settings/defaults.py:666 +#: awx/settings/defaults.py:667 msgid "US West (Oregon)" msgstr "米国西部 (オレゴン)" -#: awx/settings/defaults.py:667 +#: awx/settings/defaults.py:668 msgid "US West (Northern California)" msgstr "米国西部 (北カリフォルニア)" -#: awx/settings/defaults.py:668 +#: awx/settings/defaults.py:669 msgid "Canada (Central)" msgstr "カナダ (中部)" -#: awx/settings/defaults.py:669 +#: awx/settings/defaults.py:670 msgid "EU (Frankfurt)" msgstr "EU (フランクフルト)" -#: awx/settings/defaults.py:670 +#: awx/settings/defaults.py:671 msgid "EU (Ireland)" msgstr "EU (アイルランド)" -#: awx/settings/defaults.py:671 +#: awx/settings/defaults.py:672 msgid "EU (London)" msgstr "EU (ロンドン)" -#: awx/settings/defaults.py:672 +#: awx/settings/defaults.py:673 msgid "Asia Pacific (Singapore)" msgstr "アジア太平洋 (シンガポール)" -#: awx/settings/defaults.py:673 +#: awx/settings/defaults.py:674 msgid "Asia Pacific (Sydney)" msgstr "アジア太平洋 (シドニー)" -#: awx/settings/defaults.py:674 +#: awx/settings/defaults.py:675 msgid "Asia Pacific (Tokyo)" msgstr "アジア太平洋 (東京)" -#: awx/settings/defaults.py:675 +#: awx/settings/defaults.py:676 msgid "Asia Pacific (Seoul)" msgstr "アジア太平洋 (ソウル)" -#: awx/settings/defaults.py:676 +#: awx/settings/defaults.py:677 msgid "Asia Pacific (Mumbai)" msgstr "アジア太平洋 (ムンバイ)" -#: awx/settings/defaults.py:677 +#: awx/settings/defaults.py:678 msgid "South America (Sao Paulo)" msgstr "南アメリカ (サンパウロ)" -#: awx/settings/defaults.py:678 +#: awx/settings/defaults.py:679 msgid "US West (GovCloud)" msgstr "米国西部 (GovCloud)" -#: awx/settings/defaults.py:679 +#: awx/settings/defaults.py:680 msgid "China (Beijing)" msgstr "中国 (北京)" -#: awx/settings/defaults.py:728 +#: awx/settings/defaults.py:729 msgid "US East 1 (B)" msgstr "米国東部 1 (B)" -#: awx/settings/defaults.py:729 +#: awx/settings/defaults.py:730 msgid "US East 1 (C)" msgstr "米国東部 1 (C)" -#: awx/settings/defaults.py:730 +#: awx/settings/defaults.py:731 msgid "US East 1 (D)" msgstr "米国東部 1 (D)" -#: awx/settings/defaults.py:731 +#: awx/settings/defaults.py:732 msgid "US East 4 (A)" msgstr "米国東部 4 (A)" -#: awx/settings/defaults.py:732 +#: awx/settings/defaults.py:733 msgid "US East 4 (B)" msgstr "米国東部 4 (B)" -#: awx/settings/defaults.py:733 +#: awx/settings/defaults.py:734 msgid "US East 4 (C)" msgstr "米国東部 4 (C)" -#: awx/settings/defaults.py:734 +#: awx/settings/defaults.py:735 msgid "US Central (A)" msgstr "米国中部 (A)" -#: awx/settings/defaults.py:735 +#: awx/settings/defaults.py:736 msgid "US Central (B)" msgstr "米国中部 (B)" -#: awx/settings/defaults.py:736 +#: awx/settings/defaults.py:737 msgid "US Central (C)" msgstr "米国中部 (C)" -#: awx/settings/defaults.py:737 +#: awx/settings/defaults.py:738 msgid "US Central (F)" msgstr "米国中部 (F)" -#: awx/settings/defaults.py:738 +#: awx/settings/defaults.py:739 msgid "US West (A)" msgstr "米国西部 (A)" -#: awx/settings/defaults.py:739 +#: awx/settings/defaults.py:740 msgid "US West (B)" msgstr "米国西部 (B)" -#: awx/settings/defaults.py:740 +#: awx/settings/defaults.py:741 msgid "US West (C)" msgstr "米国西部 (C)" -#: awx/settings/defaults.py:741 +#: awx/settings/defaults.py:742 msgid "Europe West 1 (B)" msgstr "欧州西部 1 (B)" -#: awx/settings/defaults.py:742 +#: awx/settings/defaults.py:743 msgid "Europe West 1 (C)" msgstr "欧州西部 1 (C)" -#: awx/settings/defaults.py:743 +#: awx/settings/defaults.py:744 msgid "Europe West 1 (D)" msgstr "欧州西部 1 (D)" -#: awx/settings/defaults.py:744 +#: awx/settings/defaults.py:745 msgid "Europe West 2 (A)" msgstr "欧州西部 2 (A)" -#: awx/settings/defaults.py:745 +#: awx/settings/defaults.py:746 msgid "Europe West 2 (B)" msgstr "欧州西部 2 (B)" -#: awx/settings/defaults.py:746 +#: awx/settings/defaults.py:747 msgid "Europe West 2 (C)" msgstr "欧州西部 2 (C)" -#: awx/settings/defaults.py:747 +#: awx/settings/defaults.py:748 msgid "Asia East (A)" msgstr "アジア東部 (A)" -#: awx/settings/defaults.py:748 +#: awx/settings/defaults.py:749 msgid "Asia East (B)" msgstr "アジア東部 (B)" -#: awx/settings/defaults.py:749 +#: awx/settings/defaults.py:750 msgid "Asia East (C)" msgstr "アジア東部 (C)" -#: awx/settings/defaults.py:750 +#: awx/settings/defaults.py:751 msgid "Asia Southeast (A)" msgstr "アジア南東部 (A)" -#: awx/settings/defaults.py:751 +#: awx/settings/defaults.py:752 msgid "Asia Southeast (B)" msgstr "アジア南東部 (B)" -#: awx/settings/defaults.py:752 +#: awx/settings/defaults.py:753 msgid "Asia Northeast (A)" msgstr "アジア北東部 (A)" -#: awx/settings/defaults.py:753 +#: awx/settings/defaults.py:754 msgid "Asia Northeast (B)" msgstr "アジア北東部 (B)" -#: awx/settings/defaults.py:754 +#: awx/settings/defaults.py:755 msgid "Asia Northeast (C)" msgstr "アジア北東部 (C)" -#: awx/settings/defaults.py:755 +#: awx/settings/defaults.py:756 msgid "Australia Southeast (A)" msgstr "オーストラリア南東部 (A)" -#: awx/settings/defaults.py:756 +#: awx/settings/defaults.py:757 msgid "Australia Southeast (B)" msgstr "オーストラリア南東部 (B)" -#: awx/settings/defaults.py:757 +#: awx/settings/defaults.py:758 msgid "Australia Southeast (C)" msgstr "オーストラリア南東部 (C)" -#: awx/settings/defaults.py:781 +#: awx/settings/defaults.py:780 msgid "US East" msgstr "米国東部" -#: awx/settings/defaults.py:782 +#: awx/settings/defaults.py:781 msgid "US East 2" msgstr "米国東部 2" -#: awx/settings/defaults.py:783 +#: awx/settings/defaults.py:782 msgid "US Central" msgstr "米国中部" -#: awx/settings/defaults.py:784 +#: awx/settings/defaults.py:783 msgid "US North Central" msgstr "米国中北部" -#: awx/settings/defaults.py:785 +#: awx/settings/defaults.py:784 msgid "US South Central" msgstr "米国中南部" -#: awx/settings/defaults.py:786 +#: awx/settings/defaults.py:785 msgid "US West Central" msgstr "米国中西部" -#: awx/settings/defaults.py:787 +#: awx/settings/defaults.py:786 msgid "US West" msgstr "米国西部" -#: awx/settings/defaults.py:788 +#: awx/settings/defaults.py:787 msgid "US West 2" msgstr "米国西部 2" -#: awx/settings/defaults.py:789 +#: awx/settings/defaults.py:788 msgid "Canada East" msgstr "カナダ東部" -#: awx/settings/defaults.py:790 +#: awx/settings/defaults.py:789 msgid "Canada Central" msgstr "カナダ中部" -#: awx/settings/defaults.py:791 +#: awx/settings/defaults.py:790 msgid "Brazil South" msgstr "ブラジル南部" -#: awx/settings/defaults.py:792 +#: awx/settings/defaults.py:791 msgid "Europe North" msgstr "欧州北部" -#: awx/settings/defaults.py:793 +#: awx/settings/defaults.py:792 msgid "Europe West" msgstr "欧州西部" -#: awx/settings/defaults.py:794 +#: awx/settings/defaults.py:793 msgid "UK West" msgstr "英国西部" -#: awx/settings/defaults.py:795 +#: awx/settings/defaults.py:794 msgid "UK South" msgstr "英国南部" -#: awx/settings/defaults.py:796 +#: awx/settings/defaults.py:795 msgid "Asia East" msgstr "アジア東部" -#: awx/settings/defaults.py:797 +#: awx/settings/defaults.py:796 msgid "Asia Southeast" msgstr "アジア南東部" -#: awx/settings/defaults.py:798 +#: awx/settings/defaults.py:797 msgid "Australia East" msgstr "オーストラリア東部" -#: awx/settings/defaults.py:799 +#: awx/settings/defaults.py:798 msgid "Australia Southeast" msgstr "オーストラリア南東部 " -#: awx/settings/defaults.py:800 +#: awx/settings/defaults.py:799 msgid "India West" msgstr "インド西部" -#: awx/settings/defaults.py:801 +#: awx/settings/defaults.py:800 msgid "India South" msgstr "インド南部" -#: awx/settings/defaults.py:802 +#: awx/settings/defaults.py:801 msgid "Japan East" msgstr "日本東部" -#: awx/settings/defaults.py:803 +#: awx/settings/defaults.py:802 msgid "Japan West" msgstr "日本西部" -#: awx/settings/defaults.py:804 +#: awx/settings/defaults.py:803 msgid "Korea Central" msgstr "韓国中部" -#: awx/settings/defaults.py:805 +#: awx/settings/defaults.py:804 msgid "Korea South" msgstr "韓国南部" @@ -4297,6 +4349,7 @@ msgid "SAML Team Map" msgstr "SAML チームマップ" #: awx/sso/fields.py:123 +#, python-brace-format msgid "Invalid connection option(s): {invalid_options}." msgstr "無効な接続オプション: {invalid_options}" @@ -4313,14 +4366,17 @@ msgid "Subtree" msgstr "サブツリー" #: awx/sso/fields.py:214 +#, python-brace-format msgid "Expected a list of three items but got {length} instead." msgstr "3 つの項目の一覧が予期されましが、{length} が取得されました。" #: awx/sso/fields.py:215 +#, python-brace-format msgid "Expected an instance of LDAPSearch but got {input_type} instead." msgstr "LDAPSearch のインスタンスが予期されましたが、{input_type} が取得されました。" #: awx/sso/fields.py:251 +#, python-brace-format msgid "" "Expected an instance of LDAPSearch or LDAPSearchUnion but got {input_type} " "instead." @@ -4328,64 +4384,79 @@ msgstr "" "LDAPSearch または LDAPSearchUnion のインスタンスが予期されましたが、{input_type} が取得されました。" #: awx/sso/fields.py:289 +#, python-brace-format msgid "Invalid user attribute(s): {invalid_attrs}." msgstr "無効なユーザー属性: {invalid_attrs}" #: awx/sso/fields.py:306 +#, python-brace-format msgid "Expected an instance of LDAPGroupType but got {input_type} instead." msgstr "LDAPGroupType のインスタンスが予期されましたが、{input_type} が取得されました。" #: awx/sso/fields.py:334 +#, python-brace-format msgid "Invalid user flag: \"{invalid_flag}\"." msgstr "無効なユーザーフラグ: \"{invalid_flag}\"" #: awx/sso/fields.py:350 awx/sso/fields.py:517 +#, python-brace-format msgid "" "Expected None, True, False, a string or list of strings but got {input_type}" " instead." msgstr "None、True、False、文字列または文字列の一覧が予期されましたが、{input_type} が取得されました。" #: awx/sso/fields.py:386 +#, python-brace-format msgid "Missing key(s): {missing_keys}." msgstr "キーがありません: {missing_keys}" #: awx/sso/fields.py:387 +#, python-brace-format msgid "Invalid key(s): {invalid_keys}." msgstr "無効なキー: {invalid_keys}" #: awx/sso/fields.py:436 awx/sso/fields.py:553 +#, python-brace-format msgid "Invalid key(s) for organization map: {invalid_keys}." msgstr "組織マップの無効なキー: {invalid_keys}" #: awx/sso/fields.py:454 +#, python-brace-format msgid "Missing required key for team map: {invalid_keys}." msgstr "チームマップの必要なキーがありません: {invalid_keys}" #: awx/sso/fields.py:455 awx/sso/fields.py:572 +#, python-brace-format msgid "Invalid key(s) for team map: {invalid_keys}." msgstr "チームマップの無効なキー: {invalid_keys}" #: awx/sso/fields.py:571 +#, python-brace-format msgid "Missing required key for team map: {missing_keys}." msgstr "チームマップで必要なキーがありません: {missing_keys}" #: awx/sso/fields.py:589 +#, python-brace-format msgid "Missing required key(s) for org info record: {missing_keys}." msgstr "組織情報レコードで必要なキーがありません: {missing_keys}" #: awx/sso/fields.py:602 +#, python-brace-format msgid "Invalid language code(s) for org info: {invalid_lang_codes}." msgstr "組織情報の無効な言語コード: {invalid_lang_codes}" #: awx/sso/fields.py:621 +#, python-brace-format msgid "Missing required key(s) for contact: {missing_keys}." msgstr "問い合わせ先の必要なキーがありません: {missing_keys}" #: awx/sso/fields.py:633 +#, python-brace-format msgid "Missing required key(s) for IdP: {missing_keys}." msgstr "IdP で必要なキーがありません: {missing_keys}" #: awx/sso/pipeline.py:24 +#, python-brace-format msgid "An account cannot be found for {0}" msgstr "{0} のアカウントが見つかりません" @@ -4477,6 +4548,7 @@ msgid "Make a PATCH request on the %(name)s resource" msgstr "%(name)s リソースでの PATCH 要求" #: awx/ui/apps.py:9 awx/ui/conf.py:22 awx/ui/conf.py:36 awx/ui/conf.py:51 +#: awx/ui/conf.py:63 msgid "UI" msgstr "UI" @@ -4527,6 +4599,15 @@ msgstr "" "カスタムロゴを設定するには、作成するファイルを指定します。カスタムロゴを最適化するには、背景が透明の「.png」ファイルを使用します。GIF、PNG " "および JPEG 形式がサポートされます。" +#: awx/ui/conf.py:60 +msgid "Max Job Events Retreived by UI" +msgstr "UI で検索される最大ジョブイベント" + +#: awx/ui/conf.py:61 +msgid "" +"Maximum number of job events for the UI to retreive within a single request." +msgstr "単一要求内で検索される UI についての最大ジョブイベント数。" + #: awx/ui/fields.py:29 msgid "" "Invalid format for custom logo. Must be a data URL with a base64-encoded " diff --git a/awx/locale/nl/LC_MESSAGES/django.po b/awx/locale/nl/LC_MESSAGES/django.po index 92fca917e2..ddaab6205f 100644 --- a/awx/locale/nl/LC_MESSAGES/django.po +++ b/awx/locale/nl/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-08-27 19:27+0000\n" +"POT-Creation-Date: 2017-11-30 20:23+0000\n" "PO-Revision-Date: 2017-08-31 08:53+0000\n" "Last-Translator: helena02 \n" "Language-Team: Dutch\n" @@ -81,25 +81,30 @@ msgstr "Filteren op %s is niet toegestaan." msgid "Loops not allowed in filters, detected on field {}." msgstr "Lussen zijn niet toegestaan in filters, gedetecteerd in veld {}." -#: awx/api/filters.py:297 +#: awx/api/filters.py:171 +#, python-brace-format +msgid "Invalid {field_name} id: {field_id}" +msgstr "" + +#: awx/api/filters.py:302 #, python-format msgid "cannot filter on kind %s" msgstr "kan niet filteren op soort %s" -#: awx/api/filters.py:404 +#: awx/api/filters.py:409 #, python-format msgid "cannot order by field %s" msgstr "Kan niet ordenen op veld %s" -#: awx/api/generics.py:515 awx/api/generics.py:577 +#: awx/api/generics.py:550 awx/api/generics.py:612 msgid "\"id\" field must be an integer." msgstr "'Id'-veld moet een geheel getal zijn." -#: awx/api/generics.py:574 +#: awx/api/generics.py:609 msgid "\"id\" is required to disassociate" msgstr "'id' is vereist om los te koppelen" -#: awx/api/generics.py:625 +#: awx/api/generics.py:660 msgid "{} 'id' field is missing." msgstr "{} 'id'-veld ontbreekt." @@ -180,7 +185,7 @@ msgstr "Workflowtaak" msgid "Workflow Template" msgstr "Workflowsjabloon" -#: awx/api/serializers.py:697 awx/api/serializers.py:755 awx/api/views.py:4314 +#: awx/api/serializers.py:701 awx/api/serializers.py:759 awx/api/views.py:4365 #, python-format msgid "" "Standard Output too large to display (%(text_size)d bytes), only download " @@ -190,38 +195,38 @@ msgstr "" "alleen download ondersteund voor groottes van meer dan %(supported_size)d " "bytes" -#: awx/api/serializers.py:770 +#: awx/api/serializers.py:774 msgid "Write-only field used to change the password." msgstr "Een alleen-schrijven-veld is gebruikt om het wachtwoord te wijzigen." -#: awx/api/serializers.py:772 +#: awx/api/serializers.py:776 msgid "Set if the account is managed by an external service" msgstr "Instellen als de account wordt beheerd door een externe service" -#: awx/api/serializers.py:796 +#: awx/api/serializers.py:800 msgid "Password required for new User." msgstr "Wachtwoord vereist voor een nieuwe gebruiker." -#: awx/api/serializers.py:882 +#: awx/api/serializers.py:886 #, python-format msgid "Unable to change %s on user managed by LDAP." msgstr "Kan %s niet wijzigen voor gebruiker die wordt beheerd met LDAP." -#: awx/api/serializers.py:1046 +#: awx/api/serializers.py:1050 msgid "Organization is missing" msgstr "Organisatie ontbreekt" -#: awx/api/serializers.py:1050 +#: awx/api/serializers.py:1054 msgid "Update options must be set to false for manual projects." msgstr "" "De update-opties moeten voor handmatige projecten worden ingesteld op " "onwaar." -#: awx/api/serializers.py:1056 +#: awx/api/serializers.py:1060 msgid "Array of playbooks available within this project." msgstr "Er is binnen dit project een draaiboekenmatrix beschikbaar." -#: awx/api/serializers.py:1075 +#: awx/api/serializers.py:1079 msgid "" "Array of inventory files and directories available within this project, not " "comprehensive." @@ -229,68 +234,72 @@ msgstr "" "Er is binnen dit project een niet-volledige matrix met " "inventarisatiebestanden en -mappen beschikbaar." -#: awx/api/serializers.py:1282 +#: awx/api/serializers.py:1201 +msgid "Smart inventories must specify host_filter" +msgstr "" + +#: awx/api/serializers.py:1303 #, python-format msgid "Invalid port specification: %s" msgstr "Ongeldige poortspecificatie: %s" -#: awx/api/serializers.py:1293 +#: awx/api/serializers.py:1314 msgid "Cannot create Host for Smart Inventory" msgstr "Kan geen host aanmaken voor Smart-inventaris" -#: awx/api/serializers.py:1315 awx/api/serializers.py:3218 -#: awx/api/serializers.py:3303 awx/main/validators.py:198 +#: awx/api/serializers.py:1336 awx/api/serializers.py:3321 +#: awx/api/serializers.py:3406 awx/main/validators.py:198 msgid "Must be valid JSON or YAML." msgstr "Moet geldig JSON of YAML zijn." -#: awx/api/serializers.py:1411 +#: awx/api/serializers.py:1432 msgid "Invalid group name." msgstr "Ongeldige groepsnaam." -#: awx/api/serializers.py:1416 +#: awx/api/serializers.py:1437 msgid "Cannot create Group for Smart Inventory" msgstr "Kan geen groep aanmaken voor Smart-inventaris" -#: awx/api/serializers.py:1488 +#: awx/api/serializers.py:1509 msgid "" "Script must begin with a hashbang sequence: i.e.... #!/usr/bin/env python" msgstr "" "Script moet beginnen met een hashbang-reeks, bijvoorbeeld ... #!/usr/bin/env" " python" -#: awx/api/serializers.py:1534 +#: awx/api/serializers.py:1555 msgid "`{}` is a prohibited environment variable" msgstr "`{}` is niet toegestaan als omgevingsvariabele" -#: awx/api/serializers.py:1545 +#: awx/api/serializers.py:1566 msgid "If 'source' is 'custom', 'source_script' must be provided." msgstr "Als 'bron' 'aangepast' is, moet 'source_script' worden geleverd." -#: awx/api/serializers.py:1551 +#: awx/api/serializers.py:1572 msgid "Must provide an inventory." msgstr "Moet een inventaris verschaffen." -#: awx/api/serializers.py:1555 +#: awx/api/serializers.py:1576 msgid "" "The 'source_script' does not belong to the same organization as the " "inventory." msgstr "" "Het 'source_script' behoort niet tot dezelfde categorie als de inventaris." -#: awx/api/serializers.py:1557 +#: awx/api/serializers.py:1578 msgid "'source_script' doesn't exist." msgstr "'source_script' bestaat niet." -#: awx/api/serializers.py:1581 +#: awx/api/serializers.py:1602 msgid "Automatic group relationship, will be removed in 3.3" msgstr "Automatische groepsrelatie, wordt verwijderd in 3.3" -#: awx/api/serializers.py:1658 +#: awx/api/serializers.py:1679 msgid "Cannot use manual project for SCM-based inventory." msgstr "" "Kan geen handmatig project gebruiken voor een SCM-gebaseerde inventaris." -#: awx/api/serializers.py:1664 +#: awx/api/serializers.py:1685 msgid "" "Manual inventory sources are created automatically when a group is created " "in the v1 API." @@ -298,50 +307,56 @@ msgstr "" "Handmatige inventarisbronnen worden automatisch gemaakt wanneer er een groep" " wordt gemaakt in de v1 API." -#: awx/api/serializers.py:1669 +#: awx/api/serializers.py:1690 msgid "Setting not compatible with existing schedules." msgstr "Instelling is niet compatibel met bestaande schema's." -#: awx/api/serializers.py:1674 +#: awx/api/serializers.py:1695 msgid "Cannot create Inventory Source for Smart Inventory" msgstr "Kan geen inventarisbron aanmaken voor Smart-inventaris" -#: awx/api/serializers.py:1688 +#: awx/api/serializers.py:1709 #, python-format msgid "Cannot set %s if not SCM type." msgstr "Kan %s niet instellen als het geen SCM-type is." -#: awx/api/serializers.py:1929 +#: awx/api/serializers.py:1950 msgid "Modifications not allowed for managed credential types" msgstr "Wijzigingen zijn niet toegestaan voor beheerde referentietypen" -#: awx/api/serializers.py:1934 +#: awx/api/serializers.py:1955 msgid "" "Modifications to inputs are not allowed for credential types that are in use" msgstr "" "Wijzigingen in inputs zijn niet toegestaan voor referentietypen die in " "gebruik zijn" -#: awx/api/serializers.py:1940 +#: awx/api/serializers.py:1961 #, python-format msgid "Must be 'cloud' or 'net', not %s" msgstr "Moet 'cloud' of 'net' zijn, niet %s" -#: awx/api/serializers.py:1946 +#: awx/api/serializers.py:1967 msgid "'ask_at_runtime' is not supported for custom credentials." msgstr "'ask_at_runtime' wordt niet ondersteund voor aangepaste referenties." -#: awx/api/serializers.py:2119 +#: awx/api/serializers.py:2140 #, python-format msgid "\"%s\" is not a valid choice" msgstr "\"%s\" is geen geldige keuze" -#: awx/api/serializers.py:2138 +#: awx/api/serializers.py:2159 #, python-format msgid "'%s' is not a valid field for %s" msgstr "'%s' is geen geldig veld voor %s" -#: awx/api/serializers.py:2150 +#: awx/api/serializers.py:2180 +msgid "" +"You cannot change the credential type of the credential, as it may break the" +" functionality of the resources using it." +msgstr "" + +#: awx/api/serializers.py:2191 msgid "" "Write-only field used to add user to owner role. If provided, do not give " "either team or organization. Only valid for creation." @@ -350,7 +365,7 @@ msgstr "" "de eigenaarrol. Indien verschaft, geef geen team of organisatie op. Alleen " "geldig voor maken." -#: awx/api/serializers.py:2155 +#: awx/api/serializers.py:2196 msgid "" "Write-only field used to add team to owner role. If provided, do not give " "either user or organization. Only valid for creation." @@ -359,7 +374,7 @@ msgstr "" "te voegen. Indien verschaft, geef geen gebruiker of organisatie op. Alleen " "geldig voor maken." -#: awx/api/serializers.py:2160 +#: awx/api/serializers.py:2201 msgid "" "Inherit permissions from organization roles. If provided on creation, do not" " give either user or team." @@ -367,124 +382,128 @@ msgstr "" "Neem machtigingen over van organisatierollen. Indien verschaft bij maken, " "geef geen gebruiker of team op." -#: awx/api/serializers.py:2176 +#: awx/api/serializers.py:2217 msgid "Missing 'user', 'team', or 'organization'." msgstr "'gebruiker', 'team' of 'organisatie' ontbreekt." -#: awx/api/serializers.py:2216 +#: awx/api/serializers.py:2257 msgid "" "Credential organization must be set and match before assigning to a team" msgstr "" "Referentieorganisatie moet worden ingesteld en moet overeenkomen vóór " "toewijzing aan een team" -#: awx/api/serializers.py:2378 +#: awx/api/serializers.py:2424 msgid "You must provide a cloud credential." msgstr "U moet een cloudreferentie opgeven." -#: awx/api/serializers.py:2379 +#: awx/api/serializers.py:2425 msgid "You must provide a network credential." msgstr "U moet een netwerkreferentie opgeven." -#: awx/api/serializers.py:2395 +#: awx/api/serializers.py:2441 msgid "This field is required." msgstr "Dit veld is vereist." -#: awx/api/serializers.py:2397 awx/api/serializers.py:2399 +#: awx/api/serializers.py:2443 awx/api/serializers.py:2445 msgid "Playbook not found for project." msgstr "Draaiboek is niet gevonden voor project." -#: awx/api/serializers.py:2401 +#: awx/api/serializers.py:2447 msgid "Must select playbook for project." msgstr "Moet een draaiboek selecteren voor het project." -#: awx/api/serializers.py:2476 +#: awx/api/serializers.py:2522 msgid "Must either set a default value or ask to prompt on launch." msgstr "" "Moet een standaardwaarde instellen of hierom laten vragen bij het opstarten." -#: awx/api/serializers.py:2478 awx/main/models/jobs.py:325 +#: awx/api/serializers.py:2524 awx/main/models/jobs.py:326 msgid "Job types 'run' and 'check' must have assigned a project." msgstr "" "Aan de taaktypen 'uitvoeren' en 'controleren' moet een project zijn " "toegewezen." -#: awx/api/serializers.py:2549 +#: awx/api/serializers.py:2611 msgid "Invalid job template." msgstr "Ongeldige taaksjabloon." -#: awx/api/serializers.py:2630 -msgid "Credential not found or deleted." -msgstr "Referentie niet gevonden of verwijderd." +#: awx/api/serializers.py:2708 +msgid "Neither credential nor vault credential provided." +msgstr "" -#: awx/api/serializers.py:2632 +#: awx/api/serializers.py:2711 msgid "Job Template Project is missing or undefined." msgstr "Het taaksjabloonproject ontbreekt of is niet gedefinieerd." -#: awx/api/serializers.py:2634 +#: awx/api/serializers.py:2713 msgid "Job Template Inventory is missing or undefined." msgstr "De taaksjablooninventaris ontbreekt of is niet gedefinieerd." -#: awx/api/serializers.py:2921 +#: awx/api/serializers.py:2782 awx/main/tasks.py:2186 +msgid "{} are prohibited from use in ad hoc commands." +msgstr "" + +#: awx/api/serializers.py:3008 #, python-format msgid "%(job_type)s is not a valid job type. The choices are %(choices)s." msgstr "%(job_type)s is geen geldig taaktype. De keuzes zijn %(choices)s." -#: awx/api/serializers.py:2926 +#: awx/api/serializers.py:3013 msgid "Workflow job template is missing during creation." msgstr "De taaksjabloon voor de workflow ontbreekt tijdens het maken." -#: awx/api/serializers.py:2931 +#: awx/api/serializers.py:3018 #, python-format msgid "Cannot nest a %s inside a WorkflowJobTemplate" msgstr "Kan geen a %s nesten in een WorkflowJobTemplate" -#: awx/api/serializers.py:3188 +#: awx/api/serializers.py:3291 #, python-format msgid "Job Template '%s' is missing or undefined." msgstr "Taaksjabloon '%s' ontbreekt of is niet gedefinieerd." -#: awx/api/serializers.py:3191 +#: awx/api/serializers.py:3294 msgid "The inventory associated with this Job Template is being deleted." msgstr "De aan deze taaksjabloon gekoppelde inventaris wordt verwijderd." -#: awx/api/serializers.py:3232 awx/api/views.py:2991 +#: awx/api/serializers.py:3335 awx/api/views.py:3023 #, python-format msgid "Cannot assign multiple %s credentials." msgstr "Kan niet meerdere referenties voor %s toewijzen." -#: awx/api/serializers.py:3234 awx/api/views.py:2994 +#: awx/api/serializers.py:3337 awx/api/views.py:3026 msgid "Extra credentials must be network or cloud." msgstr "Extra referenties moeten netwerk of cloud zijn." -#: awx/api/serializers.py:3371 +#: awx/api/serializers.py:3474 msgid "" "Missing required fields for Notification Configuration: notification_type" msgstr "" "Ontbrekende vereiste velden voor kennisgevingsconfiguratie: " "notification_type" -#: awx/api/serializers.py:3394 +#: awx/api/serializers.py:3497 msgid "No values specified for field '{}'" msgstr "Geen waarden opgegeven voor veld '{}'" -#: awx/api/serializers.py:3399 +#: awx/api/serializers.py:3502 msgid "Missing required fields for Notification Configuration: {}." msgstr "Ontbrekende vereiste velden voor kennisgevingsconfiguratie: {}." -#: awx/api/serializers.py:3402 +#: awx/api/serializers.py:3505 msgid "Configuration field '{}' incorrect type, expected {}." msgstr "Configuratieveld '{}' onjuist type, {} verwacht." -#: awx/api/serializers.py:3455 +#: awx/api/serializers.py:3558 msgid "Inventory Source must be a cloud resource." msgstr "Inventarisbron moet een cloudresource zijn." -#: awx/api/serializers.py:3457 +#: awx/api/serializers.py:3560 msgid "Manual Project cannot have a schedule set." msgstr "Handmatig project kan geen ingesteld schema hebben." -#: awx/api/serializers.py:3460 +#: awx/api/serializers.py:3563 msgid "" "Inventory sources with `update_on_project_update` cannot be scheduled. " "Schedule its source project `{}` instead." @@ -492,71 +511,71 @@ msgstr "" "Inventarisbronnen met `update_on_project_update` kunnen niet worden gepland." " Plan in plaats daarvan het bijbehorende bronproject `{}`." -#: awx/api/serializers.py:3479 +#: awx/api/serializers.py:3582 msgid "Projects and inventory updates cannot accept extra variables." msgstr "" "Projecten en inventarisupdates kunnen geen extra variabelen accepteren." -#: awx/api/serializers.py:3501 +#: awx/api/serializers.py:3604 msgid "" "DTSTART required in rrule. Value should match: DTSTART:YYYYMMDDTHHMMSSZ" msgstr "" "DTSTART vereist in rrule. De waarde moet overeenkomen: " "DTSTART:YYYYMMDDTHHMMSSZ" -#: awx/api/serializers.py:3503 +#: awx/api/serializers.py:3606 msgid "Multiple DTSTART is not supported." msgstr "Meervoudige DTSTART wordt niet ondersteund." -#: awx/api/serializers.py:3505 +#: awx/api/serializers.py:3608 msgid "RRULE require in rrule." msgstr "RRULE vereist in rrule." -#: awx/api/serializers.py:3507 +#: awx/api/serializers.py:3610 msgid "Multiple RRULE is not supported." msgstr "Meervoudige RRULE wordt niet ondersteund." -#: awx/api/serializers.py:3509 +#: awx/api/serializers.py:3612 msgid "INTERVAL required in rrule." msgstr "INTERVAL is vereist in rrule." -#: awx/api/serializers.py:3511 +#: awx/api/serializers.py:3614 msgid "TZID is not supported." msgstr "TZID wordt niet ondersteund." -#: awx/api/serializers.py:3513 +#: awx/api/serializers.py:3616 msgid "SECONDLY is not supported." msgstr "SECONDLY wordt niet ondersteund." -#: awx/api/serializers.py:3515 +#: awx/api/serializers.py:3618 msgid "Multiple BYMONTHDAYs not supported." msgstr "Meerdere BYMONTHDAY's worden niet ondersteund." -#: awx/api/serializers.py:3517 +#: awx/api/serializers.py:3620 msgid "Multiple BYMONTHs not supported." msgstr "Meerdere BYMONTH's worden niet ondersteund." -#: awx/api/serializers.py:3519 +#: awx/api/serializers.py:3622 msgid "BYDAY with numeric prefix not supported." msgstr "BYDAY met numeriek voorvoegsel wordt niet ondersteund." -#: awx/api/serializers.py:3521 +#: awx/api/serializers.py:3624 msgid "BYYEARDAY not supported." msgstr "BYYEARDAY wordt niet ondersteund." -#: awx/api/serializers.py:3523 +#: awx/api/serializers.py:3626 msgid "BYWEEKNO not supported." msgstr "BYWEEKNO wordt niet ondersteund." -#: awx/api/serializers.py:3527 +#: awx/api/serializers.py:3630 msgid "COUNT > 999 is unsupported." msgstr "COUNT > 999 wordt niet ondersteund." -#: awx/api/serializers.py:3531 +#: awx/api/serializers.py:3634 msgid "rrule parsing failed validation." msgstr "De validering van rrule-parsering is mislukt." -#: awx/api/serializers.py:3631 +#: awx/api/serializers.py:3760 msgid "" "A summary of the new and changed values when an object is created, updated, " "or deleted" @@ -564,7 +583,7 @@ msgstr "" "Een overzicht van de nieuwe en gewijzigde waarden wanneer een object wordt " "gemaakt, bijgewerkt of verwijderd" -#: awx/api/serializers.py:3633 +#: awx/api/serializers.py:3762 msgid "" "For create, update, and delete events this is the object type that was " "affected. For associate and disassociate events this is the object type " @@ -574,7 +593,7 @@ msgstr "" "objecttype. Voor koppel- en ontkoppel-gebeurtenissen is dit het objecttype " "dat wordt gekoppeld aan of ontkoppeld van object2." -#: awx/api/serializers.py:3636 +#: awx/api/serializers.py:3765 msgid "" "Unpopulated for create, update, and delete events. For associate and " "disassociate events this is the object type that object1 is being associated" @@ -584,165 +603,165 @@ msgstr "" "en ontkoppel-gebeurtenissen is dit het objecttype waaraan object1 wordt " "gekoppeld." -#: awx/api/serializers.py:3639 +#: awx/api/serializers.py:3768 msgid "The action taken with respect to the given object(s)." msgstr "De actie ondernomen met betrekking tot de gegeven objecten." -#: awx/api/serializers.py:3749 +#: awx/api/serializers.py:3885 msgid "Unable to login with provided credentials." msgstr "Kan niet aanmelden met de verschafte referenties." -#: awx/api/serializers.py:3751 +#: awx/api/serializers.py:3887 msgid "Must include \"username\" and \"password\"." msgstr "Moet \"gebruikersnaam\" en \"wachtwoord\" bevatten." -#: awx/api/views.py:106 +#: awx/api/views.py:108 msgid "Your license does not allow use of the activity stream." msgstr "Uw licentie staat het gebruik van de activiteitenstroom niet toe." -#: awx/api/views.py:116 +#: awx/api/views.py:118 msgid "Your license does not permit use of system tracking." msgstr "Uw licentie staat het gebruik van systeemtracking niet toe." -#: awx/api/views.py:126 +#: awx/api/views.py:128 msgid "Your license does not allow use of workflows." msgstr "Uw licentie staat het gebruik van workflows niet toe." -#: awx/api/views.py:140 +#: awx/api/views.py:142 msgid "Cannot delete job resource when associated workflow job is running." msgstr "" "Kan taakresource niet verwijderen wanneer een gekoppelde workflowtaak wordt " "uitgevoerd." -#: awx/api/views.py:144 +#: awx/api/views.py:146 msgid "Cannot delete running job resource." msgstr "Kan geen taakbron in uitvoering verwijderen." -#: awx/api/views.py:153 awx/templates/rest_framework/api.html:28 +#: awx/api/views.py:155 awx/templates/rest_framework/api.html:28 msgid "REST API" msgstr "REST API" -#: awx/api/views.py:162 awx/templates/rest_framework/api.html:4 +#: awx/api/views.py:164 awx/templates/rest_framework/api.html:4 msgid "AWX REST API" msgstr "AWX REST API" -#: awx/api/views.py:224 +#: awx/api/views.py:226 msgid "Version 1" msgstr "Versie 1" -#: awx/api/views.py:228 +#: awx/api/views.py:230 msgid "Version 2" msgstr "Versie 2" -#: awx/api/views.py:239 +#: awx/api/views.py:241 msgid "Ping" msgstr "Ping" -#: awx/api/views.py:270 awx/conf/apps.py:12 +#: awx/api/views.py:272 awx/conf/apps.py:12 msgid "Configuration" msgstr "Configuratie" -#: awx/api/views.py:323 +#: awx/api/views.py:325 msgid "Invalid license data" msgstr "Ongeldige licentiegegevens" -#: awx/api/views.py:325 +#: awx/api/views.py:327 msgid "Missing 'eula_accepted' property" msgstr "Ontbrekende eigenschap 'eula_accepted'" -#: awx/api/views.py:329 +#: awx/api/views.py:331 msgid "'eula_accepted' value is invalid" msgstr "Waarde 'eula_accepted' is ongeldig" -#: awx/api/views.py:332 +#: awx/api/views.py:334 msgid "'eula_accepted' must be True" msgstr "'eula_accepted' moet True zijn" -#: awx/api/views.py:339 +#: awx/api/views.py:341 msgid "Invalid JSON" msgstr "Ongeldig JSON" -#: awx/api/views.py:347 +#: awx/api/views.py:349 msgid "Invalid License" msgstr "Ongeldige licentie" -#: awx/api/views.py:357 +#: awx/api/views.py:359 msgid "Invalid license" msgstr "Ongeldige licentie" -#: awx/api/views.py:365 +#: awx/api/views.py:367 #, python-format msgid "Failed to remove license (%s)" msgstr "Kan licentie niet verwijderen (%s)" -#: awx/api/views.py:370 +#: awx/api/views.py:372 msgid "Dashboard" msgstr "Dashboard" -#: awx/api/views.py:469 +#: awx/api/views.py:471 msgid "Dashboard Jobs Graphs" msgstr "Dashboardtaakgrafieken" -#: awx/api/views.py:505 +#: awx/api/views.py:507 #, python-format msgid "Unknown period \"%s\"" msgstr "Onbekende periode \"%s\"" -#: awx/api/views.py:519 +#: awx/api/views.py:521 msgid "Instances" msgstr "Instanties" -#: awx/api/views.py:527 +#: awx/api/views.py:529 msgid "Instance Detail" msgstr "Instantiedetails" -#: awx/api/views.py:535 +#: awx/api/views.py:537 msgid "Instance Running Jobs" msgstr "Taken in uitvoering van instantie" -#: awx/api/views.py:550 +#: awx/api/views.py:552 msgid "Instance's Instance Groups" msgstr "Instantiegroepen van instantie" -#: awx/api/views.py:560 +#: awx/api/views.py:562 msgid "Instance Groups" msgstr "Instantiegroepen" -#: awx/api/views.py:568 +#: awx/api/views.py:570 msgid "Instance Group Detail" msgstr "Details van instantiegroep" -#: awx/api/views.py:576 +#: awx/api/views.py:578 msgid "Instance Group Running Jobs" msgstr "Taken in uitvoering van instantiegroep" -#: awx/api/views.py:586 +#: awx/api/views.py:588 msgid "Instance Group's Instances" msgstr "Instanties van instantiegroep" -#: awx/api/views.py:596 +#: awx/api/views.py:598 msgid "Schedules" msgstr "Schema's" -#: awx/api/views.py:615 +#: awx/api/views.py:617 msgid "Schedule Jobs List" msgstr "Schema takenlijst" -#: awx/api/views.py:841 +#: awx/api/views.py:843 msgid "Your license only permits a single organization to exist." msgstr "Uw licentie staat het gebruik van maar één organisatie toe." -#: awx/api/views.py:1077 awx/api/views.py:4615 +#: awx/api/views.py:1079 awx/api/views.py:4666 msgid "You cannot assign an Organization role as a child role for a Team." msgstr "" "U kunt een organisatierol niet toewijzen als een onderliggende rol voor een " "team." -#: awx/api/views.py:1081 awx/api/views.py:4629 +#: awx/api/views.py:1083 awx/api/views.py:4680 msgid "You cannot grant system-level permissions to a team." msgstr "U kunt een team geen rechten op systeemniveau verlenen." -#: awx/api/views.py:1088 awx/api/views.py:4621 +#: awx/api/views.py:1090 awx/api/views.py:4672 msgid "" "You cannot grant credential access to a team when the Organization field " "isn't set, or belongs to a different organization" @@ -750,36 +769,36 @@ msgstr "" "U kunt een team geen referentietoegang verlenen wanneer het veld Organisatie" " niet is ingesteld of behoort tot een andere organisatie" -#: awx/api/views.py:1178 +#: awx/api/views.py:1180 msgid "Cannot delete project." msgstr "Kan project niet verwijderen." -#: awx/api/views.py:1213 +#: awx/api/views.py:1215 msgid "Project Schedules" msgstr "Projectschema's" -#: awx/api/views.py:1225 +#: awx/api/views.py:1227 msgid "Project SCM Inventory Sources" msgstr "SCM-inventarisbronnen van project" -#: awx/api/views.py:1352 +#: awx/api/views.py:1354 msgid "Project Update SCM Inventory Updates" msgstr "SCM-inventarisupdates van projectupdate" -#: awx/api/views.py:1407 +#: awx/api/views.py:1409 msgid "Me" msgstr "Mij" -#: awx/api/views.py:1451 awx/api/views.py:4572 +#: awx/api/views.py:1453 awx/api/views.py:4623 msgid "You may not perform any action with your own admin_role." msgstr "U kunt geen actie uitvoeren met uw eigen admin_role." -#: awx/api/views.py:1457 awx/api/views.py:4576 +#: awx/api/views.py:1459 awx/api/views.py:4627 msgid "You may not change the membership of a users admin_role" msgstr "" "U kunt het lidmaatschap van de admin_role van een gebruiker niet wijzigen" -#: awx/api/views.py:1462 awx/api/views.py:4581 +#: awx/api/views.py:1464 awx/api/views.py:4632 msgid "" "You cannot grant credential access to a user not in the credentials' " "organization" @@ -787,52 +806,53 @@ msgstr "" "U kunt geen referentietoegang verlenen aan een gebruiker die niet tot de " "organisatie van de referenties behoort" -#: awx/api/views.py:1466 awx/api/views.py:4585 +#: awx/api/views.py:1468 awx/api/views.py:4636 msgid "You cannot grant private credential access to another user" msgstr "U kunt geen privéreferentietoegang verlenen aan een andere gebruiker" -#: awx/api/views.py:1564 +#: awx/api/views.py:1566 #, python-format msgid "Cannot change %s." msgstr "Kan %s niet wijzigen." -#: awx/api/views.py:1570 +#: awx/api/views.py:1572 msgid "Cannot delete user." msgstr "Kan gebruiker niet verwijderen." -#: awx/api/views.py:1599 +#: awx/api/views.py:1601 msgid "Deletion not allowed for managed credential types" msgstr "Verwijdering is niet toegestaan voor beheerde referentietypen" -#: awx/api/views.py:1601 +#: awx/api/views.py:1603 msgid "Credential types that are in use cannot be deleted" msgstr "Referentietypen die in gebruik zijn, kunnen niet worden verwijderd" -#: awx/api/views.py:1779 +#: awx/api/views.py:1781 msgid "Cannot delete inventory script." msgstr "Kan inventarisscript niet verwijderen." -#: awx/api/views.py:1864 +#: awx/api/views.py:1866 +#, python-brace-format msgid "{0}" msgstr "{0}" -#: awx/api/views.py:2089 +#: awx/api/views.py:2101 msgid "Fact not found." msgstr "Feit niet gevonden." -#: awx/api/views.py:2113 +#: awx/api/views.py:2125 msgid "SSLError while trying to connect to {}" msgstr "SSLError tijdens poging om verbinding te maken met {}" -#: awx/api/views.py:2115 +#: awx/api/views.py:2127 msgid "Request to {} timed out." msgstr "Er is een time-out opgetreden voor de aanvraag naar {}" -#: awx/api/views.py:2117 +#: awx/api/views.py:2129 msgid "Unkown exception {} while trying to GET {}" msgstr "Onbekende uitzondering {} tijdens poging tot OPHALEN {}" -#: awx/api/views.py:2120 +#: awx/api/views.py:2132 msgid "" "Unauthorized access. Please check your Insights Credential username and " "password." @@ -840,7 +860,7 @@ msgstr "" "Geen toegang. Controleer uw Insights Credential gebruikersnaam en " "wachtwoord." -#: awx/api/views.py:2122 +#: awx/api/views.py:2134 msgid "" "Failed to gather reports and maintenance plans from Insights API at URL {}. " "Server responded with {} status code and message {}" @@ -848,201 +868,211 @@ msgstr "" "Kan rapporten en onderhoudsplannen niet verzamelen uit Insights API op URL " "{}. Server heeft gereageerd met statuscode {} en bericht {}" -#: awx/api/views.py:2128 +#: awx/api/views.py:2140 msgid "Expected JSON response from Insights but instead got {}" msgstr "Verwachtte JSON-reactie van Insights, maar kreeg in plaats daarvan {}" -#: awx/api/views.py:2135 +#: awx/api/views.py:2147 msgid "This host is not recognized as an Insights host." msgstr "Deze host wordt niet herkend als een Insights-host." -#: awx/api/views.py:2140 +#: awx/api/views.py:2152 msgid "The Insights Credential for \"{}\" was not found." msgstr "De Insights-referentie voor \"{}\" is niet gevonden." -#: awx/api/views.py:2209 +#: awx/api/views.py:2221 msgid "Cyclical Group association." msgstr "Cyclische groepskoppeling." -#: awx/api/views.py:2482 +#: awx/api/views.py:2499 msgid "Inventory Source List" msgstr "Lijst met inventarisbronnen" -#: awx/api/views.py:2495 +#: awx/api/views.py:2512 msgid "Inventory Sources Update" msgstr "Update van inventarisbronnen" -#: awx/api/views.py:2525 +#: awx/api/views.py:2542 msgid "Could not start because `can_update` returned False" msgstr "Kan niet starten omdat 'can_update' False heeft geretourneerd" -#: awx/api/views.py:2533 +#: awx/api/views.py:2550 msgid "No inventory sources to update." msgstr "Er zijn geen inventarisbronnen om bij te werken." -#: awx/api/views.py:2565 +#: awx/api/views.py:2582 msgid "Cannot delete inventory source." msgstr "Kan inventarisbron niet verwijderen." -#: awx/api/views.py:2573 +#: awx/api/views.py:2590 msgid "Inventory Source Schedules" msgstr "Inventarisbronschema's" -#: awx/api/views.py:2603 +#: awx/api/views.py:2620 msgid "Notification Templates can only be assigned when source is one of {}." msgstr "" "Berichtsjablonen kunnen alleen worden toegewezen wanneer de bron een van {} " "is." -#: awx/api/views.py:2826 +#: awx/api/views.py:2851 msgid "Job Template Schedules" msgstr "Taaksjabloonschema's" -#: awx/api/views.py:2846 awx/api/views.py:2862 +#: awx/api/views.py:2871 awx/api/views.py:2882 msgid "Your license does not allow adding surveys." msgstr "Uw licentie staat toevoeging van enquêtes niet toe." -#: awx/api/views.py:2869 +#: awx/api/views.py:2889 msgid "'name' missing from survey spec." msgstr "'name' ontbreekt in de enquêtespecificaties." -#: awx/api/views.py:2871 +#: awx/api/views.py:2891 msgid "'description' missing from survey spec." msgstr "'description' ontbreekt in de enquêtespecificaties." -#: awx/api/views.py:2873 +#: awx/api/views.py:2893 msgid "'spec' missing from survey spec." msgstr "'spec' ontbreekt in de enquêtespecificaties." -#: awx/api/views.py:2875 +#: awx/api/views.py:2895 msgid "'spec' must be a list of items." msgstr "'spec' moet een lijst met items zijn." -#: awx/api/views.py:2877 +#: awx/api/views.py:2897 msgid "'spec' doesn't contain any items." msgstr "'spec' bevat geen items." -#: awx/api/views.py:2883 +#: awx/api/views.py:2903 #, python-format msgid "Survey question %s is not a json object." msgstr "Enquêtevraag %s is geen json-object." -#: awx/api/views.py:2885 +#: awx/api/views.py:2905 #, python-format msgid "'type' missing from survey question %s." msgstr "'type' ontbreekt in enquêtevraag %s." -#: awx/api/views.py:2887 +#: awx/api/views.py:2907 #, python-format msgid "'question_name' missing from survey question %s." msgstr "'question_name' ontbreekt in enquêtevraag %s." -#: awx/api/views.py:2889 +#: awx/api/views.py:2909 #, python-format msgid "'variable' missing from survey question %s." msgstr "'variable' ontbreekt in enquêtevraag %s." -#: awx/api/views.py:2891 +#: awx/api/views.py:2911 #, python-format msgid "'variable' '%(item)s' duplicated in survey question %(survey)s." msgstr "'variable' '%(item)s' gedupliceerd in enquêtevraag %(survey)s." -#: awx/api/views.py:2896 +#: awx/api/views.py:2916 #, python-format msgid "'required' missing from survey question %s." msgstr "'required' ontbreekt in enquêtevraag %s." -#: awx/api/views.py:2901 +#: awx/api/views.py:2921 +#, python-brace-format msgid "" -"$encrypted$ is reserved keyword and may not be used as a default for " -"password {}." +"Value {question_default} for '{variable_name}' expected to be a string." msgstr "" -"$encrypted$ is een gereserveerd sleutelwoord en mag niet als standaardwaarde" -" worden gebruikt voor wachtwoord {}." -#: awx/api/views.py:3017 +#: awx/api/views.py:2928 +#, python-brace-format +msgid "" +"$encrypted$ is reserved keyword for password questions and may not be used " +"as a default for '{variable_name}' in survey question {question_position}." +msgstr "" + +#: awx/api/views.py:3049 msgid "Maximum number of labels for {} reached." msgstr "Het maximumaantal labels voor {} is bereikt." -#: awx/api/views.py:3136 +#: awx/api/views.py:3170 msgid "No matching host could be found!" msgstr "Er is geen overeenkomende host gevonden." -#: awx/api/views.py:3139 +#: awx/api/views.py:3173 msgid "Multiple hosts matched the request!" msgstr "Meerdere hosts kwamen overeen met de aanvraag." -#: awx/api/views.py:3144 +#: awx/api/views.py:3178 msgid "Cannot start automatically, user input required!" msgstr "Kan niet automatisch starten. Gebruikersinput is vereist." -#: awx/api/views.py:3151 +#: awx/api/views.py:3185 msgid "Host callback job already pending." msgstr "Er is al een hostterugkoppelingstaak in afwachting." -#: awx/api/views.py:3164 +#: awx/api/views.py:3199 msgid "Error starting job!" msgstr "Fout bij starten taak." -#: awx/api/views.py:3271 +#: awx/api/views.py:3306 +#, python-brace-format msgid "Cannot associate {0} when {1} have been associated." msgstr "Kan {0} niet koppelen wanneer {1} zijn gekoppeld." -#: awx/api/views.py:3296 +#: awx/api/views.py:3331 msgid "Multiple parent relationship not allowed." msgstr "Relatie met meerdere bovenliggende elementen is niet toegestaan." -#: awx/api/views.py:3301 +#: awx/api/views.py:3336 msgid "Cycle detected." msgstr "Cyclus gedetecteerd." -#: awx/api/views.py:3505 +#: awx/api/views.py:3540 msgid "Workflow Job Template Schedules" msgstr "Taaksjabloonschema's voor workflows" -#: awx/api/views.py:3650 awx/api/views.py:4217 +#: awx/api/views.py:3685 awx/api/views.py:4268 msgid "Superuser privileges needed." msgstr "Supergebruikersbevoegdheden vereist." -#: awx/api/views.py:3682 +#: awx/api/views.py:3717 msgid "System Job Template Schedules" msgstr "Taaksjabloonschema's voor systeem" -#: awx/api/views.py:3891 +#: awx/api/views.py:3780 +msgid "POST not allowed for Job launching in version 2 of the api" +msgstr "" + +#: awx/api/views.py:3942 msgid "Job Host Summaries List" msgstr "Lijst met taakhostoverzichten" -#: awx/api/views.py:3938 +#: awx/api/views.py:3989 msgid "Job Event Children List" msgstr "Lijst met onderliggende taakgebeurteniselementen" -#: awx/api/views.py:3947 +#: awx/api/views.py:3998 msgid "Job Event Hosts List" msgstr "Lijst met taakgebeurtenishosts" -#: awx/api/views.py:3957 +#: awx/api/views.py:4008 msgid "Job Events List" msgstr "Lijst met taakgebeurtenissen" -#: awx/api/views.py:4171 +#: awx/api/views.py:4222 msgid "Ad Hoc Command Events List" msgstr "Lijst met ad-hoc-opdrachtgebeurtenissen" -#: awx/api/views.py:4386 +#: awx/api/views.py:4437 msgid "Error generating stdout download file: {}" msgstr "Fout bij genereren stdout-downloadbestand: {}" -#: awx/api/views.py:4399 +#: awx/api/views.py:4450 #, python-format msgid "Error generating stdout download file: %s" msgstr "Fout bij genereren stdout-downloadbestand: %s" -#: awx/api/views.py:4444 +#: awx/api/views.py:4495 msgid "Delete not allowed while there are pending notifications" msgstr "" "Verwijderen is niet toegestaan wanneer er berichten in afwachting zijn" -#: awx/api/views.py:4451 +#: awx/api/views.py:4502 msgid "Notification Template Test" msgstr "Berichtsjabloon" @@ -1199,15 +1229,16 @@ msgstr "Voorbeeld van instelling die anders kan zijn voor elke gebruiker." msgid "User" msgstr "Gebruiker" -#: awx/conf/fields.py:62 +#: awx/conf/fields.py:63 msgid "Enter a valid URL" msgstr "Geef een geldige URL op" -#: awx/conf/fields.py:94 +#: awx/conf/fields.py:95 +#, python-brace-format msgid "\"{input}\" is not a valid string." msgstr "\"{input} is geen geldige tekenreeks." -#: awx/conf/license.py:19 +#: awx/conf/license.py:22 msgid "Your Tower license does not allow that." msgstr "Uw Tower-licentie staat dat niet toe." @@ -1227,7 +1258,11 @@ msgstr "" msgid "Skip commenting out settings in files." msgstr "Sla het becommentariëren van instellingen in bestanden over." -#: awx/conf/management/commands/migrate_to_database_settings.py:61 +#: awx/conf/management/commands/migrate_to_database_settings.py:62 +msgid "Skip migrating and only comment out settings in files." +msgstr "" + +#: awx/conf/management/commands/migrate_to_database_settings.py:68 msgid "Backup existing settings files with this suffix." msgstr "" "Maak een back-up van bestaande instellingenbestanden met dit achtervoegsel." @@ -1252,7 +1287,7 @@ msgstr "Gewijzigd" msgid "User-Defaults" msgstr "Standaardinstellingen voor gebruiker" -#: awx/conf/registry.py:151 +#: awx/conf/registry.py:154 msgid "This value has been set manually in a settings file." msgstr "Deze waarde is handmatig ingesteld in een instellingenbestand." @@ -1324,94 +1359,92 @@ msgstr "Instellingsdetail" msgid "Logging Connectivity Test" msgstr "Connectiviteitstest logboekregistratie" -#: awx/main/access.py:224 +#: awx/main/access.py:44 +msgid "Resource is being used by running jobs." +msgstr "" + +#: awx/main/access.py:237 #, python-format msgid "Bad data found in related field %s." msgstr "Ongeldige gegevens gevonden in gerelateerd veld %s." -#: awx/main/access.py:268 +#: awx/main/access.py:281 msgid "License is missing." msgstr "Licentie ontbreekt." -#: awx/main/access.py:270 +#: awx/main/access.py:283 msgid "License has expired." msgstr "Licentie is verlopen." -#: awx/main/access.py:278 +#: awx/main/access.py:291 #, python-format msgid "License count of %s instances has been reached." msgstr "Het aantal licenties van %s instanties is bereikt." -#: awx/main/access.py:280 +#: awx/main/access.py:293 #, python-format msgid "License count of %s instances has been exceeded." msgstr "Het aantal licenties van %s instanties is overschreden." -#: awx/main/access.py:282 +#: awx/main/access.py:295 msgid "Host count exceeds available instances." msgstr "Het aantal hosts is groter dan het aantal instanties." -#: awx/main/access.py:286 +#: awx/main/access.py:299 #, python-format msgid "Feature %s is not enabled in the active license." msgstr "De functie %s is niet ingeschakeld in de actieve licentie." -#: awx/main/access.py:288 +#: awx/main/access.py:301 msgid "Features not found in active license." msgstr "Functies niet gevonden in actieve licentie." -#: awx/main/access.py:534 awx/main/access.py:619 awx/main/access.py:748 -#: awx/main/access.py:801 awx/main/access.py:1063 awx/main/access.py:1263 -#: awx/main/access.py:1725 -msgid "Resource is being used by running jobs" -msgstr "Resource wordt gebruikt door taken uit te voeren" - -#: awx/main/access.py:675 +#: awx/main/access.py:707 msgid "Unable to change inventory on a host." msgstr "Kan inventaris op een host niet wijzigen." -#: awx/main/access.py:692 awx/main/access.py:737 +#: awx/main/access.py:724 awx/main/access.py:769 msgid "Cannot associate two items from different inventories." msgstr "Kan twee items uit verschillende inventarissen niet koppelen." -#: awx/main/access.py:725 +#: awx/main/access.py:757 msgid "Unable to change inventory on a group." msgstr "Kan inventaris van een groep niet wijzigen." -#: awx/main/access.py:983 +#: awx/main/access.py:1017 msgid "Unable to change organization on a team." msgstr "Kan organisatie van een team niet wijzigen." -#: awx/main/access.py:996 +#: awx/main/access.py:1030 msgid "The {} role cannot be assigned to a team" msgstr "De rol {} kan niet worden toegewezen aan een team" -#: awx/main/access.py:998 +#: awx/main/access.py:1032 msgid "The admin_role for a User cannot be assigned to a team" msgstr "" "De admin_role voor een gebruiker kan niet worden toegewezen aan een team" -#: awx/main/access.py:1443 +#: awx/main/access.py:1479 msgid "Job has been orphaned from its job template." msgstr "De taak is verwijderd uit zijn taaksjabloon." -#: awx/main/access.py:1445 +#: awx/main/access.py:1481 msgid "You do not have execute permission to related job template." msgstr "U hebt geen uitvoermachtiging voor de gerelateerde taaksjabloon." -#: awx/main/access.py:1448 +#: awx/main/access.py:1484 msgid "Job was launched with prompted fields." msgstr "De taak is gestart met invoervelden." -#: awx/main/access.py:1450 +#: awx/main/access.py:1486 msgid " Organization level permissions required." msgstr "Organisatieniveaumachtigingen zijn vereist." -#: awx/main/access.py:1452 +#: awx/main/access.py:1488 msgid " You do not have permission to related resources." msgstr "U hebt geen machtiging voor gerelateerde resources." -#: awx/main/access.py:1798 +#: awx/main/access.py:1833 msgid "" "You do not have permission to the workflow job resources required for " "relaunch." @@ -1945,86 +1978,86 @@ msgstr "" msgid "\n" msgstr "\n" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Sudo" msgstr "Sudo" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Su" msgstr "Su" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Pbrun" msgstr "Pbrun" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Pfexec" msgstr "Pfexec" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "DZDO" msgstr "DZDO" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Pmrun" msgstr "Pmrun" -#: awx/main/constants.py:8 +#: awx/main/constants.py:10 msgid "Runas" msgstr "Runas" -#: awx/main/fields.py:56 +#: awx/main/fields.py:57 #, python-format msgid "'%s' is not one of ['%s']" msgstr "'%s' is niet een van ['%s']" -#: awx/main/fields.py:531 +#: awx/main/fields.py:533 #, python-format msgid "cannot be set unless \"%s\" is set" msgstr "kan niet ingesteld worden, tenzij '%s' ingesteld is" -#: awx/main/fields.py:547 +#: awx/main/fields.py:549 #, python-format msgid "required for %s" msgstr "vereist voor %s" -#: awx/main/fields.py:571 +#: awx/main/fields.py:573 msgid "must be set when SSH key is encrypted." msgstr "moet worden ingesteld wanneer SSH-sleutel wordt versleuteld." -#: awx/main/fields.py:577 +#: awx/main/fields.py:579 msgid "should not be set when SSH key is not encrypted." msgstr "mag niet worden ingesteld wanneer SSH-sleutel niet is gecodeerd." -#: awx/main/fields.py:635 +#: awx/main/fields.py:637 msgid "'dependencies' is not supported for custom credentials." msgstr "" "'afhankelijkheden' is niet ondersteund voor aangepaste toegangsgegevens." -#: awx/main/fields.py:649 +#: awx/main/fields.py:651 msgid "\"tower\" is a reserved field name" msgstr "\"tower\" is een gereserveerde veldnaam" -#: awx/main/fields.py:656 +#: awx/main/fields.py:658 #, python-format msgid "field IDs must be unique (%s)" msgstr "veld-id's moeten uniek zijn (%s)" -#: awx/main/fields.py:669 +#: awx/main/fields.py:671 #, python-format msgid "%s not allowed for %s type (%s)" msgstr "%s niet toegestaan voor type %s (%s)" -#: awx/main/fields.py:753 +#: awx/main/fields.py:755 #, python-format msgid "%s uses an undefined field (%s)" msgstr "%s gebruikt een niet-gedefinieerd veld (%s)" -#: awx/main/middleware.py:121 +#: awx/main/middleware.py:157 msgid "Formats of all available named urls" msgstr "Indelingen van alle beschikbare, genoemde url's" -#: awx/main/middleware.py:122 +#: awx/main/middleware.py:158 msgid "" "Read-only list of key-value pairs that shows the standard format of all " "available named URLs." @@ -2032,15 +2065,15 @@ msgstr "" "Alleen-lezen-lijst met sleutelwaardeparen die de standaardindeling van alle " "beschikbare, genoemde URL's toont." -#: awx/main/middleware.py:124 awx/main/middleware.py:134 +#: awx/main/middleware.py:160 awx/main/middleware.py:170 msgid "Named URL" msgstr "Genoemde URL" -#: awx/main/middleware.py:131 +#: awx/main/middleware.py:167 msgid "List of all named url graph nodes." msgstr "Lijst met alle grafische knooppunten van genoemde URL's." -#: awx/main/middleware.py:132 +#: awx/main/middleware.py:168 msgid "" "Read-only list of key-value pairs that exposes named URL graph topology. Use" " this list to programmatically generate named URLs for resources" @@ -2049,51 +2082,51 @@ msgstr "" "genoemde URL's duidelijk maakt. Gebruik deze lijst om programmatische " "genoemde URL's voor resources te genereren." -#: awx/main/migrations/_reencrypt.py:23 awx/main/models/notifications.py:33 +#: awx/main/migrations/_reencrypt.py:25 awx/main/models/notifications.py:33 msgid "Email" msgstr "E-mail" -#: awx/main/migrations/_reencrypt.py:24 awx/main/models/notifications.py:34 +#: awx/main/migrations/_reencrypt.py:26 awx/main/models/notifications.py:34 msgid "Slack" msgstr "Slack" -#: awx/main/migrations/_reencrypt.py:25 awx/main/models/notifications.py:35 +#: awx/main/migrations/_reencrypt.py:27 awx/main/models/notifications.py:35 msgid "Twilio" msgstr "Twilio" -#: awx/main/migrations/_reencrypt.py:26 awx/main/models/notifications.py:36 +#: awx/main/migrations/_reencrypt.py:28 awx/main/models/notifications.py:36 msgid "Pagerduty" msgstr "Pagerduty" -#: awx/main/migrations/_reencrypt.py:27 awx/main/models/notifications.py:37 +#: awx/main/migrations/_reencrypt.py:29 awx/main/models/notifications.py:37 msgid "HipChat" msgstr "HipChat" -#: awx/main/migrations/_reencrypt.py:28 awx/main/models/notifications.py:38 +#: awx/main/migrations/_reencrypt.py:30 awx/main/models/notifications.py:38 msgid "Webhook" msgstr "Webhook" -#: awx/main/migrations/_reencrypt.py:29 awx/main/models/notifications.py:39 +#: awx/main/migrations/_reencrypt.py:31 awx/main/models/notifications.py:39 msgid "IRC" msgstr "IRC" -#: awx/main/models/activity_stream.py:24 +#: awx/main/models/activity_stream.py:25 msgid "Entity Created" msgstr "Entiteit gemaakt" -#: awx/main/models/activity_stream.py:25 +#: awx/main/models/activity_stream.py:26 msgid "Entity Updated" msgstr "Entiteit bijgewerkt" -#: awx/main/models/activity_stream.py:26 +#: awx/main/models/activity_stream.py:27 msgid "Entity Deleted" msgstr "Entiteit verwijderd" -#: awx/main/models/activity_stream.py:27 +#: awx/main/models/activity_stream.py:28 msgid "Entity Associated with another Entity" msgstr "Entiteit gekoppeld aan een andere entiteit" -#: awx/main/models/activity_stream.py:28 +#: awx/main/models/activity_stream.py:29 msgid "Entity was Disassociated with another Entity" msgstr "Entiteit is losgekoppeld van een andere entiteit" @@ -2119,43 +2152,43 @@ msgstr "Niet-ondersteunde module voor ad-hocopdrachten." msgid "No argument passed to %s module." msgstr "Geen argument doorgegeven aan module %s." -#: awx/main/models/ad_hoc_commands.py:245 awx/main/models/jobs.py:904 +#: awx/main/models/ad_hoc_commands.py:245 awx/main/models/jobs.py:911 msgid "Host Failed" msgstr "Host is mislukt" -#: awx/main/models/ad_hoc_commands.py:246 awx/main/models/jobs.py:905 +#: awx/main/models/ad_hoc_commands.py:246 awx/main/models/jobs.py:912 msgid "Host OK" msgstr "Host OK" -#: awx/main/models/ad_hoc_commands.py:247 awx/main/models/jobs.py:908 +#: awx/main/models/ad_hoc_commands.py:247 awx/main/models/jobs.py:915 msgid "Host Unreachable" msgstr "Host onbereikbaar" -#: awx/main/models/ad_hoc_commands.py:252 awx/main/models/jobs.py:907 +#: awx/main/models/ad_hoc_commands.py:252 awx/main/models/jobs.py:914 msgid "Host Skipped" msgstr "Host overgeslagen" -#: awx/main/models/ad_hoc_commands.py:262 awx/main/models/jobs.py:935 +#: awx/main/models/ad_hoc_commands.py:262 awx/main/models/jobs.py:942 msgid "Debug" msgstr "Foutopsporing" -#: awx/main/models/ad_hoc_commands.py:263 awx/main/models/jobs.py:936 +#: awx/main/models/ad_hoc_commands.py:263 awx/main/models/jobs.py:943 msgid "Verbose" msgstr "Uitgebreid" -#: awx/main/models/ad_hoc_commands.py:264 awx/main/models/jobs.py:937 +#: awx/main/models/ad_hoc_commands.py:264 awx/main/models/jobs.py:944 msgid "Deprecated" msgstr "Afgeschaft" -#: awx/main/models/ad_hoc_commands.py:265 awx/main/models/jobs.py:938 +#: awx/main/models/ad_hoc_commands.py:265 awx/main/models/jobs.py:945 msgid "Warning" msgstr "Waarschuwing" -#: awx/main/models/ad_hoc_commands.py:266 awx/main/models/jobs.py:939 +#: awx/main/models/ad_hoc_commands.py:266 awx/main/models/jobs.py:946 msgid "System Warning" msgstr "Systeemwaarschuwing" -#: awx/main/models/ad_hoc_commands.py:267 awx/main/models/jobs.py:940 +#: awx/main/models/ad_hoc_commands.py:267 awx/main/models/jobs.py:947 #: awx/main/models/unified_jobs.py:64 msgid "Error" msgstr "Fout" @@ -2174,27 +2207,27 @@ msgstr "Controleren" msgid "Scan" msgstr "Scannen" -#: awx/main/models/credential.py:82 +#: awx/main/models/credential.py:86 msgid "Host" msgstr "Host" -#: awx/main/models/credential.py:83 +#: awx/main/models/credential.py:87 msgid "The hostname or IP address to use." msgstr "Te gebruiken hostnaam of IP-adres" -#: awx/main/models/credential.py:89 +#: awx/main/models/credential.py:93 msgid "Username" msgstr "Gebruikersnaam" -#: awx/main/models/credential.py:90 +#: awx/main/models/credential.py:94 msgid "Username for this credential." msgstr "Gebruikersnaam voor deze referentie." -#: awx/main/models/credential.py:96 +#: awx/main/models/credential.py:100 msgid "Password" msgstr "Wachtwoord" -#: awx/main/models/credential.py:97 +#: awx/main/models/credential.py:101 msgid "" "Password for this credential (or \"ASK\" to prompt the user for machine " "credentials)." @@ -2202,43 +2235,43 @@ msgstr "" "Wachtwoord voor deze referentie (of \"ASK\" om de gebruiker om de " "machinereferenties te vragen)." -#: awx/main/models/credential.py:104 +#: awx/main/models/credential.py:108 msgid "Security Token" msgstr "Beveiligingstoken" -#: awx/main/models/credential.py:105 +#: awx/main/models/credential.py:109 msgid "Security Token for this credential" msgstr "Beveiligingstoken voor deze referentie" -#: awx/main/models/credential.py:111 +#: awx/main/models/credential.py:115 msgid "Project" msgstr "Project" -#: awx/main/models/credential.py:112 +#: awx/main/models/credential.py:116 msgid "The identifier for the project." msgstr "De id voor het project." -#: awx/main/models/credential.py:118 +#: awx/main/models/credential.py:122 msgid "Domain" msgstr "Domein" -#: awx/main/models/credential.py:119 +#: awx/main/models/credential.py:123 msgid "The identifier for the domain." msgstr "De id voor het domein." -#: awx/main/models/credential.py:124 +#: awx/main/models/credential.py:128 msgid "SSH private key" msgstr "SSH-privésleutel" -#: awx/main/models/credential.py:125 +#: awx/main/models/credential.py:129 msgid "RSA or DSA private key to be used instead of password." msgstr "RSA- of DSA-privésleutel te gebruiken in plaats van wachtwoord." -#: awx/main/models/credential.py:131 +#: awx/main/models/credential.py:135 msgid "SSH key unlock" msgstr "SSH-sleutelontgrendeling" -#: awx/main/models/credential.py:132 +#: awx/main/models/credential.py:136 msgid "" "Passphrase to unlock SSH private key if encrypted (or \"ASK\" to prompt the " "user for machine credentials)." @@ -2246,51 +2279,51 @@ msgstr "" "Wachtwoordzin om SSH-privésleutel te ontgrendelen indien versleuteld (of " "\"ASK\" om de gebruiker om de machinereferenties te vragen)." -#: awx/main/models/credential.py:139 +#: awx/main/models/credential.py:143 msgid "None" msgstr "Geen" -#: awx/main/models/credential.py:140 +#: awx/main/models/credential.py:144 msgid "Privilege escalation method." msgstr "Methode voor verhoging van rechten." -#: awx/main/models/credential.py:146 +#: awx/main/models/credential.py:150 msgid "Privilege escalation username." msgstr "Gebruikersnaam voor verhoging van rechten." -#: awx/main/models/credential.py:152 +#: awx/main/models/credential.py:156 msgid "Password for privilege escalation method." msgstr "Wachtwoord voor methode voor verhoging van rechten." -#: awx/main/models/credential.py:158 +#: awx/main/models/credential.py:162 msgid "Vault password (or \"ASK\" to prompt the user)." msgstr "Wachtwoord voor kluis (of \"ASK\" om de gebruiker te vragen)." -#: awx/main/models/credential.py:162 +#: awx/main/models/credential.py:166 msgid "Whether to use the authorize mechanism." msgstr "Of het autorisatiemechanisme mag worden gebruikt." -#: awx/main/models/credential.py:168 +#: awx/main/models/credential.py:172 msgid "Password used by the authorize mechanism." msgstr "Wachtwoord gebruikt door het autorisatiemechanisme." -#: awx/main/models/credential.py:174 +#: awx/main/models/credential.py:178 msgid "Client Id or Application Id for the credential" msgstr "Klant-id voor toepassings-id voor de referentie" -#: awx/main/models/credential.py:180 +#: awx/main/models/credential.py:184 msgid "Secret Token for this credential" msgstr "Geheim token voor deze referentie" -#: awx/main/models/credential.py:186 +#: awx/main/models/credential.py:190 msgid "Subscription identifier for this credential" msgstr "Abonnements-id voor deze referentie" -#: awx/main/models/credential.py:192 +#: awx/main/models/credential.py:196 msgid "Tenant identifier for this credential" msgstr "Huurder-id voor deze referentie" -#: awx/main/models/credential.py:216 +#: awx/main/models/credential.py:220 msgid "" "Specify the type of credential you want to create. Refer to the Ansible " "Tower documentation for details on each type." @@ -2298,7 +2331,7 @@ msgstr "" "Geef het type referentie op dat u wilt maken. Raadpleeg de documentatie voor" " Ansible Tower voor details over elk type." -#: awx/main/models/credential.py:230 awx/main/models/credential.py:416 +#: awx/main/models/credential.py:234 awx/main/models/credential.py:420 msgid "" "Enter inputs using either JSON or YAML syntax. Use the radio button to " "toggle between the two. Refer to the Ansible Tower documentation for example" @@ -2308,31 +2341,31 @@ msgstr "" "wisselen tussen de twee. Raadpleeg de documentatie voor Ansible Tower voor " "voorbeeldsyntaxis." -#: awx/main/models/credential.py:397 +#: awx/main/models/credential.py:401 msgid "Machine" msgstr "Machine" -#: awx/main/models/credential.py:398 +#: awx/main/models/credential.py:402 msgid "Vault" msgstr "Kluis" -#: awx/main/models/credential.py:399 +#: awx/main/models/credential.py:403 msgid "Network" msgstr "Netwerk" -#: awx/main/models/credential.py:400 +#: awx/main/models/credential.py:404 msgid "Source Control" msgstr "Broncontrole" -#: awx/main/models/credential.py:401 +#: awx/main/models/credential.py:405 msgid "Cloud" msgstr "Cloud" -#: awx/main/models/credential.py:402 +#: awx/main/models/credential.py:406 msgid "Insights" msgstr "Inzichten" -#: awx/main/models/credential.py:423 +#: awx/main/models/credential.py:427 msgid "" "Enter injectors using either JSON or YAML syntax. Use the radio button to " "toggle between the two. Refer to the Ansible Tower documentation for example" @@ -2342,6 +2375,11 @@ msgstr "" " wisselen tussen de twee. Raadpleeg de documentatie voor Ansible Tower voor " "voorbeeldsyntaxis." +#: awx/main/models/credential.py:478 +#, python-format +msgid "adding %s credential type" +msgstr "" + #: awx/main/models/fact.py:25 msgid "Host for the facts that the fact scan captured." msgstr "Host voor de feiten die de feitenscan heeft vastgelegd." @@ -2358,11 +2396,11 @@ msgstr "" "Willekeurige JSON-structuur van modulefeiten vastgelegd bij de tijdstempel " "voor één host." -#: awx/main/models/ha.py:76 +#: awx/main/models/ha.py:78 msgid "Instances that are members of this InstanceGroup" msgstr "Instanties die lid zijn van deze InstanceGroup" -#: awx/main/models/ha.py:81 +#: awx/main/models/ha.py:83 msgid "Instance Group to remotely control this group." msgstr "Instantiegroep om deze groep extern te regelen." @@ -2556,38 +2594,42 @@ msgid "Google Compute Engine" msgstr "Google Compute Engine" #: awx/main/models/inventory.py:870 -msgid "Microsoft Azure Classic (deprecated)" -msgstr "Microsoft Azure Classic (afgeschaft)" - -#: awx/main/models/inventory.py:871 msgid "Microsoft Azure Resource Manager" msgstr "Microsoft Azure Resource Manager" -#: awx/main/models/inventory.py:872 +#: awx/main/models/inventory.py:871 msgid "VMware vCenter" msgstr "VMware vCenter" -#: awx/main/models/inventory.py:873 +#: awx/main/models/inventory.py:872 msgid "Red Hat Satellite 6" msgstr "Red Hat Satellite 6" -#: awx/main/models/inventory.py:874 +#: awx/main/models/inventory.py:873 msgid "Red Hat CloudForms" msgstr "Red Hat CloudForms" -#: awx/main/models/inventory.py:875 +#: awx/main/models/inventory.py:874 msgid "OpenStack" msgstr "OpenStack" +#: awx/main/models/inventory.py:875 +msgid "oVirt4" +msgstr "" + #: awx/main/models/inventory.py:876 +msgid "Ansible Tower" +msgstr "" + +#: awx/main/models/inventory.py:877 msgid "Custom Script" msgstr "Aangepast script" -#: awx/main/models/inventory.py:993 +#: awx/main/models/inventory.py:994 msgid "Inventory source variables in YAML or JSON format." msgstr "Bronvariabelen inventaris in YAML- of JSON-indeling." -#: awx/main/models/inventory.py:1012 +#: awx/main/models/inventory.py:1013 msgid "" "Comma-separated list of filter expressions (EC2 only). Hosts are imported " "when ANY of the filters match." @@ -2595,77 +2637,77 @@ msgstr "" "Door komma's gescheiden lijst met filterexpressies (alleen EC2). Hosts " "worden geïmporteerd wanneer WILLEKEURIG WELK van de filters overeenkomt." -#: awx/main/models/inventory.py:1018 +#: awx/main/models/inventory.py:1019 msgid "Limit groups automatically created from inventory source (EC2 only)." msgstr "" "Overschrijf groepen die automatisch gemaakt worden op grond van " "inventarisbron (alleen EC2)." -#: awx/main/models/inventory.py:1022 +#: awx/main/models/inventory.py:1023 msgid "Overwrite local groups and hosts from remote inventory source." msgstr "" "Overschrijf lokale groepen en hosts op grond van externe inventarisbron." -#: awx/main/models/inventory.py:1026 +#: awx/main/models/inventory.py:1027 msgid "Overwrite local variables from remote inventory source." msgstr "Overschrijf lokale variabelen op grond van externe inventarisbron." -#: awx/main/models/inventory.py:1031 awx/main/models/jobs.py:159 +#: awx/main/models/inventory.py:1032 awx/main/models/jobs.py:160 #: awx/main/models/projects.py:117 msgid "The amount of time (in seconds) to run before the task is canceled." msgstr "" "De hoeveelheid tijd (in seconden) voor uitvoering voordat de taak wordt " "geannuleerd." -#: awx/main/models/inventory.py:1064 +#: awx/main/models/inventory.py:1065 msgid "Image ID" msgstr "Image-id" -#: awx/main/models/inventory.py:1065 +#: awx/main/models/inventory.py:1066 msgid "Availability Zone" msgstr "Beschikbaarheidszone" -#: awx/main/models/inventory.py:1066 +#: awx/main/models/inventory.py:1067 msgid "Account" msgstr "Account" -#: awx/main/models/inventory.py:1067 +#: awx/main/models/inventory.py:1068 msgid "Instance ID" msgstr "Instantie-id" -#: awx/main/models/inventory.py:1068 +#: awx/main/models/inventory.py:1069 msgid "Instance State" msgstr "Instantiestaat" -#: awx/main/models/inventory.py:1069 +#: awx/main/models/inventory.py:1070 msgid "Instance Type" msgstr "Instantietype" -#: awx/main/models/inventory.py:1070 +#: awx/main/models/inventory.py:1071 msgid "Key Name" msgstr "Sleutelnaam" -#: awx/main/models/inventory.py:1071 +#: awx/main/models/inventory.py:1072 msgid "Region" msgstr "Regio" -#: awx/main/models/inventory.py:1072 +#: awx/main/models/inventory.py:1073 msgid "Security Group" msgstr "Beveiligingsgroep" -#: awx/main/models/inventory.py:1073 +#: awx/main/models/inventory.py:1074 msgid "Tags" msgstr "Tags" -#: awx/main/models/inventory.py:1074 +#: awx/main/models/inventory.py:1075 msgid "Tag None" msgstr "Tag geen" -#: awx/main/models/inventory.py:1075 +#: awx/main/models/inventory.py:1076 msgid "VPC ID" msgstr "VPC ID" -#: awx/main/models/inventory.py:1138 +#: awx/main/models/inventory.py:1145 #, python-format msgid "" "Cloud-based inventory sources (such as %s) require credentials for the " @@ -2674,30 +2716,36 @@ msgstr "" "Cloudgebaseerde inventarisbronnen (zoals %s) vereisen referenties voor de " "overeenkomende cloudservice." -#: awx/main/models/inventory.py:1145 +#: awx/main/models/inventory.py:1152 msgid "Credential is required for a cloud source." msgstr "Referentie is vereist voor een cloudbron." -#: awx/main/models/inventory.py:1167 +#: awx/main/models/inventory.py:1155 +msgid "" +"Credentials of type machine, source control, insights and vault are " +"disallowed for custom inventory sources." +msgstr "" + +#: awx/main/models/inventory.py:1179 #, python-format msgid "Invalid %(source)s region: %(region)s" msgstr "Ongeldige %(source)s regio: %(region)s" -#: awx/main/models/inventory.py:1191 +#: awx/main/models/inventory.py:1203 #, python-format msgid "Invalid filter expression: %(filter)s" msgstr "Ongeldige filterexpressie: %(filter)s" -#: awx/main/models/inventory.py:1212 +#: awx/main/models/inventory.py:1224 #, python-format msgid "Invalid group by choice: %(choice)s" msgstr "Ongeldige groep op keuze: %(choice)s" -#: awx/main/models/inventory.py:1247 +#: awx/main/models/inventory.py:1259 msgid "Project containing inventory file used as source." msgstr "Project met inventarisbestand dat wordt gebruikt als bron." -#: awx/main/models/inventory.py:1395 +#: awx/main/models/inventory.py:1407 #, python-format msgid "" "Unable to configure this item for cloud sync. It is already managed by %s." @@ -2705,7 +2753,7 @@ msgstr "" "Kan dit item niet configureren voor cloudsynchronisatie. Wordt al beheerd " "door %s." -#: awx/main/models/inventory.py:1405 +#: awx/main/models/inventory.py:1417 msgid "" "More than one SCM-based inventory source with update on project update per-" "inventory not allowed." @@ -2713,7 +2761,7 @@ msgstr "" "Het is niet toegestaan meer dan één SCM-gebaseerde inventarisbron met een " "update bovenop een projectupdate per inventaris te hebben." -#: awx/main/models/inventory.py:1412 +#: awx/main/models/inventory.py:1424 msgid "" "Cannot update SCM-based inventory source on launch if set to update on " "project update. Instead, configure the corresponding source project to " @@ -2723,30 +2771,30 @@ msgstr "" "ingesteld op bijwerken bij projectupdate. Configureer in plaats daarvan het " "overeenkomstige bronproject om bij te werken bij opstarten." -#: awx/main/models/inventory.py:1418 +#: awx/main/models/inventory.py:1430 msgid "SCM type sources must set `overwrite_vars` to `true`." msgstr "SCM-typebronnen moeten 'overwrite_vars' instellen op 'true'." -#: awx/main/models/inventory.py:1423 +#: awx/main/models/inventory.py:1435 msgid "Cannot set source_path if not SCM type." msgstr "Kan source_path niet instellen als het geen SCM-type is." -#: awx/main/models/inventory.py:1448 +#: awx/main/models/inventory.py:1460 msgid "" "Inventory files from this Project Update were used for the inventory update." msgstr "" "Inventarisbestanden uit deze projectupdate zijn gebruikt voor de " "inventarisupdate." -#: awx/main/models/inventory.py:1561 +#: awx/main/models/inventory.py:1573 msgid "Inventory script contents" msgstr "Inhoud inventarisscript" -#: awx/main/models/inventory.py:1566 +#: awx/main/models/inventory.py:1578 msgid "Organization owning this inventory script" msgstr "Organisatie die eigenaar is van deze inventarisscript" -#: awx/main/models/jobs.py:65 +#: awx/main/models/jobs.py:66 msgid "" "If enabled, textual changes made to any templated files on the host are " "shown in the standard output" @@ -2754,7 +2802,7 @@ msgstr "" "Indien ingeschakeld, worden tekstwijzigingen aangebracht in " "sjabloonbestanden op de host weergegeven in de standaardoutput" -#: awx/main/models/jobs.py:163 +#: awx/main/models/jobs.py:164 msgid "" "If enabled, Tower will act as an Ansible Fact Cache Plugin; persisting facts" " at the end of a playbook run to the database and caching facts for use by " @@ -2765,37 +2813,37 @@ msgstr "" "database en worden feiten voor gebruik door Ansible in het cachegeheugen " "opgeslagen." -#: awx/main/models/jobs.py:172 +#: awx/main/models/jobs.py:173 msgid "You must provide an SSH credential." msgstr "U moet een SSH-referentie opgeven." -#: awx/main/models/jobs.py:180 +#: awx/main/models/jobs.py:181 msgid "You must provide a Vault credential." msgstr "U moet een kluisreferentie opgeven." -#: awx/main/models/jobs.py:316 +#: awx/main/models/jobs.py:317 msgid "Job Template must provide 'inventory' or allow prompting for it." msgstr "Taaksjabloon moet 'inventory' verschaffen of toestaan erom te vragen." -#: awx/main/models/jobs.py:320 +#: awx/main/models/jobs.py:321 msgid "Job Template must provide 'credential' or allow prompting for it." msgstr "" "Taaksjabloon moet 'credential' verschaffen of toestaan erom te vragen." -#: awx/main/models/jobs.py:422 +#: awx/main/models/jobs.py:427 msgid "Cannot override job_type to or from a scan job." msgstr "Kan job_type niet vervangen naar of vanuit een scantaak." -#: awx/main/models/jobs.py:488 awx/main/models/projects.py:263 +#: awx/main/models/jobs.py:493 awx/main/models/projects.py:263 msgid "SCM Revision" msgstr "SCM-revisie" -#: awx/main/models/jobs.py:489 +#: awx/main/models/jobs.py:494 msgid "The SCM Revision from the Project used for this job, if available" msgstr "" "De SCM-revisie uit het project gebruikt voor deze taak, indien beschikbaar" -#: awx/main/models/jobs.py:497 +#: awx/main/models/jobs.py:502 msgid "" "The SCM Refresh task used to make sure the playbooks were available for the " "job run" @@ -2803,105 +2851,105 @@ msgstr "" "De taak SCM vernieuwen gebruik om te verzekeren dat de draaiboeken " "beschikbaar waren om de taak uit te voeren" -#: awx/main/models/jobs.py:802 +#: awx/main/models/jobs.py:809 msgid "job host summaries" msgstr "taakhostoverzichten" -#: awx/main/models/jobs.py:906 +#: awx/main/models/jobs.py:913 msgid "Host Failure" msgstr "Hostmislukking" -#: awx/main/models/jobs.py:909 awx/main/models/jobs.py:923 +#: awx/main/models/jobs.py:916 awx/main/models/jobs.py:930 msgid "No Hosts Remaining" msgstr "Geen resterende hosts" -#: awx/main/models/jobs.py:910 +#: awx/main/models/jobs.py:917 msgid "Host Polling" msgstr "Hostpolling" -#: awx/main/models/jobs.py:911 +#: awx/main/models/jobs.py:918 msgid "Host Async OK" msgstr "Host Async OK" -#: awx/main/models/jobs.py:912 +#: awx/main/models/jobs.py:919 msgid "Host Async Failure" msgstr "Host Async mislukking" -#: awx/main/models/jobs.py:913 +#: awx/main/models/jobs.py:920 msgid "Item OK" msgstr "Item OK" -#: awx/main/models/jobs.py:914 +#: awx/main/models/jobs.py:921 msgid "Item Failed" msgstr "Item mislukt" -#: awx/main/models/jobs.py:915 +#: awx/main/models/jobs.py:922 msgid "Item Skipped" msgstr "Item overgeslagen" -#: awx/main/models/jobs.py:916 +#: awx/main/models/jobs.py:923 msgid "Host Retry" msgstr "Host opnieuw proberen" -#: awx/main/models/jobs.py:918 +#: awx/main/models/jobs.py:925 msgid "File Difference" msgstr "Bestandsverschil" -#: awx/main/models/jobs.py:919 +#: awx/main/models/jobs.py:926 msgid "Playbook Started" msgstr "Draaiboek gestart" -#: awx/main/models/jobs.py:920 +#: awx/main/models/jobs.py:927 msgid "Running Handlers" msgstr "Handlers die worden uitgevoerd" -#: awx/main/models/jobs.py:921 +#: awx/main/models/jobs.py:928 msgid "Including File" msgstr "Inclusief bestand" -#: awx/main/models/jobs.py:922 +#: awx/main/models/jobs.py:929 msgid "No Hosts Matched" msgstr "Geen overeenkomende hosts" -#: awx/main/models/jobs.py:924 +#: awx/main/models/jobs.py:931 msgid "Task Started" msgstr "Taak gestart" -#: awx/main/models/jobs.py:926 +#: awx/main/models/jobs.py:933 msgid "Variables Prompted" msgstr "Variabelen gevraagd" -#: awx/main/models/jobs.py:927 +#: awx/main/models/jobs.py:934 msgid "Gathering Facts" msgstr "Feiten verzamelen" -#: awx/main/models/jobs.py:928 +#: awx/main/models/jobs.py:935 msgid "internal: on Import for Host" msgstr "intern: bij importeren voor host" -#: awx/main/models/jobs.py:929 +#: awx/main/models/jobs.py:936 msgid "internal: on Not Import for Host" msgstr "intern: niet bij importeren voor host" -#: awx/main/models/jobs.py:930 +#: awx/main/models/jobs.py:937 msgid "Play Started" msgstr "Afspelen gestart" -#: awx/main/models/jobs.py:931 +#: awx/main/models/jobs.py:938 msgid "Playbook Complete" msgstr "Draaiboek voltooid" -#: awx/main/models/jobs.py:1363 +#: awx/main/models/jobs.py:1351 msgid "Remove jobs older than a certain number of days" msgstr "Taken ouder dan een bepaald aantal dagen verwijderen" -#: awx/main/models/jobs.py:1364 +#: awx/main/models/jobs.py:1352 msgid "Remove activity stream entries older than a certain number of days" msgstr "" "Vermeldingen activiteitenstroom ouder dan een bepaald aantal dagen " "verwijderen" -#: awx/main/models/jobs.py:1365 +#: awx/main/models/jobs.py:1353 msgid "Purge and/or reduce the granularity of system tracking data" msgstr "" "Granulariteit van systeemtrackinggegevens verwijderen en/of verminderen" @@ -3324,7 +3372,7 @@ msgstr "Uitzondering bij het maken van de verbinding met Twilio: {}" msgid "Error sending notification webhook: {}" msgstr "Fout bij verzending bericht webhook: {}" -#: awx/main/scheduler/__init__.py:184 +#: awx/main/scheduler/task_manager.py:197 msgid "" "Job spawned from workflow could not start because it was not in the right " "state or required manual credentials" @@ -3332,7 +3380,7 @@ msgstr "" "Taak voortgebracht vanuit workflow kon niet starten omdat deze niet de " "juiste status of vereiste handmatige referenties had" -#: awx/main/scheduler/__init__.py:188 +#: awx/main/scheduler/task_manager.py:201 msgid "" "Job spawned from workflow could not start because it was missing a related " "resource such as project or inventory" @@ -3352,7 +3400,7 @@ msgstr "De licentie voor Ansible Tower verloopt binnenkort" msgid "status_str must be either succeeded or failed" msgstr "status_str must moet geslaagd of mislukt zijn" -#: awx/main/tasks.py:1531 +#: awx/main/tasks.py:1549 msgid "Dependent inventory update {} was canceled." msgstr "De afhankelijke inventarisupdate {} is geannuleerd." @@ -3361,38 +3409,38 @@ msgstr "De afhankelijke inventarisupdate {} is geannuleerd." msgid "Unable to convert \"%s\" to boolean" msgstr "Kan \"%s\" niet converteren in boolean" -#: awx/main/utils/common.py:209 +#: awx/main/utils/common.py:235 #, python-format msgid "Unsupported SCM type \"%s\"" msgstr "Niet-ondersteund SCM-type \"%s\"" -#: awx/main/utils/common.py:216 awx/main/utils/common.py:228 -#: awx/main/utils/common.py:247 +#: awx/main/utils/common.py:242 awx/main/utils/common.py:254 +#: awx/main/utils/common.py:273 #, python-format msgid "Invalid %s URL" msgstr "Ongeldige %s URL" -#: awx/main/utils/common.py:218 awx/main/utils/common.py:257 +#: awx/main/utils/common.py:244 awx/main/utils/common.py:283 #, python-format msgid "Unsupported %s URL" msgstr "Niet-ondersteunde %s URL" -#: awx/main/utils/common.py:259 +#: awx/main/utils/common.py:285 #, python-format msgid "Unsupported host \"%s\" for file:// URL" msgstr "Niet-ondersteunde host \"%s\" voor bestand:// URL" -#: awx/main/utils/common.py:261 +#: awx/main/utils/common.py:287 #, python-format msgid "Host is required for %s URL" msgstr "Host is vereist voor %s URL" -#: awx/main/utils/common.py:279 +#: awx/main/utils/common.py:305 #, python-format msgid "Username must be \"git\" for SSH access to %s." msgstr "Gebruikersnaam moet \"git\" zijn voor SSH-toegang tot %s." -#: awx/main/utils/common.py:285 +#: awx/main/utils/common.py:311 #, python-format msgid "Username must be \"hg\" for SSH access to %s." msgstr "Gebruikersnaam moet \"hg\" zijn voor SSH-toegang tot %s." @@ -3513,287 +3561,287 @@ msgstr "Serverfout" msgid "A server error has occurred." msgstr "Er is een serverfout opgetreden" -#: awx/settings/defaults.py:664 +#: awx/settings/defaults.py:665 msgid "US East (Northern Virginia)" msgstr "VS Oosten (Northern Virginia)" -#: awx/settings/defaults.py:665 +#: awx/settings/defaults.py:666 msgid "US East (Ohio)" msgstr "VS Oosten (Ohio)" -#: awx/settings/defaults.py:666 +#: awx/settings/defaults.py:667 msgid "US West (Oregon)" msgstr "VS Westen (Oregon)" -#: awx/settings/defaults.py:667 +#: awx/settings/defaults.py:668 msgid "US West (Northern California)" msgstr "VS Westen (Northern California)" -#: awx/settings/defaults.py:668 +#: awx/settings/defaults.py:669 msgid "Canada (Central)" msgstr "Canada (Midden)" -#: awx/settings/defaults.py:669 +#: awx/settings/defaults.py:670 msgid "EU (Frankfurt)" msgstr "EU (Frankfurt)" -#: awx/settings/defaults.py:670 +#: awx/settings/defaults.py:671 msgid "EU (Ireland)" msgstr "EU (Ierland)" -#: awx/settings/defaults.py:671 +#: awx/settings/defaults.py:672 msgid "EU (London)" msgstr "EU (Londen)" -#: awx/settings/defaults.py:672 +#: awx/settings/defaults.py:673 msgid "Asia Pacific (Singapore)" msgstr "Azië-Pacific (Singapore)" -#: awx/settings/defaults.py:673 +#: awx/settings/defaults.py:674 msgid "Asia Pacific (Sydney)" msgstr "Azië-Pacific (Sydney)" -#: awx/settings/defaults.py:674 +#: awx/settings/defaults.py:675 msgid "Asia Pacific (Tokyo)" msgstr "Azië-Pacific (Tokyo)" -#: awx/settings/defaults.py:675 +#: awx/settings/defaults.py:676 msgid "Asia Pacific (Seoul)" msgstr "Azië-Pacific (Seoul)" -#: awx/settings/defaults.py:676 +#: awx/settings/defaults.py:677 msgid "Asia Pacific (Mumbai)" msgstr "Azië-Pacific (Mumbai)" -#: awx/settings/defaults.py:677 +#: awx/settings/defaults.py:678 msgid "South America (Sao Paulo)" msgstr "Zuid-Amerika (Sao Paulo)" -#: awx/settings/defaults.py:678 +#: awx/settings/defaults.py:679 msgid "US West (GovCloud)" msgstr "VS Westen (GovCloud)" -#: awx/settings/defaults.py:679 +#: awx/settings/defaults.py:680 msgid "China (Beijing)" msgstr "China (Beijing)" -#: awx/settings/defaults.py:728 +#: awx/settings/defaults.py:729 msgid "US East 1 (B)" msgstr "VS Oosten 1 (B)" -#: awx/settings/defaults.py:729 +#: awx/settings/defaults.py:730 msgid "US East 1 (C)" msgstr "VS Oosten 1 (C)" -#: awx/settings/defaults.py:730 +#: awx/settings/defaults.py:731 msgid "US East 1 (D)" msgstr "VS Oosten 1 (D)" -#: awx/settings/defaults.py:731 +#: awx/settings/defaults.py:732 msgid "US East 4 (A)" msgstr "VS Oosten 4 (A)" -#: awx/settings/defaults.py:732 +#: awx/settings/defaults.py:733 msgid "US East 4 (B)" msgstr "VS Oosten 4 (B)" -#: awx/settings/defaults.py:733 +#: awx/settings/defaults.py:734 msgid "US East 4 (C)" msgstr "VS Oosten 4 (C)" -#: awx/settings/defaults.py:734 +#: awx/settings/defaults.py:735 msgid "US Central (A)" msgstr "VS Midden (A)" -#: awx/settings/defaults.py:735 +#: awx/settings/defaults.py:736 msgid "US Central (B)" msgstr "VS Midden (B)" -#: awx/settings/defaults.py:736 +#: awx/settings/defaults.py:737 msgid "US Central (C)" msgstr "VS Midden (C)" -#: awx/settings/defaults.py:737 +#: awx/settings/defaults.py:738 msgid "US Central (F)" msgstr "VS Midden (F)" -#: awx/settings/defaults.py:738 +#: awx/settings/defaults.py:739 msgid "US West (A)" msgstr "VS Westen (A)" -#: awx/settings/defaults.py:739 +#: awx/settings/defaults.py:740 msgid "US West (B)" msgstr "VS Westen (B)" -#: awx/settings/defaults.py:740 +#: awx/settings/defaults.py:741 msgid "US West (C)" msgstr "VS Westen (C)" -#: awx/settings/defaults.py:741 +#: awx/settings/defaults.py:742 msgid "Europe West 1 (B)" msgstr "Europa Westen 1 (B)" -#: awx/settings/defaults.py:742 +#: awx/settings/defaults.py:743 msgid "Europe West 1 (C)" msgstr "Europa Westen 1 (C)" -#: awx/settings/defaults.py:743 +#: awx/settings/defaults.py:744 msgid "Europe West 1 (D)" msgstr "Europa Westen 1 (D)" -#: awx/settings/defaults.py:744 +#: awx/settings/defaults.py:745 msgid "Europe West 2 (A)" msgstr "Europa Westen 2 (A)" -#: awx/settings/defaults.py:745 +#: awx/settings/defaults.py:746 msgid "Europe West 2 (B)" msgstr "Europa Westen 2 (B)" -#: awx/settings/defaults.py:746 +#: awx/settings/defaults.py:747 msgid "Europe West 2 (C)" msgstr "Europa Westen 2 (C)" -#: awx/settings/defaults.py:747 +#: awx/settings/defaults.py:748 msgid "Asia East (A)" msgstr "Azië Oosten (A)" -#: awx/settings/defaults.py:748 +#: awx/settings/defaults.py:749 msgid "Asia East (B)" msgstr "Azië Oosten (B)" -#: awx/settings/defaults.py:749 +#: awx/settings/defaults.py:750 msgid "Asia East (C)" msgstr "Azië Oosten (C)" -#: awx/settings/defaults.py:750 +#: awx/settings/defaults.py:751 msgid "Asia Southeast (A)" msgstr "Azië (Zuidoost) (A)" -#: awx/settings/defaults.py:751 +#: awx/settings/defaults.py:752 msgid "Asia Southeast (B)" msgstr "Azië (Zuidoost) (B)" -#: awx/settings/defaults.py:752 +#: awx/settings/defaults.py:753 msgid "Asia Northeast (A)" msgstr "Azië (Noordoost) (A)" -#: awx/settings/defaults.py:753 +#: awx/settings/defaults.py:754 msgid "Asia Northeast (B)" msgstr "Azië (Noordoost) (B)" -#: awx/settings/defaults.py:754 +#: awx/settings/defaults.py:755 msgid "Asia Northeast (C)" msgstr "Azië (Noordoost) (C)" -#: awx/settings/defaults.py:755 +#: awx/settings/defaults.py:756 msgid "Australia Southeast (A)" msgstr "Australië Zuidoost (A)" -#: awx/settings/defaults.py:756 +#: awx/settings/defaults.py:757 msgid "Australia Southeast (B)" msgstr "Australië Zuidoost (B)" -#: awx/settings/defaults.py:757 +#: awx/settings/defaults.py:758 msgid "Australia Southeast (C)" msgstr "Australië Zuidoost (C)" -#: awx/settings/defaults.py:781 +#: awx/settings/defaults.py:780 msgid "US East" msgstr "VS Oosten" -#: awx/settings/defaults.py:782 +#: awx/settings/defaults.py:781 msgid "US East 2" msgstr "VS Oosten 2" -#: awx/settings/defaults.py:783 +#: awx/settings/defaults.py:782 msgid "US Central" msgstr "VS Midden" -#: awx/settings/defaults.py:784 +#: awx/settings/defaults.py:783 msgid "US North Central" msgstr "VS Noord Midden" -#: awx/settings/defaults.py:785 +#: awx/settings/defaults.py:784 msgid "US South Central" msgstr "VS Zuid MIdden" -#: awx/settings/defaults.py:786 +#: awx/settings/defaults.py:785 msgid "US West Central" msgstr "VS West Midden" -#: awx/settings/defaults.py:787 +#: awx/settings/defaults.py:786 msgid "US West" msgstr "VS Westen" -#: awx/settings/defaults.py:788 +#: awx/settings/defaults.py:787 msgid "US West 2" msgstr "VS Westen 2" -#: awx/settings/defaults.py:789 +#: awx/settings/defaults.py:788 msgid "Canada East" msgstr "Canada Oosten" -#: awx/settings/defaults.py:790 +#: awx/settings/defaults.py:789 msgid "Canada Central" msgstr "Canada Midden" -#: awx/settings/defaults.py:791 +#: awx/settings/defaults.py:790 msgid "Brazil South" msgstr "Brazilië Zuiden" -#: awx/settings/defaults.py:792 +#: awx/settings/defaults.py:791 msgid "Europe North" msgstr "Europa Noorden" -#: awx/settings/defaults.py:793 +#: awx/settings/defaults.py:792 msgid "Europe West" msgstr "Europa Westen" -#: awx/settings/defaults.py:794 +#: awx/settings/defaults.py:793 msgid "UK West" msgstr "VK Westen" -#: awx/settings/defaults.py:795 +#: awx/settings/defaults.py:794 msgid "UK South" msgstr "VK Zuiden" -#: awx/settings/defaults.py:796 +#: awx/settings/defaults.py:795 msgid "Asia East" msgstr "Azië Oosten" -#: awx/settings/defaults.py:797 +#: awx/settings/defaults.py:796 msgid "Asia Southeast" msgstr "Azië Zuidoosten" -#: awx/settings/defaults.py:798 +#: awx/settings/defaults.py:797 msgid "Australia East" msgstr "Australië Oosten" -#: awx/settings/defaults.py:799 +#: awx/settings/defaults.py:798 msgid "Australia Southeast" msgstr "Australië Zuidoosten" -#: awx/settings/defaults.py:800 +#: awx/settings/defaults.py:799 msgid "India West" msgstr "India Westen" -#: awx/settings/defaults.py:801 +#: awx/settings/defaults.py:800 msgid "India South" msgstr "India Zuiden" -#: awx/settings/defaults.py:802 +#: awx/settings/defaults.py:801 msgid "Japan East" msgstr "Japan Oosten" -#: awx/settings/defaults.py:803 +#: awx/settings/defaults.py:802 msgid "Japan West" msgstr "Japan Westen" -#: awx/settings/defaults.py:804 +#: awx/settings/defaults.py:803 msgid "Korea Central" msgstr "Korea Midden" -#: awx/settings/defaults.py:805 +#: awx/settings/defaults.py:804 msgid "Korea South" msgstr "Korea Zuiden" @@ -4544,6 +4592,7 @@ msgid "SAML Team Map" msgstr "SAML-teamtoewijzing" #: awx/sso/fields.py:123 +#, python-brace-format msgid "Invalid connection option(s): {invalid_options}." msgstr "Ongeldige verbindingsoptie(s): {invalid_options}." @@ -4560,16 +4609,19 @@ msgid "Subtree" msgstr "Substructuur" #: awx/sso/fields.py:214 +#, python-brace-format msgid "Expected a list of three items but got {length} instead." msgstr "Verwachtte een lijst met drie items, maar kreeg er {length}." #: awx/sso/fields.py:215 +#, python-brace-format msgid "Expected an instance of LDAPSearch but got {input_type} instead." msgstr "" "Verwachtte een instantie van LDAPSearch, maar kreeg in plaats daarvan " "{input_type}." #: awx/sso/fields.py:251 +#, python-brace-format msgid "" "Expected an instance of LDAPSearch or LDAPSearchUnion but got {input_type} " "instead." @@ -4578,20 +4630,24 @@ msgstr "" "plaats daarvan {input_type}." #: awx/sso/fields.py:289 +#, python-brace-format msgid "Invalid user attribute(s): {invalid_attrs}." msgstr "Ongeldig(e) gebruikerskenmerk(en): {invalid_attrs}." #: awx/sso/fields.py:306 +#, python-brace-format msgid "Expected an instance of LDAPGroupType but got {input_type} instead." msgstr "" "Verwachtte een instantie van LDAPGroupType, maar kreeg in plaats daarvan " "{input_type}." #: awx/sso/fields.py:334 +#, python-brace-format msgid "Invalid user flag: \"{invalid_flag}\"." msgstr "Ongeldige gebruikersvlag: \"{invalid_flag}\"." #: awx/sso/fields.py:350 awx/sso/fields.py:517 +#, python-brace-format msgid "" "Expected None, True, False, a string or list of strings but got {input_type}" " instead." @@ -4600,46 +4656,57 @@ msgstr "" "maar kreeg in plaats daarvan {input_type}." #: awx/sso/fields.py:386 +#, python-brace-format msgid "Missing key(s): {missing_keys}." msgstr "Ontbrekende sleutel(s): {missing_keys}." #: awx/sso/fields.py:387 +#, python-brace-format msgid "Invalid key(s): {invalid_keys}." msgstr "Ongeldige sleutel(s): {invalid_keys}." #: awx/sso/fields.py:436 awx/sso/fields.py:553 +#, python-brace-format msgid "Invalid key(s) for organization map: {invalid_keys}." msgstr "Ongeldige sleutel(s) voor organisatietoewijzing: {invalid_keys}." #: awx/sso/fields.py:454 +#, python-brace-format msgid "Missing required key for team map: {invalid_keys}." msgstr "Ontbrekende vereiste sleutel voor teamtoewijzing: {invalid_keys}." #: awx/sso/fields.py:455 awx/sso/fields.py:572 +#, python-brace-format msgid "Invalid key(s) for team map: {invalid_keys}." msgstr "Ongeldige sleutel(s) voor teamtoewijzing: {invalid_keys}." #: awx/sso/fields.py:571 +#, python-brace-format msgid "Missing required key for team map: {missing_keys}." msgstr "Ontbrekende vereiste sleutel voor teamtoewijzing: {missing_keys}." #: awx/sso/fields.py:589 +#, python-brace-format msgid "Missing required key(s) for org info record: {missing_keys}." msgstr "Ontbrekende vereiste sleutel(s) voor org info record: {missing_keys}." #: awx/sso/fields.py:602 +#, python-brace-format msgid "Invalid language code(s) for org info: {invalid_lang_codes}." msgstr "Ongeldige taalcode(s) voor org info: {invalid_lang_codes}." #: awx/sso/fields.py:621 +#, python-brace-format msgid "Missing required key(s) for contact: {missing_keys}." msgstr "Ontbrekende vereiste sleutel(s) voor contactpersoon: {missing_keys}." #: awx/sso/fields.py:633 +#, python-brace-format msgid "Missing required key(s) for IdP: {missing_keys}." msgstr "Ontbrekende vereiste sleutel(s) voor IdP: {missing_keys}." #: awx/sso/pipeline.py:24 +#, python-brace-format msgid "An account cannot be found for {0}" msgstr "Een account kan niet worden gevonden voor {0}" @@ -4733,6 +4800,7 @@ msgid "Make a PATCH request on the %(name)s resource" msgstr "Maak een PATCH-aanvraag voor de resource van %(name)s" #: awx/ui/apps.py:9 awx/ui/conf.py:22 awx/ui/conf.py:36 awx/ui/conf.py:51 +#: awx/ui/conf.py:63 msgid "UI" msgstr "Gebruikersinterface" @@ -4787,6 +4855,15 @@ msgstr "" "transparante achtergrond gebruikt. De indelingen GIF, PNG en JPEG worden " "ondersteund." +#: awx/ui/conf.py:60 +msgid "Max Job Events Retreived by UI" +msgstr "" + +#: awx/ui/conf.py:61 +msgid "" +"Maximum number of job events for the UI to retreive within a single request." +msgstr "" + #: awx/ui/fields.py:29 msgid "" "Invalid format for custom logo. Must be a data URL with a base64-encoded " diff --git a/awx/ui/po/es.po b/awx/ui/po/es.po index 18dce8c5bb..6e6aca6ae6 100644 --- a/awx/ui/po/es.po +++ b/awx/ui/po/es.po @@ -6,10 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2017-09-05 01:01+0000\n" -"Last-Translator: edrh01 \n" +"PO-Revision-Date: 2017-12-05 05:02+0000\n" +"Last-Translator: trh01 \n" "Language-Team: \n" -"MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: es\n" @@ -17,7 +16,7 @@ msgstr "" "X-Generator: Zanata 4.2.1\n" #: client/src/projects/add/projects-add.controller.js:153 -#: client/src/projects/edit/projects-edit.controller.js:282 +#: client/src/projects/edit/projects-edit.controller.js:288 msgid "" "%sNote:%s Mercurial does not support password authentication for SSH. Do not" " put the username and key in the URL. If using Bitbucket and SSH, do not " @@ -28,7 +27,7 @@ msgstr "" " SSH, no indique su usuario de Bitbucket." #: client/src/projects/add/projects-add.controller.js:132 -#: client/src/projects/edit/projects-edit.controller.js:261 +#: client/src/projects/edit/projects-edit.controller.js:267 msgid "" "%sNote:%s When using SSH protocol for GitHub or Bitbucket, enter an SSH key " "only, do not enter a username (other than git). Additionally, GitHub and " @@ -46,7 +45,6 @@ msgid "(defaults to %s)" msgstr "(valor por defecto a %s)" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:378 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:334 msgid "(seconds)" msgstr "(segundos)" @@ -70,7 +68,7 @@ msgstr "50" msgid "A schedule name is required." msgstr "Un nombre para el planificador es necesario." -#: client/src/users/add/users-add.controller.js:101 +#: client/src/users/add/users-add.controller.js:102 msgid "A value is required" msgstr "Un valor es necesario" @@ -93,11 +91,10 @@ msgstr "DETALLES DE ACTIVIDAD" #: client/src/activity-stream/activitystream.route.js:28 #: client/src/activity-stream/streams.list.js:14 #: client/src/activity-stream/streams.list.js:15 -#: client/src/activity-stream/activitystream.route.js:27 msgid "ACTIVITY STREAM" msgstr "FLUJO DE ACTIVIDAD" -#: client/features/credentials/legacy.credentials.js:79 +#: client/features/credentials/legacy.credentials.js:76 #: client/src/credential-types/credential-types.list.js:44 #: client/src/credentials/credentials.form.js:449 #: client/src/credentials/credentials.list.js:54 @@ -112,15 +109,10 @@ msgstr "FLUJO DE ACTIVIDAD" #: client/src/projects/projects.list.js:78 #: client/src/scheduler/schedules.list.js:68 client/src/teams/teams.form.js:85 #: client/src/teams/teams.list.js:45 -#: client/src/templates/job_templates/job-template.form.js:402 +#: client/src/templates/job_templates/job-template.form.js:397 #: client/src/templates/templates.list.js:58 #: client/src/templates/workflows.form.js:125 #: client/src/users/users.list.js:50 -#: client/features/credentials/legacy.credentials.js:74 -#: client/src/credential-types/credential-types.list.js:41 -#: client/src/projects/projects.form.js:242 -#: client/src/templates/job_templates/job-template.form.js:422 -#: client/src/templates/workflows.form.js:130 msgid "ADD" msgstr "AÑADIR" @@ -132,8 +124,7 @@ msgstr "AGREGAR GRUPO" msgid "ADD HOST" msgstr "AGREGAR HOST" -#: client/src/teams/teams.form.js:157 client/src/users/users.form.js:212 -#: client/src/users/users.form.js:213 +#: client/src/teams/teams.form.js:157 client/src/users/users.form.js:216 msgid "ADD PERMISSIONS" msgstr "AÑADIR PERMISOS" @@ -151,7 +142,6 @@ msgstr "INFORMACIÓN ADICIONAL" #: client/src/organizations/linkout/organizations-linkout.route.js:330 #: client/src/organizations/list/organizations-list.controller.js:84 -#: client/src/organizations/linkout/organizations-linkout.route.js:323 msgid "ADMINS" msgstr "ADMINS" @@ -172,8 +162,7 @@ msgstr "CUALQUIERA" msgid "API Key" msgstr "Clave API" -#: client/src/notifications/notificationTemplates.form.js:246 -#: client/src/notifications/notificationTemplates.form.js:251 +#: client/src/notifications/notificationTemplates.form.js:243 msgid "API Service/Integration Key" msgstr "Servicio API/Clave de integración" @@ -196,7 +185,6 @@ msgid "ASSOCIATED HOSTS" msgstr "HOSTS ASOCIADOS" #: client/src/setup-menu/setup-menu.partial.html:66 -#: client/src/setup-menu/setup-menu.partial.html:72 msgid "About {{BRAND_NAME}}" msgstr "Acerca de {{BRAND_NAME}}" @@ -204,13 +192,11 @@ msgstr "Acerca de {{BRAND_NAME}}" msgid "Access Key" msgstr "Clave de acceso" -#: client/src/notifications/notificationTemplates.form.js:224 -#: client/src/notifications/notificationTemplates.form.js:229 +#: client/src/notifications/notificationTemplates.form.js:221 msgid "Account SID" msgstr "Cuenta SID" -#: client/src/notifications/notificationTemplates.form.js:183 -#: client/src/notifications/notificationTemplates.form.js:186 +#: client/src/notifications/notificationTemplates.form.js:180 msgid "Account Token" msgstr "Cuenta Token" @@ -229,17 +215,15 @@ msgstr "Acciones" msgid "Activity" msgstr "Actividad" -#: client/src/configuration/system-form/configuration-system.controller.js:86 +#: client/src/configuration/system-form/configuration-system.controller.js:88 msgid "Activity Stream" msgstr "Flujo de actividad" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:134 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:137 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:131 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:132 #: client/src/organizations/organizations.form.js:81 #: client/src/teams/teams.form.js:82 #: client/src/templates/workflows.form.js:122 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:143 -#: client/src/templates/workflows.form.js:127 msgid "Add" msgstr "Añadir" @@ -259,12 +243,9 @@ msgstr "Añadir permisos" msgid "Add Project" msgstr "Añadir proyecto" -#: client/src/shared/form-generator.js:1703 -#: client/src/templates/job_templates/job-template.form.js:450 +#: client/src/shared/form-generator.js:1711 +#: client/src/templates/job_templates/job-template.form.js:445 #: client/src/templates/workflows.form.js:170 -#: client/src/shared/form-generator.js:1754 -#: client/src/templates/job_templates/job-template.form.js:467 -#: client/src/templates/workflows.form.js:175 msgid "Add Survey" msgstr "Añadir encuesta" @@ -279,8 +260,6 @@ msgstr "Añadir usuario" #: client/src/shared/stateDefinitions.factory.js:410 #: client/src/shared/stateDefinitions.factory.js:578 #: client/src/users/users.list.js:17 -#: client/src/shared/stateDefinitions.factory.js:364 -#: client/src/shared/stateDefinitions.factory.js:532 msgid "Add Users" msgstr "Añadir usuarios" @@ -300,18 +279,13 @@ msgstr "Agregar un host" msgid "Add a new schedule" msgstr "Añadir un nuevo planificador" -#: client/features/credentials/legacy.credentials.js:77 +#: client/features/credentials/legacy.credentials.js:74 #: client/src/credentials/credentials.form.js:447 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:136 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:139 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:133 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:134 #: client/src/projects/projects.form.js:241 -#: client/src/templates/job_templates/job-template.form.js:400 +#: client/src/templates/job_templates/job-template.form.js:395 #: client/src/templates/workflows.form.js:123 -#: client/features/credentials/legacy.credentials.js:72 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:145 -#: client/src/projects/projects.form.js:240 -#: client/src/templates/job_templates/job-template.form.js:420 -#: client/src/templates/workflows.form.js:128 msgid "Add a permission" msgstr "Añadir un permiso" @@ -324,8 +298,7 @@ msgstr "" " ejecutan tareas sobre máquinas o cuando se sincronizan inventarios o " "proyectos." -#: client/src/shared/form-generator.js:1439 -#: client/src/shared/form-generator.js:1490 +#: client/src/shared/form-generator.js:1446 msgid "Admin" msgstr "Administrador" @@ -349,7 +322,6 @@ msgstr "" #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:65 #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:74 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:139 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:130 msgid "All" msgstr "Todo" @@ -362,8 +334,8 @@ msgstr "Todas las actividades" msgid "All Jobs" msgstr "Todos los trabajos" -#: client/src/templates/job_templates/job-template.form.js:280 -#: client/src/templates/job_templates/job-template.form.js:287 +#: client/src/templates/job_templates/job-template.form.js:275 +#: client/src/templates/job_templates/job-template.form.js:282 msgid "Allow Provisioning Callbacks" msgstr "Permitir la ejecución utilizando Callbacks" @@ -378,8 +350,7 @@ msgstr "" msgid "Always" msgstr "Siempre" -#: client/src/projects/list/projects-list.controller.js:267 -#: client/src/projects/list/projects-list.controller.js:265 +#: client/src/projects/list/projects-list.controller.js:266 msgid "" "An SCM update does not appear to be running for project: %s. Click the " "%sRefresh%s button to view the latest status." @@ -388,13 +359,21 @@ msgstr "" "proyectos: %s. Pulse sobre el botón %sActualizar%s para ver el estado más " "reciente." -#: client/src/templates/survey-maker/shared/question-definition.form.js:59 -#: client/src/templates/survey-maker/shared/question-definition.form.js:65 +#: client/src/templates/survey-maker/shared/question-definition.form.js:62 +#: client/src/templates/survey-maker/shared/question-definition.form.js:68 msgid "Answer Type" msgstr "Tipo de respuesta" -#: client/src/credentials/list/credentials-list.controller.js:114 -#: client/src/credentials/list/credentials-list.controller.js:106 +#: client/src/templates/survey-maker/shared/question-definition.form.js:44 +#: client/src/templates/survey-maker/shared/question-definition.form.js:53 +msgid "Answer Variable Name" +msgstr "Nombre de la variable" + +#: client/src/job-results/job-results.service.js:144 +msgid "Are you sure you want to cancel the job below?" +msgstr "¿Está seguro de que desea cancelar esta tarea?" + +#: client/src/credentials/list/credentials-list.controller.js:133 msgid "Are you sure you want to delete the credential below?" msgstr "¿Está seguro que quiere eliminar la credencial indicada?" @@ -402,6 +381,7 @@ msgstr "¿Está seguro que quiere eliminar la credencial indicada?" msgid "Are you sure you want to delete the inventory below?" msgstr "¿Está seguro de que quiere eliminar el inventario indicado?" +#: client/src/job-results/job-results.service.js:95 #: client/src/jobs/factories/delete-job.factory.js:110 msgid "Are you sure you want to delete the job below?" msgstr "¿Está seguro que quiere eliminar el trabajo indicado?" @@ -416,10 +396,13 @@ msgid "Are you sure you want to delete the organization below?" msgstr "¿Está seguro que quiere eliminar la organización indicada?" #: client/src/projects/list/projects-list.controller.js:208 -#: client/src/projects/list/projects-list.controller.js:207 msgid "Are you sure you want to delete the project below?" msgstr "¿Está seguro que quiere eliminar el proyecto indicado?" +#: client/src/templates/list/templates-list.controller.js:103 +msgid "Are you sure you want to delete the template below?" +msgstr "¿Está seguro de que quiere eliminar esta plantilla?" + #: client/src/users/list/users-list.controller.js:90 msgid "Are you sure you want to delete the user below?" msgstr "¿Está seguro que quiere eliminar el usuario indicado?" @@ -432,14 +415,13 @@ msgstr "¿Esta seguro de que desea eliminar este {{deleteMode}}?" msgid "Are you sure you want to disassociate the group below from" msgstr "¿Está seguro de que quiere desasociar el grupo indicado de" -#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:22 +#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:23 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:25 -#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:25 +#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:26 msgid "Are you sure you want to disassociate the host below from" msgstr "¿Está seguro de que quiere desasociar el host indicado de" #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:47 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:69 msgid "" "Are you sure you want to permanently delete the group below from the " "inventory?" @@ -447,8 +429,7 @@ msgstr "" "¿Está seguro de que quiere eliminar permanentemente el grupo indicado del " "inventario?" -#: client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js:98 -#: client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js:93 +#: client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js:106 msgid "" "Are you sure you want to permanently delete the host below from the " "inventory?" @@ -456,7 +437,6 @@ msgstr "" "¿Está seguro de que quiere eliminar permanentemente el host indicado del " "inventario?" -#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:120 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:69 msgid "" "Are you sure you want to permanently delete the inventory source below from " @@ -465,7 +445,7 @@ msgstr "" "¿Está seguro de que quiere eliminar permanentemente la fuente del inventario" " del inventario?" -#: client/src/projects/edit/projects-edit.controller.js:238 +#: client/src/projects/edit/projects-edit.controller.js:244 msgid "Are you sure you want to remove the %s below from %s?" msgstr "¿Está seguro de que quiere eliminar el %s indicado de %s?" @@ -488,8 +468,7 @@ msgstr "Asociar un grupo existente" msgid "Associate this host with a new group" msgstr "Asociar este host a un nuevo grupo" -#: client/src/shared/form-generator.js:1441 -#: client/src/shared/form-generator.js:1492 +#: client/src/shared/form-generator.js:1448 msgid "Auditor" msgstr "Auditor" @@ -536,12 +515,11 @@ msgstr "Zona de disponibilidad:" msgid "Azure AD" msgstr "Azure AD" -#: client/src/shared/directives.js:75 client/src/shared/directives.js:133 +#: client/src/shared/directives.js:75 msgid "BROWSE" msgstr "NAVEGAR" #: client/src/projects/projects.form.js:80 -#: client/src/projects/projects.form.js:79 msgid "" "Base path used for locating playbooks. Directories found inside this path " "will be listed in the playbook directory drop-down. Together the base path " @@ -555,32 +533,28 @@ msgstr "" "encontrar los playbooks." #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:128 -#: client/src/templates/job_templates/job-template.form.js:274 msgid "Become Privilege Escalation" msgstr "Activar la escalada de privilegios" -#: client/src/license/license.partial.html:104 +#: client/src/license/license.partial.html:107 msgid "Browse" msgstr "Navegar" #: client/lib/services/base-string.service.js:61 -#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:26 +#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:28 #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:51 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html:29 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:29 -#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:29 +#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:30 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:73 #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html:16 #: client/src/inventories-hosts/shared/associate-groups/associate-groups.partial.html:16 #: client/src/inventories-hosts/shared/associate-hosts/associate-hosts.partial.html:16 -#: client/src/job-submission/job-submission.partial.html:363 +#: client/src/job-submission/job-submission.partial.html:370 #: client/src/partials/survey-maker-modal.html:17 -#: client/src/partials/survey-maker-modal.html:84 +#: client/src/partials/survey-maker-modal.html:85 #: client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.partial.html:17 #: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:65 -#: client/lib/services/base-string.service.js:29 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:73 -#: client/src/job-submission/job-submission.partial.html:360 msgid "CANCEL" msgstr "CANCELAR" @@ -592,14 +566,13 @@ msgstr "MODIFICACIONES" msgid "CLEAR ALL" msgstr "LIMPIAR TODO" -#: client/src/partials/survey-maker-modal.html:85 +#: client/src/partials/survey-maker-modal.html:86 msgid "CLOSE" msgstr "CERRAR" #: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:19 -#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js:18 +#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js:19 #: client/src/templates/completed-jobs.list.js:20 -#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js:17 msgid "COMPLETED JOBS" msgstr "TRABAJOS COMPLETADOS" @@ -649,12 +622,10 @@ msgstr "CREAR TRABAJO PROGRAMADO" msgid "CREATE SOURCE" msgstr "CREAR FUENTE" -#: client/src/job-submission/job-submission.partial.html:344 +#: client/src/job-submission/job-submission.partial.html:351 #: client/src/partials/job-template-details.html:2 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:93 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:82 -#: client/src/job-submission/job-submission.partial.html:341 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:80 msgid "CREDENTIAL" msgstr "CREDENCIAL" @@ -664,7 +635,6 @@ msgstr "TIPO DE CREDENCIAL" #: client/src/job-submission/job-submission.partial.html:92 #: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:56 -#: client/src/job-submission/job-submission.partial.html:90 msgid "CREDENTIAL TYPE:" msgstr "TIPO DE CREDENCIAL:" @@ -679,8 +649,6 @@ msgstr "TIPOS DE CREDENCIAL" #: client/src/credentials/credentials.list.js:15 #: client/src/credentials/credentials.list.js:16 #: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:5 -#: client/features/credentials/legacy.credentials.js:13 -#: client/src/activity-stream/get-target-title.factory.js:14 msgid "CREDENTIALS" msgstr "CREDENCIALES" @@ -691,35 +659,27 @@ msgstr "PERMISOS DE CREDENCIAL" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:378 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:390 #: client/src/projects/projects.form.js:199 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:334 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:346 -#: client/src/projects/projects.form.js:198 msgid "Cache Timeout" msgstr "Tiempo de espera para la expiración de la caché" #: client/src/projects/projects.form.js:188 -#: client/src/projects/projects.form.js:187 msgid "Cache Timeout%s (seconds)%s" msgstr "Tiempo de espera para la expiración de la caché%s (segundos)%s" #: client/src/projects/list/projects-list.controller.js:199 #: client/src/users/list/users-list.controller.js:83 -#: client/src/projects/list/projects-list.controller.js:198 msgid "Call to %s failed. DELETE returned status:" msgstr "Fallo en la llamada a %s. DELETE ha devuelto el estado:" -#: client/src/projects/list/projects-list.controller.js:247 -#: client/src/projects/list/projects-list.controller.js:264 #: client/src/projects/list/projects-list.controller.js:246 -#: client/src/projects/list/projects-list.controller.js:262 +#: client/src/projects/list/projects-list.controller.js:263 msgid "Call to %s failed. GET status:" msgstr "Fallo en la llamada a %s. Estado GET:" -#: client/src/projects/edit/projects-edit.controller.js:232 +#: client/src/projects/edit/projects-edit.controller.js:238 msgid "Call to %s failed. POST returned status:" msgstr "Fallo en la llamada a %s. POST ha devuelto el estado:" -#: client/src/projects/list/projects-list.controller.js:226 #: client/src/projects/list/projects-list.controller.js:225 msgid "Call to %s failed. POST status:" msgstr "Fallo en la llamada a %s. Estado POST :" @@ -728,25 +688,25 @@ msgstr "Fallo en la llamada a %s. Estado POST :" msgid "Call to %s failed. Return status: %d" msgstr "Fallo en la llamada a %s. Ha devuelto el estado: %d" -#: client/src/projects/list/projects-list.controller.js:273 -#: client/src/projects/list/projects-list.controller.js:271 +#: client/src/projects/list/projects-list.controller.js:272 msgid "Call to get project failed. GET status:" msgstr "Fallo en la obtención del proyecto. Estado GET :" #: client/src/access/add-rbac-resource/rbac-resource.partial.html:105 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:191 -#: client/src/configuration/configuration.controller.js:535 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:188 +#: client/src/configuration/configuration.controller.js:541 #: client/src/job-results/job-results.partial.html:42 #: client/src/jobs/factories/delete-job.factory.js:33 -#: client/src/shared/form-generator.js:1691 +#: client/src/shared/form-generator.js:1699 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:12 #: client/src/workflow-results/workflow-results.partial.html:42 -#: client/src/configuration/configuration.controller.js:529 -#: client/src/shared/form-generator.js:1742 msgid "Cancel" msgstr "Cancelar" -#: client/src/projects/list/projects-list.controller.js:242 +#: client/src/job-results/job-results.service.js:142 +msgid "Cancel Job" +msgstr "Cancelar tarea" + #: client/src/projects/list/projects-list.controller.js:241 msgid "Cancel Not Allowed" msgstr "Cancelación no permitida." @@ -770,22 +730,15 @@ msgstr "Cancelado. Pulse para mostrar más detalles." #: client/src/shared/smart-search/smart-search.controller.js:49 #: client/src/shared/smart-search/smart-search.controller.js:91 -#: client/src/shared/smart-search/smart-search.controller.js:39 -#: client/src/shared/smart-search/smart-search.controller.js:81 msgid "Cannot search running job" msgstr "Imposible buscar en trabajos en ejecución." -#: client/src/instance-groups/instance-group.partial.html:10 -#: client/src/instance-groups/instance-groups.list.js:21 -#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:10 -#: client/src/instance-groups/instances/instances-list.partial.html:18 +#: client/src/instance-groups/instance-groups.list.js:22 #: client/src/instance-groups/instances/instances.list.js:20 -#: client/src/instance-groups/list/instance-groups-list.partial.html:29 msgid "Capacity" msgstr "Capacidad" #: client/src/projects/projects.form.js:82 -#: client/src/projects/projects.form.js:81 msgid "Change %s under \"Configure {{BRAND_NAME}}\" to change this location." msgstr "" "Modificar %s dentro de \"Configurar {{BRAND_NAME}}\" para cambiar esta " @@ -795,16 +748,15 @@ msgstr "" msgid "Changes" msgstr "Modificaciones" -#: client/src/shared/form-generator.js:1064 -#: client/src/shared/form-generator.js:1116 +#: client/src/shared/form-generator.js:1071 msgid "Choose a %s" msgstr "Escoja un %s" -#: client/src/templates/survey-maker/shared/question-definition.form.js:61 +#: client/src/templates/survey-maker/shared/question-definition.form.js:64 msgid "Choose an answer type" msgstr "Elegir un tipo de respuesta" -#: client/src/templates/survey-maker/shared/question-definition.form.js:64 +#: client/src/templates/survey-maker/shared/question-definition.form.js:67 msgid "" "Choose an answer type or format you want as the prompt for the user. Refer " "to the Ansible Tower Documentation for more additional information about " @@ -818,7 +770,7 @@ msgstr "" msgid "Choose an inventory file" msgstr "Escoja un archivo del inventario." -#: client/src/shared/directives.js:76 client/src/shared/directives.js:134 +#: client/src/shared/directives.js:76 msgid "Choose file" msgstr "Escoja fichero" @@ -831,11 +783,10 @@ msgstr "" "final, y pulse sobre Enviar." #: client/src/projects/projects.form.js:156 -#: client/src/projects/projects.form.js:155 msgid "Clean" msgstr "Limpiar" -#: client/src/templates/survey-maker/shared/question-definition.form.js:296 +#: client/src/templates/survey-maker/shared/question-definition.form.js:299 msgid "Clear" msgstr "Borrar" @@ -874,7 +825,6 @@ msgstr "" "trabajo." #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:138 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:129 msgid "" "Click on the regions field to see a list of regions for your cloud provider." " You can select multiple regions, or choose" @@ -886,8 +836,7 @@ msgstr "" msgid "Client ID" msgstr "ID del cliente" -#: client/src/notifications/notificationTemplates.form.js:257 -#: client/src/notifications/notificationTemplates.form.js:262 +#: client/src/notifications/notificationTemplates.form.js:254 msgid "Client Identifier" msgstr "Identificador del cliente" @@ -895,12 +844,11 @@ msgstr "Identificador del cliente" msgid "Client Secret" msgstr "Pregunta secreta del cliente" -#: client/src/shared/form-generator.js:1695 -#: client/src/shared/form-generator.js:1746 +#: client/src/shared/form-generator.js:1703 msgid "Close" msgstr "Cerrar" -#: client/src/job-results/job-results.partial.html:288 +#: client/src/job-results/job-results.partial.html:291 msgid "Cloud Credential" msgstr "Credencial cloud" @@ -912,18 +860,14 @@ msgstr "Fuente de nube no configurada." msgid "Cloud source not configured. Click" msgstr "Fuente de nube no configurada. Haga clic en" -#: client/src/credentials/factories/become-method-change.factory.js:86 -#: client/src/credentials/factories/kind-change.factory.js:143 -#: client/src/credentials/factories/become-method-change.factory.js:88 -#: client/src/credentials/factories/kind-change.factory.js:145 +#: client/src/credentials/factories/become-method-change.factory.js:80 +#: client/src/credentials/factories/kind-change.factory.js:137 msgid "CloudForms URL" msgstr "URL CloudForms" #: client/src/job-results/job-results.controller.js:226 #: client/src/standard-out/standard-out.controller.js:243 #: client/src/workflow-results/workflow-results.controller.js:118 -#: client/src/job-results/job-results.controller.js:219 -#: client/src/standard-out/standard-out.controller.js:245 msgid "Collapse Output" msgstr "Colapsar salida" @@ -933,37 +877,41 @@ msgid "Completed Jobs" msgstr "Tareas completadas" #: client/src/management-jobs/card/card.partial.html:34 -#: client/src/management-jobs/card/card.partial.html:32 msgid "Configure Notifications" msgstr "Configurar las notificaciones" #: client/src/setup-menu/setup-menu.partial.html:60 -#: client/src/setup-menu/setup-menu.partial.html:66 msgid "Configure {{BRAND_NAME}}" msgstr "Configurar {{BRAND_NAME}}" -#: client/src/users/users.form.js:79 client/src/users/users.form.js:80 +#: client/src/users/users.form.js:81 msgid "Confirm Password" msgstr "Confirmar la contraseña" -#: client/src/configuration/configuration.controller.js:542 -#: client/src/configuration/configuration.controller.js:536 +#: client/src/configuration/configuration.controller.js:548 msgid "Confirm Reset" msgstr "Confirmar la reinicialización" -#: client/src/configuration/configuration.controller.js:551 -#: client/src/configuration/configuration.controller.js:545 +#: client/src/configuration/configuration.controller.js:557 msgid "Confirm factory reset" msgstr "Confirmar la reinicialización a valores de fábrica" +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:120 +msgid "" +"Confirm that you want to permanently delete the inventory source below from " +"the inventory. Deleting this inventory source also deletes its associated " +"groups and hosts." +msgstr "" +"¿Está seguro de que quiere eliminar permanentemente la fuente del inventario" +" de este inventario? Eliminar la fuente del inventario también elimina los " +"grupos y los host asociados." + #: client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js:82 msgid "Confirm the removal of the" msgstr "Confirmar la eliminación de" #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:134 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:149 -#: client/src/templates/job_templates/job-template.form.js:222 -#: client/src/templates/job_templates/job-template.form.js:241 msgid "" "Consult the Ansible documentation for further details on the usage of tags." msgstr "" @@ -974,15 +922,13 @@ msgstr "" msgid "Contains 0 hosts." msgstr "Contiene 0 hosts." -#: client/src/templates/job_templates/job-template.form.js:185 -#: client/src/templates/job_templates/job-template.form.js:194 +#: client/src/templates/job_templates/job-template.form.js:180 msgid "" "Control the level of output ansible will produce as the playbook executes." msgstr "" "Controlar el nivel de salida que ansible producirá al ejecutar playbooks." #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:313 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:269 msgid "" "Control the level of output ansible will produce for inventory source update" " jobs." @@ -1018,16 +964,11 @@ msgstr "" msgid "Create New" msgstr "Crear nuevo" -#: client/src/inventories-hosts/hosts/host.list.js:107 -msgid "Create a new Smart Inventory from search results." -msgstr "Crear un nuevo inventario inteligente de los resultados de búsqueda." - #: client/src/credentials/credentials.list.js:52 msgid "Create a new credential" msgstr "Crear una nueva credencial" #: client/src/credential-types/credential-types.list.js:42 -#: client/src/credential-types/credential-types.list.js:39 msgid "Create a new credential type" msgstr "Crear un nuevo tipo de credencial" @@ -1076,14 +1017,12 @@ msgid "Create a new user" msgstr "Crear un nuevo usuario" #: client/src/setup-menu/setup-menu.partial.html:42 -#: client/src/setup-menu/setup-menu.partial.html:35 msgid "Create and edit scripts to dynamically load hosts from any source." msgstr "" "Crear y editar scripts que dinámicamente carguen servidores a partir de " "cualquier origen." #: client/src/setup-menu/setup-menu.partial.html:30 -#: client/src/setup-menu/setup-menu.partial.html:49 msgid "" "Create custom credential types to be used for authenticating to network " "hosts and cloud sources" @@ -1092,7 +1031,6 @@ msgstr "" "hosts de red y fuentes de nube" #: client/src/setup-menu/setup-menu.partial.html:49 -#: client/src/setup-menu/setup-menu.partial.html:42 msgid "" "Create templates for sending notifications with Email, HipChat, Slack, and " "SMS." @@ -1104,26 +1042,22 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:74 #: client/src/job-submission/job-submission.partial.html:18 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:67 -#: client/src/templates/job_templates/job-template.form.js:126 +#: client/src/templates/job_templates/job-template.form.js:121 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:53 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:62 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:70 msgid "Credential" msgstr "Credencial" #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:32 #: client/src/setup-menu/setup-menu.partial.html:29 -#: client/src/setup-menu/setup-menu.partial.html:48 msgid "Credential Types" msgstr "Tipos de credencial" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:135 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:59 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:129 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:58 #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:24 #: client/src/setup-menu/setup-menu.partial.html:22 -#: client/src/templates/job_templates/job-template.form.js:139 -#: client/src/templates/job_templates/job-template.form.js:130 -#: client/src/templates/job_templates/job-template.form.js:142 +#: client/src/templates/job_templates/job-template.form.js:134 msgid "Credentials" msgstr "Credenciales" @@ -1131,7 +1065,7 @@ msgstr "Credenciales" msgid "Critical" msgstr "Crítico" -#: client/src/shared/directives.js:77 client/src/shared/directives.js:135 +#: client/src/shared/directives.js:77 msgid "Current Image:" msgstr "Imagen actual:" @@ -1141,13 +1075,11 @@ msgstr "" "Actualmente siguiendo la salida estándar. Haga clic para dejar de seguir." #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:171 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:159 msgid "Custom Inventory Script" msgstr "Script de inventario personalizado" -#: client/src/inventory-scripts/inventory-scripts.form.js:53 -#: client/src/inventory-scripts/inventory-scripts.form.js:63 -#: client/src/inventory-scripts/inventory-scripts.form.js:64 +#: client/src/inventory-scripts/inventory-scripts.form.js:50 +#: client/src/inventory-scripts/inventory-scripts.form.js:60 msgid "Custom Script" msgstr "Script personalizado" @@ -1155,22 +1087,23 @@ msgstr "Script personalizado" msgid "DASHBOARD" msgstr "PANEL DE CONTROL" -#: client/src/credentials/list/credentials-list.controller.js:116 +#: client/src/credentials/list/credentials-list.controller.js:135 #: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:103 #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:52 -#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:145 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:178 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:74 +#: client/src/job-results/job-results.service.js:119 +#: client/src/jobs/factories/delete-job.factory.js:115 #: client/src/notifications/notification-templates-list/list.controller.js:195 #: client/src/organizations/list/organizations-list.controller.js:174 #: client/src/partials/survey-maker-modal.html:18 -#: client/src/projects/edit/projects-edit.controller.js:240 +#: client/src/projects/edit/projects-edit.controller.js:246 +#: client/src/templates/list/templates-list.controller.js:154 #: client/src/users/list/users-list.controller.js:92 -#: client/src/credentials/list/credentials-list.controller.js:108 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:74 msgid "DELETE" msgstr "ELIMINAR" -#: client/src/partials/survey-maker-modal.html:83 +#: client/src/partials/survey-maker-modal.html:84 msgid "DELETE SURVEY" msgstr "BORRAR ENCUESTA" @@ -1178,10 +1111,10 @@ msgstr "BORRAR ENCUESTA" msgid "DETAILS" msgstr "DETALLES" -#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:27 +#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:29 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html:30 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:30 -#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:30 +#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:31 msgid "DISASSOCIATE" msgstr "DISOCIAR" @@ -1191,26 +1124,24 @@ msgstr "HOSTS DINÁMICOS" #: client/src/credential-types/credential-types.list.js:73 #: client/src/credentials/credentials.list.js:85 -#: client/src/credentials/list/credentials-list.controller.js:113 -#: client/src/inventories-hosts/inventories/inventory.list.js:112 +#: client/src/credentials/list/credentials-list.controller.js:132 +#: client/src/inventories-hosts/inventories/inventory.list.js:111 #: client/src/inventory-scripts/inventory-scripts.list.js:71 #: client/src/job-results/job-results.partial.html:54 #: client/src/jobs/factories/delete-job.factory.js:37 #: client/src/notifications/notification-templates-list/list.controller.js:192 #: client/src/notifications/notificationTemplates.list.js:91 #: client/src/organizations/list/organizations-list.controller.js:171 -#: client/src/projects/edit/projects-edit.controller.js:237 +#: client/src/projects/edit/projects-edit.controller.js:243 #: client/src/projects/list/projects-list.controller.js:207 #: client/src/scheduler/schedules.list.js:90 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:13 #: client/src/teams/teams.list.js:72 +#: client/src/templates/list/templates-list.controller.js:102 #: client/src/templates/templates.list.js:120 #: client/src/users/list/users-list.controller.js:89 #: client/src/users/users.list.js:79 #: client/src/workflow-results/workflow-results.partial.html:54 -#: client/src/credential-types/credential-types.list.js:70 -#: client/src/credentials/list/credentials-list.controller.js:105 -#: client/src/projects/list/projects-list.controller.js:206 msgid "Delete" msgstr "ELIMINAR" @@ -1219,7 +1150,11 @@ msgstr "ELIMINAR" msgid "Delete Group" msgstr "Eliminar grupo" -#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:142 +#: client/src/job-results/job-results.service.js:93 +msgid "Delete Job" +msgstr "Eliminar tarea" + +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:175 msgid "Delete Source" msgstr "Eliminar fuente" @@ -1228,7 +1163,6 @@ msgid "Delete credential" msgstr "Eliminar la credencial." #: client/src/credential-types/credential-types.list.js:75 -#: client/src/credential-types/credential-types.list.js:72 msgid "Delete credential type" msgstr "Eliminar tipo de credencial" @@ -1240,12 +1174,10 @@ msgstr[0] "Eliminar grupo" msgstr[1] "Eliminar grupos" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:48 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:48 msgid "Delete groups" msgstr "Eliminar grupos" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:37 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:37 msgid "Delete groups and hosts" msgstr "Eliminar grupos y hosts" @@ -1257,11 +1189,10 @@ msgstr[0] "Eliminar host" msgstr[1] "Eliminar hosts" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:59 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:59 msgid "Delete hosts" msgstr "Eliminar hosts" -#: client/src/inventories-hosts/inventories/inventory.list.js:114 +#: client/src/inventories-hosts/inventories/inventory.list.js:113 msgid "Delete inventory" msgstr "Eliminar el inventario" @@ -1274,7 +1205,6 @@ msgid "Delete notification" msgstr "Eliminar la notificación" #: client/src/projects/projects.form.js:166 -#: client/src/projects/projects.form.js:165 msgid "Delete on Update" msgstr "Eliminar la actualización" @@ -1306,7 +1236,6 @@ msgid "Delete the job" msgstr "Eliminar el trabajo" #: client/src/projects/projects.form.js:168 -#: client/src/projects/projects.form.js:167 msgid "" "Delete the local repository in its entirety prior to performing an update." msgstr "" @@ -1334,7 +1263,6 @@ msgid "Deleting group" msgstr "Eliminando grupo" #: client/src/projects/projects.form.js:168 -#: client/src/projects/projects.form.js:167 msgid "" "Depending on the size of the repository this may significantly increase the " "amount of time required to complete an update." @@ -1364,61 +1292,50 @@ msgstr "Documentación de descripción de las instancias" #: client/src/templates/job_templates/job-template.form.js:41 #: client/src/templates/survey-maker/shared/question-definition.form.js:36 #: client/src/templates/workflows.form.js:39 -#: client/src/users/users.form.js:141 client/src/users/users.form.js:167 -#: client/src/inventories-hosts/hosts/host.form.js:62 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:61 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:55 -#: client/src/users/users.form.js:142 client/src/users/users.form.js:168 +#: client/src/users/users.form.js:145 client/src/users/users.form.js:171 msgid "Description" msgstr "Descripción" -#: client/src/notifications/notificationTemplates.form.js:139 -#: client/src/notifications/notificationTemplates.form.js:143 -#: client/src/notifications/notificationTemplates.form.js:155 -#: client/src/notifications/notificationTemplates.form.js:159 +#: client/src/notifications/notificationTemplates.form.js:136 #: client/src/notifications/notificationTemplates.form.js:140 -#: client/src/notifications/notificationTemplates.form.js:145 -#: client/src/notifications/notificationTemplates.form.js:157 -#: client/src/notifications/notificationTemplates.form.js:162 -#: client/src/notifications/notificationTemplates.form.js:378 +#: client/src/notifications/notificationTemplates.form.js:152 +#: client/src/notifications/notificationTemplates.form.js:156 msgid "Destination Channels" msgstr "Canales destinatarios" -#: client/src/notifications/notificationTemplates.form.js:362 -#: client/src/notifications/notificationTemplates.form.js:366 -#: client/src/notifications/notificationTemplates.form.js:373 +#: client/src/notifications/notificationTemplates.form.js:359 +#: client/src/notifications/notificationTemplates.form.js:363 msgid "Destination Channels or Users" msgstr "Canales destinatarios o usuarios" -#: client/src/notifications/notificationTemplates.form.js:208 -#: client/src/notifications/notificationTemplates.form.js:209 -#: client/src/notifications/notificationTemplates.form.js:212 -#: client/src/notifications/notificationTemplates.form.js:213 +#: client/src/notifications/notificationTemplates.form.js:205 +#: client/src/notifications/notificationTemplates.form.js:206 msgid "Destination SMS Number" msgstr "Número SMS del destinatario" #: client/features/credentials/credentials.strings.js:13 #: client/src/license/license.partial.html:5 -#: client/src/shared/form-generator.js:1474 -#: client/src/shared/form-generator.js:1525 +#: client/src/shared/form-generator.js:1481 msgid "Details" msgstr "Detalles" -#: client/src/job-submission/job-submission.partial.html:257 -#: client/src/job-submission/job-submission.partial.html:255 +#: client/src/job-submission/job-submission.partial.html:263 msgid "Diff Mode" msgstr "Modo diff" #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html:6 -#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:6 -msgid "Disassociate Group" -msgstr "Disociar grupo" +msgid "Disassociate Group From Group" +msgstr "Desasociar un grupo de otro grupo" #: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:6 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:6 msgid "Disassociate Host" msgstr "Disociar host" +#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:6 +#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:6 +msgid "Disassociate Host From Group" +msgstr "Desasociar un host de un grupo" + #: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js:65 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js:110 #: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js:98 @@ -1430,9 +1347,9 @@ msgid "Disassociate host" msgstr "Disociar host" #: client/src/configuration/auth-form/configuration-auth.controller.js:75 -#: client/src/configuration/configuration.controller.js:198 -#: client/src/configuration/configuration.controller.js:260 -#: client/src/configuration/system-form/configuration-system.controller.js:55 +#: client/src/configuration/configuration.controller.js:202 +#: client/src/configuration/configuration.controller.js:264 +#: client/src/configuration/system-form/configuration-system.controller.js:57 msgid "Discard changes" msgstr "Descartar cambios" @@ -1440,15 +1357,13 @@ msgstr "Descartar cambios" msgid "Dissasociate permission from team" msgstr "Desasociar permiso de un equipo." -#: client/src/users/users.form.js:221 client/src/users/users.form.js:222 +#: client/src/users/users.form.js:225 msgid "Dissasociate permission from user" msgstr "Desasociar permiso de un usuario" #: client/src/credentials/credentials.form.js:384 -#: client/src/credentials/factories/become-method-change.factory.js:60 -#: client/src/credentials/factories/kind-change.factory.js:117 -#: client/src/credentials/factories/become-method-change.factory.js:62 -#: client/src/credentials/factories/kind-change.factory.js:119 +#: client/src/credentials/factories/become-method-change.factory.js:54 +#: client/src/credentials/factories/kind-change.factory.js:111 msgid "Domain Name" msgstr "Nombre de dominio" @@ -1456,11 +1371,10 @@ msgstr "Nombre de dominio" #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:134 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:141 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:102 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:128 msgid "Download Output" msgstr "Descargar salida" -#: client/src/inventory-scripts/inventory-scripts.form.js:62 +#: client/src/inventory-scripts/inventory-scripts.form.js:59 msgid "" "Drag and drop your custom inventory script file here or create one in the " "field to import your custom inventory. Refer to the Ansible Tower " @@ -1470,7 +1384,7 @@ msgstr "" "cree uno en el campo para importar el inventario personalizado. Consulte la " "documentación de Ansible Tower para acceder a ejemplos de sintaxis." -#: client/src/partials/survey-maker-modal.html:76 +#: client/src/partials/survey-maker-modal.html:77 msgid "Drop question here to reorder" msgstr "Arrastre y suelte una pregunta aquí para reordenar" @@ -1493,7 +1407,6 @@ msgstr "EDITAR AVISO DE ENCUESTA" #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:46 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:79 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:59 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:66 msgid "ELAPSED" msgstr "TIEMPO TRANSCURRIDO" @@ -1522,7 +1435,6 @@ msgstr "" "inventario de la fuente seleccionada antes de ejecutar tareas de trabajo." #: client/src/projects/projects.form.js:179 -#: client/src/projects/projects.form.js:178 msgid "" "Each time a job runs using this project, perform an update to the local " "repository prior to starting the job." @@ -1539,21 +1451,16 @@ msgstr "" #: client/src/scheduler/schedules.list.js:75 client/src/teams/teams.list.js:55 #: client/src/templates/templates.list.js:103 #: client/src/users/users.list.js:60 -#: client/src/credential-types/credential-types.list.js:53 msgid "Edit" msgstr "Editar" -#: client/src/shared/form-generator.js:1707 -#: client/src/templates/job_templates/job-template.form.js:457 +#: client/src/shared/form-generator.js:1715 +#: client/src/templates/job_templates/job-template.form.js:452 #: client/src/templates/workflows.form.js:177 -#: client/src/shared/form-generator.js:1758 -#: client/src/templates/job_templates/job-template.form.js:474 -#: client/src/templates/workflows.form.js:182 msgid "Edit Survey" msgstr "Editar la encuesta" #: client/src/credential-types/credential-types.list.js:58 -#: client/src/credential-types/credential-types.list.js:55 msgid "Edit credenital type" msgstr "Editar tipo de credencial" @@ -1601,32 +1508,32 @@ msgstr "Editar el equipo" msgid "Edit template" msgstr "Editar la plantilla" -#: client/src/job-results/job-results.partial.html:188 +#: client/src/job-results/job-results.partial.html:191 msgid "Edit the Schedule" msgstr "Editar la planificación" -#: client/src/job-results/job-results.partial.html:172 +#: client/src/job-results/job-results.partial.html:175 #: client/src/workflow-results/workflow-results.partial.html:124 msgid "Edit the User" msgstr "Editar el usuario" -#: client/src/job-results/job-results.partial.html:262 -#: client/src/job-results/job-results.partial.html:277 -#: client/src/job-results/job-results.partial.html:293 -#: client/src/job-results/job-results.partial.html:308 -#: client/src/job-results/job-results.partial.html:323 +#: client/src/job-results/job-results.partial.html:265 +#: client/src/job-results/job-results.partial.html:280 +#: client/src/job-results/job-results.partial.html:296 +#: client/src/job-results/job-results.partial.html:311 +#: client/src/job-results/job-results.partial.html:326 msgid "Edit the credential" msgstr "Editar la credencial" -#: client/src/job-results/job-results.partial.html:203 +#: client/src/job-results/job-results.partial.html:206 msgid "Edit the inventory" msgstr "Editar el inventario" -#: client/src/job-results/job-results.partial.html:137 +#: client/src/job-results/job-results.partial.html:140 msgid "Edit the job template" msgstr "Editar la plantilla de trabajo" -#: client/src/job-results/job-results.partial.html:226 +#: client/src/job-results/job-results.partial.html:229 #: client/src/projects/projects.list.js:105 msgid "Edit the project" msgstr "Editar el proyecto" @@ -1640,11 +1547,9 @@ msgid "Edit user" msgstr "Editar el usuario" #: client/src/setup-menu/setup-menu.partial.html:61 -#: client/src/setup-menu/setup-menu.partial.html:67 msgid "Edit {{BRAND_NAME}}'s configuration." msgstr "Editar la configuración de {{BRAND_NAME}}." -#: client/src/projects/list/projects-list.controller.js:242 #: client/src/projects/list/projects-list.controller.js:241 msgid "" "Either you do not have access or the SCM update process completed. Click the" @@ -1654,7 +1559,7 @@ msgstr "" "completado. Pulse sobre el botón %sActualizar%s para ver el estado más " "reciente." -#: client/src/job-results/job-results.partial.html:517 +#: client/src/job-results/job-results.partial.html:520 msgid "Elapsed" msgstr "Tiempo transcurrido" @@ -1663,18 +1568,18 @@ msgstr "Tiempo transcurrido" msgid "Email" msgstr "Correo" +#: client/src/templates/job_templates/job-template.form.js:288 #: client/src/templates/job_templates/job-template.form.js:293 -#: client/src/templates/job_templates/job-template.form.js:298 msgid "Enable Concurrent Jobs" msgstr "Activar los trabajos concurrentes" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:123 +#: client/src/templates/job_templates/job-template.form.js:264 #: client/src/templates/job_templates/job-template.form.js:269 -#: client/src/templates/job_templates/job-template.form.js:274 msgid "Enable Privilege Escalation" msgstr "Activar la elevación de privilegios" -#: client/src/templates/job_templates/job-template.form.js:284 +#: client/src/templates/job_templates/job-template.form.js:279 msgid "" "Enables creation of a provisioning callback URL. Using the URL a host can " "contact {{BRAND_NAME}} and request a configuration update using this job " @@ -1689,17 +1594,14 @@ msgstr "" msgid "Encrypted credentials are not supported." msgstr "Credenciales cifrados no están soportados." -#: client/src/license/license.partial.html:108 +#: client/src/license/license.partial.html:113 msgid "End User License Agreement" msgstr "Acuerdo de licencia de usuario final" #: client/src/inventories-hosts/hosts/host.form.js:73 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:72 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:72 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:89 -#: client/src/inventories-hosts/hosts/host.form.js:72 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:71 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:98 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:86 msgid "" "Enter inventory variables using either JSON or YAML syntax. Use the radio " "button to toggle between the two." @@ -1707,7 +1609,7 @@ msgstr "" "Introduzca variables del inventario usando sintaxis JSON o YAML. Utilice el " "botón de selección para elegir entre los dos." -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:98 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:93 msgid "" "Enter inventory variables using either JSON or YAML syntax. Use the radio " "button to toggle between the two. Refer to the Ansible Tower documentation " @@ -1717,14 +1619,14 @@ msgstr "" "Utilice el botón de selección para alternar entre los dos. Consulte la " "documentación de Ansible Tower para acceder a ejemplos de sintaxis." -#: client/src/notifications/notificationTemplates.form.js:158 +#: client/src/notifications/notificationTemplates.form.js:155 msgid "" "Enter one HipChat channel per line. The pound symbol (#) is not required." msgstr "" "Ingrese un canal de HipChat por línea. El símbolo numeral (#) no es " "necesario." -#: client/src/notifications/notificationTemplates.form.js:365 +#: client/src/notifications/notificationTemplates.form.js:362 msgid "" "Enter one IRC channel or username per line. The pound symbol (#) for " "channels, and the at (@) symbol for users, are not required." @@ -1732,13 +1634,13 @@ msgstr "" "Ingrese un canal de IRC o nombre de usuario por línea. El símbolo numeral " "(#) para canales y el símbolo arroba (@) para usuarios no son necesarios." -#: client/src/notifications/notificationTemplates.form.js:142 +#: client/src/notifications/notificationTemplates.form.js:139 msgid "" "Enter one Slack channel per line. The pound symbol (#) is not required." msgstr "" "Ingrese un canal de Slack por línea. El símbolo numeral (#) no es necesario." -#: client/src/notifications/notificationTemplates.form.js:100 +#: client/src/notifications/notificationTemplates.form.js:97 msgid "" "Enter one email address per line to create a recipient list for this type of" " notification." @@ -1746,17 +1648,15 @@ msgstr "" "Ingrese una dirección de correo electrónico por línea para crear una lista " "de destinatarios para este tipo de notificación." -#: client/src/notifications/notificationTemplates.form.js:212 +#: client/src/notifications/notificationTemplates.form.js:209 msgid "" "Enter one phone number per line to specify where to route SMS messages." msgstr "" "Ingrese un número de teléfono por línea para indicar adónde enviar los " "mensajes de SMS." -#: client/src/credentials/factories/become-method-change.factory.js:87 -#: client/src/credentials/factories/kind-change.factory.js:144 -#: client/src/credentials/factories/become-method-change.factory.js:89 -#: client/src/credentials/factories/kind-change.factory.js:146 +#: client/src/credentials/factories/become-method-change.factory.js:81 +#: client/src/credentials/factories/kind-change.factory.js:138 msgid "" "Enter the URL for the virtual machine which %scorresponds to your CloudForm " "instance. %sFor example, %s" @@ -1764,10 +1664,8 @@ msgstr "" "Introduzca la URL para la máquina virtual la cual %scorresponda a su " "instancia CloudForm. %sPor ejemplo, %s" -#: client/src/credentials/factories/become-method-change.factory.js:77 -#: client/src/credentials/factories/kind-change.factory.js:134 -#: client/src/credentials/factories/become-method-change.factory.js:79 -#: client/src/credentials/factories/kind-change.factory.js:136 +#: client/src/credentials/factories/become-method-change.factory.js:71 +#: client/src/credentials/factories/kind-change.factory.js:128 msgid "" "Enter the URL which corresponds to your %sRed Hat Satellite 6 server. %sFor " "example, %s" @@ -1775,17 +1673,15 @@ msgstr "" "Introduzca la URL que corresponda a su servidor %sRed Hat Satellite 6. %sPor" " ejemplo, %s" -#: client/src/credentials/factories/become-method-change.factory.js:55 -#: client/src/credentials/factories/kind-change.factory.js:112 -#: client/src/credentials/factories/become-method-change.factory.js:57 -#: client/src/credentials/factories/kind-change.factory.js:114 +#: client/src/credentials/factories/become-method-change.factory.js:49 +#: client/src/credentials/factories/kind-change.factory.js:106 msgid "" "Enter the hostname or IP address which corresponds to your VMware vCenter." msgstr "" "Introduzca el nombre de servidor o dirección IP que corresponda a su VMWare " "vCenter." -#: client/src/notifications/notificationTemplates.form.js:198 +#: client/src/notifications/notificationTemplates.form.js:195 msgid "" "Enter the number associated with the \"Messaging Service\" in Twilio in the " "format +18005550199." @@ -1805,56 +1701,42 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:187 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:194 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:174 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:181 msgid "Environment Variables" msgstr "Variables del entorno" -#: client/src/configuration/configuration.controller.js:344 -#: client/src/configuration/configuration.controller.js:443 -#: client/src/configuration/configuration.controller.js:477 -#: client/src/configuration/configuration.controller.js:524 -#: client/src/configuration/system-form/configuration-system.controller.js:226 +#: client/src/configuration/configuration.controller.js:348 +#: client/src/configuration/configuration.controller.js:449 +#: client/src/configuration/configuration.controller.js:483 +#: client/src/configuration/configuration.controller.js:530 +#: client/src/configuration/system-form/configuration-system.controller.js:231 #: client/src/credentials/factories/credential-form-save.factory.js:77 #: client/src/credentials/factories/credential-form-save.factory.js:93 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:191 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:210 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:129 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:139 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:166 +#: client/src/job-submission/job-submission-factories/launchjob.factory.js:194 +#: client/src/job-submission/job-submission-factories/launchjob.factory.js:213 #: client/src/management-jobs/card/card.controller.js:140 #: client/src/management-jobs/card/card.controller.js:230 #: client/src/management-jobs/card/card.controller.js:28 #: client/src/projects/add/projects-add.controller.js:108 -#: client/src/projects/edit/projects-edit.controller.js:150 -#: client/src/projects/edit/projects-edit.controller.js:216 -#: client/src/projects/edit/projects-edit.controller.js:232 +#: client/src/projects/edit/projects-edit.controller.js:156 +#: client/src/projects/edit/projects-edit.controller.js:222 +#: client/src/projects/edit/projects-edit.controller.js:238 #: client/src/projects/list/projects-list.controller.js:169 #: client/src/projects/list/projects-list.controller.js:198 -#: client/src/projects/list/projects-list.controller.js:226 -#: client/src/projects/list/projects-list.controller.js:247 -#: client/src/projects/list/projects-list.controller.js:263 -#: client/src/projects/list/projects-list.controller.js:272 -#: client/src/users/add/users-add.controller.js:98 +#: client/src/projects/list/projects-list.controller.js:225 +#: client/src/projects/list/projects-list.controller.js:246 +#: client/src/projects/list/projects-list.controller.js:262 +#: client/src/projects/list/projects-list.controller.js:271 +#: client/src/users/add/users-add.controller.js:99 #: client/src/users/edit/users-edit.controller.js:180 #: client/src/users/edit/users-edit.controller.js:80 #: client/src/users/list/users-list.controller.js:82 -#: client/src/configuration/configuration.controller.js:341 -#: client/src/configuration/configuration.controller.js:440 -#: client/src/configuration/configuration.controller.js:474 -#: client/src/configuration/configuration.controller.js:518 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:188 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:207 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:119 -#: client/src/projects/list/projects-list.controller.js:168 -#: client/src/projects/list/projects-list.controller.js:197 -#: client/src/projects/list/projects-list.controller.js:225 -#: client/src/projects/list/projects-list.controller.js:246 -#: client/src/projects/list/projects-list.controller.js:261 -#: client/src/projects/list/projects-list.controller.js:270 -#: client/src/users/edit/users-edit.controller.js:163 msgid "Error!" msgstr "¡Error!" #: client/src/activity-stream/streams.list.js:40 -#: client/src/activity-stream/streams.list.js:41 msgid "Event" msgstr "Evento" @@ -1867,21 +1749,21 @@ msgid "Event summary not available" msgstr "Resumen del evento no disponible." #: client/src/projects/add/projects-add.controller.js:129 -#: client/src/projects/edit/projects-edit.controller.js:259 +#: client/src/projects/edit/projects-edit.controller.js:265 msgid "Example URLs for GIT SCM include:" msgstr "Ejemplos de URLs para SCM GIT :" #: client/src/projects/add/projects-add.controller.js:150 -#: client/src/projects/edit/projects-edit.controller.js:279 +#: client/src/projects/edit/projects-edit.controller.js:285 msgid "Example URLs for Mercurial SCM include:" msgstr "Ejemplos de URLs para SCM Mercurial :" #: client/src/projects/add/projects-add.controller.js:141 -#: client/src/projects/edit/projects-edit.controller.js:270 +#: client/src/projects/edit/projects-edit.controller.js:276 msgid "Example URLs for Subversion SCM include:" msgstr "Ejemplos de URLs para SCM Subversion :" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:68 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65 msgid "Example: ansible_facts.ansible_distribution:\"RedHat\"" msgstr "Ejemplo: ansible_facts.ansible_distribution:\"RedHat\"" @@ -1899,9 +1781,6 @@ msgstr "Host existente" #: client/src/standard-out/standard-out.controller.js:245 #: client/src/workflow-results/workflow-results.controller.js:120 #: client/src/workflow-results/workflow-results.controller.js:76 -#: client/src/job-results/job-results.controller.js:221 -#: client/src/standard-out/standard-out.controller.js:23 -#: client/src/standard-out/standard-out.controller.js:247 msgid "Expand Output" msgstr "Extender salida" @@ -1913,24 +1792,20 @@ msgstr "Fecha de expiración el" msgid "Explanation" msgstr "Explicación" -#: client/src/job-results/job-results.partial.html:272 +#: client/src/job-results/job-results.partial.html:275 msgid "Extra Credentials" msgstr "Credenciales adicionales" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:132 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:144 -#: client/src/job-results/job-results.partial.html:406 -#: client/src/job-submission/job-submission.partial.html:161 +#: client/src/job-results/job-results.partial.html:409 +#: client/src/job-submission/job-submission.partial.html:165 #: client/src/partials/logviewer.html:8 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:105 -#: client/src/templates/job_templates/job-template.form.js:347 -#: client/src/templates/job_templates/job-template.form.js:354 +#: client/src/templates/job_templates/job-template.form.js:342 +#: client/src/templates/job_templates/job-template.form.js:349 #: client/src/templates/workflows.form.js:74 #: client/src/templates/workflows.form.js:81 -#: client/src/job-submission/job-submission.partial.html:159 -#: client/src/templates/job_templates/job-template.form.js:359 -#: client/src/templates/job_templates/job-template.form.js:371 -#: client/src/templates/workflows.form.js:86 msgid "Extra Variables" msgstr "Variables adicionales" @@ -1939,7 +1814,7 @@ msgstr "Variables adicionales" msgid "FACTS" msgstr "EVENTOS" -#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:63 +#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:64 msgid "FAILED" msgstr "FALLIDO" @@ -1950,16 +1825,12 @@ msgstr "CAMPOS:" #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:39 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:72 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:52 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:59 msgid "FINISHED" msgstr "FINALIZADO" #: client/src/inventories-hosts/hosts/host.form.js:107 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:106 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:106 -#: client/src/inventories-hosts/hosts/host.form.js:111 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:111 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:105 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:107 msgid "Facts" msgstr "Eventos" @@ -1971,7 +1842,7 @@ msgstr "Fallido" msgid "Failed Hosts" msgstr "Servidores fallidos" -#: client/src/users/add/users-add.controller.js:98 +#: client/src/users/add/users-add.controller.js:99 msgid "Failed to add new user. POST returned status:" msgstr "Ha fallado la creación de nuevo usuario. POST ha devuelto el estado:" @@ -1984,29 +1855,25 @@ msgid "Failed to create new project. POST returned status:" msgstr "" "Ha fallado la creación de un nuevo proyecto. POST ha devuelto el estado:" -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:211 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:208 +#: client/src/job-submission/job-submission-factories/launchjob.factory.js:214 msgid "Failed to retrieve job template extra variables." msgstr "" "Ha fallado la obtención de variables adicionales para la plantilla de tarea." -#: client/src/projects/edit/projects-edit.controller.js:151 +#: client/src/projects/edit/projects-edit.controller.js:157 msgid "Failed to retrieve project: %s. GET status:" msgstr "Ha fallado la obtención del proyecto: %s. Estado GET :" #: client/src/users/edit/users-edit.controller.js:181 #: client/src/users/edit/users-edit.controller.js:81 -#: client/src/users/edit/users-edit.controller.js:164 msgid "Failed to retrieve user: %s. GET status:" msgstr "Ha fallado la obtención del usuario: %s. Estado GET :" -#: client/src/configuration/configuration.controller.js:444 -#: client/src/configuration/configuration.controller.js:441 +#: client/src/configuration/configuration.controller.js:450 msgid "Failed to save settings. Returned status:" msgstr "Ha fallado guardar los ajustes. Estado devuelto:" -#: client/src/configuration/configuration.controller.js:478 -#: client/src/configuration/configuration.controller.js:475 +#: client/src/configuration/configuration.controller.js:484 msgid "Failed to save toggle settings. Returned status:" msgstr "Ha fallado el guardado de los ajustes cambiados. Estado devuelto:" @@ -2014,14 +1881,13 @@ msgstr "Ha fallado el guardado de los ajustes cambiados. Estado devuelto:" msgid "Failed to update Credential. PUT status:" msgstr "Ha fallado la actualización de Credencial. Estado PUT :" -#: client/src/projects/edit/projects-edit.controller.js:216 +#: client/src/projects/edit/projects-edit.controller.js:222 msgid "Failed to update project: %s. PUT status:" msgstr "Ha fallado la actualización del proyecto: %s. Estado PUT :" -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:192 +#: client/src/job-submission/job-submission-factories/launchjob.factory.js:195 #: client/src/management-jobs/card/card.controller.js:141 #: client/src/management-jobs/card/card.controller.js:231 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:189 msgid "Failed updating job %s with variables. POST returned: %d" msgstr "" "Ha fallado la actualización del trabajo %s con variables. POST ha devuelto: " @@ -2044,11 +1910,10 @@ msgstr "Última ejecución" #: client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js:54 #: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:58 #: client/src/inventories-hosts/shared/factories/set-status.factory.js:44 -#: client/src/job-results/job-results.partial.html:108 +#: client/src/job-results/job-results.partial.html:111 #: client/src/jobs/all-jobs.list.js:66 #: client/src/portal-mode/portal-jobs.list.js:40 #: client/src/templates/completed-jobs.list.js:59 -#: client/src/portal-mode/portal-jobs.list.js:39 msgid "Finished" msgstr "Finalizado" @@ -2069,10 +1934,8 @@ msgstr "" "Para obtener información adicional sobre la sintaxis de búsqueda avanzada, " "consulte Ansible Tower" -#: client/src/credentials/factories/become-method-change.factory.js:69 -#: client/src/credentials/factories/kind-change.factory.js:126 -#: client/src/credentials/factories/become-method-change.factory.js:71 -#: client/src/credentials/factories/kind-change.factory.js:128 +#: client/src/credentials/factories/become-method-change.factory.js:63 +#: client/src/credentials/factories/kind-change.factory.js:120 msgid "For example, %s" msgstr "Por ejemplo, %s" @@ -2082,8 +1945,6 @@ msgstr "Por ejemplo, %s" #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js:32 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:35 #: client/src/inventories-hosts/inventories/related/hosts/related-host.list.js:31 -#: client/src/inventories-hosts/hosts/host.form.js:35 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:34 msgid "" "For hosts that are part of an external inventory, this flag cannot be " "changed. It will be set by the inventory sync process." @@ -2104,7 +1965,6 @@ msgstr "" "ejecutar el manual." #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:118 -#: client/src/templates/job_templates/job-template.form.js:176 msgid "" "For more information and examples see %sthe Patterns topic at " "docs.ansible.com%s." @@ -2114,12 +1974,10 @@ msgstr "" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:109 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:96 -#: client/src/job-results/job-results.partial.html:333 +#: client/src/job-results/job-results.partial.html:336 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:87 -#: client/src/templates/job_templates/job-template.form.js:149 -#: client/src/templates/job_templates/job-template.form.js:159 -#: client/src/templates/job_templates/job-template.form.js:152 -#: client/src/templates/job_templates/job-template.form.js:165 +#: client/src/templates/job_templates/job-template.form.js:144 +#: client/src/templates/job_templates/job-template.form.js:154 msgid "Forks" msgstr "Forks" @@ -2148,8 +2006,7 @@ msgstr "Equipo GitHub" msgid "Google OAuth2" msgstr "Google OAuth2" -#: client/src/teams/teams.form.js:155 client/src/users/users.form.js:210 -#: client/src/users/users.form.js:211 +#: client/src/teams/teams.form.js:155 client/src/users/users.form.js:214 msgid "Grant Permission" msgstr "Conceder permiso" @@ -2183,13 +2040,9 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.form.js:88 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js:32 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:114 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:114 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:115 #: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js:32 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:172 -#: client/src/inventories-hosts/hosts/host.form.js:119 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:119 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:113 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:178 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:167 msgid "Groups" msgstr "Grupos" @@ -2209,14 +2062,11 @@ msgstr "" #: client/src/inventories-hosts/inventories/inventories.partial.html:14 #: client/src/inventories-hosts/inventories/related/hosts/related-host.route.js:18 #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-hosts.route.js:17 -#: client/src/activity-stream/get-target-title.factory.js:38 msgid "HOSTS" msgstr "SERVIDORES" -#: client/src/notifications/notificationTemplates.form.js:323 -#: client/src/notifications/notificationTemplates.form.js:324 -#: client/src/notifications/notificationTemplates.form.js:328 -#: client/src/notifications/notificationTemplates.form.js:329 +#: client/src/notifications/notificationTemplates.form.js:320 +#: client/src/notifications/notificationTemplates.form.js:321 msgid "HTTP Headers" msgstr "Cabeceras HTTP" @@ -2229,27 +2079,23 @@ msgid "High" msgstr "Alto" #: client/src/credentials/credentials.form.js:139 -#: client/src/notifications/notificationTemplates.form.js:86 +#: client/src/notifications/notificationTemplates.form.js:83 msgid "Host" msgstr "Servidor" -#: client/src/credentials/factories/become-method-change.factory.js:58 -#: client/src/credentials/factories/kind-change.factory.js:115 -#: client/src/credentials/factories/become-method-change.factory.js:60 -#: client/src/credentials/factories/kind-change.factory.js:117 +#: client/src/credentials/factories/become-method-change.factory.js:52 +#: client/src/credentials/factories/kind-change.factory.js:109 msgid "Host (Authentication URL)" msgstr "Servidor (URL de autentificación)" -#: client/src/templates/job_templates/job-template.form.js:329 -#: client/src/templates/job_templates/job-template.form.js:338 +#: client/src/templates/job_templates/job-template.form.js:324 +#: client/src/templates/job_templates/job-template.form.js:333 msgid "Host Config Key" msgstr "Clave de configuración del servidor" #: client/src/inventories-hosts/hosts/host.form.js:40 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:39 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:39 -#: client/src/inventories-hosts/hosts/host.form.js:39 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:38 msgid "Host Enabled" msgstr "Servidor habilitado" @@ -2259,18 +2105,12 @@ msgstr "Servidor habilitado" #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:56 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:45 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:56 -#: client/src/inventories-hosts/hosts/host.form.js:45 -#: client/src/inventories-hosts/hosts/host.form.js:56 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:44 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:55 msgid "Host Name" msgstr "Nombre de Host" #: client/src/inventories-hosts/hosts/host.form.js:80 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:79 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:79 -#: client/src/inventories-hosts/hosts/host.form.js:79 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:78 msgid "Host Variables" msgstr "Variables de Host" @@ -2295,11 +2135,9 @@ msgstr "El host no está disponible. Haga clic para alternar." #: client/src/inventories-hosts/inventories/related/groups/groups.form.js:98 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js:57 #: client/src/inventories-hosts/inventories/related/hosts/related-host.list.js:56 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:170 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:181 -#: client/src/job-results/job-results.partial.html:501 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:168 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:187 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:167 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:176 +#: client/src/job-results/job-results.partial.html:504 msgid "Hosts" msgstr "Servidores" @@ -2320,7 +2158,7 @@ msgstr "Servidores utilizados" msgid "Hosts are imported to" msgstr "Los hosts se importan a" -#: client/src/license/license.partial.html:116 +#: client/src/license/license.partial.html:121 msgid "I agree to the End User License Agreement" msgstr "Yo acepto el Acuerdo de licencia de usuario final." @@ -2349,7 +2187,7 @@ msgstr "OBSERVACIONES" msgid "INSTANCE GROUPS" msgstr "GRUPOS DE INSTANCIA" -#: client/src/instance-groups/instance-group.partial.html:28 +#: client/src/instance-groups/instance-group.partial.html:27 msgid "INSTANCES" msgstr "INSTANCIAS" @@ -2363,14 +2201,11 @@ msgstr "INSTANCIAS" #: client/src/main-menu/main-menu.partial.html:27 #: client/src/organizations/linkout/organizations-linkout.route.js:143 #: client/src/organizations/list/organizations-list.controller.js:66 -#: client/src/activity-stream/get-target-title.factory.js:11 -#: client/src/organizations/linkout/organizations-linkout.route.js:141 msgid "INVENTORIES" msgstr "INVENTARIOS" -#: client/src/job-submission/job-submission.partial.html:339 +#: client/src/job-submission/job-submission.partial.html:346 #: client/src/partials/job-template-details.html:2 -#: client/src/job-submission/job-submission.partial.html:336 msgid "INVENTORY" msgstr "INVENTARIO" @@ -2381,7 +2216,6 @@ msgstr "SCRIPT DE INVENTARIO" #: client/src/activity-stream/get-target-title.factory.js:35 #: client/src/inventory-scripts/inventory-scripts.list.js:12 #: client/src/inventory-scripts/main.js:66 -#: client/src/activity-stream/get-target-title.factory.js:32 msgid "INVENTORY SCRIPTS" msgstr "SCRIPTS DE INVENTARIO" @@ -2389,13 +2223,11 @@ msgstr "SCRIPTS DE INVENTARIO" msgid "INVENTORY SOURCES" msgstr "FUENTES DE INVENTARIO" -#: client/src/notifications/notificationTemplates.form.js:351 -#: client/src/notifications/notificationTemplates.form.js:362 +#: client/src/notifications/notificationTemplates.form.js:348 msgid "IRC Nick" msgstr "Alias en IRC" -#: client/src/notifications/notificationTemplates.form.js:340 -#: client/src/notifications/notificationTemplates.form.js:351 +#: client/src/notifications/notificationTemplates.form.js:337 msgid "IRC Server Address" msgstr "Dirección del servidor IRC" @@ -2424,14 +2256,6 @@ msgstr "Sesión inactiva" msgid "If blank, all groups above are created except" msgstr "Si está en blanco, se crean todos los grupos de arriba, excepto" -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:331 -msgid "" -"If checked, all child groups and hosts not found on the external source will" -" be deleted from the local inventory." -msgstr "" -"Si las opciones están marcadas, los grupos de hijos y los hosts que no se " -"encuentren en la fuente externa se eliminarán del inventario local." - #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:343 msgid "" "If checked, all variables for child groups and hosts will be removed and " @@ -2441,29 +2265,52 @@ msgstr "" " hosts se eliminarán y reemplazarán con aquellas que se hallen en la fuente " "externa." -#: client/src/templates/job_templates/job-template.form.js:272 +#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:331 +msgid "" +"If checked, any hosts and groups that were previously present on the " +"external source but are now removed will be removed from the Tower " +"inventory. Hosts and groups that were not managed by the inventory source " +"will be promoted to the next manually created group or if there is no " +"manually created group to promote them into, they will be left in the " +"\"all\" default group for the inventory." +msgstr "" +"Si las opciones están marcadas, cualquier grupo o host que fueron " +"presentados previamente en la fuente externa pero que ahora son eliminados " +"del inventario de Tower. Los hosts y grupos que no fueron administrados por " +"la fuente del inventario serán promovidos al siguiente grupo creado " +"manualmente o, si no hay un grupo creado manualmente al que puedan ser " +"promovidos, se los dejará en el grupo predeterminado \"Todo\" para el " +"inventario." + +#: client/src/templates/job_templates/job-template.form.js:267 msgid "If enabled, run this playbook as an administrator." msgstr "" "Si se encuentra habilitada la opción, ejecute este manual como " "administrador." #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:120 -#: client/src/templates/job_templates/job-template.form.js:256 -#: client/src/templates/job_templates/job-template.form.js:258 msgid "" "If enabled, show the changes made by Ansible tasks, where supported. This is" -" equivalent to Ansible's --diff mode." +" equivalent to Ansible’s --diff mode." msgstr "" "Si se habilita, muestra los cambios realizados por las tareas de Ansible, " "donde sea compatible. Esto es equivalente al modo --diff de Ansible." -#: client/src/templates/job_templates/job-template.form.js:296 +#: client/src/templates/job_templates/job-template.form.js:251 +msgid "" +"If enabled, show the changes made by Ansible tasks, where supported. This is" +" equivalent to Ansible’s --diff mode." +msgstr "" +"Si se habilita, muestra los cambios realizados por las tareas de Ansible, " +"donde sea compatible. Esto es equivalente al modo --diff de Ansible." + +#: client/src/templates/job_templates/job-template.form.js:291 msgid "If enabled, simultaneous runs of this job template will be allowed." msgstr "" "Si se habilita esta opción, la ejecución de esta plantilla de trabajo en " "paralelo será permitida." -#: client/src/templates/job_templates/job-template.form.js:307 +#: client/src/templates/job_templates/job-template.form.js:302 msgid "" "If enabled, use cached facts if available and store discovered facts in the " "cache." @@ -2502,8 +2349,6 @@ msgstr "ID de la imagen:" #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js:30 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:33 #: client/src/inventories-hosts/inventories/related/hosts/related-host.list.js:29 -#: client/src/inventories-hosts/hosts/host.form.js:33 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:32 msgid "" "Indicates if a host is available and should be included in running jobs." msgstr "" @@ -2512,56 +2357,46 @@ msgstr "" #: client/src/activity-stream/activity-detail.form.js:31 #: client/src/activity-stream/streams.list.js:33 -#: client/src/activity-stream/streams.list.js:34 msgid "Initiated by" msgstr "Inicializado por" #: client/src/credential-types/credential-types.form.js:53 #: client/src/credential-types/credential-types.form.js:61 -#: client/src/credential-types/credential-types.form.js:60 -#: client/src/credential-types/credential-types.form.js:75 msgid "Injector Configuration" msgstr "Configuración del inyector" #: client/src/credential-types/credential-types.form.js:39 #: client/src/credential-types/credential-types.form.js:47 -#: client/src/credential-types/credential-types.form.js:54 msgid "Input Configuration" msgstr "Configuración de entrada" #: client/src/inventories-hosts/hosts/host.form.js:123 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:121 -#: client/src/inventories-hosts/hosts/host.form.js:127 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:120 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:122 msgid "Insights" msgstr "Insights" -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:72 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:69 msgid "Insights Credential" msgstr "Credencial de Insights" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:145 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:148 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:135 msgid "Instance Filters" msgstr "Filtros de instancias" -#: client/src/job-results/job-results.partial.html:366 +#: client/src/job-results/job-results.partial.html:369 msgid "Instance Group" msgstr "Grupo de instancias" +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:72 #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:75 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:78 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:83 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:86 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:78 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:81 #: client/src/organizations/organizations.form.js:38 #: client/src/organizations/organizations.form.js:41 #: client/src/setup-menu/setup-menu.partial.html:54 -#: client/src/templates/job_templates/job-template.form.js:196 -#: client/src/templates/job_templates/job-template.form.js:199 -#: client/src/setup-menu/setup-menu.partial.html:60 -#: client/src/templates/job_templates/job-template.form.js:205 -#: client/src/templates/job_templates/job-template.form.js:208 +#: client/src/templates/job_templates/job-template.form.js:191 +#: client/src/templates/job_templates/job-template.form.js:194 msgid "Instance Groups" msgstr "Grupos de instancias" @@ -2597,8 +2432,8 @@ msgstr "Entrada no válida para este tipo." msgid "Invalid username and/or password. Please try again." msgstr "Nombre de usuario o contraseña inválida. Por favor intente de nuevo." -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:128 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:53 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:122 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:52 #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:26 #: client/src/home/dashboard/counts/dashboard-counts.directive.js:50 #: client/src/organizations/linkout/organizations-linkout.route.js:155 @@ -2608,7 +2443,7 @@ msgstr "Inventarios" #: client/src/inventories-hosts/hosts/host.list.js:69 #: client/src/inventories-hosts/inventories/inventory.list.js:80 #: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:69 -#: client/src/job-results/job-results.partial.html:198 +#: client/src/job-results/job-results.partial.html:201 #: client/src/job-submission/job-submission.partial.html:17 #: client/src/organizations/linkout/controllers/organizations-inventories.controller.js:70 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:58 @@ -2616,21 +2451,16 @@ msgstr "Inventarios" #: client/src/templates/job_templates/job-template.form.js:80 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:72 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:82 -#: client/src/templates/job_templates/job-template.form.js:70 -#: client/src/templates/job_templates/job-template.form.js:84 msgid "Inventory" msgstr "Inventario" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:110 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:124 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:104 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:116 msgid "Inventory File" msgstr "Archivo de inventario" #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:27 #: client/src/setup-menu/setup-menu.partial.html:41 -#: client/src/setup-menu/setup-menu.partial.html:34 msgid "Inventory Scripts" msgstr "Scripts de inventario" @@ -2642,8 +2472,7 @@ msgstr "Sincronización de inventario" msgid "Inventory Sync Failures" msgstr "Errores de sincronización de inventario" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:96 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:105 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:93 msgid "Inventory Variables" msgstr "Variables de inventario" @@ -2663,26 +2492,23 @@ msgstr "PLANTILLA DE TRABAJO" #: client/src/organizations/list/organizations-list.controller.js:78 #: client/src/portal-mode/portal-job-templates.list.js:13 #: client/src/portal-mode/portal-job-templates.list.js:14 -#: client/src/organizations/linkout/organizations-linkout.route.js:250 msgid "JOB TEMPLATES" msgstr "PLANTILLAS DE TRABAJO" #: client/src/activity-stream/get-target-title.factory.js:32 -#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:109 -#: client/src/instance-groups/instance-group.partial.html:29 -#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:28 +#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:118 +#: client/src/instance-groups/instance-group.partial.html:28 +#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:27 #: client/src/instance-groups/jobs/jobs-list.route.js:9 #: client/src/jobs/jobs.route.js:15 #: client/src/main-menu/main-menu.partial.html:122 #: client/src/main-menu/main-menu.partial.html:43 #: client/src/portal-mode/portal-jobs.list.js:13 #: client/src/portal-mode/portal-jobs.list.js:17 -#: client/src/activity-stream/get-target-title.factory.js:29 msgid "JOBS" msgstr "TRABAJOS" -#: client/src/job-submission/job-submission.partial.html:169 -#: client/src/job-submission/job-submission.partial.html:167 +#: client/src/job-submission/job-submission.partial.html:173 msgid "JSON" msgstr "JSON" @@ -2692,15 +2518,12 @@ msgstr "JSON" msgid "JSON:" msgstr "JSON:" -#: client/src/job-results/job-results.partial.html:381 -#: client/src/job-submission/job-submission.partial.html:222 -#: client/src/templates/job_templates/job-template.form.js:205 -#: client/src/templates/job_templates/job-template.form.js:212 +#: client/src/job-results/job-results.partial.html:384 +#: client/src/job-submission/job-submission.partial.html:228 +#: client/src/templates/job_templates/job-template.form.js:200 +#: client/src/templates/job_templates/job-template.form.js:207 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:127 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:135 -#: client/src/job-submission/job-submission.partial.html:220 -#: client/src/templates/job_templates/job-template.form.js:214 -#: client/src/templates/job_templates/job-template.form.js:223 msgid "Job Tags" msgstr "Etiquetas de trabajo" @@ -2708,22 +2531,19 @@ msgstr "Etiquetas de trabajo" msgid "Job Template" msgstr "Plantilla de trabajo" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:109 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:103 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:36 #: client/src/organizations/linkout/organizations-linkout.route.js:268 -#: client/src/organizations/linkout/organizations-linkout.route.js:262 msgid "Job Templates" msgstr "Plantillas de trabajo" #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:32 -#: client/src/job-results/job-results.partial.html:156 -#: client/src/job-submission/job-submission.partial.html:196 +#: client/src/job-results/job-results.partial.html:159 +#: client/src/job-submission/job-submission.partial.html:202 #: client/src/templates/job_templates/job-template.form.js:47 #: client/src/templates/job_templates/job-template.form.js:55 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:103 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:92 -#: client/src/job-submission/job-submission.partial.html:194 -#: client/src/templates/job_templates/job-template.form.js:59 msgid "Job Type" msgstr "Tipo de trabajo" @@ -2742,14 +2562,13 @@ msgid "Jobs" msgstr "Trabajos" #: client/src/job-results/job-results.controller.js:269 -#: client/src/job-results/job-results.controller.js:321 +#: client/src/job-results/job-results.controller.js:366 msgid "Jump to last line of standard out." msgstr "Ir a la última línea de la salida estándar." #: client/src/access/add-rbac-resource/rbac-resource.partial.html:61 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:102 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:154 #: client/src/shared/smart-search/smart-search.partial.html:14 -#: client/src/access/add-rbac-resource/rbac-resource.partial.html:63 msgid "Key" msgstr "Clave" @@ -2769,7 +2588,6 @@ msgstr "EJECUTAR TAREA" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:86 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:66 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:73 msgid "LAUNCH TYPE" msgstr "TIPO DE EJECUCIÓN" @@ -2778,12 +2596,10 @@ msgid "LDAP" msgstr "LDAP" #: client/src/license/license.route.js:19 -#: client/src/license/license.route.js:18 msgid "LICENSE" msgstr "LICENCIA" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:58 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:45 msgid "LICENSE ERROR" msgstr "ERROR DE LICENCIA" @@ -2793,16 +2609,14 @@ msgstr "CERRAR SESIÓN" #: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:68 #: client/src/instance-groups/jobs/jobs.list.js:66 -#: client/src/job-results/job-results.partial.html:431 -#: client/src/job-results/job-results.partial.html:440 +#: client/src/job-results/job-results.partial.html:434 +#: client/src/job-results/job-results.partial.html:443 #: client/src/jobs/all-jobs.list.js:74 -#: client/src/templates/job_templates/job-template.form.js:239 -#: client/src/templates/job_templates/job-template.form.js:243 +#: client/src/templates/job_templates/job-template.form.js:234 +#: client/src/templates/job_templates/job-template.form.js:238 #: client/src/templates/templates.list.js:43 #: client/src/templates/workflows.form.js:62 #: client/src/templates/workflows.form.js:67 -#: client/src/templates/job_templates/job-template.form.js:347 -#: client/src/templates/job_templates/job-template.form.js:352 msgid "Labels" msgstr "Etiquetas" @@ -2820,25 +2634,22 @@ msgid "Last Updated" msgstr "Última actualización" #: client/src/portal-mode/portal-job-templates.list.js:36 -#: client/src/shared/form-generator.js:1699 +#: client/src/shared/form-generator.js:1707 #: client/src/templates/templates.list.js:80 -#: client/src/shared/form-generator.js:1750 msgid "Launch" msgstr "Ejecutar" #: client/src/management-jobs/card/card.partial.html:23 -#: client/src/management-jobs/card/card.partial.html:21 msgid "Launch Management Job" msgstr "Ejecutar trabajo de gestión" -#: client/src/job-results/job-results.partial.html:167 -#: client/src/job-results/job-results.partial.html:182 +#: client/src/job-results/job-results.partial.html:170 +#: client/src/job-results/job-results.partial.html:185 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:76 msgid "Launched By" msgstr "Ejecutado por" #: client/src/job-submission/job-submission.partial.html:99 -#: client/src/job-submission/job-submission.partial.html:97 msgid "" "Launching this job requires the passwords listed below. Enter and confirm " "each password before continuing." @@ -2846,8 +2657,7 @@ msgstr "" "Ejecutar esta tarea requiere las siguientes contraseñas. Ingrese y confirme " "cada contraseña antes de continuar." -#: client/features/credentials/legacy.credentials.js:360 -#: client/features/credentials/legacy.credentials.js:343 +#: client/features/credentials/legacy.credentials.js:357 msgid "Legacy state configuration for does not exist" msgstr "No existe la configuración del estado heredado de" @@ -2856,7 +2666,7 @@ msgstr "No existe la configuración del estado heredado de" msgid "License" msgstr "Licencia" -#: client/src/license/license.partial.html:102 +#: client/src/license/license.partial.html:104 msgid "License File" msgstr "Fichero de licencia" @@ -2874,16 +2684,13 @@ msgstr "Tipo de licencia" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:45 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:55 -#: client/src/job-results/job-results.partial.html:344 -#: client/src/job-submission/job-submission.partial.html:214 +#: client/src/job-results/job-results.partial.html:347 +#: client/src/job-submission/job-submission.partial.html:220 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:92 -#: client/src/templates/job_templates/job-template.form.js:165 -#: client/src/templates/job_templates/job-template.form.js:169 +#: client/src/templates/job_templates/job-template.form.js:160 +#: client/src/templates/job_templates/job-template.form.js:164 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:113 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:120 -#: client/src/job-submission/job-submission.partial.html:212 -#: client/src/templates/job_templates/job-template.form.js:171 -#: client/src/templates/job_templates/job-template.form.js:178 msgid "Limit" msgstr "Límite" @@ -2918,8 +2725,7 @@ msgstr "" msgid "Live events: error connecting to the server." msgstr "Eventos en directo: error al conectar al servidor." -#: client/src/shared/form-generator.js:1975 -#: client/src/shared/form-generator.js:2026 +#: client/src/shared/form-generator.js:1983 msgid "Loading..." msgstr "Cargando..." @@ -2931,15 +2737,15 @@ msgstr "Huso horario local" msgid "Log Out" msgstr "Cerrar sesión" -#: client/src/configuration/system-form/configuration-system.controller.js:220 -msgid "Log aggregator test failed.
Detail:" -msgstr "Error en la prueba del agregador de registros.
Detalles:" +#: client/src/configuration/system-form/configuration-system.controller.js:225 +msgid "Log aggregator test failed.
Detail:" +msgstr "Error en la prueba del agregador de registros.
Detalles:" -#: client/src/configuration/system-form/configuration-system.controller.js:212 +#: client/src/configuration/system-form/configuration-system.controller.js:218 msgid "Log aggregator test successful." msgstr "Se realizó correctamente la prueba del agregador de registros." -#: client/src/configuration/system-form/configuration-system.controller.js:87 +#: client/src/configuration/system-form/configuration-system.controller.js:89 msgid "Logging" msgstr "Iniciando sesión" @@ -2949,7 +2755,6 @@ msgstr "Bajo" #: client/src/management-jobs/card/card.partial.html:6 #: client/src/management-jobs/card/card.route.js:21 -#: client/src/management-jobs/card/card.partial.html:4 msgid "MANAGEMENT JOBS" msgstr "TAREAS DE GESTIÓN" @@ -2958,18 +2763,16 @@ msgid "MY VIEW" msgstr "MI VISTA" #: client/src/credentials/credentials.form.js:67 -#: client/src/job-submission/job-submission.partial.html:349 -#: client/src/job-submission/job-submission.partial.html:346 +#: client/src/job-submission/job-submission.partial.html:356 msgid "Machine" msgstr "Máquina" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:60 -#: client/src/job-results/job-results.partial.html:257 +#: client/src/job-results/job-results.partial.html:260 msgid "Machine Credential" msgstr "Credenciales de máquina" #: client/src/setup-menu/setup-menu.partial.html:36 -#: client/src/setup-menu/setup-menu.partial.html:29 msgid "" "Manage the cleanup of old job history, activity streams, data marked for " "deletion, and system tracking info." @@ -2978,26 +2781,16 @@ msgstr "" "actividad, datos marcados para eliminación e información de sistema de " "rastreo." -#: client/src/credentials/factories/become-method-change.factory.js:38 -#: client/src/credentials/factories/kind-change.factory.js:95 -#: client/src/credentials/factories/become-method-change.factory.js:40 -#: client/src/credentials/factories/kind-change.factory.js:97 -msgid "Management Certificate" -msgstr "Certificado de gestión" - #: client/src/setup-menu/setup-menu.partial.html:35 -#: client/src/setup-menu/setup-menu.partial.html:28 msgid "Management Jobs" msgstr "Trabajos de gestión" #: client/src/projects/list/projects-list.controller.js:89 -#: client/src/projects/list/projects-list.controller.js:88 msgid "Manual projects do not require a schedule" msgstr "Los proyectos manuales no necesitan de una planificación." -#: client/src/projects/edit/projects-edit.controller.js:140 +#: client/src/projects/edit/projects-edit.controller.js:141 #: client/src/projects/list/projects-list.controller.js:88 -#: client/src/projects/list/projects-list.controller.js:87 msgid "Manual projects do not require an SCM update" msgstr "Los proyectos manuales no necesitan una actualización del SCM" @@ -3010,7 +2803,7 @@ msgstr "" msgid "Medium" msgstr "Medio" -#: client/src/configuration/system-form/configuration-system.controller.js:88 +#: client/src/configuration/system-form/configuration-system.controller.js:90 msgid "Misc. System" msgstr "Miscelánea del sistema" @@ -3037,7 +2830,7 @@ msgstr "" "La tarea más reciente se completó correctamente. Haga clic para ver las " "tareas." -#: client/src/templates/survey-maker/shared/question-definition.form.js:74 +#: client/src/templates/survey-maker/shared/question-definition.form.js:77 msgid "Multiple Choice Options" msgstr "Opciones de selección múltiple" @@ -3121,7 +2914,6 @@ msgstr "PLANTILLA DE NOTIFICACIÓN" #: client/src/activity-stream/get-target-title.factory.js:26 #: client/src/notifications/notificationTemplates.list.js:14 -#: client/src/activity-stream/get-target-title.factory.js:23 msgid "NOTIFICATION TEMPLATES" msgstr "PLANTILLAS DE NOTIFICACIÓN" @@ -3137,7 +2929,7 @@ msgstr "NOTIFICACIONES" #: client/src/credentials/credentials.list.js:26 #: client/src/home/dashboard/lists/job-templates/job-templates-list.partial.html:14 #: client/src/home/dashboard/lists/jobs/jobs-list.partial.html:13 -#: client/src/instance-groups/instance-groups.list.js:14 +#: client/src/instance-groups/instance-groups.list.js:15 #: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:35 #: client/src/instance-groups/instances/instances-list.partial.html:15 #: client/src/instance-groups/instances/instances.list.js:14 @@ -3174,13 +2966,8 @@ msgstr "NOTIFICACIONES" #: client/src/templates/job_templates/job-template.form.js:34 #: client/src/templates/templates.list.js:24 #: client/src/templates/workflows.form.js:32 -#: client/src/users/users.form.js:138 client/src/users/users.form.js:164 -#: client/src/users/users.form.js:190 -#: client/src/credential-types/credential-types.list.js:21 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:48 -#: client/src/portal-mode/portal-jobs.list.js:34 -#: client/src/users/users.form.js:139 client/src/users/users.form.js:165 -#: client/src/users/users.form.js:191 +#: client/src/users/users.form.js:142 client/src/users/users.form.js:168 +#: client/src/users/users.form.js:194 msgid "Name" msgstr "Nombre" @@ -3188,7 +2975,7 @@ msgstr "Nombre" msgid "Network" msgstr "Red" -#: client/src/job-results/job-results.partial.html:303 +#: client/src/job-results/job-results.partial.html:306 msgid "Network Credential" msgstr "Credenciales de Red" @@ -3200,7 +2987,7 @@ msgstr "Nuevo grupo" msgid "New Host" msgstr "Nuevo host" -#: client/src/users/add/users-add.controller.js:90 +#: client/src/users/add/users-add.controller.js:91 msgid "New user successfully created!" msgstr "¡Nuevo usuario creado correctamente!" @@ -3214,7 +3001,7 @@ msgid "No Credentials Have Been Created" msgstr "Ningún credencial ha sido creado" #: client/src/job-submission/lists/credential/job-sub-cred-list.controller.js:44 -#: client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js:124 +#: client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js:140 msgid "No Credentials Matching This Type Have Been Created" msgstr "No se crearon credenciales que coincidan con este tipo" @@ -3231,7 +3018,6 @@ msgid "No Remediation Playbook Available" msgstr "No hay un playbook de reparación disponible" #: client/src/projects/list/projects-list.controller.js:159 -#: client/src/projects/list/projects-list.controller.js:158 msgid "No SCM Configuration" msgstr "Ninguna configuración SCM" @@ -3244,7 +3030,6 @@ msgid "No Teams exist" msgstr "No existe ningún equipo" #: client/src/projects/list/projects-list.controller.js:150 -#: client/src/projects/list/projects-list.controller.js:149 msgid "No Updates Available" msgstr "No existen actualizaciones disponibles" @@ -3301,8 +3086,7 @@ msgstr "Ningún trabajo ha sido ejecutado todavía." msgid "No jobs were recently run." msgstr "Ningún trabajo ha sido recientemente ejecutado." -#: client/src/teams/teams.form.js:121 client/src/users/users.form.js:187 -#: client/src/users/users.form.js:188 +#: client/src/teams/teams.form.js:121 client/src/users/users.form.js:191 msgid "No permissions have been granted" msgstr "Ningún permiso concedido" @@ -3310,7 +3094,7 @@ msgstr "Ningún permiso concedido" msgid "No recent job data available for this host." msgstr "No hay datos de tareas recientes disponibles para este host." -#: client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js:73 +#: client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js:75 msgid "No recent job data available for this inventory." msgstr "No hay datos de tareas recientes disponibles para este inventario." @@ -3319,8 +3103,8 @@ msgid "No recent notifications." msgstr "No hay notificaciones recientes" #: client/src/inventories-hosts/hosts/hosts.partial.html:36 -#: client/src/shared/form-generator.js:1871 -#: client/src/shared/form-generator.js:1922 +#: client/src/shared/form-generator.js:1879 +#: client/src/shared/list-generator/list-generator.factory.js:240 msgid "No records matched your search." msgstr "No existe registros que coincidan con su búsqueda." @@ -3328,10 +3112,8 @@ msgstr "No existe registros que coincidan con su búsqueda." msgid "No schedules exist" msgstr "No existen planificaciones" -#: client/src/job-submission/job-submission.partial.html:341 -#: client/src/job-submission/job-submission.partial.html:346 -#: client/src/job-submission/job-submission.partial.html:338 -#: client/src/job-submission/job-submission.partial.html:343 +#: client/src/job-submission/job-submission.partial.html:348 +#: client/src/job-submission/job-submission.partial.html:353 msgid "None selected" msgstr "Ninguno seleccionado" @@ -3342,7 +3124,6 @@ msgid "Normal User" msgstr "Usuario normal" #: client/src/projects/list/projects-list.controller.js:91 -#: client/src/projects/list/projects-list.controller.js:90 msgid "Not configured for SCM" msgstr "No configurado para SCM" @@ -3350,10 +3131,18 @@ msgstr "No configurado para SCM" msgid "Not configured for inventory sync." msgstr "No configurado para la sincronización de inventario." -#: client/src/notifications/notificationTemplates.form.js:291 -#: client/src/notifications/notificationTemplates.form.js:292 -#: client/src/notifications/notificationTemplates.form.js:296 -#: client/src/notifications/notificationTemplates.form.js:297 +#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:25 +msgid "" +"Note that only hosts directly in this group can be disassociated. Hosts in " +"sub-groups must be disassociated directly from the sub-group level that they" +" belong." +msgstr "" +"Tenga en cuenta que solo se pueden desasociar los hosts asociados " +"directamente a este grupo. Los hosts en subgrupos deben ser desasociados del" +" nivel de subgrupo al que pertenecen." + +#: client/src/notifications/notificationTemplates.form.js:288 +#: client/src/notifications/notificationTemplates.form.js:289 msgid "Notification Color" msgstr "Color de notificación" @@ -3361,8 +3150,7 @@ msgstr "Color de notificación" msgid "Notification Failed." msgstr "Notificación fallida" -#: client/src/notifications/notificationTemplates.form.js:280 -#: client/src/notifications/notificationTemplates.form.js:285 +#: client/src/notifications/notificationTemplates.form.js:277 msgid "Notification Label" msgstr "Etiqueta de Notificación" @@ -3374,37 +3162,33 @@ msgstr "Plantillas de notificación" #: client/src/management-jobs/notifications/notification.route.js:21 #: client/src/notifications/notifications.list.js:17 #: client/src/setup-menu/setup-menu.partial.html:48 -#: client/src/setup-menu/setup-menu.partial.html:41 msgid "Notifications" msgstr "Notificación" -#: client/src/notifications/notificationTemplates.form.js:305 -#: client/src/notifications/notificationTemplates.form.js:310 +#: client/src/notifications/notificationTemplates.form.js:302 msgid "Notify Channel" msgstr "Notificar canal" #: client/src/inventories-hosts/hosts/hosts.partial.html:55 -#: client/src/job-submission/job-submission.partial.html:263 +#: client/src/job-submission/job-submission.partial.html:269 #: client/src/partials/survey-maker-modal.html:27 -#: client/src/shared/form-generator.js:538 +#: client/src/shared/form-generator.js:542 +#: client/src/shared/form-generator.js:773 #: client/src/shared/generator-helpers.js:551 -#: client/src/job-submission/job-submission.partial.html:260 -#: client/src/shared/form-generator.js:555 msgid "OFF" msgstr "OFF" #: client/lib/services/base-string.service.js:63 -#: client/lib/services/base-string.service.js:31 +#: client/src/jobs/factories/delete-job.factory.js:115 msgid "OK" msgstr "Aceptar" #: client/src/inventories-hosts/hosts/hosts.partial.html:54 -#: client/src/job-submission/job-submission.partial.html:261 +#: client/src/job-submission/job-submission.partial.html:267 #: client/src/partials/survey-maker-modal.html:26 -#: client/src/shared/form-generator.js:536 +#: client/src/shared/form-generator.js:538 +#: client/src/shared/form-generator.js:771 #: client/src/shared/generator-helpers.js:547 -#: client/src/job-submission/job-submission.partial.html:259 -#: client/src/shared/form-generator.js:553 msgid "ON" msgstr "ON" @@ -3415,17 +3199,14 @@ msgstr "OPCIONES" #: client/src/activity-stream/get-target-title.factory.js:29 #: client/src/organizations/list/organizations-list.partial.html:6 #: client/src/organizations/main.js:52 -#: client/src/activity-stream/get-target-title.factory.js:26 msgid "ORGANIZATIONS" msgstr "ORGANIZACIONES" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:116 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:103 msgid "OVERWRITE" msgstr "REEMPLAZAR" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:123 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:110 msgid "OVERWRITE VARS" msgstr "REEMPLAZAR VARS" @@ -3439,7 +3220,6 @@ msgstr "En caso de éxito" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:157 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:162 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:146 msgid "Only Group By" msgstr "Agrupar solo por" @@ -3452,9 +3232,8 @@ msgstr "" "necesario para las direcciones URLs en el uso de autentificación para " "KeyStone v3. Los escenarios más habituales:" -#: client/src/templates/job_templates/job-template.form.js:245 +#: client/src/templates/job_templates/job-template.form.js:240 #: client/src/templates/workflows.form.js:69 -#: client/src/templates/job_templates/job-template.form.js:354 msgid "" "Optional labels that describe this job template, such as 'dev' or 'test'. " "Labels can be used to group and filter job templates and completed jobs." @@ -3463,11 +3242,9 @@ msgstr "" " 'dev' o 'test'. Las etiquetas pueden ser utilizadas para agrupar y filtrar " "plantillas de trabajo y tareas completadas." -#: client/src/notifications/notificationTemplates.form.js:385 +#: client/src/notifications/notificationTemplates.form.js:382 #: client/src/partials/logviewer.html:7 -#: client/src/templates/job_templates/job-template.form.js:264 -#: client/src/notifications/notificationTemplates.form.js:397 -#: client/src/templates/job_templates/job-template.form.js:265 +#: client/src/templates/job_templates/job-template.form.js:259 msgid "Options" msgstr "Opciones" @@ -3486,11 +3263,11 @@ msgstr "Opciones" msgid "Organization" msgstr "Organización" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:142 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:65 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:136 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:64 #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:30 #: client/src/setup-menu/setup-menu.partial.html:4 -#: client/src/users/users.form.js:128 client/src/users/users.form.js:129 +#: client/src/users/users.form.js:132 msgid "Organizations" msgstr "Organizaciones" @@ -3552,15 +3329,11 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:328 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:333 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:282 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:288 msgid "Overwrite" msgstr "Anular" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:340 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:345 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:295 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:301 msgid "Overwrite Variables" msgstr "Anular variables" @@ -3572,8 +3345,7 @@ msgstr "Propietarios" msgid "PASSWORD" msgstr "CONTRASEÑA" -#: client/features/credentials/legacy.credentials.js:125 -#: client/features/credentials/legacy.credentials.js:120 +#: client/features/credentials/legacy.credentials.js:122 msgid "PERMISSIONS" msgstr "PERMISOS" @@ -3588,9 +3360,8 @@ msgstr "AGREGAR UN AVISO DE ENCUESTA." #: client/src/instance-groups/instances/instances-list.partial.html:6 #: client/src/instance-groups/list/instance-groups-list.partial.html:16 #: client/src/organizations/list/organizations-list.partial.html:47 -#: client/src/shared/form-generator.js:1877 +#: client/src/shared/form-generator.js:1885 #: client/src/shared/list-generator/list-generator.factory.js:248 -#: client/src/shared/form-generator.js:1928 msgid "PLEASE ADD ITEMS TO THIS LIST" msgstr "Por favor añada elementos a la lista" @@ -3602,6 +3373,10 @@ msgstr "MODO PORTAL" msgid "PREVIEW" msgstr "VISTA PREVIA" +#: client/src/job-results/job-results.service.js:166 +msgid "PROCEED" +msgstr "PROCEDER" + #: client/src/partials/job-template-details.html:2 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:73 msgid "PROJECT" @@ -3614,7 +3389,6 @@ msgstr "PROYECTO" #: client/src/organizations/list/organizations-list.controller.js:72 #: client/src/projects/main.js:73 client/src/projects/projects.list.js:14 #: client/src/projects/projects.list.js:15 -#: client/src/organizations/linkout/organizations-linkout.route.js:191 msgid "PROJECTS" msgstr "PROYECTOS" @@ -3622,12 +3396,11 @@ msgstr "PROYECTOS" msgid "Page" msgstr "Página" -#: client/src/notifications/notificationTemplates.form.js:235 -#: client/src/notifications/notificationTemplates.form.js:240 +#: client/src/notifications/notificationTemplates.form.js:232 msgid "Pagerduty subdomain" msgstr "Subdominio Pagerduty" -#: client/src/templates/job_templates/job-template.form.js:353 +#: client/src/templates/job_templates/job-template.form.js:348 msgid "" "Pass extra command line variables to the playbook. Provide key/value pairs " "using either YAML or JSON. Refer to the Ansible Tower documentation for " @@ -3660,34 +3433,21 @@ msgstr "" #: client/src/credentials/credentials.form.js:226 #: client/src/credentials/factories/become-method-change.factory.js:21 -#: client/src/credentials/factories/become-method-change.factory.js:46 -#: client/src/credentials/factories/become-method-change.factory.js:54 -#: client/src/credentials/factories/become-method-change.factory.js:74 -#: client/src/credentials/factories/become-method-change.factory.js:84 -#: client/src/credentials/factories/become-method-change.factory.js:94 -#: client/src/credentials/factories/kind-change.factory.js:103 -#: client/src/credentials/factories/kind-change.factory.js:111 -#: client/src/credentials/factories/kind-change.factory.js:131 -#: client/src/credentials/factories/kind-change.factory.js:141 -#: client/src/credentials/factories/kind-change.factory.js:151 +#: client/src/credentials/factories/become-method-change.factory.js:40 +#: client/src/credentials/factories/become-method-change.factory.js:48 +#: client/src/credentials/factories/become-method-change.factory.js:68 +#: client/src/credentials/factories/become-method-change.factory.js:78 +#: client/src/credentials/factories/become-method-change.factory.js:88 +#: client/src/credentials/factories/kind-change.factory.js:105 +#: client/src/credentials/factories/kind-change.factory.js:125 +#: client/src/credentials/factories/kind-change.factory.js:135 +#: client/src/credentials/factories/kind-change.factory.js:145 #: client/src/credentials/factories/kind-change.factory.js:30 #: client/src/credentials/factories/kind-change.factory.js:78 -#: client/src/job-submission/job-submission.partial.html:103 +#: client/src/credentials/factories/kind-change.factory.js:97 +#: client/src/job-submission/job-submission.partial.html:104 #: client/src/notifications/shared/type-change.service.js:28 #: client/src/users/users.form.js:68 -#: client/src/credentials/factories/become-method-change.factory.js:23 -#: client/src/credentials/factories/become-method-change.factory.js:48 -#: client/src/credentials/factories/become-method-change.factory.js:56 -#: client/src/credentials/factories/become-method-change.factory.js:76 -#: client/src/credentials/factories/become-method-change.factory.js:86 -#: client/src/credentials/factories/become-method-change.factory.js:96 -#: client/src/credentials/factories/kind-change.factory.js:105 -#: client/src/credentials/factories/kind-change.factory.js:113 -#: client/src/credentials/factories/kind-change.factory.js:133 -#: client/src/credentials/factories/kind-change.factory.js:143 -#: client/src/credentials/factories/kind-change.factory.js:153 -#: client/src/credentials/factories/kind-change.factory.js:80 -#: client/src/job-submission/job-submission.partial.html:101 msgid "Password" msgstr "Contraseña" @@ -3710,8 +3470,6 @@ msgstr "Semana pasada" #: client/src/credentials/factories/become-method-change.factory.js:29 #: client/src/credentials/factories/kind-change.factory.js:86 -#: client/src/credentials/factories/become-method-change.factory.js:31 -#: client/src/credentials/factories/kind-change.factory.js:88 msgid "" "Paste the contents of the PEM file associated with the service account " "email." @@ -3719,17 +3477,6 @@ msgstr "" "Pegue el contenido del fichero PEM asociado al correo de la cuenta de " "servicio." -#: client/src/credentials/factories/become-method-change.factory.js:41 -#: client/src/credentials/factories/kind-change.factory.js:98 -#: client/src/credentials/factories/become-method-change.factory.js:43 -#: client/src/credentials/factories/kind-change.factory.js:100 -msgid "" -"Paste the contents of the PEM file that corresponds to the certificate you " -"uploaded in the Microsoft Azure console." -msgstr "" -"Pegue el contenido del fichero PEM que corresponde al certificado que usted " -"ha subido en la consola de Microsof Azure." - #: client/src/credentials/factories/kind-change.factory.js:51 msgid "Paste the contents of the SSH private key file." msgstr "Pegue el contenido del fichero de la clave privada SSH." @@ -3739,7 +3486,7 @@ msgid "Paste the contents of the SSH private key file.%s or click to close%s" msgstr "" "Pegue el contenido del fichero de la clave privada SSH. %s o pulse cerrar%s" -#: client/src/inventories-hosts/inventories/inventory.list.js:121 +#: client/src/inventories-hosts/inventories/inventory.list.js:119 msgid "Pending Delete" msgstr "Eliminación pendiente" @@ -3748,40 +3495,30 @@ msgid "Period" msgstr "Periodo" #: client/src/projects/add/projects-add.controller.js:29 -#: client/src/users/add/users-add.controller.js:42 +#: client/src/users/add/users-add.controller.js:43 msgid "Permission Error" msgstr "Error de permiso" #: client/features/credentials/credentials.strings.js:14 -#: client/features/credentials/legacy.credentials.js:69 +#: client/features/credentials/legacy.credentials.js:66 #: client/src/credentials/credentials.form.js:439 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:125 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:128 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:122 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:123 #: client/src/projects/projects.form.js:233 client/src/teams/teams.form.js:117 -#: client/src/templates/job_templates/job-template.form.js:391 +#: client/src/templates/job_templates/job-template.form.js:386 #: client/src/templates/workflows.form.js:114 -#: client/src/users/users.form.js:183 -#: client/features/credentials/legacy.credentials.js:64 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:134 -#: client/src/projects/projects.form.js:232 -#: client/src/templates/job_templates/job-template.form.js:411 -#: client/src/templates/workflows.form.js:119 -#: client/src/users/users.form.js:184 +#: client/src/users/users.form.js:187 msgid "Permissions" msgstr "Permisos" -#: client/src/job-results/job-results.partial.html:246 -#: client/src/shared/form-generator.js:1062 -#: client/src/templates/job_templates/job-template.form.js:109 -#: client/src/templates/job_templates/job-template.form.js:120 -#: client/src/shared/form-generator.js:1114 -#: client/src/templates/job_templates/job-template.form.js:113 -#: client/src/templates/job_templates/job-template.form.js:124 +#: client/src/job-results/job-results.partial.html:249 +#: client/src/shared/form-generator.js:1069 +#: client/src/templates/job_templates/job-template.form.js:107 +#: client/src/templates/job_templates/job-template.form.js:115 msgid "Playbook" msgstr "Playbook" #: client/src/projects/projects.form.js:89 -#: client/src/projects/projects.form.js:88 msgid "Playbook Directory" msgstr "Directorio de playbook" @@ -3789,20 +3526,19 @@ msgstr "Directorio de playbook" msgid "Playbook Run" msgstr "Ejecución de playbook" -#: client/src/job-results/job-results.partial.html:485 +#: client/src/job-results/job-results.partial.html:488 msgid "Plays" msgstr "Reproduccciones" -#: client/src/users/users.form.js:122 client/src/users/users.form.js:123 +#: client/src/users/users.form.js:126 msgid "Please add user to an Organization." msgstr "Por favor añada un usuario a su organización." -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:101 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:100 msgid "Please assign roles to the selected resources" msgstr "Por favor asigne funciones a los recursos seleccionados" #: client/src/access/add-rbac-resource/rbac-resource.partial.html:60 -#: client/src/access/add-rbac-resource/rbac-resource.partial.html:62 msgid "Please assign roles to the selected users/teams" msgstr "Por favor asigne funciones a los usuarios/equipos seleccionados" @@ -3814,15 +3550,12 @@ msgstr "" "Por favor pulse sobre el siguiente botón para visitar la página web de " "Ansible para obtener una clave de licencia Tower." -#: client/src/inventories-hosts/inventory-hosts.strings.js:25 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.strings.js:8 +#: client/src/inventories-hosts/inventory-hosts.strings.js:27 msgid "Please click the icon to edit the host filter." msgstr "Haga clic en el icono para editar el filtro del host." -#: client/src/shared/form-generator.js:854 -#: client/src/shared/form-generator.js:949 -#: client/src/shared/form-generator.js:877 -#: client/src/shared/form-generator.js:973 +#: client/src/shared/form-generator.js:861 +#: client/src/shared/form-generator.js:956 msgid "" "Please enter a URL that begins with ssh, http or https. The URL may not " "contain the '@' character." @@ -3830,30 +3563,23 @@ msgstr "" "Por favor introduzca una URL que inicie por ssh, http o https. La URL no " "puede contener el caracter '@'." -#: client/src/shared/form-generator.js:1151 -#: client/src/shared/form-generator.js:1203 +#: client/src/shared/form-generator.js:1158 msgid "Please enter a number greater than %d and less than %d." msgstr "Por favor introduzca un número mayor que %d y menor que %d." -#: client/src/shared/form-generator.js:1153 -#: client/src/shared/form-generator.js:1205 +#: client/src/shared/form-generator.js:1160 msgid "Please enter a number greater than %d." msgstr "Por favor introduzca un número mayor que %d." -#: client/src/shared/form-generator.js:1145 -#: client/src/shared/form-generator.js:1197 +#: client/src/shared/form-generator.js:1152 msgid "Please enter a number." msgstr "Por favor introduzca un número." -#: client/src/job-submission/job-submission.partial.html:111 -#: client/src/job-submission/job-submission.partial.html:124 -#: client/src/job-submission/job-submission.partial.html:137 -#: client/src/job-submission/job-submission.partial.html:150 +#: client/src/job-submission/job-submission.partial.html:112 +#: client/src/job-submission/job-submission.partial.html:126 +#: client/src/job-submission/job-submission.partial.html:140 +#: client/src/job-submission/job-submission.partial.html:154 #: client/src/login/loginModal/loginModal.partial.html:78 -#: client/src/job-submission/job-submission.partial.html:109 -#: client/src/job-submission/job-submission.partial.html:122 -#: client/src/job-submission/job-submission.partial.html:135 -#: client/src/job-submission/job-submission.partial.html:148 msgid "Please enter a password." msgstr "Por favor introduzca una contraseña." @@ -3861,56 +3587,39 @@ msgstr "Por favor introduzca una contraseña." msgid "Please enter a username." msgstr "Por favor introduzca un nombre de usuario." -#: client/src/shared/form-generator.js:844 -#: client/src/shared/form-generator.js:939 -#: client/src/shared/form-generator.js:867 -#: client/src/shared/form-generator.js:963 +#: client/src/shared/form-generator.js:851 +#: client/src/shared/form-generator.js:946 msgid "Please enter a valid email address." msgstr "Por favor introduzca una dirección de correo válida." #: client/lib/components/components.strings.js:15 -#: client/src/shared/form-generator.js:1009 -#: client/src/shared/form-generator.js:839 -#: client/src/shared/form-generator.js:934 -#: client/src/shared/form-generator.js:1061 -#: client/src/shared/form-generator.js:862 -#: client/src/shared/form-generator.js:958 +#: client/src/shared/form-generator.js:1016 +#: client/src/shared/form-generator.js:846 +#: client/src/shared/form-generator.js:941 msgid "Please enter a value." msgstr "Por favor introduzca un valor." -#: client/src/job-submission/job-submission.partial.html:282 -#: client/src/job-submission/job-submission.partial.html:287 -#: client/src/job-submission/job-submission.partial.html:298 -#: client/src/job-submission/job-submission.partial.html:304 -#: client/src/job-submission/job-submission.partial.html:310 -#: client/src/job-submission/job-submission.partial.html:279 -#: client/src/job-submission/job-submission.partial.html:284 -#: client/src/job-submission/job-submission.partial.html:295 -#: client/src/job-submission/job-submission.partial.html:301 -#: client/src/job-submission/job-submission.partial.html:307 +#: client/src/job-submission/job-submission.partial.html:289 +#: client/src/job-submission/job-submission.partial.html:294 +#: client/src/job-submission/job-submission.partial.html:305 +#: client/src/job-submission/job-submission.partial.html:311 +#: client/src/job-submission/job-submission.partial.html:317 msgid "Please enter an answer between" msgstr "Ingrese una respuesta entre" -#: client/src/job-submission/job-submission.partial.html:309 -#: client/src/job-submission/job-submission.partial.html:306 +#: client/src/job-submission/job-submission.partial.html:316 msgid "Please enter an answer that is a decimal number." msgstr "Ingrese una respuesta que sea un número decimal." -#: client/src/job-submission/job-submission.partial.html:303 -#: client/src/job-submission/job-submission.partial.html:300 +#: client/src/job-submission/job-submission.partial.html:310 msgid "Please enter an answer that is a valid integer." msgstr "Ingrese una respuesta que sea un valor entero válido." -#: client/src/job-submission/job-submission.partial.html:281 -#: client/src/job-submission/job-submission.partial.html:286 -#: client/src/job-submission/job-submission.partial.html:297 -#: client/src/job-submission/job-submission.partial.html:302 -#: client/src/job-submission/job-submission.partial.html:308 -#: client/src/job-submission/job-submission.partial.html:278 -#: client/src/job-submission/job-submission.partial.html:283 -#: client/src/job-submission/job-submission.partial.html:294 -#: client/src/job-submission/job-submission.partial.html:299 -#: client/src/job-submission/job-submission.partial.html:305 +#: client/src/job-submission/job-submission.partial.html:288 +#: client/src/job-submission/job-submission.partial.html:293 +#: client/src/job-submission/job-submission.partial.html:304 +#: client/src/job-submission/job-submission.partial.html:309 +#: client/src/job-submission/job-submission.partial.html:315 msgid "Please enter an answer." msgstr "Ingrese una respuesta." @@ -3919,7 +3628,7 @@ msgstr "Ingrese una respuesta." msgid "Please save and run a job to view." msgstr "Guarde y ejecute una tarea para ver." -#: client/src/templates/job_templates/add-job-template/job-template-add.controller.js:49 +#: client/src/templates/job_templates/add-job-template/job-template-add.controller.js:50 msgid "Please save before adding a survey to this job template." msgstr "Guarde antes de agregar una encuesta a esta plantilla de trabajo." @@ -3936,44 +3645,34 @@ msgstr "Guarde antes de agregar notificaciones." msgid "Please save before adding users." msgstr "Guarde antes de agregar usuarios." -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:121 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:124 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:118 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:119 #: client/src/projects/projects.form.js:225 client/src/teams/teams.form.js:113 -#: client/src/templates/job_templates/job-template.form.js:384 +#: client/src/templates/job_templates/job-template.form.js:379 #: client/src/templates/workflows.form.js:107 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:130 -#: client/src/projects/projects.form.js:224 -#: client/src/templates/job_templates/job-template.form.js:404 -#: client/src/templates/workflows.form.js:112 msgid "Please save before assigning permissions." msgstr "Guarde antes de asignar permisos." -#: client/src/users/users.form.js:120 client/src/users/users.form.js:179 -#: client/src/users/users.form.js:121 client/src/users/users.form.js:180 +#: client/src/users/users.form.js:124 client/src/users/users.form.js:183 msgid "Please save before assigning to organizations." msgstr "Guarde antes de asignar a organizaciones" -#: client/src/users/users.form.js:148 client/src/users/users.form.js:149 +#: client/src/users/users.form.js:152 msgid "Please save before assigning to teams." msgstr "Guarde antes de asignar a equipos." -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:169 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:175 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:164 msgid "Please save before creating groups." msgstr "Guarde antes de crear grupos." -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:178 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:184 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:173 msgid "Please save before creating hosts." msgstr "Guarde antes de crear hosts." #: client/src/inventories-hosts/hosts/host.form.js:112 #: client/src/inventories-hosts/inventories/related/groups/groups.form.js:86 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:111 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:111 -#: client/src/inventories-hosts/hosts/host.form.js:116 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:116 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:110 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:112 msgid "Please save before defining groups." msgstr "Guarde antes de definir grupos." @@ -3981,8 +3680,7 @@ msgstr "Guarde antes de definir grupos." msgid "Please save before defining hosts." msgstr "Guarde antes de definir hosts." -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:187 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:193 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:182 msgid "Please save before defining inventory sources." msgstr "Guarde antes de definir fuentes de inventario." @@ -3991,22 +3689,17 @@ msgid "Please save before defining the workflow graph." msgstr "Guarde antes de definir un gráfico de flujo de trabajo." #: client/src/inventories-hosts/hosts/host.form.js:121 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:119 -#: client/src/inventories-hosts/hosts/host.form.js:125 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:118 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:120 msgid "Please save before viewing Insights." msgstr "Guarde antes de ver Insights." #: client/src/inventories-hosts/hosts/host.form.js:105 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:104 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:104 -#: client/src/inventories-hosts/hosts/host.form.js:109 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:109 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:103 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:105 msgid "Please save before viewing facts." msgstr "Guarde antes de ver eventos." -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:167 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:164 msgid "Please save before viewing hosts." msgstr "Guarde antes de ver los hosts." @@ -4023,7 +3716,6 @@ msgid "Please select a Credential." msgstr "Por favor seleccione un credencial." #: client/src/templates/job_templates/multi-credential/multi-credential.partial.html:46 -#: client/src/templates/job_templates/multi-credential/multi-credential.partial.html:43 msgid "" "Please select a machine (SSH) credential or check the \"Prompt on launch\" " "option." @@ -4031,29 +3723,22 @@ msgstr "" "Seleccione una credencial de máquina (SSH) o marque la opción “Preguntar al " "ejecutar”." -#: client/src/shared/form-generator.js:1186 -#: client/src/shared/form-generator.js:1238 +#: client/src/shared/form-generator.js:1193 msgid "Please select a number between" msgstr "Por favor seleccione un número entre" -#: client/src/shared/form-generator.js:1182 -#: client/src/shared/form-generator.js:1234 +#: client/src/shared/form-generator.js:1189 msgid "Please select a number." msgstr "Por favor seleccione un número." -#: client/src/shared/form-generator.js:1074 -#: client/src/shared/form-generator.js:1142 -#: client/src/shared/form-generator.js:1263 -#: client/src/shared/form-generator.js:1371 -#: client/src/shared/form-generator.js:1126 -#: client/src/shared/form-generator.js:1194 -#: client/src/shared/form-generator.js:1314 -#: client/src/shared/form-generator.js:1422 +#: client/src/shared/form-generator.js:1081 +#: client/src/shared/form-generator.js:1149 +#: client/src/shared/form-generator.js:1270 +#: client/src/shared/form-generator.js:1378 msgid "Please select a value." msgstr "Por favor seleccione un valor." #: client/src/templates/job_templates/job-template.form.js:77 -#: client/src/templates/job_templates/job-template.form.js:81 msgid "Please select an Inventory or check the Prompt on launch option." msgstr "" "Por favor seleccione un inventario o seleccione la opción Preguntar al " @@ -4063,8 +3748,11 @@ msgstr "" msgid "Please select an Inventory." msgstr "Por favor seleccione un Inventario." -#: client/src/shared/form-generator.js:1179 -#: client/src/shared/form-generator.js:1231 +#: client/src/inventories-hosts/inventory-hosts.strings.js:26 +msgid "Please select an organization before editing the host filter." +msgstr "Seleccione una organización antes de editar el filtro del host." + +#: client/src/shared/form-generator.js:1186 msgid "Please select at least one value." msgstr "Por favor seleccione al menos un valor." @@ -4072,7 +3760,7 @@ msgstr "Por favor seleccione al menos un valor." msgid "Please select resources from the lists below." msgstr "Por favor seleccione recursos de la lista siguiente." -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:68 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65 msgid "Populate the hosts for this inventory by using a search filter." msgstr "" "Complete los hosts de este inventario por medio del filtro de búsqueda." @@ -4088,8 +3776,7 @@ msgid "Private Key" msgstr "Clave privada" #: client/src/credentials/credentials.form.js:264 -#: client/src/job-submission/job-submission.partial.html:116 -#: client/src/job-submission/job-submission.partial.html:114 +#: client/src/job-submission/job-submission.partial.html:118 msgid "Private Key Passphrase" msgstr "Frase de contraseña para la clave privada" @@ -4099,44 +3786,30 @@ msgid "Privilege Escalation" msgstr "Elevación de privilegios" #: client/src/credentials/credentials.form.js:305 -#: client/src/job-submission/job-submission.partial.html:129 -#: client/src/credentials/factories/become-method-change.factory.js:19 -#: client/src/credentials/factories/kind-change.factory.js:76 -#: client/src/job-submission/job-submission.partial.html:127 +#: client/src/job-submission/job-submission.partial.html:132 msgid "Privilege Escalation Password" msgstr "Contraseña para la elevación de privilegios" #: client/src/credentials/credentials.form.js:295 -#: client/src/credentials/factories/become-method-change.factory.js:18 -#: client/src/credentials/factories/kind-change.factory.js:75 msgid "Privilege Escalation Username" msgstr "Usuario para la elevación de privilegios" #: client/src/credentials/factories/become-method-change.factory.js:30 #: client/src/credentials/factories/kind-change.factory.js:87 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:93 -#: client/src/job-results/job-results.partial.html:213 -#: client/src/templates/job_templates/job-template.form.js:103 +#: client/src/job-results/job-results.partial.html:216 +#: client/src/templates/job_templates/job-template.form.js:100 #: client/src/templates/job_templates/job-template.form.js:91 -#: client/src/credentials/factories/become-method-change.factory.js:32 -#: client/src/credentials/factories/kind-change.factory.js:89 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:88 -#: client/src/templates/job_templates/job-template.form.js:107 -#: client/src/templates/job_templates/job-template.form.js:95 msgid "Project" msgstr "Proyecto" -#: client/src/credentials/factories/become-method-change.factory.js:59 -#: client/src/credentials/factories/kind-change.factory.js:116 -#: client/src/credentials/factories/become-method-change.factory.js:61 -#: client/src/credentials/factories/kind-change.factory.js:118 +#: client/src/credentials/factories/become-method-change.factory.js:53 +#: client/src/credentials/factories/kind-change.factory.js:110 msgid "Project (Tenant Name)" msgstr "Proyecto (Nombre del inquilino [Tenant])" #: client/src/projects/projects.form.js:75 #: client/src/projects/projects.form.js:83 -#: client/src/projects/projects.form.js:74 -#: client/src/projects/projects.form.js:82 msgid "Project Base Path" msgstr "Ruta base del proyecto" @@ -4145,7 +3818,6 @@ msgid "Project Name" msgstr "Nombre del proyecto" #: client/src/projects/projects.form.js:100 -#: client/src/projects/projects.form.js:99 msgid "Project Path" msgstr "Ruta del proyecto" @@ -4154,12 +3826,11 @@ msgid "Project Sync Failures" msgstr "Errores de sincronización del proyecto" #: client/src/projects/list/projects-list.controller.js:170 -#: client/src/projects/list/projects-list.controller.js:169 msgid "Project lookup failed. GET returned:" msgstr "La búsqueda del proyecto ha fallado. GET ha devuelto:" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:121 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:48 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:115 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:47 #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:31 #: client/src/home/dashboard/counts/dashboard-counts.directive.js:61 #: client/src/organizations/linkout/organizations-linkout.route.js:206 @@ -4173,12 +3844,10 @@ msgstr[0] "Promover grupo" msgstr[1] "Promover grupos" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:43 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:43 msgid "Promote groups" msgstr "Promover grupos" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:32 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:32 msgid "Promote groups and hosts" msgstr "Promover grupos y hosts" @@ -4189,7 +3858,6 @@ msgstr[0] "Promover host" msgstr[1] "Promover hosts" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:54 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:54 msgid "Promote hosts" msgstr "Promover hosts" @@ -4202,31 +3870,20 @@ msgid "Prompt" msgstr "Aviso" #: client/lib/components/components.strings.js:30 -#: client/src/templates/job_templates/job-template.form.js:144 -#: client/src/templates/job_templates/job-template.form.js:174 -#: client/src/templates/job_templates/job-template.form.js:191 -#: client/src/templates/job_templates/job-template.form.js:217 -#: client/src/templates/job_templates/job-template.form.js:234 -#: client/src/templates/job_templates/job-template.form.js:259 -#: client/src/templates/job_templates/job-template.form.js:359 +#: client/src/templates/job_templates/job-template.form.js:139 +#: client/src/templates/job_templates/job-template.form.js:169 +#: client/src/templates/job_templates/job-template.form.js:186 +#: client/src/templates/job_templates/job-template.form.js:212 +#: client/src/templates/job_templates/job-template.form.js:229 +#: client/src/templates/job_templates/job-template.form.js:254 +#: client/src/templates/job_templates/job-template.form.js:354 #: client/src/templates/job_templates/job-template.form.js:60 #: client/src/templates/job_templates/job-template.form.js:86 -#: client/src/templates/job_templates/job-template.form.js:147 -#: client/src/templates/job_templates/job-template.form.js:183 -#: client/src/templates/job_templates/job-template.form.js:200 -#: client/src/templates/job_templates/job-template.form.js:228 -#: client/src/templates/job_templates/job-template.form.js:247 -#: client/src/templates/job_templates/job-template.form.js:261 -#: client/src/templates/job_templates/job-template.form.js:376 -#: client/src/templates/job_templates/job-template.form.js:64 -#: client/src/templates/job_templates/job-template.form.js:90 msgid "Prompt on launch" msgstr "Preguntar al ejecutar" #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:132 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:147 -#: client/src/templates/job_templates/job-template.form.js:220 -#: client/src/templates/job_templates/job-template.form.js:239 msgid "Provide a comma separated list of tags." msgstr "Introduzca una lista de etiquetas separadas por coma." @@ -4249,13 +3906,11 @@ msgstr "" #: client/src/inventories-hosts/hosts/host.form.js:50 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:49 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:49 -#: client/src/inventories-hosts/hosts/host.form.js:49 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:48 msgid "Provide a host name, ip address, or ip address:port. Examples include:" msgstr "" "Provea un nombre de host, dirección ip, ó dirección:puerto. Por ejemplo:" -#: client/src/templates/job_templates/job-template.form.js:168 +#: client/src/templates/job_templates/job-template.form.js:163 msgid "" "Provide a host pattern to further constrain the list of hosts that will be " "managed or affected by the playbook. Multiple patterns are allowed. Refer to" @@ -4267,7 +3922,6 @@ msgstr "" "obtener más información y ejemplos relacionados con los patrones." #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:116 -#: client/src/templates/job_templates/job-template.form.js:174 msgid "" "Provide a host pattern to further constrain the list of hosts that will be " "managed or affected by the playbook. Multiple patterns can be separated by " @@ -4283,8 +3937,17 @@ msgstr "" "Proporcione variables del entorno para trasladar al script del inventario " "personalizado." -#: client/src/templates/job_templates/job-template.form.js:316 -#: client/src/templates/job_templates/job-template.form.js:324 +#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:203 +#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:287 +msgid "" +"Provide the named URL encoded name or id of the remote Tower inventory to be" +" imported." +msgstr "" +"Indique la URL, el nombre cifrado o id del inventario remoto de Tower para " +"importarlos." + +#: client/src/templates/job_templates/job-template.form.js:311 +#: client/src/templates/job_templates/job-template.form.js:319 msgid "Provisioning Callback URL" msgstr "Dirección URL para las llamadas callback" @@ -4329,12 +3992,10 @@ msgstr "PLANTILLAS USADAS RECIENTEMENTE" #: client/src/portal-mode/portal-mode-jobs.partial.html:20 #: client/src/projects/projects.list.js:71 #: client/src/scheduler/schedules.list.js:61 -#: client/src/activity-stream/streams.list.js:55 msgid "REFRESH" msgstr "ACTUALIZAR" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:109 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:96 msgid "REGIONS" msgstr "REGIONES" @@ -4342,7 +4003,7 @@ msgstr "REGIONES" msgid "RELATED FIELDS:" msgstr "CAMPOS RELACIONADOS:" -#: client/src/shared/directives.js:78 client/src/shared/directives.js:136 +#: client/src/shared/directives.js:78 msgid "REMOVE" msgstr "ELIMINAR" @@ -4360,14 +4021,11 @@ msgstr "RESULTADOS" #: client/src/job-submission/job-submission.partial.html:44 #: client/src/job-submission/job-submission.partial.html:87 #: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:52 -#: client/src/job-submission/job-submission.partial.html:85 msgid "REVERT" msgstr "REVERTIR" #: client/src/credentials/factories/become-method-change.factory.js:25 #: client/src/credentials/factories/kind-change.factory.js:82 -#: client/src/credentials/factories/become-method-change.factory.js:27 -#: client/src/credentials/factories/kind-change.factory.js:84 msgid "RSA Private Key" msgstr "Clave privada RSA" @@ -4388,7 +4046,7 @@ msgstr "EJECUTAR COMANDOS" msgid "Random" msgstr "Aleatorio" -#: client/src/job-results/job-results.partial.html:408 +#: client/src/job-results/job-results.partial.html:411 msgid "Read only view of extra variables added to the job template." msgstr "" "Vista de solo lectura de las variables adicionales añadidas a la plantilla " @@ -4404,9 +4062,8 @@ msgstr "" msgid "Recent Notifications" msgstr "Notificaciones recientes" -#: client/src/notifications/notificationTemplates.form.js:101 -#: client/src/notifications/notificationTemplates.form.js:97 -#: client/src/notifications/notificationTemplates.form.js:102 +#: client/src/notifications/notificationTemplates.form.js:94 +#: client/src/notifications/notificationTemplates.form.js:98 msgid "Recipient List" msgstr "Lista de destinatarios" @@ -4415,7 +4072,7 @@ msgstr "Lista de destinatarios" msgid "Red" msgstr "Rojo" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:68 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65 msgid "" "Refer to the Ansible Tower documentation for further syntax and examples." msgstr "" @@ -4433,7 +4090,6 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/sources/sources.list.js:50 #: client/src/projects/projects.list.js:67 #: client/src/scheduler/schedules.list.js:57 -#: client/src/activity-stream/streams.list.js:52 msgid "Refresh the page" msgstr "Actualizar la página" @@ -4443,7 +4099,6 @@ msgid "Region:" msgstr "Región:" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:131 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:122 msgid "Regions" msgstr "Regiones" @@ -4460,22 +4115,17 @@ msgstr "Grupos relacionados" msgid "Relaunch using the same parameters" msgstr "Relanzar utilizando los mismos parámetros" -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:199 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:205 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:194 msgid "Remediate Inventory" msgstr "Reparar inventario" #: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:96 #: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:97 -#: client/src/teams/teams.form.js:142 client/src/users/users.form.js:218 -#: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:85 -#: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:86 -#: client/src/users/users.form.js:219 +#: client/src/teams/teams.form.js:142 client/src/users/users.form.js:222 msgid "Remove" msgstr "Eliminar" #: client/src/projects/projects.form.js:158 -#: client/src/projects/projects.form.js:157 msgid "Remove any local modifications prior to performing an update." msgstr "" "Eliminar cualquier modificación local antes de realizar una actualización." @@ -4488,7 +4138,7 @@ msgstr "Frecuencia de repetición" msgid "Request License" msgstr "Solicitar una licencia" -#: client/src/templates/survey-maker/shared/question-definition.form.js:288 +#: client/src/templates/survey-maker/shared/question-definition.form.js:291 msgid "Required" msgstr "Obligatorio" @@ -4496,12 +4146,11 @@ msgstr "Obligatorio" msgid "Reset" msgstr "Restablecer" -#: client/src/job-results/job-results.partial.html:120 +#: client/src/job-results/job-results.partial.html:123 msgid "Results Traceback" msgstr "Resultados Traceback" -#: client/src/shared/form-generator.js:684 -#: client/src/shared/form-generator.js:701 +#: client/src/shared/form-generator.js:690 msgid "Revert" msgstr "Revertir" @@ -4516,45 +4165,40 @@ msgstr "Revertir" #: client/src/configuration/auth-form/sub-forms/auth-tacacs.form.js:47 #: client/src/configuration/jobs-form/configuration-jobs.form.js:73 #: client/src/configuration/system-form/sub-forms/system-activity-stream.form.js:26 -#: client/src/configuration/system-form/sub-forms/system-logging.form.js:73 +#: client/src/configuration/system-form/sub-forms/system-logging.form.js:74 #: client/src/configuration/system-form/sub-forms/system-misc.form.js:50 #: client/src/configuration/ui-form/configuration-ui.form.js:36 msgid "Revert all to default" msgstr "Revertir todo a valores por defecto" -#: client/src/job-results/job-results.partial.html:236 +#: client/src/job-results/job-results.partial.html:239 #: client/src/projects/projects.list.js:50 msgid "Revision" msgstr "Revisión" #: client/src/projects/add/projects-add.controller.js:146 -#: client/src/projects/edit/projects-edit.controller.js:275 +#: client/src/projects/edit/projects-edit.controller.js:281 msgid "Revision #" msgstr "Revisión n°" -#: client/features/credentials/legacy.credentials.js:91 +#: client/features/credentials/legacy.credentials.js:88 #: client/src/credentials/credentials.form.js:461 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:151 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:154 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:148 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:149 #: client/src/organizations/organizations.form.js:97 #: client/src/projects/projects.form.js:255 client/src/teams/teams.form.js:135 #: client/src/teams/teams.form.js:98 #: client/src/templates/workflows.form.js:138 -#: client/src/users/users.form.js:201 -#: client/features/credentials/legacy.credentials.js:86 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:160 -#: client/src/projects/projects.form.js:254 -#: client/src/templates/workflows.form.js:143 -#: client/src/users/users.form.js:202 +#: client/src/users/users.form.js:205 msgid "Role" msgstr "Función" -#: client/src/instance-groups/instance-group.partial.html:15 -#: client/src/instance-groups/instance-groups.list.js:25 -#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:15 -#: client/src/instance-groups/instances/instances-list.partial.html:21 +#: client/src/instance-groups/instance-group.partial.html:14 +#: client/src/instance-groups/instance-groups.list.js:26 +#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:14 +#: client/src/instance-groups/instances/instances-list.partial.html:18 #: client/src/instance-groups/instances/instances.list.js:24 -#: client/src/instance-groups/list/instance-groups-list.partial.html:32 +#: client/src/instance-groups/list/instance-groups-list.partial.html:29 msgid "Running Jobs" msgstr "Tareas en ejecución" @@ -4570,13 +4214,12 @@ msgstr "SAML" #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html:17 #: client/src/inventories-hosts/shared/associate-groups/associate-groups.partial.html:17 #: client/src/inventories-hosts/shared/associate-hosts/associate-hosts.partial.html:17 -#: client/src/partials/survey-maker-modal.html:86 +#: client/src/partials/survey-maker-modal.html:87 #: client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.partial.html:18 -#: client/lib/services/base-string.service.js:30 msgid "SAVE" msgstr "GUARDAR" -#: client/src/scheduler/main.js:331 client/src/scheduler/main.js:330 +#: client/src/scheduler/main.js:331 msgid "SCHEDULED" msgstr "PROGRAMADO" @@ -4592,39 +4235,34 @@ msgstr "TRABAJOS PROGRAMADOS" #: client/src/scheduler/main.js:145 client/src/scheduler/main.js:183 #: client/src/scheduler/main.js:235 client/src/scheduler/main.js:273 #: client/src/scheduler/main.js:52 client/src/scheduler/main.js:90 -#: client/src/activity-stream/get-target-title.factory.js:35 msgid "SCHEDULES" msgstr "PROGRAMACIONES" #: client/src/projects/add/projects-add.controller.js:118 -#: client/src/projects/edit/projects-edit.controller.js:248 +#: client/src/projects/edit/projects-edit.controller.js:254 msgid "SCM Branch" msgstr "Rama SCM" #: client/src/projects/add/projects-add.controller.js:137 -#: client/src/projects/edit/projects-edit.controller.js:266 +#: client/src/projects/edit/projects-edit.controller.js:272 msgid "SCM Branch/Tag/Commit" msgstr "Consigna/Etiqueta/Rama SCM" #: client/src/projects/add/projects-add.controller.js:158 -#: client/src/projects/edit/projects-edit.controller.js:287 +#: client/src/projects/edit/projects-edit.controller.js:293 msgid "SCM Branch/Tag/Revision" msgstr "Revisión/Etiqueta/Rama SCM" #: client/src/projects/projects.form.js:159 -#: client/src/projects/projects.form.js:158 msgid "SCM Clean" msgstr "Limpiar SCM" #: client/src/projects/projects.form.js:170 -#: client/src/projects/projects.form.js:169 msgid "SCM Delete" msgstr "Eliminar SCM" #: client/src/credentials/factories/become-method-change.factory.js:20 #: client/src/credentials/factories/kind-change.factory.js:77 -#: client/src/credentials/factories/become-method-change.factory.js:22 -#: client/src/credentials/factories/kind-change.factory.js:79 msgid "SCM Private Key" msgstr "Clave privada SCM" @@ -4634,23 +4272,19 @@ msgstr "Tipo SCM" #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:49 #: client/src/projects/projects.form.js:180 -#: client/src/projects/projects.form.js:179 msgid "SCM Update" msgstr "Actualización SCM" #: client/src/projects/list/projects-list.controller.js:222 -#: client/src/projects/list/projects-list.controller.js:221 msgid "SCM Update Cancel" msgstr "Cancelar actualización SCM" #: client/src/projects/projects.form.js:150 -#: client/src/projects/projects.form.js:149 msgid "SCM Update Options" msgstr "Opciones de actualización SCM" -#: client/src/projects/edit/projects-edit.controller.js:136 +#: client/src/projects/edit/projects-edit.controller.js:137 #: client/src/projects/list/projects-list.controller.js:84 -#: client/src/projects/list/projects-list.controller.js:83 msgid "SCM update currently running" msgstr "Actualización SCM actualmente en ejecución" @@ -4683,7 +4317,6 @@ msgstr "SELECCIONADO:" #: client/src/main-menu/main-menu.partial.html:59 #: client/src/setup-menu/setup.route.js:9 -#: client/src/setup-menu/setup.route.js:8 msgid "SETTINGS" msgstr "AJUSTES" @@ -4699,13 +4332,12 @@ msgstr "INICIAR SESIÓN" msgid "SIGN IN WITH" msgstr "INICIAR SESIÓN CON" -#: client/src/inventories-hosts/hosts/host.list.js:109 +#: client/src/inventories-hosts/hosts/host.list.js:110 #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:32 msgid "SMART INVENTORY" msgstr "INVENTARIO INTELIGENTE" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:102 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:89 msgid "SOURCE" msgstr "FUENTE" @@ -4713,10 +4345,8 @@ msgstr "FUENTE" msgid "SOURCES" msgstr "FUENTES" -#: client/src/credentials/factories/become-method-change.factory.js:95 -#: client/src/credentials/factories/kind-change.factory.js:152 -#: client/src/credentials/factories/become-method-change.factory.js:97 -#: client/src/credentials/factories/kind-change.factory.js:154 +#: client/src/credentials/factories/become-method-change.factory.js:89 +#: client/src/credentials/factories/kind-change.factory.js:146 msgid "SSH Key" msgstr "Clave SSH" @@ -4724,22 +4354,19 @@ msgstr "Clave SSH" msgid "SSH key description" msgstr "Descripción de la clave SSH" -#: client/src/notifications/notificationTemplates.form.js:378 -#: client/src/notifications/notificationTemplates.form.js:390 +#: client/src/notifications/notificationTemplates.form.js:375 msgid "SSL Connection" msgstr "Conexión SSL" #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:128 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:135 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:96 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:122 msgid "STANDARD OUT" msgstr "SALIDA ESTÁNDAR" #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:32 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:65 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:45 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:52 msgid "STARTED" msgstr "INICIADO" @@ -4754,7 +4381,7 @@ msgstr "ESTADO" msgid "STS Token" msgstr "Token STS" -#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:60 +#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:61 msgid "SUCCESSFUL" msgstr "CORRECTO" @@ -4770,39 +4397,34 @@ msgstr "SINCRONIZAR TODO" msgid "SYSTEM TRACKING" msgstr "SISTEMA DE RASTREO" -#: client/src/credentials/factories/become-method-change.factory.js:76 -#: client/src/credentials/factories/kind-change.factory.js:133 -#: client/src/credentials/factories/become-method-change.factory.js:78 -#: client/src/credentials/factories/kind-change.factory.js:135 +#: client/src/credentials/factories/become-method-change.factory.js:70 +#: client/src/credentials/factories/kind-change.factory.js:127 msgid "Satellite 6 URL" msgstr "URL Satellite 6" #: client/src/access/add-rbac-resource/rbac-resource.partial.html:110 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:196 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:193 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:157 -#: client/src/shared/form-generator.js:1683 -#: client/src/shared/form-generator.js:1734 +#: client/src/shared/form-generator.js:1691 msgid "Save" msgstr "Guardar" #: client/src/configuration/auth-form/configuration-auth.controller.js:86 -#: client/src/configuration/configuration.controller.js:209 -#: client/src/configuration/configuration.controller.js:268 -#: client/src/configuration/system-form/configuration-system.controller.js:66 +#: client/src/configuration/configuration.controller.js:213 +#: client/src/configuration/configuration.controller.js:272 +#: client/src/configuration/system-form/configuration-system.controller.js:68 msgid "Save changes" msgstr "Guardar los cambios" -#: client/src/license/license.partial.html:122 +#: client/src/license/license.partial.html:127 msgid "Save successful!" msgstr "Guardado correctamente" #: client/src/templates/templates.list.js:88 -#: client/src/partials/subhome.html:10 msgid "Schedule" msgstr "Planificar" #: client/src/management-jobs/card/card.partial.html:28 -#: client/src/management-jobs/card/card.partial.html:26 msgid "Schedule Management Job" msgstr "Planificar trabajo de gestión" @@ -4820,14 +4442,11 @@ msgstr "Planificar futuras ejecuciones de plantilla de trabajo." #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:33 #: client/src/jobs/jobs.partial.html:10 -#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:32 msgid "Schedules" msgstr "Programaciones" #: client/src/shared/smart-search/smart-search.controller.js:49 #: client/src/shared/smart-search/smart-search.controller.js:94 -#: client/src/shared/smart-search/smart-search.controller.js:39 -#: client/src/shared/smart-search/smart-search.controller.js:84 msgid "Search" msgstr "Buscar" @@ -4850,8 +4469,7 @@ msgstr "" " temporalmente y con credenciales con privilegio limitado para usuarios de " "AWS Identity y Access Management (IAM)." -#: client/src/shared/form-generator.js:1687 -#: client/src/shared/form-generator.js:1738 +#: client/src/shared/form-generator.js:1695 msgid "Select" msgstr "Seleccionar" @@ -4901,11 +4519,10 @@ msgstr "" #: client/src/configuration/jobs-form/configuration-jobs.controller.js:109 #: client/src/configuration/jobs-form/configuration-jobs.controller.js:134 #: client/src/configuration/ui-form/configuration-ui.controller.js:95 -#: client/src/configuration/jobs-form/configuration-jobs.controller.js:124 msgid "Select commands" msgstr "Seleccionar comandos" -#: client/src/templates/job_templates/job-template.form.js:138 +#: client/src/templates/job_templates/job-template.form.js:133 msgid "" "Select credentials that allow Tower to access the nodes this job will be ran" " against. You can only select one credential of each type. For machine " @@ -4924,7 +4541,6 @@ msgstr "" "al momento de la ejecución." #: client/src/projects/projects.form.js:98 -#: client/src/projects/projects.form.js:97 msgid "" "Select from the list of directories found in the Project Base Path. Together" " the base path and the playbook directory provide the full path used to " @@ -4934,8 +4550,8 @@ msgstr "" "del proyecto. Junto al directorio base y el directorio del playbook se " "construirá la ruta completa utilizada para encontrar playbooks." -#: client/src/configuration/auth-form/configuration-auth.controller.js:262 -#: client/src/configuration/auth-form/configuration-auth.controller.js:281 +#: client/src/configuration/auth-form/configuration-auth.controller.js:263 +#: client/src/configuration/auth-form/configuration-auth.controller.js:282 msgid "Select group types" msgstr "Seleccionar un tipo de grupo" @@ -4943,13 +4559,12 @@ msgstr "Seleccionar un tipo de grupo" msgid "Select roles" msgstr "Seleccionar roles" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:77 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:85 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:74 msgid "Select the Instance Groups for this Inventory to run on." msgstr "" "Seleccione los grupos de instancias en los que se ejecutará este inventario." -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:85 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:80 msgid "" "Select the Instance Groups for this Inventory to run on. Refer to the " "Ansible Tower documentation for more detail." @@ -4958,8 +4573,7 @@ msgstr "" " Inventario. Consulte la documentación de Ansible Tower para obtener más " "información." -#: client/src/templates/job_templates/job-template.form.js:198 -#: client/src/templates/job_templates/job-template.form.js:207 +#: client/src/templates/job_templates/job-template.form.js:193 msgid "Select the Instance Groups for this Job Template to run on." msgstr "" "Seleccione los grupos de instancias en los que se ejecutará esta plantilla " @@ -4984,7 +4598,6 @@ msgstr "" #: client/src/templates/job_templates/job-template.form.js:79 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:81 -#: client/src/templates/job_templates/job-template.form.js:83 msgid "Select the inventory containing the hosts you want this job to manage." msgstr "" "Seleccione el inventario que contenga los servidores que desea que este " @@ -4998,20 +4611,18 @@ msgstr "" "Seleccione el archivo del inventario que sincronizará esta fuente. Puede " "seleccionar del menú desplegable o ingresar un archivo en la entrada." -#: client/src/templates/job_templates/job-template.form.js:119 -#: client/src/templates/job_templates/job-template.form.js:123 +#: client/src/templates/job_templates/job-template.form.js:114 msgid "Select the playbook to be executed by this job." msgstr "Seleccionar el playbook a ser ejecutado por este trabajo." -#: client/src/templates/job_templates/job-template.form.js:102 -#: client/src/templates/job_templates/job-template.form.js:106 +#: client/src/templates/job_templates/job-template.form.js:99 msgid "" "Select the project containing the playbook you want this job to execute." msgstr "" "Seleccionar el proyecto que contiene el playbook que desea ejecutar este " "trabajo." -#: client/src/configuration/system-form/configuration-system.controller.js:191 +#: client/src/configuration/system-form/configuration-system.controller.js:197 msgid "Select types" msgstr "Seleccionar los tipos" @@ -5020,15 +4631,12 @@ msgstr "Seleccionar los tipos" msgid "Select which groups to create automatically." msgstr "Seleccione los grupos que se crearán de manera automática." -#: client/src/notifications/notificationTemplates.form.js:113 -#: client/src/notifications/notificationTemplates.form.js:114 +#: client/src/notifications/notificationTemplates.form.js:110 msgid "Sender Email" msgstr "Dirección de correo del remitente" #: client/src/credentials/factories/become-method-change.factory.js:24 #: client/src/credentials/factories/kind-change.factory.js:81 -#: client/src/credentials/factories/become-method-change.factory.js:26 -#: client/src/credentials/factories/kind-change.factory.js:83 msgid "Service Account Email Address" msgstr "Dirección de correo de cuenta de servicio" @@ -5053,27 +4661,19 @@ msgstr "" msgid "Settings" msgstr "Ajustes" -#: client/src/job-submission/job-submission.partial.html:107 -#: client/src/job-submission/job-submission.partial.html:120 -#: client/src/job-submission/job-submission.partial.html:133 -#: client/src/job-submission/job-submission.partial.html:146 -#: client/src/job-submission/job-submission.partial.html:292 -#: client/src/shared/form-generator.js:869 -#: client/src/job-submission/job-submission.partial.html:105 -#: client/src/job-submission/job-submission.partial.html:118 -#: client/src/job-submission/job-submission.partial.html:131 -#: client/src/job-submission/job-submission.partial.html:144 -#: client/src/job-submission/job-submission.partial.html:289 -#: client/src/shared/form-generator.js:892 +#: client/src/job-submission/job-submission.partial.html:108 +#: client/src/job-submission/job-submission.partial.html:122 +#: client/src/job-submission/job-submission.partial.html:136 +#: client/src/job-submission/job-submission.partial.html:150 +#: client/src/job-submission/job-submission.partial.html:299 +#: client/src/shared/form-generator.js:876 msgid "Show" msgstr "Mostrar" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:114 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:117 -#: client/src/templates/job_templates/job-template.form.js:250 -#: client/src/templates/job_templates/job-template.form.js:253 -#: client/src/templates/job_templates/job-template.form.js:252 -#: client/src/templates/job_templates/job-template.form.js:255 +#: client/src/templates/job_templates/job-template.form.js:245 +#: client/src/templates/job_templates/job-template.form.js:248 msgid "Show Changes" msgstr "Mostrar cambios" @@ -5081,37 +4681,27 @@ msgstr "Mostrar cambios" #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:44 #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:55 #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:76 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:34 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:45 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:56 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:77 msgid "Sign in with %s" msgstr "Iniciar sesión con %s" #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:63 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:64 msgid "Sign in with %s Organizations" msgstr "Iniciar sesión con las organizaciones %s" #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:61 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:62 msgid "Sign in with %s Teams" msgstr "Iniciar sesión con los equipos %s" -#: client/src/job-results/job-results.partial.html:392 -#: client/src/job-submission/job-submission.partial.html:239 -#: client/src/templates/job_templates/job-template.form.js:222 -#: client/src/templates/job_templates/job-template.form.js:229 +#: client/src/job-results/job-results.partial.html:395 +#: client/src/job-submission/job-submission.partial.html:245 +#: client/src/templates/job_templates/job-template.form.js:217 +#: client/src/templates/job_templates/job-template.form.js:224 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:142 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:150 -#: client/src/job-submission/job-submission.partial.html:237 -#: client/src/templates/job_templates/job-template.form.js:233 -#: client/src/templates/job_templates/job-template.form.js:242 msgid "Skip Tags" msgstr "Omitir etiquetas" #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:148 -#: client/src/templates/job_templates/job-template.form.js:240 msgid "" "Skip tags are useful when you have a large playbook, and you want to skip " "specific parts of a play or task." @@ -5119,7 +4709,7 @@ msgstr "" "Omitir etiquetas es útil cuando se posee de un playbook largo y desea omitir" " algunas partes de una jugada o tarea." -#: client/src/templates/job_templates/job-template.form.js:228 +#: client/src/templates/job_templates/job-template.form.js:223 msgid "" "Skip tags are useful when you have a large playbook, and you want to skip " "specific parts of a play or task. Use commas to separate multiple tags. " @@ -5130,16 +4720,15 @@ msgstr "" "comas para separar las distintas etiquetas. Consulte la documentación de " "Ansible Tower para obtener información detallada sobre el uso de etiquetas." -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:69 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:62 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:66 msgid "Smart Host Filter" msgstr "Filtro de host inteligente" #: client/src/inventories-hosts/inventories/inventory.list.js:85 #: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:69 #: client/src/organizations/linkout/controllers/organizations-inventories.controller.js:70 -#: client/src/shared/form-generator.js:1449 -#: client/src/shared/form-generator.js:1500 +#: client/src/shared/form-generator.js:1456 msgid "Smart Inventory" msgstr "Inventario inteligente" @@ -5149,8 +4738,6 @@ msgstr "Se puede solucionar con playbook" #: client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.directive.js:57 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:64 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:61 -#: client/src/partials/subhome.html:8 msgid "Source" msgstr "Fuente" @@ -5163,15 +4750,12 @@ msgstr "Fuente de control" msgid "Source Details" msgstr "Detalles de la fuente" -#: client/src/notifications/notificationTemplates.form.js:195 -#: client/src/notifications/notificationTemplates.form.js:196 -#: client/src/notifications/notificationTemplates.form.js:198 -#: client/src/notifications/notificationTemplates.form.js:199 +#: client/src/notifications/notificationTemplates.form.js:192 +#: client/src/notifications/notificationTemplates.form.js:193 msgid "Source Phone Number" msgstr "Número de teléfono de la fuente" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:136 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:127 msgid "Source Regions" msgstr "Regiones de fuente" @@ -5185,10 +4769,6 @@ msgstr "Regiones de fuente" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:281 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:291 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:298 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:195 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:202 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:218 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:241 msgid "Source Variables" msgstr "Variables de fuente" @@ -5197,12 +4777,11 @@ msgid "Source Vars" msgstr "Vars de la fuente" #: client/src/inventories-hosts/inventories/related/sources/sources.list.js:34 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:189 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:195 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:184 msgid "Sources" msgstr "Fuentes" -#: client/src/notifications/notificationTemplates.form.js:333 +#: client/src/notifications/notificationTemplates.form.js:330 msgid "" "Specify HTTP Headers in JSON format. Refer to the Ansible Tower " "documentation for example syntax." @@ -5218,7 +4797,7 @@ msgstr "" "Especificar un método para las operaciones %s. Esto es equivalente a " "especificar el parámetro %s, cuando %s puede ser %s." -#: client/src/notifications/notificationTemplates.form.js:295 +#: client/src/notifications/notificationTemplates.form.js:292 msgid "" "Specify a notification color. Acceptable colors are: yellow, green, red " "purple, gray or random." @@ -5263,7 +4842,7 @@ msgstr "Hora de inicio" msgid "Start a job using this template" msgstr "Iniciar un trabajo usando esta plantilla" -#: client/src/projects/edit/projects-edit.controller.js:133 +#: client/src/projects/edit/projects-edit.controller.js:134 #: client/src/projects/list/projects-list.controller.js:74 msgid "Start an SCM update" msgstr "Iniciar una actualización de SCM" @@ -5272,7 +4851,7 @@ msgstr "Iniciar una actualización de SCM" msgid "Start sync process" msgstr "Iniciar proceso de sincronización" -#: client/src/job-results/job-results.partial.html:97 +#: client/src/job-results/job-results.partial.html:100 msgid "Started" msgstr "Iniciado" @@ -5290,7 +4869,7 @@ msgstr "Estado" msgid "Sub Category" msgstr "Subcategoría" -#: client/src/license/license.partial.html:121 +#: client/src/license/license.partial.html:126 msgid "Submit" msgstr "Enviar" @@ -5329,7 +4908,7 @@ msgstr "Correctos" msgid "Survey" msgstr "Encuesta" -#: client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js:57 +#: client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js:60 #: client/src/templates/workflows/edit-workflow/workflow-edit.controller.js:64 msgid "" "Surveys allow users to be prompted at job launch with a series of questions " @@ -5402,8 +4981,6 @@ msgstr "TACACS+" #: client/src/organizations/list/organizations-list.controller.js:60 #: client/src/teams/main.js:46 client/src/teams/teams.list.js:14 #: client/src/teams/teams.list.js:15 -#: client/src/activity-stream/get-target-title.factory.js:20 -#: client/src/organizations/linkout/organizations-linkout.route.js:96 msgid "TEAMS" msgstr "EQUIPOS" @@ -5413,11 +4990,14 @@ msgstr "EQUIPOS" #: client/src/templates/list/templates-list.route.js:13 #: client/src/templates/templates.list.js:15 #: client/src/templates/templates.list.js:16 -#: client/src/activity-stream/get-target-title.factory.js:41 msgid "TEMPLATES" msgstr "PLANTILLAS" -#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:102 +#: client/src/instance-groups/instance-groups.list.js:8 +msgid "THERE ARE CURRENTLY NO INSTANCE GROUPS DEFINED" +msgstr "NO HAY INSTANCIAS DE GRUPOS DEFINIDAS EN ESTE MOMENTO" + +#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:104 msgid "TIME" msgstr "DURACIÓN" @@ -5431,7 +5011,6 @@ msgid "Tag None:" msgstr "Ninguna etiqueta:" #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:133 -#: client/src/templates/job_templates/job-template.form.js:221 msgid "" "Tags are useful when you have a large playbook, and you want to run a " "specific part of a play or task." @@ -5439,7 +5018,7 @@ msgstr "" "Etiquetas son útiles cuando se tiene un playbook largo y se desea " "especificar una parte específica de una jugada o tarea." -#: client/src/templates/job_templates/job-template.form.js:211 +#: client/src/templates/job_templates/job-template.form.js:206 msgid "" "Tags are useful when you have a large playbook, and you want to run a " "specific part of a play or task. Use commas to separate multiple tags. Refer" @@ -5455,25 +5034,20 @@ msgstr "" msgid "Tags:" msgstr "Etiquetas:" -#: client/src/notifications/notificationTemplates.form.js:312 -#: client/src/notifications/notificationTemplates.form.js:317 +#: client/src/notifications/notificationTemplates.form.js:309 msgid "Target URL" msgstr "URL destino" -#: client/src/job-results/job-results.partial.html:493 +#: client/src/job-results/job-results.partial.html:496 msgid "Tasks" msgstr "Tareas" -#: client/features/credentials/legacy.credentials.js:97 +#: client/features/credentials/legacy.credentials.js:94 #: client/src/credentials/credentials.form.js:467 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:157 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:160 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:154 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:155 #: client/src/projects/projects.form.js:261 #: client/src/templates/workflows.form.js:144 -#: client/features/credentials/legacy.credentials.js:92 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:166 -#: client/src/projects/projects.form.js:260 -#: client/src/templates/workflows.form.js:149 msgid "Team Roles" msgstr "Funciones de equipo" @@ -5482,20 +5056,16 @@ msgstr "Funciones de equipo" #: client/src/organizations/linkout/organizations-linkout.route.js:108 #: client/src/setup-menu/setup-menu.partial.html:16 #: client/src/shared/stateDefinitions.factory.js:410 -#: client/src/users/users.form.js:155 -#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:33 -#: client/src/shared/stateDefinitions.factory.js:364 -#: client/src/users/users.form.js:156 +#: client/src/users/users.form.js:159 msgid "Teams" msgstr "Equipos" -#: client/src/job-results/job-results.partial.html:132 +#: client/src/job-results/job-results.partial.html:135 #: client/src/templates/templates.list.js:14 msgid "Template" msgstr "Plantilla" #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:35 -#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:34 msgid "Templates" msgstr "Plantillas" @@ -5503,7 +5073,7 @@ msgstr "Plantillas" msgid "Tenant ID" msgstr "ID inquilino [Tenant]" -#: client/src/configuration/system-form/sub-forms/system-logging.form.js:78 +#: client/src/configuration/system-form/sub-forms/system-logging.form.js:79 msgid "Test" msgstr "Probar" @@ -5511,10 +5081,8 @@ msgstr "Probar" msgid "Test notification" msgstr "Probar notificación" -#: client/src/shared/form-generator.js:1379 -#: client/src/shared/form-generator.js:1385 -#: client/src/shared/form-generator.js:1430 -#: client/src/shared/form-generator.js:1436 +#: client/src/shared/form-generator.js:1386 +#: client/src/shared/form-generator.js:1392 msgid "That value was not found. Please enter or select a valid value." msgstr "" "El valor no fue encontrado. Por favor introduzca o seleccione un valor " @@ -5530,8 +5098,6 @@ msgstr "No se encontró la credencial de Insights para {{inventory.name}}." #: client/src/credentials/factories/become-method-change.factory.js:32 #: client/src/credentials/factories/kind-change.factory.js:89 -#: client/src/credentials/factories/become-method-change.factory.js:34 -#: client/src/credentials/factories/kind-change.factory.js:91 msgid "" "The Project ID is the GCE assigned identification. It is constructed as two " "words followed by a three digit number. Such as:" @@ -5539,7 +5105,7 @@ msgstr "" "El ID del proyecto es el identificador asignado en GCE. Se construye de dos " "palabras seguidas por tres dígitos. Ejemplo:" -#: client/src/projects/edit/projects-edit.controller.js:326 +#: client/src/projects/edit/projects-edit.controller.js:332 msgid "The SCM update process is running." msgstr "El proceso de actualización SCM está en ejecución." @@ -5554,14 +5120,12 @@ msgstr "" "La dirección de correo asignada a la cuenta de servicio Google Compute " "Engine %s." -#: client/src/job-results/job-results.partial.html:510 +#: client/src/job-results/job-results.partial.html:513 msgid "The host count will update when the job is complete." msgstr "El conteo de hosts se actualizará cuando se complete la tarea." -#: client/src/credentials/factories/become-method-change.factory.js:68 -#: client/src/credentials/factories/kind-change.factory.js:125 -#: client/src/credentials/factories/become-method-change.factory.js:70 -#: client/src/credentials/factories/kind-change.factory.js:127 +#: client/src/credentials/factories/become-method-change.factory.js:62 +#: client/src/credentials/factories/kind-change.factory.js:119 msgid "The host to authenticate with." msgstr "El servidor al que autentificarse." @@ -5582,7 +5146,6 @@ msgstr "" "eliminación final." #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:104 -#: client/src/templates/job_templates/job-template.form.js:160 msgid "" "The number of parallel or simultaneous processes to use while executing the " "playbook. Inputting no value will use the default value from the %sansible " @@ -5592,7 +5155,7 @@ msgstr "" "ejecuta el playbook. Si no ingresa un valor, se utilizará el valor " "predeterminado desde el %sfichero de configuración ansible%s." -#: client/src/templates/job_templates/job-template.form.js:157 +#: client/src/templates/job_templates/job-template.form.js:152 msgid "" "The number of parallel or simultaneous processes to use while executing the " "playbook. Value defaults to 0. Refer to the Ansible documentation for " @@ -5603,8 +5166,7 @@ msgstr "" " documentación de Ansible Tower para obtener información detallada sobre el " "archivo de configuración." -#: client/src/job-results/job-results.controller.js:590 -#: client/src/job-results/job-results.controller.js:585 +#: client/src/job-results/job-results.controller.js:619 msgid "The output is too large to display. Please download." msgstr "La salida es muy larga para ser mostrada. Por favor descárguela." @@ -5613,7 +5175,6 @@ msgid "The project value" msgstr "El valor del proyecto" #: client/src/projects/list/projects-list.controller.js:159 -#: client/src/projects/list/projects-list.controller.js:158 msgid "" "The selected project is not configured for SCM. To configure for SCM, edit " "the project and provide SCM settings, and then run an update." @@ -5630,6 +5191,16 @@ msgstr "" "La salida estándar es demasiado larga para ser mostrada. Especifique filtros" " adicionales para limitar la salida estándar." +#: client/src/templates/survey-maker/shared/question-definition.form.js:52 +msgid "" +"The suggested format for variable names is lowercase and underscore-" +"separated (for example, foo_bar, user_id, host_name, etc.). Variable names " +"with spaces are not allowed." +msgstr "" +"El formato sugerido para los nombres de variables es minúsculas y guiones " +"bajos (por ejemplo, foo_bar, user_id, host_name, etc.). No están permitidos " +"los nombres de variables con espacios." + #: client/src/management-jobs/scheduler/schedulerForm.partial.html:124 msgid "The time must be in HH24:MM:SS format." msgstr "La hora debe ser en formato HH24:MM:SS" @@ -5651,7 +5222,6 @@ msgid "There are no jobs to display at this time" msgstr "No hay trabajos a mostrar por el momento" #: client/src/projects/list/projects-list.controller.js:150 -#: client/src/projects/list/projects-list.controller.js:149 msgid "" "There is no SCM update information available for this project. An update has" " not yet been completed. If you have not already done so, start an update " @@ -5660,17 +5230,32 @@ msgstr "" "No hay información disponible de la actualización SCM disponible para este " "proyecto. Una actualización no ha sido todavía completada." -#: client/src/configuration/configuration.controller.js:345 -#: client/src/configuration/configuration.controller.js:342 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:140 +msgid "There was an error deleting inventory source groups. Returned status:" +msgstr "" +"Se produjo un error al eliminar los grupos de la fuente del inventario. " +"Estado devuelto:" + +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:130 +msgid "There was an error deleting inventory source hosts. Returned status:" +msgstr "" +"Se produjo un error al eliminar los hosts de la fuente del inventario. " +"Estado devuelto:" + +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:167 +msgid "There was an error deleting inventory source. Returned status:" +msgstr "" +"Se produjo un error al eliminar la fuente del inventario. Estado devuelto:" + +#: client/src/configuration/configuration.controller.js:349 msgid "There was an error resetting value. Returned status:" msgstr "Ha habido un error reiniciando el valor. Estado devuelto:" -#: client/src/configuration/configuration.controller.js:525 -#: client/src/configuration/configuration.controller.js:519 +#: client/src/configuration/configuration.controller.js:531 msgid "There was an error resetting values. Returned status:" msgstr "Ha habido un error reiniciando valores. Estado devuelto:" -#: client/src/configuration/system-form/configuration-system.controller.js:227 +#: client/src/configuration/system-form/configuration-system.controller.js:232 msgid "There was an error testing the log aggregator. Returned status:" msgstr "" "Se produjo un error al probar el agregador de registros. Estado devuelto:" @@ -5694,10 +5279,8 @@ msgstr "Este grupo contiene" msgid "This is not a valid number." msgstr "Éste no es un número válido." -#: client/src/credentials/factories/become-method-change.factory.js:65 -#: client/src/credentials/factories/kind-change.factory.js:122 -#: client/src/credentials/factories/become-method-change.factory.js:67 -#: client/src/credentials/factories/kind-change.factory.js:124 +#: client/src/credentials/factories/become-method-change.factory.js:59 +#: client/src/credentials/factories/kind-change.factory.js:116 msgid "" "This is the tenant name. This value is usually the same as the username." msgstr "" @@ -5718,22 +5301,19 @@ msgid "" msgstr "" "Esta máquina no se ha registrado con Insights en {{last_check_in}} horas" -#: client/src/shared/form-generator.js:740 -#: client/src/shared/form-generator.js:765 +#: client/src/shared/form-generator.js:746 msgid "" "This setting has been set manually in a settings file and is now disabled." msgstr "" "Este valor ha sido establecido manualmente en el fichero de configuración y " "ahora está inhabilitado." -#: client/src/users/users.form.js:160 client/src/users/users.form.js:161 +#: client/src/users/users.form.js:164 msgid "This user is not a member of any teams" msgstr "Este usuario no es miembro de ningún equipo." -#: client/src/shared/form-generator.js:849 -#: client/src/shared/form-generator.js:944 -#: client/src/shared/form-generator.js:872 -#: client/src/shared/form-generator.js:968 +#: client/src/shared/form-generator.js:856 +#: client/src/shared/form-generator.js:951 msgid "" "This value does not match the password you entered previously. Please " "confirm that password." @@ -5741,8 +5321,7 @@ msgstr "" "Este valor no corresponde con la contraseña introducida anteriormente. Por " "favor confirme la contraseña." -#: client/src/configuration/configuration.controller.js:550 -#: client/src/configuration/configuration.controller.js:544 +#: client/src/configuration/configuration.controller.js:556 msgid "" "This will reset all configuration values to their factory defaults. Are you " "sure you want to proceed?" @@ -5753,7 +5332,6 @@ msgstr "" #: client/src/activity-stream/streams.list.js:25 #: client/src/home/dashboard/lists/jobs/jobs-list.partial.html:14 #: client/src/notifications/notification-templates-list/list.controller.js:72 -#: client/src/activity-stream/streams.list.js:26 msgid "Time" msgstr "Duración" @@ -5762,7 +5340,6 @@ msgid "Time Remaining" msgstr "Tiempo restante" #: client/src/projects/projects.form.js:196 -#: client/src/projects/projects.form.js:195 msgid "" "Time in seconds to consider a project to be current. During job runs and " "callbacks the task system will evaluate the timestamp of the latest project " @@ -5796,8 +5373,7 @@ msgstr "" "Para aprender más sobre el token de IAM STS, acuda a la documentación de " "%sAmazon%s." -#: client/src/shared/form-generator.js:874 -#: client/src/shared/form-generator.js:897 +#: client/src/shared/form-generator.js:881 msgid "Toggle the display of plaintext." msgstr "Conmutar la visualización en texto plano." @@ -5828,7 +5404,7 @@ msgstr "Traceback" #: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:52 #: client/src/inventories-hosts/inventories/related/sources/sources.list.js:41 #: client/src/jobs/all-jobs.list.js:59 -#: client/src/notifications/notificationTemplates.form.js:57 +#: client/src/notifications/notificationTemplates.form.js:54 #: client/src/notifications/notificationTemplates.list.js:39 #: client/src/notifications/notifications.list.js:31 #: client/src/projects/projects.list.js:44 @@ -5837,9 +5413,7 @@ msgstr "Traceback" #: client/src/templates/completed-jobs.list.js:53 #: client/src/templates/templates.list.js:31 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:27 -#: client/src/users/users.form.js:196 -#: client/src/credential-types/credential-types.list.js:28 -#: client/src/users/users.form.js:197 +#: client/src/users/users.form.js:200 msgid "Type" msgstr "Tipo" @@ -5850,7 +5424,7 @@ msgid "Type Details" msgstr "Detalles del tipo" #: client/src/projects/add/projects-add.controller.js:169 -#: client/src/projects/edit/projects-edit.controller.js:298 +#: client/src/projects/edit/projects-edit.controller.js:304 msgid "URL popover text" msgstr "Texto 'popover' de la URL" @@ -5863,8 +5437,6 @@ msgstr "NOMBRE DE USUARIO" #: client/src/organizations/list/organizations-list.controller.js:54 #: client/src/users/main.js:46 client/src/users/users.list.js:18 #: client/src/users/users.list.js:19 -#: client/src/activity-stream/get-target-title.factory.js:17 -#: client/src/organizations/linkout/organizations-linkout.route.js:41 msgid "USERS" msgstr "USUARIOS" @@ -5872,6 +5444,10 @@ msgstr "USUARIOS" msgid "Unable to Submit" msgstr "No se puede enviar" +#: client/lib/components/components.strings.js:52 +msgid "Unavailable to run jobs." +msgstr "No disponible para ejecutar tareas." + #: client/lib/components/components.strings.js:22 msgid "Unexpected Error" msgstr "Error inesperado" @@ -5890,36 +5466,29 @@ msgstr "Tipo de modelo de visualización no compatible" msgid "Unsupported input type" msgstr "Tipo de entrada no compatible" -#: client/src/projects/list/projects-list.controller.js:267 -#: client/src/projects/list/projects-list.controller.js:265 +#: client/src/projects/list/projects-list.controller.js:266 msgid "Update Not Found" msgstr "Actualización no encontrada" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:321 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:276 msgid "Update Options" msgstr "Actualizar opciones" -#: client/src/projects/edit/projects-edit.controller.js:326 +#: client/src/projects/edit/projects-edit.controller.js:332 msgid "Update in Progress" msgstr "Actualización en curso" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:352 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:357 #: client/src/projects/projects.form.js:177 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:308 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:313 -#: client/src/projects/projects.form.js:176 msgid "Update on Launch" msgstr "Actualizar al ejecutar" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:364 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:320 msgid "Update on Project Change" msgstr "Actualizar en el cambio de proyecto" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:370 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:326 msgid "Update on Project Update" msgstr "Actualizar en la actualización del proyecto" @@ -5927,21 +5496,26 @@ msgstr "Actualizar en la actualización del proyecto" msgid "Upgrade" msgstr "Actualizar" +#: client/src/templates/job_templates/job-template.form.js:299 #: client/src/templates/job_templates/job-template.form.js:304 -#: client/src/templates/job_templates/job-template.form.js:309 msgid "Use Fact Cache" msgstr "Usar caché de eventos" -#: client/src/notifications/notificationTemplates.form.js:398 -#: client/src/notifications/notificationTemplates.form.js:410 +#: client/src/notifications/notificationTemplates.form.js:395 msgid "Use SSL" msgstr "Utilizar SSL" -#: client/src/notifications/notificationTemplates.form.js:393 -#: client/src/notifications/notificationTemplates.form.js:405 +#: client/src/notifications/notificationTemplates.form.js:390 msgid "Use TLS" msgstr "Utilizar TLS" +#: client/src/instance-groups/instance-group.partial.html:10 +#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:10 +#: client/src/instance-groups/instances/instances-list.partial.html:21 +#: client/src/instance-groups/list/instance-groups-list.partial.html:32 +msgid "Used Capacity" +msgstr "Capacidad usada" + #: client/src/credentials/credentials.form.js:76 msgid "" "Used to check out and synchronize playbook repositories with a remote source" @@ -5952,17 +5526,13 @@ msgstr "" " remoto de gestión de código fuente como Git, Subversion (svn) o Mercurial " "(hg). Estos credenciales son utilizados por proyectos." -#: client/features/credentials/legacy.credentials.js:86 +#: client/features/credentials/legacy.credentials.js:83 #: client/src/credentials/credentials.form.js:456 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:146 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:149 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:143 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:144 #: client/src/organizations/organizations.form.js:92 #: client/src/projects/projects.form.js:250 client/src/teams/teams.form.js:93 #: client/src/templates/workflows.form.js:133 -#: client/features/credentials/legacy.credentials.js:81 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:155 -#: client/src/projects/projects.form.js:249 -#: client/src/templates/workflows.form.js:138 msgid "User" msgstr "Usuario" @@ -5970,21 +5540,19 @@ msgstr "Usuario" msgid "User Interface" msgstr "Interfaz de usuario" -#: client/src/users/users.form.js:91 client/src/users/users.form.js:92 +#: client/src/users/users.form.js:95 msgid "User Type" msgstr "Tipo de usuario" #: client/src/access/rbac-multiselect/permissionsUsers.list.js:30 #: client/src/credentials/factories/become-method-change.factory.js:17 -#: client/src/credentials/factories/become-method-change.factory.js:44 -#: client/src/credentials/factories/kind-change.factory.js:101 +#: client/src/credentials/factories/become-method-change.factory.js:38 #: client/src/credentials/factories/kind-change.factory.js:17 #: client/src/credentials/factories/kind-change.factory.js:41 #: client/src/credentials/factories/kind-change.factory.js:74 -#: client/src/notifications/notificationTemplates.form.js:67 +#: client/src/credentials/factories/kind-change.factory.js:95 +#: client/src/notifications/notificationTemplates.form.js:64 #: client/src/users/users.form.js:58 client/src/users/users.list.js:29 -#: client/src/credentials/factories/become-method-change.factory.js:46 -#: client/src/credentials/factories/kind-change.factory.js:103 msgid "Username" msgstr "Usuario" @@ -6004,7 +5572,6 @@ msgstr "" #: client/src/organizations/organizations.form.js:74 #: client/src/setup-menu/setup-menu.partial.html:10 #: client/src/teams/teams.form.js:75 -#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:35 msgid "Users" msgstr "Usuarios" @@ -6040,26 +5607,22 @@ msgstr "Licencia válida" #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.form.js:47 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:67 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:67 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:84 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:93 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:99 -#: client/src/inventories-hosts/hosts/host.form.js:67 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:66 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:81 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:88 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:94 msgid "Variables" msgstr "Variables" -#: client/src/job-submission/job-submission.partial.html:357 -#: client/src/job-submission/job-submission.partial.html:354 +#: client/src/job-submission/job-submission.partial.html:364 msgid "Vault" msgstr "Vault" -#: client/src/job-results/job-results.partial.html:318 +#: client/src/job-results/job-results.partial.html:321 msgid "Vault Credential" msgstr "Credencial de Vault" #: client/src/credentials/credentials.form.js:391 -#: client/src/job-submission/job-submission.partial.html:142 -#: client/src/job-submission/job-submission.partial.html:140 +#: client/src/job-submission/job-submission.partial.html:146 msgid "Vault Password" msgstr "Contraseña Vault" @@ -6067,16 +5630,11 @@ msgstr "Contraseña Vault" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:90 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:307 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:314 -#: client/src/job-results/job-results.partial.html:355 -#: client/src/job-submission/job-submission.partial.html:178 +#: client/src/job-results/job-results.partial.html:358 +#: client/src/job-submission/job-submission.partial.html:183 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:99 -#: client/src/templates/job_templates/job-template.form.js:179 -#: client/src/templates/job_templates/job-template.form.js:186 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:263 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:270 -#: client/src/job-submission/job-submission.partial.html:176 -#: client/src/templates/job_templates/job-template.form.js:188 -#: client/src/templates/job_templates/job-template.form.js:195 +#: client/src/templates/job_templates/job-template.form.js:174 +#: client/src/templates/job_templates/job-template.form.js:181 msgid "Verbosity" msgstr "Nivel de detalle" @@ -6088,14 +5646,12 @@ msgstr "Versión" #: client/src/credential-types/credential-types.list.js:64 #: client/src/credentials/credentials.list.js:75 #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:58 -#: client/src/inventories-hosts/inventories/inventory.list.js:105 +#: client/src/inventories-hosts/inventories/inventory.list.js:104 #: client/src/inventory-scripts/inventory-scripts.list.js:62 #: client/src/notifications/notificationTemplates.list.js:82 #: client/src/scheduler/schedules.list.js:83 client/src/teams/teams.list.js:64 #: client/src/templates/templates.list.js:112 #: client/src/users/users.list.js:70 -#: client/src/activity-stream/streams.list.js:64 -#: client/src/credential-types/credential-types.list.js:61 msgid "View" msgstr "Mostrar" @@ -6120,10 +5676,7 @@ msgstr "Ver ejemplos de JSON en" #: client/src/inventories-hosts/hosts/host.form.js:78 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:77 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:77 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:94 -#: client/src/inventories-hosts/hosts/host.form.js:77 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:76 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:103 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:91 msgid "View JSON examples at %s" msgstr "Mostrar los ejemplos JSON en %s" @@ -6135,12 +5688,9 @@ msgstr "Ver menos" msgid "View More" msgstr "Ver más" -#: client/src/shared/form-generator.js:1711 -#: client/src/templates/job_templates/job-template.form.js:441 +#: client/src/shared/form-generator.js:1719 +#: client/src/templates/job_templates/job-template.form.js:436 #: client/src/templates/workflows.form.js:161 -#: client/src/shared/form-generator.js:1762 -#: client/src/templates/job_templates/job-template.form.js:458 -#: client/src/templates/workflows.form.js:166 msgid "View Survey" msgstr "Mostrar la encuesta" @@ -6153,20 +5703,15 @@ msgstr "Ver ejemplos de YAML en" #: client/src/inventories-hosts/hosts/host.form.js:79 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:78 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:78 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:95 -#: client/src/inventories-hosts/hosts/host.form.js:78 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:77 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:104 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:92 msgid "View YAML examples at %s" msgstr "Mostrar los ejemplos YAML en %s" #: client/src/setup-menu/setup-menu.partial.html:72 -#: client/src/setup-menu/setup-menu.partial.html:54 msgid "View Your License" msgstr "Mostrar su licencia" #: client/src/setup-menu/setup-menu.partial.html:73 -#: client/src/setup-menu/setup-menu.partial.html:55 msgid "View and edit your license information." msgstr "Mostrar y editar su información de licencia." @@ -6175,12 +5720,10 @@ msgid "View credential" msgstr "Mostrar credencial" #: client/src/credential-types/credential-types.list.js:66 -#: client/src/credential-types/credential-types.list.js:63 msgid "View credential type" msgstr "Ver tipo de credencial" #: client/src/activity-stream/streams.list.js:67 -#: client/src/activity-stream/streams.list.js:68 msgid "View event details" msgstr "Mostrar detalles del evento" @@ -6197,11 +5740,10 @@ msgid "View host" msgstr "Ver host" #: client/src/setup-menu/setup-menu.partial.html:67 -#: client/src/setup-menu/setup-menu.partial.html:73 msgid "View information about this version of Ansible {{BRAND_NAME}}." msgstr "Ver información acerca de esta versión de Ansible {{BRAND_NAME}}." -#: client/src/inventories-hosts/inventories/inventory.list.js:107 +#: client/src/inventories-hosts/inventories/inventory.list.js:106 msgid "View inventory" msgstr "Mostrar inventario" @@ -6210,7 +5752,6 @@ msgid "View inventory script" msgstr "Mostrar script de inventario" #: client/src/setup-menu/setup-menu.partial.html:55 -#: client/src/setup-menu/setup-menu.partial.html:61 msgid "View list and capacity of {{BRAND_NAME}} instances." msgstr "Ver lista y capacidad de las instancias de {{BRAND_NAME}}." @@ -6218,7 +5759,7 @@ msgstr "Ver lista y capacidad de las instancias de {{BRAND_NAME}}." msgid "View notification" msgstr "Mostrar notificación" -#: client/src/job-results/job-results.partial.html:219 +#: client/src/job-results/job-results.partial.html:222 msgid "View project sync results" msgstr "Ver resultados de sincronización del proyecto" @@ -6261,7 +5802,7 @@ msgstr "Mostrar usuario" #: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:42 #: client/src/instance-groups/jobs/jobs.list.js:41 -#: client/src/job-results/job-results.partial.html:142 +#: client/src/job-results/job-results.partial.html:145 #: client/src/jobs/all-jobs.list.js:49 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:25 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:25 @@ -6273,9 +5814,9 @@ msgid "WORKFLOW" msgstr "FLUJO DE TRABAJO" #: client/src/configuration/auth-form/configuration-auth.controller.js:73 -#: client/src/configuration/configuration.controller.js:196 -#: client/src/configuration/configuration.controller.js:258 -#: client/src/configuration/system-form/configuration-system.controller.js:53 +#: client/src/configuration/configuration.controller.js:200 +#: client/src/configuration/configuration.controller.js:262 +#: client/src/configuration/system-form/configuration-system.controller.js:55 msgid "Warning: Unsaved Changes" msgstr "Aviso: modificaciones no guardadas" @@ -6309,7 +5850,6 @@ msgstr "" "actualización del inventario." #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:97 -#: client/src/templates/job_templates/job-template.form.js:54 msgid "" "When this template is submitted as a job, setting the type to %s will " "execute the playbook, running tasks on the selected hosts." @@ -6317,10 +5857,8 @@ msgstr "" "Cuando una plantilla es lanzada como un trabajo, configurar el tipo a %s " "ejecutará el playbook, ejecutará las tareas en los servidores seleccionados." -#: client/src/shared/form-generator.js:1715 +#: client/src/shared/form-generator.js:1723 #: client/src/templates/workflows.form.js:187 -#: client/src/shared/form-generator.js:1766 -#: client/src/templates/workflows.form.js:192 msgid "Workflow Editor" msgstr "Editor de flujo de trabajo" @@ -6328,13 +5866,12 @@ msgstr "Editor de flujo de trabajo" msgid "Workflow Template" msgstr "Plantilla de flujo de trabajo" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:115 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:109 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:41 msgid "Workflow Templates" msgstr "Plantillas de flujo de trabajo" -#: client/src/job-submission/job-submission.partial.html:167 -#: client/src/job-submission/job-submission.partial.html:165 +#: client/src/job-submission/job-submission.partial.html:171 msgid "YAML" msgstr "YAML" @@ -6357,7 +5894,7 @@ msgstr "" "Usted puede crear una plantilla de trabajo aquí." -#: client/src/projects/edit/projects-edit.controller.js:61 +#: client/src/projects/edit/projects-edit.controller.js:62 msgid "You do not have access to view this property" msgstr "Usted no tiene permiso para ver esta propiedad" @@ -6365,14 +5902,18 @@ msgstr "Usted no tiene permiso para ver esta propiedad" msgid "You do not have permission to add a project." msgstr "Usted no tiene permiso para añadir un proyecto." -#: client/src/users/add/users-add.controller.js:42 +#: client/src/users/add/users-add.controller.js:43 msgid "You do not have permission to add a user." msgstr "Usted no tiene permiso para añadir un usuario." +#: client/src/inventories-hosts/inventory-hosts.strings.js:28 +msgid "You do not have sufficient permissions to edit the host filter." +msgstr "No tiene permisos suficientes para editar el filtro del host." + #: client/src/configuration/auth-form/configuration-auth.controller.js:72 -#: client/src/configuration/configuration.controller.js:195 -#: client/src/configuration/configuration.controller.js:257 -#: client/src/configuration/system-form/configuration-system.controller.js:52 +#: client/src/configuration/configuration.controller.js:199 +#: client/src/configuration/configuration.controller.js:261 +#: client/src/configuration/system-form/configuration-system.controller.js:54 msgid "" "You have unsaved changes. Would you like to proceed without" " saving?" @@ -6381,7 +5922,6 @@ msgstr "" "guardarlas?" #: client/src/projects/list/projects-list.controller.js:222 -#: client/src/projects/list/projects-list.controller.js:221 msgid "Your request to cancel the update was submitted to the task manager." msgstr "" "Su solicitud de cancelación de la actualización ha sido enviada al gestor de" @@ -6392,19 +5932,14 @@ msgid "Your session timed out due to inactivity. Please sign in." msgstr "Su sesión ha expirado debido a inactividad. Por favor inicie sesión." #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:24 -#: client/src/job-submission/job-submission.partial.html:310 -#: client/src/shared/form-generator.js:1186 -#: client/src/job-submission/job-submission.partial.html:307 -#: client/src/shared/form-generator.js:1238 +#: client/src/job-submission/job-submission.partial.html:317 +#: client/src/shared/form-generator.js:1193 msgid "and" msgstr "y" -#: client/src/job-submission/job-submission.partial.html:282 -#: client/src/job-submission/job-submission.partial.html:287 -#: client/src/job-submission/job-submission.partial.html:298 -#: client/src/job-submission/job-submission.partial.html:279 -#: client/src/job-submission/job-submission.partial.html:284 -#: client/src/job-submission/job-submission.partial.html:295 +#: client/src/job-submission/job-submission.partial.html:289 +#: client/src/job-submission/job-submission.partial.html:294 +#: client/src/job-submission/job-submission.partial.html:305 msgid "characters long." msgstr "caracteres." @@ -6429,12 +5964,10 @@ msgstr[0] "grupo" msgstr[1] "grupos" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:26 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:26 msgid "groups" msgstr "grupos" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:24 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:24 msgid "groups and" msgstr "grupos y" @@ -6446,8 +5979,6 @@ msgstr[1] "hosts" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:24 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:25 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:24 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:25 msgid "hosts" msgstr "hosts" @@ -6472,8 +6003,7 @@ msgstr "de la coincidencia con los filtros." msgid "organization" msgstr "organización" -#: client/src/shared/form-generator.js:1062 -#: client/src/shared/form-generator.js:1114 +#: client/src/shared/form-generator.js:1069 msgid "playbook" msgstr "playbook" @@ -6493,17 +6023,13 @@ msgstr "" msgid "test" msgstr "prueba" -#: client/src/job-submission/job-submission.partial.html:282 -#: client/src/job-submission/job-submission.partial.html:287 -#: client/src/job-submission/job-submission.partial.html:298 -#: client/src/job-submission/job-submission.partial.html:279 -#: client/src/job-submission/job-submission.partial.html:284 -#: client/src/job-submission/job-submission.partial.html:295 +#: client/src/job-submission/job-submission.partial.html:289 +#: client/src/job-submission/job-submission.partial.html:294 +#: client/src/job-submission/job-submission.partial.html:305 msgid "to" msgstr "para" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:139 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:130 msgid "" "to include all regions. Only Hosts associated with the selected regions will" " be updated." @@ -6572,231 +6098,3 @@ msgstr "{{breadcrumb.instance_group_name}}" #: client/src/shared/paginate/paginate.partial.html:55 msgid "{{pageSize}}" msgstr "{{pageSize}}" - -#: client/src/notifications/notificationTemplates.form.js:377 -msgid "%s or %s" -msgstr "%s o %s" - -#: client/src/partials/subhome.html:30 -msgid " Back to options" -msgstr " Regresar a opciones" - -#: client/src/partials/subhome.html:32 -msgid " Save" -msgstr " Guardar" - -#: client/src/partials/subhome.html:29 -msgid " View Details" -msgstr " Ver Detalles" - -#: client/src/partials/subhome.html:31 -msgid " Cancel" -msgstr " Cancelar" - -#: client/src/shared/smart-search/smart-search.partial.html:51 -msgid "ADDITIONAL INFORMATION:" -msgstr "INFORMACIÓN ADICIONAL:" - -#: client/lib/services/base-string.service.js:8 -msgid "BaseString cannot be extended without providing a namespace" -msgstr "No se puede ampliar BaseString sin proporcionar un espacio de nombres" - -#: client/src/notifications/notificationTemplates.form.js:299 -msgid "Color can be one of %s." -msgstr "El color puede ser solo uno de estos %s." - -#: client/src/inventory-scripts/inventory-scripts.form.js:62 -msgid "" -"Drag and drop your custom inventory script file here or create one in the " -"field to import your custom inventory." -msgstr "" -"Arrastrar y soltar sus ficheros scripts personalizados de inventario aquí o " -"crear uno en el campo para importar su inventario personalizado." - -#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:104 -msgid "" -"Extra Variables\n" -" \n" -" " -msgstr "" -"Variables Adicionales\n" -" \n" -" " - -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:120 -msgid "Failed to get third-party login types. Returned status:" -msgstr "" -"Ha fallado la obtención de tipos de autenticación de terceros. Estado " -"devuelto:" - -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:68 -msgid "Filter that will be applied to the hosts of this inventory." -msgstr "Filtro que se aplicará a los hosts de este inventario." - -#: client/src/shared/smart-search/smart-search.partial.html:51 -msgid "" -"For additional information on advanced search search syntax please see the " -"Ansible Tower " -"documentation." -msgstr "" -"Para obtener información adicional sobre la sintaxis de búsqueda avanzada, " -"por favor lea la documentación de Ansible Tower " -"documentación." - -#: client/src/notifications/notificationTemplates.form.js:101 -#: client/src/notifications/notificationTemplates.form.js:144 -#: client/src/notifications/notificationTemplates.form.js:161 -#: client/src/notifications/notificationTemplates.form.js:217 -#: client/src/notifications/notificationTemplates.form.js:339 -#: client/src/notifications/notificationTemplates.form.js:377 -msgid "For example:" -msgstr "Por ejemplo:" - -#: client/src/templates/job_templates/job-template.form.js:272 -msgid "" -"If enabled, run this playbook as an administrator. This is the equivalent of" -" passing the %s option to the %s command." -msgstr "" -"Si se habilita esta opción, ejecuta este playbook como administrador. Esto " -"es equivalente a pasar la opción %s al comando %s." - -#: client/src/templates/job_templates/job-template.form.js:57 -msgid "" -"Instead, %s will check playbook syntax, test environment setup and report " -"problems." -msgstr "" -"En vez, %s comprobará el playbook, la sintaxis, configuración del entorno de" -" pruebas e informará de problemas." - -#: client/src/inventories-hosts/inventories/insights/insights.partial.html:63 -msgid "" -"No data is available. Either there are no issues to report or no scan jobs " -"have been run on this host." -msgstr "" -"No hay datos disponibles. No hay problemas para informar o no se ejecutaron " -"tareas de análisis en este host." - -#: client/lib/services/base-string.service.js:9 -msgid "No string exists with this name" -msgstr "No hay cadenas con este nombre" - -#: client/src/notifications/notificationTemplates.form.js:201 -msgid "Number associated with the \"Messaging Service\" in Twilio." -msgstr "Número asociado con el \"Servicio de mensaje\" en Twilio.T" - -#: client/src/partials/survey-maker-modal.html:45 -msgid "PLEASE ADD A SURVEY PROMPT ON THE LEFT." -msgstr "POR FAVOR AGREGUE UN AVISO DE ENCUESTA A LA IZQUIERDA." - -#: client/src/shared/paginate/paginate.partial.html:33 -msgid "" -"Page\n" -" {{current}} of\n" -" {{last}}" -msgstr "" -"Page\n" -" {{current}} de\n" -" {{last}}" - -#: client/src/templates/job_templates/job-template.form.js:365 -#: client/src/templates/workflows.form.js:80 -msgid "" -"Pass extra command line variables to the playbook. This is the %s or %s " -"command line parameter for %s. Provide key/value pairs using either YAML or " -"JSON." -msgstr "" -"Transmitir variables adicionales en la línea de comandos a los playbook. " -"Este es el parámetro de línea de comandos %s o %s para %s. Introduzca pareja" -" de clave/valor utilizando la sintaxis YAML o JSON." - -#: client/src/partials/inventory-add.html:11 -msgid "Please enter a name for this job template copy." -msgstr "" -"Por favor introduzca un nombre para esta copia de platilla de trabajo." - -#: client/src/partials/subhome.html:6 -msgid "Properties" -msgstr "Propiedades" - -#: client/src/inventory-scripts/inventory-scripts.form.js:63 -msgid "Script must begin with a hashbang sequence: i.e.... %s" -msgstr "El script debe comenzar con la secuencia hashbang: p.e. ....%s" - -#: client/src/templates/job_templates/job-template.form.js:141 -msgid "" -"Select credentials that allow {{BRAND_NAME}} to access the nodes this job " -"will be ran against. You can only select one credential of each type.

You must select either a machine (SSH) credential or \"Prompt on " -"launch\". \"Prompt on launch\" requires you to select a machine credential " -"at run time.

If you select credentials AND check the \"Prompt on " -"launch\" box, you make the selected credentials the defaults that can be " -"updated at run time." -msgstr "" -"Seleccione credenciales que permiten a {{BRAND_NAME}} acceder a los nodos en" -" los que se ejecutará esta tarea. Solo puede seleccionar una credencial de " -"cada tipo.

Debe seleccionar una credencial de máquina (SSH) o " -"“Preguntar al ejecutar”. “Preguntar al ejecutar” requiere que seleccione una" -" credencial de máquina en el momento de la ejecución.

Si " -"selecciona credenciales Y marca la casilla “Preguntar al ejecutar”, las " -"credenciales seleccionadas son los valores predeterminados que se pueden " -"actualizar en el momento de la ejecución." - -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:115 -msgid "" -"Select the inventory file to be synced by this source. You can select from " -"the dropdown or enter a file within the input." -msgstr "" -"Seleccione el archivo de inventario que esta fuente sincronizará. Puede " -"seleccionar desde la lista desplegable o ingresar un archivo de la entrada." - -#: client/src/templates/job_templates/job-template.form.js:56 -msgid "Setting the type to %s will not execute the playbook." -msgstr "La configuración del tipo a %s no ejecutará el playbook." - -#: client/src/notifications/notificationTemplates.form.js:338 -msgid "Specify HTTP Headers in JSON format" -msgstr "Especificar las cabeceras HTTP en formato JSON" - -#: client/src/notifications/notificationTemplates.form.js:202 -msgid "This must be of the form %s." -msgstr "Esto debe tener el formato %s" - -#: client/src/notifications/notificationTemplates.form.js:100 -#: client/src/notifications/notificationTemplates.form.js:216 -msgid "Type an option on each line." -msgstr "Escriba una opción en cada línea" - -#: client/src/notifications/notificationTemplates.form.js:143 -#: client/src/notifications/notificationTemplates.form.js:160 -#: client/src/notifications/notificationTemplates.form.js:376 -msgid "Type an option on each line. The pound symbol (#) is not required." -msgstr "" -"Escriba una opción en cada línea. El símbolo almohadilla (#) no es " -"necesario." - -#: client/src/templates/templates.list.js:66 -msgid "Workflow Job Template" -msgstr "Plantilla de trabajo para flujo de trabajo" - -#: client/src/shared/form-generator.js:980 -msgid "Your password must be %d characters long." -msgstr "Su password debe ser de longitud %d." - -#: client/src/shared/form-generator.js:985 -msgid "Your password must contain a lowercase letter." -msgstr "Su password debe contener al menos una letra minúscula." - -#: client/src/shared/form-generator.js:995 -msgid "Your password must contain a number." -msgstr "Su password debe contener un número." - -#: client/src/shared/form-generator.js:990 -msgid "Your password must contain an uppercase letter." -msgstr "Su password debe contener una letra mayúscula." - -#: client/src/shared/form-generator.js:1000 -msgid "Your password must contain one of the following characters: %s" -msgstr "Su password debe contener uno de los siguientes caracteres: %s" diff --git a/awx/ui/po/fr.po b/awx/ui/po/fr.po index e2bea392e6..cf767346bf 100644 --- a/awx/ui/po/fr.po +++ b/awx/ui/po/fr.po @@ -5,10 +5,9 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2017-08-29 12:15+0000\n" +"PO-Revision-Date: 2017-12-04 04:51+0000\n" "Last-Translator: croe \n" "Language-Team: French\n" -"MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" @@ -16,7 +15,7 @@ msgstr "" "X-Generator: Zanata 4.2.1\n" #: client/src/projects/add/projects-add.controller.js:153 -#: client/src/projects/edit/projects-edit.controller.js:282 +#: client/src/projects/edit/projects-edit.controller.js:288 msgid "" "%sNote:%s Mercurial does not support password authentication for SSH. Do not" " put the username and key in the URL. If using Bitbucket and SSH, do not " @@ -28,7 +27,7 @@ msgstr "" "Bitbucket." #: client/src/projects/add/projects-add.controller.js:132 -#: client/src/projects/edit/projects-edit.controller.js:261 +#: client/src/projects/edit/projects-edit.controller.js:267 msgid "" "%sNote:%s When using SSH protocol for GitHub or Bitbucket, enter an SSH key " "only, do not enter a username (other than git). Additionally, GitHub and " @@ -47,7 +46,6 @@ msgid "(defaults to %s)" msgstr "(défini par défaut sur %s)" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:378 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:334 msgid "(seconds)" msgstr "(secondes)" @@ -71,7 +69,7 @@ msgstr "50" msgid "A schedule name is required." msgstr "Un intitulé est requis pour la programmation" -#: client/src/users/add/users-add.controller.js:101 +#: client/src/users/add/users-add.controller.js:102 msgid "A value is required" msgstr "Entrez une valeur" @@ -94,11 +92,10 @@ msgstr "DÉTAILS ACTIVITÉ" #: client/src/activity-stream/activitystream.route.js:28 #: client/src/activity-stream/streams.list.js:14 #: client/src/activity-stream/streams.list.js:15 -#: client/src/activity-stream/activitystream.route.js:27 msgid "ACTIVITY STREAM" msgstr "FLUX D’ACTIVITÉ" -#: client/features/credentials/legacy.credentials.js:79 +#: client/features/credentials/legacy.credentials.js:76 #: client/src/credential-types/credential-types.list.js:44 #: client/src/credentials/credentials.form.js:449 #: client/src/credentials/credentials.list.js:54 @@ -113,15 +110,10 @@ msgstr "FLUX D’ACTIVITÉ" #: client/src/projects/projects.list.js:78 #: client/src/scheduler/schedules.list.js:68 client/src/teams/teams.form.js:85 #: client/src/teams/teams.list.js:45 -#: client/src/templates/job_templates/job-template.form.js:402 +#: client/src/templates/job_templates/job-template.form.js:397 #: client/src/templates/templates.list.js:58 #: client/src/templates/workflows.form.js:125 #: client/src/users/users.list.js:50 -#: client/features/credentials/legacy.credentials.js:74 -#: client/src/credential-types/credential-types.list.js:41 -#: client/src/projects/projects.form.js:242 -#: client/src/templates/job_templates/job-template.form.js:422 -#: client/src/templates/workflows.form.js:130 msgid "ADD" msgstr "AJOUTER" @@ -133,8 +125,7 @@ msgstr "AJOUTER UN GROUPE" msgid "ADD HOST" msgstr "AJOUTER UN HÔTE" -#: client/src/teams/teams.form.js:157 client/src/users/users.form.js:212 -#: client/src/users/users.form.js:213 +#: client/src/teams/teams.form.js:157 client/src/users/users.form.js:216 msgid "ADD PERMISSIONS" msgstr "AJOUTER PERMISSION" @@ -152,7 +143,6 @@ msgstr "INFORMATIONS SUPPLÉMENTAIRES" #: client/src/organizations/linkout/organizations-linkout.route.js:330 #: client/src/organizations/list/organizations-list.controller.js:84 -#: client/src/organizations/linkout/organizations-linkout.route.js:323 msgid "ADMINS" msgstr "ADMINS" @@ -173,8 +163,7 @@ msgstr "QUELCONQUE" msgid "API Key" msgstr "Clé API" -#: client/src/notifications/notificationTemplates.form.js:246 -#: client/src/notifications/notificationTemplates.form.js:251 +#: client/src/notifications/notificationTemplates.form.js:243 msgid "API Service/Integration Key" msgstr "Service API/Clé d’intégration" @@ -197,7 +186,6 @@ msgid "ASSOCIATED HOSTS" msgstr "HÔTES ASSOCIÉS" #: client/src/setup-menu/setup-menu.partial.html:66 -#: client/src/setup-menu/setup-menu.partial.html:72 msgid "About {{BRAND_NAME}}" msgstr "À propos de {{BRAND_NAME}}" @@ -205,13 +193,11 @@ msgstr "À propos de {{BRAND_NAME}}" msgid "Access Key" msgstr "Clé d’accès" -#: client/src/notifications/notificationTemplates.form.js:224 -#: client/src/notifications/notificationTemplates.form.js:229 +#: client/src/notifications/notificationTemplates.form.js:221 msgid "Account SID" msgstr "SID de compte" -#: client/src/notifications/notificationTemplates.form.js:183 -#: client/src/notifications/notificationTemplates.form.js:186 +#: client/src/notifications/notificationTemplates.form.js:180 msgid "Account Token" msgstr "Token de compte" @@ -230,17 +216,15 @@ msgstr "Actions" msgid "Activity" msgstr "Activité" -#: client/src/configuration/system-form/configuration-system.controller.js:86 +#: client/src/configuration/system-form/configuration-system.controller.js:88 msgid "Activity Stream" msgstr "Flux d’activité" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:134 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:137 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:131 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:132 #: client/src/organizations/organizations.form.js:81 #: client/src/teams/teams.form.js:82 #: client/src/templates/workflows.form.js:122 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:143 -#: client/src/templates/workflows.form.js:127 msgid "Add" msgstr "Ajouter" @@ -260,12 +244,9 @@ msgstr "Ajouter les permissions" msgid "Add Project" msgstr "Ajouter un projet" -#: client/src/shared/form-generator.js:1703 -#: client/src/templates/job_templates/job-template.form.js:450 +#: client/src/shared/form-generator.js:1711 +#: client/src/templates/job_templates/job-template.form.js:445 #: client/src/templates/workflows.form.js:170 -#: client/src/shared/form-generator.js:1754 -#: client/src/templates/job_templates/job-template.form.js:467 -#: client/src/templates/workflows.form.js:175 msgid "Add Survey" msgstr "Ajouter un questionnaire" @@ -280,8 +261,6 @@ msgstr "Ajouter un utilisateur" #: client/src/shared/stateDefinitions.factory.js:410 #: client/src/shared/stateDefinitions.factory.js:578 #: client/src/users/users.list.js:17 -#: client/src/shared/stateDefinitions.factory.js:364 -#: client/src/shared/stateDefinitions.factory.js:532 msgid "Add Users" msgstr "Ajouter des utilisateurs" @@ -301,18 +280,13 @@ msgstr "Ajouter un hôte" msgid "Add a new schedule" msgstr "Ajouter une nouvelle programmation" -#: client/features/credentials/legacy.credentials.js:77 +#: client/features/credentials/legacy.credentials.js:74 #: client/src/credentials/credentials.form.js:447 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:136 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:139 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:133 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:134 #: client/src/projects/projects.form.js:241 -#: client/src/templates/job_templates/job-template.form.js:400 +#: client/src/templates/job_templates/job-template.form.js:395 #: client/src/templates/workflows.form.js:123 -#: client/features/credentials/legacy.credentials.js:72 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:145 -#: client/src/projects/projects.form.js:240 -#: client/src/templates/job_templates/job-template.form.js:420 -#: client/src/templates/workflows.form.js:128 msgid "Add a permission" msgstr "Ajouter une permission" @@ -325,8 +299,7 @@ msgstr "" "connexion afin de les utiliser lors du lancement de tâches sur des machines " "ou durant la synchronisation d'inventaires ou de projets." -#: client/src/shared/form-generator.js:1439 -#: client/src/shared/form-generator.js:1490 +#: client/src/shared/form-generator.js:1446 msgid "Admin" msgstr "Administrateur" @@ -350,7 +323,6 @@ msgstr "" #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:65 #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:74 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:139 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:130 msgid "All" msgstr "Tous" @@ -363,8 +335,8 @@ msgstr "Activités" msgid "All Jobs" msgstr "Toutes les tâches" -#: client/src/templates/job_templates/job-template.form.js:280 -#: client/src/templates/job_templates/job-template.form.js:287 +#: client/src/templates/job_templates/job-template.form.js:275 +#: client/src/templates/job_templates/job-template.form.js:282 msgid "Allow Provisioning Callbacks" msgstr "Autoriser les rappels d’exécution de Tower job_template" @@ -379,8 +351,7 @@ msgstr "" msgid "Always" msgstr "Toujours" -#: client/src/projects/list/projects-list.controller.js:267 -#: client/src/projects/list/projects-list.controller.js:265 +#: client/src/projects/list/projects-list.controller.js:266 msgid "" "An SCM update does not appear to be running for project: %s. Click the " "%sRefresh%s button to view the latest status." @@ -388,13 +359,21 @@ msgstr "" "Une mise à jour SCM ne semble pas s’exécuter pour le projet : %s. Cliquez " "sur le bouton %sActualiser%s pour voir l’état le plus récent." -#: client/src/templates/survey-maker/shared/question-definition.form.js:59 -#: client/src/templates/survey-maker/shared/question-definition.form.js:65 +#: client/src/templates/survey-maker/shared/question-definition.form.js:62 +#: client/src/templates/survey-maker/shared/question-definition.form.js:68 msgid "Answer Type" msgstr "Type de réponse" -#: client/src/credentials/list/credentials-list.controller.js:114 -#: client/src/credentials/list/credentials-list.controller.js:106 +#: client/src/templates/survey-maker/shared/question-definition.form.js:44 +#: client/src/templates/survey-maker/shared/question-definition.form.js:53 +msgid "Answer Variable Name" +msgstr "Nom de variable de réponse" + +#: client/src/job-results/job-results.service.js:144 +msgid "Are you sure you want to cancel the job below?" +msgstr "Voulez-vous vraiment supprimer la tâche ci-dessous ?" + +#: client/src/credentials/list/credentials-list.controller.js:133 msgid "Are you sure you want to delete the credential below?" msgstr "" "Voulez-vous vraiment supprimer les informations d’identification ci-dessous " @@ -404,6 +383,7 @@ msgstr "" msgid "Are you sure you want to delete the inventory below?" msgstr "Voulez-vous vraiment supprimer l'inventaire ci-dessous ?" +#: client/src/job-results/job-results.service.js:95 #: client/src/jobs/factories/delete-job.factory.js:110 msgid "Are you sure you want to delete the job below?" msgstr "Voulez-vous vraiment supprimer la tâche ci-dessous ?" @@ -417,10 +397,13 @@ msgid "Are you sure you want to delete the organization below?" msgstr "Voulez-vous vraiment supprimer l’organisation ci-dessous ?" #: client/src/projects/list/projects-list.controller.js:208 -#: client/src/projects/list/projects-list.controller.js:207 msgid "Are you sure you want to delete the project below?" msgstr "Voulez-vous vraiment supprimer le projet ci-dessous ?" +#: client/src/templates/list/templates-list.controller.js:103 +msgid "Are you sure you want to delete the template below?" +msgstr "Voulez-vous vraiment supprimer le modèle ci-dessous ?" + #: client/src/users/list/users-list.controller.js:90 msgid "Are you sure you want to delete the user below?" msgstr "Voulez-vous vraiment supprimer l’utilisateur ci-dessous ?" @@ -433,14 +416,13 @@ msgstr "Êtes-vous certain de vouloir supprimer ce {{deleteMode}}?" msgid "Are you sure you want to disassociate the group below from" msgstr "Voulez-vous vraiment supprimer le groupe ci-dessous de" -#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:22 +#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:23 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:25 -#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:25 +#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:26 msgid "Are you sure you want to disassociate the host below from" msgstr "Voulez-vous vraiment supprimer l'hôte ci-dessous de" #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:47 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:69 msgid "" "Are you sure you want to permanently delete the group below from the " "inventory?" @@ -448,8 +430,7 @@ msgstr "" "Voulez-vous vraiment supprimer définitivement le groupe ci-dessous de " "l'inventaire ?" -#: client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js:98 -#: client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js:93 +#: client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js:106 msgid "" "Are you sure you want to permanently delete the host below from the " "inventory?" @@ -457,7 +438,6 @@ msgstr "" "Voulez-vous vraiment supprimer définitivement l'hôte ci-dessous de " "l'inventaire ?" -#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:120 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:69 msgid "" "Are you sure you want to permanently delete the inventory source below from " @@ -466,7 +446,7 @@ msgstr "" "Voulez-vous vraiment supprimer définitivement la source de l'inventaire ci-" "dessous ?" -#: client/src/projects/edit/projects-edit.controller.js:238 +#: client/src/projects/edit/projects-edit.controller.js:244 msgid "Are you sure you want to remove the %s below from %s?" msgstr "Voulez-vous vraiment supprimer le %s ci-dessous de %s ?" @@ -489,8 +469,7 @@ msgstr "Associer un groupe existant" msgid "Associate this host with a new group" msgstr "Associer cet hôte à un nouveau groupe" -#: client/src/shared/form-generator.js:1441 -#: client/src/shared/form-generator.js:1492 +#: client/src/shared/form-generator.js:1448 msgid "Auditor" msgstr "Auditeur" @@ -538,12 +517,11 @@ msgstr "Zone de disponibilité :" msgid "Azure AD" msgstr "Azure AD" -#: client/src/shared/directives.js:75 client/src/shared/directives.js:133 +#: client/src/shared/directives.js:75 msgid "BROWSE" msgstr "NAVIGUER" #: client/src/projects/projects.form.js:80 -#: client/src/projects/projects.form.js:79 msgid "" "Base path used for locating playbooks. Directories found inside this path " "will be listed in the playbook directory drop-down. Together the base path " @@ -557,32 +535,28 @@ msgstr "" "playbooks." #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:128 -#: client/src/templates/job_templates/job-template.form.js:274 msgid "Become Privilege Escalation" msgstr "Activer l’élévation des privilèges" -#: client/src/license/license.partial.html:104 +#: client/src/license/license.partial.html:107 msgid "Browse" msgstr "Parcourir" #: client/lib/services/base-string.service.js:61 -#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:26 +#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:28 #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:51 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html:29 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:29 -#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:29 +#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:30 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:73 #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html:16 #: client/src/inventories-hosts/shared/associate-groups/associate-groups.partial.html:16 #: client/src/inventories-hosts/shared/associate-hosts/associate-hosts.partial.html:16 -#: client/src/job-submission/job-submission.partial.html:363 +#: client/src/job-submission/job-submission.partial.html:370 #: client/src/partials/survey-maker-modal.html:17 -#: client/src/partials/survey-maker-modal.html:84 +#: client/src/partials/survey-maker-modal.html:85 #: client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.partial.html:17 #: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:65 -#: client/lib/services/base-string.service.js:29 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:73 -#: client/src/job-submission/job-submission.partial.html:360 msgid "CANCEL" msgstr "ANNULER" @@ -594,14 +568,13 @@ msgstr "MODIFICATIONS" msgid "CLEAR ALL" msgstr "TOUT EFFACER" -#: client/src/partials/survey-maker-modal.html:85 +#: client/src/partials/survey-maker-modal.html:86 msgid "CLOSE" msgstr "FERMER" #: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:19 -#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js:18 +#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js:19 #: client/src/templates/completed-jobs.list.js:20 -#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js:17 msgid "COMPLETED JOBS" msgstr "JOBS TERMINÉS" @@ -651,12 +624,10 @@ msgstr "CRÉER UNE TÂCHE PROGRAMMÉE" msgid "CREATE SOURCE" msgstr "CRÉER UNE SOURCE" -#: client/src/job-submission/job-submission.partial.html:344 +#: client/src/job-submission/job-submission.partial.html:351 #: client/src/partials/job-template-details.html:2 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:93 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:82 -#: client/src/job-submission/job-submission.partial.html:341 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:80 msgid "CREDENTIAL" msgstr "INFORMATIONS D’IDENTIFICATION" @@ -666,7 +637,6 @@ msgstr "TYPE D'INFORMATIONS D'IDENTIFICATION" #: client/src/job-submission/job-submission.partial.html:92 #: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:56 -#: client/src/job-submission/job-submission.partial.html:90 msgid "CREDENTIAL TYPE:" msgstr "TYPE D'INFORMATIONS D'IDENTIFICATION :" @@ -681,8 +651,6 @@ msgstr "TYPES D'INFORMATIONS D'IDENTIFICATION" #: client/src/credentials/credentials.list.js:15 #: client/src/credentials/credentials.list.js:16 #: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:5 -#: client/features/credentials/legacy.credentials.js:13 -#: client/src/activity-stream/get-target-title.factory.js:14 msgid "CREDENTIALS" msgstr "INFORMATIONS D’IDENTIFICATION" @@ -693,35 +661,27 @@ msgstr "PERMISSIONS LIÉES AUX INFORMATIONS D'IDENTIFICATION" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:378 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:390 #: client/src/projects/projects.form.js:199 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:334 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:346 -#: client/src/projects/projects.form.js:198 msgid "Cache Timeout" msgstr "Expiration du délai d’attente du cache" #: client/src/projects/projects.form.js:188 -#: client/src/projects/projects.form.js:187 msgid "Cache Timeout%s (seconds)%s" msgstr "Expiration du délai d’attente du cache%s (secondes)%s" #: client/src/projects/list/projects-list.controller.js:199 #: client/src/users/list/users-list.controller.js:83 -#: client/src/projects/list/projects-list.controller.js:198 msgid "Call to %s failed. DELETE returned status:" msgstr "Échec de l’appel de %s. État DELETE renvoyé :" -#: client/src/projects/list/projects-list.controller.js:247 -#: client/src/projects/list/projects-list.controller.js:264 #: client/src/projects/list/projects-list.controller.js:246 -#: client/src/projects/list/projects-list.controller.js:262 +#: client/src/projects/list/projects-list.controller.js:263 msgid "Call to %s failed. GET status:" msgstr "Échec de l’appel de %s. État GET :" -#: client/src/projects/edit/projects-edit.controller.js:232 +#: client/src/projects/edit/projects-edit.controller.js:238 msgid "Call to %s failed. POST returned status:" msgstr "Échec de l’appel de %s. État POST renvoyé :" -#: client/src/projects/list/projects-list.controller.js:226 #: client/src/projects/list/projects-list.controller.js:225 msgid "Call to %s failed. POST status:" msgstr "Échec de l’appel de %s. État POST :" @@ -730,25 +690,25 @@ msgstr "Échec de l’appel de %s. État POST :" msgid "Call to %s failed. Return status: %d" msgstr "Échec de l’appel de %s. État du renvoie : %d" -#: client/src/projects/list/projects-list.controller.js:273 -#: client/src/projects/list/projects-list.controller.js:271 +#: client/src/projects/list/projects-list.controller.js:272 msgid "Call to get project failed. GET status:" msgstr "Échec de l’appel du projet en GET. État GET :" #: client/src/access/add-rbac-resource/rbac-resource.partial.html:105 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:191 -#: client/src/configuration/configuration.controller.js:535 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:188 +#: client/src/configuration/configuration.controller.js:541 #: client/src/job-results/job-results.partial.html:42 #: client/src/jobs/factories/delete-job.factory.js:33 -#: client/src/shared/form-generator.js:1691 +#: client/src/shared/form-generator.js:1699 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:12 #: client/src/workflow-results/workflow-results.partial.html:42 -#: client/src/configuration/configuration.controller.js:529 -#: client/src/shared/form-generator.js:1742 msgid "Cancel" msgstr "Annuler" -#: client/src/projects/list/projects-list.controller.js:242 +#: client/src/job-results/job-results.service.js:142 +msgid "Cancel Job" +msgstr "Annuler la tâche" + #: client/src/projects/list/projects-list.controller.js:241 msgid "Cancel Not Allowed" msgstr "Annulation non autorisée" @@ -772,22 +732,15 @@ msgstr "Annulé. Cliquez pour connaître les détails." #: client/src/shared/smart-search/smart-search.controller.js:49 #: client/src/shared/smart-search/smart-search.controller.js:91 -#: client/src/shared/smart-search/smart-search.controller.js:39 -#: client/src/shared/smart-search/smart-search.controller.js:81 msgid "Cannot search running job" msgstr "Impossible de rechercher les tâches en cours" -#: client/src/instance-groups/instance-group.partial.html:10 -#: client/src/instance-groups/instance-groups.list.js:21 -#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:10 -#: client/src/instance-groups/instances/instances-list.partial.html:18 +#: client/src/instance-groups/instance-groups.list.js:22 #: client/src/instance-groups/instances/instances.list.js:20 -#: client/src/instance-groups/list/instance-groups-list.partial.html:29 msgid "Capacity" msgstr "Capacité" #: client/src/projects/projects.form.js:82 -#: client/src/projects/projects.form.js:81 msgid "Change %s under \"Configure {{BRAND_NAME}}\" to change this location." msgstr "Modifiez %s sous \"Configure {{BRAND_NAME}}\" pour changer d'emplacement." @@ -795,16 +748,15 @@ msgstr "Modifiez %s sous \"Configure {{BRAND_NAME}}\" pour changer d'emplacement msgid "Changes" msgstr "Modifications" -#: client/src/shared/form-generator.js:1064 -#: client/src/shared/form-generator.js:1116 +#: client/src/shared/form-generator.js:1071 msgid "Choose a %s" msgstr "Choisir un %s" -#: client/src/templates/survey-maker/shared/question-definition.form.js:61 +#: client/src/templates/survey-maker/shared/question-definition.form.js:64 msgid "Choose an answer type" msgstr "Choisissez un type de réponse" -#: client/src/templates/survey-maker/shared/question-definition.form.js:64 +#: client/src/templates/survey-maker/shared/question-definition.form.js:67 msgid "" "Choose an answer type or format you want as the prompt for the user. Refer " "to the Ansible Tower Documentation for more additional information about " @@ -818,7 +770,7 @@ msgstr "" msgid "Choose an inventory file" msgstr "Sélectionner un fichier d'inventaire" -#: client/src/shared/directives.js:76 client/src/shared/directives.js:134 +#: client/src/shared/directives.js:76 msgid "Choose file" msgstr "Choisir un fichier" @@ -831,11 +783,10 @@ msgstr "" "l’utilisateur final et validez." #: client/src/projects/projects.form.js:156 -#: client/src/projects/projects.form.js:155 msgid "Clean" msgstr "Nettoyer" -#: client/src/templates/survey-maker/shared/question-definition.form.js:296 +#: client/src/templates/survey-maker/shared/question-definition.form.js:299 msgid "Clear" msgstr "Effacer" @@ -873,7 +824,6 @@ msgstr "" "avez fini. Cliquez sur le bouton %s pour créer un modèle de tâche." #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:138 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:129 msgid "" "Click on the regions field to see a list of regions for your cloud provider." " You can select multiple regions, or choose" @@ -885,8 +835,7 @@ msgstr "" msgid "Client ID" msgstr "ID du client" -#: client/src/notifications/notificationTemplates.form.js:257 -#: client/src/notifications/notificationTemplates.form.js:262 +#: client/src/notifications/notificationTemplates.form.js:254 msgid "Client Identifier" msgstr "Identifiant client" @@ -894,12 +843,11 @@ msgstr "Identifiant client" msgid "Client Secret" msgstr "Question secrète du client" -#: client/src/shared/form-generator.js:1695 -#: client/src/shared/form-generator.js:1746 +#: client/src/shared/form-generator.js:1703 msgid "Close" msgstr "Fermer" -#: client/src/job-results/job-results.partial.html:288 +#: client/src/job-results/job-results.partial.html:291 msgid "Cloud Credential" msgstr "Informations d’identification cloud" @@ -911,18 +859,14 @@ msgstr "Source cloud non configurée." msgid "Cloud source not configured. Click" msgstr "Source cloud non configurée. Cliquez sur" -#: client/src/credentials/factories/become-method-change.factory.js:86 -#: client/src/credentials/factories/kind-change.factory.js:143 -#: client/src/credentials/factories/become-method-change.factory.js:88 -#: client/src/credentials/factories/kind-change.factory.js:145 +#: client/src/credentials/factories/become-method-change.factory.js:80 +#: client/src/credentials/factories/kind-change.factory.js:137 msgid "CloudForms URL" msgstr "URL CloudForms" #: client/src/job-results/job-results.controller.js:226 #: client/src/standard-out/standard-out.controller.js:243 #: client/src/workflow-results/workflow-results.controller.js:118 -#: client/src/job-results/job-results.controller.js:219 -#: client/src/standard-out/standard-out.controller.js:245 msgid "Collapse Output" msgstr "Tout réduire" @@ -932,37 +876,41 @@ msgid "Completed Jobs" msgstr "Tâches terminées" #: client/src/management-jobs/card/card.partial.html:34 -#: client/src/management-jobs/card/card.partial.html:32 msgid "Configure Notifications" msgstr "Configurer les notifications" #: client/src/setup-menu/setup-menu.partial.html:60 -#: client/src/setup-menu/setup-menu.partial.html:66 msgid "Configure {{BRAND_NAME}}" msgstr "Configurer {{BRAND_NAME}}" -#: client/src/users/users.form.js:79 client/src/users/users.form.js:80 +#: client/src/users/users.form.js:81 msgid "Confirm Password" msgstr "Confirmer le mot de passe" -#: client/src/configuration/configuration.controller.js:542 -#: client/src/configuration/configuration.controller.js:536 +#: client/src/configuration/configuration.controller.js:548 msgid "Confirm Reset" msgstr "Confirmer la réinitialisation" -#: client/src/configuration/configuration.controller.js:551 -#: client/src/configuration/configuration.controller.js:545 +#: client/src/configuration/configuration.controller.js:557 msgid "Confirm factory reset" msgstr "Confirmer la réinitialisation usine" +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:120 +msgid "" +"Confirm that you want to permanently delete the inventory source below from " +"the inventory. Deleting this inventory source also deletes its associated " +"groups and hosts." +msgstr "" +"Voulez-vous vraiment supprimer définitivement la source de l'inventaire ci-" +"dessous ? Supprimer cette source d'inventaire supprimera aussi tous ses " +"groupes et hôtes associés." + #: client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js:82 msgid "Confirm the removal of the" msgstr "Confirmer la suppression du" #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:134 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:149 -#: client/src/templates/job_templates/job-template.form.js:222 -#: client/src/templates/job_templates/job-template.form.js:241 msgid "" "Consult the Ansible documentation for further details on the usage of tags." msgstr "" @@ -973,8 +921,7 @@ msgstr "" msgid "Contains 0 hosts." msgstr "Contient 0 hôtes." -#: client/src/templates/job_templates/job-template.form.js:185 -#: client/src/templates/job_templates/job-template.form.js:194 +#: client/src/templates/job_templates/job-template.form.js:180 msgid "" "Control the level of output ansible will produce as the playbook executes." msgstr "" @@ -982,7 +929,6 @@ msgstr "" "playbook." #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:313 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:269 msgid "" "Control the level of output ansible will produce for inventory source update" " jobs." @@ -1018,16 +964,11 @@ msgstr "" msgid "Create New" msgstr "Créer" -#: client/src/inventories-hosts/hosts/host.list.js:107 -msgid "Create a new Smart Inventory from search results." -msgstr "Créer un nouvel inventaire Smart à partir des résultats de recherche." - #: client/src/credentials/credentials.list.js:52 msgid "Create a new credential" msgstr "Créer de nouvelles informations d’identification" #: client/src/credential-types/credential-types.list.js:42 -#: client/src/credential-types/credential-types.list.js:39 msgid "Create a new credential type" msgstr "Créer un nouveau type d'informations d'identification." @@ -1076,14 +1017,12 @@ msgid "Create a new user" msgstr "Créer un utilisateur" #: client/src/setup-menu/setup-menu.partial.html:42 -#: client/src/setup-menu/setup-menu.partial.html:35 msgid "Create and edit scripts to dynamically load hosts from any source." msgstr "" "Créez et modifiez des scripts pour charger dynamiquement des hôtes à partir " "de n’importe quelle source." #: client/src/setup-menu/setup-menu.partial.html:30 -#: client/src/setup-menu/setup-menu.partial.html:49 msgid "" "Create custom credential types to be used for authenticating to network " "hosts and cloud sources" @@ -1092,7 +1031,6 @@ msgstr "" "l'authentification aux hôtes réseaux et aux sources cloud" #: client/src/setup-menu/setup-menu.partial.html:49 -#: client/src/setup-menu/setup-menu.partial.html:42 msgid "" "Create templates for sending notifications with Email, HipChat, Slack, and " "SMS." @@ -1104,26 +1042,22 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:74 #: client/src/job-submission/job-submission.partial.html:18 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:67 -#: client/src/templates/job_templates/job-template.form.js:126 +#: client/src/templates/job_templates/job-template.form.js:121 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:53 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:62 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:70 msgid "Credential" msgstr "Information d’identification" #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:32 #: client/src/setup-menu/setup-menu.partial.html:29 -#: client/src/setup-menu/setup-menu.partial.html:48 msgid "Credential Types" msgstr "Types d'informations d'identification" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:135 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:59 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:129 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:58 #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:24 #: client/src/setup-menu/setup-menu.partial.html:22 -#: client/src/templates/job_templates/job-template.form.js:139 -#: client/src/templates/job_templates/job-template.form.js:130 -#: client/src/templates/job_templates/job-template.form.js:142 +#: client/src/templates/job_templates/job-template.form.js:134 msgid "Credentials" msgstr "Informations d’identification" @@ -1131,7 +1065,7 @@ msgstr "Informations d’identification" msgid "Critical" msgstr "Critique" -#: client/src/shared/directives.js:77 client/src/shared/directives.js:135 +#: client/src/shared/directives.js:77 msgid "Current Image:" msgstr "Image actuelle :" @@ -1141,13 +1075,11 @@ msgstr "" "Suit le standard à mesure qu'il vient. Cliquez pour annuler l'abonnement." #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:171 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:159 msgid "Custom Inventory Script" msgstr "Script d'inventaire personnalisé" -#: client/src/inventory-scripts/inventory-scripts.form.js:53 -#: client/src/inventory-scripts/inventory-scripts.form.js:63 -#: client/src/inventory-scripts/inventory-scripts.form.js:64 +#: client/src/inventory-scripts/inventory-scripts.form.js:50 +#: client/src/inventory-scripts/inventory-scripts.form.js:60 msgid "Custom Script" msgstr "Script personnalisé" @@ -1155,22 +1087,23 @@ msgstr "Script personnalisé" msgid "DASHBOARD" msgstr "TABLEAU DE BORD" -#: client/src/credentials/list/credentials-list.controller.js:116 +#: client/src/credentials/list/credentials-list.controller.js:135 #: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:103 #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:52 -#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:145 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:178 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:74 +#: client/src/job-results/job-results.service.js:119 +#: client/src/jobs/factories/delete-job.factory.js:115 #: client/src/notifications/notification-templates-list/list.controller.js:195 #: client/src/organizations/list/organizations-list.controller.js:174 #: client/src/partials/survey-maker-modal.html:18 -#: client/src/projects/edit/projects-edit.controller.js:240 +#: client/src/projects/edit/projects-edit.controller.js:246 +#: client/src/templates/list/templates-list.controller.js:154 #: client/src/users/list/users-list.controller.js:92 -#: client/src/credentials/list/credentials-list.controller.js:108 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:74 msgid "DELETE" msgstr "SUPPRIMER" -#: client/src/partials/survey-maker-modal.html:83 +#: client/src/partials/survey-maker-modal.html:84 msgid "DELETE SURVEY" msgstr "SUPPRIMER QUESTIONNAIRE" @@ -1178,10 +1111,10 @@ msgstr "SUPPRIMER QUESTIONNAIRE" msgid "DETAILS" msgstr "DÉTAILS" -#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:27 +#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:29 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html:30 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:30 -#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:30 +#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:31 msgid "DISASSOCIATE" msgstr "DISSOCIER" @@ -1191,26 +1124,24 @@ msgstr "HÔTES DYNAMIQUES" #: client/src/credential-types/credential-types.list.js:73 #: client/src/credentials/credentials.list.js:85 -#: client/src/credentials/list/credentials-list.controller.js:113 -#: client/src/inventories-hosts/inventories/inventory.list.js:112 +#: client/src/credentials/list/credentials-list.controller.js:132 +#: client/src/inventories-hosts/inventories/inventory.list.js:111 #: client/src/inventory-scripts/inventory-scripts.list.js:71 #: client/src/job-results/job-results.partial.html:54 #: client/src/jobs/factories/delete-job.factory.js:37 #: client/src/notifications/notification-templates-list/list.controller.js:192 #: client/src/notifications/notificationTemplates.list.js:91 #: client/src/organizations/list/organizations-list.controller.js:171 -#: client/src/projects/edit/projects-edit.controller.js:237 +#: client/src/projects/edit/projects-edit.controller.js:243 #: client/src/projects/list/projects-list.controller.js:207 #: client/src/scheduler/schedules.list.js:90 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:13 #: client/src/teams/teams.list.js:72 +#: client/src/templates/list/templates-list.controller.js:102 #: client/src/templates/templates.list.js:120 #: client/src/users/list/users-list.controller.js:89 #: client/src/users/users.list.js:79 #: client/src/workflow-results/workflow-results.partial.html:54 -#: client/src/credential-types/credential-types.list.js:70 -#: client/src/credentials/list/credentials-list.controller.js:105 -#: client/src/projects/list/projects-list.controller.js:206 msgid "Delete" msgstr "Supprimer" @@ -1219,7 +1150,11 @@ msgstr "Supprimer" msgid "Delete Group" msgstr "Supprimer le groupe" -#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:142 +#: client/src/job-results/job-results.service.js:93 +msgid "Delete Job" +msgstr "Supprimer Tâche" + +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:175 msgid "Delete Source" msgstr "Supprimer la source" @@ -1228,7 +1163,6 @@ msgid "Delete credential" msgstr "Supprimer les informations d’identification" #: client/src/credential-types/credential-types.list.js:75 -#: client/src/credential-types/credential-types.list.js:72 msgid "Delete credential type" msgstr "Supprimer le type d'informations d’identification" @@ -1240,12 +1174,10 @@ msgstr[0] "Supprimer le groupe" msgstr[1] "Supprimer les groupes" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:48 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:48 msgid "Delete groups" msgstr "Supprimer les groupes" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:37 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:37 msgid "Delete groups and hosts" msgstr "Supprimer les groupes et les hôtes" @@ -1257,11 +1189,10 @@ msgstr[0] "Supprimer l'hôte" msgstr[1] "Supprimer les hôtes" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:59 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:59 msgid "Delete hosts" msgstr "Supprimer les hôtes" -#: client/src/inventories-hosts/inventories/inventory.list.js:114 +#: client/src/inventories-hosts/inventories/inventory.list.js:113 msgid "Delete inventory" msgstr "Supprimer l’inventaire" @@ -1274,7 +1205,6 @@ msgid "Delete notification" msgstr "Supprimer la notification" #: client/src/projects/projects.form.js:166 -#: client/src/projects/projects.form.js:165 msgid "Delete on Update" msgstr "Supprimer lors de la mise à jour" @@ -1306,7 +1236,6 @@ msgid "Delete the job" msgstr "Supprimer la tâche" #: client/src/projects/projects.form.js:168 -#: client/src/projects/projects.form.js:167 msgid "" "Delete the local repository in its entirety prior to performing an update." msgstr "" @@ -1334,7 +1263,6 @@ msgid "Deleting group" msgstr "Suppression du groupe" #: client/src/projects/projects.form.js:168 -#: client/src/projects/projects.form.js:167 msgid "" "Depending on the size of the repository this may significantly increase the " "amount of time required to complete an update." @@ -1364,61 +1292,50 @@ msgstr "Décrire la documentation des instances" #: client/src/templates/job_templates/job-template.form.js:41 #: client/src/templates/survey-maker/shared/question-definition.form.js:36 #: client/src/templates/workflows.form.js:39 -#: client/src/users/users.form.js:141 client/src/users/users.form.js:167 -#: client/src/inventories-hosts/hosts/host.form.js:62 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:61 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:55 -#: client/src/users/users.form.js:142 client/src/users/users.form.js:168 +#: client/src/users/users.form.js:145 client/src/users/users.form.js:171 msgid "Description" msgstr "Description" -#: client/src/notifications/notificationTemplates.form.js:139 -#: client/src/notifications/notificationTemplates.form.js:143 -#: client/src/notifications/notificationTemplates.form.js:155 -#: client/src/notifications/notificationTemplates.form.js:159 +#: client/src/notifications/notificationTemplates.form.js:136 #: client/src/notifications/notificationTemplates.form.js:140 -#: client/src/notifications/notificationTemplates.form.js:145 -#: client/src/notifications/notificationTemplates.form.js:157 -#: client/src/notifications/notificationTemplates.form.js:162 -#: client/src/notifications/notificationTemplates.form.js:378 +#: client/src/notifications/notificationTemplates.form.js:152 +#: client/src/notifications/notificationTemplates.form.js:156 msgid "Destination Channels" msgstr "Canaux de destination" -#: client/src/notifications/notificationTemplates.form.js:362 -#: client/src/notifications/notificationTemplates.form.js:366 -#: client/src/notifications/notificationTemplates.form.js:373 +#: client/src/notifications/notificationTemplates.form.js:359 +#: client/src/notifications/notificationTemplates.form.js:363 msgid "Destination Channels or Users" msgstr "Canaux de destination pour les utilisateurs" -#: client/src/notifications/notificationTemplates.form.js:208 -#: client/src/notifications/notificationTemplates.form.js:209 -#: client/src/notifications/notificationTemplates.form.js:212 -#: client/src/notifications/notificationTemplates.form.js:213 +#: client/src/notifications/notificationTemplates.form.js:205 +#: client/src/notifications/notificationTemplates.form.js:206 msgid "Destination SMS Number" msgstr "Numéro SMS de destination" #: client/features/credentials/credentials.strings.js:13 #: client/src/license/license.partial.html:5 -#: client/src/shared/form-generator.js:1474 -#: client/src/shared/form-generator.js:1525 +#: client/src/shared/form-generator.js:1481 msgid "Details" msgstr "Détails" -#: client/src/job-submission/job-submission.partial.html:257 -#: client/src/job-submission/job-submission.partial.html:255 +#: client/src/job-submission/job-submission.partial.html:263 msgid "Diff Mode" msgstr "Mode diff" #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html:6 -#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:6 -msgid "Disassociate Group" -msgstr "Dissocier le groupe" +msgid "Disassociate Group From Group" +msgstr "Dissocier Groupe du Groupe" #: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:6 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:6 msgid "Disassociate Host" msgstr "Dissocier l'hôte" +#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:6 +#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:6 +msgid "Disassociate Host From Group" +msgstr "Dissocier Hôte du Groupe" + #: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js:65 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js:110 #: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js:98 @@ -1430,9 +1347,9 @@ msgid "Disassociate host" msgstr "Dissocier l'hôte" #: client/src/configuration/auth-form/configuration-auth.controller.js:75 -#: client/src/configuration/configuration.controller.js:198 -#: client/src/configuration/configuration.controller.js:260 -#: client/src/configuration/system-form/configuration-system.controller.js:55 +#: client/src/configuration/configuration.controller.js:202 +#: client/src/configuration/configuration.controller.js:264 +#: client/src/configuration/system-form/configuration-system.controller.js:57 msgid "Discard changes" msgstr "Ignorer les modifications" @@ -1440,15 +1357,13 @@ msgstr "Ignorer les modifications" msgid "Dissasociate permission from team" msgstr "Dissocier la permission de l’équipe" -#: client/src/users/users.form.js:221 client/src/users/users.form.js:222 +#: client/src/users/users.form.js:225 msgid "Dissasociate permission from user" msgstr "Dissocier la permission de l’utilisateur" #: client/src/credentials/credentials.form.js:384 -#: client/src/credentials/factories/become-method-change.factory.js:60 -#: client/src/credentials/factories/kind-change.factory.js:117 -#: client/src/credentials/factories/become-method-change.factory.js:62 -#: client/src/credentials/factories/kind-change.factory.js:119 +#: client/src/credentials/factories/become-method-change.factory.js:54 +#: client/src/credentials/factories/kind-change.factory.js:111 msgid "Domain Name" msgstr "Nom de domaine" @@ -1456,11 +1371,10 @@ msgstr "Nom de domaine" #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:134 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:141 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:102 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:128 msgid "Download Output" msgstr "Télécharger la sortie" -#: client/src/inventory-scripts/inventory-scripts.form.js:62 +#: client/src/inventory-scripts/inventory-scripts.form.js:59 msgid "" "Drag and drop your custom inventory script file here or create one in the " "field to import your custom inventory. Refer to the Ansible Tower " @@ -1470,7 +1384,7 @@ msgstr "" "créez-en un dans le champ pour importer votre inventaire personnalisé. Voir " "la documentation Ansible Tower pour obtenir des exemples de syntaxe." -#: client/src/partials/survey-maker-modal.html:76 +#: client/src/partials/survey-maker-modal.html:77 msgid "Drop question here to reorder" msgstr "Mettez la question ici pour réordonnancer" @@ -1493,7 +1407,6 @@ msgstr "MODIFIER L'INVITE DU QUESTIONNAIRE" #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:46 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:79 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:59 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:66 msgid "ELAPSED" msgstr "TEMPS ÉCOULÉ" @@ -1522,7 +1435,6 @@ msgstr "" "jour de la source sélectionnée avant de lancer la tâche." #: client/src/projects/projects.form.js:179 -#: client/src/projects/projects.form.js:178 msgid "" "Each time a job runs using this project, perform an update to the local " "repository prior to starting the job." @@ -1539,21 +1451,16 @@ msgstr "" #: client/src/scheduler/schedules.list.js:75 client/src/teams/teams.list.js:55 #: client/src/templates/templates.list.js:103 #: client/src/users/users.list.js:60 -#: client/src/credential-types/credential-types.list.js:53 msgid "Edit" msgstr "Modifier" -#: client/src/shared/form-generator.js:1707 -#: client/src/templates/job_templates/job-template.form.js:457 +#: client/src/shared/form-generator.js:1715 +#: client/src/templates/job_templates/job-template.form.js:452 #: client/src/templates/workflows.form.js:177 -#: client/src/shared/form-generator.js:1758 -#: client/src/templates/job_templates/job-template.form.js:474 -#: client/src/templates/workflows.form.js:182 msgid "Edit Survey" msgstr "Modifier le questionnaire" #: client/src/credential-types/credential-types.list.js:58 -#: client/src/credential-types/credential-types.list.js:55 msgid "Edit credenital type" msgstr "Modifier le type d'information d'identification" @@ -1601,32 +1508,32 @@ msgstr "Modifier l’équipe" msgid "Edit template" msgstr "Modifier le modèle" -#: client/src/job-results/job-results.partial.html:188 +#: client/src/job-results/job-results.partial.html:191 msgid "Edit the Schedule" msgstr "Modifier la planification" -#: client/src/job-results/job-results.partial.html:172 +#: client/src/job-results/job-results.partial.html:175 #: client/src/workflow-results/workflow-results.partial.html:124 msgid "Edit the User" msgstr "Modifier l’Utilisateur" -#: client/src/job-results/job-results.partial.html:262 -#: client/src/job-results/job-results.partial.html:277 -#: client/src/job-results/job-results.partial.html:293 -#: client/src/job-results/job-results.partial.html:308 -#: client/src/job-results/job-results.partial.html:323 +#: client/src/job-results/job-results.partial.html:265 +#: client/src/job-results/job-results.partial.html:280 +#: client/src/job-results/job-results.partial.html:296 +#: client/src/job-results/job-results.partial.html:311 +#: client/src/job-results/job-results.partial.html:326 msgid "Edit the credential" msgstr "Modifier l'information d’identification" -#: client/src/job-results/job-results.partial.html:203 +#: client/src/job-results/job-results.partial.html:206 msgid "Edit the inventory" msgstr "Modifier l’inventaire" -#: client/src/job-results/job-results.partial.html:137 +#: client/src/job-results/job-results.partial.html:140 msgid "Edit the job template" msgstr "Modifier le modèle de tâche" -#: client/src/job-results/job-results.partial.html:226 +#: client/src/job-results/job-results.partial.html:229 #: client/src/projects/projects.list.js:105 msgid "Edit the project" msgstr "Modifier le projet" @@ -1640,11 +1547,9 @@ msgid "Edit user" msgstr "Modifier l’utilisateur" #: client/src/setup-menu/setup-menu.partial.html:61 -#: client/src/setup-menu/setup-menu.partial.html:67 msgid "Edit {{BRAND_NAME}}'s configuration." msgstr "Modifier la configuration de {{BRAND_NAME}}." -#: client/src/projects/list/projects-list.controller.js:242 #: client/src/projects/list/projects-list.controller.js:241 msgid "" "Either you do not have access or the SCM update process completed. Click the" @@ -1653,7 +1558,7 @@ msgstr "" "Vous n’avez pas accès, ou la mise à jour SCM est terminée. Cliquez sur le " "bouton %sActualiser%s pour voir l’état le plus récent." -#: client/src/job-results/job-results.partial.html:517 +#: client/src/job-results/job-results.partial.html:520 msgid "Elapsed" msgstr "Temps écoulé" @@ -1662,18 +1567,18 @@ msgstr "Temps écoulé" msgid "Email" msgstr "Email" +#: client/src/templates/job_templates/job-template.form.js:288 #: client/src/templates/job_templates/job-template.form.js:293 -#: client/src/templates/job_templates/job-template.form.js:298 msgid "Enable Concurrent Jobs" msgstr "Activer les tâches parallèles" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:123 +#: client/src/templates/job_templates/job-template.form.js:264 #: client/src/templates/job_templates/job-template.form.js:269 -#: client/src/templates/job_templates/job-template.form.js:274 msgid "Enable Privilege Escalation" msgstr "Activer l’élévation des privilèges" -#: client/src/templates/job_templates/job-template.form.js:284 +#: client/src/templates/job_templates/job-template.form.js:279 msgid "" "Enables creation of a provisioning callback URL. Using the URL a host can " "contact {{BRAND_NAME}} and request a configuration update using this job " @@ -1688,17 +1593,14 @@ msgid "Encrypted credentials are not supported." msgstr "" "Les informations d’identification chiffrées ne sont pas prises en charge." -#: client/src/license/license.partial.html:108 +#: client/src/license/license.partial.html:113 msgid "End User License Agreement" msgstr "Contrat de licence de l’utilisateur final" #: client/src/inventories-hosts/hosts/host.form.js:73 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:72 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:72 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:89 -#: client/src/inventories-hosts/hosts/host.form.js:72 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:71 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:98 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:86 msgid "" "Enter inventory variables using either JSON or YAML syntax. Use the radio " "button to toggle between the two." @@ -1706,7 +1608,7 @@ msgstr "" "Entrez les variables d’inventaire avec la syntaxe JSON ou YAML. Utilisez le " "bouton radio pour basculer entre les deux." -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:98 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:93 msgid "" "Enter inventory variables using either JSON or YAML syntax. Use the radio " "button to toggle between the two. Refer to the Ansible Tower documentation " @@ -1716,14 +1618,14 @@ msgstr "" "bouton radio pour basculer entre les deux. Consultez la documentation " "d’Ansible Tower pour avoir un exemple de syntaxe." -#: client/src/notifications/notificationTemplates.form.js:158 +#: client/src/notifications/notificationTemplates.form.js:155 msgid "" "Enter one HipChat channel per line. The pound symbol (#) is not required." msgstr "" "Saisir un canal HipChat par ligne. Le symbole dièse (#) n’est pas " "nécessaire." -#: client/src/notifications/notificationTemplates.form.js:365 +#: client/src/notifications/notificationTemplates.form.js:362 msgid "" "Enter one IRC channel or username per line. The pound symbol (#) for " "channels, and the at (@) symbol for users, are not required." @@ -1731,13 +1633,13 @@ msgstr "" "Saisir un canal IRC ou un nom d'utilisateur par ligne. Le symbole dièse (#) " "pour les canaux et (@) pour le utilisateurs, ne sont pas nécessaires." -#: client/src/notifications/notificationTemplates.form.js:142 +#: client/src/notifications/notificationTemplates.form.js:139 msgid "" "Enter one Slack channel per line. The pound symbol (#) is not required." msgstr "" "Saisir un canal Slack par ligne. Le symbole dièse (#) n’est pas nécessaire." -#: client/src/notifications/notificationTemplates.form.js:100 +#: client/src/notifications/notificationTemplates.form.js:97 msgid "" "Enter one email address per line to create a recipient list for this type of" " notification." @@ -1745,17 +1647,15 @@ msgstr "" "Saisir une adresse email par ligne pour créer une liste des destinataires " "pour ce type de notification." -#: client/src/notifications/notificationTemplates.form.js:212 +#: client/src/notifications/notificationTemplates.form.js:209 msgid "" "Enter one phone number per line to specify where to route SMS messages." msgstr "" "Saisir un numéro de téléphone par ligne pour spécifier où envoyer les " "messages SMS." -#: client/src/credentials/factories/become-method-change.factory.js:87 -#: client/src/credentials/factories/kind-change.factory.js:144 -#: client/src/credentials/factories/become-method-change.factory.js:89 -#: client/src/credentials/factories/kind-change.factory.js:146 +#: client/src/credentials/factories/become-method-change.factory.js:81 +#: client/src/credentials/factories/kind-change.factory.js:138 msgid "" "Enter the URL for the virtual machine which %scorresponds to your CloudForm " "instance. %sFor example, %s" @@ -1763,10 +1663,8 @@ msgstr "" "Veuillez saisir l’URL de la machine virtuelle qui correspond à votre " "instance de CloudForm. %sPar exemple, %s" -#: client/src/credentials/factories/become-method-change.factory.js:77 -#: client/src/credentials/factories/kind-change.factory.js:134 -#: client/src/credentials/factories/become-method-change.factory.js:79 -#: client/src/credentials/factories/kind-change.factory.js:136 +#: client/src/credentials/factories/become-method-change.factory.js:71 +#: client/src/credentials/factories/kind-change.factory.js:128 msgid "" "Enter the URL which corresponds to your %sRed Hat Satellite 6 server. %sFor " "example, %s" @@ -1774,16 +1672,14 @@ msgstr "" "Veuillez saisir l’URL qui correspond à votre serveur %sRed Hat Satellite 6. " "%sPar exemple, %s" -#: client/src/credentials/factories/become-method-change.factory.js:55 -#: client/src/credentials/factories/kind-change.factory.js:112 -#: client/src/credentials/factories/become-method-change.factory.js:57 -#: client/src/credentials/factories/kind-change.factory.js:114 +#: client/src/credentials/factories/become-method-change.factory.js:49 +#: client/src/credentials/factories/kind-change.factory.js:106 msgid "" "Enter the hostname or IP address which corresponds to your VMware vCenter." msgstr "" "Entrez le nom d’hôte ou l’adresse IP qui correspond à votre VMware vCenter." -#: client/src/notifications/notificationTemplates.form.js:198 +#: client/src/notifications/notificationTemplates.form.js:195 msgid "" "Enter the number associated with the \"Messaging Service\" in Twilio in the " "format +18005550199." @@ -1803,56 +1699,42 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:187 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:194 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:174 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:181 msgid "Environment Variables" msgstr "Variables d'environnement" -#: client/src/configuration/configuration.controller.js:344 -#: client/src/configuration/configuration.controller.js:443 -#: client/src/configuration/configuration.controller.js:477 -#: client/src/configuration/configuration.controller.js:524 -#: client/src/configuration/system-form/configuration-system.controller.js:226 +#: client/src/configuration/configuration.controller.js:348 +#: client/src/configuration/configuration.controller.js:449 +#: client/src/configuration/configuration.controller.js:483 +#: client/src/configuration/configuration.controller.js:530 +#: client/src/configuration/system-form/configuration-system.controller.js:231 #: client/src/credentials/factories/credential-form-save.factory.js:77 #: client/src/credentials/factories/credential-form-save.factory.js:93 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:191 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:210 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:129 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:139 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:166 +#: client/src/job-submission/job-submission-factories/launchjob.factory.js:194 +#: client/src/job-submission/job-submission-factories/launchjob.factory.js:213 #: client/src/management-jobs/card/card.controller.js:140 #: client/src/management-jobs/card/card.controller.js:230 #: client/src/management-jobs/card/card.controller.js:28 #: client/src/projects/add/projects-add.controller.js:108 -#: client/src/projects/edit/projects-edit.controller.js:150 -#: client/src/projects/edit/projects-edit.controller.js:216 -#: client/src/projects/edit/projects-edit.controller.js:232 +#: client/src/projects/edit/projects-edit.controller.js:156 +#: client/src/projects/edit/projects-edit.controller.js:222 +#: client/src/projects/edit/projects-edit.controller.js:238 #: client/src/projects/list/projects-list.controller.js:169 #: client/src/projects/list/projects-list.controller.js:198 -#: client/src/projects/list/projects-list.controller.js:226 -#: client/src/projects/list/projects-list.controller.js:247 -#: client/src/projects/list/projects-list.controller.js:263 -#: client/src/projects/list/projects-list.controller.js:272 -#: client/src/users/add/users-add.controller.js:98 +#: client/src/projects/list/projects-list.controller.js:225 +#: client/src/projects/list/projects-list.controller.js:246 +#: client/src/projects/list/projects-list.controller.js:262 +#: client/src/projects/list/projects-list.controller.js:271 +#: client/src/users/add/users-add.controller.js:99 #: client/src/users/edit/users-edit.controller.js:180 #: client/src/users/edit/users-edit.controller.js:80 #: client/src/users/list/users-list.controller.js:82 -#: client/src/configuration/configuration.controller.js:341 -#: client/src/configuration/configuration.controller.js:440 -#: client/src/configuration/configuration.controller.js:474 -#: client/src/configuration/configuration.controller.js:518 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:188 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:207 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:119 -#: client/src/projects/list/projects-list.controller.js:168 -#: client/src/projects/list/projects-list.controller.js:197 -#: client/src/projects/list/projects-list.controller.js:225 -#: client/src/projects/list/projects-list.controller.js:246 -#: client/src/projects/list/projects-list.controller.js:261 -#: client/src/projects/list/projects-list.controller.js:270 -#: client/src/users/edit/users-edit.controller.js:163 msgid "Error!" msgstr "Erreur !" #: client/src/activity-stream/streams.list.js:40 -#: client/src/activity-stream/streams.list.js:41 msgid "Event" msgstr "Événement" @@ -1865,21 +1747,21 @@ msgid "Event summary not available" msgstr "Récapitulatif de l’événement non disponible" #: client/src/projects/add/projects-add.controller.js:129 -#: client/src/projects/edit/projects-edit.controller.js:259 +#: client/src/projects/edit/projects-edit.controller.js:265 msgid "Example URLs for GIT SCM include:" msgstr "Exemples d’URL pour le SCM GIT :" #: client/src/projects/add/projects-add.controller.js:150 -#: client/src/projects/edit/projects-edit.controller.js:279 +#: client/src/projects/edit/projects-edit.controller.js:285 msgid "Example URLs for Mercurial SCM include:" msgstr "Exemples d’URL pour le SCM Mercurial :" #: client/src/projects/add/projects-add.controller.js:141 -#: client/src/projects/edit/projects-edit.controller.js:270 +#: client/src/projects/edit/projects-edit.controller.js:276 msgid "Example URLs for Subversion SCM include:" msgstr "Exemples d’URL pour le SCM Subversion :" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:68 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65 msgid "Example: ansible_facts.ansible_distribution:\"RedHat\"" msgstr "Exemple : ansible_facts.ansible_distribution:\"RedHat\"" @@ -1897,9 +1779,6 @@ msgstr "Hôte existant" #: client/src/standard-out/standard-out.controller.js:245 #: client/src/workflow-results/workflow-results.controller.js:120 #: client/src/workflow-results/workflow-results.controller.js:76 -#: client/src/job-results/job-results.controller.js:221 -#: client/src/standard-out/standard-out.controller.js:23 -#: client/src/standard-out/standard-out.controller.js:247 msgid "Expand Output" msgstr "Tout agrandir" @@ -1911,24 +1790,20 @@ msgstr "Arrive à expiration le" msgid "Explanation" msgstr "Explication" -#: client/src/job-results/job-results.partial.html:272 +#: client/src/job-results/job-results.partial.html:275 msgid "Extra Credentials" msgstr "Informations d’identification supplémentaires" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:132 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:144 -#: client/src/job-results/job-results.partial.html:406 -#: client/src/job-submission/job-submission.partial.html:161 +#: client/src/job-results/job-results.partial.html:409 +#: client/src/job-submission/job-submission.partial.html:165 #: client/src/partials/logviewer.html:8 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:105 -#: client/src/templates/job_templates/job-template.form.js:347 -#: client/src/templates/job_templates/job-template.form.js:354 +#: client/src/templates/job_templates/job-template.form.js:342 +#: client/src/templates/job_templates/job-template.form.js:349 #: client/src/templates/workflows.form.js:74 #: client/src/templates/workflows.form.js:81 -#: client/src/job-submission/job-submission.partial.html:159 -#: client/src/templates/job_templates/job-template.form.js:359 -#: client/src/templates/job_templates/job-template.form.js:371 -#: client/src/templates/workflows.form.js:86 msgid "Extra Variables" msgstr "Variables supplémentaires" @@ -1937,7 +1812,7 @@ msgstr "Variables supplémentaires" msgid "FACTS" msgstr "FAITS" -#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:63 +#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:64 msgid "FAILED" msgstr "ÉCHEC" @@ -1948,16 +1823,12 @@ msgstr "CHAMPS :" #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:39 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:72 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:52 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:59 msgid "FINISHED" msgstr "TERMINÉ" #: client/src/inventories-hosts/hosts/host.form.js:107 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:106 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:106 -#: client/src/inventories-hosts/hosts/host.form.js:111 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:111 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:105 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:107 msgid "Facts" msgstr "Faits" @@ -1969,7 +1840,7 @@ msgstr "Échec" msgid "Failed Hosts" msgstr "Échec des hôtes" -#: client/src/users/add/users-add.controller.js:98 +#: client/src/users/add/users-add.controller.js:99 msgid "Failed to add new user. POST returned status:" msgstr "L’ajout de l’utilisateur a échoué. État POST renvoyé :" @@ -1981,29 +1852,25 @@ msgstr "La création des informations d’identification a échoué. État POST msgid "Failed to create new project. POST returned status:" msgstr "La création du projet a échoué. État POST renvoyé :" -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:211 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:208 +#: client/src/job-submission/job-submission-factories/launchjob.factory.js:214 msgid "Failed to retrieve job template extra variables." msgstr "" "N’a pas pu extraire les variables supplémentaires du modèle de la tâche." -#: client/src/projects/edit/projects-edit.controller.js:151 +#: client/src/projects/edit/projects-edit.controller.js:157 msgid "Failed to retrieve project: %s. GET status:" msgstr "La récupération du projet a échoué : %s. État GET :" #: client/src/users/edit/users-edit.controller.js:181 #: client/src/users/edit/users-edit.controller.js:81 -#: client/src/users/edit/users-edit.controller.js:164 msgid "Failed to retrieve user: %s. GET status:" msgstr "La récupération de l’utilisateur a échoué : %s. État GET :" -#: client/src/configuration/configuration.controller.js:444 -#: client/src/configuration/configuration.controller.js:441 +#: client/src/configuration/configuration.controller.js:450 msgid "Failed to save settings. Returned status:" msgstr "L’enregistrement des paramètres a échoué. État renvoyé :" -#: client/src/configuration/configuration.controller.js:478 -#: client/src/configuration/configuration.controller.js:475 +#: client/src/configuration/configuration.controller.js:484 msgid "Failed to save toggle settings. Returned status:" msgstr "" "L’enregistrement des paramètres d’activation/désactivation a échoué. État " @@ -2013,14 +1880,13 @@ msgstr "" msgid "Failed to update Credential. PUT status:" msgstr "La mise à jour des informations d’identification a échoué. État PUT :" -#: client/src/projects/edit/projects-edit.controller.js:216 +#: client/src/projects/edit/projects-edit.controller.js:222 msgid "Failed to update project: %s. PUT status:" msgstr "La mise à jour du projet a échoué : %s. État PUT :" -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:192 +#: client/src/job-submission/job-submission-factories/launchjob.factory.js:195 #: client/src/management-jobs/card/card.controller.js:141 #: client/src/management-jobs/card/card.controller.js:231 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:189 msgid "Failed updating job %s with variables. POST returned: %d" msgstr "" "N’a pas pu mettre à jour la tâche %s avec les variables. Retour POST : %d" @@ -2042,11 +1908,10 @@ msgstr "Dernière exécution" #: client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js:54 #: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:58 #: client/src/inventories-hosts/shared/factories/set-status.factory.js:44 -#: client/src/job-results/job-results.partial.html:108 +#: client/src/job-results/job-results.partial.html:111 #: client/src/jobs/all-jobs.list.js:66 #: client/src/portal-mode/portal-jobs.list.js:40 #: client/src/templates/completed-jobs.list.js:59 -#: client/src/portal-mode/portal-jobs.list.js:39 msgid "Finished" msgstr "Terminé" @@ -2067,10 +1932,8 @@ msgstr "" "Pour obtenir des informations supplémentaires sur la syntaxe de recherche " "avancée, consulter la documentation Ansible Tower." -#: client/src/credentials/factories/become-method-change.factory.js:69 -#: client/src/credentials/factories/kind-change.factory.js:126 -#: client/src/credentials/factories/become-method-change.factory.js:71 -#: client/src/credentials/factories/kind-change.factory.js:128 +#: client/src/credentials/factories/become-method-change.factory.js:63 +#: client/src/credentials/factories/kind-change.factory.js:120 msgid "For example, %s" msgstr "Par exemple, %s" @@ -2080,8 +1943,6 @@ msgstr "Par exemple, %s" #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js:32 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:35 #: client/src/inventories-hosts/inventories/related/hosts/related-host.list.js:31 -#: client/src/inventories-hosts/hosts/host.form.js:35 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:34 msgid "" "For hosts that are part of an external inventory, this flag cannot be " "changed. It will be set by the inventory sync process." @@ -2102,7 +1963,6 @@ msgstr "" "les problèmes." #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:118 -#: client/src/templates/job_templates/job-template.form.js:176 msgid "" "For more information and examples see %sthe Patterns topic at " "docs.ansible.com%s." @@ -2112,12 +1972,10 @@ msgstr "" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:109 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:96 -#: client/src/job-results/job-results.partial.html:333 +#: client/src/job-results/job-results.partial.html:336 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:87 -#: client/src/templates/job_templates/job-template.form.js:149 -#: client/src/templates/job_templates/job-template.form.js:159 -#: client/src/templates/job_templates/job-template.form.js:152 -#: client/src/templates/job_templates/job-template.form.js:165 +#: client/src/templates/job_templates/job-template.form.js:144 +#: client/src/templates/job_templates/job-template.form.js:154 msgid "Forks" msgstr "Forks" @@ -2146,8 +2004,7 @@ msgstr "Équipe GitHub" msgid "Google OAuth2" msgstr "Google OAuth2" -#: client/src/teams/teams.form.js:155 client/src/users/users.form.js:210 -#: client/src/users/users.form.js:211 +#: client/src/teams/teams.form.js:155 client/src/users/users.form.js:214 msgid "Grant Permission" msgstr "Donner Permission" @@ -2181,13 +2038,9 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.form.js:88 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js:32 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:114 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:114 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:115 #: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js:32 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:172 -#: client/src/inventories-hosts/hosts/host.form.js:119 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:119 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:113 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:178 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:167 msgid "Groups" msgstr "Groupes" @@ -2207,14 +2060,11 @@ msgstr "" #: client/src/inventories-hosts/inventories/inventories.partial.html:14 #: client/src/inventories-hosts/inventories/related/hosts/related-host.route.js:18 #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-hosts.route.js:17 -#: client/src/activity-stream/get-target-title.factory.js:38 msgid "HOSTS" msgstr "HÔTES " -#: client/src/notifications/notificationTemplates.form.js:323 -#: client/src/notifications/notificationTemplates.form.js:324 -#: client/src/notifications/notificationTemplates.form.js:328 -#: client/src/notifications/notificationTemplates.form.js:329 +#: client/src/notifications/notificationTemplates.form.js:320 +#: client/src/notifications/notificationTemplates.form.js:321 msgid "HTTP Headers" msgstr "En-têtes HTTP" @@ -2227,27 +2077,23 @@ msgid "High" msgstr "Élevée" #: client/src/credentials/credentials.form.js:139 -#: client/src/notifications/notificationTemplates.form.js:86 +#: client/src/notifications/notificationTemplates.form.js:83 msgid "Host" msgstr "Hôte" -#: client/src/credentials/factories/become-method-change.factory.js:58 -#: client/src/credentials/factories/kind-change.factory.js:115 -#: client/src/credentials/factories/become-method-change.factory.js:60 -#: client/src/credentials/factories/kind-change.factory.js:117 +#: client/src/credentials/factories/become-method-change.factory.js:52 +#: client/src/credentials/factories/kind-change.factory.js:109 msgid "Host (Authentication URL)" msgstr "Hôte (URL d’authentification)" -#: client/src/templates/job_templates/job-template.form.js:329 -#: client/src/templates/job_templates/job-template.form.js:338 +#: client/src/templates/job_templates/job-template.form.js:324 +#: client/src/templates/job_templates/job-template.form.js:333 msgid "Host Config Key" msgstr "Clé de configuration de l’hôte" #: client/src/inventories-hosts/hosts/host.form.js:40 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:39 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:39 -#: client/src/inventories-hosts/hosts/host.form.js:39 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:38 msgid "Host Enabled" msgstr "Hôte activé" @@ -2257,18 +2103,12 @@ msgstr "Hôte activé" #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:56 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:45 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:56 -#: client/src/inventories-hosts/hosts/host.form.js:45 -#: client/src/inventories-hosts/hosts/host.form.js:56 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:44 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:55 msgid "Host Name" msgstr "Nom d'hôte" #: client/src/inventories-hosts/hosts/host.form.js:80 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:79 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:79 -#: client/src/inventories-hosts/hosts/host.form.js:79 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:78 msgid "Host Variables" msgstr "Variables d'hôte" @@ -2293,11 +2133,9 @@ msgstr "Hôte indisponible. Cliquez pour activer ou désactiver." #: client/src/inventories-hosts/inventories/related/groups/groups.form.js:98 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js:57 #: client/src/inventories-hosts/inventories/related/hosts/related-host.list.js:56 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:170 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:181 -#: client/src/job-results/job-results.partial.html:501 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:168 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:187 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:167 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:176 +#: client/src/job-results/job-results.partial.html:504 msgid "Hosts" msgstr "Hôtes" @@ -2318,7 +2156,7 @@ msgstr "Hôtes utilisés" msgid "Hosts are imported to" msgstr "Hôtes importés dans" -#: client/src/license/license.partial.html:116 +#: client/src/license/license.partial.html:121 msgid "I agree to the End User License Agreement" msgstr "J’accepte le Contrat de licence de l’utilisateur final" @@ -2347,7 +2185,7 @@ msgstr "INSIGHTS" msgid "INSTANCE GROUPS" msgstr "GROUPES D'INSTANCES" -#: client/src/instance-groups/instance-group.partial.html:28 +#: client/src/instance-groups/instance-group.partial.html:27 msgid "INSTANCES" msgstr "INSTANCES" @@ -2361,14 +2199,11 @@ msgstr "INSTANCES" #: client/src/main-menu/main-menu.partial.html:27 #: client/src/organizations/linkout/organizations-linkout.route.js:143 #: client/src/organizations/list/organizations-list.controller.js:66 -#: client/src/activity-stream/get-target-title.factory.js:11 -#: client/src/organizations/linkout/organizations-linkout.route.js:141 msgid "INVENTORIES" msgstr "INVENTAIRES" -#: client/src/job-submission/job-submission.partial.html:339 +#: client/src/job-submission/job-submission.partial.html:346 #: client/src/partials/job-template-details.html:2 -#: client/src/job-submission/job-submission.partial.html:336 msgid "INVENTORY" msgstr "INVENTAIRE" @@ -2379,7 +2214,6 @@ msgstr "SCRIPT D’INVENTAIRE" #: client/src/activity-stream/get-target-title.factory.js:35 #: client/src/inventory-scripts/inventory-scripts.list.js:12 #: client/src/inventory-scripts/main.js:66 -#: client/src/activity-stream/get-target-title.factory.js:32 msgid "INVENTORY SCRIPTS" msgstr "SCRIPTS D’INVENTAIRE" @@ -2387,13 +2221,11 @@ msgstr "SCRIPTS D’INVENTAIRE" msgid "INVENTORY SOURCES" msgstr "SOURCES D'INVENTAIRE" -#: client/src/notifications/notificationTemplates.form.js:351 -#: client/src/notifications/notificationTemplates.form.js:362 +#: client/src/notifications/notificationTemplates.form.js:348 msgid "IRC Nick" msgstr "Surnom IRC" -#: client/src/notifications/notificationTemplates.form.js:340 -#: client/src/notifications/notificationTemplates.form.js:351 +#: client/src/notifications/notificationTemplates.form.js:337 msgid "IRC Server Address" msgstr "Adresse du serveur IRC" @@ -2423,14 +2255,6 @@ msgid "If blank, all groups above are created except" msgstr "" "Si resté vide, cela indique que tous les groupes ci-dessus sont créés sauf" -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:331 -msgid "" -"If checked, all child groups and hosts not found on the external source will" -" be deleted from the local inventory." -msgstr "" -"Si coché, tous les groupes dépendants et les hôtes non trouvés dans la " -"source externe seront supprimés de l'inventaire local." - #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:343 msgid "" "If checked, all variables for child groups and hosts will be removed and " @@ -2439,28 +2263,49 @@ msgstr "" "Si cochées, toutes les variables des groupes et hôtes dépendants seront " "supprimées et remplacées par celles qui se trouvent dans la source externe." -#: client/src/templates/job_templates/job-template.form.js:272 +#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:331 +msgid "" +"If checked, any hosts and groups that were previously present on the " +"external source but are now removed will be removed from the Tower " +"inventory. Hosts and groups that were not managed by the inventory source " +"will be promoted to the next manually created group or if there is no " +"manually created group to promote them into, they will be left in the " +"\"all\" default group for the inventory." +msgstr "" +"Si cochés, tous les hôtes et groupes qui étaient présent auparavant sur la " +"source externe, mais qui sont maintenant supprimés, seront supprimés de " +"l'inventaire de Tower. Les hôtes et les groupes qui n'étaient pas gérés par " +"la source de l'inventaire seront promus au prochain groupe créé manuellement" +" ou s'il n'y a pas de groupe créé manuellement dans lequel les promouvoir, " +"ils devront rester dans le groupe \"all\" par défaut de cet inventaire." + +#: client/src/templates/job_templates/job-template.form.js:267 msgid "If enabled, run this playbook as an administrator." msgstr "Si activé, exécuter ce playbook en tant qu'administrateur." #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:120 -#: client/src/templates/job_templates/job-template.form.js:256 -#: client/src/templates/job_templates/job-template.form.js:258 msgid "" "If enabled, show the changes made by Ansible tasks, where supported. This is" -" equivalent to Ansible's --diff mode." +" equivalent to Ansible’s --diff mode." msgstr "" -"Si cette option est activée, affichez les modifications apportées par les " -"tâches Ansible, là où elles sont prises en charge. Cela est équivalent au " -"mode --diff d'Ansible." +"Si activé, afficher les changements faits par les tâches Ansible, si " +"supporté. C'est équivalent au mode Ansible’s -diff ." -#: client/src/templates/job_templates/job-template.form.js:296 +#: client/src/templates/job_templates/job-template.form.js:251 +msgid "" +"If enabled, show the changes made by Ansible tasks, where supported. This is" +" equivalent to Ansible’s --diff mode." +msgstr "" +"Si activé, afficher les changements faits par les tâches Ansible, si " +"supporté. C'est équivalent au mode Ansible’s --diff." + +#: client/src/templates/job_templates/job-template.form.js:291 msgid "If enabled, simultaneous runs of this job template will be allowed." msgstr "" "Si activé, il sera possible d’avoir des exécutions de ce modèle de tâche en " "simultané." -#: client/src/templates/job_templates/job-template.form.js:307 +#: client/src/templates/job_templates/job-template.form.js:302 msgid "" "If enabled, use cached facts if available and store discovered facts in the " "cache." @@ -2500,8 +2345,6 @@ msgstr "ID d'image :" #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js:30 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:33 #: client/src/inventories-hosts/inventories/related/hosts/related-host.list.js:29 -#: client/src/inventories-hosts/hosts/host.form.js:33 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:32 msgid "" "Indicates if a host is available and should be included in running jobs." msgstr "" @@ -2510,56 +2353,46 @@ msgstr "" #: client/src/activity-stream/activity-detail.form.js:31 #: client/src/activity-stream/streams.list.js:33 -#: client/src/activity-stream/streams.list.js:34 msgid "Initiated by" msgstr "Initié par" #: client/src/credential-types/credential-types.form.js:53 #: client/src/credential-types/credential-types.form.js:61 -#: client/src/credential-types/credential-types.form.js:60 -#: client/src/credential-types/credential-types.form.js:75 msgid "Injector Configuration" msgstr "Configuration d'Injector" #: client/src/credential-types/credential-types.form.js:39 #: client/src/credential-types/credential-types.form.js:47 -#: client/src/credential-types/credential-types.form.js:54 msgid "Input Configuration" msgstr "Configuration de l'entrée" #: client/src/inventories-hosts/hosts/host.form.js:123 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:121 -#: client/src/inventories-hosts/hosts/host.form.js:127 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:120 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:122 msgid "Insights" msgstr "Insights" -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:72 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:69 msgid "Insights Credential" msgstr "Information d’identification à Insights" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:145 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:148 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:135 msgid "Instance Filters" msgstr "Filtres de l'instance" -#: client/src/job-results/job-results.partial.html:366 +#: client/src/job-results/job-results.partial.html:369 msgid "Instance Group" msgstr "Groupe d'instance" +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:72 #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:75 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:78 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:83 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:86 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:78 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:81 #: client/src/organizations/organizations.form.js:38 #: client/src/organizations/organizations.form.js:41 #: client/src/setup-menu/setup-menu.partial.html:54 -#: client/src/templates/job_templates/job-template.form.js:196 -#: client/src/templates/job_templates/job-template.form.js:199 -#: client/src/setup-menu/setup-menu.partial.html:60 -#: client/src/templates/job_templates/job-template.form.js:205 -#: client/src/templates/job_templates/job-template.form.js:208 +#: client/src/templates/job_templates/job-template.form.js:191 +#: client/src/templates/job_templates/job-template.form.js:194 msgid "Instance Groups" msgstr "Groupes d'instances" @@ -2595,8 +2428,8 @@ msgstr "Entrée non valide pour ce type." msgid "Invalid username and/or password. Please try again." msgstr "Nom d’utilisateur et/ou mot de passe non valide. Veuillez réessayer." -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:128 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:53 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:122 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:52 #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:26 #: client/src/home/dashboard/counts/dashboard-counts.directive.js:50 #: client/src/organizations/linkout/organizations-linkout.route.js:155 @@ -2606,7 +2439,7 @@ msgstr "Inventaires" #: client/src/inventories-hosts/hosts/host.list.js:69 #: client/src/inventories-hosts/inventories/inventory.list.js:80 #: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:69 -#: client/src/job-results/job-results.partial.html:198 +#: client/src/job-results/job-results.partial.html:201 #: client/src/job-submission/job-submission.partial.html:17 #: client/src/organizations/linkout/controllers/organizations-inventories.controller.js:70 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:58 @@ -2614,21 +2447,16 @@ msgstr "Inventaires" #: client/src/templates/job_templates/job-template.form.js:80 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:72 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:82 -#: client/src/templates/job_templates/job-template.form.js:70 -#: client/src/templates/job_templates/job-template.form.js:84 msgid "Inventory" msgstr "Inventaire" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:110 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:124 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:104 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:116 msgid "Inventory File" msgstr "Fichier d'inventaire" #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:27 #: client/src/setup-menu/setup-menu.partial.html:41 -#: client/src/setup-menu/setup-menu.partial.html:34 msgid "Inventory Scripts" msgstr "Scripts d’inventaire" @@ -2640,8 +2468,7 @@ msgstr "Synchronisation des inventaires" msgid "Inventory Sync Failures" msgstr "Erreurs de synchronisation des inventaires" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:96 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:105 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:93 msgid "Inventory Variables" msgstr "Variables d’inventaire" @@ -2661,26 +2488,23 @@ msgstr "MODÈLES DE TÂCHE" #: client/src/organizations/list/organizations-list.controller.js:78 #: client/src/portal-mode/portal-job-templates.list.js:13 #: client/src/portal-mode/portal-job-templates.list.js:14 -#: client/src/organizations/linkout/organizations-linkout.route.js:250 msgid "JOB TEMPLATES" msgstr "MODÈLES DE TÂCHE " #: client/src/activity-stream/get-target-title.factory.js:32 -#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:109 -#: client/src/instance-groups/instance-group.partial.html:29 -#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:28 +#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:118 +#: client/src/instance-groups/instance-group.partial.html:28 +#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:27 #: client/src/instance-groups/jobs/jobs-list.route.js:9 #: client/src/jobs/jobs.route.js:15 #: client/src/main-menu/main-menu.partial.html:122 #: client/src/main-menu/main-menu.partial.html:43 #: client/src/portal-mode/portal-jobs.list.js:13 #: client/src/portal-mode/portal-jobs.list.js:17 -#: client/src/activity-stream/get-target-title.factory.js:29 msgid "JOBS" msgstr "TÂCHES" -#: client/src/job-submission/job-submission.partial.html:169 -#: client/src/job-submission/job-submission.partial.html:167 +#: client/src/job-submission/job-submission.partial.html:173 msgid "JSON" msgstr "JSON" @@ -2690,15 +2514,12 @@ msgstr "JSON" msgid "JSON:" msgstr "JSON :" -#: client/src/job-results/job-results.partial.html:381 -#: client/src/job-submission/job-submission.partial.html:222 -#: client/src/templates/job_templates/job-template.form.js:205 -#: client/src/templates/job_templates/job-template.form.js:212 +#: client/src/job-results/job-results.partial.html:384 +#: client/src/job-submission/job-submission.partial.html:228 +#: client/src/templates/job_templates/job-template.form.js:200 +#: client/src/templates/job_templates/job-template.form.js:207 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:127 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:135 -#: client/src/job-submission/job-submission.partial.html:220 -#: client/src/templates/job_templates/job-template.form.js:214 -#: client/src/templates/job_templates/job-template.form.js:223 msgid "Job Tags" msgstr "Balises de tâche" @@ -2706,22 +2527,19 @@ msgstr "Balises de tâche" msgid "Job Template" msgstr "Modèle de tâche" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:109 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:103 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:36 #: client/src/organizations/linkout/organizations-linkout.route.js:268 -#: client/src/organizations/linkout/organizations-linkout.route.js:262 msgid "Job Templates" msgstr "Modèles de tâche" #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:32 -#: client/src/job-results/job-results.partial.html:156 -#: client/src/job-submission/job-submission.partial.html:196 +#: client/src/job-results/job-results.partial.html:159 +#: client/src/job-submission/job-submission.partial.html:202 #: client/src/templates/job_templates/job-template.form.js:47 #: client/src/templates/job_templates/job-template.form.js:55 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:103 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:92 -#: client/src/job-submission/job-submission.partial.html:194 -#: client/src/templates/job_templates/job-template.form.js:59 msgid "Job Type" msgstr "Type de tâche" @@ -2740,14 +2558,13 @@ msgid "Jobs" msgstr "Tâches" #: client/src/job-results/job-results.controller.js:269 -#: client/src/job-results/job-results.controller.js:321 +#: client/src/job-results/job-results.controller.js:366 msgid "Jump to last line of standard out." msgstr "Passez à la dernière ligne de la sortie standard out." #: client/src/access/add-rbac-resource/rbac-resource.partial.html:61 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:102 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:154 #: client/src/shared/smart-search/smart-search.partial.html:14 -#: client/src/access/add-rbac-resource/rbac-resource.partial.html:63 msgid "Key" msgstr "Clé" @@ -2767,7 +2584,6 @@ msgstr "TÂCHE DE LANCEMENT" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:86 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:66 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:73 msgid "LAUNCH TYPE" msgstr "TYPE LANCEMENT" @@ -2776,12 +2592,10 @@ msgid "LDAP" msgstr "LDAP" #: client/src/license/license.route.js:19 -#: client/src/license/license.route.js:18 msgid "LICENSE" msgstr "LICENCE" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:58 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:45 msgid "LICENSE ERROR" msgstr "ERREUR DE LICENCE" @@ -2791,16 +2605,14 @@ msgstr "SE DÉCONNECTER" #: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:68 #: client/src/instance-groups/jobs/jobs.list.js:66 -#: client/src/job-results/job-results.partial.html:431 -#: client/src/job-results/job-results.partial.html:440 +#: client/src/job-results/job-results.partial.html:434 +#: client/src/job-results/job-results.partial.html:443 #: client/src/jobs/all-jobs.list.js:74 -#: client/src/templates/job_templates/job-template.form.js:239 -#: client/src/templates/job_templates/job-template.form.js:243 +#: client/src/templates/job_templates/job-template.form.js:234 +#: client/src/templates/job_templates/job-template.form.js:238 #: client/src/templates/templates.list.js:43 #: client/src/templates/workflows.form.js:62 #: client/src/templates/workflows.form.js:67 -#: client/src/templates/job_templates/job-template.form.js:347 -#: client/src/templates/job_templates/job-template.form.js:352 msgid "Labels" msgstr "Libellés" @@ -2818,25 +2630,22 @@ msgid "Last Updated" msgstr "Dernière mise à jour" #: client/src/portal-mode/portal-job-templates.list.js:36 -#: client/src/shared/form-generator.js:1699 +#: client/src/shared/form-generator.js:1707 #: client/src/templates/templates.list.js:80 -#: client/src/shared/form-generator.js:1750 msgid "Launch" msgstr "Lancer" #: client/src/management-jobs/card/card.partial.html:23 -#: client/src/management-jobs/card/card.partial.html:21 msgid "Launch Management Job" msgstr "Lancer la tâche de gestion" -#: client/src/job-results/job-results.partial.html:167 -#: client/src/job-results/job-results.partial.html:182 +#: client/src/job-results/job-results.partial.html:170 +#: client/src/job-results/job-results.partial.html:185 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:76 msgid "Launched By" msgstr "Lancé par" #: client/src/job-submission/job-submission.partial.html:99 -#: client/src/job-submission/job-submission.partial.html:97 msgid "" "Launching this job requires the passwords listed below. Enter and confirm " "each password before continuing." @@ -2844,8 +2653,7 @@ msgstr "" "Le lancement de cette tâche requiert les mots de passe figurant ci-dessous. " "Saisissez et confirmez chaque mot de passe avant de continuer." -#: client/features/credentials/legacy.credentials.js:360 -#: client/features/credentials/legacy.credentials.js:343 +#: client/features/credentials/legacy.credentials.js:357 msgid "Legacy state configuration for does not exist" msgstr "Configuration inexistante de l'état hérité pour." @@ -2854,7 +2662,7 @@ msgstr "Configuration inexistante de l'état hérité pour." msgid "License" msgstr "Licence" -#: client/src/license/license.partial.html:102 +#: client/src/license/license.partial.html:104 msgid "License File" msgstr "Fichier de licence" @@ -2872,16 +2680,13 @@ msgstr "Type de licence" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:45 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:55 -#: client/src/job-results/job-results.partial.html:344 -#: client/src/job-submission/job-submission.partial.html:214 +#: client/src/job-results/job-results.partial.html:347 +#: client/src/job-submission/job-submission.partial.html:220 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:92 -#: client/src/templates/job_templates/job-template.form.js:165 -#: client/src/templates/job_templates/job-template.form.js:169 +#: client/src/templates/job_templates/job-template.form.js:160 +#: client/src/templates/job_templates/job-template.form.js:164 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:113 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:120 -#: client/src/job-submission/job-submission.partial.html:212 -#: client/src/templates/job_templates/job-template.form.js:171 -#: client/src/templates/job_templates/job-template.form.js:178 msgid "Limit" msgstr "Limite" @@ -2916,8 +2721,7 @@ msgstr "" msgid "Live events: error connecting to the server." msgstr "Événements en direct : erreur de connexion au serveur." -#: client/src/shared/form-generator.js:1975 -#: client/src/shared/form-generator.js:2026 +#: client/src/shared/form-generator.js:1983 msgid "Loading..." msgstr "Chargement en cours..." @@ -2929,15 +2733,15 @@ msgstr "Fuseau horaire local" msgid "Log Out" msgstr "Se déconnecter" -#: client/src/configuration/system-form/configuration-system.controller.js:220 -msgid "Log aggregator test failed.
Detail:" -msgstr "Échec de l'agrégateur de journalisation
Détail :" +#: client/src/configuration/system-form/configuration-system.controller.js:225 +msgid "Log aggregator test failed.
Detail:" +msgstr "Échec du test de l'agrégateur de journalisation.
Détails :" -#: client/src/configuration/system-form/configuration-system.controller.js:212 +#: client/src/configuration/system-form/configuration-system.controller.js:218 msgid "Log aggregator test successful." msgstr "Test de l'agrégateur de journalisation réussi." -#: client/src/configuration/system-form/configuration-system.controller.js:87 +#: client/src/configuration/system-form/configuration-system.controller.js:89 msgid "Logging" msgstr "Journalisation" @@ -2947,7 +2751,6 @@ msgstr "Basse" #: client/src/management-jobs/card/card.partial.html:6 #: client/src/management-jobs/card/card.route.js:21 -#: client/src/management-jobs/card/card.partial.html:4 msgid "MANAGEMENT JOBS" msgstr "TÂCHES DE GESTION" @@ -2956,18 +2759,16 @@ msgid "MY VIEW" msgstr "MON ÉCRAN" #: client/src/credentials/credentials.form.js:67 -#: client/src/job-submission/job-submission.partial.html:349 -#: client/src/job-submission/job-submission.partial.html:346 +#: client/src/job-submission/job-submission.partial.html:356 msgid "Machine" msgstr "Machine" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:60 -#: client/src/job-results/job-results.partial.html:257 +#: client/src/job-results/job-results.partial.html:260 msgid "Machine Credential" msgstr "Informations d’identification de la machine" #: client/src/setup-menu/setup-menu.partial.html:36 -#: client/src/setup-menu/setup-menu.partial.html:29 msgid "" "Manage the cleanup of old job history, activity streams, data marked for " "deletion, and system tracking info." @@ -2976,26 +2777,16 @@ msgstr "" "d’activité, des données marquées pour suppression et des informations de " "suivi du système." -#: client/src/credentials/factories/become-method-change.factory.js:38 -#: client/src/credentials/factories/kind-change.factory.js:95 -#: client/src/credentials/factories/become-method-change.factory.js:40 -#: client/src/credentials/factories/kind-change.factory.js:97 -msgid "Management Certificate" -msgstr "Certificat de gestion" - #: client/src/setup-menu/setup-menu.partial.html:35 -#: client/src/setup-menu/setup-menu.partial.html:28 msgid "Management Jobs" msgstr "Tâches de gestion" #: client/src/projects/list/projects-list.controller.js:89 -#: client/src/projects/list/projects-list.controller.js:88 msgid "Manual projects do not require a schedule" msgstr "Les projets manuels ne nécessitent pas de planification" -#: client/src/projects/edit/projects-edit.controller.js:140 +#: client/src/projects/edit/projects-edit.controller.js:141 #: client/src/projects/list/projects-list.controller.js:88 -#: client/src/projects/list/projects-list.controller.js:87 msgid "Manual projects do not require an SCM update" msgstr "Les projets manuels ne nécessitent pas de mise à jour SCM" @@ -3009,7 +2800,7 @@ msgstr "" msgid "Medium" msgstr "Moyenne" -#: client/src/configuration/system-form/configuration-system.controller.js:88 +#: client/src/configuration/system-form/configuration-system.controller.js:90 msgid "Misc. System" msgstr "Système divers" @@ -3034,7 +2825,7 @@ msgstr "Échec de la dernière tâche. Cliquez pour afficher les tâches." msgid "Most recent job successful. Click to view jobs." msgstr "Réussite de la dernière tâche. Cliquez pour afficher les tâches." -#: client/src/templates/survey-maker/shared/question-definition.form.js:74 +#: client/src/templates/survey-maker/shared/question-definition.form.js:77 msgid "Multiple Choice Options" msgstr "Options à choix multiples." @@ -3118,7 +2909,6 @@ msgstr "MODÈLE DE NOTIFICATION" #: client/src/activity-stream/get-target-title.factory.js:26 #: client/src/notifications/notificationTemplates.list.js:14 -#: client/src/activity-stream/get-target-title.factory.js:23 msgid "NOTIFICATION TEMPLATES" msgstr "MODÈLES DE NOTIFICATION" @@ -3134,7 +2924,7 @@ msgstr "NOTIFICATIONS" #: client/src/credentials/credentials.list.js:26 #: client/src/home/dashboard/lists/job-templates/job-templates-list.partial.html:14 #: client/src/home/dashboard/lists/jobs/jobs-list.partial.html:13 -#: client/src/instance-groups/instance-groups.list.js:14 +#: client/src/instance-groups/instance-groups.list.js:15 #: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:35 #: client/src/instance-groups/instances/instances-list.partial.html:15 #: client/src/instance-groups/instances/instances.list.js:14 @@ -3171,13 +2961,8 @@ msgstr "NOTIFICATIONS" #: client/src/templates/job_templates/job-template.form.js:34 #: client/src/templates/templates.list.js:24 #: client/src/templates/workflows.form.js:32 -#: client/src/users/users.form.js:138 client/src/users/users.form.js:164 -#: client/src/users/users.form.js:190 -#: client/src/credential-types/credential-types.list.js:21 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:48 -#: client/src/portal-mode/portal-jobs.list.js:34 -#: client/src/users/users.form.js:139 client/src/users/users.form.js:165 -#: client/src/users/users.form.js:191 +#: client/src/users/users.form.js:142 client/src/users/users.form.js:168 +#: client/src/users/users.form.js:194 msgid "Name" msgstr "Nom" @@ -3185,7 +2970,7 @@ msgstr "Nom" msgid "Network" msgstr "Réseau" -#: client/src/job-results/job-results.partial.html:303 +#: client/src/job-results/job-results.partial.html:306 msgid "Network Credential" msgstr "Informations d’identification réseau" @@ -3197,7 +2982,7 @@ msgstr "Nouveau groupe" msgid "New Host" msgstr "Nouvel hôte" -#: client/src/users/add/users-add.controller.js:90 +#: client/src/users/add/users-add.controller.js:91 msgid "New user successfully created!" msgstr "Création de l’utilisateur réussie" @@ -3211,7 +2996,7 @@ msgid "No Credentials Have Been Created" msgstr "Informations d’identification non créées" #: client/src/job-submission/lists/credential/job-sub-cred-list.controller.js:44 -#: client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js:124 +#: client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js:140 msgid "No Credentials Matching This Type Have Been Created" msgstr "" "Aucune information d'identification correspondant à ce type n'a été créée" @@ -3229,7 +3014,6 @@ msgid "No Remediation Playbook Available" msgstr "Playbook de remédiation indisponible" #: client/src/projects/list/projects-list.controller.js:159 -#: client/src/projects/list/projects-list.controller.js:158 msgid "No SCM Configuration" msgstr "Aucune configuration SCM" @@ -3242,7 +3026,6 @@ msgid "No Teams exist" msgstr "Aucune équipe existante" #: client/src/projects/list/projects-list.controller.js:150 -#: client/src/projects/list/projects-list.controller.js:149 msgid "No Updates Available" msgstr "Aucune mise à jour disponible" @@ -3299,8 +3082,7 @@ msgstr "Aucune tâche exécutée pour l’instant." msgid "No jobs were recently run." msgstr "Aucune tâche récemment exécutée." -#: client/src/teams/teams.form.js:121 client/src/users/users.form.js:187 -#: client/src/users/users.form.js:188 +#: client/src/teams/teams.form.js:121 client/src/users/users.form.js:191 msgid "No permissions have been granted" msgstr "Aucune permission accordée" @@ -3308,7 +3090,7 @@ msgstr "Aucune permission accordée" msgid "No recent job data available for this host." msgstr "Aucune donnée de tâche récente n'est disponible pour cet hôte." -#: client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js:73 +#: client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js:75 msgid "No recent job data available for this inventory." msgstr "Aucune donnée de tâche récente n'est disponible pour cet inventaire." @@ -3317,8 +3099,8 @@ msgid "No recent notifications." msgstr "Aucun notification récente." #: client/src/inventories-hosts/hosts/hosts.partial.html:36 -#: client/src/shared/form-generator.js:1871 -#: client/src/shared/form-generator.js:1922 +#: client/src/shared/form-generator.js:1879 +#: client/src/shared/list-generator/list-generator.factory.js:240 msgid "No records matched your search." msgstr "Aucun enregistrement ne correspond à votre demande." @@ -3326,10 +3108,8 @@ msgstr "Aucun enregistrement ne correspond à votre demande." msgid "No schedules exist" msgstr "Aucune planification existante" -#: client/src/job-submission/job-submission.partial.html:341 -#: client/src/job-submission/job-submission.partial.html:346 -#: client/src/job-submission/job-submission.partial.html:338 -#: client/src/job-submission/job-submission.partial.html:343 +#: client/src/job-submission/job-submission.partial.html:348 +#: client/src/job-submission/job-submission.partial.html:353 msgid "None selected" msgstr "Aucune sélectionnée" @@ -3340,7 +3120,6 @@ msgid "Normal User" msgstr "Utilisateur normal" #: client/src/projects/list/projects-list.controller.js:91 -#: client/src/projects/list/projects-list.controller.js:90 msgid "Not configured for SCM" msgstr "Non configuré pour le SCM" @@ -3348,10 +3127,18 @@ msgstr "Non configuré pour le SCM" msgid "Not configured for inventory sync." msgstr "Non configuré pour la synchronisation de l'inventaire." -#: client/src/notifications/notificationTemplates.form.js:291 -#: client/src/notifications/notificationTemplates.form.js:292 -#: client/src/notifications/notificationTemplates.form.js:296 -#: client/src/notifications/notificationTemplates.form.js:297 +#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:25 +msgid "" +"Note that only hosts directly in this group can be disassociated. Hosts in " +"sub-groups must be disassociated directly from the sub-group level that they" +" belong." +msgstr "" +"Notez que seuls les hôtes qui sont directement dans ce groupe peuvent être " +"dissociés. Les hôtes qui se trouvent dans les sous-groupes doivent être " +"dissociés directement au niveau du sous-groupe auquel ils appartiennent." + +#: client/src/notifications/notificationTemplates.form.js:288 +#: client/src/notifications/notificationTemplates.form.js:289 msgid "Notification Color" msgstr "Couleur des notifications" @@ -3359,8 +3146,7 @@ msgstr "Couleur des notifications" msgid "Notification Failed." msgstr "Échec de notification" -#: client/src/notifications/notificationTemplates.form.js:280 -#: client/src/notifications/notificationTemplates.form.js:285 +#: client/src/notifications/notificationTemplates.form.js:277 msgid "Notification Label" msgstr "Étiquette de notification" @@ -3372,37 +3158,33 @@ msgstr "Modèles de notification" #: client/src/management-jobs/notifications/notification.route.js:21 #: client/src/notifications/notifications.list.js:17 #: client/src/setup-menu/setup-menu.partial.html:48 -#: client/src/setup-menu/setup-menu.partial.html:41 msgid "Notifications" msgstr "Notifications" -#: client/src/notifications/notificationTemplates.form.js:305 -#: client/src/notifications/notificationTemplates.form.js:310 +#: client/src/notifications/notificationTemplates.form.js:302 msgid "Notify Channel" msgstr "Canal de notification" #: client/src/inventories-hosts/hosts/hosts.partial.html:55 -#: client/src/job-submission/job-submission.partial.html:263 +#: client/src/job-submission/job-submission.partial.html:269 #: client/src/partials/survey-maker-modal.html:27 -#: client/src/shared/form-generator.js:538 +#: client/src/shared/form-generator.js:542 +#: client/src/shared/form-generator.js:773 #: client/src/shared/generator-helpers.js:551 -#: client/src/job-submission/job-submission.partial.html:260 -#: client/src/shared/form-generator.js:555 msgid "OFF" msgstr "DÉSACTIVÉ" #: client/lib/services/base-string.service.js:63 -#: client/lib/services/base-string.service.js:31 +#: client/src/jobs/factories/delete-job.factory.js:115 msgid "OK" msgstr "OK" #: client/src/inventories-hosts/hosts/hosts.partial.html:54 -#: client/src/job-submission/job-submission.partial.html:261 +#: client/src/job-submission/job-submission.partial.html:267 #: client/src/partials/survey-maker-modal.html:26 -#: client/src/shared/form-generator.js:536 +#: client/src/shared/form-generator.js:538 +#: client/src/shared/form-generator.js:771 #: client/src/shared/generator-helpers.js:547 -#: client/src/job-submission/job-submission.partial.html:259 -#: client/src/shared/form-generator.js:553 msgid "ON" msgstr "ACTIVÉ" @@ -3413,17 +3195,14 @@ msgstr "OPTIONS" #: client/src/activity-stream/get-target-title.factory.js:29 #: client/src/organizations/list/organizations-list.partial.html:6 #: client/src/organizations/main.js:52 -#: client/src/activity-stream/get-target-title.factory.js:26 msgid "ORGANIZATIONS" msgstr "ORGANISATIONS" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:116 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:103 msgid "OVERWRITE" msgstr "REMPLACER" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:123 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:110 msgid "OVERWRITE VARS" msgstr "REMPLACER VARS" @@ -3437,7 +3216,6 @@ msgstr "Lors d’une réussite" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:157 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:162 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:146 msgid "Only Group By" msgstr "Grouper seulement par" @@ -3450,9 +3228,8 @@ msgstr "" "nécessaires seulement pour les URL d’authentification Keystone v3. Les " "scénarios courants incluent :" -#: client/src/templates/job_templates/job-template.form.js:245 +#: client/src/templates/job_templates/job-template.form.js:240 #: client/src/templates/workflows.form.js:69 -#: client/src/templates/job_templates/job-template.form.js:354 msgid "" "Optional labels that describe this job template, such as 'dev' or 'test'. " "Labels can be used to group and filter job templates and completed jobs." @@ -3461,11 +3238,9 @@ msgstr "" "'test'. Les libellés peuvent être utilisés pour regrouper et filtrer les " "modèles de tâche et les tâches terminées." -#: client/src/notifications/notificationTemplates.form.js:385 +#: client/src/notifications/notificationTemplates.form.js:382 #: client/src/partials/logviewer.html:7 -#: client/src/templates/job_templates/job-template.form.js:264 -#: client/src/notifications/notificationTemplates.form.js:397 -#: client/src/templates/job_templates/job-template.form.js:265 +#: client/src/templates/job_templates/job-template.form.js:259 msgid "Options" msgstr "Options" @@ -3484,11 +3259,11 @@ msgstr "Options" msgid "Organization" msgstr "Organisation" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:142 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:65 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:136 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:64 #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:30 #: client/src/setup-menu/setup-menu.partial.html:4 -#: client/src/users/users.form.js:128 client/src/users/users.form.js:129 +#: client/src/users/users.form.js:132 msgid "Organizations" msgstr "Organisations" @@ -3553,15 +3328,11 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:328 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:333 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:282 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:288 msgid "Overwrite" msgstr "Remplacer" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:340 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:345 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:295 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:301 msgid "Overwrite Variables" msgstr "Remplacer les variables" @@ -3573,8 +3344,7 @@ msgstr "Propriétaires" msgid "PASSWORD" msgstr "MOT DE PASSE" -#: client/features/credentials/legacy.credentials.js:125 -#: client/features/credentials/legacy.credentials.js:120 +#: client/features/credentials/legacy.credentials.js:122 msgid "PERMISSIONS" msgstr "PERMISSIONS" @@ -3589,9 +3359,8 @@ msgstr "VEUILLEZ AJOUTER UNE INVITE AU QUESTIONNAIRE." #: client/src/instance-groups/instances/instances-list.partial.html:6 #: client/src/instance-groups/list/instance-groups-list.partial.html:16 #: client/src/organizations/list/organizations-list.partial.html:47 -#: client/src/shared/form-generator.js:1877 +#: client/src/shared/form-generator.js:1885 #: client/src/shared/list-generator/list-generator.factory.js:248 -#: client/src/shared/form-generator.js:1928 msgid "PLEASE ADD ITEMS TO THIS LIST" msgstr "AJOUTEZ DES ÉLÉMENTS À CETTE LISTE" @@ -3603,6 +3372,10 @@ msgstr "MODE PORTAIL" msgid "PREVIEW" msgstr "PRÉVISUALISATION" +#: client/src/job-results/job-results.service.js:166 +msgid "PROCEED" +msgstr "CONTINUER" + #: client/src/partials/job-template-details.html:2 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:73 msgid "PROJECT" @@ -3615,7 +3388,6 @@ msgstr "PROJET" #: client/src/organizations/list/organizations-list.controller.js:72 #: client/src/projects/main.js:73 client/src/projects/projects.list.js:14 #: client/src/projects/projects.list.js:15 -#: client/src/organizations/linkout/organizations-linkout.route.js:191 msgid "PROJECTS" msgstr "PROJETS" @@ -3623,12 +3395,11 @@ msgstr "PROJETS" msgid "Page" msgstr "Page" -#: client/src/notifications/notificationTemplates.form.js:235 -#: client/src/notifications/notificationTemplates.form.js:240 +#: client/src/notifications/notificationTemplates.form.js:232 msgid "Pagerduty subdomain" msgstr "Sous-domaine Pagerduty" -#: client/src/templates/job_templates/job-template.form.js:353 +#: client/src/templates/job_templates/job-template.form.js:348 msgid "" "Pass extra command line variables to the playbook. Provide key/value pairs " "using either YAML or JSON. Refer to the Ansible Tower documentation for " @@ -3661,34 +3432,21 @@ msgstr "" #: client/src/credentials/credentials.form.js:226 #: client/src/credentials/factories/become-method-change.factory.js:21 -#: client/src/credentials/factories/become-method-change.factory.js:46 -#: client/src/credentials/factories/become-method-change.factory.js:54 -#: client/src/credentials/factories/become-method-change.factory.js:74 -#: client/src/credentials/factories/become-method-change.factory.js:84 -#: client/src/credentials/factories/become-method-change.factory.js:94 -#: client/src/credentials/factories/kind-change.factory.js:103 -#: client/src/credentials/factories/kind-change.factory.js:111 -#: client/src/credentials/factories/kind-change.factory.js:131 -#: client/src/credentials/factories/kind-change.factory.js:141 -#: client/src/credentials/factories/kind-change.factory.js:151 +#: client/src/credentials/factories/become-method-change.factory.js:40 +#: client/src/credentials/factories/become-method-change.factory.js:48 +#: client/src/credentials/factories/become-method-change.factory.js:68 +#: client/src/credentials/factories/become-method-change.factory.js:78 +#: client/src/credentials/factories/become-method-change.factory.js:88 +#: client/src/credentials/factories/kind-change.factory.js:105 +#: client/src/credentials/factories/kind-change.factory.js:125 +#: client/src/credentials/factories/kind-change.factory.js:135 +#: client/src/credentials/factories/kind-change.factory.js:145 #: client/src/credentials/factories/kind-change.factory.js:30 #: client/src/credentials/factories/kind-change.factory.js:78 -#: client/src/job-submission/job-submission.partial.html:103 +#: client/src/credentials/factories/kind-change.factory.js:97 +#: client/src/job-submission/job-submission.partial.html:104 #: client/src/notifications/shared/type-change.service.js:28 #: client/src/users/users.form.js:68 -#: client/src/credentials/factories/become-method-change.factory.js:23 -#: client/src/credentials/factories/become-method-change.factory.js:48 -#: client/src/credentials/factories/become-method-change.factory.js:56 -#: client/src/credentials/factories/become-method-change.factory.js:76 -#: client/src/credentials/factories/become-method-change.factory.js:86 -#: client/src/credentials/factories/become-method-change.factory.js:96 -#: client/src/credentials/factories/kind-change.factory.js:105 -#: client/src/credentials/factories/kind-change.factory.js:113 -#: client/src/credentials/factories/kind-change.factory.js:133 -#: client/src/credentials/factories/kind-change.factory.js:143 -#: client/src/credentials/factories/kind-change.factory.js:153 -#: client/src/credentials/factories/kind-change.factory.js:80 -#: client/src/job-submission/job-submission.partial.html:101 msgid "Password" msgstr "Mot de passe" @@ -3711,8 +3469,6 @@ msgstr "La semaine dernière" #: client/src/credentials/factories/become-method-change.factory.js:29 #: client/src/credentials/factories/kind-change.factory.js:86 -#: client/src/credentials/factories/become-method-change.factory.js:31 -#: client/src/credentials/factories/kind-change.factory.js:88 msgid "" "Paste the contents of the PEM file associated with the service account " "email." @@ -3720,17 +3476,6 @@ msgstr "" "Collez le contenu du fichier PEM associé à l’adresse électronique du compte " "de service." -#: client/src/credentials/factories/become-method-change.factory.js:41 -#: client/src/credentials/factories/kind-change.factory.js:98 -#: client/src/credentials/factories/become-method-change.factory.js:43 -#: client/src/credentials/factories/kind-change.factory.js:100 -msgid "" -"Paste the contents of the PEM file that corresponds to the certificate you " -"uploaded in the Microsoft Azure console." -msgstr "" -"Collez le contenu du fichier PEM correspondant au certificat que vous avez " -"chargé dans la console Microsoft Azure." - #: client/src/credentials/factories/kind-change.factory.js:51 msgid "Paste the contents of the SSH private key file." msgstr "Collez le contenu du fichier de clé privée SSH." @@ -3740,7 +3485,7 @@ msgid "Paste the contents of the SSH private key file.%s or click to close%s" msgstr "" "Collez le contenu du fichier de clé privée SSH.%s ou cliquez pour fermer%s" -#: client/src/inventories-hosts/inventories/inventory.list.js:121 +#: client/src/inventories-hosts/inventories/inventory.list.js:119 msgid "Pending Delete" msgstr "En attente de suppression" @@ -3749,40 +3494,30 @@ msgid "Period" msgstr "Période" #: client/src/projects/add/projects-add.controller.js:29 -#: client/src/users/add/users-add.controller.js:42 +#: client/src/users/add/users-add.controller.js:43 msgid "Permission Error" msgstr "Erreur de permission" #: client/features/credentials/credentials.strings.js:14 -#: client/features/credentials/legacy.credentials.js:69 +#: client/features/credentials/legacy.credentials.js:66 #: client/src/credentials/credentials.form.js:439 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:125 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:128 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:122 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:123 #: client/src/projects/projects.form.js:233 client/src/teams/teams.form.js:117 -#: client/src/templates/job_templates/job-template.form.js:391 +#: client/src/templates/job_templates/job-template.form.js:386 #: client/src/templates/workflows.form.js:114 -#: client/src/users/users.form.js:183 -#: client/features/credentials/legacy.credentials.js:64 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:134 -#: client/src/projects/projects.form.js:232 -#: client/src/templates/job_templates/job-template.form.js:411 -#: client/src/templates/workflows.form.js:119 -#: client/src/users/users.form.js:184 +#: client/src/users/users.form.js:187 msgid "Permissions" msgstr "Permissions" -#: client/src/job-results/job-results.partial.html:246 -#: client/src/shared/form-generator.js:1062 -#: client/src/templates/job_templates/job-template.form.js:109 -#: client/src/templates/job_templates/job-template.form.js:120 -#: client/src/shared/form-generator.js:1114 -#: client/src/templates/job_templates/job-template.form.js:113 -#: client/src/templates/job_templates/job-template.form.js:124 +#: client/src/job-results/job-results.partial.html:249 +#: client/src/shared/form-generator.js:1069 +#: client/src/templates/job_templates/job-template.form.js:107 +#: client/src/templates/job_templates/job-template.form.js:115 msgid "Playbook" msgstr "Playbook" #: client/src/projects/projects.form.js:89 -#: client/src/projects/projects.form.js:88 msgid "Playbook Directory" msgstr "Répertoire de playbooks" @@ -3790,20 +3525,19 @@ msgstr "Répertoire de playbooks" msgid "Playbook Run" msgstr "Exécution du playbook" -#: client/src/job-results/job-results.partial.html:485 +#: client/src/job-results/job-results.partial.html:488 msgid "Plays" msgstr "Lancements" -#: client/src/users/users.form.js:122 client/src/users/users.form.js:123 +#: client/src/users/users.form.js:126 msgid "Please add user to an Organization." msgstr "Veuillez ajouter un utilisateur à votre organisation." -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:101 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:100 msgid "Please assign roles to the selected resources" msgstr "Veuillez allouer des rôles aux ressources sélectionnées" #: client/src/access/add-rbac-resource/rbac-resource.partial.html:60 -#: client/src/access/add-rbac-resource/rbac-resource.partial.html:62 msgid "Please assign roles to the selected users/teams" msgstr "Veuillez allouer des rôles aux utilisateurs / équipes sélectionnées" @@ -3815,15 +3549,12 @@ msgstr "" "Cliquez sur le bouton ci-dessous pour visiter le site Web d'Ansible afin " "d'obtenir une clé de licence Tower." -#: client/src/inventories-hosts/inventory-hosts.strings.js:25 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.strings.js:8 +#: client/src/inventories-hosts/inventory-hosts.strings.js:27 msgid "Please click the icon to edit the host filter." msgstr "Cliquez sur l'icône pour modifier le filtre de l'hôte." -#: client/src/shared/form-generator.js:854 -#: client/src/shared/form-generator.js:949 -#: client/src/shared/form-generator.js:877 -#: client/src/shared/form-generator.js:973 +#: client/src/shared/form-generator.js:861 +#: client/src/shared/form-generator.js:956 msgid "" "Please enter a URL that begins with ssh, http or https. The URL may not " "contain the '@' character." @@ -3831,30 +3562,23 @@ msgstr "" "Veuillez saisir une URL commençant par ssh, http ou https. L’URL ne doit pas" " contenir le caractère '@'." -#: client/src/shared/form-generator.js:1151 -#: client/src/shared/form-generator.js:1203 +#: client/src/shared/form-generator.js:1158 msgid "Please enter a number greater than %d and less than %d." msgstr "Entrez un nombre supérieur à %d et inférieur à %d." -#: client/src/shared/form-generator.js:1153 -#: client/src/shared/form-generator.js:1205 +#: client/src/shared/form-generator.js:1160 msgid "Please enter a number greater than %d." msgstr "Entrez un nombre supérieur à %d." -#: client/src/shared/form-generator.js:1145 -#: client/src/shared/form-generator.js:1197 +#: client/src/shared/form-generator.js:1152 msgid "Please enter a number." msgstr "Entrez un nombre." -#: client/src/job-submission/job-submission.partial.html:111 -#: client/src/job-submission/job-submission.partial.html:124 -#: client/src/job-submission/job-submission.partial.html:137 -#: client/src/job-submission/job-submission.partial.html:150 +#: client/src/job-submission/job-submission.partial.html:112 +#: client/src/job-submission/job-submission.partial.html:126 +#: client/src/job-submission/job-submission.partial.html:140 +#: client/src/job-submission/job-submission.partial.html:154 #: client/src/login/loginModal/loginModal.partial.html:78 -#: client/src/job-submission/job-submission.partial.html:109 -#: client/src/job-submission/job-submission.partial.html:122 -#: client/src/job-submission/job-submission.partial.html:135 -#: client/src/job-submission/job-submission.partial.html:148 msgid "Please enter a password." msgstr "Entrez un mot de passe." @@ -3862,56 +3586,39 @@ msgstr "Entrez un mot de passe." msgid "Please enter a username." msgstr "Entrez un nom d’utilisateur." -#: client/src/shared/form-generator.js:844 -#: client/src/shared/form-generator.js:939 -#: client/src/shared/form-generator.js:867 -#: client/src/shared/form-generator.js:963 +#: client/src/shared/form-generator.js:851 +#: client/src/shared/form-generator.js:946 msgid "Please enter a valid email address." msgstr "Entrez une adresse électronique valide." #: client/lib/components/components.strings.js:15 -#: client/src/shared/form-generator.js:1009 -#: client/src/shared/form-generator.js:839 -#: client/src/shared/form-generator.js:934 -#: client/src/shared/form-generator.js:1061 -#: client/src/shared/form-generator.js:862 -#: client/src/shared/form-generator.js:958 +#: client/src/shared/form-generator.js:1016 +#: client/src/shared/form-generator.js:846 +#: client/src/shared/form-generator.js:941 msgid "Please enter a value." msgstr "Entrez une valeur." -#: client/src/job-submission/job-submission.partial.html:282 -#: client/src/job-submission/job-submission.partial.html:287 -#: client/src/job-submission/job-submission.partial.html:298 -#: client/src/job-submission/job-submission.partial.html:304 -#: client/src/job-submission/job-submission.partial.html:310 -#: client/src/job-submission/job-submission.partial.html:279 -#: client/src/job-submission/job-submission.partial.html:284 -#: client/src/job-submission/job-submission.partial.html:295 -#: client/src/job-submission/job-submission.partial.html:301 -#: client/src/job-submission/job-submission.partial.html:307 +#: client/src/job-submission/job-submission.partial.html:289 +#: client/src/job-submission/job-submission.partial.html:294 +#: client/src/job-submission/job-submission.partial.html:305 +#: client/src/job-submission/job-submission.partial.html:311 +#: client/src/job-submission/job-submission.partial.html:317 msgid "Please enter an answer between" msgstr "Veuillez saisir une réponse entre" -#: client/src/job-submission/job-submission.partial.html:309 -#: client/src/job-submission/job-submission.partial.html:306 +#: client/src/job-submission/job-submission.partial.html:316 msgid "Please enter an answer that is a decimal number." msgstr "Veuillez saisir une réponse qui est un chiffre décimal." -#: client/src/job-submission/job-submission.partial.html:303 -#: client/src/job-submission/job-submission.partial.html:300 +#: client/src/job-submission/job-submission.partial.html:310 msgid "Please enter an answer that is a valid integer." msgstr "Veuillez saisir une réponse qui est un entier valide." -#: client/src/job-submission/job-submission.partial.html:281 -#: client/src/job-submission/job-submission.partial.html:286 -#: client/src/job-submission/job-submission.partial.html:297 -#: client/src/job-submission/job-submission.partial.html:302 -#: client/src/job-submission/job-submission.partial.html:308 -#: client/src/job-submission/job-submission.partial.html:278 -#: client/src/job-submission/job-submission.partial.html:283 -#: client/src/job-submission/job-submission.partial.html:294 -#: client/src/job-submission/job-submission.partial.html:299 -#: client/src/job-submission/job-submission.partial.html:305 +#: client/src/job-submission/job-submission.partial.html:288 +#: client/src/job-submission/job-submission.partial.html:293 +#: client/src/job-submission/job-submission.partial.html:304 +#: client/src/job-submission/job-submission.partial.html:309 +#: client/src/job-submission/job-submission.partial.html:315 msgid "Please enter an answer." msgstr "Veuillez saisir une réponse." @@ -3920,7 +3627,7 @@ msgstr "Veuillez saisir une réponse." msgid "Please save and run a job to view." msgstr "Veuillez enregistrer et exécuter une tâche à afficher" -#: client/src/templates/job_templates/add-job-template/job-template-add.controller.js:49 +#: client/src/templates/job_templates/add-job-template/job-template-add.controller.js:50 msgid "Please save before adding a survey to this job template." msgstr "" "Veuillez enregistrer avant d'ajouter un questionnaire à ce modèle de tâche." @@ -3939,44 +3646,34 @@ msgstr "Veuillez enregistrer avant d'ajouter des notifications." msgid "Please save before adding users." msgstr "Veuillez enregistrer avant d'ajouter des utilisateurs" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:121 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:124 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:118 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:119 #: client/src/projects/projects.form.js:225 client/src/teams/teams.form.js:113 -#: client/src/templates/job_templates/job-template.form.js:384 +#: client/src/templates/job_templates/job-template.form.js:379 #: client/src/templates/workflows.form.js:107 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:130 -#: client/src/projects/projects.form.js:224 -#: client/src/templates/job_templates/job-template.form.js:404 -#: client/src/templates/workflows.form.js:112 msgid "Please save before assigning permissions." msgstr "Veuillez enregistrer avant d'attribuer des permissions." -#: client/src/users/users.form.js:120 client/src/users/users.form.js:179 -#: client/src/users/users.form.js:121 client/src/users/users.form.js:180 +#: client/src/users/users.form.js:124 client/src/users/users.form.js:183 msgid "Please save before assigning to organizations." msgstr "Veuillez enregistrer avant l'attribution à des organisations." -#: client/src/users/users.form.js:148 client/src/users/users.form.js:149 +#: client/src/users/users.form.js:152 msgid "Please save before assigning to teams." msgstr "Veuillez enregistrer avant l'attribution à des équipes." -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:169 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:175 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:164 msgid "Please save before creating groups." msgstr "Veuillez enregistrer avant la création de groupes." -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:178 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:184 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:173 msgid "Please save before creating hosts." msgstr "Veuillez enregistrer avant la création d'hôtes." #: client/src/inventories-hosts/hosts/host.form.js:112 #: client/src/inventories-hosts/inventories/related/groups/groups.form.js:86 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:111 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:111 -#: client/src/inventories-hosts/hosts/host.form.js:116 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:116 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:110 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:112 msgid "Please save before defining groups." msgstr "Veuillez enregistrer avant de définir des groupes." @@ -3984,8 +3681,7 @@ msgstr "Veuillez enregistrer avant de définir des groupes." msgid "Please save before defining hosts." msgstr "Veuillez enregistrer avant de définir des hôtes." -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:187 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:193 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:182 msgid "Please save before defining inventory sources." msgstr "Veuillez enregistrer avant de définir des sources d'inventaire." @@ -3995,22 +3691,17 @@ msgstr "" "Veuillez enregistrer avant de définir le graphique du flux de travail." #: client/src/inventories-hosts/hosts/host.form.js:121 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:119 -#: client/src/inventories-hosts/hosts/host.form.js:125 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:118 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:120 msgid "Please save before viewing Insights." msgstr "Veuillez enregistrer avant d'afficher Insights." #: client/src/inventories-hosts/hosts/host.form.js:105 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:104 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:104 -#: client/src/inventories-hosts/hosts/host.form.js:109 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:109 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:103 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:105 msgid "Please save before viewing facts." msgstr "Veuillez enregistrer avant d'afficher des facts." -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:167 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:164 msgid "Please save before viewing hosts." msgstr "Veuillez enregistrer avant d'afficher le hôtes." @@ -4028,7 +3719,6 @@ msgid "Please select a Credential." msgstr "Sélectionnez des informations d’identification." #: client/src/templates/job_templates/multi-credential/multi-credential.partial.html:46 -#: client/src/templates/job_templates/multi-credential/multi-credential.partial.html:43 msgid "" "Please select a machine (SSH) credential or check the \"Prompt on launch\" " "option." @@ -4036,29 +3726,22 @@ msgstr "" "Sélectionnez les informations d'identification de la machine (SSH) ou cochez" " l'option Me le demander au lancement." -#: client/src/shared/form-generator.js:1186 -#: client/src/shared/form-generator.js:1238 +#: client/src/shared/form-generator.js:1193 msgid "Please select a number between" msgstr "Sélectionnez un nombre compris entre" -#: client/src/shared/form-generator.js:1182 -#: client/src/shared/form-generator.js:1234 +#: client/src/shared/form-generator.js:1189 msgid "Please select a number." msgstr "Sélectionnez un nombre." -#: client/src/shared/form-generator.js:1074 -#: client/src/shared/form-generator.js:1142 -#: client/src/shared/form-generator.js:1263 -#: client/src/shared/form-generator.js:1371 -#: client/src/shared/form-generator.js:1126 -#: client/src/shared/form-generator.js:1194 -#: client/src/shared/form-generator.js:1314 -#: client/src/shared/form-generator.js:1422 +#: client/src/shared/form-generator.js:1081 +#: client/src/shared/form-generator.js:1149 +#: client/src/shared/form-generator.js:1270 +#: client/src/shared/form-generator.js:1378 msgid "Please select a value." msgstr "Sélectionnez une valeur." #: client/src/templates/job_templates/job-template.form.js:77 -#: client/src/templates/job_templates/job-template.form.js:81 msgid "Please select an Inventory or check the Prompt on launch option." msgstr "" "Sélectionnez un inventaire ou cochez l’option Me le demander au lancement." @@ -4067,8 +3750,12 @@ msgstr "" msgid "Please select an Inventory." msgstr "Sélectionnez un inventaire." -#: client/src/shared/form-generator.js:1179 -#: client/src/shared/form-generator.js:1231 +#: client/src/inventories-hosts/inventory-hosts.strings.js:26 +msgid "Please select an organization before editing the host filter." +msgstr "" +"Veuillez sélectionner une organisation avant d'éditer le filtre de l'hôte." + +#: client/src/shared/form-generator.js:1186 msgid "Please select at least one value." msgstr "Sélectionnez une valeur au moins." @@ -4076,7 +3763,7 @@ msgstr "Sélectionnez une valeur au moins." msgid "Please select resources from the lists below." msgstr "Veuillez sélectionner des ressources dans les listes ci-dessous." -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:68 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65 msgid "Populate the hosts for this inventory by using a search filter." msgstr "" "Remplir les hôtes de cet inventaire en utilisant un filtre de recherche." @@ -4092,8 +3779,7 @@ msgid "Private Key" msgstr "Clé privée" #: client/src/credentials/credentials.form.js:264 -#: client/src/job-submission/job-submission.partial.html:116 -#: client/src/job-submission/job-submission.partial.html:114 +#: client/src/job-submission/job-submission.partial.html:118 msgid "Private Key Passphrase" msgstr "Phrase de passe pour la clé privée" @@ -4103,44 +3789,30 @@ msgid "Privilege Escalation" msgstr "Élévation des privilèges" #: client/src/credentials/credentials.form.js:305 -#: client/src/job-submission/job-submission.partial.html:129 -#: client/src/credentials/factories/become-method-change.factory.js:19 -#: client/src/credentials/factories/kind-change.factory.js:76 -#: client/src/job-submission/job-submission.partial.html:127 +#: client/src/job-submission/job-submission.partial.html:132 msgid "Privilege Escalation Password" msgstr "Mot de passe pour l’élévation des privilèges" #: client/src/credentials/credentials.form.js:295 -#: client/src/credentials/factories/become-method-change.factory.js:18 -#: client/src/credentials/factories/kind-change.factory.js:75 msgid "Privilege Escalation Username" msgstr "Nom d’utilisateur pour l’élévation des privilèges" #: client/src/credentials/factories/become-method-change.factory.js:30 #: client/src/credentials/factories/kind-change.factory.js:87 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:93 -#: client/src/job-results/job-results.partial.html:213 -#: client/src/templates/job_templates/job-template.form.js:103 +#: client/src/job-results/job-results.partial.html:216 +#: client/src/templates/job_templates/job-template.form.js:100 #: client/src/templates/job_templates/job-template.form.js:91 -#: client/src/credentials/factories/become-method-change.factory.js:32 -#: client/src/credentials/factories/kind-change.factory.js:89 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:88 -#: client/src/templates/job_templates/job-template.form.js:107 -#: client/src/templates/job_templates/job-template.form.js:95 msgid "Project" msgstr "Projet" -#: client/src/credentials/factories/become-method-change.factory.js:59 -#: client/src/credentials/factories/kind-change.factory.js:116 -#: client/src/credentials/factories/become-method-change.factory.js:61 -#: client/src/credentials/factories/kind-change.factory.js:118 +#: client/src/credentials/factories/become-method-change.factory.js:53 +#: client/src/credentials/factories/kind-change.factory.js:110 msgid "Project (Tenant Name)" msgstr "Projet (nom du client)" #: client/src/projects/projects.form.js:75 #: client/src/projects/projects.form.js:83 -#: client/src/projects/projects.form.js:74 -#: client/src/projects/projects.form.js:82 msgid "Project Base Path" msgstr "Chemin de base du projet" @@ -4149,7 +3821,6 @@ msgid "Project Name" msgstr "Nom du projet" #: client/src/projects/projects.form.js:100 -#: client/src/projects/projects.form.js:99 msgid "Project Path" msgstr "Chemin du projet" @@ -4158,12 +3829,11 @@ msgid "Project Sync Failures" msgstr "Erreurs de synchronisation du projet" #: client/src/projects/list/projects-list.controller.js:170 -#: client/src/projects/list/projects-list.controller.js:169 msgid "Project lookup failed. GET returned:" msgstr "La recherche de projet n’a pas abouti. GET renvoyé :" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:121 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:48 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:115 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:47 #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:31 #: client/src/home/dashboard/counts/dashboard-counts.directive.js:61 #: client/src/organizations/linkout/organizations-linkout.route.js:206 @@ -4177,12 +3847,10 @@ msgstr[0] "Promouvoir Groupe" msgstr[1] "Promouvoir Groupes" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:43 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:43 msgid "Promote groups" msgstr "Promouvoir des groupes" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:32 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:32 msgid "Promote groups and hosts" msgstr "Promouvoir des groupes et des hôtes" @@ -4193,7 +3861,6 @@ msgstr[0] "Promouvoir Hôte" msgstr[1] "Promouvoir Hôtes" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:54 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:54 msgid "Promote hosts" msgstr "Promouvoir des hôtes" @@ -4206,31 +3873,20 @@ msgid "Prompt" msgstr "Invite" #: client/lib/components/components.strings.js:30 -#: client/src/templates/job_templates/job-template.form.js:144 -#: client/src/templates/job_templates/job-template.form.js:174 -#: client/src/templates/job_templates/job-template.form.js:191 -#: client/src/templates/job_templates/job-template.form.js:217 -#: client/src/templates/job_templates/job-template.form.js:234 -#: client/src/templates/job_templates/job-template.form.js:259 -#: client/src/templates/job_templates/job-template.form.js:359 +#: client/src/templates/job_templates/job-template.form.js:139 +#: client/src/templates/job_templates/job-template.form.js:169 +#: client/src/templates/job_templates/job-template.form.js:186 +#: client/src/templates/job_templates/job-template.form.js:212 +#: client/src/templates/job_templates/job-template.form.js:229 +#: client/src/templates/job_templates/job-template.form.js:254 +#: client/src/templates/job_templates/job-template.form.js:354 #: client/src/templates/job_templates/job-template.form.js:60 #: client/src/templates/job_templates/job-template.form.js:86 -#: client/src/templates/job_templates/job-template.form.js:147 -#: client/src/templates/job_templates/job-template.form.js:183 -#: client/src/templates/job_templates/job-template.form.js:200 -#: client/src/templates/job_templates/job-template.form.js:228 -#: client/src/templates/job_templates/job-template.form.js:247 -#: client/src/templates/job_templates/job-template.form.js:261 -#: client/src/templates/job_templates/job-template.form.js:376 -#: client/src/templates/job_templates/job-template.form.js:64 -#: client/src/templates/job_templates/job-template.form.js:90 msgid "Prompt on launch" msgstr "Me le demander au lancement" #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:132 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:147 -#: client/src/templates/job_templates/job-template.form.js:220 -#: client/src/templates/job_templates/job-template.form.js:239 msgid "Provide a comma separated list of tags." msgstr "Entrez une liste de balises séparées par des virgules." @@ -4253,12 +3909,10 @@ msgstr "" #: client/src/inventories-hosts/hosts/host.form.js:50 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:49 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:49 -#: client/src/inventories-hosts/hosts/host.form.js:49 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:48 msgid "Provide a host name, ip address, or ip address:port. Examples include:" msgstr "Fournir un nom d'hôte, une adresse ip ou ip address:port. Exemples :" -#: client/src/templates/job_templates/job-template.form.js:168 +#: client/src/templates/job_templates/job-template.form.js:163 msgid "" "Provide a host pattern to further constrain the list of hosts that will be " "managed or affected by the playbook. Multiple patterns are allowed. Refer to" @@ -4270,7 +3924,6 @@ msgstr "" "exemples de modèles." #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:116 -#: client/src/templates/job_templates/job-template.form.js:174 msgid "" "Provide a host pattern to further constrain the list of hosts that will be " "managed or affected by the playbook. Multiple patterns can be separated by " @@ -4286,8 +3939,17 @@ msgstr "" "Fournir des variables d'environnement à transmettre au script de " "l'inventaire personnalisé." -#: client/src/templates/job_templates/job-template.form.js:316 -#: client/src/templates/job_templates/job-template.form.js:324 +#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:203 +#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:287 +msgid "" +"Provide the named URL encoded name or id of the remote Tower inventory to be" +" imported." +msgstr "" +"Fournir le nom encodé de l'URL ou d'id de l'inventaire distant de Tower à " +"importer." + +#: client/src/templates/job_templates/job-template.form.js:311 +#: client/src/templates/job_templates/job-template.form.js:319 msgid "Provisioning Callback URL" msgstr "URL de rappel d’exécution de Tower job_template" @@ -4332,12 +3994,10 @@ msgstr "MODÈLES RÉCEMMENT UTILISÉS" #: client/src/portal-mode/portal-mode-jobs.partial.html:20 #: client/src/projects/projects.list.js:71 #: client/src/scheduler/schedules.list.js:61 -#: client/src/activity-stream/streams.list.js:55 msgid "REFRESH" msgstr "ACTUALISER" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:109 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:96 msgid "REGIONS" msgstr "RÉGIONS" @@ -4345,7 +4005,7 @@ msgstr "RÉGIONS" msgid "RELATED FIELDS:" msgstr "CHAMPS ASSOCIÉS :" -#: client/src/shared/directives.js:78 client/src/shared/directives.js:136 +#: client/src/shared/directives.js:78 msgid "REMOVE" msgstr "SUPPRIMER" @@ -4363,14 +4023,11 @@ msgstr "RÉSULTATS" #: client/src/job-submission/job-submission.partial.html:44 #: client/src/job-submission/job-submission.partial.html:87 #: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:52 -#: client/src/job-submission/job-submission.partial.html:85 msgid "REVERT" msgstr "RÉTABLIR" #: client/src/credentials/factories/become-method-change.factory.js:25 #: client/src/credentials/factories/kind-change.factory.js:82 -#: client/src/credentials/factories/become-method-change.factory.js:27 -#: client/src/credentials/factories/kind-change.factory.js:84 msgid "RSA Private Key" msgstr "Clé privée RSA" @@ -4391,7 +4048,7 @@ msgstr "EXÉCUTER DES COMMANDES" msgid "Random" msgstr "Aléatoire" -#: client/src/job-results/job-results.partial.html:408 +#: client/src/job-results/job-results.partial.html:411 msgid "Read only view of extra variables added to the job template." msgstr "" "Affichage en lecture seule de variables supplémentaires ajoutées au modèle " @@ -4407,9 +4064,8 @@ msgstr "" msgid "Recent Notifications" msgstr "Notifications récentes" -#: client/src/notifications/notificationTemplates.form.js:101 -#: client/src/notifications/notificationTemplates.form.js:97 -#: client/src/notifications/notificationTemplates.form.js:102 +#: client/src/notifications/notificationTemplates.form.js:94 +#: client/src/notifications/notificationTemplates.form.js:98 msgid "Recipient List" msgstr "Liste de destinataires" @@ -4418,7 +4074,7 @@ msgstr "Liste de destinataires" msgid "Red" msgstr "Rouge" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:68 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65 msgid "" "Refer to the Ansible Tower documentation for further syntax and examples." msgstr "" @@ -4436,7 +4092,6 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/sources/sources.list.js:50 #: client/src/projects/projects.list.js:67 #: client/src/scheduler/schedules.list.js:57 -#: client/src/activity-stream/streams.list.js:52 msgid "Refresh the page" msgstr "Actualiser la page" @@ -4446,7 +4101,6 @@ msgid "Region:" msgstr "Région :" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:131 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:122 msgid "Regions" msgstr "Régions" @@ -4463,22 +4117,17 @@ msgstr "Groupes liés" msgid "Relaunch using the same parameters" msgstr "Relancer en utilisant les mêmes paramètres" -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:199 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:205 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:194 msgid "Remediate Inventory" msgstr "Remédier à l'inventaire" #: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:96 #: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:97 -#: client/src/teams/teams.form.js:142 client/src/users/users.form.js:218 -#: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:85 -#: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:86 -#: client/src/users/users.form.js:219 +#: client/src/teams/teams.form.js:142 client/src/users/users.form.js:222 msgid "Remove" msgstr "Supprimer" #: client/src/projects/projects.form.js:158 -#: client/src/projects/projects.form.js:157 msgid "Remove any local modifications prior to performing an update." msgstr "" "Supprimez toutes les modifications locales avant d’effectuer une mise à " @@ -4492,7 +4141,7 @@ msgstr "Fréquence de répétition" msgid "Request License" msgstr "Demander une licence" -#: client/src/templates/survey-maker/shared/question-definition.form.js:288 +#: client/src/templates/survey-maker/shared/question-definition.form.js:291 msgid "Required" msgstr "Obligatoire" @@ -4500,12 +4149,11 @@ msgstr "Obligatoire" msgid "Reset" msgstr "Réinitialisation" -#: client/src/job-results/job-results.partial.html:120 +#: client/src/job-results/job-results.partial.html:123 msgid "Results Traceback" msgstr "Traceback Résultats" -#: client/src/shared/form-generator.js:684 -#: client/src/shared/form-generator.js:701 +#: client/src/shared/form-generator.js:690 msgid "Revert" msgstr "Revenir" @@ -4520,45 +4168,40 @@ msgstr "Revenir" #: client/src/configuration/auth-form/sub-forms/auth-tacacs.form.js:47 #: client/src/configuration/jobs-form/configuration-jobs.form.js:73 #: client/src/configuration/system-form/sub-forms/system-activity-stream.form.js:26 -#: client/src/configuration/system-form/sub-forms/system-logging.form.js:73 +#: client/src/configuration/system-form/sub-forms/system-logging.form.js:74 #: client/src/configuration/system-form/sub-forms/system-misc.form.js:50 #: client/src/configuration/ui-form/configuration-ui.form.js:36 msgid "Revert all to default" msgstr "Revenir aux valeurs par défaut" -#: client/src/job-results/job-results.partial.html:236 +#: client/src/job-results/job-results.partial.html:239 #: client/src/projects/projects.list.js:50 msgid "Revision" msgstr "Révision" #: client/src/projects/add/projects-add.controller.js:146 -#: client/src/projects/edit/projects-edit.controller.js:275 +#: client/src/projects/edit/projects-edit.controller.js:281 msgid "Revision #" msgstr "Révision n°" -#: client/features/credentials/legacy.credentials.js:91 +#: client/features/credentials/legacy.credentials.js:88 #: client/src/credentials/credentials.form.js:461 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:151 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:154 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:148 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:149 #: client/src/organizations/organizations.form.js:97 #: client/src/projects/projects.form.js:255 client/src/teams/teams.form.js:135 #: client/src/teams/teams.form.js:98 #: client/src/templates/workflows.form.js:138 -#: client/src/users/users.form.js:201 -#: client/features/credentials/legacy.credentials.js:86 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:160 -#: client/src/projects/projects.form.js:254 -#: client/src/templates/workflows.form.js:143 -#: client/src/users/users.form.js:202 +#: client/src/users/users.form.js:205 msgid "Role" msgstr "Rôle" -#: client/src/instance-groups/instance-group.partial.html:15 -#: client/src/instance-groups/instance-groups.list.js:25 -#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:15 -#: client/src/instance-groups/instances/instances-list.partial.html:21 +#: client/src/instance-groups/instance-group.partial.html:14 +#: client/src/instance-groups/instance-groups.list.js:26 +#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:14 +#: client/src/instance-groups/instances/instances-list.partial.html:18 #: client/src/instance-groups/instances/instances.list.js:24 -#: client/src/instance-groups/list/instance-groups-list.partial.html:32 +#: client/src/instance-groups/list/instance-groups-list.partial.html:29 msgid "Running Jobs" msgstr "Tâches en cours d'exécution" @@ -4574,13 +4217,12 @@ msgstr "SAML" #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html:17 #: client/src/inventories-hosts/shared/associate-groups/associate-groups.partial.html:17 #: client/src/inventories-hosts/shared/associate-hosts/associate-hosts.partial.html:17 -#: client/src/partials/survey-maker-modal.html:86 +#: client/src/partials/survey-maker-modal.html:87 #: client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.partial.html:18 -#: client/lib/services/base-string.service.js:30 msgid "SAVE" msgstr "ENREGISTRER" -#: client/src/scheduler/main.js:331 client/src/scheduler/main.js:330 +#: client/src/scheduler/main.js:331 msgid "SCHEDULED" msgstr "PROGRAMMÉ" @@ -4596,39 +4238,34 @@ msgstr "TÂCHES PROGRAMMÉES" #: client/src/scheduler/main.js:145 client/src/scheduler/main.js:183 #: client/src/scheduler/main.js:235 client/src/scheduler/main.js:273 #: client/src/scheduler/main.js:52 client/src/scheduler/main.js:90 -#: client/src/activity-stream/get-target-title.factory.js:35 msgid "SCHEDULES" msgstr "PROGRAMMATIONS" #: client/src/projects/add/projects-add.controller.js:118 -#: client/src/projects/edit/projects-edit.controller.js:248 +#: client/src/projects/edit/projects-edit.controller.js:254 msgid "SCM Branch" msgstr "Branche SCM" #: client/src/projects/add/projects-add.controller.js:137 -#: client/src/projects/edit/projects-edit.controller.js:266 +#: client/src/projects/edit/projects-edit.controller.js:272 msgid "SCM Branch/Tag/Commit" msgstr "Branche SCM/Balise/Validation" #: client/src/projects/add/projects-add.controller.js:158 -#: client/src/projects/edit/projects-edit.controller.js:287 +#: client/src/projects/edit/projects-edit.controller.js:293 msgid "SCM Branch/Tag/Revision" msgstr "Branche SCM/Balise/Révision" #: client/src/projects/projects.form.js:159 -#: client/src/projects/projects.form.js:158 msgid "SCM Clean" msgstr "Nettoyage SCM" #: client/src/projects/projects.form.js:170 -#: client/src/projects/projects.form.js:169 msgid "SCM Delete" msgstr "Suppression SCM" #: client/src/credentials/factories/become-method-change.factory.js:20 #: client/src/credentials/factories/kind-change.factory.js:77 -#: client/src/credentials/factories/become-method-change.factory.js:22 -#: client/src/credentials/factories/kind-change.factory.js:79 msgid "SCM Private Key" msgstr "Clé privée SCM" @@ -4638,23 +4275,19 @@ msgstr "Type SCM" #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:49 #: client/src/projects/projects.form.js:180 -#: client/src/projects/projects.form.js:179 msgid "SCM Update" msgstr "Mise à jour SCM" #: client/src/projects/list/projects-list.controller.js:222 -#: client/src/projects/list/projects-list.controller.js:221 msgid "SCM Update Cancel" msgstr "Annulation de la mise à jour SCM" #: client/src/projects/projects.form.js:150 -#: client/src/projects/projects.form.js:149 msgid "SCM Update Options" msgstr "Options de mise à jour SCM" -#: client/src/projects/edit/projects-edit.controller.js:136 +#: client/src/projects/edit/projects-edit.controller.js:137 #: client/src/projects/list/projects-list.controller.js:84 -#: client/src/projects/list/projects-list.controller.js:83 msgid "SCM update currently running" msgstr "Mise à jour SCM en cours" @@ -4687,7 +4320,6 @@ msgstr "SÉLECTIONNÉ :" #: client/src/main-menu/main-menu.partial.html:59 #: client/src/setup-menu/setup.route.js:9 -#: client/src/setup-menu/setup.route.js:8 msgid "SETTINGS" msgstr "PARAMÈTRES" @@ -4703,13 +4335,12 @@ msgstr "SE CONNECTER" msgid "SIGN IN WITH" msgstr "SE CONNECTER AVEC" -#: client/src/inventories-hosts/hosts/host.list.js:109 +#: client/src/inventories-hosts/hosts/host.list.js:110 #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:32 msgid "SMART INVENTORY" msgstr "INVENTAIRE SMART" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:102 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:89 msgid "SOURCE" msgstr "SOURCE" @@ -4717,10 +4348,8 @@ msgstr "SOURCE" msgid "SOURCES" msgstr "SOURCES" -#: client/src/credentials/factories/become-method-change.factory.js:95 -#: client/src/credentials/factories/kind-change.factory.js:152 -#: client/src/credentials/factories/become-method-change.factory.js:97 -#: client/src/credentials/factories/kind-change.factory.js:154 +#: client/src/credentials/factories/become-method-change.factory.js:89 +#: client/src/credentials/factories/kind-change.factory.js:146 msgid "SSH Key" msgstr "Clé SSH" @@ -4728,22 +4357,19 @@ msgstr "Clé SSH" msgid "SSH key description" msgstr "Description de la clé SSH" -#: client/src/notifications/notificationTemplates.form.js:378 -#: client/src/notifications/notificationTemplates.form.js:390 +#: client/src/notifications/notificationTemplates.form.js:375 msgid "SSL Connection" msgstr "Connexion SSL" #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:128 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:135 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:96 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:122 msgid "STANDARD OUT" msgstr "STANDARD OUT" #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:32 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:65 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:45 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:52 msgid "STARTED" msgstr "DÉMARRÉ" @@ -4758,7 +4384,7 @@ msgstr "STATUT" msgid "STS Token" msgstr "Token STS" -#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:60 +#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:61 msgid "SUCCESSFUL" msgstr "RÉUSSI" @@ -4774,39 +4400,34 @@ msgstr "SYNCHRONISER TOUT" msgid "SYSTEM TRACKING" msgstr "SUIVI DU SYSTÈME" -#: client/src/credentials/factories/become-method-change.factory.js:76 -#: client/src/credentials/factories/kind-change.factory.js:133 -#: client/src/credentials/factories/become-method-change.factory.js:78 -#: client/src/credentials/factories/kind-change.factory.js:135 +#: client/src/credentials/factories/become-method-change.factory.js:70 +#: client/src/credentials/factories/kind-change.factory.js:127 msgid "Satellite 6 URL" msgstr "URL Satellite 6" #: client/src/access/add-rbac-resource/rbac-resource.partial.html:110 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:196 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:193 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:157 -#: client/src/shared/form-generator.js:1683 -#: client/src/shared/form-generator.js:1734 +#: client/src/shared/form-generator.js:1691 msgid "Save" msgstr "Enregistrer" #: client/src/configuration/auth-form/configuration-auth.controller.js:86 -#: client/src/configuration/configuration.controller.js:209 -#: client/src/configuration/configuration.controller.js:268 -#: client/src/configuration/system-form/configuration-system.controller.js:66 +#: client/src/configuration/configuration.controller.js:213 +#: client/src/configuration/configuration.controller.js:272 +#: client/src/configuration/system-form/configuration-system.controller.js:68 msgid "Save changes" msgstr "Enregistrer les modifications" -#: client/src/license/license.partial.html:122 +#: client/src/license/license.partial.html:127 msgid "Save successful!" msgstr "Enregistrement réussi" #: client/src/templates/templates.list.js:88 -#: client/src/partials/subhome.html:10 msgid "Schedule" msgstr "Planifier" #: client/src/management-jobs/card/card.partial.html:28 -#: client/src/management-jobs/card/card.partial.html:26 msgid "Schedule Management Job" msgstr "Planifier la tâche de gestion" @@ -4824,14 +4445,11 @@ msgstr "Planifier les prochaines exécutions de modèle de tâche" #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:33 #: client/src/jobs/jobs.partial.html:10 -#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:32 msgid "Schedules" msgstr "Calendriers" #: client/src/shared/smart-search/smart-search.controller.js:49 #: client/src/shared/smart-search/smart-search.controller.js:94 -#: client/src/shared/smart-search/smart-search.controller.js:39 -#: client/src/shared/smart-search/smart-search.controller.js:84 msgid "Search" msgstr "Rechercher" @@ -4854,8 +4472,7 @@ msgstr "" "demander des informations d’identification provisoires avec des privilèges " "limités pour les utilisateurs d’AWS Identity and Access Management (IAM)." -#: client/src/shared/form-generator.js:1687 -#: client/src/shared/form-generator.js:1738 +#: client/src/shared/form-generator.js:1695 msgid "Select" msgstr "Sélectionner" @@ -4905,11 +4522,10 @@ msgstr "" #: client/src/configuration/jobs-form/configuration-jobs.controller.js:109 #: client/src/configuration/jobs-form/configuration-jobs.controller.js:134 #: client/src/configuration/ui-form/configuration-ui.controller.js:95 -#: client/src/configuration/jobs-form/configuration-jobs.controller.js:124 msgid "Select commands" msgstr "Sélectionner des commandes" -#: client/src/templates/job_templates/job-template.form.js:138 +#: client/src/templates/job_templates/job-template.form.js:133 msgid "" "Select credentials that allow Tower to access the nodes this job will be ran" " against. You can only select one credential of each type. For machine " @@ -4930,7 +4546,6 @@ msgstr "" "moment de l'exécution." #: client/src/projects/projects.form.js:98 -#: client/src/projects/projects.form.js:97 msgid "" "Select from the list of directories found in the Project Base Path. Together" " the base path and the playbook directory provide the full path used to " @@ -4940,8 +4555,8 @@ msgstr "" "chemin de base du projet. Le chemin de base et le répertoire de playbook " "fournissent ensemble le chemin complet servant à localiser les playbooks." -#: client/src/configuration/auth-form/configuration-auth.controller.js:262 -#: client/src/configuration/auth-form/configuration-auth.controller.js:281 +#: client/src/configuration/auth-form/configuration-auth.controller.js:263 +#: client/src/configuration/auth-form/configuration-auth.controller.js:282 msgid "Select group types" msgstr "Sélectionner des types de groupe" @@ -4949,13 +4564,12 @@ msgstr "Sélectionner des types de groupe" msgid "Select roles" msgstr "Sélectionner des rôles" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:77 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:85 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:74 msgid "Select the Instance Groups for this Inventory to run on." msgstr "" "Sélectionnez les groupes d'instances sur lesquels exécuter cet inventaire." -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:85 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:80 msgid "" "Select the Instance Groups for this Inventory to run on. Refer to the " "Ansible Tower documentation for more detail." @@ -4963,8 +4577,7 @@ msgstr "" "Sélectionnez les groupes d'instances sur lesquels exécuter cet inventaire. " "Voir la documentation Ansible Tower pour obtenir plus d'informations." -#: client/src/templates/job_templates/job-template.form.js:198 -#: client/src/templates/job_templates/job-template.form.js:207 +#: client/src/templates/job_templates/job-template.form.js:193 msgid "Select the Instance Groups for this Job Template to run on." msgstr "" "Sélectionnez les groupes d'instances sur lesquels exécuter ce modèle de " @@ -4989,7 +4602,6 @@ msgstr "" #: client/src/templates/job_templates/job-template.form.js:79 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:81 -#: client/src/templates/job_templates/job-template.form.js:83 msgid "Select the inventory containing the hosts you want this job to manage." msgstr "" "Sélectionnez l’inventaire contenant les hôtes que vous souhaitez gérer." @@ -5002,19 +4614,17 @@ msgstr "" "Sélectionnez le fichier d'inventaire à synchroniser par cette source. Vous " "pouvez le choisir dans le menu déroulant ou saisir un fichier dans l'entrée." -#: client/src/templates/job_templates/job-template.form.js:119 -#: client/src/templates/job_templates/job-template.form.js:123 +#: client/src/templates/job_templates/job-template.form.js:114 msgid "Select the playbook to be executed by this job." msgstr "Sélectionnez le playbook qui devra être exécuté par cette tâche." -#: client/src/templates/job_templates/job-template.form.js:102 -#: client/src/templates/job_templates/job-template.form.js:106 +#: client/src/templates/job_templates/job-template.form.js:99 msgid "" "Select the project containing the playbook you want this job to execute." msgstr "" "Sélectionnez le projet contenant le playbook que cette tâche devra exécuter." -#: client/src/configuration/system-form/configuration-system.controller.js:191 +#: client/src/configuration/system-form/configuration-system.controller.js:197 msgid "Select types" msgstr "Sélectionner des types" @@ -5023,15 +4633,12 @@ msgstr "Sélectionner des types" msgid "Select which groups to create automatically." msgstr "Sélectionner quels groupes créer automatiquement." -#: client/src/notifications/notificationTemplates.form.js:113 -#: client/src/notifications/notificationTemplates.form.js:114 +#: client/src/notifications/notificationTemplates.form.js:110 msgid "Sender Email" msgstr "Adresse électronique de l’expéditeur" #: client/src/credentials/factories/become-method-change.factory.js:24 #: client/src/credentials/factories/kind-change.factory.js:81 -#: client/src/credentials/factories/become-method-change.factory.js:26 -#: client/src/credentials/factories/kind-change.factory.js:83 msgid "Service Account Email Address" msgstr "Adresse électronique du compte de service" @@ -5056,27 +4663,19 @@ msgstr "" msgid "Settings" msgstr "Paramètres" -#: client/src/job-submission/job-submission.partial.html:107 -#: client/src/job-submission/job-submission.partial.html:120 -#: client/src/job-submission/job-submission.partial.html:133 -#: client/src/job-submission/job-submission.partial.html:146 -#: client/src/job-submission/job-submission.partial.html:292 -#: client/src/shared/form-generator.js:869 -#: client/src/job-submission/job-submission.partial.html:105 -#: client/src/job-submission/job-submission.partial.html:118 -#: client/src/job-submission/job-submission.partial.html:131 -#: client/src/job-submission/job-submission.partial.html:144 -#: client/src/job-submission/job-submission.partial.html:289 -#: client/src/shared/form-generator.js:892 +#: client/src/job-submission/job-submission.partial.html:108 +#: client/src/job-submission/job-submission.partial.html:122 +#: client/src/job-submission/job-submission.partial.html:136 +#: client/src/job-submission/job-submission.partial.html:150 +#: client/src/job-submission/job-submission.partial.html:299 +#: client/src/shared/form-generator.js:876 msgid "Show" msgstr "Afficher" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:114 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:117 -#: client/src/templates/job_templates/job-template.form.js:250 -#: client/src/templates/job_templates/job-template.form.js:253 -#: client/src/templates/job_templates/job-template.form.js:252 -#: client/src/templates/job_templates/job-template.form.js:255 +#: client/src/templates/job_templates/job-template.form.js:245 +#: client/src/templates/job_templates/job-template.form.js:248 msgid "Show Changes" msgstr "Afficher les modifications" @@ -5084,37 +4683,27 @@ msgstr "Afficher les modifications" #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:44 #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:55 #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:76 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:34 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:45 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:56 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:77 msgid "Sign in with %s" msgstr "Se connecter avec %s" #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:63 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:64 msgid "Sign in with %s Organizations" msgstr "Se connecter avec des organisations %s" #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:61 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:62 msgid "Sign in with %s Teams" msgstr "Se connecter avec des équipes %s" -#: client/src/job-results/job-results.partial.html:392 -#: client/src/job-submission/job-submission.partial.html:239 -#: client/src/templates/job_templates/job-template.form.js:222 -#: client/src/templates/job_templates/job-template.form.js:229 +#: client/src/job-results/job-results.partial.html:395 +#: client/src/job-submission/job-submission.partial.html:245 +#: client/src/templates/job_templates/job-template.form.js:217 +#: client/src/templates/job_templates/job-template.form.js:224 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:142 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:150 -#: client/src/job-submission/job-submission.partial.html:237 -#: client/src/templates/job_templates/job-template.form.js:233 -#: client/src/templates/job_templates/job-template.form.js:242 msgid "Skip Tags" msgstr "Balises de saut" #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:148 -#: client/src/templates/job_templates/job-template.form.js:240 msgid "" "Skip tags are useful when you have a large playbook, and you want to skip " "specific parts of a play or task." @@ -5122,7 +4711,7 @@ msgstr "" "Les balises de saut sont utiles si votre playbook est important et que vous " "souhaitez ignorer certaines parties d’une scène ou d’une tâche." -#: client/src/templates/job_templates/job-template.form.js:228 +#: client/src/templates/job_templates/job-template.form.js:223 msgid "" "Skip tags are useful when you have a large playbook, and you want to skip " "specific parts of a play or task. Use commas to separate multiple tags. " @@ -5133,16 +4722,15 @@ msgstr "" " virgules pour séparer plusieurs balises. Consulter la documentation Ansible" " Tower pour obtenir des détails sur l'utilisation des balises." -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:69 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:62 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:66 msgid "Smart Host Filter" msgstr "Filtre d'hôte smart" #: client/src/inventories-hosts/inventories/inventory.list.js:85 #: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:69 #: client/src/organizations/linkout/controllers/organizations-inventories.controller.js:70 -#: client/src/shared/form-generator.js:1449 -#: client/src/shared/form-generator.js:1500 +#: client/src/shared/form-generator.js:1456 msgid "Smart Inventory" msgstr "Inventaire smart" @@ -5152,8 +4740,6 @@ msgstr "Solvable avec playbook" #: client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.directive.js:57 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:64 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:61 -#: client/src/partials/subhome.html:8 msgid "Source" msgstr "Source" @@ -5166,15 +4752,12 @@ msgstr "Contrôle de la source" msgid "Source Details" msgstr "Détails de la source" -#: client/src/notifications/notificationTemplates.form.js:195 -#: client/src/notifications/notificationTemplates.form.js:196 -#: client/src/notifications/notificationTemplates.form.js:198 -#: client/src/notifications/notificationTemplates.form.js:199 +#: client/src/notifications/notificationTemplates.form.js:192 +#: client/src/notifications/notificationTemplates.form.js:193 msgid "Source Phone Number" msgstr "Numéro de téléphone de la source" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:136 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:127 msgid "Source Regions" msgstr "Régions sources" @@ -5188,10 +4771,6 @@ msgstr "Régions sources" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:281 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:291 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:298 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:195 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:202 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:218 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:241 msgid "Source Variables" msgstr "Variables sources" @@ -5200,12 +4779,11 @@ msgid "Source Vars" msgstr "Vars Source" #: client/src/inventories-hosts/inventories/related/sources/sources.list.js:34 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:189 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:195 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:184 msgid "Sources" msgstr "Sources" -#: client/src/notifications/notificationTemplates.form.js:333 +#: client/src/notifications/notificationTemplates.form.js:330 msgid "" "Specify HTTP Headers in JSON format. Refer to the Ansible Tower " "documentation for example syntax." @@ -5221,7 +4799,7 @@ msgstr "" "Spécifiez une méthode pour les opérations %s. Cela équivaut à définir le " "paramètre %s, où %s peut être %s" -#: client/src/notifications/notificationTemplates.form.js:295 +#: client/src/notifications/notificationTemplates.form.js:292 msgid "" "Specify a notification color. Acceptable colors are: yellow, green, red " "purple, gray or random." @@ -5266,7 +4844,7 @@ msgstr "Heure Début" msgid "Start a job using this template" msgstr "Démarrer une tâche avec ce modèle" -#: client/src/projects/edit/projects-edit.controller.js:133 +#: client/src/projects/edit/projects-edit.controller.js:134 #: client/src/projects/list/projects-list.controller.js:74 msgid "Start an SCM update" msgstr "Démarrer une mise à jour SCM" @@ -5275,7 +4853,7 @@ msgstr "Démarrer une mise à jour SCM" msgid "Start sync process" msgstr "Démarrer le processus de synchronisation" -#: client/src/job-results/job-results.partial.html:97 +#: client/src/job-results/job-results.partial.html:100 msgid "Started" msgstr "Démarré" @@ -5293,7 +4871,7 @@ msgstr "État" msgid "Sub Category" msgstr "Sous-catégorie" -#: client/src/license/license.partial.html:121 +#: client/src/license/license.partial.html:126 msgid "Submit" msgstr "Valider" @@ -5331,7 +4909,7 @@ msgstr "Réussi" msgid "Survey" msgstr "Questionnaire" -#: client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js:57 +#: client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js:60 #: client/src/templates/workflows/edit-workflow/workflow-edit.controller.js:64 msgid "" "Surveys allow users to be prompted at job launch with a series of questions " @@ -5406,8 +4984,6 @@ msgstr "TACACS+" #: client/src/organizations/list/organizations-list.controller.js:60 #: client/src/teams/main.js:46 client/src/teams/teams.list.js:14 #: client/src/teams/teams.list.js:15 -#: client/src/activity-stream/get-target-title.factory.js:20 -#: client/src/organizations/linkout/organizations-linkout.route.js:96 msgid "TEAMS" msgstr "ÉQUIPES" @@ -5417,11 +4993,14 @@ msgstr "ÉQUIPES" #: client/src/templates/list/templates-list.route.js:13 #: client/src/templates/templates.list.js:15 #: client/src/templates/templates.list.js:16 -#: client/src/activity-stream/get-target-title.factory.js:41 msgid "TEMPLATES" msgstr "MODÈLES" -#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:102 +#: client/src/instance-groups/instance-groups.list.js:8 +msgid "THERE ARE CURRENTLY NO INSTANCE GROUPS DEFINED" +msgstr "IL N'Y AUCUN GROUPE D'INSTANCES ACTUELLEMENT DÉFINIS" + +#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:104 msgid "TIME" msgstr "DURÉE" @@ -5435,7 +5014,6 @@ msgid "Tag None:" msgstr "Ne rien baliser :" #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:133 -#: client/src/templates/job_templates/job-template.form.js:221 msgid "" "Tags are useful when you have a large playbook, and you want to run a " "specific part of a play or task." @@ -5443,7 +5021,7 @@ msgstr "" "Les balises sont utiles si votre playbook est important et que vous " "souhaitez exécuter une partie donnée d’une scène ou d’une tâche." -#: client/src/templates/job_templates/job-template.form.js:211 +#: client/src/templates/job_templates/job-template.form.js:206 msgid "" "Tags are useful when you have a large playbook, and you want to run a " "specific part of a play or task. Use commas to separate multiple tags. Refer" @@ -5460,25 +5038,20 @@ msgstr "" msgid "Tags:" msgstr "Balises :" -#: client/src/notifications/notificationTemplates.form.js:312 -#: client/src/notifications/notificationTemplates.form.js:317 +#: client/src/notifications/notificationTemplates.form.js:309 msgid "Target URL" msgstr "URL cible" -#: client/src/job-results/job-results.partial.html:493 +#: client/src/job-results/job-results.partial.html:496 msgid "Tasks" msgstr "Tâches" -#: client/features/credentials/legacy.credentials.js:97 +#: client/features/credentials/legacy.credentials.js:94 #: client/src/credentials/credentials.form.js:467 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:157 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:160 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:154 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:155 #: client/src/projects/projects.form.js:261 #: client/src/templates/workflows.form.js:144 -#: client/features/credentials/legacy.credentials.js:92 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:166 -#: client/src/projects/projects.form.js:260 -#: client/src/templates/workflows.form.js:149 msgid "Team Roles" msgstr "Rôles d’équipe" @@ -5487,20 +5060,16 @@ msgstr "Rôles d’équipe" #: client/src/organizations/linkout/organizations-linkout.route.js:108 #: client/src/setup-menu/setup-menu.partial.html:16 #: client/src/shared/stateDefinitions.factory.js:410 -#: client/src/users/users.form.js:155 -#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:33 -#: client/src/shared/stateDefinitions.factory.js:364 -#: client/src/users/users.form.js:156 +#: client/src/users/users.form.js:159 msgid "Teams" msgstr "Équipes" -#: client/src/job-results/job-results.partial.html:132 +#: client/src/job-results/job-results.partial.html:135 #: client/src/templates/templates.list.js:14 msgid "Template" msgstr "Modèle" #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:35 -#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:34 msgid "Templates" msgstr "Modèles" @@ -5508,7 +5077,7 @@ msgstr "Modèles" msgid "Tenant ID" msgstr "ID Client" -#: client/src/configuration/system-form/sub-forms/system-logging.form.js:78 +#: client/src/configuration/system-form/sub-forms/system-logging.form.js:79 msgid "Test" msgstr "Test" @@ -5516,10 +5085,8 @@ msgstr "Test" msgid "Test notification" msgstr "Notification test" -#: client/src/shared/form-generator.js:1379 -#: client/src/shared/form-generator.js:1385 -#: client/src/shared/form-generator.js:1430 -#: client/src/shared/form-generator.js:1436 +#: client/src/shared/form-generator.js:1386 +#: client/src/shared/form-generator.js:1392 msgid "That value was not found. Please enter or select a valid value." msgstr "" "Cette valeur n’a pas été trouvée. Veuillez entrer ou sélectionner une valeur" @@ -5538,8 +5105,6 @@ msgstr "" #: client/src/credentials/factories/become-method-change.factory.js:32 #: client/src/credentials/factories/kind-change.factory.js:89 -#: client/src/credentials/factories/become-method-change.factory.js:34 -#: client/src/credentials/factories/kind-change.factory.js:91 msgid "" "The Project ID is the GCE assigned identification. It is constructed as two " "words followed by a three digit number. Such as:" @@ -5547,7 +5112,7 @@ msgstr "" "L’ID du projet est l’identifiant attribué par GCE. Il se compose de deux " "mots suivis d’un nombre à trois chiffres. Exemple :" -#: client/src/projects/edit/projects-edit.controller.js:326 +#: client/src/projects/edit/projects-edit.controller.js:332 msgid "The SCM update process is running." msgstr "Le processus de mise à jour SCM est en cours d’exécution." @@ -5563,14 +5128,12 @@ msgstr "" "Adresse électronique attribuée au compte de service Google Compute Engine " "%s." -#: client/src/job-results/job-results.partial.html:510 +#: client/src/job-results/job-results.partial.html:513 msgid "The host count will update when the job is complete." msgstr "Le nombre d'hôtes s'actualisera une fois la tâche terminée." -#: client/src/credentials/factories/become-method-change.factory.js:68 -#: client/src/credentials/factories/kind-change.factory.js:125 -#: client/src/credentials/factories/become-method-change.factory.js:70 -#: client/src/credentials/factories/kind-change.factory.js:127 +#: client/src/credentials/factories/become-method-change.factory.js:62 +#: client/src/credentials/factories/kind-change.factory.js:119 msgid "The host to authenticate with." msgstr "Hôte avec lequel s’authentifier." @@ -5591,7 +5154,6 @@ msgstr "" "complète ne sera pas traitée." #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:104 -#: client/src/templates/job_templates/job-template.form.js:160 msgid "" "The number of parallel or simultaneous processes to use while executing the " "playbook. Inputting no value will use the default value from the %sansible " @@ -5601,7 +5163,7 @@ msgstr "" "du playbook. La saisie d'aucune valeur entraînera l'utilisation de la valeur" " par défaut du %sfichier de configuration ansible%s." -#: client/src/templates/job_templates/job-template.form.js:157 +#: client/src/templates/job_templates/job-template.form.js:152 msgid "" "The number of parallel or simultaneous processes to use while executing the " "playbook. Value defaults to 0. Refer to the Ansible documentation for " @@ -5611,8 +5173,7 @@ msgstr "" "du playbook. 0 indique la valeur par défaut. Voir la documentation Ansible " "pour plus d'informations sur le fichier de configuration." -#: client/src/job-results/job-results.controller.js:590 -#: client/src/job-results/job-results.controller.js:585 +#: client/src/job-results/job-results.controller.js:619 msgid "The output is too large to display. Please download." msgstr "" "La sortie est trop volumineuse pour être affichée. Veuillez télécharger." @@ -5622,7 +5183,6 @@ msgid "The project value" msgstr "Valeur du projet" #: client/src/projects/list/projects-list.controller.js:159 -#: client/src/projects/list/projects-list.controller.js:158 msgid "" "The selected project is not configured for SCM. To configure for SCM, edit " "the project and provide SCM settings, and then run an update." @@ -5639,6 +5199,16 @@ msgstr "" "La sortie standard out est trop volumineuse pour être affichée. Veuillez " "spécifier d'autres filtres pour restreindre le standard." +#: client/src/templates/survey-maker/shared/question-definition.form.js:52 +msgid "" +"The suggested format for variable names is lowercase and underscore-" +"separated (for example, foo_bar, user_id, host_name, etc.). Variable names " +"with spaces are not allowed." +msgstr "" +"Le format suggéré pour les noms de variables est en minuscules avec des " +"tirets de séparation (exemple, foo_bar, user_id, host_name, etc.). Les noms " +"de variables contenant des espaces ne sont pas autorisés." + #: client/src/management-jobs/scheduler/schedulerForm.partial.html:124 msgid "The time must be in HH24:MM:SS format." msgstr "L’heure doit être sous le format suivant HH24:MM:SS" @@ -5660,7 +5230,6 @@ msgid "There are no jobs to display at this time" msgstr "Aucune tâche à afficher pour le moment" #: client/src/projects/list/projects-list.controller.js:150 -#: client/src/projects/list/projects-list.controller.js:149 msgid "" "There is no SCM update information available for this project. An update has" " not yet been completed. If you have not already done so, start an update " @@ -5670,21 +5239,37 @@ msgstr "" "mise à jour n’est pas encore terminée. Si vous n’avez pas encore lancé une " "mise à jour pour ce projet, faites-le." -#: client/src/configuration/configuration.controller.js:345 -#: client/src/configuration/configuration.controller.js:342 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:140 +msgid "There was an error deleting inventory source groups. Returned status:" +msgstr "" +"Une erreur s’est produite lors de la suppression des groupes de source " +"d'inventaire. État renvoyé :" + +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:130 +msgid "There was an error deleting inventory source hosts. Returned status:" +msgstr "" +"Une erreur s’est produite lors de la suppression des hôtes de source " +"d'inventaire. État renvoyé :" + +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:167 +msgid "There was an error deleting inventory source. Returned status:" +msgstr "" +"Une erreur s’est produite lors de la suppression de la source d'inventaire. " +"État renvoyé :" + +#: client/src/configuration/configuration.controller.js:349 msgid "There was an error resetting value. Returned status:" msgstr "" "Une erreur s’est produite lors de la réinitialisation de la valeur. État " "renvoyé :" -#: client/src/configuration/configuration.controller.js:525 -#: client/src/configuration/configuration.controller.js:519 +#: client/src/configuration/configuration.controller.js:531 msgid "There was an error resetting values. Returned status:" msgstr "" "Une erreur s’est produite lors de la réinitialisation des valeurs. État " "renvoyé :" -#: client/src/configuration/system-form/configuration-system.controller.js:227 +#: client/src/configuration/system-form/configuration-system.controller.js:232 msgid "There was an error testing the log aggregator. Returned status:" msgstr "" "Une erreur s’est produite lors du test de l'agrégateur. État renvoyé :" @@ -5709,10 +5294,8 @@ msgstr "Ce groupe contient" msgid "This is not a valid number." msgstr "Le nombre n’est pas valide." -#: client/src/credentials/factories/become-method-change.factory.js:65 -#: client/src/credentials/factories/kind-change.factory.js:122 -#: client/src/credentials/factories/become-method-change.factory.js:67 -#: client/src/credentials/factories/kind-change.factory.js:124 +#: client/src/credentials/factories/become-method-change.factory.js:59 +#: client/src/credentials/factories/kind-change.factory.js:116 msgid "" "This is the tenant name. This value is usually the same as the username." msgstr "" @@ -5734,22 +5317,19 @@ msgstr "" "Cette machine n'a pas été connectée à Insights depuis {{last_check_in}} " "heures" -#: client/src/shared/form-generator.js:740 -#: client/src/shared/form-generator.js:765 +#: client/src/shared/form-generator.js:746 msgid "" "This setting has been set manually in a settings file and is now disabled." msgstr "" "Cette valeur a été définie manuellement dans un fichier de configuration et " "est maintenant désactivée." -#: client/src/users/users.form.js:160 client/src/users/users.form.js:161 +#: client/src/users/users.form.js:164 msgid "This user is not a member of any teams" msgstr "Cet utilisateur n’est pas membre d’une équipe" -#: client/src/shared/form-generator.js:849 -#: client/src/shared/form-generator.js:944 -#: client/src/shared/form-generator.js:872 -#: client/src/shared/form-generator.js:968 +#: client/src/shared/form-generator.js:856 +#: client/src/shared/form-generator.js:951 msgid "" "This value does not match the password you entered previously. Please " "confirm that password." @@ -5757,8 +5337,7 @@ msgstr "" "Cette valeur ne correspond pas au mot de passe que vous avez entré " "précédemment. Veuillez confirmer ce mot de passe." -#: client/src/configuration/configuration.controller.js:550 -#: client/src/configuration/configuration.controller.js:544 +#: client/src/configuration/configuration.controller.js:556 msgid "" "This will reset all configuration values to their factory defaults. Are you " "sure you want to proceed?" @@ -5769,7 +5348,6 @@ msgstr "" #: client/src/activity-stream/streams.list.js:25 #: client/src/home/dashboard/lists/jobs/jobs-list.partial.html:14 #: client/src/notifications/notification-templates-list/list.controller.js:72 -#: client/src/activity-stream/streams.list.js:26 msgid "Time" msgstr "Durée" @@ -5778,7 +5356,6 @@ msgid "Time Remaining" msgstr "Durée restante" #: client/src/projects/projects.form.js:196 -#: client/src/projects/projects.form.js:195 msgid "" "Time in seconds to consider a project to be current. During job runs and " "callbacks the task system will evaluate the timestamp of the latest project " @@ -5813,8 +5390,7 @@ msgstr "" "Pour en savoir plus sur le token STS d’IAM, reportez-vous à la documentation" " d’%sAmazon%s." -#: client/src/shared/form-generator.js:874 -#: client/src/shared/form-generator.js:897 +#: client/src/shared/form-generator.js:881 msgid "Toggle the display of plaintext." msgstr "Bascule l’affichage du texte en clair." @@ -5845,7 +5421,7 @@ msgstr "Traceback" #: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:52 #: client/src/inventories-hosts/inventories/related/sources/sources.list.js:41 #: client/src/jobs/all-jobs.list.js:59 -#: client/src/notifications/notificationTemplates.form.js:57 +#: client/src/notifications/notificationTemplates.form.js:54 #: client/src/notifications/notificationTemplates.list.js:39 #: client/src/notifications/notifications.list.js:31 #: client/src/projects/projects.list.js:44 @@ -5854,9 +5430,7 @@ msgstr "Traceback" #: client/src/templates/completed-jobs.list.js:53 #: client/src/templates/templates.list.js:31 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:27 -#: client/src/users/users.form.js:196 -#: client/src/credential-types/credential-types.list.js:28 -#: client/src/users/users.form.js:197 +#: client/src/users/users.form.js:200 msgid "Type" msgstr "Type" @@ -5867,7 +5441,7 @@ msgid "Type Details" msgstr "Détails sur le type" #: client/src/projects/add/projects-add.controller.js:169 -#: client/src/projects/edit/projects-edit.controller.js:298 +#: client/src/projects/edit/projects-edit.controller.js:304 msgid "URL popover text" msgstr "Texte popover de l’URL" @@ -5880,8 +5454,6 @@ msgstr "NOM D’UTILISATEUR" #: client/src/organizations/list/organizations-list.controller.js:54 #: client/src/users/main.js:46 client/src/users/users.list.js:18 #: client/src/users/users.list.js:19 -#: client/src/activity-stream/get-target-title.factory.js:17 -#: client/src/organizations/linkout/organizations-linkout.route.js:41 msgid "USERS" msgstr "UTILISATEURS" @@ -5889,6 +5461,10 @@ msgstr "UTILISATEURS" msgid "Unable to Submit" msgstr "Validation impossible" +#: client/lib/components/components.strings.js:52 +msgid "Unavailable to run jobs." +msgstr "Non disponible pour exécuter les tâches." + #: client/lib/components/components.strings.js:22 msgid "Unexpected Error" msgstr "Erreur inattendue" @@ -5906,36 +5482,29 @@ msgstr "Type de modèle d'affichage non pris en charge" msgid "Unsupported input type" msgstr "Type d'entrée non prise en charge" -#: client/src/projects/list/projects-list.controller.js:267 -#: client/src/projects/list/projects-list.controller.js:265 +#: client/src/projects/list/projects-list.controller.js:266 msgid "Update Not Found" msgstr "Mise à jour introuvable" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:321 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:276 msgid "Update Options" msgstr "Mettre à jour les options" -#: client/src/projects/edit/projects-edit.controller.js:326 +#: client/src/projects/edit/projects-edit.controller.js:332 msgid "Update in Progress" msgstr "Mise à jour en cours" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:352 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:357 #: client/src/projects/projects.form.js:177 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:308 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:313 -#: client/src/projects/projects.form.js:176 msgid "Update on Launch" msgstr "Mettre à jour au lancement" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:364 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:320 msgid "Update on Project Change" msgstr "Mettre à jour lorsqu'une modification est apportée au projet" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:370 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:326 msgid "Update on Project Update" msgstr "Mettre à jour lorsque le projet est actualisé" @@ -5943,21 +5512,26 @@ msgstr "Mettre à jour lorsque le projet est actualisé" msgid "Upgrade" msgstr "Mettre à niveau" +#: client/src/templates/job_templates/job-template.form.js:299 #: client/src/templates/job_templates/job-template.form.js:304 -#: client/src/templates/job_templates/job-template.form.js:309 msgid "Use Fact Cache" msgstr "Utiliser le cache des facts" -#: client/src/notifications/notificationTemplates.form.js:398 -#: client/src/notifications/notificationTemplates.form.js:410 +#: client/src/notifications/notificationTemplates.form.js:395 msgid "Use SSL" msgstr "Utiliser SSL" -#: client/src/notifications/notificationTemplates.form.js:393 -#: client/src/notifications/notificationTemplates.form.js:405 +#: client/src/notifications/notificationTemplates.form.js:390 msgid "Use TLS" msgstr "Utiliser TLS" +#: client/src/instance-groups/instance-group.partial.html:10 +#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:10 +#: client/src/instance-groups/instances/instances-list.partial.html:21 +#: client/src/instance-groups/list/instance-groups-list.partial.html:32 +msgid "Used Capacity" +msgstr "Capacité utilisée" + #: client/src/credentials/credentials.form.js:76 msgid "" "Used to check out and synchronize playbook repositories with a remote source" @@ -5968,17 +5542,13 @@ msgstr "" "SCM à distance tel que Git, Subversion (svn) ou Mercurial (hg). Ces " "informations d’identification sont utilisées par les Projets." -#: client/features/credentials/legacy.credentials.js:86 +#: client/features/credentials/legacy.credentials.js:83 #: client/src/credentials/credentials.form.js:456 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:146 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:149 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:143 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:144 #: client/src/organizations/organizations.form.js:92 #: client/src/projects/projects.form.js:250 client/src/teams/teams.form.js:93 #: client/src/templates/workflows.form.js:133 -#: client/features/credentials/legacy.credentials.js:81 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:155 -#: client/src/projects/projects.form.js:249 -#: client/src/templates/workflows.form.js:138 msgid "User" msgstr "Utilisateur" @@ -5986,21 +5556,19 @@ msgstr "Utilisateur" msgid "User Interface" msgstr "Interface utilisateur" -#: client/src/users/users.form.js:91 client/src/users/users.form.js:92 +#: client/src/users/users.form.js:95 msgid "User Type" msgstr "Type d’utilisateur" #: client/src/access/rbac-multiselect/permissionsUsers.list.js:30 #: client/src/credentials/factories/become-method-change.factory.js:17 -#: client/src/credentials/factories/become-method-change.factory.js:44 -#: client/src/credentials/factories/kind-change.factory.js:101 +#: client/src/credentials/factories/become-method-change.factory.js:38 #: client/src/credentials/factories/kind-change.factory.js:17 #: client/src/credentials/factories/kind-change.factory.js:41 #: client/src/credentials/factories/kind-change.factory.js:74 -#: client/src/notifications/notificationTemplates.form.js:67 +#: client/src/credentials/factories/kind-change.factory.js:95 +#: client/src/notifications/notificationTemplates.form.js:64 #: client/src/users/users.form.js:58 client/src/users/users.list.js:29 -#: client/src/credentials/factories/become-method-change.factory.js:46 -#: client/src/credentials/factories/kind-change.factory.js:103 msgid "Username" msgstr "Nom d’utilisateur" @@ -6020,7 +5588,6 @@ msgstr "" #: client/src/organizations/organizations.form.js:74 #: client/src/setup-menu/setup-menu.partial.html:10 #: client/src/teams/teams.form.js:75 -#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:35 msgid "Users" msgstr "Utilisateurs" @@ -6057,26 +5624,22 @@ msgstr "Licence valide" #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.form.js:47 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:67 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:67 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:84 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:93 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:99 -#: client/src/inventories-hosts/hosts/host.form.js:67 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:66 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:81 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:88 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:94 msgid "Variables" msgstr "Variables" -#: client/src/job-submission/job-submission.partial.html:357 -#: client/src/job-submission/job-submission.partial.html:354 +#: client/src/job-submission/job-submission.partial.html:364 msgid "Vault" msgstr "Coffre-fort" -#: client/src/job-results/job-results.partial.html:318 +#: client/src/job-results/job-results.partial.html:321 msgid "Vault Credential" msgstr "Informations d'identification du coffre-fort" #: client/src/credentials/credentials.form.js:391 -#: client/src/job-submission/job-submission.partial.html:142 -#: client/src/job-submission/job-submission.partial.html:140 +#: client/src/job-submission/job-submission.partial.html:146 msgid "Vault Password" msgstr "Mot de passe Vault" @@ -6084,16 +5647,11 @@ msgstr "Mot de passe Vault" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:90 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:307 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:314 -#: client/src/job-results/job-results.partial.html:355 -#: client/src/job-submission/job-submission.partial.html:178 +#: client/src/job-results/job-results.partial.html:358 +#: client/src/job-submission/job-submission.partial.html:183 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:99 -#: client/src/templates/job_templates/job-template.form.js:179 -#: client/src/templates/job_templates/job-template.form.js:186 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:263 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:270 -#: client/src/job-submission/job-submission.partial.html:176 -#: client/src/templates/job_templates/job-template.form.js:188 -#: client/src/templates/job_templates/job-template.form.js:195 +#: client/src/templates/job_templates/job-template.form.js:174 +#: client/src/templates/job_templates/job-template.form.js:181 msgid "Verbosity" msgstr "Verbosité" @@ -6105,14 +5663,12 @@ msgstr "Version" #: client/src/credential-types/credential-types.list.js:64 #: client/src/credentials/credentials.list.js:75 #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:58 -#: client/src/inventories-hosts/inventories/inventory.list.js:105 +#: client/src/inventories-hosts/inventories/inventory.list.js:104 #: client/src/inventory-scripts/inventory-scripts.list.js:62 #: client/src/notifications/notificationTemplates.list.js:82 #: client/src/scheduler/schedules.list.js:83 client/src/teams/teams.list.js:64 #: client/src/templates/templates.list.js:112 #: client/src/users/users.list.js:70 -#: client/src/activity-stream/streams.list.js:64 -#: client/src/credential-types/credential-types.list.js:61 msgid "View" msgstr "Afficher" @@ -6137,10 +5693,7 @@ msgstr "Afficher les exemples JSON à" #: client/src/inventories-hosts/hosts/host.form.js:78 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:77 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:77 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:94 -#: client/src/inventories-hosts/hosts/host.form.js:77 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:76 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:103 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:91 msgid "View JSON examples at %s" msgstr "Afficher les exemples JSON à %s" @@ -6152,12 +5705,9 @@ msgstr "Afficher moins" msgid "View More" msgstr "Afficher plus" -#: client/src/shared/form-generator.js:1711 -#: client/src/templates/job_templates/job-template.form.js:441 +#: client/src/shared/form-generator.js:1719 +#: client/src/templates/job_templates/job-template.form.js:436 #: client/src/templates/workflows.form.js:161 -#: client/src/shared/form-generator.js:1762 -#: client/src/templates/job_templates/job-template.form.js:458 -#: client/src/templates/workflows.form.js:166 msgid "View Survey" msgstr "Afficher le questionnaire" @@ -6170,20 +5720,15 @@ msgstr "Afficher les exemples YAML à" #: client/src/inventories-hosts/hosts/host.form.js:79 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:78 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:78 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:95 -#: client/src/inventories-hosts/hosts/host.form.js:78 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:77 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:104 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:92 msgid "View YAML examples at %s" msgstr "Afficher les exemples YAML à %s" #: client/src/setup-menu/setup-menu.partial.html:72 -#: client/src/setup-menu/setup-menu.partial.html:54 msgid "View Your License" msgstr "Afficher votre licence" #: client/src/setup-menu/setup-menu.partial.html:73 -#: client/src/setup-menu/setup-menu.partial.html:55 msgid "View and edit your license information." msgstr "Affichez et modifiez vos informations de licence." @@ -6192,12 +5737,10 @@ msgid "View credential" msgstr "Afficher les informations d’identification" #: client/src/credential-types/credential-types.list.js:66 -#: client/src/credential-types/credential-types.list.js:63 msgid "View credential type" msgstr "Afficher le type d'informations d’identification" #: client/src/activity-stream/streams.list.js:67 -#: client/src/activity-stream/streams.list.js:68 msgid "View event details" msgstr "Afficher les détails de l’événement" @@ -6214,11 +5757,10 @@ msgid "View host" msgstr "Afficher l'hôte" #: client/src/setup-menu/setup-menu.partial.html:67 -#: client/src/setup-menu/setup-menu.partial.html:73 msgid "View information about this version of Ansible {{BRAND_NAME}}." msgstr "Afficher des informations sur cette version d'Ansible {{BRAND_NAME}}." -#: client/src/inventories-hosts/inventories/inventory.list.js:107 +#: client/src/inventories-hosts/inventories/inventory.list.js:106 msgid "View inventory" msgstr "Afficher l’inventaire" @@ -6227,7 +5769,6 @@ msgid "View inventory script" msgstr "Afficher le script d’inventaire" #: client/src/setup-menu/setup-menu.partial.html:55 -#: client/src/setup-menu/setup-menu.partial.html:61 msgid "View list and capacity of {{BRAND_NAME}} instances." msgstr "Afficher la liste et la capacité des instances {{BRAND_NAME}}." @@ -6235,7 +5776,7 @@ msgstr "Afficher la liste et la capacité des instances {{BRAND_NAME}}." msgid "View notification" msgstr "Afficher la notification" -#: client/src/job-results/job-results.partial.html:219 +#: client/src/job-results/job-results.partial.html:222 msgid "View project sync results" msgstr "Afficher les résultats de synchronisation du projet" @@ -6278,7 +5819,7 @@ msgstr "Afficher l’utilisateur" #: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:42 #: client/src/instance-groups/jobs/jobs.list.js:41 -#: client/src/job-results/job-results.partial.html:142 +#: client/src/job-results/job-results.partial.html:145 #: client/src/jobs/all-jobs.list.js:49 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:25 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:25 @@ -6290,9 +5831,9 @@ msgid "WORKFLOW" msgstr "WORKFLOW" #: client/src/configuration/auth-form/configuration-auth.controller.js:73 -#: client/src/configuration/configuration.controller.js:196 -#: client/src/configuration/configuration.controller.js:258 -#: client/src/configuration/system-form/configuration-system.controller.js:53 +#: client/src/configuration/configuration.controller.js:200 +#: client/src/configuration/configuration.controller.js:262 +#: client/src/configuration/system-form/configuration-system.controller.js:55 msgid "Warning: Unsaved Changes" msgstr "Avertissement : modifications non enregistrées" @@ -6326,7 +5867,6 @@ msgstr "" "l'inventaire." #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:97 -#: client/src/templates/job_templates/job-template.form.js:54 msgid "" "When this template is submitted as a job, setting the type to %s will " "execute the playbook, running tasks on the selected hosts." @@ -6334,10 +5874,8 @@ msgstr "" "Lorsque ce modèle est validé en tant que tâche, le fait de définir le type " "sur %s exécute le playbook en lançant les tâches sur les hôtes sélectionnés." -#: client/src/shared/form-generator.js:1715 +#: client/src/shared/form-generator.js:1723 #: client/src/templates/workflows.form.js:187 -#: client/src/shared/form-generator.js:1766 -#: client/src/templates/workflows.form.js:192 msgid "Workflow Editor" msgstr "Workflow Editor" @@ -6345,13 +5883,12 @@ msgstr "Workflow Editor" msgid "Workflow Template" msgstr "Modèle de workflow" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:115 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:109 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:41 msgid "Workflow Templates" msgstr "Modèles de workflow" -#: client/src/job-submission/job-submission.partial.html:167 -#: client/src/job-submission/job-submission.partial.html:165 +#: client/src/job-submission/job-submission.partial.html:171 msgid "YAML" msgstr "YAML" @@ -6374,7 +5911,7 @@ msgstr "" "Vous pouvez créer un modèle de tâche ici." -#: client/src/projects/edit/projects-edit.controller.js:61 +#: client/src/projects/edit/projects-edit.controller.js:62 msgid "You do not have access to view this property" msgstr "Vous n’avez pas d’accès pour afficher cette propriété" @@ -6382,14 +5919,20 @@ msgstr "Vous n’avez pas d’accès pour afficher cette propriété" msgid "You do not have permission to add a project." msgstr "Vous n’êtes pas autorisé à ajouter un projet." -#: client/src/users/add/users-add.controller.js:42 +#: client/src/users/add/users-add.controller.js:43 msgid "You do not have permission to add a user." msgstr "Vous n’êtes pas autorisé à ajouter un utilisateur." +#: client/src/inventories-hosts/inventory-hosts.strings.js:28 +msgid "You do not have sufficient permissions to edit the host filter." +msgstr "" +"Vous ne disposez pas de suffisamment de permissions pour modifier le filtre " +"de l'hôte." + #: client/src/configuration/auth-form/configuration-auth.controller.js:72 -#: client/src/configuration/configuration.controller.js:195 -#: client/src/configuration/configuration.controller.js:257 -#: client/src/configuration/system-form/configuration-system.controller.js:52 +#: client/src/configuration/configuration.controller.js:199 +#: client/src/configuration/configuration.controller.js:261 +#: client/src/configuration/system-form/configuration-system.controller.js:54 msgid "" "You have unsaved changes. Would you like to proceed without" " saving?" @@ -6398,7 +5941,6 @@ msgstr "" "sans les enregistrer ?" #: client/src/projects/list/projects-list.controller.js:222 -#: client/src/projects/list/projects-list.controller.js:221 msgid "Your request to cancel the update was submitted to the task manager." msgstr "" "Votre demande d’annulation de la mise à jour a été envoyée au gestionnaire " @@ -6411,19 +5953,14 @@ msgstr "" "connecter." #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:24 -#: client/src/job-submission/job-submission.partial.html:310 -#: client/src/shared/form-generator.js:1186 -#: client/src/job-submission/job-submission.partial.html:307 -#: client/src/shared/form-generator.js:1238 +#: client/src/job-submission/job-submission.partial.html:317 +#: client/src/shared/form-generator.js:1193 msgid "and" msgstr "et" -#: client/src/job-submission/job-submission.partial.html:282 -#: client/src/job-submission/job-submission.partial.html:287 -#: client/src/job-submission/job-submission.partial.html:298 -#: client/src/job-submission/job-submission.partial.html:279 -#: client/src/job-submission/job-submission.partial.html:284 -#: client/src/job-submission/job-submission.partial.html:295 +#: client/src/job-submission/job-submission.partial.html:289 +#: client/src/job-submission/job-submission.partial.html:294 +#: client/src/job-submission/job-submission.partial.html:305 msgid "characters long." msgstr "caractères." @@ -6448,12 +5985,10 @@ msgstr[0] "group" msgstr[1] "groupes" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:26 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:26 msgid "groups" msgstr "groupes" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:24 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:24 msgid "groups and" msgstr "groupes et" @@ -6465,8 +6000,6 @@ msgstr[1] "hôtes" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:24 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:25 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:24 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:25 msgid "hosts" msgstr "hôtes" @@ -6491,8 +6024,7 @@ msgstr "des filtres correspondent." msgid "organization" msgstr "organisation" -#: client/src/shared/form-generator.js:1062 -#: client/src/shared/form-generator.js:1114 +#: client/src/shared/form-generator.js:1069 msgid "playbook" msgstr "playbook" @@ -6512,17 +6044,13 @@ msgstr "" msgid "test" msgstr "test" -#: client/src/job-submission/job-submission.partial.html:282 -#: client/src/job-submission/job-submission.partial.html:287 -#: client/src/job-submission/job-submission.partial.html:298 -#: client/src/job-submission/job-submission.partial.html:279 -#: client/src/job-submission/job-submission.partial.html:284 -#: client/src/job-submission/job-submission.partial.html:295 +#: client/src/job-submission/job-submission.partial.html:289 +#: client/src/job-submission/job-submission.partial.html:294 +#: client/src/job-submission/job-submission.partial.html:305 msgid "to" msgstr "pour" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:139 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:130 msgid "" "to include all regions. Only Hosts associated with the selected regions will" " be updated." @@ -6591,231 +6119,3 @@ msgstr "{{breadcrumb.instance_group_name}}" #: client/src/shared/paginate/paginate.partial.html:55 msgid "{{pageSize}}" msgstr "{{pageSize}}" - -#: client/src/notifications/notificationTemplates.form.js:377 -msgid "%s or %s" -msgstr "%s ou %s" - -#: client/src/partials/subhome.html:30 -msgid " Back to options" -msgstr " Retour aux options" - -#: client/src/partials/subhome.html:32 -msgid " Save" -msgstr " Sauvegarder" - -#: client/src/partials/subhome.html:29 -msgid " View Details" -msgstr " Afficher les détails" - -#: client/src/partials/subhome.html:31 -msgid " Cancel" -msgstr " Annuler" - -#: client/src/shared/smart-search/smart-search.partial.html:51 -msgid "ADDITIONAL INFORMATION:" -msgstr "INFORMATIONS SUPPLÉMENTAIRES :" - -#: client/lib/services/base-string.service.js:8 -msgid "BaseString cannot be extended without providing a namespace" -msgstr "Impossible d'étendre BaseString sans fournir d'espace nom" - -#: client/src/notifications/notificationTemplates.form.js:299 -msgid "Color can be one of %s." -msgstr "La couleur peut être l’une des %s." - -#: client/src/inventory-scripts/inventory-scripts.form.js:62 -msgid "" -"Drag and drop your custom inventory script file here or create one in the " -"field to import your custom inventory." -msgstr "" -"Faites glisser votre script d’inventaire personnalisé et déposez-le ici ou " -"créez-en un dans le champ pour importer votre inventaire personnalisé." - -#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:104 -msgid "" -"Extra Variables\n" -" \n" -" " -msgstr "" -"Variables supplémentaire\n" -" \n" -" " - -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:120 -msgid "Failed to get third-party login types. Returned status:" -msgstr "L’obtention des types de connexion tiers a échoué. État renvoyé :" - -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:68 -msgid "Filter that will be applied to the hosts of this inventory." -msgstr "Filtre appliqué aux hôtes de cet inventaire." - -#: client/src/shared/smart-search/smart-search.partial.html:51 -msgid "" -"For additional information on advanced search search syntax please see the " -"Ansible Tower " -"documentation." -msgstr "" -"Pour obtenir des informations supplémentaires sur la syntaxe de recherche " -"avancée, consulter la documentation Ansible Tower " -"documentation." - -#: client/src/notifications/notificationTemplates.form.js:101 -#: client/src/notifications/notificationTemplates.form.js:144 -#: client/src/notifications/notificationTemplates.form.js:161 -#: client/src/notifications/notificationTemplates.form.js:217 -#: client/src/notifications/notificationTemplates.form.js:339 -#: client/src/notifications/notificationTemplates.form.js:377 -msgid "For example:" -msgstr "Par exemple :" - -#: client/src/templates/job_templates/job-template.form.js:272 -msgid "" -"If enabled, run this playbook as an administrator. This is the equivalent of" -" passing the %s option to the %s command." -msgstr "" -"Si cette option est activée, exécutez ce playbook en tant qu’administrateur." -" Cette opération revient à transmettre l’option %s à la commande %s." - -#: client/src/templates/job_templates/job-template.form.js:57 -msgid "" -"Instead, %s will check playbook syntax, test environment setup and report " -"problems." -msgstr "" -"À la place, %s vérifie la syntaxe du playbook, teste la configuration de " -"l’environnement et signale les problèmes." - -#: client/src/inventories-hosts/inventories/insights/insights.partial.html:63 -msgid "" -"No data is available. Either there are no issues to report or no scan jobs " -"have been run on this host." -msgstr "" -"Aucune donnée disponible : aucun problème à signaler ou aucune tâche " -"d'analyse exécutée sur cet hôte." - -#: client/lib/services/base-string.service.js:9 -msgid "No string exists with this name" -msgstr "Aucune chaîne portant ce nom n'existe." - -#: client/src/notifications/notificationTemplates.form.js:201 -msgid "Number associated with the \"Messaging Service\" in Twilio." -msgstr "Numéro associé au \"Service de messagerie\" de Twilio." - -#: client/src/partials/survey-maker-modal.html:45 -msgid "PLEASE ADD A SURVEY PROMPT ON THE LEFT." -msgstr "VEUILLEZ AJOUTER UNE INVITE AU QUESTIONNAIRE SUR LA GAUCHE." - -#: client/src/shared/paginate/paginate.partial.html:33 -msgid "" -"Page\n" -" {{current}} of\n" -" {{last}}" -msgstr "" -"Page\n" -" {{current}} of\n" -" {{last}}" - -#: client/src/templates/job_templates/job-template.form.js:365 -#: client/src/templates/workflows.form.js:80 -msgid "" -"Pass extra command line variables to the playbook. This is the %s or %s " -"command line parameter for %s. Provide key/value pairs using either YAML or " -"JSON." -msgstr "" -"Transmettez des variables de ligne de commande supplémentaires au playbook. " -"Il s’agit du paramètre de ligne de commande %s ou %s pour %s. Entrez des " -"paires clé/valeur avec la syntaxe YAML ou JSON." - -#: client/src/partials/inventory-add.html:11 -msgid "Please enter a name for this job template copy." -msgstr "Veuillez saisir un nom pour cette copie de modèle de tâche." - -#: client/src/partials/subhome.html:6 -msgid "Properties" -msgstr "Propriétés" - -#: client/src/inventory-scripts/inventory-scripts.form.js:63 -msgid "Script must begin with a hashbang sequence: i.e.... %s" -msgstr "Le script doit commencer par une séquence hashbang : c.-à-d. ....%s" - -#: client/src/templates/job_templates/job-template.form.js:141 -msgid "" -"Select credentials that allow {{BRAND_NAME}} to access the nodes this job " -"will be ran against. You can only select one credential of each type.

You must select either a machine (SSH) credential or \"Prompt on " -"launch\". \"Prompt on launch\" requires you to select a machine credential " -"at run time.

If you select credentials AND check the \"Prompt on " -"launch\" box, you make the selected credentials the defaults that can be " -"updated at run time." -msgstr "" -"Sélectionnez les informations d'identification permettant à {{BRAND_NAME}} " -"d'accéder aux noeuds selon qui déterminent l'exécution de cette tâche. Vous " -"pouvez uniquement sélectionner une information d'identification de chaque " -"type.

Vous devez sélectionner soit une information " -"d'identification machine (SSH) soit \"Me demander au lancement\". \"Me " -"demander au lancement\" requiert la sélection des informations " -"d'identification de la machine lors de l'exécution.

Si vous " -"sélectionnez des informations d'identification ET que vous cochez la case " -"\"Me demander au lancement\", les informations d'identification " -"sélectionnées deviennent les informations d'identification par défaut qui " -"peuvent être mises à jour au moment de l'exécution." - -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:115 -msgid "" -"Select the inventory file to be synced by this source. You can select from " -"the dropdown or enter a file within the input." -msgstr "" -"Sélectionnez le fichier d'inventaire à synchroniser par cette source. Vous " -"pouvez le choisir dans le menu déroulant ou saisir un fichier dans l'entrée." - -#: client/src/templates/job_templates/job-template.form.js:56 -msgid "Setting the type to %s will not execute the playbook." -msgstr "La définition du type sur %s n’exécute pas le playbook." - -#: client/src/notifications/notificationTemplates.form.js:338 -msgid "Specify HTTP Headers in JSON format" -msgstr "Spécifier les en-têtes HTTP au format JSON" - -#: client/src/notifications/notificationTemplates.form.js:202 -msgid "This must be of the form %s." -msgstr "Elle doit se présenter au format %s." - -#: client/src/notifications/notificationTemplates.form.js:100 -#: client/src/notifications/notificationTemplates.form.js:216 -msgid "Type an option on each line." -msgstr "Tapez une option sur chaque ligne." - -#: client/src/notifications/notificationTemplates.form.js:143 -#: client/src/notifications/notificationTemplates.form.js:160 -#: client/src/notifications/notificationTemplates.form.js:376 -msgid "Type an option on each line. The pound symbol (#) is not required." -msgstr "" -"Tapez une option sur chaque ligne. Le symbole dièse (#) n’est pas " -"nécessaire." - -#: client/src/templates/templates.list.js:66 -msgid "Workflow Job Template" -msgstr "Modèle de tâche Workflow" - -#: client/src/shared/form-generator.js:980 -msgid "Your password must be %d characters long." -msgstr "Votre mot de passe doit comporter %d caractères." - -#: client/src/shared/form-generator.js:985 -msgid "Your password must contain a lowercase letter." -msgstr "Votre mot de passe doit contenir une lettre minuscule." - -#: client/src/shared/form-generator.js:995 -msgid "Your password must contain a number." -msgstr "Votre mot de passe doit contenir un chiffre." - -#: client/src/shared/form-generator.js:990 -msgid "Your password must contain an uppercase letter." -msgstr "Votre mot de passe doit contenir une lettre majuscule." - -#: client/src/shared/form-generator.js:1000 -msgid "Your password must contain one of the following characters: %s" -msgstr "Votre mot de passe doit contenir l’un des caractères suivants : %s" diff --git a/awx/ui/po/ja.po b/awx/ui/po/ja.po index daf5dcae77..467d03779a 100644 --- a/awx/ui/po/ja.po +++ b/awx/ui/po/ja.po @@ -5,10 +5,9 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2017-09-18 12:36+0000\n" -"Last-Translator: myamamot \n" +"PO-Revision-Date: 2017-12-04 10:38+0000\n" +"Last-Translator: asasaki \n" "Language-Team: Japanese\n" -"MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ja\n" @@ -16,7 +15,7 @@ msgstr "" "X-Generator: Zanata 4.2.1\n" #: client/src/projects/add/projects-add.controller.js:153 -#: client/src/projects/edit/projects-edit.controller.js:282 +#: client/src/projects/edit/projects-edit.controller.js:288 msgid "" "%sNote:%s Mercurial does not support password authentication for SSH. Do not" " put the username and key in the URL. If using Bitbucket and SSH, do not " @@ -26,7 +25,7 @@ msgstr "" "に入れないでください。Bitbucket および SSH を使用している場合は、Bitbucket ユーザー名を入力しないでください。" #: client/src/projects/add/projects-add.controller.js:132 -#: client/src/projects/edit/projects-edit.controller.js:261 +#: client/src/projects/edit/projects-edit.controller.js:267 msgid "" "%sNote:%s When using SSH protocol for GitHub or Bitbucket, enter an SSH key " "only, do not enter a username (other than git). Additionally, GitHub and " @@ -42,7 +41,6 @@ msgid "(defaults to %s)" msgstr "(%s にデフォルト設定)" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:378 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:334 msgid "(seconds)" msgstr "(秒)" @@ -66,7 +64,7 @@ msgstr "50" msgid "A schedule name is required." msgstr "スケジュール名が必要です。" -#: client/src/users/add/users-add.controller.js:101 +#: client/src/users/add/users-add.controller.js:102 msgid "A value is required" msgstr "値が必要です" @@ -89,11 +87,10 @@ msgstr "アクティビティーの詳細" #: client/src/activity-stream/activitystream.route.js:28 #: client/src/activity-stream/streams.list.js:14 #: client/src/activity-stream/streams.list.js:15 -#: client/src/activity-stream/activitystream.route.js:27 msgid "ACTIVITY STREAM" msgstr "アクティビティーストリーム" -#: client/features/credentials/legacy.credentials.js:79 +#: client/features/credentials/legacy.credentials.js:76 #: client/src/credential-types/credential-types.list.js:44 #: client/src/credentials/credentials.form.js:449 #: client/src/credentials/credentials.list.js:54 @@ -108,15 +105,10 @@ msgstr "アクティビティーストリーム" #: client/src/projects/projects.list.js:78 #: client/src/scheduler/schedules.list.js:68 client/src/teams/teams.form.js:85 #: client/src/teams/teams.list.js:45 -#: client/src/templates/job_templates/job-template.form.js:402 +#: client/src/templates/job_templates/job-template.form.js:397 #: client/src/templates/templates.list.js:58 #: client/src/templates/workflows.form.js:125 #: client/src/users/users.list.js:50 -#: client/features/credentials/legacy.credentials.js:74 -#: client/src/credential-types/credential-types.list.js:41 -#: client/src/projects/projects.form.js:242 -#: client/src/templates/job_templates/job-template.form.js:422 -#: client/src/templates/workflows.form.js:130 msgid "ADD" msgstr "追加" @@ -128,8 +120,7 @@ msgstr "グループの追加" msgid "ADD HOST" msgstr "ホストの追加" -#: client/src/teams/teams.form.js:157 client/src/users/users.form.js:212 -#: client/src/users/users.form.js:213 +#: client/src/teams/teams.form.js:157 client/src/users/users.form.js:216 msgid "ADD PERMISSIONS" msgstr "パーミッションの追加" @@ -147,7 +138,6 @@ msgstr "追加情報" #: client/src/organizations/linkout/organizations-linkout.route.js:330 #: client/src/organizations/list/organizations-list.controller.js:84 -#: client/src/organizations/linkout/organizations-linkout.route.js:323 msgid "ADMINS" msgstr "管理者" @@ -168,8 +158,7 @@ msgstr "任意" msgid "API Key" msgstr "API キー" -#: client/src/notifications/notificationTemplates.form.js:246 -#: client/src/notifications/notificationTemplates.form.js:251 +#: client/src/notifications/notificationTemplates.form.js:243 msgid "API Service/Integration Key" msgstr "API サービス/統合キー" @@ -192,7 +181,6 @@ msgid "ASSOCIATED HOSTS" msgstr "関連付けられているホスト" #: client/src/setup-menu/setup-menu.partial.html:66 -#: client/src/setup-menu/setup-menu.partial.html:72 msgid "About {{BRAND_NAME}}" msgstr "{{BRAND_NAME}} の概要" @@ -200,13 +188,11 @@ msgstr "{{BRAND_NAME}} の概要" msgid "Access Key" msgstr "アクセスキー" -#: client/src/notifications/notificationTemplates.form.js:224 -#: client/src/notifications/notificationTemplates.form.js:229 +#: client/src/notifications/notificationTemplates.form.js:221 msgid "Account SID" msgstr "アカウント SID" -#: client/src/notifications/notificationTemplates.form.js:183 -#: client/src/notifications/notificationTemplates.form.js:186 +#: client/src/notifications/notificationTemplates.form.js:180 msgid "Account Token" msgstr "アカウントトークン" @@ -225,17 +211,15 @@ msgstr "アクション" msgid "Activity" msgstr "アクティビティー" -#: client/src/configuration/system-form/configuration-system.controller.js:86 +#: client/src/configuration/system-form/configuration-system.controller.js:88 msgid "Activity Stream" msgstr "アクティビティーストリーム" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:134 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:137 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:131 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:132 #: client/src/organizations/organizations.form.js:81 #: client/src/teams/teams.form.js:82 #: client/src/templates/workflows.form.js:122 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:143 -#: client/src/templates/workflows.form.js:127 msgid "Add" msgstr "追加" @@ -255,12 +239,9 @@ msgstr "パーミッションの追加" msgid "Add Project" msgstr "プロジェクトの追加" -#: client/src/shared/form-generator.js:1703 -#: client/src/templates/job_templates/job-template.form.js:450 +#: client/src/shared/form-generator.js:1711 +#: client/src/templates/job_templates/job-template.form.js:445 #: client/src/templates/workflows.form.js:170 -#: client/src/shared/form-generator.js:1754 -#: client/src/templates/job_templates/job-template.form.js:467 -#: client/src/templates/workflows.form.js:175 msgid "Add Survey" msgstr "Survey の追加" @@ -275,8 +256,6 @@ msgstr "ユーザーの追加" #: client/src/shared/stateDefinitions.factory.js:410 #: client/src/shared/stateDefinitions.factory.js:578 #: client/src/users/users.list.js:17 -#: client/src/shared/stateDefinitions.factory.js:364 -#: client/src/shared/stateDefinitions.factory.js:532 msgid "Add Users" msgstr "ユーザーの追加" @@ -296,18 +275,13 @@ msgstr "ホストの追加" msgid "Add a new schedule" msgstr "新規スケジュールの追加" -#: client/features/credentials/legacy.credentials.js:77 +#: client/features/credentials/legacy.credentials.js:74 #: client/src/credentials/credentials.form.js:447 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:136 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:139 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:133 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:134 #: client/src/projects/projects.form.js:241 -#: client/src/templates/job_templates/job-template.form.js:400 +#: client/src/templates/job_templates/job-template.form.js:395 #: client/src/templates/workflows.form.js:123 -#: client/features/credentials/legacy.credentials.js:72 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:145 -#: client/src/projects/projects.form.js:240 -#: client/src/templates/job_templates/job-template.form.js:420 -#: client/src/templates/workflows.form.js:128 msgid "Add a permission" msgstr "パーミッションの追加" @@ -318,8 +292,7 @@ msgid "" msgstr "" "マシンに対するジョブの起動時やインベントリーまたはプロジェクトの同期時に使用するパスワード、SSH キーおよびその他の認証情報を追加します。" -#: client/src/shared/form-generator.js:1439 -#: client/src/shared/form-generator.js:1490 +#: client/src/shared/form-generator.js:1446 msgid "Admin" msgstr "管理者" @@ -342,7 +315,6 @@ msgstr "" #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:65 #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:74 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:139 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:130 msgid "All" msgstr "すべて" @@ -355,8 +327,8 @@ msgstr "すべてのアクティビティー" msgid "All Jobs" msgstr "すべてのジョブ" -#: client/src/templates/job_templates/job-template.form.js:280 -#: client/src/templates/job_templates/job-template.form.js:287 +#: client/src/templates/job_templates/job-template.form.js:275 +#: client/src/templates/job_templates/job-template.form.js:282 msgid "Allow Provisioning Callbacks" msgstr "プロビジョニングコールバックの許可" @@ -369,20 +341,27 @@ msgstr "他のユーザーが {{BRAND_NAME}} にサインインし、独自に msgid "Always" msgstr "常時" -#: client/src/projects/list/projects-list.controller.js:267 -#: client/src/projects/list/projects-list.controller.js:265 +#: client/src/projects/list/projects-list.controller.js:266 msgid "" "An SCM update does not appear to be running for project: %s. Click the " "%sRefresh%s button to view the latest status." msgstr "SCM 更新がプロジェクトに対して実行されていないようです: %s。%s更新%s ボタンをクリックして最新のステータスを表示してください。" -#: client/src/templates/survey-maker/shared/question-definition.form.js:59 -#: client/src/templates/survey-maker/shared/question-definition.form.js:65 +#: client/src/templates/survey-maker/shared/question-definition.form.js:62 +#: client/src/templates/survey-maker/shared/question-definition.form.js:68 msgid "Answer Type" msgstr "回答タイプ" -#: client/src/credentials/list/credentials-list.controller.js:114 -#: client/src/credentials/list/credentials-list.controller.js:106 +#: client/src/templates/survey-maker/shared/question-definition.form.js:44 +#: client/src/templates/survey-maker/shared/question-definition.form.js:53 +msgid "Answer Variable Name" +msgstr "回答の変数名" + +#: client/src/job-results/job-results.service.js:144 +msgid "Are you sure you want to cancel the job below?" +msgstr "以下のジョブを取り消してもよろしいですか?" + +#: client/src/credentials/list/credentials-list.controller.js:133 msgid "Are you sure you want to delete the credential below?" msgstr "以下の認証情報を削除してもよろしいですか?" @@ -390,6 +369,7 @@ msgstr "以下の認証情報を削除してもよろしいですか?" msgid "Are you sure you want to delete the inventory below?" msgstr "以下のインベントリーを削除してもよろしいですか?" +#: client/src/job-results/job-results.service.js:95 #: client/src/jobs/factories/delete-job.factory.js:110 msgid "Are you sure you want to delete the job below?" msgstr "以下のジョブを削除してもよろしいですか?" @@ -403,10 +383,13 @@ msgid "Are you sure you want to delete the organization below?" msgstr "以下の組織を削除してもよろしいですか?" #: client/src/projects/list/projects-list.controller.js:208 -#: client/src/projects/list/projects-list.controller.js:207 msgid "Are you sure you want to delete the project below?" msgstr "以下のプロジェクトを削除してもよろしいですか?" +#: client/src/templates/list/templates-list.controller.js:103 +msgid "Are you sure you want to delete the template below?" +msgstr "以下のテンプレートを削除してもよろしいですか?" + #: client/src/users/list/users-list.controller.js:90 msgid "Are you sure you want to delete the user below?" msgstr "以下のユーザーを削除してもよろしいですか?" @@ -419,34 +402,31 @@ msgstr "この {{deleteMode}} を削除してもよろしいですか?" msgid "Are you sure you want to disassociate the group below from" msgstr "以下のグループの関連付けを解除してもよろしいですか?" -#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:22 +#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:23 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:25 -#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:25 +#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:26 msgid "Are you sure you want to disassociate the host below from" msgstr "以下のホストの関連付けを解除してもよろしいですか?" #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:47 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:69 msgid "" "Are you sure you want to permanently delete the group below from the " "inventory?" msgstr "インベントリーから以下のグループを完全に削除してもよろしいですか?" -#: client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js:98 -#: client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js:93 +#: client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js:106 msgid "" "Are you sure you want to permanently delete the host below from the " "inventory?" msgstr "インベントリーからホストを完全に削除してもよろしいですか?" -#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:120 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:69 msgid "" "Are you sure you want to permanently delete the inventory source below from " "the inventory?" msgstr "インベントリーから以下のインベントリーソースを完全に削除してもよろしいですか?" -#: client/src/projects/edit/projects-edit.controller.js:238 +#: client/src/projects/edit/projects-edit.controller.js:244 msgid "Are you sure you want to remove the %s below from %s?" msgstr "%s から以下の %s を削除してもよろしいですか?" @@ -469,8 +449,7 @@ msgstr "既存グループの関連付け" msgid "Associate this host with a new group" msgstr "新規グループへのこのホストの関連付け" -#: client/src/shared/form-generator.js:1441 -#: client/src/shared/form-generator.js:1492 +#: client/src/shared/form-generator.js:1448 msgid "Auditor" msgstr "監査者" @@ -514,12 +493,11 @@ msgstr "アベイラビリティーゾーン" msgid "Azure AD" msgstr "Azure AD" -#: client/src/shared/directives.js:75 client/src/shared/directives.js:133 +#: client/src/shared/directives.js:75 msgid "BROWSE" msgstr "参照" #: client/src/projects/projects.form.js:80 -#: client/src/projects/projects.form.js:79 msgid "" "Base path used for locating playbooks. Directories found inside this path " "will be listed in the playbook directory drop-down. Together the base path " @@ -531,32 +509,28 @@ msgstr "" "を見つけるために使用される完全なパスを提供します。" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:128 -#: client/src/templates/job_templates/job-template.form.js:274 msgid "Become Privilege Escalation" msgstr "Become (権限昇格)" -#: client/src/license/license.partial.html:104 +#: client/src/license/license.partial.html:107 msgid "Browse" msgstr "参照" #: client/lib/services/base-string.service.js:61 -#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:26 +#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:28 #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:51 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html:29 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:29 -#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:29 +#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:30 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:73 #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html:16 #: client/src/inventories-hosts/shared/associate-groups/associate-groups.partial.html:16 #: client/src/inventories-hosts/shared/associate-hosts/associate-hosts.partial.html:16 -#: client/src/job-submission/job-submission.partial.html:363 +#: client/src/job-submission/job-submission.partial.html:370 #: client/src/partials/survey-maker-modal.html:17 -#: client/src/partials/survey-maker-modal.html:84 +#: client/src/partials/survey-maker-modal.html:85 #: client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.partial.html:17 #: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:65 -#: client/lib/services/base-string.service.js:29 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:73 -#: client/src/job-submission/job-submission.partial.html:360 msgid "CANCEL" msgstr "取り消し" @@ -568,14 +542,13 @@ msgstr "変更" msgid "CLEAR ALL" msgstr "すべてをクリア" -#: client/src/partials/survey-maker-modal.html:85 +#: client/src/partials/survey-maker-modal.html:86 msgid "CLOSE" msgstr "閉じる" #: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:19 -#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js:18 +#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js:19 #: client/src/templates/completed-jobs.list.js:20 -#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js:17 msgid "COMPLETED JOBS" msgstr "完了したジョブ" @@ -625,12 +598,10 @@ msgstr "スケジュール済みジョブの作成" msgid "CREATE SOURCE" msgstr "ソースの作成" -#: client/src/job-submission/job-submission.partial.html:344 +#: client/src/job-submission/job-submission.partial.html:351 #: client/src/partials/job-template-details.html:2 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:93 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:82 -#: client/src/job-submission/job-submission.partial.html:341 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:80 msgid "CREDENTIAL" msgstr "認証情報" @@ -640,7 +611,6 @@ msgstr "認証情報タイプ" #: client/src/job-submission/job-submission.partial.html:92 #: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:56 -#: client/src/job-submission/job-submission.partial.html:90 msgid "CREDENTIAL TYPE:" msgstr "認証情報タイプ:" @@ -655,8 +625,6 @@ msgstr "認証情報タイプ" #: client/src/credentials/credentials.list.js:15 #: client/src/credentials/credentials.list.js:16 #: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:5 -#: client/features/credentials/legacy.credentials.js:13 -#: client/src/activity-stream/get-target-title.factory.js:14 msgid "CREDENTIALS" msgstr "認証情報" @@ -667,35 +635,27 @@ msgstr "認証情報のパーミッション" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:378 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:390 #: client/src/projects/projects.form.js:199 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:334 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:346 -#: client/src/projects/projects.form.js:198 msgid "Cache Timeout" msgstr "キャッシュタイムアウト" #: client/src/projects/projects.form.js:188 -#: client/src/projects/projects.form.js:187 msgid "Cache Timeout%s (seconds)%s" msgstr "キャッシュタイムアウト%s (seconds)%s" #: client/src/projects/list/projects-list.controller.js:199 #: client/src/users/list/users-list.controller.js:83 -#: client/src/projects/list/projects-list.controller.js:198 msgid "Call to %s failed. DELETE returned status:" msgstr "%s の呼び出しに失敗しました。DELETE で返されたステータス:" -#: client/src/projects/list/projects-list.controller.js:247 -#: client/src/projects/list/projects-list.controller.js:264 #: client/src/projects/list/projects-list.controller.js:246 -#: client/src/projects/list/projects-list.controller.js:262 +#: client/src/projects/list/projects-list.controller.js:263 msgid "Call to %s failed. GET status:" msgstr "%s の呼び出しに失敗しました。GET ステータス:" -#: client/src/projects/edit/projects-edit.controller.js:232 +#: client/src/projects/edit/projects-edit.controller.js:238 msgid "Call to %s failed. POST returned status:" msgstr "%s の呼び出しに失敗しました。POST で返されたステータス:" -#: client/src/projects/list/projects-list.controller.js:226 #: client/src/projects/list/projects-list.controller.js:225 msgid "Call to %s failed. POST status:" msgstr "%s の呼び出しに失敗しました。POST ステータス:" @@ -704,25 +664,25 @@ msgstr "%s の呼び出しに失敗しました。POST ステータス:" msgid "Call to %s failed. Return status: %d" msgstr "%s の呼び出しが失敗しました。返されたステータス: %d" -#: client/src/projects/list/projects-list.controller.js:273 -#: client/src/projects/list/projects-list.controller.js:271 +#: client/src/projects/list/projects-list.controller.js:272 msgid "Call to get project failed. GET status:" msgstr "プロジェクトを取得するための呼び出しに失敗しました。GET ステータス:" #: client/src/access/add-rbac-resource/rbac-resource.partial.html:105 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:191 -#: client/src/configuration/configuration.controller.js:535 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:188 +#: client/src/configuration/configuration.controller.js:541 #: client/src/job-results/job-results.partial.html:42 #: client/src/jobs/factories/delete-job.factory.js:33 -#: client/src/shared/form-generator.js:1691 +#: client/src/shared/form-generator.js:1699 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:12 #: client/src/workflow-results/workflow-results.partial.html:42 -#: client/src/configuration/configuration.controller.js:529 -#: client/src/shared/form-generator.js:1742 msgid "Cancel" msgstr "取り消し" -#: client/src/projects/list/projects-list.controller.js:242 +#: client/src/job-results/job-results.service.js:142 +msgid "Cancel Job" +msgstr "ジョブの取り消し" + #: client/src/projects/list/projects-list.controller.js:241 msgid "Cancel Not Allowed" msgstr "取り消しは許可されていません" @@ -746,22 +706,15 @@ msgstr "取り消されました。クリックして詳細を確認してくだ #: client/src/shared/smart-search/smart-search.controller.js:49 #: client/src/shared/smart-search/smart-search.controller.js:91 -#: client/src/shared/smart-search/smart-search.controller.js:39 -#: client/src/shared/smart-search/smart-search.controller.js:81 msgid "Cannot search running job" msgstr "実行中のジョブを検索することはできません" -#: client/src/instance-groups/instance-group.partial.html:10 -#: client/src/instance-groups/instance-groups.list.js:21 -#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:10 -#: client/src/instance-groups/instances/instances-list.partial.html:18 +#: client/src/instance-groups/instance-groups.list.js:22 #: client/src/instance-groups/instances/instances.list.js:20 -#: client/src/instance-groups/list/instance-groups-list.partial.html:29 msgid "Capacity" msgstr "容量" #: client/src/projects/projects.form.js:82 -#: client/src/projects/projects.form.js:81 msgid "Change %s under \"Configure {{BRAND_NAME}}\" to change this location." msgstr "この場所を変更するには「{{BRAND_NAME}} の設定」下の %s を変更します。" @@ -769,16 +722,15 @@ msgstr "この場所を変更するには「{{BRAND_NAME}} の設定」下の %s msgid "Changes" msgstr "変更" -#: client/src/shared/form-generator.js:1064 -#: client/src/shared/form-generator.js:1116 +#: client/src/shared/form-generator.js:1071 msgid "Choose a %s" -msgstr "%sの選択" +msgstr "%s の選択" -#: client/src/templates/survey-maker/shared/question-definition.form.js:61 +#: client/src/templates/survey-maker/shared/question-definition.form.js:64 msgid "Choose an answer type" msgstr "回答タイプの選択" -#: client/src/templates/survey-maker/shared/question-definition.form.js:64 +#: client/src/templates/survey-maker/shared/question-definition.form.js:67 msgid "" "Choose an answer type or format you want as the prompt for the user. Refer " "to the Ansible Tower Documentation for more additional information about " @@ -791,7 +743,7 @@ msgstr "" msgid "Choose an inventory file" msgstr "インベントリーファイルの選択" -#: client/src/shared/directives.js:76 client/src/shared/directives.js:134 +#: client/src/shared/directives.js:76 msgid "Choose file" msgstr "ファイルの選択" @@ -802,11 +754,10 @@ msgid "" msgstr "ライセンスファイルを選択し、使用許諾契約書に同意した後に「送信」をクリックします。" #: client/src/projects/projects.form.js:156 -#: client/src/projects/projects.form.js:155 msgid "Clean" msgstr "クリーニング" -#: client/src/templates/survey-maker/shared/question-definition.form.js:296 +#: client/src/templates/survey-maker/shared/question-definition.form.js:299 msgid "Clear" msgstr "消去" @@ -838,7 +789,6 @@ msgid "" msgstr "行をクリックしてこれを選択し、終了したら「終了」をクリックします。%s ボタンをクリックして新規ジョブテンプレートを作成します。" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:138 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:129 msgid "" "Click on the regions field to see a list of regions for your cloud provider." " You can select multiple regions, or choose" @@ -848,8 +798,7 @@ msgstr "リージョンフィールドをクリックして、クラウドプロ msgid "Client ID" msgstr "クライアント ID" -#: client/src/notifications/notificationTemplates.form.js:257 -#: client/src/notifications/notificationTemplates.form.js:262 +#: client/src/notifications/notificationTemplates.form.js:254 msgid "Client Identifier" msgstr "クライアント識別子" @@ -857,12 +806,11 @@ msgstr "クライアント識別子" msgid "Client Secret" msgstr "クライアントシークレット" -#: client/src/shared/form-generator.js:1695 -#: client/src/shared/form-generator.js:1746 +#: client/src/shared/form-generator.js:1703 msgid "Close" msgstr "閉じる" -#: client/src/job-results/job-results.partial.html:288 +#: client/src/job-results/job-results.partial.html:291 msgid "Cloud Credential" msgstr "クラウド認証情報" @@ -874,18 +822,14 @@ msgstr "クラウドリソースは設定されていません。" msgid "Cloud source not configured. Click" msgstr "クラウドソースは設定されていません。以下をクリックします。" -#: client/src/credentials/factories/become-method-change.factory.js:86 -#: client/src/credentials/factories/kind-change.factory.js:143 -#: client/src/credentials/factories/become-method-change.factory.js:88 -#: client/src/credentials/factories/kind-change.factory.js:145 +#: client/src/credentials/factories/become-method-change.factory.js:80 +#: client/src/credentials/factories/kind-change.factory.js:137 msgid "CloudForms URL" msgstr "CloudForms URL" #: client/src/job-results/job-results.controller.js:226 #: client/src/standard-out/standard-out.controller.js:243 #: client/src/workflow-results/workflow-results.controller.js:118 -#: client/src/job-results/job-results.controller.js:219 -#: client/src/standard-out/standard-out.controller.js:245 msgid "Collapse Output" msgstr "出力の縮小" @@ -895,37 +839,39 @@ msgid "Completed Jobs" msgstr "完了したジョブ" #: client/src/management-jobs/card/card.partial.html:34 -#: client/src/management-jobs/card/card.partial.html:32 msgid "Configure Notifications" msgstr "通知の設定" #: client/src/setup-menu/setup-menu.partial.html:60 -#: client/src/setup-menu/setup-menu.partial.html:66 msgid "Configure {{BRAND_NAME}}" msgstr "{{BRAND_NAME}} の設定" -#: client/src/users/users.form.js:79 client/src/users/users.form.js:80 +#: client/src/users/users.form.js:81 msgid "Confirm Password" msgstr "パスワードの確認" -#: client/src/configuration/configuration.controller.js:542 -#: client/src/configuration/configuration.controller.js:536 +#: client/src/configuration/configuration.controller.js:548 msgid "Confirm Reset" msgstr "リセットの確認" -#: client/src/configuration/configuration.controller.js:551 -#: client/src/configuration/configuration.controller.js:545 +#: client/src/configuration/configuration.controller.js:557 msgid "Confirm factory reset" msgstr "出荷時の設定へのリセットの確認" +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:120 +msgid "" +"Confirm that you want to permanently delete the inventory source below from " +"the inventory. Deleting this inventory source also deletes its associated " +"groups and hosts." +msgstr "" +"インベントリーから以下のインベントリーソースを完全に削除してもよいかを確認します。このインベントリーソースを削除すると、それに関連付けられたグループおよびホストも削除されます。" + #: client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js:82 msgid "Confirm the removal of the" -msgstr "削除を確認:" +msgstr "以下の削除を確認:" #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:134 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:149 -#: client/src/templates/job_templates/job-template.form.js:222 -#: client/src/templates/job_templates/job-template.form.js:241 msgid "" "Consult the Ansible documentation for further details on the usage of tags." msgstr "タグの使用法についての詳細は、Ansible ドキュメントを参照してください。" @@ -934,14 +880,12 @@ msgstr "タグの使用法についての詳細は、Ansible ドキュメント msgid "Contains 0 hosts." msgstr "0 ホストが含まれています。" -#: client/src/templates/job_templates/job-template.form.js:185 -#: client/src/templates/job_templates/job-template.form.js:194 +#: client/src/templates/job_templates/job-template.form.js:180 msgid "" "Control the level of output ansible will produce as the playbook executes." msgstr "Playbook の実行時に Ansible が生成する出力のレベルを制御します。" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:313 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:269 msgid "" "Control the level of output ansible will produce for inventory source update" " jobs." @@ -975,16 +919,11 @@ msgstr "" msgid "Create New" msgstr "新規作成" -#: client/src/inventories-hosts/hosts/host.list.js:107 -msgid "Create a new Smart Inventory from search results." -msgstr "検索結果から新規のスマートインベントリーを作成します。" - #: client/src/credentials/credentials.list.js:52 msgid "Create a new credential" msgstr "新規認証情報の作成" #: client/src/credential-types/credential-types.list.js:42 -#: client/src/credential-types/credential-types.list.js:39 msgid "Create a new credential type" msgstr "新規認証情報タイプの作成" @@ -1033,19 +972,16 @@ msgid "Create a new user" msgstr "新規ユーザーの作成" #: client/src/setup-menu/setup-menu.partial.html:42 -#: client/src/setup-menu/setup-menu.partial.html:35 msgid "Create and edit scripts to dynamically load hosts from any source." msgstr "任意のソースからホストを動的にロードするためのスクリプトを作成し、編集します。" #: client/src/setup-menu/setup-menu.partial.html:30 -#: client/src/setup-menu/setup-menu.partial.html:49 msgid "" "Create custom credential types to be used for authenticating to network " "hosts and cloud sources" msgstr "ネットワークホストおよびクラウドソースに対する認証に使用されるカスタム認証情報タイプを作成します。" #: client/src/setup-menu/setup-menu.partial.html:49 -#: client/src/setup-menu/setup-menu.partial.html:42 msgid "" "Create templates for sending notifications with Email, HipChat, Slack, and " "SMS." @@ -1055,26 +991,22 @@ msgstr "メール、HipChat、Slack、および SMS での通知を送信する #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:74 #: client/src/job-submission/job-submission.partial.html:18 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:67 -#: client/src/templates/job_templates/job-template.form.js:126 +#: client/src/templates/job_templates/job-template.form.js:121 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:53 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:62 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:70 msgid "Credential" msgstr "認証情報" #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:32 #: client/src/setup-menu/setup-menu.partial.html:29 -#: client/src/setup-menu/setup-menu.partial.html:48 msgid "Credential Types" msgstr "認証情報タイプ" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:135 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:59 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:129 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:58 #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:24 #: client/src/setup-menu/setup-menu.partial.html:22 -#: client/src/templates/job_templates/job-template.form.js:139 -#: client/src/templates/job_templates/job-template.form.js:130 -#: client/src/templates/job_templates/job-template.form.js:142 +#: client/src/templates/job_templates/job-template.form.js:134 msgid "Credentials" msgstr "認証情報" @@ -1082,7 +1014,7 @@ msgstr "認証情報" msgid "Critical" msgstr "重大" -#: client/src/shared/directives.js:77 client/src/shared/directives.js:135 +#: client/src/shared/directives.js:77 msgid "Current Image:" msgstr "現在のイメージ:" @@ -1091,13 +1023,11 @@ msgid "Currently following standard out as it comes in. Click to unfollow." msgstr "現在、受信時の標準出力をフォローしています。クリックしてフォローを解除します。" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:171 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:159 msgid "Custom Inventory Script" msgstr "カスタムインベントリースクリプト" -#: client/src/inventory-scripts/inventory-scripts.form.js:53 -#: client/src/inventory-scripts/inventory-scripts.form.js:63 -#: client/src/inventory-scripts/inventory-scripts.form.js:64 +#: client/src/inventory-scripts/inventory-scripts.form.js:50 +#: client/src/inventory-scripts/inventory-scripts.form.js:60 msgid "Custom Script" msgstr "カスタムスクリプト" @@ -1105,22 +1035,23 @@ msgstr "カスタムスクリプト" msgid "DASHBOARD" msgstr "ダッシュボード" -#: client/src/credentials/list/credentials-list.controller.js:116 +#: client/src/credentials/list/credentials-list.controller.js:135 #: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:103 #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:52 -#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:145 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:178 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:74 +#: client/src/job-results/job-results.service.js:119 +#: client/src/jobs/factories/delete-job.factory.js:115 #: client/src/notifications/notification-templates-list/list.controller.js:195 #: client/src/organizations/list/organizations-list.controller.js:174 #: client/src/partials/survey-maker-modal.html:18 -#: client/src/projects/edit/projects-edit.controller.js:240 +#: client/src/projects/edit/projects-edit.controller.js:246 +#: client/src/templates/list/templates-list.controller.js:154 #: client/src/users/list/users-list.controller.js:92 -#: client/src/credentials/list/credentials-list.controller.js:108 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:74 msgid "DELETE" msgstr "削除" -#: client/src/partials/survey-maker-modal.html:83 +#: client/src/partials/survey-maker-modal.html:84 msgid "DELETE SURVEY" msgstr "Survey の削除" @@ -1128,10 +1059,10 @@ msgstr "Survey の削除" msgid "DETAILS" msgstr "詳細" -#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:27 +#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:29 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html:30 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:30 -#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:30 +#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:31 msgid "DISASSOCIATE" msgstr "関連付けの解除" @@ -1141,26 +1072,24 @@ msgstr "動的ホスト" #: client/src/credential-types/credential-types.list.js:73 #: client/src/credentials/credentials.list.js:85 -#: client/src/credentials/list/credentials-list.controller.js:113 -#: client/src/inventories-hosts/inventories/inventory.list.js:112 +#: client/src/credentials/list/credentials-list.controller.js:132 +#: client/src/inventories-hosts/inventories/inventory.list.js:111 #: client/src/inventory-scripts/inventory-scripts.list.js:71 #: client/src/job-results/job-results.partial.html:54 #: client/src/jobs/factories/delete-job.factory.js:37 #: client/src/notifications/notification-templates-list/list.controller.js:192 #: client/src/notifications/notificationTemplates.list.js:91 #: client/src/organizations/list/organizations-list.controller.js:171 -#: client/src/projects/edit/projects-edit.controller.js:237 +#: client/src/projects/edit/projects-edit.controller.js:243 #: client/src/projects/list/projects-list.controller.js:207 #: client/src/scheduler/schedules.list.js:90 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:13 #: client/src/teams/teams.list.js:72 +#: client/src/templates/list/templates-list.controller.js:102 #: client/src/templates/templates.list.js:120 #: client/src/users/list/users-list.controller.js:89 #: client/src/users/users.list.js:79 #: client/src/workflow-results/workflow-results.partial.html:54 -#: client/src/credential-types/credential-types.list.js:70 -#: client/src/credentials/list/credentials-list.controller.js:105 -#: client/src/projects/list/projects-list.controller.js:206 msgid "Delete" msgstr "削除" @@ -1169,7 +1098,11 @@ msgstr "削除" msgid "Delete Group" msgstr "グループの削除" -#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:142 +#: client/src/job-results/job-results.service.js:93 +msgid "Delete Job" +msgstr "ジョブの削除" + +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:175 msgid "Delete Source" msgstr "ソースの削除" @@ -1178,7 +1111,6 @@ msgid "Delete credential" msgstr "認証情報の削除" #: client/src/credential-types/credential-types.list.js:75 -#: client/src/credential-types/credential-types.list.js:72 msgid "Delete credential type" msgstr "認証情報タイプの削除" @@ -1189,12 +1121,10 @@ msgid_plural "Delete groups" msgstr[0] "グループの削除" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:48 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:48 msgid "Delete groups" msgstr "グループの削除" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:37 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:37 msgid "Delete groups and hosts" msgstr "グループおよびホストの削除" @@ -1205,11 +1135,10 @@ msgid_plural "Delete hosts" msgstr[0] "ホストの削除" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:59 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:59 msgid "Delete hosts" msgstr "ホストの削除" -#: client/src/inventories-hosts/inventories/inventory.list.js:114 +#: client/src/inventories-hosts/inventories/inventory.list.js:113 msgid "Delete inventory" msgstr "インベントリーの削除" @@ -1222,9 +1151,8 @@ msgid "Delete notification" msgstr "通知の削除" #: client/src/projects/projects.form.js:166 -#: client/src/projects/projects.form.js:165 msgid "Delete on Update" -msgstr "更新時のデプロイ" +msgstr "更新時の削除" #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:27 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:27 @@ -1254,7 +1182,6 @@ msgid "Delete the job" msgstr "ジョブの削除" #: client/src/projects/projects.form.js:168 -#: client/src/projects/projects.form.js:167 msgid "" "Delete the local repository in its entirety prior to performing an update." msgstr "更新の実行前にローカルリポジトリーを完全に削除します。" @@ -1280,7 +1207,6 @@ msgid "Deleting group" msgstr "グループを削除しています" #: client/src/projects/projects.form.js:168 -#: client/src/projects/projects.form.js:167 msgid "" "Depending on the size of the repository this may significantly increase the " "amount of time required to complete an update." @@ -1308,61 +1234,50 @@ msgstr "インスタンスの概要ドキュメント" #: client/src/templates/job_templates/job-template.form.js:41 #: client/src/templates/survey-maker/shared/question-definition.form.js:36 #: client/src/templates/workflows.form.js:39 -#: client/src/users/users.form.js:141 client/src/users/users.form.js:167 -#: client/src/inventories-hosts/hosts/host.form.js:62 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:61 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:55 -#: client/src/users/users.form.js:142 client/src/users/users.form.js:168 +#: client/src/users/users.form.js:145 client/src/users/users.form.js:171 msgid "Description" msgstr "説明" -#: client/src/notifications/notificationTemplates.form.js:139 -#: client/src/notifications/notificationTemplates.form.js:143 -#: client/src/notifications/notificationTemplates.form.js:155 -#: client/src/notifications/notificationTemplates.form.js:159 +#: client/src/notifications/notificationTemplates.form.js:136 #: client/src/notifications/notificationTemplates.form.js:140 -#: client/src/notifications/notificationTemplates.form.js:145 -#: client/src/notifications/notificationTemplates.form.js:157 -#: client/src/notifications/notificationTemplates.form.js:162 -#: client/src/notifications/notificationTemplates.form.js:378 +#: client/src/notifications/notificationTemplates.form.js:152 +#: client/src/notifications/notificationTemplates.form.js:156 msgid "Destination Channels" msgstr "送信先チャネル" -#: client/src/notifications/notificationTemplates.form.js:362 -#: client/src/notifications/notificationTemplates.form.js:366 -#: client/src/notifications/notificationTemplates.form.js:373 +#: client/src/notifications/notificationTemplates.form.js:359 +#: client/src/notifications/notificationTemplates.form.js:363 msgid "Destination Channels or Users" msgstr "送信先チャネルまたはユーザー" -#: client/src/notifications/notificationTemplates.form.js:208 -#: client/src/notifications/notificationTemplates.form.js:209 -#: client/src/notifications/notificationTemplates.form.js:212 -#: client/src/notifications/notificationTemplates.form.js:213 +#: client/src/notifications/notificationTemplates.form.js:205 +#: client/src/notifications/notificationTemplates.form.js:206 msgid "Destination SMS Number" msgstr "送信先 SMS 番号" #: client/features/credentials/credentials.strings.js:13 #: client/src/license/license.partial.html:5 -#: client/src/shared/form-generator.js:1474 -#: client/src/shared/form-generator.js:1525 +#: client/src/shared/form-generator.js:1481 msgid "Details" msgstr "詳細" -#: client/src/job-submission/job-submission.partial.html:257 -#: client/src/job-submission/job-submission.partial.html:255 +#: client/src/job-submission/job-submission.partial.html:263 msgid "Diff Mode" msgstr "差分モード" #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html:6 -#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:6 -msgid "Disassociate Group" -msgstr "グループの関連付けの解除" +msgid "Disassociate Group From Group" +msgstr "グループの他のグループとの関連付けを解除" #: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:6 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:6 msgid "Disassociate Host" msgstr "ホストの関連付けの解除" +#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:6 +#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:6 +msgid "Disassociate Host From Group" +msgstr "ホストのグループとの関連付けを解除" + #: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js:65 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js:110 #: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js:98 @@ -1374,9 +1289,9 @@ msgid "Disassociate host" msgstr "ホストの関連付けの解除" #: client/src/configuration/auth-form/configuration-auth.controller.js:75 -#: client/src/configuration/configuration.controller.js:198 -#: client/src/configuration/configuration.controller.js:260 -#: client/src/configuration/system-form/configuration-system.controller.js:55 +#: client/src/configuration/configuration.controller.js:202 +#: client/src/configuration/configuration.controller.js:264 +#: client/src/configuration/system-form/configuration-system.controller.js:57 msgid "Discard changes" msgstr "変更の破棄" @@ -1384,15 +1299,13 @@ msgstr "変更の破棄" msgid "Dissasociate permission from team" msgstr "チームからパーミッションの関連付けを解除" -#: client/src/users/users.form.js:221 client/src/users/users.form.js:222 +#: client/src/users/users.form.js:225 msgid "Dissasociate permission from user" msgstr "ユーザーからパーミッションの関連付けを解除" #: client/src/credentials/credentials.form.js:384 -#: client/src/credentials/factories/become-method-change.factory.js:60 -#: client/src/credentials/factories/kind-change.factory.js:117 -#: client/src/credentials/factories/become-method-change.factory.js:62 -#: client/src/credentials/factories/kind-change.factory.js:119 +#: client/src/credentials/factories/become-method-change.factory.js:54 +#: client/src/credentials/factories/kind-change.factory.js:111 msgid "Domain Name" msgstr "ドメイン名" @@ -1400,11 +1313,10 @@ msgstr "ドメイン名" #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:134 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:141 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:102 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:128 msgid "Download Output" msgstr "出力のダウンロード" -#: client/src/inventory-scripts/inventory-scripts.form.js:62 +#: client/src/inventory-scripts/inventory-scripts.form.js:59 msgid "" "Drag and drop your custom inventory script file here or create one in the " "field to import your custom inventory. Refer to the Ansible Tower " @@ -1413,7 +1325,7 @@ msgstr "" "カスタムインベントリーのスクリプトファイルをここにドラッグアンドドロップするか、またはこのフィールドにカスタムインベントリーをインポートするためのファイルを作成します。構文のサンプルについては、Ansible" " Tower ドキュメントを参照してください。" -#: client/src/partials/survey-maker-modal.html:76 +#: client/src/partials/survey-maker-modal.html:77 msgid "Drop question here to reorder" msgstr "並び替える質問をドロップ" @@ -1436,7 +1348,6 @@ msgstr "Survey プロンプトの編集" #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:46 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:79 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:59 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:66 msgid "ELAPSED" msgstr "経過時間" @@ -1463,7 +1374,6 @@ msgid "" msgstr "このインベントリーでジョブを実行する際は常に、選択されたソースのインベントリーを更新してからジョブのタスクを実行します。" #: client/src/projects/projects.form.js:179 -#: client/src/projects/projects.form.js:178 msgid "" "Each time a job runs using this project, perform an update to the local " "repository prior to starting the job." @@ -1478,21 +1388,16 @@ msgstr "このプロジェクトでジョブを実行する際は常に、ジョ #: client/src/scheduler/schedules.list.js:75 client/src/teams/teams.list.js:55 #: client/src/templates/templates.list.js:103 #: client/src/users/users.list.js:60 -#: client/src/credential-types/credential-types.list.js:53 msgid "Edit" msgstr "編集" -#: client/src/shared/form-generator.js:1707 -#: client/src/templates/job_templates/job-template.form.js:457 +#: client/src/shared/form-generator.js:1715 +#: client/src/templates/job_templates/job-template.form.js:452 #: client/src/templates/workflows.form.js:177 -#: client/src/shared/form-generator.js:1758 -#: client/src/templates/job_templates/job-template.form.js:474 -#: client/src/templates/workflows.form.js:182 msgid "Edit Survey" msgstr "Survey の編集" #: client/src/credential-types/credential-types.list.js:58 -#: client/src/credential-types/credential-types.list.js:55 msgid "Edit credenital type" msgstr "認証情報タイプの編集" @@ -1540,32 +1445,32 @@ msgstr "チームの編集" msgid "Edit template" msgstr "テンプレートの編集" -#: client/src/job-results/job-results.partial.html:188 +#: client/src/job-results/job-results.partial.html:191 msgid "Edit the Schedule" msgstr "スケジュールの編集" -#: client/src/job-results/job-results.partial.html:172 +#: client/src/job-results/job-results.partial.html:175 #: client/src/workflow-results/workflow-results.partial.html:124 msgid "Edit the User" msgstr "ユーザーの編集" -#: client/src/job-results/job-results.partial.html:262 -#: client/src/job-results/job-results.partial.html:277 -#: client/src/job-results/job-results.partial.html:293 -#: client/src/job-results/job-results.partial.html:308 -#: client/src/job-results/job-results.partial.html:323 +#: client/src/job-results/job-results.partial.html:265 +#: client/src/job-results/job-results.partial.html:280 +#: client/src/job-results/job-results.partial.html:296 +#: client/src/job-results/job-results.partial.html:311 +#: client/src/job-results/job-results.partial.html:326 msgid "Edit the credential" msgstr "認証情報の編集" -#: client/src/job-results/job-results.partial.html:203 +#: client/src/job-results/job-results.partial.html:206 msgid "Edit the inventory" msgstr "インベントリーの編集" -#: client/src/job-results/job-results.partial.html:137 +#: client/src/job-results/job-results.partial.html:140 msgid "Edit the job template" msgstr "ジョブテンプレートの編集" -#: client/src/job-results/job-results.partial.html:226 +#: client/src/job-results/job-results.partial.html:229 #: client/src/projects/projects.list.js:105 msgid "Edit the project" msgstr "プロジェクトの編集" @@ -1579,18 +1484,16 @@ msgid "Edit user" msgstr "ユーザーの編集" #: client/src/setup-menu/setup-menu.partial.html:61 -#: client/src/setup-menu/setup-menu.partial.html:67 msgid "Edit {{BRAND_NAME}}'s configuration." msgstr "{{BRAND_NAME}} の設定を編集します。" -#: client/src/projects/list/projects-list.controller.js:242 #: client/src/projects/list/projects-list.controller.js:241 msgid "" "Either you do not have access or the SCM update process completed. Click the" " %sRefresh%s button to view the latest status." msgstr "アクセスがないか、または SCM 更新プロセスが完了しました。%s更新%s ボタンをクリックして最新のステータスを表示します。" -#: client/src/job-results/job-results.partial.html:517 +#: client/src/job-results/job-results.partial.html:520 msgid "Elapsed" msgstr "経過時間" @@ -1599,18 +1502,18 @@ msgstr "経過時間" msgid "Email" msgstr "メール" +#: client/src/templates/job_templates/job-template.form.js:288 #: client/src/templates/job_templates/job-template.form.js:293 -#: client/src/templates/job_templates/job-template.form.js:298 msgid "Enable Concurrent Jobs" msgstr "同時実行ジョブの有効化" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:123 +#: client/src/templates/job_templates/job-template.form.js:264 #: client/src/templates/job_templates/job-template.form.js:269 -#: client/src/templates/job_templates/job-template.form.js:274 msgid "Enable Privilege Escalation" msgstr "権限昇格の有効化" -#: client/src/templates/job_templates/job-template.form.js:284 +#: client/src/templates/job_templates/job-template.form.js:279 msgid "" "Enables creation of a provisioning callback URL. Using the URL a host can " "contact {{BRAND_NAME}} and request a configuration update using this job " @@ -1623,24 +1526,21 @@ msgstr "" msgid "Encrypted credentials are not supported." msgstr "暗号化された認証情報はサポートされていません。" -#: client/src/license/license.partial.html:108 +#: client/src/license/license.partial.html:113 msgid "End User License Agreement" msgstr "使用許諾契約書" #: client/src/inventories-hosts/hosts/host.form.js:73 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:72 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:72 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:89 -#: client/src/inventories-hosts/hosts/host.form.js:72 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:71 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:98 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:86 msgid "" "Enter inventory variables using either JSON or YAML syntax. Use the radio " "button to toggle between the two." msgstr "" "JSON または YAML 構文のいずれかを使用してインベントリー変数を入力します。ラジオボタンを使用して 2 つの間の切り替えを行います。" -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:98 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:93 msgid "" "Enter inventory variables using either JSON or YAML syntax. Use the radio " "button to toggle between the two. Refer to the Ansible Tower documentation " @@ -1650,12 +1550,12 @@ msgstr "" "構文のいずれかを使用してインベントリー変数を入力します。ラジオボタンを使用してこれらの間で切り替えを行います。構文のサンプルについては Ansible " "Tower ドキュメントを参照してください。" -#: client/src/notifications/notificationTemplates.form.js:158 +#: client/src/notifications/notificationTemplates.form.js:155 msgid "" "Enter one HipChat channel per line. The pound symbol (#) is not required." msgstr "各行に 1 つの HipChat チャンネルを入力します。シャープ記号 (#) は不要です。" -#: client/src/notifications/notificationTemplates.form.js:365 +#: client/src/notifications/notificationTemplates.form.js:362 msgid "" "Enter one IRC channel or username per line. The pound symbol (#) for " "channels, and the at (@) symbol for users, are not required." @@ -1663,49 +1563,43 @@ msgstr "" "各行に 1 つの IRC チャンネルまたはユーザー名を入力します。チャンネルのシャープ記号 (#) およびユーザーのアットマーク (@) " "記号は不要です。" -#: client/src/notifications/notificationTemplates.form.js:142 +#: client/src/notifications/notificationTemplates.form.js:139 msgid "" "Enter one Slack channel per line. The pound symbol (#) is not required." msgstr "各行に 1 つの Slack チャンネルを入力します。シャープ記号 (#) は不要です。" -#: client/src/notifications/notificationTemplates.form.js:100 +#: client/src/notifications/notificationTemplates.form.js:97 msgid "" "Enter one email address per line to create a recipient list for this type of" " notification." msgstr "各行に 1 つのメールアドレスを入力し、この通知タイプの受信者リストを作成します。" -#: client/src/notifications/notificationTemplates.form.js:212 +#: client/src/notifications/notificationTemplates.form.js:209 msgid "" "Enter one phone number per line to specify where to route SMS messages." msgstr "各行に 1 つの電話番号を入力し、SMS メッセージのルート先を指定します。" -#: client/src/credentials/factories/become-method-change.factory.js:87 -#: client/src/credentials/factories/kind-change.factory.js:144 -#: client/src/credentials/factories/become-method-change.factory.js:89 -#: client/src/credentials/factories/kind-change.factory.js:146 +#: client/src/credentials/factories/become-method-change.factory.js:81 +#: client/src/credentials/factories/kind-change.factory.js:138 msgid "" "Enter the URL for the virtual machine which %scorresponds to your CloudForm " "instance. %sFor example, %s" msgstr "CloudForms インスタンスに対応する %s仮想マシンの URL を入力します (%s例: %s)。" -#: client/src/credentials/factories/become-method-change.factory.js:77 -#: client/src/credentials/factories/kind-change.factory.js:134 -#: client/src/credentials/factories/become-method-change.factory.js:79 -#: client/src/credentials/factories/kind-change.factory.js:136 +#: client/src/credentials/factories/become-method-change.factory.js:71 +#: client/src/credentials/factories/kind-change.factory.js:128 msgid "" "Enter the URL which corresponds to your %sRed Hat Satellite 6 server. %sFor " "example, %s" msgstr "Red Hat Satellite 6 Server に対応する %sURL を入力します (%s例: %s)。" -#: client/src/credentials/factories/become-method-change.factory.js:55 -#: client/src/credentials/factories/kind-change.factory.js:112 -#: client/src/credentials/factories/become-method-change.factory.js:57 -#: client/src/credentials/factories/kind-change.factory.js:114 +#: client/src/credentials/factories/become-method-change.factory.js:49 +#: client/src/credentials/factories/kind-change.factory.js:106 msgid "" "Enter the hostname or IP address which corresponds to your VMware vCenter." msgstr "VMware vCenter に対応するホスト名または IP アドレスを入力します。" -#: client/src/notifications/notificationTemplates.form.js:198 +#: client/src/notifications/notificationTemplates.form.js:195 msgid "" "Enter the number associated with the \"Messaging Service\" in Twilio in the " "format +18005550199." @@ -1721,56 +1615,42 @@ msgstr "JSON または YAML 構文のいずれかを使用して変数を入力 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:187 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:194 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:174 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:181 msgid "Environment Variables" msgstr "環境変数" -#: client/src/configuration/configuration.controller.js:344 -#: client/src/configuration/configuration.controller.js:443 -#: client/src/configuration/configuration.controller.js:477 -#: client/src/configuration/configuration.controller.js:524 -#: client/src/configuration/system-form/configuration-system.controller.js:226 +#: client/src/configuration/configuration.controller.js:348 +#: client/src/configuration/configuration.controller.js:449 +#: client/src/configuration/configuration.controller.js:483 +#: client/src/configuration/configuration.controller.js:530 +#: client/src/configuration/system-form/configuration-system.controller.js:231 #: client/src/credentials/factories/credential-form-save.factory.js:77 #: client/src/credentials/factories/credential-form-save.factory.js:93 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:191 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:210 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:129 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:139 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:166 +#: client/src/job-submission/job-submission-factories/launchjob.factory.js:194 +#: client/src/job-submission/job-submission-factories/launchjob.factory.js:213 #: client/src/management-jobs/card/card.controller.js:140 #: client/src/management-jobs/card/card.controller.js:230 #: client/src/management-jobs/card/card.controller.js:28 #: client/src/projects/add/projects-add.controller.js:108 -#: client/src/projects/edit/projects-edit.controller.js:150 -#: client/src/projects/edit/projects-edit.controller.js:216 -#: client/src/projects/edit/projects-edit.controller.js:232 +#: client/src/projects/edit/projects-edit.controller.js:156 +#: client/src/projects/edit/projects-edit.controller.js:222 +#: client/src/projects/edit/projects-edit.controller.js:238 #: client/src/projects/list/projects-list.controller.js:169 #: client/src/projects/list/projects-list.controller.js:198 -#: client/src/projects/list/projects-list.controller.js:226 -#: client/src/projects/list/projects-list.controller.js:247 -#: client/src/projects/list/projects-list.controller.js:263 -#: client/src/projects/list/projects-list.controller.js:272 -#: client/src/users/add/users-add.controller.js:98 +#: client/src/projects/list/projects-list.controller.js:225 +#: client/src/projects/list/projects-list.controller.js:246 +#: client/src/projects/list/projects-list.controller.js:262 +#: client/src/projects/list/projects-list.controller.js:271 +#: client/src/users/add/users-add.controller.js:99 #: client/src/users/edit/users-edit.controller.js:180 #: client/src/users/edit/users-edit.controller.js:80 #: client/src/users/list/users-list.controller.js:82 -#: client/src/configuration/configuration.controller.js:341 -#: client/src/configuration/configuration.controller.js:440 -#: client/src/configuration/configuration.controller.js:474 -#: client/src/configuration/configuration.controller.js:518 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:188 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:207 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:119 -#: client/src/projects/list/projects-list.controller.js:168 -#: client/src/projects/list/projects-list.controller.js:197 -#: client/src/projects/list/projects-list.controller.js:225 -#: client/src/projects/list/projects-list.controller.js:246 -#: client/src/projects/list/projects-list.controller.js:261 -#: client/src/projects/list/projects-list.controller.js:270 -#: client/src/users/edit/users-edit.controller.js:163 msgid "Error!" msgstr "エラー!" #: client/src/activity-stream/streams.list.js:40 -#: client/src/activity-stream/streams.list.js:41 msgid "Event" msgstr "イベント" @@ -1783,21 +1663,21 @@ msgid "Event summary not available" msgstr "イベントの概要はありません" #: client/src/projects/add/projects-add.controller.js:129 -#: client/src/projects/edit/projects-edit.controller.js:259 +#: client/src/projects/edit/projects-edit.controller.js:265 msgid "Example URLs for GIT SCM include:" msgstr "GIT SCM のサンプル URL には以下が含まれます:" #: client/src/projects/add/projects-add.controller.js:150 -#: client/src/projects/edit/projects-edit.controller.js:279 +#: client/src/projects/edit/projects-edit.controller.js:285 msgid "Example URLs for Mercurial SCM include:" msgstr "Mercurial SCM のサンプル URL には以下が含まれます:" #: client/src/projects/add/projects-add.controller.js:141 -#: client/src/projects/edit/projects-edit.controller.js:270 +#: client/src/projects/edit/projects-edit.controller.js:276 msgid "Example URLs for Subversion SCM include:" msgstr "Subversion SCM のサンプル URL には以下が含まれます:" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:68 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65 msgid "Example: ansible_facts.ansible_distribution:\"RedHat\"" msgstr "例: ansible_facts.ansible_distribution:\"RedHat\"" @@ -1815,9 +1695,6 @@ msgstr "既存ホスト" #: client/src/standard-out/standard-out.controller.js:245 #: client/src/workflow-results/workflow-results.controller.js:120 #: client/src/workflow-results/workflow-results.controller.js:76 -#: client/src/job-results/job-results.controller.js:221 -#: client/src/standard-out/standard-out.controller.js:23 -#: client/src/standard-out/standard-out.controller.js:247 msgid "Expand Output" msgstr "出力の展開" @@ -1829,24 +1706,20 @@ msgstr "有効期限" msgid "Explanation" msgstr "説明" -#: client/src/job-results/job-results.partial.html:272 +#: client/src/job-results/job-results.partial.html:275 msgid "Extra Credentials" msgstr "追加の認証情報" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:132 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:144 -#: client/src/job-results/job-results.partial.html:406 -#: client/src/job-submission/job-submission.partial.html:161 +#: client/src/job-results/job-results.partial.html:409 +#: client/src/job-submission/job-submission.partial.html:165 #: client/src/partials/logviewer.html:8 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:105 -#: client/src/templates/job_templates/job-template.form.js:347 -#: client/src/templates/job_templates/job-template.form.js:354 +#: client/src/templates/job_templates/job-template.form.js:342 +#: client/src/templates/job_templates/job-template.form.js:349 #: client/src/templates/workflows.form.js:74 #: client/src/templates/workflows.form.js:81 -#: client/src/job-submission/job-submission.partial.html:159 -#: client/src/templates/job_templates/job-template.form.js:359 -#: client/src/templates/job_templates/job-template.form.js:371 -#: client/src/templates/workflows.form.js:86 msgid "Extra Variables" msgstr "追加変数" @@ -1855,7 +1728,7 @@ msgstr "追加変数" msgid "FACTS" msgstr "ファクト" -#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:63 +#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:64 msgid "FAILED" msgstr "失敗" @@ -1866,16 +1739,12 @@ msgstr "フィールド:" #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:39 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:72 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:52 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:59 msgid "FINISHED" msgstr "完了" #: client/src/inventories-hosts/hosts/host.form.js:107 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:106 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:106 -#: client/src/inventories-hosts/hosts/host.form.js:111 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:111 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:105 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:107 msgid "Facts" msgstr "ファクト" @@ -1887,7 +1756,7 @@ msgstr "失敗" msgid "Failed Hosts" msgstr "失敗したホスト" -#: client/src/users/add/users-add.controller.js:98 +#: client/src/users/add/users-add.controller.js:99 msgid "Failed to add new user. POST returned status:" msgstr "新規ユーザーを追加できませんでした。POST で返されたステータス:" @@ -1899,28 +1768,24 @@ msgstr "新規の認証情報を作成できませんでした。POST ステー msgid "Failed to create new project. POST returned status:" msgstr "新規プロジェクトを作成できませんでした。POST で返されたステータス:" -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:211 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:208 +#: client/src/job-submission/job-submission-factories/launchjob.factory.js:214 msgid "Failed to retrieve job template extra variables." msgstr "ジョブテンプレートの追加変数を取得できませんでした。" -#: client/src/projects/edit/projects-edit.controller.js:151 +#: client/src/projects/edit/projects-edit.controller.js:157 msgid "Failed to retrieve project: %s. GET status:" msgstr "プロジェクトを取得できませんでした: %s. GET ステータス:" #: client/src/users/edit/users-edit.controller.js:181 #: client/src/users/edit/users-edit.controller.js:81 -#: client/src/users/edit/users-edit.controller.js:164 msgid "Failed to retrieve user: %s. GET status:" msgstr "ユーザーを取得できませんでした: %s. GET ステータス:" -#: client/src/configuration/configuration.controller.js:444 -#: client/src/configuration/configuration.controller.js:441 +#: client/src/configuration/configuration.controller.js:450 msgid "Failed to save settings. Returned status:" msgstr "設定を保存できませんでした。返されたステータス:" -#: client/src/configuration/configuration.controller.js:478 -#: client/src/configuration/configuration.controller.js:475 +#: client/src/configuration/configuration.controller.js:484 msgid "Failed to save toggle settings. Returned status:" msgstr "トグルの設定を保存できませんでした。返されたステータス:" @@ -1928,14 +1793,13 @@ msgstr "トグルの設定を保存できませんでした。返されたステ msgid "Failed to update Credential. PUT status:" msgstr "認証情報を更新できませんでした。PUT ステータス:" -#: client/src/projects/edit/projects-edit.controller.js:216 +#: client/src/projects/edit/projects-edit.controller.js:222 msgid "Failed to update project: %s. PUT status:" msgstr "プロジェクトを更新できませんでした: %s. PUT ステータス:" -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:192 +#: client/src/job-submission/job-submission-factories/launchjob.factory.js:195 #: client/src/management-jobs/card/card.controller.js:141 #: client/src/management-jobs/card/card.controller.js:231 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:189 msgid "Failed updating job %s with variables. POST returned: %d" msgstr "変数でジョブ %s を更新できませんでした。POST で返されたステータス: %d" @@ -1956,11 +1820,10 @@ msgstr "最終実行日時" #: client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js:54 #: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:58 #: client/src/inventories-hosts/shared/factories/set-status.factory.js:44 -#: client/src/job-results/job-results.partial.html:108 +#: client/src/job-results/job-results.partial.html:111 #: client/src/jobs/all-jobs.list.js:66 #: client/src/portal-mode/portal-jobs.list.js:40 #: client/src/templates/completed-jobs.list.js:59 -#: client/src/portal-mode/portal-jobs.list.js:39 msgid "Finished" msgstr "終了日時" @@ -1979,10 +1842,8 @@ msgid "" "Ansible Tower" msgstr "詳細検索の検索構文についての詳細は、Ansible Tower ドキュメントを参照してください。" -#: client/src/credentials/factories/become-method-change.factory.js:69 -#: client/src/credentials/factories/kind-change.factory.js:126 -#: client/src/credentials/factories/become-method-change.factory.js:71 -#: client/src/credentials/factories/kind-change.factory.js:128 +#: client/src/credentials/factories/become-method-change.factory.js:63 +#: client/src/credentials/factories/kind-change.factory.js:120 msgid "For example, %s" msgstr "例: %s" @@ -1992,8 +1853,6 @@ msgstr "例: %s" #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js:32 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:35 #: client/src/inventories-hosts/inventories/related/hosts/related-host.list.js:31 -#: client/src/inventories-hosts/hosts/host.form.js:35 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:34 msgid "" "For hosts that are part of an external inventory, this flag cannot be " "changed. It will be set by the inventory sync process." @@ -2009,7 +1868,6 @@ msgstr "" "構文、テスト環境セットアップおよびレポートの問題のみを検査するチェックを選択します。" #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:118 -#: client/src/templates/job_templates/job-template.form.js:176 msgid "" "For more information and examples see %sthe Patterns topic at " "docs.ansible.com%s." @@ -2017,12 +1875,10 @@ msgstr "詳細情報およびサンプルについては、docs.ansible.com の #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:109 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:96 -#: client/src/job-results/job-results.partial.html:333 +#: client/src/job-results/job-results.partial.html:336 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:87 -#: client/src/templates/job_templates/job-template.form.js:149 -#: client/src/templates/job_templates/job-template.form.js:159 -#: client/src/templates/job_templates/job-template.form.js:152 -#: client/src/templates/job_templates/job-template.form.js:165 +#: client/src/templates/job_templates/job-template.form.js:144 +#: client/src/templates/job_templates/job-template.form.js:154 msgid "Forks" msgstr "フォーク" @@ -2051,8 +1907,7 @@ msgstr "GitHub チーム" msgid "Google OAuth2" msgstr "Google OAuth2" -#: client/src/teams/teams.form.js:155 client/src/users/users.form.js:210 -#: client/src/users/users.form.js:211 +#: client/src/teams/teams.form.js:155 client/src/users/users.form.js:214 msgid "Grant Permission" msgstr "パーミッションの付与" @@ -2084,13 +1939,9 @@ msgstr "会社内の複数の部署のパーミッションを管理するため #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.form.js:88 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js:32 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:114 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:114 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:115 #: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js:32 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:172 -#: client/src/inventories-hosts/hosts/host.form.js:119 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:119 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:113 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:178 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:167 msgid "Groups" msgstr "グループ" @@ -2108,14 +1959,11 @@ msgstr "ヒント: 以下のフィールドに SSH 秘密鍵ファイルをド #: client/src/inventories-hosts/inventories/inventories.partial.html:14 #: client/src/inventories-hosts/inventories/related/hosts/related-host.route.js:18 #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-hosts.route.js:17 -#: client/src/activity-stream/get-target-title.factory.js:38 msgid "HOSTS" msgstr "ホスト" -#: client/src/notifications/notificationTemplates.form.js:323 -#: client/src/notifications/notificationTemplates.form.js:324 -#: client/src/notifications/notificationTemplates.form.js:328 -#: client/src/notifications/notificationTemplates.form.js:329 +#: client/src/notifications/notificationTemplates.form.js:320 +#: client/src/notifications/notificationTemplates.form.js:321 msgid "HTTP Headers" msgstr "HTTP ヘッダー" @@ -2128,27 +1976,23 @@ msgid "High" msgstr "高" #: client/src/credentials/credentials.form.js:139 -#: client/src/notifications/notificationTemplates.form.js:86 +#: client/src/notifications/notificationTemplates.form.js:83 msgid "Host" msgstr "ホスト" -#: client/src/credentials/factories/become-method-change.factory.js:58 -#: client/src/credentials/factories/kind-change.factory.js:115 -#: client/src/credentials/factories/become-method-change.factory.js:60 -#: client/src/credentials/factories/kind-change.factory.js:117 +#: client/src/credentials/factories/become-method-change.factory.js:52 +#: client/src/credentials/factories/kind-change.factory.js:109 msgid "Host (Authentication URL)" msgstr "ホスト (認証 URL)" -#: client/src/templates/job_templates/job-template.form.js:329 -#: client/src/templates/job_templates/job-template.form.js:338 +#: client/src/templates/job_templates/job-template.form.js:324 +#: client/src/templates/job_templates/job-template.form.js:333 msgid "Host Config Key" msgstr "ホスト設定キー" #: client/src/inventories-hosts/hosts/host.form.js:40 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:39 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:39 -#: client/src/inventories-hosts/hosts/host.form.js:39 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:38 msgid "Host Enabled" msgstr "有効なホスト" @@ -2158,18 +2002,12 @@ msgstr "有効なホスト" #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:56 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:45 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:56 -#: client/src/inventories-hosts/hosts/host.form.js:45 -#: client/src/inventories-hosts/hosts/host.form.js:56 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:44 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:55 msgid "Host Name" msgstr "ホスト名" #: client/src/inventories-hosts/hosts/host.form.js:80 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:79 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:79 -#: client/src/inventories-hosts/hosts/host.form.js:79 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:78 msgid "Host Variables" msgstr "ホスト変数" @@ -2194,11 +2032,9 @@ msgstr "ホストを利用できません。クリックして切り替えます #: client/src/inventories-hosts/inventories/related/groups/groups.form.js:98 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js:57 #: client/src/inventories-hosts/inventories/related/hosts/related-host.list.js:56 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:170 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:181 -#: client/src/job-results/job-results.partial.html:501 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:168 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:187 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:167 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:176 +#: client/src/job-results/job-results.partial.html:504 msgid "Hosts" msgstr "ホスト" @@ -2219,7 +2055,7 @@ msgstr "使用されたホスト" msgid "Hosts are imported to" msgstr "ホストのインポート先" -#: client/src/license/license.partial.html:116 +#: client/src/license/license.partial.html:121 msgid "I agree to the End User License Agreement" msgstr "使用許諾契約書に同意します。" @@ -2248,7 +2084,7 @@ msgstr "INSIGHTS" msgid "INSTANCE GROUPS" msgstr "インスタンスグループ" -#: client/src/instance-groups/instance-group.partial.html:28 +#: client/src/instance-groups/instance-group.partial.html:27 msgid "INSTANCES" msgstr "インスタンス" @@ -2262,14 +2098,11 @@ msgstr "インスタンス" #: client/src/main-menu/main-menu.partial.html:27 #: client/src/organizations/linkout/organizations-linkout.route.js:143 #: client/src/organizations/list/organizations-list.controller.js:66 -#: client/src/activity-stream/get-target-title.factory.js:11 -#: client/src/organizations/linkout/organizations-linkout.route.js:141 msgid "INVENTORIES" msgstr "インベントリー" -#: client/src/job-submission/job-submission.partial.html:339 +#: client/src/job-submission/job-submission.partial.html:346 #: client/src/partials/job-template-details.html:2 -#: client/src/job-submission/job-submission.partial.html:336 msgid "INVENTORY" msgstr "インベントリー" @@ -2280,7 +2113,6 @@ msgstr "インベントリースクリプト" #: client/src/activity-stream/get-target-title.factory.js:35 #: client/src/inventory-scripts/inventory-scripts.list.js:12 #: client/src/inventory-scripts/main.js:66 -#: client/src/activity-stream/get-target-title.factory.js:32 msgid "INVENTORY SCRIPTS" msgstr "インベントリースクリプト" @@ -2288,13 +2120,11 @@ msgstr "インベントリースクリプト" msgid "INVENTORY SOURCES" msgstr "インベントリーソース" -#: client/src/notifications/notificationTemplates.form.js:351 -#: client/src/notifications/notificationTemplates.form.js:362 +#: client/src/notifications/notificationTemplates.form.js:348 msgid "IRC Nick" msgstr "IRC ニック" -#: client/src/notifications/notificationTemplates.form.js:340 -#: client/src/notifications/notificationTemplates.form.js:351 +#: client/src/notifications/notificationTemplates.form.js:337 msgid "IRC Server Address" msgstr "IRC サーバーアドレス" @@ -2323,37 +2153,49 @@ msgstr "アイドル状態のセッション" msgid "If blank, all groups above are created except" msgstr "空白の場合には、以下を除く上記のすべてのグループが作成されます。" -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:331 -msgid "" -"If checked, all child groups and hosts not found on the external source will" -" be deleted from the local inventory." -msgstr "チェックが付けられている場合、外部ソースに見つからないすべての子グループおよびホストがローカルインベントリーから削除されます。" - #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:343 msgid "" "If checked, all variables for child groups and hosts will be removed and " "replaced by those found on the external source." msgstr "チェックが付けられている場合、子グループおよびホストのすべての変数が削除され、外部ソースにあるものによって置き換えられます。" -#: client/src/templates/job_templates/job-template.form.js:272 +#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:331 +msgid "" +"If checked, any hosts and groups that were previously present on the " +"external source but are now removed will be removed from the Tower " +"inventory. Hosts and groups that were not managed by the inventory source " +"will be promoted to the next manually created group or if there is no " +"manually created group to promote them into, they will be left in the " +"\"all\" default group for the inventory." +msgstr "" +"チェックが付けられている場合、以前は外部ソースにあり、現在は削除されているホストおよびグループが Tower " +"インベントリーから削除されます。インベントリーソースで管理されていなかったホストおよびグループは次に手動で作成されるグループにプロモートされるか、またはプロモート先となる手動で作成されたグループがない場合は、それらはインベントリーの「すべて」のデフォルトグループに残ります。" + +#: client/src/templates/job_templates/job-template.form.js:267 msgid "If enabled, run this playbook as an administrator." msgstr "有効にされている場合、この Playbook を管理者として実行します。" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:120 -#: client/src/templates/job_templates/job-template.form.js:256 -#: client/src/templates/job_templates/job-template.form.js:258 msgid "" "If enabled, show the changes made by Ansible tasks, where supported. This is" -" equivalent to Ansible's --diff mode." +" equivalent to Ansible’s --diff mode." msgstr "" "Ansible タスクで加えられた変更を表示します (有効にされ、サポートされている場合)。これは Ansible の --diff " "モードに相当します。" -#: client/src/templates/job_templates/job-template.form.js:296 +#: client/src/templates/job_templates/job-template.form.js:251 +msgid "" +"If enabled, show the changes made by Ansible tasks, where supported. This is" +" equivalent to Ansible’s --diff mode." +msgstr "" +"Ansible タスクで加えられた変更を表示します (有効にされ、サポートされている場合)。これは Ansible の --diff " +"モードに相当します。" + +#: client/src/templates/job_templates/job-template.form.js:291 msgid "If enabled, simultaneous runs of this job template will be allowed." msgstr "このジョブテンプレートの同時実行が許可されます (有効にされている場合)。" -#: client/src/templates/job_templates/job-template.form.js:307 +#: client/src/templates/job_templates/job-template.form.js:302 msgid "" "If enabled, use cached facts if available and store discovered facts in the " "cache." @@ -2384,64 +2226,52 @@ msgstr "イメージ ID:" #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js:30 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:33 #: client/src/inventories-hosts/inventories/related/hosts/related-host.list.js:29 -#: client/src/inventories-hosts/hosts/host.form.js:33 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:32 msgid "" "Indicates if a host is available and should be included in running jobs." msgstr "ホストが利用可能かどうか、また実行中のジョブに組み込む必要があるかどうかを示します。" #: client/src/activity-stream/activity-detail.form.js:31 #: client/src/activity-stream/streams.list.js:33 -#: client/src/activity-stream/streams.list.js:34 msgid "Initiated by" msgstr "開始:" #: client/src/credential-types/credential-types.form.js:53 #: client/src/credential-types/credential-types.form.js:61 -#: client/src/credential-types/credential-types.form.js:60 -#: client/src/credential-types/credential-types.form.js:75 msgid "Injector Configuration" msgstr "インジェクターの設定" #: client/src/credential-types/credential-types.form.js:39 #: client/src/credential-types/credential-types.form.js:47 -#: client/src/credential-types/credential-types.form.js:54 msgid "Input Configuration" msgstr "入力の設定" #: client/src/inventories-hosts/hosts/host.form.js:123 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:121 -#: client/src/inventories-hosts/hosts/host.form.js:127 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:120 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:122 msgid "Insights" msgstr "Insights" -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:72 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:69 msgid "Insights Credential" msgstr "Insights 認証情報" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:145 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:148 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:135 msgid "Instance Filters" msgstr "インスタンスフィルター" -#: client/src/job-results/job-results.partial.html:366 +#: client/src/job-results/job-results.partial.html:369 msgid "Instance Group" msgstr "インスタンスグループ" +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:72 #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:75 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:78 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:83 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:86 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:78 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:81 #: client/src/organizations/organizations.form.js:38 #: client/src/organizations/organizations.form.js:41 #: client/src/setup-menu/setup-menu.partial.html:54 -#: client/src/templates/job_templates/job-template.form.js:196 -#: client/src/templates/job_templates/job-template.form.js:199 -#: client/src/setup-menu/setup-menu.partial.html:60 -#: client/src/templates/job_templates/job-template.form.js:205 -#: client/src/templates/job_templates/job-template.form.js:208 +#: client/src/templates/job_templates/job-template.form.js:191 +#: client/src/templates/job_templates/job-template.form.js:194 msgid "Instance Groups" msgstr "インスタンスグループ" @@ -2477,8 +2307,8 @@ msgstr "このタイプの無効な入力です。" msgid "Invalid username and/or password. Please try again." msgstr "無効なユーザー名および/またはパスワードです。やり直してください。" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:128 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:53 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:122 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:52 #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:26 #: client/src/home/dashboard/counts/dashboard-counts.directive.js:50 #: client/src/organizations/linkout/organizations-linkout.route.js:155 @@ -2488,7 +2318,7 @@ msgstr "インベントリー" #: client/src/inventories-hosts/hosts/host.list.js:69 #: client/src/inventories-hosts/inventories/inventory.list.js:80 #: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:69 -#: client/src/job-results/job-results.partial.html:198 +#: client/src/job-results/job-results.partial.html:201 #: client/src/job-submission/job-submission.partial.html:17 #: client/src/organizations/linkout/controllers/organizations-inventories.controller.js:70 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:58 @@ -2496,21 +2326,16 @@ msgstr "インベントリー" #: client/src/templates/job_templates/job-template.form.js:80 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:72 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:82 -#: client/src/templates/job_templates/job-template.form.js:70 -#: client/src/templates/job_templates/job-template.form.js:84 msgid "Inventory" msgstr "インベントリー" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:110 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:124 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:104 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:116 msgid "Inventory File" msgstr "インベントリーファイル" #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:27 #: client/src/setup-menu/setup-menu.partial.html:41 -#: client/src/setup-menu/setup-menu.partial.html:34 msgid "Inventory Scripts" msgstr "インベントリースクリプト" @@ -2522,8 +2347,7 @@ msgstr "インベントリー同期" msgid "Inventory Sync Failures" msgstr "インベントリーの同期の失敗" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:96 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:105 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:93 msgid "Inventory Variables" msgstr "インベントリー変数" @@ -2543,26 +2367,23 @@ msgstr "ジョブテンプレート" #: client/src/organizations/list/organizations-list.controller.js:78 #: client/src/portal-mode/portal-job-templates.list.js:13 #: client/src/portal-mode/portal-job-templates.list.js:14 -#: client/src/organizations/linkout/organizations-linkout.route.js:250 msgid "JOB TEMPLATES" msgstr "ジョブテンプレート" #: client/src/activity-stream/get-target-title.factory.js:32 -#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:109 -#: client/src/instance-groups/instance-group.partial.html:29 -#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:28 +#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:118 +#: client/src/instance-groups/instance-group.partial.html:28 +#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:27 #: client/src/instance-groups/jobs/jobs-list.route.js:9 #: client/src/jobs/jobs.route.js:15 #: client/src/main-menu/main-menu.partial.html:122 #: client/src/main-menu/main-menu.partial.html:43 #: client/src/portal-mode/portal-jobs.list.js:13 #: client/src/portal-mode/portal-jobs.list.js:17 -#: client/src/activity-stream/get-target-title.factory.js:29 msgid "JOBS" msgstr "ジョブ" -#: client/src/job-submission/job-submission.partial.html:169 -#: client/src/job-submission/job-submission.partial.html:167 +#: client/src/job-submission/job-submission.partial.html:173 msgid "JSON" msgstr "JSON" @@ -2572,15 +2393,12 @@ msgstr "JSON" msgid "JSON:" msgstr "JSON:" -#: client/src/job-results/job-results.partial.html:381 -#: client/src/job-submission/job-submission.partial.html:222 -#: client/src/templates/job_templates/job-template.form.js:205 -#: client/src/templates/job_templates/job-template.form.js:212 +#: client/src/job-results/job-results.partial.html:384 +#: client/src/job-submission/job-submission.partial.html:228 +#: client/src/templates/job_templates/job-template.form.js:200 +#: client/src/templates/job_templates/job-template.form.js:207 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:127 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:135 -#: client/src/job-submission/job-submission.partial.html:220 -#: client/src/templates/job_templates/job-template.form.js:214 -#: client/src/templates/job_templates/job-template.form.js:223 msgid "Job Tags" msgstr "ジョブタグ" @@ -2588,22 +2406,19 @@ msgstr "ジョブタグ" msgid "Job Template" msgstr "ジョブテンプレート" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:109 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:103 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:36 #: client/src/organizations/linkout/organizations-linkout.route.js:268 -#: client/src/organizations/linkout/organizations-linkout.route.js:262 msgid "Job Templates" msgstr "ジョブテンプレート" #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:32 -#: client/src/job-results/job-results.partial.html:156 -#: client/src/job-submission/job-submission.partial.html:196 +#: client/src/job-results/job-results.partial.html:159 +#: client/src/job-submission/job-submission.partial.html:202 #: client/src/templates/job_templates/job-template.form.js:47 #: client/src/templates/job_templates/job-template.form.js:55 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:103 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:92 -#: client/src/job-submission/job-submission.partial.html:194 -#: client/src/templates/job_templates/job-template.form.js:59 msgid "Job Type" msgstr "ジョブタイプ" @@ -2620,14 +2435,13 @@ msgid "Jobs" msgstr "ジョブ" #: client/src/job-results/job-results.controller.js:269 -#: client/src/job-results/job-results.controller.js:321 +#: client/src/job-results/job-results.controller.js:366 msgid "Jump to last line of standard out." msgstr "標準出力の最終行にジャンプ" #: client/src/access/add-rbac-resource/rbac-resource.partial.html:61 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:102 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:154 #: client/src/shared/smart-search/smart-search.partial.html:14 -#: client/src/access/add-rbac-resource/rbac-resource.partial.html:63 msgid "Key" msgstr "キー" @@ -2647,7 +2461,6 @@ msgstr "ジョブの起動" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:86 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:66 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:73 msgid "LAUNCH TYPE" msgstr "起動タイプ" @@ -2656,12 +2469,10 @@ msgid "LDAP" msgstr "LDAP" #: client/src/license/license.route.js:19 -#: client/src/license/license.route.js:18 msgid "LICENSE" msgstr "ライセンス" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:58 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:45 msgid "LICENSE ERROR" msgstr "ライセンスエラー" @@ -2671,16 +2482,14 @@ msgstr "ログアウト" #: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:68 #: client/src/instance-groups/jobs/jobs.list.js:66 -#: client/src/job-results/job-results.partial.html:431 -#: client/src/job-results/job-results.partial.html:440 +#: client/src/job-results/job-results.partial.html:434 +#: client/src/job-results/job-results.partial.html:443 #: client/src/jobs/all-jobs.list.js:74 -#: client/src/templates/job_templates/job-template.form.js:239 -#: client/src/templates/job_templates/job-template.form.js:243 +#: client/src/templates/job_templates/job-template.form.js:234 +#: client/src/templates/job_templates/job-template.form.js:238 #: client/src/templates/templates.list.js:43 #: client/src/templates/workflows.form.js:62 #: client/src/templates/workflows.form.js:67 -#: client/src/templates/job_templates/job-template.form.js:347 -#: client/src/templates/job_templates/job-template.form.js:352 msgid "Labels" msgstr "ラベル" @@ -2698,32 +2507,28 @@ msgid "Last Updated" msgstr "最終更新日時" #: client/src/portal-mode/portal-job-templates.list.js:36 -#: client/src/shared/form-generator.js:1699 +#: client/src/shared/form-generator.js:1707 #: client/src/templates/templates.list.js:80 -#: client/src/shared/form-generator.js:1750 msgid "Launch" msgstr "起動" #: client/src/management-jobs/card/card.partial.html:23 -#: client/src/management-jobs/card/card.partial.html:21 msgid "Launch Management Job" msgstr "管理ジョブの起動" -#: client/src/job-results/job-results.partial.html:167 -#: client/src/job-results/job-results.partial.html:182 +#: client/src/job-results/job-results.partial.html:170 +#: client/src/job-results/job-results.partial.html:185 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:76 msgid "Launched By" msgstr "起動:" #: client/src/job-submission/job-submission.partial.html:99 -#: client/src/job-submission/job-submission.partial.html:97 msgid "" "Launching this job requires the passwords listed below. Enter and confirm " "each password before continuing." msgstr "このジョブの起動には以下に記載されているパスワードが必要です。それぞれのパスワードを入力し、確認してから続行します。" -#: client/features/credentials/legacy.credentials.js:360 -#: client/features/credentials/legacy.credentials.js:343 +#: client/features/credentials/legacy.credentials.js:357 msgid "Legacy state configuration for does not exist" msgstr "レガシー状態の設定は存在しません。" @@ -2732,7 +2537,7 @@ msgstr "レガシー状態の設定は存在しません。" msgid "License" msgstr "ライセンス" -#: client/src/license/license.partial.html:102 +#: client/src/license/license.partial.html:104 msgid "License File" msgstr "ライセンスファイル" @@ -2750,16 +2555,13 @@ msgstr "ライセンスタイプ" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:45 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:55 -#: client/src/job-results/job-results.partial.html:344 -#: client/src/job-submission/job-submission.partial.html:214 +#: client/src/job-results/job-results.partial.html:347 +#: client/src/job-submission/job-submission.partial.html:220 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:92 -#: client/src/templates/job_templates/job-template.form.js:165 -#: client/src/templates/job_templates/job-template.form.js:169 +#: client/src/templates/job_templates/job-template.form.js:160 +#: client/src/templates/job_templates/job-template.form.js:164 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:113 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:120 -#: client/src/job-submission/job-submission.partial.html:212 -#: client/src/templates/job_templates/job-template.form.js:171 -#: client/src/templates/job_templates/job-template.form.js:178 msgid "Limit" msgstr "制限" @@ -2792,8 +2594,7 @@ msgstr "ライブイベント: 接続されています。ジョブステータ msgid "Live events: error connecting to the server." msgstr "ライブイベント: サーバーへの接続時にエラーが発生しました。" -#: client/src/shared/form-generator.js:1975 -#: client/src/shared/form-generator.js:2026 +#: client/src/shared/form-generator.js:1983 msgid "Loading..." msgstr "ロード中..." @@ -2805,15 +2606,15 @@ msgstr "ローカルタイムゾーン" msgid "Log Out" msgstr "ログアウト" -#: client/src/configuration/system-form/configuration-system.controller.js:220 -msgid "Log aggregator test failed.
Detail:" -msgstr "ログアグリゲーターのテストに失敗しました。
詳細:" +#: client/src/configuration/system-form/configuration-system.controller.js:225 +msgid "Log aggregator test failed.
Detail:" +msgstr "ログアグリゲーターのテストに失敗しました。
詳細:" -#: client/src/configuration/system-form/configuration-system.controller.js:212 +#: client/src/configuration/system-form/configuration-system.controller.js:218 msgid "Log aggregator test successful." msgstr "ログアグリゲーターのテストが成功しました。" -#: client/src/configuration/system-form/configuration-system.controller.js:87 +#: client/src/configuration/system-form/configuration-system.controller.js:89 msgid "Logging" msgstr "ロギング" @@ -2823,7 +2624,6 @@ msgstr "低" #: client/src/management-jobs/card/card.partial.html:6 #: client/src/management-jobs/card/card.route.js:21 -#: client/src/management-jobs/card/card.partial.html:4 msgid "MANAGEMENT JOBS" msgstr "管理ジョブ" @@ -2832,43 +2632,31 @@ msgid "MY VIEW" msgstr "マイビュー" #: client/src/credentials/credentials.form.js:67 -#: client/src/job-submission/job-submission.partial.html:349 -#: client/src/job-submission/job-submission.partial.html:346 +#: client/src/job-submission/job-submission.partial.html:356 msgid "Machine" msgstr "マシン" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:60 -#: client/src/job-results/job-results.partial.html:257 +#: client/src/job-results/job-results.partial.html:260 msgid "Machine Credential" msgstr "マシンの認証情報" #: client/src/setup-menu/setup-menu.partial.html:36 -#: client/src/setup-menu/setup-menu.partial.html:29 msgid "" "Manage the cleanup of old job history, activity streams, data marked for " "deletion, and system tracking info." msgstr "古いジョブ履歴、アクティビティーストリーム、削除用にマークされたデータ、およびシステムトラッキング情報のクリーンアップを管理します。" -#: client/src/credentials/factories/become-method-change.factory.js:38 -#: client/src/credentials/factories/kind-change.factory.js:95 -#: client/src/credentials/factories/become-method-change.factory.js:40 -#: client/src/credentials/factories/kind-change.factory.js:97 -msgid "Management Certificate" -msgstr "管理証明書" - #: client/src/setup-menu/setup-menu.partial.html:35 -#: client/src/setup-menu/setup-menu.partial.html:28 msgid "Management Jobs" msgstr "管理ジョブ" #: client/src/projects/list/projects-list.controller.js:89 -#: client/src/projects/list/projects-list.controller.js:88 msgid "Manual projects do not require a schedule" msgstr "手動プロジェクトにスケジュールは不要です" -#: client/src/projects/edit/projects-edit.controller.js:140 +#: client/src/projects/edit/projects-edit.controller.js:141 #: client/src/projects/list/projects-list.controller.js:88 -#: client/src/projects/list/projects-list.controller.js:87 msgid "Manual projects do not require an SCM update" msgstr "手動プロジェクトに SCM 更新は不要です" @@ -2880,7 +2668,7 @@ msgstr "ユーザーあたりの最大セッション数に達しました。サ msgid "Medium" msgstr "中" -#: client/src/configuration/system-form/configuration-system.controller.js:88 +#: client/src/configuration/system-form/configuration-system.controller.js:90 msgid "Misc. System" msgstr "その他のシステム" @@ -2905,7 +2693,7 @@ msgstr "最新のジョブが失敗しました。クリックしてジョブを msgid "Most recent job successful. Click to view jobs." msgstr "最新のジョブが成功しました。クリックしてジョブを表示します。" -#: client/src/templates/survey-maker/shared/question-definition.form.js:74 +#: client/src/templates/survey-maker/shared/question-definition.form.js:77 msgid "Multiple Choice Options" msgstr "複数の選択オプション" @@ -2989,7 +2777,6 @@ msgstr "通知テンプレート" #: client/src/activity-stream/get-target-title.factory.js:26 #: client/src/notifications/notificationTemplates.list.js:14 -#: client/src/activity-stream/get-target-title.factory.js:23 msgid "NOTIFICATION TEMPLATES" msgstr "通知テンプレート" @@ -3005,7 +2792,7 @@ msgstr "通知" #: client/src/credentials/credentials.list.js:26 #: client/src/home/dashboard/lists/job-templates/job-templates-list.partial.html:14 #: client/src/home/dashboard/lists/jobs/jobs-list.partial.html:13 -#: client/src/instance-groups/instance-groups.list.js:14 +#: client/src/instance-groups/instance-groups.list.js:15 #: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:35 #: client/src/instance-groups/instances/instances-list.partial.html:15 #: client/src/instance-groups/instances/instances.list.js:14 @@ -3042,13 +2829,8 @@ msgstr "通知" #: client/src/templates/job_templates/job-template.form.js:34 #: client/src/templates/templates.list.js:24 #: client/src/templates/workflows.form.js:32 -#: client/src/users/users.form.js:138 client/src/users/users.form.js:164 -#: client/src/users/users.form.js:190 -#: client/src/credential-types/credential-types.list.js:21 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:48 -#: client/src/portal-mode/portal-jobs.list.js:34 -#: client/src/users/users.form.js:139 client/src/users/users.form.js:165 -#: client/src/users/users.form.js:191 +#: client/src/users/users.form.js:142 client/src/users/users.form.js:168 +#: client/src/users/users.form.js:194 msgid "Name" msgstr "名前" @@ -3056,7 +2838,7 @@ msgstr "名前" msgid "Network" msgstr "ネットワーク" -#: client/src/job-results/job-results.partial.html:303 +#: client/src/job-results/job-results.partial.html:306 msgid "Network Credential" msgstr "ネットワークの認証情報" @@ -3068,7 +2850,7 @@ msgstr "新規グループ" msgid "New Host" msgstr "新規ホスト" -#: client/src/users/add/users-add.controller.js:90 +#: client/src/users/add/users-add.controller.js:91 msgid "New user successfully created!" msgstr "新規ユーザーが正常に作成されました!" @@ -3082,7 +2864,7 @@ msgid "No Credentials Have Been Created" msgstr "認証情報が作成されていません" #: client/src/job-submission/lists/credential/job-sub-cred-list.controller.js:44 -#: client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js:124 +#: client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js:140 msgid "No Credentials Matching This Type Have Been Created" msgstr "このタイプに一致する認証情報が作成されていません" @@ -3099,7 +2881,6 @@ msgid "No Remediation Playbook Available" msgstr "修復 Playbook を使用できません" #: client/src/projects/list/projects-list.controller.js:159 -#: client/src/projects/list/projects-list.controller.js:158 msgid "No SCM Configuration" msgstr "SCM 設定がありません" @@ -3112,7 +2893,6 @@ msgid "No Teams exist" msgstr "チームが存在しません" #: client/src/projects/list/projects-list.controller.js:150 -#: client/src/projects/list/projects-list.controller.js:149 msgid "No Updates Available" msgstr "利用可能な更新がありません" @@ -3167,8 +2947,7 @@ msgstr "実行されたジョブがありません。" msgid "No jobs were recently run." msgstr "最近実行されたジョブがありません。" -#: client/src/teams/teams.form.js:121 client/src/users/users.form.js:187 -#: client/src/users/users.form.js:188 +#: client/src/teams/teams.form.js:121 client/src/users/users.form.js:191 msgid "No permissions have been granted" msgstr "パーミッションが付与されていません" @@ -3176,7 +2955,7 @@ msgstr "パーミッションが付与されていません" msgid "No recent job data available for this host." msgstr "このホストに利用できる最新のジョブデータがありません。" -#: client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js:73 +#: client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js:75 msgid "No recent job data available for this inventory." msgstr "このインベントリーに利用できる最新のジョブデータがありません。" @@ -3185,8 +2964,8 @@ msgid "No recent notifications." msgstr "最新の通知はありません。" #: client/src/inventories-hosts/hosts/hosts.partial.html:36 -#: client/src/shared/form-generator.js:1871 -#: client/src/shared/form-generator.js:1922 +#: client/src/shared/form-generator.js:1879 +#: client/src/shared/list-generator/list-generator.factory.js:240 msgid "No records matched your search." msgstr "検索に一致するレコードはありません" @@ -3194,10 +2973,8 @@ msgstr "検索に一致するレコードはありません" msgid "No schedules exist" msgstr "スケジュールがありません" -#: client/src/job-submission/job-submission.partial.html:341 -#: client/src/job-submission/job-submission.partial.html:346 -#: client/src/job-submission/job-submission.partial.html:338 -#: client/src/job-submission/job-submission.partial.html:343 +#: client/src/job-submission/job-submission.partial.html:348 +#: client/src/job-submission/job-submission.partial.html:353 msgid "None selected" msgstr "いずれも選択されていません" @@ -3208,7 +2985,6 @@ msgid "Normal User" msgstr "標準ユーザー" #: client/src/projects/list/projects-list.controller.js:91 -#: client/src/projects/list/projects-list.controller.js:90 msgid "Not configured for SCM" msgstr "SCM 用に設定されていません" @@ -3216,10 +2992,16 @@ msgstr "SCM 用に設定されていません" msgid "Not configured for inventory sync." msgstr "インベントリーの同期に設定されていません。" -#: client/src/notifications/notificationTemplates.form.js:291 -#: client/src/notifications/notificationTemplates.form.js:292 -#: client/src/notifications/notificationTemplates.form.js:296 -#: client/src/notifications/notificationTemplates.form.js:297 +#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:25 +msgid "" +"Note that only hosts directly in this group can be disassociated. Hosts in " +"sub-groups must be disassociated directly from the sub-group level that they" +" belong." +msgstr "" +"このグループに直接含まれるホストのみの関連付けを解除できることに注意してください。サブグループのホストの関連付けの解除については、それらのホストが属するサブグループのレベルで直接実行する必要があります。" + +#: client/src/notifications/notificationTemplates.form.js:288 +#: client/src/notifications/notificationTemplates.form.js:289 msgid "Notification Color" msgstr "通知の色" @@ -3227,8 +3009,7 @@ msgstr "通知の色" msgid "Notification Failed." msgstr "通知に失敗しました。" -#: client/src/notifications/notificationTemplates.form.js:280 -#: client/src/notifications/notificationTemplates.form.js:285 +#: client/src/notifications/notificationTemplates.form.js:277 msgid "Notification Label" msgstr "通知レベル" @@ -3240,37 +3021,33 @@ msgstr "通知テンプレート" #: client/src/management-jobs/notifications/notification.route.js:21 #: client/src/notifications/notifications.list.js:17 #: client/src/setup-menu/setup-menu.partial.html:48 -#: client/src/setup-menu/setup-menu.partial.html:41 msgid "Notifications" msgstr "通知" -#: client/src/notifications/notificationTemplates.form.js:305 -#: client/src/notifications/notificationTemplates.form.js:310 +#: client/src/notifications/notificationTemplates.form.js:302 msgid "Notify Channel" msgstr "通知チャネル" #: client/src/inventories-hosts/hosts/hosts.partial.html:55 -#: client/src/job-submission/job-submission.partial.html:263 +#: client/src/job-submission/job-submission.partial.html:269 #: client/src/partials/survey-maker-modal.html:27 -#: client/src/shared/form-generator.js:538 +#: client/src/shared/form-generator.js:542 +#: client/src/shared/form-generator.js:773 #: client/src/shared/generator-helpers.js:551 -#: client/src/job-submission/job-submission.partial.html:260 -#: client/src/shared/form-generator.js:555 msgid "OFF" msgstr "オフ" #: client/lib/services/base-string.service.js:63 -#: client/lib/services/base-string.service.js:31 +#: client/src/jobs/factories/delete-job.factory.js:115 msgid "OK" msgstr "OK" #: client/src/inventories-hosts/hosts/hosts.partial.html:54 -#: client/src/job-submission/job-submission.partial.html:261 +#: client/src/job-submission/job-submission.partial.html:267 #: client/src/partials/survey-maker-modal.html:26 -#: client/src/shared/form-generator.js:536 +#: client/src/shared/form-generator.js:538 +#: client/src/shared/form-generator.js:771 #: client/src/shared/generator-helpers.js:547 -#: client/src/job-submission/job-submission.partial.html:259 -#: client/src/shared/form-generator.js:553 msgid "ON" msgstr "オン" @@ -3281,17 +3058,14 @@ msgstr "オプション" #: client/src/activity-stream/get-target-title.factory.js:29 #: client/src/organizations/list/organizations-list.partial.html:6 #: client/src/organizations/main.js:52 -#: client/src/activity-stream/get-target-title.factory.js:26 msgid "ORGANIZATIONS" msgstr "組織" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:116 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:103 msgid "OVERWRITE" msgstr "上書き" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:123 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:110 msgid "OVERWRITE VARS" msgstr "変数の上書き" @@ -3305,7 +3079,6 @@ msgstr "成功した場合 " #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:157 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:162 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:146 msgid "Only Group By" msgstr "グループ化のみ" @@ -3317,20 +3090,17 @@ msgstr "" "OpenStack ドメインは管理上の境界を定義します。これは Keystone v3 認証 URL " "にのみ必要です。共通するシナリオには以下が含まれます:" -#: client/src/templates/job_templates/job-template.form.js:245 +#: client/src/templates/job_templates/job-template.form.js:240 #: client/src/templates/workflows.form.js:69 -#: client/src/templates/job_templates/job-template.form.js:354 msgid "" "Optional labels that describe this job template, such as 'dev' or 'test'. " "Labels can be used to group and filter job templates and completed jobs." msgstr "" "「dev」または「test」などのこのジョブテンプレートを説明するオプションラベルです。ラベルを使用し、ジョブテンプレートおよび完了したジョブの分類およびフィルターを実行できます。" -#: client/src/notifications/notificationTemplates.form.js:385 +#: client/src/notifications/notificationTemplates.form.js:382 #: client/src/partials/logviewer.html:7 -#: client/src/templates/job_templates/job-template.form.js:264 -#: client/src/notifications/notificationTemplates.form.js:397 -#: client/src/templates/job_templates/job-template.form.js:265 +#: client/src/templates/job_templates/job-template.form.js:259 msgid "Options" msgstr "オプション" @@ -3349,11 +3119,11 @@ msgstr "オプション" msgid "Organization" msgstr "組織" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:142 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:65 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:136 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:64 #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:30 #: client/src/setup-menu/setup-menu.partial.html:4 -#: client/src/users/users.form.js:128 client/src/users/users.form.js:129 +#: client/src/users/users.form.js:132 msgid "Organizations" msgstr "組織" @@ -3411,15 +3181,11 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:328 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:333 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:282 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:288 msgid "Overwrite" msgstr "上書き" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:340 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:345 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:295 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:301 msgid "Overwrite Variables" msgstr "変数の上書き" @@ -3431,8 +3197,7 @@ msgstr "所有者" msgid "PASSWORD" msgstr "パスワード" -#: client/features/credentials/legacy.credentials.js:125 -#: client/features/credentials/legacy.credentials.js:120 +#: client/features/credentials/legacy.credentials.js:122 msgid "PERMISSIONS" msgstr "パーミッション" @@ -3447,9 +3212,8 @@ msgstr "Survey プロンプトを追加してください。" #: client/src/instance-groups/instances/instances-list.partial.html:6 #: client/src/instance-groups/list/instance-groups-list.partial.html:16 #: client/src/organizations/list/organizations-list.partial.html:47 -#: client/src/shared/form-generator.js:1877 +#: client/src/shared/form-generator.js:1885 #: client/src/shared/list-generator/list-generator.factory.js:248 -#: client/src/shared/form-generator.js:1928 msgid "PLEASE ADD ITEMS TO THIS LIST" msgstr "項目をこの一覧に追加してください" @@ -3461,6 +3225,10 @@ msgstr "ポータルモード" msgid "PREVIEW" msgstr "プレビュー" +#: client/src/job-results/job-results.service.js:166 +msgid "PROCEED" +msgstr "続行" + #: client/src/partials/job-template-details.html:2 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:73 msgid "PROJECT" @@ -3473,7 +3241,6 @@ msgstr "プロジェクト" #: client/src/organizations/list/organizations-list.controller.js:72 #: client/src/projects/main.js:73 client/src/projects/projects.list.js:14 #: client/src/projects/projects.list.js:15 -#: client/src/organizations/linkout/organizations-linkout.route.js:191 msgid "PROJECTS" msgstr "プロジェクト" @@ -3481,12 +3248,11 @@ msgstr "プロジェクト" msgid "Page" msgstr "ページ" -#: client/src/notifications/notificationTemplates.form.js:235 -#: client/src/notifications/notificationTemplates.form.js:240 +#: client/src/notifications/notificationTemplates.form.js:232 msgid "Pagerduty subdomain" msgstr "Pagerduty サブドメイン" -#: client/src/templates/job_templates/job-template.form.js:353 +#: client/src/templates/job_templates/job-template.form.js:348 msgid "" "Pass extra command line variables to the playbook. Provide key/value pairs " "using either YAML or JSON. Refer to the Ansible Tower documentation for " @@ -3516,34 +3282,21 @@ msgstr "" #: client/src/credentials/credentials.form.js:226 #: client/src/credentials/factories/become-method-change.factory.js:21 -#: client/src/credentials/factories/become-method-change.factory.js:46 -#: client/src/credentials/factories/become-method-change.factory.js:54 -#: client/src/credentials/factories/become-method-change.factory.js:74 -#: client/src/credentials/factories/become-method-change.factory.js:84 -#: client/src/credentials/factories/become-method-change.factory.js:94 -#: client/src/credentials/factories/kind-change.factory.js:103 -#: client/src/credentials/factories/kind-change.factory.js:111 -#: client/src/credentials/factories/kind-change.factory.js:131 -#: client/src/credentials/factories/kind-change.factory.js:141 -#: client/src/credentials/factories/kind-change.factory.js:151 +#: client/src/credentials/factories/become-method-change.factory.js:40 +#: client/src/credentials/factories/become-method-change.factory.js:48 +#: client/src/credentials/factories/become-method-change.factory.js:68 +#: client/src/credentials/factories/become-method-change.factory.js:78 +#: client/src/credentials/factories/become-method-change.factory.js:88 +#: client/src/credentials/factories/kind-change.factory.js:105 +#: client/src/credentials/factories/kind-change.factory.js:125 +#: client/src/credentials/factories/kind-change.factory.js:135 +#: client/src/credentials/factories/kind-change.factory.js:145 #: client/src/credentials/factories/kind-change.factory.js:30 #: client/src/credentials/factories/kind-change.factory.js:78 -#: client/src/job-submission/job-submission.partial.html:103 +#: client/src/credentials/factories/kind-change.factory.js:97 +#: client/src/job-submission/job-submission.partial.html:104 #: client/src/notifications/shared/type-change.service.js:28 #: client/src/users/users.form.js:68 -#: client/src/credentials/factories/become-method-change.factory.js:23 -#: client/src/credentials/factories/become-method-change.factory.js:48 -#: client/src/credentials/factories/become-method-change.factory.js:56 -#: client/src/credentials/factories/become-method-change.factory.js:76 -#: client/src/credentials/factories/become-method-change.factory.js:86 -#: client/src/credentials/factories/become-method-change.factory.js:96 -#: client/src/credentials/factories/kind-change.factory.js:105 -#: client/src/credentials/factories/kind-change.factory.js:113 -#: client/src/credentials/factories/kind-change.factory.js:133 -#: client/src/credentials/factories/kind-change.factory.js:143 -#: client/src/credentials/factories/kind-change.factory.js:153 -#: client/src/credentials/factories/kind-change.factory.js:80 -#: client/src/job-submission/job-submission.partial.html:101 msgid "Password" msgstr "パスワード" @@ -3566,22 +3319,11 @@ msgstr "過去 1 週間" #: client/src/credentials/factories/become-method-change.factory.js:29 #: client/src/credentials/factories/kind-change.factory.js:86 -#: client/src/credentials/factories/become-method-change.factory.js:31 -#: client/src/credentials/factories/kind-change.factory.js:88 msgid "" "Paste the contents of the PEM file associated with the service account " "email." msgstr "サービスアカウントメールに関連付けられた PEM ファイルの内容を貼り付けます。" -#: client/src/credentials/factories/become-method-change.factory.js:41 -#: client/src/credentials/factories/kind-change.factory.js:98 -#: client/src/credentials/factories/become-method-change.factory.js:43 -#: client/src/credentials/factories/kind-change.factory.js:100 -msgid "" -"Paste the contents of the PEM file that corresponds to the certificate you " -"uploaded in the Microsoft Azure console." -msgstr "Microsoft Azure コンソールにアップロードした証明書に対応する PEM ファイルの内容を貼り付けます。" - #: client/src/credentials/factories/kind-change.factory.js:51 msgid "Paste the contents of the SSH private key file." msgstr "SSH 秘密鍵ファイルの内容を貼り付けます。" @@ -3590,7 +3332,7 @@ msgstr "SSH 秘密鍵ファイルの内容を貼り付けます。" msgid "Paste the contents of the SSH private key file.%s or click to close%s" msgstr "SSH 秘密鍵ファイルの内容を貼り付けます。%s またはクリックして %s を閉じます。" -#: client/src/inventories-hosts/inventories/inventory.list.js:121 +#: client/src/inventories-hosts/inventories/inventory.list.js:119 msgid "Pending Delete" msgstr "保留中の削除" @@ -3599,40 +3341,30 @@ msgid "Period" msgstr "期間" #: client/src/projects/add/projects-add.controller.js:29 -#: client/src/users/add/users-add.controller.js:42 +#: client/src/users/add/users-add.controller.js:43 msgid "Permission Error" msgstr "パーミッションのエラー" #: client/features/credentials/credentials.strings.js:14 -#: client/features/credentials/legacy.credentials.js:69 +#: client/features/credentials/legacy.credentials.js:66 #: client/src/credentials/credentials.form.js:439 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:125 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:128 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:122 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:123 #: client/src/projects/projects.form.js:233 client/src/teams/teams.form.js:117 -#: client/src/templates/job_templates/job-template.form.js:391 +#: client/src/templates/job_templates/job-template.form.js:386 #: client/src/templates/workflows.form.js:114 -#: client/src/users/users.form.js:183 -#: client/features/credentials/legacy.credentials.js:64 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:134 -#: client/src/projects/projects.form.js:232 -#: client/src/templates/job_templates/job-template.form.js:411 -#: client/src/templates/workflows.form.js:119 -#: client/src/users/users.form.js:184 +#: client/src/users/users.form.js:187 msgid "Permissions" msgstr "パーミッション" -#: client/src/job-results/job-results.partial.html:246 -#: client/src/shared/form-generator.js:1062 -#: client/src/templates/job_templates/job-template.form.js:109 -#: client/src/templates/job_templates/job-template.form.js:120 -#: client/src/shared/form-generator.js:1114 -#: client/src/templates/job_templates/job-template.form.js:113 -#: client/src/templates/job_templates/job-template.form.js:124 +#: client/src/job-results/job-results.partial.html:249 +#: client/src/shared/form-generator.js:1069 +#: client/src/templates/job_templates/job-template.form.js:107 +#: client/src/templates/job_templates/job-template.form.js:115 msgid "Playbook" msgstr "Playbook" #: client/src/projects/projects.form.js:89 -#: client/src/projects/projects.form.js:88 msgid "Playbook Directory" msgstr "Playbook ディレクトリー" @@ -3640,20 +3372,19 @@ msgstr "Playbook ディレクトリー" msgid "Playbook Run" msgstr "Playbook 実行" -#: client/src/job-results/job-results.partial.html:485 +#: client/src/job-results/job-results.partial.html:488 msgid "Plays" msgstr "プレイ" -#: client/src/users/users.form.js:122 client/src/users/users.form.js:123 +#: client/src/users/users.form.js:126 msgid "Please add user to an Organization." msgstr "ユーザーを組織に追加してください。" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:101 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:100 msgid "Please assign roles to the selected resources" msgstr "ロールを選択したリソースに割り当ててください。" #: client/src/access/add-rbac-resource/rbac-resource.partial.html:60 -#: client/src/access/add-rbac-resource/rbac-resource.partial.html:62 msgid "Please assign roles to the selected users/teams" msgstr "ロールを選択したユーザー/チームに割り当ててください。" @@ -3663,44 +3394,34 @@ msgid "" "license key." msgstr "以下のボタンをクリックし、Ansible の web サイトに移動して Tower ライセンスキーを取得します。" -#: client/src/inventories-hosts/inventory-hosts.strings.js:25 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.strings.js:8 +#: client/src/inventories-hosts/inventory-hosts.strings.js:27 msgid "Please click the icon to edit the host filter." msgstr "アイコンをクリックしてホストフィルターを編集します。" -#: client/src/shared/form-generator.js:854 -#: client/src/shared/form-generator.js:949 -#: client/src/shared/form-generator.js:877 -#: client/src/shared/form-generator.js:973 +#: client/src/shared/form-generator.js:861 +#: client/src/shared/form-generator.js:956 msgid "" "Please enter a URL that begins with ssh, http or https. The URL may not " "contain the '@' character." msgstr "ssh、http または https で始まる URL を入力します。URL には「@」文字を含めることはできません。" -#: client/src/shared/form-generator.js:1151 -#: client/src/shared/form-generator.js:1203 +#: client/src/shared/form-generator.js:1158 msgid "Please enter a number greater than %d and less than %d." msgstr "%d より大きく、%d より小さい数値を入力してください。" -#: client/src/shared/form-generator.js:1153 -#: client/src/shared/form-generator.js:1205 +#: client/src/shared/form-generator.js:1160 msgid "Please enter a number greater than %d." msgstr "%d より大きい数値を入力してください。" -#: client/src/shared/form-generator.js:1145 -#: client/src/shared/form-generator.js:1197 +#: client/src/shared/form-generator.js:1152 msgid "Please enter a number." msgstr "数値を入力してください。" -#: client/src/job-submission/job-submission.partial.html:111 -#: client/src/job-submission/job-submission.partial.html:124 -#: client/src/job-submission/job-submission.partial.html:137 -#: client/src/job-submission/job-submission.partial.html:150 +#: client/src/job-submission/job-submission.partial.html:112 +#: client/src/job-submission/job-submission.partial.html:126 +#: client/src/job-submission/job-submission.partial.html:140 +#: client/src/job-submission/job-submission.partial.html:154 #: client/src/login/loginModal/loginModal.partial.html:78 -#: client/src/job-submission/job-submission.partial.html:109 -#: client/src/job-submission/job-submission.partial.html:122 -#: client/src/job-submission/job-submission.partial.html:135 -#: client/src/job-submission/job-submission.partial.html:148 msgid "Please enter a password." msgstr "パスワードを入力してください。" @@ -3708,56 +3429,39 @@ msgstr "パスワードを入力してください。" msgid "Please enter a username." msgstr "ユーザー名を入力してください。" -#: client/src/shared/form-generator.js:844 -#: client/src/shared/form-generator.js:939 -#: client/src/shared/form-generator.js:867 -#: client/src/shared/form-generator.js:963 +#: client/src/shared/form-generator.js:851 +#: client/src/shared/form-generator.js:946 msgid "Please enter a valid email address." msgstr "有効なメールアドレスを入力してください。" #: client/lib/components/components.strings.js:15 -#: client/src/shared/form-generator.js:1009 -#: client/src/shared/form-generator.js:839 -#: client/src/shared/form-generator.js:934 -#: client/src/shared/form-generator.js:1061 -#: client/src/shared/form-generator.js:862 -#: client/src/shared/form-generator.js:958 +#: client/src/shared/form-generator.js:1016 +#: client/src/shared/form-generator.js:846 +#: client/src/shared/form-generator.js:941 msgid "Please enter a value." msgstr "値を入力してください。" -#: client/src/job-submission/job-submission.partial.html:282 -#: client/src/job-submission/job-submission.partial.html:287 -#: client/src/job-submission/job-submission.partial.html:298 -#: client/src/job-submission/job-submission.partial.html:304 -#: client/src/job-submission/job-submission.partial.html:310 -#: client/src/job-submission/job-submission.partial.html:279 -#: client/src/job-submission/job-submission.partial.html:284 -#: client/src/job-submission/job-submission.partial.html:295 -#: client/src/job-submission/job-submission.partial.html:301 -#: client/src/job-submission/job-submission.partial.html:307 +#: client/src/job-submission/job-submission.partial.html:289 +#: client/src/job-submission/job-submission.partial.html:294 +#: client/src/job-submission/job-submission.partial.html:305 +#: client/src/job-submission/job-submission.partial.html:311 +#: client/src/job-submission/job-submission.partial.html:317 msgid "Please enter an answer between" msgstr "次の範囲で回答を入力してください:" -#: client/src/job-submission/job-submission.partial.html:309 -#: client/src/job-submission/job-submission.partial.html:306 +#: client/src/job-submission/job-submission.partial.html:316 msgid "Please enter an answer that is a decimal number." msgstr "10 進数の回答を入力してください。" -#: client/src/job-submission/job-submission.partial.html:303 -#: client/src/job-submission/job-submission.partial.html:300 +#: client/src/job-submission/job-submission.partial.html:310 msgid "Please enter an answer that is a valid integer." msgstr "有効な整数の回答を入力してください。" -#: client/src/job-submission/job-submission.partial.html:281 -#: client/src/job-submission/job-submission.partial.html:286 -#: client/src/job-submission/job-submission.partial.html:297 -#: client/src/job-submission/job-submission.partial.html:302 -#: client/src/job-submission/job-submission.partial.html:308 -#: client/src/job-submission/job-submission.partial.html:278 -#: client/src/job-submission/job-submission.partial.html:283 -#: client/src/job-submission/job-submission.partial.html:294 -#: client/src/job-submission/job-submission.partial.html:299 -#: client/src/job-submission/job-submission.partial.html:305 +#: client/src/job-submission/job-submission.partial.html:288 +#: client/src/job-submission/job-submission.partial.html:293 +#: client/src/job-submission/job-submission.partial.html:304 +#: client/src/job-submission/job-submission.partial.html:309 +#: client/src/job-submission/job-submission.partial.html:315 msgid "Please enter an answer." msgstr "回答を入力してください。" @@ -3766,7 +3470,7 @@ msgstr "回答を入力してください。" msgid "Please save and run a job to view." msgstr "表示するジョブを保存し、実行してください。" -#: client/src/templates/job_templates/add-job-template/job-template-add.controller.js:49 +#: client/src/templates/job_templates/add-job-template/job-template-add.controller.js:50 msgid "Please save before adding a survey to this job template." msgstr "Survey をこのジョブテンプレートに追加する前に保存してください。" @@ -3783,44 +3487,34 @@ msgstr "通知を追加する前に保存してください。" msgid "Please save before adding users." msgstr "ユーザーを追加する前に保存してください。" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:121 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:124 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:118 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:119 #: client/src/projects/projects.form.js:225 client/src/teams/teams.form.js:113 -#: client/src/templates/job_templates/job-template.form.js:384 +#: client/src/templates/job_templates/job-template.form.js:379 #: client/src/templates/workflows.form.js:107 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:130 -#: client/src/projects/projects.form.js:224 -#: client/src/templates/job_templates/job-template.form.js:404 -#: client/src/templates/workflows.form.js:112 msgid "Please save before assigning permissions." msgstr "パーミッションを割り当てる前に保存してください。" -#: client/src/users/users.form.js:120 client/src/users/users.form.js:179 -#: client/src/users/users.form.js:121 client/src/users/users.form.js:180 +#: client/src/users/users.form.js:124 client/src/users/users.form.js:183 msgid "Please save before assigning to organizations." msgstr "組織に割り当てる前に保存してください。" -#: client/src/users/users.form.js:148 client/src/users/users.form.js:149 +#: client/src/users/users.form.js:152 msgid "Please save before assigning to teams." msgstr "チームに割り当てる前に保存してください。" -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:169 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:175 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:164 msgid "Please save before creating groups." msgstr "グループを作成する前に保存してください。" -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:178 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:184 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:173 msgid "Please save before creating hosts." msgstr "ホストを作成する前に保存してください。" #: client/src/inventories-hosts/hosts/host.form.js:112 #: client/src/inventories-hosts/inventories/related/groups/groups.form.js:86 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:111 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:111 -#: client/src/inventories-hosts/hosts/host.form.js:116 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:116 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:110 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:112 msgid "Please save before defining groups." msgstr "グループを定義する前に保存してください。" @@ -3828,8 +3522,7 @@ msgstr "グループを定義する前に保存してください。" msgid "Please save before defining hosts." msgstr "ホストを定義する前に保存してください。" -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:187 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:193 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:182 msgid "Please save before defining inventory sources." msgstr "インベントリーソースを定義する前に保存してください。" @@ -3838,22 +3531,17 @@ msgid "Please save before defining the workflow graph." msgstr "ワークフローグラフを定義する前に保存してください。" #: client/src/inventories-hosts/hosts/host.form.js:121 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:119 -#: client/src/inventories-hosts/hosts/host.form.js:125 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:118 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:120 msgid "Please save before viewing Insights." msgstr "Insights を表示する前に保存してください。" #: client/src/inventories-hosts/hosts/host.form.js:105 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:104 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:104 -#: client/src/inventories-hosts/hosts/host.form.js:109 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:109 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:103 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:105 msgid "Please save before viewing facts." msgstr "ファクトを表示する前に保存してください。" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:167 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:164 msgid "Please save before viewing hosts." msgstr "ホストを表示する前に保存してください。" @@ -3870,35 +3558,27 @@ msgid "Please select a Credential." msgstr "認証情報を選択してください。" #: client/src/templates/job_templates/multi-credential/multi-credential.partial.html:46 -#: client/src/templates/job_templates/multi-credential/multi-credential.partial.html:43 msgid "" "Please select a machine (SSH) credential or check the \"Prompt on launch\" " "option." msgstr "マシン (SSH) 認証情報を選択するか、または「起動プロンプト」オプションにチェックを付けます。" -#: client/src/shared/form-generator.js:1186 -#: client/src/shared/form-generator.js:1238 +#: client/src/shared/form-generator.js:1193 msgid "Please select a number between" msgstr "Please select a number between" -#: client/src/shared/form-generator.js:1182 -#: client/src/shared/form-generator.js:1234 +#: client/src/shared/form-generator.js:1189 msgid "Please select a number." msgstr "数値を選択してください。" -#: client/src/shared/form-generator.js:1074 -#: client/src/shared/form-generator.js:1142 -#: client/src/shared/form-generator.js:1263 -#: client/src/shared/form-generator.js:1371 -#: client/src/shared/form-generator.js:1126 -#: client/src/shared/form-generator.js:1194 -#: client/src/shared/form-generator.js:1314 -#: client/src/shared/form-generator.js:1422 +#: client/src/shared/form-generator.js:1081 +#: client/src/shared/form-generator.js:1149 +#: client/src/shared/form-generator.js:1270 +#: client/src/shared/form-generator.js:1378 msgid "Please select a value." msgstr "値を選択してください。" #: client/src/templates/job_templates/job-template.form.js:77 -#: client/src/templates/job_templates/job-template.form.js:81 msgid "Please select an Inventory or check the Prompt on launch option." msgstr "インベントリーを選択するか、または「起動プロンプト」オプションにチェックを付けてください。" @@ -3906,8 +3586,11 @@ msgstr "インベントリーを選択するか、または「起動プロンプ msgid "Please select an Inventory." msgstr "インベントリーを選択してください。" -#: client/src/shared/form-generator.js:1179 -#: client/src/shared/form-generator.js:1231 +#: client/src/inventories-hosts/inventory-hosts.strings.js:26 +msgid "Please select an organization before editing the host filter." +msgstr "組織を選択してからホストフィルターを編集します。" + +#: client/src/shared/form-generator.js:1186 msgid "Please select at least one value." msgstr "1 つ以上の値を選択してください。" @@ -3915,7 +3598,7 @@ msgstr "1 つ以上の値を選択してください。" msgid "Please select resources from the lists below." msgstr "以下の一覧からリソースを選択してください。" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:68 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65 msgid "Populate the hosts for this inventory by using a search filter." msgstr "検索フィルターを使用してこのインベントリーのホストを設定します。" @@ -3930,8 +3613,7 @@ msgid "Private Key" msgstr "秘密鍵" #: client/src/credentials/credentials.form.js:264 -#: client/src/job-submission/job-submission.partial.html:116 -#: client/src/job-submission/job-submission.partial.html:114 +#: client/src/job-submission/job-submission.partial.html:118 msgid "Private Key Passphrase" msgstr "秘密鍵のパスフレーズ" @@ -3941,44 +3623,30 @@ msgid "Privilege Escalation" msgstr "権限昇格" #: client/src/credentials/credentials.form.js:305 -#: client/src/job-submission/job-submission.partial.html:129 -#: client/src/credentials/factories/become-method-change.factory.js:19 -#: client/src/credentials/factories/kind-change.factory.js:76 -#: client/src/job-submission/job-submission.partial.html:127 +#: client/src/job-submission/job-submission.partial.html:132 msgid "Privilege Escalation Password" msgstr "権限昇格のパスワード" #: client/src/credentials/credentials.form.js:295 -#: client/src/credentials/factories/become-method-change.factory.js:18 -#: client/src/credentials/factories/kind-change.factory.js:75 msgid "Privilege Escalation Username" msgstr "権限昇格のユーザー名" #: client/src/credentials/factories/become-method-change.factory.js:30 #: client/src/credentials/factories/kind-change.factory.js:87 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:93 -#: client/src/job-results/job-results.partial.html:213 -#: client/src/templates/job_templates/job-template.form.js:103 +#: client/src/job-results/job-results.partial.html:216 +#: client/src/templates/job_templates/job-template.form.js:100 #: client/src/templates/job_templates/job-template.form.js:91 -#: client/src/credentials/factories/become-method-change.factory.js:32 -#: client/src/credentials/factories/kind-change.factory.js:89 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:88 -#: client/src/templates/job_templates/job-template.form.js:107 -#: client/src/templates/job_templates/job-template.form.js:95 msgid "Project" msgstr "プロジェクト" -#: client/src/credentials/factories/become-method-change.factory.js:59 -#: client/src/credentials/factories/kind-change.factory.js:116 -#: client/src/credentials/factories/become-method-change.factory.js:61 -#: client/src/credentials/factories/kind-change.factory.js:118 +#: client/src/credentials/factories/become-method-change.factory.js:53 +#: client/src/credentials/factories/kind-change.factory.js:110 msgid "Project (Tenant Name)" msgstr "プロジェクト (テナント名)" #: client/src/projects/projects.form.js:75 #: client/src/projects/projects.form.js:83 -#: client/src/projects/projects.form.js:74 -#: client/src/projects/projects.form.js:82 msgid "Project Base Path" msgstr "プロジェクトのベースパス" @@ -3987,7 +3655,6 @@ msgid "Project Name" msgstr "プロジェクト名" #: client/src/projects/projects.form.js:100 -#: client/src/projects/projects.form.js:99 msgid "Project Path" msgstr "プロジェクトパス" @@ -3996,12 +3663,11 @@ msgid "Project Sync Failures" msgstr "プロジェクトの同期の失敗" #: client/src/projects/list/projects-list.controller.js:170 -#: client/src/projects/list/projects-list.controller.js:169 msgid "Project lookup failed. GET returned:" msgstr "プロジェクトの検索に失敗しました。GET で以下が返されました:" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:121 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:48 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:115 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:47 #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:31 #: client/src/home/dashboard/counts/dashboard-counts.directive.js:61 #: client/src/organizations/linkout/organizations-linkout.route.js:206 @@ -4014,12 +3680,10 @@ msgid_plural "Promote groups" msgstr[0] "グループのプロモート" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:43 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:43 msgid "Promote groups" msgstr "グループのプロモート" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:32 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:32 msgid "Promote groups and hosts" msgstr "グループおよびホストのプロモート" @@ -4029,7 +3693,6 @@ msgid_plural "Promote hosts" msgstr[0] "ホストのプロモート" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:54 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:54 msgid "Promote hosts" msgstr "ホストのプロモート" @@ -4042,31 +3705,20 @@ msgid "Prompt" msgstr "プロンプト" #: client/lib/components/components.strings.js:30 -#: client/src/templates/job_templates/job-template.form.js:144 -#: client/src/templates/job_templates/job-template.form.js:174 -#: client/src/templates/job_templates/job-template.form.js:191 -#: client/src/templates/job_templates/job-template.form.js:217 -#: client/src/templates/job_templates/job-template.form.js:234 -#: client/src/templates/job_templates/job-template.form.js:259 -#: client/src/templates/job_templates/job-template.form.js:359 +#: client/src/templates/job_templates/job-template.form.js:139 +#: client/src/templates/job_templates/job-template.form.js:169 +#: client/src/templates/job_templates/job-template.form.js:186 +#: client/src/templates/job_templates/job-template.form.js:212 +#: client/src/templates/job_templates/job-template.form.js:229 +#: client/src/templates/job_templates/job-template.form.js:254 +#: client/src/templates/job_templates/job-template.form.js:354 #: client/src/templates/job_templates/job-template.form.js:60 #: client/src/templates/job_templates/job-template.form.js:86 -#: client/src/templates/job_templates/job-template.form.js:147 -#: client/src/templates/job_templates/job-template.form.js:183 -#: client/src/templates/job_templates/job-template.form.js:200 -#: client/src/templates/job_templates/job-template.form.js:228 -#: client/src/templates/job_templates/job-template.form.js:247 -#: client/src/templates/job_templates/job-template.form.js:261 -#: client/src/templates/job_templates/job-template.form.js:376 -#: client/src/templates/job_templates/job-template.form.js:64 -#: client/src/templates/job_templates/job-template.form.js:90 msgid "Prompt on launch" msgstr "起動プロンプト" #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:132 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:147 -#: client/src/templates/job_templates/job-template.form.js:220 -#: client/src/templates/job_templates/job-template.form.js:239 msgid "Provide a comma separated list of tags." msgstr "カンマ区切りのタグの一覧を指定してください。" @@ -4088,12 +3740,10 @@ msgstr "" #: client/src/inventories-hosts/hosts/host.form.js:50 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:49 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:49 -#: client/src/inventories-hosts/hosts/host.form.js:49 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:48 msgid "Provide a host name, ip address, or ip address:port. Examples include:" msgstr "host name、ip address、または ip address:port を指定してください。例:" -#: client/src/templates/job_templates/job-template.form.js:168 +#: client/src/templates/job_templates/job-template.form.js:163 msgid "" "Provide a host pattern to further constrain the list of hosts that will be " "managed or affected by the playbook. Multiple patterns are allowed. Refer to" @@ -4104,7 +3754,6 @@ msgstr "" " ドキュメントを参照してください。" #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:116 -#: client/src/templates/job_templates/job-template.form.js:174 msgid "" "Provide a host pattern to further constrain the list of hosts that will be " "managed or affected by the playbook. Multiple patterns can be separated by " @@ -4117,8 +3766,15 @@ msgstr "" msgid "Provide environment variables to pass to the custom inventory script." msgstr "カスタムインベントリースクリプトに渡す環境変数を指定します。" -#: client/src/templates/job_templates/job-template.form.js:316 -#: client/src/templates/job_templates/job-template.form.js:324 +#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:203 +#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:287 +msgid "" +"Provide the named URL encoded name or id of the remote Tower inventory to be" +" imported." +msgstr "インポートされるリモート Tower インベントリーの名前付き URL のエンコードされた名前または ID を指定します。" + +#: client/src/templates/job_templates/job-template.form.js:311 +#: client/src/templates/job_templates/job-template.form.js:319 msgid "Provisioning Callback URL" msgstr "プロビジョニングコールバック URL" @@ -4163,12 +3819,10 @@ msgstr "最近使用されたテンプレート" #: client/src/portal-mode/portal-mode-jobs.partial.html:20 #: client/src/projects/projects.list.js:71 #: client/src/scheduler/schedules.list.js:61 -#: client/src/activity-stream/streams.list.js:55 msgid "REFRESH" msgstr "更新" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:109 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:96 msgid "REGIONS" msgstr "リージョン" @@ -4176,7 +3830,7 @@ msgstr "リージョン" msgid "RELATED FIELDS:" msgstr "関連フィールド:" -#: client/src/shared/directives.js:78 client/src/shared/directives.js:136 +#: client/src/shared/directives.js:78 msgid "REMOVE" msgstr "削除" @@ -4194,14 +3848,11 @@ msgstr "結果" #: client/src/job-submission/job-submission.partial.html:44 #: client/src/job-submission/job-submission.partial.html:87 #: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:52 -#: client/src/job-submission/job-submission.partial.html:85 msgid "REVERT" msgstr "元に戻す" #: client/src/credentials/factories/become-method-change.factory.js:25 #: client/src/credentials/factories/kind-change.factory.js:82 -#: client/src/credentials/factories/become-method-change.factory.js:27 -#: client/src/credentials/factories/kind-change.factory.js:84 msgid "RSA Private Key" msgstr "RSA 秘密鍵" @@ -4222,7 +3873,7 @@ msgstr "コマンドの実行" msgid "Random" msgstr "ランダム" -#: client/src/job-results/job-results.partial.html:408 +#: client/src/job-results/job-results.partial.html:411 msgid "Read only view of extra variables added to the job template." msgstr "追加変数の読み取り専用ビューがジョブテンプレートに追加されました。" @@ -4234,9 +3885,8 @@ msgstr "追加変数の読み取り専用ビューがワークフローに追加 msgid "Recent Notifications" msgstr "最近の通知" -#: client/src/notifications/notificationTemplates.form.js:101 -#: client/src/notifications/notificationTemplates.form.js:97 -#: client/src/notifications/notificationTemplates.form.js:102 +#: client/src/notifications/notificationTemplates.form.js:94 +#: client/src/notifications/notificationTemplates.form.js:98 msgid "Recipient List" msgstr "受信者リスト" @@ -4245,7 +3895,7 @@ msgstr "受信者リスト" msgid "Red" msgstr "赤" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:68 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65 msgid "" "Refer to the Ansible Tower documentation for further syntax and examples." msgstr "追加の構文およびサンプルについては、Ansible Tower ドキュメントを参照してください。" @@ -4261,7 +3911,6 @@ msgstr "追加の構文およびサンプルについては、Ansible Tower ド #: client/src/inventories-hosts/inventories/related/sources/sources.list.js:50 #: client/src/projects/projects.list.js:67 #: client/src/scheduler/schedules.list.js:57 -#: client/src/activity-stream/streams.list.js:52 msgid "Refresh the page" msgstr "ページの更新" @@ -4271,7 +3920,6 @@ msgid "Region:" msgstr "リージョン:" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:131 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:122 msgid "Regions" msgstr "リージョン" @@ -4288,22 +3936,17 @@ msgstr "関連するグループ" msgid "Relaunch using the same parameters" msgstr "同一パラメーターによる起動" -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:199 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:205 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:194 msgid "Remediate Inventory" msgstr "インベントリーの修復" #: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:96 #: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:97 -#: client/src/teams/teams.form.js:142 client/src/users/users.form.js:218 -#: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:85 -#: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:86 -#: client/src/users/users.form.js:219 +#: client/src/teams/teams.form.js:142 client/src/users/users.form.js:222 msgid "Remove" msgstr "削除" #: client/src/projects/projects.form.js:158 -#: client/src/projects/projects.form.js:157 msgid "Remove any local modifications prior to performing an update." msgstr "更新の実行前にローカルの変更を削除します。" @@ -4315,7 +3958,7 @@ msgstr "繰り返しの頻度" msgid "Request License" msgstr "ライセンスの要求" -#: client/src/templates/survey-maker/shared/question-definition.form.js:288 +#: client/src/templates/survey-maker/shared/question-definition.form.js:291 msgid "Required" msgstr "必須" @@ -4323,12 +3966,11 @@ msgstr "必須" msgid "Reset" msgstr "リセット" -#: client/src/job-results/job-results.partial.html:120 +#: client/src/job-results/job-results.partial.html:123 msgid "Results Traceback" msgstr "結果のトレースバック" -#: client/src/shared/form-generator.js:684 -#: client/src/shared/form-generator.js:701 +#: client/src/shared/form-generator.js:690 msgid "Revert" msgstr "元に戻す" @@ -4343,45 +3985,40 @@ msgstr "元に戻す" #: client/src/configuration/auth-form/sub-forms/auth-tacacs.form.js:47 #: client/src/configuration/jobs-form/configuration-jobs.form.js:73 #: client/src/configuration/system-form/sub-forms/system-activity-stream.form.js:26 -#: client/src/configuration/system-form/sub-forms/system-logging.form.js:73 +#: client/src/configuration/system-form/sub-forms/system-logging.form.js:74 #: client/src/configuration/system-form/sub-forms/system-misc.form.js:50 #: client/src/configuration/ui-form/configuration-ui.form.js:36 msgid "Revert all to default" msgstr "すべてをデフォルトに戻す" -#: client/src/job-results/job-results.partial.html:236 +#: client/src/job-results/job-results.partial.html:239 #: client/src/projects/projects.list.js:50 msgid "Revision" msgstr "リビジョン" #: client/src/projects/add/projects-add.controller.js:146 -#: client/src/projects/edit/projects-edit.controller.js:275 +#: client/src/projects/edit/projects-edit.controller.js:281 msgid "Revision #" msgstr "リビジョン #" -#: client/features/credentials/legacy.credentials.js:91 +#: client/features/credentials/legacy.credentials.js:88 #: client/src/credentials/credentials.form.js:461 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:151 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:154 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:148 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:149 #: client/src/organizations/organizations.form.js:97 #: client/src/projects/projects.form.js:255 client/src/teams/teams.form.js:135 #: client/src/teams/teams.form.js:98 #: client/src/templates/workflows.form.js:138 -#: client/src/users/users.form.js:201 -#: client/features/credentials/legacy.credentials.js:86 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:160 -#: client/src/projects/projects.form.js:254 -#: client/src/templates/workflows.form.js:143 -#: client/src/users/users.form.js:202 +#: client/src/users/users.form.js:205 msgid "Role" msgstr "ロール" -#: client/src/instance-groups/instance-group.partial.html:15 -#: client/src/instance-groups/instance-groups.list.js:25 -#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:15 -#: client/src/instance-groups/instances/instances-list.partial.html:21 +#: client/src/instance-groups/instance-group.partial.html:14 +#: client/src/instance-groups/instance-groups.list.js:26 +#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:14 +#: client/src/instance-groups/instances/instances-list.partial.html:18 #: client/src/instance-groups/instances/instances.list.js:24 -#: client/src/instance-groups/list/instance-groups-list.partial.html:32 +#: client/src/instance-groups/list/instance-groups-list.partial.html:29 msgid "Running Jobs" msgstr "実行中のジョブ" @@ -4397,13 +4034,12 @@ msgstr "SAML" #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html:17 #: client/src/inventories-hosts/shared/associate-groups/associate-groups.partial.html:17 #: client/src/inventories-hosts/shared/associate-hosts/associate-hosts.partial.html:17 -#: client/src/partials/survey-maker-modal.html:86 +#: client/src/partials/survey-maker-modal.html:87 #: client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.partial.html:18 -#: client/lib/services/base-string.service.js:30 msgid "SAVE" msgstr "保存" -#: client/src/scheduler/main.js:331 client/src/scheduler/main.js:330 +#: client/src/scheduler/main.js:331 msgid "SCHEDULED" msgstr "スケジュール済み" @@ -4419,39 +4055,34 @@ msgstr "スケジュール済みジョブ" #: client/src/scheduler/main.js:145 client/src/scheduler/main.js:183 #: client/src/scheduler/main.js:235 client/src/scheduler/main.js:273 #: client/src/scheduler/main.js:52 client/src/scheduler/main.js:90 -#: client/src/activity-stream/get-target-title.factory.js:35 msgid "SCHEDULES" msgstr "スケジュール" #: client/src/projects/add/projects-add.controller.js:118 -#: client/src/projects/edit/projects-edit.controller.js:248 +#: client/src/projects/edit/projects-edit.controller.js:254 msgid "SCM Branch" msgstr "SCM ブランチ" #: client/src/projects/add/projects-add.controller.js:137 -#: client/src/projects/edit/projects-edit.controller.js:266 +#: client/src/projects/edit/projects-edit.controller.js:272 msgid "SCM Branch/Tag/Commit" msgstr "SCM ブランチ/タグ/コミット" #: client/src/projects/add/projects-add.controller.js:158 -#: client/src/projects/edit/projects-edit.controller.js:287 +#: client/src/projects/edit/projects-edit.controller.js:293 msgid "SCM Branch/Tag/Revision" msgstr "SCM ブランチ/タグ/リビジョン" #: client/src/projects/projects.form.js:159 -#: client/src/projects/projects.form.js:158 msgid "SCM Clean" msgstr "SCM クリーニング" #: client/src/projects/projects.form.js:170 -#: client/src/projects/projects.form.js:169 msgid "SCM Delete" msgstr "SCM 削除" #: client/src/credentials/factories/become-method-change.factory.js:20 #: client/src/credentials/factories/kind-change.factory.js:77 -#: client/src/credentials/factories/become-method-change.factory.js:22 -#: client/src/credentials/factories/kind-change.factory.js:79 msgid "SCM Private Key" msgstr "SCM 秘密鍵" @@ -4461,23 +4092,19 @@ msgstr "SCM タイプ" #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:49 #: client/src/projects/projects.form.js:180 -#: client/src/projects/projects.form.js:179 msgid "SCM Update" msgstr "SCM 更新" #: client/src/projects/list/projects-list.controller.js:222 -#: client/src/projects/list/projects-list.controller.js:221 msgid "SCM Update Cancel" msgstr "SCM 更新の取り消し" #: client/src/projects/projects.form.js:150 -#: client/src/projects/projects.form.js:149 msgid "SCM Update Options" msgstr "SCM 更新オプション" -#: client/src/projects/edit/projects-edit.controller.js:136 +#: client/src/projects/edit/projects-edit.controller.js:137 #: client/src/projects/list/projects-list.controller.js:84 -#: client/src/projects/list/projects-list.controller.js:83 msgid "SCM update currently running" msgstr "現在実行中の SCM 更新" @@ -4510,7 +4137,6 @@ msgstr "選択済み:" #: client/src/main-menu/main-menu.partial.html:59 #: client/src/setup-menu/setup.route.js:9 -#: client/src/setup-menu/setup.route.js:8 msgid "SETTINGS" msgstr "設定" @@ -4526,13 +4152,12 @@ msgstr "サインイン" msgid "SIGN IN WITH" msgstr "サインイン:" -#: client/src/inventories-hosts/hosts/host.list.js:109 +#: client/src/inventories-hosts/hosts/host.list.js:110 #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:32 msgid "SMART INVENTORY" msgstr "スマートインベントリー" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:102 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:89 msgid "SOURCE" msgstr "ソース" @@ -4540,10 +4165,8 @@ msgstr "ソース" msgid "SOURCES" msgstr "ソース" -#: client/src/credentials/factories/become-method-change.factory.js:95 -#: client/src/credentials/factories/kind-change.factory.js:152 -#: client/src/credentials/factories/become-method-change.factory.js:97 -#: client/src/credentials/factories/kind-change.factory.js:154 +#: client/src/credentials/factories/become-method-change.factory.js:89 +#: client/src/credentials/factories/kind-change.factory.js:146 msgid "SSH Key" msgstr "SSH キー" @@ -4551,22 +4174,19 @@ msgstr "SSH キー" msgid "SSH key description" msgstr "SSH キーの説明" -#: client/src/notifications/notificationTemplates.form.js:378 -#: client/src/notifications/notificationTemplates.form.js:390 +#: client/src/notifications/notificationTemplates.form.js:375 msgid "SSL Connection" msgstr "SSL 接続" #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:128 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:135 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:96 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:122 msgid "STANDARD OUT" msgstr "標準出力" #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:32 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:65 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:45 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:52 msgid "STARTED" msgstr "開始" @@ -4581,7 +4201,7 @@ msgstr "ステータス" msgid "STS Token" msgstr "STS トークン" -#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:60 +#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:61 msgid "SUCCESSFUL" msgstr "成功" @@ -4597,39 +4217,34 @@ msgstr "すべてを同期する" msgid "SYSTEM TRACKING" msgstr "システムトラッキング" -#: client/src/credentials/factories/become-method-change.factory.js:76 -#: client/src/credentials/factories/kind-change.factory.js:133 -#: client/src/credentials/factories/become-method-change.factory.js:78 -#: client/src/credentials/factories/kind-change.factory.js:135 +#: client/src/credentials/factories/become-method-change.factory.js:70 +#: client/src/credentials/factories/kind-change.factory.js:127 msgid "Satellite 6 URL" msgstr "Satellite 6 URL" #: client/src/access/add-rbac-resource/rbac-resource.partial.html:110 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:196 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:193 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:157 -#: client/src/shared/form-generator.js:1683 -#: client/src/shared/form-generator.js:1734 +#: client/src/shared/form-generator.js:1691 msgid "Save" msgstr "保存" #: client/src/configuration/auth-form/configuration-auth.controller.js:86 -#: client/src/configuration/configuration.controller.js:209 -#: client/src/configuration/configuration.controller.js:268 -#: client/src/configuration/system-form/configuration-system.controller.js:66 +#: client/src/configuration/configuration.controller.js:213 +#: client/src/configuration/configuration.controller.js:272 +#: client/src/configuration/system-form/configuration-system.controller.js:68 msgid "Save changes" msgstr "変更の保存" -#: client/src/license/license.partial.html:122 +#: client/src/license/license.partial.html:127 msgid "Save successful!" msgstr "正常に保存が実行されました!" #: client/src/templates/templates.list.js:88 -#: client/src/partials/subhome.html:10 msgid "Schedule" msgstr "スケジュール" #: client/src/management-jobs/card/card.partial.html:28 -#: client/src/management-jobs/card/card.partial.html:26 msgid "Schedule Management Job" msgstr "管理ジョブのスケジュール" @@ -4647,14 +4262,11 @@ msgstr "ジョブテンプレート実行のスケジュール" #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:33 #: client/src/jobs/jobs.partial.html:10 -#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:32 msgid "Schedules" msgstr "スケジュール" #: client/src/shared/smart-search/smart-search.controller.js:49 #: client/src/shared/smart-search/smart-search.controller.js:94 -#: client/src/shared/smart-search/smart-search.controller.js:39 -#: client/src/shared/smart-search/smart-search.controller.js:84 msgid "Search" msgstr "検索" @@ -4676,8 +4288,7 @@ msgstr "" "セキュリティートークンサービス (STS) は、AWS Identity and Access Management (IAM) " "ユーザーの一時的な、権限の制限された認証情報を要求できる web サービスです。" -#: client/src/shared/form-generator.js:1687 -#: client/src/shared/form-generator.js:1738 +#: client/src/shared/form-generator.js:1695 msgid "Select" msgstr "選択" @@ -4721,11 +4332,10 @@ msgstr "" #: client/src/configuration/jobs-form/configuration-jobs.controller.js:109 #: client/src/configuration/jobs-form/configuration-jobs.controller.js:134 #: client/src/configuration/ui-form/configuration-ui.controller.js:95 -#: client/src/configuration/jobs-form/configuration-jobs.controller.js:124 msgid "Select commands" msgstr "コマンドの選択" -#: client/src/templates/job_templates/job-template.form.js:138 +#: client/src/templates/job_templates/job-template.form.js:133 msgid "" "Select credentials that allow Tower to access the nodes this job will be ran" " against. You can only select one credential of each type. For machine " @@ -4739,7 +4349,6 @@ msgstr "" "については、認証情報を選択せずに「起動プロンプト」を選択すると、実行時にマシン認証情報を選択する必要があります。認証情報を選択し、「起動プロンプト」にチェックを付けている場合、選択した認証情報が実行時に更新できるデフォルトになります。" #: client/src/projects/projects.form.js:98 -#: client/src/projects/projects.form.js:97 msgid "" "Select from the list of directories found in the Project Base Path. Together" " the base path and the playbook directory provide the full path used to " @@ -4748,8 +4357,8 @@ msgstr "" "プロジェクトのベースパスにあるデイレクトリーの一覧から選択します。ベースパスと Playbook ディレクトリーは、Playbook " "を見つけるために使用される完全なパスを提供します。" -#: client/src/configuration/auth-form/configuration-auth.controller.js:262 -#: client/src/configuration/auth-form/configuration-auth.controller.js:281 +#: client/src/configuration/auth-form/configuration-auth.controller.js:263 +#: client/src/configuration/auth-form/configuration-auth.controller.js:282 msgid "Select group types" msgstr "グループタイプの選択" @@ -4757,20 +4366,18 @@ msgstr "グループタイプの選択" msgid "Select roles" msgstr "ロールの選択" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:77 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:85 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:74 msgid "Select the Instance Groups for this Inventory to run on." msgstr "このインベントリーが実行されるインスタンスグループを選択します。" -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:85 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:80 msgid "" "Select the Instance Groups for this Inventory to run on. Refer to the " "Ansible Tower documentation for more detail." msgstr "" "このインベントリーが実行されるインスタンスグループを選択します。詳細については、Ansible Tower ドキュメントを参照してください。" -#: client/src/templates/job_templates/job-template.form.js:198 -#: client/src/templates/job_templates/job-template.form.js:207 +#: client/src/templates/job_templates/job-template.form.js:193 msgid "Select the Instance Groups for this Job Template to run on." msgstr "このジョブテンプレートが実行されるインスタンスグループを選択します。" @@ -4789,7 +4396,6 @@ msgstr "" #: client/src/templates/job_templates/job-template.form.js:79 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:81 -#: client/src/templates/job_templates/job-template.form.js:83 msgid "Select the inventory containing the hosts you want this job to manage." msgstr "このジョブで管理するホストが含まれるインベントリーを選択してください。" @@ -4799,18 +4405,16 @@ msgid "" "the dropdown or enter a file within the input." msgstr "このソースで同期されるインベントリーファイルを選択します。ドロップダウンから選択するか、入力にファイルを指定できます。" -#: client/src/templates/job_templates/job-template.form.js:119 -#: client/src/templates/job_templates/job-template.form.js:123 +#: client/src/templates/job_templates/job-template.form.js:114 msgid "Select the playbook to be executed by this job." msgstr "このジョブで実行される Playbook を選択してください。" -#: client/src/templates/job_templates/job-template.form.js:102 -#: client/src/templates/job_templates/job-template.form.js:106 +#: client/src/templates/job_templates/job-template.form.js:99 msgid "" "Select the project containing the playbook you want this job to execute." msgstr "このジョブで実行する Playbook が含まれるプロジェクトを選択してください。" -#: client/src/configuration/system-form/configuration-system.controller.js:191 +#: client/src/configuration/system-form/configuration-system.controller.js:197 msgid "Select types" msgstr "タイプの選択" @@ -4819,15 +4423,12 @@ msgstr "タイプの選択" msgid "Select which groups to create automatically." msgstr "自動作成するグループを選択します。" -#: client/src/notifications/notificationTemplates.form.js:113 -#: client/src/notifications/notificationTemplates.form.js:114 +#: client/src/notifications/notificationTemplates.form.js:110 msgid "Sender Email" msgstr "送信者のメール" #: client/src/credentials/factories/become-method-change.factory.js:24 #: client/src/credentials/factories/kind-change.factory.js:81 -#: client/src/credentials/factories/become-method-change.factory.js:26 -#: client/src/credentials/factories/kind-change.factory.js:83 msgid "Service Account Email Address" msgstr "サービスアカウントのメールアドレス" @@ -4849,27 +4450,19 @@ msgstr "" msgid "Settings" msgstr "設定" -#: client/src/job-submission/job-submission.partial.html:107 -#: client/src/job-submission/job-submission.partial.html:120 -#: client/src/job-submission/job-submission.partial.html:133 -#: client/src/job-submission/job-submission.partial.html:146 -#: client/src/job-submission/job-submission.partial.html:292 -#: client/src/shared/form-generator.js:869 -#: client/src/job-submission/job-submission.partial.html:105 -#: client/src/job-submission/job-submission.partial.html:118 -#: client/src/job-submission/job-submission.partial.html:131 -#: client/src/job-submission/job-submission.partial.html:144 -#: client/src/job-submission/job-submission.partial.html:289 -#: client/src/shared/form-generator.js:892 +#: client/src/job-submission/job-submission.partial.html:108 +#: client/src/job-submission/job-submission.partial.html:122 +#: client/src/job-submission/job-submission.partial.html:136 +#: client/src/job-submission/job-submission.partial.html:150 +#: client/src/job-submission/job-submission.partial.html:299 +#: client/src/shared/form-generator.js:876 msgid "Show" msgstr "表示" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:114 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:117 -#: client/src/templates/job_templates/job-template.form.js:250 -#: client/src/templates/job_templates/job-template.form.js:253 -#: client/src/templates/job_templates/job-template.form.js:252 -#: client/src/templates/job_templates/job-template.form.js:255 +#: client/src/templates/job_templates/job-template.form.js:245 +#: client/src/templates/job_templates/job-template.form.js:248 msgid "Show Changes" msgstr "変更の表示" @@ -4877,43 +4470,33 @@ msgstr "変更の表示" #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:44 #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:55 #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:76 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:34 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:45 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:56 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:77 msgid "Sign in with %s" msgstr "%s でサインイン" #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:63 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:64 msgid "Sign in with %s Organizations" msgstr "%s 組織でサインイン" #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:61 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:62 msgid "Sign in with %s Teams" msgstr "%s チームでサインイン" -#: client/src/job-results/job-results.partial.html:392 -#: client/src/job-submission/job-submission.partial.html:239 -#: client/src/templates/job_templates/job-template.form.js:222 -#: client/src/templates/job_templates/job-template.form.js:229 +#: client/src/job-results/job-results.partial.html:395 +#: client/src/job-submission/job-submission.partial.html:245 +#: client/src/templates/job_templates/job-template.form.js:217 +#: client/src/templates/job_templates/job-template.form.js:224 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:142 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:150 -#: client/src/job-submission/job-submission.partial.html:237 -#: client/src/templates/job_templates/job-template.form.js:233 -#: client/src/templates/job_templates/job-template.form.js:242 msgid "Skip Tags" msgstr "スキップタグ" #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:148 -#: client/src/templates/job_templates/job-template.form.js:240 msgid "" "Skip tags are useful when you have a large playbook, and you want to skip " "specific parts of a play or task." msgstr "スキップタグは、Playbook のサイズが大きい場合にプレイまたはタスクの特定の部分をスキップする必要がある場合に役立ちます。" -#: client/src/templates/job_templates/job-template.form.js:228 +#: client/src/templates/job_templates/job-template.form.js:223 msgid "" "Skip tags are useful when you have a large playbook, and you want to skip " "specific parts of a play or task. Use commas to separate multiple tags. " @@ -4923,16 +4506,15 @@ msgstr "" "のサイズが大きい場合にプレイまたはタスクの特定の部分をスキップする必要がある場合に役立ちます。カンマを使って複数のタグを区切ります。タグの使用方法の詳細については、Ansible" " Tower ドキュメントを参照してください。" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:69 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:62 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:66 msgid "Smart Host Filter" msgstr "スマートホストフィルター" #: client/src/inventories-hosts/inventories/inventory.list.js:85 #: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:69 #: client/src/organizations/linkout/controllers/organizations-inventories.controller.js:70 -#: client/src/shared/form-generator.js:1449 -#: client/src/shared/form-generator.js:1500 +#: client/src/shared/form-generator.js:1456 msgid "Smart Inventory" msgstr "スマートインベントリー" @@ -4942,8 +4524,6 @@ msgstr "Playbook で解決可能" #: client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.directive.js:57 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:64 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:61 -#: client/src/partials/subhome.html:8 msgid "Source" msgstr "ソース" @@ -4956,15 +4536,12 @@ msgstr "ソースコントロール" msgid "Source Details" msgstr "ソース詳細" -#: client/src/notifications/notificationTemplates.form.js:195 -#: client/src/notifications/notificationTemplates.form.js:196 -#: client/src/notifications/notificationTemplates.form.js:198 -#: client/src/notifications/notificationTemplates.form.js:199 +#: client/src/notifications/notificationTemplates.form.js:192 +#: client/src/notifications/notificationTemplates.form.js:193 msgid "Source Phone Number" msgstr "発信元の電話番号" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:136 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:127 msgid "Source Regions" msgstr "ソースリージョン" @@ -4978,10 +4555,6 @@ msgstr "ソースリージョン" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:281 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:291 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:298 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:195 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:202 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:218 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:241 msgid "Source Variables" msgstr "ソース変数" @@ -4990,12 +4563,11 @@ msgid "Source Vars" msgstr "ソース変数" #: client/src/inventories-hosts/inventories/related/sources/sources.list.js:34 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:189 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:195 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:184 msgid "Sources" msgstr "ソース" -#: client/src/notifications/notificationTemplates.form.js:333 +#: client/src/notifications/notificationTemplates.form.js:330 msgid "" "Specify HTTP Headers in JSON format. Refer to the Ansible Tower " "documentation for example syntax." @@ -5007,7 +4579,7 @@ msgid "" "parameter, where %s could be %s" msgstr "%s 操作のメソッドを指定します。これは %s を指定することに相当します。%s は %s にすることができます。" -#: client/src/notifications/notificationTemplates.form.js:295 +#: client/src/notifications/notificationTemplates.form.js:292 msgid "" "Specify a notification color. Acceptable colors are: yellow, green, red " "purple, gray or random." @@ -5046,7 +4618,7 @@ msgstr "開始時間" msgid "Start a job using this template" msgstr "このテンプレートを使用したジョブの開始" -#: client/src/projects/edit/projects-edit.controller.js:133 +#: client/src/projects/edit/projects-edit.controller.js:134 #: client/src/projects/list/projects-list.controller.js:74 msgid "Start an SCM update" msgstr "SCM 更新の開始" @@ -5055,9 +4627,9 @@ msgstr "SCM 更新の開始" msgid "Start sync process" msgstr "同期プロセスの開始" -#: client/src/job-results/job-results.partial.html:97 +#: client/src/job-results/job-results.partial.html:100 msgid "Started" -msgstr "開始 " +msgstr "開始日時" #: client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js:53 #: client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.directive.js:55 @@ -5073,7 +4645,7 @@ msgstr "ステータス" msgid "Sub Category" msgstr "サブカテゴリー" -#: client/src/license/license.partial.html:121 +#: client/src/license/license.partial.html:126 msgid "Submit" msgstr "送信" @@ -5110,7 +4682,7 @@ msgstr "成功" msgid "Survey" msgstr "Survey" -#: client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js:57 +#: client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js:60 #: client/src/templates/workflows/edit-workflow/workflow-edit.controller.js:64 msgid "" "Surveys allow users to be prompted at job launch with a series of questions " @@ -5181,8 +4753,6 @@ msgstr "TACACS+" #: client/src/organizations/list/organizations-list.controller.js:60 #: client/src/teams/main.js:46 client/src/teams/teams.list.js:14 #: client/src/teams/teams.list.js:15 -#: client/src/activity-stream/get-target-title.factory.js:20 -#: client/src/organizations/linkout/organizations-linkout.route.js:96 msgid "TEAMS" msgstr "チーム" @@ -5192,11 +4762,14 @@ msgstr "チーム" #: client/src/templates/list/templates-list.route.js:13 #: client/src/templates/templates.list.js:15 #: client/src/templates/templates.list.js:16 -#: client/src/activity-stream/get-target-title.factory.js:41 msgid "TEMPLATES" msgstr "テンプレート" -#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:102 +#: client/src/instance-groups/instance-groups.list.js:8 +msgid "THERE ARE CURRENTLY NO INSTANCE GROUPS DEFINED" +msgstr "現時点で定義されたインスタンスグループはありません" + +#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:104 msgid "TIME" msgstr "時間" @@ -5210,13 +4783,12 @@ msgid "Tag None:" msgstr "タグ None:" #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:133 -#: client/src/templates/job_templates/job-template.form.js:221 msgid "" "Tags are useful when you have a large playbook, and you want to run a " "specific part of a play or task." msgstr "タグは、Playbook のサイズが大きい場合にプレイまたはタスクの特定の部分を実行する必要がある場合に役立ちます。" -#: client/src/templates/job_templates/job-template.form.js:211 +#: client/src/templates/job_templates/job-template.form.js:206 msgid "" "Tags are useful when you have a large playbook, and you want to run a " "specific part of a play or task. Use commas to separate multiple tags. Refer" @@ -5231,25 +4803,20 @@ msgstr "" msgid "Tags:" msgstr "タグ:" -#: client/src/notifications/notificationTemplates.form.js:312 -#: client/src/notifications/notificationTemplates.form.js:317 +#: client/src/notifications/notificationTemplates.form.js:309 msgid "Target URL" msgstr "ターゲット URL" -#: client/src/job-results/job-results.partial.html:493 +#: client/src/job-results/job-results.partial.html:496 msgid "Tasks" msgstr "タスク" -#: client/features/credentials/legacy.credentials.js:97 +#: client/features/credentials/legacy.credentials.js:94 #: client/src/credentials/credentials.form.js:467 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:157 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:160 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:154 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:155 #: client/src/projects/projects.form.js:261 #: client/src/templates/workflows.form.js:144 -#: client/features/credentials/legacy.credentials.js:92 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:166 -#: client/src/projects/projects.form.js:260 -#: client/src/templates/workflows.form.js:149 msgid "Team Roles" msgstr "チームロール" @@ -5258,20 +4825,16 @@ msgstr "チームロール" #: client/src/organizations/linkout/organizations-linkout.route.js:108 #: client/src/setup-menu/setup-menu.partial.html:16 #: client/src/shared/stateDefinitions.factory.js:410 -#: client/src/users/users.form.js:155 -#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:33 -#: client/src/shared/stateDefinitions.factory.js:364 -#: client/src/users/users.form.js:156 +#: client/src/users/users.form.js:159 msgid "Teams" msgstr "チーム" -#: client/src/job-results/job-results.partial.html:132 +#: client/src/job-results/job-results.partial.html:135 #: client/src/templates/templates.list.js:14 msgid "Template" msgstr "テンプレート" #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:35 -#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:34 msgid "Templates" msgstr "テンプレート" @@ -5279,7 +4842,7 @@ msgstr "テンプレート" msgid "Tenant ID" msgstr "テナント ID" -#: client/src/configuration/system-form/sub-forms/system-logging.form.js:78 +#: client/src/configuration/system-form/sub-forms/system-logging.form.js:79 msgid "Test" msgstr "テスト" @@ -5287,10 +4850,8 @@ msgstr "テスト" msgid "Test notification" msgstr "テスト通知" -#: client/src/shared/form-generator.js:1379 -#: client/src/shared/form-generator.js:1385 -#: client/src/shared/form-generator.js:1430 -#: client/src/shared/form-generator.js:1436 +#: client/src/shared/form-generator.js:1386 +#: client/src/shared/form-generator.js:1392 msgid "That value was not found. Please enter or select a valid value." msgstr "値が見つかりませんでした。有効な値を入力または選択してください。" @@ -5304,14 +4865,12 @@ msgstr "{{inventory.name}} の Insights 認証情報が見つかりませんで #: client/src/credentials/factories/become-method-change.factory.js:32 #: client/src/credentials/factories/kind-change.factory.js:89 -#: client/src/credentials/factories/become-method-change.factory.js:34 -#: client/src/credentials/factories/kind-change.factory.js:91 msgid "" "The Project ID is the GCE assigned identification. It is constructed as two " "words followed by a three digit number. Such as:" msgstr "プロジェクト ID は GCE によって割り当てられる識別情報です。これは、以下のように 2 語とそれに続く 3 桁の数字で構成されます。" -#: client/src/projects/edit/projects-edit.controller.js:326 +#: client/src/projects/edit/projects-edit.controller.js:332 msgid "The SCM update process is running." msgstr "SCM 更新プロセスが実行中です。" @@ -5324,14 +4883,12 @@ msgid "" "The email address assigned to the Google Compute Engine %sservice account." msgstr "Google Compute Engine %sサービスアカウントに割り当てられたメールアドレス。" -#: client/src/job-results/job-results.partial.html:510 +#: client/src/job-results/job-results.partial.html:513 msgid "The host count will update when the job is complete." msgstr "ジョブの完了時にホスト数が更新されます。" -#: client/src/credentials/factories/become-method-change.factory.js:68 -#: client/src/credentials/factories/kind-change.factory.js:125 -#: client/src/credentials/factories/become-method-change.factory.js:70 -#: client/src/credentials/factories/kind-change.factory.js:127 +#: client/src/credentials/factories/become-method-change.factory.js:62 +#: client/src/credentials/factories/kind-change.factory.js:119 msgid "The host to authenticate with." msgstr "認証するホスト。" @@ -5350,7 +4907,6 @@ msgid "" msgstr "最終の削除が処理されるまでインベントリーは保留状態になります。" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:104 -#: client/src/templates/job_templates/job-template.form.js:160 msgid "" "The number of parallel or simultaneous processes to use while executing the " "playbook. Inputting no value will use the default value from the %sansible " @@ -5359,7 +4915,7 @@ msgstr "" "Playbook の実行中に使用する並列または同時プロセスの数です。いずれの値も入力しないと、 %sansible 設定ファイル%s " "のデフォルト値が使用されます。" -#: client/src/templates/job_templates/job-template.form.js:157 +#: client/src/templates/job_templates/job-template.form.js:152 msgid "" "The number of parallel or simultaneous processes to use while executing the " "playbook. Value defaults to 0. Refer to the Ansible documentation for " @@ -5368,8 +4924,7 @@ msgstr "" "Playbook の実行中に使用する並列または同時プロセスの数です。デフォルト値は 0 になります。設定ファイルについての詳細は、Ansible " "ドキュメントを参照してください。" -#: client/src/job-results/job-results.controller.js:590 -#: client/src/job-results/job-results.controller.js:585 +#: client/src/job-results/job-results.controller.js:619 msgid "The output is too large to display. Please download." msgstr "出力が大きすぎて表示できません。ダウンロードしてください。" @@ -5378,7 +4933,6 @@ msgid "The project value" msgstr "プロジェクト値" #: client/src/projects/list/projects-list.controller.js:159 -#: client/src/projects/list/projects-list.controller.js:158 msgid "" "The selected project is not configured for SCM. To configure for SCM, edit " "the project and provide SCM settings, and then run an update." @@ -5392,6 +4946,15 @@ msgid "" "filters to narrow the standard out." msgstr "標準出力が大きすぎて表示できません。標準出力の範囲を制限するために追加のフィルターを指定してください。" +#: client/src/templates/survey-maker/shared/question-definition.form.js:52 +msgid "" +"The suggested format for variable names is lowercase and underscore-" +"separated (for example, foo_bar, user_id, host_name, etc.). Variable names " +"with spaces are not allowed." +msgstr "" +"推奨される変数名の形式は小文字のみを使用し、それらをアンダースコアで区切る形です (foo_bar、user_id、host_name " +"など)。スペースを含む変数名は許可されません。" + #: client/src/management-jobs/scheduler/schedulerForm.partial.html:124 msgid "The time must be in HH24:MM:SS format." msgstr "時間は HH24:MM:SS 形式で表示される必要があります。" @@ -5413,7 +4976,6 @@ msgid "There are no jobs to display at this time" msgstr "現時点で表示できるジョブはありません" #: client/src/projects/list/projects-list.controller.js:150 -#: client/src/projects/list/projects-list.controller.js:149 msgid "" "There is no SCM update information available for this project. An update has" " not yet been completed. If you have not already done so, start an update " @@ -5422,17 +4984,27 @@ msgstr "" "このプロジェクトに利用できる SCM " "更新情報はありません。更新はまだ完了していません。まだ更新を実行していない場合は、このプロジェクトの更新を開始してください。" -#: client/src/configuration/configuration.controller.js:345 -#: client/src/configuration/configuration.controller.js:342 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:140 +msgid "There was an error deleting inventory source groups. Returned status:" +msgstr "インベントリーソースグループの削除中にエラーが発生しました。返されたステータス:" + +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:130 +msgid "There was an error deleting inventory source hosts. Returned status:" +msgstr "インベントリーソースホストの削除中にエラーが発生しました。返されたステータス:" + +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:167 +msgid "There was an error deleting inventory source. Returned status:" +msgstr "インベントリーソースの削除中にエラーが発生しました。返されたステータス:" + +#: client/src/configuration/configuration.controller.js:349 msgid "There was an error resetting value. Returned status:" msgstr "値のリセット中にエラーが発生しました。返されたステータス:" -#: client/src/configuration/configuration.controller.js:525 -#: client/src/configuration/configuration.controller.js:519 +#: client/src/configuration/configuration.controller.js:531 msgid "There was an error resetting values. Returned status:" msgstr "値のリセット中にエラーが発生しました。返されたステータス:" -#: client/src/configuration/system-form/configuration-system.controller.js:227 +#: client/src/configuration/system-form/configuration-system.controller.js:232 msgid "There was an error testing the log aggregator. Returned status:" msgstr "ログアグリゲーターのテスト中にエラーが発生しました。返されたステータス:" @@ -5454,10 +5026,8 @@ msgstr "このグループには以下が含まれます。" msgid "This is not a valid number." msgstr "これは無効な数値です。" -#: client/src/credentials/factories/become-method-change.factory.js:65 -#: client/src/credentials/factories/kind-change.factory.js:122 -#: client/src/credentials/factories/become-method-change.factory.js:67 -#: client/src/credentials/factories/kind-change.factory.js:124 +#: client/src/credentials/factories/become-method-change.factory.js:59 +#: client/src/credentials/factories/kind-change.factory.js:116 msgid "" "This is the tenant name. This value is usually the same as the username." msgstr "これはテナント名です。通常、この値はユーザー名と同じです。" @@ -5473,27 +5043,23 @@ msgid "" "This machine has not checked in with Insights in {{last_check_in}} hours" msgstr "このマシンは {{last_check_in}} 時間 Insights にチェックインしていません" -#: client/src/shared/form-generator.js:740 -#: client/src/shared/form-generator.js:765 +#: client/src/shared/form-generator.js:746 msgid "" "This setting has been set manually in a settings file and is now disabled." msgstr "この値は設定ファイルに手動で設定され、現在は無効にされています。" -#: client/src/users/users.form.js:160 client/src/users/users.form.js:161 +#: client/src/users/users.form.js:164 msgid "This user is not a member of any teams" msgstr "このユーザーはいずれのチームのメンバーでもありません。" -#: client/src/shared/form-generator.js:849 -#: client/src/shared/form-generator.js:944 -#: client/src/shared/form-generator.js:872 -#: client/src/shared/form-generator.js:968 +#: client/src/shared/form-generator.js:856 +#: client/src/shared/form-generator.js:951 msgid "" "This value does not match the password you entered previously. Please " "confirm that password." msgstr "この値は以前に入力されたパスワードと一致しません。パスワードを確認してください。" -#: client/src/configuration/configuration.controller.js:550 -#: client/src/configuration/configuration.controller.js:544 +#: client/src/configuration/configuration.controller.js:556 msgid "" "This will reset all configuration values to their factory defaults. Are you " "sure you want to proceed?" @@ -5502,7 +5068,6 @@ msgstr "これにより、すべての設定値が出荷時の設定にリセッ #: client/src/activity-stream/streams.list.js:25 #: client/src/home/dashboard/lists/jobs/jobs-list.partial.html:14 #: client/src/notifications/notification-templates-list/list.controller.js:72 -#: client/src/activity-stream/streams.list.js:26 msgid "Time" msgstr "時間" @@ -5511,7 +5076,6 @@ msgid "Time Remaining" msgstr "残りの時間" #: client/src/projects/projects.form.js:196 -#: client/src/projects/projects.form.js:195 msgid "" "Time in seconds to consider a project to be current. During job runs and " "callbacks the task system will evaluate the timestamp of the latest project " @@ -5537,8 +5101,7 @@ msgid "" "documentation%s." msgstr "IAM STS トークンについての詳細は、%sAmazon ドキュメント%s を参照してください。" -#: client/src/shared/form-generator.js:874 -#: client/src/shared/form-generator.js:897 +#: client/src/shared/form-generator.js:881 msgid "Toggle the display of plaintext." msgstr "プレーンテキストの表示を切り替えます。" @@ -5567,7 +5130,7 @@ msgstr "トレースバック" #: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:52 #: client/src/inventories-hosts/inventories/related/sources/sources.list.js:41 #: client/src/jobs/all-jobs.list.js:59 -#: client/src/notifications/notificationTemplates.form.js:57 +#: client/src/notifications/notificationTemplates.form.js:54 #: client/src/notifications/notificationTemplates.list.js:39 #: client/src/notifications/notifications.list.js:31 #: client/src/projects/projects.list.js:44 @@ -5576,9 +5139,7 @@ msgstr "トレースバック" #: client/src/templates/completed-jobs.list.js:53 #: client/src/templates/templates.list.js:31 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:27 -#: client/src/users/users.form.js:196 -#: client/src/credential-types/credential-types.list.js:28 -#: client/src/users/users.form.js:197 +#: client/src/users/users.form.js:200 msgid "Type" msgstr "タイプ" @@ -5589,7 +5150,7 @@ msgid "Type Details" msgstr "タイプの詳細" #: client/src/projects/add/projects-add.controller.js:169 -#: client/src/projects/edit/projects-edit.controller.js:298 +#: client/src/projects/edit/projects-edit.controller.js:304 msgid "URL popover text" msgstr "URL ポップオーバーテキスト" @@ -5602,8 +5163,6 @@ msgstr "ユーザー名" #: client/src/organizations/list/organizations-list.controller.js:54 #: client/src/users/main.js:46 client/src/users/users.list.js:18 #: client/src/users/users.list.js:19 -#: client/src/activity-stream/get-target-title.factory.js:17 -#: client/src/organizations/linkout/organizations-linkout.route.js:41 msgid "USERS" msgstr "ユーザー" @@ -5611,6 +5170,10 @@ msgstr "ユーザー" msgid "Unable to Submit" msgstr "送信できません" +#: client/lib/components/components.strings.js:52 +msgid "Unavailable to run jobs." +msgstr "ジョブの実行に使用できません。" + #: client/lib/components/components.strings.js:22 msgid "Unexpected Error" msgstr "予期しないエラー" @@ -5627,36 +5190,29 @@ msgstr "サポートされない表示モデルタイプ" msgid "Unsupported input type" msgstr "サポートされない入力タイプ" -#: client/src/projects/list/projects-list.controller.js:267 -#: client/src/projects/list/projects-list.controller.js:265 +#: client/src/projects/list/projects-list.controller.js:266 msgid "Update Not Found" msgstr "更新が見つかりません" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:321 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:276 msgid "Update Options" msgstr "オプションの更新" -#: client/src/projects/edit/projects-edit.controller.js:326 +#: client/src/projects/edit/projects-edit.controller.js:332 msgid "Update in Progress" msgstr "更新が進行中です" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:352 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:357 #: client/src/projects/projects.form.js:177 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:308 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:313 -#: client/src/projects/projects.form.js:176 msgid "Update on Launch" msgstr "起動時の更新" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:364 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:320 msgid "Update on Project Change" msgstr "プロジェクト変更時の更新" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:370 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:326 msgid "Update on Project Update" msgstr "プロジェクト更新時の更新" @@ -5664,21 +5220,26 @@ msgstr "プロジェクト更新時の更新" msgid "Upgrade" msgstr "アップグレード" +#: client/src/templates/job_templates/job-template.form.js:299 #: client/src/templates/job_templates/job-template.form.js:304 -#: client/src/templates/job_templates/job-template.form.js:309 msgid "Use Fact Cache" msgstr "ファクトのキャッシュの使用" -#: client/src/notifications/notificationTemplates.form.js:398 -#: client/src/notifications/notificationTemplates.form.js:410 +#: client/src/notifications/notificationTemplates.form.js:395 msgid "Use SSL" msgstr "SSL の使用" -#: client/src/notifications/notificationTemplates.form.js:393 -#: client/src/notifications/notificationTemplates.form.js:405 +#: client/src/notifications/notificationTemplates.form.js:390 msgid "Use TLS" msgstr "TLS の使用" +#: client/src/instance-groups/instance-group.partial.html:10 +#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:10 +#: client/src/instance-groups/instances/instances-list.partial.html:21 +#: client/src/instance-groups/list/instance-groups-list.partial.html:32 +msgid "Used Capacity" +msgstr "使用済み容量" + #: client/src/credentials/credentials.form.js:76 msgid "" "Used to check out and synchronize playbook repositories with a remote source" @@ -5688,17 +5249,13 @@ msgstr "" "Git、Subversion (svn)、または Mercurial (hg) などのリモートソースコントロール管理システムで Playbook " "リポジトリーをチェックアウトし、同期するために使用されます。これらの認証情報はプロジェクトで使用されます。" -#: client/features/credentials/legacy.credentials.js:86 +#: client/features/credentials/legacy.credentials.js:83 #: client/src/credentials/credentials.form.js:456 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:146 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:149 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:143 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:144 #: client/src/organizations/organizations.form.js:92 #: client/src/projects/projects.form.js:250 client/src/teams/teams.form.js:93 #: client/src/templates/workflows.form.js:133 -#: client/features/credentials/legacy.credentials.js:81 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:155 -#: client/src/projects/projects.form.js:249 -#: client/src/templates/workflows.form.js:138 msgid "User" msgstr "ユーザー" @@ -5706,21 +5263,19 @@ msgstr "ユーザー" msgid "User Interface" msgstr "ユーザーインターフェース" -#: client/src/users/users.form.js:91 client/src/users/users.form.js:92 +#: client/src/users/users.form.js:95 msgid "User Type" msgstr "ユーザータイプ" #: client/src/access/rbac-multiselect/permissionsUsers.list.js:30 #: client/src/credentials/factories/become-method-change.factory.js:17 -#: client/src/credentials/factories/become-method-change.factory.js:44 -#: client/src/credentials/factories/kind-change.factory.js:101 +#: client/src/credentials/factories/become-method-change.factory.js:38 #: client/src/credentials/factories/kind-change.factory.js:17 #: client/src/credentials/factories/kind-change.factory.js:41 #: client/src/credentials/factories/kind-change.factory.js:74 -#: client/src/notifications/notificationTemplates.form.js:67 +#: client/src/credentials/factories/kind-change.factory.js:95 +#: client/src/notifications/notificationTemplates.form.js:64 #: client/src/users/users.form.js:58 client/src/users/users.list.js:29 -#: client/src/credentials/factories/become-method-change.factory.js:46 -#: client/src/credentials/factories/kind-change.factory.js:103 msgid "Username" msgstr "ユーザー名" @@ -5738,7 +5293,6 @@ msgstr "" #: client/src/organizations/organizations.form.js:74 #: client/src/setup-menu/setup-menu.partial.html:10 #: client/src/teams/teams.form.js:75 -#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:35 msgid "Users" msgstr "ユーザー" @@ -5773,26 +5327,22 @@ msgstr "有効なライセンス" #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.form.js:47 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:67 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:67 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:84 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:93 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:99 -#: client/src/inventories-hosts/hosts/host.form.js:67 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:66 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:81 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:88 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:94 msgid "Variables" msgstr "変数" -#: client/src/job-submission/job-submission.partial.html:357 -#: client/src/job-submission/job-submission.partial.html:354 +#: client/src/job-submission/job-submission.partial.html:364 msgid "Vault" msgstr "Vault" -#: client/src/job-results/job-results.partial.html:318 +#: client/src/job-results/job-results.partial.html:321 msgid "Vault Credential" msgstr "Vault 認証情報" #: client/src/credentials/credentials.form.js:391 -#: client/src/job-submission/job-submission.partial.html:142 -#: client/src/job-submission/job-submission.partial.html:140 +#: client/src/job-submission/job-submission.partial.html:146 msgid "Vault Password" msgstr "Vault パスワード" @@ -5800,16 +5350,11 @@ msgstr "Vault パスワード" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:90 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:307 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:314 -#: client/src/job-results/job-results.partial.html:355 -#: client/src/job-submission/job-submission.partial.html:178 +#: client/src/job-results/job-results.partial.html:358 +#: client/src/job-submission/job-submission.partial.html:183 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:99 -#: client/src/templates/job_templates/job-template.form.js:179 -#: client/src/templates/job_templates/job-template.form.js:186 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:263 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:270 -#: client/src/job-submission/job-submission.partial.html:176 -#: client/src/templates/job_templates/job-template.form.js:188 -#: client/src/templates/job_templates/job-template.form.js:195 +#: client/src/templates/job_templates/job-template.form.js:174 +#: client/src/templates/job_templates/job-template.form.js:181 msgid "Verbosity" msgstr "詳細" @@ -5821,14 +5366,12 @@ msgstr "バージョン" #: client/src/credential-types/credential-types.list.js:64 #: client/src/credentials/credentials.list.js:75 #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:58 -#: client/src/inventories-hosts/inventories/inventory.list.js:105 +#: client/src/inventories-hosts/inventories/inventory.list.js:104 #: client/src/inventory-scripts/inventory-scripts.list.js:62 #: client/src/notifications/notificationTemplates.list.js:82 #: client/src/scheduler/schedules.list.js:83 client/src/teams/teams.list.js:64 #: client/src/templates/templates.list.js:112 #: client/src/users/users.list.js:70 -#: client/src/activity-stream/streams.list.js:64 -#: client/src/credential-types/credential-types.list.js:61 msgid "View" msgstr "表示" @@ -5853,10 +5396,7 @@ msgstr "JSON サンプルの表示: " #: client/src/inventories-hosts/hosts/host.form.js:78 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:77 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:77 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:94 -#: client/src/inventories-hosts/hosts/host.form.js:77 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:76 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:103 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:91 msgid "View JSON examples at %s" msgstr "JSON サンプルを %s に表示" @@ -5868,12 +5408,9 @@ msgstr "簡易表示" msgid "View More" msgstr "詳細表示" -#: client/src/shared/form-generator.js:1711 -#: client/src/templates/job_templates/job-template.form.js:441 +#: client/src/shared/form-generator.js:1719 +#: client/src/templates/job_templates/job-template.form.js:436 #: client/src/templates/workflows.form.js:161 -#: client/src/shared/form-generator.js:1762 -#: client/src/templates/job_templates/job-template.form.js:458 -#: client/src/templates/workflows.form.js:166 msgid "View Survey" msgstr "Survey の表示" @@ -5886,20 +5423,15 @@ msgstr "YAML サンプルの表示: " #: client/src/inventories-hosts/hosts/host.form.js:79 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:78 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:78 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:95 -#: client/src/inventories-hosts/hosts/host.form.js:78 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:77 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:104 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:92 msgid "View YAML examples at %s" msgstr "YAML サンプルを %s に表示" #: client/src/setup-menu/setup-menu.partial.html:72 -#: client/src/setup-menu/setup-menu.partial.html:54 msgid "View Your License" msgstr "ライセンスの表示" #: client/src/setup-menu/setup-menu.partial.html:73 -#: client/src/setup-menu/setup-menu.partial.html:55 msgid "View and edit your license information." msgstr "ライセンス情報を表示し、編集します。" @@ -5908,12 +5440,10 @@ msgid "View credential" msgstr "認証情報の表示" #: client/src/credential-types/credential-types.list.js:66 -#: client/src/credential-types/credential-types.list.js:63 msgid "View credential type" msgstr "認証情報タイプの表示" #: client/src/activity-stream/streams.list.js:67 -#: client/src/activity-stream/streams.list.js:68 msgid "View event details" msgstr "イベント詳細の表示" @@ -5930,11 +5460,10 @@ msgid "View host" msgstr "ホストの表示" #: client/src/setup-menu/setup-menu.partial.html:67 -#: client/src/setup-menu/setup-menu.partial.html:73 msgid "View information about this version of Ansible {{BRAND_NAME}}." msgstr "本バージョンの Ansible {{BRAND_NAME}} についての情報を表示します。" -#: client/src/inventories-hosts/inventories/inventory.list.js:107 +#: client/src/inventories-hosts/inventories/inventory.list.js:106 msgid "View inventory" msgstr "インベントリーの表示" @@ -5943,7 +5472,6 @@ msgid "View inventory script" msgstr "インベントリースクリプトの表示" #: client/src/setup-menu/setup-menu.partial.html:55 -#: client/src/setup-menu/setup-menu.partial.html:61 msgid "View list and capacity of {{BRAND_NAME}} instances." msgstr "{{BRAND_NAME}} インスタンスの一覧および容量を表示します。" @@ -5951,7 +5479,7 @@ msgstr "{{BRAND_NAME}} インスタンスの一覧および容量を表示しま msgid "View notification" msgstr "通知の表示" -#: client/src/job-results/job-results.partial.html:219 +#: client/src/job-results/job-results.partial.html:222 msgid "View project sync results" msgstr "プロジェクトの同期結果の表示" @@ -5994,7 +5522,7 @@ msgstr "ユーザーの表示" #: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:42 #: client/src/instance-groups/jobs/jobs.list.js:41 -#: client/src/job-results/job-results.partial.html:142 +#: client/src/job-results/job-results.partial.html:145 #: client/src/jobs/all-jobs.list.js:49 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:25 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:25 @@ -6006,9 +5534,9 @@ msgid "WORKFLOW" msgstr "ワークフロー" #: client/src/configuration/auth-form/configuration-auth.controller.js:73 -#: client/src/configuration/configuration.controller.js:196 -#: client/src/configuration/configuration.controller.js:258 -#: client/src/configuration/system-form/configuration-system.controller.js:53 +#: client/src/configuration/configuration.controller.js:200 +#: client/src/configuration/configuration.controller.js:262 +#: client/src/configuration/system-form/configuration-system.controller.js:55 msgid "Warning: Unsaved Changes" msgstr "警告: 変更が保存されていません" @@ -6036,17 +5564,14 @@ msgstr "" "チェックが付けられていない場合、外部ソースにないローカルの子ホストおよびグループは、インベントリーの更新プロセスによって処理されないままになります。" #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:97 -#: client/src/templates/job_templates/job-template.form.js:54 msgid "" "When this template is submitted as a job, setting the type to %s will " "execute the playbook, running tasks on the selected hosts." msgstr "" "このテンプレートがジョブとして送信される場合、タイプを %s に設定すると Playbook が実行され、選択されたホストでタスクが実行されます。" -#: client/src/shared/form-generator.js:1715 +#: client/src/shared/form-generator.js:1723 #: client/src/templates/workflows.form.js:187 -#: client/src/shared/form-generator.js:1766 -#: client/src/templates/workflows.form.js:192 msgid "Workflow Editor" msgstr "ワークフローエディター" @@ -6054,13 +5579,12 @@ msgstr "ワークフローエディター" msgid "Workflow Template" msgstr "ワークフローテンプレート" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:115 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:109 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:41 msgid "Workflow Templates" msgstr "ワークフローテンプレート" -#: client/src/job-submission/job-submission.partial.html:167 -#: client/src/job-submission/job-submission.partial.html:165 +#: client/src/job-submission/job-submission.partial.html:171 msgid "YAML" msgstr "YAML" @@ -6081,7 +5605,7 @@ msgid "" "href=\"#/templates/add_job_template\">here." msgstr "ジョブテンプレートをここに作成できます。" -#: client/src/projects/edit/projects-edit.controller.js:61 +#: client/src/projects/edit/projects-edit.controller.js:62 msgid "You do not have access to view this property" msgstr "これを適切に表示するためのアクセス権がありません。" @@ -6089,21 +5613,24 @@ msgstr "これを適切に表示するためのアクセス権がありません msgid "You do not have permission to add a project." msgstr "プロジェクトを追加するパーミッションがありません。" -#: client/src/users/add/users-add.controller.js:42 +#: client/src/users/add/users-add.controller.js:43 msgid "You do not have permission to add a user." msgstr "ユーザーを追加するパーミッションがありません。" +#: client/src/inventories-hosts/inventory-hosts.strings.js:28 +msgid "You do not have sufficient permissions to edit the host filter." +msgstr "ホストフィルターの編集に必要なパーミッションがありません。" + #: client/src/configuration/auth-form/configuration-auth.controller.js:72 -#: client/src/configuration/configuration.controller.js:195 -#: client/src/configuration/configuration.controller.js:257 -#: client/src/configuration/system-form/configuration-system.controller.js:52 +#: client/src/configuration/configuration.controller.js:199 +#: client/src/configuration/configuration.controller.js:261 +#: client/src/configuration/system-form/configuration-system.controller.js:54 msgid "" "You have unsaved changes. Would you like to proceed without" " saving?" msgstr "保存されていない変更があります。変更せずに次に進みますか?" #: client/src/projects/list/projects-list.controller.js:222 -#: client/src/projects/list/projects-list.controller.js:221 msgid "Your request to cancel the update was submitted to the task manager." msgstr "更新を取り消す要求がタスクマネージャーに送信されました。" @@ -6112,19 +5639,14 @@ msgid "Your session timed out due to inactivity. Please sign in." msgstr "アイドル時間によりセッションがタイムアウトしました。サインインしてください。" #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:24 -#: client/src/job-submission/job-submission.partial.html:310 -#: client/src/shared/form-generator.js:1186 -#: client/src/job-submission/job-submission.partial.html:307 -#: client/src/shared/form-generator.js:1238 +#: client/src/job-submission/job-submission.partial.html:317 +#: client/src/shared/form-generator.js:1193 msgid "and" msgstr "and" -#: client/src/job-submission/job-submission.partial.html:282 -#: client/src/job-submission/job-submission.partial.html:287 -#: client/src/job-submission/job-submission.partial.html:298 -#: client/src/job-submission/job-submission.partial.html:279 -#: client/src/job-submission/job-submission.partial.html:284 -#: client/src/job-submission/job-submission.partial.html:295 +#: client/src/job-submission/job-submission.partial.html:289 +#: client/src/job-submission/job-submission.partial.html:294 +#: client/src/job-submission/job-submission.partial.html:305 msgid "characters long." msgstr "文字の長さ。" @@ -6139,7 +5661,7 @@ msgstr "サポートされるフィルターの詳細の一覧" #: client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js:82 msgid "from the" -msgstr " " +msgstr " 削除元:" #: client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js:82 #: client/src/inventories-hosts/inventory-hosts.strings.js:8 @@ -6148,12 +5670,10 @@ msgid_plural "groups" msgstr[0] "グループ" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:26 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:26 msgid "groups" msgstr "グループ" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:24 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:24 msgid "groups and" msgstr "グループおよび" @@ -6164,8 +5684,6 @@ msgstr[0] "ホスト" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:24 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:25 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:24 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:25 msgid "hosts" msgstr "ホスト" @@ -6190,8 +5708,7 @@ msgstr "フィルターの一致:" msgid "organization" msgstr "組織" -#: client/src/shared/form-generator.js:1062 -#: client/src/shared/form-generator.js:1114 +#: client/src/shared/form-generator.js:1069 msgid "playbook" msgstr "Playbook" @@ -6209,17 +5726,13 @@ msgstr "同期が失敗しているソースです。クリックして詳細を msgid "test" msgstr "テスト" -#: client/src/job-submission/job-submission.partial.html:282 -#: client/src/job-submission/job-submission.partial.html:287 -#: client/src/job-submission/job-submission.partial.html:298 -#: client/src/job-submission/job-submission.partial.html:279 -#: client/src/job-submission/job-submission.partial.html:284 -#: client/src/job-submission/job-submission.partial.html:295 +#: client/src/job-submission/job-submission.partial.html:289 +#: client/src/job-submission/job-submission.partial.html:294 +#: client/src/job-submission/job-submission.partial.html:305 msgid "to" msgstr " " #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:139 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:130 msgid "" "to include all regions. Only Hosts associated with the selected regions will" " be updated." @@ -6284,211 +5797,3 @@ msgstr "{{breadcrumb.instance_group_name}}" #: client/src/shared/paginate/paginate.partial.html:55 msgid "{{pageSize}}" msgstr "{{pageSize}}" - -#: client/src/notifications/notificationTemplates.form.js:377 -msgid "%s or %s" -msgstr "%s または %s" - -#: client/src/partials/subhome.html:30 -msgid " Back to options" -msgstr " オプションに戻る" - -#: client/src/partials/subhome.html:32 -msgid " Save" -msgstr " 保存" - -#: client/src/partials/subhome.html:29 -msgid " View Details" -msgstr " 詳細の表示" - -#: client/src/partials/subhome.html:31 -msgid " Cancel" -msgstr " 取り消し" - -#: client/src/shared/smart-search/smart-search.partial.html:51 -msgid "ADDITIONAL INFORMATION:" -msgstr "追加情報:" - -#: client/lib/services/base-string.service.js:8 -msgid "BaseString cannot be extended without providing a namespace" -msgstr "名前空間を指定しないと BaseString を拡張することはできません" - -#: client/src/notifications/notificationTemplates.form.js:299 -msgid "Color can be one of %s." -msgstr "色を %s のいずれかにすることができます。" - -#: client/src/inventory-scripts/inventory-scripts.form.js:62 -msgid "" -"Drag and drop your custom inventory script file here or create one in the " -"field to import your custom inventory." -msgstr "" -"カスタムインベントリーのスクリプトファイルをここにドラッグアンドドロップするか、またはこのフィールドにカスタムインベントリーをインポートするためのファイルを作成します。" - -#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:104 -msgid "" -"Extra Variables\n" -" \n" -" " -msgstr "" -"追加変数\n" -" \n" -" " - -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:120 -msgid "Failed to get third-party login types. Returned status:" -msgstr "サードパーティーのログインタイプを取得できませんでした。返されたステータス:" - -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:68 -msgid "Filter that will be applied to the hosts of this inventory." -msgstr "このインべントリーのホストに適用されるフィルター。" - -#: client/src/shared/smart-search/smart-search.partial.html:51 -msgid "" -"For additional information on advanced search search syntax please see the " -"Ansible Tower " -"documentation." -msgstr "" -"高度な検索の検索構文についての詳細は、Ansible Tower ドキュメントwを参照してください。" - -#: client/src/notifications/notificationTemplates.form.js:101 -#: client/src/notifications/notificationTemplates.form.js:144 -#: client/src/notifications/notificationTemplates.form.js:161 -#: client/src/notifications/notificationTemplates.form.js:217 -#: client/src/notifications/notificationTemplates.form.js:339 -#: client/src/notifications/notificationTemplates.form.js:377 -msgid "For example:" -msgstr "例:" - -#: client/src/templates/job_templates/job-template.form.js:272 -msgid "" -"If enabled, run this playbook as an administrator. This is the equivalent of" -" passing the %s option to the %s command." -msgstr "" -"管理者としてこの Playbook を実行します (有効にされている場合)。これは %s オプションを %s コマンドに渡すことに相当します。" - -#: client/src/templates/job_templates/job-template.form.js:57 -msgid "" -"Instead, %s will check playbook syntax, test environment setup and report " -"problems." -msgstr "代わりに、%s は Playbook 構文、テスト環境セットアップおよびレポートの問題を検査します。" - -#: client/src/inventories-hosts/inventories/insights/insights.partial.html:63 -msgid "" -"No data is available. Either there are no issues to report or no scan jobs " -"have been run on this host." -msgstr "使用できるデータがありません。報告する問題がないか、またはこのホストにスキャンジョブが実行されていません。" - -#: client/lib/services/base-string.service.js:9 -msgid "No string exists with this name" -msgstr "この名前を持つ文字列はありません" - -#: client/src/notifications/notificationTemplates.form.js:201 -msgid "Number associated with the \"Messaging Service\" in Twilio." -msgstr "Twilio の \"メッセージングサービス\" に関連付けられた数字。 " - -#: client/src/partials/survey-maker-modal.html:45 -msgid "PLEASE ADD A SURVEY PROMPT ON THE LEFT." -msgstr "左側に Survey プロンプトを追加してください。" - -#: client/src/shared/paginate/paginate.partial.html:33 -msgid "" -"Page\n" -" {{current}} of\n" -" {{last}}" -msgstr "" -"ページ\n" -" {{current}} of\n" -" {{last}}" - -#: client/src/templates/job_templates/job-template.form.js:365 -#: client/src/templates/workflows.form.js:80 -msgid "" -"Pass extra command line variables to the playbook. This is the %s or %s " -"command line parameter for %s. Provide key/value pairs using either YAML or " -"JSON." -msgstr "" -"追加のコマンドライン変数を Playbook に渡します。これは、%s の %s または %s コマンドラインパラメーターです。YAML または " -"JSON のいずれかを使用してキーと値のペアを指定します。" - -#: client/src/partials/inventory-add.html:11 -msgid "Please enter a name for this job template copy." -msgstr "このジョブテンプレートコピーの名前を入力してください。" - -#: client/src/partials/subhome.html:6 -msgid "Properties" -msgstr "プロパティー" - -#: client/src/inventory-scripts/inventory-scripts.form.js:63 -msgid "Script must begin with a hashbang sequence: i.e.... %s" -msgstr "スクリプトは hashbang シーケンスで開始する必要があります (例: .... %s)。" - -#: client/src/templates/job_templates/job-template.form.js:141 -msgid "" -"Select credentials that allow {{BRAND_NAME}} to access the nodes this job " -"will be ran against. You can only select one credential of each type.

You must select either a machine (SSH) credential or \"Prompt on " -"launch\". \"Prompt on launch\" requires you to select a machine credential " -"at run time.

If you select credentials AND check the \"Prompt on " -"launch\" box, you make the selected credentials the defaults that can be " -"updated at run time." -msgstr "" -"{{BRAND_NAME}} のこのジョブが実行されるノードへのアクセスを許可する認証情報を選択します。各タイプにつき 1 " -"つの認証情報のみを選択できます。

マシン (SSH) " -"認証情報または「起動プロンプト」のいずれかを選択する必要があります。「起動プロンプト」では、実行時にマシン認証情報を選択する必要があります。

認証情報を選択し、「起動プロンプト」ボックスにチェックを付けている場合、選択した認証情報が実行時に更新できるデフォルトになります。" - -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:115 -msgid "" -"Select the inventory file to be synced by this source. You can select from " -"the dropdown or enter a file within the input." -msgstr "このソースで同期されるインベントリーファイルを選択します。ドロップダウンから選択するか、入力にファイルを指定できます。" - -#: client/src/templates/job_templates/job-template.form.js:56 -msgid "Setting the type to %s will not execute the playbook." -msgstr "タイプを %s に設定すると Playbook は実行されません。" - -#: client/src/notifications/notificationTemplates.form.js:338 -msgid "Specify HTTP Headers in JSON format" -msgstr "JSON 形式での HTTP ヘッダーの指定" - -#: client/src/notifications/notificationTemplates.form.js:202 -msgid "This must be of the form %s." -msgstr "これは %s 形式でなければなりません。" - -#: client/src/notifications/notificationTemplates.form.js:100 -#: client/src/notifications/notificationTemplates.form.js:216 -msgid "Type an option on each line." -msgstr "各行にオプションを入力します。" - -#: client/src/notifications/notificationTemplates.form.js:143 -#: client/src/notifications/notificationTemplates.form.js:160 -#: client/src/notifications/notificationTemplates.form.js:376 -msgid "Type an option on each line. The pound symbol (#) is not required." -msgstr "各行にオプションを入力します。シャープ記号 (#) は不要です。" - -#: client/src/templates/templates.list.js:66 -msgid "Workflow Job Template" -msgstr "ワークフロージョブテンプレート" - -#: client/src/shared/form-generator.js:980 -msgid "Your password must be %d characters long." -msgstr "パスワードの長さは %d 文字にしてください。" - -#: client/src/shared/form-generator.js:985 -msgid "Your password must contain a lowercase letter." -msgstr "パスワードには小文字を含める必要があります。" - -#: client/src/shared/form-generator.js:995 -msgid "Your password must contain a number." -msgstr "パスワードには数字を含める必要があります。" - -#: client/src/shared/form-generator.js:990 -msgid "Your password must contain an uppercase letter." -msgstr "パスワードには大文字を含める必要があります。" - -#: client/src/shared/form-generator.js:1000 -msgid "Your password must contain one of the following characters: %s" -msgstr "パスワードには以下の文字のいずれかを使用する必要があります: %s" diff --git a/awx/ui/po/nl.po b/awx/ui/po/nl.po index ee1fb79cc2..7d51e82b91 100644 --- a/awx/ui/po/nl.po +++ b/awx/ui/po/nl.po @@ -7,7 +7,6 @@ msgstr "" "PO-Revision-Date: 2017-09-13 08:29+0000\n" "Last-Translator: Froebel Flores \n" "Language-Team: Dutch\n" -"MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: nl\n" @@ -15,7 +14,7 @@ msgstr "" "X-Generator: Zanata 4.2.1\n" #: client/src/projects/add/projects-add.controller.js:153 -#: client/src/projects/edit/projects-edit.controller.js:282 +#: client/src/projects/edit/projects-edit.controller.js:288 msgid "" "%sNote:%s Mercurial does not support password authentication for SSH. Do not" " put the username and key in the URL. If using Bitbucket and SSH, do not " @@ -26,7 +25,7 @@ msgstr "" "Bitbucket en SSH gebruikt, noem uw Bitbucket-gebruikersnaam dan niet." #: client/src/projects/add/projects-add.controller.js:132 -#: client/src/projects/edit/projects-edit.controller.js:261 +#: client/src/projects/edit/projects-edit.controller.js:267 msgid "" "%sNote:%s When using SSH protocol for GitHub or Bitbucket, enter an SSH key " "only, do not enter a username (other than git). Additionally, GitHub and " @@ -44,7 +43,6 @@ msgid "(defaults to %s)" msgstr "(wordt standaard %s)" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:378 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:334 msgid "(seconds)" msgstr "(seconden)" @@ -68,7 +66,7 @@ msgstr "50" msgid "A schedule name is required." msgstr "Een naam voor het schema is vereist." -#: client/src/users/add/users-add.controller.js:101 +#: client/src/users/add/users-add.controller.js:102 msgid "A value is required" msgstr "Een waarde is vereist" @@ -91,11 +89,10 @@ msgstr "ACTIVITEITSGEGEVENS" #: client/src/activity-stream/activitystream.route.js:28 #: client/src/activity-stream/streams.list.js:14 #: client/src/activity-stream/streams.list.js:15 -#: client/src/activity-stream/activitystream.route.js:27 msgid "ACTIVITY STREAM" msgstr "ACTIVITEITENLOGBOEK" -#: client/features/credentials/legacy.credentials.js:79 +#: client/features/credentials/legacy.credentials.js:76 #: client/src/credential-types/credential-types.list.js:44 #: client/src/credentials/credentials.form.js:449 #: client/src/credentials/credentials.list.js:54 @@ -110,15 +107,10 @@ msgstr "ACTIVITEITENLOGBOEK" #: client/src/projects/projects.list.js:78 #: client/src/scheduler/schedules.list.js:68 client/src/teams/teams.form.js:85 #: client/src/teams/teams.list.js:45 -#: client/src/templates/job_templates/job-template.form.js:402 +#: client/src/templates/job_templates/job-template.form.js:397 #: client/src/templates/templates.list.js:58 #: client/src/templates/workflows.form.js:125 #: client/src/users/users.list.js:50 -#: client/features/credentials/legacy.credentials.js:74 -#: client/src/credential-types/credential-types.list.js:41 -#: client/src/projects/projects.form.js:242 -#: client/src/templates/job_templates/job-template.form.js:422 -#: client/src/templates/workflows.form.js:130 msgid "ADD" msgstr "TOEVOEGEN" @@ -130,8 +122,7 @@ msgstr "GROEP TOEVOEGEN" msgid "ADD HOST" msgstr "HOST TOEVOEGEN" -#: client/src/teams/teams.form.js:157 client/src/users/users.form.js:212 -#: client/src/users/users.form.js:213 +#: client/src/teams/teams.form.js:157 client/src/users/users.form.js:216 msgid "ADD PERMISSIONS" msgstr "MACHTIGINGEN TOEVOEGEN" @@ -149,7 +140,6 @@ msgstr "AANVULLENDE INFORMATIE" #: client/src/organizations/linkout/organizations-linkout.route.js:330 #: client/src/organizations/list/organizations-list.controller.js:84 -#: client/src/organizations/linkout/organizations-linkout.route.js:323 msgid "ADMINS" msgstr "BEHEERDERS" @@ -170,8 +160,7 @@ msgstr "IEDERE" msgid "API Key" msgstr "API-sleutel" -#: client/src/notifications/notificationTemplates.form.js:246 -#: client/src/notifications/notificationTemplates.form.js:251 +#: client/src/notifications/notificationTemplates.form.js:243 msgid "API Service/Integration Key" msgstr "Service-/integratiesleutel API" @@ -194,7 +183,6 @@ msgid "ASSOCIATED HOSTS" msgstr "VERBONDEN HOSTS" #: client/src/setup-menu/setup-menu.partial.html:66 -#: client/src/setup-menu/setup-menu.partial.html:72 msgid "About {{BRAND_NAME}}" msgstr "Over {{BRAND_NAME}}" @@ -202,13 +190,11 @@ msgstr "Over {{BRAND_NAME}}" msgid "Access Key" msgstr "Toegangssleutel" -#: client/src/notifications/notificationTemplates.form.js:224 -#: client/src/notifications/notificationTemplates.form.js:229 +#: client/src/notifications/notificationTemplates.form.js:221 msgid "Account SID" msgstr "SID account" -#: client/src/notifications/notificationTemplates.form.js:183 -#: client/src/notifications/notificationTemplates.form.js:186 +#: client/src/notifications/notificationTemplates.form.js:180 msgid "Account Token" msgstr "Accounttoken" @@ -227,17 +213,15 @@ msgstr "Acties" msgid "Activity" msgstr "Activiteit" -#: client/src/configuration/system-form/configuration-system.controller.js:86 +#: client/src/configuration/system-form/configuration-system.controller.js:88 msgid "Activity Stream" msgstr "Activiteitenlogboek" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:134 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:137 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:131 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:132 #: client/src/organizations/organizations.form.js:81 #: client/src/teams/teams.form.js:82 #: client/src/templates/workflows.form.js:122 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:143 -#: client/src/templates/workflows.form.js:127 msgid "Add" msgstr "Toevoegen" @@ -257,12 +241,9 @@ msgstr "Machtigingen toevoegen" msgid "Add Project" msgstr "Project toevoegen" -#: client/src/shared/form-generator.js:1703 -#: client/src/templates/job_templates/job-template.form.js:450 +#: client/src/shared/form-generator.js:1711 +#: client/src/templates/job_templates/job-template.form.js:445 #: client/src/templates/workflows.form.js:170 -#: client/src/shared/form-generator.js:1754 -#: client/src/templates/job_templates/job-template.form.js:467 -#: client/src/templates/workflows.form.js:175 msgid "Add Survey" msgstr "Vragenlijst toevoegen" @@ -277,8 +258,6 @@ msgstr "Gebruiker toevoegen" #: client/src/shared/stateDefinitions.factory.js:410 #: client/src/shared/stateDefinitions.factory.js:578 #: client/src/users/users.list.js:17 -#: client/src/shared/stateDefinitions.factory.js:364 -#: client/src/shared/stateDefinitions.factory.js:532 msgid "Add Users" msgstr "Gebruikers toevoegen" @@ -298,18 +277,13 @@ msgstr "Een host toevoegen" msgid "Add a new schedule" msgstr "Een nieuw schema toevoegen" -#: client/features/credentials/legacy.credentials.js:77 +#: client/features/credentials/legacy.credentials.js:74 #: client/src/credentials/credentials.form.js:447 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:136 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:139 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:133 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:134 #: client/src/projects/projects.form.js:241 -#: client/src/templates/job_templates/job-template.form.js:400 +#: client/src/templates/job_templates/job-template.form.js:395 #: client/src/templates/workflows.form.js:123 -#: client/features/credentials/legacy.credentials.js:72 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:145 -#: client/src/projects/projects.form.js:240 -#: client/src/templates/job_templates/job-template.form.js:420 -#: client/src/templates/workflows.form.js:128 msgid "Add a permission" msgstr "Een machtiging toevoegen" @@ -322,8 +296,7 @@ msgstr "" " bij het starten van taken m.b.t. machines of bij het synchroniseren van " "inventarissen of projecten." -#: client/src/shared/form-generator.js:1439 -#: client/src/shared/form-generator.js:1490 +#: client/src/shared/form-generator.js:1446 msgid "Admin" msgstr "Beheerder" @@ -347,7 +320,6 @@ msgstr "" #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:65 #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:74 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:139 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:130 msgid "All" msgstr "Alle" @@ -360,8 +332,8 @@ msgstr "Alle activiteit" msgid "All Jobs" msgstr "Alle taken" -#: client/src/templates/job_templates/job-template.form.js:280 -#: client/src/templates/job_templates/job-template.form.js:287 +#: client/src/templates/job_templates/job-template.form.js:275 +#: client/src/templates/job_templates/job-template.form.js:282 msgid "Allow Provisioning Callbacks" msgstr "Provisioning terugkoppelingen toestaan" @@ -376,8 +348,7 @@ msgstr "" msgid "Always" msgstr "Altijd" -#: client/src/projects/list/projects-list.controller.js:267 -#: client/src/projects/list/projects-list.controller.js:265 +#: client/src/projects/list/projects-list.controller.js:266 msgid "" "An SCM update does not appear to be running for project: %s. Click the " "%sRefresh%s button to view the latest status." @@ -385,13 +356,21 @@ msgstr "" "Het lijkt er op dat er geen SCM-update bezig is voor project: %s. Klik op de" " knop %sVernieuwen%s om de nieuwste status in te zien." -#: client/src/templates/survey-maker/shared/question-definition.form.js:59 -#: client/src/templates/survey-maker/shared/question-definition.form.js:65 +#: client/src/templates/survey-maker/shared/question-definition.form.js:62 +#: client/src/templates/survey-maker/shared/question-definition.form.js:68 msgid "Answer Type" msgstr "Antwoordtype" -#: client/src/credentials/list/credentials-list.controller.js:114 -#: client/src/credentials/list/credentials-list.controller.js:106 +#: client/src/templates/survey-maker/shared/question-definition.form.js:44 +#: client/src/templates/survey-maker/shared/question-definition.form.js:53 +msgid "Answer Variable Name" +msgstr "" + +#: client/src/job-results/job-results.service.js:144 +msgid "Are you sure you want to cancel the job below?" +msgstr "" + +#: client/src/credentials/list/credentials-list.controller.js:133 msgid "Are you sure you want to delete the credential below?" msgstr "Weet u zeker dat u onderstaande toegangsgegevens wilt verwijderen?" @@ -399,6 +378,7 @@ msgstr "Weet u zeker dat u onderstaande toegangsgegevens wilt verwijderen?" msgid "Are you sure you want to delete the inventory below?" msgstr "Weet u zeker dat u onderstaande inventaris wilt verwijderen?" +#: client/src/job-results/job-results.service.js:95 #: client/src/jobs/factories/delete-job.factory.js:110 msgid "Are you sure you want to delete the job below?" msgstr "Weet u zeker dat u onderstaande taak wilt verwijderen?" @@ -412,10 +392,13 @@ msgid "Are you sure you want to delete the organization below?" msgstr "Weet u zeker dat u onderstaande organisatie wilt verwijderen?" #: client/src/projects/list/projects-list.controller.js:208 -#: client/src/projects/list/projects-list.controller.js:207 msgid "Are you sure you want to delete the project below?" msgstr "Weet u zeker dat u onderstaand project wilt verwijderen?" +#: client/src/templates/list/templates-list.controller.js:103 +msgid "Are you sure you want to delete the template below?" +msgstr "" + #: client/src/users/list/users-list.controller.js:90 msgid "Are you sure you want to delete the user below?" msgstr "Weet u zeker dat u onderstaande gebruiker wilt verwijderen?" @@ -428,14 +411,13 @@ msgstr "Weet u zeker dat u deze {{deleteMode}} wilt verwijderen?" msgid "Are you sure you want to disassociate the group below from" msgstr "Weet u zeker dat u onderstaande groep los wilt koppelen van" -#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:22 +#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:23 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:25 -#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:25 +#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:26 msgid "Are you sure you want to disassociate the host below from" msgstr "Weet u zeker dat u onderstaande host los wilt koppelen van" #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:47 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:69 msgid "" "Are you sure you want to permanently delete the group below from the " "inventory?" @@ -443,14 +425,12 @@ msgstr "" "Weet u zeker dat u onderstaande groep permanent wilt verwijderen uit de " "inventaris?" -#: client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js:98 -#: client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js:93 +#: client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js:106 msgid "" "Are you sure you want to permanently delete the host below from the " "inventory?" msgstr "Weet u zeker dat u onderstaande host permanent wilt verwijderen?" -#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:120 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:69 msgid "" "Are you sure you want to permanently delete the inventory source below from " @@ -459,7 +439,7 @@ msgstr "" "Weet u zeker dat u onderstaande inventarisbron permanent wilt verwijderen " "uit de inventaris?" -#: client/src/projects/edit/projects-edit.controller.js:238 +#: client/src/projects/edit/projects-edit.controller.js:244 msgid "Are you sure you want to remove the %s below from %s?" msgstr "Weet u zeker dat u onderstaande %s wilt verwijderen uit de %s?" @@ -482,8 +462,7 @@ msgstr "Een bestaande groep verbinden" msgid "Associate this host with a new group" msgstr "Deze host verbinden met een nieuwe groep" -#: client/src/shared/form-generator.js:1441 -#: client/src/shared/form-generator.js:1492 +#: client/src/shared/form-generator.js:1448 msgid "Auditor" msgstr "Auditor" @@ -530,12 +509,11 @@ msgstr "Beschikbaarheidsgebied:" msgid "Azure AD" msgstr "Azure AD" -#: client/src/shared/directives.js:75 client/src/shared/directives.js:133 +#: client/src/shared/directives.js:75 msgid "BROWSE" msgstr "BLADEREN" #: client/src/projects/projects.form.js:80 -#: client/src/projects/projects.form.js:79 msgid "" "Base path used for locating playbooks. Directories found inside this path " "will be listed in the playbook directory drop-down. Together the base path " @@ -548,32 +526,28 @@ msgstr "" "samen het volledige pad dat gebruikt wordt om draaiboeken te vinden." #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:128 -#: client/src/templates/job_templates/job-template.form.js:274 msgid "Become Privilege Escalation" msgstr "Verhoging van rechten worden" -#: client/src/license/license.partial.html:104 +#: client/src/license/license.partial.html:107 msgid "Browse" msgstr "Bladeren" #: client/lib/services/base-string.service.js:61 -#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:26 +#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:28 #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:51 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html:29 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:29 -#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:29 +#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:30 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:73 #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html:16 #: client/src/inventories-hosts/shared/associate-groups/associate-groups.partial.html:16 #: client/src/inventories-hosts/shared/associate-hosts/associate-hosts.partial.html:16 -#: client/src/job-submission/job-submission.partial.html:363 +#: client/src/job-submission/job-submission.partial.html:370 #: client/src/partials/survey-maker-modal.html:17 -#: client/src/partials/survey-maker-modal.html:84 +#: client/src/partials/survey-maker-modal.html:85 #: client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.partial.html:17 #: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:65 -#: client/lib/services/base-string.service.js:29 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:73 -#: client/src/job-submission/job-submission.partial.html:360 msgid "CANCEL" msgstr "ANNULEREN" @@ -585,14 +559,13 @@ msgstr "WIJZIGINGEN" msgid "CLEAR ALL" msgstr "ALLES WISSEN" -#: client/src/partials/survey-maker-modal.html:85 +#: client/src/partials/survey-maker-modal.html:86 msgid "CLOSE" msgstr "SLUITEN" #: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:19 -#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js:18 +#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js:19 #: client/src/templates/completed-jobs.list.js:20 -#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js:17 msgid "COMPLETED JOBS" msgstr "VOLTOOIDE TAKEN" @@ -642,12 +615,10 @@ msgstr "GEPLANDE TAAK AANMAKEN" msgid "CREATE SOURCE" msgstr "BRON AANMAKEN" -#: client/src/job-submission/job-submission.partial.html:344 +#: client/src/job-submission/job-submission.partial.html:351 #: client/src/partials/job-template-details.html:2 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:93 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:82 -#: client/src/job-submission/job-submission.partial.html:341 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:80 msgid "CREDENTIAL" msgstr "TOEGANGSGEGEVENS" @@ -657,7 +628,6 @@ msgstr "SOORT TOEGANGSGEGEVENS" #: client/src/job-submission/job-submission.partial.html:92 #: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:56 -#: client/src/job-submission/job-submission.partial.html:90 msgid "CREDENTIAL TYPE:" msgstr "SOORT TOEGANGSGEGEVENS:" @@ -672,8 +642,6 @@ msgstr "SOORTEN TOEGANGSGEGEVENS" #: client/src/credentials/credentials.list.js:15 #: client/src/credentials/credentials.list.js:16 #: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:5 -#: client/features/credentials/legacy.credentials.js:13 -#: client/src/activity-stream/get-target-title.factory.js:14 msgid "CREDENTIALS" msgstr "TOEGANGSGEGEVENS" @@ -684,35 +652,27 @@ msgstr "MACHTIGINGEN TOEGANGSGEGEVENS" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:378 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:390 #: client/src/projects/projects.form.js:199 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:334 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:346 -#: client/src/projects/projects.form.js:198 msgid "Cache Timeout" msgstr "Cache time-out" #: client/src/projects/projects.form.js:188 -#: client/src/projects/projects.form.js:187 msgid "Cache Timeout%s (seconds)%s" msgstr "Cache time-out %s (seconden)%s" #: client/src/projects/list/projects-list.controller.js:199 #: client/src/users/list/users-list.controller.js:83 -#: client/src/projects/list/projects-list.controller.js:198 msgid "Call to %s failed. DELETE returned status:" msgstr "Oproepen %s mislukt. Geretourneerde status VERWIJDEREN:" -#: client/src/projects/list/projects-list.controller.js:247 -#: client/src/projects/list/projects-list.controller.js:264 #: client/src/projects/list/projects-list.controller.js:246 -#: client/src/projects/list/projects-list.controller.js:262 +#: client/src/projects/list/projects-list.controller.js:263 msgid "Call to %s failed. GET status:" msgstr "Oproepen %s mislukt. Status OPHALEN:" -#: client/src/projects/edit/projects-edit.controller.js:232 +#: client/src/projects/edit/projects-edit.controller.js:238 msgid "Call to %s failed. POST returned status:" msgstr "Oproepen %s mislukt. Geretourneerde status POSTEN:" -#: client/src/projects/list/projects-list.controller.js:226 #: client/src/projects/list/projects-list.controller.js:225 msgid "Call to %s failed. POST status:" msgstr "Oproepen %s mislukt. Status POSTEN:" @@ -721,25 +681,25 @@ msgstr "Oproepen %s mislukt. Status POSTEN:" msgid "Call to %s failed. Return status: %d" msgstr "Oproepen %s mislukt. Status retourneren: %d" -#: client/src/projects/list/projects-list.controller.js:273 -#: client/src/projects/list/projects-list.controller.js:271 +#: client/src/projects/list/projects-list.controller.js:272 msgid "Call to get project failed. GET status:" msgstr "Oproep om project op te halen mislukt. Status OPHALEN:" #: client/src/access/add-rbac-resource/rbac-resource.partial.html:105 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:191 -#: client/src/configuration/configuration.controller.js:535 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:188 +#: client/src/configuration/configuration.controller.js:541 #: client/src/job-results/job-results.partial.html:42 #: client/src/jobs/factories/delete-job.factory.js:33 -#: client/src/shared/form-generator.js:1691 +#: client/src/shared/form-generator.js:1699 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:12 #: client/src/workflow-results/workflow-results.partial.html:42 -#: client/src/configuration/configuration.controller.js:529 -#: client/src/shared/form-generator.js:1742 msgid "Cancel" msgstr "Annuleren" -#: client/src/projects/list/projects-list.controller.js:242 +#: client/src/job-results/job-results.service.js:142 +msgid "Cancel Job" +msgstr "" + #: client/src/projects/list/projects-list.controller.js:241 msgid "Cancel Not Allowed" msgstr "Annuleren niet toegestaan" @@ -763,22 +723,15 @@ msgstr "Geannuleerd. Klik voor meer informatie" #: client/src/shared/smart-search/smart-search.controller.js:49 #: client/src/shared/smart-search/smart-search.controller.js:91 -#: client/src/shared/smart-search/smart-search.controller.js:39 -#: client/src/shared/smart-search/smart-search.controller.js:81 msgid "Cannot search running job" msgstr "Kan taak in uitvoering niet zoeken" -#: client/src/instance-groups/instance-group.partial.html:10 -#: client/src/instance-groups/instance-groups.list.js:21 -#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:10 -#: client/src/instance-groups/instances/instances-list.partial.html:18 +#: client/src/instance-groups/instance-groups.list.js:22 #: client/src/instance-groups/instances/instances.list.js:20 -#: client/src/instance-groups/list/instance-groups-list.partial.html:29 msgid "Capacity" msgstr "Capaciteit" #: client/src/projects/projects.form.js:82 -#: client/src/projects/projects.form.js:81 msgid "Change %s under \"Configure {{BRAND_NAME}}\" to change this location." msgstr "" "Wijzig %s onder \"{{BRAND_NAME}} configureren\" om deze locatie te wijzigen." @@ -787,16 +740,15 @@ msgstr "" msgid "Changes" msgstr "Wijzigingen" -#: client/src/shared/form-generator.js:1064 -#: client/src/shared/form-generator.js:1116 +#: client/src/shared/form-generator.js:1071 msgid "Choose a %s" msgstr "Kies een %s" -#: client/src/templates/survey-maker/shared/question-definition.form.js:61 +#: client/src/templates/survey-maker/shared/question-definition.form.js:64 msgid "Choose an answer type" msgstr "Kies een antwoordtype" -#: client/src/templates/survey-maker/shared/question-definition.form.js:64 +#: client/src/templates/survey-maker/shared/question-definition.form.js:67 msgid "" "Choose an answer type or format you want as the prompt for the user. Refer " "to the Ansible Tower Documentation for more additional information about " @@ -810,7 +762,7 @@ msgstr "" msgid "Choose an inventory file" msgstr "Kies een inventarisbestand" -#: client/src/shared/directives.js:76 client/src/shared/directives.js:134 +#: client/src/shared/directives.js:76 msgid "Choose file" msgstr "Bestand kiezen" @@ -823,11 +775,10 @@ msgstr "" "eindgebruikers en klik op indienen." #: client/src/projects/projects.form.js:156 -#: client/src/projects/projects.form.js:155 msgid "Clean" msgstr "Opschonen" -#: client/src/templates/survey-maker/shared/question-definition.form.js:296 +#: client/src/templates/survey-maker/shared/question-definition.form.js:299 msgid "Clear" msgstr "Wissen" @@ -865,7 +816,6 @@ msgstr "" " Klik op de knop %s om een nieuw taaksjabloon aan te maken." #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:138 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:129 msgid "" "Click on the regions field to see a list of regions for your cloud provider." " You can select multiple regions, or choose" @@ -877,8 +827,7 @@ msgstr "" msgid "Client ID" msgstr "Klant-ID" -#: client/src/notifications/notificationTemplates.form.js:257 -#: client/src/notifications/notificationTemplates.form.js:262 +#: client/src/notifications/notificationTemplates.form.js:254 msgid "Client Identifier" msgstr "Klant-identificeerder" @@ -886,12 +835,11 @@ msgstr "Klant-identificeerder" msgid "Client Secret" msgstr "Klant-geheim" -#: client/src/shared/form-generator.js:1695 -#: client/src/shared/form-generator.js:1746 +#: client/src/shared/form-generator.js:1703 msgid "Close" msgstr "Sluiten" -#: client/src/job-results/job-results.partial.html:288 +#: client/src/job-results/job-results.partial.html:291 msgid "Cloud Credential" msgstr "Cloudtoegangsgegevens" @@ -903,18 +851,14 @@ msgstr "Cloudbron niet geconfigureerd." msgid "Cloud source not configured. Click" msgstr "Cloudbron niet geconfigureerd. Klik op" -#: client/src/credentials/factories/become-method-change.factory.js:86 -#: client/src/credentials/factories/kind-change.factory.js:143 -#: client/src/credentials/factories/become-method-change.factory.js:88 -#: client/src/credentials/factories/kind-change.factory.js:145 +#: client/src/credentials/factories/become-method-change.factory.js:80 +#: client/src/credentials/factories/kind-change.factory.js:137 msgid "CloudForms URL" msgstr "CloudForms URL" #: client/src/job-results/job-results.controller.js:226 #: client/src/standard-out/standard-out.controller.js:243 #: client/src/workflow-results/workflow-results.controller.js:118 -#: client/src/job-results/job-results.controller.js:219 -#: client/src/standard-out/standard-out.controller.js:245 msgid "Collapse Output" msgstr "Output samenvouwen" @@ -924,37 +868,38 @@ msgid "Completed Jobs" msgstr "Voltooide taken" #: client/src/management-jobs/card/card.partial.html:34 -#: client/src/management-jobs/card/card.partial.html:32 msgid "Configure Notifications" msgstr "Notificaties configureren" #: client/src/setup-menu/setup-menu.partial.html:60 -#: client/src/setup-menu/setup-menu.partial.html:66 msgid "Configure {{BRAND_NAME}}" msgstr "{{BRAND_NAME}} configureren" -#: client/src/users/users.form.js:79 client/src/users/users.form.js:80 +#: client/src/users/users.form.js:81 msgid "Confirm Password" msgstr "Wachtwoord bevestigen" -#: client/src/configuration/configuration.controller.js:542 -#: client/src/configuration/configuration.controller.js:536 +#: client/src/configuration/configuration.controller.js:548 msgid "Confirm Reset" msgstr "Reset bevestigen" -#: client/src/configuration/configuration.controller.js:551 -#: client/src/configuration/configuration.controller.js:545 +#: client/src/configuration/configuration.controller.js:557 msgid "Confirm factory reset" msgstr "Reset naar fabrieksinstellingen bevestigen" +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:120 +msgid "" +"Confirm that you want to permanently delete the inventory source below from " +"the inventory. Deleting this inventory source also deletes its associated " +"groups and hosts." +msgstr "" + #: client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js:82 msgid "Confirm the removal of the" msgstr "Bevestig het verwijderen van de" #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:134 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:149 -#: client/src/templates/job_templates/job-template.form.js:222 -#: client/src/templates/job_templates/job-template.form.js:241 msgid "" "Consult the Ansible documentation for further details on the usage of tags." msgstr "" @@ -965,8 +910,7 @@ msgstr "" msgid "Contains 0 hosts." msgstr "Bevat 0 hosts." -#: client/src/templates/job_templates/job-template.form.js:185 -#: client/src/templates/job_templates/job-template.form.js:194 +#: client/src/templates/job_templates/job-template.form.js:180 msgid "" "Control the level of output ansible will produce as the playbook executes." msgstr "" @@ -974,7 +918,6 @@ msgstr "" "draaiboek." #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:313 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:269 msgid "" "Control the level of output ansible will produce for inventory source update" " jobs." @@ -1010,16 +953,11 @@ msgstr "" msgid "Create New" msgstr "Nieuw aanmaken" -#: client/src/inventories-hosts/hosts/host.list.js:107 -msgid "Create a new Smart Inventory from search results." -msgstr "Een nieuwe Smart-inventaris aanmaken vanuit zoekresultaten." - #: client/src/credentials/credentials.list.js:52 msgid "Create a new credential" msgstr "Nieuwe toegangsgegevens aanmaken" #: client/src/credential-types/credential-types.list.js:42 -#: client/src/credential-types/credential-types.list.js:39 msgid "Create a new credential type" msgstr "Een nieuwe soort toegangsgegevens aanmaken" @@ -1068,13 +1006,11 @@ msgid "Create a new user" msgstr "Een nieuwe gebruiker aanmaken" #: client/src/setup-menu/setup-menu.partial.html:42 -#: client/src/setup-menu/setup-menu.partial.html:35 msgid "Create and edit scripts to dynamically load hosts from any source." msgstr "" "Scripts aanmaken en bewerken zodat ze van iedere bron dynamisch hosts laden." #: client/src/setup-menu/setup-menu.partial.html:30 -#: client/src/setup-menu/setup-menu.partial.html:49 msgid "" "Create custom credential types to be used for authenticating to network " "hosts and cloud sources" @@ -1083,7 +1019,6 @@ msgstr "" "authenticeren van netwerkhosts en cloudbronnen" #: client/src/setup-menu/setup-menu.partial.html:49 -#: client/src/setup-menu/setup-menu.partial.html:42 msgid "" "Create templates for sending notifications with Email, HipChat, Slack, and " "SMS." @@ -1095,26 +1030,22 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:74 #: client/src/job-submission/job-submission.partial.html:18 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:67 -#: client/src/templates/job_templates/job-template.form.js:126 +#: client/src/templates/job_templates/job-template.form.js:121 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:53 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:62 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:70 msgid "Credential" msgstr "Toegangsgegevens" #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:32 #: client/src/setup-menu/setup-menu.partial.html:29 -#: client/src/setup-menu/setup-menu.partial.html:48 msgid "Credential Types" msgstr "Soorten toegangsgegevens" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:135 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:59 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:129 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:58 #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:24 #: client/src/setup-menu/setup-menu.partial.html:22 -#: client/src/templates/job_templates/job-template.form.js:139 -#: client/src/templates/job_templates/job-template.form.js:130 -#: client/src/templates/job_templates/job-template.form.js:142 +#: client/src/templates/job_templates/job-template.form.js:134 msgid "Credentials" msgstr "Toegangsgegevens" @@ -1122,7 +1053,7 @@ msgstr "Toegangsgegevens" msgid "Critical" msgstr "Cruciaal" -#: client/src/shared/directives.js:77 client/src/shared/directives.js:135 +#: client/src/shared/directives.js:77 msgid "Current Image:" msgstr "Huidige afbeelding:" @@ -1133,13 +1064,11 @@ msgstr "" " stoppen met volgen." #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:171 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:159 msgid "Custom Inventory Script" msgstr "Aangepast inventarisscript" -#: client/src/inventory-scripts/inventory-scripts.form.js:53 -#: client/src/inventory-scripts/inventory-scripts.form.js:63 -#: client/src/inventory-scripts/inventory-scripts.form.js:64 +#: client/src/inventory-scripts/inventory-scripts.form.js:50 +#: client/src/inventory-scripts/inventory-scripts.form.js:60 msgid "Custom Script" msgstr "Aangepast script" @@ -1147,22 +1076,23 @@ msgstr "Aangepast script" msgid "DASHBOARD" msgstr "DASHBOARD" -#: client/src/credentials/list/credentials-list.controller.js:116 +#: client/src/credentials/list/credentials-list.controller.js:135 #: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:103 #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:52 -#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:145 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:178 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:74 +#: client/src/job-results/job-results.service.js:119 +#: client/src/jobs/factories/delete-job.factory.js:115 #: client/src/notifications/notification-templates-list/list.controller.js:195 #: client/src/organizations/list/organizations-list.controller.js:174 #: client/src/partials/survey-maker-modal.html:18 -#: client/src/projects/edit/projects-edit.controller.js:240 +#: client/src/projects/edit/projects-edit.controller.js:246 +#: client/src/templates/list/templates-list.controller.js:154 #: client/src/users/list/users-list.controller.js:92 -#: client/src/credentials/list/credentials-list.controller.js:108 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:74 msgid "DELETE" msgstr "VERWIJDEREN" -#: client/src/partials/survey-maker-modal.html:83 +#: client/src/partials/survey-maker-modal.html:84 msgid "DELETE SURVEY" msgstr "VRAGENLIJST VERWIJDEREN" @@ -1170,10 +1100,10 @@ msgstr "VRAGENLIJST VERWIJDEREN" msgid "DETAILS" msgstr "MEER INFORMATIE" -#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:27 +#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:29 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html:30 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:30 -#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:30 +#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:31 msgid "DISASSOCIATE" msgstr "LOSKOPPELEN" @@ -1183,26 +1113,24 @@ msgstr "DYNAMISCHE HOSTS" #: client/src/credential-types/credential-types.list.js:73 #: client/src/credentials/credentials.list.js:85 -#: client/src/credentials/list/credentials-list.controller.js:113 -#: client/src/inventories-hosts/inventories/inventory.list.js:112 +#: client/src/credentials/list/credentials-list.controller.js:132 +#: client/src/inventories-hosts/inventories/inventory.list.js:111 #: client/src/inventory-scripts/inventory-scripts.list.js:71 #: client/src/job-results/job-results.partial.html:54 #: client/src/jobs/factories/delete-job.factory.js:37 #: client/src/notifications/notification-templates-list/list.controller.js:192 #: client/src/notifications/notificationTemplates.list.js:91 #: client/src/organizations/list/organizations-list.controller.js:171 -#: client/src/projects/edit/projects-edit.controller.js:237 +#: client/src/projects/edit/projects-edit.controller.js:243 #: client/src/projects/list/projects-list.controller.js:207 #: client/src/scheduler/schedules.list.js:90 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:13 #: client/src/teams/teams.list.js:72 +#: client/src/templates/list/templates-list.controller.js:102 #: client/src/templates/templates.list.js:120 #: client/src/users/list/users-list.controller.js:89 #: client/src/users/users.list.js:79 #: client/src/workflow-results/workflow-results.partial.html:54 -#: client/src/credential-types/credential-types.list.js:70 -#: client/src/credentials/list/credentials-list.controller.js:105 -#: client/src/projects/list/projects-list.controller.js:206 msgid "Delete" msgstr "Verwijderen" @@ -1211,7 +1139,11 @@ msgstr "Verwijderen" msgid "Delete Group" msgstr "Groep verwijderen" -#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:142 +#: client/src/job-results/job-results.service.js:93 +msgid "Delete Job" +msgstr "" + +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:175 msgid "Delete Source" msgstr "Bron verwijderen" @@ -1220,7 +1152,6 @@ msgid "Delete credential" msgstr "Toegangsgegevens verwijderen" #: client/src/credential-types/credential-types.list.js:75 -#: client/src/credential-types/credential-types.list.js:72 msgid "Delete credential type" msgstr "Soort toegangsgegevens verwijderen" @@ -1232,12 +1163,10 @@ msgstr[0] "Groep verwijderen" msgstr[1] "Groepen verwijderen" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:48 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:48 msgid "Delete groups" msgstr "Groepen verwijderen" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:37 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:37 msgid "Delete groups and hosts" msgstr "Groepen en hosts verwijderen" @@ -1249,11 +1178,10 @@ msgstr[0] "Host verwijderen" msgstr[1] "Hosts verwijderen" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:59 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:59 msgid "Delete hosts" msgstr "Hosts verwijderen" -#: client/src/inventories-hosts/inventories/inventory.list.js:114 +#: client/src/inventories-hosts/inventories/inventory.list.js:113 msgid "Delete inventory" msgstr "Inventaris verwijderen" @@ -1266,7 +1194,6 @@ msgid "Delete notification" msgstr "Bericht verwijderen" #: client/src/projects/projects.form.js:166 -#: client/src/projects/projects.form.js:165 msgid "Delete on Update" msgstr "Verwijderen bij update" @@ -1298,7 +1225,6 @@ msgid "Delete the job" msgstr "De taak verwijderen" #: client/src/projects/projects.form.js:168 -#: client/src/projects/projects.form.js:167 msgid "" "Delete the local repository in its entirety prior to performing an update." msgstr "" @@ -1326,7 +1252,6 @@ msgid "Deleting group" msgstr "Groep wordt verwijderd" #: client/src/projects/projects.form.js:168 -#: client/src/projects/projects.form.js:167 msgid "" "Depending on the size of the repository this may significantly increase the " "amount of time required to complete an update." @@ -1356,61 +1281,50 @@ msgstr "Documentatie Instances beschrijven" #: client/src/templates/job_templates/job-template.form.js:41 #: client/src/templates/survey-maker/shared/question-definition.form.js:36 #: client/src/templates/workflows.form.js:39 -#: client/src/users/users.form.js:141 client/src/users/users.form.js:167 -#: client/src/inventories-hosts/hosts/host.form.js:62 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:61 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:55 -#: client/src/users/users.form.js:142 client/src/users/users.form.js:168 +#: client/src/users/users.form.js:145 client/src/users/users.form.js:171 msgid "Description" msgstr "Omschrijving" -#: client/src/notifications/notificationTemplates.form.js:139 -#: client/src/notifications/notificationTemplates.form.js:143 -#: client/src/notifications/notificationTemplates.form.js:155 -#: client/src/notifications/notificationTemplates.form.js:159 +#: client/src/notifications/notificationTemplates.form.js:136 #: client/src/notifications/notificationTemplates.form.js:140 -#: client/src/notifications/notificationTemplates.form.js:145 -#: client/src/notifications/notificationTemplates.form.js:157 -#: client/src/notifications/notificationTemplates.form.js:162 -#: client/src/notifications/notificationTemplates.form.js:378 +#: client/src/notifications/notificationTemplates.form.js:152 +#: client/src/notifications/notificationTemplates.form.js:156 msgid "Destination Channels" msgstr "Bestemmingskanalen" -#: client/src/notifications/notificationTemplates.form.js:362 -#: client/src/notifications/notificationTemplates.form.js:366 -#: client/src/notifications/notificationTemplates.form.js:373 +#: client/src/notifications/notificationTemplates.form.js:359 +#: client/src/notifications/notificationTemplates.form.js:363 msgid "Destination Channels or Users" msgstr "Bestemmingskanalen of -gebruikers" -#: client/src/notifications/notificationTemplates.form.js:208 -#: client/src/notifications/notificationTemplates.form.js:209 -#: client/src/notifications/notificationTemplates.form.js:212 -#: client/src/notifications/notificationTemplates.form.js:213 +#: client/src/notifications/notificationTemplates.form.js:205 +#: client/src/notifications/notificationTemplates.form.js:206 msgid "Destination SMS Number" msgstr "Sms-nummer bestemming" #: client/features/credentials/credentials.strings.js:13 #: client/src/license/license.partial.html:5 -#: client/src/shared/form-generator.js:1474 -#: client/src/shared/form-generator.js:1525 +#: client/src/shared/form-generator.js:1481 msgid "Details" msgstr "Meer informatie" -#: client/src/job-submission/job-submission.partial.html:257 -#: client/src/job-submission/job-submission.partial.html:255 +#: client/src/job-submission/job-submission.partial.html:263 msgid "Diff Mode" msgstr "Diff-modus" #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html:6 -#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:6 -msgid "Disassociate Group" -msgstr "Groep loskoppelen" +msgid "Disassociate Group From Group" +msgstr "" #: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:6 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:6 msgid "Disassociate Host" msgstr "Host loskoppelen" +#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:6 +#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:6 +msgid "Disassociate Host From Group" +msgstr "" + #: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js:65 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js:110 #: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js:98 @@ -1422,9 +1336,9 @@ msgid "Disassociate host" msgstr "Host loskoppelen" #: client/src/configuration/auth-form/configuration-auth.controller.js:75 -#: client/src/configuration/configuration.controller.js:198 -#: client/src/configuration/configuration.controller.js:260 -#: client/src/configuration/system-form/configuration-system.controller.js:55 +#: client/src/configuration/configuration.controller.js:202 +#: client/src/configuration/configuration.controller.js:264 +#: client/src/configuration/system-form/configuration-system.controller.js:57 msgid "Discard changes" msgstr "Wijzigingen annuleren" @@ -1432,15 +1346,13 @@ msgstr "Wijzigingen annuleren" msgid "Dissasociate permission from team" msgstr "Machtiging loskoppelen van team" -#: client/src/users/users.form.js:221 client/src/users/users.form.js:222 +#: client/src/users/users.form.js:225 msgid "Dissasociate permission from user" msgstr "Machtiging loskoppelen van gebruiker" #: client/src/credentials/credentials.form.js:384 -#: client/src/credentials/factories/become-method-change.factory.js:60 -#: client/src/credentials/factories/kind-change.factory.js:117 -#: client/src/credentials/factories/become-method-change.factory.js:62 -#: client/src/credentials/factories/kind-change.factory.js:119 +#: client/src/credentials/factories/become-method-change.factory.js:54 +#: client/src/credentials/factories/kind-change.factory.js:111 msgid "Domain Name" msgstr "Domeinnaam" @@ -1448,11 +1360,10 @@ msgstr "Domeinnaam" #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:134 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:141 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:102 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:128 msgid "Download Output" msgstr "Download output" -#: client/src/inventory-scripts/inventory-scripts.form.js:62 +#: client/src/inventory-scripts/inventory-scripts.form.js:59 msgid "" "Drag and drop your custom inventory script file here or create one in the " "field to import your custom inventory. Refer to the Ansible Tower " @@ -1462,7 +1373,7 @@ msgstr "" "in het veld om uw aangepaste inventaris te importeren. Raadpleeg de " "documentatie van Ansible Tower voor voorbeeldsyntaxis." -#: client/src/partials/survey-maker-modal.html:76 +#: client/src/partials/survey-maker-modal.html:77 msgid "Drop question here to reorder" msgstr "Sleep een vraag hierheen om opnieuw te ordenen" @@ -1485,7 +1396,6 @@ msgstr "MELDING VRAGENLIJST WIJZIGEN" #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:46 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:79 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:59 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:66 msgid "ELAPSED" msgstr "VERLOPEN" @@ -1515,7 +1425,6 @@ msgstr "" "opdrachten van de taak uitgevoerd worden." #: client/src/projects/projects.form.js:179 -#: client/src/projects/projects.form.js:178 msgid "" "Each time a job runs using this project, perform an update to the local " "repository prior to starting the job." @@ -1532,21 +1441,16 @@ msgstr "" #: client/src/scheduler/schedules.list.js:75 client/src/teams/teams.list.js:55 #: client/src/templates/templates.list.js:103 #: client/src/users/users.list.js:60 -#: client/src/credential-types/credential-types.list.js:53 msgid "Edit" msgstr "Wijzigen" -#: client/src/shared/form-generator.js:1707 -#: client/src/templates/job_templates/job-template.form.js:457 +#: client/src/shared/form-generator.js:1715 +#: client/src/templates/job_templates/job-template.form.js:452 #: client/src/templates/workflows.form.js:177 -#: client/src/shared/form-generator.js:1758 -#: client/src/templates/job_templates/job-template.form.js:474 -#: client/src/templates/workflows.form.js:182 msgid "Edit Survey" msgstr "Vragenlijst wijzigen" #: client/src/credential-types/credential-types.list.js:58 -#: client/src/credential-types/credential-types.list.js:55 msgid "Edit credenital type" msgstr "Soort toegangsgegevens wijzigen" @@ -1594,32 +1498,32 @@ msgstr "Team wijzigen" msgid "Edit template" msgstr "Sjabloon wijzigen" -#: client/src/job-results/job-results.partial.html:188 +#: client/src/job-results/job-results.partial.html:191 msgid "Edit the Schedule" msgstr "Het schema wijzigen" -#: client/src/job-results/job-results.partial.html:172 +#: client/src/job-results/job-results.partial.html:175 #: client/src/workflow-results/workflow-results.partial.html:124 msgid "Edit the User" msgstr "De gebruiker wijzigen" -#: client/src/job-results/job-results.partial.html:262 -#: client/src/job-results/job-results.partial.html:277 -#: client/src/job-results/job-results.partial.html:293 -#: client/src/job-results/job-results.partial.html:308 -#: client/src/job-results/job-results.partial.html:323 +#: client/src/job-results/job-results.partial.html:265 +#: client/src/job-results/job-results.partial.html:280 +#: client/src/job-results/job-results.partial.html:296 +#: client/src/job-results/job-results.partial.html:311 +#: client/src/job-results/job-results.partial.html:326 msgid "Edit the credential" msgstr "De toegangsgegevens wijzigen" -#: client/src/job-results/job-results.partial.html:203 +#: client/src/job-results/job-results.partial.html:206 msgid "Edit the inventory" msgstr "De inventaris wijzigen" -#: client/src/job-results/job-results.partial.html:137 +#: client/src/job-results/job-results.partial.html:140 msgid "Edit the job template" msgstr "De taaksjabloon wijzigen" -#: client/src/job-results/job-results.partial.html:226 +#: client/src/job-results/job-results.partial.html:229 #: client/src/projects/projects.list.js:105 msgid "Edit the project" msgstr "Het project wijzigen" @@ -1633,11 +1537,9 @@ msgid "Edit user" msgstr "Gebruiker wijzigen" #: client/src/setup-menu/setup-menu.partial.html:61 -#: client/src/setup-menu/setup-menu.partial.html:67 msgid "Edit {{BRAND_NAME}}'s configuration." msgstr "Configuratie van {{BRAND_NAME}} wijzigen." -#: client/src/projects/list/projects-list.controller.js:242 #: client/src/projects/list/projects-list.controller.js:241 msgid "" "Either you do not have access or the SCM update process completed. Click the" @@ -1646,7 +1548,7 @@ msgstr "" "U heeft mogelijk geen toegang, of het SCM-updateproces is al voltooid. Klik " "op de knop %sVernieuwen%s om de nieuwste status te zien." -#: client/src/job-results/job-results.partial.html:517 +#: client/src/job-results/job-results.partial.html:520 msgid "Elapsed" msgstr "Verlopen" @@ -1655,18 +1557,18 @@ msgstr "Verlopen" msgid "Email" msgstr "E-mail" +#: client/src/templates/job_templates/job-template.form.js:288 #: client/src/templates/job_templates/job-template.form.js:293 -#: client/src/templates/job_templates/job-template.form.js:298 msgid "Enable Concurrent Jobs" msgstr "Gelijktijdige taken inschakelen" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:123 +#: client/src/templates/job_templates/job-template.form.js:264 #: client/src/templates/job_templates/job-template.form.js:269 -#: client/src/templates/job_templates/job-template.form.js:274 msgid "Enable Privilege Escalation" msgstr "Verhoging van rechten inschakelen" -#: client/src/templates/job_templates/job-template.form.js:284 +#: client/src/templates/job_templates/job-template.form.js:279 msgid "" "Enables creation of a provisioning callback URL. Using the URL a host can " "contact {{BRAND_NAME}} and request a configuration update using this job " @@ -1680,17 +1582,14 @@ msgstr "" msgid "Encrypted credentials are not supported." msgstr "Versleutelde toegangsgegevens worden niet ondersteund." -#: client/src/license/license.partial.html:108 +#: client/src/license/license.partial.html:113 msgid "End User License Agreement" msgstr "Licentie-overeenkomst voor eindgebruikers" #: client/src/inventories-hosts/hosts/host.form.js:73 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:72 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:72 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:89 -#: client/src/inventories-hosts/hosts/host.form.js:72 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:71 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:98 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:86 msgid "" "Enter inventory variables using either JSON or YAML syntax. Use the radio " "button to toggle between the two." @@ -1698,7 +1597,7 @@ msgstr "" "Voer variabelen van de inventaris in met JSON- of YAML-syntaxis. Gebruik de " "radioknop om tussen de twee te wisselen." -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:98 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:93 msgid "" "Enter inventory variables using either JSON or YAML syntax. Use the radio " "button to toggle between the two. Refer to the Ansible Tower documentation " @@ -1708,13 +1607,13 @@ msgstr "" "de radio-knop om tussen de twee te wisselen. Raadpleeg de documentatie van " "Ansible Tower voor voorbeeldsyntaxis." -#: client/src/notifications/notificationTemplates.form.js:158 +#: client/src/notifications/notificationTemplates.form.js:155 msgid "" "Enter one HipChat channel per line. The pound symbol (#) is not required." msgstr "" "Voer één HipChat-kanaal per regel in. Het hekje (#) is hierbij niet vereist." -#: client/src/notifications/notificationTemplates.form.js:365 +#: client/src/notifications/notificationTemplates.form.js:362 msgid "" "Enter one IRC channel or username per line. The pound symbol (#) for " "channels, and the at (@) symbol for users, are not required." @@ -1722,13 +1621,13 @@ msgstr "" "Voer één IRC-kanaal of gebruikersnaam per regel in. Het hekje (#) voor " "kanalen en het apenstaartje (@) voor gebruikers zijn hierbij niet vereist." -#: client/src/notifications/notificationTemplates.form.js:142 +#: client/src/notifications/notificationTemplates.form.js:139 msgid "" "Enter one Slack channel per line. The pound symbol (#) is not required." msgstr "" "Voer één Slack-kanaal per regel in. Het hekje (#) is hierbij niet vereist." -#: client/src/notifications/notificationTemplates.form.js:100 +#: client/src/notifications/notificationTemplates.form.js:97 msgid "" "Enter one email address per line to create a recipient list for this type of" " notification." @@ -1736,17 +1635,15 @@ msgstr "" "Voer één e-mailadres per regel in om een lijst met ontvangers te maken voor " "dit type bericht." -#: client/src/notifications/notificationTemplates.form.js:212 +#: client/src/notifications/notificationTemplates.form.js:209 msgid "" "Enter one phone number per line to specify where to route SMS messages." msgstr "" "Voer één telefoonnummer per regel in om aan te geven waar SMS-berichten " "naartoe gestuurd moeten worden." -#: client/src/credentials/factories/become-method-change.factory.js:87 -#: client/src/credentials/factories/kind-change.factory.js:144 -#: client/src/credentials/factories/become-method-change.factory.js:89 -#: client/src/credentials/factories/kind-change.factory.js:146 +#: client/src/credentials/factories/become-method-change.factory.js:81 +#: client/src/credentials/factories/kind-change.factory.js:138 msgid "" "Enter the URL for the virtual machine which %scorresponds to your CloudForm " "instance. %sFor example, %s" @@ -1754,10 +1651,8 @@ msgstr "" "Voer de URL in voor de virtuele machine die %sovereenkomt met uw CloudForm-" "instantie. %sBijvoorbeeld %s" -#: client/src/credentials/factories/become-method-change.factory.js:77 -#: client/src/credentials/factories/kind-change.factory.js:134 -#: client/src/credentials/factories/become-method-change.factory.js:79 -#: client/src/credentials/factories/kind-change.factory.js:136 +#: client/src/credentials/factories/become-method-change.factory.js:71 +#: client/src/credentials/factories/kind-change.factory.js:128 msgid "" "Enter the URL which corresponds to your %sRed Hat Satellite 6 server. %sFor " "example, %s" @@ -1765,16 +1660,14 @@ msgstr "" "Voer de URL in die overeenkomt met uw %sRed Had Satellite 6-server. " "%sBijvoorbeeld %s" -#: client/src/credentials/factories/become-method-change.factory.js:55 -#: client/src/credentials/factories/kind-change.factory.js:112 -#: client/src/credentials/factories/become-method-change.factory.js:57 -#: client/src/credentials/factories/kind-change.factory.js:114 +#: client/src/credentials/factories/become-method-change.factory.js:49 +#: client/src/credentials/factories/kind-change.factory.js:106 msgid "" "Enter the hostname or IP address which corresponds to your VMware vCenter." msgstr "" "Voer de hostnaam of het IP-adres in dat overeenkomt met uw VMware vCenter." -#: client/src/notifications/notificationTemplates.form.js:198 +#: client/src/notifications/notificationTemplates.form.js:195 msgid "" "Enter the number associated with the \"Messaging Service\" in Twilio in the " "format +18005550199." @@ -1794,56 +1687,42 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:187 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:194 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:174 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:181 msgid "Environment Variables" msgstr "Omgevingsvariabelen" -#: client/src/configuration/configuration.controller.js:344 -#: client/src/configuration/configuration.controller.js:443 -#: client/src/configuration/configuration.controller.js:477 -#: client/src/configuration/configuration.controller.js:524 -#: client/src/configuration/system-form/configuration-system.controller.js:226 +#: client/src/configuration/configuration.controller.js:348 +#: client/src/configuration/configuration.controller.js:449 +#: client/src/configuration/configuration.controller.js:483 +#: client/src/configuration/configuration.controller.js:530 +#: client/src/configuration/system-form/configuration-system.controller.js:231 #: client/src/credentials/factories/credential-form-save.factory.js:77 #: client/src/credentials/factories/credential-form-save.factory.js:93 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:191 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:210 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:129 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:139 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:166 +#: client/src/job-submission/job-submission-factories/launchjob.factory.js:194 +#: client/src/job-submission/job-submission-factories/launchjob.factory.js:213 #: client/src/management-jobs/card/card.controller.js:140 #: client/src/management-jobs/card/card.controller.js:230 #: client/src/management-jobs/card/card.controller.js:28 #: client/src/projects/add/projects-add.controller.js:108 -#: client/src/projects/edit/projects-edit.controller.js:150 -#: client/src/projects/edit/projects-edit.controller.js:216 -#: client/src/projects/edit/projects-edit.controller.js:232 +#: client/src/projects/edit/projects-edit.controller.js:156 +#: client/src/projects/edit/projects-edit.controller.js:222 +#: client/src/projects/edit/projects-edit.controller.js:238 #: client/src/projects/list/projects-list.controller.js:169 #: client/src/projects/list/projects-list.controller.js:198 -#: client/src/projects/list/projects-list.controller.js:226 -#: client/src/projects/list/projects-list.controller.js:247 -#: client/src/projects/list/projects-list.controller.js:263 -#: client/src/projects/list/projects-list.controller.js:272 -#: client/src/users/add/users-add.controller.js:98 +#: client/src/projects/list/projects-list.controller.js:225 +#: client/src/projects/list/projects-list.controller.js:246 +#: client/src/projects/list/projects-list.controller.js:262 +#: client/src/projects/list/projects-list.controller.js:271 +#: client/src/users/add/users-add.controller.js:99 #: client/src/users/edit/users-edit.controller.js:180 #: client/src/users/edit/users-edit.controller.js:80 #: client/src/users/list/users-list.controller.js:82 -#: client/src/configuration/configuration.controller.js:341 -#: client/src/configuration/configuration.controller.js:440 -#: client/src/configuration/configuration.controller.js:474 -#: client/src/configuration/configuration.controller.js:518 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:188 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:207 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:119 -#: client/src/projects/list/projects-list.controller.js:168 -#: client/src/projects/list/projects-list.controller.js:197 -#: client/src/projects/list/projects-list.controller.js:225 -#: client/src/projects/list/projects-list.controller.js:246 -#: client/src/projects/list/projects-list.controller.js:261 -#: client/src/projects/list/projects-list.controller.js:270 -#: client/src/users/edit/users-edit.controller.js:163 msgid "Error!" msgstr "Fout!" #: client/src/activity-stream/streams.list.js:40 -#: client/src/activity-stream/streams.list.js:41 msgid "Event" msgstr "Gebeurtenis" @@ -1856,21 +1735,21 @@ msgid "Event summary not available" msgstr "Samenvatting van de gebeurtenis niet beschikbaar" #: client/src/projects/add/projects-add.controller.js:129 -#: client/src/projects/edit/projects-edit.controller.js:259 +#: client/src/projects/edit/projects-edit.controller.js:265 msgid "Example URLs for GIT SCM include:" msgstr "Voorbeelden van URL's voor GIT SCM zijn onder andere:" #: client/src/projects/add/projects-add.controller.js:150 -#: client/src/projects/edit/projects-edit.controller.js:279 +#: client/src/projects/edit/projects-edit.controller.js:285 msgid "Example URLs for Mercurial SCM include:" msgstr "Voorbeelden van URL's voor Mercurial SCM zijn onder andere:" #: client/src/projects/add/projects-add.controller.js:141 -#: client/src/projects/edit/projects-edit.controller.js:270 +#: client/src/projects/edit/projects-edit.controller.js:276 msgid "Example URLs for Subversion SCM include:" msgstr "Voorbeelden van URL's voor Subversion SCM zijn onder andere:" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:68 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65 msgid "Example: ansible_facts.ansible_distribution:\"RedHat\"" msgstr "Voorbeeld: ansible_facts.ansible_distribution:\"RedHat\"" @@ -1888,9 +1767,6 @@ msgstr "Bestaande host" #: client/src/standard-out/standard-out.controller.js:245 #: client/src/workflow-results/workflow-results.controller.js:120 #: client/src/workflow-results/workflow-results.controller.js:76 -#: client/src/job-results/job-results.controller.js:221 -#: client/src/standard-out/standard-out.controller.js:23 -#: client/src/standard-out/standard-out.controller.js:247 msgid "Expand Output" msgstr "Output uitklappen" @@ -1902,24 +1778,20 @@ msgstr "Verloopt op" msgid "Explanation" msgstr "Uitleg" -#: client/src/job-results/job-results.partial.html:272 +#: client/src/job-results/job-results.partial.html:275 msgid "Extra Credentials" msgstr "Extra toegangsgegevens" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:132 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:144 -#: client/src/job-results/job-results.partial.html:406 -#: client/src/job-submission/job-submission.partial.html:161 +#: client/src/job-results/job-results.partial.html:409 +#: client/src/job-submission/job-submission.partial.html:165 #: client/src/partials/logviewer.html:8 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:105 -#: client/src/templates/job_templates/job-template.form.js:347 -#: client/src/templates/job_templates/job-template.form.js:354 +#: client/src/templates/job_templates/job-template.form.js:342 +#: client/src/templates/job_templates/job-template.form.js:349 #: client/src/templates/workflows.form.js:74 #: client/src/templates/workflows.form.js:81 -#: client/src/job-submission/job-submission.partial.html:159 -#: client/src/templates/job_templates/job-template.form.js:359 -#: client/src/templates/job_templates/job-template.form.js:371 -#: client/src/templates/workflows.form.js:86 msgid "Extra Variables" msgstr "Extra variabelen" @@ -1928,7 +1800,7 @@ msgstr "Extra variabelen" msgid "FACTS" msgstr "FEITEN" -#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:63 +#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:64 msgid "FAILED" msgstr "MISLUKT" @@ -1939,16 +1811,12 @@ msgstr "VELDEN:" #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:39 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:72 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:52 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:59 msgid "FINISHED" msgstr "VOLTOOID" #: client/src/inventories-hosts/hosts/host.form.js:107 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:106 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:106 -#: client/src/inventories-hosts/hosts/host.form.js:111 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:111 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:105 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:107 msgid "Facts" msgstr "Feiten" @@ -1960,7 +1828,7 @@ msgstr "Mislukt" msgid "Failed Hosts" msgstr "Mislukte hosts" -#: client/src/users/add/users-add.controller.js:98 +#: client/src/users/add/users-add.controller.js:99 msgid "Failed to add new user. POST returned status:" msgstr "Nieuwe gebruiker toevoegen mislukt. Geretourneerde statut POSTEN:" @@ -1972,28 +1840,24 @@ msgstr "Nieuwe toegangsgegevens aanmaken mislukt. Status POSTEN:" msgid "Failed to create new project. POST returned status:" msgstr "Nieuw project aanmaken mislukt. Geretourneerde status POSTEN:" -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:211 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:208 +#: client/src/job-submission/job-submission-factories/launchjob.factory.js:214 msgid "Failed to retrieve job template extra variables." msgstr "Extra variabelen van taaksjabloon ophalen mislukt." -#: client/src/projects/edit/projects-edit.controller.js:151 +#: client/src/projects/edit/projects-edit.controller.js:157 msgid "Failed to retrieve project: %s. GET status:" msgstr "Project ophalen mislukt: %s. status OPHALEN:" #: client/src/users/edit/users-edit.controller.js:181 #: client/src/users/edit/users-edit.controller.js:81 -#: client/src/users/edit/users-edit.controller.js:164 msgid "Failed to retrieve user: %s. GET status:" msgstr "Gebruiker ophalen mislukt: %s. Status OPHALEN:" -#: client/src/configuration/configuration.controller.js:444 -#: client/src/configuration/configuration.controller.js:441 +#: client/src/configuration/configuration.controller.js:450 msgid "Failed to save settings. Returned status:" msgstr "Instellingen opslaan mislukt. Geretourneerde status:" -#: client/src/configuration/configuration.controller.js:478 -#: client/src/configuration/configuration.controller.js:475 +#: client/src/configuration/configuration.controller.js:484 msgid "Failed to save toggle settings. Returned status:" msgstr "Instellingen wisselen mislukt. Geretourneerde status:" @@ -2001,14 +1865,13 @@ msgstr "Instellingen wisselen mislukt. Geretourneerde status:" msgid "Failed to update Credential. PUT status:" msgstr "Toegangsgegevens updaten mislukt. Status PLAATSEN:" -#: client/src/projects/edit/projects-edit.controller.js:216 +#: client/src/projects/edit/projects-edit.controller.js:222 msgid "Failed to update project: %s. PUT status:" msgstr "Project updaten mislukt: %s. Status PLAATSEN:" -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:192 +#: client/src/job-submission/job-submission-factories/launchjob.factory.js:195 #: client/src/management-jobs/card/card.controller.js:141 #: client/src/management-jobs/card/card.controller.js:231 -#: client/src/job-submission/job-submission-factories/launchjob.factory.js:189 msgid "Failed updating job %s with variables. POST returned: %d" msgstr "Taak %s met variabelen bijwerken mislukt. Geretourneerde POSTEN: %d" @@ -2029,11 +1892,10 @@ msgstr "Laatste uitvoering" #: client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js:54 #: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:58 #: client/src/inventories-hosts/shared/factories/set-status.factory.js:44 -#: client/src/job-results/job-results.partial.html:108 +#: client/src/job-results/job-results.partial.html:111 #: client/src/jobs/all-jobs.list.js:66 #: client/src/portal-mode/portal-jobs.list.js:40 #: client/src/templates/completed-jobs.list.js:59 -#: client/src/portal-mode/portal-jobs.list.js:39 msgid "Finished" msgstr "Voltooid" @@ -2053,10 +1915,8 @@ msgid "" msgstr "" "Zie de Ansible Tower voor meer informatie over geavanceerde zoeksyntaxis" -#: client/src/credentials/factories/become-method-change.factory.js:69 -#: client/src/credentials/factories/kind-change.factory.js:126 -#: client/src/credentials/factories/become-method-change.factory.js:71 -#: client/src/credentials/factories/kind-change.factory.js:128 +#: client/src/credentials/factories/become-method-change.factory.js:63 +#: client/src/credentials/factories/kind-change.factory.js:120 msgid "For example, %s" msgstr "Bijvoorbeeld %s" @@ -2066,8 +1926,6 @@ msgstr "Bijvoorbeeld %s" #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js:32 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:35 #: client/src/inventories-hosts/inventories/related/hosts/related-host.list.js:31 -#: client/src/inventories-hosts/hosts/host.form.js:35 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:34 msgid "" "For hosts that are part of an external inventory, this flag cannot be " "changed. It will be set by the inventory sync process." @@ -2088,7 +1946,6 @@ msgstr "" "rapporteren zonder het draaiboek uit te voeren." #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:118 -#: client/src/templates/job_templates/job-template.form.js:176 msgid "" "For more information and examples see %sthe Patterns topic at " "docs.ansible.com%s." @@ -2098,12 +1955,10 @@ msgstr "" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:109 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:96 -#: client/src/job-results/job-results.partial.html:333 +#: client/src/job-results/job-results.partial.html:336 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:87 -#: client/src/templates/job_templates/job-template.form.js:149 -#: client/src/templates/job_templates/job-template.form.js:159 -#: client/src/templates/job_templates/job-template.form.js:152 -#: client/src/templates/job_templates/job-template.form.js:165 +#: client/src/templates/job_templates/job-template.form.js:144 +#: client/src/templates/job_templates/job-template.form.js:154 msgid "Forks" msgstr "Vorken" @@ -2132,8 +1987,7 @@ msgstr "GitHub Team" msgid "Google OAuth2" msgstr "Google OAuth2" -#: client/src/teams/teams.form.js:155 client/src/users/users.form.js:210 -#: client/src/users/users.form.js:211 +#: client/src/teams/teams.form.js:155 client/src/users/users.form.js:214 msgid "Grant Permission" msgstr "Machtiging toekennen" @@ -2167,13 +2021,9 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.form.js:88 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js:32 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:114 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:114 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:115 #: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js:32 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:172 -#: client/src/inventories-hosts/hosts/host.form.js:119 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:119 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:113 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:178 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:167 msgid "Groups" msgstr "Groepen" @@ -2191,14 +2041,11 @@ msgstr "TIP: sleep een SSH-privésleutelbestand naar het onderstaande veld." #: client/src/inventories-hosts/inventories/inventories.partial.html:14 #: client/src/inventories-hosts/inventories/related/hosts/related-host.route.js:18 #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-hosts.route.js:17 -#: client/src/activity-stream/get-target-title.factory.js:38 msgid "HOSTS" msgstr "HOSTS" -#: client/src/notifications/notificationTemplates.form.js:323 -#: client/src/notifications/notificationTemplates.form.js:324 -#: client/src/notifications/notificationTemplates.form.js:328 -#: client/src/notifications/notificationTemplates.form.js:329 +#: client/src/notifications/notificationTemplates.form.js:320 +#: client/src/notifications/notificationTemplates.form.js:321 msgid "HTTP Headers" msgstr "HTTP-koppen" @@ -2211,27 +2058,23 @@ msgid "High" msgstr "Hoog" #: client/src/credentials/credentials.form.js:139 -#: client/src/notifications/notificationTemplates.form.js:86 +#: client/src/notifications/notificationTemplates.form.js:83 msgid "Host" msgstr "Host" -#: client/src/credentials/factories/become-method-change.factory.js:58 -#: client/src/credentials/factories/kind-change.factory.js:115 -#: client/src/credentials/factories/become-method-change.factory.js:60 -#: client/src/credentials/factories/kind-change.factory.js:117 +#: client/src/credentials/factories/become-method-change.factory.js:52 +#: client/src/credentials/factories/kind-change.factory.js:109 msgid "Host (Authentication URL)" msgstr "Host (authenticatie-URL)" -#: client/src/templates/job_templates/job-template.form.js:329 -#: client/src/templates/job_templates/job-template.form.js:338 +#: client/src/templates/job_templates/job-template.form.js:324 +#: client/src/templates/job_templates/job-template.form.js:333 msgid "Host Config Key" msgstr "Configuratiesleutel host" #: client/src/inventories-hosts/hosts/host.form.js:40 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:39 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:39 -#: client/src/inventories-hosts/hosts/host.form.js:39 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:38 msgid "Host Enabled" msgstr "Host ingeschakeld" @@ -2241,18 +2084,12 @@ msgstr "Host ingeschakeld" #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:56 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:45 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:56 -#: client/src/inventories-hosts/hosts/host.form.js:45 -#: client/src/inventories-hosts/hosts/host.form.js:56 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:44 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:55 msgid "Host Name" msgstr "Hostnaam" #: client/src/inventories-hosts/hosts/host.form.js:80 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:79 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:79 -#: client/src/inventories-hosts/hosts/host.form.js:79 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:78 msgid "Host Variables" msgstr "Hostvariabelen" @@ -2277,11 +2114,9 @@ msgstr "Host is niet beschikbaar. Klik om te wisselen." #: client/src/inventories-hosts/inventories/related/groups/groups.form.js:98 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js:57 #: client/src/inventories-hosts/inventories/related/hosts/related-host.list.js:56 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:170 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:181 -#: client/src/job-results/job-results.partial.html:501 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:168 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:187 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:167 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:176 +#: client/src/job-results/job-results.partial.html:504 msgid "Hosts" msgstr "Hosts" @@ -2302,7 +2137,7 @@ msgstr "Gebruikte hosts" msgid "Hosts are imported to" msgstr "Hosts worden geïmporteerd naar" -#: client/src/license/license.partial.html:116 +#: client/src/license/license.partial.html:121 msgid "I agree to the End User License Agreement" msgstr "Ik ga akkoord met de licentie-overeenkomst voor eindgebruikers" @@ -2331,7 +2166,7 @@ msgstr "INZICHTEN" msgid "INSTANCE GROUPS" msgstr "INSTANTIEGROEPEN" -#: client/src/instance-groups/instance-group.partial.html:28 +#: client/src/instance-groups/instance-group.partial.html:27 msgid "INSTANCES" msgstr "INSTANTIES" @@ -2345,14 +2180,11 @@ msgstr "INSTANTIES" #: client/src/main-menu/main-menu.partial.html:27 #: client/src/organizations/linkout/organizations-linkout.route.js:143 #: client/src/organizations/list/organizations-list.controller.js:66 -#: client/src/activity-stream/get-target-title.factory.js:11 -#: client/src/organizations/linkout/organizations-linkout.route.js:141 msgid "INVENTORIES" msgstr "INVENTARISSEN" -#: client/src/job-submission/job-submission.partial.html:339 +#: client/src/job-submission/job-submission.partial.html:346 #: client/src/partials/job-template-details.html:2 -#: client/src/job-submission/job-submission.partial.html:336 msgid "INVENTORY" msgstr "INVENTARIS" @@ -2363,7 +2195,6 @@ msgstr "INVENTARISSCRIPT" #: client/src/activity-stream/get-target-title.factory.js:35 #: client/src/inventory-scripts/inventory-scripts.list.js:12 #: client/src/inventory-scripts/main.js:66 -#: client/src/activity-stream/get-target-title.factory.js:32 msgid "INVENTORY SCRIPTS" msgstr "INVENTARISSCRIPTS" @@ -2371,13 +2202,11 @@ msgstr "INVENTARISSCRIPTS" msgid "INVENTORY SOURCES" msgstr "INVENTARISBRONNEN" -#: client/src/notifications/notificationTemplates.form.js:351 -#: client/src/notifications/notificationTemplates.form.js:362 +#: client/src/notifications/notificationTemplates.form.js:348 msgid "IRC Nick" msgstr "IRC-bijnaam" -#: client/src/notifications/notificationTemplates.form.js:340 -#: client/src/notifications/notificationTemplates.form.js:351 +#: client/src/notifications/notificationTemplates.form.js:337 msgid "IRC Server Address" msgstr "IRC-serveradres" @@ -2408,15 +2237,6 @@ msgstr "" "Als dit vakje leeg wordt gelaten, worden alle bovenstaande groepen " "aangemaakt, behalve" -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:331 -msgid "" -"If checked, all child groups and hosts not found on the external source will" -" be deleted from the local inventory." -msgstr "" -"Als dit vakje aangevinkt is, worden alle onderliggende groepen en hosts die " -"niet aangetroffen worden in de externe bron verwijderd uit de lokale " -"inventaris." - #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:343 msgid "" "If checked, all variables for child groups and hosts will be removed and " @@ -2426,30 +2246,41 @@ msgstr "" "groepen en hosts verwijderd en worden ze vervangen door de variabelen die " "aangetroffen worden in de externe bron." -#: client/src/templates/job_templates/job-template.form.js:272 +#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:331 +msgid "" +"If checked, any hosts and groups that were previously present on the " +"external source but are now removed will be removed from the Tower " +"inventory. Hosts and groups that were not managed by the inventory source " +"will be promoted to the next manually created group or if there is no " +"manually created group to promote them into, they will be left in the " +"\"all\" default group for the inventory." +msgstr "" + +#: client/src/templates/job_templates/job-template.form.js:267 msgid "If enabled, run this playbook as an administrator." msgstr "" "Als deze optie ingeschakeld is, wordt het draaiboek uitgevoerd als " "beheerder." #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:120 -#: client/src/templates/job_templates/job-template.form.js:256 -#: client/src/templates/job_templates/job-template.form.js:258 msgid "" "If enabled, show the changes made by Ansible tasks, where supported. This is" -" equivalent to Ansible's --diff mode." +" equivalent to Ansible’s --diff mode." msgstr "" -"Laat de wijzigingen die aangebracht zijn door Ansible-taken zien, waar " -"ondersteund, indien deze mogelijkheid ingeschakeld is. Dit staat gelijk aan " -"de diff-modus van Ansible." -#: client/src/templates/job_templates/job-template.form.js:296 +#: client/src/templates/job_templates/job-template.form.js:251 +msgid "" +"If enabled, show the changes made by Ansible tasks, where supported. This is" +" equivalent to Ansible’s --diff mode." +msgstr "" + +#: client/src/templates/job_templates/job-template.form.js:291 msgid "If enabled, simultaneous runs of this job template will be allowed." msgstr "" "Indien deze mogelijkheid ingeschakeld is, zijn gelijktijdige uitvoeringen " "van deze taaksjabloon toegestaan." -#: client/src/templates/job_templates/job-template.form.js:307 +#: client/src/templates/job_templates/job-template.form.js:302 msgid "" "If enabled, use cached facts if available and store discovered facts in the " "cache." @@ -2488,8 +2319,6 @@ msgstr "Afbeelding-ID:" #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js:30 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:33 #: client/src/inventories-hosts/inventories/related/hosts/related-host.list.js:29 -#: client/src/inventories-hosts/hosts/host.form.js:33 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:32 msgid "" "Indicates if a host is available and should be included in running jobs." msgstr "" @@ -2498,56 +2327,46 @@ msgstr "" #: client/src/activity-stream/activity-detail.form.js:31 #: client/src/activity-stream/streams.list.js:33 -#: client/src/activity-stream/streams.list.js:34 msgid "Initiated by" msgstr "Gestart door" #: client/src/credential-types/credential-types.form.js:53 #: client/src/credential-types/credential-types.form.js:61 -#: client/src/credential-types/credential-types.form.js:60 -#: client/src/credential-types/credential-types.form.js:75 msgid "Injector Configuration" msgstr "Configuratie-injector" #: client/src/credential-types/credential-types.form.js:39 #: client/src/credential-types/credential-types.form.js:47 -#: client/src/credential-types/credential-types.form.js:54 msgid "Input Configuration" msgstr "Configuratie-input" #: client/src/inventories-hosts/hosts/host.form.js:123 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:121 -#: client/src/inventories-hosts/hosts/host.form.js:127 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:120 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:122 msgid "Insights" msgstr "Inzichten" -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:72 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:69 msgid "Insights Credential" msgstr "Inzichten toegangsgegevens" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:145 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:148 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:135 msgid "Instance Filters" msgstr "Instantiefilters" -#: client/src/job-results/job-results.partial.html:366 +#: client/src/job-results/job-results.partial.html:369 msgid "Instance Group" msgstr "Instantiegroep" +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:72 #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:75 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:78 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:83 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:86 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:78 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:81 #: client/src/organizations/organizations.form.js:38 #: client/src/organizations/organizations.form.js:41 #: client/src/setup-menu/setup-menu.partial.html:54 -#: client/src/templates/job_templates/job-template.form.js:196 -#: client/src/templates/job_templates/job-template.form.js:199 -#: client/src/setup-menu/setup-menu.partial.html:60 -#: client/src/templates/job_templates/job-template.form.js:205 -#: client/src/templates/job_templates/job-template.form.js:208 +#: client/src/templates/job_templates/job-template.form.js:191 +#: client/src/templates/job_templates/job-template.form.js:194 msgid "Instance Groups" msgstr "Instantiegroepen" @@ -2583,8 +2402,8 @@ msgstr "Ongeldige input voor dit type." msgid "Invalid username and/or password. Please try again." msgstr "Ongeldige gebruikersnaam en/of wachtwoord. Probeer het opnieuw." -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:128 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:53 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:122 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:52 #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:26 #: client/src/home/dashboard/counts/dashboard-counts.directive.js:50 #: client/src/organizations/linkout/organizations-linkout.route.js:155 @@ -2594,7 +2413,7 @@ msgstr "Inventarissen" #: client/src/inventories-hosts/hosts/host.list.js:69 #: client/src/inventories-hosts/inventories/inventory.list.js:80 #: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:69 -#: client/src/job-results/job-results.partial.html:198 +#: client/src/job-results/job-results.partial.html:201 #: client/src/job-submission/job-submission.partial.html:17 #: client/src/organizations/linkout/controllers/organizations-inventories.controller.js:70 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:58 @@ -2602,21 +2421,16 @@ msgstr "Inventarissen" #: client/src/templates/job_templates/job-template.form.js:80 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:72 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:82 -#: client/src/templates/job_templates/job-template.form.js:70 -#: client/src/templates/job_templates/job-template.form.js:84 msgid "Inventory" msgstr "Inventaris" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:110 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:124 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:104 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:116 msgid "Inventory File" msgstr "Inventarisbestand" #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:27 #: client/src/setup-menu/setup-menu.partial.html:41 -#: client/src/setup-menu/setup-menu.partial.html:34 msgid "Inventory Scripts" msgstr "Inventarisscript" @@ -2628,8 +2442,7 @@ msgstr "Inventarissynchronisatie" msgid "Inventory Sync Failures" msgstr "Fouten bij inventarissynchronisatie" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:96 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:105 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:93 msgid "Inventory Variables" msgstr "Inventarisvariabelen" @@ -2649,26 +2462,23 @@ msgstr "TAAKSJABLOON" #: client/src/organizations/list/organizations-list.controller.js:78 #: client/src/portal-mode/portal-job-templates.list.js:13 #: client/src/portal-mode/portal-job-templates.list.js:14 -#: client/src/organizations/linkout/organizations-linkout.route.js:250 msgid "JOB TEMPLATES" msgstr "TAAKSJABLONEN" #: client/src/activity-stream/get-target-title.factory.js:32 -#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:109 -#: client/src/instance-groups/instance-group.partial.html:29 -#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:28 +#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:118 +#: client/src/instance-groups/instance-group.partial.html:28 +#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:27 #: client/src/instance-groups/jobs/jobs-list.route.js:9 #: client/src/jobs/jobs.route.js:15 #: client/src/main-menu/main-menu.partial.html:122 #: client/src/main-menu/main-menu.partial.html:43 #: client/src/portal-mode/portal-jobs.list.js:13 #: client/src/portal-mode/portal-jobs.list.js:17 -#: client/src/activity-stream/get-target-title.factory.js:29 msgid "JOBS" msgstr "TAKEN" -#: client/src/job-submission/job-submission.partial.html:169 -#: client/src/job-submission/job-submission.partial.html:167 +#: client/src/job-submission/job-submission.partial.html:173 msgid "JSON" msgstr "JSON" @@ -2678,15 +2488,12 @@ msgstr "JSON" msgid "JSON:" msgstr "JSON:" -#: client/src/job-results/job-results.partial.html:381 -#: client/src/job-submission/job-submission.partial.html:222 -#: client/src/templates/job_templates/job-template.form.js:205 -#: client/src/templates/job_templates/job-template.form.js:212 +#: client/src/job-results/job-results.partial.html:384 +#: client/src/job-submission/job-submission.partial.html:228 +#: client/src/templates/job_templates/job-template.form.js:200 +#: client/src/templates/job_templates/job-template.form.js:207 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:127 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:135 -#: client/src/job-submission/job-submission.partial.html:220 -#: client/src/templates/job_templates/job-template.form.js:214 -#: client/src/templates/job_templates/job-template.form.js:223 msgid "Job Tags" msgstr "Taaktags" @@ -2694,22 +2501,19 @@ msgstr "Taaktags" msgid "Job Template" msgstr "Taaksjabloon" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:109 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:103 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:36 #: client/src/organizations/linkout/organizations-linkout.route.js:268 -#: client/src/organizations/linkout/organizations-linkout.route.js:262 msgid "Job Templates" msgstr "Taaksjablonen" #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:32 -#: client/src/job-results/job-results.partial.html:156 -#: client/src/job-submission/job-submission.partial.html:196 +#: client/src/job-results/job-results.partial.html:159 +#: client/src/job-submission/job-submission.partial.html:202 #: client/src/templates/job_templates/job-template.form.js:47 #: client/src/templates/job_templates/job-template.form.js:55 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:103 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:92 -#: client/src/job-submission/job-submission.partial.html:194 -#: client/src/templates/job_templates/job-template.form.js:59 msgid "Job Type" msgstr "Soort taak" @@ -2728,14 +2532,13 @@ msgid "Jobs" msgstr "Taken" #: client/src/job-results/job-results.controller.js:269 -#: client/src/job-results/job-results.controller.js:321 +#: client/src/job-results/job-results.controller.js:366 msgid "Jump to last line of standard out." msgstr "Meteen naar de laatste regel van de standaardoutput gaan." #: client/src/access/add-rbac-resource/rbac-resource.partial.html:61 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:102 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:154 #: client/src/shared/smart-search/smart-search.partial.html:14 -#: client/src/access/add-rbac-resource/rbac-resource.partial.html:63 msgid "Key" msgstr "Sleutel" @@ -2755,7 +2558,6 @@ msgstr "TAAK STARTEN" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:86 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:66 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:73 msgid "LAUNCH TYPE" msgstr "SOORT STARTEN" @@ -2764,12 +2566,10 @@ msgid "LDAP" msgstr "LDAP" #: client/src/license/license.route.js:19 -#: client/src/license/license.route.js:18 msgid "LICENSE" msgstr "LICENTIE" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:58 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:45 msgid "LICENSE ERROR" msgstr "LICENTIEFOUT" @@ -2779,16 +2579,14 @@ msgstr "AFMELDEN" #: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:68 #: client/src/instance-groups/jobs/jobs.list.js:66 -#: client/src/job-results/job-results.partial.html:431 -#: client/src/job-results/job-results.partial.html:440 +#: client/src/job-results/job-results.partial.html:434 +#: client/src/job-results/job-results.partial.html:443 #: client/src/jobs/all-jobs.list.js:74 -#: client/src/templates/job_templates/job-template.form.js:239 -#: client/src/templates/job_templates/job-template.form.js:243 +#: client/src/templates/job_templates/job-template.form.js:234 +#: client/src/templates/job_templates/job-template.form.js:238 #: client/src/templates/templates.list.js:43 #: client/src/templates/workflows.form.js:62 #: client/src/templates/workflows.form.js:67 -#: client/src/templates/job_templates/job-template.form.js:347 -#: client/src/templates/job_templates/job-template.form.js:352 msgid "Labels" msgstr "Labels" @@ -2806,25 +2604,22 @@ msgid "Last Updated" msgstr "Laatst geüpdatet" #: client/src/portal-mode/portal-job-templates.list.js:36 -#: client/src/shared/form-generator.js:1699 +#: client/src/shared/form-generator.js:1707 #: client/src/templates/templates.list.js:80 -#: client/src/shared/form-generator.js:1750 msgid "Launch" msgstr "Starten" #: client/src/management-jobs/card/card.partial.html:23 -#: client/src/management-jobs/card/card.partial.html:21 msgid "Launch Management Job" msgstr "Beheertaak starten" -#: client/src/job-results/job-results.partial.html:167 -#: client/src/job-results/job-results.partial.html:182 +#: client/src/job-results/job-results.partial.html:170 +#: client/src/job-results/job-results.partial.html:185 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:76 msgid "Launched By" msgstr "Gestart door" #: client/src/job-submission/job-submission.partial.html:99 -#: client/src/job-submission/job-submission.partial.html:97 msgid "" "Launching this job requires the passwords listed below. Enter and confirm " "each password before continuing." @@ -2832,8 +2627,7 @@ msgstr "" "Voor het starten van deze taak zijn onderstaande wachtwoorden nodig. Ieder " "wachtwoord dient ingevoerd en bevestigd te worden voordat u verdergaat." -#: client/features/credentials/legacy.credentials.js:360 -#: client/features/credentials/legacy.credentials.js:343 +#: client/features/credentials/legacy.credentials.js:357 msgid "Legacy state configuration for does not exist" msgstr "Er bestaat geen oude staat van configuratie voor" @@ -2842,7 +2636,7 @@ msgstr "Er bestaat geen oude staat van configuratie voor" msgid "License" msgstr "Licentie" -#: client/src/license/license.partial.html:102 +#: client/src/license/license.partial.html:104 msgid "License File" msgstr "Licentiebestand" @@ -2860,16 +2654,13 @@ msgstr "Licentiesoort" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:45 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:55 -#: client/src/job-results/job-results.partial.html:344 -#: client/src/job-submission/job-submission.partial.html:214 +#: client/src/job-results/job-results.partial.html:347 +#: client/src/job-submission/job-submission.partial.html:220 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:92 -#: client/src/templates/job_templates/job-template.form.js:165 -#: client/src/templates/job_templates/job-template.form.js:169 +#: client/src/templates/job_templates/job-template.form.js:160 +#: client/src/templates/job_templates/job-template.form.js:164 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:113 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:120 -#: client/src/job-submission/job-submission.partial.html:212 -#: client/src/templates/job_templates/job-template.form.js:171 -#: client/src/templates/job_templates/job-template.form.js:178 msgid "Limit" msgstr "Limiet" @@ -2905,8 +2696,7 @@ msgstr "" msgid "Live events: error connecting to the server." msgstr "Livegebeurtenissen: fout bij het verbinding maken met de server." -#: client/src/shared/form-generator.js:1975 -#: client/src/shared/form-generator.js:2026 +#: client/src/shared/form-generator.js:1983 msgid "Loading..." msgstr "Laden..." @@ -2918,15 +2708,15 @@ msgstr "Lokale tijdzone" msgid "Log Out" msgstr "Afmelden" -#: client/src/configuration/system-form/configuration-system.controller.js:220 -msgid "Log aggregator test failed.
Detail:" -msgstr "Log aggregator-test mislukt.
Informatie:" +#: client/src/configuration/system-form/configuration-system.controller.js:225 +msgid "Log aggregator test failed.
Detail:" +msgstr "" -#: client/src/configuration/system-form/configuration-system.controller.js:212 +#: client/src/configuration/system-form/configuration-system.controller.js:218 msgid "Log aggregator test successful." msgstr "Log aggregator-test gelukt." -#: client/src/configuration/system-form/configuration-system.controller.js:87 +#: client/src/configuration/system-form/configuration-system.controller.js:89 msgid "Logging" msgstr "Bezig met dataregistratie" @@ -2936,7 +2726,6 @@ msgstr "Laag" #: client/src/management-jobs/card/card.partial.html:6 #: client/src/management-jobs/card/card.route.js:21 -#: client/src/management-jobs/card/card.partial.html:4 msgid "MANAGEMENT JOBS" msgstr "BEHEERDERSTAKEN" @@ -2945,18 +2734,16 @@ msgid "MY VIEW" msgstr "MIJN BEELD" #: client/src/credentials/credentials.form.js:67 -#: client/src/job-submission/job-submission.partial.html:349 -#: client/src/job-submission/job-submission.partial.html:346 +#: client/src/job-submission/job-submission.partial.html:356 msgid "Machine" msgstr "Machine" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:60 -#: client/src/job-results/job-results.partial.html:257 +#: client/src/job-results/job-results.partial.html:260 msgid "Machine Credential" msgstr "Toegangsgegevens machine" #: client/src/setup-menu/setup-menu.partial.html:36 -#: client/src/setup-menu/setup-menu.partial.html:29 msgid "" "Manage the cleanup of old job history, activity streams, data marked for " "deletion, and system tracking info." @@ -2964,26 +2751,16 @@ msgstr "" "Het opschonen van oude taakgeschiedenis, activiteitenlogboeken, gegevens die" " verwijderd moeten worden en trackinginformatie van het systeem." -#: client/src/credentials/factories/become-method-change.factory.js:38 -#: client/src/credentials/factories/kind-change.factory.js:95 -#: client/src/credentials/factories/become-method-change.factory.js:40 -#: client/src/credentials/factories/kind-change.factory.js:97 -msgid "Management Certificate" -msgstr "Beheerderscertificaat" - #: client/src/setup-menu/setup-menu.partial.html:35 -#: client/src/setup-menu/setup-menu.partial.html:28 msgid "Management Jobs" msgstr "Beheerderstaken" #: client/src/projects/list/projects-list.controller.js:89 -#: client/src/projects/list/projects-list.controller.js:88 msgid "Manual projects do not require a schedule" msgstr "Voor handmatige projecten is geen schema nodig" -#: client/src/projects/edit/projects-edit.controller.js:140 +#: client/src/projects/edit/projects-edit.controller.js:141 #: client/src/projects/list/projects-list.controller.js:88 -#: client/src/projects/list/projects-list.controller.js:87 msgid "Manual projects do not require an SCM update" msgstr "Voor handmatige projecten is geen SCM-update nodig" @@ -2995,7 +2772,7 @@ msgstr "Maximaal aantal sessies per gebruiker bereikt. Meld u aan." msgid "Medium" msgstr "Medium" -#: client/src/configuration/system-form/configuration-system.controller.js:88 +#: client/src/configuration/system-form/configuration-system.controller.js:90 msgid "Misc. System" msgstr "Overig systeem" @@ -3020,7 +2797,7 @@ msgstr "Meest recente taak is mislukt. Klik om taken te bekijken." msgid "Most recent job successful. Click to view jobs." msgstr "Meest recente taak is gelukt. Klik om taken te bekijken." -#: client/src/templates/survey-maker/shared/question-definition.form.js:74 +#: client/src/templates/survey-maker/shared/question-definition.form.js:77 msgid "Multiple Choice Options" msgstr "Meerkeuze-opties" @@ -3104,7 +2881,6 @@ msgstr "BERICHTSJABLOON" #: client/src/activity-stream/get-target-title.factory.js:26 #: client/src/notifications/notificationTemplates.list.js:14 -#: client/src/activity-stream/get-target-title.factory.js:23 msgid "NOTIFICATION TEMPLATES" msgstr "BERICHTSJABLONEN" @@ -3120,7 +2896,7 @@ msgstr "BERICHTEN" #: client/src/credentials/credentials.list.js:26 #: client/src/home/dashboard/lists/job-templates/job-templates-list.partial.html:14 #: client/src/home/dashboard/lists/jobs/jobs-list.partial.html:13 -#: client/src/instance-groups/instance-groups.list.js:14 +#: client/src/instance-groups/instance-groups.list.js:15 #: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:35 #: client/src/instance-groups/instances/instances-list.partial.html:15 #: client/src/instance-groups/instances/instances.list.js:14 @@ -3157,13 +2933,8 @@ msgstr "BERICHTEN" #: client/src/templates/job_templates/job-template.form.js:34 #: client/src/templates/templates.list.js:24 #: client/src/templates/workflows.form.js:32 -#: client/src/users/users.form.js:138 client/src/users/users.form.js:164 -#: client/src/users/users.form.js:190 -#: client/src/credential-types/credential-types.list.js:21 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:48 -#: client/src/portal-mode/portal-jobs.list.js:34 -#: client/src/users/users.form.js:139 client/src/users/users.form.js:165 -#: client/src/users/users.form.js:191 +#: client/src/users/users.form.js:142 client/src/users/users.form.js:168 +#: client/src/users/users.form.js:194 msgid "Name" msgstr "Naam" @@ -3171,7 +2942,7 @@ msgstr "Naam" msgid "Network" msgstr "Netwerk" -#: client/src/job-results/job-results.partial.html:303 +#: client/src/job-results/job-results.partial.html:306 msgid "Network Credential" msgstr "Netwerktoegangsgegevens" @@ -3183,7 +2954,7 @@ msgstr "Nieuwe groep" msgid "New Host" msgstr "Nieuwe host" -#: client/src/users/add/users-add.controller.js:90 +#: client/src/users/add/users-add.controller.js:91 msgid "New user successfully created!" msgstr "Nieuwe gebruiker aanmaken gelukt!" @@ -3197,7 +2968,7 @@ msgid "No Credentials Have Been Created" msgstr "Nog geen toegangsgegevens aangemaakt" #: client/src/job-submission/lists/credential/job-sub-cred-list.controller.js:44 -#: client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js:124 +#: client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js:140 msgid "No Credentials Matching This Type Have Been Created" msgstr "Nog geen toegangsgegevens die overeenkomen met deze soort aangemaakt" @@ -3214,7 +2985,6 @@ msgid "No Remediation Playbook Available" msgstr "Geen draaiboek voor herstel beschikbaar" #: client/src/projects/list/projects-list.controller.js:159 -#: client/src/projects/list/projects-list.controller.js:158 msgid "No SCM Configuration" msgstr "Geen SCM-configuratie" @@ -3227,7 +2997,6 @@ msgid "No Teams exist" msgstr "Er bestaan geen teams" #: client/src/projects/list/projects-list.controller.js:150 -#: client/src/projects/list/projects-list.controller.js:149 msgid "No Updates Available" msgstr "Er zijn geen updates beschikbaar" @@ -3282,8 +3051,7 @@ msgstr "Er zijn nog geen taken uitgevoerd." msgid "No jobs were recently run." msgstr "Er zijn recent geen taken uitgevoerd." -#: client/src/teams/teams.form.js:121 client/src/users/users.form.js:187 -#: client/src/users/users.form.js:188 +#: client/src/teams/teams.form.js:121 client/src/users/users.form.js:191 msgid "No permissions have been granted" msgstr "Geen machtigingen toegekend" @@ -3291,7 +3059,7 @@ msgstr "Geen machtigingen toegekend" msgid "No recent job data available for this host." msgstr "Er zijn geen recente taakgegevens beschikbaar voor deze host." -#: client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js:73 +#: client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js:75 msgid "No recent job data available for this inventory." msgstr "Er zijn geen recente taakgegevens beschikbaar voor dit inventaris." @@ -3300,8 +3068,8 @@ msgid "No recent notifications." msgstr "Geen recente berichten." #: client/src/inventories-hosts/hosts/hosts.partial.html:36 -#: client/src/shared/form-generator.js:1871 -#: client/src/shared/form-generator.js:1922 +#: client/src/shared/form-generator.js:1879 +#: client/src/shared/list-generator/list-generator.factory.js:240 msgid "No records matched your search." msgstr "Er zijn geen gegevens die overeenkomen met uw zoekopdracht." @@ -3309,10 +3077,8 @@ msgstr "Er zijn geen gegevens die overeenkomen met uw zoekopdracht." msgid "No schedules exist" msgstr "Er bestaan geen schema's" -#: client/src/job-submission/job-submission.partial.html:341 -#: client/src/job-submission/job-submission.partial.html:346 -#: client/src/job-submission/job-submission.partial.html:338 -#: client/src/job-submission/job-submission.partial.html:343 +#: client/src/job-submission/job-submission.partial.html:348 +#: client/src/job-submission/job-submission.partial.html:353 msgid "None selected" msgstr "Geen geselecteerd" @@ -3323,7 +3089,6 @@ msgid "Normal User" msgstr "Normale gebruiker" #: client/src/projects/list/projects-list.controller.js:91 -#: client/src/projects/list/projects-list.controller.js:90 msgid "Not configured for SCM" msgstr "Niet geconfigureerd voor SCM" @@ -3331,10 +3096,15 @@ msgstr "Niet geconfigureerd voor SCM" msgid "Not configured for inventory sync." msgstr "Niet geconfigureerd voor inventarissynchronisatie." -#: client/src/notifications/notificationTemplates.form.js:291 -#: client/src/notifications/notificationTemplates.form.js:292 -#: client/src/notifications/notificationTemplates.form.js:296 -#: client/src/notifications/notificationTemplates.form.js:297 +#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:25 +msgid "" +"Note that only hosts directly in this group can be disassociated. Hosts in " +"sub-groups must be disassociated directly from the sub-group level that they" +" belong." +msgstr "" + +#: client/src/notifications/notificationTemplates.form.js:288 +#: client/src/notifications/notificationTemplates.form.js:289 msgid "Notification Color" msgstr "Berichtkleur" @@ -3342,8 +3112,7 @@ msgstr "Berichtkleur" msgid "Notification Failed." msgstr "Bericht mislukt" -#: client/src/notifications/notificationTemplates.form.js:280 -#: client/src/notifications/notificationTemplates.form.js:285 +#: client/src/notifications/notificationTemplates.form.js:277 msgid "Notification Label" msgstr "Berichtlabel" @@ -3355,37 +3124,33 @@ msgstr "Berichtsjablonen" #: client/src/management-jobs/notifications/notification.route.js:21 #: client/src/notifications/notifications.list.js:17 #: client/src/setup-menu/setup-menu.partial.html:48 -#: client/src/setup-menu/setup-menu.partial.html:41 msgid "Notifications" msgstr "Berichten" -#: client/src/notifications/notificationTemplates.form.js:305 -#: client/src/notifications/notificationTemplates.form.js:310 +#: client/src/notifications/notificationTemplates.form.js:302 msgid "Notify Channel" msgstr "Bericht naar kanaal sturen" #: client/src/inventories-hosts/hosts/hosts.partial.html:55 -#: client/src/job-submission/job-submission.partial.html:263 +#: client/src/job-submission/job-submission.partial.html:269 #: client/src/partials/survey-maker-modal.html:27 -#: client/src/shared/form-generator.js:538 +#: client/src/shared/form-generator.js:542 +#: client/src/shared/form-generator.js:773 #: client/src/shared/generator-helpers.js:551 -#: client/src/job-submission/job-submission.partial.html:260 -#: client/src/shared/form-generator.js:555 msgid "OFF" msgstr "UIT" #: client/lib/services/base-string.service.js:63 -#: client/lib/services/base-string.service.js:31 +#: client/src/jobs/factories/delete-job.factory.js:115 msgid "OK" msgstr "OK" #: client/src/inventories-hosts/hosts/hosts.partial.html:54 -#: client/src/job-submission/job-submission.partial.html:261 +#: client/src/job-submission/job-submission.partial.html:267 #: client/src/partials/survey-maker-modal.html:26 -#: client/src/shared/form-generator.js:536 +#: client/src/shared/form-generator.js:538 +#: client/src/shared/form-generator.js:771 #: client/src/shared/generator-helpers.js:547 -#: client/src/job-submission/job-submission.partial.html:259 -#: client/src/shared/form-generator.js:553 msgid "ON" msgstr "AAN" @@ -3396,17 +3161,14 @@ msgstr "OPTIES" #: client/src/activity-stream/get-target-title.factory.js:29 #: client/src/organizations/list/organizations-list.partial.html:6 #: client/src/organizations/main.js:52 -#: client/src/activity-stream/get-target-title.factory.js:26 msgid "ORGANIZATIONS" msgstr "ORGANISATIES" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:116 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:103 msgid "OVERWRITE" msgstr "OVERSCHRIJVEN" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:123 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:110 msgid "OVERWRITE VARS" msgstr "VARIABELEN OVERSCHRIJVEN" @@ -3420,7 +3182,6 @@ msgstr "Bij slagen" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:157 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:162 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:146 msgid "Only Group By" msgstr "Alleen ordenen op" @@ -3432,9 +3193,8 @@ msgstr "" "Domeinen van OpenStack bepalen administratieve grenzen. Het is alleen nodig " "voor Keystone v3 authenticatie-URL's. Veel voorkomende scenario's zijn:" -#: client/src/templates/job_templates/job-template.form.js:245 +#: client/src/templates/job_templates/job-template.form.js:240 #: client/src/templates/workflows.form.js:69 -#: client/src/templates/job_templates/job-template.form.js:354 msgid "" "Optional labels that describe this job template, such as 'dev' or 'test'. " "Labels can be used to group and filter job templates and completed jobs." @@ -3443,11 +3203,9 @@ msgstr "" "Labels kunnen gebruikt worden om taaksjablonen en uitgevoerde taken te " "ordenen en filteren." -#: client/src/notifications/notificationTemplates.form.js:385 +#: client/src/notifications/notificationTemplates.form.js:382 #: client/src/partials/logviewer.html:7 -#: client/src/templates/job_templates/job-template.form.js:264 -#: client/src/notifications/notificationTemplates.form.js:397 -#: client/src/templates/job_templates/job-template.form.js:265 +#: client/src/templates/job_templates/job-template.form.js:259 msgid "Options" msgstr "Opties" @@ -3466,11 +3224,11 @@ msgstr "Opties" msgid "Organization" msgstr "Organisatie" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:142 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:65 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:136 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:64 #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:30 #: client/src/setup-menu/setup-menu.partial.html:4 -#: client/src/users/users.form.js:128 client/src/users/users.form.js:129 +#: client/src/users/users.form.js:132 msgid "Organizations" msgstr "Organisaties" @@ -3532,15 +3290,11 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:328 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:333 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:282 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:288 msgid "Overwrite" msgstr "Overschrijven" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:340 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:345 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:295 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:301 msgid "Overwrite Variables" msgstr "Variabelen overschrijven" @@ -3552,8 +3306,7 @@ msgstr "Eigenaren" msgid "PASSWORD" msgstr "WACHTWOORD" -#: client/features/credentials/legacy.credentials.js:125 -#: client/features/credentials/legacy.credentials.js:120 +#: client/features/credentials/legacy.credentials.js:122 msgid "PERMISSIONS" msgstr "MACHTIGINGEN" @@ -3568,9 +3321,8 @@ msgstr "VOEG EEN MELDING VOOR DE VRAGENLIJST TOE." #: client/src/instance-groups/instances/instances-list.partial.html:6 #: client/src/instance-groups/list/instance-groups-list.partial.html:16 #: client/src/organizations/list/organizations-list.partial.html:47 -#: client/src/shared/form-generator.js:1877 +#: client/src/shared/form-generator.js:1885 #: client/src/shared/list-generator/list-generator.factory.js:248 -#: client/src/shared/form-generator.js:1928 msgid "PLEASE ADD ITEMS TO THIS LIST" msgstr "VOEG ITEMS AAN DEZE LIJST TOE" @@ -3582,6 +3334,10 @@ msgstr "PORTAALMODUS" msgid "PREVIEW" msgstr "VOORVERTONING" +#: client/src/job-results/job-results.service.js:166 +msgid "PROCEED" +msgstr "" + #: client/src/partials/job-template-details.html:2 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:73 msgid "PROJECT" @@ -3594,7 +3350,6 @@ msgstr "PROJECT" #: client/src/organizations/list/organizations-list.controller.js:72 #: client/src/projects/main.js:73 client/src/projects/projects.list.js:14 #: client/src/projects/projects.list.js:15 -#: client/src/organizations/linkout/organizations-linkout.route.js:191 msgid "PROJECTS" msgstr "PROJECTEN" @@ -3602,12 +3357,11 @@ msgstr "PROJECTEN" msgid "Page" msgstr "Pagina" -#: client/src/notifications/notificationTemplates.form.js:235 -#: client/src/notifications/notificationTemplates.form.js:240 +#: client/src/notifications/notificationTemplates.form.js:232 msgid "Pagerduty subdomain" msgstr "Subdomein Pagerduty" -#: client/src/templates/job_templates/job-template.form.js:353 +#: client/src/templates/job_templates/job-template.form.js:348 msgid "" "Pass extra command line variables to the playbook. Provide key/value pairs " "using either YAML or JSON. Refer to the Ansible Tower documentation for " @@ -3640,34 +3394,21 @@ msgstr "" #: client/src/credentials/credentials.form.js:226 #: client/src/credentials/factories/become-method-change.factory.js:21 -#: client/src/credentials/factories/become-method-change.factory.js:46 -#: client/src/credentials/factories/become-method-change.factory.js:54 -#: client/src/credentials/factories/become-method-change.factory.js:74 -#: client/src/credentials/factories/become-method-change.factory.js:84 -#: client/src/credentials/factories/become-method-change.factory.js:94 -#: client/src/credentials/factories/kind-change.factory.js:103 -#: client/src/credentials/factories/kind-change.factory.js:111 -#: client/src/credentials/factories/kind-change.factory.js:131 -#: client/src/credentials/factories/kind-change.factory.js:141 -#: client/src/credentials/factories/kind-change.factory.js:151 +#: client/src/credentials/factories/become-method-change.factory.js:40 +#: client/src/credentials/factories/become-method-change.factory.js:48 +#: client/src/credentials/factories/become-method-change.factory.js:68 +#: client/src/credentials/factories/become-method-change.factory.js:78 +#: client/src/credentials/factories/become-method-change.factory.js:88 +#: client/src/credentials/factories/kind-change.factory.js:105 +#: client/src/credentials/factories/kind-change.factory.js:125 +#: client/src/credentials/factories/kind-change.factory.js:135 +#: client/src/credentials/factories/kind-change.factory.js:145 #: client/src/credentials/factories/kind-change.factory.js:30 #: client/src/credentials/factories/kind-change.factory.js:78 -#: client/src/job-submission/job-submission.partial.html:103 +#: client/src/credentials/factories/kind-change.factory.js:97 +#: client/src/job-submission/job-submission.partial.html:104 #: client/src/notifications/shared/type-change.service.js:28 #: client/src/users/users.form.js:68 -#: client/src/credentials/factories/become-method-change.factory.js:23 -#: client/src/credentials/factories/become-method-change.factory.js:48 -#: client/src/credentials/factories/become-method-change.factory.js:56 -#: client/src/credentials/factories/become-method-change.factory.js:76 -#: client/src/credentials/factories/become-method-change.factory.js:86 -#: client/src/credentials/factories/become-method-change.factory.js:96 -#: client/src/credentials/factories/kind-change.factory.js:105 -#: client/src/credentials/factories/kind-change.factory.js:113 -#: client/src/credentials/factories/kind-change.factory.js:133 -#: client/src/credentials/factories/kind-change.factory.js:143 -#: client/src/credentials/factories/kind-change.factory.js:153 -#: client/src/credentials/factories/kind-change.factory.js:80 -#: client/src/job-submission/job-submission.partial.html:101 msgid "Password" msgstr "Wachtwoord" @@ -3690,8 +3431,6 @@ msgstr "Afgelopen week" #: client/src/credentials/factories/become-method-change.factory.js:29 #: client/src/credentials/factories/kind-change.factory.js:86 -#: client/src/credentials/factories/become-method-change.factory.js:31 -#: client/src/credentials/factories/kind-change.factory.js:88 msgid "" "Paste the contents of the PEM file associated with the service account " "email." @@ -3699,17 +3438,6 @@ msgstr "" "Plak hier de inhoud van het PEM-bestand dat bij de e-mail van het " "serviceaccount hoor." -#: client/src/credentials/factories/become-method-change.factory.js:41 -#: client/src/credentials/factories/kind-change.factory.js:98 -#: client/src/credentials/factories/become-method-change.factory.js:43 -#: client/src/credentials/factories/kind-change.factory.js:100 -msgid "" -"Paste the contents of the PEM file that corresponds to the certificate you " -"uploaded in the Microsoft Azure console." -msgstr "" -"Plak hier de inhoud van het PEM-bestand dat hoort bij het certificaat dat u " -"geüpload hebt in de Microsoft Azure-console." - #: client/src/credentials/factories/kind-change.factory.js:51 msgid "Paste the contents of the SSH private key file." msgstr "Plak hier de inhoud van het SSH-privésleutelbestand." @@ -3720,7 +3448,7 @@ msgstr "" "Plak hier de inhoud van het SSH-privésleutelbestand.%s of klik om af te " "sluiten%s" -#: client/src/inventories-hosts/inventories/inventory.list.js:121 +#: client/src/inventories-hosts/inventories/inventory.list.js:119 msgid "Pending Delete" msgstr "In afwachting om verwijderd te worden" @@ -3729,40 +3457,30 @@ msgid "Period" msgstr "Periode" #: client/src/projects/add/projects-add.controller.js:29 -#: client/src/users/add/users-add.controller.js:42 +#: client/src/users/add/users-add.controller.js:43 msgid "Permission Error" msgstr "Machtigingsfout" #: client/features/credentials/credentials.strings.js:14 -#: client/features/credentials/legacy.credentials.js:69 +#: client/features/credentials/legacy.credentials.js:66 #: client/src/credentials/credentials.form.js:439 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:125 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:128 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:122 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:123 #: client/src/projects/projects.form.js:233 client/src/teams/teams.form.js:117 -#: client/src/templates/job_templates/job-template.form.js:391 +#: client/src/templates/job_templates/job-template.form.js:386 #: client/src/templates/workflows.form.js:114 -#: client/src/users/users.form.js:183 -#: client/features/credentials/legacy.credentials.js:64 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:134 -#: client/src/projects/projects.form.js:232 -#: client/src/templates/job_templates/job-template.form.js:411 -#: client/src/templates/workflows.form.js:119 -#: client/src/users/users.form.js:184 +#: client/src/users/users.form.js:187 msgid "Permissions" msgstr "Machtigingen" -#: client/src/job-results/job-results.partial.html:246 -#: client/src/shared/form-generator.js:1062 -#: client/src/templates/job_templates/job-template.form.js:109 -#: client/src/templates/job_templates/job-template.form.js:120 -#: client/src/shared/form-generator.js:1114 -#: client/src/templates/job_templates/job-template.form.js:113 -#: client/src/templates/job_templates/job-template.form.js:124 +#: client/src/job-results/job-results.partial.html:249 +#: client/src/shared/form-generator.js:1069 +#: client/src/templates/job_templates/job-template.form.js:107 +#: client/src/templates/job_templates/job-template.form.js:115 msgid "Playbook" msgstr "Draaiboek" #: client/src/projects/projects.form.js:89 -#: client/src/projects/projects.form.js:88 msgid "Playbook Directory" msgstr "Draaiboekmap" @@ -3770,20 +3488,19 @@ msgstr "Draaiboekmap" msgid "Playbook Run" msgstr "Draaiboek uitvoering" -#: client/src/job-results/job-results.partial.html:485 +#: client/src/job-results/job-results.partial.html:488 msgid "Plays" msgstr "Uitvoeringen van het draaiboek" -#: client/src/users/users.form.js:122 client/src/users/users.form.js:123 +#: client/src/users/users.form.js:126 msgid "Please add user to an Organization." msgstr "Voeg gebruiker toe aan een organisatie" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:101 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:100 msgid "Please assign roles to the selected resources" msgstr "Wijs rollen toe aan de geselecteerde bronnen" #: client/src/access/add-rbac-resource/rbac-resource.partial.html:60 -#: client/src/access/add-rbac-resource/rbac-resource.partial.html:62 msgid "Please assign roles to the selected users/teams" msgstr "Wijs rollen toe aan de geselecteerde gebruikers/teams" @@ -3795,15 +3512,12 @@ msgstr "" "Klik op onderstaande knop om de website van Ansible te bezoeken en een " "licentiesleutel voor Tower te bemachtigen." -#: client/src/inventories-hosts/inventory-hosts.strings.js:25 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.strings.js:8 +#: client/src/inventories-hosts/inventory-hosts.strings.js:27 msgid "Please click the icon to edit the host filter." msgstr "Klik op het icoon om de hostfilter te wijzigen." -#: client/src/shared/form-generator.js:854 -#: client/src/shared/form-generator.js:949 -#: client/src/shared/form-generator.js:877 -#: client/src/shared/form-generator.js:973 +#: client/src/shared/form-generator.js:861 +#: client/src/shared/form-generator.js:956 msgid "" "Please enter a URL that begins with ssh, http or https. The URL may not " "contain the '@' character." @@ -3811,30 +3525,23 @@ msgstr "" "Voer een URL in die begint met ssh, http of https. De URL mag niet het teken" " '@' bevatten." -#: client/src/shared/form-generator.js:1151 -#: client/src/shared/form-generator.js:1203 +#: client/src/shared/form-generator.js:1158 msgid "Please enter a number greater than %d and less than %d." msgstr "Voer een getal in dat groter is dan %d en kleiner dan %d." -#: client/src/shared/form-generator.js:1153 -#: client/src/shared/form-generator.js:1205 +#: client/src/shared/form-generator.js:1160 msgid "Please enter a number greater than %d." msgstr "Voer een getal in dat groter is dan %d." -#: client/src/shared/form-generator.js:1145 -#: client/src/shared/form-generator.js:1197 +#: client/src/shared/form-generator.js:1152 msgid "Please enter a number." msgstr "Voer een getal in." -#: client/src/job-submission/job-submission.partial.html:111 -#: client/src/job-submission/job-submission.partial.html:124 -#: client/src/job-submission/job-submission.partial.html:137 -#: client/src/job-submission/job-submission.partial.html:150 +#: client/src/job-submission/job-submission.partial.html:112 +#: client/src/job-submission/job-submission.partial.html:126 +#: client/src/job-submission/job-submission.partial.html:140 +#: client/src/job-submission/job-submission.partial.html:154 #: client/src/login/loginModal/loginModal.partial.html:78 -#: client/src/job-submission/job-submission.partial.html:109 -#: client/src/job-submission/job-submission.partial.html:122 -#: client/src/job-submission/job-submission.partial.html:135 -#: client/src/job-submission/job-submission.partial.html:148 msgid "Please enter a password." msgstr "Voer een wachtwoord in." @@ -3842,56 +3549,39 @@ msgstr "Voer een wachtwoord in." msgid "Please enter a username." msgstr "Voer een gebruikersnaam in." -#: client/src/shared/form-generator.js:844 -#: client/src/shared/form-generator.js:939 -#: client/src/shared/form-generator.js:867 -#: client/src/shared/form-generator.js:963 +#: client/src/shared/form-generator.js:851 +#: client/src/shared/form-generator.js:946 msgid "Please enter a valid email address." msgstr "Voer een geldig e-mailadres in." #: client/lib/components/components.strings.js:15 -#: client/src/shared/form-generator.js:1009 -#: client/src/shared/form-generator.js:839 -#: client/src/shared/form-generator.js:934 -#: client/src/shared/form-generator.js:1061 -#: client/src/shared/form-generator.js:862 -#: client/src/shared/form-generator.js:958 +#: client/src/shared/form-generator.js:1016 +#: client/src/shared/form-generator.js:846 +#: client/src/shared/form-generator.js:941 msgid "Please enter a value." msgstr "Voer een waarde in." -#: client/src/job-submission/job-submission.partial.html:282 -#: client/src/job-submission/job-submission.partial.html:287 -#: client/src/job-submission/job-submission.partial.html:298 -#: client/src/job-submission/job-submission.partial.html:304 -#: client/src/job-submission/job-submission.partial.html:310 -#: client/src/job-submission/job-submission.partial.html:279 -#: client/src/job-submission/job-submission.partial.html:284 -#: client/src/job-submission/job-submission.partial.html:295 -#: client/src/job-submission/job-submission.partial.html:301 -#: client/src/job-submission/job-submission.partial.html:307 +#: client/src/job-submission/job-submission.partial.html:289 +#: client/src/job-submission/job-submission.partial.html:294 +#: client/src/job-submission/job-submission.partial.html:305 +#: client/src/job-submission/job-submission.partial.html:311 +#: client/src/job-submission/job-submission.partial.html:317 msgid "Please enter an answer between" msgstr "Voer een antwoord in tussen" -#: client/src/job-submission/job-submission.partial.html:309 -#: client/src/job-submission/job-submission.partial.html:306 +#: client/src/job-submission/job-submission.partial.html:316 msgid "Please enter an answer that is a decimal number." msgstr "Voer een antwoord in dat een decimaal getal is." -#: client/src/job-submission/job-submission.partial.html:303 -#: client/src/job-submission/job-submission.partial.html:300 +#: client/src/job-submission/job-submission.partial.html:310 msgid "Please enter an answer that is a valid integer." msgstr "Voer een antwoord in dat een geldig geheel getal is." -#: client/src/job-submission/job-submission.partial.html:281 -#: client/src/job-submission/job-submission.partial.html:286 -#: client/src/job-submission/job-submission.partial.html:297 -#: client/src/job-submission/job-submission.partial.html:302 -#: client/src/job-submission/job-submission.partial.html:308 -#: client/src/job-submission/job-submission.partial.html:278 -#: client/src/job-submission/job-submission.partial.html:283 -#: client/src/job-submission/job-submission.partial.html:294 -#: client/src/job-submission/job-submission.partial.html:299 -#: client/src/job-submission/job-submission.partial.html:305 +#: client/src/job-submission/job-submission.partial.html:288 +#: client/src/job-submission/job-submission.partial.html:293 +#: client/src/job-submission/job-submission.partial.html:304 +#: client/src/job-submission/job-submission.partial.html:309 +#: client/src/job-submission/job-submission.partial.html:315 msgid "Please enter an answer." msgstr "Voer een antwoord in." @@ -3900,7 +3590,7 @@ msgstr "Voer een antwoord in." msgid "Please save and run a job to view." msgstr "Sla op en voer een taak uit om te bekijken." -#: client/src/templates/job_templates/add-job-template/job-template-add.controller.js:49 +#: client/src/templates/job_templates/add-job-template/job-template-add.controller.js:50 msgid "Please save before adding a survey to this job template." msgstr "Sla op voordat u een een vragenlijst toevoegt aan deze taaksjabloon." @@ -3917,44 +3607,34 @@ msgstr "Sla op voordat u berichten toevoegt." msgid "Please save before adding users." msgstr "Sla op voordat u gebruikers toevoegt." -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:121 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:124 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:118 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:119 #: client/src/projects/projects.form.js:225 client/src/teams/teams.form.js:113 -#: client/src/templates/job_templates/job-template.form.js:384 +#: client/src/templates/job_templates/job-template.form.js:379 #: client/src/templates/workflows.form.js:107 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:130 -#: client/src/projects/projects.form.js:224 -#: client/src/templates/job_templates/job-template.form.js:404 -#: client/src/templates/workflows.form.js:112 msgid "Please save before assigning permissions." msgstr "Sla op voordat u machtigingen toekent." -#: client/src/users/users.form.js:120 client/src/users/users.form.js:179 -#: client/src/users/users.form.js:121 client/src/users/users.form.js:180 +#: client/src/users/users.form.js:124 client/src/users/users.form.js:183 msgid "Please save before assigning to organizations." msgstr "Sla op voordat u toewijst aan organisaties." -#: client/src/users/users.form.js:148 client/src/users/users.form.js:149 +#: client/src/users/users.form.js:152 msgid "Please save before assigning to teams." msgstr "Sla op voordat u toewijst aan teams." -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:169 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:175 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:164 msgid "Please save before creating groups." msgstr "Sla op voordat u groepen aanmaakt." -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:178 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:184 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:173 msgid "Please save before creating hosts." msgstr "Sla op voordat u hosts aanmaakt." #: client/src/inventories-hosts/hosts/host.form.js:112 #: client/src/inventories-hosts/inventories/related/groups/groups.form.js:86 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:111 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:111 -#: client/src/inventories-hosts/hosts/host.form.js:116 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:116 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:110 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:112 msgid "Please save before defining groups." msgstr "Sla op voordat u groepen bepaalt." @@ -3962,8 +3642,7 @@ msgstr "Sla op voordat u groepen bepaalt." msgid "Please save before defining hosts." msgstr "Sla op voordat u hosts bepaalt." -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:187 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:193 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:182 msgid "Please save before defining inventory sources." msgstr "Sla op voordat u inventarisbronnen bepaalt." @@ -3972,22 +3651,17 @@ msgid "Please save before defining the workflow graph." msgstr "Sla op voordat u de workflowgrafiek bepaalt." #: client/src/inventories-hosts/hosts/host.form.js:121 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:119 -#: client/src/inventories-hosts/hosts/host.form.js:125 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:118 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:120 msgid "Please save before viewing Insights." msgstr "Sla op voordat u Insights bekijkt." #: client/src/inventories-hosts/hosts/host.form.js:105 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:104 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:104 -#: client/src/inventories-hosts/hosts/host.form.js:109 -#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:109 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:103 +#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:105 msgid "Please save before viewing facts." msgstr "Sla op voordat u feiten bekijkt." -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:167 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:164 msgid "Please save before viewing hosts." msgstr "Sla op voordat u hosts bekijkt." @@ -4004,7 +3678,6 @@ msgid "Please select a Credential." msgstr "Selecteer toegangsgegevens." #: client/src/templates/job_templates/multi-credential/multi-credential.partial.html:46 -#: client/src/templates/job_templates/multi-credential/multi-credential.partial.html:43 msgid "" "Please select a machine (SSH) credential or check the \"Prompt on launch\" " "option." @@ -4012,29 +3685,22 @@ msgstr "" "Selecteer machine (SSH)-toegangsgegevens of vink de optie \"Melding bij " "opstarten\" aan." -#: client/src/shared/form-generator.js:1186 -#: client/src/shared/form-generator.js:1238 +#: client/src/shared/form-generator.js:1193 msgid "Please select a number between" msgstr "Selecteer een getal tussen" -#: client/src/shared/form-generator.js:1182 -#: client/src/shared/form-generator.js:1234 +#: client/src/shared/form-generator.js:1189 msgid "Please select a number." msgstr "Selecteer een getal." -#: client/src/shared/form-generator.js:1074 -#: client/src/shared/form-generator.js:1142 -#: client/src/shared/form-generator.js:1263 -#: client/src/shared/form-generator.js:1371 -#: client/src/shared/form-generator.js:1126 -#: client/src/shared/form-generator.js:1194 -#: client/src/shared/form-generator.js:1314 -#: client/src/shared/form-generator.js:1422 +#: client/src/shared/form-generator.js:1081 +#: client/src/shared/form-generator.js:1149 +#: client/src/shared/form-generator.js:1270 +#: client/src/shared/form-generator.js:1378 msgid "Please select a value." msgstr "Selecteer een waarde." #: client/src/templates/job_templates/job-template.form.js:77 -#: client/src/templates/job_templates/job-template.form.js:81 msgid "Please select an Inventory or check the Prompt on launch option." msgstr "Selecteer een inventaris of vink de optie Melding bij opstarten aan." @@ -4042,8 +3708,11 @@ msgstr "Selecteer een inventaris of vink de optie Melding bij opstarten aan." msgid "Please select an Inventory." msgstr "Selecteer een inventaris." -#: client/src/shared/form-generator.js:1179 -#: client/src/shared/form-generator.js:1231 +#: client/src/inventories-hosts/inventory-hosts.strings.js:26 +msgid "Please select an organization before editing the host filter." +msgstr "" + +#: client/src/shared/form-generator.js:1186 msgid "Please select at least one value." msgstr "Selecteer ten minste één waarde." @@ -4051,7 +3720,7 @@ msgstr "Selecteer ten minste één waarde." msgid "Please select resources from the lists below." msgstr "Selecteer hulpbronnen uit de onderstaande lijsten." -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:68 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65 msgid "Populate the hosts for this inventory by using a search filter." msgstr "Vul de hosts voor dit inventaris in door een zoekfilter te gebruiken." @@ -4066,8 +3735,7 @@ msgid "Private Key" msgstr "Privésleutel" #: client/src/credentials/credentials.form.js:264 -#: client/src/job-submission/job-submission.partial.html:116 -#: client/src/job-submission/job-submission.partial.html:114 +#: client/src/job-submission/job-submission.partial.html:118 msgid "Private Key Passphrase" msgstr "Privésleutel wachtwoordzin" @@ -4077,44 +3745,30 @@ msgid "Privilege Escalation" msgstr "Verhoging van rechten" #: client/src/credentials/credentials.form.js:305 -#: client/src/job-submission/job-submission.partial.html:129 -#: client/src/credentials/factories/become-method-change.factory.js:19 -#: client/src/credentials/factories/kind-change.factory.js:76 -#: client/src/job-submission/job-submission.partial.html:127 +#: client/src/job-submission/job-submission.partial.html:132 msgid "Privilege Escalation Password" msgstr "Wachtwoord verhoging van rechten" #: client/src/credentials/credentials.form.js:295 -#: client/src/credentials/factories/become-method-change.factory.js:18 -#: client/src/credentials/factories/kind-change.factory.js:75 msgid "Privilege Escalation Username" msgstr "Gebruikersnaam verhoging van rechten" #: client/src/credentials/factories/become-method-change.factory.js:30 #: client/src/credentials/factories/kind-change.factory.js:87 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:93 -#: client/src/job-results/job-results.partial.html:213 -#: client/src/templates/job_templates/job-template.form.js:103 +#: client/src/job-results/job-results.partial.html:216 +#: client/src/templates/job_templates/job-template.form.js:100 #: client/src/templates/job_templates/job-template.form.js:91 -#: client/src/credentials/factories/become-method-change.factory.js:32 -#: client/src/credentials/factories/kind-change.factory.js:89 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:88 -#: client/src/templates/job_templates/job-template.form.js:107 -#: client/src/templates/job_templates/job-template.form.js:95 msgid "Project" msgstr "Projecten" -#: client/src/credentials/factories/become-method-change.factory.js:59 -#: client/src/credentials/factories/kind-change.factory.js:116 -#: client/src/credentials/factories/become-method-change.factory.js:61 -#: client/src/credentials/factories/kind-change.factory.js:118 +#: client/src/credentials/factories/become-method-change.factory.js:53 +#: client/src/credentials/factories/kind-change.factory.js:110 msgid "Project (Tenant Name)" msgstr "Projecten (naam huurder)" #: client/src/projects/projects.form.js:75 #: client/src/projects/projects.form.js:83 -#: client/src/projects/projects.form.js:74 -#: client/src/projects/projects.form.js:82 msgid "Project Base Path" msgstr "Basispad project" @@ -4123,7 +3777,6 @@ msgid "Project Name" msgstr "Projectnaam" #: client/src/projects/projects.form.js:100 -#: client/src/projects/projects.form.js:99 msgid "Project Path" msgstr "Projectpad" @@ -4132,12 +3785,11 @@ msgid "Project Sync Failures" msgstr "Mislukte projectsynchronisaties" #: client/src/projects/list/projects-list.controller.js:170 -#: client/src/projects/list/projects-list.controller.js:169 msgid "Project lookup failed. GET returned:" msgstr "Ophalen project mislukt. Geretourneerde OPHALEN:" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:121 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:48 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:115 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:47 #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:31 #: client/src/home/dashboard/counts/dashboard-counts.directive.js:61 #: client/src/organizations/linkout/organizations-linkout.route.js:206 @@ -4151,12 +3803,10 @@ msgstr[0] "Groep promoveren" msgstr[1] "Groepen promoveren" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:43 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:43 msgid "Promote groups" msgstr "Groepen promoveren" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:32 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:32 msgid "Promote groups and hosts" msgstr "Groepen en hosts promoveren" @@ -4167,7 +3817,6 @@ msgstr[0] "Host promoveren" msgstr[1] "Hosts promoveren" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:54 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:54 msgid "Promote hosts" msgstr "Hosts promoveren" @@ -4180,31 +3829,20 @@ msgid "Prompt" msgstr "Melding" #: client/lib/components/components.strings.js:30 -#: client/src/templates/job_templates/job-template.form.js:144 -#: client/src/templates/job_templates/job-template.form.js:174 -#: client/src/templates/job_templates/job-template.form.js:191 -#: client/src/templates/job_templates/job-template.form.js:217 -#: client/src/templates/job_templates/job-template.form.js:234 -#: client/src/templates/job_templates/job-template.form.js:259 -#: client/src/templates/job_templates/job-template.form.js:359 +#: client/src/templates/job_templates/job-template.form.js:139 +#: client/src/templates/job_templates/job-template.form.js:169 +#: client/src/templates/job_templates/job-template.form.js:186 +#: client/src/templates/job_templates/job-template.form.js:212 +#: client/src/templates/job_templates/job-template.form.js:229 +#: client/src/templates/job_templates/job-template.form.js:254 +#: client/src/templates/job_templates/job-template.form.js:354 #: client/src/templates/job_templates/job-template.form.js:60 #: client/src/templates/job_templates/job-template.form.js:86 -#: client/src/templates/job_templates/job-template.form.js:147 -#: client/src/templates/job_templates/job-template.form.js:183 -#: client/src/templates/job_templates/job-template.form.js:200 -#: client/src/templates/job_templates/job-template.form.js:228 -#: client/src/templates/job_templates/job-template.form.js:247 -#: client/src/templates/job_templates/job-template.form.js:261 -#: client/src/templates/job_templates/job-template.form.js:376 -#: client/src/templates/job_templates/job-template.form.js:64 -#: client/src/templates/job_templates/job-template.form.js:90 msgid "Prompt on launch" msgstr "Melding bij opstarten" #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:132 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:147 -#: client/src/templates/job_templates/job-template.form.js:220 -#: client/src/templates/job_templates/job-template.form.js:239 msgid "Provide a comma separated list of tags." msgstr "Geef een lijst van tags gescheiden door komma's op." @@ -4227,12 +3865,10 @@ msgstr "" #: client/src/inventories-hosts/hosts/host.form.js:50 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:49 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:49 -#: client/src/inventories-hosts/hosts/host.form.js:49 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:48 msgid "Provide a host name, ip address, or ip address:port. Examples include:" msgstr "Geef een hostnaam, IP-adres, of IP-adres:poort op. Voorbeelden:" -#: client/src/templates/job_templates/job-template.form.js:168 +#: client/src/templates/job_templates/job-template.form.js:163 msgid "" "Provide a host pattern to further constrain the list of hosts that will be " "managed or affected by the playbook. Multiple patterns are allowed. Refer to" @@ -4244,7 +3880,6 @@ msgstr "" "en voorbeelden van patronen." #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:116 -#: client/src/templates/job_templates/job-template.form.js:174 msgid "" "Provide a host pattern to further constrain the list of hosts that will be " "managed or affected by the playbook. Multiple patterns can be separated by " @@ -4260,8 +3895,15 @@ msgstr "" "Geef omgevingsvariabelen op om door te geven aan het aangepaste " "inventarisscript." -#: client/src/templates/job_templates/job-template.form.js:316 -#: client/src/templates/job_templates/job-template.form.js:324 +#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:203 +#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:287 +msgid "" +"Provide the named URL encoded name or id of the remote Tower inventory to be" +" imported." +msgstr "" + +#: client/src/templates/job_templates/job-template.form.js:311 +#: client/src/templates/job_templates/job-template.form.js:319 msgid "Provisioning Callback URL" msgstr "Provisioning terugkoppelings-URL" @@ -4306,12 +3948,10 @@ msgstr "SJABLONEN DIE RECENT GEBRUIKT ZIJN" #: client/src/portal-mode/portal-mode-jobs.partial.html:20 #: client/src/projects/projects.list.js:71 #: client/src/scheduler/schedules.list.js:61 -#: client/src/activity-stream/streams.list.js:55 msgid "REFRESH" msgstr "VERNIEUWEN" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:109 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:96 msgid "REGIONS" msgstr "REGIO'S" @@ -4319,7 +3959,7 @@ msgstr "REGIO'S" msgid "RELATED FIELDS:" msgstr "VERWANTE VELDEN:" -#: client/src/shared/directives.js:78 client/src/shared/directives.js:136 +#: client/src/shared/directives.js:78 msgid "REMOVE" msgstr "VERWIJDEREN" @@ -4337,14 +3977,11 @@ msgstr "RESULTATEN" #: client/src/job-submission/job-submission.partial.html:44 #: client/src/job-submission/job-submission.partial.html:87 #: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:52 -#: client/src/job-submission/job-submission.partial.html:85 msgid "REVERT" msgstr "TERUGZETTEN" #: client/src/credentials/factories/become-method-change.factory.js:25 #: client/src/credentials/factories/kind-change.factory.js:82 -#: client/src/credentials/factories/become-method-change.factory.js:27 -#: client/src/credentials/factories/kind-change.factory.js:84 msgid "RSA Private Key" msgstr "RSA-privésleutel" @@ -4365,7 +4002,7 @@ msgstr "COMMANDO'S UITVOEREN" msgid "Random" msgstr "Willekeurig" -#: client/src/job-results/job-results.partial.html:408 +#: client/src/job-results/job-results.partial.html:411 msgid "Read only view of extra variables added to the job template." msgstr "" "Alleen-lezen-beeld van extra variabelen toegevoegd aan het taaksjabloon." @@ -4378,9 +4015,8 @@ msgstr "Alleen-lezen-beeld van extra variabelen toegevoegd aan de workflow." msgid "Recent Notifications" msgstr "Recente berichten" -#: client/src/notifications/notificationTemplates.form.js:101 -#: client/src/notifications/notificationTemplates.form.js:97 -#: client/src/notifications/notificationTemplates.form.js:102 +#: client/src/notifications/notificationTemplates.form.js:94 +#: client/src/notifications/notificationTemplates.form.js:98 msgid "Recipient List" msgstr "Lijst van ontvangers" @@ -4389,7 +4025,7 @@ msgstr "Lijst van ontvangers" msgid "Red" msgstr "Rood" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:68 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65 msgid "" "Refer to the Ansible Tower documentation for further syntax and examples." msgstr "" @@ -4407,7 +4043,6 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/sources/sources.list.js:50 #: client/src/projects/projects.list.js:67 #: client/src/scheduler/schedules.list.js:57 -#: client/src/activity-stream/streams.list.js:52 msgid "Refresh the page" msgstr "Pagina vernieuwen" @@ -4417,7 +4052,6 @@ msgid "Region:" msgstr "Regio:" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:131 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:122 msgid "Regions" msgstr "Regio's" @@ -4434,22 +4068,17 @@ msgstr "Gerelateerde groepen" msgid "Relaunch using the same parameters" msgstr "Opnieuw opstarten met dezelfde parameters" -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:199 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:205 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:194 msgid "Remediate Inventory" msgstr "Inventaris herstellen" #: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:96 #: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:97 -#: client/src/teams/teams.form.js:142 client/src/users/users.form.js:218 -#: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:85 -#: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:86 -#: client/src/users/users.form.js:219 +#: client/src/teams/teams.form.js:142 client/src/users/users.form.js:222 msgid "Remove" msgstr "Verwijderen" #: client/src/projects/projects.form.js:158 -#: client/src/projects/projects.form.js:157 msgid "Remove any local modifications prior to performing an update." msgstr "" "Verwijder alle plaatselijke aanpassingen voordat een update uitgevoerd " @@ -4463,7 +4092,7 @@ msgstr "Frequentie herhalen" msgid "Request License" msgstr "Licentie opvragen" -#: client/src/templates/survey-maker/shared/question-definition.form.js:288 +#: client/src/templates/survey-maker/shared/question-definition.form.js:291 msgid "Required" msgstr "Vereist" @@ -4471,12 +4100,11 @@ msgstr "Vereist" msgid "Reset" msgstr "Resetten" -#: client/src/job-results/job-results.partial.html:120 +#: client/src/job-results/job-results.partial.html:123 msgid "Results Traceback" msgstr "Resultaten-traceback" -#: client/src/shared/form-generator.js:684 -#: client/src/shared/form-generator.js:701 +#: client/src/shared/form-generator.js:690 msgid "Revert" msgstr "Terugzetten" @@ -4491,45 +4119,40 @@ msgstr "Terugzetten" #: client/src/configuration/auth-form/sub-forms/auth-tacacs.form.js:47 #: client/src/configuration/jobs-form/configuration-jobs.form.js:73 #: client/src/configuration/system-form/sub-forms/system-activity-stream.form.js:26 -#: client/src/configuration/system-form/sub-forms/system-logging.form.js:73 +#: client/src/configuration/system-form/sub-forms/system-logging.form.js:74 #: client/src/configuration/system-form/sub-forms/system-misc.form.js:50 #: client/src/configuration/ui-form/configuration-ui.form.js:36 msgid "Revert all to default" msgstr "Alles terugzetten naar standaardinstellingen" -#: client/src/job-results/job-results.partial.html:236 +#: client/src/job-results/job-results.partial.html:239 #: client/src/projects/projects.list.js:50 msgid "Revision" msgstr "Herziening" #: client/src/projects/add/projects-add.controller.js:146 -#: client/src/projects/edit/projects-edit.controller.js:275 +#: client/src/projects/edit/projects-edit.controller.js:281 msgid "Revision #" msgstr "Herziening #" -#: client/features/credentials/legacy.credentials.js:91 +#: client/features/credentials/legacy.credentials.js:88 #: client/src/credentials/credentials.form.js:461 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:151 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:154 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:148 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:149 #: client/src/organizations/organizations.form.js:97 #: client/src/projects/projects.form.js:255 client/src/teams/teams.form.js:135 #: client/src/teams/teams.form.js:98 #: client/src/templates/workflows.form.js:138 -#: client/src/users/users.form.js:201 -#: client/features/credentials/legacy.credentials.js:86 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:160 -#: client/src/projects/projects.form.js:254 -#: client/src/templates/workflows.form.js:143 -#: client/src/users/users.form.js:202 +#: client/src/users/users.form.js:205 msgid "Role" msgstr "Rol" -#: client/src/instance-groups/instance-group.partial.html:15 -#: client/src/instance-groups/instance-groups.list.js:25 -#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:15 -#: client/src/instance-groups/instances/instances-list.partial.html:21 +#: client/src/instance-groups/instance-group.partial.html:14 +#: client/src/instance-groups/instance-groups.list.js:26 +#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:14 +#: client/src/instance-groups/instances/instances-list.partial.html:18 #: client/src/instance-groups/instances/instances.list.js:24 -#: client/src/instance-groups/list/instance-groups-list.partial.html:32 +#: client/src/instance-groups/list/instance-groups-list.partial.html:29 msgid "Running Jobs" msgstr "Taken in uitvoering" @@ -4545,13 +4168,12 @@ msgstr "SAML" #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html:17 #: client/src/inventories-hosts/shared/associate-groups/associate-groups.partial.html:17 #: client/src/inventories-hosts/shared/associate-hosts/associate-hosts.partial.html:17 -#: client/src/partials/survey-maker-modal.html:86 +#: client/src/partials/survey-maker-modal.html:87 #: client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.partial.html:18 -#: client/lib/services/base-string.service.js:30 msgid "SAVE" msgstr "OPSLAAN" -#: client/src/scheduler/main.js:331 client/src/scheduler/main.js:330 +#: client/src/scheduler/main.js:331 msgid "SCHEDULED" msgstr "GEPLAND" @@ -4567,39 +4189,34 @@ msgstr "GEPLANDE TAKEN" #: client/src/scheduler/main.js:145 client/src/scheduler/main.js:183 #: client/src/scheduler/main.js:235 client/src/scheduler/main.js:273 #: client/src/scheduler/main.js:52 client/src/scheduler/main.js:90 -#: client/src/activity-stream/get-target-title.factory.js:35 msgid "SCHEDULES" msgstr "SCHEMA'S" #: client/src/projects/add/projects-add.controller.js:118 -#: client/src/projects/edit/projects-edit.controller.js:248 +#: client/src/projects/edit/projects-edit.controller.js:254 msgid "SCM Branch" msgstr "SCM-vertakking" #: client/src/projects/add/projects-add.controller.js:137 -#: client/src/projects/edit/projects-edit.controller.js:266 +#: client/src/projects/edit/projects-edit.controller.js:272 msgid "SCM Branch/Tag/Commit" msgstr "SCM-vertakking/tag/binding" #: client/src/projects/add/projects-add.controller.js:158 -#: client/src/projects/edit/projects-edit.controller.js:287 +#: client/src/projects/edit/projects-edit.controller.js:293 msgid "SCM Branch/Tag/Revision" msgstr "SCM-vertakking/tag/herziening" #: client/src/projects/projects.form.js:159 -#: client/src/projects/projects.form.js:158 msgid "SCM Clean" msgstr "SCM-zuiveren" #: client/src/projects/projects.form.js:170 -#: client/src/projects/projects.form.js:169 msgid "SCM Delete" msgstr "SCM-verwijderen" #: client/src/credentials/factories/become-method-change.factory.js:20 #: client/src/credentials/factories/kind-change.factory.js:77 -#: client/src/credentials/factories/become-method-change.factory.js:22 -#: client/src/credentials/factories/kind-change.factory.js:79 msgid "SCM Private Key" msgstr "SCM-privésleutel" @@ -4609,23 +4226,19 @@ msgstr "SCM-soort" #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:49 #: client/src/projects/projects.form.js:180 -#: client/src/projects/projects.form.js:179 msgid "SCM Update" msgstr "SCM-update" #: client/src/projects/list/projects-list.controller.js:222 -#: client/src/projects/list/projects-list.controller.js:221 msgid "SCM Update Cancel" msgstr "SCM-updatekanaal" #: client/src/projects/projects.form.js:150 -#: client/src/projects/projects.form.js:149 msgid "SCM Update Options" msgstr "SCM-update-opties" -#: client/src/projects/edit/projects-edit.controller.js:136 +#: client/src/projects/edit/projects-edit.controller.js:137 #: client/src/projects/list/projects-list.controller.js:84 -#: client/src/projects/list/projects-list.controller.js:83 msgid "SCM update currently running" msgstr "SCM-update nu in uitvoering" @@ -4658,7 +4271,6 @@ msgstr "GESELECTEERD:" #: client/src/main-menu/main-menu.partial.html:59 #: client/src/setup-menu/setup.route.js:9 -#: client/src/setup-menu/setup.route.js:8 msgid "SETTINGS" msgstr "INSTELLINGEN" @@ -4674,13 +4286,12 @@ msgstr "AANMELDEN" msgid "SIGN IN WITH" msgstr "AANMELDEN MET" -#: client/src/inventories-hosts/hosts/host.list.js:109 +#: client/src/inventories-hosts/hosts/host.list.js:110 #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:32 msgid "SMART INVENTORY" msgstr "SMART-INVENTARIS" #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:102 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:89 msgid "SOURCE" msgstr "BRON" @@ -4688,10 +4299,8 @@ msgstr "BRON" msgid "SOURCES" msgstr "BRONNEN" -#: client/src/credentials/factories/become-method-change.factory.js:95 -#: client/src/credentials/factories/kind-change.factory.js:152 -#: client/src/credentials/factories/become-method-change.factory.js:97 -#: client/src/credentials/factories/kind-change.factory.js:154 +#: client/src/credentials/factories/become-method-change.factory.js:89 +#: client/src/credentials/factories/kind-change.factory.js:146 msgid "SSH Key" msgstr "SSH-sleutel" @@ -4699,22 +4308,19 @@ msgstr "SSH-sleutel" msgid "SSH key description" msgstr "Beschrijving SSH-sleutel" -#: client/src/notifications/notificationTemplates.form.js:378 -#: client/src/notifications/notificationTemplates.form.js:390 +#: client/src/notifications/notificationTemplates.form.js:375 msgid "SSL Connection" msgstr "SSL-verbinding" #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:128 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:135 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:96 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:122 msgid "STANDARD OUT" msgstr "STANDAARDOUTPUT" #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:32 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:65 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:45 -#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:52 msgid "STARTED" msgstr "BEGONNEN" @@ -4729,7 +4335,7 @@ msgstr "STATUS" msgid "STS Token" msgstr "STS-token" -#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:60 +#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:61 msgid "SUCCESSFUL" msgstr "GESLAAGD" @@ -4745,39 +4351,34 @@ msgstr "ALLES SYNCHRONISEREN" msgid "SYSTEM TRACKING" msgstr "SYSTEEMTRACKING" -#: client/src/credentials/factories/become-method-change.factory.js:76 -#: client/src/credentials/factories/kind-change.factory.js:133 -#: client/src/credentials/factories/become-method-change.factory.js:78 -#: client/src/credentials/factories/kind-change.factory.js:135 +#: client/src/credentials/factories/become-method-change.factory.js:70 +#: client/src/credentials/factories/kind-change.factory.js:127 msgid "Satellite 6 URL" msgstr "Satellite 6-URL" #: client/src/access/add-rbac-resource/rbac-resource.partial.html:110 -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:196 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:193 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:157 -#: client/src/shared/form-generator.js:1683 -#: client/src/shared/form-generator.js:1734 +#: client/src/shared/form-generator.js:1691 msgid "Save" msgstr "Opslaan" #: client/src/configuration/auth-form/configuration-auth.controller.js:86 -#: client/src/configuration/configuration.controller.js:209 -#: client/src/configuration/configuration.controller.js:268 -#: client/src/configuration/system-form/configuration-system.controller.js:66 +#: client/src/configuration/configuration.controller.js:213 +#: client/src/configuration/configuration.controller.js:272 +#: client/src/configuration/system-form/configuration-system.controller.js:68 msgid "Save changes" msgstr "Wijzigingen opslaan" -#: client/src/license/license.partial.html:122 +#: client/src/license/license.partial.html:127 msgid "Save successful!" msgstr "Opslaan gelukt!" #: client/src/templates/templates.list.js:88 -#: client/src/partials/subhome.html:10 msgid "Schedule" msgstr "Schema" #: client/src/management-jobs/card/card.partial.html:28 -#: client/src/management-jobs/card/card.partial.html:26 msgid "Schedule Management Job" msgstr "Schema beheertaak" @@ -4795,14 +4396,11 @@ msgstr "Toekomstige uitvoeringen van het taaksjabloon inplannen" #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:33 #: client/src/jobs/jobs.partial.html:10 -#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:32 msgid "Schedules" msgstr "Schema's" #: client/src/shared/smart-search/smart-search.controller.js:49 #: client/src/shared/smart-search/smart-search.controller.js:94 -#: client/src/shared/smart-search/smart-search.controller.js:39 -#: client/src/shared/smart-search/smart-search.controller.js:84 msgid "Search" msgstr "Zoeken" @@ -4825,8 +4423,7 @@ msgstr "" "toegangsgegevens met beperkte rechten aan kunt vragen voor gebruikers van " "AWS Identity en Access Management (IAM)" -#: client/src/shared/form-generator.js:1687 -#: client/src/shared/form-generator.js:1738 +#: client/src/shared/form-generator.js:1695 msgid "Select" msgstr "Selecteren" @@ -4875,11 +4472,10 @@ msgstr "" #: client/src/configuration/jobs-form/configuration-jobs.controller.js:109 #: client/src/configuration/jobs-form/configuration-jobs.controller.js:134 #: client/src/configuration/ui-form/configuration-ui.controller.js:95 -#: client/src/configuration/jobs-form/configuration-jobs.controller.js:124 msgid "Select commands" msgstr "Commando's selecteren" -#: client/src/templates/job_templates/job-template.form.js:138 +#: client/src/templates/job_templates/job-template.form.js:133 msgid "" "Select credentials that allow Tower to access the nodes this job will be ran" " against. You can only select one credential of each type. For machine " @@ -4898,7 +4494,6 @@ msgstr "" "standaardtoegangsgegevens en kunnen deze bij het opstarten gewijzigd worden." #: client/src/projects/projects.form.js:98 -#: client/src/projects/projects.form.js:97 msgid "" "Select from the list of directories found in the Project Base Path. Together" " the base path and the playbook directory provide the full path used to " @@ -4908,8 +4503,8 @@ msgstr "" "Het basispad en de map van het draaiboek vormen samen het volledige pad dat " "gebruikt wordt op draaiboeken te vinden." -#: client/src/configuration/auth-form/configuration-auth.controller.js:262 -#: client/src/configuration/auth-form/configuration-auth.controller.js:281 +#: client/src/configuration/auth-form/configuration-auth.controller.js:263 +#: client/src/configuration/auth-form/configuration-auth.controller.js:282 msgid "Select group types" msgstr "Selecteer soorten groepen" @@ -4917,13 +4512,12 @@ msgstr "Selecteer soorten groepen" msgid "Select roles" msgstr "Selecteer rollen" -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:77 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:85 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:74 msgid "Select the Instance Groups for this Inventory to run on." msgstr "" "Selecteer de instantiegroepen waar deze inventaris op uitgevoerd wordt." -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:85 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:80 msgid "" "Select the Instance Groups for this Inventory to run on. Refer to the " "Ansible Tower documentation for more detail." @@ -4931,8 +4525,7 @@ msgstr "" "Selecteer de instantiegroepen waar deze inventaris op uitgevoerd wordt. " "Raadpleeg de documentatie van Ansible Tower voor meer informatie." -#: client/src/templates/job_templates/job-template.form.js:198 -#: client/src/templates/job_templates/job-template.form.js:207 +#: client/src/templates/job_templates/job-template.form.js:193 msgid "Select the Instance Groups for this Job Template to run on." msgstr "" "Selecteer de instantiegroepen waar deze taaksjabloon op uitgevoerd wordt." @@ -4955,7 +4548,6 @@ msgstr "" #: client/src/templates/job_templates/job-template.form.js:79 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:81 -#: client/src/templates/job_templates/job-template.form.js:83 msgid "Select the inventory containing the hosts you want this job to manage." msgstr "" "Selecteer de inventaris met de hosts waarvan u wilt dat deze taak ze " @@ -4970,20 +4562,18 @@ msgstr "" "bron. U kunt kiezen uit het uitklapbare menu of een bestand invoeren in het " "invoerveld." -#: client/src/templates/job_templates/job-template.form.js:119 -#: client/src/templates/job_templates/job-template.form.js:123 +#: client/src/templates/job_templates/job-template.form.js:114 msgid "Select the playbook to be executed by this job." msgstr "Selecteer het draaiboek dat uitgevoerd moet worden door deze taak." -#: client/src/templates/job_templates/job-template.form.js:102 -#: client/src/templates/job_templates/job-template.form.js:106 +#: client/src/templates/job_templates/job-template.form.js:99 msgid "" "Select the project containing the playbook you want this job to execute." msgstr "" "Selecteer het project dat het draaiboek bevat waarvan u wilt dat deze taak " "hem uitvoert." -#: client/src/configuration/system-form/configuration-system.controller.js:191 +#: client/src/configuration/system-form/configuration-system.controller.js:197 msgid "Select types" msgstr "Selecteer soorten" @@ -4992,15 +4582,12 @@ msgstr "Selecteer soorten" msgid "Select which groups to create automatically." msgstr "Selecteer welke groepen automatisch aangemaakt moeten worden." -#: client/src/notifications/notificationTemplates.form.js:113 -#: client/src/notifications/notificationTemplates.form.js:114 +#: client/src/notifications/notificationTemplates.form.js:110 msgid "Sender Email" msgstr "Afzender e-mail" #: client/src/credentials/factories/become-method-change.factory.js:24 #: client/src/credentials/factories/kind-change.factory.js:81 -#: client/src/credentials/factories/become-method-change.factory.js:26 -#: client/src/credentials/factories/kind-change.factory.js:83 msgid "Service Account Email Address" msgstr "E-mailadres service-account" @@ -5026,27 +4613,19 @@ msgstr "" msgid "Settings" msgstr "Instellingen" -#: client/src/job-submission/job-submission.partial.html:107 -#: client/src/job-submission/job-submission.partial.html:120 -#: client/src/job-submission/job-submission.partial.html:133 -#: client/src/job-submission/job-submission.partial.html:146 -#: client/src/job-submission/job-submission.partial.html:292 -#: client/src/shared/form-generator.js:869 -#: client/src/job-submission/job-submission.partial.html:105 -#: client/src/job-submission/job-submission.partial.html:118 -#: client/src/job-submission/job-submission.partial.html:131 -#: client/src/job-submission/job-submission.partial.html:144 -#: client/src/job-submission/job-submission.partial.html:289 -#: client/src/shared/form-generator.js:892 +#: client/src/job-submission/job-submission.partial.html:108 +#: client/src/job-submission/job-submission.partial.html:122 +#: client/src/job-submission/job-submission.partial.html:136 +#: client/src/job-submission/job-submission.partial.html:150 +#: client/src/job-submission/job-submission.partial.html:299 +#: client/src/shared/form-generator.js:876 msgid "Show" msgstr "Tonen" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:114 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:117 -#: client/src/templates/job_templates/job-template.form.js:250 -#: client/src/templates/job_templates/job-template.form.js:253 -#: client/src/templates/job_templates/job-template.form.js:252 -#: client/src/templates/job_templates/job-template.form.js:255 +#: client/src/templates/job_templates/job-template.form.js:245 +#: client/src/templates/job_templates/job-template.form.js:248 msgid "Show Changes" msgstr "Wijzigingen tonen" @@ -5054,37 +4633,27 @@ msgstr "Wijzigingen tonen" #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:44 #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:55 #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:76 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:34 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:45 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:56 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:77 msgid "Sign in with %s" msgstr "Aanmelden met %s" #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:63 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:64 msgid "Sign in with %s Organizations" msgstr "Aanmelden met %s organisaties" #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:61 -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:62 msgid "Sign in with %s Teams" msgstr "Aanmelden met %s teams" -#: client/src/job-results/job-results.partial.html:392 -#: client/src/job-submission/job-submission.partial.html:239 -#: client/src/templates/job_templates/job-template.form.js:222 -#: client/src/templates/job_templates/job-template.form.js:229 +#: client/src/job-results/job-results.partial.html:395 +#: client/src/job-submission/job-submission.partial.html:245 +#: client/src/templates/job_templates/job-template.form.js:217 +#: client/src/templates/job_templates/job-template.form.js:224 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:142 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:150 -#: client/src/job-submission/job-submission.partial.html:237 -#: client/src/templates/job_templates/job-template.form.js:233 -#: client/src/templates/job_templates/job-template.form.js:242 msgid "Skip Tags" msgstr "Tags overslaan" #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:148 -#: client/src/templates/job_templates/job-template.form.js:240 msgid "" "Skip tags are useful when you have a large playbook, and you want to skip " "specific parts of a play or task." @@ -5092,7 +4661,7 @@ msgstr "" "Tags overslaan is nuttig wanneer u een groot draaiboek heeft en specifieke " "delen van het draaiboek of een taak wilt overslaan." -#: client/src/templates/job_templates/job-template.form.js:228 +#: client/src/templates/job_templates/job-template.form.js:223 msgid "" "Skip tags are useful when you have a large playbook, and you want to skip " "specific parts of a play or task. Use commas to separate multiple tags. " @@ -5103,16 +4672,15 @@ msgstr "" "meerdere tags van elkaar te scheiden. Raadpleeg de documentatie van Ansible " "Tower voor meer informatie over het gebruik van tags." -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:69 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:62 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:66 msgid "Smart Host Filter" msgstr "Smart-hostfilter" #: client/src/inventories-hosts/inventories/inventory.list.js:85 #: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:69 #: client/src/organizations/linkout/controllers/organizations-inventories.controller.js:70 -#: client/src/shared/form-generator.js:1449 -#: client/src/shared/form-generator.js:1500 +#: client/src/shared/form-generator.js:1456 msgid "Smart Inventory" msgstr "Smart-inventaris" @@ -5122,8 +4690,6 @@ msgstr "Op te lossen met draaiboek" #: client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.directive.js:57 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:64 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:61 -#: client/src/partials/subhome.html:8 msgid "Source" msgstr "Bron" @@ -5136,15 +4702,12 @@ msgstr "Broncontrole" msgid "Source Details" msgstr "Broninformatie" -#: client/src/notifications/notificationTemplates.form.js:195 -#: client/src/notifications/notificationTemplates.form.js:196 -#: client/src/notifications/notificationTemplates.form.js:198 -#: client/src/notifications/notificationTemplates.form.js:199 +#: client/src/notifications/notificationTemplates.form.js:192 +#: client/src/notifications/notificationTemplates.form.js:193 msgid "Source Phone Number" msgstr "Brontelefoonnummer" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:136 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:127 msgid "Source Regions" msgstr "Bronregio's" @@ -5158,10 +4721,6 @@ msgstr "Bronregio's" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:281 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:291 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:298 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:195 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:202 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:218 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:241 msgid "Source Variables" msgstr "Bronvariabelen" @@ -5170,12 +4729,11 @@ msgid "Source Vars" msgstr "Bronvariabelen" #: client/src/inventories-hosts/inventories/related/sources/sources.list.js:34 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:189 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:195 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:184 msgid "Sources" msgstr "Bronnen" -#: client/src/notifications/notificationTemplates.form.js:333 +#: client/src/notifications/notificationTemplates.form.js:330 msgid "" "Specify HTTP Headers in JSON format. Refer to the Ansible Tower " "documentation for example syntax." @@ -5191,7 +4749,7 @@ msgstr "" "Specificeer een methode voor %s-operaties. Dit staat gelijk aan het " "specificeren van de %s-parameter, waar %s %s kan zijn" -#: client/src/notifications/notificationTemplates.form.js:295 +#: client/src/notifications/notificationTemplates.form.js:292 msgid "" "Specify a notification color. Acceptable colors are: yellow, green, red " "purple, gray or random." @@ -5236,7 +4794,7 @@ msgstr "Starttijd" msgid "Start a job using this template" msgstr "Start een taak met deze sjabloon" -#: client/src/projects/edit/projects-edit.controller.js:133 +#: client/src/projects/edit/projects-edit.controller.js:134 #: client/src/projects/list/projects-list.controller.js:74 msgid "Start an SCM update" msgstr "Start een SCM-update" @@ -5245,7 +4803,7 @@ msgstr "Start een SCM-update" msgid "Start sync process" msgstr "Start het synchronisatieproces" -#: client/src/job-results/job-results.partial.html:97 +#: client/src/job-results/job-results.partial.html:100 msgid "Started" msgstr "Gestart" @@ -5263,7 +4821,7 @@ msgstr "Status" msgid "Sub Category" msgstr "Subcategorie" -#: client/src/license/license.partial.html:121 +#: client/src/license/license.partial.html:126 msgid "Submit" msgstr "Indienen" @@ -5301,7 +4859,7 @@ msgstr "Geslaagd" msgid "Survey" msgstr "Vragenlijst" -#: client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js:57 +#: client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js:60 #: client/src/templates/workflows/edit-workflow/workflow-edit.controller.js:64 msgid "" "Surveys allow users to be prompted at job launch with a series of questions " @@ -5374,8 +4932,6 @@ msgstr "TACACS+" #: client/src/organizations/list/organizations-list.controller.js:60 #: client/src/teams/main.js:46 client/src/teams/teams.list.js:14 #: client/src/teams/teams.list.js:15 -#: client/src/activity-stream/get-target-title.factory.js:20 -#: client/src/organizations/linkout/organizations-linkout.route.js:96 msgid "TEAMS" msgstr "TEAMS" @@ -5385,11 +4941,14 @@ msgstr "TEAMS" #: client/src/templates/list/templates-list.route.js:13 #: client/src/templates/templates.list.js:15 #: client/src/templates/templates.list.js:16 -#: client/src/activity-stream/get-target-title.factory.js:41 msgid "TEMPLATES" msgstr "SJABLONEN" -#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:102 +#: client/src/instance-groups/instance-groups.list.js:8 +msgid "THERE ARE CURRENTLY NO INSTANCE GROUPS DEFINED" +msgstr "" + +#: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:104 msgid "TIME" msgstr "TIJD" @@ -5403,7 +4962,6 @@ msgid "Tag None:" msgstr "Tag geen:" #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:133 -#: client/src/templates/job_templates/job-template.form.js:221 msgid "" "Tags are useful when you have a large playbook, and you want to run a " "specific part of a play or task." @@ -5411,7 +4969,7 @@ msgstr "" "Tags zijn nuttig als u een groot draaiboek heeft en een specifiek deel van " "het draaiboek of van een taak uit wilt voeren." -#: client/src/templates/job_templates/job-template.form.js:211 +#: client/src/templates/job_templates/job-template.form.js:206 msgid "" "Tags are useful when you have a large playbook, and you want to run a " "specific part of a play or task. Use commas to separate multiple tags. Refer" @@ -5427,25 +4985,20 @@ msgstr "" msgid "Tags:" msgstr "Tags:" -#: client/src/notifications/notificationTemplates.form.js:312 -#: client/src/notifications/notificationTemplates.form.js:317 +#: client/src/notifications/notificationTemplates.form.js:309 msgid "Target URL" msgstr "Doel-URL" -#: client/src/job-results/job-results.partial.html:493 +#: client/src/job-results/job-results.partial.html:496 msgid "Tasks" msgstr "Taken" -#: client/features/credentials/legacy.credentials.js:97 +#: client/features/credentials/legacy.credentials.js:94 #: client/src/credentials/credentials.form.js:467 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:157 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:160 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:154 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:155 #: client/src/projects/projects.form.js:261 #: client/src/templates/workflows.form.js:144 -#: client/features/credentials/legacy.credentials.js:92 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:166 -#: client/src/projects/projects.form.js:260 -#: client/src/templates/workflows.form.js:149 msgid "Team Roles" msgstr "Teamrollen" @@ -5454,20 +5007,16 @@ msgstr "Teamrollen" #: client/src/organizations/linkout/organizations-linkout.route.js:108 #: client/src/setup-menu/setup-menu.partial.html:16 #: client/src/shared/stateDefinitions.factory.js:410 -#: client/src/users/users.form.js:155 -#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:33 -#: client/src/shared/stateDefinitions.factory.js:364 -#: client/src/users/users.form.js:156 +#: client/src/users/users.form.js:159 msgid "Teams" msgstr "Teams" -#: client/src/job-results/job-results.partial.html:132 +#: client/src/job-results/job-results.partial.html:135 #: client/src/templates/templates.list.js:14 msgid "Template" msgstr "Sjabloon" #: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:35 -#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:34 msgid "Templates" msgstr "Sjablonen" @@ -5475,7 +5024,7 @@ msgstr "Sjablonen" msgid "Tenant ID" msgstr "Huurder-ID" -#: client/src/configuration/system-form/sub-forms/system-logging.form.js:78 +#: client/src/configuration/system-form/sub-forms/system-logging.form.js:79 msgid "Test" msgstr "Test" @@ -5483,10 +5032,8 @@ msgstr "Test" msgid "Test notification" msgstr "Testbericht" -#: client/src/shared/form-generator.js:1379 -#: client/src/shared/form-generator.js:1385 -#: client/src/shared/form-generator.js:1430 -#: client/src/shared/form-generator.js:1436 +#: client/src/shared/form-generator.js:1386 +#: client/src/shared/form-generator.js:1392 msgid "That value was not found. Please enter or select a valid value." msgstr "" "De waarde is niet gevonden. Voer een geldige waarde in of selecteer er een." @@ -5505,8 +5052,6 @@ msgstr "" #: client/src/credentials/factories/become-method-change.factory.js:32 #: client/src/credentials/factories/kind-change.factory.js:89 -#: client/src/credentials/factories/become-method-change.factory.js:34 -#: client/src/credentials/factories/kind-change.factory.js:91 msgid "" "The Project ID is the GCE assigned identification. It is constructed as two " "words followed by a three digit number. Such as:" @@ -5514,7 +5059,7 @@ msgstr "" "Het project-ID is de toegewezen GCE-identificatie. Dit bestaat uit twee " "woorden, gevolgd door drie getallen, zoals:" -#: client/src/projects/edit/projects-edit.controller.js:326 +#: client/src/projects/edit/projects-edit.controller.js:332 msgid "The SCM update process is running." msgstr "Het SCM-updateproces is nu in uitvoering." @@ -5530,14 +5075,12 @@ msgstr "" "Het e-mailadres dat toegewezen is aan het Google Compute Engine " "%sserviceaccount." -#: client/src/job-results/job-results.partial.html:510 +#: client/src/job-results/job-results.partial.html:513 msgid "The host count will update when the job is complete." msgstr "Het hostaantal wordt bijgewerkt wanneer de taak voltooid is." -#: client/src/credentials/factories/become-method-change.factory.js:68 -#: client/src/credentials/factories/kind-change.factory.js:125 -#: client/src/credentials/factories/become-method-change.factory.js:70 -#: client/src/credentials/factories/kind-change.factory.js:127 +#: client/src/credentials/factories/become-method-change.factory.js:62 +#: client/src/credentials/factories/kind-change.factory.js:119 msgid "The host to authenticate with." msgstr "De host waarmee geauthenticeerd moet worden." @@ -5558,7 +5101,6 @@ msgstr "" "verwijderproces verwerkt is." #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:104 -#: client/src/templates/job_templates/job-template.form.js:160 msgid "" "The number of parallel or simultaneous processes to use while executing the " "playbook. Inputting no value will use the default value from the %sansible " @@ -5568,7 +5110,7 @@ msgstr "" "uitvoeren van het draaiboeken. Als u geen waarde invoert, wordt de " "standaardwaarde van de %sgeregistreerde Ansible-configuratie%s gebruikt." -#: client/src/templates/job_templates/job-template.form.js:157 +#: client/src/templates/job_templates/job-template.form.js:152 msgid "" "The number of parallel or simultaneous processes to use while executing the " "playbook. Value defaults to 0. Refer to the Ansible documentation for " @@ -5578,8 +5120,7 @@ msgstr "" "uitvoeren van het draaiboeken. Waarde is standaard 0. Raadpleeg de " "documentatie van Ansible voor informatie over het configuratiebestand." -#: client/src/job-results/job-results.controller.js:590 -#: client/src/job-results/job-results.controller.js:585 +#: client/src/job-results/job-results.controller.js:619 msgid "The output is too large to display. Please download." msgstr "" "De output is te groot om weer te geven. Download het om het in te zien." @@ -5589,7 +5130,6 @@ msgid "The project value" msgstr "De projectwaarde" #: client/src/projects/list/projects-list.controller.js:159 -#: client/src/projects/list/projects-list.controller.js:158 msgid "" "The selected project is not configured for SCM. To configure for SCM, edit " "the project and provide SCM settings, and then run an update." @@ -5606,6 +5146,13 @@ msgstr "" "De standaardoutput is te groot om weer te geven. Pas extra filters toe om de" " standaardoutput te verkleinen." +#: client/src/templates/survey-maker/shared/question-definition.form.js:52 +msgid "" +"The suggested format for variable names is lowercase and underscore-" +"separated (for example, foo_bar, user_id, host_name, etc.). Variable names " +"with spaces are not allowed." +msgstr "" + #: client/src/management-jobs/scheduler/schedulerForm.partial.html:124 msgid "The time must be in HH24:MM:SS format." msgstr "De tijd moet weergegeven worden in de indeling HH24:MM:SS." @@ -5627,7 +5174,6 @@ msgid "There are no jobs to display at this time" msgstr "Er zijn op dit moment geen taken om weer te geven" #: client/src/projects/list/projects-list.controller.js:150 -#: client/src/projects/list/projects-list.controller.js:149 msgid "" "There is no SCM update information available for this project. An update has" " not yet been completed. If you have not already done so, start an update " @@ -5637,17 +5183,27 @@ msgstr "" "geen update voltooid. Start een update voor dit project, indien u dit nog " "niet gedaan heeft." -#: client/src/configuration/configuration.controller.js:345 -#: client/src/configuration/configuration.controller.js:342 +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:140 +msgid "There was an error deleting inventory source groups. Returned status:" +msgstr "" + +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:130 +msgid "There was an error deleting inventory source hosts. Returned status:" +msgstr "" + +#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:167 +msgid "There was an error deleting inventory source. Returned status:" +msgstr "" + +#: client/src/configuration/configuration.controller.js:349 msgid "There was an error resetting value. Returned status:" msgstr "Er was een fout bij het resetten van de waarde. Teruggegeven status:" -#: client/src/configuration/configuration.controller.js:525 -#: client/src/configuration/configuration.controller.js:519 +#: client/src/configuration/configuration.controller.js:531 msgid "There was an error resetting values. Returned status:" msgstr "Er was een fout bij het resetten van de waardes. Teruggegeven status:" -#: client/src/configuration/system-form/configuration-system.controller.js:227 +#: client/src/configuration/system-form/configuration-system.controller.js:232 msgid "There was an error testing the log aggregator. Returned status:" msgstr "" "Er was een fout bij het testen van de log aggregator. Teruggegeven status:" @@ -5671,10 +5227,8 @@ msgstr "Deze groep bevat" msgid "This is not a valid number." msgstr "Dit is geen geldig nummer." -#: client/src/credentials/factories/become-method-change.factory.js:65 -#: client/src/credentials/factories/kind-change.factory.js:122 -#: client/src/credentials/factories/become-method-change.factory.js:67 -#: client/src/credentials/factories/kind-change.factory.js:124 +#: client/src/credentials/factories/become-method-change.factory.js:59 +#: client/src/credentials/factories/kind-change.factory.js:116 msgid "" "This is the tenant name. This value is usually the same as the username." msgstr "" @@ -5696,22 +5250,19 @@ msgstr "" "Deze machine heeft {{last_check_in}} uur geleden voor het laatst ingecheckt " "bij Insights" -#: client/src/shared/form-generator.js:740 -#: client/src/shared/form-generator.js:765 +#: client/src/shared/form-generator.js:746 msgid "" "This setting has been set manually in a settings file and is now disabled." msgstr "" "Deze instelling is handmatig gekozen in een instellingenbestand en is nu " "uitgeschakeld." -#: client/src/users/users.form.js:160 client/src/users/users.form.js:161 +#: client/src/users/users.form.js:164 msgid "This user is not a member of any teams" msgstr "Deze gebruiker is niet lid van een team" -#: client/src/shared/form-generator.js:849 -#: client/src/shared/form-generator.js:944 -#: client/src/shared/form-generator.js:872 -#: client/src/shared/form-generator.js:968 +#: client/src/shared/form-generator.js:856 +#: client/src/shared/form-generator.js:951 msgid "" "This value does not match the password you entered previously. Please " "confirm that password." @@ -5719,8 +5270,7 @@ msgstr "" "Deze waarde komt niet overeen met het wachtwoord dat u eerder ingevoerd " "heeft. Bevestig dat wachtwoord." -#: client/src/configuration/configuration.controller.js:550 -#: client/src/configuration/configuration.controller.js:544 +#: client/src/configuration/configuration.controller.js:556 msgid "" "This will reset all configuration values to their factory defaults. Are you " "sure you want to proceed?" @@ -5731,7 +5281,6 @@ msgstr "" #: client/src/activity-stream/streams.list.js:25 #: client/src/home/dashboard/lists/jobs/jobs-list.partial.html:14 #: client/src/notifications/notification-templates-list/list.controller.js:72 -#: client/src/activity-stream/streams.list.js:26 msgid "Time" msgstr "Tijd" @@ -5740,7 +5289,6 @@ msgid "Time Remaining" msgstr "Tijd over" #: client/src/projects/projects.form.js:196 -#: client/src/projects/projects.form.js:195 msgid "" "Time in seconds to consider a project to be current. During job runs and " "callbacks the task system will evaluate the timestamp of the latest project " @@ -5774,8 +5322,7 @@ msgstr "" "Raadpleeg de %sAmazondocumentatie%s voor meer informatie over de IAM STS-" "token." -#: client/src/shared/form-generator.js:874 -#: client/src/shared/form-generator.js:897 +#: client/src/shared/form-generator.js:881 msgid "Toggle the display of plaintext." msgstr "Tekst tonen/verbergen" @@ -5806,7 +5353,7 @@ msgstr "Traceback" #: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:52 #: client/src/inventories-hosts/inventories/related/sources/sources.list.js:41 #: client/src/jobs/all-jobs.list.js:59 -#: client/src/notifications/notificationTemplates.form.js:57 +#: client/src/notifications/notificationTemplates.form.js:54 #: client/src/notifications/notificationTemplates.list.js:39 #: client/src/notifications/notifications.list.js:31 #: client/src/projects/projects.list.js:44 @@ -5815,9 +5362,7 @@ msgstr "Traceback" #: client/src/templates/completed-jobs.list.js:53 #: client/src/templates/templates.list.js:31 #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:27 -#: client/src/users/users.form.js:196 -#: client/src/credential-types/credential-types.list.js:28 -#: client/src/users/users.form.js:197 +#: client/src/users/users.form.js:200 msgid "Type" msgstr "Soort" @@ -5828,7 +5373,7 @@ msgid "Type Details" msgstr "Soortdetails" #: client/src/projects/add/projects-add.controller.js:169 -#: client/src/projects/edit/projects-edit.controller.js:298 +#: client/src/projects/edit/projects-edit.controller.js:304 msgid "URL popover text" msgstr "URL-popovertekst" @@ -5841,8 +5386,6 @@ msgstr "GEBRUIKERSNAAM" #: client/src/organizations/list/organizations-list.controller.js:54 #: client/src/users/main.js:46 client/src/users/users.list.js:18 #: client/src/users/users.list.js:19 -#: client/src/activity-stream/get-target-title.factory.js:17 -#: client/src/organizations/linkout/organizations-linkout.route.js:41 msgid "USERS" msgstr "GEBRUIKERS" @@ -5850,6 +5393,10 @@ msgstr "GEBRUIKERS" msgid "Unable to Submit" msgstr "Kon niet indienen" +#: client/lib/components/components.strings.js:52 +msgid "Unavailable to run jobs." +msgstr "" + #: client/lib/components/components.strings.js:22 msgid "Unexpected Error" msgstr "Onverwachte fout" @@ -5866,36 +5413,29 @@ msgstr "Soort weergavemodel niet ondersteund" msgid "Unsupported input type" msgstr "Soort input niet ondersteund" -#: client/src/projects/list/projects-list.controller.js:267 -#: client/src/projects/list/projects-list.controller.js:265 +#: client/src/projects/list/projects-list.controller.js:266 msgid "Update Not Found" msgstr "Update niet gevonden" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:321 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:276 msgid "Update Options" msgstr "Update-opties" -#: client/src/projects/edit/projects-edit.controller.js:326 +#: client/src/projects/edit/projects-edit.controller.js:332 msgid "Update in Progress" msgstr "Update in uitvoering" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:352 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:357 #: client/src/projects/projects.form.js:177 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:308 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:313 -#: client/src/projects/projects.form.js:176 msgid "Update on Launch" msgstr "Update bij opstarten" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:364 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:320 msgid "Update on Project Change" msgstr "Update voor projectwijziging" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:370 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:326 msgid "Update on Project Update" msgstr "Update voor projectupdate" @@ -5903,21 +5443,26 @@ msgstr "Update voor projectupdate" msgid "Upgrade" msgstr "Upgrade" +#: client/src/templates/job_templates/job-template.form.js:299 #: client/src/templates/job_templates/job-template.form.js:304 -#: client/src/templates/job_templates/job-template.form.js:309 msgid "Use Fact Cache" msgstr "Feitcache gebruiken" -#: client/src/notifications/notificationTemplates.form.js:398 -#: client/src/notifications/notificationTemplates.form.js:410 +#: client/src/notifications/notificationTemplates.form.js:395 msgid "Use SSL" msgstr "SSL gebruiken" -#: client/src/notifications/notificationTemplates.form.js:393 -#: client/src/notifications/notificationTemplates.form.js:405 +#: client/src/notifications/notificationTemplates.form.js:390 msgid "Use TLS" msgstr "TLS gebruiken" +#: client/src/instance-groups/instance-group.partial.html:10 +#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:10 +#: client/src/instance-groups/instances/instances-list.partial.html:21 +#: client/src/instance-groups/list/instance-groups-list.partial.html:32 +msgid "Used Capacity" +msgstr "" + #: client/src/credentials/credentials.form.js:76 msgid "" "Used to check out and synchronize playbook repositories with a remote source" @@ -5928,17 +5473,13 @@ msgstr "" "met een broncontrole-beheersysteem op afstand, zoals Git, Subversion (svn) " "of Mercurial (hg). Deze toegangsgegevens worden gebruikt door projecten." -#: client/features/credentials/legacy.credentials.js:86 +#: client/features/credentials/legacy.credentials.js:83 #: client/src/credentials/credentials.form.js:456 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:146 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:149 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:143 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:144 #: client/src/organizations/organizations.form.js:92 #: client/src/projects/projects.form.js:250 client/src/teams/teams.form.js:93 #: client/src/templates/workflows.form.js:133 -#: client/features/credentials/legacy.credentials.js:81 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:155 -#: client/src/projects/projects.form.js:249 -#: client/src/templates/workflows.form.js:138 msgid "User" msgstr "Gebruiker" @@ -5946,21 +5487,19 @@ msgstr "Gebruiker" msgid "User Interface" msgstr "Gebruikersinterface" -#: client/src/users/users.form.js:91 client/src/users/users.form.js:92 +#: client/src/users/users.form.js:95 msgid "User Type" msgstr "Soort gebruiker" #: client/src/access/rbac-multiselect/permissionsUsers.list.js:30 #: client/src/credentials/factories/become-method-change.factory.js:17 -#: client/src/credentials/factories/become-method-change.factory.js:44 -#: client/src/credentials/factories/kind-change.factory.js:101 +#: client/src/credentials/factories/become-method-change.factory.js:38 #: client/src/credentials/factories/kind-change.factory.js:17 #: client/src/credentials/factories/kind-change.factory.js:41 #: client/src/credentials/factories/kind-change.factory.js:74 -#: client/src/notifications/notificationTemplates.form.js:67 +#: client/src/credentials/factories/kind-change.factory.js:95 +#: client/src/notifications/notificationTemplates.form.js:64 #: client/src/users/users.form.js:58 client/src/users/users.list.js:29 -#: client/src/credentials/factories/become-method-change.factory.js:46 -#: client/src/credentials/factories/kind-change.factory.js:103 msgid "Username" msgstr "Gebruikersnaam" @@ -5980,7 +5519,6 @@ msgstr "" #: client/src/organizations/organizations.form.js:74 #: client/src/setup-menu/setup-menu.partial.html:10 #: client/src/teams/teams.form.js:75 -#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:35 msgid "Users" msgstr "Gebruikers" @@ -6017,26 +5555,22 @@ msgstr "Geldige licentie" #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.form.js:47 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:67 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:67 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:84 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:93 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:99 -#: client/src/inventories-hosts/hosts/host.form.js:67 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:66 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:81 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:88 +#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:94 msgid "Variables" msgstr "Variabelen" -#: client/src/job-submission/job-submission.partial.html:357 -#: client/src/job-submission/job-submission.partial.html:354 +#: client/src/job-submission/job-submission.partial.html:364 msgid "Vault" msgstr "Kluis" -#: client/src/job-results/job-results.partial.html:318 +#: client/src/job-results/job-results.partial.html:321 msgid "Vault Credential" msgstr "Toegangsgegevens kluis" #: client/src/credentials/credentials.form.js:391 -#: client/src/job-submission/job-submission.partial.html:142 -#: client/src/job-submission/job-submission.partial.html:140 +#: client/src/job-submission/job-submission.partial.html:146 msgid "Vault Password" msgstr "Wachtwoord kluis" @@ -6044,16 +5578,11 @@ msgstr "Wachtwoord kluis" #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:90 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:307 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:314 -#: client/src/job-results/job-results.partial.html:355 -#: client/src/job-submission/job-submission.partial.html:178 +#: client/src/job-results/job-results.partial.html:358 +#: client/src/job-submission/job-submission.partial.html:183 #: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:99 -#: client/src/templates/job_templates/job-template.form.js:179 -#: client/src/templates/job_templates/job-template.form.js:186 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:263 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:270 -#: client/src/job-submission/job-submission.partial.html:176 -#: client/src/templates/job_templates/job-template.form.js:188 -#: client/src/templates/job_templates/job-template.form.js:195 +#: client/src/templates/job_templates/job-template.form.js:174 +#: client/src/templates/job_templates/job-template.form.js:181 msgid "Verbosity" msgstr "Verbositeit" @@ -6065,14 +5594,12 @@ msgstr "Versie" #: client/src/credential-types/credential-types.list.js:64 #: client/src/credentials/credentials.list.js:75 #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:58 -#: client/src/inventories-hosts/inventories/inventory.list.js:105 +#: client/src/inventories-hosts/inventories/inventory.list.js:104 #: client/src/inventory-scripts/inventory-scripts.list.js:62 #: client/src/notifications/notificationTemplates.list.js:82 #: client/src/scheduler/schedules.list.js:83 client/src/teams/teams.list.js:64 #: client/src/templates/templates.list.js:112 #: client/src/users/users.list.js:70 -#: client/src/activity-stream/streams.list.js:64 -#: client/src/credential-types/credential-types.list.js:61 msgid "View" msgstr "weergeven" @@ -6097,10 +5624,7 @@ msgstr "Bekijk JSON-voorbeelden op" #: client/src/inventories-hosts/hosts/host.form.js:78 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:77 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:77 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:94 -#: client/src/inventories-hosts/hosts/host.form.js:77 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:76 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:103 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:91 msgid "View JSON examples at %s" msgstr "Zie JSON-voorbeelden op %s" @@ -6112,12 +5636,9 @@ msgstr "Minder weergeven" msgid "View More" msgstr "Meer weergeven" -#: client/src/shared/form-generator.js:1711 -#: client/src/templates/job_templates/job-template.form.js:441 +#: client/src/shared/form-generator.js:1719 +#: client/src/templates/job_templates/job-template.form.js:436 #: client/src/templates/workflows.form.js:161 -#: client/src/shared/form-generator.js:1762 -#: client/src/templates/job_templates/job-template.form.js:458 -#: client/src/templates/workflows.form.js:166 msgid "View Survey" msgstr "Vragenlijst weergeven" @@ -6130,20 +5651,15 @@ msgstr "Bekijk YAML-voorbeelden op" #: client/src/inventories-hosts/hosts/host.form.js:79 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:78 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:78 -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:95 -#: client/src/inventories-hosts/hosts/host.form.js:78 -#: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:77 -#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:104 +#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:92 msgid "View YAML examples at %s" msgstr "Zie YAML-voorbeelden op %s" #: client/src/setup-menu/setup-menu.partial.html:72 -#: client/src/setup-menu/setup-menu.partial.html:54 msgid "View Your License" msgstr "Uw licentie weergeven" #: client/src/setup-menu/setup-menu.partial.html:73 -#: client/src/setup-menu/setup-menu.partial.html:55 msgid "View and edit your license information." msgstr "Uw licentie-informatie weergeven en bewerken." @@ -6152,12 +5668,10 @@ msgid "View credential" msgstr "Toegangsgegevens weergeven" #: client/src/credential-types/credential-types.list.js:66 -#: client/src/credential-types/credential-types.list.js:63 msgid "View credential type" msgstr "Soort toegangsgegevens weergeven" #: client/src/activity-stream/streams.list.js:67 -#: client/src/activity-stream/streams.list.js:68 msgid "View event details" msgstr "Evenementinformatie weergeven" @@ -6174,11 +5688,10 @@ msgid "View host" msgstr "Host weergeven" #: client/src/setup-menu/setup-menu.partial.html:67 -#: client/src/setup-menu/setup-menu.partial.html:73 msgid "View information about this version of Ansible {{BRAND_NAME}}." msgstr "Informatie over deze versie van Ansible {{BRAND_NAME}} weergeven." -#: client/src/inventories-hosts/inventories/inventory.list.js:107 +#: client/src/inventories-hosts/inventories/inventory.list.js:106 msgid "View inventory" msgstr "Inventaris weergeven" @@ -6187,7 +5700,6 @@ msgid "View inventory script" msgstr "Inventarisscript weergeven" #: client/src/setup-menu/setup-menu.partial.html:55 -#: client/src/setup-menu/setup-menu.partial.html:61 msgid "View list and capacity of {{BRAND_NAME}} instances." msgstr "Lijst en capaciteit van {{BRAND_NAME}}-instanties weergeven." @@ -6195,7 +5707,7 @@ msgstr "Lijst en capaciteit van {{BRAND_NAME}}-instanties weergeven." msgid "View notification" msgstr "Bericht weergeven" -#: client/src/job-results/job-results.partial.html:219 +#: client/src/job-results/job-results.partial.html:222 msgid "View project sync results" msgstr "Resultaten projectsynchronisatie weergeven" @@ -6238,7 +5750,7 @@ msgstr "Gebruiker weergeven" #: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:42 #: client/src/instance-groups/jobs/jobs.list.js:41 -#: client/src/job-results/job-results.partial.html:142 +#: client/src/job-results/job-results.partial.html:145 #: client/src/jobs/all-jobs.list.js:49 #: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:25 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:25 @@ -6250,9 +5762,9 @@ msgid "WORKFLOW" msgstr "WORKFLOW" #: client/src/configuration/auth-form/configuration-auth.controller.js:73 -#: client/src/configuration/configuration.controller.js:196 -#: client/src/configuration/configuration.controller.js:258 -#: client/src/configuration/system-form/configuration-system.controller.js:53 +#: client/src/configuration/configuration.controller.js:200 +#: client/src/configuration/configuration.controller.js:262 +#: client/src/configuration/system-form/configuration-system.controller.js:55 msgid "Warning: Unsaved Changes" msgstr "Waarschuwing: niet-opgeslagen wijzigingen" @@ -6286,7 +5798,6 @@ msgstr "" "synchronisatieproces van de inventaris." #: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:97 -#: client/src/templates/job_templates/job-template.form.js:54 msgid "" "When this template is submitted as a job, setting the type to %s will " "execute the playbook, running tasks on the selected hosts." @@ -6295,10 +5806,8 @@ msgstr "" "%s, wordt het draaiboek uitgevoerd en worden de taken uitgevoerd op de " "gekozen hosts." -#: client/src/shared/form-generator.js:1715 +#: client/src/shared/form-generator.js:1723 #: client/src/templates/workflows.form.js:187 -#: client/src/shared/form-generator.js:1766 -#: client/src/templates/workflows.form.js:192 msgid "Workflow Editor" msgstr "Workfloweditor" @@ -6306,13 +5815,12 @@ msgstr "Workfloweditor" msgid "Workflow Template" msgstr "Workflowsjabloon" -#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:115 +#: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:109 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:41 msgid "Workflow Templates" msgstr "Workflowsjablonen" -#: client/src/job-submission/job-submission.partial.html:167 -#: client/src/job-submission/job-submission.partial.html:165 +#: client/src/job-submission/job-submission.partial.html:171 msgid "YAML" msgstr "YAML" @@ -6335,7 +5843,7 @@ msgstr "" "U kunt hier een taaksjabloon " "maken." -#: client/src/projects/edit/projects-edit.controller.js:61 +#: client/src/projects/edit/projects-edit.controller.js:62 msgid "You do not have access to view this property" msgstr "U heeft geen toestemming om dit eigendom weer te geven" @@ -6343,14 +5851,18 @@ msgstr "U heeft geen toestemming om dit eigendom weer te geven" msgid "You do not have permission to add a project." msgstr "U heeft geen machtiging om een project toe te voegen." -#: client/src/users/add/users-add.controller.js:42 +#: client/src/users/add/users-add.controller.js:43 msgid "You do not have permission to add a user." msgstr "U heeft geen machtiging om een gebruiker toe te voegen." +#: client/src/inventories-hosts/inventory-hosts.strings.js:28 +msgid "You do not have sufficient permissions to edit the host filter." +msgstr "" + #: client/src/configuration/auth-form/configuration-auth.controller.js:72 -#: client/src/configuration/configuration.controller.js:195 -#: client/src/configuration/configuration.controller.js:257 -#: client/src/configuration/system-form/configuration-system.controller.js:52 +#: client/src/configuration/configuration.controller.js:199 +#: client/src/configuration/configuration.controller.js:261 +#: client/src/configuration/system-form/configuration-system.controller.js:54 msgid "" "You have unsaved changes. Would you like to proceed without" " saving?" @@ -6359,7 +5871,6 @@ msgstr "" " op te slaan?" #: client/src/projects/list/projects-list.controller.js:222 -#: client/src/projects/list/projects-list.controller.js:221 msgid "Your request to cancel the update was submitted to the task manager." msgstr "" "Uw verzoek om de update te annuleren is ingediend bij de taakbeheerder." @@ -6369,19 +5880,14 @@ msgid "Your session timed out due to inactivity. Please sign in." msgstr "Uw sessie is verlopen vanwege inactiviteit. Meld u opnieuw aan." #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:24 -#: client/src/job-submission/job-submission.partial.html:310 -#: client/src/shared/form-generator.js:1186 -#: client/src/job-submission/job-submission.partial.html:307 -#: client/src/shared/form-generator.js:1238 +#: client/src/job-submission/job-submission.partial.html:317 +#: client/src/shared/form-generator.js:1193 msgid "and" msgstr "en" -#: client/src/job-submission/job-submission.partial.html:282 -#: client/src/job-submission/job-submission.partial.html:287 -#: client/src/job-submission/job-submission.partial.html:298 -#: client/src/job-submission/job-submission.partial.html:279 -#: client/src/job-submission/job-submission.partial.html:284 -#: client/src/job-submission/job-submission.partial.html:295 +#: client/src/job-submission/job-submission.partial.html:289 +#: client/src/job-submission/job-submission.partial.html:294 +#: client/src/job-submission/job-submission.partial.html:305 msgid "characters long." msgstr "tekens lang." @@ -6406,12 +5912,10 @@ msgstr[0] "groep" msgstr[1] "groepen" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:26 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:26 msgid "groups" msgstr "groepen" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:24 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:24 msgid "groups and" msgstr "groepen en" @@ -6423,8 +5927,6 @@ msgstr[1] "hosts" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:24 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:25 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:24 -#: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:25 msgid "hosts" msgstr "hosts" @@ -6449,8 +5951,7 @@ msgstr "van de filters komen overeen." msgid "organization" msgstr "organisatie" -#: client/src/shared/form-generator.js:1062 -#: client/src/shared/form-generator.js:1114 +#: client/src/shared/form-generator.js:1069 msgid "playbook" msgstr "draaiboek" @@ -6468,17 +5969,13 @@ msgstr "bronnen met synchronisatiefouten. Klik voor meer informatie" msgid "test" msgstr "test" -#: client/src/job-submission/job-submission.partial.html:282 -#: client/src/job-submission/job-submission.partial.html:287 -#: client/src/job-submission/job-submission.partial.html:298 -#: client/src/job-submission/job-submission.partial.html:279 -#: client/src/job-submission/job-submission.partial.html:284 -#: client/src/job-submission/job-submission.partial.html:295 +#: client/src/job-submission/job-submission.partial.html:289 +#: client/src/job-submission/job-submission.partial.html:294 +#: client/src/job-submission/job-submission.partial.html:305 msgid "to" msgstr "om" #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:139 -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:130 msgid "" "to include all regions. Only Hosts associated with the selected regions will" " be updated." @@ -6547,221 +6044,3 @@ msgstr "{{breadcrumb.instance_group_name}}" #: client/src/shared/paginate/paginate.partial.html:55 msgid "{{pageSize}}" msgstr "{{pageSize}}" - -#: client/src/notifications/notificationTemplates.form.js:377 -msgid "%s or %s" -msgstr "%s of %s" - -#: client/src/partials/subhome.html:30 -msgid " Back to options" -msgstr "" - -#: client/src/partials/subhome.html:32 -msgid " Save" -msgstr "" - -#: client/src/partials/subhome.html:29 -msgid " View Details" -msgstr "" - -#: client/src/partials/subhome.html:31 -msgid " Cancel" -msgstr "" - -#: client/src/shared/smart-search/smart-search.partial.html:51 -msgid "ADDITIONAL INFORMATION:" -msgstr "" - -#: client/lib/services/base-string.service.js:8 -msgid "BaseString cannot be extended without providing a namespace" -msgstr "" -"BaseString kan niet verlengd worden als er geen naamruimte opgegeven is" - -#: client/src/notifications/notificationTemplates.form.js:299 -msgid "Color can be one of %s." -msgstr "Kleur kan een van %s zijn." - -#: client/src/inventory-scripts/inventory-scripts.form.js:62 -msgid "" -"Drag and drop your custom inventory script file here or create one in the " -"field to import your custom inventory." -msgstr "" -"Sleep uw aangepaste inventarisscriptbestand hierheen of maak een nieuwe aan " -"in het veld om uw aangepaste inventaris te importeren." - -#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:104 -msgid "" -"Extra Variables\n" -" \n" -" " -msgstr "" - -#: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:120 -msgid "Failed to get third-party login types. Returned status:" -msgstr "" -"Soorten aanmeldingen van derde partijen ophalen mislukt. Geretourneerde " -"status:" - -#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:68 -msgid "Filter that will be applied to the hosts of this inventory." -msgstr "Filters die toegepast zullen worden op de hosts van deze inventaris." - -#: client/src/shared/smart-search/smart-search.partial.html:51 -msgid "" -"For additional information on advanced search search syntax please see the " -"Ansible Tower " -"documentation." -msgstr "" - -#: client/src/notifications/notificationTemplates.form.js:101 -#: client/src/notifications/notificationTemplates.form.js:144 -#: client/src/notifications/notificationTemplates.form.js:161 -#: client/src/notifications/notificationTemplates.form.js:217 -#: client/src/notifications/notificationTemplates.form.js:339 -#: client/src/notifications/notificationTemplates.form.js:377 -msgid "For example:" -msgstr "Bijvoorbeeld:" - -#: client/src/templates/job_templates/job-template.form.js:272 -msgid "" -"If enabled, run this playbook as an administrator. This is the equivalent of" -" passing the %s option to the %s command." -msgstr "" -"Voer dit draaiboek uit als beheerder, indien deze mogelijkheid ingeschakeld " -"is. Dit staat gelijk aan het doorgeven van de optie %s aan het commando %s." - -#: client/src/templates/job_templates/job-template.form.js:57 -msgid "" -"Instead, %s will check playbook syntax, test environment setup and report " -"problems." -msgstr "" -"In plaats daarvan zal %s de syntaxis van het draaiboek controleren, de " -"installatie van de omgeving testen en problemen rapporteren." - -#: client/src/inventories-hosts/inventories/insights/insights.partial.html:63 -msgid "" -"No data is available. Either there are no issues to report or no scan jobs " -"have been run on this host." -msgstr "" -"Geen gegevens beschikbaar. Dit kan betekenen dat er geen problemen zijn om " -"te rapporteren of dat er geen scantaken uitgevoerd zijn op deze host." - -#: client/lib/services/base-string.service.js:9 -msgid "No string exists with this name" -msgstr "Er bestaat geen string met deze naam" - -#: client/src/notifications/notificationTemplates.form.js:201 -msgid "Number associated with the \"Messaging Service\" in Twilio." -msgstr "Nummer dat verbonden is aan de \"berichtendienst\" in Twilio." - -#: client/src/partials/survey-maker-modal.html:45 -msgid "PLEASE ADD A SURVEY PROMPT ON THE LEFT." -msgstr "VOEG LINKS EEN MELDING VOOR EEN VRAGENLIJST TOE." - -#: client/src/shared/paginate/paginate.partial.html:33 -msgid "" -"Page\n" -" {{current}} of\n" -" {{last}}" -msgstr "" - -#: client/src/templates/job_templates/job-template.form.js:365 -#: client/src/templates/workflows.form.js:80 -msgid "" -"Pass extra command line variables to the playbook. This is the %s or %s " -"command line parameter for %s. Provide key/value pairs using either YAML or " -"JSON." -msgstr "" -"Geef extra commandoregelvariabelen op in het draaiboek. Dit is de %s of %s " -"commandoregelparameter voor %s. Geef sleutel/waarde-paren op met YAML of " -"JSON." - -#: client/src/partials/inventory-add.html:11 -msgid "Please enter a name for this job template copy." -msgstr "Voer een naam in voor deze kopie van een taaksjabloon." - -#: client/src/partials/subhome.html:6 -msgid "Properties" -msgstr "Eigenschappen" - -#: client/src/inventory-scripts/inventory-scripts.form.js:63 -msgid "Script must begin with a hashbang sequence: i.e.... %s" -msgstr "Script moet beginnen met een hashbang-reeks, bijvoorbeeld ... %s" - -#: client/src/templates/job_templates/job-template.form.js:141 -msgid "" -"Select credentials that allow {{BRAND_NAME}} to access the nodes this job " -"will be ran against. You can only select one credential of each type.

You must select either a machine (SSH) credential or \"Prompt on " -"launch\". \"Prompt on launch\" requires you to select a machine credential " -"at run time.

If you select credentials AND check the \"Prompt on " -"launch\" box, you make the selected credentials the defaults that can be " -"updated at run time." -msgstr "" -"Selecteer toegangsgegevens waarmee {{BRAND_NAME}} toegang kan krijgen tot de" -" knooppunten waartegen deze taak uitgevoerd zal worden. U kunt slechts één " -"set toegangsgegevens van iedere soort kiezen.

U moet óf machine " -"(SSH)-toegangsgegevens kiezen, óf \"Melding bij opstarten\". Indien u kiest " -"voor \"Melding bij opstarten\", moet u bij het opstarten " -"machinetoegangsgegevens kiezen.

Als u toegangsgegevens kiest EN " -"het vakje \"Melding bij opstarten\" aanklikt, maakt u van de gekozen " -"toegangsgegevens de standaard die bij opstarten gewijzigd kan worden." - -#: client/src/inventories-hosts/inventories/related/sources/sources.form.js:115 -msgid "" -"Select the inventory file to be synced by this source. You can select from " -"the dropdown or enter a file within the input." -msgstr "" -"Selecteer het inventarisbestand dat gesynchroniseerd moet worden door deze " -"bron. U kunt kiezen uit het uitklapbare menu of een bestand invoeren in het " -"invoerveld." - -#: client/src/templates/job_templates/job-template.form.js:56 -msgid "Setting the type to %s will not execute the playbook." -msgstr "" -"Als %s ingesteld wordt als de soort, wordt het draaiboek niet uitgevoerd." - -#: client/src/notifications/notificationTemplates.form.js:338 -msgid "Specify HTTP Headers in JSON format" -msgstr "Specificeer HTTP-koppen in JSON-formaat" - -#: client/src/notifications/notificationTemplates.form.js:202 -msgid "This must be of the form %s." -msgstr "Dit moet uit het formulier %s komen." - -#: client/src/notifications/notificationTemplates.form.js:100 -#: client/src/notifications/notificationTemplates.form.js:216 -msgid "Type an option on each line." -msgstr "Voer op iedere regel een optie in." - -#: client/src/notifications/notificationTemplates.form.js:143 -#: client/src/notifications/notificationTemplates.form.js:160 -#: client/src/notifications/notificationTemplates.form.js:376 -msgid "Type an option on each line. The pound symbol (#) is not required." -msgstr "" -"Voer op iedere regel een optie in. Het hekje (#) is hierbij niet vereist." - -#: client/src/templates/templates.list.js:66 -msgid "Workflow Job Template" -msgstr "" - -#: client/src/shared/form-generator.js:980 -msgid "Your password must be %d characters long." -msgstr "Uw wachtwoord moet ten minste %d tekens lang zijn." - -#: client/src/shared/form-generator.js:985 -msgid "Your password must contain a lowercase letter." -msgstr "Uw wachtwoord moet een kleine letter bevatten." - -#: client/src/shared/form-generator.js:995 -msgid "Your password must contain a number." -msgstr "Uw wachtwoord moet een getal bevatten." - -#: client/src/shared/form-generator.js:990 -msgid "Your password must contain an uppercase letter." -msgstr "Uw wachtwoord moet een hoofdletter bevatten." - -#: client/src/shared/form-generator.js:1000 -msgid "Your password must contain one of the following characters: %s" -msgstr "Uw wachtwoord moet één van de volgende tekens bevatten: %s" From 1fb890f4ebe76816fe3b8fb7fc70b938bd942f2b Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Wed, 6 Dec 2017 11:27:07 -0500 Subject: [PATCH 137/141] fix a race condition in "host.last_job" when jobs are deleted see: https://github.com/ansible/ansible-tower/issues/7815 --- awx/main/signals.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/awx/main/signals.py b/awx/main/signals.py index 1936f96c76..aa5266d31a 100644 --- a/awx/main/signals.py +++ b/awx/main/signals.py @@ -296,7 +296,12 @@ def _update_host_last_jhs(host): except IndexError: jhs = None update_fields = [] - last_job = jhs.job if jhs else None + try: + last_job = jhs.job if jhs else None + except Job.DoesNotExist: + # The job (and its summaries) have already been/are currently being + # deleted, so there's no need to update the host w/ a reference to it + return if host.last_job != last_job: host.last_job = last_job update_fields.append('last_job') From ce94ba4c835c8a55af268b30f83217a0d82aaabc Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Fri, 8 Dec 2017 09:56:01 -0500 Subject: [PATCH 138/141] change how we detect the current user to avoid a nuanced recursion error see: https://github.com/ansible/ansible-tower/issues/7802 --- awx/api/generics.py | 6 +++++- awx/main/signals.py | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/awx/api/generics.py b/awx/api/generics.py index fcc48322ce..869c29277a 100644 --- a/awx/api/generics.py +++ b/awx/api/generics.py @@ -21,7 +21,7 @@ from django.utils.translation import ugettext_lazy as _ # Django REST Framework from rest_framework.authentication import get_authorization_header -from rest_framework.exceptions import PermissionDenied +from rest_framework.exceptions import PermissionDenied, AuthenticationFailed from rest_framework import generics from rest_framework.response import Response from rest_framework import status @@ -115,6 +115,10 @@ class APIView(views.APIView): drf_request = super(APIView, self).initialize_request(request, *args, **kwargs) request.drf_request = drf_request + try: + request.drf_request_user = getattr(drf_request, 'user', False) + except AuthenticationFailed: + request.drf_request_user = None return drf_request def finalize_response(self, request, response, *args, **kwargs): diff --git a/awx/main/signals.py b/awx/main/signals.py index aa5266d31a..bc885b2c7f 100644 --- a/awx/main/signals.py +++ b/awx/main/signals.py @@ -558,8 +558,8 @@ def get_current_user_from_drf_request(sender, **kwargs): drf_request on the underlying Django Request object. ''' request = get_current_request() - drf_request = getattr(request, 'drf_request', None) - return (getattr(drf_request, 'user', False), 0) + drf_request_user = getattr(request, 'drf_request_user', False) + return (drf_request_user, 0) @receiver(pre_delete, sender=Organization) From 334d47f3ab378c59a952af0f70abacac574bbe1a Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Mon, 11 Dec 2017 09:42:06 -0500 Subject: [PATCH 139/141] Pull updated translations --- awx/locale/es/LC_MESSAGES/django.po | 2 +- awx/locale/fr/LC_MESSAGES/django.po | 2 +- awx/locale/ja/LC_MESSAGES/django.po | 2 +- awx/locale/nl/LC_MESSAGES/django.po | 36 ++++++++++------ awx/ui/po/es.po | 20 ++++----- awx/ui/po/fr.po | 2 +- awx/ui/po/ja.po | 8 ++-- awx/ui/po/nl.po | 64 +++++++++++++++++++++-------- 8 files changed, 88 insertions(+), 48 deletions(-) diff --git a/awx/locale/es/LC_MESSAGES/django.po b/awx/locale/es/LC_MESSAGES/django.po index 0d6c14d205..d24f549215 100644 --- a/awx/locale/es/LC_MESSAGES/django.po +++ b/awx/locale/es/LC_MESSAGES/django.po @@ -21,7 +21,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Zanata 4.2.1\n" +"X-Generator: Zanata 4.3.2\n" #: awx/api/authentication.py:67 msgid "Invalid token header. No credentials provided." diff --git a/awx/locale/fr/LC_MESSAGES/django.po b/awx/locale/fr/LC_MESSAGES/django.po index a87c214f2c..f009e410f4 100644 --- a/awx/locale/fr/LC_MESSAGES/django.po +++ b/awx/locale/fr/LC_MESSAGES/django.po @@ -14,7 +14,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -"X-Generator: Zanata 4.2.1\n" +"X-Generator: Zanata 4.3.2\n" #: awx/api/authentication.py:67 msgid "Invalid token header. No credentials provided." diff --git a/awx/locale/ja/LC_MESSAGES/django.po b/awx/locale/ja/LC_MESSAGES/django.po index 61e79a9a48..a86ce49b9f 100644 --- a/awx/locale/ja/LC_MESSAGES/django.po +++ b/awx/locale/ja/LC_MESSAGES/django.po @@ -13,7 +13,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0\n" -"X-Generator: Zanata 4.2.1\n" +"X-Generator: Zanata 4.3.2\n" #: awx/api/authentication.py:67 msgid "Invalid token header. No credentials provided." diff --git a/awx/locale/nl/LC_MESSAGES/django.po b/awx/locale/nl/LC_MESSAGES/django.po index ddaab6205f..24b5ca542b 100644 --- a/awx/locale/nl/LC_MESSAGES/django.po +++ b/awx/locale/nl/LC_MESSAGES/django.po @@ -6,15 +6,15 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-30 20:23+0000\n" -"PO-Revision-Date: 2017-08-31 08:53+0000\n" -"Last-Translator: helena02 \n" +"PO-Revision-Date: 2017-12-06 02:18+0000\n" +"Last-Translator: helena \n" "Language-Team: Dutch\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -"X-Generator: Zanata 4.2.1\n" +"X-Generator: Zanata 4.3.2\n" #: awx/api/authentication.py:67 msgid "Invalid token header. No credentials provided." @@ -84,7 +84,7 @@ msgstr "Lussen zijn niet toegestaan in filters, gedetecteerd in veld {}." #: awx/api/filters.py:171 #, python-brace-format msgid "Invalid {field_name} id: {field_id}" -msgstr "" +msgstr "Ongeldig {field_name} id: {field_id}" #: awx/api/filters.py:302 #, python-format @@ -236,7 +236,7 @@ msgstr "" #: awx/api/serializers.py:1201 msgid "Smart inventories must specify host_filter" -msgstr "" +msgstr "Smart-inventaris moet hostfilter specificeren" #: awx/api/serializers.py:1303 #, python-format @@ -355,6 +355,8 @@ msgid "" "You cannot change the credential type of the credential, as it may break the" " functionality of the resources using it." msgstr "" +"U kunt het soort toegangsgegevens niet wijzigen, omdat dan de bronnen die " +"deze gebruiken niet langer werken." #: awx/api/serializers.py:2191 msgid "" @@ -430,7 +432,7 @@ msgstr "Ongeldige taaksjabloon." #: awx/api/serializers.py:2708 msgid "Neither credential nor vault credential provided." -msgstr "" +msgstr "Geen toegangsgegevens of toegangsgegevens voor de kluis ingevoerd." #: awx/api/serializers.py:2711 msgid "Job Template Project is missing or undefined." @@ -442,7 +444,7 @@ msgstr "De taaksjablooninventaris ontbreekt of is niet gedefinieerd." #: awx/api/serializers.py:2782 awx/main/tasks.py:2186 msgid "{} are prohibited from use in ad hoc commands." -msgstr "" +msgstr "{} kunnen niet worden gebruikt in ad-hocopdrachten." #: awx/api/serializers.py:3008 #, python-format @@ -977,6 +979,7 @@ msgstr "'required' ontbreekt in enquêtevraag %s." msgid "" "Value {question_default} for '{variable_name}' expected to be a string." msgstr "" +"Waarde {question_default} voor '{variable_name}' zou een string moeten zijn." #: awx/api/views.py:2928 #, python-brace-format @@ -984,6 +987,9 @@ msgid "" "$encrypted$ is reserved keyword for password questions and may not be used " "as a default for '{variable_name}' in survey question {question_position}." msgstr "" +"$encrypted$ is een gereserveerd sleutelwoord voor het wachtwoord en mag niet" +" als standaardwaarde worden gebruikt voor '{variable_name}' in enquêtevraag " +"{question_position}." #: awx/api/views.py:3049 msgid "Maximum number of labels for {} reached." @@ -1037,6 +1043,7 @@ msgstr "Taaksjabloonschema's voor systeem" #: awx/api/views.py:3780 msgid "POST not allowed for Job launching in version 2 of the api" msgstr "" +"POST is niet toegestaan voor het openen van taken in versie 2 van de API" #: awx/api/views.py:3942 msgid "Job Host Summaries List" @@ -1261,6 +1268,8 @@ msgstr "Sla het becommentariëren van instellingen in bestanden over." #: awx/conf/management/commands/migrate_to_database_settings.py:62 msgid "Skip migrating and only comment out settings in files." msgstr "" +"Sla migreren over en maak alleen opmerkingen over de instellingen in " +"bestanden." #: awx/conf/management/commands/migrate_to_database_settings.py:68 msgid "Backup existing settings files with this suffix." @@ -1361,7 +1370,7 @@ msgstr "Connectiviteitstest logboekregistratie" #: awx/main/access.py:44 msgid "Resource is being used by running jobs." -msgstr "" +msgstr "Bron wordt gebruikt om taken uit te voeren." #: awx/main/access.py:237 #, python-format @@ -2378,7 +2387,7 @@ msgstr "" #: awx/main/models/credential.py:478 #, python-format msgid "adding %s credential type" -msgstr "" +msgstr "%s soort toegangsgegevens toevoegen" #: awx/main/models/fact.py:25 msgid "Host for the facts that the fact scan captured." @@ -2615,11 +2624,11 @@ msgstr "OpenStack" #: awx/main/models/inventory.py:875 msgid "oVirt4" -msgstr "" +msgstr "oVirt4" #: awx/main/models/inventory.py:876 msgid "Ansible Tower" -msgstr "" +msgstr "Ansible Tower" #: awx/main/models/inventory.py:877 msgid "Custom Script" @@ -2725,6 +2734,8 @@ msgid "" "Credentials of type machine, source control, insights and vault are " "disallowed for custom inventory sources." msgstr "" +"Toegangsgegevens van soort machine, bronbeheer, inzichten en kluis zijn niet" +" toegestaan voor aangepaste inventarisbronnen." #: awx/main/models/inventory.py:1179 #, python-format @@ -4857,12 +4868,13 @@ msgstr "" #: awx/ui/conf.py:60 msgid "Max Job Events Retreived by UI" -msgstr "" +msgstr "Het maximumaantal taakgebeurtenissen dat is opgehaald door de UI" #: awx/ui/conf.py:61 msgid "" "Maximum number of job events for the UI to retreive within a single request." msgstr "" +"Het maximumaantal taakgebeurtenissen dat de UI kan ophalen met één verzoek." #: awx/ui/fields.py:29 msgid "" diff --git a/awx/ui/po/es.po b/awx/ui/po/es.po index 6e6aca6ae6..3b3f293d12 100644 --- a/awx/ui/po/es.po +++ b/awx/ui/po/es.po @@ -3,17 +3,18 @@ # mkim , 2017. #zanata # plocatelli , 2017. #zanata # trh01 , 2017. #zanata +# trrh02 , 2017. #zanata msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2017-12-05 05:02+0000\n" -"Last-Translator: trh01 \n" +"PO-Revision-Date: 2017-12-06 11:32+0000\n" +"Last-Translator: trrh02 \n" "Language-Team: \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -"X-Generator: Zanata 4.2.1\n" +"X-Generator: Zanata 4.3.2\n" #: client/src/projects/add/projects-add.controller.js:153 #: client/src/projects/edit/projects-edit.controller.js:288 @@ -2274,13 +2275,12 @@ msgid "" "manually created group to promote them into, they will be left in the " "\"all\" default group for the inventory." msgstr "" -"Si las opciones están marcadas, cualquier grupo o host que fueron " -"presentados previamente en la fuente externa pero que ahora son eliminados " -"del inventario de Tower. Los hosts y grupos que no fueron administrados por " -"la fuente del inventario serán promovidos al siguiente grupo creado " -"manualmente o, si no hay un grupo creado manualmente al que puedan ser " -"promovidos, se los dejará en el grupo predeterminado \"Todo\" para el " -"inventario." +"Si las opciones están marcadas, cualquier grupo o host que estuvo presente " +"previamente en la fuente externa pero que ahora se eliminó, se eliminará del" +" inventario de Tower. Los hosts y grupos que no fueron administrados por la " +"fuente del inventario serán promovidos al siguiente grupo creado manualmente" +" o, si no hay un grupo creado manualmente al que puedan ser promovidos, se " +"los dejará en el grupo predeterminado \"Todo\" para el inventario." #: client/src/templates/job_templates/job-template.form.js:267 msgid "If enabled, run this playbook as an administrator." diff --git a/awx/ui/po/fr.po b/awx/ui/po/fr.po index cf767346bf..e889960028 100644 --- a/awx/ui/po/fr.po +++ b/awx/ui/po/fr.po @@ -12,7 +12,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -"X-Generator: Zanata 4.2.1\n" +"X-Generator: Zanata 4.3.2\n" #: client/src/projects/add/projects-add.controller.js:153 #: client/src/projects/edit/projects-edit.controller.js:288 diff --git a/awx/ui/po/ja.po b/awx/ui/po/ja.po index 467d03779a..719df35933 100644 --- a/awx/ui/po/ja.po +++ b/awx/ui/po/ja.po @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2017-12-04 10:38+0000\n" +"PO-Revision-Date: 2017-12-06 12:57+0000\n" "Last-Translator: asasaki \n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0\n" -"X-Generator: Zanata 4.2.1\n" +"X-Generator: Zanata 4.3.2\n" #: client/src/projects/add/projects-add.controller.js:153 #: client/src/projects/edit/projects-edit.controller.js:288 @@ -130,7 +130,7 @@ msgstr "ソースの追加" #: client/src/templates/survey-maker/shared/question-definition.form.js:16 msgid "ADD SURVEY PROMPT" -msgstr "Survey プロンプトの追加" +msgstr "Survey プロンプトの追加" #: client/src/shared/smart-search/smart-search.partial.html:51 msgid "ADDITIONAL INFORMATION" @@ -5603,7 +5603,7 @@ msgstr "黄" msgid "" "You can create a job template here." -msgstr "ジョブテンプレートをここに作成できます。" +msgstr "ジョブテンプレートの作成はここから実行できます。" #: client/src/projects/edit/projects-edit.controller.js:62 msgid "You do not have access to view this property" diff --git a/awx/ui/po/nl.po b/awx/ui/po/nl.po index 7d51e82b91..a914aa4468 100644 --- a/awx/ui/po/nl.po +++ b/awx/ui/po/nl.po @@ -4,14 +4,14 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2017-09-13 08:29+0000\n" -"Last-Translator: Froebel Flores \n" +"PO-Revision-Date: 2017-12-06 02:10+0000\n" +"Last-Translator: helena \n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -"X-Generator: Zanata 4.2.1\n" +"X-Generator: Zanata 4.3.2\n" #: client/src/projects/add/projects-add.controller.js:153 #: client/src/projects/edit/projects-edit.controller.js:288 @@ -33,7 +33,7 @@ msgid "" "only protocol (git://) does not use username or password information." msgstr "" "%sLet op:%s als u een SSH-protocol gebruikt voor GitHub of Bitbucket, voer " -"dan alleen een SSH-sleutel in, voer geen gebruikersnaam in (behalve git). " +"dan alleen een SSH-sleutel in. Voer geen gebruikersnaam in (behalve git). " "Daarnaast ondersteunen GitHub en Bitbucket geen wachtwoordauthenticatie bij " "gebruik van SSH. Het GIT-alleen-lezen-protocol (git://) gebruikt geen " "gebruikersnaam- of wachtwoordinformatie." @@ -364,11 +364,11 @@ msgstr "Antwoordtype" #: client/src/templates/survey-maker/shared/question-definition.form.js:44 #: client/src/templates/survey-maker/shared/question-definition.form.js:53 msgid "Answer Variable Name" -msgstr "" +msgstr "Antwoord naam variabele" #: client/src/job-results/job-results.service.js:144 msgid "Are you sure you want to cancel the job below?" -msgstr "" +msgstr "Weet je zeker dat u de onderstaande taak wilt annuleren?" #: client/src/credentials/list/credentials-list.controller.js:133 msgid "Are you sure you want to delete the credential below?" @@ -397,7 +397,7 @@ msgstr "Weet u zeker dat u onderstaand project wilt verwijderen?" #: client/src/templates/list/templates-list.controller.js:103 msgid "Are you sure you want to delete the template below?" -msgstr "" +msgstr "Weet je zeker dat u het onderstaande sjabloon wilt verwijderen?" #: client/src/users/list/users-list.controller.js:90 msgid "Are you sure you want to delete the user below?" @@ -698,7 +698,7 @@ msgstr "Annuleren" #: client/src/job-results/job-results.service.js:142 msgid "Cancel Job" -msgstr "" +msgstr "Taak annuleren" #: client/src/projects/list/projects-list.controller.js:241 msgid "Cancel Not Allowed" @@ -893,6 +893,9 @@ msgid "" "the inventory. Deleting this inventory source also deletes its associated " "groups and hosts." msgstr "" +"Bevestig dat u de onderstaande inventarisbron permanent wilt verwijderen uit" +" de inventaris. Wanneer u deze inventaris verwijdert, worden alle " +"bijbehorende groepen en hosts eveneens verwijderd." #: client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js:82 msgid "Confirm the removal of the" @@ -1141,7 +1144,7 @@ msgstr "Groep verwijderen" #: client/src/job-results/job-results.service.js:93 msgid "Delete Job" -msgstr "" +msgstr "Taak verwijderen" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:175 msgid "Delete Source" @@ -1314,7 +1317,7 @@ msgstr "Diff-modus" #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html:6 msgid "Disassociate Group From Group" -msgstr "" +msgstr "Groep van groep loskoppelen" #: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:6 msgid "Disassociate Host" @@ -1323,7 +1326,7 @@ msgstr "Host loskoppelen" #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:6 #: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html:6 msgid "Disassociate Host From Group" -msgstr "" +msgstr "Host van groep loskoppelen" #: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js:65 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js:110 @@ -2255,6 +2258,12 @@ msgid "" "manually created group to promote them into, they will be left in the " "\"all\" default group for the inventory." msgstr "" +"Als dit vakje aangevinkt is, worden alle groepen en hosts die eerder " +"aanwezig waren in de externe bron, maar die nu verwijderd zijn, verwijderd " +"uit de inventaris. Hosts en groepen die niet beheerd werden door de " +"inventarisbron, worden omhoog verplaatst naar de volgende handmatig gemaakte" +" groep. Als er geen handmatig gemaakte groep is waar ze naartoe kunnen " +"worden verplaatst, blijven ze staan in de standaard inventarisgroep 'Alle'." #: client/src/templates/job_templates/job-template.form.js:267 msgid "If enabled, run this playbook as an administrator." @@ -2267,12 +2276,18 @@ msgid "" "If enabled, show the changes made by Ansible tasks, where supported. This is" " equivalent to Ansible’s --diff mode." msgstr "" +"Als deze mogelijkheid ingeschakeld is, worden de wijzigingen die aangebracht" +" zijn door Ansible-taken weergegeven, waar ondersteund. Dit staat gelijk aan" +" de diff-modus van Ansible." #: client/src/templates/job_templates/job-template.form.js:251 msgid "" "If enabled, show the changes made by Ansible tasks, where supported. This is" " equivalent to Ansible’s --diff mode." msgstr "" +"Als deze mogelijkheid ingeschakeld is, worden de wijzigingen die aangebracht" +" zijn door Ansible-taken weergegeven, waar ondersteund. Dit staat gelijk aan" +" de diff-modus van Ansible." #: client/src/templates/job_templates/job-template.form.js:291 msgid "If enabled, simultaneous runs of this job template will be allowed." @@ -2710,7 +2725,7 @@ msgstr "Afmelden" #: client/src/configuration/system-form/configuration-system.controller.js:225 msgid "Log aggregator test failed.
Detail:" -msgstr "" +msgstr "Log aggregator-test mislukt.
Details:" #: client/src/configuration/system-form/configuration-system.controller.js:218 msgid "Log aggregator test successful." @@ -3102,6 +3117,9 @@ msgid "" "sub-groups must be disassociated directly from the sub-group level that they" " belong." msgstr "" +"Let op: Alleen hosts die zich direct in deze groep bevinden, kunnen worden " +"losgekoppeld. Hosts in subgroepen moeten rechtstreeks worden losgekoppeld " +"van het subgroepniveau waar ze bij horen." #: client/src/notifications/notificationTemplates.form.js:288 #: client/src/notifications/notificationTemplates.form.js:289 @@ -3336,7 +3354,7 @@ msgstr "VOORVERTONING" #: client/src/job-results/job-results.service.js:166 msgid "PROCEED" -msgstr "" +msgstr "DOORGAAN" #: client/src/partials/job-template-details.html:2 #: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:73 @@ -3710,7 +3728,7 @@ msgstr "Selecteer een inventaris." #: client/src/inventories-hosts/inventory-hosts.strings.js:26 msgid "Please select an organization before editing the host filter." -msgstr "" +msgstr "Selecteer een organisatie voordat u het hostfilter wijzigt." #: client/src/shared/form-generator.js:1186 msgid "Please select at least one value." @@ -3901,6 +3919,8 @@ msgid "" "Provide the named URL encoded name or id of the remote Tower inventory to be" " imported." msgstr "" +"Voer de URL, versleutelde naam of ID of de externe inventaris in die " +"geïmporteerd moet worden." #: client/src/templates/job_templates/job-template.form.js:311 #: client/src/templates/job_templates/job-template.form.js:319 @@ -4946,7 +4966,7 @@ msgstr "SJABLONEN" #: client/src/instance-groups/instance-groups.list.js:8 msgid "THERE ARE CURRENTLY NO INSTANCE GROUPS DEFINED" -msgstr "" +msgstr "ER ZIJN OP DIT MOMENT GEEN INSTANTIEGROEPEN GEDEFINIEERD" #: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:104 msgid "TIME" @@ -5152,6 +5172,9 @@ msgid "" "separated (for example, foo_bar, user_id, host_name, etc.). Variable names " "with spaces are not allowed." msgstr "" +"De voorgestelde indeling voor namen van variabelen: kleine letters en " +"gescheiden door middel van een underscore (bijvoorbeeld foo_bar, user_id, " +"host_name etc.) De naam van een variabele mag geen spaties bevatten." #: client/src/management-jobs/scheduler/schedulerForm.partial.html:124 msgid "The time must be in HH24:MM:SS format." @@ -5186,14 +5209,19 @@ msgstr "" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:140 msgid "There was an error deleting inventory source groups. Returned status:" msgstr "" +"Er is iets misgegaan bij het verwijderen van de inventarisbrongroepen. " +"Status:" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:130 msgid "There was an error deleting inventory source hosts. Returned status:" msgstr "" +"Er is iets misgegaan bij het verwijderen van de inventarisbrongroepen. " +"Status:" #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:167 msgid "There was an error deleting inventory source. Returned status:" msgstr "" +"Er is iets misgegaan bij het verwijderen van de inventarisbron. Status:" #: client/src/configuration/configuration.controller.js:349 msgid "There was an error resetting value. Returned status:" @@ -5395,7 +5423,7 @@ msgstr "Kon niet indienen" #: client/lib/components/components.strings.js:52 msgid "Unavailable to run jobs." -msgstr "" +msgstr "Kan geen taken uitvoeren." #: client/lib/components/components.strings.js:22 msgid "Unexpected Error" @@ -5461,7 +5489,7 @@ msgstr "TLS gebruiken" #: client/src/instance-groups/instances/instances-list.partial.html:21 #: client/src/instance-groups/list/instance-groups-list.partial.html:32 msgid "Used Capacity" -msgstr "" +msgstr "Gebruikte capaciteit" #: client/src/credentials/credentials.form.js:76 msgid "" @@ -5857,7 +5885,7 @@ msgstr "U heeft geen machtiging om een gebruiker toe te voegen." #: client/src/inventories-hosts/inventory-hosts.strings.js:28 msgid "You do not have sufficient permissions to edit the host filter." -msgstr "" +msgstr "U hebt geen toestemming om het hostfilter te bewerken." #: client/src/configuration/auth-form/configuration-auth.controller.js:72 #: client/src/configuration/configuration.controller.js:199 From a2f64f1053bb1c31cebfb0ee7146070a0c4a8e4f Mon Sep 17 00:00:00 2001 From: gconsidine Date: Mon, 11 Dec 2017 11:47:21 -0500 Subject: [PATCH 140/141] Adjust style of toggle button to accommodate text that exceeds 42px --- awx/ui/client/src/scheduler/scheduleToggle.block.less | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/awx/ui/client/src/scheduler/scheduleToggle.block.less b/awx/ui/client/src/scheduler/scheduleToggle.block.less index 3cdb8f8f40..49bcc954f7 100644 --- a/awx/ui/client/src/scheduler/scheduleToggle.block.less +++ b/awx/ui/client/src/scheduler/scheduleToggle.block.less @@ -13,12 +13,10 @@ border-radius: 5px; border: 1px solid @default-link; background-color: @default-link; - width: 42px; margin-top: 2px; cursor: pointer; - display: flex; - height: 18px; - overflow: hidden; + display: inline-block; + min-width: 42px; &.ScheduleToggle--disabled { cursor: not-allowed; @@ -42,10 +40,11 @@ border-top-right-radius: 4px; border-bottom-right-radius: 4px; padding-top: 0px; - margin-top: 0px; border-top: 0px; border-bottom: 0px; border-right: 0px; + display: inline-block; + height: 22px; } .ScheduleToggle.is-on { From 34c206fab0c37297c7a47930feeced23a1754585 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Mon, 11 Dec 2017 12:01:28 -0500 Subject: [PATCH 141/141] Bump psql-container pg version to 9.6 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e2cb881fa3..0ba149c123 100644 --- a/Makefile +++ b/Makefile @@ -603,7 +603,7 @@ clean-elk: docker rm tools_kibana_1 psql-container: - docker run -it --net tools_default --rm postgres:9.4.1 sh -c 'exec psql -h "postgres" -p "5432" -U postgres' + docker run -it --net tools_default --rm postgres:9.6 sh -c 'exec psql -h "postgres" -p "5432" -U postgres' VERSION: echo $(VERSION_TARGET) > $@