From 1776b692fea7fd19d528d5de1a26da0c85fe1f81 Mon Sep 17 00:00:00 2001 From: "Daniel W. Anner" Date: Tue, 21 May 2024 14:54:10 +0000 Subject: [PATCH] Organization filters --- contrib/openapi2.json | 38 ++++++++--------- contrib/openapi2.yaml | 38 ++++++++--------- docs/features/context-data.md | 4 +- netbox/circuits/filtersets.py | 8 ++-- netbox/circuits/forms/filtersets.py | 4 +- netbox/circuits/tests/test_filtersets.py | 6 +-- netbox/dcim/filtersets.py | 36 ++++++++-------- netbox/dcim/forms/bulk_edit.py | 14 +++---- netbox/dcim/forms/bulk_import.py | 6 +-- netbox/dcim/forms/filtersets.py | 36 ++++++++-------- netbox/dcim/forms/object_create.py | 2 +- netbox/dcim/svg/racks.py | 4 +- netbox/dcim/tests/test_filtersets.py | 30 ++++++------- netbox/extras/filtersets.py | 8 ++-- netbox/extras/forms/bulk_import.py | 14 +++---- netbox/extras/forms/filtersets.py | 12 +++--- netbox/extras/forms/model_forms.py | 18 ++++---- netbox/ipam/filtersets.py | 8 ++-- netbox/ipam/forms/bulk_edit.py | 6 +-- netbox/ipam/forms/filtersets.py | 6 +-- netbox/ipam/forms/model_forms.py | 2 +- netbox/ipam/tests/test_filtersets.py | 42 +++++++++---------- netbox/netbox/forms/__init__.py | 2 +- netbox/tenancy/filtersets.py | 8 ++-- netbox/tenancy/forms/bulk_import.py | 4 +- netbox/tenancy/forms/filtersets.py | 6 +-- netbox/tenancy/forms/forms.py | 4 +- netbox/translations/de/LC_MESSAGES/django.po | 42 +++++++++---------- netbox/translations/en/LC_MESSAGES/django.po | 38 ++++++++--------- netbox/translations/es/LC_MESSAGES/django.po | 42 +++++++++---------- netbox/translations/fr/LC_MESSAGES/django.po | 42 +++++++++---------- netbox/translations/ja/LC_MESSAGES/django.po | 42 +++++++++---------- netbox/translations/pt/LC_MESSAGES/django.po | 42 +++++++++---------- netbox/translations/ru/LC_MESSAGES/django.po | 42 +++++++++---------- netbox/translations/tr/LC_MESSAGES/django.po | 42 +++++++++---------- netbox/translations/uk/LC_MESSAGES/django.po | 42 +++++++++---------- netbox/translations/zh/LC_MESSAGES/django.po | 42 +++++++++---------- netbox/users/forms/model_forms.py | 2 +- netbox/virtualization/filtersets.py | 12 +++--- netbox/virtualization/forms/bulk_edit.py | 2 +- netbox/virtualization/forms/filtersets.py | 4 +- netbox/virtualization/forms/model_forms.py | 2 +- .../virtualization/tests/test_filtersets.py | 12 +++--- netbox/wireless/forms/bulk_import.py | 2 +- netbox/wireless/forms/filtersets.py | 2 +- 45 files changed, 410 insertions(+), 410 deletions(-) diff --git a/contrib/openapi2.json b/contrib/openapi2.json index 6eb681662..46278b174 100644 --- a/contrib/openapi2.json +++ b/contrib/openapi2.json @@ -72599,7 +72599,7 @@ "readOnly": true }, "object_type": { - "title": "Object type", + "title": "Object Type", "type": "string", "readOnly": true }, @@ -72758,7 +72758,7 @@ "type": "object", "properties": { "object_type": { - "title": "Object type", + "title": "Object Type", "type": "string" }, "object_id": { @@ -73578,7 +73578,7 @@ "maxLength": 50 }, "asset_tag": { - "title": "Asset tag", + "title": "Asset Tag", "description": "A unique tag used to identify this device", "type": "string", "maxLength": 50, @@ -75607,7 +75607,7 @@ "x-nullable": true }, "weight_unit": { - "title": "Weight unit", + "title": "Weight Unit", "required": [ "label", "value" @@ -75781,7 +75781,7 @@ "x-nullable": true }, "weight_unit": { - "title": "Weight unit", + "title": "Weight Unit", "type": "string", "enum": [ "kg", @@ -79585,7 +79585,7 @@ "maxLength": 50 }, "asset_tag": { - "title": "Asset tag", + "title": "Asset Tag", "description": "A unique tag used to identify this item", "type": "string", "maxLength": 50, @@ -79716,7 +79716,7 @@ "maxLength": 50 }, "asset_tag": { - "title": "Asset tag", + "title": "Asset Tag", "description": "A unique tag used to identify this item", "type": "string", "maxLength": 50, @@ -80465,7 +80465,7 @@ "x-nullable": true }, "weight_unit": { - "title": "Weight unit", + "title": "Weight Unit", "required": [ "label", "value" @@ -80574,7 +80574,7 @@ "x-nullable": true }, "weight_unit": { - "title": "Weight unit", + "title": "Weight Unit", "type": "string", "enum": [ "kg", @@ -80753,7 +80753,7 @@ "maxLength": 50 }, "asset_tag": { - "title": "Asset tag", + "title": "Asset Tag", "description": "A unique tag used to identify this device", "type": "string", "maxLength": 50, @@ -80849,7 +80849,7 @@ "maxLength": 50 }, "asset_tag": { - "title": "Asset tag", + "title": "Asset Tag", "description": "A unique tag used to identify this device", "type": "string", "maxLength": 50, @@ -84308,7 +84308,7 @@ "maxLength": 50 }, "asset_tag": { - "title": "Asset tag", + "title": "Asset Tag", "description": "A unique tag used to identify this rack", "type": "string", "maxLength": 50, @@ -84390,7 +84390,7 @@ "x-nullable": true }, "max_weight": { - "title": "Max weight", + "title": "Max Weight", "description": "Maximum load capacity for the rack", "type": "integer", "maximum": 2147483647, @@ -84398,7 +84398,7 @@ "x-nullable": true }, "weight_unit": { - "title": "Weight unit", + "title": "Weight Unit", "required": [ "label", "value" @@ -84596,7 +84596,7 @@ "maxLength": 50 }, "asset_tag": { - "title": "Asset tag", + "title": "Asset Tag", "description": "A unique tag used to identify this rack", "type": "string", "maxLength": 50, @@ -84640,7 +84640,7 @@ "x-nullable": true }, "max_weight": { - "title": "Max weight", + "title": "Max Weight", "description": "Maximum load capacity for the rack", "type": "integer", "maximum": 2147483647, @@ -84648,7 +84648,7 @@ "x-nullable": true }, "weight_unit": { - "title": "Weight unit", + "title": "Weight Unit", "type": "string", "enum": [ "kg", @@ -87486,7 +87486,7 @@ } }, "object_type": { - "title": "Object type", + "title": "Object Type", "type": "string" }, "data_type": { @@ -87701,7 +87701,7 @@ ] }, "object_type": { - "title": "Object type", + "title": "Object Type", "type": "string" }, "data_type": { diff --git a/contrib/openapi2.yaml b/contrib/openapi2.yaml index bd30643a6..cd0525282 100644 --- a/contrib/openapi2.yaml +++ b/contrib/openapi2.yaml @@ -50819,7 +50819,7 @@ definitions: type: string readOnly: true object_type: - title: Object type + title: Object Type type: string readOnly: true object_id: @@ -50945,7 +50945,7 @@ definitions: type: object properties: object_type: - title: Object type + title: Object Type type: string object_id: title: Object id @@ -51593,7 +51593,7 @@ definitions: type: string maxLength: 50 asset_tag: - title: Asset tag + title: Asset Tag description: A unique tag used to identify this device type: string maxLength: 50 @@ -53249,7 +53249,7 @@ definitions: format: decimal x-nullable: true weight_unit: - title: Weight unit + title: Weight Unit required: - label - value @@ -53389,7 +53389,7 @@ definitions: format: decimal x-nullable: true weight_unit: - title: Weight unit + title: Weight Unit type: string enum: - kg @@ -56714,7 +56714,7 @@ definitions: type: string maxLength: 50 asset_tag: - title: Asset tag + title: Asset Tag description: A unique tag used to identify this item type: string maxLength: 50 @@ -56819,7 +56819,7 @@ definitions: type: string maxLength: 50 asset_tag: - title: Asset tag + title: Asset Tag description: A unique tag used to identify this item type: string maxLength: 50 @@ -57418,7 +57418,7 @@ definitions: format: decimal x-nullable: true weight_unit: - title: Weight unit + title: Weight Unit required: - label - value @@ -57503,7 +57503,7 @@ definitions: format: decimal x-nullable: true weight_unit: - title: Weight unit + title: Weight Unit type: string enum: - kg @@ -57640,7 +57640,7 @@ definitions: type: string maxLength: 50 asset_tag: - title: Asset tag + title: Asset Tag description: A unique tag used to identify this device type: string maxLength: 50 @@ -57716,7 +57716,7 @@ definitions: type: string maxLength: 50 asset_tag: - title: Asset tag + title: Asset Tag description: A unique tag used to identify this device type: string maxLength: 50 @@ -60697,7 +60697,7 @@ definitions: type: string maxLength: 50 asset_tag: - title: Asset tag + title: Asset Tag description: A unique tag used to identify this rack type: string maxLength: 50 @@ -60762,14 +60762,14 @@ definitions: format: decimal x-nullable: true max_weight: - title: Max weight + title: Max Weight description: Maximum load capacity for the rack type: integer maximum: 2147483647 minimum: 0 x-nullable: true weight_unit: - title: Weight unit + title: Weight Unit required: - label - value @@ -60926,7 +60926,7 @@ definitions: type: string maxLength: 50 asset_tag: - title: Asset tag + title: Asset Tag description: A unique tag used to identify this rack type: string maxLength: 50 @@ -60963,14 +60963,14 @@ definitions: format: decimal x-nullable: true max_weight: - title: Max weight + title: Max Weight description: Maximum load capacity for the rack type: integer maximum: 2147483647 minimum: 0 x-nullable: true weight_unit: - title: Weight unit + title: Weight Unit type: string enum: - kg @@ -63270,7 +63270,7 @@ definitions: - object - multiobject object_type: - title: Object type + title: Object Type type: string data_type: title: Data type @@ -63449,7 +63449,7 @@ definitions: - object - multiobject object_type: - title: Object type + title: Object Type type: string data_type: title: Data type diff --git a/docs/features/context-data.md b/docs/features/context-data.md index 22aeccea2..857401dd5 100644 --- a/docs/features/context-data.md +++ b/docs/features/context-data.md @@ -18,7 +18,7 @@ Config contexts can be computed for objects based on the following criteria: | Type | Devices | Virtual Machines | |---------------|------------------|------------------| | Region | :material-check: | :material-check: | -| Site group | :material-check: | :material-check: | +| Site Group | :material-check: | :material-check: | | Site | :material-check: | :material-check: | | Location | :material-check: | | | Device type | :material-check: | | @@ -27,7 +27,7 @@ Config contexts can be computed for objects based on the following criteria: | Cluster type | | :material-check: | | Cluster group | | :material-check: | | Cluster | | :material-check: | -| Tenant group | :material-check: | :material-check: | +| Tenant Group | :material-check: | :material-check: | | Tenant | :material-check: | :material-check: | | Tag | :material-check: | :material-check: | diff --git a/netbox/circuits/filtersets.py b/netbox/circuits/filtersets.py index e52673874..2bc797f52 100644 --- a/netbox/circuits/filtersets.py +++ b/netbox/circuits/filtersets.py @@ -39,14 +39,14 @@ class ProviderFilterSet(NetBoxModelFilterSet, ContactModelFilterSet): queryset=SiteGroup.objects.all(), field_name='circuits__terminations__site__group', lookup_expr='in', - label=_('Site group (ID)'), + label=_('Site Group (ID)'), ) site_group = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), field_name='circuits__terminations__site__group', lookup_expr='in', to_field_name='slug', - label=_('Site group (slug)'), + label=_('Site Group (slug)'), ) site_id = django_filters.ModelMultipleChoiceFilter( field_name='circuits__terminations__site', @@ -206,14 +206,14 @@ class CircuitFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFilte queryset=SiteGroup.objects.all(), field_name='terminations__site__group', lookup_expr='in', - label=_('Site group (ID)'), + label=_('Site Group (ID)'), ) site_group = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), field_name='terminations__site__group', lookup_expr='in', to_field_name='slug', - label=_('Site group (slug)'), + label=_('Site Group (slug)'), ) site_id = django_filters.ModelMultipleChoiceFilter( field_name='terminations__site', diff --git a/netbox/circuits/forms/filtersets.py b/netbox/circuits/forms/filtersets.py index 6f6473c3d..a665affb8 100644 --- a/netbox/circuits/forms/filtersets.py +++ b/netbox/circuits/forms/filtersets.py @@ -37,7 +37,7 @@ class ProviderFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm): site_group_id = DynamicModelMultipleChoiceField( queryset=SiteGroup.objects.all(), required=False, - label=_('Site group') + label=_('Site Group') ) site_id = DynamicModelMultipleChoiceField( queryset=Site.objects.all(), @@ -157,7 +157,7 @@ class CircuitFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFi site_group_id = DynamicModelMultipleChoiceField( queryset=SiteGroup.objects.all(), required=False, - label=_('Site group') + label=_('Site Group') ) site_id = DynamicModelMultipleChoiceField( queryset=Site.objects.all(), diff --git a/netbox/circuits/tests/test_filtersets.py b/netbox/circuits/tests/test_filtersets.py index df10c3929..e821491e7 100644 --- a/netbox/circuits/tests/test_filtersets.py +++ b/netbox/circuits/tests/test_filtersets.py @@ -180,9 +180,9 @@ class CircuitTestCase(TestCase, ChangeLoggedFilterSetTests): Site.objects.bulk_create(sites) tenant_groups = ( - TenantGroup(name='Tenant group 1', slug='tenant-group-1'), - TenantGroup(name='Tenant group 2', slug='tenant-group-2'), - TenantGroup(name='Tenant group 3', slug='tenant-group-3'), + TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), + TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), + TenantGroup(name='Tenant Group 3', slug='tenant-group-3'), ) for tenantgroup in tenant_groups: tenantgroup.save() diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py index ad1e29f26..a558bacb0 100644 --- a/netbox/dcim/filtersets.py +++ b/netbox/dcim/filtersets.py @@ -124,14 +124,14 @@ class SiteGroupFilterSet(OrganizationalModelFilterSet, ContactModelFilterSet): queryset=SiteGroup.objects.all(), field_name='parent', lookup_expr='in', - label=_('Site group (ID)'), + label=_('Site Group (ID)'), ) ancestor = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), field_name='parent', lookup_expr='in', to_field_name='slug', - label=_('Site group (slug)'), + label=_('Site Group (slug)'), ) class Meta: @@ -221,14 +221,14 @@ class LocationFilterSet(TenancyFilterSet, ContactModelFilterSet, OrganizationalM queryset=SiteGroup.objects.all(), field_name='site__group', lookup_expr='in', - label=_('Site group (ID)'), + label=_('Site Group (ID)'), ) site_group = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), field_name='site__group', lookup_expr='in', to_field_name='slug', - label=_('Site group (slug)'), + label=_('Site Group (slug)'), ) site_id = django_filters.ModelMultipleChoiceFilter( queryset=Site.objects.all(), @@ -307,14 +307,14 @@ class RackFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFilterSe queryset=SiteGroup.objects.all(), field_name='site__group', lookup_expr='in', - label=_('Site group (ID)'), + label=_('Site Group (ID)'), ) site_group = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), field_name='site__group', lookup_expr='in', to_field_name='slug', - label=_('Site group (slug)'), + label=_('Site Group (slug)'), ) site_id = django_filters.ModelMultipleChoiceFilter( queryset=Site.objects.all(), @@ -416,14 +416,14 @@ class RackReservationFilterSet(NetBoxModelFilterSet, TenancyFilterSet): queryset=SiteGroup.objects.all(), field_name='rack__site__group', lookup_expr='in', - label=_('Site group (ID)'), + label=_('Site Group (ID)'), ) site_group = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), field_name='rack__site__group', lookup_expr='in', to_field_name='slug', - label=_('Site group (slug)'), + label=_('Site Group (slug)'), ) location_id = TreeNodeMultipleChoiceFilter( queryset=Location.objects.all(), @@ -979,14 +979,14 @@ class DeviceFilterSet( queryset=SiteGroup.objects.all(), field_name='site__group', lookup_expr='in', - label=_('Site group (ID)'), + label=_('Site Group (ID)'), ) site_group = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), field_name='site__group', lookup_expr='in', to_field_name='slug', - label=_('Site group (slug)'), + label=_('Site Group (slug)'), ) site_id = django_filters.ModelMultipleChoiceFilter( queryset=Site.objects.all(), @@ -1305,14 +1305,14 @@ class DeviceComponentFilterSet(django_filters.FilterSet): queryset=SiteGroup.objects.all(), field_name='device__site__group', lookup_expr='in', - label=_('Site group (ID)'), + label=_('Site Group (ID)'), ) site_group = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), field_name='device__site__group', lookup_expr='in', to_field_name='slug', - label=_('Site group (slug)'), + label=_('Site Group (slug)'), ) site_id = django_filters.ModelMultipleChoiceFilter( field_name='device__site', @@ -1832,14 +1832,14 @@ class VirtualChassisFilterSet(NetBoxModelFilterSet): queryset=SiteGroup.objects.all(), field_name='master__site__group', lookup_expr='in', - label=_('Site group (ID)'), + label=_('Site Group (ID)'), ) site_group = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), field_name='master__site__group', lookup_expr='in', to_field_name='slug', - label=_('Site group (slug)'), + label=_('Site Group (slug)'), ) site_id = django_filters.ModelMultipleChoiceFilter( field_name='master__site', @@ -2075,14 +2075,14 @@ class PowerPanelFilterSet(NetBoxModelFilterSet, ContactModelFilterSet): queryset=SiteGroup.objects.all(), field_name='site__group', lookup_expr='in', - label=_('Site group (ID)'), + label=_('Site Group (ID)'), ) site_group = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), field_name='site__group', lookup_expr='in', to_field_name='slug', - label=_('Site group (slug)'), + label=_('Site Group (slug)'), ) site_id = django_filters.ModelMultipleChoiceFilter( queryset=Site.objects.all(), @@ -2133,14 +2133,14 @@ class PowerFeedFilterSet(NetBoxModelFilterSet, CabledObjectFilterSet, PathEndpoi queryset=SiteGroup.objects.all(), field_name='power_panel__site__group', lookup_expr='in', - label=_('Site group (ID)'), + label=_('Site Group (ID)'), ) site_group = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), field_name='power_panel__site__group', lookup_expr='in', to_field_name='slug', - label=_('Site group (slug)'), + label=_('Site Group (slug)'), ) site_id = django_filters.ModelMultipleChoiceFilter( field_name='power_panel__site', diff --git a/netbox/dcim/forms/bulk_edit.py b/netbox/dcim/forms/bulk_edit.py index 25b049e6d..fa40176a6 100644 --- a/netbox/dcim/forms/bulk_edit.py +++ b/netbox/dcim/forms/bulk_edit.py @@ -228,7 +228,7 @@ class RackBulkEditForm(NetBoxModelBulkEditForm): } ) site_group = DynamicModelChoiceField( - label=_('Site group'), + label=_('Site Group'), queryset=SiteGroup.objects.all(), required=False, initial_params={ @@ -274,7 +274,7 @@ class RackBulkEditForm(NetBoxModelBulkEditForm): label=_('Serial Number') ) asset_tag = forms.CharField( - label=_('Asset tag'), + label=_('Asset Tag'), max_length=50, required=False ) @@ -323,12 +323,12 @@ class RackBulkEditForm(NetBoxModelBulkEditForm): required=False ) max_weight = forms.IntegerField( - label=_('Max weight'), + label=_('Max Weight'), min_value=0, required=False ) weight_unit = forms.ChoiceField( - label=_('Weight unit'), + label=_('Weight Unit'), choices=add_blank_choice(WeightUnitChoices), required=False, initial='' @@ -438,7 +438,7 @@ class DeviceTypeBulkEditForm(NetBoxModelBulkEditForm): required=False ) weight_unit = forms.ChoiceField( - label=_('Weight unit'), + label=_('Weight Unit'), choices=add_blank_choice(WeightUnitChoices), required=False, initial='' @@ -477,7 +477,7 @@ class ModuleTypeBulkEditForm(NetBoxModelBulkEditForm): required=False ) weight_unit = forms.ChoiceField( - label=_('Weight unit'), + label=_('Weight Unit'), choices=add_blank_choice(WeightUnitChoices), required=False, initial='' @@ -760,7 +760,7 @@ class PowerPanelBulkEditForm(NetBoxModelBulkEditForm): } ) site_group = DynamicModelChoiceField( - label=_('Site group'), + label=_('Site Group'), queryset=SiteGroup.objects.all(), required=False, initial_params={ diff --git a/netbox/dcim/forms/bulk_import.py b/netbox/dcim/forms/bulk_import.py index 5a64cad02..c4aed0b30 100644 --- a/netbox/dcim/forms/bulk_import.py +++ b/netbox/dcim/forms/bulk_import.py @@ -228,7 +228,7 @@ class RackImportForm(NetBoxModelImportForm): help_text=_('Unit for outer dimensions') ) weight_unit = CSVChoiceField( - label=_('Weight unit'), + label=_('Weight Unit'), choices=WeightUnitChoices, required=False, help_text=_('Unit for rack weights') @@ -334,7 +334,7 @@ class DeviceTypeImportForm(NetBoxModelImportForm): help_text=_('Device weight'), ) weight_unit = CSVChoiceField( - label=_('Weight unit'), + label=_('Weight Unit'), choices=WeightUnitChoices, required=False, help_text=_('Unit for device weight') @@ -360,7 +360,7 @@ class ModuleTypeImportForm(NetBoxModelImportForm): help_text=_('Module weight'), ) weight_unit = CSVChoiceField( - label=_('Weight unit'), + label=_('Weight Unit'), choices=WeightUnitChoices, required=False, help_text=_('Unit for module weight') diff --git a/netbox/dcim/forms/filtersets.py b/netbox/dcim/forms/filtersets.py index 21854b53f..c3df91615 100644 --- a/netbox/dcim/forms/filtersets.py +++ b/netbox/dcim/forms/filtersets.py @@ -73,7 +73,7 @@ class DeviceComponentFilterForm(NetBoxModelFilterSetForm): site_group_id = DynamicModelMultipleChoiceField( queryset=SiteGroup.objects.all(), required=False, - label=_('Site group') + label=_('Site Group') ) site_id = DynamicModelMultipleChoiceField( queryset=Site.objects.all(), @@ -153,7 +153,7 @@ class SiteGroupFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm): parent_id = DynamicModelMultipleChoiceField( queryset=SiteGroup.objects.all(), required=False, - label=_('Parent group') + label=_('Parent Group') ) tag = TagFilterField(model) @@ -180,7 +180,7 @@ class SiteFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFilte group_id = DynamicModelMultipleChoiceField( queryset=SiteGroup.objects.all(), required=False, - label=_('Site group') + label=_('Site Group') ) asn_id = DynamicModelMultipleChoiceField( queryset=ASN.objects.all(), @@ -206,7 +206,7 @@ class LocationFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelF site_group_id = DynamicModelMultipleChoiceField( queryset=SiteGroup.objects.all(), required=False, - label=_('Site group') + label=_('Site Group') ) site_id = DynamicModelMultipleChoiceField( queryset=Site.objects.all(), @@ -267,7 +267,7 @@ class RackFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFilte site_group_id = DynamicModelMultipleChoiceField( queryset=SiteGroup.objects.all(), required=False, - label=_('Site group') + label=_('Site Group') ) location_id = DynamicModelMultipleChoiceField( queryset=Location.objects.all(), @@ -304,7 +304,7 @@ class RackFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFilte required=False ) asset_tag = forms.CharField( - label=_('Asset tag'), + label=_('Asset Tag'), required=False ) tag = TagFilterField(model) @@ -314,12 +314,12 @@ class RackFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFilte min_value=1 ) max_weight = forms.IntegerField( - label=_('Max weight'), + label=_('Max Weight'), required=False, min_value=1 ) weight_unit = forms.ChoiceField( - label=_('Weight unit'), + label=_('Weight Unit'), choices=add_blank_choice(WeightUnitChoices), required=False ) @@ -362,7 +362,7 @@ class RackReservationFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): site_group_id = DynamicModelMultipleChoiceField( queryset=SiteGroup.objects.all(), required=False, - label=_('Site group') + label=_('Site Group') ) site_id = DynamicModelMultipleChoiceField( queryset=Site.objects.all(), @@ -530,7 +530,7 @@ class DeviceTypeFilterForm(NetBoxModelFilterSetForm): required=False ) weight_unit = forms.ChoiceField( - label=_('Weight unit'), + label=_('Weight Unit'), choices=add_blank_choice(WeightUnitChoices), required=False ) @@ -605,7 +605,7 @@ class ModuleTypeFilterForm(NetBoxModelFilterSetForm): required=False ) weight_unit = forms.ChoiceField( - label=_('Weight unit'), + label=_('Weight Unit'), choices=add_blank_choice(WeightUnitChoices), required=False ) @@ -669,7 +669,7 @@ class DeviceFilterForm( site_group_id = DynamicModelMultipleChoiceField( queryset=SiteGroup.objects.all(), required=False, - label=_('Site group') + label=_('Site Group') ) site_id = DynamicModelMultipleChoiceField( queryset=Site.objects.all(), @@ -738,7 +738,7 @@ class DeviceFilterForm( required=False ) asset_tag = forms.CharField( - label=_('Asset tag'), + label=_('Asset Tag'), required=False ) mac_address = forms.CharField( @@ -875,7 +875,7 @@ class ModuleFilterForm(LocalConfigContextFilterForm, TenancyFilterForm, NetBoxMo required=False ) asset_tag = forms.CharField( - label=_('Asset tag'), + label=_('Asset Tag'), required=False ) tag = TagFilterField(model) @@ -896,7 +896,7 @@ class VirtualChassisFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): site_group_id = DynamicModelMultipleChoiceField( queryset=SiteGroup.objects.all(), required=False, - label=_('Site group') + label=_('Site Group') ) site_id = DynamicModelMultipleChoiceField( queryset=Site.objects.all(), @@ -1010,7 +1010,7 @@ class PowerPanelFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm): site_group_id = DynamicModelMultipleChoiceField( queryset=SiteGroup.objects.all(), required=False, - label=_('Site group') + label=_('Site Group') ) site_id = DynamicModelMultipleChoiceField( queryset=Site.objects.all(), @@ -1049,7 +1049,7 @@ class PowerFeedFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): site_group_id = DynamicModelMultipleChoiceField( queryset=SiteGroup.objects.all(), required=False, - label=_('Site group') + label=_('Site Group') ) site_id = DynamicModelMultipleChoiceField( queryset=Site.objects.all(), @@ -1427,7 +1427,7 @@ class InventoryItemFilterForm(DeviceComponentFilterForm): required=False ) asset_tag = forms.CharField( - label=_('Asset tag'), + label=_('Asset Tag'), required=False ) discovered = forms.NullBooleanField( diff --git a/netbox/dcim/forms/object_create.py b/netbox/dcim/forms/object_create.py index f811700b4..890d572d9 100644 --- a/netbox/dcim/forms/object_create.py +++ b/netbox/dcim/forms/object_create.py @@ -380,7 +380,7 @@ class VirtualChassisCreateForm(NetBoxModelForm): } ) site_group = DynamicModelChoiceField( - label=_('Site group'), + label=_('Site Group'), queryset=SiteGroup.objects.all(), required=False, initial_params={ diff --git a/netbox/dcim/svg/racks.py b/netbox/dcim/svg/racks.py index 0f73095b5..c6ac40b0f 100644 --- a/netbox/dcim/svg/racks.py +++ b/netbox/dcim/svg/racks.py @@ -49,7 +49,7 @@ def get_device_description(device): Name: Role: Device Type: () - Asset tag: (if defined) + Asset Tag: (if defined) Serial: (if defined) Description: (if defined) """ @@ -58,7 +58,7 @@ def get_device_description(device): u_height = f'{floatformat(device.device_type.u_height)}U' description += f'\nDevice Type: {device.device_type.manufacturer.name} {device.device_type.model} ({u_height})' if device.asset_tag: - description += f'\nAsset tag: {device.asset_tag}' + description += f'\nAsset Tag: {device.asset_tag}' if device.serial: description += f'\nSerial: {device.serial}' if device.description: diff --git a/netbox/dcim/tests/test_filtersets.py b/netbox/dcim/tests/test_filtersets.py index 96ea020b3..b77930f3c 100644 --- a/netbox/dcim/tests/test_filtersets.py +++ b/netbox/dcim/tests/test_filtersets.py @@ -217,9 +217,9 @@ class SiteTestCase(TestCase, ChangeLoggedFilterSetTests): group.save() tenant_groups = ( - TenantGroup(name='Tenant group 1', slug='tenant-group-1'), - TenantGroup(name='Tenant group 2', slug='tenant-group-2'), - TenantGroup(name='Tenant group 3', slug='tenant-group-3'), + TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), + TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), + TenantGroup(name='Tenant Group 3', slug='tenant-group-3'), ) for tenantgroup in tenant_groups: tenantgroup.save() @@ -515,9 +515,9 @@ class RackTestCase(TestCase, ChangeLoggedFilterSetTests): RackRole.objects.bulk_create(rack_roles) tenant_groups = ( - TenantGroup(name='Tenant group 1', slug='tenant-group-1'), - TenantGroup(name='Tenant group 2', slug='tenant-group-2'), - TenantGroup(name='Tenant group 3', slug='tenant-group-3'), + TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), + TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), + TenantGroup(name='Tenant Group 3', slug='tenant-group-3'), ) for tenantgroup in tenant_groups: tenantgroup.save() @@ -782,9 +782,9 @@ class RackReservationTestCase(TestCase, ChangeLoggedFilterSetTests): User.objects.bulk_create(users) tenant_groups = ( - TenantGroup(name='Tenant group 1', slug='tenant-group-1'), - TenantGroup(name='Tenant group 2', slug='tenant-group-2'), - TenantGroup(name='Tenant group 3', slug='tenant-group-3'), + TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), + TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), + TenantGroup(name='Tenant Group 3', slug='tenant-group-3'), ) for tenantgroup in tenant_groups: tenantgroup.save() @@ -1967,9 +1967,9 @@ class DeviceTestCase(TestCase, ChangeLoggedFilterSetTests): Cluster.objects.bulk_create(clusters) tenant_groups = ( - TenantGroup(name='Tenant group 1', slug='tenant-group-1'), - TenantGroup(name='Tenant group 2', slug='tenant-group-2'), - TenantGroup(name='Tenant group 3', slug='tenant-group-3'), + TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), + TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), + TenantGroup(name='Tenant Group 3', slug='tenant-group-3'), ) for tenantgroup in tenant_groups: tenantgroup.save() @@ -5162,9 +5162,9 @@ class PowerFeedTestCase(TestCase, ChangeLoggedFilterSetTests): Rack.objects.bulk_create(racks) tenant_groups = ( - TenantGroup(name='Tenant group 1', slug='tenant-group-1'), - TenantGroup(name='Tenant group 2', slug='tenant-group-2'), - TenantGroup(name='Tenant group 3', slug='tenant-group-3'), + TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), + TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), + TenantGroup(name='Tenant Group 3', slug='tenant-group-3'), ) for tenantgroup in tenant_groups: tenantgroup.save() diff --git a/netbox/extras/filtersets.py b/netbox/extras/filtersets.py index 274834d31..20be0e5db 100644 --- a/netbox/extras/filtersets.py +++ b/netbox/extras/filtersets.py @@ -464,12 +464,12 @@ class ConfigContextFilterSet(ChangeLoggedModelFilterSet): field_name='site_groups__slug', queryset=SiteGroup.objects.all(), to_field_name='slug', - label=_('Site group (slug)'), + label=_('Site Group (slug)'), ) site_group_id = django_filters.ModelMultipleChoiceFilter( field_name='site_groups', queryset=SiteGroup.objects.all(), - label=_('Site group'), + label=_('Site Group'), ) site_id = django_filters.ModelMultipleChoiceFilter( field_name='sites', @@ -550,13 +550,13 @@ class ConfigContextFilterSet(ChangeLoggedModelFilterSet): tenant_group_id = django_filters.ModelMultipleChoiceFilter( field_name='tenant_groups', queryset=TenantGroup.objects.all(), - label=_('Tenant group'), + label=_('Tenant Group'), ) tenant_group = django_filters.ModelMultipleChoiceFilter( field_name='tenant_groups__slug', queryset=TenantGroup.objects.all(), to_field_name='slug', - label=_('Tenant group (slug)'), + label=_('Tenant Group (slug)'), ) tenant_id = django_filters.ModelMultipleChoiceFilter( field_name='tenants', diff --git a/netbox/extras/forms/bulk_import.py b/netbox/extras/forms/bulk_import.py index c09eed3da..8aa804c95 100644 --- a/netbox/extras/forms/bulk_import.py +++ b/netbox/extras/forms/bulk_import.py @@ -31,7 +31,7 @@ __all__ = ( class CustomFieldImportForm(CSVModelForm): object_types = CSVMultipleContentTypeField( - label=_('Object types'), + label=_('Object Types'), queryset=ObjectType.objects.with_feature('custom_fields'), help_text=_("One or more assigned object types") ) @@ -41,10 +41,10 @@ class CustomFieldImportForm(CSVModelForm): help_text=_('Field data type (e.g. text, integer, etc.)') ) related_object_type = CSVContentTypeField( - label=_('Object type'), + label=_('Object Type'), queryset=ObjectType.objects.public(), required=False, - help_text=_("Object type (for object or multi-object fields)") + help_text=_("Object Type (for object or multi-object fields)") ) choice_set = CSVModelChoiceField( label=_('Choice set'), @@ -112,7 +112,7 @@ class CustomFieldChoiceSetImportForm(CSVModelForm): class CustomLinkImportForm(CSVModelForm): object_types = CSVMultipleContentTypeField( - label=_('Object types'), + label=_('Object Types'), queryset=ObjectType.objects.with_feature('custom_links'), help_text=_("One or more assigned object types") ) @@ -133,7 +133,7 @@ class CustomLinkImportForm(CSVModelForm): class ExportTemplateImportForm(CSVModelForm): object_types = CSVMultipleContentTypeField( - label=_('Object types'), + label=_('Object Types'), queryset=ObjectType.objects.with_feature('export_templates'), help_text=_("One or more assigned object types") ) @@ -156,7 +156,7 @@ class ConfigTemplateImportForm(CSVModelForm): class SavedFilterImportForm(CSVModelForm): object_types = CSVMultipleContentTypeField( - label=_('Object types'), + label=_('Object Types'), queryset=ObjectType.objects.all(), help_text=_("One or more assigned object types") ) @@ -180,7 +180,7 @@ class WebhookImportForm(NetBoxModelImportForm): class EventRuleImportForm(NetBoxModelImportForm): object_types = CSVMultipleContentTypeField( - label=_('Object types'), + label=_('Object Types'), queryset=ObjectType.objects.with_feature('event_rules'), help_text=_("One or more assigned object types") ) diff --git a/netbox/extras/forms/filtersets.py b/netbox/extras/forms/filtersets.py index d4235c465..7650e4cde 100644 --- a/netbox/extras/forms/filtersets.py +++ b/netbox/extras/forms/filtersets.py @@ -112,7 +112,7 @@ class CustomLinkFilterForm(SavedFiltersMixin, FilterForm): FieldSet('object_type', 'enabled', 'new_window', 'weight', name=_('Attributes')), ) object_type = ContentTypeMultipleChoiceField( - label=_('Object types'), + label=_('Object Types'), queryset=ObjectType.objects.with_feature('custom_links'), required=False ) @@ -183,7 +183,7 @@ class ImageAttachmentFilterForm(SavedFiltersMixin, FilterForm): FieldSet('object_type_id', 'name', name=_('Attributes')), ) object_type_id = ContentTypeChoiceField( - label=_('Object type'), + label=_('Object Type'), queryset=ObjectType.objects.with_feature('image_attachments'), required=False ) @@ -199,7 +199,7 @@ class SavedFilterFilterForm(SavedFiltersMixin, FilterForm): FieldSet('object_type', 'enabled', 'shared', 'weight', name=_('Attributes')), ) object_type = ContentTypeMultipleChoiceField( - label=_('Object types'), + label=_('Object Types'), queryset=ObjectType.objects.public(), required=False ) @@ -257,7 +257,7 @@ class EventRuleFilterForm(NetBoxModelFilterSetForm): object_type_id = ContentTypeMultipleChoiceField( queryset=ObjectType.objects.with_feature('event_rules'), required=False, - label=_('Object type') + label=_('Object Type') ) action_type = forms.ChoiceField( choices=add_blank_choice(EventRuleActionChoices), @@ -352,7 +352,7 @@ class ConfigContextFilterForm(SavedFiltersMixin, FilterForm): site_group_id = DynamicModelMultipleChoiceField( queryset=SiteGroup.objects.all(), required=False, - label=_('Site groups') + label=_('Site Groups') ) site_id = DynamicModelMultipleChoiceField( queryset=Site.objects.all(), @@ -397,7 +397,7 @@ class ConfigContextFilterForm(SavedFiltersMixin, FilterForm): tenant_group_id = DynamicModelMultipleChoiceField( queryset=TenantGroup.objects.all(), required=False, - label=_('Tenant groups') + label=_('Tenant Groups') ) tenant_id = DynamicModelMultipleChoiceField( queryset=Tenant.objects.all(), diff --git a/netbox/extras/forms/model_forms.py b/netbox/extras/forms/model_forms.py index ebd6e6c08..be171f3f6 100644 --- a/netbox/extras/forms/model_forms.py +++ b/netbox/extras/forms/model_forms.py @@ -40,7 +40,7 @@ __all__ = ( class CustomFieldForm(forms.ModelForm): object_types = ContentTypeMultipleChoiceField( - label=_('Object types'), + label=_('Object Types'), queryset=ObjectType.objects.with_feature('custom_fields') ) related_object_type = ContentTypeChoiceField( @@ -128,7 +128,7 @@ class CustomFieldChoiceSetForm(forms.ModelForm): class CustomLinkForm(forms.ModelForm): object_types = ContentTypeMultipleChoiceField( - label=_('Object types'), + label=_('Object Types'), queryset=ObjectType.objects.with_feature('custom_links') ) @@ -160,7 +160,7 @@ class CustomLinkForm(forms.ModelForm): class ExportTemplateForm(SyncedDataMixin, forms.ModelForm): object_types = ContentTypeMultipleChoiceField( - label=_('Object types'), + label=_('Object Types'), queryset=ObjectType.objects.with_feature('export_templates') ) template_code = forms.CharField( @@ -201,7 +201,7 @@ class ExportTemplateForm(SyncedDataMixin, forms.ModelForm): class SavedFilterForm(forms.ModelForm): slug = SlugField() object_types = ContentTypeMultipleChoiceField( - label=_('Object types'), + label=_('Object Types'), queryset=ObjectType.objects.all() ) parameters = JSONField() @@ -227,7 +227,7 @@ class SavedFilterForm(forms.ModelForm): class BookmarkForm(forms.ModelForm): object_type = ContentTypeChoiceField( - label=_('Object type'), + label=_('Object Type'), queryset=ObjectType.objects.with_feature('bookmarks') ) @@ -258,7 +258,7 @@ class WebhookForm(NetBoxModelForm): class EventRuleForm(NetBoxModelForm): object_types = ContentTypeMultipleChoiceField( - label=_('Object types'), + label=_('Object Types'), queryset=ObjectType.objects.with_feature('event_rules'), ) action_choice = forms.ChoiceField( @@ -362,7 +362,7 @@ class EventRuleForm(NetBoxModelForm): class TagForm(forms.ModelForm): slug = SlugField() object_types = ContentTypeMultipleChoiceField( - label=_('Object types'), + label=_('Object Types'), queryset=ObjectType.objects.with_feature('tags'), required=False ) @@ -385,7 +385,7 @@ class ConfigContextForm(SyncedDataMixin, forms.ModelForm): required=False ) site_groups = DynamicModelMultipleChoiceField( - label=_('Site groups'), + label=_('Site Groups'), queryset=SiteGroup.objects.all(), required=False ) @@ -430,7 +430,7 @@ class ConfigContextForm(SyncedDataMixin, forms.ModelForm): required=False ) tenant_groups = DynamicModelMultipleChoiceField( - label=_('Tenant groups'), + label=_('Tenant Groups'), queryset=TenantGroup.objects.all(), required=False ) diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py index d58f5bfc9..45b9c53d5 100644 --- a/netbox/ipam/filtersets.py +++ b/netbox/ipam/filtersets.py @@ -349,14 +349,14 @@ class PrefixFilterSet(NetBoxModelFilterSet, TenancyFilterSet): queryset=SiteGroup.objects.all(), field_name='site__group', lookup_expr='in', - label=_('Site group (ID)'), + label=_('Site Group (ID)'), ) site_group = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), field_name='site__group', lookup_expr='in', to_field_name='slug', - label=_('Site group (slug)'), + label=_('Site Group (slug)'), ) site_id = django_filters.ModelMultipleChoiceFilter( queryset=Site.objects.all(), @@ -955,14 +955,14 @@ class VLANFilterSet(NetBoxModelFilterSet, TenancyFilterSet): queryset=SiteGroup.objects.all(), field_name='site__group', lookup_expr='in', - label=_('Site group (ID)'), + label=_('Site Group (ID)'), ) site_group = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), field_name='site__group', lookup_expr='in', to_field_name='slug', - label=_('Site group (slug)'), + label=_('Site Group (slug)'), ) site_id = django_filters.ModelMultipleChoiceFilter( queryset=Site.objects.all(), diff --git a/netbox/ipam/forms/bulk_edit.py b/netbox/ipam/forms/bulk_edit.py index c7f64ab1d..592e136e4 100644 --- a/netbox/ipam/forms/bulk_edit.py +++ b/netbox/ipam/forms/bulk_edit.py @@ -208,7 +208,7 @@ class PrefixBulkEditForm(NetBoxModelBulkEditForm): required=False ) site_group = DynamicModelChoiceField( - label=_('Site group'), + label=_('Site Group'), queryset=SiteGroup.objects.all(), required=False ) @@ -442,7 +442,7 @@ class VLANGroupBulkEditForm(NetBoxModelBulkEditForm): sitegroup = DynamicModelChoiceField( queryset=SiteGroup.objects.all(), required=False, - label=_('Site group') + label=_('Site Group') ) site = DynamicModelChoiceField( label=_('Site'), @@ -514,7 +514,7 @@ class VLANBulkEditForm(NetBoxModelBulkEditForm): required=False ) site_group = DynamicModelChoiceField( - label=_('Site group'), + label=_('Site Group'), queryset=SiteGroup.objects.all(), required=False ) diff --git a/netbox/ipam/forms/filtersets.py b/netbox/ipam/forms/filtersets.py index 80fb04226..b63abcf5b 100644 --- a/netbox/ipam/forms/filtersets.py +++ b/netbox/ipam/forms/filtersets.py @@ -219,7 +219,7 @@ class PrefixFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): site_group_id = DynamicModelMultipleChoiceField( queryset=SiteGroup.objects.all(), required=False, - label=_('Site group') + label=_('Site Group') ) site_id = DynamicModelMultipleChoiceField( queryset=Site.objects.all(), @@ -424,7 +424,7 @@ class VLANGroupFilterForm(NetBoxModelFilterSetForm): sitegroup = DynamicModelMultipleChoiceField( queryset=SiteGroup.objects.all(), required=False, - label=_('Site group') + label=_('Site Group') ) site = DynamicModelMultipleChoiceField( queryset=Site.objects.all(), @@ -484,7 +484,7 @@ class VLANFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): site_group_id = DynamicModelMultipleChoiceField( queryset=SiteGroup.objects.all(), required=False, - label=_('Site group') + label=_('Site Group') ) site_id = DynamicModelMultipleChoiceField( queryset=Site.objects.all(), diff --git a/netbox/ipam/forms/model_forms.py b/netbox/ipam/forms/model_forms.py index 4e405a035..54c42518b 100644 --- a/netbox/ipam/forms/model_forms.py +++ b/netbox/ipam/forms/model_forms.py @@ -581,7 +581,7 @@ class VLANGroupForm(NetBoxModelForm): initial_params={ 'sites': '$site' }, - label=_('Site group') + label=_('Site Group') ) site = DynamicModelChoiceField( label=_('Site'), diff --git a/netbox/ipam/tests/test_filtersets.py b/netbox/ipam/tests/test_filtersets.py index 3a46423a5..729128d99 100644 --- a/netbox/ipam/tests/test_filtersets.py +++ b/netbox/ipam/tests/test_filtersets.py @@ -217,9 +217,9 @@ class VRFTestCase(TestCase, ChangeLoggedFilterSetTests): RouteTarget.objects.bulk_create(route_targets) tenant_groups = ( - TenantGroup(name='Tenant group 1', slug='tenant-group-1'), - TenantGroup(name='Tenant group 2', slug='tenant-group-2'), - TenantGroup(name='Tenant group 3', slug='tenant-group-3'), + TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), + TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), + TenantGroup(name='Tenant Group 3', slug='tenant-group-3'), ) for tenantgroup in tenant_groups: tenantgroup.save() @@ -318,9 +318,9 @@ class RouteTargetTestCase(TestCase, ChangeLoggedFilterSetTests): def setUpTestData(cls): tenant_groups = ( - TenantGroup(name='Tenant group 1', slug='tenant-group-1'), - TenantGroup(name='Tenant group 2', slug='tenant-group-2'), - TenantGroup(name='Tenant group 3', slug='tenant-group-3'), + TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), + TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), + TenantGroup(name='Tenant Group 3', slug='tenant-group-3'), ) for tenantgroup in tenant_groups: tenantgroup.save() @@ -480,9 +480,9 @@ class AggregateTestCase(TestCase, ChangeLoggedFilterSetTests): RIR.objects.bulk_create(rirs) tenant_groups = ( - TenantGroup(name='Tenant group 1', slug='tenant-group-1'), - TenantGroup(name='Tenant group 2', slug='tenant-group-2'), - TenantGroup(name='Tenant group 3', slug='tenant-group-3'), + TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), + TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), + TenantGroup(name='Tenant Group 3', slug='tenant-group-3'), ) for tenantgroup in tenant_groups: tenantgroup.save() @@ -640,9 +640,9 @@ class PrefixTestCase(TestCase, ChangeLoggedFilterSetTests): Role.objects.bulk_create(roles) tenant_groups = ( - TenantGroup(name='Tenant group 1', slug='tenant-group-1'), - TenantGroup(name='Tenant group 2', slug='tenant-group-2'), - TenantGroup(name='Tenant group 3', slug='tenant-group-3'), + TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), + TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), + TenantGroup(name='Tenant Group 3', slug='tenant-group-3'), ) for tenantgroup in tenant_groups: tenantgroup.save() @@ -824,9 +824,9 @@ class IPRangeTestCase(TestCase, ChangeLoggedFilterSetTests): Role.objects.bulk_create(roles) tenant_groups = ( - TenantGroup(name='Tenant group 1', slug='tenant-group-1'), - TenantGroup(name='Tenant group 2', slug='tenant-group-2'), - TenantGroup(name='Tenant group 3', slug='tenant-group-3'), + TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), + TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), + TenantGroup(name='Tenant Group 3', slug='tenant-group-3'), ) for tenantgroup in tenant_groups: tenantgroup.save() @@ -1039,9 +1039,9 @@ class IPAddressTestCase(TestCase, ChangeLoggedFilterSetTests): FHRPGroup.objects.bulk_create(fhrp_groups) tenant_groups = ( - TenantGroup(name='Tenant group 1', slug='tenant-group-1'), - TenantGroup(name='Tenant group 2', slug='tenant-group-2'), - TenantGroup(name='Tenant group 3', slug='tenant-group-3'), + TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), + TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), + TenantGroup(name='Tenant Group 3', slug='tenant-group-3'), ) for tenantgroup in tenant_groups: tenantgroup.save() @@ -1671,9 +1671,9 @@ class VLANTestCase(TestCase, ChangeLoggedFilterSetTests): Role.objects.bulk_create(roles) tenant_groups = ( - TenantGroup(name='Tenant group 1', slug='tenant-group-1'), - TenantGroup(name='Tenant group 2', slug='tenant-group-2'), - TenantGroup(name='Tenant group 3', slug='tenant-group-3'), + TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), + TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), + TenantGroup(name='Tenant Group 3', slug='tenant-group-3'), ) for tenantgroup in tenant_groups: tenantgroup.save() diff --git a/netbox/netbox/forms/__init__.py b/netbox/netbox/forms/__init__.py index fa82689a5..ee44243b9 100644 --- a/netbox/netbox/forms/__init__.py +++ b/netbox/netbox/forms/__init__.py @@ -31,7 +31,7 @@ class SearchForm(forms.Form): obj_types = forms.MultipleChoiceField( choices=[], required=False, - label=_('Object type(s)') + label=_('Object Type(s)') ) lookup = forms.ChoiceField( choices=LOOKUP_CHOICES, diff --git a/netbox/tenancy/filtersets.py b/netbox/tenancy/filtersets.py index 75096b00e..02ef54f6a 100644 --- a/netbox/tenancy/filtersets.py +++ b/netbox/tenancy/filtersets.py @@ -179,14 +179,14 @@ class TenantGroupFilterSet(OrganizationalModelFilterSet): queryset=TenantGroup.objects.all(), field_name='parent', lookup_expr='in', - label=_('Tenant group (ID)'), + label=_('Tenant Group (ID)'), ) ancestor = TreeNodeMultipleChoiceFilter( queryset=TenantGroup.objects.all(), field_name='parent', lookup_expr='in', to_field_name='slug', - label=_('Tenant group (slug)'), + label=_('Tenant Group (slug)'), ) class Meta: @@ -199,14 +199,14 @@ class TenantFilterSet(NetBoxModelFilterSet, ContactModelFilterSet): queryset=TenantGroup.objects.all(), field_name='group', lookup_expr='in', - label=_('Tenant group (ID)'), + label=_('Tenant Group (ID)'), ) group = TreeNodeMultipleChoiceFilter( queryset=TenantGroup.objects.all(), field_name='group', lookup_expr='in', to_field_name='slug', - label=_('Tenant group (slug)'), + label=_('Tenant Group (slug)'), ) class Meta: diff --git a/netbox/tenancy/forms/bulk_import.py b/netbox/tenancy/forms/bulk_import.py index f37317549..06b6ca6a1 100644 --- a/netbox/tenancy/forms/bulk_import.py +++ b/netbox/tenancy/forms/bulk_import.py @@ -25,7 +25,7 @@ class TenantGroupImportForm(NetBoxModelImportForm): queryset=TenantGroup.objects.all(), required=False, to_field_name='name', - help_text=_('Parent group') + help_text=_('Parent Group') ) slug = SlugField() @@ -59,7 +59,7 @@ class ContactGroupImportForm(NetBoxModelImportForm): queryset=ContactGroup.objects.all(), required=False, to_field_name='name', - help_text=_('Parent group') + help_text=_('Parent Group') ) slug = SlugField() diff --git a/netbox/tenancy/forms/filtersets.py b/netbox/tenancy/forms/filtersets.py index 960ca45b1..352e2bffe 100644 --- a/netbox/tenancy/forms/filtersets.py +++ b/netbox/tenancy/forms/filtersets.py @@ -30,7 +30,7 @@ class TenantGroupFilterForm(NetBoxModelFilterSetForm): parent_id = DynamicModelMultipleChoiceField( queryset=TenantGroup.objects.all(), required=False, - label=_('Parent group') + label=_('Parent Group') ) tag = TagFilterField(model) @@ -59,7 +59,7 @@ class ContactGroupFilterForm(NetBoxModelFilterSetForm): parent_id = DynamicModelMultipleChoiceField( queryset=ContactGroup.objects.all(), required=False, - label=_('Parent group') + label=_('Parent Group') ) tag = TagFilterField(model) @@ -89,7 +89,7 @@ class ContactAssignmentFilterForm(NetBoxModelFilterSetForm): object_type_id = ContentTypeMultipleChoiceField( queryset=ObjectType.objects.with_feature('contacts'), required=False, - label=_('Object type') + label=_('Object Type') ) group_id = DynamicModelMultipleChoiceField( queryset=ContactGroup.objects.all(), diff --git a/netbox/tenancy/forms/forms.py b/netbox/tenancy/forms/forms.py index 114253e7a..0c16eedd3 100644 --- a/netbox/tenancy/forms/forms.py +++ b/netbox/tenancy/forms/forms.py @@ -13,7 +13,7 @@ __all__ = ( class TenancyForm(forms.Form): tenant_group = DynamicModelChoiceField( - label=_('Tenant group'), + label=_('Tenant Group'), queryset=TenantGroup.objects.all(), required=False, null_option='None', @@ -36,7 +36,7 @@ class TenancyFilterForm(forms.Form): queryset=TenantGroup.objects.all(), required=False, null_option='None', - label=_('Tenant group') + label=_('Tenant Group') ) tenant_id = DynamicModelMultipleChoiceField( queryset=Tenant.objects.all(), diff --git a/netbox/translations/de/LC_MESSAGES/django.po b/netbox/translations/de/LC_MESSAGES/django.po index ca00405eb..860487e5d 100644 --- a/netbox/translations/de/LC_MESSAGES/django.po +++ b/netbox/translations/de/LC_MESSAGES/django.po @@ -2,10 +2,10 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# # Translators: # Jeremy Stretch, 2024 -# +# #, fuzzy msgid "" msgstr "" @@ -125,7 +125,7 @@ msgstr "Region (Schnecke)" #: dcim/filtersets.py:2078 dcim/filtersets.py:2136 ipam/filtersets.py:352 #: ipam/filtersets.py:958 virtualization/filtersets.py:58 #: virtualization/filtersets.py:186 -msgid "Site group (ID)" +msgid "Site Group (ID)" msgstr "Websitegruppe (ID)" #: circuits/filtersets.py:49 circuits/filtersets.py:216 dcim/filtersets.py:134 @@ -134,7 +134,7 @@ msgstr "Websitegruppe (ID)" #: dcim/filtersets.py:2085 dcim/filtersets.py:2143 extras/filtersets.py:467 #: ipam/filtersets.py:359 ipam/filtersets.py:965 #: virtualization/filtersets.py:65 virtualization/filtersets.py:193 -msgid "Site group (slug)" +msgid "Site Group (slug)" msgstr "Seitengruppe (Slug)" #: circuits/filtersets.py:54 circuits/forms/bulk_import.py:116 @@ -761,7 +761,7 @@ msgstr "Region" #: virtualization/forms/bulk_edit.py:86 virtualization/forms/filtersets.py:69 #: virtualization/forms/filtersets.py:138 #: virtualization/forms/model_forms.py:98 -msgid "Site group" +msgid "Site Group" msgstr "Seitengruppe" #: circuits/forms/filtersets.py:62 circuits/forms/filtersets.py:80 @@ -2784,7 +2784,7 @@ msgstr "Seriennummer" #: dcim/forms/bulk_edit.py:277 dcim/forms/filtersets.py:307 #: dcim/forms/filtersets.py:741 dcim/forms/filtersets.py:878 #: dcim/forms/filtersets.py:1430 -msgid "Asset tag" +msgid "Asset Tag" msgstr "Asset-Tag" #: dcim/forms/bulk_edit.py:287 dcim/forms/bulk_import.py:220 @@ -2838,7 +2838,7 @@ msgid "Weight" msgstr "Gewicht" #: dcim/forms/bulk_edit.py:326 dcim/forms/filtersets.py:317 -msgid "Max weight" +msgid "Max Weight" msgstr "Maximales Gewicht" #: dcim/forms/bulk_edit.py:331 dcim/forms/bulk_edit.py:441 @@ -2846,7 +2846,7 @@ msgstr "Maximales Gewicht" #: dcim/forms/bulk_import.py:337 dcim/forms/bulk_import.py:363 #: dcim/forms/filtersets.py:322 dcim/forms/filtersets.py:533 #: dcim/forms/filtersets.py:608 -msgid "Weight unit" +msgid "Weight Unit" msgstr "Gewichtseinheit" #: dcim/forms/bulk_edit.py:345 dcim/forms/bulk_edit.py:808 @@ -3781,7 +3781,7 @@ msgstr "Übergeordnete Region" #: tenancy/forms/bulk_import.py:62 tenancy/forms/filtersets.py:33 #: tenancy/forms/filtersets.py:62 wireless/forms/bulk_import.py:25 #: wireless/forms/filtersets.py:25 -msgid "Parent group" +msgid "Parent Group" msgstr "Übergeordnete Gruppe" #: dcim/forms/filtersets.py:247 dcim/forms/filtersets.py:332 @@ -6549,12 +6549,12 @@ msgstr "Clustergruppe (Schnecke)" #: extras/filtersets.py:553 tenancy/forms/forms.py:16 #: tenancy/forms/forms.py:39 -msgid "Tenant group" +msgid "Tenant Group" msgstr "Mietergruppe" #: extras/filtersets.py:559 tenancy/filtersets.py:189 #: tenancy/filtersets.py:209 -msgid "Tenant group (slug)" +msgid "Tenant Group (slug)" msgstr "Mietergruppe (Slug)" #: extras/filtersets.py:575 extras/forms/model_forms.py:371 @@ -6677,7 +6677,7 @@ msgstr "Ist aktiv" #: extras/forms/model_forms.py:131 extras/forms/model_forms.py:163 #: extras/forms/model_forms.py:204 extras/forms/model_forms.py:261 #: extras/forms/model_forms.py:365 users/forms/model_forms.py:273 -msgid "Object types" +msgid "Object Types" msgstr "Typen von Objekten" #: extras/forms/bulk_import.py:36 extras/forms/bulk_import.py:117 @@ -6693,11 +6693,11 @@ msgstr "Felddatentyp (z. B. Text, Integer usw.)" #: extras/forms/bulk_import.py:44 extras/forms/filtersets.py:186 #: extras/forms/filtersets.py:260 extras/forms/model_forms.py:230 #: tenancy/forms/filtersets.py:92 -msgid "Object type" +msgid "Object Type" msgstr "Typ des Objekts" #: extras/forms/bulk_import.py:47 -msgid "Object type (for object or multi-object fields)" +msgid "Object Type (for object or multi-object fields)" msgstr "Objekttyp (für Objekt- oder Mehrfachobjektfelder)" #: extras/forms/bulk_import.py:50 extras/forms/filtersets.py:74 @@ -6847,7 +6847,7 @@ msgid "Regions" msgstr "Regionen" #: extras/forms/filtersets.py:355 extras/forms/model_forms.py:388 -msgid "Site groups" +msgid "Site Groups" msgstr "Site-Gruppen" #: extras/forms/filtersets.py:365 extras/forms/model_forms.py:398 @@ -6879,7 +6879,7 @@ msgid "Clusters" msgstr "Cluster" #: extras/forms/filtersets.py:400 extras/forms/model_forms.py:433 -msgid "Tenant groups" +msgid "Tenant Groups" msgstr "Mietergruppen" #: extras/forms/filtersets.py:454 extras/forms/filtersets.py:492 @@ -9753,7 +9753,7 @@ msgid "Regex" msgstr "Regex" #: netbox/forms/__init__.py:34 -msgid "Object type(s)" +msgid "Object Type(s)" msgstr "Objekttyp (en)" #: netbox/forms/base.py:88 @@ -13184,7 +13184,7 @@ msgid "Parent tenant group (slug)" msgstr "Übergeordnete Mietergruppe (Slug)" #: tenancy/filtersets.py:182 tenancy/filtersets.py:202 -msgid "Tenant group (ID)" +msgid "Tenant Group (ID)" msgstr "Mandantengruppe (ID)" #: tenancy/filtersets.py:235 @@ -13691,7 +13691,7 @@ msgstr "" "Objekte gefunden" #: utilities/forms/fields/csv.py:97 -msgid "Object type must be specified as \".\"" +msgid "Object Type must be specified as \".\"" msgstr "Der Objekttyp muss als“ angegeben werden.“" #: utilities/forms/fields/csv.py:101 @@ -13967,11 +13967,11 @@ msgstr "" "definieren" #: virtualization/filtersets.py:79 -msgid "Parent group (ID)" +msgid "Parent Group (ID)" msgstr "Übergeordnete Gruppe (ID)" #: virtualization/filtersets.py:85 -msgid "Parent group (slug)" +msgid "Parent Group (slug)" msgstr "Elterngruppe (Schnecke)" #: virtualization/filtersets.py:89 virtualization/filtersets.py:141 diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index 83c690869..d127d07b1 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -120,7 +120,7 @@ msgstr "" #: dcim/filtersets.py:2078 dcim/filtersets.py:2136 ipam/filtersets.py:352 #: ipam/filtersets.py:958 virtualization/filtersets.py:58 #: virtualization/filtersets.py:186 -msgid "Site group (ID)" +msgid "Site Group (ID)" msgstr "" #: circuits/filtersets.py:49 circuits/filtersets.py:216 dcim/filtersets.py:134 @@ -129,7 +129,7 @@ msgstr "" #: dcim/filtersets.py:2085 dcim/filtersets.py:2143 extras/filtersets.py:467 #: ipam/filtersets.py:359 ipam/filtersets.py:965 #: virtualization/filtersets.py:65 virtualization/filtersets.py:193 -msgid "Site group (slug)" +msgid "Site Group (slug)" msgstr "" #: circuits/filtersets.py:54 circuits/forms/bulk_import.py:116 @@ -740,7 +740,7 @@ msgstr "" #: virtualization/forms/bulk_edit.py:86 virtualization/forms/filtersets.py:69 #: virtualization/forms/filtersets.py:138 #: virtualization/forms/model_forms.py:98 -msgid "Site group" +msgid "Site Group" msgstr "" #: circuits/forms/filtersets.py:62 circuits/forms/filtersets.py:80 @@ -2733,7 +2733,7 @@ msgstr "" #: dcim/forms/bulk_edit.py:277 dcim/forms/filtersets.py:307 #: dcim/forms/filtersets.py:741 dcim/forms/filtersets.py:878 #: dcim/forms/filtersets.py:1430 -msgid "Asset tag" +msgid "Asset Tag" msgstr "" #: dcim/forms/bulk_edit.py:287 dcim/forms/bulk_import.py:220 @@ -2787,7 +2787,7 @@ msgid "Weight" msgstr "" #: dcim/forms/bulk_edit.py:326 dcim/forms/filtersets.py:317 -msgid "Max weight" +msgid "Max Weight" msgstr "" #: dcim/forms/bulk_edit.py:331 dcim/forms/bulk_edit.py:441 @@ -2795,7 +2795,7 @@ msgstr "" #: dcim/forms/bulk_import.py:337 dcim/forms/bulk_import.py:363 #: dcim/forms/filtersets.py:322 dcim/forms/filtersets.py:533 #: dcim/forms/filtersets.py:608 -msgid "Weight unit" +msgid "Weight Unit" msgstr "" #: dcim/forms/bulk_edit.py:345 dcim/forms/bulk_edit.py:808 @@ -3713,7 +3713,7 @@ msgstr "" #: tenancy/forms/bulk_import.py:62 tenancy/forms/filtersets.py:33 #: tenancy/forms/filtersets.py:62 wireless/forms/bulk_import.py:25 #: wireless/forms/filtersets.py:25 -msgid "Parent group" +msgid "Parent Group" msgstr "" #: dcim/forms/filtersets.py:247 dcim/forms/filtersets.py:332 @@ -6307,11 +6307,11 @@ msgid "Cluster group (slug)" msgstr "" #: extras/filtersets.py:553 tenancy/forms/forms.py:16 tenancy/forms/forms.py:39 -msgid "Tenant group" +msgid "Tenant Group" msgstr "" #: extras/filtersets.py:559 tenancy/filtersets.py:189 tenancy/filtersets.py:209 -msgid "Tenant group (slug)" +msgid "Tenant Group (slug)" msgstr "" #: extras/filtersets.py:575 extras/forms/model_forms.py:371 @@ -6434,7 +6434,7 @@ msgstr "" #: extras/forms/model_forms.py:131 extras/forms/model_forms.py:163 #: extras/forms/model_forms.py:204 extras/forms/model_forms.py:261 #: extras/forms/model_forms.py:365 users/forms/model_forms.py:273 -msgid "Object types" +msgid "Object Types" msgstr "" #: extras/forms/bulk_import.py:36 extras/forms/bulk_import.py:117 @@ -6450,11 +6450,11 @@ msgstr "" #: extras/forms/bulk_import.py:44 extras/forms/filtersets.py:186 #: extras/forms/filtersets.py:260 extras/forms/model_forms.py:230 #: tenancy/forms/filtersets.py:92 -msgid "Object type" +msgid "Object Type" msgstr "" #: extras/forms/bulk_import.py:47 -msgid "Object type (for object or multi-object fields)" +msgid "Object Type (for object or multi-object fields)" msgstr "" #: extras/forms/bulk_import.py:50 extras/forms/filtersets.py:74 @@ -6594,7 +6594,7 @@ msgid "Regions" msgstr "" #: extras/forms/filtersets.py:355 extras/forms/model_forms.py:388 -msgid "Site groups" +msgid "Site Groups" msgstr "" #: extras/forms/filtersets.py:365 extras/forms/model_forms.py:398 @@ -6626,7 +6626,7 @@ msgid "Clusters" msgstr "" #: extras/forms/filtersets.py:400 extras/forms/model_forms.py:433 -msgid "Tenant groups" +msgid "Tenant Groups" msgstr "" #: extras/forms/filtersets.py:454 extras/forms/filtersets.py:492 @@ -9345,7 +9345,7 @@ msgid "Regex" msgstr "" #: netbox/forms/__init__.py:34 -msgid "Object type(s)" +msgid "Object Type(s)" msgstr "" #: netbox/forms/base.py:88 @@ -12680,7 +12680,7 @@ msgid "Parent tenant group (slug)" msgstr "" #: tenancy/filtersets.py:182 tenancy/filtersets.py:202 -msgid "Tenant group (ID)" +msgid "Tenant Group (ID)" msgstr "" #: tenancy/filtersets.py:235 @@ -13140,7 +13140,7 @@ msgid "" msgstr "" #: utilities/forms/fields/csv.py:97 -msgid "Object type must be specified as \".\"" +msgid "Object Type must be specified as \".\"" msgstr "" #: utilities/forms/fields/csv.py:101 @@ -13386,11 +13386,11 @@ msgid "" msgstr "" #: virtualization/filtersets.py:79 -msgid "Parent group (ID)" +msgid "Parent Group (ID)" msgstr "" #: virtualization/filtersets.py:85 -msgid "Parent group (slug)" +msgid "Parent Group (slug)" msgstr "" #: virtualization/filtersets.py:89 virtualization/filtersets.py:141 diff --git a/netbox/translations/es/LC_MESSAGES/django.po b/netbox/translations/es/LC_MESSAGES/django.po index 4db765e3c..ac67887ec 100644 --- a/netbox/translations/es/LC_MESSAGES/django.po +++ b/netbox/translations/es/LC_MESSAGES/django.po @@ -2,10 +2,10 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# # Translators: # Jeremy Stretch, 2024 -# +# #, fuzzy msgid "" msgstr "" @@ -125,7 +125,7 @@ msgstr "Región (slug)" #: dcim/filtersets.py:2078 dcim/filtersets.py:2136 ipam/filtersets.py:352 #: ipam/filtersets.py:958 virtualization/filtersets.py:58 #: virtualization/filtersets.py:186 -msgid "Site group (ID)" +msgid "Site Group (ID)" msgstr "Grupo de sitios (ID)" #: circuits/filtersets.py:49 circuits/filtersets.py:216 dcim/filtersets.py:134 @@ -134,7 +134,7 @@ msgstr "Grupo de sitios (ID)" #: dcim/filtersets.py:2085 dcim/filtersets.py:2143 extras/filtersets.py:467 #: ipam/filtersets.py:359 ipam/filtersets.py:965 #: virtualization/filtersets.py:65 virtualization/filtersets.py:193 -msgid "Site group (slug)" +msgid "Site Group (slug)" msgstr "Grupo de sitios (slug)" #: circuits/filtersets.py:54 circuits/forms/bulk_import.py:116 @@ -761,7 +761,7 @@ msgstr "Región" #: virtualization/forms/bulk_edit.py:86 virtualization/forms/filtersets.py:69 #: virtualization/forms/filtersets.py:138 #: virtualization/forms/model_forms.py:98 -msgid "Site group" +msgid "Site Group" msgstr "Grupo de sitios" #: circuits/forms/filtersets.py:62 circuits/forms/filtersets.py:80 @@ -2779,7 +2779,7 @@ msgstr "Número de serie" #: dcim/forms/bulk_edit.py:277 dcim/forms/filtersets.py:307 #: dcim/forms/filtersets.py:741 dcim/forms/filtersets.py:878 #: dcim/forms/filtersets.py:1430 -msgid "Asset tag" +msgid "Asset Tag" msgstr "Etiqueta de activo" #: dcim/forms/bulk_edit.py:287 dcim/forms/bulk_import.py:220 @@ -2833,7 +2833,7 @@ msgid "Weight" msgstr "Peso" #: dcim/forms/bulk_edit.py:326 dcim/forms/filtersets.py:317 -msgid "Max weight" +msgid "Max Weight" msgstr "Peso máximo" #: dcim/forms/bulk_edit.py:331 dcim/forms/bulk_edit.py:441 @@ -2841,7 +2841,7 @@ msgstr "Peso máximo" #: dcim/forms/bulk_import.py:337 dcim/forms/bulk_import.py:363 #: dcim/forms/filtersets.py:322 dcim/forms/filtersets.py:533 #: dcim/forms/filtersets.py:608 -msgid "Weight unit" +msgid "Weight Unit" msgstr "Unidad de peso" #: dcim/forms/bulk_edit.py:345 dcim/forms/bulk_edit.py:808 @@ -3775,7 +3775,7 @@ msgstr "Región principal" #: tenancy/forms/bulk_import.py:62 tenancy/forms/filtersets.py:33 #: tenancy/forms/filtersets.py:62 wireless/forms/bulk_import.py:25 #: wireless/forms/filtersets.py:25 -msgid "Parent group" +msgid "Parent Group" msgstr "Grupo de padres" #: dcim/forms/filtersets.py:247 dcim/forms/filtersets.py:332 @@ -6519,12 +6519,12 @@ msgstr "Grupo de racimos (babosa)" #: extras/filtersets.py:553 tenancy/forms/forms.py:16 #: tenancy/forms/forms.py:39 -msgid "Tenant group" +msgid "Tenant Group" msgstr "Grupo de inquilinos" #: extras/filtersets.py:559 tenancy/filtersets.py:189 #: tenancy/filtersets.py:209 -msgid "Tenant group (slug)" +msgid "Tenant Group (slug)" msgstr "Grupo de inquilinos (slug)" #: extras/filtersets.py:575 extras/forms/model_forms.py:371 @@ -6647,7 +6647,7 @@ msgstr "Está activo" #: extras/forms/model_forms.py:131 extras/forms/model_forms.py:163 #: extras/forms/model_forms.py:204 extras/forms/model_forms.py:261 #: extras/forms/model_forms.py:365 users/forms/model_forms.py:273 -msgid "Object types" +msgid "Object Types" msgstr "Tipos de objetos" #: extras/forms/bulk_import.py:36 extras/forms/bulk_import.py:117 @@ -6663,11 +6663,11 @@ msgstr "Tipo de datos de campo (por ejemplo, texto, entero, etc.)" #: extras/forms/bulk_import.py:44 extras/forms/filtersets.py:186 #: extras/forms/filtersets.py:260 extras/forms/model_forms.py:230 #: tenancy/forms/filtersets.py:92 -msgid "Object type" +msgid "Object Type" msgstr "Tipo de objeto" #: extras/forms/bulk_import.py:47 -msgid "Object type (for object or multi-object fields)" +msgid "Object Type (for object or multi-object fields)" msgstr "Tipo de objeto (para campos de objetos o de varios objetos)" #: extras/forms/bulk_import.py:50 extras/forms/filtersets.py:74 @@ -6812,7 +6812,7 @@ msgid "Regions" msgstr "Regiones" #: extras/forms/filtersets.py:355 extras/forms/model_forms.py:388 -msgid "Site groups" +msgid "Site Groups" msgstr "Grupos de sitios" #: extras/forms/filtersets.py:365 extras/forms/model_forms.py:398 @@ -6844,7 +6844,7 @@ msgid "Clusters" msgstr "Clústers" #: extras/forms/filtersets.py:400 extras/forms/model_forms.py:433 -msgid "Tenant groups" +msgid "Tenant Groups" msgstr "Grupos de inquilinos" #: extras/forms/filtersets.py:454 extras/forms/filtersets.py:492 @@ -9708,7 +9708,7 @@ msgid "Regex" msgstr "Regex" #: netbox/forms/__init__.py:34 -msgid "Object type(s)" +msgid "Object Type(s)" msgstr "Tipo(s) de objeto(s)" #: netbox/forms/base.py:88 @@ -13131,7 +13131,7 @@ msgid "Parent tenant group (slug)" msgstr "Grupo de padres e inquilinos (slug)" #: tenancy/filtersets.py:182 tenancy/filtersets.py:202 -msgid "Tenant group (ID)" +msgid "Tenant Group (ID)" msgstr "Grupo de inquilinos (ID)" #: tenancy/filtersets.py:235 @@ -13636,7 +13636,7 @@ msgstr "" "objetos" #: utilities/forms/fields/csv.py:97 -msgid "Object type must be specified as \".\"" +msgid "Object Type must be specified as \".\"" msgstr "El tipo de objeto debe especificarse como».»" #: utilities/forms/fields/csv.py:101 @@ -13911,11 +13911,11 @@ msgstr "" "conjunto de consultas base" #: virtualization/filtersets.py:79 -msgid "Parent group (ID)" +msgid "Parent Group (ID)" msgstr "Grupo de padres (ID)" #: virtualization/filtersets.py:85 -msgid "Parent group (slug)" +msgid "Parent Group (slug)" msgstr "Grupo de padres (babosas)" #: virtualization/filtersets.py:89 virtualization/filtersets.py:141 diff --git a/netbox/translations/fr/LC_MESSAGES/django.po b/netbox/translations/fr/LC_MESSAGES/django.po index 75b5c4e56..1f23797e9 100644 --- a/netbox/translations/fr/LC_MESSAGES/django.po +++ b/netbox/translations/fr/LC_MESSAGES/django.po @@ -2,13 +2,13 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# # Translators: # Jonathan Senecal, 2024 # Quentin Laurent, 2024 # Xavier W, 2024 # Jeremy Stretch, 2024 -# +# #, fuzzy msgid "" msgstr "" @@ -128,7 +128,7 @@ msgstr "Région (slug)" #: dcim/filtersets.py:2078 dcim/filtersets.py:2136 ipam/filtersets.py:352 #: ipam/filtersets.py:958 virtualization/filtersets.py:58 #: virtualization/filtersets.py:186 -msgid "Site group (ID)" +msgid "Site Group (ID)" msgstr "Groupe de sites (ID)" #: circuits/filtersets.py:49 circuits/filtersets.py:216 dcim/filtersets.py:134 @@ -137,7 +137,7 @@ msgstr "Groupe de sites (ID)" #: dcim/filtersets.py:2085 dcim/filtersets.py:2143 extras/filtersets.py:467 #: ipam/filtersets.py:359 ipam/filtersets.py:965 #: virtualization/filtersets.py:65 virtualization/filtersets.py:193 -msgid "Site group (slug)" +msgid "Site Group (slug)" msgstr "Groupe de sites (slug)" #: circuits/filtersets.py:54 circuits/forms/bulk_import.py:116 @@ -764,7 +764,7 @@ msgstr "Région" #: virtualization/forms/bulk_edit.py:86 virtualization/forms/filtersets.py:69 #: virtualization/forms/filtersets.py:138 #: virtualization/forms/model_forms.py:98 -msgid "Site group" +msgid "Site Group" msgstr "Groupe de sites" #: circuits/forms/filtersets.py:62 circuits/forms/filtersets.py:80 @@ -2787,7 +2787,7 @@ msgstr "Numéro de série" #: dcim/forms/bulk_edit.py:277 dcim/forms/filtersets.py:307 #: dcim/forms/filtersets.py:741 dcim/forms/filtersets.py:878 #: dcim/forms/filtersets.py:1430 -msgid "Asset tag" +msgid "Asset Tag" msgstr "Étiquette d'actif" #: dcim/forms/bulk_edit.py:287 dcim/forms/bulk_import.py:220 @@ -2841,7 +2841,7 @@ msgid "Weight" msgstr "Poids" #: dcim/forms/bulk_edit.py:326 dcim/forms/filtersets.py:317 -msgid "Max weight" +msgid "Max Weight" msgstr "Poids maximum" #: dcim/forms/bulk_edit.py:331 dcim/forms/bulk_edit.py:441 @@ -2849,7 +2849,7 @@ msgstr "Poids maximum" #: dcim/forms/bulk_import.py:337 dcim/forms/bulk_import.py:363 #: dcim/forms/filtersets.py:322 dcim/forms/filtersets.py:533 #: dcim/forms/filtersets.py:608 -msgid "Weight unit" +msgid "Weight Unit" msgstr "Unité de poids" #: dcim/forms/bulk_edit.py:345 dcim/forms/bulk_edit.py:808 @@ -3783,7 +3783,7 @@ msgstr "Région parente" #: tenancy/forms/bulk_import.py:62 tenancy/forms/filtersets.py:33 #: tenancy/forms/filtersets.py:62 wireless/forms/bulk_import.py:25 #: wireless/forms/filtersets.py:25 -msgid "Parent group" +msgid "Parent Group" msgstr "Groupe de parents" #: dcim/forms/filtersets.py:247 dcim/forms/filtersets.py:332 @@ -6529,12 +6529,12 @@ msgstr "Groupe de clusters (slug)" #: extras/filtersets.py:553 tenancy/forms/forms.py:16 #: tenancy/forms/forms.py:39 -msgid "Tenant group" +msgid "Tenant Group" msgstr "Groupe de locataires" #: extras/filtersets.py:559 tenancy/filtersets.py:189 #: tenancy/filtersets.py:209 -msgid "Tenant group (slug)" +msgid "Tenant Group (slug)" msgstr "Groupe de locataires (slug)" #: extras/filtersets.py:575 extras/forms/model_forms.py:371 @@ -6657,7 +6657,7 @@ msgstr "Est actif" #: extras/forms/model_forms.py:131 extras/forms/model_forms.py:163 #: extras/forms/model_forms.py:204 extras/forms/model_forms.py:261 #: extras/forms/model_forms.py:365 users/forms/model_forms.py:273 -msgid "Object types" +msgid "Object Types" msgstr "Types d'objets" #: extras/forms/bulk_import.py:36 extras/forms/bulk_import.py:117 @@ -6673,11 +6673,11 @@ msgstr "Type de données de champ (par exemple texte, entier, etc.)" #: extras/forms/bulk_import.py:44 extras/forms/filtersets.py:186 #: extras/forms/filtersets.py:260 extras/forms/model_forms.py:230 #: tenancy/forms/filtersets.py:92 -msgid "Object type" +msgid "Object Type" msgstr "Type d'objet" #: extras/forms/bulk_import.py:47 -msgid "Object type (for object or multi-object fields)" +msgid "Object Type (for object or multi-object fields)" msgstr "Type d'objet (pour les champs d'objets ou multi-objets)" #: extras/forms/bulk_import.py:50 extras/forms/filtersets.py:74 @@ -6821,7 +6821,7 @@ msgid "Regions" msgstr "Régions" #: extras/forms/filtersets.py:355 extras/forms/model_forms.py:388 -msgid "Site groups" +msgid "Site Groups" msgstr "Groupes de sites" #: extras/forms/filtersets.py:365 extras/forms/model_forms.py:398 @@ -6853,7 +6853,7 @@ msgid "Clusters" msgstr "Clusters" #: extras/forms/filtersets.py:400 extras/forms/model_forms.py:433 -msgid "Tenant groups" +msgid "Tenant Groups" msgstr "Groupes de locataires" #: extras/forms/filtersets.py:454 extras/forms/filtersets.py:492 @@ -9738,7 +9738,7 @@ msgid "Regex" msgstr "Regex" #: netbox/forms/__init__.py:34 -msgid "Object type(s)" +msgid "Object Type(s)" msgstr "Type (s) d'objet" #: netbox/forms/base.py:88 @@ -13170,7 +13170,7 @@ msgid "Parent tenant group (slug)" msgstr "Groupe de parents locataires (slug)" #: tenancy/filtersets.py:182 tenancy/filtersets.py:202 -msgid "Tenant group (ID)" +msgid "Tenant Group (ID)" msgstr "Groupe de locataires (ID)" #: tenancy/filtersets.py:235 @@ -13673,7 +13673,7 @@ msgstr "" "été trouvés" #: utilities/forms/fields/csv.py:97 -msgid "Object type must be specified as \".\"" +msgid "Object Type must be specified as \".\"" msgstr "Le type d'objet doit être spécifié comme ».«" #: utilities/forms/fields/csv.py:101 @@ -13948,11 +13948,11 @@ msgstr "" "définissent un ensemble de requêtes de base" #: virtualization/filtersets.py:79 -msgid "Parent group (ID)" +msgid "Parent Group (ID)" msgstr "Groupe de parents (ID)" #: virtualization/filtersets.py:85 -msgid "Parent group (slug)" +msgid "Parent Group (slug)" msgstr "Groupe de parents (limace)" #: virtualization/filtersets.py:89 virtualization/filtersets.py:141 diff --git a/netbox/translations/ja/LC_MESSAGES/django.po b/netbox/translations/ja/LC_MESSAGES/django.po index d64b88911..e9a05b303 100644 --- a/netbox/translations/ja/LC_MESSAGES/django.po +++ b/netbox/translations/ja/LC_MESSAGES/django.po @@ -2,12 +2,12 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# # Translators: # Tatsuya Ueda , 2024 # Jeremy Stretch, 2024 # teapot, 2024 -# +# #, fuzzy msgid "" msgstr "" @@ -127,7 +127,7 @@ msgstr "リージョン (slug)" #: dcim/filtersets.py:2078 dcim/filtersets.py:2136 ipam/filtersets.py:352 #: ipam/filtersets.py:958 virtualization/filtersets.py:58 #: virtualization/filtersets.py:186 -msgid "Site group (ID)" +msgid "Site Group (ID)" msgstr "サイトグループ (ID)" #: circuits/filtersets.py:49 circuits/filtersets.py:216 dcim/filtersets.py:134 @@ -136,7 +136,7 @@ msgstr "サイトグループ (ID)" #: dcim/filtersets.py:2085 dcim/filtersets.py:2143 extras/filtersets.py:467 #: ipam/filtersets.py:359 ipam/filtersets.py:965 #: virtualization/filtersets.py:65 virtualization/filtersets.py:193 -msgid "Site group (slug)" +msgid "Site Group (slug)" msgstr "サイトグループ (slug)" #: circuits/filtersets.py:54 circuits/forms/bulk_import.py:116 @@ -763,7 +763,7 @@ msgstr "リージョン" #: virtualization/forms/bulk_edit.py:86 virtualization/forms/filtersets.py:69 #: virtualization/forms/filtersets.py:138 #: virtualization/forms/model_forms.py:98 -msgid "Site group" +msgid "Site Group" msgstr "サイトグループ" #: circuits/forms/filtersets.py:62 circuits/forms/filtersets.py:80 @@ -2766,7 +2766,7 @@ msgstr "シリアル番号" #: dcim/forms/bulk_edit.py:277 dcim/forms/filtersets.py:307 #: dcim/forms/filtersets.py:741 dcim/forms/filtersets.py:878 #: dcim/forms/filtersets.py:1430 -msgid "Asset tag" +msgid "Asset Tag" msgstr "アセットタグ" #: dcim/forms/bulk_edit.py:287 dcim/forms/bulk_import.py:220 @@ -2820,7 +2820,7 @@ msgid "Weight" msgstr "重量" #: dcim/forms/bulk_edit.py:326 dcim/forms/filtersets.py:317 -msgid "Max weight" +msgid "Max Weight" msgstr "最大重量" #: dcim/forms/bulk_edit.py:331 dcim/forms/bulk_edit.py:441 @@ -2828,7 +2828,7 @@ msgstr "最大重量" #: dcim/forms/bulk_import.py:337 dcim/forms/bulk_import.py:363 #: dcim/forms/filtersets.py:322 dcim/forms/filtersets.py:533 #: dcim/forms/filtersets.py:608 -msgid "Weight unit" +msgid "Weight Unit" msgstr "重量単位" #: dcim/forms/bulk_edit.py:345 dcim/forms/bulk_edit.py:808 @@ -3751,7 +3751,7 @@ msgstr "親リージョン" #: tenancy/forms/bulk_import.py:62 tenancy/forms/filtersets.py:33 #: tenancy/forms/filtersets.py:62 wireless/forms/bulk_import.py:25 #: wireless/forms/filtersets.py:25 -msgid "Parent group" +msgid "Parent Group" msgstr "親グループ" #: dcim/forms/filtersets.py:247 dcim/forms/filtersets.py:332 @@ -6369,12 +6369,12 @@ msgstr "クラスタグループ (slug)" #: extras/filtersets.py:553 tenancy/forms/forms.py:16 #: tenancy/forms/forms.py:39 -msgid "Tenant group" +msgid "Tenant Group" msgstr "テナントグループ" #: extras/filtersets.py:559 tenancy/filtersets.py:189 #: tenancy/filtersets.py:209 -msgid "Tenant group (slug)" +msgid "Tenant Group (slug)" msgstr "テナントグループ (slug)" #: extras/filtersets.py:575 extras/forms/model_forms.py:371 @@ -6497,7 +6497,7 @@ msgstr "有効" #: extras/forms/model_forms.py:131 extras/forms/model_forms.py:163 #: extras/forms/model_forms.py:204 extras/forms/model_forms.py:261 #: extras/forms/model_forms.py:365 users/forms/model_forms.py:273 -msgid "Object types" +msgid "Object Types" msgstr "オブジェクトタイプ" #: extras/forms/bulk_import.py:36 extras/forms/bulk_import.py:117 @@ -6513,11 +6513,11 @@ msgstr "フィールドデータタイプ (テキスト、整数など)" #: extras/forms/bulk_import.py:44 extras/forms/filtersets.py:186 #: extras/forms/filtersets.py:260 extras/forms/model_forms.py:230 #: tenancy/forms/filtersets.py:92 -msgid "Object type" +msgid "Object Type" msgstr "オブジェクトタイプ" #: extras/forms/bulk_import.py:47 -msgid "Object type (for object or multi-object fields)" +msgid "Object Type (for object or multi-object fields)" msgstr "オブジェクトタイプ (オブジェクトフィールドまたはマルチオブジェクトフィールド用)" #: extras/forms/bulk_import.py:50 extras/forms/filtersets.py:74 @@ -6659,7 +6659,7 @@ msgid "Regions" msgstr "リージョン" #: extras/forms/filtersets.py:355 extras/forms/model_forms.py:388 -msgid "Site groups" +msgid "Site Groups" msgstr "サイトグループ" #: extras/forms/filtersets.py:365 extras/forms/model_forms.py:398 @@ -6691,7 +6691,7 @@ msgid "Clusters" msgstr "クラスタ" #: extras/forms/filtersets.py:400 extras/forms/model_forms.py:433 -msgid "Tenant groups" +msgid "Tenant Groups" msgstr "テナントグループ" #: extras/forms/filtersets.py:454 extras/forms/filtersets.py:492 @@ -9437,7 +9437,7 @@ msgid "Regex" msgstr "正規表現" #: netbox/forms/__init__.py:34 -msgid "Object type(s)" +msgid "Object Type(s)" msgstr "オブジェクトタイプ" #: netbox/forms/base.py:88 @@ -12808,7 +12808,7 @@ msgid "Parent tenant group (slug)" msgstr "親テナントグループ (スラッグ)" #: tenancy/filtersets.py:182 tenancy/filtersets.py:202 -msgid "Tenant group (ID)" +msgid "Tenant Group (ID)" msgstr "テナントグループ (ID)" #: tenancy/filtersets.py:235 @@ -13283,7 +13283,7 @@ msgid "" msgstr "「{value}「」はこのフィールドにとって一意の値ではありません。複数のオブジェクトが見つかりました" #: utilities/forms/fields/csv.py:97 -msgid "Object type must be specified as \".\"" +msgid "Object Type must be specified as \".\"" msgstr "オブジェクトタイプは「」として指定する必要があります。」" #: utilities/forms/fields/csv.py:101 @@ -13536,11 +13536,11 @@ msgstr "" "は、基本クエリセットを定義するビューでのみ使用できます。" #: virtualization/filtersets.py:79 -msgid "Parent group (ID)" +msgid "Parent Group (ID)" msgstr "親グループ (ID)" #: virtualization/filtersets.py:85 -msgid "Parent group (slug)" +msgid "Parent Group (slug)" msgstr "親グループ (slug)" #: virtualization/filtersets.py:89 virtualization/filtersets.py:141 diff --git a/netbox/translations/pt/LC_MESSAGES/django.po b/netbox/translations/pt/LC_MESSAGES/django.po index ceeef2aa9..d11d8f06d 100644 --- a/netbox/translations/pt/LC_MESSAGES/django.po +++ b/netbox/translations/pt/LC_MESSAGES/django.po @@ -2,11 +2,11 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# # Translators: # Renato Almeida de Oliveira, 2024 # Jeremy Stretch, 2024 -# +# #, fuzzy msgid "" msgstr "" @@ -126,7 +126,7 @@ msgstr "Região (slug)" #: dcim/filtersets.py:2078 dcim/filtersets.py:2136 ipam/filtersets.py:352 #: ipam/filtersets.py:958 virtualization/filtersets.py:58 #: virtualization/filtersets.py:186 -msgid "Site group (ID)" +msgid "Site Group (ID)" msgstr "Grupo de sites (ID)" #: circuits/filtersets.py:49 circuits/filtersets.py:216 dcim/filtersets.py:134 @@ -135,7 +135,7 @@ msgstr "Grupo de sites (ID)" #: dcim/filtersets.py:2085 dcim/filtersets.py:2143 extras/filtersets.py:467 #: ipam/filtersets.py:359 ipam/filtersets.py:965 #: virtualization/filtersets.py:65 virtualization/filtersets.py:193 -msgid "Site group (slug)" +msgid "Site Group (slug)" msgstr "Grupo de sites (slug)" #: circuits/filtersets.py:54 circuits/forms/bulk_import.py:116 @@ -762,7 +762,7 @@ msgstr "Região" #: virtualization/forms/bulk_edit.py:86 virtualization/forms/filtersets.py:69 #: virtualization/forms/filtersets.py:138 #: virtualization/forms/model_forms.py:98 -msgid "Site group" +msgid "Site Group" msgstr "Grupo de sites" #: circuits/forms/filtersets.py:62 circuits/forms/filtersets.py:80 @@ -2781,7 +2781,7 @@ msgstr "Número de série" #: dcim/forms/bulk_edit.py:277 dcim/forms/filtersets.py:307 #: dcim/forms/filtersets.py:741 dcim/forms/filtersets.py:878 #: dcim/forms/filtersets.py:1430 -msgid "Asset tag" +msgid "Asset Tag" msgstr "Etiqueta de ativo" #: dcim/forms/bulk_edit.py:287 dcim/forms/bulk_import.py:220 @@ -2835,7 +2835,7 @@ msgid "Weight" msgstr "Peso" #: dcim/forms/bulk_edit.py:326 dcim/forms/filtersets.py:317 -msgid "Max weight" +msgid "Max Weight" msgstr "Peso máximo" #: dcim/forms/bulk_edit.py:331 dcim/forms/bulk_edit.py:441 @@ -2843,7 +2843,7 @@ msgstr "Peso máximo" #: dcim/forms/bulk_import.py:337 dcim/forms/bulk_import.py:363 #: dcim/forms/filtersets.py:322 dcim/forms/filtersets.py:533 #: dcim/forms/filtersets.py:608 -msgid "Weight unit" +msgid "Weight Unit" msgstr "Unidade de peso" #: dcim/forms/bulk_edit.py:345 dcim/forms/bulk_edit.py:808 @@ -3774,7 +3774,7 @@ msgstr "Região principal" #: tenancy/forms/bulk_import.py:62 tenancy/forms/filtersets.py:33 #: tenancy/forms/filtersets.py:62 wireless/forms/bulk_import.py:25 #: wireless/forms/filtersets.py:25 -msgid "Parent group" +msgid "Parent Group" msgstr "Grupo de pais" #: dcim/forms/filtersets.py:247 dcim/forms/filtersets.py:332 @@ -6504,12 +6504,12 @@ msgstr "Grupo de clusters (slug)" #: extras/filtersets.py:553 tenancy/forms/forms.py:16 #: tenancy/forms/forms.py:39 -msgid "Tenant group" +msgid "Tenant Group" msgstr "Grupo de inquilinos" #: extras/filtersets.py:559 tenancy/filtersets.py:189 #: tenancy/filtersets.py:209 -msgid "Tenant group (slug)" +msgid "Tenant Group (slug)" msgstr "Grupo de inquilinos (lesma)" #: extras/filtersets.py:575 extras/forms/model_forms.py:371 @@ -6632,7 +6632,7 @@ msgstr "Está ativo" #: extras/forms/model_forms.py:131 extras/forms/model_forms.py:163 #: extras/forms/model_forms.py:204 extras/forms/model_forms.py:261 #: extras/forms/model_forms.py:365 users/forms/model_forms.py:273 -msgid "Object types" +msgid "Object Types" msgstr "Tipos de objetos" #: extras/forms/bulk_import.py:36 extras/forms/bulk_import.py:117 @@ -6648,11 +6648,11 @@ msgstr "Tipo de dados de campo (por exemplo, texto, número inteiro etc.)" #: extras/forms/bulk_import.py:44 extras/forms/filtersets.py:186 #: extras/forms/filtersets.py:260 extras/forms/model_forms.py:230 #: tenancy/forms/filtersets.py:92 -msgid "Object type" +msgid "Object Type" msgstr "Tipo de objeto" #: extras/forms/bulk_import.py:47 -msgid "Object type (for object or multi-object fields)" +msgid "Object Type (for object or multi-object fields)" msgstr "Tipo de objeto (para campos de objeto ou de vários objetos)" #: extras/forms/bulk_import.py:50 extras/forms/filtersets.py:74 @@ -6796,7 +6796,7 @@ msgid "Regions" msgstr "Regiões" #: extras/forms/filtersets.py:355 extras/forms/model_forms.py:388 -msgid "Site groups" +msgid "Site Groups" msgstr "Grupos de sites" #: extras/forms/filtersets.py:365 extras/forms/model_forms.py:398 @@ -6828,7 +6828,7 @@ msgid "Clusters" msgstr "Clusters" #: extras/forms/filtersets.py:400 extras/forms/model_forms.py:433 -msgid "Tenant groups" +msgid "Tenant Groups" msgstr "Grupos de inquilinos" #: extras/forms/filtersets.py:454 extras/forms/filtersets.py:492 @@ -9676,7 +9676,7 @@ msgid "Regex" msgstr "Regex" #: netbox/forms/__init__.py:34 -msgid "Object type(s)" +msgid "Object Type(s)" msgstr "Tipo (s) de objeto" #: netbox/forms/base.py:88 @@ -13092,7 +13092,7 @@ msgid "Parent tenant group (slug)" msgstr "Grupo de pais e inquilinos (lesma)" #: tenancy/filtersets.py:182 tenancy/filtersets.py:202 -msgid "Tenant group (ID)" +msgid "Tenant Group (ID)" msgstr "Grupo de inquilinos (ID)" #: tenancy/filtersets.py:235 @@ -13588,7 +13588,7 @@ msgstr "" "encontrados" #: utilities/forms/fields/csv.py:97 -msgid "Object type must be specified as \".\"" +msgid "Object Type must be specified as \".\"" msgstr "O tipo de objeto deve ser especificado como”.“" #: utilities/forms/fields/csv.py:101 @@ -13860,11 +13860,11 @@ msgstr "" " um conjunto de consultas básico." #: virtualization/filtersets.py:79 -msgid "Parent group (ID)" +msgid "Parent Group (ID)" msgstr "Grupo de pais (ID)" #: virtualization/filtersets.py:85 -msgid "Parent group (slug)" +msgid "Parent Group (slug)" msgstr "Grupo de pais (lesma)" #: virtualization/filtersets.py:89 virtualization/filtersets.py:141 diff --git a/netbox/translations/ru/LC_MESSAGES/django.po b/netbox/translations/ru/LC_MESSAGES/django.po index 131d73467..f86226e85 100644 --- a/netbox/translations/ru/LC_MESSAGES/django.po +++ b/netbox/translations/ru/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# # Translators: # Vladyslav V. Prodan, 2024 # Madi Tuleu, 2024 @@ -13,7 +13,7 @@ # Artem Kotik, 2024 # Ivan Petrov, 2024 # Jeremy Stretch, 2024 -# +# #, fuzzy msgid "" msgstr "" @@ -133,7 +133,7 @@ msgstr "Регион (подстрока)" #: dcim/filtersets.py:2078 dcim/filtersets.py:2136 ipam/filtersets.py:352 #: ipam/filtersets.py:958 virtualization/filtersets.py:58 #: virtualization/filtersets.py:186 -msgid "Site group (ID)" +msgid "Site Group (ID)" msgstr "Группа сайтов (ID)" #: circuits/filtersets.py:49 circuits/filtersets.py:216 dcim/filtersets.py:134 @@ -142,7 +142,7 @@ msgstr "Группа сайтов (ID)" #: dcim/filtersets.py:2085 dcim/filtersets.py:2143 extras/filtersets.py:467 #: ipam/filtersets.py:359 ipam/filtersets.py:965 #: virtualization/filtersets.py:65 virtualization/filtersets.py:193 -msgid "Site group (slug)" +msgid "Site Group (slug)" msgstr "Группа сайтов (подстрока)" #: circuits/filtersets.py:54 circuits/forms/bulk_import.py:116 @@ -769,7 +769,7 @@ msgstr "Регион" #: virtualization/forms/bulk_edit.py:86 virtualization/forms/filtersets.py:69 #: virtualization/forms/filtersets.py:138 #: virtualization/forms/model_forms.py:98 -msgid "Site group" +msgid "Site Group" msgstr "Группа сайтов" #: circuits/forms/filtersets.py:62 circuits/forms/filtersets.py:80 @@ -2786,7 +2786,7 @@ msgstr "Серийный номер" #: dcim/forms/bulk_edit.py:277 dcim/forms/filtersets.py:307 #: dcim/forms/filtersets.py:741 dcim/forms/filtersets.py:878 #: dcim/forms/filtersets.py:1430 -msgid "Asset tag" +msgid "Asset Tag" msgstr "Инвентарный номер" #: dcim/forms/bulk_edit.py:287 dcim/forms/bulk_import.py:220 @@ -2840,7 +2840,7 @@ msgid "Weight" msgstr "Вес" #: dcim/forms/bulk_edit.py:326 dcim/forms/filtersets.py:317 -msgid "Max weight" +msgid "Max Weight" msgstr "Максимальный вес" #: dcim/forms/bulk_edit.py:331 dcim/forms/bulk_edit.py:441 @@ -2848,7 +2848,7 @@ msgstr "Максимальный вес" #: dcim/forms/bulk_import.py:337 dcim/forms/bulk_import.py:363 #: dcim/forms/filtersets.py:322 dcim/forms/filtersets.py:533 #: dcim/forms/filtersets.py:608 -msgid "Weight unit" +msgid "Weight Unit" msgstr "Весовая единица" #: dcim/forms/bulk_edit.py:345 dcim/forms/bulk_edit.py:808 @@ -3781,7 +3781,7 @@ msgstr "Родительский регион" #: tenancy/forms/bulk_import.py:62 tenancy/forms/filtersets.py:33 #: tenancy/forms/filtersets.py:62 wireless/forms/bulk_import.py:25 #: wireless/forms/filtersets.py:25 -msgid "Parent group" +msgid "Parent Group" msgstr "Родительская группа" #: dcim/forms/filtersets.py:247 dcim/forms/filtersets.py:332 @@ -6503,12 +6503,12 @@ msgstr "Группа кластеров (подстрока)" #: extras/filtersets.py:553 tenancy/forms/forms.py:16 #: tenancy/forms/forms.py:39 -msgid "Tenant group" +msgid "Tenant Group" msgstr "Группа тенантов" #: extras/filtersets.py:559 tenancy/filtersets.py:189 #: tenancy/filtersets.py:209 -msgid "Tenant group (slug)" +msgid "Tenant Group (slug)" msgstr "Группа тенантов (подстрока)" #: extras/filtersets.py:575 extras/forms/model_forms.py:371 @@ -6631,7 +6631,7 @@ msgstr "Активен" #: extras/forms/model_forms.py:131 extras/forms/model_forms.py:163 #: extras/forms/model_forms.py:204 extras/forms/model_forms.py:261 #: extras/forms/model_forms.py:365 users/forms/model_forms.py:273 -msgid "Object types" +msgid "Object Types" msgstr "Типы объектов" #: extras/forms/bulk_import.py:36 extras/forms/bulk_import.py:117 @@ -6647,11 +6647,11 @@ msgstr "Тип данных поля (например, текст, целое #: extras/forms/bulk_import.py:44 extras/forms/filtersets.py:186 #: extras/forms/filtersets.py:260 extras/forms/model_forms.py:230 #: tenancy/forms/filtersets.py:92 -msgid "Object type" +msgid "Object Type" msgstr "Тип объекта" #: extras/forms/bulk_import.py:47 -msgid "Object type (for object or multi-object fields)" +msgid "Object Type (for object or multi-object fields)" msgstr "" "Тип объекта (для полей объектов или полей, состоящих из нескольких объектов)" @@ -6798,7 +6798,7 @@ msgid "Regions" msgstr "Регионы" #: extras/forms/filtersets.py:355 extras/forms/model_forms.py:388 -msgid "Site groups" +msgid "Site Groups" msgstr "Группы сайтов" #: extras/forms/filtersets.py:365 extras/forms/model_forms.py:398 @@ -6830,7 +6830,7 @@ msgid "Clusters" msgstr "Кластеры" #: extras/forms/filtersets.py:400 extras/forms/model_forms.py:433 -msgid "Tenant groups" +msgid "Tenant Groups" msgstr "Группы тенантов" #: extras/forms/filtersets.py:454 extras/forms/filtersets.py:492 @@ -9666,7 +9666,7 @@ msgid "Regex" msgstr "Regex" #: netbox/forms/__init__.py:34 -msgid "Object type(s)" +msgid "Object Type(s)" msgstr "Тип (ы) объекта" #: netbox/forms/base.py:88 @@ -13083,7 +13083,7 @@ msgid "Parent tenant group (slug)" msgstr "Родительская группа арендаторов (короткая метка)" #: tenancy/filtersets.py:182 tenancy/filtersets.py:202 -msgid "Tenant group (ID)" +msgid "Tenant Group (ID)" msgstr "Группа тенантов (ID)" #: tenancy/filtersets.py:235 @@ -13581,7 +13581,7 @@ msgstr "" " объектов" #: utilities/forms/fields/csv.py:97 -msgid "Object type must be specified as \".\"" +msgid "Object Type must be specified as \".\"" msgstr "Тип объекта должен быть указан как».»" #: utilities/forms/fields/csv.py:101 @@ -13854,11 +13854,11 @@ msgstr "" "определяющих базовый набор запросов" #: virtualization/filtersets.py:79 -msgid "Parent group (ID)" +msgid "Parent Group (ID)" msgstr "Родительская группа (ID)" #: virtualization/filtersets.py:85 -msgid "Parent group (slug)" +msgid "Parent Group (slug)" msgstr "Родительская группа (подстрока)" #: virtualization/filtersets.py:89 virtualization/filtersets.py:141 diff --git a/netbox/translations/tr/LC_MESSAGES/django.po b/netbox/translations/tr/LC_MESSAGES/django.po index ee0317364..eaacfdf55 100644 --- a/netbox/translations/tr/LC_MESSAGES/django.po +++ b/netbox/translations/tr/LC_MESSAGES/django.po @@ -2,11 +2,11 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# # Translators: # Burak Senturk, 2024 # Jeremy Stretch, 2024 -# +# #, fuzzy msgid "" msgstr "" @@ -126,7 +126,7 @@ msgstr "Bölge (kısa ad)" #: dcim/filtersets.py:2078 dcim/filtersets.py:2136 ipam/filtersets.py:352 #: ipam/filtersets.py:958 virtualization/filtersets.py:58 #: virtualization/filtersets.py:186 -msgid "Site group (ID)" +msgid "Site Group (ID)" msgstr "Site grubu (ID)" #: circuits/filtersets.py:49 circuits/filtersets.py:216 dcim/filtersets.py:134 @@ -135,7 +135,7 @@ msgstr "Site grubu (ID)" #: dcim/filtersets.py:2085 dcim/filtersets.py:2143 extras/filtersets.py:467 #: ipam/filtersets.py:359 ipam/filtersets.py:965 #: virtualization/filtersets.py:65 virtualization/filtersets.py:193 -msgid "Site group (slug)" +msgid "Site Group (slug)" msgstr "Site grubu (kısa ad)" #: circuits/filtersets.py:54 circuits/forms/bulk_import.py:116 @@ -762,7 +762,7 @@ msgstr "Bölge" #: virtualization/forms/bulk_edit.py:86 virtualization/forms/filtersets.py:69 #: virtualization/forms/filtersets.py:138 #: virtualization/forms/model_forms.py:98 -msgid "Site group" +msgid "Site Group" msgstr "Site grubu" #: circuits/forms/filtersets.py:62 circuits/forms/filtersets.py:80 @@ -2775,7 +2775,7 @@ msgstr "Seri Numarası" #: dcim/forms/bulk_edit.py:277 dcim/forms/filtersets.py:307 #: dcim/forms/filtersets.py:741 dcim/forms/filtersets.py:878 #: dcim/forms/filtersets.py:1430 -msgid "Asset tag" +msgid "Asset Tag" msgstr "Varlık etiketi" #: dcim/forms/bulk_edit.py:287 dcim/forms/bulk_import.py:220 @@ -2829,7 +2829,7 @@ msgid "Weight" msgstr "Ağırlığı" #: dcim/forms/bulk_edit.py:326 dcim/forms/filtersets.py:317 -msgid "Max weight" +msgid "Max Weight" msgstr "Maksimum ağırlık" #: dcim/forms/bulk_edit.py:331 dcim/forms/bulk_edit.py:441 @@ -2837,7 +2837,7 @@ msgstr "Maksimum ağırlık" #: dcim/forms/bulk_import.py:337 dcim/forms/bulk_import.py:363 #: dcim/forms/filtersets.py:322 dcim/forms/filtersets.py:533 #: dcim/forms/filtersets.py:608 -msgid "Weight unit" +msgid "Weight Unit" msgstr "Ağırlık birimi" #: dcim/forms/bulk_edit.py:345 dcim/forms/bulk_edit.py:808 @@ -3768,7 +3768,7 @@ msgstr "Ana bölge" #: tenancy/forms/bulk_import.py:62 tenancy/forms/filtersets.py:33 #: tenancy/forms/filtersets.py:62 wireless/forms/bulk_import.py:25 #: wireless/forms/filtersets.py:25 -msgid "Parent group" +msgid "Parent Group" msgstr "Ebeveyn grubu" #: dcim/forms/filtersets.py:247 dcim/forms/filtersets.py:332 @@ -6442,12 +6442,12 @@ msgstr "Küme grubu (kısa ad)" #: extras/filtersets.py:553 tenancy/forms/forms.py:16 #: tenancy/forms/forms.py:39 -msgid "Tenant group" +msgid "Tenant Group" msgstr "Kiracı grubu" #: extras/filtersets.py:559 tenancy/filtersets.py:189 #: tenancy/filtersets.py:209 -msgid "Tenant group (slug)" +msgid "Tenant Group (slug)" msgstr "Kiracı grubu (kısa ad)" #: extras/filtersets.py:575 extras/forms/model_forms.py:371 @@ -6570,7 +6570,7 @@ msgstr "Aktif" #: extras/forms/model_forms.py:131 extras/forms/model_forms.py:163 #: extras/forms/model_forms.py:204 extras/forms/model_forms.py:261 #: extras/forms/model_forms.py:365 users/forms/model_forms.py:273 -msgid "Object types" +msgid "Object Types" msgstr "Nesne türleri" #: extras/forms/bulk_import.py:36 extras/forms/bulk_import.py:117 @@ -6586,11 +6586,11 @@ msgstr "Alan veri türü (örn. Metin, tamsayı vb.)" #: extras/forms/bulk_import.py:44 extras/forms/filtersets.py:186 #: extras/forms/filtersets.py:260 extras/forms/model_forms.py:230 #: tenancy/forms/filtersets.py:92 -msgid "Object type" +msgid "Object Type" msgstr "Nesne türü" #: extras/forms/bulk_import.py:47 -msgid "Object type (for object or multi-object fields)" +msgid "Object Type (for object or multi-object fields)" msgstr "Nesne türü (nesne veya çoklu nesne alanları için)" #: extras/forms/bulk_import.py:50 extras/forms/filtersets.py:74 @@ -6734,7 +6734,7 @@ msgid "Regions" msgstr "Bölgeler" #: extras/forms/filtersets.py:355 extras/forms/model_forms.py:388 -msgid "Site groups" +msgid "Site Groups" msgstr "Site grupları" #: extras/forms/filtersets.py:365 extras/forms/model_forms.py:398 @@ -6766,7 +6766,7 @@ msgid "Clusters" msgstr "Kümeler" #: extras/forms/filtersets.py:400 extras/forms/model_forms.py:433 -msgid "Tenant groups" +msgid "Tenant Groups" msgstr "Kiracı grupları" #: extras/forms/filtersets.py:454 extras/forms/filtersets.py:492 @@ -9583,7 +9583,7 @@ msgid "Regex" msgstr "Regeks" #: netbox/forms/__init__.py:34 -msgid "Object type(s)" +msgid "Object Type(s)" msgstr "Nesne türü (ler)" #: netbox/forms/base.py:88 @@ -12998,7 +12998,7 @@ msgid "Parent tenant group (slug)" msgstr "Ana kiracı grubu (sümüklü böcek)" #: tenancy/filtersets.py:182 tenancy/filtersets.py:202 -msgid "Tenant group (ID)" +msgid "Tenant Group (ID)" msgstr "Kiracı grubu (ID)" #: tenancy/filtersets.py:235 @@ -13488,7 +13488,7 @@ msgstr "" "“{value}“bu alan için benzersiz bir değer değil; birden fazla nesne bulundu" #: utilities/forms/fields/csv.py:97 -msgid "Object type must be specified as \".\"" +msgid "Object Type must be specified as \".\"" msgstr "Nesne türü şu şekilde belirtilmelidir”.“" #: utilities/forms/fields/csv.py:101 @@ -13756,11 +13756,11 @@ msgstr "" "yalnızca temel sorgu kümesini tanımlayan görünümlerde kullanılabilir" #: virtualization/filtersets.py:79 -msgid "Parent group (ID)" +msgid "Parent Group (ID)" msgstr "Ana grup (ID)" #: virtualization/filtersets.py:85 -msgid "Parent group (slug)" +msgid "Parent Group (slug)" msgstr "Ebeveyn grubu (kısa ad)" #: virtualization/filtersets.py:89 virtualization/filtersets.py:141 diff --git a/netbox/translations/uk/LC_MESSAGES/django.po b/netbox/translations/uk/LC_MESSAGES/django.po index f4b8924fa..8efecf366 100644 --- a/netbox/translations/uk/LC_MESSAGES/django.po +++ b/netbox/translations/uk/LC_MESSAGES/django.po @@ -2,10 +2,10 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# # Translators: # Jeremy Stretch, 2024 -# +# #, fuzzy msgid "" msgstr "" @@ -125,7 +125,7 @@ msgstr "Регіон (слимак)" #: dcim/filtersets.py:2078 dcim/filtersets.py:2136 ipam/filtersets.py:352 #: ipam/filtersets.py:958 virtualization/filtersets.py:58 #: virtualization/filtersets.py:186 -msgid "Site group (ID)" +msgid "Site Group (ID)" msgstr "Група сайту (ID)" #: circuits/filtersets.py:49 circuits/filtersets.py:216 dcim/filtersets.py:134 @@ -134,7 +134,7 @@ msgstr "Група сайту (ID)" #: dcim/filtersets.py:2085 dcim/filtersets.py:2143 extras/filtersets.py:467 #: ipam/filtersets.py:359 ipam/filtersets.py:965 #: virtualization/filtersets.py:65 virtualization/filtersets.py:193 -msgid "Site group (slug)" +msgid "Site Group (slug)" msgstr "Група ділянок (слимак)" #: circuits/filtersets.py:54 circuits/forms/bulk_import.py:116 @@ -761,7 +761,7 @@ msgstr "Регіон" #: virtualization/forms/bulk_edit.py:86 virtualization/forms/filtersets.py:69 #: virtualization/forms/filtersets.py:138 #: virtualization/forms/model_forms.py:98 -msgid "Site group" +msgid "Site Group" msgstr "Група сайтів" #: circuits/forms/filtersets.py:62 circuits/forms/filtersets.py:80 @@ -2772,7 +2772,7 @@ msgstr "Серійний номер" #: dcim/forms/bulk_edit.py:277 dcim/forms/filtersets.py:307 #: dcim/forms/filtersets.py:741 dcim/forms/filtersets.py:878 #: dcim/forms/filtersets.py:1430 -msgid "Asset tag" +msgid "Asset Tag" msgstr "Тег активів" #: dcim/forms/bulk_edit.py:287 dcim/forms/bulk_import.py:220 @@ -2826,7 +2826,7 @@ msgid "Weight" msgstr "Вага" #: dcim/forms/bulk_edit.py:326 dcim/forms/filtersets.py:317 -msgid "Max weight" +msgid "Max Weight" msgstr "Максимальна вага" #: dcim/forms/bulk_edit.py:331 dcim/forms/bulk_edit.py:441 @@ -2834,7 +2834,7 @@ msgstr "Максимальна вага" #: dcim/forms/bulk_import.py:337 dcim/forms/bulk_import.py:363 #: dcim/forms/filtersets.py:322 dcim/forms/filtersets.py:533 #: dcim/forms/filtersets.py:608 -msgid "Weight unit" +msgid "Weight Unit" msgstr "Вагова одиниця" #: dcim/forms/bulk_edit.py:345 dcim/forms/bulk_edit.py:808 @@ -3764,7 +3764,7 @@ msgstr "Батьківський регіон" #: tenancy/forms/bulk_import.py:62 tenancy/forms/filtersets.py:33 #: tenancy/forms/filtersets.py:62 wireless/forms/bulk_import.py:25 #: wireless/forms/filtersets.py:25 -msgid "Parent group" +msgid "Parent Group" msgstr "Батьківська група" #: dcim/forms/filtersets.py:247 dcim/forms/filtersets.py:332 @@ -6475,12 +6475,12 @@ msgstr "Кластерна група (слимак)" #: extras/filtersets.py:553 tenancy/forms/forms.py:16 #: tenancy/forms/forms.py:39 -msgid "Tenant group" +msgid "Tenant Group" msgstr "Група орендарів" #: extras/filtersets.py:559 tenancy/filtersets.py:189 #: tenancy/filtersets.py:209 -msgid "Tenant group (slug)" +msgid "Tenant Group (slug)" msgstr "Група орендарів (слимак)" #: extras/filtersets.py:575 extras/forms/model_forms.py:371 @@ -6603,7 +6603,7 @@ msgstr "Активний" #: extras/forms/model_forms.py:131 extras/forms/model_forms.py:163 #: extras/forms/model_forms.py:204 extras/forms/model_forms.py:261 #: extras/forms/model_forms.py:365 users/forms/model_forms.py:273 -msgid "Object types" +msgid "Object Types" msgstr "Типи об'єктів" #: extras/forms/bulk_import.py:36 extras/forms/bulk_import.py:117 @@ -6619,11 +6619,11 @@ msgstr "Тип даних поля (наприклад, текст, ціле ч #: extras/forms/bulk_import.py:44 extras/forms/filtersets.py:186 #: extras/forms/filtersets.py:260 extras/forms/model_forms.py:230 #: tenancy/forms/filtersets.py:92 -msgid "Object type" +msgid "Object Type" msgstr "Тип об'єкта" #: extras/forms/bulk_import.py:47 -msgid "Object type (for object or multi-object fields)" +msgid "Object Type (for object or multi-object fields)" msgstr "Тип об'єкта (для об'єктів або полів з кількома об'єктами)" #: extras/forms/bulk_import.py:50 extras/forms/filtersets.py:74 @@ -6767,7 +6767,7 @@ msgid "Regions" msgstr "Регіони" #: extras/forms/filtersets.py:355 extras/forms/model_forms.py:388 -msgid "Site groups" +msgid "Site Groups" msgstr "Групи сайтів" #: extras/forms/filtersets.py:365 extras/forms/model_forms.py:398 @@ -6799,7 +6799,7 @@ msgid "Clusters" msgstr "Кластери" #: extras/forms/filtersets.py:400 extras/forms/model_forms.py:433 -msgid "Tenant groups" +msgid "Tenant Groups" msgstr "Групи орендарів" #: extras/forms/filtersets.py:454 extras/forms/filtersets.py:492 @@ -9619,7 +9619,7 @@ msgid "Regex" msgstr "Регекс" #: netbox/forms/__init__.py:34 -msgid "Object type(s)" +msgid "Object Type(s)" msgstr "Тип (и) об'єкта" #: netbox/forms/base.py:88 @@ -13028,7 +13028,7 @@ msgid "Parent tenant group (slug)" msgstr "Батьківська група орендарів (слимак)" #: tenancy/filtersets.py:182 tenancy/filtersets.py:202 -msgid "Tenant group (ID)" +msgid "Tenant Group (ID)" msgstr "Група орендарів (ID)" #: tenancy/filtersets.py:235 @@ -13522,7 +13522,7 @@ msgstr "" "об'єктів" #: utilities/forms/fields/csv.py:97 -msgid "Object type must be specified as \".\"" +msgid "Object Type must be specified as \".\"" msgstr "Тип об'єкта повинен бути вказаний як».«" #: utilities/forms/fields/csv.py:101 @@ -13793,11 +13793,11 @@ msgstr "" "які визначають базовий набір запитів" #: virtualization/filtersets.py:79 -msgid "Parent group (ID)" +msgid "Parent Group (ID)" msgstr "Батьківська група (ID)" #: virtualization/filtersets.py:85 -msgid "Parent group (slug)" +msgid "Parent Group (slug)" msgstr "Батьківська група (слимак)" #: virtualization/filtersets.py:89 virtualization/filtersets.py:141 diff --git a/netbox/translations/zh/LC_MESSAGES/django.po b/netbox/translations/zh/LC_MESSAGES/django.po index 6bcbb0076..9f9e85081 100644 --- a/netbox/translations/zh/LC_MESSAGES/django.po +++ b/netbox/translations/zh/LC_MESSAGES/django.po @@ -2,10 +2,10 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# # Translators: # Jeremy Stretch, 2024 -# +# #, fuzzy msgid "" msgstr "" @@ -125,7 +125,7 @@ msgstr "区域（slug）" #: dcim/filtersets.py:2078 dcim/filtersets.py:2136 ipam/filtersets.py:352 #: ipam/filtersets.py:958 virtualization/filtersets.py:58 #: virtualization/filtersets.py:186 -msgid "Site group (ID)" +msgid "Site Group (ID)" msgstr "站点组 (ID)" #: circuits/filtersets.py:49 circuits/filtersets.py:216 dcim/filtersets.py:134 @@ -134,7 +134,7 @@ msgstr "站点组 (ID)" #: dcim/filtersets.py:2085 dcim/filtersets.py:2143 extras/filtersets.py:467 #: ipam/filtersets.py:359 ipam/filtersets.py:965 #: virtualization/filtersets.py:65 virtualization/filtersets.py:193 -msgid "Site group (slug)" +msgid "Site Group (slug)" msgstr "站点组（slug）" #: circuits/filtersets.py:54 circuits/forms/bulk_import.py:116 @@ -761,7 +761,7 @@ msgstr "区域" #: virtualization/forms/bulk_edit.py:86 virtualization/forms/filtersets.py:69 #: virtualization/forms/filtersets.py:138 #: virtualization/forms/model_forms.py:98 -msgid "Site group" +msgid "Site Group" msgstr "站点组" #: circuits/forms/filtersets.py:62 circuits/forms/filtersets.py:80 @@ -2764,7 +2764,7 @@ msgstr "序列号" #: dcim/forms/bulk_edit.py:277 dcim/forms/filtersets.py:307 #: dcim/forms/filtersets.py:741 dcim/forms/filtersets.py:878 #: dcim/forms/filtersets.py:1430 -msgid "Asset tag" +msgid "Asset Tag" msgstr "资产标签" #: dcim/forms/bulk_edit.py:287 dcim/forms/bulk_import.py:220 @@ -2818,7 +2818,7 @@ msgid "Weight" msgstr "重量" #: dcim/forms/bulk_edit.py:326 dcim/forms/filtersets.py:317 -msgid "Max weight" +msgid "Max Weight" msgstr "最大重量" #: dcim/forms/bulk_edit.py:331 dcim/forms/bulk_edit.py:441 @@ -2826,7 +2826,7 @@ msgstr "最大重量" #: dcim/forms/bulk_import.py:337 dcim/forms/bulk_import.py:363 #: dcim/forms/filtersets.py:322 dcim/forms/filtersets.py:533 #: dcim/forms/filtersets.py:608 -msgid "Weight unit" +msgid "Weight Unit" msgstr "重量单位" #: dcim/forms/bulk_edit.py:345 dcim/forms/bulk_edit.py:808 @@ -3749,7 +3749,7 @@ msgstr "父区域" #: tenancy/forms/bulk_import.py:62 tenancy/forms/filtersets.py:33 #: tenancy/forms/filtersets.py:62 wireless/forms/bulk_import.py:25 #: wireless/forms/filtersets.py:25 -msgid "Parent group" +msgid "Parent Group" msgstr "家长小组" #: dcim/forms/filtersets.py:247 dcim/forms/filtersets.py:332 @@ -6350,12 +6350,12 @@ msgstr "集群组（slug）" #: extras/filtersets.py:553 tenancy/forms/forms.py:16 #: tenancy/forms/forms.py:39 -msgid "Tenant group" +msgid "Tenant Group" msgstr "租户群组" #: extras/filtersets.py:559 tenancy/filtersets.py:189 #: tenancy/filtersets.py:209 -msgid "Tenant group (slug)" +msgid "Tenant Group (slug)" msgstr "租户群组（slug）" #: extras/filtersets.py:575 extras/forms/model_forms.py:371 @@ -6478,7 +6478,7 @@ msgstr "处于活动状态" #: extras/forms/model_forms.py:131 extras/forms/model_forms.py:163 #: extras/forms/model_forms.py:204 extras/forms/model_forms.py:261 #: extras/forms/model_forms.py:365 users/forms/model_forms.py:273 -msgid "Object types" +msgid "Object Types" msgstr "对象类型" #: extras/forms/bulk_import.py:36 extras/forms/bulk_import.py:117 @@ -6494,11 +6494,11 @@ msgstr "字段数据类型（例如文本、整数等）" #: extras/forms/bulk_import.py:44 extras/forms/filtersets.py:186 #: extras/forms/filtersets.py:260 extras/forms/model_forms.py:230 #: tenancy/forms/filtersets.py:92 -msgid "Object type" +msgid "Object Type" msgstr "物体类型" #: extras/forms/bulk_import.py:47 -msgid "Object type (for object or multi-object fields)" +msgid "Object Type (for object or multi-object fields)" msgstr "对象类型（适用于对象或多对象字段）" #: extras/forms/bulk_import.py:50 extras/forms/filtersets.py:74 @@ -6638,7 +6638,7 @@ msgid "Regions" msgstr "地区" #: extras/forms/filtersets.py:355 extras/forms/model_forms.py:388 -msgid "Site groups" +msgid "Site Groups" msgstr "网站群组" #: extras/forms/filtersets.py:365 extras/forms/model_forms.py:398 @@ -6670,7 +6670,7 @@ msgid "Clusters" msgstr "集群" #: extras/forms/filtersets.py:400 extras/forms/model_forms.py:433 -msgid "Tenant groups" +msgid "Tenant Groups" msgstr "租户群组" #: extras/forms/filtersets.py:454 extras/forms/filtersets.py:492 @@ -9409,7 +9409,7 @@ msgid "Regex" msgstr "正则表达式" #: netbox/forms/__init__.py:34 -msgid "Object type(s)" +msgid "Object Type(s)" msgstr "对象类型" #: netbox/forms/base.py:88 @@ -12762,7 +12762,7 @@ msgid "Parent tenant group (slug)" msgstr "父租户群组 (slug)" #: tenancy/filtersets.py:182 tenancy/filtersets.py:202 -msgid "Tenant group (ID)" +msgid "Tenant Group (ID)" msgstr "租户组 (ID)" #: tenancy/filtersets.py:235 @@ -13230,7 +13230,7 @@ msgid "" msgstr "“{value}“不是此字段的唯一值；找到了多个对象" #: utilities/forms/fields/csv.py:97 -msgid "Object type must be specified as \".\"" +msgid "Object Type must be specified as \".\"" msgstr "必须将对象类型指定为”。“" #: utilities/forms/fields/csv.py:101 @@ -13478,11 +13478,11 @@ msgid "" msgstr "{class_name} 没有定义查询集。objectPermissionRequiredMixin 只能用于定义基本查询集的视图" #: virtualization/filtersets.py:79 -msgid "Parent group (ID)" +msgid "Parent Group (ID)" msgstr "家长群组 (ID)" #: virtualization/filtersets.py:85 -msgid "Parent group (slug)" +msgid "Parent Group (slug)" msgstr "家长小组（slug）" #: virtualization/filtersets.py:89 virtualization/filtersets.py:141 diff --git a/netbox/users/forms/model_forms.py b/netbox/users/forms/model_forms.py index 7a9f63ea7..cd312dcc7 100644 --- a/netbox/users/forms/model_forms.py +++ b/netbox/users/forms/model_forms.py @@ -270,7 +270,7 @@ class GroupForm(forms.ModelForm): class ObjectPermissionForm(forms.ModelForm): object_types = ContentTypeMultipleChoiceField( - label=_('Object types'), + label=_('Object Types'), queryset=ObjectType.objects.all(), limit_choices_to=OBJECTPERMISSION_OBJECT_TYPES, widget=forms.SelectMultiple(attrs={'size': 6}) diff --git a/netbox/virtualization/filtersets.py b/netbox/virtualization/filtersets.py index 55fadd1af..ba6cbeda9 100644 --- a/netbox/virtualization/filtersets.py +++ b/netbox/virtualization/filtersets.py @@ -55,14 +55,14 @@ class ClusterFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFilte queryset=SiteGroup.objects.all(), field_name='site__group', lookup_expr='in', - label=_('Site group (ID)'), + label=_('Site Group (ID)'), ) site_group = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), field_name='site__group', lookup_expr='in', to_field_name='slug', - label=_('Site group (slug)'), + label=_('Site Group (slug)'), ) site_id = django_filters.ModelMultipleChoiceFilter( queryset=Site.objects.all(), @@ -76,13 +76,13 @@ class ClusterFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFilte ) group_id = django_filters.ModelMultipleChoiceFilter( queryset=ClusterGroup.objects.all(), - label=_('Parent group (ID)'), + label=_('Parent Group (ID)'), ) group = django_filters.ModelMultipleChoiceFilter( field_name='group__slug', queryset=ClusterGroup.objects.all(), to_field_name='slug', - label=_('Parent group (slug)'), + label=_('Parent Group (slug)'), ) type_id = django_filters.ModelMultipleChoiceFilter( queryset=ClusterType.objects.all(), @@ -183,14 +183,14 @@ class VirtualMachineFilterSet( queryset=SiteGroup.objects.all(), field_name='site__group', lookup_expr='in', - label=_('Site group (ID)'), + label=_('Site Group (ID)'), ) site_group = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), field_name='site__group', lookup_expr='in', to_field_name='slug', - label=_('Site group (slug)'), + label=_('Site Group (slug)'), ) site_id = django_filters.ModelMultipleChoiceFilter( queryset=Site.objects.all(), diff --git a/netbox/virtualization/forms/bulk_edit.py b/netbox/virtualization/forms/bulk_edit.py index 2bd3434ac..97f5d4b02 100644 --- a/netbox/virtualization/forms/bulk_edit.py +++ b/netbox/virtualization/forms/bulk_edit.py @@ -83,7 +83,7 @@ class ClusterBulkEditForm(NetBoxModelBulkEditForm): required=False, ) site_group = DynamicModelChoiceField( - label=_('Site group'), + label=_('Site Group'), queryset=SiteGroup.objects.all(), required=False, ) diff --git a/netbox/virtualization/forms/filtersets.py b/netbox/virtualization/forms/filtersets.py index 1cb652a1b..d7e660cb9 100644 --- a/netbox/virtualization/forms/filtersets.py +++ b/netbox/virtualization/forms/filtersets.py @@ -66,7 +66,7 @@ class ClusterFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFi site_group_id = DynamicModelMultipleChoiceField( queryset=SiteGroup.objects.all(), required=False, - label=_('Site group') + label=_('Site Group') ) site_id = DynamicModelMultipleChoiceField( queryset=Site.objects.all(), @@ -135,7 +135,7 @@ class VirtualMachineFilterForm( site_group_id = DynamicModelMultipleChoiceField( queryset=SiteGroup.objects.all(), required=False, - label=_('Site group') + label=_('Site Group') ) site_id = DynamicModelMultipleChoiceField( queryset=Site.objects.all(), diff --git a/netbox/virtualization/forms/model_forms.py b/netbox/virtualization/forms/model_forms.py index bfdfc9ada..71aeea13e 100644 --- a/netbox/virtualization/forms/model_forms.py +++ b/netbox/virtualization/forms/model_forms.py @@ -95,7 +95,7 @@ class ClusterAddDevicesForm(forms.Form): null_option='None' ) site_group = DynamicModelChoiceField( - label=_('Site group'), + label=_('Site Group'), queryset=SiteGroup.objects.all(), required=False, null_option='None' diff --git a/netbox/virtualization/tests/test_filtersets.py b/netbox/virtualization/tests/test_filtersets.py index ff55aba10..8531fc312 100644 --- a/netbox/virtualization/tests/test_filtersets.py +++ b/netbox/virtualization/tests/test_filtersets.py @@ -116,9 +116,9 @@ class ClusterTestCase(TestCase, ChangeLoggedFilterSetTests): Site.objects.bulk_create(sites) tenant_groups = ( - TenantGroup(name='Tenant group 1', slug='tenant-group-1'), - TenantGroup(name='Tenant group 2', slug='tenant-group-2'), - TenantGroup(name='Tenant group 3', slug='tenant-group-3'), + TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), + TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), + TenantGroup(name='Tenant Group 3', slug='tenant-group-3'), ) for tenantgroup in tenant_groups: tenantgroup.save() @@ -299,9 +299,9 @@ class VirtualMachineTestCase(TestCase, ChangeLoggedFilterSetTests): ) tenant_groups = ( - TenantGroup(name='Tenant group 1', slug='tenant-group-1'), - TenantGroup(name='Tenant group 2', slug='tenant-group-2'), - TenantGroup(name='Tenant group 3', slug='tenant-group-3'), + TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), + TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), + TenantGroup(name='Tenant Group 3', slug='tenant-group-3'), ) for tenantgroup in tenant_groups: tenantgroup.save() diff --git a/netbox/wireless/forms/bulk_import.py b/netbox/wireless/forms/bulk_import.py index 38bc37360..a1e44e0d6 100644 --- a/netbox/wireless/forms/bulk_import.py +++ b/netbox/wireless/forms/bulk_import.py @@ -22,7 +22,7 @@ class WirelessLANGroupImportForm(NetBoxModelImportForm): queryset=WirelessLANGroup.objects.all(), required=False, to_field_name='name', - help_text=_('Parent group') + help_text=_('Parent Group') ) slug = SlugField() diff --git a/netbox/wireless/forms/filtersets.py b/netbox/wireless/forms/filtersets.py index 2458d7b48..7bea23d6c 100644 --- a/netbox/wireless/forms/filtersets.py +++ b/netbox/wireless/forms/filtersets.py @@ -22,7 +22,7 @@ class WirelessLANGroupFilterForm(NetBoxModelFilterSetForm): parent_id = DynamicModelMultipleChoiceField( queryset=WirelessLANGroup.objects.all(), required=False, - label=_('Parent group') + label=_('Parent Group') ) tag = TagFilterField(model)