- Looking for an enterprise solution? Check out NetBox Cloud! + Looking for a managed solution? Check out NetBox Cloud or NetBox Enterprise!
- Looking for an enterprise solution? Check out NetBox Cloud!
+ Looking for a managed solution? Check out NetBox Cloud or NetBox Enterprise!
```
-
-````
-```
-var s = "Code block";
-alert(s);
-```
-````
-
-```
-var s = "Code block";
-alert(s);
-```
-
-
-
-## Tables
-
-```no-highlight
-Colons can be used to align columns.
-
-| Tables | Are | Cool |
-| ------------- |:-------------:| -----:|
-| col 3 is | right-aligned | $1600 |
-| col 2 is | centered | $12 |
-| zebra stripes | are neat | $1 |
-
-There must be at least 3 dashes separating each header cell.
-The outer pipes (|) are optional, and you don't need to make the
-raw Markdown line up prettily. You can also use inline Markdown.
-
-Markdown | Less | Pretty
---- | --- | ---
-*Still* | `renders` | **nicely**
-1 | 2 | 3
-```
-
-Colons can be used to align columns.
-
-| Tables | Are | Cool |
-| ------------- |:-------------:| -----:|
-| col 3 is | right-aligned | $1600 |
-| col 2 is | centered | $12 |
-| zebra stripes | are neat | $1 |
-
-There must be at least 3 dashes separating each header cell. The outer pipes (|) are optional, and you don't need to make the raw Markdown line up prettily. You can also use inline Markdown.
-
-Markdown | Less | Pretty
---- | --- | ---
-*Still* | `renders` | **nicely**
-1 | 2 | 3
-
-
-
-## Blockquotes
-
-```no-highlight
-> Blockquotes are very handy in email to emulate reply text.
-> This line is part of the same quote.
-
-Quote break.
-
-> This is a very long line that will still be quoted properly when it wraps. Oh boy let's keep writing to make sure this is long enough to actually wrap for everyone. Oh, you can *put* **Markdown** into a blockquote.
-```
-
-> Blockquotes are very handy in email to emulate reply text.
-> This line is part of the same quote.
-
-Quote break.
-
-> This is a very long line that will still be quoted properly when it wraps. Oh boy let's keep writing to make sure this is long enough to actually wrap for everyone. Oh, you can *put* **Markdown** into a blockquote.
-
-
-
-## Inline HTML
-
-You can also use raw HTML in your Markdown, and it'll mostly work pretty well.
-
-```no-highlight
-` and `
` tags. +``` + +Paragraphs are rendered in HTML using `` and `
` tags. + +```` +``` +def my_func(foo, bar): + # Do something + return foo * bar +``` +```` + +```no-highlight +def my_func(foo, bar): + # Do something + return foo * bar +``` + +## Tables + +Simple tables can be constructed using the pipe character (`|`) to denote columns, and hyphens (`-`) to denote the heading. Inline Markdown can be used to style text within columns. + +```no-highlight +| Heading 1 | Heading 2 | Heading 3 | +|-----------|-----------|-----------| +| Row 1 | Alpha | Red | +| Row 2 | **Bravo** | Green | +| Row 3 | Charlie | ~~Blue~~ | +``` + +| Heading 1 | Heading 2 | Heading 3 | +|-----------|-----------|-----------| +| _Row 1_ | Alpha | Red | +| Row 2 | **Bravo** | Green | +| Row 3 | Charlie | ~~Blue~~ | + +Colons can be used to align text to the left or right side of a column. + +```no-highlight +| Left-aligned | Centered | Right-aligned | +|:-------------|:--------:|--------------:| +| Text | Text | Text | +| Text | Text | Text | +| Text | Text | Text | +``` + +| Left-aligned | Centered | Right-aligned | +|:-------------|:--------:|--------------:| +| Text | Text | Text | +| Text | Text | Text | +| Text | Text | Text | + +## Blockquotes + +Text can be wrapped in a blockquote by prepending a right angle bracket (`>`) before each line. + +```no-highlight +> I think that I shall never see +> a graph more lovely than a tree. +> A tree whose crucial property +> is loop-free connectivity. +``` + +> I think that I shall never see +> a graph more lovely than a tree. +> A tree whose crucial property +> is loop-free connectivity. + +Markdown removes line breaks by default. To preserve line breaks, append two spaces to each line (represented below with the `⋅` character). + +```no-highlight +> I think that I shall never see⋅⋅ +> a graph more lovely than a tree.⋅⋅ +> A tree whose crucial property⋅⋅ +> is loop-free connectivity. +``` + +> I think that I shall never see +> a graph more lovely than a tree. +> A tree whose crucial property +> is loop-free connectivity. + +## Horizontal Rule + +A horizontal rule is a single line rendered across the width of the page using a series of three or more hyphens or asterisks. It can be useful for separating sections of content. + +```no-highlight +Content + +--- + +More content + +*** + +Final content +``` + +Content + +--- + +More content + +*** + +Final content diff --git a/docs/release-notes/version-3.7.md b/docs/release-notes/version-3.7.md index 9724c4488..337526c14 100644 --- a/docs/release-notes/version-3.7.md +++ b/docs/release-notes/version-3.7.md @@ -1,6 +1,76 @@ # NetBox v3.7 -## v3.7.5 (FUTURE) +## v3.7.7 (2024-05-01) + +### Enhancements + +* [#15428](https://github.com/netbox-community/netbox/issues/15428) - Show usage counts for associated objects on config template list +* [#15812](https://github.com/netbox-community/netbox/issues/15812) - Add Date & DateTime variable types for custom scripts +* [#15894](https://github.com/netbox-community/netbox/issues/15894) - Cache the generated API schema definition for shorter loading times + +### Bug Fixes + +* [#11460](https://github.com/netbox-community/netbox/issues/11460) - Fix AttributeError exception when editing a cable with only one end terminated +* [#13712](https://github.com/netbox-community/netbox/issues/13712) - Fix row highlighting for device interface list display +* [#13806](https://github.com/netbox-community/netbox/issues/13806) - Fix "mark" button tooltip on button activation for device interface list display +* [#13922](https://github.com/netbox-community/netbox/issues/13922) - Fix SVG drawing error on multiple termination trace with multiple devices +* [#14241](https://github.com/netbox-community/netbox/issues/14241) - Fix random interface swap when performing cable trace with multiple termination +* [#14852](https://github.com/netbox-community/netbox/issues/14852) - Fix NoReverseMatch exception when viewing an event rule which references a deleted custom script +* [#15524](https://github.com/netbox-community/netbox/issues/15524) - Fix rounding error when reporting IP range utilization +* [#15548](https://github.com/netbox-community/netbox/issues/15548) - Ignore many-to-many mappings when checking dependencies of an object being deleted +* [#15845](https://github.com/netbox-community/netbox/issues/15845) - Avoid extraneous database queries when fetching assigned IP addresses via REST API +* [#15872](https://github.com/netbox-community/netbox/issues/15872) - `BANNER_MAINTENANCE` content should permit custom HTML +* [#15891](https://github.com/netbox-community/netbox/issues/15891) - Ensure deterministic ordering for scripts & reports +* [#15896](https://github.com/netbox-community/netbox/issues/15896) - Fix retention of default value when editing a custom JSON field +* [#15899](https://github.com/netbox-community/netbox/issues/15899) - Fix exception when enabling the tags column on the L2VPN terminations table + +--- + +## v3.7.6 (2024-04-22) + +!!! warning + If remote authentication is in use with Gunicorn v22.0 or later, it may be necessary to configure Gunicorn's [`header_map`](https://docs.gunicorn.org/en/stable/settings.html#header-map) setting to preserve authentication headers. + +### Enhancements + +* [#14690](https://github.com/netbox-community/netbox/issues/14690) - Improve rendering of JSON data in configuration form +* [#15427](https://github.com/netbox-community/netbox/issues/15427) - Enable compatibility with non-Amazon S3 providers for remote data sources +* [#15640](https://github.com/netbox-community/netbox/issues/15640) - Add global search support for L2VPN identifiers +* [#15644](https://github.com/netbox-community/netbox/issues/15644) - Introduce new configuration parameters for enabling HTTP Strict Transport Security (HSTS) + +### Bug Fixes + +* [#15541](https://github.com/netbox-community/netbox/issues/15541) - Restore ability to modify assigned component template when adding/modifying an inventory item template +* [#15582](https://github.com/netbox-community/netbox/issues/15582) - Fix permission constraints for synchronization of remote data sources +* [#15588](https://github.com/netbox-community/netbox/issues/15588) - Correct OpenAPI schema definitions for read-only fields which may return null values +* [#15635](https://github.com/netbox-community/netbox/issues/15635) - Extend plugin removal instruction to include reindexing the global search cache +* [#15654](https://github.com/netbox-community/netbox/issues/15654) - Fix `AttributeError` exception when attempting to save an incomplete tunnel termination +* [#15668](https://github.com/netbox-community/netbox/issues/15668) - Fix permission required to display virtual disks tab on virtual machine UI view +* [#15685](https://github.com/netbox-community/netbox/issues/15685) - Allow filtering cables by decimal values using UI filter form +* [#15761](https://github.com/netbox-community/netbox/issues/15761) - Add missing `ike_policy` & `ike_policy_id` filters for IKE proposals +* [#15771](https://github.com/netbox-community/netbox/issues/15771) - Include `id` in list of supported fields for all bulk import forms +* [#15790](https://github.com/netbox-community/netbox/issues/15790) - Fix live preview support for EventRule comments + +--- + +## v3.7.5 (2024-04-04) + +### Enhancements + +* [#14707](https://github.com/netbox-community/netbox/issues/14707) - Clarify interface designation when creating tunnel terminations +* [#15039](https://github.com/netbox-community/netbox/issues/15039) - Allow API tokens to be cloned + +### Bug Fixes + +* [#14799](https://github.com/netbox-community/netbox/issues/14799) - Avoid caching modified reports & scripts +* [#15029](https://github.com/netbox-community/netbox/issues/15029) - Raise a clean validation error when attempting to make duplicate FHRP group assignments +* [#15102](https://github.com/netbox-community/netbox/issues/15102) - Fix usage of selector widget for form fields referencing users/groups +* [#15435](https://github.com/netbox-community/netbox/issues/15435) - Correct permissions name to allow adding a module bay to a device via the UI +* [#15502](https://github.com/netbox-community/netbox/issues/15502) - Fix KeyError exception when modifying an IP address assigned to a virtual machine +* [#15597](https://github.com/netbox-community/netbox/issues/15597) - Restore help modal for `button_class` field on custom link bulk import form +* [#15598](https://github.com/netbox-community/netbox/issues/15598) - Fix exception when creating a device from a device type with one or more child inventory items +* [#15608](https://github.com/netbox-community/netbox/issues/15608) - Avoid caching values of null fields in search index +* [#15609](https://github.com/netbox-community/netbox/issues/15609) - Fix filtering of the providers list by assigned ASN --- diff --git a/mkdocs.yml b/mkdocs.yml index e1128578a..5aa657230 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -42,6 +42,7 @@ plugins: show_root_toc_entry: false show_source: false extra: + readthedocs: !ENV READTHEDOCS social: - icon: fontawesome/brands/github link: https://github.com/netbox-community/netbox @@ -127,7 +128,9 @@ nav: - Synchronized Data: 'integrations/synchronized-data.md' - Prometheus Metrics: 'integrations/prometheus-metrics.md' - Plugins: - - Using Plugins: 'plugins/index.md' + - About Plugins: 'plugins/index.md' + - Installing a Plugin: 'plugins/installation.md' + - Removing a Plugin: 'plugins/removal.md' - Developing Plugins: - Getting Started: 'plugins/development/index.md' - Models: 'plugins/development/models.md' diff --git a/netbox/circuits/filtersets.py b/netbox/circuits/filtersets.py index 97be1cf57..9a14b5286 100644 --- a/netbox/circuits/filtersets.py +++ b/netbox/circuits/filtersets.py @@ -64,6 +64,12 @@ class ProviderFilterSet(NetBoxModelFilterSet, ContactModelFilterSet): queryset=ASN.objects.all(), label=_('ASN (ID)'), ) + asn = django_filters.ModelMultipleChoiceFilter( + field_name='asns__asn', + queryset=ASN.objects.all(), + to_field_name='asn', + label=_('ASN'), + ) class Meta: model = Provider diff --git a/netbox/circuits/forms/filtersets.py b/netbox/circuits/forms/filtersets.py index 1e1abd068..8f730ba10 100644 --- a/netbox/circuits/forms/filtersets.py +++ b/netbox/circuits/forms/filtersets.py @@ -24,7 +24,7 @@ class ProviderFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm): fieldsets = ( (None, ('q', 'filter_id', 'tag')), (_('Location'), ('region_id', 'site_group_id', 'site_id')), - (_('ASN'), ('asn',)), + (_('ASN'), ('asn_id',)), (_('Contacts'), ('contact', 'contact_role', 'contact_group')), ) region_id = DynamicModelMultipleChoiceField( @@ -46,10 +46,6 @@ class ProviderFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm): }, label=_('Site') ) - asn = forms.IntegerField( - required=False, - label=_('ASN (legacy)') - ) asn_id = DynamicModelMultipleChoiceField( queryset=ASN.objects.all(), required=False, diff --git a/netbox/circuits/tests/test_filtersets.py b/netbox/circuits/tests/test_filtersets.py index 6553179ec..ae9de03e9 100644 --- a/netbox/circuits/tests/test_filtersets.py +++ b/netbox/circuits/tests/test_filtersets.py @@ -90,10 +90,12 @@ class ProviderTestCase(TestCase, ChangeLoggedFilterSetTests): params = {'description': ['foobar1', 'foobar2']} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) - def test_asn_id(self): # ASN object assignment + def test_asn(self): asns = ASN.objects.all()[:2] params = {'asn_id': [asns[0].pk, asns[1].pk]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + params = {'asn': [asns[0].asn, asns[1].asn]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_region(self): regions = Region.objects.all()[:2] diff --git a/netbox/core/api/views.py b/netbox/core/api/views.py index 7bf2f87a6..39c922eb6 100644 --- a/netbox/core/api/views.py +++ b/netbox/core/api/views.py @@ -1,5 +1,5 @@ from django.shortcuts import get_object_or_404 - +from django.utils.translation import gettext_lazy as _ from rest_framework.decorators import action from rest_framework.exceptions import PermissionDenied from rest_framework.response import Response @@ -33,10 +33,11 @@ class DataSourceViewSet(NetBoxModelViewSet): """ Enqueue a job to synchronize the DataSource. """ - if not request.user.has_perm('core.sync_datasource'): - raise PermissionDenied("Syncing data sources requires the core.sync_datasource permission.") - datasource = get_object_or_404(DataSource, pk=pk) + + if not request.user.has_perm('core.sync_datasource', obj=datasource): + raise PermissionDenied(_("This user does not have permission to synchronize this data source.")) + datasource.enqueue_sync_job(request) serializer = serializers.DataSourceSerializer(datasource, context={'request': request}) diff --git a/netbox/core/data_backends.py b/netbox/core/data_backends.py index 15891a6f5..2d3a7d8c8 100644 --- a/netbox/core/data_backends.py +++ b/netbox/core/data_backends.py @@ -149,7 +149,8 @@ class S3Backend(DataBackend): region_name=self._region_name, aws_access_key_id=aws_access_key_id, aws_secret_access_key=aws_secret_access_key, - config=self.config + config=self.config, + endpoint_url=self._endpoint_url ) bucket = s3.Bucket(self._bucket_name) @@ -176,6 +177,11 @@ class S3Backend(DataBackend): url_path = urlparse(self.url).path.lstrip('/') return url_path.split('/')[0] + @property + def _endpoint_url(self): + url_path = urlparse(self.url) + return url_path._replace(params="", fragment="", query="", path="").geturl() + @property def _remote_path(self): url_path = urlparse(self.url).path.lstrip('/') diff --git a/netbox/core/forms/model_forms.py b/netbox/core/forms/model_forms.py index ae891dd59..0f4f971dc 100644 --- a/netbox/core/forms/model_forms.py +++ b/netbox/core/forms/model_forms.py @@ -3,6 +3,7 @@ import json from django import forms from django.conf import settings +from django.forms.fields import JSONField as _JSONField from django.utils.translation import gettext_lazy as _ from core.forms.mixins import SyncedDataMixin @@ -12,7 +13,7 @@ from netbox.forms import NetBoxModelForm from netbox.registry import registry from netbox.utils import get_data_backend_choices from utilities.forms import BootstrapMixin, get_field_value -from utilities.forms.fields import CommentField +from utilities.forms.fields import CommentField, JSONField from utilities.forms.widgets import HTMXSelect __all__ = ( @@ -132,6 +133,9 @@ class ConfigFormMetaclass(forms.models.ModelFormMetaclass): 'help_text': param.description, } field_kwargs.update(**param.field_kwargs) + if param.field is _JSONField: + # Replace with our own JSONField to get pretty JSON in config editor + param.field = JSONField param_fields[param.name] = param.field(**field_kwargs) attrs.update(param_fields) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 053b3e9ea..e07d17aca 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -612,7 +612,7 @@ class InventoryItemTemplateSerializer(ValidatedModelSerializer): required=False, allow_null=True ) - component = serializers.SerializerMethodField(read_only=True) + component = serializers.SerializerMethodField(read_only=True, allow_null=True) _depth = serializers.IntegerField(source='level', read_only=True) class Meta: @@ -668,7 +668,7 @@ class DeviceSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:device-detail') device_type = NestedDeviceTypeSerializer() role = NestedDeviceRoleSerializer() - device_role = NestedDeviceRoleSerializer(read_only=True, help_text='Deprecated in v3.6 in favor of `role`.') + device_role = NestedDeviceRoleSerializer(read_only=True, help_text=_('Deprecated in v3.6 in favor of `role`.')) tenant = NestedTenantSerializer(required=False, allow_null=True, default=None) platform = NestedPlatformSerializer(required=False, allow_null=True) site = NestedSiteSerializer() @@ -685,7 +685,7 @@ class DeviceSerializer(NetBoxModelSerializer): ) status = ChoiceField(choices=DeviceStatusChoices, required=False) airflow = ChoiceField(choices=DeviceAirflowChoices, allow_blank=True, required=False) - primary_ip = NestedIPAddressSerializer(read_only=True) + primary_ip = NestedIPAddressSerializer(read_only=True, allow_null=True) primary_ip4 = NestedIPAddressSerializer(required=False, allow_null=True) primary_ip6 = NestedIPAddressSerializer(required=False, allow_null=True) oob_ip = NestedIPAddressSerializer(required=False, allow_null=True) @@ -735,7 +735,7 @@ class DeviceSerializer(NetBoxModelSerializer): class DeviceWithConfigContextSerializer(DeviceSerializer): - config_context = serializers.SerializerMethodField(read_only=True) + config_context = serializers.SerializerMethodField(read_only=True, allow_null=True) class Meta(DeviceSerializer.Meta): fields = [ @@ -1067,7 +1067,7 @@ class InventoryItemSerializer(NetBoxModelSerializer): required=False, allow_null=True ) - component = serializers.SerializerMethodField(read_only=True) + component = serializers.SerializerMethodField(read_only=True, allow_null=True) _depth = serializers.IntegerField(source='level', read_only=True) class Meta: diff --git a/netbox/dcim/forms/bulk_import.py b/netbox/dcim/forms/bulk_import.py index 47974096f..95e6c4098 100644 --- a/netbox/dcim/forms/bulk_import.py +++ b/netbox/dcim/forms/bulk_import.py @@ -1373,14 +1373,14 @@ class VirtualDeviceContextImportForm(NetBoxModelImportForm): label=_('Device'), queryset=Device.objects.all(), to_field_name='name', - help_text='Assigned role' + help_text=_('Assigned role') ) tenant = CSVModelChoiceField( label=_('Tenant'), queryset=Tenant.objects.all(), required=False, to_field_name='name', - help_text='Assigned tenant' + help_text=_('Assigned tenant') ) status = CSVChoiceField( label=_('Status'), diff --git a/netbox/dcim/forms/connections.py b/netbox/dcim/forms/connections.py index 854c5ebed..90a3d6ce0 100644 --- a/netbox/dcim/forms/connections.py +++ b/netbox/dcim/forms/connections.py @@ -1,4 +1,5 @@ from django import forms +from django.contrib.contenttypes.models import ContentType from django.utils.translation import gettext_lazy as _ from circuits.models import Circuit, CircuitTermination @@ -82,14 +83,22 @@ def get_cable_form(a_type, b_type): class _CableForm(CableForm, metaclass=FormMetaclass): - def __init__(self, *args, **kwargs): + def __init__(self, *args, initial=None, **kwargs): + + initial = initial or {} + if a_type: + ct = ContentType.objects.get_for_model(a_type) + initial['a_terminations_type'] = f'{ct.app_label}.{ct.model}' + if b_type: + ct = ContentType.objects.get_for_model(b_type) + initial['b_terminations_type'] = f'{ct.app_label}.{ct.model}' # TODO: Temporary hack to work around list handling limitations with utils.normalize_querydict() for field_name in ('a_terminations', 'b_terminations'): - if field_name in kwargs.get('initial', {}) and type(kwargs['initial'][field_name]) is not list: - kwargs['initial'][field_name] = [kwargs['initial'][field_name]] + if field_name in initial and type(initial[field_name]) is not list: + initial[field_name] = [initial[field_name]] - super().__init__(*args, **kwargs) + super().__init__(*args, initial=initial, **kwargs) if self.instance and self.instance.pk: # Initialize A/B terminations when modifying an existing Cable instance @@ -100,7 +109,7 @@ def get_cable_form(a_type, b_type): super().clean() # Set the A/B terminations on the Cable instance - self.instance.a_terminations = self.cleaned_data['a_terminations'] - self.instance.b_terminations = self.cleaned_data['b_terminations'] + self.instance.a_terminations = self.cleaned_data.get('a_terminations', []) + self.instance.b_terminations = self.cleaned_data.get('b_terminations', []) return _CableForm diff --git a/netbox/dcim/forms/filtersets.py b/netbox/dcim/forms/filtersets.py index 95c441381..d8d326271 100644 --- a/netbox/dcim/forms/filtersets.py +++ b/netbox/dcim/forms/filtersets.py @@ -977,9 +977,9 @@ class CableFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): label=_('Color'), required=False ) - length = forms.IntegerField( + length = forms.DecimalField( label=_('Length'), - required=False + required=False, ) length_unit = forms.ChoiceField( label=_('Length unit'), diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py index 6773bc55f..cc7100e3c 100644 --- a/netbox/dcim/forms/model_forms.py +++ b/netbox/dcim/forms/model_forms.py @@ -13,8 +13,7 @@ from netbox.forms import NetBoxModelForm from tenancy.forms import TenancyForm from utilities.forms import BootstrapMixin, add_blank_choice from utilities.forms.fields import ( - CommentField, ContentTypeChoiceField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, JSONField, - NumericArrayField, SlugField, + CommentField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, JSONField, NumericArrayField, SlugField, ) from utilities.forms.widgets import APISelect, ClearableFileInput, HTMXSelect, NumberWithOptions, SelectWithPK from virtualization.models import Cluster @@ -616,14 +615,33 @@ class ModuleForm(ModuleCommonForm, NetBoxModelForm): self.fields['adopt_components'].disabled = True +def get_termination_type_choices(): + return add_blank_choice([ + (f'{ct.app_label}.{ct.model}', ct.model_class()._meta.verbose_name.title()) + for ct in ContentType.objects.filter(CABLE_TERMINATION_MODELS) + ]) + + class CableForm(TenancyForm, NetBoxModelForm): + a_terminations_type = forms.ChoiceField( + choices=get_termination_type_choices, + required=False, + widget=HTMXSelect(), + label=_('Type') + ) + b_terminations_type = forms.ChoiceField( + choices=get_termination_type_choices, + required=False, + widget=HTMXSelect(), + label=_('Type') + ) comments = CommentField() class Meta: model = Cable fields = [ - 'type', 'status', 'tenant_group', 'tenant', 'label', 'color', 'length', 'length_unit', 'description', - 'comments', 'tags', + 'a_terminations_type', 'b_terminations_type', 'type', 'status', 'tenant_group', 'tenant', 'label', 'color', + 'length', 'length_unit', 'description', 'comments', 'tags', ] error_messages = { 'length': { @@ -976,21 +994,67 @@ class InventoryItemTemplateForm(ComponentTemplateForm): queryset=Manufacturer.objects.all(), required=False ) - component_type = ContentTypeChoiceField( - queryset=ContentType.objects.all(), - limit_choices_to=MODULAR_COMPONENT_TEMPLATE_MODELS, + # Assigned component selectors + consoleporttemplate = DynamicModelChoiceField( + queryset=ConsolePortTemplate.objects.all(), required=False, - widget=forms.HiddenInput + query_params={ + 'device_type_id': '$device_type' + }, + label=_('Console port template') ) - component_id = forms.IntegerField( + consoleserverporttemplate = DynamicModelChoiceField( + queryset=ConsoleServerPortTemplate.objects.all(), required=False, - widget=forms.HiddenInput + query_params={ + 'device_type_id': '$device_type' + }, + label=_('Console server port template') + ) + frontporttemplate = DynamicModelChoiceField( + queryset=FrontPortTemplate.objects.all(), + required=False, + query_params={ + 'device_type_id': '$device_type' + }, + label=_('Front port template') + ) + interfacetemplate = DynamicModelChoiceField( + queryset=InterfaceTemplate.objects.all(), + required=False, + query_params={ + 'device_type_id': '$device_type' + }, + label=_('Interface template') + ) + poweroutlettemplate = DynamicModelChoiceField( + queryset=PowerOutletTemplate.objects.all(), + required=False, + query_params={ + 'device_type_id': '$device_type' + }, + label=_('Power outlet template') + ) + powerporttemplate = DynamicModelChoiceField( + queryset=PowerPortTemplate.objects.all(), + required=False, + query_params={ + 'device_type_id': '$device_type' + }, + label=_('Power port template') + ) + rearporttemplate = DynamicModelChoiceField( + queryset=RearPortTemplate.objects.all(), + required=False, + query_params={ + 'device_type_id': '$device_type' + }, + label=_('Rear port template') ) fieldsets = ( (None, ( 'device_type', 'parent', 'name', 'label', 'role', 'manufacturer', 'part_id', 'description', - 'component_type', 'component_id', )), ) @@ -998,9 +1062,52 @@ class InventoryItemTemplateForm(ComponentTemplateForm): model = InventoryItemTemplate fields = [ 'device_type', 'parent', 'name', 'label', 'role', 'manufacturer', 'part_id', 'description', - 'component_type', 'component_id', ] + def __init__(self, *args, **kwargs): + instance = kwargs.get('instance') + initial = kwargs.get('initial', {}).copy() + component_type = initial.get('component_type') + component_id = initial.get('component_id') + + # Used for picking the default active tab for component selection + self.no_component = True + + if instance: + # When editing set the initial value for component selection + for component_model in ContentType.objects.filter(MODULAR_COMPONENT_TEMPLATE_MODELS): + if type(instance.component) is component_model.model_class(): + initial[component_model.model] = instance.component + self.no_component = False + break + elif component_type and component_id: + # When adding the InventoryItem from a component page + if content_type := ContentType.objects.filter(MODULAR_COMPONENT_TEMPLATE_MODELS).filter(pk=component_type).first(): + if component := content_type.model_class().objects.filter(pk=component_id).first(): + initial[content_type.model] = component + self.no_component = False + + kwargs['initial'] = initial + + super().__init__(*args, **kwargs) + + def clean(self): + super().clean() + + # Handle object assignment + selected_objects = [ + field for field in ( + 'consoleporttemplate', 'consoleserverporttemplate', 'frontporttemplate', 'interfacetemplate', + 'poweroutlettemplate', 'powerporttemplate', 'rearporttemplate' + ) if self.cleaned_data[field] + ] + if len(selected_objects) > 1: + raise forms.ValidationError(_("An InventoryItem can only be assigned to a single component.")) + elif selected_objects: + self.instance.component = self.cleaned_data[selected_objects[0]] + else: + self.instance.component = None + # # Device components diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py index 2a1269a8d..588901709 100644 --- a/netbox/dcim/models/devices.py +++ b/netbox/dcim/models/devices.py @@ -996,17 +996,16 @@ class Device( bulk_create: If True, bulk_create() will be called to create all components in a single query (default). Otherwise, save() will be called on each instance individually. """ - components = [obj.instantiate(device=self) for obj in queryset] - if not components: - return - - # Set default values for any applicable custom fields model = queryset.model.component_model - if cf_defaults := CustomField.objects.get_defaults_for_model(model): - for component in components: - component.custom_field_data = cf_defaults if bulk_create: + components = [obj.instantiate(device=self) for obj in queryset] + if not components: + return + # Set default values for any applicable custom fields + if cf_defaults := CustomField.objects.get_defaults_for_model(model): + for component in components: + component.custom_field_data = cf_defaults model.objects.bulk_create(components) # Manually send the post_save signal for each of the newly created components for component in components: @@ -1019,7 +1018,11 @@ class Device( update_fields=None ) else: - for component in components: + for obj in queryset: + component = obj.instantiate(device=self) + # Set default values for any applicable custom fields + if cf_defaults := CustomField.objects.get_defaults_for_model(model): + component.custom_field_data = cf_defaults component.save() def save(self, *args, **kwargs): diff --git a/netbox/dcim/svg/cables.py b/netbox/dcim/svg/cables.py index d7365161e..596f0c6bf 100644 --- a/netbox/dcim/svg/cables.py +++ b/netbox/dcim/svg/cables.py @@ -8,17 +8,16 @@ from django.conf import settings from dcim.constants import CABLE_TRACE_SVG_DEFAULT_WIDTH from utilities.utils import foreground_color - __all__ = ( 'CableTraceSVG', ) - OFFSET = 0.5 PADDING = 10 LINE_HEIGHT = 20 FANOUT_HEIGHT = 35 FANOUT_LEG_HEIGHT = 15 +CABLE_HEIGHT = 4 * LINE_HEIGHT + FANOUT_HEIGHT + FANOUT_LEG_HEIGHT class Node(Hyperlink): @@ -84,31 +83,38 @@ class Connector(Group): labels: Iterable of text labels """ - def __init__(self, start, url, color, labels=[], description=[], **extra): - super().__init__(class_='connector', **extra) + def __init__(self, start, url, color, wireless, labels=[], description=[], end=None, text_offset=0, **extra): + super().__init__(class_="connector", **extra) self.start = start self.height = PADDING * 2 + LINE_HEIGHT * len(labels) + PADDING * 2 - self.end = (start[0], start[1] + self.height) + # Allow to specify end-position or auto-calculate + self.end = end if end else (start[0], start[1] + self.height) self.color = color or '000000' - # Draw a "shadow" line to give the cable a border - cable_shadow = Line(start=self.start, end=self.end, class_='cable-shadow') - self.add(cable_shadow) + if wireless: + # Draw the cable + cable = Line(start=self.start, end=self.end, class_="wireless-link") + self.add(cable) + else: + # Draw a "shadow" line to give the cable a border + cable_shadow = Line(start=self.start, end=self.end, class_='cable-shadow') + self.add(cable_shadow) - # Draw the cable - cable = Line(start=self.start, end=self.end, style=f'stroke: #{self.color}') - self.add(cable) + # Draw the cable + cable = Line(start=self.start, end=self.end, style=f'stroke: #{self.color}') + self.add(cable) # Add link link = Hyperlink(href=url, target='_parent') # Add text label(s) - cursor = start[1] - cursor += PADDING * 2 + cursor = start[1] + text_offset + cursor += PADDING * 2 + LINE_HEIGHT * 2 + x_coord = (start[0] + end[0]) / 2 + PADDING for i, label in enumerate(labels): cursor += LINE_HEIGHT - text_coords = (start[0] + PADDING * 2, cursor - LINE_HEIGHT / 2) + text_coords = (x_coord, cursor - LINE_HEIGHT / 2) text = Text(label, insert=text_coords, class_='bold' if not i else []) link.add(text) if len(description) > 0: @@ -190,8 +196,9 @@ class CableTraceSVG: def draw_parent_objects(self, obj_list): """ - Draw a set of parent objects. + Draw a set of parent objects (eg hosts, switched, patchpanels) and return all created nodes """ + objects = [] width = self.width / len(obj_list) for i, obj in enumerate(obj_list): node = Node( @@ -199,23 +206,26 @@ class CableTraceSVG: width=width, url=f'{self.base_url}{obj.get_absolute_url()}', color=self._get_color(obj), - labels=self._get_labels(obj) + labels=self._get_labels(obj), + object=obj ) + objects.append(node) self.parent_objects.append(node) if i + 1 == len(obj_list): self.cursor += node.box['height'] + return objects - def draw_terminations(self, terminations): + def draw_object_terminations(self, terminations, offset_x, width): """ - Draw a row of terminating objects (e.g. interfaces), all of which are attached to the same end of a cable. + Draw all terminations belonging to an object with specified offset and width + Return all created nodes and their maximum height """ - nodes = [] nodes_height = 0 - width = self.width / len(terminations) - - for i, term in enumerate(terminations): + nodes = [] + # Sort them by name to make renders more readable + for i, term in enumerate(sorted(terminations, key=lambda x: x.name)): node = Node( - position=(i * width, self.cursor), + position=(offset_x + i * width, self.cursor), width=width, url=f'{self.base_url}{term.get_absolute_url()}', color=self._get_color(term), @@ -225,133 +235,89 @@ class CableTraceSVG: ) nodes_height = max(nodes_height, node.box['height']) nodes.append(node) + return nodes, nodes_height + + def draw_terminations(self, terminations, parent_object_nodes): + """ + Draw a row of terminating objects (e.g. interfaces) and return all created nodes + Attach them to previously created parent objects + """ + nodes = [] + nodes_height = 0 + + # Draw terminations for each parent object + for parent in parent_object_nodes: + parent_terms = [term for term in terminations if term.parent_object == parent.object] + + # Width and offset(position) for each termination box + width = parent.box['width'] / len(parent_terms) + offset_x = parent.box['x'] + + result, nodes_height = self.draw_object_terminations(parent_terms, offset_x, width) + nodes.extend(result) self.cursor += nodes_height self.terminations.extend(nodes) return nodes - def draw_fanin(self, node, connector): - points = ( - node.bottom_center, - (node.bottom_center[0], node.bottom_center[1] + FANOUT_LEG_HEIGHT), - connector.start, - ) - self.connectors.extend(( - Polyline(points=points, class_='cable-shadow'), - Polyline(points=points, style=f'stroke: #{connector.color}'), - )) - - def draw_fanout(self, node, connector): - points = ( - connector.end, - (node.top_center[0], node.top_center[1] - FANOUT_LEG_HEIGHT), - node.top_center, - ) - self.connectors.extend(( - Polyline(points=points, class_='cable-shadow'), - Polyline(points=points, style=f'stroke: #{connector.color}'), - )) - - def draw_cable(self, cable, terminations, cable_count=0): + def draw_far_objects(self, obj_list, terminations): """ - Draw a single cable. Terminations and cable count are passed for determining position and padding - - :param cable: The cable to draw - :param terminations: List of terminations to build positioning data off of - :param cable_count: Count of all cables on this layer for determining whether to collapse description into a - tooltip. + Draw the far-end objects and its terminations and return all created nodes """ + # Make sure elements are sorted by name for readability + objects = sorted(obj_list, key=lambda x: x.name) + width = self.width / len(objects) - # If the cable count is higher than 2, collapse the description into a tooltip - if cable_count > 2: - # Use the cable __str__ function to denote the cable - labels = [f'{cable}'] + # Max-height of created terminations + terms_height = 0 + term_nodes = [] - # Include the label and the status description in the tooltip - description = [ - f'Cable {cable}', - cable.get_status_display() - ] + # Draw the terminations by per object first + for i, obj in enumerate(objects): + obj_terms = [term for term in terminations if term.parent_object == obj] + obj_pos = i * width + result, result_nodes_height = self.draw_object_terminations(obj_terms, obj_pos, width / len(obj_terms)) - if cable.type: - # Include the cable type in the tooltip - description.append(cable.get_type_display()) - if cable.length is not None and cable.length_unit: - # Include the cable length in the tooltip - description.append(f'{cable.length} {cable.get_length_unit_display()}') - else: - labels = [ - f'Cable {cable}', - cable.get_status_display() - ] - description = [] - if cable.type: - labels.append(cable.get_type_display()) - if cable.length is not None and cable.length_unit: - # Include the cable length in the tooltip - labels.append(f'{cable.length} {cable.get_length_unit_display()}') + terms_height = max(terms_height, result_nodes_height) + term_nodes.extend(result) - # If there is only one termination, center on that termination - # Otherwise average the center across the terminations - if len(terminations) == 1: - center = terminations[0].bottom_center[0] - else: - # Get a list of termination centers - termination_centers = [term.bottom_center[0] for term in terminations] - # Average the centers - center = sum(termination_centers) / len(termination_centers) + # Update cursor and draw the objects + self.cursor += terms_height + self.terminations.extend(term_nodes) + object_nodes = self.draw_parent_objects(objects) - # Create the connector - connector = Connector( - start=(center, self.cursor), - color=cable.color or '000000', - url=f'{self.base_url}{cable.get_absolute_url()}', - labels=labels, - description=description - ) + return object_nodes, term_nodes - # Set the cursor position - self.cursor += connector.height - - return connector - - def draw_wirelesslink(self, wirelesslink): + def draw_fanin(self, target, terminations, color): """ - Draw a line with labels representing a WirelessLink. + Draw the fan-in-lines from each of the terminations to the targetpoint """ - group = Group(class_='connector') + for term in terminations: + points = ( + term.bottom_center, + (term.bottom_center[0], term.bottom_center[1] + FANOUT_LEG_HEIGHT), + target, + ) + self.connectors.extend(( + Polyline(points=points, class_='cable-shadow'), + Polyline(points=points, style=f'stroke: #{color}'), + )) - labels = [ - f'Wireless link {wirelesslink}', - wirelesslink.get_status_display() - ] - if wirelesslink.ssid: - labels.append(wirelesslink.ssid) - - # Draw the wireless link - start = (OFFSET + self.center, self.cursor) - height = PADDING * 2 + LINE_HEIGHT * len(labels) + PADDING * 2 - end = (start[0], start[1] + height) - line = Line(start=start, end=end, class_='wireless-link') - group.add(line) - - self.cursor += PADDING * 2 - - # Add link - link = Hyperlink(href=f'{self.base_url}{wirelesslink.get_absolute_url()}', target='_parent') - - # Add text label(s) - for i, label in enumerate(labels): - self.cursor += LINE_HEIGHT - text_coords = (self.center + PADDING * 2, self.cursor - LINE_HEIGHT / 2) - text = Text(label, insert=text_coords, class_='bold' if not i else []) - link.add(text) - - group.add(link) - self.cursor += PADDING * 2 - - return group + def draw_fanout(self, start, terminations, color): + """ + Draw the fan-out-lines from the startpoint to each of the terminations + """ + for term in terminations: + points = ( + term.top_center, + (term.top_center[0], term.top_center[1] - FANOUT_LEG_HEIGHT), + start, + ) + self.connectors.extend(( + Polyline(points=points, class_='cable-shadow'), + Polyline(points=points, style=f'stroke: #{color}'), + )) def draw_attachment(self): """ @@ -378,86 +344,99 @@ class CableTraceSVG: traced_path = self.origin.trace() + parent_object_nodes = [] # Iterate through each (terms, cable, terms) segment in the path for i, segment in enumerate(traced_path): near_ends, links, far_ends = segment - # Near end parent + # This is segment number one. if i == 0: # If this is the first segment, draw the originating termination's parent object - self.draw_parent_objects(set(end.parent_object for end in near_ends)) + parent_object_nodes = self.draw_parent_objects(set(end.parent_object for end in near_ends)) + # Else: No need to draw parent objects (parent objects are drawn in last "round" as the far-end!) - # Near end termination(s) - terminations = self.draw_terminations(near_ends) + near_terminations = self.draw_terminations(near_ends, parent_object_nodes) + self.cursor += CABLE_HEIGHT # Connector (a Cable or WirelessLink) if links: - link_cables = {} - fanin = False - fanout = False - # Determine if we have fanins or fanouts - if len(near_ends) > len(set(links)): - self.cursor += FANOUT_HEIGHT - fanin = True - if len(far_ends) > len(set(links)): - fanout = True - cursor = self.cursor - for link in links: - # Cable - if type(link) is Cable and not link_cables.get(link.pk): - # Reset cursor - self.cursor = cursor - # Generate a list of terminations connected to this cable - near_end_link_terminations = [term for term in terminations if term.object.cable == link] - # Draw the cable - cable = self.draw_cable(link, near_end_link_terminations, cable_count=len(links)) - # Add cable to the list of cables - link_cables.update({link.pk: cable}) - # Add cable to drawing - self.connectors.append(cable) + parent_object_nodes, far_terminations = self.draw_far_objects(set(end.parent_object for end in far_ends), far_ends) + for cable in links: + # Fill in labels and description with all available data + description = [ + f"Link {cable}", + cable.get_status_display() + ] + near = [] + far = [] + color = '000000' + if cable.description: + description.append(f"{cable.description}") + if isinstance(cable, Cable): + labels = [f"{cable}"] if len(links) > 2 else [f"Cable {cable}", cable.get_status_display()] + if cable.type: + description.append(cable.get_type_display()) + if cable.length and cable.length_unit: + description.append(f"{cable.length} {cable.get_length_unit_display()}") + color = cable.color or '000000' - # Draw fan-ins - if len(near_ends) > 1 and fanin: - for term in terminations: - if term.object.cable == link: - self.draw_fanin(term, cable) + # Collect all connected nodes to this cable + near = [term for term in near_terminations if term.object in cable.a_terminations] + far = [term for term in far_terminations if term.object in cable.b_terminations] + if not (near and far): + # a and b terminations may be swapped + near = [term for term in near_terminations if term.object in cable.b_terminations] + far = [term for term in far_terminations if term.object in cable.a_terminations] + elif isinstance(cable, WirelessLink): + labels = [f"{cable}"] if len(links) > 2 else [f"Wireless {cable}", cable.get_status_display()] + if cable.ssid: + description.append(f"{cable.ssid}") + near = [term for term in near_terminations if term.object == cable.interface_a] + far = [term for term in far_terminations if term.object == cable.interface_b] + if not (near and far): + # a and b terminations may be swapped + near = [term for term in near_terminations if term.object == cable.interface_b] + far = [term for term in far_terminations if term.object == cable.interface_a] - # WirelessLink - elif type(link) is WirelessLink: - wirelesslink = self.draw_wirelesslink(link) - self.connectors.append(wirelesslink) + # Select most-probable start and end position + start = near[0].bottom_center + end = far[0].top_center + text_offset = 0 - # Far end termination(s) - if len(far_ends) > 1: - if fanout: - self.cursor += FANOUT_HEIGHT - terminations = self.draw_terminations(far_ends) - for term in terminations: - if hasattr(term.object, 'cable') and link_cables.get(term.object.cable.pk): - self.draw_fanout(term, link_cables.get(term.object.cable.pk)) - else: - self.draw_terminations(far_ends) - elif far_ends: - self.draw_terminations(far_ends) - else: - # Link is not connected to anything - break + if len(near) > 1: + # Handle Fan-In - change start position to be directly below start + start = (end[0], start[1] + FANOUT_HEIGHT + FANOUT_LEG_HEIGHT) + self.draw_fanin(start, near, color) + text_offset -= FANOUT_HEIGHT + FANOUT_LEG_HEIGHT + elif len(far) > 1: + # Handle Fan-Out - change end position to be directly above end + end = (start[0], end[1] - FANOUT_HEIGHT - FANOUT_LEG_HEIGHT) + self.draw_fanout(end, far, color) + text_offset -= FANOUT_HEIGHT - # Far end parent - parent_objects = set(end.parent_object for end in far_ends) - self.draw_parent_objects(parent_objects) + # Create the connector + connector = Connector( + start=start, + end=end, + color=color, + wireless=isinstance(cable, WirelessLink), + url=f'{self.base_url}{cable.get_absolute_url()}', + text_offset=text_offset, + labels=labels, + description=description + ) + self.connectors.append(connector) # Render a far-end object not connected via a link (e.g. a ProviderNetwork or Site associated with # a CircuitTermination) elif far_ends: - # Attachment attachment = self.draw_attachment() self.connectors.append(attachment) # Object - self.draw_parent_objects(far_ends) + parent_object_nodes = self.draw_parent_objects(far_ends) # Determine drawing size self.drawing = svgwrite.Drawing( diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py index 98dcfcb3c..800b55bf1 100644 --- a/netbox/dcim/tables/devices.py +++ b/netbox/dcim/tables/devices.py @@ -51,34 +51,6 @@ def get_cabletermination_row_class(record): return '' -def get_interface_row_class(record): - if not record.enabled: - return 'danger' - elif record.is_virtual: - return 'primary' - return get_cabletermination_row_class(record) - - -def get_interface_state_attribute(record): - """ - Get interface enabled state as string to attach to^ "
-"[アルファベット順]{3}$ 値をちょうど 3 文字の大文字に制限します。"
+"[A-Z]{3}$ は値を3 字の大文字に制限します。"
#: extras/models/customfields.py:185
msgid "choice set"
-msgstr "チョイスセット"
+msgstr "選択肢"
#: extras/models/customfields.py:194
msgid "Specifies whether the custom field is displayed in the UI"
@@ -6851,11 +6857,11 @@ msgstr "カスタムフィールド値を UI で編集できるかどうかを
#: extras/models/customfields.py:205
msgid "is cloneable"
-msgstr "クローン可能"
+msgstr "複製可能"
#: extras/models/customfields.py:206
msgid "Replicate this value when cloning objects"
-msgstr "オブジェクトのクローニング時にこの値を複製する"
+msgstr "オブジェクトの複製時にこの値を複製する"
#: extras/models/customfields.py:219
msgid "custom field"
@@ -6868,7 +6874,7 @@ msgstr "カスタムフィールド"
#: extras/models/customfields.py:309
#, python-brace-format
msgid "Invalid default value \"{value}\": {error}"
-msgstr "デフォルト値が無効です」{value}「: {error}"
+msgstr "デフォルト値が無効です \"{value}\": {error}"
#: extras/models/customfields.py:316
msgid "A minimum value may be set only for numeric fields"
@@ -6902,7 +6908,7 @@ msgstr "{type} フィールドはオブジェクトタイプを定義できま
#: extras/models/customfields.py:434
msgid "True"
-msgstr "本当"
+msgstr "真"
#: extras/models/customfields.py:435
msgid "False"
@@ -6911,7 +6917,7 @@ msgstr "偽"
#: extras/models/customfields.py:517
#, python-brace-format
msgid "Values must match this regex: {regex}"
-msgstr "値は次の正規表現と一致する必要があります。 {regex}"
+msgstr "値は次の正規表現とマッチする必要があります。 {regex}"
#: extras/models/customfields.py:611
msgid "Value must be a string."
@@ -6920,7 +6926,7 @@ msgstr "値は文字列でなければなりません。"
#: extras/models/customfields.py:613
#, python-brace-format
msgid "Value must match regex '{regex}'"
-msgstr "値は正規表現 'と一致する必要があります{regex}'"
+msgstr "値は正規表現 '{regex}'と一致する必要があります"
#: extras/models/customfields.py:618
msgid "Value must be an integer."
@@ -6929,16 +6935,16 @@ msgstr "値は整数でなければなりません。"
#: extras/models/customfields.py:621 extras/models/customfields.py:636
#, python-brace-format
msgid "Value must be at least {minimum}"
-msgstr "値は少なくとも次の値でなければなりません {minimum}"
+msgstr "値は {minimum} 以上でなければなりません"
#: extras/models/customfields.py:625 extras/models/customfields.py:640
#, python-brace-format
msgid "Value must not exceed {maximum}"
-msgstr "値を超えてはいけません {maximum}"
+msgstr "値は {maximum} を超えてはいけません"
#: extras/models/customfields.py:633
msgid "Value must be a decimal."
-msgstr "値は10進数でなければなりません。"
+msgstr "値は実数でなければなりません。"
#: extras/models/customfields.py:645
msgid "Value must be true or false."
@@ -6950,27 +6956,27 @@ msgstr "日付値は ISO 8601 フォーマット (YYYY-MM-DD) である必要が
#: extras/models/customfields.py:662
msgid "Date and time values must be in ISO 8601 format (YYYY-MM-DD HH:MM:SS)."
-msgstr "日付と時刻の値は ISO 8601 フォーマット (YYYY-MM-DD HH: MM: SS) である必要があります。"
+msgstr "日付と時刻の値は ISO 8601 フォーマット (YYYY-MM-DD HH:MM:SS) である必要があります。"
#: extras/models/customfields.py:669
#, python-brace-format
msgid "Invalid choice ({value}) for choice set {choiceset}."
-msgstr "選択が無効です ({value}) チョイスセット用 {choiceset}。"
+msgstr "{value}は選択肢 {choiceset} に含まれていません。"
#: extras/models/customfields.py:679
#, python-brace-format
msgid "Invalid choice(s) ({value}) for choice set {choiceset}."
-msgstr "選択が無効です ({value}) チョイスセット用 {choiceset}。"
+msgstr "{value}は選択肢 {choiceset} に含まれていません。"
#: extras/models/customfields.py:688
#, python-brace-format
msgid "Value must be an object ID, not {type}"
-msgstr "値はオブジェクトIDでなければならず、そうではありません {type}"
+msgstr "{type}ではなく、オブジェクトIDを指定してください"
#: extras/models/customfields.py:694
#, python-brace-format
msgid "Value must be a list of object IDs, not {type}"
-msgstr "値はオブジェクト ID のリストでなければならず、そうではありません {type}"
+msgstr "{type} ではなくオブジェクト ID のリストを入力してください"
#: extras/models/customfields.py:698
#, python-brace-format
@@ -6991,11 +6997,11 @@ msgstr "選択肢は自動的にアルファベット順に並べられます"
#: extras/models/customfields.py:739
msgid "custom field choice set"
-msgstr "カスタムフィールド選択セット"
+msgstr "カスタムフィールド選択肢"
#: extras/models/customfields.py:740
msgid "custom field choice sets"
-msgstr "カスタムフィールド選択セット"
+msgstr "カスタムフィールド選択肢"
#: extras/models/customfields.py:776
msgid "Must define base or extra choices."
@@ -7007,7 +7013,7 @@ msgstr "レイアウト"
#: extras/models/dashboard.py:23
msgid "config"
-msgstr "設定する"
+msgstr "設定"
#: extras/models/dashboard.py:28
msgid "dashboard"
@@ -7094,7 +7100,7 @@ msgstr "イベントルール"
msgid ""
"At least one event type must be selected: create, update, delete, job start,"
" and/or job end."
-msgstr "少なくとも 1 つのイベントタイプ (作成、更新、削除、ジョブの開始、ジョブの終了) を選択する必要があります。"
+msgstr "少なくとも 1 つのイベントタイプを選択する必要があります。 : 作成、更新、削除、ジョブの開始、ジョブの終了"
#: extras/models/models.py:196
msgid ""
@@ -7140,13 +7146,13 @@ msgid ""
"username, request_id, and data."
msgstr ""
"カスタムリクエストボディ用の Jinja2 テンプレート。空欄の場合は、変更を表す JSON "
-"オブジェクトが含まれます。利用可能なコンテキストデータには以下が含まれます。 出来事、 型、 "
-"タイムスタンプ、 ユーザ名、 リクエスト ID、および "
-"データ。"
+"オブジェクトが含まれます。利用可能なコンテキストデータには以下が含まれます。 event, "
+"model, timestamp, username, "
+"request_id, and data."
#: extras/models/models.py:234
msgid "secret"
-msgstr "秘密"
+msgstr "シークレット"
#: extras/models/models.py:238
msgid ""
@@ -7154,8 +7160,8 @@ msgid ""
"header containing a HMAC hex digest of the payload body using the secret as "
"the key. The secret is not transmitted in the request."
msgstr ""
-"提供された場合、リクエストには以下が含まれます X フック-シグネチャー シークレットをキーとして使用したペイロード本体の "
-"HMAC 16 進ダイジェストを含むヘッダー。シークレットはリクエストでは送信されません。"
+"提供された場合、リクエストにはシークレットをキーとして使用したペイロード本体のHMAC 16 進ダイジェストを含むX-Hook-"
+"Signature ヘッダー が含まれます 。シークレットはリクエストでは送信されません。"
#: extras/models/models.py:245
msgid "Enable SSL certificate verification. Disable with caution!"
@@ -7207,15 +7213,6 @@ msgstr "リンク URL の Jinja2 テンプレートコード"
msgid "Links with the same group will appear as a dropdown menu"
msgstr "同じグループのリンクはドロップダウンメニューとして表示されます"
-#: extras/models/models.py:353
-msgid "button class"
-msgstr "ボタンクラス"
-
-#: extras/models/models.py:357
-msgid ""
-"The class of the first link in a group will be used for the dropdown button"
-msgstr "グループ内の最初のリンクのクラスがドロップダウンボタンに使用されます"
-
#: extras/models/models.py:360
msgid "new window"
msgstr "新しいウィンドウ"
@@ -7241,12 +7238,12 @@ msgid ""
"Jinja2 template code. The list of objects being exported is passed as a "
"context variable named queryset."
msgstr ""
-"Jinja2 テンプレートコード。エクスポートされるオブジェクトのリストは、という名前のコンテキスト変数として渡されます。 "
-"クエリーセット。"
+"Jinja2 テンプレートコード。エクスポートされるオブジェクトのリストは、 "
+"クエリーセットという名前のコンテキスト変数として渡されます。"
#: extras/models/models.py:440
msgid "Defaults to text/plain; charset=utf-8"
-msgstr "デフォルトは テキスト/プレーン; 文字セット=utf-8"
+msgstr "デフォルトは text/plain; charset=utf-8"
#: extras/models/models.py:443
msgid "file extension"
@@ -7262,20 +7259,20 @@ msgstr "添付ファイルとして"
#: extras/models/models.py:451
msgid "Download file as attachment"
-msgstr "ファイルを添付ファイルとしてダウンロード"
+msgstr "ファイルを直接ダウンロードする"
#: extras/models/models.py:460
msgid "export template"
-msgstr "テンプレートをエクスポート"
+msgstr "エクスポートテンプレート"
#: extras/models/models.py:461
msgid "export templates"
-msgstr "テンプレートをエクスポートする"
+msgstr "エクスポートテンプレート"
#: extras/models/models.py:478
#, python-brace-format
msgid "\"{name}\" is a reserved name. Please choose a different name."
-msgstr "「{name}「は予約名です。別の名前を選択してください。"
+msgstr "\"{name}\"は予約されています。別の名前を選択してください。"
#: extras/models/models.py:528
msgid "The object type(s) to which this filter applies."
@@ -7287,19 +7284,19 @@ msgstr "共有した"
#: extras/models/models.py:573
msgid "saved filter"
-msgstr "保存済みフィルター"
+msgstr "保存済みフィルタ"
#: extras/models/models.py:574
msgid "saved filters"
-msgstr "保存済みフィルター"
+msgstr "保存済みフィルタ"
#: extras/models/models.py:592
msgid "Filter parameters must be stored as a dictionary of keyword arguments."
-msgstr "フィルターパラメータは、キーワード引数の辞書として保存する必要があります。"
+msgstr "フィルタパラメータは、キーワード引数の辞書として保存する必要があります。"
#: extras/models/models.py:620
msgid "image height"
-msgstr "画像の高さ"
+msgstr "画像高さ"
#: extras/models/models.py:623
msgid "image width"
@@ -7307,16 +7304,16 @@ msgstr "画像幅"
#: extras/models/models.py:640
msgid "image attachment"
-msgstr "画像添付"
+msgstr "添付画像"
#: extras/models/models.py:641
msgid "image attachments"
-msgstr "画像添付ファイル"
+msgstr "添付画像"
#: extras/models/models.py:655
#, python-brace-format
msgid "Image attachments cannot be assigned to this object type ({type})."
-msgstr "このオブジェクトタイプにはイメージ添付ファイルを割り当てることができません ({type})。"
+msgstr "このオブジェクトタイプ ({type})には添付画像を割り当てることができません。"
#: extras/models/models.py:718
msgid "kind"
@@ -7333,7 +7330,7 @@ msgstr "ジャーナルエントリ"
#: extras/models/models.py:748
#, python-brace-format
msgid "Journaling is not supported for this object type ({type})."
-msgstr "このオブジェクトタイプではジャーナリングはサポートされていません ({type})。"
+msgstr "このオブジェクトタイプ({type})ではジャーナリングはサポートされていません 。"
#: extras/models/models.py:790
msgid "bookmark"
@@ -7346,7 +7343,7 @@ msgstr "ブックマーク"
#: extras/models/models.py:804
#, python-brace-format
msgid "Bookmarks cannot be assigned to this object type ({type})."
-msgstr "このオブジェクトタイプにはブックマークを割り当てられません ({type})。"
+msgstr "このオブジェクトタイプ ({type})にはブックマークを割り当てられません。"
#: extras/models/reports.py:46
msgid "report module"
@@ -7382,7 +7379,7 @@ msgstr "キャッシュ値"
#: extras/models/search.py:59
msgid "cached values"
-msgstr "キャッシュされた値"
+msgstr "キャッシュ値"
#: extras/models/staging.py:44
msgid "branch"
@@ -7390,7 +7387,7 @@ msgstr "ブランチ"
#: extras/models/staging.py:45
msgid "branches"
-msgstr "枝"
+msgstr "ブランチ"
#: extras/models/staging.py:97
msgid "staged change"
@@ -7398,15 +7395,15 @@ msgstr "段階的変更"
#: extras/models/staging.py:98
msgid "staged changes"
-msgstr "段階的な変更"
+msgstr "段階的変更"
#: extras/models/tags.py:40
-msgid "The object type(s) to which this this tag can be applied."
+msgid "The object type(s) to which this tag can be applied."
msgstr "このタグを適用できるオブジェクトタイプ。"
#: extras/models/tags.py:49
msgid "tag"
-msgstr "鬼ごっこ"
+msgstr "タグ"
#: extras/models/tags.py:50
msgid "tags"
@@ -7430,7 +7427,7 @@ msgstr "スクリプトデータ"
#: extras/scripts.py:375
msgid "Script Execution Parameters"
-msgstr "スクリプト実行パラメーター"
+msgstr "スクリプト実行パラメータ"
#: extras/signals.py:121
#, python-brace-format
@@ -7441,7 +7438,7 @@ msgstr "削除は保護ルールによって禁止されています。 {message
#: extras/tables/tables.py:143 extras/tables/tables.py:208
#: extras/tables/tables.py:285
msgid "Content Types"
-msgstr "コンテンツタイプ"
+msgstr "コンテントタイプ"
#: extras/tables/tables.py:50
msgid "Visible"
@@ -7457,7 +7454,7 @@ msgstr "チョイスセット"
#: extras/tables/tables.py:68
msgid "Is Cloneable"
-msgstr "クローニング可能"
+msgstr "複製可能"
#: extras/tables/tables.py:98
msgid "Count"
@@ -7469,7 +7466,7 @@ msgstr "アルファベット順に並べる"
#: extras/tables/tables.py:125 templates/extras/customlink.html:34
msgid "New Window"
-msgstr "[新規ウィンドウ]"
+msgstr "新規ウィンドウ"
#: extras/tables/tables.py:146
msgid "As Attachment"
@@ -7493,11 +7490,11 @@ msgstr "同期済み"
#: extras/tables/tables.py:178
msgid "Content Type"
-msgstr "コンテンツタイプ"
+msgstr "コンテントタイプ"
#: extras/tables/tables.py:185
msgid "Image"
-msgstr "[イメージ]"
+msgstr "画像"
#: extras/tables/tables.py:190
msgid "Size (Bytes)"
@@ -7537,12 +7534,12 @@ msgstr "コメント (ショート)"
#: extras/validators.py:15
#, python-format
msgid "Ensure this value is equal to %(limit_value)s."
-msgstr "この値が次の値と等しいことを確認してください %(limit_value)s。"
+msgstr "%(limit_value)sと等しいことを確認する 。"
#: extras/validators.py:26
#, python-format
msgid "Ensure this value does not equal %(limit_value)s."
-msgstr "この値が等しくないことを確認してください %(limit_value)s。"
+msgstr "%(limit_value)sと等しくないことを確認する。"
#: extras/validators.py:37
msgid "This field must be empty."
@@ -7555,7 +7552,7 @@ msgstr "このフィールドは空であってはなりません。"
#: extras/validators.py:121
#, python-brace-format
msgid "Invalid attribute \"{name}\" for {model}"
-msgstr "属性が無効です」{name}「用 {model}"
+msgstr "{model}において{name}属性は無効です"
#: extras/views.py:880
msgid "Your dashboard has been reset."
@@ -7563,7 +7560,7 @@ msgstr "ダッシュボードがリセットされました。"
#: ipam/api/field_serializers.py:17
msgid "Enter a valid IPv4 or IPv6 address with optional mask."
-msgstr "オプションのマスクを使用して有効な IPv4 または IPv6 アドレスを入力します。"
+msgstr "有効な IPv4 または IPv6 アドレスを入力してください。(サブネットマスクが使用可能)"
#: ipam/api/field_serializers.py:24
#, python-brace-format
@@ -7594,7 +7591,7 @@ msgstr "DHCP"
#: ipam/choices.py:73
msgid "SLAAC"
-msgstr "スラーク"
+msgstr "SLAAC"
#: ipam/choices.py:89
msgid "Loopback"
@@ -7668,7 +7665,7 @@ msgstr "プレフィックス"
#: ipam/filtersets.py:136 ipam/filtersets.py:175 ipam/filtersets.py:198
msgid "RIR (ID)"
-msgstr "リル (アイディー)"
+msgstr "RIR (ID)"
#: ipam/filtersets.py:142 ipam/filtersets.py:181 ipam/filtersets.py:204
msgid "RIR (slug)"
@@ -7684,7 +7681,7 @@ msgstr "プレフィックス内およびプレフィックスを含む"
#: ipam/filtersets.py:259
msgid "Prefixes which contain this prefix or IP"
-msgstr "このプレフィックスまたは IP を含むプレフィックス"
+msgstr "このプレフィックス / IP を含むプレフィックス"
#: ipam/filtersets.py:270 ipam/filtersets.py:538 ipam/forms/bulk_edit.py:326
#: ipam/forms/filtersets.py:191 ipam/forms/filtersets.py:317
@@ -7700,14 +7697,14 @@ msgid "VLAN number (1-4094)"
msgstr "VLAN 番号 (1-4094)"
#: ipam/filtersets.py:437 ipam/filtersets.py:441 ipam/filtersets.py:533
-#: ipam/forms/model_forms.py:444 templates/tenancy/contact.html:54
+#: ipam/forms/model_forms.py:430 templates/tenancy/contact.html:54
#: tenancy/forms/bulk_edit.py:112
msgid "Address"
-msgstr "住所"
+msgstr "アドレス"
#: ipam/filtersets.py:445
msgid "Ranges which contain this prefix or IP"
-msgstr "このプレフィックスまたは IP を含む範囲"
+msgstr "このプレフィックス / IP を含む範囲"
#: ipam/filtersets.py:473 ipam/filtersets.py:529
msgid "Parent prefix"
@@ -7746,11 +7743,11 @@ msgstr "FHRP グループ (ID)"
#: ipam/filtersets.py:618
msgid "Is assigned to an interface"
-msgstr "インタフェースに割り当てられている"
+msgstr "インタフェースに割り当てられているか"
#: ipam/filtersets.py:622
msgid "Is assigned"
-msgstr "割り当てられている"
+msgstr "割当済みか"
#: ipam/filtersets.py:1047
msgid "IP address (ID)"
@@ -7817,7 +7814,7 @@ msgstr "非公開です"
#: templates/ipam/aggregate.html:19 templates/ipam/asn.html:28
#: templates/ipam/asnrange.html:20 templates/ipam/rir.html:20
msgid "RIR"
-msgstr "リル"
+msgstr "RIR"
#: ipam/forms/bulk_edit.py:168
msgid "Date added"
@@ -7869,7 +7866,7 @@ msgid "Authentication key"
msgstr "認証キー"
#: ipam/forms/bulk_edit.py:404 ipam/forms/filtersets.py:369
-#: ipam/forms/model_forms.py:455 netbox/navigation/menu.py:376
+#: ipam/forms/model_forms.py:441 netbox/navigation/menu.py:376
#: templates/ipam/fhrpgroup.html:51
#: templates/wireless/inc/authentication_attrs.html:5
#: wireless/forms/bulk_edit.py:90 wireless/forms/bulk_edit.py:137
@@ -7884,13 +7881,13 @@ msgstr "子 VLAN VID の最小値"
#: ipam/forms/bulk_edit.py:420
msgid "Maximum child VLAN VID"
-msgstr "子 VLAN VID の最大数"
+msgstr "子 VLAN VID の最大値"
-#: ipam/forms/bulk_edit.py:428 ipam/forms/model_forms.py:527
+#: ipam/forms/bulk_edit.py:428 ipam/forms/model_forms.py:531
msgid "Scope type"
msgstr "スコープタイプ"
-#: ipam/forms/bulk_edit.py:489 ipam/forms/model_forms.py:600
+#: ipam/forms/bulk_edit.py:489 ipam/forms/model_forms.py:604
#: ipam/tables/vlans.py:71 templates/ipam/vlangroup.html:39
msgid "Scope"
msgstr "スコープ"
@@ -7899,8 +7896,8 @@ msgstr "スコープ"
msgid "Site & Group"
msgstr "サイトとグループ"
-#: ipam/forms/bulk_edit.py:574 ipam/forms/model_forms.py:663
-#: ipam/forms/model_forms.py:697 ipam/tables/services.py:19
+#: ipam/forms/bulk_edit.py:574 ipam/forms/model_forms.py:667
+#: ipam/forms/model_forms.py:701 ipam/tables/services.py:19
#: ipam/tables/services.py:49 templates/ipam/service.html:39
#: templates/ipam/servicetemplate.html:24
msgid "Ports"
@@ -7908,11 +7905,11 @@ msgstr "ポート"
#: ipam/forms/bulk_import.py:47
msgid "Import route targets"
-msgstr "ルートターゲットをインポート"
+msgstr "インポートルートターゲット"
#: ipam/forms/bulk_import.py:53
msgid "Export route targets"
-msgstr "ルートターゲットをエクスポートする"
+msgstr "エクスポートルートターゲット"
#: ipam/forms/bulk_import.py:91 ipam/forms/bulk_import.py:111
#: ipam/forms/bulk_import.py:131
@@ -7940,7 +7937,7 @@ msgid "Parent device of assigned interface (if any)"
msgstr "割当インタフェースの親デバイス (存在する場合)"
#: ipam/forms/bulk_import.py:310 ipam/forms/bulk_import.py:496
-#: ipam/forms/model_forms.py:691 virtualization/filtersets.py:284
+#: ipam/forms/model_forms.py:695 virtualization/filtersets.py:284
#: virtualization/filtersets.py:323 virtualization/forms/bulk_edit.py:199
#: virtualization/forms/bulk_edit.py:325
#: virtualization/forms/bulk_import.py:146
@@ -8115,8 +8112,8 @@ msgstr "ポート"
#: virtualization/forms/filtersets.py:189
#: virtualization/forms/filtersets.py:234
#: virtualization/forms/model_forms.py:223
-#: virtualization/tables/virtualmachines.py:115
-#: virtualization/tables/virtualmachines.py:168 vpn/choices.py:45
+#: virtualization/tables/virtualmachines.py:128
+#: virtualization/tables/virtualmachines.py:181 vpn/choices.py:45
#: vpn/forms/filtersets.py:289 vpn/forms/model_forms.py:161
#: vpn/forms/model_forms.py:172 vpn/forms/model_forms.py:274
msgid "Virtual Machine"
@@ -8139,7 +8136,7 @@ msgstr "サイト/VLAN 割り当て"
msgid "IP Range"
msgstr "IP アドレス範囲"
-#: ipam/forms/model_forms.py:285 ipam/forms/model_forms.py:454
+#: ipam/forms/model_forms.py:285 ipam/forms/model_forms.py:440
#: templates/ipam/fhrpgroup.html:19 templates/ipam/ipaddress_edit.html:52
msgid "FHRP Group"
msgstr "FHRP グループ"
@@ -8152,7 +8149,7 @@ msgstr "これをデバイス/仮想マシンのプライマリIPにする"
msgid "An IP address can only be assigned to a single object."
msgstr "IP アドレスは 1 つのオブジェクトにのみ割り当てることができます。"
-#: ipam/forms/model_forms.py:357 ipam/models/ip.py:877
+#: ipam/forms/model_forms.py:357 ipam/models/ip.py:896
msgid ""
"Cannot reassign IP address while it is designated as the primary IP for the "
"parent object"
@@ -8163,46 +8160,39 @@ msgid ""
"Only IP addresses assigned to an interface can be designated as primary IPs."
msgstr "プライマリ IP として指定できるのは、インタフェースに割当 IP アドレスのみです。"
-#: ipam/forms/model_forms.py:373
-#, python-brace-format
-msgid "{ip} is a network ID, which may not be assigned to an interface."
-msgstr "{ip} はネットワーク ID で、インタフェースに割り当てることはできません。"
-
-#: ipam/forms/model_forms.py:379
-#, python-brace-format
-msgid ""
-"{ip} is a broadcast address, which may not be assigned to an interface."
-msgstr "{ip} はブロードキャストアドレスで、インタフェースに割り当てることはできません。"
-
-#: ipam/forms/model_forms.py:456
+#: ipam/forms/model_forms.py:442
msgid "Virtual IP Address"
msgstr "仮想 IP アドレス"
-#: ipam/forms/model_forms.py:598 ipam/forms/model_forms.py:637
+#: ipam/forms/model_forms.py:523
+msgid "Assignment already exists"
+msgstr "アサインメントは既に存在します"
+
+#: ipam/forms/model_forms.py:602 ipam/forms/model_forms.py:641
#: ipam/tables/ip.py:250 templates/ipam/vlan_edit.html:37
#: templates/ipam/vlangroup.html:27
msgid "VLAN Group"
msgstr "VLAN グループ"
-#: ipam/forms/model_forms.py:599
+#: ipam/forms/model_forms.py:603
msgid "Child VLANs"
msgstr "子 VLAN"
-#: ipam/forms/model_forms.py:668 ipam/forms/model_forms.py:702
+#: ipam/forms/model_forms.py:672 ipam/forms/model_forms.py:706
msgid ""
"Comma-separated list of one or more port numbers. A range may be specified "
"using a hyphen."
msgstr "1 つ以上のポート番号をカンマで区切ったリスト。範囲はハイフンを使用して指定できます。"
-#: ipam/forms/model_forms.py:673 templates/ipam/servicetemplate.html:12
+#: ipam/forms/model_forms.py:677 templates/ipam/servicetemplate.html:12
msgid "Service Template"
msgstr "サービステンプレート"
-#: ipam/forms/model_forms.py:724
+#: ipam/forms/model_forms.py:728
msgid "Service template"
msgstr "サービステンプレート"
-#: ipam/forms/model_forms.py:754
+#: ipam/forms/model_forms.py:758
msgid ""
"Must specify name, protocol, and port(s) if not using a service template."
msgstr "サービステンプレートを使用しない場合は、名前、プロトコル、およびポートを指定する必要があります。"
@@ -8362,12 +8352,12 @@ msgstr "プレフィックス"
msgid "Cannot create prefix with /0 mask."
msgstr "/0 マスクではプレフィックスを作成できません。"
-#: ipam/models/ip.py:323 ipam/models/ip.py:854
+#: ipam/models/ip.py:323 ipam/models/ip.py:873
#, python-brace-format
msgid "VRF {vrf}"
msgstr "VRF {vrf}"
-#: ipam/models/ip.py:323 ipam/models/ip.py:854
+#: ipam/models/ip.py:323 ipam/models/ip.py:873
msgid "global table"
msgstr "グローバルテーブル"
@@ -8460,12 +8450,23 @@ msgstr "IP アドレス"
msgid "Cannot create IP address with /0 mask."
msgstr "/0 マスクで IP アドレスを作成することはできません。"
-#: ipam/models/ip.py:856
+#: ipam/models/ip.py:850
+#, python-brace-format
+msgid "{ip} is a network ID, which may not be assigned to an interface."
+msgstr "{ip} はネットワーク ID で、インタフェースに割り当てることはできません。"
+
+#: ipam/models/ip.py:861
+#, python-brace-format
+msgid ""
+"{ip} is a broadcast address, which may not be assigned to an interface."
+msgstr "{ip} はブロードキャストアドレスで、インタフェースに割り当てることはできません。"
+
+#: ipam/models/ip.py:875
#, python-brace-format
msgid "Duplicate IP address found in {table}: {ipaddress}"
msgstr "重複した IP アドレスが見つかりました {table}: {ipaddress}"
-#: ipam/models/ip.py:883
+#: ipam/models/ip.py:902
msgid "Only IPv6 addresses can be assigned SLAAC status"
msgstr "SLAAC ステータスを割り当てることができるのは IPv6 アドレスのみです"
@@ -9224,7 +9225,7 @@ msgstr "[仮想マシン]"
#: templates/virtualization/virtualmachine.html:177
#: templates/virtualization/virtualmachine/base.html:32
#: templates/virtualization/virtualmachine_list.html:21
-#: virtualization/tables/virtualmachines.py:90 virtualization/views.py:389
+#: virtualization/tables/virtualmachines.py:103 virtualization/views.py:389
msgid "Virtual Disks"
msgstr "仮想ディスク"
@@ -10140,8 +10141,8 @@ msgstr "スケジューリング"
#: templates/core/job.html:66
#, python-format
-msgid "every %(interval)s seconds"
-msgstr "ごと %(interval)s 秒"
+msgid "every %(interval)s minutes"
+msgstr "ごと %(interval)s 分"
#: templates/dcim/bulk_disconnect.html:9
#, python-format
@@ -12651,65 +12652,65 @@ msgstr "このオブジェクトタイプでは制約はサポートされてい
msgid "Invalid filter for {model}: {error}"
msgstr "のフィルタが無効です {model}: {error}"
-#: users/models.py:54
+#: users/models.py:55
msgid "user"
msgstr "ユーザ"
-#: users/models.py:55
+#: users/models.py:56
msgid "users"
msgstr "ユーザ"
-#: users/models.py:66
+#: users/models.py:67
msgid "A user with this username already exists."
msgstr "このユーザ名のユーザはすでに存在します。"
-#: users/models.py:78 vpn/models/crypto.py:42
+#: users/models.py:79 vpn/models/crypto.py:42
msgid "group"
msgstr "グループ"
-#: users/models.py:79
+#: users/models.py:80
msgid "groups"
msgstr "グループ"
-#: users/models.py:106 users/models.py:107
+#: users/models.py:107 users/models.py:108
msgid "user preferences"
msgstr "ユーザプリファレンス"
-#: users/models.py:174
+#: users/models.py:175
#, python-brace-format
msgid "Key '{path}' is a leaf node; cannot assign new keys"
msgstr "キー '{path}'はリーフノードです。新しいキーを割り当てることはできません"
-#: users/models.py:186
+#: users/models.py:187
#, python-brace-format
msgid "Key '{path}' is a dictionary; cannot assign a non-dictionary value"
msgstr "キー '{path}'はディクショナリです。ディクショナリ以外の値は割り当てられません"
-#: users/models.py:252
+#: users/models.py:253
msgid "expires"
msgstr "期限切れ"
-#: users/models.py:257
+#: users/models.py:258
msgid "last used"
msgstr "最終使用日"
-#: users/models.py:262
+#: users/models.py:263
msgid "key"
msgstr "キー"
-#: users/models.py:268
+#: users/models.py:269
msgid "write enabled"
msgstr "書き込み有効"
-#: users/models.py:270
+#: users/models.py:271
msgid "Permit create/update/delete operations using this key"
msgstr "このキーを使用して作成/更新/削除操作を許可する"
-#: users/models.py:281
+#: users/models.py:282
msgid "allowed IPs"
msgstr "許可された IP"
-#: users/models.py:283
+#: users/models.py:284
msgid ""
"Allowed IPv4/IPv6 networks from where the token can be used. Leave blank for"
" no restrictions. Ex: \"10.1.1.0/24, 192.168.10.16/32, 2001:DB8:1::/64\""
@@ -12718,32 +12719,32 @@ msgstr ""
"ネットワーク。制限がない場合は空白のままにしてください。例:10.1.1.0/24、192.168.10.16/32、2001: DB 8:1:: "
"/64\""
-#: users/models.py:291
+#: users/models.py:296
msgid "token"
msgstr "トークン"
-#: users/models.py:292
+#: users/models.py:297
msgid "tokens"
msgstr "トークン"
-#: users/models.py:373
+#: users/models.py:378
msgid "The list of actions granted by this permission"
msgstr "この権限によって付与されたアクションのリスト"
-#: users/models.py:378
+#: users/models.py:383
msgid "constraints"
msgstr "制約"
-#: users/models.py:379
+#: users/models.py:384
msgid ""
"Queryset filter matching the applicable objects of the selected type(s)"
msgstr "選択したタイプの該当するオブジェクトに一致するクエリーセットフィルタ"
-#: users/models.py:386
+#: users/models.py:391
msgid "permission"
msgstr "許可"
-#: users/models.py:387
+#: users/models.py:392
msgid "permissions"
msgstr "許可"
@@ -13000,43 +13001,50 @@ msgid ""
"the object's change log for details."
msgstr "このオブジェクトは、フォームがレンダリングされてから変更されました。詳細については、オブジェクトの変更ログを参照してください。"
-#: utilities/forms/utils.py:42 utilities/forms/utils.py:65
-#: utilities/forms/utils.py:77 utilities/forms/utils.py:80
+#: utilities/forms/utils.py:42 utilities/forms/utils.py:68
+#: utilities/forms/utils.py:85 utilities/forms/utils.py:87
#, python-brace-format
msgid "Range \"{value}\" is invalid."
msgstr "レンジ」{value}「は無効です。"
-#: utilities/forms/utils.py:225
+#: utilities/forms/utils.py:74
+#, python-brace-format
+msgid ""
+"Invalid range: Ending value ({end}) must be greater than beginning value "
+"({begin})."
+msgstr "範囲が無効です:終了値 ({end}) は開始値 () より大きくなければなりません{begin})。"
+
+#: utilities/forms/utils.py:232
#, python-brace-format
msgid "Duplicate or conflicting column header for \"{field}\""
msgstr "「」の列ヘッダーが重複しているか、重複しています{field}」"
-#: utilities/forms/utils.py:231
+#: utilities/forms/utils.py:238
#, python-brace-format
msgid "Duplicate or conflicting column header for \"{header}\""
msgstr "「」の列ヘッダーが重複しているか、重複しています{header}」"
-#: utilities/forms/utils.py:240
+#: utilities/forms/utils.py:247
#, python-brace-format
msgid "Row {row}: Expected {count_expected} columns but found {count_found}"
msgstr "行 {row}: 期待 {count_expected} 列が見つかりましたが {count_found}"
-#: utilities/forms/utils.py:263
+#: utilities/forms/utils.py:270
#, python-brace-format
msgid "Unexpected column header \"{field}\" found."
msgstr "予期しない列ヘッダー」{field}「が見つかりました。"
-#: utilities/forms/utils.py:265
+#: utilities/forms/utils.py:272
#, python-brace-format
msgid "Column \"{field}\" is not a related object; cannot use dots"
msgstr "コラム」{field}\"は関連オブジェクトではありません。ドットは使用できません"
-#: utilities/forms/utils.py:269
+#: utilities/forms/utils.py:276
#, python-brace-format
msgid "Invalid related object attribute for column \"{field}\": {to_field}"
msgstr "列 \"の関連オブジェクト属性が無効です{field}「: {to_field}"
-#: utilities/forms/utils.py:277
+#: utilities/forms/utils.py:284
#, python-brace-format
msgid "Required column header \"{header}\" not found."
msgstr "必須の列ヘッダー」{header}「が見つかりません。"
@@ -13648,6 +13656,11 @@ msgstr "提案"
msgid "Assigned Object Type"
msgstr "割当オブジェクトタイプ"
+#: vpn/forms/model_forms.py:94 vpn/forms/model_forms.py:129
+#: vpn/forms/model_forms.py:241 vpn/tables/tunnels.py:91
+msgid "Tunnel interface"
+msgstr "トンネルインターフェイス"
+
#: vpn/forms/model_forms.py:147
msgid "First Termination"
msgstr "1 回目の解約"
diff --git a/netbox/translations/pt/LC_MESSAGES/django.mo b/netbox/translations/pt/LC_MESSAGES/django.mo
index 04bb56897..ad8ae9463 100644
Binary files a/netbox/translations/pt/LC_MESSAGES/django.mo and b/netbox/translations/pt/LC_MESSAGES/django.mo differ
diff --git a/netbox/translations/pt/LC_MESSAGES/django.po b/netbox/translations/pt/LC_MESSAGES/django.po
index 6ee21865d..5e6b470e5 100644
--- a/netbox/translations/pt/LC_MESSAGES/django.po
+++ b/netbox/translations/pt/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-21 19:48+0000\n"
+"POT-Creation-Date: 2024-04-04 19:11+0000\n"
"PO-Revision-Date: 2023-10-30 17:48+0000\n"
"Last-Translator: Jeremy Stretch, 2024\n"
"Language-Team: Portuguese (https://app.transifex.com/netbox-community/teams/178115/pt/)\n"
@@ -64,8 +64,8 @@ msgid "Your preferences have been updated."
msgstr "Suas preferências foram atualizadas."
#: circuits/choices.py:21 dcim/choices.py:20 dcim/choices.py:102
-#: dcim/choices.py:174 dcim/choices.py:220 dcim/choices.py:1419
-#: dcim/choices.py:1495 dcim/choices.py:1545 virtualization/choices.py:20
+#: dcim/choices.py:174 dcim/choices.py:220 dcim/choices.py:1425
+#: dcim/choices.py:1501 dcim/choices.py:1551 virtualization/choices.py:20
#: virtualization/choices.py:45 vpn/choices.py:18
msgid "Planned"
msgstr "Planejado"
@@ -75,8 +75,8 @@ msgid "Provisioning"
msgstr "Provisionamento"
#: circuits/choices.py:23 dcim/choices.py:22 dcim/choices.py:103
-#: dcim/choices.py:173 dcim/choices.py:219 dcim/choices.py:1494
-#: dcim/choices.py:1544 extras/tables/tables.py:380 ipam/choices.py:31
+#: dcim/choices.py:173 dcim/choices.py:219 dcim/choices.py:1500
+#: dcim/choices.py:1550 extras/tables/tables.py:380 ipam/choices.py:31
#: ipam/choices.py:49 ipam/choices.py:69 ipam/choices.py:154
#: templates/extras/configcontext.html:26 templates/users/user.html:38
#: users/forms/bulk_edit.py:36 virtualization/choices.py:22
@@ -85,7 +85,7 @@ msgid "Active"
msgstr "Ativo"
#: circuits/choices.py:24 dcim/choices.py:172 dcim/choices.py:218
-#: dcim/choices.py:1493 dcim/choices.py:1546 virtualization/choices.py:24
+#: dcim/choices.py:1499 dcim/choices.py:1552 virtualization/choices.py:24
#: virtualization/choices.py:43
msgid "Offline"
msgstr "Off-line"
@@ -98,7 +98,7 @@ msgstr "Desprovisionamento"
msgid "Decommissioned"
msgstr "Desativado"
-#: circuits/filtersets.py:29 circuits/filtersets.py:184 dcim/filtersets.py:124
+#: circuits/filtersets.py:29 circuits/filtersets.py:190 dcim/filtersets.py:124
#: dcim/filtersets.py:185 dcim/filtersets.py:260 dcim/filtersets.py:369
#: dcim/filtersets.py:903 dcim/filtersets.py:1207 dcim/filtersets.py:1702
#: dcim/filtersets.py:1945 dcim/filtersets.py:2003 ipam/filtersets.py:305
@@ -107,7 +107,7 @@ msgstr "Desativado"
msgid "Region (ID)"
msgstr "Região (ID)"
-#: circuits/filtersets.py:36 circuits/filtersets.py:191 dcim/filtersets.py:130
+#: circuits/filtersets.py:36 circuits/filtersets.py:197 dcim/filtersets.py:130
#: dcim/filtersets.py:192 dcim/filtersets.py:267 dcim/filtersets.py:376
#: dcim/filtersets.py:910 dcim/filtersets.py:1214 dcim/filtersets.py:1709
#: dcim/filtersets.py:1952 dcim/filtersets.py:2010 extras/filtersets.py:414
@@ -117,7 +117,7 @@ msgstr "Região (ID)"
msgid "Region (slug)"
msgstr "Região (slug)"
-#: circuits/filtersets.py:42 circuits/filtersets.py:197 dcim/filtersets.py:198
+#: circuits/filtersets.py:42 circuits/filtersets.py:203 dcim/filtersets.py:198
#: dcim/filtersets.py:273 dcim/filtersets.py:382 dcim/filtersets.py:916
#: dcim/filtersets.py:1220 dcim/filtersets.py:1715 dcim/filtersets.py:1958
#: dcim/filtersets.py:2016 ipam/filtersets.py:318 ipam/filtersets.py:909
@@ -125,7 +125,7 @@ msgstr "Região (slug)"
msgid "Site group (ID)"
msgstr "Grupo de sites (ID)"
-#: circuits/filtersets.py:49 circuits/filtersets.py:204 dcim/filtersets.py:205
+#: circuits/filtersets.py:49 circuits/filtersets.py:210 dcim/filtersets.py:205
#: dcim/filtersets.py:280 dcim/filtersets.py:389 dcim/filtersets.py:923
#: dcim/filtersets.py:1227 dcim/filtersets.py:1722 dcim/filtersets.py:1965
#: dcim/filtersets.py:2023 extras/filtersets.py:420 ipam/filtersets.py:325
@@ -135,7 +135,7 @@ msgid "Site group (slug)"
msgstr "Grupo de sites (slug)"
#: circuits/filtersets.py:54 circuits/forms/bulk_import.py:117
-#: circuits/forms/filtersets.py:47 circuits/forms/filtersets.py:171
+#: circuits/forms/filtersets.py:47 circuits/forms/filtersets.py:167
#: circuits/forms/model_forms.py:137 dcim/forms/bulk_edit.py:166
#: dcim/forms/bulk_edit.py:238 dcim/forms/bulk_edit.py:570
#: dcim/forms/bulk_edit.py:763 dcim/forms/bulk_import.py:130
@@ -158,8 +158,8 @@ msgstr "Grupo de sites (slug)"
#: ipam/forms/bulk_import.py:170 ipam/forms/bulk_import.py:437
#: ipam/forms/filtersets.py:152 ipam/forms/filtersets.py:226
#: ipam/forms/filtersets.py:417 ipam/forms/filtersets.py:470
-#: ipam/forms/model_forms.py:206 ipam/forms/model_forms.py:548
-#: ipam/forms/model_forms.py:640 ipam/tables/ip.py:244
+#: ipam/forms/model_forms.py:206 ipam/forms/model_forms.py:552
+#: ipam/forms/model_forms.py:644 ipam/tables/ip.py:244
#: ipam/tables/vlans.py:114 ipam/tables/vlans.py:216
#: templates/circuits/circuittermination_edit.html:20
#: templates/circuits/inc/circuit_termination.html:33
@@ -181,13 +181,13 @@ msgstr "Grupo de sites (slug)"
#: virtualization/forms/model_forms.py:107
#: virtualization/forms/model_forms.py:174
#: virtualization/tables/clusters.py:77
-#: virtualization/tables/virtualmachines.py:53 vpn/forms/filtersets.py:262
+#: virtualization/tables/virtualmachines.py:62 vpn/forms/filtersets.py:262
#: wireless/forms/model_forms.py:77 wireless/forms/model_forms.py:117
msgid "Site"
msgstr "Site"
-#: circuits/filtersets.py:60 circuits/filtersets.py:215
-#: circuits/filtersets.py:252 dcim/filtersets.py:215 dcim/filtersets.py:290
+#: circuits/filtersets.py:60 circuits/filtersets.py:221
+#: circuits/filtersets.py:258 dcim/filtersets.py:215 dcim/filtersets.py:290
#: dcim/filtersets.py:363 extras/filtersets.py:436 ipam/filtersets.py:215
#: ipam/filtersets.py:335 ipam/filtersets.py:926
#: virtualization/filtersets.py:75 virtualization/filtersets.py:203
@@ -199,33 +199,39 @@ msgstr "Site (slug)"
msgid "ASN (ID)"
msgstr "ASN (ID)"
-#: circuits/filtersets.py:87 circuits/filtersets.py:114
-#: circuits/filtersets.py:148
-msgid "Provider (ID)"
-msgstr "Provedor (ID)"
+#: circuits/filtersets.py:71 circuits/forms/filtersets.py:27
+#: ipam/forms/model_forms.py:158 ipam/models/asns.py:108
+#: ipam/models/asns.py:125 ipam/tables/asn.py:41 templates/ipam/asn.html:20
+msgid "ASN"
+msgstr "ASN"
#: circuits/filtersets.py:93 circuits/filtersets.py:120
#: circuits/filtersets.py:154
+msgid "Provider (ID)"
+msgstr "Provedor (ID)"
+
+#: circuits/filtersets.py:99 circuits/filtersets.py:126
+#: circuits/filtersets.py:160
msgid "Provider (slug)"
msgstr "Provedor (slug)"
-#: circuits/filtersets.py:159
+#: circuits/filtersets.py:165
msgid "Provider account (ID)"
msgstr "Conta do provedor (ID)"
-#: circuits/filtersets.py:164
+#: circuits/filtersets.py:170
msgid "Provider network (ID)"
msgstr "Rede do provedor (ID)"
-#: circuits/filtersets.py:168
+#: circuits/filtersets.py:174
msgid "Circuit type (ID)"
msgstr "Tipo de circuito (ID)"
-#: circuits/filtersets.py:174
+#: circuits/filtersets.py:180
msgid "Circuit type (slug)"
msgstr "Tipo de circuito (slug)"
-#: circuits/filtersets.py:209 circuits/filtersets.py:246
+#: circuits/filtersets.py:215 circuits/filtersets.py:252
#: dcim/filtersets.py:209 dcim/filtersets.py:284 dcim/filtersets.py:357
#: dcim/filtersets.py:927 dcim/filtersets.py:1232 dcim/filtersets.py:1727
#: dcim/filtersets.py:1969 dcim/filtersets.py:2028 ipam/filtersets.py:209
@@ -235,13 +241,13 @@ msgstr "Tipo de circuito (slug)"
msgid "Site (ID)"
msgstr "Site (ID)"
-#: circuits/filtersets.py:238 core/filtersets.py:73 core/filtersets.py:132
+#: circuits/filtersets.py:244 core/filtersets.py:73 core/filtersets.py:132
#: dcim/filtersets.py:640 dcim/filtersets.py:1201 dcim/filtersets.py:2076
#: extras/filtersets.py:40 extras/filtersets.py:69 extras/filtersets.py:101
#: extras/filtersets.py:140 extras/filtersets.py:168 extras/filtersets.py:195
#: extras/filtersets.py:226 extras/filtersets.py:295 extras/filtersets.py:343
#: extras/filtersets.py:403 extras/filtersets.py:562 extras/filtersets.py:604
-#: extras/filtersets.py:645 ipam/forms/model_forms.py:430
+#: extras/filtersets.py:645 ipam/forms/model_forms.py:416
#: netbox/filtersets.py:275 netbox/forms/__init__.py:23
#: netbox/forms/base.py:163 templates/htmx/object_selector.html:28
#: templates/inc/filter_list.html:53 templates/ipam/ipaddress_assign.html:32
@@ -251,7 +257,7 @@ msgstr "Site (ID)"
msgid "Search"
msgstr "Busca"
-#: circuits/filtersets.py:242 circuits/forms/bulk_edit.py:167
+#: circuits/filtersets.py:248 circuits/forms/bulk_edit.py:167
#: circuits/forms/model_forms.py:110 circuits/forms/model_forms.py:132
#: dcim/forms/connections.py:66 templates/circuits/circuit.html:15
#: templates/dcim/inc/cable_termination.html:55
@@ -259,11 +265,11 @@ msgstr "Busca"
msgid "Circuit"
msgstr "Circuito"
-#: circuits/filtersets.py:256
+#: circuits/filtersets.py:262
msgid "ProviderNetwork (ID)"
msgstr "Rede do provedor (ID)"
-#: circuits/forms/bulk_edit.py:25 circuits/forms/filtersets.py:56
+#: circuits/forms/bulk_edit.py:25 circuits/forms/filtersets.py:52
#: circuits/forms/model_forms.py:26 circuits/tables/providers.py:33
#: dcim/forms/bulk_edit.py:126 dcim/forms/filtersets.py:187
#: dcim/forms/model_forms.py:126 dcim/tables/sites.py:94
@@ -374,8 +380,8 @@ msgstr "Descrição"
#: circuits/forms/bulk_edit.py:46 circuits/forms/bulk_edit.py:68
#: circuits/forms/bulk_edit.py:118 circuits/forms/bulk_import.py:35
#: circuits/forms/bulk_import.py:50 circuits/forms/bulk_import.py:76
-#: circuits/forms/filtersets.py:70 circuits/forms/filtersets.py:88
-#: circuits/forms/filtersets.py:116 circuits/forms/filtersets.py:131
+#: circuits/forms/filtersets.py:66 circuits/forms/filtersets.py:84
+#: circuits/forms/filtersets.py:112 circuits/forms/filtersets.py:127
#: circuits/forms/model_forms.py:32 circuits/forms/model_forms.py:44
#: circuits/forms/model_forms.py:58 circuits/forms/model_forms.py:92
#: circuits/tables/circuits.py:55 circuits/tables/providers.py:72
@@ -387,18 +393,18 @@ msgstr "Descrição"
msgid "Provider"
msgstr "Provedor"
-#: circuits/forms/bulk_edit.py:75 circuits/forms/filtersets.py:91
+#: circuits/forms/bulk_edit.py:75 circuits/forms/filtersets.py:87
#: templates/circuits/providernetwork.html:31
msgid "Service ID"
msgstr "ID do serviço"
-#: circuits/forms/bulk_edit.py:95 circuits/forms/filtersets.py:107
+#: circuits/forms/bulk_edit.py:95 circuits/forms/filtersets.py:103
#: dcim/forms/bulk_edit.py:204 dcim/forms/bulk_edit.py:500
#: dcim/forms/bulk_edit.py:694 dcim/forms/bulk_edit.py:1063
#: dcim/forms/bulk_edit.py:1090 dcim/forms/bulk_edit.py:1562
#: dcim/forms/filtersets.py:977 dcim/forms/filtersets.py:1353
-#: dcim/forms/filtersets.py:1374 dcim/tables/devices.py:722
-#: dcim/tables/devices.py:782 dcim/tables/devices.py:1009
+#: dcim/forms/filtersets.py:1374 dcim/tables/devices.py:726
+#: dcim/tables/devices.py:786 dcim/tables/devices.py:1013
#: dcim/tables/devicetypes.py:245 dcim/tables/devicetypes.py:260
#: dcim/tables/racks.py:32 extras/forms/bulk_edit.py:259
#: extras/tables/tables.py:328 templates/circuits/circuittype.html:33
@@ -410,7 +416,7 @@ msgid "Color"
msgstr "Cor"
#: circuits/forms/bulk_edit.py:113 circuits/forms/bulk_import.py:89
-#: circuits/forms/filtersets.py:126 core/forms/bulk_edit.py:17
+#: circuits/forms/filtersets.py:122 core/forms/bulk_edit.py:17
#: core/forms/filtersets.py:29 core/tables/data.py:20 core/tables/jobs.py:18
#: dcim/forms/bulk_edit.py:281 dcim/forms/bulk_edit.py:672
#: dcim/forms/bulk_edit.py:811 dcim/forms/bulk_edit.py:879
@@ -429,7 +435,7 @@ msgstr "Cor"
#: dcim/forms/filtersets.py:1253 dcim/forms/filtersets.py:1348
#: dcim/forms/filtersets.py:1369 dcim/forms/object_import.py:89
#: dcim/forms/object_import.py:118 dcim/forms/object_import.py:150
-#: dcim/tables/devices.py:211 dcim/tables/devices.py:838
+#: dcim/tables/devices.py:211 dcim/tables/devices.py:842
#: dcim/tables/power.py:77 extras/forms/bulk_import.py:39
#: extras/tables/tables.py:278 extras/tables/tables.py:350
#: extras/tables/tables.py:448 netbox/tables/tables.py:234
@@ -454,12 +460,12 @@ msgid "Type"
msgstr "Tipo"
#: circuits/forms/bulk_edit.py:123 circuits/forms/bulk_import.py:82
-#: circuits/forms/filtersets.py:139 circuits/forms/model_forms.py:97
+#: circuits/forms/filtersets.py:135 circuits/forms/model_forms.py:97
msgid "Provider account"
msgstr "Conta do provedor"
#: circuits/forms/bulk_edit.py:131 circuits/forms/bulk_import.py:95
-#: circuits/forms/filtersets.py:150 core/forms/filtersets.py:34
+#: circuits/forms/filtersets.py:146 core/forms/filtersets.py:34
#: core/forms/filtersets.py:75 core/tables/data.py:23 core/tables/jobs.py:26
#: dcim/forms/bulk_edit.py:104 dcim/forms/bulk_edit.py:179
#: dcim/forms/bulk_edit.py:260 dcim/forms/bulk_edit.py:593
@@ -473,8 +479,8 @@ msgstr "Conta do provedor"
#: dcim/forms/filtersets.py:281 dcim/forms/filtersets.py:726
#: dcim/forms/filtersets.py:835 dcim/forms/filtersets.py:871
#: dcim/forms/filtersets.py:972 dcim/forms/filtersets.py:1083
-#: dcim/tables/devices.py:173 dcim/tables/devices.py:841
-#: dcim/tables/devices.py:1069 dcim/tables/modules.py:69
+#: dcim/tables/devices.py:173 dcim/tables/devices.py:845
+#: dcim/tables/devices.py:1073 dcim/tables/modules.py:69
#: dcim/tables/power.py:74 dcim/tables/racks.py:66 dcim/tables/sites.py:82
#: dcim/tables/sites.py:133 ipam/forms/bulk_edit.py:240
#: ipam/forms/bulk_edit.py:289 ipam/forms/bulk_edit.py:337
@@ -482,7 +488,7 @@ msgstr "Conta do provedor"
#: ipam/forms/bulk_import.py:256 ipam/forms/bulk_import.py:292
#: ipam/forms/bulk_import.py:458 ipam/forms/filtersets.py:205
#: ipam/forms/filtersets.py:270 ipam/forms/filtersets.py:341
-#: ipam/forms/filtersets.py:482 ipam/forms/model_forms.py:449
+#: ipam/forms/filtersets.py:482 ipam/forms/model_forms.py:435
#: ipam/tables/ip.py:236 ipam/tables/ip.py:309 ipam/tables/ip.py:359
#: ipam/tables/ip.py:421 ipam/tables/ip.py:448 ipam/tables/vlans.py:122
#: ipam/tables/vlans.py:227 templates/circuits/circuit.html:35
@@ -503,7 +509,7 @@ msgstr "Conta do provedor"
#: virtualization/forms/bulk_import.py:80
#: virtualization/forms/filtersets.py:61
#: virtualization/forms/filtersets.py:156 virtualization/tables/clusters.py:74
-#: virtualization/tables/virtualmachines.py:50 vpn/forms/bulk_edit.py:38
+#: virtualization/tables/virtualmachines.py:59 vpn/forms/bulk_edit.py:38
#: vpn/forms/bulk_import.py:37 vpn/forms/filtersets.py:46
#: vpn/tables/tunnels.py:48 wireless/forms/bulk_edit.py:42
#: wireless/forms/bulk_edit.py:104 wireless/forms/bulk_import.py:43
@@ -514,7 +520,7 @@ msgid "Status"
msgstr "Status"
#: circuits/forms/bulk_edit.py:137 circuits/forms/bulk_import.py:100
-#: circuits/forms/filtersets.py:119 dcim/forms/bulk_edit.py:120
+#: circuits/forms/filtersets.py:115 dcim/forms/bulk_edit.py:120
#: dcim/forms/bulk_edit.py:185 dcim/forms/bulk_edit.py:255
#: dcim/forms/bulk_edit.py:366 dcim/forms/bulk_edit.py:583
#: dcim/forms/bulk_edit.py:684 dcim/forms/bulk_edit.py:1590
@@ -572,15 +578,15 @@ msgstr "Status"
msgid "Tenant"
msgstr "Inquilino"
-#: circuits/forms/bulk_edit.py:142 circuits/forms/filtersets.py:174
+#: circuits/forms/bulk_edit.py:142 circuits/forms/filtersets.py:170
msgid "Install date"
msgstr "Data de instalação"
-#: circuits/forms/bulk_edit.py:147 circuits/forms/filtersets.py:179
+#: circuits/forms/bulk_edit.py:147 circuits/forms/filtersets.py:175
msgid "Termination date"
msgstr "Data de rescisão"
-#: circuits/forms/bulk_edit.py:153 circuits/forms/filtersets.py:186
+#: circuits/forms/bulk_edit.py:153 circuits/forms/filtersets.py:182
msgid "Commit rate (Kbps)"
msgstr "Taxa de confirmação (Kbps)"
@@ -613,7 +619,7 @@ msgstr "Provedor atribuído"
#: circuits/forms/bulk_import.py:70 dcim/forms/bulk_import.py:178
#: dcim/forms/bulk_import.py:388 dcim/forms/bulk_import.py:1108
-#: dcim/forms/bulk_import.py:1187 extras/forms/bulk_import.py:229
+#: dcim/forms/bulk_import.py:1187 extras/forms/bulk_import.py:235
msgid "RGB color in hexadecimal. Example:"
msgstr "Cor RGB em hexadecimal. Exemplo:"
@@ -649,12 +655,12 @@ msgstr "Status operacional"
msgid "Assigned tenant"
msgstr "Inquilino designado"
-#: circuits/forms/bulk_import.py:123 circuits/forms/filtersets.py:147
+#: circuits/forms/bulk_import.py:123 circuits/forms/filtersets.py:143
#: circuits/forms/model_forms.py:143
msgid "Provider network"
msgstr "Rede de provedores"
-#: circuits/forms/filtersets.py:26 circuits/forms/filtersets.py:118
+#: circuits/forms/filtersets.py:26 circuits/forms/filtersets.py:114
#: dcim/forms/bulk_edit.py:247 dcim/forms/bulk_edit.py:345
#: dcim/forms/bulk_edit.py:575 dcim/forms/bulk_edit.py:622
#: dcim/forms/bulk_edit.py:772 dcim/forms/bulk_import.py:189
@@ -678,7 +684,7 @@ msgstr "Rede de provedores"
#: extras/filtersets.py:441 extras/forms/filtersets.py:328
#: ipam/forms/bulk_edit.py:456 ipam/forms/filtersets.py:168
#: ipam/forms/filtersets.py:400 ipam/forms/filtersets.py:422
-#: ipam/forms/filtersets.py:448 ipam/forms/model_forms.py:560
+#: ipam/forms/filtersets.py:448 ipam/forms/model_forms.py:564
#: templates/dcim/device.html:26 templates/dcim/device_edit.html:30
#: templates/dcim/inc/cable_termination.html:12
#: templates/dcim/location.html:27 templates/dcim/powerpanel.html:27
@@ -688,13 +694,7 @@ msgstr "Rede de provedores"
msgid "Location"
msgstr "Localização"
-#: circuits/forms/filtersets.py:27 ipam/forms/model_forms.py:158
-#: ipam/models/asns.py:108 ipam/models/asns.py:125 ipam/tables/asn.py:41
-#: templates/ipam/asn.html:20
-msgid "ASN"
-msgstr "ASN"
-
-#: circuits/forms/filtersets.py:28 circuits/forms/filtersets.py:120
+#: circuits/forms/filtersets.py:28 circuits/forms/filtersets.py:116
#: dcim/forms/filtersets.py:136 dcim/forms/filtersets.py:150
#: dcim/forms/filtersets.py:166 dcim/forms/filtersets.py:198
#: dcim/forms/filtersets.py:249 dcim/forms/filtersets.py:334
@@ -707,7 +707,7 @@ msgstr "ASN"
msgid "Contacts"
msgstr "Contatos"
-#: circuits/forms/filtersets.py:33 circuits/forms/filtersets.py:157
+#: circuits/forms/filtersets.py:33 circuits/forms/filtersets.py:153
#: dcim/forms/bulk_edit.py:110 dcim/forms/bulk_edit.py:222
#: dcim/forms/bulk_edit.py:747 dcim/forms/bulk_import.py:92
#: dcim/forms/filtersets.py:70 dcim/forms/filtersets.py:177
@@ -722,7 +722,7 @@ msgstr "Contatos"
#: ipam/forms/bulk_edit.py:205 ipam/forms/bulk_edit.py:437
#: ipam/forms/bulk_edit.py:509 ipam/forms/filtersets.py:212
#: ipam/forms/filtersets.py:407 ipam/forms/filtersets.py:456
-#: ipam/forms/model_forms.py:532 templates/dcim/device.html:18
+#: ipam/forms/model_forms.py:536 templates/dcim/device.html:18
#: templates/dcim/rack.html:19 templates/dcim/rackreservation.html:25
#: templates/dcim/region.html:26 templates/dcim/site.html:31
#: templates/ipam/prefix.html:50 templates/ipam/vlan.html:19
@@ -732,7 +732,7 @@ msgstr "Contatos"
msgid "Region"
msgstr "Região"
-#: circuits/forms/filtersets.py:38 circuits/forms/filtersets.py:162
+#: circuits/forms/filtersets.py:38 circuits/forms/filtersets.py:158
#: dcim/forms/bulk_edit.py:230 dcim/forms/bulk_edit.py:755
#: dcim/forms/filtersets.py:75 dcim/forms/filtersets.py:182
#: dcim/forms/filtersets.py:208 dcim/forms/filtersets.py:269
@@ -742,19 +742,15 @@ msgstr "Região"
#: extras/filtersets.py:425 ipam/forms/bulk_edit.py:210
#: ipam/forms/bulk_edit.py:444 ipam/forms/bulk_edit.py:514
#: ipam/forms/filtersets.py:217 ipam/forms/filtersets.py:412
-#: ipam/forms/filtersets.py:461 ipam/forms/model_forms.py:545
+#: ipam/forms/filtersets.py:461 ipam/forms/model_forms.py:549
#: virtualization/forms/bulk_edit.py:85 virtualization/forms/filtersets.py:68
#: virtualization/forms/filtersets.py:134
#: virtualization/forms/model_forms.py:101
msgid "Site group"
msgstr "Grupo de sites"
-#: circuits/forms/filtersets.py:51
-msgid "ASN (legacy)"
-msgstr "ASN (legado)"
-
-#: circuits/forms/filtersets.py:65 circuits/forms/filtersets.py:83
-#: circuits/forms/filtersets.py:102 circuits/forms/filtersets.py:117
+#: circuits/forms/filtersets.py:61 circuits/forms/filtersets.py:79
+#: circuits/forms/filtersets.py:98 circuits/forms/filtersets.py:113
#: core/forms/filtersets.py:63 dcim/forms/bulk_edit.py:718
#: dcim/forms/filtersets.py:164 dcim/forms/filtersets.py:196
#: dcim/forms/filtersets.py:825 dcim/forms/filtersets.py:920
@@ -780,7 +776,7 @@ msgstr "ASN (legado)"
msgid "Attributes"
msgstr "Atributos"
-#: circuits/forms/filtersets.py:73 circuits/tables/circuits.py:60
+#: circuits/forms/filtersets.py:69 circuits/tables/circuits.py:60
#: circuits/tables/providers.py:66 templates/circuits/circuit.html:23
#: templates/circuits/provideraccount.html:25
msgid "Account"
@@ -801,7 +797,7 @@ msgstr "Tipo de circuito"
#: dcim/models/device_component_templates.py:491
#: dcim/models/device_component_templates.py:591
#: dcim/models/device_components.py:976 dcim/models/device_components.py:1050
-#: dcim/models/device_components.py:1166 dcim/models/devices.py:467
+#: dcim/models/device_components.py:1166 dcim/models/devices.py:469
#: dcim/models/racks.py:43 extras/models/tags.py:28
msgid "color"
msgstr "cor"
@@ -823,8 +819,8 @@ msgid "Unique circuit ID"
msgstr "ID de circuito exclusivo"
#: circuits/models/circuits.py:67 core/models/data.py:55
-#: core/models/jobs.py:85 dcim/models/cables.py:49 dcim/models/devices.py:641
-#: dcim/models/devices.py:1165 dcim/models/devices.py:1374
+#: core/models/jobs.py:85 dcim/models/cables.py:49 dcim/models/devices.py:643
+#: dcim/models/devices.py:1170 dcim/models/devices.py:1379
#: dcim/models/power.py:95 dcim/models/racks.py:97 dcim/models/sites.py:154
#: dcim/models/sites.py:266 ipam/models/ip.py:252 ipam/models/ip.py:521
#: ipam/models/ip.py:729 ipam/models/vlans.py:175
@@ -903,7 +899,7 @@ msgstr "ID do painel de patch e número (s) de porta"
#: extras/models/models.py:541 extras/models/staging.py:31
#: extras/models/tags.py:32 netbox/models/__init__.py:109
#: netbox/models/__init__.py:144 netbox/models/__init__.py:190
-#: users/models.py:273 users/models.py:348
+#: users/models.py:274 users/models.py:353
#: virtualization/models/virtualmachines.py:282
msgid "description"
msgstr "descrição"
@@ -933,8 +929,8 @@ msgstr ""
#: circuits/models/providers.py:22 circuits/models/providers.py:66
#: circuits/models/providers.py:104 core/models/data.py:42
#: core/models/jobs.py:46 dcim/models/device_component_templates.py:43
-#: dcim/models/device_components.py:54 dcim/models/devices.py:581
-#: dcim/models/devices.py:1305 dcim/models/devices.py:1370
+#: dcim/models/device_components.py:54 dcim/models/devices.py:583
+#: dcim/models/devices.py:1310 dcim/models/devices.py:1375
#: dcim/models/power.py:39 dcim/models/power.py:91 dcim/models/racks.py:62
#: dcim/models/sites.py:138 extras/models/configs.py:36
#: extras/models/configs.py:215 extras/models/customfields.py:89
@@ -947,7 +943,7 @@ msgstr ""
#: ipam/models/vrfs.py:79 netbox/models/__init__.py:136
#: netbox/models/__init__.py:180 tenancy/models/contacts.py:64
#: tenancy/models/tenants.py:20 tenancy/models/tenants.py:45
-#: users/models.py:344 virtualization/models/clusters.py:57
+#: users/models.py:349 virtualization/models/clusters.py:57
#: virtualization/models/virtualmachines.py:70
#: virtualization/models/virtualmachines.py:272 vpn/models/crypto.py:24
#: vpn/models/crypto.py:71 vpn/models/crypto.py:131 vpn/models/crypto.py:183
@@ -1005,13 +1001,13 @@ msgstr "redes de provedores"
#: core/tables/data.py:16 core/tables/jobs.py:14 dcim/forms/filtersets.py:60
#: dcim/forms/object_create.py:42 dcim/tables/devices.py:88
#: dcim/tables/devices.py:125 dcim/tables/devices.py:167
-#: dcim/tables/devices.py:318 dcim/tables/devices.py:400
-#: dcim/tables/devices.py:444 dcim/tables/devices.py:496
-#: dcim/tables/devices.py:548 dcim/tables/devices.py:668
-#: dcim/tables/devices.py:749 dcim/tables/devices.py:799
-#: dcim/tables/devices.py:865 dcim/tables/devices.py:980
-#: dcim/tables/devices.py:1000 dcim/tables/devices.py:1029
-#: dcim/tables/devices.py:1059 dcim/tables/devicetypes.py:32
+#: dcim/tables/devices.py:322 dcim/tables/devices.py:404
+#: dcim/tables/devices.py:448 dcim/tables/devices.py:500
+#: dcim/tables/devices.py:552 dcim/tables/devices.py:672
+#: dcim/tables/devices.py:753 dcim/tables/devices.py:803
+#: dcim/tables/devices.py:869 dcim/tables/devices.py:984
+#: dcim/tables/devices.py:1004 dcim/tables/devices.py:1033
+#: dcim/tables/devices.py:1063 dcim/tables/devicetypes.py:32
#: dcim/tables/power.py:22 dcim/tables/power.py:62 dcim/tables/racks.py:23
#: dcim/tables/racks.py:53 dcim/tables/sites.py:24 dcim/tables/sites.py:51
#: dcim/tables/sites.py:78 dcim/tables/sites.py:125
@@ -1077,9 +1073,9 @@ msgstr "redes de provedores"
#: virtualization/forms/object_create.py:23
#: virtualization/tables/clusters.py:17 virtualization/tables/clusters.py:39
#: virtualization/tables/clusters.py:62
-#: virtualization/tables/virtualmachines.py:45
-#: virtualization/tables/virtualmachines.py:119
-#: virtualization/tables/virtualmachines.py:172 vpn/tables/crypto.py:18
+#: virtualization/tables/virtualmachines.py:54
+#: virtualization/tables/virtualmachines.py:132
+#: virtualization/tables/virtualmachines.py:185 vpn/tables/crypto.py:18
#: vpn/tables/crypto.py:57 vpn/tables/crypto.py:93 vpn/tables/crypto.py:129
#: vpn/tables/crypto.py:158 vpn/tables/l2vpn.py:23 vpn/tables/tunnels.py:18
#: vpn/tables/tunnels.py:40 wireless/tables/wirelesslan.py:18
@@ -1114,7 +1110,7 @@ msgstr "Taxa de comprometimento"
#: circuits/tables/circuits.py:75 circuits/tables/providers.py:48
#: circuits/tables/providers.py:82 circuits/tables/providers.py:107
-#: dcim/tables/devices.py:1042 dcim/tables/devicetypes.py:92
+#: dcim/tables/devices.py:1046 dcim/tables/devicetypes.py:92
#: dcim/tables/modules.py:29 dcim/tables/modules.py:72 dcim/tables/power.py:39
#: dcim/tables/power.py:96 dcim/tables/racks.py:76 dcim/tables/racks.py:156
#: dcim/tables/sites.py:103 extras/forms/bulk_edit.py:320
@@ -1126,7 +1122,7 @@ msgstr "Taxa de comprometimento"
#: templates/inc/panels/comments.html:6 tenancy/tables/contacts.py:68
#: tenancy/tables/tenants.py:46 utilities/forms/fields/fields.py:29
#: virtualization/tables/clusters.py:91
-#: virtualization/tables/virtualmachines.py:68 vpn/tables/crypto.py:37
+#: virtualization/tables/virtualmachines.py:81 vpn/tables/crypto.py:37
#: vpn/tables/crypto.py:74 vpn/tables/crypto.py:109 vpn/tables/crypto.py:140
#: vpn/tables/crypto.py:173 vpn/tables/l2vpn.py:37 vpn/tables/tunnels.py:61
#: wireless/tables/wirelesslan.py:27 wireless/tables/wirelesslan.py:58
@@ -1163,7 +1159,7 @@ msgid "Completed"
msgstr "Concluído"
#: core/choices.py:22 core/choices.py:59 dcim/choices.py:176
-#: dcim/choices.py:222 dcim/choices.py:1496 extras/choices.py:212
+#: dcim/choices.py:222 dcim/choices.py:1502 extras/choices.py:212
#: virtualization/choices.py:47
msgid "Failed"
msgstr "Falhou"
@@ -1245,7 +1241,7 @@ msgstr "Fonte de dados (nome)"
#: core/forms/bulk_edit.py:24 core/forms/filtersets.py:39
#: core/tables/data.py:26 dcim/forms/bulk_edit.py:1012
#: dcim/forms/bulk_edit.py:1285 dcim/forms/filtersets.py:1270
-#: dcim/tables/devices.py:573 dcim/tables/devicetypes.py:221
+#: dcim/tables/devices.py:577 dcim/tables/devicetypes.py:221
#: extras/forms/bulk_edit.py:97 extras/forms/bulk_edit.py:161
#: extras/forms/bulk_edit.py:220 extras/forms/filtersets.py:119
#: extras/forms/filtersets.py:206 extras/forms/filtersets.py:267
@@ -1384,7 +1380,7 @@ msgstr ""
msgid "Rack Elevations"
msgstr "Elevações da cremalheira"
-#: core/forms/model_forms.py:148 dcim/choices.py:1407
+#: core/forms/model_forms.py:148 dcim/choices.py:1413
#: dcim/forms/bulk_edit.py:859 dcim/forms/bulk_edit.py:1242
#: dcim/forms/bulk_edit.py:1260 dcim/tables/racks.py:89
#: netbox/navigation/menu.py:276 netbox/navigation/menu.py:280
@@ -1445,7 +1441,7 @@ msgstr " (padrão)"
#: core/models/config.py:18 core/models/data.py:282 core/models/files.py:27
#: core/models/jobs.py:50 extras/models/models.py:760
-#: netbox/models/features.py:52 users/models.py:248
+#: netbox/models/features.py:52 users/models.py:249
msgid "created"
msgstr "criada"
@@ -1503,7 +1499,7 @@ msgstr "URL"
#: core/models/data.py:62 dcim/models/device_component_templates.py:392
#: dcim/models/device_components.py:513 extras/models/models.py:88
-#: extras/models/models.py:331 extras/models/models.py:556 users/models.py:353
+#: extras/models/models.py:331 extras/models/models.py:556 users/models.py:358
msgid "enabled"
msgstr "permitido"
@@ -1720,7 +1716,7 @@ msgid "Staging"
msgstr "Encenação"
#: dcim/choices.py:23 dcim/choices.py:178 dcim/choices.py:223
-#: dcim/choices.py:1420 virtualization/choices.py:23
+#: dcim/choices.py:1426 virtualization/choices.py:23
#: virtualization/choices.py:48
msgid "Decommissioning"
msgstr "Descomissionamento"
@@ -1780,7 +1776,7 @@ msgstr "Obsoleto"
msgid "Millimeters"
msgstr "Milímetros"
-#: dcim/choices.py:115 dcim/choices.py:1442
+#: dcim/choices.py:115 dcim/choices.py:1448
msgid "Inches"
msgstr "Polegadas"
@@ -1792,8 +1788,8 @@ msgstr "Polegadas"
#: dcim/forms/filtersets.py:226 dcim/forms/model_forms.py:73
#: dcim/forms/model_forms.py:94 dcim/forms/model_forms.py:172
#: dcim/forms/model_forms.py:962 dcim/forms/model_forms.py:1303
-#: dcim/forms/object_import.py:181 dcim/tables/devices.py:676
-#: dcim/tables/devices.py:960 extras/tables/tables.py:181
+#: dcim/forms/object_import.py:181 dcim/tables/devices.py:680
+#: dcim/tables/devices.py:964 extras/tables/tables.py:181
#: ipam/tables/fhrp.py:59 ipam/tables/ip.py:374 ipam/tables/services.py:44
#: templates/dcim/interface.html:105 templates/dcim/interface.html:321
#: templates/dcim/location.html:44 templates/dcim/region.html:38
@@ -1806,7 +1802,7 @@ msgstr "Polegadas"
#: tenancy/forms/bulk_import.py:58 tenancy/forms/model_forms.py:24
#: tenancy/forms/model_forms.py:69 virtualization/forms/bulk_edit.py:206
#: virtualization/forms/bulk_import.py:151
-#: virtualization/tables/virtualmachines.py:142 wireless/forms/bulk_edit.py:23
+#: virtualization/tables/virtualmachines.py:155 wireless/forms/bulk_edit.py:23
#: wireless/forms/bulk_import.py:21 wireless/forms/model_forms.py:20
msgid "Parent"
msgstr "Pai"
@@ -1855,7 +1851,7 @@ msgstr "Da direita para a esquerda"
msgid "Side to rear"
msgstr "De lado para trás"
-#: dcim/choices.py:198 dcim/choices.py:1215
+#: dcim/choices.py:198 dcim/choices.py:1221
msgid "Passive"
msgstr "Passivo"
@@ -1883,8 +1879,8 @@ msgstr "Internacional/ITA"
msgid "Proprietary"
msgstr "Proprietário"
-#: dcim/choices.py:534 dcim/choices.py:764 dcim/choices.py:1131
-#: dcim/choices.py:1133 dcim/choices.py:1338 dcim/choices.py:1340
+#: dcim/choices.py:534 dcim/choices.py:764 dcim/choices.py:1137
+#: dcim/choices.py:1139 dcim/choices.py:1344 dcim/choices.py:1346
#: netbox/navigation/menu.py:188
msgid "Other"
msgstr "Outros"
@@ -1897,177 +1893,177 @@ msgstr "ITA/Internacional"
msgid "Physical"
msgstr "Físico"
-#: dcim/choices.py:795 dcim/choices.py:949
+#: dcim/choices.py:795 dcim/choices.py:952
msgid "Virtual"
msgstr "Virtual"
-#: dcim/choices.py:796 dcim/choices.py:1019 dcim/forms/bulk_edit.py:1398
+#: dcim/choices.py:796 dcim/choices.py:1022 dcim/forms/bulk_edit.py:1398
#: dcim/forms/filtersets.py:1233 dcim/forms/model_forms.py:888
#: dcim/forms/model_forms.py:1197 netbox/navigation/menu.py:128
#: netbox/navigation/menu.py:132 templates/dcim/interface.html:217
msgid "Wireless"
msgstr "Sem fio"
-#: dcim/choices.py:947
+#: dcim/choices.py:950
msgid "Virtual interfaces"
msgstr "Interfaces virtuais"
-#: dcim/choices.py:950 dcim/forms/bulk_edit.py:1295
+#: dcim/choices.py:953 dcim/forms/bulk_edit.py:1295
#: dcim/forms/bulk_import.py:785 dcim/forms/model_forms.py:876
-#: dcim/tables/devices.py:680 templates/dcim/interface.html:109
+#: dcim/tables/devices.py:684 templates/dcim/interface.html:109
#: templates/virtualization/vminterface.html:46
#: virtualization/forms/bulk_edit.py:211
#: virtualization/forms/bulk_import.py:158
-#: virtualization/tables/virtualmachines.py:146
+#: virtualization/tables/virtualmachines.py:159
msgid "Bridge"
msgstr "Ponte"
-#: dcim/choices.py:951
+#: dcim/choices.py:954
msgid "Link Aggregation Group (LAG)"
msgstr "Grupo de agregação de links (LAG)"
-#: dcim/choices.py:955
+#: dcim/choices.py:958
msgid "Ethernet (fixed)"
msgstr "Ethernet (fixa)"
-#: dcim/choices.py:969
+#: dcim/choices.py:972
msgid "Ethernet (modular)"
msgstr "Ethernet (modular)"
-#: dcim/choices.py:1005
+#: dcim/choices.py:1008
msgid "Ethernet (backplane)"
msgstr "Ethernet (painel traseiro)"
-#: dcim/choices.py:1033
+#: dcim/choices.py:1036
msgid "Cellular"
msgstr "Celular"
-#: dcim/choices.py:1080 dcim/forms/filtersets.py:302
+#: dcim/choices.py:1086 dcim/forms/filtersets.py:302
#: dcim/forms/filtersets.py:736 dcim/forms/filtersets.py:876
#: dcim/forms/filtersets.py:1426 templates/dcim/inventoryitem.html:53
#: templates/dcim/virtualchassis_edit.html:55
msgid "Serial"
msgstr "Serial"
-#: dcim/choices.py:1095
+#: dcim/choices.py:1101
msgid "Coaxial"
msgstr "Coaxial"
-#: dcim/choices.py:1112
+#: dcim/choices.py:1118
msgid "Stacking"
msgstr "Empilhamento"
-#: dcim/choices.py:1162
+#: dcim/choices.py:1168
msgid "Half"
msgstr "Metade"
-#: dcim/choices.py:1163
+#: dcim/choices.py:1169
msgid "Full"
msgstr "Completo"
-#: dcim/choices.py:1164 netbox/preferences.py:29 wireless/choices.py:480
+#: dcim/choices.py:1170 netbox/preferences.py:29 wireless/choices.py:480
msgid "Auto"
msgstr "Automático"
-#: dcim/choices.py:1175
+#: dcim/choices.py:1181
msgid "Access"
msgstr "Acesso"
-#: dcim/choices.py:1176 ipam/tables/vlans.py:168 ipam/tables/vlans.py:213
+#: dcim/choices.py:1182 ipam/tables/vlans.py:168 ipam/tables/vlans.py:213
#: templates/dcim/inc/interface_vlans_table.html:7
msgid "Tagged"
msgstr "Marcado"
-#: dcim/choices.py:1177
+#: dcim/choices.py:1183
msgid "Tagged (All)"
msgstr "Marcado (Todos)"
-#: dcim/choices.py:1206
+#: dcim/choices.py:1212
msgid "IEEE Standard"
msgstr "Padrão IEEE"
-#: dcim/choices.py:1217
+#: dcim/choices.py:1223
msgid "Passive 24V (2-pair)"
msgstr "24V passivo (2 pares)"
-#: dcim/choices.py:1218
+#: dcim/choices.py:1224
msgid "Passive 24V (4-pair)"
msgstr "24V passivo (4 pares)"
-#: dcim/choices.py:1219
+#: dcim/choices.py:1225
msgid "Passive 48V (2-pair)"
msgstr "48V passivo (2 pares)"
-#: dcim/choices.py:1220
+#: dcim/choices.py:1226
msgid "Passive 48V (4-pair)"
msgstr "48V passivo (4 pares)"
-#: dcim/choices.py:1282 dcim/choices.py:1378
+#: dcim/choices.py:1288 dcim/choices.py:1384
msgid "Copper"
msgstr "Cobre"
-#: dcim/choices.py:1305
+#: dcim/choices.py:1311
msgid "Fiber Optic"
msgstr "Fibra óptica"
-#: dcim/choices.py:1394
+#: dcim/choices.py:1400
msgid "Fiber"
msgstr "Fibra"
-#: dcim/choices.py:1418 dcim/forms/filtersets.py:1140
+#: dcim/choices.py:1424 dcim/forms/filtersets.py:1140
msgid "Connected"
msgstr "Conectado"
-#: dcim/choices.py:1437
+#: dcim/choices.py:1443
msgid "Kilometers"
msgstr "Quilômetros"
-#: dcim/choices.py:1438 templates/dcim/cable_trace.html:62
+#: dcim/choices.py:1444 templates/dcim/cable_trace.html:62
msgid "Meters"
msgstr "Metros"
-#: dcim/choices.py:1439
+#: dcim/choices.py:1445
msgid "Centimeters"
msgstr "Centímetros"
-#: dcim/choices.py:1440
+#: dcim/choices.py:1446
msgid "Miles"
msgstr "Miles"
-#: dcim/choices.py:1441 templates/dcim/cable_trace.html:63
+#: dcim/choices.py:1447 templates/dcim/cable_trace.html:63
msgid "Feet"
msgstr "Pés"
-#: dcim/choices.py:1457 templates/dcim/device.html:332
+#: dcim/choices.py:1463 templates/dcim/device.html:332
#: templates/dcim/rack.html:157
msgid "Kilograms"
msgstr "Quilogramas"
-#: dcim/choices.py:1458
+#: dcim/choices.py:1464
msgid "Grams"
msgstr "Gramas"
-#: dcim/choices.py:1459 templates/dcim/rack.html:158
+#: dcim/choices.py:1465 templates/dcim/rack.html:158
msgid "Pounds"
msgstr "Libras"
-#: dcim/choices.py:1460
+#: dcim/choices.py:1466
msgid "Ounces"
msgstr "Onças"
-#: dcim/choices.py:1506 tenancy/choices.py:17
+#: dcim/choices.py:1512 tenancy/choices.py:17
msgid "Primary"
msgstr "Primário"
-#: dcim/choices.py:1507
+#: dcim/choices.py:1513
msgid "Redundant"
msgstr "Redundante"
-#: dcim/choices.py:1528
+#: dcim/choices.py:1534
msgid "Single phase"
msgstr "Fase única"
-#: dcim/choices.py:1529
+#: dcim/choices.py:1535
msgid "Three-phase"
msgstr "Trifásico"
@@ -2344,7 +2340,7 @@ msgid "Virtual Chassis (ID)"
msgstr "Chassi virtual (ID)"
#: dcim/filtersets.py:1303 dcim/forms/filtersets.py:106
-#: dcim/tables/devices.py:235 netbox/navigation/menu.py:67
+#: dcim/tables/devices.py:239 netbox/navigation/menu.py:67
#: templates/dcim/device.html:123 templates/dcim/device_edit.html:93
#: templates/dcim/virtualchassis.html:20
#: templates/dcim/virtualchassis_add.html:8
@@ -2368,7 +2364,7 @@ msgstr "VID atribuído"
#: dcim/filtersets.py:1448 dcim/forms/bulk_edit.py:1374
#: dcim/forms/bulk_import.py:836 dcim/forms/filtersets.py:1328
#: dcim/forms/model_forms.py:1182 dcim/models/device_components.py:712
-#: dcim/tables/devices.py:642 ipam/filtersets.py:282 ipam/filtersets.py:293
+#: dcim/tables/devices.py:646 ipam/filtersets.py:282 ipam/filtersets.py:293
#: ipam/filtersets.py:449 ipam/filtersets.py:550 ipam/filtersets.py:561
#: ipam/forms/bulk_edit.py:226 ipam/forms/bulk_edit.py:281
#: ipam/forms/bulk_edit.py:323 ipam/forms/bulk_import.py:156
@@ -2376,8 +2372,8 @@ msgstr "VID atribuído"
#: ipam/forms/filtersets.py:66 ipam/forms/filtersets.py:167
#: ipam/forms/filtersets.py:295 ipam/forms/model_forms.py:59
#: ipam/forms/model_forms.py:203 ipam/forms/model_forms.py:246
-#: ipam/forms/model_forms.py:290 ipam/forms/model_forms.py:412
-#: ipam/forms/model_forms.py:426 ipam/forms/model_forms.py:440
+#: ipam/forms/model_forms.py:290 ipam/forms/model_forms.py:398
+#: ipam/forms/model_forms.py:412 ipam/forms/model_forms.py:426
#: ipam/models/ip.py:232 ipam/models/ip.py:511 ipam/models/ip.py:719
#: ipam/models/vrfs.py:62 ipam/tables/ip.py:241 ipam/tables/ip.py:306
#: ipam/tables/ip.py:356 ipam/tables/ip.py:445
@@ -2390,7 +2386,7 @@ msgstr "VID atribuído"
#: virtualization/forms/filtersets.py:220
#: virtualization/forms/model_forms.py:347
#: virtualization/models/virtualmachines.py:348
-#: virtualization/tables/virtualmachines.py:123
+#: virtualization/tables/virtualmachines.py:136
msgid "VRF"
msgstr "VRF"
@@ -2404,7 +2400,7 @@ msgid "L2VPN (ID)"
msgstr "L2VPN (ID)"
#: dcim/filtersets.py:1465 dcim/forms/filtersets.py:1333
-#: dcim/tables/devices.py:590 ipam/filtersets.py:973
+#: dcim/tables/devices.py:594 ipam/filtersets.py:973
#: ipam/forms/filtersets.py:499 ipam/tables/vlans.py:133
#: templates/dcim/interface.html:94 templates/ipam/vlan.html:69
#: templates/vpn/l2vpntermination.html:15
@@ -2475,7 +2471,7 @@ msgstr "Etiquetas"
#: dcim/forms/bulk_create.py:112 dcim/forms/filtersets.py:1390
#: dcim/forms/model_forms.py:426 dcim/forms/model_forms.py:475
#: dcim/forms/object_create.py:196 dcim/forms/object_create.py:352
-#: dcim/tables/devices.py:198 dcim/tables/devices.py:725
+#: dcim/tables/devices.py:198 dcim/tables/devices.py:729
#: dcim/tables/devicetypes.py:242 templates/dcim/device.html:45
#: templates/dcim/device.html:129 templates/dcim/modulebay.html:35
#: templates/dcim/virtualchassis.html:59
@@ -2494,7 +2490,7 @@ msgstr ""
#: dcim/forms/bulk_edit.py:115 dcim/forms/bulk_import.py:99
#: dcim/forms/model_forms.py:120 dcim/tables/sites.py:89
#: ipam/filtersets.py:936 ipam/forms/bulk_edit.py:528
-#: ipam/forms/bulk_import.py:444 ipam/forms/model_forms.py:509
+#: ipam/forms/bulk_import.py:444 ipam/forms/model_forms.py:495
#: ipam/tables/fhrp.py:67 ipam/tables/vlans.py:118 ipam/tables/vlans.py:221
#: templates/dcim/interface.html:294 templates/dcim/site.html:37
#: templates/ipam/inc/panels/fhrp_groups.html:10 templates/ipam/vlan.html:30
@@ -2544,8 +2540,8 @@ msgstr "Fuso horário"
#: dcim/forms/filtersets.py:704 dcim/forms/filtersets.py:1417
#: dcim/forms/model_forms.py:224 dcim/forms/model_forms.py:970
#: dcim/forms/model_forms.py:1311 dcim/forms/object_import.py:186
-#: dcim/tables/devices.py:202 dcim/tables/devices.py:833
-#: dcim/tables/devices.py:944 dcim/tables/devicetypes.py:300
+#: dcim/tables/devices.py:202 dcim/tables/devices.py:837
+#: dcim/tables/devices.py:948 dcim/tables/devicetypes.py:300
#: dcim/tables/racks.py:69 extras/filtersets.py:457
#: ipam/forms/bulk_edit.py:245 ipam/forms/bulk_edit.py:294
#: ipam/forms/bulk_edit.py:342 ipam/forms/bulk_edit.py:546
@@ -2554,7 +2550,7 @@ msgstr "Fuso horário"
#: ipam/forms/filtersets.py:232 ipam/forms/filtersets.py:278
#: ipam/forms/filtersets.py:346 ipam/forms/filtersets.py:490
#: ipam/forms/model_forms.py:187 ipam/forms/model_forms.py:222
-#: ipam/forms/model_forms.py:249 ipam/forms/model_forms.py:647
+#: ipam/forms/model_forms.py:249 ipam/forms/model_forms.py:651
#: ipam/tables/ip.py:257 ipam/tables/ip.py:313 ipam/tables/ip.py:363
#: ipam/tables/vlans.py:126 ipam/tables/vlans.py:230
#: templates/dcim/device.html:187
@@ -2572,7 +2568,7 @@ msgstr "Fuso horário"
#: virtualization/forms/bulk_import.py:106
#: virtualization/forms/filtersets.py:153
#: virtualization/forms/model_forms.py:198
-#: virtualization/tables/virtualmachines.py:65 vpn/forms/bulk_edit.py:86
+#: virtualization/tables/virtualmachines.py:74 vpn/forms/bulk_edit.py:86
#: vpn/forms/bulk_import.py:81 vpn/forms/filtersets.py:84
#: vpn/forms/model_forms.py:77 vpn/forms/model_forms.py:112
#: vpn/tables/tunnels.py:82
@@ -2666,7 +2662,7 @@ msgstr "Unidade de peso"
#: dcim/forms/model_forms.py:669 dcim/forms/object_create.py:399
#: dcim/tables/devices.py:194 dcim/tables/power.py:70 dcim/tables/racks.py:148
#: ipam/forms/bulk_edit.py:464 ipam/forms/filtersets.py:427
-#: ipam/forms/model_forms.py:571 templates/dcim/device.html:30
+#: ipam/forms/model_forms.py:575 templates/dcim/device.html:30
#: templates/dcim/inc/cable_termination.html:16
#: templates/dcim/powerfeed.html:31 templates/dcim/rack.html:14
#: templates/dcim/rack/base.html:4 templates/dcim/rack_edit.html:8
@@ -2699,7 +2695,7 @@ msgstr "Hardware"
#: dcim/forms/model_forms.py:334 dcim/forms/model_forms.py:374
#: dcim/forms/model_forms.py:975 dcim/forms/model_forms.py:1316
#: dcim/forms/object_import.py:192 dcim/tables/devices.py:129
-#: dcim/tables/devices.py:205 dcim/tables/devices.py:947
+#: dcim/tables/devices.py:205 dcim/tables/devices.py:951
#: dcim/tables/devicetypes.py:81 dcim/tables/devicetypes.py:304
#: dcim/tables/modules.py:20 dcim/tables/modules.py:60
#: templates/dcim/devicetype.html:17 templates/dcim/inventoryitem.html:45
@@ -2746,7 +2742,7 @@ msgstr "Tipo de dispositivo"
msgid "Module Type"
msgstr "Tipo de módulo"
-#: dcim/forms/bulk_edit.py:506 dcim/models/devices.py:472
+#: dcim/forms/bulk_edit.py:506 dcim/models/devices.py:474
msgid "VM role"
msgstr "Função da VM"
@@ -2778,13 +2774,15 @@ msgstr "Função do dispositivo"
#: dcim/forms/bulk_edit.py:588 dcim/forms/bulk_import.py:443
#: dcim/forms/filtersets.py:723 dcim/forms/model_forms.py:389
-#: dcim/forms/model_forms.py:448 extras/filtersets.py:468
-#: templates/dcim/device.html:191 templates/dcim/platform.html:27
+#: dcim/forms/model_forms.py:448 dcim/tables/devices.py:215
+#: extras/filtersets.py:468 templates/dcim/device.html:191
+#: templates/dcim/platform.html:27
#: templates/virtualization/virtualmachine.html:30
#: virtualization/forms/bulk_edit.py:159
#: virtualization/forms/bulk_import.py:122
#: virtualization/forms/filtersets.py:164
#: virtualization/forms/model_forms.py:206
+#: virtualization/tables/virtualmachines.py:78
msgid "Platform"
msgstr "Plataforma"
@@ -2808,16 +2806,16 @@ msgstr "Plataforma"
#: dcim/forms/model_forms.py:760 dcim/forms/model_forms.py:1011
#: dcim/forms/model_forms.py:1460 dcim/forms/object_create.py:256
#: dcim/tables/connections.py:22 dcim/tables/connections.py:41
-#: dcim/tables/connections.py:60 dcim/tables/devices.py:314
-#: dcim/tables/devices.py:379 dcim/tables/devices.py:423
-#: dcim/tables/devices.py:468 dcim/tables/devices.py:522
-#: dcim/tables/devices.py:614 dcim/tables/devices.py:715
-#: dcim/tables/devices.py:775 dcim/tables/devices.py:825
-#: dcim/tables/devices.py:885 dcim/tables/devices.py:937
-#: dcim/tables/devices.py:1063 dcim/tables/modules.py:52
+#: dcim/tables/connections.py:60 dcim/tables/devices.py:318
+#: dcim/tables/devices.py:383 dcim/tables/devices.py:427
+#: dcim/tables/devices.py:472 dcim/tables/devices.py:526
+#: dcim/tables/devices.py:618 dcim/tables/devices.py:719
+#: dcim/tables/devices.py:779 dcim/tables/devices.py:829
+#: dcim/tables/devices.py:889 dcim/tables/devices.py:941
+#: dcim/tables/devices.py:1067 dcim/tables/modules.py:52
#: extras/forms/filtersets.py:329 ipam/forms/bulk_import.py:303
#: ipam/forms/bulk_import.py:489 ipam/forms/filtersets.py:532
-#: ipam/forms/model_forms.py:685 ipam/tables/vlans.py:176
+#: ipam/forms/model_forms.py:689 ipam/tables/vlans.py:176
#: templates/dcim/consoleport.html:23 templates/dcim/consoleserverport.html:23
#: templates/dcim/device.html:14 templates/dcim/device.html:128
#: templates/dcim/device_edit.html:10 templates/dcim/devicebay.html:23
@@ -2839,7 +2837,7 @@ msgstr "Plataforma"
#: virtualization/forms/bulk_import.py:99
#: virtualization/forms/filtersets.py:124
#: virtualization/forms/model_forms.py:188
-#: virtualization/tables/virtualmachines.py:61 vpn/choices.py:44
+#: virtualization/tables/virtualmachines.py:70 vpn/choices.py:44
#: vpn/forms/bulk_import.py:86 vpn/forms/bulk_import.py:283
#: vpn/forms/filtersets.py:271 vpn/forms/model_forms.py:89
#: vpn/forms/model_forms.py:124 vpn/forms/model_forms.py:237
@@ -2979,7 +2977,7 @@ msgid "Wireless role"
msgstr "Função sem fio"
#: dcim/forms/bulk_edit.py:1178 dcim/forms/model_forms.py:595
-#: dcim/forms/model_forms.py:1026 dcim/tables/devices.py:337
+#: dcim/forms/model_forms.py:1026 dcim/tables/devices.py:341
#: templates/dcim/consoleport.html:27 templates/dcim/consoleserverport.html:27
#: templates/dcim/frontport.html:27 templates/dcim/interface.html:35
#: templates/dcim/module.html:51 templates/dcim/modulebay.html:57
@@ -2988,7 +2986,7 @@ msgstr "Função sem fio"
msgid "Module"
msgstr "Módulo"
-#: dcim/forms/bulk_edit.py:1305 dcim/tables/devices.py:685
+#: dcim/forms/bulk_edit.py:1305 dcim/tables/devices.py:689
#: templates/dcim/interface.html:113
msgid "LAG"
msgstr "DEFASAGEM"
@@ -3000,7 +2998,7 @@ msgstr "Contextos de dispositivos virtuais"
#: dcim/forms/bulk_edit.py:1316 dcim/forms/bulk_import.py:659
#: dcim/forms/bulk_import.py:685 dcim/forms/filtersets.py:1163
#: dcim/forms/filtersets.py:1185 dcim/forms/filtersets.py:1258
-#: dcim/tables/devices.py:626
+#: dcim/tables/devices.py:630
#: templates/circuits/inc/circuit_termination.html:94
#: templates/dcim/consoleport.html:43 templates/dcim/consoleserverport.html:43
msgid "Speed"
@@ -3025,13 +3023,13 @@ msgid "VLAN group"
msgstr "Grupo de VLAN"
#: dcim/forms/bulk_edit.py:1361 dcim/forms/model_forms.py:1164
-#: dcim/tables/devices.py:599 virtualization/forms/bulk_edit.py:247
+#: dcim/tables/devices.py:603 virtualization/forms/bulk_edit.py:247
#: virtualization/forms/model_forms.py:329
msgid "Untagged VLAN"
msgstr "VLAN sem etiqueta"
#: dcim/forms/bulk_edit.py:1369 dcim/forms/model_forms.py:1173
-#: dcim/tables/devices.py:605 virtualization/forms/bulk_edit.py:255
+#: dcim/tables/devices.py:609 virtualization/forms/bulk_edit.py:255
#: virtualization/forms/model_forms.py:338
msgid "Tagged VLANs"
msgstr "VLANs marcadas"
@@ -3041,7 +3039,7 @@ msgid "Wireless LAN group"
msgstr "Grupo de LAN sem fio"
#: dcim/forms/bulk_edit.py:1384 dcim/forms/model_forms.py:1151
-#: dcim/tables/devices.py:635 netbox/navigation/menu.py:134
+#: dcim/tables/devices.py:639 netbox/navigation/menu.py:134
#: templates/dcim/interface.html:289 wireless/tables/wirelesslan.py:24
msgid "Wireless LANs"
msgstr "LANs sem fio"
@@ -3212,9 +3210,9 @@ msgid "Virtual chassis"
msgstr "Chassi virtual"
#: dcim/forms/bulk_import.py:462 dcim/forms/model_forms.py:457
-#: dcim/tables/devices.py:231 extras/filtersets.py:501
+#: dcim/tables/devices.py:235 extras/filtersets.py:501
#: extras/forms/filtersets.py:330 ipam/forms/bulk_edit.py:478
-#: ipam/forms/model_forms.py:588 templates/dcim/device.html:239
+#: ipam/forms/model_forms.py:592 templates/dcim/device.html:239
#: templates/virtualization/cluster.html:11
#: templates/virtualization/virtualmachine.html:92
#: templates/virtualization/virtualmachine.html:102
@@ -3226,7 +3224,7 @@ msgstr "Chassi virtual"
#: virtualization/forms/filtersets.py:196
#: virtualization/forms/model_forms.py:82
#: virtualization/forms/model_forms.py:179
-#: virtualization/tables/virtualmachines.py:57
+#: virtualization/tables/virtualmachines.py:66
msgid "Cluster"
msgstr "Cluster"
@@ -3407,7 +3405,7 @@ msgstr "Porta traseira correspondente"
msgid "Physical medium classification"
msgstr "Classificação física do meio"
-#: dcim/forms/bulk_import.py:973 dcim/tables/devices.py:846
+#: dcim/forms/bulk_import.py:973 dcim/tables/devices.py:850
msgid "Installed device"
msgstr "Dispositivo instalado"
@@ -3495,7 +3493,7 @@ msgid "{side_upper} side termination not found: {device} {name}"
msgstr "{side_upper} terminação lateral não encontrada: {device} {name}"
#: dcim/forms/bulk_import.py:1244 dcim/forms/model_forms.py:696
-#: dcim/tables/devices.py:1033 templates/dcim/device.html:130
+#: dcim/tables/devices.py:1037 templates/dcim/device.html:130
#: templates/dcim/virtualchassis.html:28 templates/dcim/virtualchassis.html:60
msgid "Master"
msgstr "Dominar"
@@ -3621,7 +3619,7 @@ msgstr "Ocupado"
#: dcim/forms/filtersets.py:1155 dcim/forms/filtersets.py:1177
#: dcim/forms/filtersets.py:1199 dcim/forms/filtersets.py:1216
-#: dcim/forms/filtersets.py:1236 dcim/tables/devices.py:372
+#: dcim/forms/filtersets.py:1236 dcim/tables/devices.py:376
#: templates/dcim/consoleport.html:59 templates/dcim/consoleserverport.html:59
#: templates/dcim/frontport.html:74 templates/dcim/interface.html:146
#: templates/dcim/powerfeed.html:118 templates/dcim/poweroutlet.html:63
@@ -3635,7 +3633,7 @@ msgid "Virtual Device Context"
msgstr "Contexto do dispositivo virtual"
#: dcim/forms/filtersets.py:1248 extras/forms/bulk_edit.py:315
-#: extras/forms/bulk_import.py:239 extras/forms/filtersets.py:479
+#: extras/forms/bulk_import.py:245 extras/forms/filtersets.py:479
#: extras/forms/model_forms.py:557 extras/tables/tables.py:487
#: templates/extras/journalentry.html:33
msgid "Kind"
@@ -3667,7 +3665,7 @@ msgid "Transmit power (dBm)"
msgstr "Potência de transmissão (dBm)"
#: dcim/forms/filtersets.py:1344 dcim/forms/filtersets.py:1366
-#: dcim/tables/devices.py:344 templates/dcim/cable.html:12
+#: dcim/tables/devices.py:348 templates/dcim/cable.html:12
#: templates/dcim/cable_edit.html:46 templates/dcim/cable_trace.html:43
#: templates/dcim/frontport.html:84
#: templates/dcim/inc/connection_endpoints.html:4
@@ -3675,7 +3673,7 @@ msgstr "Potência de transmissão (dBm)"
msgid "Cable"
msgstr "Cabo"
-#: dcim/forms/filtersets.py:1434 dcim/tables/devices.py:956
+#: dcim/forms/filtersets.py:1434 dcim/tables/devices.py:960
msgid "Discovered"
msgstr "Descoberto"
@@ -3722,7 +3720,7 @@ msgstr "Chassi"
msgid "Device Role"
msgstr "Função do dispositivo"
-#: dcim/forms/model_forms.py:428 dcim/models/devices.py:632
+#: dcim/forms/model_forms.py:428 dcim/models/devices.py:634
msgid "The lowest-numbered unit occupied by the device"
msgstr "A unidade de menor número ocupada pelo dispositivo"
@@ -3774,9 +3772,7 @@ msgstr "Interface LAG"
#: templates/wireless/wirelesslink.html:10
#: templates/wireless/wirelesslink.html:49
#: virtualization/forms/model_forms.py:351 vpn/forms/bulk_import.py:297
-#: vpn/forms/model_forms.py:94 vpn/forms/model_forms.py:129
-#: vpn/forms/model_forms.py:241 vpn/forms/model_forms.py:436
-#: vpn/forms/model_forms.py:445 vpn/tables/tunnels.py:91
+#: vpn/forms/model_forms.py:436 vpn/forms/model_forms.py:445
#: wireless/forms/model_forms.py:112 wireless/forms/model_forms.py:152
msgid "Interface"
msgstr "Interface"
@@ -3853,7 +3849,7 @@ msgstr ""
" esperados."
#: dcim/forms/object_create.py:109 dcim/forms/object_create.py:270
-#: dcim/tables/devices.py:281
+#: dcim/tables/devices.py:285
msgid "Rear ports"
msgstr "Portas traseiras"
@@ -3892,7 +3888,7 @@ msgstr ""
"corresponder ao número selecionado de posições da porta traseira "
"({rearport_count})."
-#: dcim/forms/object_create.py:408 dcim/tables/devices.py:1039
+#: dcim/forms/object_create.py:408 dcim/tables/devices.py:1043
#: ipam/tables/fhrp.py:31 templates/dcim/virtualchassis.html:54
#: templates/dcim/virtualchassis_edit.html:48 templates/ipam/fhrpgroup.html:39
msgid "Members"
@@ -4630,13 +4626,13 @@ msgstr "função do item de inventário"
msgid "inventory item roles"
msgstr "funções do item de inventário"
-#: dcim/models/device_components.py:1230 dcim/models/devices.py:595
-#: dcim/models/devices.py:1173 dcim/models/racks.py:113
+#: dcim/models/device_components.py:1230 dcim/models/devices.py:597
+#: dcim/models/devices.py:1178 dcim/models/racks.py:113
msgid "serial number"
msgstr "número de série"
-#: dcim/models/device_components.py:1238 dcim/models/devices.py:603
-#: dcim/models/devices.py:1180 dcim/models/racks.py:120
+#: dcim/models/device_components.py:1238 dcim/models/devices.py:605
+#: dcim/models/devices.py:1185 dcim/models/racks.py:120
msgid "asset tag"
msgstr "etiqueta de ativo"
@@ -4686,7 +4682,7 @@ msgstr "fabricante"
msgid "manufacturers"
msgstr "fabricantes"
-#: dcim/models/devices.py:82 dcim/models/devices.py:381
+#: dcim/models/devices.py:82 dcim/models/devices.py:382
msgid "model"
msgstr "modelo"
@@ -4694,11 +4690,11 @@ msgstr "modelo"
msgid "default platform"
msgstr "plataforma padrão"
-#: dcim/models/devices.py:98 dcim/models/devices.py:385
+#: dcim/models/devices.py:98 dcim/models/devices.py:386
msgid "part number"
msgstr "número da peça"
-#: dcim/models/devices.py:101 dcim/models/devices.py:388
+#: dcim/models/devices.py:101 dcim/models/devices.py:389
msgid "Discrete part number (optional)"
msgstr "Número de peça discreto (opcional)"
@@ -4736,7 +4732,7 @@ msgstr ""
" dispositivos. Deixe em branco se esse tipo de dispositivo não for pai nem "
"filho."
-#: dcim/models/devices.py:128 dcim/models/devices.py:647
+#: dcim/models/devices.py:128 dcim/models/devices.py:649
msgid "airflow"
msgstr "fluxo de ar"
@@ -4748,11 +4744,11 @@ msgstr "tipo de dispositivo"
msgid "device types"
msgstr "tipos de dispositivos"
-#: dcim/models/devices.py:289
+#: dcim/models/devices.py:290
msgid "U height must be in increments of 0.5 rack units."
msgstr "A altura U deve estar em incrementos de 0,5 unidades de rack."
-#: dcim/models/devices.py:306
+#: dcim/models/devices.py:307
#, python-brace-format
msgid ""
"Device {device} in rack {rack} does not have sufficient space to accommodate"
@@ -4761,7 +4757,7 @@ msgstr ""
"Dispositivo {device} na prateleira {rack} não tem espaço suficiente para "
"acomodar uma altura de {height}U"
-#: dcim/models/devices.py:321
+#: dcim/models/devices.py:322
#, python-brace-format
msgid ""
"Unable to set 0U height: Found {racked_instance_count} "
@@ -4771,7 +4767,7 @@ msgstr ""
"href=\"{url}\">{racked_instance_count} instâncias já montado dentro de "
"racks."
-#: dcim/models/devices.py:330
+#: dcim/models/devices.py:331
msgid ""
"Must delete all device bay templates associated with this device before "
"declassifying it as a parent device."
@@ -4780,151 +4776,151 @@ msgstr ""
"associados a esse dispositivo antes de desclassificá-lo como dispositivo "
"principal."
-#: dcim/models/devices.py:336
+#: dcim/models/devices.py:337
msgid "Child device types must be 0U."
msgstr "Os tipos de dispositivos infantis devem ser 0U."
-#: dcim/models/devices.py:404
+#: dcim/models/devices.py:405
msgid "module type"
msgstr "tipo de módulo"
-#: dcim/models/devices.py:405
+#: dcim/models/devices.py:406
msgid "module types"
msgstr "tipos de módulo"
-#: dcim/models/devices.py:473
+#: dcim/models/devices.py:475
msgid "Virtual machines may be assigned to this role"
msgstr "Máquinas virtuais podem ser atribuídas a essa função"
-#: dcim/models/devices.py:485
+#: dcim/models/devices.py:487
msgid "device role"
msgstr "função do dispositivo"
-#: dcim/models/devices.py:486
+#: dcim/models/devices.py:488
msgid "device roles"
msgstr "funções do dispositivo"
-#: dcim/models/devices.py:503
+#: dcim/models/devices.py:505
msgid "Optionally limit this platform to devices of a certain manufacturer"
msgstr ""
"Opcionalmente, limite essa plataforma a dispositivos de um determinado "
"fabricante"
-#: dcim/models/devices.py:515
+#: dcim/models/devices.py:517
msgid "platform"
msgstr "plataforma"
-#: dcim/models/devices.py:516
+#: dcim/models/devices.py:518
msgid "platforms"
msgstr "plataformas"
-#: dcim/models/devices.py:564
+#: dcim/models/devices.py:566
msgid "The function this device serves"
msgstr "A função que este dispositivo serve"
-#: dcim/models/devices.py:596
+#: dcim/models/devices.py:598
msgid "Chassis serial number, assigned by the manufacturer"
msgstr "Número de série do chassi, atribuído pelo fabricante"
-#: dcim/models/devices.py:604 dcim/models/devices.py:1181
+#: dcim/models/devices.py:606 dcim/models/devices.py:1186
msgid "A unique tag used to identify this device"
msgstr "Uma tag exclusiva usada para identificar esse dispositivo"
-#: dcim/models/devices.py:631
+#: dcim/models/devices.py:633
msgid "position (U)"
msgstr "posição (U)"
-#: dcim/models/devices.py:638
+#: dcim/models/devices.py:640
msgid "rack face"
msgstr "face de cremalheira"
-#: dcim/models/devices.py:658 dcim/models/devices.py:1390
+#: dcim/models/devices.py:660 dcim/models/devices.py:1395
#: virtualization/models/virtualmachines.py:98
msgid "primary IPv4"
msgstr "IPv4 primário"
-#: dcim/models/devices.py:666 dcim/models/devices.py:1398
+#: dcim/models/devices.py:668 dcim/models/devices.py:1403
#: virtualization/models/virtualmachines.py:106
msgid "primary IPv6"
msgstr "IPv6 primário"
-#: dcim/models/devices.py:674
+#: dcim/models/devices.py:676
msgid "out-of-band IP"
msgstr "IP fora de banda"
-#: dcim/models/devices.py:691
+#: dcim/models/devices.py:693
msgid "VC position"
msgstr "Posição VC"
-#: dcim/models/devices.py:695
+#: dcim/models/devices.py:697
msgid "Virtual chassis position"
msgstr "Posição do chassi virtual"
-#: dcim/models/devices.py:698
+#: dcim/models/devices.py:700
msgid "VC priority"
msgstr "Prioridade VC"
-#: dcim/models/devices.py:702
+#: dcim/models/devices.py:704
msgid "Virtual chassis master election priority"
msgstr "Prioridade de eleição do mestre do chassi virtual"
-#: dcim/models/devices.py:705 dcim/models/sites.py:207
+#: dcim/models/devices.py:707 dcim/models/sites.py:207
msgid "latitude"
msgstr "latitude"
-#: dcim/models/devices.py:710 dcim/models/devices.py:718
+#: dcim/models/devices.py:712 dcim/models/devices.py:720
#: dcim/models/sites.py:212 dcim/models/sites.py:220
msgid "GPS coordinate in decimal format (xx.yyyyyy)"
msgstr "Coordenada GPS em formato decimal (xx.yyyyyy)"
-#: dcim/models/devices.py:713 dcim/models/sites.py:215
+#: dcim/models/devices.py:715 dcim/models/sites.py:215
msgid "longitude"
msgstr "longitude"
-#: dcim/models/devices.py:786
+#: dcim/models/devices.py:788
msgid "Device name must be unique per site."
msgstr "O nome do dispositivo deve ser exclusivo por site."
-#: dcim/models/devices.py:797 ipam/models/services.py:75
+#: dcim/models/devices.py:799 ipam/models/services.py:75
msgid "device"
msgstr "dispositivo"
-#: dcim/models/devices.py:798
+#: dcim/models/devices.py:800
msgid "devices"
msgstr "dispositivos"
-#: dcim/models/devices.py:838
+#: dcim/models/devices.py:840
#, python-brace-format
msgid "Rack {rack} does not belong to site {site}."
msgstr "Rack {rack} não pertence ao site {site}."
-#: dcim/models/devices.py:843
+#: dcim/models/devices.py:845
#, python-brace-format
msgid "Location {location} does not belong to site {site}."
msgstr "Localização {location} não pertence ao site {site}."
-#: dcim/models/devices.py:849
+#: dcim/models/devices.py:851
#, python-brace-format
msgid "Rack {rack} does not belong to location {location}."
msgstr "Rack {rack} não pertence à localização {location}."
-#: dcim/models/devices.py:856
+#: dcim/models/devices.py:858
msgid "Cannot select a rack face without assigning a rack."
msgstr "Não é possível selecionar uma face de rack sem atribuir um rack."
-#: dcim/models/devices.py:860
+#: dcim/models/devices.py:862
msgid "Cannot select a rack position without assigning a rack."
msgstr "Não é possível selecionar uma posição de rack sem atribuir um rack."
-#: dcim/models/devices.py:866
+#: dcim/models/devices.py:868
msgid "Position must be in increments of 0.5 rack units."
msgstr "A posição deve estar em incrementos de 0,5 unidades de rack."
-#: dcim/models/devices.py:870
+#: dcim/models/devices.py:872
msgid "Must specify rack face when defining rack position."
msgstr "Deve especificar a face do rack ao definir a posição do rack."
-#: dcim/models/devices.py:878
+#: dcim/models/devices.py:880
#, python-brace-format
msgid ""
"A 0U device type ({device_type}) cannot be assigned to a rack position."
@@ -4932,7 +4928,7 @@ msgstr ""
"Um tipo de dispositivo 0U ({device_type}) não pode ser atribuído a uma "
"posição de rack."
-#: dcim/models/devices.py:889
+#: dcim/models/devices.py:891
msgid ""
"Child device types cannot be assigned to a rack face. This is an attribute "
"of the parent device."
@@ -4940,7 +4936,7 @@ msgstr ""
"Os tipos de dispositivos secundários não podem ser atribuídos a uma face de "
"rack. Esse é um atributo do dispositivo principal."
-#: dcim/models/devices.py:896
+#: dcim/models/devices.py:898
msgid ""
"Child device types cannot be assigned to a rack position. This is an "
"attribute of the parent device."
@@ -4948,7 +4944,7 @@ msgstr ""
"Os tipos de dispositivos infantis não podem ser atribuídos a uma posição de "
"rack. Esse é um atributo do dispositivo principal."
-#: dcim/models/devices.py:910
+#: dcim/models/devices.py:912
#, python-brace-format
msgid ""
"U{position} is already occupied or does not have sufficient space to "
@@ -4957,23 +4953,23 @@ msgstr ""
"U{position} já está ocupado ou não tem espaço suficiente para acomodar este "
"tipo de dispositivo: {device_type} ({u_height}U)"
-#: dcim/models/devices.py:925
+#: dcim/models/devices.py:927
#, python-brace-format
msgid "{ip} is not an IPv4 address."
msgstr "{ip} não é um endereço IPv4."
-#: dcim/models/devices.py:934 dcim/models/devices.py:949
+#: dcim/models/devices.py:936 dcim/models/devices.py:951
#, python-brace-format
msgid "The specified IP address ({ip}) is not assigned to this device."
msgstr ""
"O endereço IP especificado ({ip}) não está atribuído a este dispositivo."
-#: dcim/models/devices.py:940
+#: dcim/models/devices.py:942
#, python-brace-format
msgid "{ip} is not an IPv6 address."
msgstr "{ip} não é um endereço IPv6."
-#: dcim/models/devices.py:967
+#: dcim/models/devices.py:969
#, python-brace-format
msgid ""
"The assigned platform is limited to {platform_manufacturer} device types, "
@@ -4983,25 +4979,25 @@ msgstr ""
"dispositivo, mas o tipo desse dispositivo pertence a "
"{devicetype_manufacturer}."
-#: dcim/models/devices.py:978
+#: dcim/models/devices.py:980
#, python-brace-format
msgid "The assigned cluster belongs to a different site ({site})"
msgstr "O cluster atribuído pertence a um site diferente ({site})"
-#: dcim/models/devices.py:986
+#: dcim/models/devices.py:988
msgid "A device assigned to a virtual chassis must have its position defined."
msgstr ""
"Um dispositivo atribuído a um chassi virtual deve ter sua posição definida."
-#: dcim/models/devices.py:1188
+#: dcim/models/devices.py:1193
msgid "module"
msgstr "módulo"
-#: dcim/models/devices.py:1189
+#: dcim/models/devices.py:1194
msgid "modules"
msgstr "módulos"
-#: dcim/models/devices.py:1205
+#: dcim/models/devices.py:1210
#, python-brace-format
msgid ""
"Module must be installed within a module bay belonging to the assigned "
@@ -5010,22 +5006,22 @@ msgstr ""
"O módulo deve ser instalado dentro de um compartimento de módulo pertencente"
" ao dispositivo atribuído ({device})."
-#: dcim/models/devices.py:1309
+#: dcim/models/devices.py:1314
msgid "domain"
msgstr "dominar"
-#: dcim/models/devices.py:1322 dcim/models/devices.py:1323
+#: dcim/models/devices.py:1327 dcim/models/devices.py:1328
msgid "virtual chassis"
msgstr "chassi virtual"
-#: dcim/models/devices.py:1338
+#: dcim/models/devices.py:1343
#, python-brace-format
msgid ""
"The selected master ({master}) is not assigned to this virtual chassis."
msgstr ""
"O mestre selecionado ({master}) não está atribuído a esse chassi virtual."
-#: dcim/models/devices.py:1354
+#: dcim/models/devices.py:1359
#, python-brace-format
msgid ""
"Unable to delete virtual chassis {self}. There are member interfaces which "
@@ -5034,33 +5030,33 @@ msgstr ""
"Não é possível excluir o chassi virtual {self}. Existem interfaces de "
"membros que formam interfaces LAG entre chassis."
-#: dcim/models/devices.py:1379 vpn/models/l2vpn.py:37
+#: dcim/models/devices.py:1384 vpn/models/l2vpn.py:37
msgid "identifier"
msgstr "identificador"
-#: dcim/models/devices.py:1380
+#: dcim/models/devices.py:1385
msgid "Numeric identifier unique to the parent device"
msgstr "Identificador numérico exclusivo para o dispositivo principal"
-#: dcim/models/devices.py:1408 extras/models/models.py:129
+#: dcim/models/devices.py:1413 extras/models/models.py:129
#: extras/models/models.py:724 netbox/models/__init__.py:114
msgid "comments"
msgstr "comentários"
-#: dcim/models/devices.py:1424
+#: dcim/models/devices.py:1429
msgid "virtual device context"
msgstr "contexto de dispositivo virtual"
-#: dcim/models/devices.py:1425
+#: dcim/models/devices.py:1430
msgid "virtual device contexts"
msgstr "contextos de dispositivos virtuais"
-#: dcim/models/devices.py:1457
+#: dcim/models/devices.py:1462
#, python-brace-format
msgid "{ip} is not an IPv{family} address."
msgstr "{ip} não é um IPv{family} endereço."
-#: dcim/models/devices.py:1463
+#: dcim/models/devices.py:1468
msgid "Primary IP address must belong to an interface on the assigned device."
msgstr ""
"O endereço IP principal deve pertencer a uma interface no dispositivo "
@@ -5447,7 +5443,7 @@ msgstr "Porta de console"
msgid "Reachable"
msgstr "Acessível"
-#: dcim/tables/connections.py:46 dcim/tables/devices.py:529
+#: dcim/tables/connections.py:46 dcim/tables/devices.py:533
#: templates/dcim/inventoryitem_edit.html:64
#: templates/dcim/poweroutlet.html:47 templates/dcim/powerport.html:18
msgid "Power Port"
@@ -5466,7 +5462,7 @@ msgstr "Dispositivos"
msgid "VMs"
msgstr "VMs"
-#: dcim/tables/devices.py:133 dcim/tables/devices.py:245
+#: dcim/tables/devices.py:133 dcim/tables/devices.py:249
#: extras/forms/model_forms.py:515 templates/dcim/device.html:114
#: templates/dcim/device/render_config.html:11
#: templates/dcim/device/render_config.html:15
@@ -5475,62 +5471,62 @@ msgstr "VMs"
#: templates/virtualization/virtualmachine.html:47
#: templates/virtualization/virtualmachine/render_config.html:11
#: templates/virtualization/virtualmachine/render_config.html:15
-#: virtualization/tables/virtualmachines.py:93
+#: virtualization/tables/virtualmachines.py:106
msgid "Config Template"
msgstr "Modelo de configuração"
-#: dcim/tables/devices.py:216 dcim/tables/devices.py:1074
+#: dcim/tables/devices.py:220 dcim/tables/devices.py:1078
#: ipam/forms/bulk_import.py:511 ipam/forms/model_forms.py:296
#: ipam/tables/ip.py:352 ipam/tables/ip.py:418 ipam/tables/ip.py:441
#: templates/ipam/ipaddress.html:12 templates/ipam/ipaddress_edit.html:14
-#: virtualization/tables/virtualmachines.py:81
+#: virtualization/tables/virtualmachines.py:94
msgid "IP Address"
msgstr "Endereço IP"
-#: dcim/tables/devices.py:220 dcim/tables/devices.py:1078
-#: virtualization/tables/virtualmachines.py:72
+#: dcim/tables/devices.py:224 dcim/tables/devices.py:1082
+#: virtualization/tables/virtualmachines.py:85
msgid "IPv4 Address"
msgstr "Endereço IPv4"
-#: dcim/tables/devices.py:224 dcim/tables/devices.py:1082
-#: virtualization/tables/virtualmachines.py:76
+#: dcim/tables/devices.py:228 dcim/tables/devices.py:1086
+#: virtualization/tables/virtualmachines.py:89
msgid "IPv6 Address"
msgstr "Endereço IPv6"
-#: dcim/tables/devices.py:239
+#: dcim/tables/devices.py:243
msgid "VC Position"
msgstr "Posição VC"
-#: dcim/tables/devices.py:242
+#: dcim/tables/devices.py:246
msgid "VC Priority"
msgstr "Prioridade VC"
-#: dcim/tables/devices.py:249 templates/dcim/device_edit.html:38
+#: dcim/tables/devices.py:253 templates/dcim/device_edit.html:38
#: templates/dcim/devicebay_populate.html:16
msgid "Parent Device"
msgstr "Dispositivo principal"
-#: dcim/tables/devices.py:254
+#: dcim/tables/devices.py:258
msgid "Position (Device Bay)"
msgstr "Posição (compartimento do dispositivo)"
-#: dcim/tables/devices.py:263
+#: dcim/tables/devices.py:267
msgid "Console ports"
msgstr "Portas de console"
-#: dcim/tables/devices.py:266
+#: dcim/tables/devices.py:270
msgid "Console server ports"
msgstr "Portas do servidor de console"
-#: dcim/tables/devices.py:269
+#: dcim/tables/devices.py:273
msgid "Power ports"
msgstr "Portas de alimentação"
-#: dcim/tables/devices.py:272
+#: dcim/tables/devices.py:276
msgid "Power outlets"
msgstr "Tomadas elétricas"
-#: dcim/tables/devices.py:275 dcim/tables/devices.py:1087
+#: dcim/tables/devices.py:279 dcim/tables/devices.py:1091
#: dcim/tables/devicetypes.py:125 dcim/views.py:1005 dcim/views.py:1244
#: dcim/views.py:1930 netbox/navigation/menu.py:82
#: netbox/navigation/menu.py:238 templates/dcim/device/base.html:37
@@ -5540,53 +5536,53 @@ msgstr "Tomadas elétricas"
#: templates/dcim/virtualdevicecontext.html:85
#: templates/virtualization/virtualmachine/base.html:27
#: templates/virtualization/virtualmachine_list.html:14
-#: virtualization/tables/virtualmachines.py:87 virtualization/views.py:368
+#: virtualization/tables/virtualmachines.py:100 virtualization/views.py:368
#: wireless/tables/wirelesslan.py:55
msgid "Interfaces"
msgstr "Interfaces"
-#: dcim/tables/devices.py:278
+#: dcim/tables/devices.py:282
msgid "Front ports"
msgstr "Portas frontais"
-#: dcim/tables/devices.py:284
+#: dcim/tables/devices.py:288
msgid "Device bays"
msgstr "Compartimentos para dispositivos"
-#: dcim/tables/devices.py:287
+#: dcim/tables/devices.py:291
msgid "Module bays"
msgstr "Compartimentos de módulos"
-#: dcim/tables/devices.py:290
+#: dcim/tables/devices.py:294
msgid "Inventory items"
msgstr "Itens de inventário"
-#: dcim/tables/devices.py:329 dcim/tables/modules.py:56
+#: dcim/tables/devices.py:333 dcim/tables/modules.py:56
#: templates/dcim/modulebay.html:17
msgid "Module Bay"
msgstr "Compartimento do módulo"
-#: dcim/tables/devices.py:350
+#: dcim/tables/devices.py:354
msgid "Cable Color"
msgstr "Cor do cabo"
-#: dcim/tables/devices.py:356
+#: dcim/tables/devices.py:360
msgid "Link Peers"
msgstr "Vincular pares"
-#: dcim/tables/devices.py:359
+#: dcim/tables/devices.py:363
msgid "Mark Connected"
msgstr "Marcar Conectado"
-#: dcim/tables/devices.py:475
+#: dcim/tables/devices.py:479
msgid "Maximum draw (W)"
msgstr "Consumo máximo (W)"
-#: dcim/tables/devices.py:478
+#: dcim/tables/devices.py:482
msgid "Allocated draw (W)"
msgstr "Sorteio alocado (W)"
-#: dcim/tables/devices.py:578 ipam/forms/model_forms.py:707
+#: dcim/tables/devices.py:582 ipam/forms/model_forms.py:711
#: ipam/tables/fhrp.py:28 ipam/views.py:597 ipam/views.py:691
#: netbox/navigation/menu.py:146 netbox/navigation/menu.py:148
#: templates/dcim/interface.html:351 templates/ipam/ipaddress_bulk_add.html:15
@@ -5595,12 +5591,12 @@ msgstr "Sorteio alocado (W)"
msgid "IP Addresses"
msgstr "Endereços IP"
-#: dcim/tables/devices.py:584 netbox/navigation/menu.py:190
+#: dcim/tables/devices.py:588 netbox/navigation/menu.py:190
#: templates/ipam/inc/panels/fhrp_groups.html:5
msgid "FHRP Groups"
msgstr "Grupos FHRP"
-#: dcim/tables/devices.py:596 templates/dcim/interface.html:90
+#: dcim/tables/devices.py:600 templates/dcim/interface.html:90
#: templates/virtualization/vminterface.html:70 templates/vpn/tunnel.html:18
#: templates/vpn/tunneltermination.html:14 vpn/forms/bulk_edit.py:75
#: vpn/forms/bulk_import.py:76 vpn/forms/filtersets.py:41
@@ -5609,20 +5605,20 @@ msgstr "Grupos FHRP"
msgid "Tunnel"
msgstr "Túnel"
-#: dcim/tables/devices.py:621 dcim/tables/devicetypes.py:224
+#: dcim/tables/devices.py:625 dcim/tables/devicetypes.py:224
#: templates/dcim/interface.html:66
msgid "Management Only"
msgstr "Somente gerenciamento"
-#: dcim/tables/devices.py:629
+#: dcim/tables/devices.py:633
msgid "Wireless link"
msgstr "Link sem fio"
-#: dcim/tables/devices.py:639
+#: dcim/tables/devices.py:643
msgid "VDCs"
msgstr "VDCs"
-#: dcim/tables/devices.py:647 dcim/tables/devicetypes.py:48
+#: dcim/tables/devices.py:651 dcim/tables/devicetypes.py:48
#: dcim/tables/devicetypes.py:140 dcim/views.py:1080 dcim/views.py:2023
#: netbox/navigation/menu.py:91 templates/dcim/device/base.html:52
#: templates/dcim/device_list.html:71 templates/dcim/devicetype/base.html:49
@@ -5631,7 +5627,7 @@ msgstr "VDCs"
msgid "Inventory Items"
msgstr "Itens de inventário"
-#: dcim/tables/devices.py:728
+#: dcim/tables/devices.py:732
#: templates/circuits/inc/circuit_termination.html:80
#: templates/dcim/consoleport.html:81 templates/dcim/consoleserverport.html:81
#: templates/dcim/frontport.html:53 templates/dcim/frontport.html:125
@@ -5640,28 +5636,28 @@ msgstr "Itens de inventário"
msgid "Rear Port"
msgstr "Porta traseira"
-#: dcim/tables/devices.py:893 templates/dcim/modulebay.html:51
+#: dcim/tables/devices.py:897 templates/dcim/modulebay.html:51
msgid "Installed Module"
msgstr "Módulo instalado"
-#: dcim/tables/devices.py:896
+#: dcim/tables/devices.py:900
msgid "Module Serial"
msgstr "Módulo serial"
-#: dcim/tables/devices.py:900
+#: dcim/tables/devices.py:904
msgid "Module Asset Tag"
msgstr "Etiqueta de ativo do módulo"
-#: dcim/tables/devices.py:909
+#: dcim/tables/devices.py:913
msgid "Module Status"
msgstr "Status do módulo"
-#: dcim/tables/devices.py:951 dcim/tables/devicetypes.py:308
+#: dcim/tables/devices.py:955 dcim/tables/devicetypes.py:308
#: templates/dcim/inventoryitem.html:41
msgid "Component"
msgstr "Parte"
-#: dcim/tables/devices.py:1006
+#: dcim/tables/devices.py:1010
msgid "Items"
msgstr "Itens"
@@ -6229,7 +6225,7 @@ msgid "Cluster type (slug)"
msgstr "Tipo de cluster (slug)"
#: extras/filtersets.py:490 ipam/forms/bulk_edit.py:475
-#: ipam/forms/model_forms.py:585 virtualization/forms/filtersets.py:108
+#: ipam/forms/model_forms.py:589 virtualization/forms/filtersets.py:108
msgid "Cluster group"
msgstr "Grupo de clusters"
@@ -6360,8 +6356,8 @@ msgid "Is active"
msgstr "Está ativo"
#: extras/forms/bulk_import.py:34 extras/forms/bulk_import.py:115
-#: extras/forms/bulk_import.py:130 extras/forms/bulk_import.py:153
-#: extras/forms/bulk_import.py:177 extras/forms/filtersets.py:114
+#: extras/forms/bulk_import.py:136 extras/forms/bulk_import.py:159
+#: extras/forms/bulk_import.py:183 extras/forms/filtersets.py:114
#: extras/forms/filtersets.py:160 extras/forms/filtersets.py:201
#: extras/forms/model_forms.py:43 extras/forms/model_forms.py:127
#: extras/forms/model_forms.py:156 extras/forms/model_forms.py:197
@@ -6370,8 +6366,8 @@ msgid "Content types"
msgstr "Tipos de conteúdo"
#: extras/forms/bulk_import.py:36 extras/forms/bulk_import.py:117
-#: extras/forms/bulk_import.py:132 extras/forms/bulk_import.py:155
-#: extras/forms/bulk_import.py:179 tenancy/forms/bulk_import.py:96
+#: extras/forms/bulk_import.py:138 extras/forms/bulk_import.py:161
+#: extras/forms/bulk_import.py:185 tenancy/forms/bulk_import.py:96
msgid "One or more assigned object types"
msgstr "Um ou mais tipos de objetos atribuídos"
@@ -6418,29 +6414,39 @@ msgstr ""
"opcionais separados por dois pontos: “Choice1:First Choice, Choice2:Second "
"Choice”"
-#: extras/forms/bulk_import.py:182
+#: extras/forms/bulk_import.py:120 extras/models/models.py:353
+msgid "button class"
+msgstr "classe de botão"
+
+#: extras/forms/bulk_import.py:123 extras/models/models.py:357
+msgid ""
+"The class of the first link in a group will be used for the dropdown button"
+msgstr ""
+"A classe do primeiro link em um grupo será usada para o botão suspenso"
+
+#: extras/forms/bulk_import.py:188
msgid "Action object"
msgstr "Objeto de ação"
-#: extras/forms/bulk_import.py:184
+#: extras/forms/bulk_import.py:190
msgid "Webhook name or script as dotted path module.Class"
msgstr "Nome do webhook ou script como caminho pontilhado module.Class"
-#: extras/forms/bulk_import.py:205
+#: extras/forms/bulk_import.py:211
#, python-brace-format
msgid "Webhook {name} not found"
msgstr "Webhook {name} não encontrado"
-#: extras/forms/bulk_import.py:214
+#: extras/forms/bulk_import.py:220
#, python-brace-format
msgid "Script {name} not found"
msgstr "Roteiro {name} não encontrado"
-#: extras/forms/bulk_import.py:236
+#: extras/forms/bulk_import.py:242
msgid "Assigned object type"
msgstr "Tipo de objeto atribuído"
-#: extras/forms/bulk_import.py:241
+#: extras/forms/bulk_import.py:247
msgid "The classification of entry"
msgstr "A classificação da entrada"
@@ -7397,16 +7403,6 @@ msgstr "Código de modelo Jinja2 para URL do link"
msgid "Links with the same group will appear as a dropdown menu"
msgstr "Links com o mesmo grupo aparecerão como um menu suspenso"
-#: extras/models/models.py:353
-msgid "button class"
-msgstr "classe de botão"
-
-#: extras/models/models.py:357
-msgid ""
-"The class of the first link in a group will be used for the dropdown button"
-msgstr ""
-"A classe do primeiro link em um grupo será usada para o botão suspenso"
-
#: extras/models/models.py:360
msgid "new window"
msgstr "nova janela"
@@ -7598,7 +7594,7 @@ msgid "staged changes"
msgstr "mudanças encenadas"
#: extras/models/tags.py:40
-msgid "The object type(s) to which this this tag can be applied."
+msgid "The object type(s) to which this tag can be applied."
msgstr "O (s) tipo (s) de objeto aos quais essa tag pode ser aplicada."
#: extras/models/tags.py:49
@@ -7899,7 +7895,7 @@ msgid "VLAN number (1-4094)"
msgstr "Número da VLAN (1-4094)"
#: ipam/filtersets.py:437 ipam/filtersets.py:441 ipam/filtersets.py:533
-#: ipam/forms/model_forms.py:444 templates/tenancy/contact.html:54
+#: ipam/forms/model_forms.py:430 templates/tenancy/contact.html:54
#: tenancy/forms/bulk_edit.py:112
msgid "Address"
msgstr "Endereço"
@@ -8068,7 +8064,7 @@ msgid "Authentication key"
msgstr "Chave de autenticação"
#: ipam/forms/bulk_edit.py:404 ipam/forms/filtersets.py:369
-#: ipam/forms/model_forms.py:455 netbox/navigation/menu.py:376
+#: ipam/forms/model_forms.py:441 netbox/navigation/menu.py:376
#: templates/ipam/fhrpgroup.html:51
#: templates/wireless/inc/authentication_attrs.html:5
#: wireless/forms/bulk_edit.py:90 wireless/forms/bulk_edit.py:137
@@ -8085,11 +8081,11 @@ msgstr "VLAN infantil mínima VID"
msgid "Maximum child VLAN VID"
msgstr "VLAN infantil máximo VID"
-#: ipam/forms/bulk_edit.py:428 ipam/forms/model_forms.py:527
+#: ipam/forms/bulk_edit.py:428 ipam/forms/model_forms.py:531
msgid "Scope type"
msgstr "Tipo de escopo"
-#: ipam/forms/bulk_edit.py:489 ipam/forms/model_forms.py:600
+#: ipam/forms/bulk_edit.py:489 ipam/forms/model_forms.py:604
#: ipam/tables/vlans.py:71 templates/ipam/vlangroup.html:39
msgid "Scope"
msgstr "Escopo"
@@ -8098,8 +8094,8 @@ msgstr "Escopo"
msgid "Site & Group"
msgstr "Site e grupo"
-#: ipam/forms/bulk_edit.py:574 ipam/forms/model_forms.py:663
-#: ipam/forms/model_forms.py:697 ipam/tables/services.py:19
+#: ipam/forms/bulk_edit.py:574 ipam/forms/model_forms.py:667
+#: ipam/forms/model_forms.py:701 ipam/tables/services.py:19
#: ipam/tables/services.py:49 templates/ipam/service.html:39
#: templates/ipam/servicetemplate.html:24
msgid "Ports"
@@ -8139,7 +8135,7 @@ msgid "Parent device of assigned interface (if any)"
msgstr "Dispositivo principal da interface atribuída (se houver)"
#: ipam/forms/bulk_import.py:310 ipam/forms/bulk_import.py:496
-#: ipam/forms/model_forms.py:691 virtualization/filtersets.py:284
+#: ipam/forms/model_forms.py:695 virtualization/filtersets.py:284
#: virtualization/filtersets.py:323 virtualization/forms/bulk_edit.py:199
#: virtualization/forms/bulk_edit.py:325
#: virtualization/forms/bulk_import.py:146
@@ -8317,8 +8313,8 @@ msgstr "Porto"
#: virtualization/forms/filtersets.py:189
#: virtualization/forms/filtersets.py:234
#: virtualization/forms/model_forms.py:223
-#: virtualization/tables/virtualmachines.py:115
-#: virtualization/tables/virtualmachines.py:168 vpn/choices.py:45
+#: virtualization/tables/virtualmachines.py:128
+#: virtualization/tables/virtualmachines.py:181 vpn/choices.py:45
#: vpn/forms/filtersets.py:289 vpn/forms/model_forms.py:161
#: vpn/forms/model_forms.py:172 vpn/forms/model_forms.py:274
msgid "Virtual Machine"
@@ -8341,7 +8337,7 @@ msgstr "Atribuição de site/VLAN"
msgid "IP Range"
msgstr "Intervalo de IP"
-#: ipam/forms/model_forms.py:285 ipam/forms/model_forms.py:454
+#: ipam/forms/model_forms.py:285 ipam/forms/model_forms.py:440
#: templates/ipam/fhrpgroup.html:19 templates/ipam/ipaddress_edit.html:52
msgid "FHRP Group"
msgstr "Grupo FHRP"
@@ -8354,7 +8350,7 @@ msgstr "Torne esse o IP primário do dispositivo/VM"
msgid "An IP address can only be assigned to a single object."
msgstr "Um endereço IP só pode ser atribuído a um único objeto."
-#: ipam/forms/model_forms.py:357 ipam/models/ip.py:877
+#: ipam/forms/model_forms.py:357 ipam/models/ip.py:896
msgid ""
"Cannot reassign IP address while it is designated as the primary IP for the "
"parent object"
@@ -8369,34 +8365,25 @@ msgstr ""
"Somente endereços IP atribuídos a uma interface podem ser designados como "
"IPs primários."
-#: ipam/forms/model_forms.py:373
-#, python-brace-format
-msgid "{ip} is a network ID, which may not be assigned to an interface."
-msgstr "{ip} é uma ID de rede, que não pode ser atribuída a uma interface."
-
-#: ipam/forms/model_forms.py:379
-#, python-brace-format
-msgid ""
-"{ip} is a broadcast address, which may not be assigned to an interface."
-msgstr ""
-"{ip} é um endereço de transmissão, que não pode ser atribuído a uma "
-"interface."
-
-#: ipam/forms/model_forms.py:456
+#: ipam/forms/model_forms.py:442
msgid "Virtual IP Address"
msgstr "Endereço IP virtual"
-#: ipam/forms/model_forms.py:598 ipam/forms/model_forms.py:637
+#: ipam/forms/model_forms.py:523
+msgid "Assignment already exists"
+msgstr "A atribuição já existe"
+
+#: ipam/forms/model_forms.py:602 ipam/forms/model_forms.py:641
#: ipam/tables/ip.py:250 templates/ipam/vlan_edit.html:37
#: templates/ipam/vlangroup.html:27
msgid "VLAN Group"
msgstr "Grupo VLAN"
-#: ipam/forms/model_forms.py:599
+#: ipam/forms/model_forms.py:603
msgid "Child VLANs"
msgstr "VLANs secundários"
-#: ipam/forms/model_forms.py:668 ipam/forms/model_forms.py:702
+#: ipam/forms/model_forms.py:672 ipam/forms/model_forms.py:706
msgid ""
"Comma-separated list of one or more port numbers. A range may be specified "
"using a hyphen."
@@ -8404,15 +8391,15 @@ msgstr ""
"Lista separada por vírgula de um ou mais números de porta. Um intervalo pode"
" ser especificado usando um hífen."
-#: ipam/forms/model_forms.py:673 templates/ipam/servicetemplate.html:12
+#: ipam/forms/model_forms.py:677 templates/ipam/servicetemplate.html:12
msgid "Service Template"
msgstr "Modelo de serviço"
-#: ipam/forms/model_forms.py:724
+#: ipam/forms/model_forms.py:728
msgid "Service template"
msgstr "Modelo de serviço"
-#: ipam/forms/model_forms.py:754
+#: ipam/forms/model_forms.py:758
msgid ""
"Must specify name, protocol, and port(s) if not using a service template."
msgstr ""
@@ -8579,12 +8566,12 @@ msgstr "prefixos"
msgid "Cannot create prefix with /0 mask."
msgstr "Não é possível criar prefixo com a máscara /0."
-#: ipam/models/ip.py:323 ipam/models/ip.py:854
+#: ipam/models/ip.py:323 ipam/models/ip.py:873
#, python-brace-format
msgid "VRF {vrf}"
msgstr "VRF {vrf}"
-#: ipam/models/ip.py:323 ipam/models/ip.py:854
+#: ipam/models/ip.py:323 ipam/models/ip.py:873
msgid "global table"
msgstr "tabela global"
@@ -8680,12 +8667,25 @@ msgstr "Endereços IP"
msgid "Cannot create IP address with /0 mask."
msgstr "Não é possível criar endereço IP com máscara /0."
-#: ipam/models/ip.py:856
+#: ipam/models/ip.py:850
+#, python-brace-format
+msgid "{ip} is a network ID, which may not be assigned to an interface."
+msgstr "{ip} é uma ID de rede, que não pode ser atribuída a uma interface."
+
+#: ipam/models/ip.py:861
+#, python-brace-format
+msgid ""
+"{ip} is a broadcast address, which may not be assigned to an interface."
+msgstr ""
+"{ip} é um endereço de transmissão, que não pode ser atribuído a uma "
+"interface."
+
+#: ipam/models/ip.py:875
#, python-brace-format
msgid "Duplicate IP address found in {table}: {ipaddress}"
msgstr "Endereço IP duplicado encontrado em {table}: {ipaddress}"
-#: ipam/models/ip.py:883
+#: ipam/models/ip.py:902
msgid "Only IPv6 addresses can be assigned SLAAC status"
msgstr "Somente endereços IPv6 podem receber o status SLAAC"
@@ -9468,7 +9468,7 @@ msgstr "Máquinas virtuais"
#: templates/virtualization/virtualmachine.html:177
#: templates/virtualization/virtualmachine/base.html:32
#: templates/virtualization/virtualmachine_list.html:21
-#: virtualization/tables/virtualmachines.py:90 virtualization/views.py:389
+#: virtualization/tables/virtualmachines.py:103 virtualization/views.py:389
msgid "Virtual Disks"
msgstr "Discos virtuais"
@@ -10393,8 +10393,8 @@ msgstr "Agendamento"
#: templates/core/job.html:66
#, python-format
-msgid "every %(interval)s seconds"
-msgstr "cada %(interval)s segundos"
+msgid "every %(interval)s minutes"
+msgstr "cada %(interval)s ata"
#: templates/dcim/bulk_disconnect.html:9
#, python-format
@@ -12948,67 +12948,67 @@ msgstr "As restrições não são suportadas para esse tipo de objeto."
msgid "Invalid filter for {model}: {error}"
msgstr "Filtro inválido para {model}: {error}"
-#: users/models.py:54
+#: users/models.py:55
msgid "user"
msgstr "usuária"
-#: users/models.py:55
+#: users/models.py:56
msgid "users"
msgstr "usuários"
-#: users/models.py:66
+#: users/models.py:67
msgid "A user with this username already exists."
msgstr "Já existe um usuário com esse nome de usuário."
-#: users/models.py:78 vpn/models/crypto.py:42
+#: users/models.py:79 vpn/models/crypto.py:42
msgid "group"
msgstr "grupo"
-#: users/models.py:79
+#: users/models.py:80
msgid "groups"
msgstr "grupos"
-#: users/models.py:106 users/models.py:107
+#: users/models.py:107 users/models.py:108
msgid "user preferences"
msgstr "preferências do usuário"
-#: users/models.py:174
+#: users/models.py:175
#, python-brace-format
msgid "Key '{path}' is a leaf node; cannot assign new keys"
msgstr "Chave '{path}'é um nó de folha; não é possível atribuir novas chaves"
-#: users/models.py:186
+#: users/models.py:187
#, python-brace-format
msgid "Key '{path}' is a dictionary; cannot assign a non-dictionary value"
msgstr ""
"Chave '{path}'é um dicionário; não pode atribuir um valor que não seja do "
"dicionário"
-#: users/models.py:252
+#: users/models.py:253
msgid "expires"
msgstr "expira"
-#: users/models.py:257
+#: users/models.py:258
msgid "last used"
msgstr "usado pela última vez"
-#: users/models.py:262
+#: users/models.py:263
msgid "key"
msgstr "chave"
-#: users/models.py:268
+#: users/models.py:269
msgid "write enabled"
msgstr "gravação habilitada"
-#: users/models.py:270
+#: users/models.py:271
msgid "Permit create/update/delete operations using this key"
msgstr "Permitir operações de criação/atualização/exclusão usando essa chave"
-#: users/models.py:281
+#: users/models.py:282
msgid "allowed IPs"
msgstr "IPs permitidos"
-#: users/models.py:283
+#: users/models.py:284
msgid ""
"Allowed IPv4/IPv6 networks from where the token can be used. Leave blank for"
" no restrictions. Ex: \"10.1.1.0/24, 192.168.10.16/32, 2001:DB8:1::/64\""
@@ -13016,34 +13016,34 @@ msgstr ""
"Redes IPv4/IPv6 permitidas de onde o token pode ser usado. Deixe em branco "
"sem restrições. Ex: “10.1.1.0/24, 192.168.10.16/32, 2001:DB 8:1: :/64\""
-#: users/models.py:291
+#: users/models.py:296
msgid "token"
msgstr "ficha"
-#: users/models.py:292
+#: users/models.py:297
msgid "tokens"
msgstr "tokens"
-#: users/models.py:373
+#: users/models.py:378
msgid "The list of actions granted by this permission"
msgstr "A lista de ações concedidas por essa permissão"
-#: users/models.py:378
+#: users/models.py:383
msgid "constraints"
msgstr "restrições"
-#: users/models.py:379
+#: users/models.py:384
msgid ""
"Queryset filter matching the applicable objects of the selected type(s)"
msgstr ""
"Filtro do conjunto de consultas que corresponde aos objetos aplicáveis do "
"(s) tipo (s) selecionado (s)"
-#: users/models.py:386
+#: users/models.py:391
msgid "permission"
msgstr "permissão"
-#: users/models.py:387
+#: users/models.py:392
msgid "permissions"
msgstr "permissões"
@@ -13317,46 +13317,55 @@ msgstr ""
"Esse objeto foi modificado desde que o formulário foi renderizado. Consulte "
"o registro de alterações do objeto para obter detalhes."
-#: utilities/forms/utils.py:42 utilities/forms/utils.py:65
-#: utilities/forms/utils.py:77 utilities/forms/utils.py:80
+#: utilities/forms/utils.py:42 utilities/forms/utils.py:68
+#: utilities/forms/utils.py:85 utilities/forms/utils.py:87
#, python-brace-format
msgid "Range \"{value}\" is invalid."
msgstr "Alcance”{value}“é inválido."
-#: utilities/forms/utils.py:225
+#: utilities/forms/utils.py:74
+#, python-brace-format
+msgid ""
+"Invalid range: Ending value ({end}) must be greater than beginning value "
+"({begin})."
+msgstr ""
+"Intervalo inválido: valor final ({end}) deve ser maior que o valor inicial "
+"({begin})."
+
+#: utilities/forms/utils.py:232
#, python-brace-format
msgid "Duplicate or conflicting column header for \"{field}\""
msgstr "Cabeçalho de coluna duplicado ou conflitante para”{field}“"
-#: utilities/forms/utils.py:231
+#: utilities/forms/utils.py:238
#, python-brace-format
msgid "Duplicate or conflicting column header for \"{header}\""
msgstr "Cabeçalho de coluna duplicado ou conflitante para”{header}“"
-#: utilities/forms/utils.py:240
+#: utilities/forms/utils.py:247
#, python-brace-format
msgid "Row {row}: Expected {count_expected} columns but found {count_found}"
msgstr ""
"Linha {row}: Esperado {count_expected} colunas, mas encontradas "
"{count_found}"
-#: utilities/forms/utils.py:263
+#: utilities/forms/utils.py:270
#, python-brace-format
msgid "Unexpected column header \"{field}\" found."
msgstr "Cabeçalho de coluna inesperado”{field}“encontrado."
-#: utilities/forms/utils.py:265
+#: utilities/forms/utils.py:272
#, python-brace-format
msgid "Column \"{field}\" is not a related object; cannot use dots"
msgstr "Coluna”{field}“não é um objeto relacionado; não pode usar pontos"
-#: utilities/forms/utils.py:269
+#: utilities/forms/utils.py:276
#, python-brace-format
msgid "Invalid related object attribute for column \"{field}\": {to_field}"
msgstr ""
"Atributo de objeto relacionado inválido para a coluna”{field}“: {to_field}"
-#: utilities/forms/utils.py:277
+#: utilities/forms/utils.py:284
#, python-brace-format
msgid "Required column header \"{header}\" not found."
msgstr "Cabeçalho de coluna obrigatório”{header}“não encontrado."
@@ -13994,6 +14003,11 @@ msgstr "Proposta"
msgid "Assigned Object Type"
msgstr "Tipo de objeto atribuído"
+#: vpn/forms/model_forms.py:94 vpn/forms/model_forms.py:129
+#: vpn/forms/model_forms.py:241 vpn/tables/tunnels.py:91
+msgid "Tunnel interface"
+msgstr "Interface de túnel"
+
#: vpn/forms/model_forms.py:147
msgid "First Termination"
msgstr "Primeira rescisão"
diff --git a/netbox/translations/ru/LC_MESSAGES/django.mo b/netbox/translations/ru/LC_MESSAGES/django.mo
index fd43bbda3..cf0d2757c 100644
Binary files a/netbox/translations/ru/LC_MESSAGES/django.mo and b/netbox/translations/ru/LC_MESSAGES/django.mo differ
diff --git a/netbox/translations/ru/LC_MESSAGES/django.po b/netbox/translations/ru/LC_MESSAGES/django.po
index 268a9fe36..14fe6c0b3 100644
--- a/netbox/translations/ru/LC_MESSAGES/django.po
+++ b/netbox/translations/ru/LC_MESSAGES/django.po
@@ -5,9 +5,12 @@
#
# Translators:
# Vladyslav V. Prodan, 2024
-# Nikita Vokhmintsev, 2024
-# Artem Kotik, 2024
+# Madi Tuleu, 2024
# Stavr Ognev, 2024
+# nvoff, 2024
+# Михаил Башкиров, 2024
+# Сергей Стрельцов, 2024
+# Artem Kotik, 2024
# Jeremy Stretch, 2024
#
#, fuzzy
@@ -15,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-21 19:48+0000\n"
+"POT-Creation-Date: 2024-04-04 19:11+0000\n"
"PO-Revision-Date: 2023-10-30 17:48+0000\n"
"Last-Translator: Jeremy Stretch, 2024\n"
"Language-Team: Russian (https://app.transifex.com/netbox-community/teams/178115/ru/)\n"
@@ -54,7 +57,7 @@ msgstr "Истекает"
#: account/tables.py:40 users/forms/filtersets.py:142
msgid "Last Used"
-msgstr "Последний раз использовался"
+msgstr "Последнее использование"
#: account/tables.py:43 templates/account/token.html:56
#: templates/users/token.html:48 users/forms/bulk_edit.py:102
@@ -67,19 +70,19 @@ msgid "Your preferences have been updated."
msgstr "Ваши настройки были обновлены."
#: circuits/choices.py:21 dcim/choices.py:20 dcim/choices.py:102
-#: dcim/choices.py:174 dcim/choices.py:220 dcim/choices.py:1419
-#: dcim/choices.py:1495 dcim/choices.py:1545 virtualization/choices.py:20
+#: dcim/choices.py:174 dcim/choices.py:220 dcim/choices.py:1425
+#: dcim/choices.py:1501 dcim/choices.py:1551 virtualization/choices.py:20
#: virtualization/choices.py:45 vpn/choices.py:18
msgid "Planned"
msgstr "Запланировано"
#: circuits/choices.py:22 netbox/navigation/menu.py:290
msgid "Provisioning"
-msgstr "Выделение ресурсов"
+msgstr "Ввод в эксплутацию"
#: circuits/choices.py:23 dcim/choices.py:22 dcim/choices.py:103
-#: dcim/choices.py:173 dcim/choices.py:219 dcim/choices.py:1494
-#: dcim/choices.py:1544 extras/tables/tables.py:380 ipam/choices.py:31
+#: dcim/choices.py:173 dcim/choices.py:219 dcim/choices.py:1500
+#: dcim/choices.py:1550 extras/tables/tables.py:380 ipam/choices.py:31
#: ipam/choices.py:49 ipam/choices.py:69 ipam/choices.py:154
#: templates/extras/configcontext.html:26 templates/users/user.html:38
#: users/forms/bulk_edit.py:36 virtualization/choices.py:22
@@ -88,20 +91,20 @@ msgid "Active"
msgstr "Активный"
#: circuits/choices.py:24 dcim/choices.py:172 dcim/choices.py:218
-#: dcim/choices.py:1493 dcim/choices.py:1546 virtualization/choices.py:24
+#: dcim/choices.py:1499 dcim/choices.py:1552 virtualization/choices.py:24
#: virtualization/choices.py:43
msgid "Offline"
msgstr "Оффлайн"
#: circuits/choices.py:25
msgid "Deprovisioning"
-msgstr "Выделение резервов"
+msgstr "Вывод из эксплуатации"
#: circuits/choices.py:26
msgid "Decommissioned"
msgstr "Списан"
-#: circuits/filtersets.py:29 circuits/filtersets.py:184 dcim/filtersets.py:124
+#: circuits/filtersets.py:29 circuits/filtersets.py:190 dcim/filtersets.py:124
#: dcim/filtersets.py:185 dcim/filtersets.py:260 dcim/filtersets.py:369
#: dcim/filtersets.py:903 dcim/filtersets.py:1207 dcim/filtersets.py:1702
#: dcim/filtersets.py:1945 dcim/filtersets.py:2003 ipam/filtersets.py:305
@@ -110,7 +113,7 @@ msgstr "Списан"
msgid "Region (ID)"
msgstr "Регион (ID)"
-#: circuits/filtersets.py:36 circuits/filtersets.py:191 dcim/filtersets.py:130
+#: circuits/filtersets.py:36 circuits/filtersets.py:197 dcim/filtersets.py:130
#: dcim/filtersets.py:192 dcim/filtersets.py:267 dcim/filtersets.py:376
#: dcim/filtersets.py:910 dcim/filtersets.py:1214 dcim/filtersets.py:1709
#: dcim/filtersets.py:1952 dcim/filtersets.py:2010 extras/filtersets.py:414
@@ -120,7 +123,7 @@ msgstr "Регион (ID)"
msgid "Region (slug)"
msgstr "Регион (подстрока)"
-#: circuits/filtersets.py:42 circuits/filtersets.py:197 dcim/filtersets.py:198
+#: circuits/filtersets.py:42 circuits/filtersets.py:203 dcim/filtersets.py:198
#: dcim/filtersets.py:273 dcim/filtersets.py:382 dcim/filtersets.py:916
#: dcim/filtersets.py:1220 dcim/filtersets.py:1715 dcim/filtersets.py:1958
#: dcim/filtersets.py:2016 ipam/filtersets.py:318 ipam/filtersets.py:909
@@ -128,7 +131,7 @@ msgstr "Регион (подстрока)"
msgid "Site group (ID)"
msgstr "Группа сайтов (ID)"
-#: circuits/filtersets.py:49 circuits/filtersets.py:204 dcim/filtersets.py:205
+#: circuits/filtersets.py:49 circuits/filtersets.py:210 dcim/filtersets.py:205
#: dcim/filtersets.py:280 dcim/filtersets.py:389 dcim/filtersets.py:923
#: dcim/filtersets.py:1227 dcim/filtersets.py:1722 dcim/filtersets.py:1965
#: dcim/filtersets.py:2023 extras/filtersets.py:420 ipam/filtersets.py:325
@@ -138,7 +141,7 @@ msgid "Site group (slug)"
msgstr "Группа сайтов (подстрока)"
#: circuits/filtersets.py:54 circuits/forms/bulk_import.py:117
-#: circuits/forms/filtersets.py:47 circuits/forms/filtersets.py:171
+#: circuits/forms/filtersets.py:47 circuits/forms/filtersets.py:167
#: circuits/forms/model_forms.py:137 dcim/forms/bulk_edit.py:166
#: dcim/forms/bulk_edit.py:238 dcim/forms/bulk_edit.py:570
#: dcim/forms/bulk_edit.py:763 dcim/forms/bulk_import.py:130
@@ -161,8 +164,8 @@ msgstr "Группа сайтов (подстрока)"
#: ipam/forms/bulk_import.py:170 ipam/forms/bulk_import.py:437
#: ipam/forms/filtersets.py:152 ipam/forms/filtersets.py:226
#: ipam/forms/filtersets.py:417 ipam/forms/filtersets.py:470
-#: ipam/forms/model_forms.py:206 ipam/forms/model_forms.py:548
-#: ipam/forms/model_forms.py:640 ipam/tables/ip.py:244
+#: ipam/forms/model_forms.py:206 ipam/forms/model_forms.py:552
+#: ipam/forms/model_forms.py:644 ipam/tables/ip.py:244
#: ipam/tables/vlans.py:114 ipam/tables/vlans.py:216
#: templates/circuits/circuittermination_edit.html:20
#: templates/circuits/inc/circuit_termination.html:33
@@ -184,13 +187,13 @@ msgstr "Группа сайтов (подстрока)"
#: virtualization/forms/model_forms.py:107
#: virtualization/forms/model_forms.py:174
#: virtualization/tables/clusters.py:77
-#: virtualization/tables/virtualmachines.py:53 vpn/forms/filtersets.py:262
+#: virtualization/tables/virtualmachines.py:62 vpn/forms/filtersets.py:262
#: wireless/forms/model_forms.py:77 wireless/forms/model_forms.py:117
msgid "Site"
msgstr "Сайт"
-#: circuits/filtersets.py:60 circuits/filtersets.py:215
-#: circuits/filtersets.py:252 dcim/filtersets.py:215 dcim/filtersets.py:290
+#: circuits/filtersets.py:60 circuits/filtersets.py:221
+#: circuits/filtersets.py:258 dcim/filtersets.py:215 dcim/filtersets.py:290
#: dcim/filtersets.py:363 extras/filtersets.py:436 ipam/filtersets.py:215
#: ipam/filtersets.py:335 ipam/filtersets.py:926
#: virtualization/filtersets.py:75 virtualization/filtersets.py:203
@@ -202,33 +205,39 @@ msgstr "Сайт (подстрока)"
msgid "ASN (ID)"
msgstr "ASN (ID)"
-#: circuits/filtersets.py:87 circuits/filtersets.py:114
-#: circuits/filtersets.py:148
-msgid "Provider (ID)"
-msgstr "Провайдер (ID)"
+#: circuits/filtersets.py:71 circuits/forms/filtersets.py:27
+#: ipam/forms/model_forms.py:158 ipam/models/asns.py:108
+#: ipam/models/asns.py:125 ipam/tables/asn.py:41 templates/ipam/asn.html:20
+msgid "ASN"
+msgstr "ASN"
#: circuits/filtersets.py:93 circuits/filtersets.py:120
#: circuits/filtersets.py:154
+msgid "Provider (ID)"
+msgstr "Провайдер (ID)"
+
+#: circuits/filtersets.py:99 circuits/filtersets.py:126
+#: circuits/filtersets.py:160
msgid "Provider (slug)"
msgstr "Провайдер (подстрока)"
-#: circuits/filtersets.py:159
+#: circuits/filtersets.py:165
msgid "Provider account (ID)"
msgstr "Аккаунт провайдера (ID)"
-#: circuits/filtersets.py:164
+#: circuits/filtersets.py:170
msgid "Provider network (ID)"
msgstr "Сеть провайдера (ID)"
-#: circuits/filtersets.py:168
+#: circuits/filtersets.py:174
msgid "Circuit type (ID)"
msgstr "Тип канала связи (ID)"
-#: circuits/filtersets.py:174
+#: circuits/filtersets.py:180
msgid "Circuit type (slug)"
msgstr "Тип канала связи (подстрока)"
-#: circuits/filtersets.py:209 circuits/filtersets.py:246
+#: circuits/filtersets.py:215 circuits/filtersets.py:252
#: dcim/filtersets.py:209 dcim/filtersets.py:284 dcim/filtersets.py:357
#: dcim/filtersets.py:927 dcim/filtersets.py:1232 dcim/filtersets.py:1727
#: dcim/filtersets.py:1969 dcim/filtersets.py:2028 ipam/filtersets.py:209
@@ -238,13 +247,13 @@ msgstr "Тип канала связи (подстрока)"
msgid "Site (ID)"
msgstr "Сайт (ID)"
-#: circuits/filtersets.py:238 core/filtersets.py:73 core/filtersets.py:132
+#: circuits/filtersets.py:244 core/filtersets.py:73 core/filtersets.py:132
#: dcim/filtersets.py:640 dcim/filtersets.py:1201 dcim/filtersets.py:2076
#: extras/filtersets.py:40 extras/filtersets.py:69 extras/filtersets.py:101
#: extras/filtersets.py:140 extras/filtersets.py:168 extras/filtersets.py:195
#: extras/filtersets.py:226 extras/filtersets.py:295 extras/filtersets.py:343
#: extras/filtersets.py:403 extras/filtersets.py:562 extras/filtersets.py:604
-#: extras/filtersets.py:645 ipam/forms/model_forms.py:430
+#: extras/filtersets.py:645 ipam/forms/model_forms.py:416
#: netbox/filtersets.py:275 netbox/forms/__init__.py:23
#: netbox/forms/base.py:163 templates/htmx/object_selector.html:28
#: templates/inc/filter_list.html:53 templates/ipam/ipaddress_assign.html:32
@@ -254,7 +263,7 @@ msgstr "Сайт (ID)"
msgid "Search"
msgstr "Поиск"
-#: circuits/filtersets.py:242 circuits/forms/bulk_edit.py:167
+#: circuits/filtersets.py:248 circuits/forms/bulk_edit.py:167
#: circuits/forms/model_forms.py:110 circuits/forms/model_forms.py:132
#: dcim/forms/connections.py:66 templates/circuits/circuit.html:15
#: templates/dcim/inc/cable_termination.html:55
@@ -262,11 +271,11 @@ msgstr "Поиск"
msgid "Circuit"
msgstr "Канал связи"
-#: circuits/filtersets.py:256
+#: circuits/filtersets.py:262
msgid "ProviderNetwork (ID)"
msgstr "Сеть провайдера (ID)"
-#: circuits/forms/bulk_edit.py:25 circuits/forms/filtersets.py:56
+#: circuits/forms/bulk_edit.py:25 circuits/forms/filtersets.py:52
#: circuits/forms/model_forms.py:26 circuits/tables/providers.py:33
#: dcim/forms/bulk_edit.py:126 dcim/forms/filtersets.py:187
#: dcim/forms/model_forms.py:126 dcim/tables/sites.py:94
@@ -377,8 +386,8 @@ msgstr "Описание"
#: circuits/forms/bulk_edit.py:46 circuits/forms/bulk_edit.py:68
#: circuits/forms/bulk_edit.py:118 circuits/forms/bulk_import.py:35
#: circuits/forms/bulk_import.py:50 circuits/forms/bulk_import.py:76
-#: circuits/forms/filtersets.py:70 circuits/forms/filtersets.py:88
-#: circuits/forms/filtersets.py:116 circuits/forms/filtersets.py:131
+#: circuits/forms/filtersets.py:66 circuits/forms/filtersets.py:84
+#: circuits/forms/filtersets.py:112 circuits/forms/filtersets.py:127
#: circuits/forms/model_forms.py:32 circuits/forms/model_forms.py:44
#: circuits/forms/model_forms.py:58 circuits/forms/model_forms.py:92
#: circuits/tables/circuits.py:55 circuits/tables/providers.py:72
@@ -390,18 +399,18 @@ msgstr "Описание"
msgid "Provider"
msgstr "Провайдер"
-#: circuits/forms/bulk_edit.py:75 circuits/forms/filtersets.py:91
+#: circuits/forms/bulk_edit.py:75 circuits/forms/filtersets.py:87
#: templates/circuits/providernetwork.html:31
msgid "Service ID"
msgstr "Идентификатор Службы"
-#: circuits/forms/bulk_edit.py:95 circuits/forms/filtersets.py:107
+#: circuits/forms/bulk_edit.py:95 circuits/forms/filtersets.py:103
#: dcim/forms/bulk_edit.py:204 dcim/forms/bulk_edit.py:500
#: dcim/forms/bulk_edit.py:694 dcim/forms/bulk_edit.py:1063
#: dcim/forms/bulk_edit.py:1090 dcim/forms/bulk_edit.py:1562
#: dcim/forms/filtersets.py:977 dcim/forms/filtersets.py:1353
-#: dcim/forms/filtersets.py:1374 dcim/tables/devices.py:722
-#: dcim/tables/devices.py:782 dcim/tables/devices.py:1009
+#: dcim/forms/filtersets.py:1374 dcim/tables/devices.py:726
+#: dcim/tables/devices.py:786 dcim/tables/devices.py:1013
#: dcim/tables/devicetypes.py:245 dcim/tables/devicetypes.py:260
#: dcim/tables/racks.py:32 extras/forms/bulk_edit.py:259
#: extras/tables/tables.py:328 templates/circuits/circuittype.html:33
@@ -413,7 +422,7 @@ msgid "Color"
msgstr "Цвет"
#: circuits/forms/bulk_edit.py:113 circuits/forms/bulk_import.py:89
-#: circuits/forms/filtersets.py:126 core/forms/bulk_edit.py:17
+#: circuits/forms/filtersets.py:122 core/forms/bulk_edit.py:17
#: core/forms/filtersets.py:29 core/tables/data.py:20 core/tables/jobs.py:18
#: dcim/forms/bulk_edit.py:281 dcim/forms/bulk_edit.py:672
#: dcim/forms/bulk_edit.py:811 dcim/forms/bulk_edit.py:879
@@ -432,7 +441,7 @@ msgstr "Цвет"
#: dcim/forms/filtersets.py:1253 dcim/forms/filtersets.py:1348
#: dcim/forms/filtersets.py:1369 dcim/forms/object_import.py:89
#: dcim/forms/object_import.py:118 dcim/forms/object_import.py:150
-#: dcim/tables/devices.py:211 dcim/tables/devices.py:838
+#: dcim/tables/devices.py:211 dcim/tables/devices.py:842
#: dcim/tables/power.py:77 extras/forms/bulk_import.py:39
#: extras/tables/tables.py:278 extras/tables/tables.py:350
#: extras/tables/tables.py:448 netbox/tables/tables.py:234
@@ -457,12 +466,12 @@ msgid "Type"
msgstr "Тип"
#: circuits/forms/bulk_edit.py:123 circuits/forms/bulk_import.py:82
-#: circuits/forms/filtersets.py:139 circuits/forms/model_forms.py:97
+#: circuits/forms/filtersets.py:135 circuits/forms/model_forms.py:97
msgid "Provider account"
msgstr "Аккаунт провайдера"
#: circuits/forms/bulk_edit.py:131 circuits/forms/bulk_import.py:95
-#: circuits/forms/filtersets.py:150 core/forms/filtersets.py:34
+#: circuits/forms/filtersets.py:146 core/forms/filtersets.py:34
#: core/forms/filtersets.py:75 core/tables/data.py:23 core/tables/jobs.py:26
#: dcim/forms/bulk_edit.py:104 dcim/forms/bulk_edit.py:179
#: dcim/forms/bulk_edit.py:260 dcim/forms/bulk_edit.py:593
@@ -476,8 +485,8 @@ msgstr "Аккаунт провайдера"
#: dcim/forms/filtersets.py:281 dcim/forms/filtersets.py:726
#: dcim/forms/filtersets.py:835 dcim/forms/filtersets.py:871
#: dcim/forms/filtersets.py:972 dcim/forms/filtersets.py:1083
-#: dcim/tables/devices.py:173 dcim/tables/devices.py:841
-#: dcim/tables/devices.py:1069 dcim/tables/modules.py:69
+#: dcim/tables/devices.py:173 dcim/tables/devices.py:845
+#: dcim/tables/devices.py:1073 dcim/tables/modules.py:69
#: dcim/tables/power.py:74 dcim/tables/racks.py:66 dcim/tables/sites.py:82
#: dcim/tables/sites.py:133 ipam/forms/bulk_edit.py:240
#: ipam/forms/bulk_edit.py:289 ipam/forms/bulk_edit.py:337
@@ -485,7 +494,7 @@ msgstr "Аккаунт провайдера"
#: ipam/forms/bulk_import.py:256 ipam/forms/bulk_import.py:292
#: ipam/forms/bulk_import.py:458 ipam/forms/filtersets.py:205
#: ipam/forms/filtersets.py:270 ipam/forms/filtersets.py:341
-#: ipam/forms/filtersets.py:482 ipam/forms/model_forms.py:449
+#: ipam/forms/filtersets.py:482 ipam/forms/model_forms.py:435
#: ipam/tables/ip.py:236 ipam/tables/ip.py:309 ipam/tables/ip.py:359
#: ipam/tables/ip.py:421 ipam/tables/ip.py:448 ipam/tables/vlans.py:122
#: ipam/tables/vlans.py:227 templates/circuits/circuit.html:35
@@ -506,7 +515,7 @@ msgstr "Аккаунт провайдера"
#: virtualization/forms/bulk_import.py:80
#: virtualization/forms/filtersets.py:61
#: virtualization/forms/filtersets.py:156 virtualization/tables/clusters.py:74
-#: virtualization/tables/virtualmachines.py:50 vpn/forms/bulk_edit.py:38
+#: virtualization/tables/virtualmachines.py:59 vpn/forms/bulk_edit.py:38
#: vpn/forms/bulk_import.py:37 vpn/forms/filtersets.py:46
#: vpn/tables/tunnels.py:48 wireless/forms/bulk_edit.py:42
#: wireless/forms/bulk_edit.py:104 wireless/forms/bulk_import.py:43
@@ -517,7 +526,7 @@ msgid "Status"
msgstr "Статус"
#: circuits/forms/bulk_edit.py:137 circuits/forms/bulk_import.py:100
-#: circuits/forms/filtersets.py:119 dcim/forms/bulk_edit.py:120
+#: circuits/forms/filtersets.py:115 dcim/forms/bulk_edit.py:120
#: dcim/forms/bulk_edit.py:185 dcim/forms/bulk_edit.py:255
#: dcim/forms/bulk_edit.py:366 dcim/forms/bulk_edit.py:583
#: dcim/forms/bulk_edit.py:684 dcim/forms/bulk_edit.py:1590
@@ -575,15 +584,15 @@ msgstr "Статус"
msgid "Tenant"
msgstr "Тенант"
-#: circuits/forms/bulk_edit.py:142 circuits/forms/filtersets.py:174
+#: circuits/forms/bulk_edit.py:142 circuits/forms/filtersets.py:170
msgid "Install date"
msgstr "Дата установки"
-#: circuits/forms/bulk_edit.py:147 circuits/forms/filtersets.py:179
+#: circuits/forms/bulk_edit.py:147 circuits/forms/filtersets.py:175
msgid "Termination date"
msgstr "Дата отключения"
-#: circuits/forms/bulk_edit.py:153 circuits/forms/filtersets.py:186
+#: circuits/forms/bulk_edit.py:153 circuits/forms/filtersets.py:182
msgid "Commit rate (Kbps)"
msgstr "Гарантированная скорость (Кбит/с)"
@@ -616,7 +625,7 @@ msgstr "Назначенный провайдер"
#: circuits/forms/bulk_import.py:70 dcim/forms/bulk_import.py:178
#: dcim/forms/bulk_import.py:388 dcim/forms/bulk_import.py:1108
-#: dcim/forms/bulk_import.py:1187 extras/forms/bulk_import.py:229
+#: dcim/forms/bulk_import.py:1187 extras/forms/bulk_import.py:235
msgid "RGB color in hexadecimal. Example:"
msgstr "Цвет RGB в шестнадцатеричном формате. Пример:"
@@ -652,12 +661,12 @@ msgstr "Операционный статус"
msgid "Assigned tenant"
msgstr "Назначенный тенант"
-#: circuits/forms/bulk_import.py:123 circuits/forms/filtersets.py:147
+#: circuits/forms/bulk_import.py:123 circuits/forms/filtersets.py:143
#: circuits/forms/model_forms.py:143
msgid "Provider network"
msgstr "Сеть провайдера"
-#: circuits/forms/filtersets.py:26 circuits/forms/filtersets.py:118
+#: circuits/forms/filtersets.py:26 circuits/forms/filtersets.py:114
#: dcim/forms/bulk_edit.py:247 dcim/forms/bulk_edit.py:345
#: dcim/forms/bulk_edit.py:575 dcim/forms/bulk_edit.py:622
#: dcim/forms/bulk_edit.py:772 dcim/forms/bulk_import.py:189
@@ -681,7 +690,7 @@ msgstr "Сеть провайдера"
#: extras/filtersets.py:441 extras/forms/filtersets.py:328
#: ipam/forms/bulk_edit.py:456 ipam/forms/filtersets.py:168
#: ipam/forms/filtersets.py:400 ipam/forms/filtersets.py:422
-#: ipam/forms/filtersets.py:448 ipam/forms/model_forms.py:560
+#: ipam/forms/filtersets.py:448 ipam/forms/model_forms.py:564
#: templates/dcim/device.html:26 templates/dcim/device_edit.html:30
#: templates/dcim/inc/cable_termination.html:12
#: templates/dcim/location.html:27 templates/dcim/powerpanel.html:27
@@ -691,13 +700,7 @@ msgstr "Сеть провайдера"
msgid "Location"
msgstr "Локация"
-#: circuits/forms/filtersets.py:27 ipam/forms/model_forms.py:158
-#: ipam/models/asns.py:108 ipam/models/asns.py:125 ipam/tables/asn.py:41
-#: templates/ipam/asn.html:20
-msgid "ASN"
-msgstr "ASN"
-
-#: circuits/forms/filtersets.py:28 circuits/forms/filtersets.py:120
+#: circuits/forms/filtersets.py:28 circuits/forms/filtersets.py:116
#: dcim/forms/filtersets.py:136 dcim/forms/filtersets.py:150
#: dcim/forms/filtersets.py:166 dcim/forms/filtersets.py:198
#: dcim/forms/filtersets.py:249 dcim/forms/filtersets.py:334
@@ -710,7 +713,7 @@ msgstr "ASN"
msgid "Contacts"
msgstr "Контакты"
-#: circuits/forms/filtersets.py:33 circuits/forms/filtersets.py:157
+#: circuits/forms/filtersets.py:33 circuits/forms/filtersets.py:153
#: dcim/forms/bulk_edit.py:110 dcim/forms/bulk_edit.py:222
#: dcim/forms/bulk_edit.py:747 dcim/forms/bulk_import.py:92
#: dcim/forms/filtersets.py:70 dcim/forms/filtersets.py:177
@@ -725,7 +728,7 @@ msgstr "Контакты"
#: ipam/forms/bulk_edit.py:205 ipam/forms/bulk_edit.py:437
#: ipam/forms/bulk_edit.py:509 ipam/forms/filtersets.py:212
#: ipam/forms/filtersets.py:407 ipam/forms/filtersets.py:456
-#: ipam/forms/model_forms.py:532 templates/dcim/device.html:18
+#: ipam/forms/model_forms.py:536 templates/dcim/device.html:18
#: templates/dcim/rack.html:19 templates/dcim/rackreservation.html:25
#: templates/dcim/region.html:26 templates/dcim/site.html:31
#: templates/ipam/prefix.html:50 templates/ipam/vlan.html:19
@@ -735,7 +738,7 @@ msgstr "Контакты"
msgid "Region"
msgstr "Регион"
-#: circuits/forms/filtersets.py:38 circuits/forms/filtersets.py:162
+#: circuits/forms/filtersets.py:38 circuits/forms/filtersets.py:158
#: dcim/forms/bulk_edit.py:230 dcim/forms/bulk_edit.py:755
#: dcim/forms/filtersets.py:75 dcim/forms/filtersets.py:182
#: dcim/forms/filtersets.py:208 dcim/forms/filtersets.py:269
@@ -745,19 +748,15 @@ msgstr "Регион"
#: extras/filtersets.py:425 ipam/forms/bulk_edit.py:210
#: ipam/forms/bulk_edit.py:444 ipam/forms/bulk_edit.py:514
#: ipam/forms/filtersets.py:217 ipam/forms/filtersets.py:412
-#: ipam/forms/filtersets.py:461 ipam/forms/model_forms.py:545
+#: ipam/forms/filtersets.py:461 ipam/forms/model_forms.py:549
#: virtualization/forms/bulk_edit.py:85 virtualization/forms/filtersets.py:68
#: virtualization/forms/filtersets.py:134
#: virtualization/forms/model_forms.py:101
msgid "Site group"
msgstr "Группа сайтов"
-#: circuits/forms/filtersets.py:51
-msgid "ASN (legacy)"
-msgstr "ASN (устаревшая версия)"
-
-#: circuits/forms/filtersets.py:65 circuits/forms/filtersets.py:83
-#: circuits/forms/filtersets.py:102 circuits/forms/filtersets.py:117
+#: circuits/forms/filtersets.py:61 circuits/forms/filtersets.py:79
+#: circuits/forms/filtersets.py:98 circuits/forms/filtersets.py:113
#: core/forms/filtersets.py:63 dcim/forms/bulk_edit.py:718
#: dcim/forms/filtersets.py:164 dcim/forms/filtersets.py:196
#: dcim/forms/filtersets.py:825 dcim/forms/filtersets.py:920
@@ -783,7 +782,7 @@ msgstr "ASN (устаревшая версия)"
msgid "Attributes"
msgstr "Атрибуты"
-#: circuits/forms/filtersets.py:73 circuits/tables/circuits.py:60
+#: circuits/forms/filtersets.py:69 circuits/tables/circuits.py:60
#: circuits/tables/providers.py:66 templates/circuits/circuit.html:23
#: templates/circuits/provideraccount.html:25
msgid "Account"
@@ -804,7 +803,7 @@ msgstr "Тип канала связи"
#: dcim/models/device_component_templates.py:491
#: dcim/models/device_component_templates.py:591
#: dcim/models/device_components.py:976 dcim/models/device_components.py:1050
-#: dcim/models/device_components.py:1166 dcim/models/devices.py:467
+#: dcim/models/device_components.py:1166 dcim/models/devices.py:469
#: dcim/models/racks.py:43 extras/models/tags.py:28
msgid "color"
msgstr "цвет"
@@ -819,15 +818,15 @@ msgstr "типы каналов связи"
#: circuits/models/circuits.py:46
msgid "circuit ID"
-msgstr "идентификатор канала связи"
+msgstr "Идентификатор канала связи"
#: circuits/models/circuits.py:47
msgid "Unique circuit ID"
-msgstr "Уникальный идентификатор канала связи"
+msgstr "Уникальный ID канала связи"
#: circuits/models/circuits.py:67 core/models/data.py:55
-#: core/models/jobs.py:85 dcim/models/cables.py:49 dcim/models/devices.py:641
-#: dcim/models/devices.py:1165 dcim/models/devices.py:1374
+#: core/models/jobs.py:85 dcim/models/cables.py:49 dcim/models/devices.py:643
+#: dcim/models/devices.py:1170 dcim/models/devices.py:1379
#: dcim/models/power.py:95 dcim/models/racks.py:97 dcim/models/sites.py:154
#: dcim/models/sites.py:266 ipam/models/ip.py:252 ipam/models/ip.py:521
#: ipam/models/ip.py:729 ipam/models/vlans.py:175
@@ -843,7 +842,7 @@ msgstr "установлен"
#: circuits/models/circuits.py:87
msgid "terminates"
-msgstr "завершен"
+msgstr "разобран"
#: circuits/models/circuits.py:92
msgid "commit rate (Kbps)"
@@ -883,11 +882,11 @@ msgstr "Скорость отдачи, если она отличается от
#: circuits/models/circuits.py:200
msgid "cross-connect ID"
-msgstr "идентификатор кросс-соединения"
+msgstr "ID кросс-соединения"
#: circuits/models/circuits.py:201
msgid "ID of the local cross-connect"
-msgstr "Идентификатор локального кросс-соединения"
+msgstr "ID локального кросс-соединения"
#: circuits/models/circuits.py:206
msgid "patch panel/port(s)"
@@ -895,7 +894,7 @@ msgstr "патч-панель или порт(ы)"
#: circuits/models/circuits.py:207
msgid "Patch panel ID and port number(s)"
-msgstr "Идентификатор патч-панели и номера портов"
+msgstr "ID патч-панели и номера порта(-ов)"
#: circuits/models/circuits.py:210
#: dcim/models/device_component_templates.py:61
@@ -906,7 +905,7 @@ msgstr "Идентификатор патч-панели и номера пор
#: extras/models/models.py:541 extras/models/staging.py:31
#: extras/models/tags.py:32 netbox/models/__init__.py:109
#: netbox/models/__init__.py:144 netbox/models/__init__.py:190
-#: users/models.py:273 users/models.py:348
+#: users/models.py:274 users/models.py:353
#: virtualization/models/virtualmachines.py:282
msgid "description"
msgstr "описание"
@@ -923,8 +922,8 @@ msgstr "точки подключения канала связи"
msgid ""
"A circuit termination must attach to either a site or a provider network."
msgstr ""
-"Терминатор канала должен быть подключен либо к сайту, либо к сети "
-"поставщика."
+"Оконечное устройство канала должно быть подключено либо к узлу, либо к сети "
+"провайдера."
#: circuits/models/circuits.py:239
msgid ""
@@ -936,8 +935,8 @@ msgstr ""
#: circuits/models/providers.py:22 circuits/models/providers.py:66
#: circuits/models/providers.py:104 core/models/data.py:42
#: core/models/jobs.py:46 dcim/models/device_component_templates.py:43
-#: dcim/models/device_components.py:54 dcim/models/devices.py:581
-#: dcim/models/devices.py:1305 dcim/models/devices.py:1370
+#: dcim/models/device_components.py:54 dcim/models/devices.py:583
+#: dcim/models/devices.py:1310 dcim/models/devices.py:1375
#: dcim/models/power.py:39 dcim/models/power.py:91 dcim/models/racks.py:62
#: dcim/models/sites.py:138 extras/models/configs.py:36
#: extras/models/configs.py:215 extras/models/customfields.py:89
@@ -950,7 +949,7 @@ msgstr ""
#: ipam/models/vrfs.py:79 netbox/models/__init__.py:136
#: netbox/models/__init__.py:180 tenancy/models/contacts.py:64
#: tenancy/models/tenants.py:20 tenancy/models/tenants.py:45
-#: users/models.py:344 virtualization/models/clusters.py:57
+#: users/models.py:349 virtualization/models/clusters.py:57
#: virtualization/models/virtualmachines.py:70
#: virtualization/models/virtualmachines.py:272 vpn/models/crypto.py:24
#: vpn/models/crypto.py:71 vpn/models/crypto.py:131 vpn/models/crypto.py:183
@@ -1008,13 +1007,13 @@ msgstr "сети провайдера"
#: core/tables/data.py:16 core/tables/jobs.py:14 dcim/forms/filtersets.py:60
#: dcim/forms/object_create.py:42 dcim/tables/devices.py:88
#: dcim/tables/devices.py:125 dcim/tables/devices.py:167
-#: dcim/tables/devices.py:318 dcim/tables/devices.py:400
-#: dcim/tables/devices.py:444 dcim/tables/devices.py:496
-#: dcim/tables/devices.py:548 dcim/tables/devices.py:668
-#: dcim/tables/devices.py:749 dcim/tables/devices.py:799
-#: dcim/tables/devices.py:865 dcim/tables/devices.py:980
-#: dcim/tables/devices.py:1000 dcim/tables/devices.py:1029
-#: dcim/tables/devices.py:1059 dcim/tables/devicetypes.py:32
+#: dcim/tables/devices.py:322 dcim/tables/devices.py:404
+#: dcim/tables/devices.py:448 dcim/tables/devices.py:500
+#: dcim/tables/devices.py:552 dcim/tables/devices.py:672
+#: dcim/tables/devices.py:753 dcim/tables/devices.py:803
+#: dcim/tables/devices.py:869 dcim/tables/devices.py:984
+#: dcim/tables/devices.py:1004 dcim/tables/devices.py:1033
+#: dcim/tables/devices.py:1063 dcim/tables/devicetypes.py:32
#: dcim/tables/power.py:22 dcim/tables/power.py:62 dcim/tables/racks.py:23
#: dcim/tables/racks.py:53 dcim/tables/sites.py:24 dcim/tables/sites.py:51
#: dcim/tables/sites.py:78 dcim/tables/sites.py:125
@@ -1080,9 +1079,9 @@ msgstr "сети провайдера"
#: virtualization/forms/object_create.py:23
#: virtualization/tables/clusters.py:17 virtualization/tables/clusters.py:39
#: virtualization/tables/clusters.py:62
-#: virtualization/tables/virtualmachines.py:45
-#: virtualization/tables/virtualmachines.py:119
-#: virtualization/tables/virtualmachines.py:172 vpn/tables/crypto.py:18
+#: virtualization/tables/virtualmachines.py:54
+#: virtualization/tables/virtualmachines.py:132
+#: virtualization/tables/virtualmachines.py:185 vpn/tables/crypto.py:18
#: vpn/tables/crypto.py:57 vpn/tables/crypto.py:93 vpn/tables/crypto.py:129
#: vpn/tables/crypto.py:158 vpn/tables/l2vpn.py:23 vpn/tables/tunnels.py:18
#: vpn/tables/tunnels.py:40 wireless/tables/wirelesslan.py:18
@@ -1117,7 +1116,7 @@ msgstr "Гарантированная скорость"
#: circuits/tables/circuits.py:75 circuits/tables/providers.py:48
#: circuits/tables/providers.py:82 circuits/tables/providers.py:107
-#: dcim/tables/devices.py:1042 dcim/tables/devicetypes.py:92
+#: dcim/tables/devices.py:1046 dcim/tables/devicetypes.py:92
#: dcim/tables/modules.py:29 dcim/tables/modules.py:72 dcim/tables/power.py:39
#: dcim/tables/power.py:96 dcim/tables/racks.py:76 dcim/tables/racks.py:156
#: dcim/tables/sites.py:103 extras/forms/bulk_edit.py:320
@@ -1129,7 +1128,7 @@ msgstr "Гарантированная скорость"
#: templates/inc/panels/comments.html:6 tenancy/tables/contacts.py:68
#: tenancy/tables/tenants.py:46 utilities/forms/fields/fields.py:29
#: virtualization/tables/clusters.py:91
-#: virtualization/tables/virtualmachines.py:68 vpn/tables/crypto.py:37
+#: virtualization/tables/virtualmachines.py:81 vpn/tables/crypto.py:37
#: vpn/tables/crypto.py:74 vpn/tables/crypto.py:109 vpn/tables/crypto.py:140
#: vpn/tables/crypto.py:173 vpn/tables/l2vpn.py:37 vpn/tables/tunnels.py:61
#: wireless/tables/wirelesslan.py:27 wireless/tables/wirelesslan.py:58
@@ -1166,7 +1165,7 @@ msgid "Completed"
msgstr "Завершено"
#: core/choices.py:22 core/choices.py:59 dcim/choices.py:176
-#: dcim/choices.py:222 dcim/choices.py:1496 extras/choices.py:212
+#: dcim/choices.py:222 dcim/choices.py:1502 extras/choices.py:212
#: virtualization/choices.py:47
msgid "Failed"
msgstr "Неисправно"
@@ -1212,7 +1211,7 @@ msgstr "Имя пользователя"
#: core/data_backends.py:49 core/data_backends.py:55
msgid "Only used for cloning with HTTP(S)"
-msgstr "Используется только для клонирования с помощью HTTP (S)"
+msgstr "Используется только для клонирования по HTTP (S)"
#: core/data_backends.py:53 templates/account/base.html:17
#: templates/account/password.html:11 users/forms/model_forms.py:172
@@ -1230,7 +1229,7 @@ msgstr "Не удалось получить удаленные данные ({n
#: core/data_backends.py:118
msgid "AWS access key ID"
-msgstr "Идентификатор ключа доступа AWS"
+msgstr "ID ключа доступа AWS"
#: core/data_backends.py:122
msgid "AWS secret access key"
@@ -1248,7 +1247,7 @@ msgstr "Источник данных (имя)"
#: core/forms/bulk_edit.py:24 core/forms/filtersets.py:39
#: core/tables/data.py:26 dcim/forms/bulk_edit.py:1012
#: dcim/forms/bulk_edit.py:1285 dcim/forms/filtersets.py:1270
-#: dcim/tables/devices.py:573 dcim/tables/devicetypes.py:221
+#: dcim/tables/devices.py:577 dcim/tables/devicetypes.py:221
#: extras/forms/bulk_edit.py:97 extras/forms/bulk_edit.py:161
#: extras/forms/bulk_edit.py:220 extras/forms/filtersets.py:119
#: extras/forms/filtersets.py:206 extras/forms/filtersets.py:267
@@ -1364,7 +1363,7 @@ msgstr "Источник"
#: core/forms/model_forms.py:56
msgid "Backend Parameters"
-msgstr "Параметры бэкенда"
+msgstr "Параметры backend"
#: core/forms/model_forms.py:94
msgid "File Upload"
@@ -1384,7 +1383,7 @@ msgstr "Необходимо загрузить файл или выбрать
msgid "Rack Elevations"
msgstr "Фасады стоек"
-#: core/forms/model_forms.py:148 dcim/choices.py:1407
+#: core/forms/model_forms.py:148 dcim/choices.py:1413
#: dcim/forms/bulk_edit.py:859 dcim/forms/bulk_edit.py:1242
#: dcim/forms/bulk_edit.py:1260 dcim/tables/racks.py:89
#: netbox/navigation/menu.py:276 netbox/navigation/menu.py:280
@@ -1445,7 +1444,7 @@ msgstr " (по умолчанию)"
#: core/models/config.py:18 core/models/data.py:282 core/models/files.py:27
#: core/models/jobs.py:50 extras/models/models.py:760
-#: netbox/models/features.py:52 users/models.py:248
+#: netbox/models/features.py:52 users/models.py:249
msgid "created"
msgstr "создан(а)"
@@ -1503,7 +1502,7 @@ msgstr "URL"
#: core/models/data.py:62 dcim/models/device_component_templates.py:392
#: dcim/models/device_components.py:513 extras/models/models.py:88
-#: extras/models/models.py:331 extras/models/models.py:556 users/models.py:353
+#: extras/models/models.py:331 extras/models/models.py:556 users/models.py:358
msgid "enabled"
msgstr "включен"
@@ -1536,7 +1535,7 @@ msgstr "источники данных"
#: core/models/data.py:125
#, python-brace-format
msgid "Unknown backend type: {type}"
-msgstr "Неизвестный тип бэкэнда: {type}"
+msgstr "Неизвестный тип backend: {type}"
#: core/models/data.py:180
msgid "Cannot initiate sync; syncing already in progress."
@@ -1589,7 +1588,7 @@ msgstr "файлы данных"
#: core/models/data.py:416
msgid "auto sync record"
-msgstr "запись автоматической синхронизации"
+msgstr "автоматическая синхронизация записи"
#: core/models/data.py:417
msgid "auto sync records"
@@ -1609,11 +1608,11 @@ msgstr "Путь к файлу относительно указанного к
#: core/models/files.py:61
msgid "managed file"
-msgstr "управляемый файл"
+msgstr "Настраиваемый файл"
#: core/models/files.py:62
msgid "managed files"
-msgstr "управляемые файлы"
+msgstr "Настраиваемые файлы"
#: core/models/jobs.py:54
msgid "scheduled"
@@ -1646,26 +1645,26 @@ msgstr "ошибка"
#: core/models/jobs.py:101
msgid "job ID"
-msgstr "идентификатор задания"
+msgstr "идентификатор задачи"
#: core/models/jobs.py:112
msgid "job"
-msgstr "задание"
+msgstr "задача"
#: core/models/jobs.py:113
msgid "jobs"
-msgstr " задания"
+msgstr " задачи"
#: core/models/jobs.py:135
#, python-brace-format
msgid "Jobs cannot be assigned to this object type ({type})."
-msgstr "Задания нельзя присвоить этому типу объектов ({type})."
+msgstr "Нельзя присвоить задачи этому типу объектов ({type})."
#: core/models/jobs.py:185
#, python-brace-format
msgid "Invalid status for job termination. Choices are: {choices}"
msgstr ""
-"Неверный статус для увольнения с работы. Возможны следующие варианты: "
+"Неверный статус для завершения задачи. Возможны следующие варианты: "
"{choices}"
#: core/tables/config.py:21 users/forms/filtersets.py:45 users/tables.py:39
@@ -1720,7 +1719,7 @@ msgid "Staging"
msgstr "Подготовка к развертыванию"
#: dcim/choices.py:23 dcim/choices.py:178 dcim/choices.py:223
-#: dcim/choices.py:1420 virtualization/choices.py:23
+#: dcim/choices.py:1426 virtualization/choices.py:23
#: virtualization/choices.py:48
msgid "Decommissioning"
msgstr "Вывод из эксплуатации"
@@ -1774,13 +1773,13 @@ msgstr "Доступно"
#: dcim/choices.py:104 ipam/choices.py:33 ipam/choices.py:51
#: ipam/choices.py:71 ipam/choices.py:156 wireless/choices.py:28
msgid "Deprecated"
-msgstr "Устарело"
+msgstr "Выведенный(-ая) из использования"
#: dcim/choices.py:114 templates/dcim/rack.html:128
msgid "Millimeters"
msgstr "Миллиметры"
-#: dcim/choices.py:115 dcim/choices.py:1442
+#: dcim/choices.py:115 dcim/choices.py:1448
msgid "Inches"
msgstr "Дюймы"
@@ -1792,8 +1791,8 @@ msgstr "Дюймы"
#: dcim/forms/filtersets.py:226 dcim/forms/model_forms.py:73
#: dcim/forms/model_forms.py:94 dcim/forms/model_forms.py:172
#: dcim/forms/model_forms.py:962 dcim/forms/model_forms.py:1303
-#: dcim/forms/object_import.py:181 dcim/tables/devices.py:676
-#: dcim/tables/devices.py:960 extras/tables/tables.py:181
+#: dcim/forms/object_import.py:181 dcim/tables/devices.py:680
+#: dcim/tables/devices.py:964 extras/tables/tables.py:181
#: ipam/tables/fhrp.py:59 ipam/tables/ip.py:374 ipam/tables/services.py:44
#: templates/dcim/interface.html:105 templates/dcim/interface.html:321
#: templates/dcim/location.html:44 templates/dcim/region.html:38
@@ -1806,7 +1805,7 @@ msgstr "Дюймы"
#: tenancy/forms/bulk_import.py:58 tenancy/forms/model_forms.py:24
#: tenancy/forms/model_forms.py:69 virtualization/forms/bulk_edit.py:206
#: virtualization/forms/bulk_import.py:151
-#: virtualization/tables/virtualmachines.py:142 wireless/forms/bulk_edit.py:23
+#: virtualization/tables/virtualmachines.py:155 wireless/forms/bulk_edit.py:23
#: wireless/forms/bulk_import.py:21 wireless/forms/model_forms.py:20
msgid "Parent"
msgstr "Родитель"
@@ -1819,13 +1818,13 @@ msgstr "Потомок"
#: templates/dcim/rack.html:181 templates/dcim/rack_elevation_list.html:22
#: templates/dcim/rackreservation.html:84
msgid "Front"
-msgstr "Передняя"
+msgstr "Вид спереди"
#: dcim/choices.py:156 templates/dcim/device.html:351
#: templates/dcim/rack.html:187 templates/dcim/rack_elevation_list.html:23
#: templates/dcim/rackreservation.html:90
msgid "Rear"
-msgstr "Задняя"
+msgstr "Вид сзади"
#: dcim/choices.py:175 dcim/choices.py:221 virtualization/choices.py:46
msgid "Staged"
@@ -1855,7 +1854,7 @@ msgstr "Справа налево"
msgid "Side to rear"
msgstr "Бок назад"
-#: dcim/choices.py:198 dcim/choices.py:1215
+#: dcim/choices.py:198 dcim/choices.py:1221
msgid "Passive"
msgstr "Пассивный"
@@ -1877,14 +1876,14 @@ msgstr "Калифорнийский стиль"
#: dcim/choices.py:496
msgid "International/ITA"
-msgstr "Международная/ITA"
+msgstr "ITA/Международный"
#: dcim/choices.py:526 dcim/choices.py:755
msgid "Proprietary"
msgstr "Проприетарный"
-#: dcim/choices.py:534 dcim/choices.py:764 dcim/choices.py:1131
-#: dcim/choices.py:1133 dcim/choices.py:1338 dcim/choices.py:1340
+#: dcim/choices.py:534 dcim/choices.py:764 dcim/choices.py:1137
+#: dcim/choices.py:1139 dcim/choices.py:1344 dcim/choices.py:1346
#: netbox/navigation/menu.py:188
msgid "Other"
msgstr "Другой"
@@ -1897,177 +1896,177 @@ msgstr "ITA/Международный"
msgid "Physical"
msgstr "Физический"
-#: dcim/choices.py:795 dcim/choices.py:949
+#: dcim/choices.py:795 dcim/choices.py:952
msgid "Virtual"
msgstr "Виртуальный"
-#: dcim/choices.py:796 dcim/choices.py:1019 dcim/forms/bulk_edit.py:1398
+#: dcim/choices.py:796 dcim/choices.py:1022 dcim/forms/bulk_edit.py:1398
#: dcim/forms/filtersets.py:1233 dcim/forms/model_forms.py:888
#: dcim/forms/model_forms.py:1197 netbox/navigation/menu.py:128
#: netbox/navigation/menu.py:132 templates/dcim/interface.html:217
msgid "Wireless"
msgstr "Беспроводной"
-#: dcim/choices.py:947
+#: dcim/choices.py:950
msgid "Virtual interfaces"
msgstr "Виртуальные интерфейсы"
-#: dcim/choices.py:950 dcim/forms/bulk_edit.py:1295
+#: dcim/choices.py:953 dcim/forms/bulk_edit.py:1295
#: dcim/forms/bulk_import.py:785 dcim/forms/model_forms.py:876
-#: dcim/tables/devices.py:680 templates/dcim/interface.html:109
+#: dcim/tables/devices.py:684 templates/dcim/interface.html:109
#: templates/virtualization/vminterface.html:46
#: virtualization/forms/bulk_edit.py:211
#: virtualization/forms/bulk_import.py:158
-#: virtualization/tables/virtualmachines.py:146
+#: virtualization/tables/virtualmachines.py:159
msgid "Bridge"
msgstr "Мост"
-#: dcim/choices.py:951
+#: dcim/choices.py:954
msgid "Link Aggregation Group (LAG)"
msgstr "Группа агрегации линков (LAG)"
-#: dcim/choices.py:955
+#: dcim/choices.py:958
msgid "Ethernet (fixed)"
msgstr "Ethernet (фиксированный)"
-#: dcim/choices.py:969
+#: dcim/choices.py:972
msgid "Ethernet (modular)"
msgstr "Ethernet (модульный)"
-#: dcim/choices.py:1005
+#: dcim/choices.py:1008
msgid "Ethernet (backplane)"
msgstr "Ethernet (объединительная плата)"
-#: dcim/choices.py:1033
+#: dcim/choices.py:1036
msgid "Cellular"
msgstr "Сотовая связь"
-#: dcim/choices.py:1080 dcim/forms/filtersets.py:302
+#: dcim/choices.py:1086 dcim/forms/filtersets.py:302
#: dcim/forms/filtersets.py:736 dcim/forms/filtersets.py:876
#: dcim/forms/filtersets.py:1426 templates/dcim/inventoryitem.html:53
#: templates/dcim/virtualchassis_edit.html:55
msgid "Serial"
msgstr "Серийный"
-#: dcim/choices.py:1095
+#: dcim/choices.py:1101
msgid "Coaxial"
msgstr "Коаксиальный"
-#: dcim/choices.py:1112
+#: dcim/choices.py:1118
msgid "Stacking"
msgstr "Стекирование"
-#: dcim/choices.py:1162
+#: dcim/choices.py:1168
msgid "Half"
msgstr "Полу"
-#: dcim/choices.py:1163
+#: dcim/choices.py:1169
msgid "Full"
msgstr "Полный"
-#: dcim/choices.py:1164 netbox/preferences.py:29 wireless/choices.py:480
+#: dcim/choices.py:1170 netbox/preferences.py:29 wireless/choices.py:480
msgid "Auto"
msgstr "Авто"
-#: dcim/choices.py:1175
+#: dcim/choices.py:1181
msgid "Access"
msgstr "Доступ"
-#: dcim/choices.py:1176 ipam/tables/vlans.py:168 ipam/tables/vlans.py:213
+#: dcim/choices.py:1182 ipam/tables/vlans.py:168 ipam/tables/vlans.py:213
#: templates/dcim/inc/interface_vlans_table.html:7
msgid "Tagged"
msgstr "Тегированный"
-#: dcim/choices.py:1177
+#: dcim/choices.py:1183
msgid "Tagged (All)"
msgstr "Тегированный (все)"
-#: dcim/choices.py:1206
+#: dcim/choices.py:1212
msgid "IEEE Standard"
msgstr "Стандарт IEEE"
-#: dcim/choices.py:1217
+#: dcim/choices.py:1223
msgid "Passive 24V (2-pair)"
msgstr "Пассивный режим 24 В (2 пары)"
-#: dcim/choices.py:1218
+#: dcim/choices.py:1224
msgid "Passive 24V (4-pair)"
msgstr "Пассивное напряжение 24 В (4 пары)"
-#: dcim/choices.py:1219
+#: dcim/choices.py:1225
msgid "Passive 48V (2-pair)"
msgstr "Пассивное напряжение 48 В (2 пары)"
-#: dcim/choices.py:1220
+#: dcim/choices.py:1226
msgid "Passive 48V (4-pair)"
msgstr "Пассивное напряжение 48 В (4 пары)"
-#: dcim/choices.py:1282 dcim/choices.py:1378
+#: dcim/choices.py:1288 dcim/choices.py:1384
msgid "Copper"
msgstr "Медь"
-#: dcim/choices.py:1305
+#: dcim/choices.py:1311
msgid "Fiber Optic"
msgstr "Оптоволоконное"
-#: dcim/choices.py:1394
+#: dcim/choices.py:1400
msgid "Fiber"
msgstr "Волокно"
-#: dcim/choices.py:1418 dcim/forms/filtersets.py:1140
+#: dcim/choices.py:1424 dcim/forms/filtersets.py:1140
msgid "Connected"
msgstr "Подключено"
-#: dcim/choices.py:1437
+#: dcim/choices.py:1443
msgid "Kilometers"
msgstr "Километры"
-#: dcim/choices.py:1438 templates/dcim/cable_trace.html:62
+#: dcim/choices.py:1444 templates/dcim/cable_trace.html:62
msgid "Meters"
msgstr "Метры"
-#: dcim/choices.py:1439
+#: dcim/choices.py:1445
msgid "Centimeters"
msgstr "Сантиметры"
-#: dcim/choices.py:1440
+#: dcim/choices.py:1446
msgid "Miles"
msgstr "Мили"
-#: dcim/choices.py:1441 templates/dcim/cable_trace.html:63
+#: dcim/choices.py:1447 templates/dcim/cable_trace.html:63
msgid "Feet"
msgstr "Футы"
-#: dcim/choices.py:1457 templates/dcim/device.html:332
+#: dcim/choices.py:1463 templates/dcim/device.html:332
#: templates/dcim/rack.html:157
msgid "Kilograms"
msgstr "Килограммы"
-#: dcim/choices.py:1458
+#: dcim/choices.py:1464
msgid "Grams"
msgstr "Граммы"
-#: dcim/choices.py:1459 templates/dcim/rack.html:158
+#: dcim/choices.py:1465 templates/dcim/rack.html:158
msgid "Pounds"
msgstr "Фунты"
-#: dcim/choices.py:1460
+#: dcim/choices.py:1466
msgid "Ounces"
msgstr "Унции"
-#: dcim/choices.py:1506 tenancy/choices.py:17
+#: dcim/choices.py:1512 tenancy/choices.py:17
msgid "Primary"
-msgstr "Начальное"
+msgstr "Основной"
-#: dcim/choices.py:1507
+#: dcim/choices.py:1513
msgid "Redundant"
msgstr "Резервный"
-#: dcim/choices.py:1528
+#: dcim/choices.py:1534
msgid "Single phase"
msgstr "Однофазный"
-#: dcim/choices.py:1529
+#: dcim/choices.py:1535
msgid "Three-phase"
msgstr "Трехфазный"
@@ -2316,7 +2315,7 @@ msgstr "Отсек для модулей (ID)"
#: ipam/filtersets.py:807 ipam/filtersets.py:1026
#: virtualization/filtersets.py:161 vpn/filtersets.py:351
msgid "Device (ID)"
-msgstr "Устройство (идентификатор)"
+msgstr "Устройство (ID)"
#: dcim/filtersets.py:1260
msgid "Rack (name)"
@@ -2344,7 +2343,7 @@ msgid "Virtual Chassis (ID)"
msgstr "Виртуальное шасси (ID)"
#: dcim/filtersets.py:1303 dcim/forms/filtersets.py:106
-#: dcim/tables/devices.py:235 netbox/navigation/menu.py:67
+#: dcim/tables/devices.py:239 netbox/navigation/menu.py:67
#: templates/dcim/device.html:123 templates/dcim/device_edit.html:93
#: templates/dcim/virtualchassis.html:20
#: templates/dcim/virtualchassis_add.html:8
@@ -2354,7 +2353,7 @@ msgstr "Виртуальное шасси"
#: dcim/filtersets.py:1335
msgid "Module (ID)"
-msgstr "Модуль (идентификатор)"
+msgstr "Модуль (ID)"
#: dcim/filtersets.py:1439 ipam/forms/bulk_import.py:188
#: vpn/forms/bulk_import.py:308
@@ -2368,7 +2367,7 @@ msgstr "Назначенный VID"
#: dcim/filtersets.py:1448 dcim/forms/bulk_edit.py:1374
#: dcim/forms/bulk_import.py:836 dcim/forms/filtersets.py:1328
#: dcim/forms/model_forms.py:1182 dcim/models/device_components.py:712
-#: dcim/tables/devices.py:642 ipam/filtersets.py:282 ipam/filtersets.py:293
+#: dcim/tables/devices.py:646 ipam/filtersets.py:282 ipam/filtersets.py:293
#: ipam/filtersets.py:449 ipam/filtersets.py:550 ipam/filtersets.py:561
#: ipam/forms/bulk_edit.py:226 ipam/forms/bulk_edit.py:281
#: ipam/forms/bulk_edit.py:323 ipam/forms/bulk_import.py:156
@@ -2376,8 +2375,8 @@ msgstr "Назначенный VID"
#: ipam/forms/filtersets.py:66 ipam/forms/filtersets.py:167
#: ipam/forms/filtersets.py:295 ipam/forms/model_forms.py:59
#: ipam/forms/model_forms.py:203 ipam/forms/model_forms.py:246
-#: ipam/forms/model_forms.py:290 ipam/forms/model_forms.py:412
-#: ipam/forms/model_forms.py:426 ipam/forms/model_forms.py:440
+#: ipam/forms/model_forms.py:290 ipam/forms/model_forms.py:398
+#: ipam/forms/model_forms.py:412 ipam/forms/model_forms.py:426
#: ipam/models/ip.py:232 ipam/models/ip.py:511 ipam/models/ip.py:719
#: ipam/models/vrfs.py:62 ipam/tables/ip.py:241 ipam/tables/ip.py:306
#: ipam/tables/ip.py:356 ipam/tables/ip.py:445
@@ -2390,7 +2389,7 @@ msgstr "Назначенный VID"
#: virtualization/forms/filtersets.py:220
#: virtualization/forms/model_forms.py:347
#: virtualization/models/virtualmachines.py:348
-#: virtualization/tables/virtualmachines.py:123
+#: virtualization/tables/virtualmachines.py:136
msgid "VRF"
msgstr "VRF"
@@ -2401,10 +2400,10 @@ msgstr "VRF (КРАСНЫЙ)"
#: dcim/filtersets.py:1459 ipam/filtersets.py:967 vpn/filtersets.py:314
msgid "L2VPN (ID)"
-msgstr "L2VPN (ИДЕНТИФИКАТОР)"
+msgstr "L2VPN (ID)"
#: dcim/filtersets.py:1465 dcim/forms/filtersets.py:1333
-#: dcim/tables/devices.py:590 ipam/filtersets.py:973
+#: dcim/tables/devices.py:594 ipam/filtersets.py:973
#: ipam/forms/filtersets.py:499 ipam/tables/vlans.py:133
#: templates/dcim/interface.html:94 templates/ipam/vlan.html:69
#: templates/vpn/l2vpntermination.html:15
@@ -2416,11 +2415,11 @@ msgstr "L2VPN"
#: dcim/filtersets.py:1497
msgid "Virtual Chassis Interfaces for Device"
-msgstr "Интерфейсы виртуального корпуса для устройства"
+msgstr "Интерфейсы виртуального шасси для устройства"
#: dcim/filtersets.py:1502
msgid "Virtual Chassis Interfaces for Device (ID)"
-msgstr "Интерфейсы виртуального корпуса для устройства (ID)"
+msgstr "Интерфейсы виртуального шасси для устройства (ID)"
#: dcim/filtersets.py:1506
msgid "Kind of interface"
@@ -2475,7 +2474,7 @@ msgstr "Теги"
#: dcim/forms/bulk_create.py:112 dcim/forms/filtersets.py:1390
#: dcim/forms/model_forms.py:426 dcim/forms/model_forms.py:475
#: dcim/forms/object_create.py:196 dcim/forms/object_create.py:352
-#: dcim/tables/devices.py:198 dcim/tables/devices.py:725
+#: dcim/tables/devices.py:198 dcim/tables/devices.py:729
#: dcim/tables/devicetypes.py:242 templates/dcim/device.html:45
#: templates/dcim/device.html:129 templates/dcim/modulebay.html:35
#: templates/dcim/virtualchassis.html:59
@@ -2494,7 +2493,7 @@ msgstr ""
#: dcim/forms/bulk_edit.py:115 dcim/forms/bulk_import.py:99
#: dcim/forms/model_forms.py:120 dcim/tables/sites.py:89
#: ipam/filtersets.py:936 ipam/forms/bulk_edit.py:528
-#: ipam/forms/bulk_import.py:444 ipam/forms/model_forms.py:509
+#: ipam/forms/bulk_import.py:444 ipam/forms/model_forms.py:495
#: ipam/tables/fhrp.py:67 ipam/tables/vlans.py:118 ipam/tables/vlans.py:221
#: templates/dcim/interface.html:294 templates/dcim/site.html:37
#: templates/ipam/inc/panels/fhrp_groups.html:10 templates/ipam/vlan.html:30
@@ -2544,8 +2543,8 @@ msgstr "Часовой пояс"
#: dcim/forms/filtersets.py:704 dcim/forms/filtersets.py:1417
#: dcim/forms/model_forms.py:224 dcim/forms/model_forms.py:970
#: dcim/forms/model_forms.py:1311 dcim/forms/object_import.py:186
-#: dcim/tables/devices.py:202 dcim/tables/devices.py:833
-#: dcim/tables/devices.py:944 dcim/tables/devicetypes.py:300
+#: dcim/tables/devices.py:202 dcim/tables/devices.py:837
+#: dcim/tables/devices.py:948 dcim/tables/devicetypes.py:300
#: dcim/tables/racks.py:69 extras/filtersets.py:457
#: ipam/forms/bulk_edit.py:245 ipam/forms/bulk_edit.py:294
#: ipam/forms/bulk_edit.py:342 ipam/forms/bulk_edit.py:546
@@ -2554,7 +2553,7 @@ msgstr "Часовой пояс"
#: ipam/forms/filtersets.py:232 ipam/forms/filtersets.py:278
#: ipam/forms/filtersets.py:346 ipam/forms/filtersets.py:490
#: ipam/forms/model_forms.py:187 ipam/forms/model_forms.py:222
-#: ipam/forms/model_forms.py:249 ipam/forms/model_forms.py:647
+#: ipam/forms/model_forms.py:249 ipam/forms/model_forms.py:651
#: ipam/tables/ip.py:257 ipam/tables/ip.py:313 ipam/tables/ip.py:363
#: ipam/tables/vlans.py:126 ipam/tables/vlans.py:230
#: templates/dcim/device.html:187
@@ -2572,7 +2571,7 @@ msgstr "Часовой пояс"
#: virtualization/forms/bulk_import.py:106
#: virtualization/forms/filtersets.py:153
#: virtualization/forms/model_forms.py:198
-#: virtualization/tables/virtualmachines.py:65 vpn/forms/bulk_edit.py:86
+#: virtualization/tables/virtualmachines.py:74 vpn/forms/bulk_edit.py:86
#: vpn/forms/bulk_import.py:81 vpn/forms/filtersets.py:84
#: vpn/forms/model_forms.py:77 vpn/forms/model_forms.py:112
#: vpn/tables/tunnels.py:82
@@ -2666,7 +2665,7 @@ msgstr "Весовая единица"
#: dcim/forms/model_forms.py:669 dcim/forms/object_create.py:399
#: dcim/tables/devices.py:194 dcim/tables/power.py:70 dcim/tables/racks.py:148
#: ipam/forms/bulk_edit.py:464 ipam/forms/filtersets.py:427
-#: ipam/forms/model_forms.py:571 templates/dcim/device.html:30
+#: ipam/forms/model_forms.py:575 templates/dcim/device.html:30
#: templates/dcim/inc/cable_termination.html:16
#: templates/dcim/powerfeed.html:31 templates/dcim/rack.html:14
#: templates/dcim/rack/base.html:4 templates/dcim/rack_edit.html:8
@@ -2699,7 +2698,7 @@ msgstr "Аппаратное обеспечение"
#: dcim/forms/model_forms.py:334 dcim/forms/model_forms.py:374
#: dcim/forms/model_forms.py:975 dcim/forms/model_forms.py:1316
#: dcim/forms/object_import.py:192 dcim/tables/devices.py:129
-#: dcim/tables/devices.py:205 dcim/tables/devices.py:947
+#: dcim/tables/devices.py:205 dcim/tables/devices.py:951
#: dcim/tables/devicetypes.py:81 dcim/tables/devicetypes.py:304
#: dcim/tables/modules.py:20 dcim/tables/modules.py:60
#: templates/dcim/devicetype.html:17 templates/dcim/inventoryitem.html:45
@@ -2746,7 +2745,7 @@ msgstr "Тип устройства"
msgid "Module Type"
msgstr "Тип модуля"
-#: dcim/forms/bulk_edit.py:506 dcim/models/devices.py:472
+#: dcim/forms/bulk_edit.py:506 dcim/models/devices.py:474
msgid "VM role"
msgstr "Роль виртуальной машины"
@@ -2778,13 +2777,15 @@ msgstr "Роль устройства"
#: dcim/forms/bulk_edit.py:588 dcim/forms/bulk_import.py:443
#: dcim/forms/filtersets.py:723 dcim/forms/model_forms.py:389
-#: dcim/forms/model_forms.py:448 extras/filtersets.py:468
-#: templates/dcim/device.html:191 templates/dcim/platform.html:27
+#: dcim/forms/model_forms.py:448 dcim/tables/devices.py:215
+#: extras/filtersets.py:468 templates/dcim/device.html:191
+#: templates/dcim/platform.html:27
#: templates/virtualization/virtualmachine.html:30
#: virtualization/forms/bulk_edit.py:159
#: virtualization/forms/bulk_import.py:122
#: virtualization/forms/filtersets.py:164
#: virtualization/forms/model_forms.py:206
+#: virtualization/tables/virtualmachines.py:78
msgid "Platform"
msgstr "Платформа"
@@ -2808,16 +2809,16 @@ msgstr "Платформа"
#: dcim/forms/model_forms.py:760 dcim/forms/model_forms.py:1011
#: dcim/forms/model_forms.py:1460 dcim/forms/object_create.py:256
#: dcim/tables/connections.py:22 dcim/tables/connections.py:41
-#: dcim/tables/connections.py:60 dcim/tables/devices.py:314
-#: dcim/tables/devices.py:379 dcim/tables/devices.py:423
-#: dcim/tables/devices.py:468 dcim/tables/devices.py:522
-#: dcim/tables/devices.py:614 dcim/tables/devices.py:715
-#: dcim/tables/devices.py:775 dcim/tables/devices.py:825
-#: dcim/tables/devices.py:885 dcim/tables/devices.py:937
-#: dcim/tables/devices.py:1063 dcim/tables/modules.py:52
+#: dcim/tables/connections.py:60 dcim/tables/devices.py:318
+#: dcim/tables/devices.py:383 dcim/tables/devices.py:427
+#: dcim/tables/devices.py:472 dcim/tables/devices.py:526
+#: dcim/tables/devices.py:618 dcim/tables/devices.py:719
+#: dcim/tables/devices.py:779 dcim/tables/devices.py:829
+#: dcim/tables/devices.py:889 dcim/tables/devices.py:941
+#: dcim/tables/devices.py:1067 dcim/tables/modules.py:52
#: extras/forms/filtersets.py:329 ipam/forms/bulk_import.py:303
#: ipam/forms/bulk_import.py:489 ipam/forms/filtersets.py:532
-#: ipam/forms/model_forms.py:685 ipam/tables/vlans.py:176
+#: ipam/forms/model_forms.py:689 ipam/tables/vlans.py:176
#: templates/dcim/consoleport.html:23 templates/dcim/consoleserverport.html:23
#: templates/dcim/device.html:14 templates/dcim/device.html:128
#: templates/dcim/device_edit.html:10 templates/dcim/devicebay.html:23
@@ -2839,7 +2840,7 @@ msgstr "Платформа"
#: virtualization/forms/bulk_import.py:99
#: virtualization/forms/filtersets.py:124
#: virtualization/forms/model_forms.py:188
-#: virtualization/tables/virtualmachines.py:61 vpn/choices.py:44
+#: virtualization/tables/virtualmachines.py:70 vpn/choices.py:44
#: vpn/forms/bulk_import.py:86 vpn/forms/bulk_import.py:283
#: vpn/forms/filtersets.py:271 vpn/forms/model_forms.py:89
#: vpn/forms/model_forms.py:124 vpn/forms/model_forms.py:237
@@ -2951,7 +2952,7 @@ msgstr "Порт питания"
#: dcim/forms/bulk_edit.py:973 dcim/forms/bulk_import.py:738
msgid "Feed leg"
-msgstr "Подача питании"
+msgstr "Фаза электропитания"
#: dcim/forms/bulk_edit.py:1019 dcim/forms/bulk_edit.py:1325
msgid "Management only"
@@ -2979,7 +2980,7 @@ msgid "Wireless role"
msgstr "Роль беспроводной связи"
#: dcim/forms/bulk_edit.py:1178 dcim/forms/model_forms.py:595
-#: dcim/forms/model_forms.py:1026 dcim/tables/devices.py:337
+#: dcim/forms/model_forms.py:1026 dcim/tables/devices.py:341
#: templates/dcim/consoleport.html:27 templates/dcim/consoleserverport.html:27
#: templates/dcim/frontport.html:27 templates/dcim/interface.html:35
#: templates/dcim/module.html:51 templates/dcim/modulebay.html:57
@@ -2988,10 +2989,10 @@ msgstr "Роль беспроводной связи"
msgid "Module"
msgstr "Модуль"
-#: dcim/forms/bulk_edit.py:1305 dcim/tables/devices.py:685
+#: dcim/forms/bulk_edit.py:1305 dcim/tables/devices.py:689
#: templates/dcim/interface.html:113
msgid "LAG"
-msgstr "Группа объединения каналов(LAG)"
+msgstr "LAG"
#: dcim/forms/bulk_edit.py:1310 dcim/forms/model_forms.py:1110
msgid "Virtual device contexts"
@@ -3000,7 +3001,7 @@ msgstr "Виртуальные контексты"
#: dcim/forms/bulk_edit.py:1316 dcim/forms/bulk_import.py:659
#: dcim/forms/bulk_import.py:685 dcim/forms/filtersets.py:1163
#: dcim/forms/filtersets.py:1185 dcim/forms/filtersets.py:1258
-#: dcim/tables/devices.py:626
+#: dcim/tables/devices.py:630
#: templates/circuits/inc/circuit_termination.html:94
#: templates/dcim/consoleport.html:43 templates/dcim/consoleserverport.html:43
msgid "Speed"
@@ -3025,13 +3026,13 @@ msgid "VLAN group"
msgstr "Группа VLAN"
#: dcim/forms/bulk_edit.py:1361 dcim/forms/model_forms.py:1164
-#: dcim/tables/devices.py:599 virtualization/forms/bulk_edit.py:247
+#: dcim/tables/devices.py:603 virtualization/forms/bulk_edit.py:247
#: virtualization/forms/model_forms.py:329
msgid "Untagged VLAN"
msgstr "VLAN без тегов"
#: dcim/forms/bulk_edit.py:1369 dcim/forms/model_forms.py:1173
-#: dcim/tables/devices.py:605 virtualization/forms/bulk_edit.py:255
+#: dcim/tables/devices.py:609 virtualization/forms/bulk_edit.py:255
#: virtualization/forms/model_forms.py:338
msgid "Tagged VLANs"
msgstr "VLAN с тегами"
@@ -3041,7 +3042,7 @@ msgid "Wireless LAN group"
msgstr "Беспроводная группа LAN"
#: dcim/forms/bulk_edit.py:1384 dcim/forms/model_forms.py:1151
-#: dcim/tables/devices.py:635 netbox/navigation/menu.py:134
+#: dcim/tables/devices.py:639 netbox/navigation/menu.py:134
#: templates/dcim/interface.html:289 wireless/tables/wirelesslan.py:24
msgid "Wireless LANs"
msgstr "Беспроводные LANs"
@@ -3150,7 +3151,7 @@ msgstr "Родительское место"
#: dcim/forms/bulk_import.py:267 dcim/forms/bulk_import.py:1306
msgid "Rack's location (if any)"
-msgstr "Местоположение стойки (если есть)"
+msgstr "Локация стойки (если есть)"
#: dcim/forms/bulk_import.py:276 dcim/forms/model_forms.py:246
#: dcim/tables/racks.py:153 templates/dcim/rackreservation.html:12
@@ -3212,9 +3213,9 @@ msgid "Virtual chassis"
msgstr "Виртуальное шасси"
#: dcim/forms/bulk_import.py:462 dcim/forms/model_forms.py:457
-#: dcim/tables/devices.py:231 extras/filtersets.py:501
+#: dcim/tables/devices.py:235 extras/filtersets.py:501
#: extras/forms/filtersets.py:330 ipam/forms/bulk_edit.py:478
-#: ipam/forms/model_forms.py:588 templates/dcim/device.html:239
+#: ipam/forms/model_forms.py:592 templates/dcim/device.html:239
#: templates/virtualization/cluster.html:11
#: templates/virtualization/virtualmachine.html:92
#: templates/virtualization/virtualmachine.html:102
@@ -3226,7 +3227,7 @@ msgstr "Виртуальное шасси"
#: virtualization/forms/filtersets.py:196
#: virtualization/forms/model_forms.py:82
#: virtualization/forms/model_forms.py:179
-#: virtualization/tables/virtualmachines.py:57
+#: virtualization/tables/virtualmachines.py:66
msgid "Cluster"
msgstr "Кластер"
@@ -3236,7 +3237,7 @@ msgstr "Кластер виртуализации"
#: dcim/forms/bulk_import.py:495
msgid "Assigned location (if any)"
-msgstr "Назначенное местоположение (если есть)"
+msgstr "Назначенная локация (если есть)"
#: dcim/forms/bulk_import.py:502
msgid "Assigned rack (if any)"
@@ -3339,7 +3340,7 @@ msgstr "Мостовой интерфейс"
#: dcim/forms/bulk_import.py:792
msgid "Lag"
-msgstr "Группа объединения каналов(LAG)"
+msgstr "Lag"
#: dcim/forms/bulk_import.py:796
msgid "Parent LAG interface"
@@ -3407,7 +3408,7 @@ msgstr "Соответствующий задний порт"
msgid "Physical medium classification"
msgstr "Классификация физических сред"
-#: dcim/forms/bulk_import.py:973 dcim/tables/devices.py:846
+#: dcim/forms/bulk_import.py:973 dcim/tables/devices.py:850
msgid "Installed device"
msgstr "Установленное устройство"
@@ -3495,7 +3496,7 @@ msgid "{side_upper} side termination not found: {device} {name}"
msgstr "{side_upper} боковое завершение не найдено: {device} {name}"
#: dcim/forms/bulk_import.py:1244 dcim/forms/model_forms.py:696
-#: dcim/tables/devices.py:1033 templates/dcim/device.html:130
+#: dcim/tables/devices.py:1037 templates/dcim/device.html:130
#: templates/dcim/virtualchassis.html:28 templates/dcim/virtualchassis.html:60
msgid "Master"
msgstr "Мастер"
@@ -3623,7 +3624,7 @@ msgstr "Занятый"
#: dcim/forms/filtersets.py:1155 dcim/forms/filtersets.py:1177
#: dcim/forms/filtersets.py:1199 dcim/forms/filtersets.py:1216
-#: dcim/forms/filtersets.py:1236 dcim/tables/devices.py:372
+#: dcim/forms/filtersets.py:1236 dcim/tables/devices.py:376
#: templates/dcim/consoleport.html:59 templates/dcim/consoleserverport.html:59
#: templates/dcim/frontport.html:74 templates/dcim/interface.html:146
#: templates/dcim/powerfeed.html:118 templates/dcim/poweroutlet.html:63
@@ -3634,10 +3635,10 @@ msgstr "Подключение"
#: dcim/forms/filtersets.py:1245 dcim/forms/model_forms.py:1484
#: templates/dcim/virtualdevicecontext.html:16
msgid "Virtual Device Context"
-msgstr "Контекст виртуального устройства"
+msgstr "Виртуальный контекст"
#: dcim/forms/filtersets.py:1248 extras/forms/bulk_edit.py:315
-#: extras/forms/bulk_import.py:239 extras/forms/filtersets.py:479
+#: extras/forms/bulk_import.py:245 extras/forms/filtersets.py:479
#: extras/forms/model_forms.py:557 extras/tables/tables.py:487
#: templates/extras/journalentry.html:33
msgid "Kind"
@@ -3669,7 +3670,7 @@ msgid "Transmit power (dBm)"
msgstr "Мощность передачи (дБм)"
#: dcim/forms/filtersets.py:1344 dcim/forms/filtersets.py:1366
-#: dcim/tables/devices.py:344 templates/dcim/cable.html:12
+#: dcim/tables/devices.py:348 templates/dcim/cable.html:12
#: templates/dcim/cable_edit.html:46 templates/dcim/cable_trace.html:43
#: templates/dcim/frontport.html:84
#: templates/dcim/inc/connection_endpoints.html:4
@@ -3677,7 +3678,7 @@ msgstr "Мощность передачи (дБм)"
msgid "Cable"
msgstr "Кабель"
-#: dcim/forms/filtersets.py:1434 dcim/tables/devices.py:956
+#: dcim/forms/filtersets.py:1434 dcim/tables/devices.py:960
msgid "Discovered"
msgstr "Обнаружено"
@@ -3704,8 +3705,8 @@ msgid ""
"Comma-separated list of numeric unit IDs. A range may be specified using a "
"hyphen."
msgstr ""
-"Список идентификаторов числовых единиц, разделенных запятыми. Диапазон можно"
-" указать с помощью дефиса."
+"Список числовых идентификаторов, разделенных запятыми. Диапазон можно "
+"указать с помощью дефиса."
#: dcim/forms/model_forms.py:259 dcim/tables/racks.py:133
msgid "Reservation"
@@ -3724,7 +3725,7 @@ msgstr "Шасси"
msgid "Device Role"
msgstr "Роль устройства"
-#: dcim/forms/model_forms.py:428 dcim/models/devices.py:632
+#: dcim/forms/model_forms.py:428 dcim/models/devices.py:634
msgid "The lowest-numbered unit occupied by the device"
msgstr "Устройство с наименьшим номером, занимаемое устройством"
@@ -3775,9 +3776,7 @@ msgstr "Интерфейс LAG"
#: templates/wireless/wirelesslink.html:10
#: templates/wireless/wirelesslink.html:49
#: virtualization/forms/model_forms.py:351 vpn/forms/bulk_import.py:297
-#: vpn/forms/model_forms.py:94 vpn/forms/model_forms.py:129
-#: vpn/forms/model_forms.py:241 vpn/forms/model_forms.py:436
-#: vpn/forms/model_forms.py:445 vpn/tables/tunnels.py:91
+#: vpn/forms/model_forms.py:436 vpn/forms/model_forms.py:445
#: wireless/forms/model_forms.py:112 wireless/forms/model_forms.py:152
msgid "Interface"
msgstr "Интерфейс"
@@ -3817,7 +3816,7 @@ msgstr "Комплектующие"
#: dcim/forms/model_forms.py:1432
msgid "An InventoryItem can only be assigned to a single component."
-msgstr "InventoryItem можно присвоить только одному компоненту."
+msgstr "Инвентарный номер можно присвоить только одному компоненту."
#: dcim/forms/model_forms.py:1446 templates/dcim/inventoryitemrole.html:15
msgid "Inventory Item Role"
@@ -3854,7 +3853,7 @@ msgstr ""
" ожидаются."
#: dcim/forms/object_create.py:109 dcim/forms/object_create.py:270
-#: dcim/tables/devices.py:281
+#: dcim/tables/devices.py:285
msgid "Rear ports"
msgstr "Задние порты"
@@ -3893,11 +3892,11 @@ msgstr ""
"соответствовать выбранному количеству положений задних портов "
"({rearport_count})."
-#: dcim/forms/object_create.py:408 dcim/tables/devices.py:1039
+#: dcim/forms/object_create.py:408 dcim/tables/devices.py:1043
#: ipam/tables/fhrp.py:31 templates/dcim/virtualchassis.html:54
#: templates/dcim/virtualchassis_edit.html:48 templates/ipam/fhrpgroup.html:39
msgid "Members"
-msgstr "Члены"
+msgstr "Участники"
#: dcim/forms/object_create.py:417
msgid "Initial position"
@@ -3957,7 +3956,7 @@ msgstr "Несовместимые типы терминации: {type_a} а т
#: dcim/models/cables.py:191
msgid "A and B terminations cannot connect to the same object."
-msgstr "Терминалы A и B не могут подключаться к одному и тому же объекту."
+msgstr "Окончания A и B не могут подключаться к одному и тому же объекту."
#: dcim/models/cables.py:258 ipam/models/asns.py:37
msgid "end"
@@ -4068,7 +4067,7 @@ msgstr "максимальное потребление"
#: dcim/models/device_component_templates.py:259
#: dcim/models/device_components.py:360
msgid "allocated draw"
-msgstr "назначенное потребление"
+msgstr "выделенное потребление"
#: dcim/models/device_component_templates.py:269
msgid "power port template"
@@ -4083,8 +4082,7 @@ msgstr "шаблоны портов питания"
#, python-brace-format
msgid "Allocated draw cannot exceed the maximum draw ({maximum_draw}W)."
msgstr ""
-"Выделенная ничья не может превышать максимальное количество розыгрышей "
-"({maximum_draw}Ж)."
+"Выделенная мощность не может превышать максимальную ({maximum_draw}Вт)."
#: dcim/models/device_component_templates.py:321
#: dcim/models/device_components.py:478
@@ -4238,12 +4236,12 @@ msgstr ""
#: dcim/models/device_component_templates.py:742
#: dcim/models/device_components.py:1224
msgid "part ID"
-msgstr "идентификатор детали"
+msgstr "номер модели"
#: dcim/models/device_component_templates.py:744
#: dcim/models/device_components.py:1226
msgid "Manufacturer-assigned part identifier"
-msgstr "Идентификатор детали, присвоенный производителем"
+msgstr "Номер модели, присвоенный производителем"
#: dcim/models/device_component_templates.py:761
msgid "inventory item template"
@@ -4520,7 +4518,7 @@ msgstr ""
#: dcim/models/device_components.py:886
msgid "Cannot specify custom frequency with channel selected."
-msgstr "Невозможно указать собственную частоту при выбранном канале."
+msgstr "Невозможно указать произвольную частоту для выбранного канала."
#: dcim/models/device_components.py:892
msgid "Channel width may be set only on wireless interfaces."
@@ -4529,7 +4527,7 @@ msgstr ""
#: dcim/models/device_components.py:894
msgid "Cannot specify custom width with channel selected."
-msgstr "Невозможно указать произвольную ширину при выбранном канале."
+msgstr "Невозможно указать произвольную ширину полосы для выбранного канала."
#: dcim/models/device_components.py:902
#, python-brace-format
@@ -4630,13 +4628,13 @@ msgstr "роль комплектующего"
msgid "inventory item roles"
msgstr "роли комплектующих"
-#: dcim/models/device_components.py:1230 dcim/models/devices.py:595
-#: dcim/models/devices.py:1173 dcim/models/racks.py:113
+#: dcim/models/device_components.py:1230 dcim/models/devices.py:597
+#: dcim/models/devices.py:1178 dcim/models/racks.py:113
msgid "serial number"
msgstr "серийный номер"
-#: dcim/models/device_components.py:1238 dcim/models/devices.py:603
-#: dcim/models/devices.py:1180 dcim/models/racks.py:120
+#: dcim/models/device_components.py:1238 dcim/models/devices.py:605
+#: dcim/models/devices.py:1185 dcim/models/racks.py:120
msgid "asset tag"
msgstr "инвентарный номер"
@@ -4654,11 +4652,11 @@ msgstr "Этот элемент был обнаружен автоматичес
#: dcim/models/device_components.py:1262
msgid "inventory item"
-msgstr "комплектующее"
+msgstr "элемент инвентаря"
#: dcim/models/device_components.py:1263
msgid "inventory items"
-msgstr "комплектующие"
+msgstr "элементы инвентаря"
#: dcim/models/device_components.py:1274
msgid "Cannot assign self as parent."
@@ -4671,7 +4669,7 @@ msgstr ""
#: dcim/models/device_components.py:1288
msgid "Cannot move an inventory item with dependent children"
-msgstr "Невозможно переместить инвентарь вместе с детьми-иждивенцами"
+msgstr "Невозможно переместить инвентарь вместе с дочерней зависимостью"
#: dcim/models/device_components.py:1296
msgid "Cannot assign inventory item to component on another device"
@@ -4686,7 +4684,7 @@ msgstr "производитель"
msgid "manufacturers"
msgstr "производители"
-#: dcim/models/devices.py:82 dcim/models/devices.py:381
+#: dcim/models/devices.py:82 dcim/models/devices.py:382
msgid "model"
msgstr "модель"
@@ -4694,11 +4692,11 @@ msgstr "модель"
msgid "default platform"
msgstr "платформа по умолчанию"
-#: dcim/models/devices.py:98 dcim/models/devices.py:385
+#: dcim/models/devices.py:98 dcim/models/devices.py:386
msgid "part number"
-msgstr "номер детали"
+msgstr "номер модели"
-#: dcim/models/devices.py:101 dcim/models/devices.py:388
+#: dcim/models/devices.py:101 dcim/models/devices.py:389
msgid "Discrete part number (optional)"
msgstr "Дискретный номер детали (опционально)"
@@ -4736,9 +4734,9 @@ msgstr ""
"устройств. Оставьте поле пустым, если этот тип устройства не относится ни к "
"родительскому, ни к дочернему."
-#: dcim/models/devices.py:128 dcim/models/devices.py:647
+#: dcim/models/devices.py:128 dcim/models/devices.py:649
msgid "airflow"
-msgstr "направление воздушного потока"
+msgstr "воздушный поток"
#: dcim/models/devices.py:204
msgid "device type"
@@ -4748,11 +4746,11 @@ msgstr "тип устройства"
msgid "device types"
msgstr "типы устройств"
-#: dcim/models/devices.py:289
+#: dcim/models/devices.py:290
msgid "U height must be in increments of 0.5 rack units."
-msgstr "Высоту в U нужно указывать с шагом 0.5 юнитов стойки."
+msgstr "Высоту в юнитах нужно указывать с шагом 0.5 юнита."
-#: dcim/models/devices.py:306
+#: dcim/models/devices.py:307
#, python-brace-format
msgid ""
"Device {device} in rack {rack} does not have sufficient space to accommodate"
@@ -4761,7 +4759,7 @@ msgstr ""
"Устройству {device} в стойке {rack} для размещения на высоте {height}U не "
"хватет свободных юнитов."
-#: dcim/models/devices.py:321
+#: dcim/models/devices.py:322
#, python-brace-format
msgid ""
"Unable to set 0U height: Found {racked_instance_count} "
@@ -4771,7 +4769,7 @@ msgstr ""
"href=\"{url}\">{racked_instance_count} экземпляр(ов) уже смонтированых в"
" стойках."
-#: dcim/models/devices.py:330
+#: dcim/models/devices.py:331
msgid ""
"Must delete all device bay templates associated with this device before "
"declassifying it as a parent device."
@@ -4779,157 +4777,157 @@ msgstr ""
"Необходимо удалить все шаблоны отсеков устройств, связанные с этим "
"устройством, прежде чем рассекретить его как родительское устройство."
-#: dcim/models/devices.py:336
+#: dcim/models/devices.py:337
msgid "Child device types must be 0U."
msgstr "Типы дочерних устройств должны быть 0U."
-#: dcim/models/devices.py:404
+#: dcim/models/devices.py:405
msgid "module type"
msgstr "тип модуля"
-#: dcim/models/devices.py:405
+#: dcim/models/devices.py:406
msgid "module types"
msgstr "типы модулей"
-#: dcim/models/devices.py:473
+#: dcim/models/devices.py:475
msgid "Virtual machines may be assigned to this role"
msgstr "Эта роль может быть назначена виртуальным машинам."
-#: dcim/models/devices.py:485
+#: dcim/models/devices.py:487
msgid "device role"
msgstr "роль устройства"
-#: dcim/models/devices.py:486
+#: dcim/models/devices.py:488
msgid "device roles"
msgstr "роли устройств"
-#: dcim/models/devices.py:503
+#: dcim/models/devices.py:505
msgid "Optionally limit this platform to devices of a certain manufacturer"
msgstr ""
"Опционально ограничьте эту платформу устройствами определенного "
"производителя"
-#: dcim/models/devices.py:515
+#: dcim/models/devices.py:517
msgid "platform"
-msgstr "платформы"
-
-#: dcim/models/devices.py:516
-msgid "platforms"
msgstr "платформ"
-#: dcim/models/devices.py:564
+#: dcim/models/devices.py:518
+msgid "platforms"
+msgstr "платформы"
+
+#: dcim/models/devices.py:566
msgid "The function this device serves"
msgstr "Функция, которую выполняет это устройство"
-#: dcim/models/devices.py:596
+#: dcim/models/devices.py:598
msgid "Chassis serial number, assigned by the manufacturer"
msgstr "Серийный номер корпуса, присвоенный производителем"
-#: dcim/models/devices.py:604 dcim/models/devices.py:1181
+#: dcim/models/devices.py:606 dcim/models/devices.py:1186
msgid "A unique tag used to identify this device"
msgstr "Уникальный тег, используемый для идентификации этого устройства"
-#: dcim/models/devices.py:631
+#: dcim/models/devices.py:633
msgid "position (U)"
msgstr "положение (U)"
-#: dcim/models/devices.py:638
+#: dcim/models/devices.py:640
msgid "rack face"
msgstr "лицевая сторона стойки"
-#: dcim/models/devices.py:658 dcim/models/devices.py:1390
+#: dcim/models/devices.py:660 dcim/models/devices.py:1395
#: virtualization/models/virtualmachines.py:98
msgid "primary IPv4"
msgstr "основной IPv4"
-#: dcim/models/devices.py:666 dcim/models/devices.py:1398
+#: dcim/models/devices.py:668 dcim/models/devices.py:1403
#: virtualization/models/virtualmachines.py:106
msgid "primary IPv6"
msgstr "основной IPv6"
-#: dcim/models/devices.py:674
+#: dcim/models/devices.py:676
msgid "out-of-band IP"
msgstr "внеполосный IP-адрес"
-#: dcim/models/devices.py:691
+#: dcim/models/devices.py:693
msgid "VC position"
msgstr "Позиция VC"
-#: dcim/models/devices.py:695
+#: dcim/models/devices.py:697
msgid "Virtual chassis position"
msgstr "Положение виртуального шасси"
-#: dcim/models/devices.py:698
+#: dcim/models/devices.py:700
msgid "VC priority"
msgstr "Приоритет VC"
-#: dcim/models/devices.py:702
+#: dcim/models/devices.py:704
msgid "Virtual chassis master election priority"
msgstr "Приоритет выбора основного виртуального шасси"
-#: dcim/models/devices.py:705 dcim/models/sites.py:207
+#: dcim/models/devices.py:707 dcim/models/sites.py:207
msgid "latitude"
msgstr "широта"
-#: dcim/models/devices.py:710 dcim/models/devices.py:718
+#: dcim/models/devices.py:712 dcim/models/devices.py:720
#: dcim/models/sites.py:212 dcim/models/sites.py:220
msgid "GPS coordinate in decimal format (xx.yyyyyy)"
msgstr "Координата GPS в десятичном формате (xx.yyyyyy)"
-#: dcim/models/devices.py:713 dcim/models/sites.py:215
+#: dcim/models/devices.py:715 dcim/models/sites.py:215
msgid "longitude"
msgstr "долгота"
-#: dcim/models/devices.py:786
+#: dcim/models/devices.py:788
msgid "Device name must be unique per site."
msgstr "Имя устройства должно быть уникальным для каждого сайта."
-#: dcim/models/devices.py:797 ipam/models/services.py:75
+#: dcim/models/devices.py:799 ipam/models/services.py:75
msgid "device"
msgstr "устройство"
-#: dcim/models/devices.py:798
+#: dcim/models/devices.py:800
msgid "devices"
-msgstr "приборы"
+msgstr "устройства"
-#: dcim/models/devices.py:838
+#: dcim/models/devices.py:840
#, python-brace-format
msgid "Rack {rack} does not belong to site {site}."
msgstr "Стойка {rack} не принадлежит сайту {site}."
-#: dcim/models/devices.py:843
+#: dcim/models/devices.py:845
#, python-brace-format
msgid "Location {location} does not belong to site {site}."
-msgstr "Местоположение {location} не принадлежит сайту {site}."
+msgstr "Локация {location} не принадлежит сайту {site}."
-#: dcim/models/devices.py:849
+#: dcim/models/devices.py:851
#, python-brace-format
msgid "Rack {rack} does not belong to location {location}."
-msgstr "Стойка {rack} не принадлежит расположению {location}."
+msgstr "Стойка {rack} не принадлежит локации {location}."
-#: dcim/models/devices.py:856
+#: dcim/models/devices.py:858
msgid "Cannot select a rack face without assigning a rack."
msgstr "Невозможно выбрать лицевую сторону стойки, не выбрав саму стойку."
-#: dcim/models/devices.py:860
+#: dcim/models/devices.py:862
msgid "Cannot select a rack position without assigning a rack."
msgstr "Невозможно выбрать позицию в стойке, не выбрав саму стойку."
-#: dcim/models/devices.py:866
+#: dcim/models/devices.py:868
msgid "Position must be in increments of 0.5 rack units."
msgstr "Позиция должна быть указана с шагом 0,5 единицы стойки."
-#: dcim/models/devices.py:870
+#: dcim/models/devices.py:872
msgid "Must specify rack face when defining rack position."
msgstr "При определении лицевой стороны необходимо указать позицию в стойке."
-#: dcim/models/devices.py:878
+#: dcim/models/devices.py:880
#, python-brace-format
msgid ""
"A 0U device type ({device_type}) cannot be assigned to a rack position."
msgstr "Тип устройства 0U ({device_type}) не может быть отнесено к стойке."
-#: dcim/models/devices.py:889
+#: dcim/models/devices.py:891
msgid ""
"Child device types cannot be assigned to a rack face. This is an attribute "
"of the parent device."
@@ -4937,15 +4935,15 @@ msgstr ""
"Устройствам с указанным в типе свойством \"дочернее\" нельзя выбрать лицевую"
" сторону стойки. Этот атрибут указывается для \"родительского\" устройства."
-#: dcim/models/devices.py:896
+#: dcim/models/devices.py:898
msgid ""
"Child device types cannot be assigned to a rack position. This is an "
"attribute of the parent device."
msgstr ""
-"Типы детских устройств нельзя отнести к позиции в стойке. Это атрибут "
+"Типы дочерних устройств нельзя отнести к позиции в стойке. Это атрибут "
"родительского устройства."
-#: dcim/models/devices.py:910
+#: dcim/models/devices.py:912
#, python-brace-format
msgid ""
"U{position} is already occupied or does not have sufficient space to "
@@ -4954,22 +4952,22 @@ msgstr ""
"U{position} уже занят или в нем недостаточно места для размещения этого типа"
" устройств: {device_type} ({u_height}U)"
-#: dcim/models/devices.py:925
+#: dcim/models/devices.py:927
#, python-brace-format
msgid "{ip} is not an IPv4 address."
msgstr "{ip} не является адресом IPv4."
-#: dcim/models/devices.py:934 dcim/models/devices.py:949
+#: dcim/models/devices.py:936 dcim/models/devices.py:951
#, python-brace-format
msgid "The specified IP address ({ip}) is not assigned to this device."
msgstr "Указанный IP-адрес ({ip}) не назначено этому устройству."
-#: dcim/models/devices.py:940
+#: dcim/models/devices.py:942
#, python-brace-format
msgid "{ip} is not an IPv6 address."
msgstr "{ip} не является адресом IPv6."
-#: dcim/models/devices.py:967
+#: dcim/models/devices.py:969
#, python-brace-format
msgid ""
"The assigned platform is limited to {platform_manufacturer} device types, "
@@ -4978,26 +4976,26 @@ msgstr ""
"Назначенная платформа ограничена {platform_manufacturer} типы устройств, но "
"данный тип устройства относится к {devicetype_manufacturer}."
-#: dcim/models/devices.py:978
+#: dcim/models/devices.py:980
#, python-brace-format
msgid "The assigned cluster belongs to a different site ({site})"
msgstr "Назначенный кластер принадлежит другому сайту ({site})"
-#: dcim/models/devices.py:986
+#: dcim/models/devices.py:988
msgid "A device assigned to a virtual chassis must have its position defined."
msgstr ""
"Положение устройства, назначенного виртуальному шасси, должно быть "
"определено."
-#: dcim/models/devices.py:1188
+#: dcim/models/devices.py:1193
msgid "module"
msgstr "модуль"
-#: dcim/models/devices.py:1189
+#: dcim/models/devices.py:1194
msgid "modules"
msgstr "модули"
-#: dcim/models/devices.py:1205
+#: dcim/models/devices.py:1210
#, python-brace-format
msgid ""
"Module must be installed within a module bay belonging to the assigned "
@@ -5006,21 +5004,21 @@ msgstr ""
"Модуль должен быть установлен в модульном отсеке, принадлежащем назначенному"
" устройству ({device})."
-#: dcim/models/devices.py:1309
+#: dcim/models/devices.py:1314
msgid "domain"
msgstr "Домен"
-#: dcim/models/devices.py:1322 dcim/models/devices.py:1323
+#: dcim/models/devices.py:1327 dcim/models/devices.py:1328
msgid "virtual chassis"
msgstr "виртуальное шасси"
-#: dcim/models/devices.py:1338
+#: dcim/models/devices.py:1343
#, python-brace-format
msgid ""
"The selected master ({master}) is not assigned to this virtual chassis."
msgstr "Выбранный мастер ({master}) не назначено этому виртуальному шасси."
-#: dcim/models/devices.py:1354
+#: dcim/models/devices.py:1359
#, python-brace-format
msgid ""
"Unable to delete virtual chassis {self}. There are member interfaces which "
@@ -5029,33 +5027,33 @@ msgstr ""
"Невозможно удалить виртуальное шасси {self}. Существуют интерфейсы-члены, "
"которые образуют межкорпусные интерфейсы LAG."
-#: dcim/models/devices.py:1379 vpn/models/l2vpn.py:37
+#: dcim/models/devices.py:1384 vpn/models/l2vpn.py:37
msgid "identifier"
msgstr "идентификатор"
-#: dcim/models/devices.py:1380
+#: dcim/models/devices.py:1385
msgid "Numeric identifier unique to the parent device"
msgstr "Цифровой идентификатор, уникальный для родительского устройства"
-#: dcim/models/devices.py:1408 extras/models/models.py:129
+#: dcim/models/devices.py:1413 extras/models/models.py:129
#: extras/models/models.py:724 netbox/models/__init__.py:114
msgid "comments"
msgstr "комментарии"
-#: dcim/models/devices.py:1424
+#: dcim/models/devices.py:1429
msgid "virtual device context"
msgstr "виртуальный контекст"
-#: dcim/models/devices.py:1425
+#: dcim/models/devices.py:1430
msgid "virtual device contexts"
msgstr "виртуальные контексты"
-#: dcim/models/devices.py:1457
+#: dcim/models/devices.py:1462
#, python-brace-format
msgid "{ip} is not an IPv{family} address."
msgstr "{ip} не является IPV{family} адрес."
-#: dcim/models/devices.py:1463
+#: dcim/models/devices.py:1468
msgid "Primary IP address must belong to an interface on the assigned device."
msgstr ""
"Основной IP-адрес должен принадлежать интерфейсу на назначенном устройстве."
@@ -5087,8 +5085,7 @@ msgstr "панели питания"
msgid ""
"Location {location} ({location_site}) is in a different site than {site}"
msgstr ""
-"Местоположение {location} ({location_site}) находится на другом сайте, чем "
-"{site}"
+"Локация{location} ({location_site}) находится на другом сайте, чем {site}"
#: dcim/models/power.py:107
msgid "supply"
@@ -5271,8 +5268,8 @@ msgid ""
"Rack unit numbering must begin at {position} or less to house currently "
"installed devices."
msgstr ""
-"Нумерация стеллажей должна начинаться с {position} или меньше для размещения"
-" установленных в настоящее время устройств."
+"Нумерация стоек должна начинаться с {position} или меньше для размещения "
+"установленных в настоящее время устройств."
#: dcim/models/racks.py:269
#, python-brace-format
@@ -5281,7 +5278,7 @@ msgstr "Локация должна быть с того же места, {site}
#: dcim/models/racks.py:522
msgid "units"
-msgstr "единиц"
+msgstr "юниты"
#: dcim/models/racks.py:548
msgid "rack reservation"
@@ -5300,7 +5297,7 @@ msgstr ""
#: dcim/models/racks.py:579
#, python-brace-format
msgid "The following units have already been reserved: {unit_list}"
-msgstr "Следующие номера уже зарезервированы: {unit_list}"
+msgstr "Следующие юниты уже зарезервированы: {unit_list}"
#: dcim/models/sites.py:49
msgid "A top-level region with this name already exists."
@@ -5368,7 +5365,7 @@ msgstr "место"
#: dcim/models/sites.py:239
msgid "sites"
-msgstr "места"
+msgstr "Сайты"
#: dcim/models/sites.py:303
msgid "A location with this name already exists within the specified site."
@@ -5390,16 +5387,15 @@ msgstr "локации"
#, python-brace-format
msgid "Parent location ({parent}) must belong to the same site ({site})."
msgstr ""
-"Местонахождение родителя ({parent}) должен принадлежать тому же сайту "
-"({site})."
+"Локация родителя ({parent}) должен принадлежать тому же сайту ({site})."
#: dcim/tables/cables.py:54
msgid "Termination A"
-msgstr "Прекращение A"
+msgstr "Окончание A"
#: dcim/tables/cables.py:59
msgid "Termination B"
-msgstr "Прекращение В"
+msgstr "Окончание В"
#: dcim/tables/cables.py:65 wireless/tables/wirelesslink.py:22
msgid "Device A"
@@ -5411,19 +5407,19 @@ msgstr "Устройство B"
#: dcim/tables/cables.py:77
msgid "Location A"
-msgstr "Местоположение A"
+msgstr "Локация A"
#: dcim/tables/cables.py:83
msgid "Location B"
-msgstr "Местоположение B"
+msgstr "Локация B"
#: dcim/tables/cables.py:89
msgid "Rack A"
-msgstr "Стеллаж A"
+msgstr "Стойка A"
#: dcim/tables/cables.py:95
msgid "Rack B"
-msgstr "Стеллаж B"
+msgstr "Стойка B"
#: dcim/tables/cables.py:101
msgid "Site A"
@@ -5445,7 +5441,7 @@ msgstr "Консольный порт"
msgid "Reachable"
msgstr "Доступен"
-#: dcim/tables/connections.py:46 dcim/tables/devices.py:529
+#: dcim/tables/connections.py:46 dcim/tables/devices.py:533
#: templates/dcim/inventoryitem_edit.html:64
#: templates/dcim/poweroutlet.html:47 templates/dcim/powerport.html:18
msgid "Power Port"
@@ -5464,7 +5460,7 @@ msgstr "Устройства"
msgid "VMs"
msgstr "Виртуальные машины"
-#: dcim/tables/devices.py:133 dcim/tables/devices.py:245
+#: dcim/tables/devices.py:133 dcim/tables/devices.py:249
#: extras/forms/model_forms.py:515 templates/dcim/device.html:114
#: templates/dcim/device/render_config.html:11
#: templates/dcim/device/render_config.html:15
@@ -5473,62 +5469,62 @@ msgstr "Виртуальные машины"
#: templates/virtualization/virtualmachine.html:47
#: templates/virtualization/virtualmachine/render_config.html:11
#: templates/virtualization/virtualmachine/render_config.html:15
-#: virtualization/tables/virtualmachines.py:93
+#: virtualization/tables/virtualmachines.py:106
msgid "Config Template"
msgstr "Шаблон конфигурации"
-#: dcim/tables/devices.py:216 dcim/tables/devices.py:1074
+#: dcim/tables/devices.py:220 dcim/tables/devices.py:1078
#: ipam/forms/bulk_import.py:511 ipam/forms/model_forms.py:296
#: ipam/tables/ip.py:352 ipam/tables/ip.py:418 ipam/tables/ip.py:441
#: templates/ipam/ipaddress.html:12 templates/ipam/ipaddress_edit.html:14
-#: virtualization/tables/virtualmachines.py:81
+#: virtualization/tables/virtualmachines.py:94
msgid "IP Address"
msgstr "IP-адрес"
-#: dcim/tables/devices.py:220 dcim/tables/devices.py:1078
-#: virtualization/tables/virtualmachines.py:72
+#: dcim/tables/devices.py:224 dcim/tables/devices.py:1082
+#: virtualization/tables/virtualmachines.py:85
msgid "IPv4 Address"
msgstr "Адрес IPv4"
-#: dcim/tables/devices.py:224 dcim/tables/devices.py:1082
-#: virtualization/tables/virtualmachines.py:76
+#: dcim/tables/devices.py:228 dcim/tables/devices.py:1086
+#: virtualization/tables/virtualmachines.py:89
msgid "IPv6 Address"
msgstr "Адрес IPv6"
-#: dcim/tables/devices.py:239
+#: dcim/tables/devices.py:243
msgid "VC Position"
msgstr "Позиция VC"
-#: dcim/tables/devices.py:242
+#: dcim/tables/devices.py:246
msgid "VC Priority"
msgstr "Приоритет VC"
-#: dcim/tables/devices.py:249 templates/dcim/device_edit.html:38
+#: dcim/tables/devices.py:253 templates/dcim/device_edit.html:38
#: templates/dcim/devicebay_populate.html:16
msgid "Parent Device"
msgstr "Родительское устройство"
-#: dcim/tables/devices.py:254
+#: dcim/tables/devices.py:258
msgid "Position (Device Bay)"
msgstr "Положение (отсек для устройств)"
-#: dcim/tables/devices.py:263
+#: dcim/tables/devices.py:267
msgid "Console ports"
msgstr "Консольные порты"
-#: dcim/tables/devices.py:266
+#: dcim/tables/devices.py:270
msgid "Console server ports"
msgstr "Порты консольного сервера"
-#: dcim/tables/devices.py:269
+#: dcim/tables/devices.py:273
msgid "Power ports"
msgstr "Порты питания"
-#: dcim/tables/devices.py:272
+#: dcim/tables/devices.py:276
msgid "Power outlets"
msgstr "Розетки питания"
-#: dcim/tables/devices.py:275 dcim/tables/devices.py:1087
+#: dcim/tables/devices.py:279 dcim/tables/devices.py:1091
#: dcim/tables/devicetypes.py:125 dcim/views.py:1005 dcim/views.py:1244
#: dcim/views.py:1930 netbox/navigation/menu.py:82
#: netbox/navigation/menu.py:238 templates/dcim/device/base.html:37
@@ -5538,53 +5534,53 @@ msgstr "Розетки питания"
#: templates/dcim/virtualdevicecontext.html:85
#: templates/virtualization/virtualmachine/base.html:27
#: templates/virtualization/virtualmachine_list.html:14
-#: virtualization/tables/virtualmachines.py:87 virtualization/views.py:368
+#: virtualization/tables/virtualmachines.py:100 virtualization/views.py:368
#: wireless/tables/wirelesslan.py:55
msgid "Interfaces"
msgstr "Интерфейсы"
-#: dcim/tables/devices.py:278
+#: dcim/tables/devices.py:282
msgid "Front ports"
msgstr "Передние порты"
-#: dcim/tables/devices.py:284
+#: dcim/tables/devices.py:288
msgid "Device bays"
msgstr "Отсеки для устройств"
-#: dcim/tables/devices.py:287
+#: dcim/tables/devices.py:291
msgid "Module bays"
msgstr "Отсеки для модулей"
-#: dcim/tables/devices.py:290
+#: dcim/tables/devices.py:294
msgid "Inventory items"
msgstr "Комплектующие"
-#: dcim/tables/devices.py:329 dcim/tables/modules.py:56
+#: dcim/tables/devices.py:333 dcim/tables/modules.py:56
#: templates/dcim/modulebay.html:17
msgid "Module Bay"
msgstr "Модульный отсек"
-#: dcim/tables/devices.py:350
+#: dcim/tables/devices.py:354
msgid "Cable Color"
msgstr "Цвет кабеля"
-#: dcim/tables/devices.py:356
+#: dcim/tables/devices.py:360
msgid "Link Peers"
msgstr "Связать узлы"
-#: dcim/tables/devices.py:359
+#: dcim/tables/devices.py:363
msgid "Mark Connected"
msgstr "Отметить подключение"
-#: dcim/tables/devices.py:475
+#: dcim/tables/devices.py:479
msgid "Maximum draw (W)"
msgstr "Максимальная потребляемая мощность (Вт)"
-#: dcim/tables/devices.py:478
+#: dcim/tables/devices.py:482
msgid "Allocated draw (W)"
msgstr "Выделенная мощность (Вт)"
-#: dcim/tables/devices.py:578 ipam/forms/model_forms.py:707
+#: dcim/tables/devices.py:582 ipam/forms/model_forms.py:711
#: ipam/tables/fhrp.py:28 ipam/views.py:597 ipam/views.py:691
#: netbox/navigation/menu.py:146 netbox/navigation/menu.py:148
#: templates/dcim/interface.html:351 templates/ipam/ipaddress_bulk_add.html:15
@@ -5593,12 +5589,12 @@ msgstr "Выделенная мощность (Вт)"
msgid "IP Addresses"
msgstr "IP-адреса"
-#: dcim/tables/devices.py:584 netbox/navigation/menu.py:190
+#: dcim/tables/devices.py:588 netbox/navigation/menu.py:190
#: templates/ipam/inc/panels/fhrp_groups.html:5
msgid "FHRP Groups"
msgstr "Группы FHRP"
-#: dcim/tables/devices.py:596 templates/dcim/interface.html:90
+#: dcim/tables/devices.py:600 templates/dcim/interface.html:90
#: templates/virtualization/vminterface.html:70 templates/vpn/tunnel.html:18
#: templates/vpn/tunneltermination.html:14 vpn/forms/bulk_edit.py:75
#: vpn/forms/bulk_import.py:76 vpn/forms/filtersets.py:41
@@ -5607,20 +5603,20 @@ msgstr "Группы FHRP"
msgid "Tunnel"
msgstr "Туннель"
-#: dcim/tables/devices.py:621 dcim/tables/devicetypes.py:224
+#: dcim/tables/devices.py:625 dcim/tables/devicetypes.py:224
#: templates/dcim/interface.html:66
msgid "Management Only"
msgstr "Только управление"
-#: dcim/tables/devices.py:629
+#: dcim/tables/devices.py:633
msgid "Wireless link"
msgstr "Беспроводная связь"
-#: dcim/tables/devices.py:639
+#: dcim/tables/devices.py:643
msgid "VDCs"
msgstr "Виртуальные контексты устройств(VDCs)"
-#: dcim/tables/devices.py:647 dcim/tables/devicetypes.py:48
+#: dcim/tables/devices.py:651 dcim/tables/devicetypes.py:48
#: dcim/tables/devicetypes.py:140 dcim/views.py:1080 dcim/views.py:2023
#: netbox/navigation/menu.py:91 templates/dcim/device/base.html:52
#: templates/dcim/device_list.html:71 templates/dcim/devicetype/base.html:49
@@ -5629,7 +5625,7 @@ msgstr "Виртуальные контексты устройств(VDCs)"
msgid "Inventory Items"
msgstr "Предметы инвентаря"
-#: dcim/tables/devices.py:728
+#: dcim/tables/devices.py:732
#: templates/circuits/inc/circuit_termination.html:80
#: templates/dcim/consoleport.html:81 templates/dcim/consoleserverport.html:81
#: templates/dcim/frontport.html:53 templates/dcim/frontport.html:125
@@ -5638,28 +5634,28 @@ msgstr "Предметы инвентаря"
msgid "Rear Port"
msgstr "Задний порт"
-#: dcim/tables/devices.py:893 templates/dcim/modulebay.html:51
+#: dcim/tables/devices.py:897 templates/dcim/modulebay.html:51
msgid "Installed Module"
msgstr "Установленный модуль"
-#: dcim/tables/devices.py:896
+#: dcim/tables/devices.py:900
msgid "Module Serial"
msgstr "Серийный номер модуля"
-#: dcim/tables/devices.py:900
+#: dcim/tables/devices.py:904
msgid "Module Asset Tag"
msgstr "Тег активов модуля"
-#: dcim/tables/devices.py:909
+#: dcim/tables/devices.py:913
msgid "Module Status"
msgstr "Состояние модуля"
-#: dcim/tables/devices.py:951 dcim/tables/devicetypes.py:308
+#: dcim/tables/devices.py:955 dcim/tables/devicetypes.py:308
#: templates/dcim/inventoryitem.html:41
msgid "Component"
msgstr "Компонент"
-#: dcim/tables/devices.py:1006
+#: dcim/tables/devices.py:1010
msgid "Items"
msgstr "Предметы"
@@ -5777,7 +5773,7 @@ msgstr "Высота"
#: dcim/tables/racks.py:85
msgid "Space"
-msgstr "Космос"
+msgstr "Пространство"
#: dcim/tables/racks.py:96 templates/dcim/rack.html:105
msgid "Outer Width"
@@ -5797,7 +5793,7 @@ msgstr "Максимальный вес"
#: ipam/tables/asn.py:66 netbox/navigation/menu.py:16
#: netbox/navigation/menu.py:18
msgid "Sites"
-msgstr "ЦОД"
+msgstr "Сайты"
#: dcim/tests/test_api.py:49
msgid "Test case must set peer_termination_type"
@@ -5882,7 +5878,7 @@ msgstr "JSON"
#: extras/choices.py:36
msgid "Selection"
-msgstr "Отбор"
+msgstr "Выбор"
#: extras/choices.py:37
msgid "Multiple selection"
@@ -6226,7 +6222,7 @@ msgid "Cluster type (slug)"
msgstr "Тип кластера (подстрока)"
#: extras/filtersets.py:490 ipam/forms/bulk_edit.py:475
-#: ipam/forms/model_forms.py:585 virtualization/forms/filtersets.py:108
+#: ipam/forms/model_forms.py:589 virtualization/forms/filtersets.py:108
msgid "Cluster group"
msgstr "Кластерная группа"
@@ -6278,7 +6274,7 @@ msgstr "Видимый пользовательский интерфейс"
#: extras/forms/bulk_edit.py:58 extras/forms/bulk_import.py:63
#: extras/forms/filtersets.py:83 extras/models/customfields.py:200
msgid "UI editable"
-msgstr "Редактируемый пользовательский интерфейс"
+msgstr "Редактируемый UI"
#: extras/forms/bulk_edit.py:63 extras/forms/filtersets.py:86
msgid "Is cloneable"
@@ -6357,8 +6353,8 @@ msgid "Is active"
msgstr "Активен"
#: extras/forms/bulk_import.py:34 extras/forms/bulk_import.py:115
-#: extras/forms/bulk_import.py:130 extras/forms/bulk_import.py:153
-#: extras/forms/bulk_import.py:177 extras/forms/filtersets.py:114
+#: extras/forms/bulk_import.py:136 extras/forms/bulk_import.py:159
+#: extras/forms/bulk_import.py:183 extras/forms/filtersets.py:114
#: extras/forms/filtersets.py:160 extras/forms/filtersets.py:201
#: extras/forms/model_forms.py:43 extras/forms/model_forms.py:127
#: extras/forms/model_forms.py:156 extras/forms/model_forms.py:197
@@ -6367,8 +6363,8 @@ msgid "Content types"
msgstr "Типы контента"
#: extras/forms/bulk_import.py:36 extras/forms/bulk_import.py:117
-#: extras/forms/bulk_import.py:132 extras/forms/bulk_import.py:155
-#: extras/forms/bulk_import.py:179 tenancy/forms/bulk_import.py:96
+#: extras/forms/bulk_import.py:138 extras/forms/bulk_import.py:161
+#: extras/forms/bulk_import.py:185 tenancy/forms/bulk_import.py:96
msgid "One or more assigned object types"
msgstr "Один или несколько назначенных типов объектов"
@@ -6417,29 +6413,40 @@ msgstr ""
"дополнительными метками, разделенными двоеточием: «Choice1:First Choice, "
"Choice2:Second Choice»"
-#: extras/forms/bulk_import.py:182
+#: extras/forms/bulk_import.py:120 extras/models/models.py:353
+msgid "button class"
+msgstr "класс кнопок"
+
+#: extras/forms/bulk_import.py:123 extras/models/models.py:357
+msgid ""
+"The class of the first link in a group will be used for the dropdown button"
+msgstr ""
+"Класс первой ссылки в группе будет использоваться для кнопки раскрывающегося"
+" списка"
+
+#: extras/forms/bulk_import.py:188
msgid "Action object"
msgstr "Объект действия"
-#: extras/forms/bulk_import.py:184
+#: extras/forms/bulk_import.py:190
msgid "Webhook name or script as dotted path module.Class"
msgstr "Имя веб-хука или скрипт в виде пунктирного пути module.Class"
-#: extras/forms/bulk_import.py:205
+#: extras/forms/bulk_import.py:211
#, python-brace-format
msgid "Webhook {name} not found"
msgstr "Вебхук {name} не найден"
-#: extras/forms/bulk_import.py:214
+#: extras/forms/bulk_import.py:220
#, python-brace-format
msgid "Script {name} not found"
msgstr "Сценарий {name} не найден"
-#: extras/forms/bulk_import.py:236
+#: extras/forms/bulk_import.py:242
msgid "Assigned object type"
msgstr "Назначенный тип объекта"
-#: extras/forms/bulk_import.py:241
+#: extras/forms/bulk_import.py:247
msgid "The classification of entry"
msgstr "Классификация записей"
@@ -6522,7 +6529,7 @@ msgstr "Группы сайтов"
#: extras/forms/filtersets.py:364 extras/forms/model_forms.py:408
#: netbox/navigation/menu.py:21
msgid "Locations"
-msgstr "Местоположения"
+msgstr "Локации"
#: extras/forms/filtersets.py:369 extras/forms/model_forms.py:413
msgid "Device types"
@@ -6897,7 +6904,8 @@ msgstr "Допустимы только буквенно-цифровые сим
#: extras/models/customfields.py:101
msgid "Double underscores are not permitted in custom field names."
msgstr ""
-"В именах настраиваемых полей недопустимо использовать двойное подчеркивание."
+"В именах настраиваемых полей недопустимо использовать два подчеркивания "
+"подряд (зарезервировано)."
#: extras/models/customfields.py:112
msgid ""
@@ -7321,10 +7329,9 @@ msgid ""
"username, request_id, and data."
msgstr ""
"Шаблон Jinja2 для настраиваемого тела запроса. Если поле пусто, будет "
-"добавлен объект JSON, представляющий изменение. Доступные контекстные данные"
-" включают: событие, модель, отметка "
-"времени, имя пользователя, идентификатор "
-"запроса, и данные."
+"добавлен объект JSON с изменениями. Доступные контекстные данные включают: "
+"event, model, timestamp, "
+"username, request_id, и data."
#: extras/models/models.py:234
msgid "secret"
@@ -7393,17 +7400,6 @@ msgstr "Код Jinja2 шаблона для URL-адреса"
msgid "Links with the same group will appear as a dropdown menu"
msgstr "Ссылки с той же группой появятся в выпадающем меню"
-#: extras/models/models.py:353
-msgid "button class"
-msgstr "класс кнопок"
-
-#: extras/models/models.py:357
-msgid ""
-"The class of the first link in a group will be used for the dropdown button"
-msgstr ""
-"Класс первой ссылки в группе будет использоваться для кнопки раскрывающегося"
-" списка"
-
#: extras/models/models.py:360
msgid "new window"
msgstr "новое окно"
@@ -7496,11 +7492,11 @@ msgstr "ширина изображения"
#: extras/models/models.py:640
msgid "image attachment"
-msgstr "вложение изображения"
+msgstr "прикрепить изображение"
#: extras/models/models.py:641
msgid "image attachments"
-msgstr "вложения изображений"
+msgstr "прикрепленные изображения"
#: extras/models/models.py:655
#, python-brace-format
@@ -7590,7 +7586,7 @@ msgid "staged changes"
msgstr "поэтапные изменения"
#: extras/models/tags.py:40
-msgid "The object type(s) to which this this tag can be applied."
+msgid "The object type(s) to which this tag can be applied."
msgstr "Тип (ы) объекта, к которому можно применить этот тег."
#: extras/models/tags.py:49
@@ -7889,7 +7885,7 @@ msgid "VLAN number (1-4094)"
msgstr "Номер VLAN (1-4094)"
#: ipam/filtersets.py:437 ipam/filtersets.py:441 ipam/filtersets.py:533
-#: ipam/forms/model_forms.py:444 templates/tenancy/contact.html:54
+#: ipam/forms/model_forms.py:430 templates/tenancy/contact.html:54
#: tenancy/forms/bulk_edit.py:112
msgid "Address"
msgstr "Адрес"
@@ -7931,7 +7927,7 @@ msgstr "Интерфейс виртуальной машины (ID)"
#: ipam/filtersets.py:614
msgid "FHRP group (ID)"
-msgstr "Группа FHRP (идентификатор)"
+msgstr "FHRP группа (ID)"
#: ipam/filtersets.py:618
msgid "Is assigned to an interface"
@@ -8006,7 +8002,7 @@ msgstr "Является частным"
#: templates/ipam/aggregate.html:19 templates/ipam/asn.html:28
#: templates/ipam/asnrange.html:20 templates/ipam/rir.html:20
msgid "RIR"
-msgstr "ВСАДНИКИ"
+msgstr "RIR"
#: ipam/forms/bulk_edit.py:168
msgid "Date added"
@@ -8019,7 +8015,7 @@ msgstr "Длина префикса"
#: ipam/forms/bulk_edit.py:252 ipam/forms/filtersets.py:236
#: templates/ipam/prefix.html:86
msgid "Is a pool"
-msgstr "Это бассейн"
+msgstr "Это пул"
#: ipam/forms/bulk_edit.py:257 ipam/forms/bulk_edit.py:301
#: ipam/forms/filtersets.py:243 ipam/forms/filtersets.py:282
@@ -8058,7 +8054,7 @@ msgid "Authentication key"
msgstr "Ключ аутентификации"
#: ipam/forms/bulk_edit.py:404 ipam/forms/filtersets.py:369
-#: ipam/forms/model_forms.py:455 netbox/navigation/menu.py:376
+#: ipam/forms/model_forms.py:441 netbox/navigation/menu.py:376
#: templates/ipam/fhrpgroup.html:51
#: templates/wireless/inc/authentication_attrs.html:5
#: wireless/forms/bulk_edit.py:90 wireless/forms/bulk_edit.py:137
@@ -8073,13 +8069,13 @@ msgstr "Минимальное количество VLAN VID для детей"
#: ipam/forms/bulk_edit.py:420
msgid "Maximum child VLAN VID"
-msgstr "Максимальное количество идентификаторов VLAN для детей"
+msgstr "Максимальный ID дочерней VLAN"
-#: ipam/forms/bulk_edit.py:428 ipam/forms/model_forms.py:527
+#: ipam/forms/bulk_edit.py:428 ipam/forms/model_forms.py:531
msgid "Scope type"
msgstr "Тип прицела"
-#: ipam/forms/bulk_edit.py:489 ipam/forms/model_forms.py:600
+#: ipam/forms/bulk_edit.py:489 ipam/forms/model_forms.py:604
#: ipam/tables/vlans.py:71 templates/ipam/vlangroup.html:39
msgid "Scope"
msgstr "Область применения"
@@ -8088,8 +8084,8 @@ msgstr "Область применения"
msgid "Site & Group"
msgstr "Сайт и группа"
-#: ipam/forms/bulk_edit.py:574 ipam/forms/model_forms.py:663
-#: ipam/forms/model_forms.py:697 ipam/tables/services.py:19
+#: ipam/forms/bulk_edit.py:574 ipam/forms/model_forms.py:667
+#: ipam/forms/model_forms.py:701 ipam/tables/services.py:19
#: ipam/tables/services.py:49 templates/ipam/service.html:39
#: templates/ipam/servicetemplate.html:24
msgid "Ports"
@@ -8129,7 +8125,7 @@ msgid "Parent device of assigned interface (if any)"
msgstr "Родительское устройство назначенного интерфейса (если есть)"
#: ipam/forms/bulk_import.py:310 ipam/forms/bulk_import.py:496
-#: ipam/forms/model_forms.py:691 virtualization/filtersets.py:284
+#: ipam/forms/model_forms.py:695 virtualization/filtersets.py:284
#: virtualization/filtersets.py:323 virtualization/forms/bulk_edit.py:199
#: virtualization/forms/bulk_edit.py:325
#: virtualization/forms/bulk_import.py:146
@@ -8179,16 +8175,12 @@ msgstr "Тип прицела (приложение и модель)"
#: ipam/forms/bulk_import.py:418
#, python-brace-format
msgid "Minimum child VLAN VID (default: {minimum})"
-msgstr ""
-"Минимальное количество идентификаторов VLAN для детей (по умолчанию): "
-"{minimum})"
+msgstr "Минимальный ID дочерней VLAN (по умолчанию: {minimum})"
#: ipam/forms/bulk_import.py:424
#, python-brace-format
msgid "Maximum child VLAN VID (default: {maximum})"
-msgstr ""
-"Максимальное количество идентификаторов VLAN для детей (по умолчанию): "
-"{maximum})"
+msgstr "Максимальный ID дочерней VLAN (по умолчанию: {maximum})"
#: ipam/forms/bulk_import.py:448
msgid "Assigned VLAN group"
@@ -8249,7 +8241,7 @@ msgstr "Ассортимент"
#: ipam/forms/filtersets.py:127
msgid "Start"
-msgstr "Начните"
+msgstr "Начало"
#: ipam/forms/filtersets.py:131
msgid "End"
@@ -8286,7 +8278,7 @@ msgstr "DNS-имя"
#: ipam/forms/filtersets.py:401 ipam/forms/filtersets.py:494
#: ipam/models/vlans.py:156 templates/ipam/vlan.html:34
msgid "VLAN ID"
-msgstr "ИДЕНТИФИКАТОР КЛАНА"
+msgstr "VLAN ID"
#: ipam/forms/filtersets.py:433
msgid "Minimum VID"
@@ -8311,8 +8303,8 @@ msgstr "Порт"
#: virtualization/forms/filtersets.py:189
#: virtualization/forms/filtersets.py:234
#: virtualization/forms/model_forms.py:223
-#: virtualization/tables/virtualmachines.py:115
-#: virtualization/tables/virtualmachines.py:168 vpn/choices.py:45
+#: virtualization/tables/virtualmachines.py:128
+#: virtualization/tables/virtualmachines.py:181 vpn/choices.py:45
#: vpn/forms/filtersets.py:289 vpn/forms/model_forms.py:161
#: vpn/forms/model_forms.py:172 vpn/forms/model_forms.py:274
msgid "Virtual Machine"
@@ -8335,7 +8327,7 @@ msgstr "Назначение сайта/VLAN"
msgid "IP Range"
msgstr "Диапазон IP-адресов"
-#: ipam/forms/model_forms.py:285 ipam/forms/model_forms.py:454
+#: ipam/forms/model_forms.py:285 ipam/forms/model_forms.py:440
#: templates/ipam/fhrpgroup.html:19 templates/ipam/ipaddress_edit.html:52
msgid "FHRP Group"
msgstr "Группа компаний FHRP"
@@ -8348,7 +8340,7 @@ msgstr "Сделайте этот IP-адрес основным для устр
msgid "An IP address can only be assigned to a single object."
msgstr "IP-адрес можно присвоить только одному объекту."
-#: ipam/forms/model_forms.py:357 ipam/models/ip.py:877
+#: ipam/forms/model_forms.py:357 ipam/models/ip.py:896
msgid ""
"Cannot reassign IP address while it is designated as the primary IP for the "
"parent object"
@@ -8363,34 +8355,25 @@ msgstr ""
"В качестве основных IP-адресов можно назначить только IP-адреса, назначенные"
" интерфейсу."
-#: ipam/forms/model_forms.py:373
-#, python-brace-format
-msgid "{ip} is a network ID, which may not be assigned to an interface."
-msgstr ""
-"{ip} это сетевой идентификатор, который не может быть присвоен интерфейсу."
-
-#: ipam/forms/model_forms.py:379
-#, python-brace-format
-msgid ""
-"{ip} is a broadcast address, which may not be assigned to an interface."
-msgstr ""
-"{ip} это широковещательный адрес, который может не быть присвоен интерфейсу."
-
-#: ipam/forms/model_forms.py:456
+#: ipam/forms/model_forms.py:442
msgid "Virtual IP Address"
msgstr "Виртуальный IP-адрес"
-#: ipam/forms/model_forms.py:598 ipam/forms/model_forms.py:637
+#: ipam/forms/model_forms.py:523
+msgid "Assignment already exists"
+msgstr "Задание уже существует"
+
+#: ipam/forms/model_forms.py:602 ipam/forms/model_forms.py:641
#: ipam/tables/ip.py:250 templates/ipam/vlan_edit.html:37
#: templates/ipam/vlangroup.html:27
msgid "VLAN Group"
msgstr "Группа VLAN"
-#: ipam/forms/model_forms.py:599
+#: ipam/forms/model_forms.py:603
msgid "Child VLANs"
msgstr "Детские сети VLAN"
-#: ipam/forms/model_forms.py:668 ipam/forms/model_forms.py:702
+#: ipam/forms/model_forms.py:672 ipam/forms/model_forms.py:706
msgid ""
"Comma-separated list of one or more port numbers. A range may be specified "
"using a hyphen."
@@ -8398,15 +8381,15 @@ msgstr ""
"Список одного или нескольких номеров портов, разделенных запятыми. Диапазон "
"можно указать с помощью дефиса."
-#: ipam/forms/model_forms.py:673 templates/ipam/servicetemplate.html:12
+#: ipam/forms/model_forms.py:677 templates/ipam/servicetemplate.html:12
msgid "Service Template"
msgstr "Шаблон Службы"
-#: ipam/forms/model_forms.py:724
+#: ipam/forms/model_forms.py:728
msgid "Service template"
msgstr "Шаблон службы"
-#: ipam/forms/model_forms.py:754
+#: ipam/forms/model_forms.py:758
msgid ""
"Must specify name, protocol, and port(s) if not using a service template."
msgstr ""
@@ -8415,7 +8398,7 @@ msgstr ""
#: ipam/models/asns.py:34
msgid "start"
-msgstr "начните"
+msgstr "Начало"
#: ipam/models/asns.py:51
msgid "ASN range"
@@ -8485,7 +8468,7 @@ msgstr "IP-пространство, управляемое этим RIR, счи
#: ipam/models/ip.py:71 netbox/navigation/menu.py:170
msgid "RIRs"
-msgstr "РИР"
+msgstr "RIR's"
#: ipam/models/ip.py:83
msgid "IPv4 or IPv6 network"
@@ -8555,7 +8538,7 @@ msgstr "Основная функция этого префикса"
#: ipam/models/ip.py:264
msgid "is a pool"
-msgstr "это бассейн"
+msgstr "это пул"
#: ipam/models/ip.py:266
msgid "All IP addresses within this prefix are considered usable"
@@ -8573,12 +8556,12 @@ msgstr "префиксы"
msgid "Cannot create prefix with /0 mask."
msgstr "Невозможно создать префикс с маской /0."
-#: ipam/models/ip.py:323 ipam/models/ip.py:854
+#: ipam/models/ip.py:323 ipam/models/ip.py:873
#, python-brace-format
msgid "VRF {vrf}"
msgstr "VRF {vrf}"
-#: ipam/models/ip.py:323 ipam/models/ip.py:854
+#: ipam/models/ip.py:323 ipam/models/ip.py:873
msgid "global table"
msgstr "глобальная таблица"
@@ -8674,12 +8657,25 @@ msgstr "IP-адреса"
msgid "Cannot create IP address with /0 mask."
msgstr "Невозможно создать IP-адрес с маской /0."
-#: ipam/models/ip.py:856
+#: ipam/models/ip.py:850
+#, python-brace-format
+msgid "{ip} is a network ID, which may not be assigned to an interface."
+msgstr ""
+"{ip} это идентификатор сети, который не может быть присвоен интерфейсу."
+
+#: ipam/models/ip.py:861
+#, python-brace-format
+msgid ""
+"{ip} is a broadcast address, which may not be assigned to an interface."
+msgstr ""
+"{ip} это широковещательный адрес, который может не быть присвоен интерфейсу."
+
+#: ipam/models/ip.py:875
#, python-brace-format
msgid "Duplicate IP address found in {table}: {ipaddress}"
msgstr "Дубликат IP-адреса обнаружен в {table}: {ipaddress}"
-#: ipam/models/ip.py:883
+#: ipam/models/ip.py:902
msgid "Only IPv6 addresses can be assigned SLAAC status"
msgstr "Только адресам IPv6 можно присвоить статус SLAAC"
@@ -8719,19 +8715,19 @@ msgstr "Служба должна быть связана с устройств
#: ipam/models/vlans.py:49
msgid "minimum VLAN ID"
-msgstr "минимальный идентификатор VLAN"
+msgstr "минимальный VLAN ID"
#: ipam/models/vlans.py:55
msgid "Lowest permissible ID of a child VLAN"
-msgstr "Наименьший допустимый идентификатор дочерней VLAN"
+msgstr "Наименьший допустимый ID дочерней VLAN"
#: ipam/models/vlans.py:58
msgid "maximum VLAN ID"
-msgstr "максимальный идентификатор VLAN"
+msgstr "максимальный VLAN ID"
#: ipam/models/vlans.py:64
msgid "Highest permissible ID of a child VLAN"
-msgstr "Максимально допустимый идентификатор детской VLAN"
+msgstr "Максимально допустимый ID дочерней VLAN"
#: ipam/models/vlans.py:85
msgid "VLAN groups"
@@ -8761,7 +8757,7 @@ msgstr "Группа VLAN (опционально)"
#: ipam/models/vlans.py:161
msgid "Numeric VLAN ID (1-4094)"
-msgstr "Цифровой идентификатор VLAN (1-4094)"
+msgstr "Цифровой VLAN ID (1-4094)"
#: ipam/models/vlans.py:179
msgid "Operational status of this VLAN"
@@ -8874,7 +8870,7 @@ msgstr "Глубина"
#: ipam/tables/ip.py:261
msgid "Pool"
-msgstr "Бассейн"
+msgstr "Пул"
#: ipam/tables/ip.py:264 ipam/tables/ip.py:317
msgid "Marked Utilized"
@@ -8908,7 +8904,7 @@ msgstr "Тип прицела"
#: ipam/tables/vlans.py:107 ipam/tables/vlans.py:210
#: templates/dcim/inc/interface_vlans_table.html:4
msgid "VID"
-msgstr "ВИДЕО"
+msgstr "VID"
#: ipam/tables/vrfs.py:30
msgid "RD"
@@ -9086,21 +9082,20 @@ msgstr "Предпочитайте адреса IPv4, а не IPv6"
#: netbox/config/parameters.py:84
msgid "Rack unit height"
-msgstr "Высота стеллажа"
+msgstr "Высота стойки"
#: netbox/config/parameters.py:86
msgid "Default unit height for rendered rack elevations"
msgstr ""
-"Высота единиц измерения по умолчанию для визуализированных высот стеллажей"
+"Высота единиц измерения по умолчанию для визуализированных высот стоек"
#: netbox/config/parameters.py:91
msgid "Rack unit width"
-msgstr "Ширина стеллажа"
+msgstr "Ширина стойки"
#: netbox/config/parameters.py:93
msgid "Default unit width for rendered rack elevations"
-msgstr ""
-"Ширина единиц измерения по умолчанию для визуализированных высот стеллажей"
+msgstr "Ширина юнита по умолчанию для визуализированных высот стоек"
#: netbox/config/parameters.py:100
msgid "Powerfeed voltage"
@@ -9254,7 +9249,7 @@ msgstr "{class_name} необходимо указать класс модели
#: netbox/models/features.py:278
#, python-brace-format
msgid "Unknown field name '{name}' in custom field data."
-msgstr "Неизвестное имя поля '{name}'в данных произвольных полей."
+msgstr "Неизвестное имя поля '{name}' в данных для настраиваемых полей."
#: netbox/models/features.py:284
#, python-brace-format
@@ -9339,7 +9334,7 @@ msgstr "Роли устройств"
#: netbox/navigation/menu.py:68 templates/dcim/device.html:162
#: templates/dcim/virtualdevicecontext.html:8
msgid "Virtual Device Contexts"
-msgstr "Контексты виртуальных устройств"
+msgstr "Виртуальные контексты"
#: netbox/navigation/menu.py:76
msgid "Manufacturers"
@@ -9351,7 +9346,7 @@ msgstr "Компоненты устройства"
#: netbox/navigation/menu.py:92 templates/dcim/inventoryitemrole.html:8
msgid "Inventory Item Roles"
-msgstr "Роли предметов инвентаря"
+msgstr "Роли предметов"
#: netbox/navigation/menu.py:99 netbox/navigation/menu.py:103
msgid "Connections"
@@ -9371,15 +9366,15 @@ msgstr "Интерфейсные подключения"
#: netbox/navigation/menu.py:114
msgid "Console Connections"
-msgstr "Подключения к консоли"
+msgstr "Консольные подключения"
#: netbox/navigation/menu.py:119
msgid "Power Connections"
-msgstr "Подключения питания"
+msgstr "Подключения кабелей питания"
#: netbox/navigation/menu.py:135
msgid "Wireless LAN Groups"
-msgstr "Группы беспроводных локальных сетей"
+msgstr "Группы WLAN"
#: netbox/navigation/menu.py:156
msgid "Prefix & VLAN Roles"
@@ -9410,7 +9405,7 @@ msgstr "VPN"
#: netbox/navigation/menu.py:203 netbox/navigation/menu.py:205
#: vpn/tables/tunnels.py:24
msgid "Tunnels"
-msgstr "Тоннели"
+msgstr "Туннели"
#: netbox/navigation/menu.py:206 templates/vpn/tunnelgroup.html:8
msgid "Tunnel Groups"
@@ -9423,12 +9418,12 @@ msgstr "Окончание туннелей"
#: netbox/navigation/menu.py:211 netbox/navigation/menu.py:213
#: vpn/models/l2vpn.py:64
msgid "L2VPNs"
-msgstr "VPN-сервисы L2P"
+msgstr "L2VPN"
#: netbox/navigation/menu.py:214 templates/vpn/l2vpn.html:57
#: templates/vpn/tunnel.html:73 vpn/tables/tunnels.py:58
msgid "Terminations"
-msgstr "Прекращения"
+msgstr "Соединения"
#: netbox/navigation/menu.py:220
msgid "IKE Proposals"
@@ -9464,7 +9459,7 @@ msgstr "Виртуальные машины"
#: templates/virtualization/virtualmachine.html:177
#: templates/virtualization/virtualmachine/base.html:32
#: templates/virtualization/virtualmachine_list.html:21
-#: virtualization/tables/virtualmachines.py:90 virtualization/views.py:389
+#: virtualization/tables/virtualmachines.py:103 virtualization/views.py:389
msgid "Virtual Disks"
msgstr "Виртуальные диски"
@@ -9474,19 +9469,19 @@ msgstr "Типы кластеров"
#: netbox/navigation/menu.py:247
msgid "Cluster Groups"
-msgstr "Кластерные группы"
+msgstr "Группы кластеров"
#: netbox/navigation/menu.py:261
msgid "Circuit Types"
-msgstr "Типы цепей"
+msgstr "Типы каналов связи"
#: netbox/navigation/menu.py:265 netbox/navigation/menu.py:267
msgid "Providers"
-msgstr "Поставщики"
+msgstr "Провайдеры"
#: netbox/navigation/menu.py:268 templates/circuits/provider.html:53
msgid "Provider Accounts"
-msgstr "Учетные записи поставщиков"
+msgstr "Аккаунты провайдеров"
#: netbox/navigation/menu.py:269
msgid "Provider Networks"
@@ -9546,7 +9541,7 @@ msgstr "Сохраненные фильтры"
#: netbox/navigation/menu.py:316
msgid "Image Attachments"
-msgstr "Вложения изображений"
+msgstr "Прикрепленные Изображения"
#: netbox/navigation/menu.py:320
msgid "Reports & Scripts"
@@ -9576,7 +9571,7 @@ msgstr "Вебхуки"
#: netbox/views/generic/feature_views.py:151
#: templates/extras/report/base.html:37 templates/extras/script/base.html:36
msgid "Jobs"
-msgstr "Вакансии"
+msgstr "Задачи"
#: netbox/navigation/menu.py:362
msgid "Logging"
@@ -9819,7 +9814,7 @@ msgstr "Журнал изменений"
#: netbox/views/generic/feature_views.py:91
msgid "Journal"
-msgstr "журнал"
+msgstr "Журнал"
#: netbox/views/generic/object_views.py:105
#, python-brace-format
@@ -10090,7 +10085,7 @@ msgstr "Документы"
#: templates/base/layout.html:139 templates/rest_framework/api.html:10
msgid "REST API"
-msgstr "ОСТАЛЬНОЕ API"
+msgstr "REST API"
#: templates/base/layout.html:144
msgid "REST API documentation"
@@ -10150,7 +10145,7 @@ msgstr "Сведения об увольнении"
#: templates/circuits/circuittype.html:10
msgid "Add Circuit"
-msgstr "Добавить цепь"
+msgstr "Добавить канал связи"
#: templates/circuits/inc/circuit_termination.html:9
#: templates/dcim/devicetype/component_templates.html:33
@@ -10181,7 +10176,7 @@ msgstr "Обмен"
#: templates/circuits/inc/circuit_termination.html:26
#, python-format
msgid "Termination %(side)s"
-msgstr "Прекращение %(side)s"
+msgstr "Окончания %(side)s"
#: templates/circuits/inc/circuit_termination.html:42
#: templates/dcim/cable.html:70 templates/dcim/cable.html:76
@@ -10262,7 +10257,7 @@ msgstr "Патч-панель/порт"
#: templates/circuits/provider.html:11
msgid "Add circuit"
-msgstr "Добавить цепь"
+msgstr "Добавить канал связи"
#: templates/circuits/provideraccount.html:17
msgid "Provider Account"
@@ -10270,11 +10265,11 @@ msgstr "Учетная запись поставщика"
#: templates/core/configrevision.html:47
msgid "Default unit height"
-msgstr "Высота единицы измерения по умолчанию"
+msgstr "Высота юнита по умолчанию"
#: templates/core/configrevision.html:51
msgid "Default unit width"
-msgstr "Ширина блока по умолчанию"
+msgstr "Ширина юнита по умолчанию"
#: templates/core/configrevision.html:63
msgid "Default voltage"
@@ -10390,8 +10385,8 @@ msgstr "Планирование"
#: templates/core/job.html:66
#, python-format
-msgid "every %(interval)s seconds"
-msgstr "каждый %(interval)s секунды"
+msgid "every %(interval)s minutes"
+msgstr "каждый %(interval)s протокол"
#: templates/dcim/bulk_disconnect.html:9
#, python-format
@@ -10645,7 +10640,7 @@ msgstr "Контекстные данные"
#: templates/dcim/device/render_config.html:57
#: templates/virtualization/virtualmachine/render_config.html:57
msgid "Download"
-msgstr "Загрузить"
+msgstr "Скачать"
#: templates/dcim/device/render_config.html:60
#: templates/virtualization/virtualmachine/render_config.html:60
@@ -10689,7 +10684,7 @@ msgstr "Отсек для устройств"
#: templates/dcim/devicebay.html:48
msgid "Installed Device"
-msgstr "Установленное устройство"
+msgstr "Вставленное устройство"
#: templates/dcim/devicebay_delete.html:6
#, python-format
@@ -10745,7 +10740,7 @@ msgstr "Номер детали"
#: templates/dcim/devicetype.html:40
msgid "Height (U"
-msgstr "Высота (U)"
+msgstr "Высота (U"
#: templates/dcim/devicetype.html:44
msgid "Exclude From Utilization"
@@ -10757,7 +10752,7 @@ msgstr "Родитель/ребенок"
#: templates/dcim/devicetype.html:74
msgid "Front Image"
-msgstr "Изображение на передней панели"
+msgstr "Изображение спереди"
#: templates/dcim/devicetype.html:86
msgid "Rear Image"
@@ -10779,7 +10774,7 @@ msgstr "Состояние подключения"
#: templates/dcim/inc/cable_termination.html:65
msgid "No termination"
-msgstr "Без увольнения"
+msgstr "Без окончания"
#: templates/dcim/inc/cable_toggle_buttons.html:4
msgid "Mark Planned"
@@ -10804,7 +10799,7 @@ msgstr "Конечные точки пути"
#: templates/dcim/inc/endpoint_connection.html:8
#: templates/dcim/powerfeed.html:128 templates/dcim/rearport.html:101
msgid "Not connected"
-msgstr "Не подключен"
+msgstr "Не подключено"
#: templates/dcim/inc/interface_vlans_table.html:6
msgid "Untagged"
@@ -10855,7 +10850,7 @@ msgstr "Беспроводная связь"
#: templates/dcim/interface.html:226 vpn/choices.py:55
msgid "Peer"
-msgstr "сверстник"
+msgstr "Peer"
#: templates/dcim/interface.html:238
#: templates/wireless/inc/wirelesslink_interface.html:26
@@ -10883,7 +10878,7 @@ msgstr "Ширина канала"
#: wireless/forms/filtersets.py:79 wireless/models.py:81
#: wireless/models.py:155 wireless/tables/wirelesslan.py:44
msgid "SSID"
-msgstr "СКАЗАЛ"
+msgstr "SSID"
#: templates/dcim/interface.html:316
msgid "LAG Members"
@@ -10906,7 +10901,7 @@ msgstr "Родительский товар"
#: templates/dcim/inventoryitem.html:49
msgid "Part ID"
-msgstr "Идентификатор детали"
+msgstr "Номер модели"
#: templates/dcim/inventoryitem_bulk_delete.html:5
msgid "This will also delete all child inventory items of those listed"
@@ -10924,15 +10919,15 @@ msgstr "Розетка питания"
#: templates/dcim/location.html:17
msgid "Add Child Location"
-msgstr "Добавить местоположение ребенка"
+msgstr "Добавить дочернюю локацию"
#: templates/dcim/location.html:76
msgid "Child Locations"
-msgstr "Местонахождение детей"
+msgstr "Дочерние локации"
#: templates/dcim/location.html:84 templates/dcim/site.html:137
msgid "Add a Location"
-msgstr "Добавить местоположение"
+msgstr "Добавить локацию"
#: templates/dcim/location.html:98 templates/dcim/site.html:151
msgid "Add a Device"
@@ -10970,7 +10965,7 @@ msgstr "A"
#: templates/dcim/poweroutlet.html:51
msgid "Feed Leg"
-msgstr "Кормовая ножка"
+msgstr "Фаза электропитания"
#: templates/dcim/powerpanel.html:77
msgid "Add Power Feeds"
@@ -10978,11 +10973,11 @@ msgstr "Добавить каналы питания"
#: templates/dcim/powerport.html:47
msgid "Maximum Draw"
-msgstr "Максимальная ничья"
+msgstr "Максимальное потребление"
#: templates/dcim/powerport.html:51
msgid "Allocated Draw"
-msgstr "Распределенная ничья"
+msgstr "Выделенная мощность"
#: templates/dcim/rack.html:66
msgid "Space Utilization"
@@ -10990,7 +10985,7 @@ msgstr "Использование пространства"
#: templates/dcim/rack.html:96
msgid "descending"
-msgstr "спускаясь"
+msgstr "по убыванию"
#: templates/dcim/rack.html:96
msgid "ascending"
@@ -10998,7 +10993,7 @@ msgstr "по возрастанию"
#: templates/dcim/rack.html:99
msgid "Starting Unit"
-msgstr "Пусковой блок"
+msgstr "Начальный юнит"
#: templates/dcim/rack.html:125
msgid "Mounting Depth"
@@ -11018,7 +11013,7 @@ msgstr "Общий вес"
#: templates/dcim/rack.html:173 templates/dcim/rack_elevation_list.html:16
msgid "Images and Labels"
-msgstr "Изображения и этикетки"
+msgstr "Изображения и лейблы"
#: templates/dcim/rack.html:174 templates/dcim/rack_elevation_list.html:17
msgid "Images only"
@@ -11026,7 +11021,7 @@ msgstr "Только изображения"
#: templates/dcim/rack.html:175 templates/dcim/rack_elevation_list.html:18
msgid "Labels only"
-msgstr "Только этикетки"
+msgstr "Только лейблы"
#: templates/dcim/rack/reservations.html:9
msgid "Add reservation"
@@ -11042,7 +11037,7 @@ msgstr "Внешние размеры"
#: templates/dcim/rack_edit.html:56 templates/dcim/rack_edit.html:71
msgid "Unit"
-msgstr "Единица"
+msgstr "Юнит"
#: templates/dcim/rack_elevation_list.html:12
msgid "View List"
@@ -11078,7 +11073,7 @@ msgstr "Добавить сайт"
#: templates/dcim/region.html:56
msgid "Child Regions"
-msgstr "Детские регионы"
+msgstr "Дочерние регионы"
#: templates/dcim/region.html:64
msgid "Add Region"
@@ -11106,7 +11101,7 @@ msgstr "Физический адрес"
#: templates/dcim/site.html:81
msgid "Map"
-msgstr "карта"
+msgstr "Карта"
#: templates/dcim/site.html:92
msgid "Shipping Address"
@@ -11116,7 +11111,7 @@ msgstr "Адрес доставки"
#: templates/tenancy/tenantgroup.html:58
#: templates/wireless/wirelesslangroup.html:56
msgid "Child Groups"
-msgstr "Детские группы"
+msgstr "Дочерние группы"
#: templates/dcim/sitegroup.html:64
msgid "Add Site Group"
@@ -11155,7 +11150,7 @@ msgstr "Редактирование виртуального корпуса %(n
#: templates/dcim/virtualchassis_edit.html:54
msgid "Rack/Unit"
-msgstr "Стойка/блок"
+msgstr "Стойка/Юнит"
#: templates/dcim/virtualchassis_remove_member.html:5
msgid "Remove Virtual Chassis Member"
@@ -11292,7 +11287,7 @@ msgstr "Автор"
#: templates/extras/admin/plugins_list.html:25
msgid "Author Email"
-msgstr "Электронная почта автора"
+msgstr "Почта"
#: templates/extras/admin/plugins_list.html:27
#: templates/vpn/ipsecprofile.html:47 vpn/forms/bulk_edit.py:140
@@ -11357,7 +11352,7 @@ msgstr "Видимый пользовательский интерфейс"
#: templates/extras/customfield.html:86
msgid "UI Editable"
-msgstr "Редактируемый пользовательский интерфейс"
+msgstr "Редактируемый UI"
#: templates/extras/customfield.html:108
msgid "Validation Rules"
@@ -11422,15 +11417,15 @@ msgstr "Пока не добавлено ни одной закладки."
#: templates/extras/dashboard/widgets/objectcounts.html:15
msgid "No permission"
-msgstr "Нет разрешения"
+msgstr "Нет прав"
#: templates/extras/dashboard/widgets/objectlist.html:6
msgid "No permission to view this content"
-msgstr "Нет разрешения на просмотр этого контента"
+msgstr "Нет прав на просмотр этого контента"
#: templates/extras/dashboard/widgets/objectlist.html:10
msgid "Unable to load content. Invalid view name"
-msgstr "Невозможно загрузить содержимое. Неверное имя представления"
+msgstr "Невозможно загрузить содержимое. Неверное имя"
#: templates/extras/dashboard/widgets/rssfeed.html:12
msgid "No content found"
@@ -11486,7 +11481,7 @@ msgstr "Уровень"
#: templates/extras/htmx/report_result.html:46
#: templates/extras/htmx/script_result.html:27
msgid "Message"
-msgstr "Послание"
+msgstr "Сообщение"
#: templates/extras/htmx/script_result.html:21
msgid "Script Log"
@@ -11571,7 +11566,7 @@ msgstr "Разница"
#: templates/extras/objectchange.html:87
msgid "Previous"
-msgstr "Предыдущее"
+msgstr "Предыдущий"
#: templates/extras/objectchange.html:90
msgid "Next"
@@ -11614,7 +11609,7 @@ msgstr "Этот отчет недействителен и не может бы
#: templates/extras/report.html:23 templates/extras/report_list.html:88
msgid "Run Again"
-msgstr "Беги снова"
+msgstr "Повторить"
#: templates/extras/report.html:25 templates/extras/report_list.html:90
msgid "Run Report"
@@ -11622,7 +11617,7 @@ msgstr "Запустить отчет"
#: templates/extras/report.html:36
msgid "Last run"
-msgstr "Последний забег"
+msgstr "Последний запуск"
#: templates/extras/report/base.html:30
msgid "Report"
@@ -11630,7 +11625,7 @@ msgstr "Отчет"
#: templates/extras/report_list.html:48 templates/extras/script_list.html:54
msgid "Last Run"
-msgstr "Последний забег"
+msgstr "Последний запуск"
#: templates/extras/report_list.html:70 templates/extras/script_list.html:77
msgid "Never"
@@ -11659,7 +11654,7 @@ msgstr ""
#: templates/extras/script.html:13
msgid "You do not have permission to run scripts"
-msgstr "У вас нет разрешения на запуск сценариев"
+msgstr "У вас нет разрешения на запуск скриптов"
#: templates/extras/script.html:37
msgid "Run Script"
@@ -11676,7 +11671,7 @@ msgstr ""
#: templates/extras/script_list.html:91
msgid "No Scripts Found"
-msgstr "Сценарии не найдены"
+msgstr "Скрипты не найдены"
#: templates/extras/script_list.html:94
#, python-format
@@ -11689,11 +11684,11 @@ msgstr ""
#: templates/extras/script_result.html:42
msgid "Log"
-msgstr "журнал"
+msgstr "Журнал"
#: templates/extras/tag.html:35
msgid "Tagged Items"
-msgstr "Помеченные товары"
+msgstr "Элементы с тэгом"
#: templates/extras/tag.html:47
msgid "Allowed Object Types"
@@ -11729,7 +11724,7 @@ msgstr "Дополнительные заголовки"
#: templates/extras/webhook.html:85
msgid "Body Template"
-msgstr "Шаблон тела"
+msgstr "Шаблон тела запроса"
#: templates/generic/bulk_add_component.html:15
msgid "Bulk Creation"
@@ -11826,8 +11821,8 @@ msgid ""
"%(example)s would identify a VRF by its route distinguisher."
msgstr ""
"На связанные объекты можно ссылаться с помощью любого уникального атрибута. "
-"Например, %(example)s будет идентифицировать VRF по "
-"идентификатору маршрута."
+"Например, %(example)s будет идентифицировать VRF по индикатору "
+"маршрута."
#: templates/generic/bulk_remove.html:13
msgid "Confirm Bulk Removal"
@@ -12015,11 +12010,11 @@ msgstr "Теги не назначены"
#: templates/inc/profile_button.html:12 templates/inc/profile_button.html:62
msgid "Dark Mode"
-msgstr "Темный режим"
+msgstr "Темная тема"
#: templates/inc/profile_button.html:45
msgid "Log Out"
-msgstr "Выйти из системы"
+msgstr "Выйти"
#: templates/inc/profile_button.html:53
msgid "Log In"
@@ -12131,7 +12126,7 @@ msgstr "Назначение интерфейса"
#: templates/ipam/ipaddress_edit.html:74
msgid "NAT IP (Inside"
-msgstr "NAT IP (внутренний)"
+msgstr "NAT IP (внутренний"
#: templates/ipam/iprange.html:20
msgid "Starting Address"
@@ -12175,7 +12170,7 @@ msgstr "Сетевая маска"
#: templates/ipam/prefix.html:195
msgid "Wildcard Mask"
-msgstr "Маска подстановочных знаков"
+msgstr "Обратная маска"
#: templates/ipam/prefix.html:199
msgid "Broadcast Address"
@@ -12211,7 +12206,7 @@ msgstr "Импорт VRF"
#: templates/ipam/routetarget.html:49
msgid "Exporting VRFs"
-msgstr "Экспорт файлов VRF"
+msgstr "Экспорт VRF"
#: templates/ipam/routetarget.html:60
msgid "Importing L2VPNs"
@@ -12248,11 +12243,11 @@ msgstr "Добавить VLAN"
#: templates/ipam/vlangroup.html:43
msgid "Permitted VIDs"
-msgstr "Разрешенные видео"
+msgstr "Разрешенные VID"
#: templates/ipam/vrf.html:19
msgid "Route Distinguisher"
-msgstr "Дифференцировщик маршрута"
+msgstr "RD"
#: templates/ipam/vrf.html:32
msgid "Unique IP Space"
@@ -12277,11 +12272,11 @@ msgstr "Переключить цветовой режим"
#: templates/media_failure.html:7
msgid "Static Media Failure - NetBox"
-msgstr "Сбой статического носителя - NetBox"
+msgstr "Ошибка статичных медиа - NetBox"
#: templates/media_failure.html:21
msgid "Static Media Failure"
-msgstr "Сбой статического носителя"
+msgstr "Ошибка статичных медиа"
#: templates/media_failure.html:23
msgid "The following static media file failed to load"
@@ -12297,9 +12292,9 @@ msgid ""
" This installs the most recent iteration of each static file into the static"
" root path."
msgstr ""
-"manage.py собирает статические данные был запущен во время "
-"последнего обновления. При этом последняя итерация каждого статического "
-"файла устанавливается в статический корневой путь."
+"manage.py collectstatic была запущен во время последнего "
+"обновления. При этом последняя итерация каждого статического файла "
+"устанавливается в статический корневой путь."
#: templates/media_failure.html:35
#, python-format
@@ -12308,10 +12303,8 @@ msgid ""
"the STATIC_ROOT path. Refer to the "
"installation documentation for further guidance."
msgstr ""
-"Служба HTTP (например, nginx или Apache) настроена на обслуживание файлов из"
-" СТАТИЧЕСКИЙ КОРЕНЬ путь. Обратитесь к документация по установке для получения "
-"дополнительных рекомендаций."
+"Служба HTTP (например, nginx или Apache) настроена на обслуживание файлов из STATIC_ROOT\n"
+" путь. Обратитесь к документация по установке для получения дополнительных рекомендаций."
#: templates/media_failure.html:47
#, python-format
@@ -12438,7 +12431,7 @@ msgstr "Дисковое пространство"
#: templates/virtualization/virtualmachine.html:147
msgctxt "Abbreviation for gigabyte"
msgid "GB"
-msgstr "ГИГАБАЙТ"
+msgstr "ГБ"
#: templates/virtualization/cluster/base.html:18
msgid "Add Virtual Machine"
@@ -12506,7 +12499,7 @@ msgstr "Версия IKE"
#: templates/vpn/ikepolicy.html:30
msgid "Pre-Shared Key"
-msgstr "Предварительный общий ключ"
+msgstr "Pre-Shared ключ"
#: templates/vpn/ikepolicy.html:34
#: templates/wireless/inc/authentication_attrs.html:21
@@ -12585,15 +12578,15 @@ msgstr "Атрибуты L2VPN"
#: templates/vpn/l2vpn.html:65 templates/vpn/tunnel.html:81
msgid "Add a Termination"
-msgstr "Добавить увольнение"
+msgstr "Добавить окончание"
#: templates/vpn/l2vpntermination_edit.html:9
msgid "L2VPN Termination"
-msgstr "Прекращение действия L2VPN"
+msgstr "L2VPN окончания"
#: templates/vpn/tunnel.html:9
msgid "Add Termination"
-msgstr "Добавить прекращение"
+msgstr "Добавить окончание"
#: templates/vpn/tunnel.html:38 vpn/forms/bulk_edit.py:48
#: vpn/forms/bulk_import.py:48 vpn/forms/filtersets.py:56
@@ -12622,7 +12615,7 @@ msgstr "Туннельная группа"
#: templates/vpn/tunneltermination.html:10
msgid "Tunnel Termination"
-msgstr "Прекращение туннеля"
+msgstr "Окончание Туннеля"
#: templates/vpn/tunneltermination.html:36 vpn/forms/bulk_import.py:107
#: vpn/forms/model_forms.py:101 vpn/forms/model_forms.py:137
@@ -12632,7 +12625,7 @@ msgstr "Внешний IP-адрес"
#: templates/vpn/tunneltermination.html:53
msgid "Peer Terminations"
-msgstr "Прекращение контрактов со стороны коллег"
+msgstr "Конечные Точки"
#: templates/wireless/inc/authentication_attrs.html:13
msgid "Cipher"
@@ -12640,7 +12633,7 @@ msgstr "Шифр"
#: templates/wireless/inc/authentication_attrs.html:17
msgid "PSK"
-msgstr "ПСК"
+msgstr "PSK"
#: templates/wireless/inc/wirelesslink_interface.html:35
#: templates/wireless/inc/wirelesslink_interface.html:45
@@ -12675,7 +12668,7 @@ msgstr "Свойства ссылки"
#: tenancy/choices.py:19
msgid "Tertiary"
-msgstr "Высшее образование"
+msgstr "Третичный"
#: tenancy/choices.py:20
msgid "Inactive"
@@ -12743,7 +12736,7 @@ msgstr "контактные роли"
#: tenancy/models/contacts.py:68
msgid "title"
-msgstr "титул"
+msgstr "название"
#: tenancy/models/contacts.py:73
msgid "phone"
@@ -12751,7 +12744,7 @@ msgstr "телефон"
#: tenancy/models/contacts.py:78
msgid "email"
-msgstr "письмо"
+msgstr "email"
#: tenancy/models/contacts.py:87
msgid "link"
@@ -12896,7 +12889,7 @@ msgid ""
msgstr ""
"Разрешенные сети IPv4/IPv6, из которых можно использовать токен. Оставьте "
"поле пустым, чтобы не было ограничений. Пример: 10.1.1.0/24, "
-"192.168.10.16/32, 2001 год: дБ 8:1:/64"
+"192.168.10.16/32, 2001:DB8:1::/64"
#: users/forms/model_forms.py:177
msgid "Confirm password"
@@ -12947,102 +12940,102 @@ msgstr "Ограничения для этого типа объектов не
msgid "Invalid filter for {model}: {error}"
msgstr "Неверный фильтр для {model}: {error}"
-#: users/models.py:54
+#: users/models.py:55
msgid "user"
msgstr "пользователя"
-#: users/models.py:55
+#: users/models.py:56
msgid "users"
msgstr "пользователей"
-#: users/models.py:66
+#: users/models.py:67
msgid "A user with this username already exists."
msgstr "Пользователь с таким именем уже существует."
-#: users/models.py:78 vpn/models/crypto.py:42
+#: users/models.py:79 vpn/models/crypto.py:42
msgid "group"
msgstr "группа"
-#: users/models.py:79
+#: users/models.py:80
msgid "groups"
msgstr "групп"
-#: users/models.py:106 users/models.py:107
+#: users/models.py:107 users/models.py:108
msgid "user preferences"
msgstr "пользовательские настройки"
-#: users/models.py:174
+#: users/models.py:175
#, python-brace-format
msgid "Key '{path}' is a leaf node; cannot assign new keys"
msgstr "Ключ '{path}'является листовым узлом; не может назначать новые ключи"
-#: users/models.py:186
+#: users/models.py:187
#, python-brace-format
msgid "Key '{path}' is a dictionary; cannot assign a non-dictionary value"
msgstr ""
"Ключ '{path}'— словарь; не может присвоить значение, отличное от словаря"
-#: users/models.py:252
+#: users/models.py:253
msgid "expires"
msgstr "истекает"
-#: users/models.py:257
+#: users/models.py:258
msgid "last used"
msgstr "последний раз использованный"
-#: users/models.py:262
+#: users/models.py:263
msgid "key"
msgstr "ключ"
-#: users/models.py:268
+#: users/models.py:269
msgid "write enabled"
msgstr "запись включена"
-#: users/models.py:270
+#: users/models.py:271
msgid "Permit create/update/delete operations using this key"
msgstr ""
"Разрешить операции создания/обновления/удаления с использованием этого ключа"
-#: users/models.py:281
+#: users/models.py:282
msgid "allowed IPs"
msgstr "разрешенные IP-адреса"
-#: users/models.py:283
+#: users/models.py:284
msgid ""
"Allowed IPv4/IPv6 networks from where the token can be used. Leave blank for"
" no restrictions. Ex: \"10.1.1.0/24, 192.168.10.16/32, 2001:DB8:1::/64\""
msgstr ""
"Разрешенные сети IPv4/IPv6, из которых можно использовать токен. Оставьте "
"поле пустым, чтобы не было ограничений. Пример: «10.1.1.0/24, "
-"192.168.10.16/32, 2001: БД 8:1: /64»"
+"192.168.10.16/32, 2001:DB8:1::/64»"
-#: users/models.py:291
+#: users/models.py:296
msgid "token"
msgstr "токен"
-#: users/models.py:292
+#: users/models.py:297
msgid "tokens"
msgstr "токены"
-#: users/models.py:373
+#: users/models.py:378
msgid "The list of actions granted by this permission"
msgstr "Список действий, предусмотренных этим разрешением"
-#: users/models.py:378
+#: users/models.py:383
msgid "constraints"
msgstr "ограничения"
-#: users/models.py:379
+#: users/models.py:384
msgid ""
"Queryset filter matching the applicable objects of the selected type(s)"
msgstr ""
"Фильтр Queryset, соответствующий применимым объектам выбранного типа (типов)"
-#: users/models.py:386
+#: users/models.py:391
msgid "permission"
msgstr "разрешение"
-#: users/models.py:387
+#: users/models.py:392
msgid "permissions"
msgstr "разрешения"
@@ -13065,7 +13058,7 @@ msgstr "Роза"
#: utilities/choices.py:139
msgid "Fuchsia"
-msgstr "фуксия"
+msgstr "Фуксия"
#: utilities/choices.py:141
msgid "Dark Purple"
@@ -13077,7 +13070,7 @@ msgstr "Светло-синий"
#: utilities/choices.py:147
msgid "Aqua"
-msgstr "вода"
+msgstr "Бирюзовый"
#: utilities/choices.py:148
msgid "Dark Green"
@@ -13093,7 +13086,7 @@ msgstr "Лайм"
#: utilities/choices.py:153
msgid "Amber"
-msgstr "янтарь"
+msgstr "Янтарь"
#: utilities/choices.py:155
msgid "Dark Orange"
@@ -13101,7 +13094,7 @@ msgstr "Темно-оранжевый"
#: utilities/choices.py:156
msgid "Brown"
-msgstr "коричневый"
+msgstr "Коричневый"
#: utilities/choices.py:157
msgid "Light Grey"
@@ -13312,45 +13305,54 @@ msgstr ""
"Этот объект был изменен с момента визуализации формы. Подробности см. в "
"журнале изменений объекта."
-#: utilities/forms/utils.py:42 utilities/forms/utils.py:65
-#: utilities/forms/utils.py:77 utilities/forms/utils.py:80
+#: utilities/forms/utils.py:42 utilities/forms/utils.py:68
+#: utilities/forms/utils.py:85 utilities/forms/utils.py:87
#, python-brace-format
msgid "Range \"{value}\" is invalid."
msgstr "Ассортимент»{value}\"недействительно."
-#: utilities/forms/utils.py:225
+#: utilities/forms/utils.py:74
+#, python-brace-format
+msgid ""
+"Invalid range: Ending value ({end}) must be greater than beginning value "
+"({begin})."
+msgstr ""
+"Неверный диапазон: конечное значение ({end}) должно быть больше начального "
+"значения ({begin})."
+
+#: utilities/forms/utils.py:232
#, python-brace-format
msgid "Duplicate or conflicting column header for \"{field}\""
msgstr "Повторяющийся или конфликтующий заголовок столбца для»{field}»"
-#: utilities/forms/utils.py:231
+#: utilities/forms/utils.py:238
#, python-brace-format
msgid "Duplicate or conflicting column header for \"{header}\""
msgstr "Повторяющийся или конфликтующий заголовок столбца для»{header}»"
-#: utilities/forms/utils.py:240
+#: utilities/forms/utils.py:247
#, python-brace-format
msgid "Row {row}: Expected {count_expected} columns but found {count_found}"
msgstr ""
"Ряд {row}: Ожидается {count_expected} столбцы, но найдены {count_found}"
-#: utilities/forms/utils.py:263
+#: utilities/forms/utils.py:270
#, python-brace-format
msgid "Unexpected column header \"{field}\" found."
msgstr "Неожиданный заголовок столбца»{field}«найдено."
-#: utilities/forms/utils.py:265
+#: utilities/forms/utils.py:272
#, python-brace-format
msgid "Column \"{field}\" is not a related object; cannot use dots"
msgstr ""
"Столбец»{field}\"не является родственным объектом; нельзя использовать точки"
-#: utilities/forms/utils.py:269
+#: utilities/forms/utils.py:276
#, python-brace-format
msgid "Invalid related object attribute for column \"{field}\": {to_field}"
msgstr "Неверный атрибут связанного объекта для столбца»{field}«: {to_field}"
-#: utilities/forms/utils.py:277
+#: utilities/forms/utils.py:284
#, python-brace-format
msgid "Required column header \"{header}\" not found."
msgstr "Обязательный заголовок столбца»{header}\"не найден."
@@ -13407,7 +13409,7 @@ msgstr "Закладка"
#: utilities/templates/buttons/clone.html:4
msgid "Clone"
-msgstr "Клон"
+msgstr "Клонировать"
#: utilities/templates/buttons/export.html:4
msgid "Export"
@@ -13467,7 +13469,7 @@ msgstr "Ничего не назначено"
#: utilities/templates/widgets/markdown_input.html:6
msgid "Write"
-msgstr "Напишите"
+msgstr "Текст"
#: utilities/templates/widgets/markdown_input.html:20
msgid "Testing"
@@ -13768,19 +13770,19 @@ msgstr "IP-адрес в IP-адресе"
#: vpn/choices.py:34
msgid "GRE"
-msgstr "СЕРЫЙ"
+msgstr "GRE"
#: vpn/choices.py:56
msgid "Hub"
-msgstr "хаб"
+msgstr "Hub"
#: vpn/choices.py:57
msgid "Spoke"
-msgstr "Говорил"
+msgstr "Spoke"
#: vpn/choices.py:80
msgid "Aggressive"
-msgstr "агрессивный"
+msgstr "Агрессивный"
#: vpn/choices.py:81
msgid "Main"
@@ -13788,7 +13790,7 @@ msgstr "Главная"
#: vpn/choices.py:92
msgid "Pre-shared keys"
-msgstr "Предварительно общие ключи"
+msgstr "PSK"
#: vpn/choices.py:93
msgid "Certificates"
@@ -13891,7 +13893,7 @@ msgstr "Группа туннелей"
#: vpn/forms/bulk_edit.py:116 vpn/models/crypto.py:47
msgid "SA lifetime"
-msgstr "На всю жизнь"
+msgstr "Время жизни SA"
#: vpn/forms/bulk_edit.py:150 wireless/forms/bulk_edit.py:78
#: wireless/forms/bulk_edit.py:125 wireless/forms/filtersets.py:63
@@ -13966,7 +13968,7 @@ msgstr "Назначенный интерфейс (устройство или
#: vpn/forms/bulk_import.py:334
msgid "Cannot import device and VM interface terminations simultaneously."
msgstr ""
-"Невозможно одновременно импортировать терминалы интерфейса устройства и "
+"Невозможно одновременно сетевые окончания интерфейса устройства и "
"виртуальной машины."
#: vpn/forms/bulk_import.py:336
@@ -13990,17 +13992,22 @@ msgstr "Предложение"
msgid "Assigned Object Type"
msgstr "Назначенный тип объекта"
+#: vpn/forms/model_forms.py:94 vpn/forms/model_forms.py:129
+#: vpn/forms/model_forms.py:241 vpn/tables/tunnels.py:91
+msgid "Tunnel interface"
+msgstr "Туннельный интерфейс"
+
#: vpn/forms/model_forms.py:147
msgid "First Termination"
-msgstr "Первое увольнение"
+msgstr "Первая точка"
#: vpn/forms/model_forms.py:151
msgid "Second Termination"
-msgstr "Второе расторжение"
+msgstr "Вторая точка"
#: vpn/forms/model_forms.py:198
msgid "This parameter is required when defining a termination."
-msgstr "Этот параметр необходим при определении прекращения."
+msgstr "Этот параметр необходим при определении точки."
#: vpn/forms/model_forms.py:320 vpn/forms/model_forms.py:355
msgid "Policy"
@@ -14102,11 +14109,11 @@ msgstr "Профили IPsec"
#: vpn/models/l2vpn.py:116
msgid "L2VPN termination"
-msgstr "Завершение работы L2VPN"
+msgstr "L2VPN соединение"
#: vpn/models/l2vpn.py:117
msgid "L2VPN terminations"
-msgstr "Прекращения работы L2VPN"
+msgstr "L2VPN соединения"
#: vpn/models/l2vpn.py:135
#, python-brace-format
@@ -14140,7 +14147,7 @@ msgstr "идентификатор туннеля"
#: vpn/models/tunnels.py:94
msgid "tunnel"
-msgstr "тоннель"
+msgstr "туннель"
#: vpn/models/tunnels.py:95
msgid "tunnels"
@@ -14156,7 +14163,7 @@ msgstr "завершение туннеля"
#: vpn/models/tunnels.py:157
msgid "tunnel terminations"
-msgstr "терминалы туннелей"
+msgstr "точки подключения туннеля"
#: vpn/models/tunnels.py:174
#, python-brace-format
@@ -14197,11 +14204,11 @@ msgstr "Родитель объекта"
#: vpn/tables/l2vpn.py:74
msgid "Object Site"
-msgstr "Объектный сайт"
+msgstr "Сайт объекта"
#: vpn/tables/tunnels.py:88
msgid "Host"
-msgstr "Хозяин"
+msgstr "Хост"
#: wireless/choices.py:11
msgid "Access point"
@@ -14209,7 +14216,7 @@ msgstr "Точка доступа"
#: wireless/choices.py:12
msgid "Station"
-msgstr "станция"
+msgstr "Станция"
#: wireless/choices.py:467
msgid "Open"
@@ -14264,19 +14271,19 @@ msgstr "беспроводная локальная сеть"
#: wireless/models.py:143
msgid "interface A"
-msgstr "интерфейс A"
+msgstr "Интерфейс A"
#: wireless/models.py:150
msgid "interface B"
-msgstr "интерфейс B"
+msgstr "Интерфейс B"
#: wireless/models.py:198
msgid "wireless link"
-msgstr "беспроводная связь"
+msgstr "беспроводное соединение"
#: wireless/models.py:199
msgid "wireless links"
-msgstr "беспроводные ссылки"
+msgstr "беспроводные соединения"
#: wireless/models.py:216 wireless/models.py:222
#, python-brace-format
diff --git a/netbox/translations/tr/LC_MESSAGES/django.mo b/netbox/translations/tr/LC_MESSAGES/django.mo
index f6d54ea9a..7e2a0e4b9 100644
Binary files a/netbox/translations/tr/LC_MESSAGES/django.mo and b/netbox/translations/tr/LC_MESSAGES/django.mo differ
diff --git a/netbox/translations/tr/LC_MESSAGES/django.po b/netbox/translations/tr/LC_MESSAGES/django.po
index ce0eeec33..f5dcbcac7 100644
--- a/netbox/translations/tr/LC_MESSAGES/django.po
+++ b/netbox/translations/tr/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-21 19:48+0000\n"
+"POT-Creation-Date: 2024-04-04 19:11+0000\n"
"PO-Revision-Date: 2023-10-30 17:48+0000\n"
"Last-Translator: Jeremy Stretch, 2024\n"
"Language-Team: Turkish (https://app.transifex.com/netbox-community/teams/178115/tr/)\n"
@@ -64,8 +64,8 @@ msgid "Your preferences have been updated."
msgstr "Tercihleriniz güncellendi."
#: circuits/choices.py:21 dcim/choices.py:20 dcim/choices.py:102
-#: dcim/choices.py:174 dcim/choices.py:220 dcim/choices.py:1419
-#: dcim/choices.py:1495 dcim/choices.py:1545 virtualization/choices.py:20
+#: dcim/choices.py:174 dcim/choices.py:220 dcim/choices.py:1425
+#: dcim/choices.py:1501 dcim/choices.py:1551 virtualization/choices.py:20
#: virtualization/choices.py:45 vpn/choices.py:18
msgid "Planned"
msgstr "Planlanan"
@@ -75,8 +75,8 @@ msgid "Provisioning"
msgstr "Tedarik"
#: circuits/choices.py:23 dcim/choices.py:22 dcim/choices.py:103
-#: dcim/choices.py:173 dcim/choices.py:219 dcim/choices.py:1494
-#: dcim/choices.py:1544 extras/tables/tables.py:380 ipam/choices.py:31
+#: dcim/choices.py:173 dcim/choices.py:219 dcim/choices.py:1500
+#: dcim/choices.py:1550 extras/tables/tables.py:380 ipam/choices.py:31
#: ipam/choices.py:49 ipam/choices.py:69 ipam/choices.py:154
#: templates/extras/configcontext.html:26 templates/users/user.html:38
#: users/forms/bulk_edit.py:36 virtualization/choices.py:22
@@ -85,7 +85,7 @@ msgid "Active"
msgstr "Aktif"
#: circuits/choices.py:24 dcim/choices.py:172 dcim/choices.py:218
-#: dcim/choices.py:1493 dcim/choices.py:1546 virtualization/choices.py:24
+#: dcim/choices.py:1499 dcim/choices.py:1552 virtualization/choices.py:24
#: virtualization/choices.py:43
msgid "Offline"
msgstr "Çevrim dışı"
@@ -98,7 +98,7 @@ msgstr "Hazırlıktan Kaldırma"
msgid "Decommissioned"
msgstr "Hizmet dışı bırakıldı"
-#: circuits/filtersets.py:29 circuits/filtersets.py:184 dcim/filtersets.py:124
+#: circuits/filtersets.py:29 circuits/filtersets.py:190 dcim/filtersets.py:124
#: dcim/filtersets.py:185 dcim/filtersets.py:260 dcim/filtersets.py:369
#: dcim/filtersets.py:903 dcim/filtersets.py:1207 dcim/filtersets.py:1702
#: dcim/filtersets.py:1945 dcim/filtersets.py:2003 ipam/filtersets.py:305
@@ -107,7 +107,7 @@ msgstr "Hizmet dışı bırakıldı"
msgid "Region (ID)"
msgstr "Bölge (ID)"
-#: circuits/filtersets.py:36 circuits/filtersets.py:191 dcim/filtersets.py:130
+#: circuits/filtersets.py:36 circuits/filtersets.py:197 dcim/filtersets.py:130
#: dcim/filtersets.py:192 dcim/filtersets.py:267 dcim/filtersets.py:376
#: dcim/filtersets.py:910 dcim/filtersets.py:1214 dcim/filtersets.py:1709
#: dcim/filtersets.py:1952 dcim/filtersets.py:2010 extras/filtersets.py:414
@@ -117,7 +117,7 @@ msgstr "Bölge (ID)"
msgid "Region (slug)"
msgstr "Bölge (kısa ad)"
-#: circuits/filtersets.py:42 circuits/filtersets.py:197 dcim/filtersets.py:198
+#: circuits/filtersets.py:42 circuits/filtersets.py:203 dcim/filtersets.py:198
#: dcim/filtersets.py:273 dcim/filtersets.py:382 dcim/filtersets.py:916
#: dcim/filtersets.py:1220 dcim/filtersets.py:1715 dcim/filtersets.py:1958
#: dcim/filtersets.py:2016 ipam/filtersets.py:318 ipam/filtersets.py:909
@@ -125,7 +125,7 @@ msgstr "Bölge (kısa ad)"
msgid "Site group (ID)"
msgstr "Site grubu (ID)"
-#: circuits/filtersets.py:49 circuits/filtersets.py:204 dcim/filtersets.py:205
+#: circuits/filtersets.py:49 circuits/filtersets.py:210 dcim/filtersets.py:205
#: dcim/filtersets.py:280 dcim/filtersets.py:389 dcim/filtersets.py:923
#: dcim/filtersets.py:1227 dcim/filtersets.py:1722 dcim/filtersets.py:1965
#: dcim/filtersets.py:2023 extras/filtersets.py:420 ipam/filtersets.py:325
@@ -135,7 +135,7 @@ msgid "Site group (slug)"
msgstr "Site grubu (kısa ad)"
#: circuits/filtersets.py:54 circuits/forms/bulk_import.py:117
-#: circuits/forms/filtersets.py:47 circuits/forms/filtersets.py:171
+#: circuits/forms/filtersets.py:47 circuits/forms/filtersets.py:167
#: circuits/forms/model_forms.py:137 dcim/forms/bulk_edit.py:166
#: dcim/forms/bulk_edit.py:238 dcim/forms/bulk_edit.py:570
#: dcim/forms/bulk_edit.py:763 dcim/forms/bulk_import.py:130
@@ -158,8 +158,8 @@ msgstr "Site grubu (kısa ad)"
#: ipam/forms/bulk_import.py:170 ipam/forms/bulk_import.py:437
#: ipam/forms/filtersets.py:152 ipam/forms/filtersets.py:226
#: ipam/forms/filtersets.py:417 ipam/forms/filtersets.py:470
-#: ipam/forms/model_forms.py:206 ipam/forms/model_forms.py:548
-#: ipam/forms/model_forms.py:640 ipam/tables/ip.py:244
+#: ipam/forms/model_forms.py:206 ipam/forms/model_forms.py:552
+#: ipam/forms/model_forms.py:644 ipam/tables/ip.py:244
#: ipam/tables/vlans.py:114 ipam/tables/vlans.py:216
#: templates/circuits/circuittermination_edit.html:20
#: templates/circuits/inc/circuit_termination.html:33
@@ -181,13 +181,13 @@ msgstr "Site grubu (kısa ad)"
#: virtualization/forms/model_forms.py:107
#: virtualization/forms/model_forms.py:174
#: virtualization/tables/clusters.py:77
-#: virtualization/tables/virtualmachines.py:53 vpn/forms/filtersets.py:262
+#: virtualization/tables/virtualmachines.py:62 vpn/forms/filtersets.py:262
#: wireless/forms/model_forms.py:77 wireless/forms/model_forms.py:117
msgid "Site"
msgstr "Site"
-#: circuits/filtersets.py:60 circuits/filtersets.py:215
-#: circuits/filtersets.py:252 dcim/filtersets.py:215 dcim/filtersets.py:290
+#: circuits/filtersets.py:60 circuits/filtersets.py:221
+#: circuits/filtersets.py:258 dcim/filtersets.py:215 dcim/filtersets.py:290
#: dcim/filtersets.py:363 extras/filtersets.py:436 ipam/filtersets.py:215
#: ipam/filtersets.py:335 ipam/filtersets.py:926
#: virtualization/filtersets.py:75 virtualization/filtersets.py:203
@@ -199,33 +199,39 @@ msgstr "Site (kısa ad)"
msgid "ASN (ID)"
msgstr "ASN (ID)"
-#: circuits/filtersets.py:87 circuits/filtersets.py:114
-#: circuits/filtersets.py:148
-msgid "Provider (ID)"
-msgstr "Sağlayıcı (ID)"
+#: circuits/filtersets.py:71 circuits/forms/filtersets.py:27
+#: ipam/forms/model_forms.py:158 ipam/models/asns.py:108
+#: ipam/models/asns.py:125 ipam/tables/asn.py:41 templates/ipam/asn.html:20
+msgid "ASN"
+msgstr "ASN"
#: circuits/filtersets.py:93 circuits/filtersets.py:120
#: circuits/filtersets.py:154
+msgid "Provider (ID)"
+msgstr "Sağlayıcı (ID)"
+
+#: circuits/filtersets.py:99 circuits/filtersets.py:126
+#: circuits/filtersets.py:160
msgid "Provider (slug)"
msgstr "Sağlayıcı (kısa ad)"
-#: circuits/filtersets.py:159
+#: circuits/filtersets.py:165
msgid "Provider account (ID)"
msgstr "Sağlayıcı hesabı (ID)"
-#: circuits/filtersets.py:164
+#: circuits/filtersets.py:170
msgid "Provider network (ID)"
msgstr "Sağlayıcı ağı (ID)"
-#: circuits/filtersets.py:168
+#: circuits/filtersets.py:174
msgid "Circuit type (ID)"
msgstr "Devre tipi (ID)"
-#: circuits/filtersets.py:174
+#: circuits/filtersets.py:180
msgid "Circuit type (slug)"
msgstr "Devre tipi (kısa ad)"
-#: circuits/filtersets.py:209 circuits/filtersets.py:246
+#: circuits/filtersets.py:215 circuits/filtersets.py:252
#: dcim/filtersets.py:209 dcim/filtersets.py:284 dcim/filtersets.py:357
#: dcim/filtersets.py:927 dcim/filtersets.py:1232 dcim/filtersets.py:1727
#: dcim/filtersets.py:1969 dcim/filtersets.py:2028 ipam/filtersets.py:209
@@ -235,13 +241,13 @@ msgstr "Devre tipi (kısa ad)"
msgid "Site (ID)"
msgstr "Site (ID)"
-#: circuits/filtersets.py:238 core/filtersets.py:73 core/filtersets.py:132
+#: circuits/filtersets.py:244 core/filtersets.py:73 core/filtersets.py:132
#: dcim/filtersets.py:640 dcim/filtersets.py:1201 dcim/filtersets.py:2076
#: extras/filtersets.py:40 extras/filtersets.py:69 extras/filtersets.py:101
#: extras/filtersets.py:140 extras/filtersets.py:168 extras/filtersets.py:195
#: extras/filtersets.py:226 extras/filtersets.py:295 extras/filtersets.py:343
#: extras/filtersets.py:403 extras/filtersets.py:562 extras/filtersets.py:604
-#: extras/filtersets.py:645 ipam/forms/model_forms.py:430
+#: extras/filtersets.py:645 ipam/forms/model_forms.py:416
#: netbox/filtersets.py:275 netbox/forms/__init__.py:23
#: netbox/forms/base.py:163 templates/htmx/object_selector.html:28
#: templates/inc/filter_list.html:53 templates/ipam/ipaddress_assign.html:32
@@ -251,7 +257,7 @@ msgstr "Site (ID)"
msgid "Search"
msgstr "Arama"
-#: circuits/filtersets.py:242 circuits/forms/bulk_edit.py:167
+#: circuits/filtersets.py:248 circuits/forms/bulk_edit.py:167
#: circuits/forms/model_forms.py:110 circuits/forms/model_forms.py:132
#: dcim/forms/connections.py:66 templates/circuits/circuit.html:15
#: templates/dcim/inc/cable_termination.html:55
@@ -259,11 +265,11 @@ msgstr "Arama"
msgid "Circuit"
msgstr "Devre"
-#: circuits/filtersets.py:256
+#: circuits/filtersets.py:262
msgid "ProviderNetwork (ID)"
msgstr "Sağlayıcı Ağı (ID)"
-#: circuits/forms/bulk_edit.py:25 circuits/forms/filtersets.py:56
+#: circuits/forms/bulk_edit.py:25 circuits/forms/filtersets.py:52
#: circuits/forms/model_forms.py:26 circuits/tables/providers.py:33
#: dcim/forms/bulk_edit.py:126 dcim/forms/filtersets.py:187
#: dcim/forms/model_forms.py:126 dcim/tables/sites.py:94
@@ -374,8 +380,8 @@ msgstr "Açıklama"
#: circuits/forms/bulk_edit.py:46 circuits/forms/bulk_edit.py:68
#: circuits/forms/bulk_edit.py:118 circuits/forms/bulk_import.py:35
#: circuits/forms/bulk_import.py:50 circuits/forms/bulk_import.py:76
-#: circuits/forms/filtersets.py:70 circuits/forms/filtersets.py:88
-#: circuits/forms/filtersets.py:116 circuits/forms/filtersets.py:131
+#: circuits/forms/filtersets.py:66 circuits/forms/filtersets.py:84
+#: circuits/forms/filtersets.py:112 circuits/forms/filtersets.py:127
#: circuits/forms/model_forms.py:32 circuits/forms/model_forms.py:44
#: circuits/forms/model_forms.py:58 circuits/forms/model_forms.py:92
#: circuits/tables/circuits.py:55 circuits/tables/providers.py:72
@@ -387,18 +393,18 @@ msgstr "Açıklama"
msgid "Provider"
msgstr "Sağlayıcı"
-#: circuits/forms/bulk_edit.py:75 circuits/forms/filtersets.py:91
+#: circuits/forms/bulk_edit.py:75 circuits/forms/filtersets.py:87
#: templates/circuits/providernetwork.html:31
msgid "Service ID"
msgstr "Servis ID"
-#: circuits/forms/bulk_edit.py:95 circuits/forms/filtersets.py:107
+#: circuits/forms/bulk_edit.py:95 circuits/forms/filtersets.py:103
#: dcim/forms/bulk_edit.py:204 dcim/forms/bulk_edit.py:500
#: dcim/forms/bulk_edit.py:694 dcim/forms/bulk_edit.py:1063
#: dcim/forms/bulk_edit.py:1090 dcim/forms/bulk_edit.py:1562
#: dcim/forms/filtersets.py:977 dcim/forms/filtersets.py:1353
-#: dcim/forms/filtersets.py:1374 dcim/tables/devices.py:722
-#: dcim/tables/devices.py:782 dcim/tables/devices.py:1009
+#: dcim/forms/filtersets.py:1374 dcim/tables/devices.py:726
+#: dcim/tables/devices.py:786 dcim/tables/devices.py:1013
#: dcim/tables/devicetypes.py:245 dcim/tables/devicetypes.py:260
#: dcim/tables/racks.py:32 extras/forms/bulk_edit.py:259
#: extras/tables/tables.py:328 templates/circuits/circuittype.html:33
@@ -410,7 +416,7 @@ msgid "Color"
msgstr "Renk"
#: circuits/forms/bulk_edit.py:113 circuits/forms/bulk_import.py:89
-#: circuits/forms/filtersets.py:126 core/forms/bulk_edit.py:17
+#: circuits/forms/filtersets.py:122 core/forms/bulk_edit.py:17
#: core/forms/filtersets.py:29 core/tables/data.py:20 core/tables/jobs.py:18
#: dcim/forms/bulk_edit.py:281 dcim/forms/bulk_edit.py:672
#: dcim/forms/bulk_edit.py:811 dcim/forms/bulk_edit.py:879
@@ -429,7 +435,7 @@ msgstr "Renk"
#: dcim/forms/filtersets.py:1253 dcim/forms/filtersets.py:1348
#: dcim/forms/filtersets.py:1369 dcim/forms/object_import.py:89
#: dcim/forms/object_import.py:118 dcim/forms/object_import.py:150
-#: dcim/tables/devices.py:211 dcim/tables/devices.py:838
+#: dcim/tables/devices.py:211 dcim/tables/devices.py:842
#: dcim/tables/power.py:77 extras/forms/bulk_import.py:39
#: extras/tables/tables.py:278 extras/tables/tables.py:350
#: extras/tables/tables.py:448 netbox/tables/tables.py:234
@@ -454,12 +460,12 @@ msgid "Type"
msgstr "Tür"
#: circuits/forms/bulk_edit.py:123 circuits/forms/bulk_import.py:82
-#: circuits/forms/filtersets.py:139 circuits/forms/model_forms.py:97
+#: circuits/forms/filtersets.py:135 circuits/forms/model_forms.py:97
msgid "Provider account"
msgstr "Sağlayıcı hesabı"
#: circuits/forms/bulk_edit.py:131 circuits/forms/bulk_import.py:95
-#: circuits/forms/filtersets.py:150 core/forms/filtersets.py:34
+#: circuits/forms/filtersets.py:146 core/forms/filtersets.py:34
#: core/forms/filtersets.py:75 core/tables/data.py:23 core/tables/jobs.py:26
#: dcim/forms/bulk_edit.py:104 dcim/forms/bulk_edit.py:179
#: dcim/forms/bulk_edit.py:260 dcim/forms/bulk_edit.py:593
@@ -473,8 +479,8 @@ msgstr "Sağlayıcı hesabı"
#: dcim/forms/filtersets.py:281 dcim/forms/filtersets.py:726
#: dcim/forms/filtersets.py:835 dcim/forms/filtersets.py:871
#: dcim/forms/filtersets.py:972 dcim/forms/filtersets.py:1083
-#: dcim/tables/devices.py:173 dcim/tables/devices.py:841
-#: dcim/tables/devices.py:1069 dcim/tables/modules.py:69
+#: dcim/tables/devices.py:173 dcim/tables/devices.py:845
+#: dcim/tables/devices.py:1073 dcim/tables/modules.py:69
#: dcim/tables/power.py:74 dcim/tables/racks.py:66 dcim/tables/sites.py:82
#: dcim/tables/sites.py:133 ipam/forms/bulk_edit.py:240
#: ipam/forms/bulk_edit.py:289 ipam/forms/bulk_edit.py:337
@@ -482,7 +488,7 @@ msgstr "Sağlayıcı hesabı"
#: ipam/forms/bulk_import.py:256 ipam/forms/bulk_import.py:292
#: ipam/forms/bulk_import.py:458 ipam/forms/filtersets.py:205
#: ipam/forms/filtersets.py:270 ipam/forms/filtersets.py:341
-#: ipam/forms/filtersets.py:482 ipam/forms/model_forms.py:449
+#: ipam/forms/filtersets.py:482 ipam/forms/model_forms.py:435
#: ipam/tables/ip.py:236 ipam/tables/ip.py:309 ipam/tables/ip.py:359
#: ipam/tables/ip.py:421 ipam/tables/ip.py:448 ipam/tables/vlans.py:122
#: ipam/tables/vlans.py:227 templates/circuits/circuit.html:35
@@ -503,7 +509,7 @@ msgstr "Sağlayıcı hesabı"
#: virtualization/forms/bulk_import.py:80
#: virtualization/forms/filtersets.py:61
#: virtualization/forms/filtersets.py:156 virtualization/tables/clusters.py:74
-#: virtualization/tables/virtualmachines.py:50 vpn/forms/bulk_edit.py:38
+#: virtualization/tables/virtualmachines.py:59 vpn/forms/bulk_edit.py:38
#: vpn/forms/bulk_import.py:37 vpn/forms/filtersets.py:46
#: vpn/tables/tunnels.py:48 wireless/forms/bulk_edit.py:42
#: wireless/forms/bulk_edit.py:104 wireless/forms/bulk_import.py:43
@@ -514,7 +520,7 @@ msgid "Status"
msgstr "Durum"
#: circuits/forms/bulk_edit.py:137 circuits/forms/bulk_import.py:100
-#: circuits/forms/filtersets.py:119 dcim/forms/bulk_edit.py:120
+#: circuits/forms/filtersets.py:115 dcim/forms/bulk_edit.py:120
#: dcim/forms/bulk_edit.py:185 dcim/forms/bulk_edit.py:255
#: dcim/forms/bulk_edit.py:366 dcim/forms/bulk_edit.py:583
#: dcim/forms/bulk_edit.py:684 dcim/forms/bulk_edit.py:1590
@@ -572,15 +578,15 @@ msgstr "Durum"
msgid "Tenant"
msgstr "Kiracı"
-#: circuits/forms/bulk_edit.py:142 circuits/forms/filtersets.py:174
+#: circuits/forms/bulk_edit.py:142 circuits/forms/filtersets.py:170
msgid "Install date"
msgstr "Yükleme tarihi"
-#: circuits/forms/bulk_edit.py:147 circuits/forms/filtersets.py:179
+#: circuits/forms/bulk_edit.py:147 circuits/forms/filtersets.py:175
msgid "Termination date"
msgstr "Fesih tarihi"
-#: circuits/forms/bulk_edit.py:153 circuits/forms/filtersets.py:186
+#: circuits/forms/bulk_edit.py:153 circuits/forms/filtersets.py:182
msgid "Commit rate (Kbps)"
msgstr "Taahhüt oranı (Kbps)"
@@ -613,7 +619,7 @@ msgstr "Atanan sağlayıcı"
#: circuits/forms/bulk_import.py:70 dcim/forms/bulk_import.py:178
#: dcim/forms/bulk_import.py:388 dcim/forms/bulk_import.py:1108
-#: dcim/forms/bulk_import.py:1187 extras/forms/bulk_import.py:229
+#: dcim/forms/bulk_import.py:1187 extras/forms/bulk_import.py:235
msgid "RGB color in hexadecimal. Example:"
msgstr "Onaltılık değerde RGB rengi. Örnek:"
@@ -649,12 +655,12 @@ msgstr "Operasyonel durum"
msgid "Assigned tenant"
msgstr "Atanan kiracı"
-#: circuits/forms/bulk_import.py:123 circuits/forms/filtersets.py:147
+#: circuits/forms/bulk_import.py:123 circuits/forms/filtersets.py:143
#: circuits/forms/model_forms.py:143
msgid "Provider network"
msgstr "Sağlayıcı ağı"
-#: circuits/forms/filtersets.py:26 circuits/forms/filtersets.py:118
+#: circuits/forms/filtersets.py:26 circuits/forms/filtersets.py:114
#: dcim/forms/bulk_edit.py:247 dcim/forms/bulk_edit.py:345
#: dcim/forms/bulk_edit.py:575 dcim/forms/bulk_edit.py:622
#: dcim/forms/bulk_edit.py:772 dcim/forms/bulk_import.py:189
@@ -678,7 +684,7 @@ msgstr "Sağlayıcı ağı"
#: extras/filtersets.py:441 extras/forms/filtersets.py:328
#: ipam/forms/bulk_edit.py:456 ipam/forms/filtersets.py:168
#: ipam/forms/filtersets.py:400 ipam/forms/filtersets.py:422
-#: ipam/forms/filtersets.py:448 ipam/forms/model_forms.py:560
+#: ipam/forms/filtersets.py:448 ipam/forms/model_forms.py:564
#: templates/dcim/device.html:26 templates/dcim/device_edit.html:30
#: templates/dcim/inc/cable_termination.html:12
#: templates/dcim/location.html:27 templates/dcim/powerpanel.html:27
@@ -688,13 +694,7 @@ msgstr "Sağlayıcı ağı"
msgid "Location"
msgstr "Konum"
-#: circuits/forms/filtersets.py:27 ipam/forms/model_forms.py:158
-#: ipam/models/asns.py:108 ipam/models/asns.py:125 ipam/tables/asn.py:41
-#: templates/ipam/asn.html:20
-msgid "ASN"
-msgstr "ASN"
-
-#: circuits/forms/filtersets.py:28 circuits/forms/filtersets.py:120
+#: circuits/forms/filtersets.py:28 circuits/forms/filtersets.py:116
#: dcim/forms/filtersets.py:136 dcim/forms/filtersets.py:150
#: dcim/forms/filtersets.py:166 dcim/forms/filtersets.py:198
#: dcim/forms/filtersets.py:249 dcim/forms/filtersets.py:334
@@ -707,7 +707,7 @@ msgstr "ASN"
msgid "Contacts"
msgstr "İletişim"
-#: circuits/forms/filtersets.py:33 circuits/forms/filtersets.py:157
+#: circuits/forms/filtersets.py:33 circuits/forms/filtersets.py:153
#: dcim/forms/bulk_edit.py:110 dcim/forms/bulk_edit.py:222
#: dcim/forms/bulk_edit.py:747 dcim/forms/bulk_import.py:92
#: dcim/forms/filtersets.py:70 dcim/forms/filtersets.py:177
@@ -722,7 +722,7 @@ msgstr "İletişim"
#: ipam/forms/bulk_edit.py:205 ipam/forms/bulk_edit.py:437
#: ipam/forms/bulk_edit.py:509 ipam/forms/filtersets.py:212
#: ipam/forms/filtersets.py:407 ipam/forms/filtersets.py:456
-#: ipam/forms/model_forms.py:532 templates/dcim/device.html:18
+#: ipam/forms/model_forms.py:536 templates/dcim/device.html:18
#: templates/dcim/rack.html:19 templates/dcim/rackreservation.html:25
#: templates/dcim/region.html:26 templates/dcim/site.html:31
#: templates/ipam/prefix.html:50 templates/ipam/vlan.html:19
@@ -732,7 +732,7 @@ msgstr "İletişim"
msgid "Region"
msgstr "Bölge"
-#: circuits/forms/filtersets.py:38 circuits/forms/filtersets.py:162
+#: circuits/forms/filtersets.py:38 circuits/forms/filtersets.py:158
#: dcim/forms/bulk_edit.py:230 dcim/forms/bulk_edit.py:755
#: dcim/forms/filtersets.py:75 dcim/forms/filtersets.py:182
#: dcim/forms/filtersets.py:208 dcim/forms/filtersets.py:269
@@ -742,19 +742,15 @@ msgstr "Bölge"
#: extras/filtersets.py:425 ipam/forms/bulk_edit.py:210
#: ipam/forms/bulk_edit.py:444 ipam/forms/bulk_edit.py:514
#: ipam/forms/filtersets.py:217 ipam/forms/filtersets.py:412
-#: ipam/forms/filtersets.py:461 ipam/forms/model_forms.py:545
+#: ipam/forms/filtersets.py:461 ipam/forms/model_forms.py:549
#: virtualization/forms/bulk_edit.py:85 virtualization/forms/filtersets.py:68
#: virtualization/forms/filtersets.py:134
#: virtualization/forms/model_forms.py:101
msgid "Site group"
msgstr "Site grubu"
-#: circuits/forms/filtersets.py:51
-msgid "ASN (legacy)"
-msgstr "ASN (eski)"
-
-#: circuits/forms/filtersets.py:65 circuits/forms/filtersets.py:83
-#: circuits/forms/filtersets.py:102 circuits/forms/filtersets.py:117
+#: circuits/forms/filtersets.py:61 circuits/forms/filtersets.py:79
+#: circuits/forms/filtersets.py:98 circuits/forms/filtersets.py:113
#: core/forms/filtersets.py:63 dcim/forms/bulk_edit.py:718
#: dcim/forms/filtersets.py:164 dcim/forms/filtersets.py:196
#: dcim/forms/filtersets.py:825 dcim/forms/filtersets.py:920
@@ -780,7 +776,7 @@ msgstr "ASN (eski)"
msgid "Attributes"
msgstr "Öznitellikler"
-#: circuits/forms/filtersets.py:73 circuits/tables/circuits.py:60
+#: circuits/forms/filtersets.py:69 circuits/tables/circuits.py:60
#: circuits/tables/providers.py:66 templates/circuits/circuit.html:23
#: templates/circuits/provideraccount.html:25
msgid "Account"
@@ -801,7 +797,7 @@ msgstr "Devre Tipi"
#: dcim/models/device_component_templates.py:491
#: dcim/models/device_component_templates.py:591
#: dcim/models/device_components.py:976 dcim/models/device_components.py:1050
-#: dcim/models/device_components.py:1166 dcim/models/devices.py:467
+#: dcim/models/device_components.py:1166 dcim/models/devices.py:469
#: dcim/models/racks.py:43 extras/models/tags.py:28
msgid "color"
msgstr "renk"
@@ -823,8 +819,8 @@ msgid "Unique circuit ID"
msgstr "Benzersiz devre ID"
#: circuits/models/circuits.py:67 core/models/data.py:55
-#: core/models/jobs.py:85 dcim/models/cables.py:49 dcim/models/devices.py:641
-#: dcim/models/devices.py:1165 dcim/models/devices.py:1374
+#: core/models/jobs.py:85 dcim/models/cables.py:49 dcim/models/devices.py:643
+#: dcim/models/devices.py:1170 dcim/models/devices.py:1379
#: dcim/models/power.py:95 dcim/models/racks.py:97 dcim/models/sites.py:154
#: dcim/models/sites.py:266 ipam/models/ip.py:252 ipam/models/ip.py:521
#: ipam/models/ip.py:729 ipam/models/vlans.py:175
@@ -903,7 +899,7 @@ msgstr "Yama paneli kimliği ve bağlantı noktası numaraları"
#: extras/models/models.py:541 extras/models/staging.py:31
#: extras/models/tags.py:32 netbox/models/__init__.py:109
#: netbox/models/__init__.py:144 netbox/models/__init__.py:190
-#: users/models.py:273 users/models.py:348
+#: users/models.py:274 users/models.py:353
#: virtualization/models/virtualmachines.py:282
msgid "description"
msgstr "açıklama"
@@ -930,8 +926,8 @@ msgstr "Devre sonlandırma hem siteye hem de sağlayıcı ağına bağlanamaz."
#: circuits/models/providers.py:22 circuits/models/providers.py:66
#: circuits/models/providers.py:104 core/models/data.py:42
#: core/models/jobs.py:46 dcim/models/device_component_templates.py:43
-#: dcim/models/device_components.py:54 dcim/models/devices.py:581
-#: dcim/models/devices.py:1305 dcim/models/devices.py:1370
+#: dcim/models/device_components.py:54 dcim/models/devices.py:583
+#: dcim/models/devices.py:1310 dcim/models/devices.py:1375
#: dcim/models/power.py:39 dcim/models/power.py:91 dcim/models/racks.py:62
#: dcim/models/sites.py:138 extras/models/configs.py:36
#: extras/models/configs.py:215 extras/models/customfields.py:89
@@ -944,7 +940,7 @@ msgstr "Devre sonlandırma hem siteye hem de sağlayıcı ağına bağlanamaz."
#: ipam/models/vrfs.py:79 netbox/models/__init__.py:136
#: netbox/models/__init__.py:180 tenancy/models/contacts.py:64
#: tenancy/models/tenants.py:20 tenancy/models/tenants.py:45
-#: users/models.py:344 virtualization/models/clusters.py:57
+#: users/models.py:349 virtualization/models/clusters.py:57
#: virtualization/models/virtualmachines.py:70
#: virtualization/models/virtualmachines.py:272 vpn/models/crypto.py:24
#: vpn/models/crypto.py:71 vpn/models/crypto.py:131 vpn/models/crypto.py:183
@@ -1002,13 +998,13 @@ msgstr "sağlayıcı ağları"
#: core/tables/data.py:16 core/tables/jobs.py:14 dcim/forms/filtersets.py:60
#: dcim/forms/object_create.py:42 dcim/tables/devices.py:88
#: dcim/tables/devices.py:125 dcim/tables/devices.py:167
-#: dcim/tables/devices.py:318 dcim/tables/devices.py:400
-#: dcim/tables/devices.py:444 dcim/tables/devices.py:496
-#: dcim/tables/devices.py:548 dcim/tables/devices.py:668
-#: dcim/tables/devices.py:749 dcim/tables/devices.py:799
-#: dcim/tables/devices.py:865 dcim/tables/devices.py:980
-#: dcim/tables/devices.py:1000 dcim/tables/devices.py:1029
-#: dcim/tables/devices.py:1059 dcim/tables/devicetypes.py:32
+#: dcim/tables/devices.py:322 dcim/tables/devices.py:404
+#: dcim/tables/devices.py:448 dcim/tables/devices.py:500
+#: dcim/tables/devices.py:552 dcim/tables/devices.py:672
+#: dcim/tables/devices.py:753 dcim/tables/devices.py:803
+#: dcim/tables/devices.py:869 dcim/tables/devices.py:984
+#: dcim/tables/devices.py:1004 dcim/tables/devices.py:1033
+#: dcim/tables/devices.py:1063 dcim/tables/devicetypes.py:32
#: dcim/tables/power.py:22 dcim/tables/power.py:62 dcim/tables/racks.py:23
#: dcim/tables/racks.py:53 dcim/tables/sites.py:24 dcim/tables/sites.py:51
#: dcim/tables/sites.py:78 dcim/tables/sites.py:125
@@ -1074,9 +1070,9 @@ msgstr "sağlayıcı ağları"
#: virtualization/forms/object_create.py:23
#: virtualization/tables/clusters.py:17 virtualization/tables/clusters.py:39
#: virtualization/tables/clusters.py:62
-#: virtualization/tables/virtualmachines.py:45
-#: virtualization/tables/virtualmachines.py:119
-#: virtualization/tables/virtualmachines.py:172 vpn/tables/crypto.py:18
+#: virtualization/tables/virtualmachines.py:54
+#: virtualization/tables/virtualmachines.py:132
+#: virtualization/tables/virtualmachines.py:185 vpn/tables/crypto.py:18
#: vpn/tables/crypto.py:57 vpn/tables/crypto.py:93 vpn/tables/crypto.py:129
#: vpn/tables/crypto.py:158 vpn/tables/l2vpn.py:23 vpn/tables/tunnels.py:18
#: vpn/tables/tunnels.py:40 wireless/tables/wirelesslan.py:18
@@ -1111,7 +1107,7 @@ msgstr "Taahhüt Oranı"
#: circuits/tables/circuits.py:75 circuits/tables/providers.py:48
#: circuits/tables/providers.py:82 circuits/tables/providers.py:107
-#: dcim/tables/devices.py:1042 dcim/tables/devicetypes.py:92
+#: dcim/tables/devices.py:1046 dcim/tables/devicetypes.py:92
#: dcim/tables/modules.py:29 dcim/tables/modules.py:72 dcim/tables/power.py:39
#: dcim/tables/power.py:96 dcim/tables/racks.py:76 dcim/tables/racks.py:156
#: dcim/tables/sites.py:103 extras/forms/bulk_edit.py:320
@@ -1123,7 +1119,7 @@ msgstr "Taahhüt Oranı"
#: templates/inc/panels/comments.html:6 tenancy/tables/contacts.py:68
#: tenancy/tables/tenants.py:46 utilities/forms/fields/fields.py:29
#: virtualization/tables/clusters.py:91
-#: virtualization/tables/virtualmachines.py:68 vpn/tables/crypto.py:37
+#: virtualization/tables/virtualmachines.py:81 vpn/tables/crypto.py:37
#: vpn/tables/crypto.py:74 vpn/tables/crypto.py:109 vpn/tables/crypto.py:140
#: vpn/tables/crypto.py:173 vpn/tables/l2vpn.py:37 vpn/tables/tunnels.py:61
#: wireless/tables/wirelesslan.py:27 wireless/tables/wirelesslan.py:58
@@ -1160,7 +1156,7 @@ msgid "Completed"
msgstr "Tamamlandı"
#: core/choices.py:22 core/choices.py:59 dcim/choices.py:176
-#: dcim/choices.py:222 dcim/choices.py:1496 extras/choices.py:212
+#: dcim/choices.py:222 dcim/choices.py:1502 extras/choices.py:212
#: virtualization/choices.py:47
msgid "Failed"
msgstr "Başarısız"
@@ -1242,7 +1238,7 @@ msgstr "Veri kaynağı (isim)"
#: core/forms/bulk_edit.py:24 core/forms/filtersets.py:39
#: core/tables/data.py:26 dcim/forms/bulk_edit.py:1012
#: dcim/forms/bulk_edit.py:1285 dcim/forms/filtersets.py:1270
-#: dcim/tables/devices.py:573 dcim/tables/devicetypes.py:221
+#: dcim/tables/devices.py:577 dcim/tables/devicetypes.py:221
#: extras/forms/bulk_edit.py:97 extras/forms/bulk_edit.py:161
#: extras/forms/bulk_edit.py:220 extras/forms/filtersets.py:119
#: extras/forms/filtersets.py:206 extras/forms/filtersets.py:267
@@ -1379,7 +1375,7 @@ msgstr ""
msgid "Rack Elevations"
msgstr "Raf Yükseltmeleri"
-#: core/forms/model_forms.py:148 dcim/choices.py:1407
+#: core/forms/model_forms.py:148 dcim/choices.py:1413
#: dcim/forms/bulk_edit.py:859 dcim/forms/bulk_edit.py:1242
#: dcim/forms/bulk_edit.py:1260 dcim/tables/racks.py:89
#: netbox/navigation/menu.py:276 netbox/navigation/menu.py:280
@@ -1440,7 +1436,7 @@ msgstr " (varsayılan)"
#: core/models/config.py:18 core/models/data.py:282 core/models/files.py:27
#: core/models/jobs.py:50 extras/models/models.py:760
-#: netbox/models/features.py:52 users/models.py:248
+#: netbox/models/features.py:52 users/models.py:249
msgid "created"
msgstr "oluşturulan"
@@ -1498,7 +1494,7 @@ msgstr "URL"
#: core/models/data.py:62 dcim/models/device_component_templates.py:392
#: dcim/models/device_components.py:513 extras/models/models.py:88
-#: extras/models/models.py:331 extras/models/models.py:556 users/models.py:353
+#: extras/models/models.py:331 extras/models/models.py:556 users/models.py:358
msgid "enabled"
msgstr "etkin"
@@ -1714,7 +1710,7 @@ msgid "Staging"
msgstr "Sahneleme"
#: dcim/choices.py:23 dcim/choices.py:178 dcim/choices.py:223
-#: dcim/choices.py:1420 virtualization/choices.py:23
+#: dcim/choices.py:1426 virtualization/choices.py:23
#: virtualization/choices.py:48
msgid "Decommissioning"
msgstr "Hizmetten çıkarma"
@@ -1774,7 +1770,7 @@ msgstr "Kullanımdan kaldırıldı"
msgid "Millimeters"
msgstr "Milimetre"
-#: dcim/choices.py:115 dcim/choices.py:1442
+#: dcim/choices.py:115 dcim/choices.py:1448
msgid "Inches"
msgstr "İnç"
@@ -1786,8 +1782,8 @@ msgstr "İnç"
#: dcim/forms/filtersets.py:226 dcim/forms/model_forms.py:73
#: dcim/forms/model_forms.py:94 dcim/forms/model_forms.py:172
#: dcim/forms/model_forms.py:962 dcim/forms/model_forms.py:1303
-#: dcim/forms/object_import.py:181 dcim/tables/devices.py:676
-#: dcim/tables/devices.py:960 extras/tables/tables.py:181
+#: dcim/forms/object_import.py:181 dcim/tables/devices.py:680
+#: dcim/tables/devices.py:964 extras/tables/tables.py:181
#: ipam/tables/fhrp.py:59 ipam/tables/ip.py:374 ipam/tables/services.py:44
#: templates/dcim/interface.html:105 templates/dcim/interface.html:321
#: templates/dcim/location.html:44 templates/dcim/region.html:38
@@ -1800,7 +1796,7 @@ msgstr "İnç"
#: tenancy/forms/bulk_import.py:58 tenancy/forms/model_forms.py:24
#: tenancy/forms/model_forms.py:69 virtualization/forms/bulk_edit.py:206
#: virtualization/forms/bulk_import.py:151
-#: virtualization/tables/virtualmachines.py:142 wireless/forms/bulk_edit.py:23
+#: virtualization/tables/virtualmachines.py:155 wireless/forms/bulk_edit.py:23
#: wireless/forms/bulk_import.py:21 wireless/forms/model_forms.py:20
msgid "Parent"
msgstr "Ebeveyn"
@@ -1849,7 +1845,7 @@ msgstr "Sağdan sola"
msgid "Side to rear"
msgstr "Yandan arkaya"
-#: dcim/choices.py:198 dcim/choices.py:1215
+#: dcim/choices.py:198 dcim/choices.py:1221
msgid "Passive"
msgstr "Pasif"
@@ -1877,8 +1873,8 @@ msgstr "Uluslararası/ITA"
msgid "Proprietary"
msgstr "Tescilli"
-#: dcim/choices.py:534 dcim/choices.py:764 dcim/choices.py:1131
-#: dcim/choices.py:1133 dcim/choices.py:1338 dcim/choices.py:1340
+#: dcim/choices.py:534 dcim/choices.py:764 dcim/choices.py:1137
+#: dcim/choices.py:1139 dcim/choices.py:1344 dcim/choices.py:1346
#: netbox/navigation/menu.py:188
msgid "Other"
msgstr "Diğer"
@@ -1891,177 +1887,177 @@ msgstr "ITA/Uluslararası"
msgid "Physical"
msgstr "Fiziksel"
-#: dcim/choices.py:795 dcim/choices.py:949
+#: dcim/choices.py:795 dcim/choices.py:952
msgid "Virtual"
msgstr "Sanal"
-#: dcim/choices.py:796 dcim/choices.py:1019 dcim/forms/bulk_edit.py:1398
+#: dcim/choices.py:796 dcim/choices.py:1022 dcim/forms/bulk_edit.py:1398
#: dcim/forms/filtersets.py:1233 dcim/forms/model_forms.py:888
#: dcim/forms/model_forms.py:1197 netbox/navigation/menu.py:128
#: netbox/navigation/menu.py:132 templates/dcim/interface.html:217
msgid "Wireless"
msgstr "Kablosuz"
-#: dcim/choices.py:947
+#: dcim/choices.py:950
msgid "Virtual interfaces"
msgstr "Sanal arayüzler"
-#: dcim/choices.py:950 dcim/forms/bulk_edit.py:1295
+#: dcim/choices.py:953 dcim/forms/bulk_edit.py:1295
#: dcim/forms/bulk_import.py:785 dcim/forms/model_forms.py:876
-#: dcim/tables/devices.py:680 templates/dcim/interface.html:109
+#: dcim/tables/devices.py:684 templates/dcim/interface.html:109
#: templates/virtualization/vminterface.html:46
#: virtualization/forms/bulk_edit.py:211
#: virtualization/forms/bulk_import.py:158
-#: virtualization/tables/virtualmachines.py:146
+#: virtualization/tables/virtualmachines.py:159
msgid "Bridge"
msgstr "Köprü"
-#: dcim/choices.py:951
+#: dcim/choices.py:954
msgid "Link Aggregation Group (LAG)"
msgstr "Bağlantı Toplama Grubu (LAG)"
-#: dcim/choices.py:955
+#: dcim/choices.py:958
msgid "Ethernet (fixed)"
msgstr "Ethernet (sabit)"
-#: dcim/choices.py:969
+#: dcim/choices.py:972
msgid "Ethernet (modular)"
msgstr "Ethernet (modüler)"
-#: dcim/choices.py:1005
+#: dcim/choices.py:1008
msgid "Ethernet (backplane)"
msgstr "Ethernet (arka panel)"
-#: dcim/choices.py:1033
+#: dcim/choices.py:1036
msgid "Cellular"
msgstr "Hücresel"
-#: dcim/choices.py:1080 dcim/forms/filtersets.py:302
+#: dcim/choices.py:1086 dcim/forms/filtersets.py:302
#: dcim/forms/filtersets.py:736 dcim/forms/filtersets.py:876
#: dcim/forms/filtersets.py:1426 templates/dcim/inventoryitem.html:53
#: templates/dcim/virtualchassis_edit.html:55
msgid "Serial"
msgstr "Seri"
-#: dcim/choices.py:1095
+#: dcim/choices.py:1101
msgid "Coaxial"
msgstr "Koaksiyel"
-#: dcim/choices.py:1112
+#: dcim/choices.py:1118
msgid "Stacking"
msgstr "İstifleme"
-#: dcim/choices.py:1162
+#: dcim/choices.py:1168
msgid "Half"
msgstr "Yarım"
-#: dcim/choices.py:1163
+#: dcim/choices.py:1169
msgid "Full"
msgstr "Dolu"
-#: dcim/choices.py:1164 netbox/preferences.py:29 wireless/choices.py:480
+#: dcim/choices.py:1170 netbox/preferences.py:29 wireless/choices.py:480
msgid "Auto"
msgstr "Oto"
-#: dcim/choices.py:1175
+#: dcim/choices.py:1181
msgid "Access"
msgstr "Erişim"
-#: dcim/choices.py:1176 ipam/tables/vlans.py:168 ipam/tables/vlans.py:213
+#: dcim/choices.py:1182 ipam/tables/vlans.py:168 ipam/tables/vlans.py:213
#: templates/dcim/inc/interface_vlans_table.html:7
msgid "Tagged"
msgstr "Etiketlenmiş"
-#: dcim/choices.py:1177
+#: dcim/choices.py:1183
msgid "Tagged (All)"
msgstr "Etiketlenmiş (Tümü)"
-#: dcim/choices.py:1206
+#: dcim/choices.py:1212
msgid "IEEE Standard"
msgstr "IEEE Standardı"
-#: dcim/choices.py:1217
+#: dcim/choices.py:1223
msgid "Passive 24V (2-pair)"
msgstr "Pasif 24V (2 çift)"
-#: dcim/choices.py:1218
+#: dcim/choices.py:1224
msgid "Passive 24V (4-pair)"
msgstr "Pasif 24V (4 çift)"
-#: dcim/choices.py:1219
+#: dcim/choices.py:1225
msgid "Passive 48V (2-pair)"
msgstr "Pasif 48V (2 çift)"
-#: dcim/choices.py:1220
+#: dcim/choices.py:1226
msgid "Passive 48V (4-pair)"
msgstr "Pasif 48V (4 çift)"
-#: dcim/choices.py:1282 dcim/choices.py:1378
+#: dcim/choices.py:1288 dcim/choices.py:1384
msgid "Copper"
msgstr "Bakır"
-#: dcim/choices.py:1305
+#: dcim/choices.py:1311
msgid "Fiber Optic"
msgstr "Fiber Optik"
-#: dcim/choices.py:1394
+#: dcim/choices.py:1400
msgid "Fiber"
msgstr "Elyaf"
-#: dcim/choices.py:1418 dcim/forms/filtersets.py:1140
+#: dcim/choices.py:1424 dcim/forms/filtersets.py:1140
msgid "Connected"
msgstr "Bağlı"
-#: dcim/choices.py:1437
+#: dcim/choices.py:1443
msgid "Kilometers"
msgstr "Kilometre"
-#: dcim/choices.py:1438 templates/dcim/cable_trace.html:62
+#: dcim/choices.py:1444 templates/dcim/cable_trace.html:62
msgid "Meters"
msgstr "Sayaçlar"
-#: dcim/choices.py:1439
+#: dcim/choices.py:1445
msgid "Centimeters"
msgstr "Santimetre"
-#: dcim/choices.py:1440
+#: dcim/choices.py:1446
msgid "Miles"
msgstr "Mil"
-#: dcim/choices.py:1441 templates/dcim/cable_trace.html:63
+#: dcim/choices.py:1447 templates/dcim/cable_trace.html:63
msgid "Feet"
msgstr "Ayaklar"
-#: dcim/choices.py:1457 templates/dcim/device.html:332
+#: dcim/choices.py:1463 templates/dcim/device.html:332
#: templates/dcim/rack.html:157
msgid "Kilograms"
msgstr "Kilogram"
-#: dcim/choices.py:1458
+#: dcim/choices.py:1464
msgid "Grams"
msgstr "Gramlar"
-#: dcim/choices.py:1459 templates/dcim/rack.html:158
+#: dcim/choices.py:1465 templates/dcim/rack.html:158
msgid "Pounds"
msgstr "Pound'lar"
-#: dcim/choices.py:1460
+#: dcim/choices.py:1466
msgid "Ounces"
msgstr "ons"
-#: dcim/choices.py:1506 tenancy/choices.py:17
+#: dcim/choices.py:1512 tenancy/choices.py:17
msgid "Primary"
msgstr "Birincil"
-#: dcim/choices.py:1507
+#: dcim/choices.py:1513
msgid "Redundant"
msgstr "Yedekli"
-#: dcim/choices.py:1528
+#: dcim/choices.py:1534
msgid "Single phase"
msgstr "Tek fazlı"
-#: dcim/choices.py:1529
+#: dcim/choices.py:1535
msgid "Three-phase"
msgstr "Üç fazlı"
@@ -2338,7 +2334,7 @@ msgid "Virtual Chassis (ID)"
msgstr "Sanal Kasa (ID)"
#: dcim/filtersets.py:1303 dcim/forms/filtersets.py:106
-#: dcim/tables/devices.py:235 netbox/navigation/menu.py:67
+#: dcim/tables/devices.py:239 netbox/navigation/menu.py:67
#: templates/dcim/device.html:123 templates/dcim/device_edit.html:93
#: templates/dcim/virtualchassis.html:20
#: templates/dcim/virtualchassis_add.html:8
@@ -2362,7 +2358,7 @@ msgstr "Atanmış VID"
#: dcim/filtersets.py:1448 dcim/forms/bulk_edit.py:1374
#: dcim/forms/bulk_import.py:836 dcim/forms/filtersets.py:1328
#: dcim/forms/model_forms.py:1182 dcim/models/device_components.py:712
-#: dcim/tables/devices.py:642 ipam/filtersets.py:282 ipam/filtersets.py:293
+#: dcim/tables/devices.py:646 ipam/filtersets.py:282 ipam/filtersets.py:293
#: ipam/filtersets.py:449 ipam/filtersets.py:550 ipam/filtersets.py:561
#: ipam/forms/bulk_edit.py:226 ipam/forms/bulk_edit.py:281
#: ipam/forms/bulk_edit.py:323 ipam/forms/bulk_import.py:156
@@ -2370,8 +2366,8 @@ msgstr "Atanmış VID"
#: ipam/forms/filtersets.py:66 ipam/forms/filtersets.py:167
#: ipam/forms/filtersets.py:295 ipam/forms/model_forms.py:59
#: ipam/forms/model_forms.py:203 ipam/forms/model_forms.py:246
-#: ipam/forms/model_forms.py:290 ipam/forms/model_forms.py:412
-#: ipam/forms/model_forms.py:426 ipam/forms/model_forms.py:440
+#: ipam/forms/model_forms.py:290 ipam/forms/model_forms.py:398
+#: ipam/forms/model_forms.py:412 ipam/forms/model_forms.py:426
#: ipam/models/ip.py:232 ipam/models/ip.py:511 ipam/models/ip.py:719
#: ipam/models/vrfs.py:62 ipam/tables/ip.py:241 ipam/tables/ip.py:306
#: ipam/tables/ip.py:356 ipam/tables/ip.py:445
@@ -2384,7 +2380,7 @@ msgstr "Atanmış VID"
#: virtualization/forms/filtersets.py:220
#: virtualization/forms/model_forms.py:347
#: virtualization/models/virtualmachines.py:348
-#: virtualization/tables/virtualmachines.py:123
+#: virtualization/tables/virtualmachines.py:136
msgid "VRF"
msgstr "VRF"
@@ -2398,7 +2394,7 @@ msgid "L2VPN (ID)"
msgstr "L2VPN (KİMLİĞİ)"
#: dcim/filtersets.py:1465 dcim/forms/filtersets.py:1333
-#: dcim/tables/devices.py:590 ipam/filtersets.py:973
+#: dcim/tables/devices.py:594 ipam/filtersets.py:973
#: ipam/forms/filtersets.py:499 ipam/tables/vlans.py:133
#: templates/dcim/interface.html:94 templates/ipam/vlan.html:69
#: templates/vpn/l2vpntermination.html:15
@@ -2469,7 +2465,7 @@ msgstr "Etiketler"
#: dcim/forms/bulk_create.py:112 dcim/forms/filtersets.py:1390
#: dcim/forms/model_forms.py:426 dcim/forms/model_forms.py:475
#: dcim/forms/object_create.py:196 dcim/forms/object_create.py:352
-#: dcim/tables/devices.py:198 dcim/tables/devices.py:725
+#: dcim/tables/devices.py:198 dcim/tables/devices.py:729
#: dcim/tables/devicetypes.py:242 templates/dcim/device.html:45
#: templates/dcim/device.html:129 templates/dcim/modulebay.html:35
#: templates/dcim/virtualchassis.html:59
@@ -2488,7 +2484,7 @@ msgstr ""
#: dcim/forms/bulk_edit.py:115 dcim/forms/bulk_import.py:99
#: dcim/forms/model_forms.py:120 dcim/tables/sites.py:89
#: ipam/filtersets.py:936 ipam/forms/bulk_edit.py:528
-#: ipam/forms/bulk_import.py:444 ipam/forms/model_forms.py:509
+#: ipam/forms/bulk_import.py:444 ipam/forms/model_forms.py:495
#: ipam/tables/fhrp.py:67 ipam/tables/vlans.py:118 ipam/tables/vlans.py:221
#: templates/dcim/interface.html:294 templates/dcim/site.html:37
#: templates/ipam/inc/panels/fhrp_groups.html:10 templates/ipam/vlan.html:30
@@ -2538,8 +2534,8 @@ msgstr "Saat dilimi"
#: dcim/forms/filtersets.py:704 dcim/forms/filtersets.py:1417
#: dcim/forms/model_forms.py:224 dcim/forms/model_forms.py:970
#: dcim/forms/model_forms.py:1311 dcim/forms/object_import.py:186
-#: dcim/tables/devices.py:202 dcim/tables/devices.py:833
-#: dcim/tables/devices.py:944 dcim/tables/devicetypes.py:300
+#: dcim/tables/devices.py:202 dcim/tables/devices.py:837
+#: dcim/tables/devices.py:948 dcim/tables/devicetypes.py:300
#: dcim/tables/racks.py:69 extras/filtersets.py:457
#: ipam/forms/bulk_edit.py:245 ipam/forms/bulk_edit.py:294
#: ipam/forms/bulk_edit.py:342 ipam/forms/bulk_edit.py:546
@@ -2548,7 +2544,7 @@ msgstr "Saat dilimi"
#: ipam/forms/filtersets.py:232 ipam/forms/filtersets.py:278
#: ipam/forms/filtersets.py:346 ipam/forms/filtersets.py:490
#: ipam/forms/model_forms.py:187 ipam/forms/model_forms.py:222
-#: ipam/forms/model_forms.py:249 ipam/forms/model_forms.py:647
+#: ipam/forms/model_forms.py:249 ipam/forms/model_forms.py:651
#: ipam/tables/ip.py:257 ipam/tables/ip.py:313 ipam/tables/ip.py:363
#: ipam/tables/vlans.py:126 ipam/tables/vlans.py:230
#: templates/dcim/device.html:187
@@ -2566,7 +2562,7 @@ msgstr "Saat dilimi"
#: virtualization/forms/bulk_import.py:106
#: virtualization/forms/filtersets.py:153
#: virtualization/forms/model_forms.py:198
-#: virtualization/tables/virtualmachines.py:65 vpn/forms/bulk_edit.py:86
+#: virtualization/tables/virtualmachines.py:74 vpn/forms/bulk_edit.py:86
#: vpn/forms/bulk_import.py:81 vpn/forms/filtersets.py:84
#: vpn/forms/model_forms.py:77 vpn/forms/model_forms.py:112
#: vpn/tables/tunnels.py:82
@@ -2660,7 +2656,7 @@ msgstr "Ağırlık birimi"
#: dcim/forms/model_forms.py:669 dcim/forms/object_create.py:399
#: dcim/tables/devices.py:194 dcim/tables/power.py:70 dcim/tables/racks.py:148
#: ipam/forms/bulk_edit.py:464 ipam/forms/filtersets.py:427
-#: ipam/forms/model_forms.py:571 templates/dcim/device.html:30
+#: ipam/forms/model_forms.py:575 templates/dcim/device.html:30
#: templates/dcim/inc/cable_termination.html:16
#: templates/dcim/powerfeed.html:31 templates/dcim/rack.html:14
#: templates/dcim/rack/base.html:4 templates/dcim/rack_edit.html:8
@@ -2693,7 +2689,7 @@ msgstr "Donanım"
#: dcim/forms/model_forms.py:334 dcim/forms/model_forms.py:374
#: dcim/forms/model_forms.py:975 dcim/forms/model_forms.py:1316
#: dcim/forms/object_import.py:192 dcim/tables/devices.py:129
-#: dcim/tables/devices.py:205 dcim/tables/devices.py:947
+#: dcim/tables/devices.py:205 dcim/tables/devices.py:951
#: dcim/tables/devicetypes.py:81 dcim/tables/devicetypes.py:304
#: dcim/tables/modules.py:20 dcim/tables/modules.py:60
#: templates/dcim/devicetype.html:17 templates/dcim/inventoryitem.html:45
@@ -2740,7 +2736,7 @@ msgstr "Aygıt Türü"
msgid "Module Type"
msgstr "Modül Türü"
-#: dcim/forms/bulk_edit.py:506 dcim/models/devices.py:472
+#: dcim/forms/bulk_edit.py:506 dcim/models/devices.py:474
msgid "VM role"
msgstr "VM rolü"
@@ -2772,13 +2768,15 @@ msgstr "Aygıt rolü"
#: dcim/forms/bulk_edit.py:588 dcim/forms/bulk_import.py:443
#: dcim/forms/filtersets.py:723 dcim/forms/model_forms.py:389
-#: dcim/forms/model_forms.py:448 extras/filtersets.py:468
-#: templates/dcim/device.html:191 templates/dcim/platform.html:27
+#: dcim/forms/model_forms.py:448 dcim/tables/devices.py:215
+#: extras/filtersets.py:468 templates/dcim/device.html:191
+#: templates/dcim/platform.html:27
#: templates/virtualization/virtualmachine.html:30
#: virtualization/forms/bulk_edit.py:159
#: virtualization/forms/bulk_import.py:122
#: virtualization/forms/filtersets.py:164
#: virtualization/forms/model_forms.py:206
+#: virtualization/tables/virtualmachines.py:78
msgid "Platform"
msgstr "Platform"
@@ -2802,16 +2800,16 @@ msgstr "Platform"
#: dcim/forms/model_forms.py:760 dcim/forms/model_forms.py:1011
#: dcim/forms/model_forms.py:1460 dcim/forms/object_create.py:256
#: dcim/tables/connections.py:22 dcim/tables/connections.py:41
-#: dcim/tables/connections.py:60 dcim/tables/devices.py:314
-#: dcim/tables/devices.py:379 dcim/tables/devices.py:423
-#: dcim/tables/devices.py:468 dcim/tables/devices.py:522
-#: dcim/tables/devices.py:614 dcim/tables/devices.py:715
-#: dcim/tables/devices.py:775 dcim/tables/devices.py:825
-#: dcim/tables/devices.py:885 dcim/tables/devices.py:937
-#: dcim/tables/devices.py:1063 dcim/tables/modules.py:52
+#: dcim/tables/connections.py:60 dcim/tables/devices.py:318
+#: dcim/tables/devices.py:383 dcim/tables/devices.py:427
+#: dcim/tables/devices.py:472 dcim/tables/devices.py:526
+#: dcim/tables/devices.py:618 dcim/tables/devices.py:719
+#: dcim/tables/devices.py:779 dcim/tables/devices.py:829
+#: dcim/tables/devices.py:889 dcim/tables/devices.py:941
+#: dcim/tables/devices.py:1067 dcim/tables/modules.py:52
#: extras/forms/filtersets.py:329 ipam/forms/bulk_import.py:303
#: ipam/forms/bulk_import.py:489 ipam/forms/filtersets.py:532
-#: ipam/forms/model_forms.py:685 ipam/tables/vlans.py:176
+#: ipam/forms/model_forms.py:689 ipam/tables/vlans.py:176
#: templates/dcim/consoleport.html:23 templates/dcim/consoleserverport.html:23
#: templates/dcim/device.html:14 templates/dcim/device.html:128
#: templates/dcim/device_edit.html:10 templates/dcim/devicebay.html:23
@@ -2833,7 +2831,7 @@ msgstr "Platform"
#: virtualization/forms/bulk_import.py:99
#: virtualization/forms/filtersets.py:124
#: virtualization/forms/model_forms.py:188
-#: virtualization/tables/virtualmachines.py:61 vpn/choices.py:44
+#: virtualization/tables/virtualmachines.py:70 vpn/choices.py:44
#: vpn/forms/bulk_import.py:86 vpn/forms/bulk_import.py:283
#: vpn/forms/filtersets.py:271 vpn/forms/model_forms.py:89
#: vpn/forms/model_forms.py:124 vpn/forms/model_forms.py:237
@@ -2973,7 +2971,7 @@ msgid "Wireless role"
msgstr "Kablosuz rolü"
#: dcim/forms/bulk_edit.py:1178 dcim/forms/model_forms.py:595
-#: dcim/forms/model_forms.py:1026 dcim/tables/devices.py:337
+#: dcim/forms/model_forms.py:1026 dcim/tables/devices.py:341
#: templates/dcim/consoleport.html:27 templates/dcim/consoleserverport.html:27
#: templates/dcim/frontport.html:27 templates/dcim/interface.html:35
#: templates/dcim/module.html:51 templates/dcim/modulebay.html:57
@@ -2982,7 +2980,7 @@ msgstr "Kablosuz rolü"
msgid "Module"
msgstr "Modül"
-#: dcim/forms/bulk_edit.py:1305 dcim/tables/devices.py:685
+#: dcim/forms/bulk_edit.py:1305 dcim/tables/devices.py:689
#: templates/dcim/interface.html:113
msgid "LAG"
msgstr "GECİKME"
@@ -2994,7 +2992,7 @@ msgstr "Sanal cihaz bağlamları"
#: dcim/forms/bulk_edit.py:1316 dcim/forms/bulk_import.py:659
#: dcim/forms/bulk_import.py:685 dcim/forms/filtersets.py:1163
#: dcim/forms/filtersets.py:1185 dcim/forms/filtersets.py:1258
-#: dcim/tables/devices.py:626
+#: dcim/tables/devices.py:630
#: templates/circuits/inc/circuit_termination.html:94
#: templates/dcim/consoleport.html:43 templates/dcim/consoleserverport.html:43
msgid "Speed"
@@ -3019,13 +3017,13 @@ msgid "VLAN group"
msgstr "VLAN grubu"
#: dcim/forms/bulk_edit.py:1361 dcim/forms/model_forms.py:1164
-#: dcim/tables/devices.py:599 virtualization/forms/bulk_edit.py:247
+#: dcim/tables/devices.py:603 virtualization/forms/bulk_edit.py:247
#: virtualization/forms/model_forms.py:329
msgid "Untagged VLAN"
msgstr "Etiketsiz VLAN"
#: dcim/forms/bulk_edit.py:1369 dcim/forms/model_forms.py:1173
-#: dcim/tables/devices.py:605 virtualization/forms/bulk_edit.py:255
+#: dcim/tables/devices.py:609 virtualization/forms/bulk_edit.py:255
#: virtualization/forms/model_forms.py:338
msgid "Tagged VLANs"
msgstr "Etiketli VLAN'lar"
@@ -3035,7 +3033,7 @@ msgid "Wireless LAN group"
msgstr "Kablosuz LAN grubu"
#: dcim/forms/bulk_edit.py:1384 dcim/forms/model_forms.py:1151
-#: dcim/tables/devices.py:635 netbox/navigation/menu.py:134
+#: dcim/tables/devices.py:639 netbox/navigation/menu.py:134
#: templates/dcim/interface.html:289 wireless/tables/wirelesslan.py:24
msgid "Wireless LANs"
msgstr "Kablosuz LAN'lar"
@@ -3206,9 +3204,9 @@ msgid "Virtual chassis"
msgstr "Sanal şasi"
#: dcim/forms/bulk_import.py:462 dcim/forms/model_forms.py:457
-#: dcim/tables/devices.py:231 extras/filtersets.py:501
+#: dcim/tables/devices.py:235 extras/filtersets.py:501
#: extras/forms/filtersets.py:330 ipam/forms/bulk_edit.py:478
-#: ipam/forms/model_forms.py:588 templates/dcim/device.html:239
+#: ipam/forms/model_forms.py:592 templates/dcim/device.html:239
#: templates/virtualization/cluster.html:11
#: templates/virtualization/virtualmachine.html:92
#: templates/virtualization/virtualmachine.html:102
@@ -3220,7 +3218,7 @@ msgstr "Sanal şasi"
#: virtualization/forms/filtersets.py:196
#: virtualization/forms/model_forms.py:82
#: virtualization/forms/model_forms.py:179
-#: virtualization/tables/virtualmachines.py:57
+#: virtualization/tables/virtualmachines.py:66
msgid "Cluster"
msgstr "Küme"
@@ -3401,7 +3399,7 @@ msgstr "İlgili arka bağlantı noktası"
msgid "Physical medium classification"
msgstr "Fiziksel ortam sınıflandırması"
-#: dcim/forms/bulk_import.py:973 dcim/tables/devices.py:846
+#: dcim/forms/bulk_import.py:973 dcim/tables/devices.py:850
msgid "Installed device"
msgstr "Yüklü cihaz"
@@ -3489,7 +3487,7 @@ msgid "{side_upper} side termination not found: {device} {name}"
msgstr "{side_upper} yan sonlandırma bulunamadı: {device} {name}"
#: dcim/forms/bulk_import.py:1244 dcim/forms/model_forms.py:696
-#: dcim/tables/devices.py:1033 templates/dcim/device.html:130
+#: dcim/tables/devices.py:1037 templates/dcim/device.html:130
#: templates/dcim/virtualchassis.html:28 templates/dcim/virtualchassis.html:60
msgid "Master"
msgstr "Usta"
@@ -3615,7 +3613,7 @@ msgstr "işgal"
#: dcim/forms/filtersets.py:1155 dcim/forms/filtersets.py:1177
#: dcim/forms/filtersets.py:1199 dcim/forms/filtersets.py:1216
-#: dcim/forms/filtersets.py:1236 dcim/tables/devices.py:372
+#: dcim/forms/filtersets.py:1236 dcim/tables/devices.py:376
#: templates/dcim/consoleport.html:59 templates/dcim/consoleserverport.html:59
#: templates/dcim/frontport.html:74 templates/dcim/interface.html:146
#: templates/dcim/powerfeed.html:118 templates/dcim/poweroutlet.html:63
@@ -3629,7 +3627,7 @@ msgid "Virtual Device Context"
msgstr "Sanal Aygıt Bağlamı"
#: dcim/forms/filtersets.py:1248 extras/forms/bulk_edit.py:315
-#: extras/forms/bulk_import.py:239 extras/forms/filtersets.py:479
+#: extras/forms/bulk_import.py:245 extras/forms/filtersets.py:479
#: extras/forms/model_forms.py:557 extras/tables/tables.py:487
#: templates/extras/journalentry.html:33
msgid "Kind"
@@ -3661,7 +3659,7 @@ msgid "Transmit power (dBm)"
msgstr "İletim gücü (dBm)"
#: dcim/forms/filtersets.py:1344 dcim/forms/filtersets.py:1366
-#: dcim/tables/devices.py:344 templates/dcim/cable.html:12
+#: dcim/tables/devices.py:348 templates/dcim/cable.html:12
#: templates/dcim/cable_edit.html:46 templates/dcim/cable_trace.html:43
#: templates/dcim/frontport.html:84
#: templates/dcim/inc/connection_endpoints.html:4
@@ -3669,7 +3667,7 @@ msgstr "İletim gücü (dBm)"
msgid "Cable"
msgstr "Kablo"
-#: dcim/forms/filtersets.py:1434 dcim/tables/devices.py:956
+#: dcim/forms/filtersets.py:1434 dcim/tables/devices.py:960
msgid "Discovered"
msgstr "Keşfedildi"
@@ -3716,7 +3714,7 @@ msgstr "Şasi"
msgid "Device Role"
msgstr "Aygıt Rolü"
-#: dcim/forms/model_forms.py:428 dcim/models/devices.py:632
+#: dcim/forms/model_forms.py:428 dcim/models/devices.py:634
msgid "The lowest-numbered unit occupied by the device"
msgstr "Cihazın kullandığı en düşük numaralı birim"
@@ -3767,9 +3765,7 @@ msgstr "LAG arayüzü"
#: templates/wireless/wirelesslink.html:10
#: templates/wireless/wirelesslink.html:49
#: virtualization/forms/model_forms.py:351 vpn/forms/bulk_import.py:297
-#: vpn/forms/model_forms.py:94 vpn/forms/model_forms.py:129
-#: vpn/forms/model_forms.py:241 vpn/forms/model_forms.py:436
-#: vpn/forms/model_forms.py:445 vpn/tables/tunnels.py:91
+#: vpn/forms/model_forms.py:436 vpn/forms/model_forms.py:445
#: wireless/forms/model_forms.py:112 wireless/forms/model_forms.py:152
msgid "Interface"
msgstr "Arayüz"
@@ -3846,7 +3842,7 @@ msgstr ""
"bekleniyor."
#: dcim/forms/object_create.py:109 dcim/forms/object_create.py:270
-#: dcim/tables/devices.py:281
+#: dcim/tables/devices.py:285
msgid "Rear ports"
msgstr "Arka bağlantı noktaları"
@@ -3883,7 +3879,7 @@ msgstr ""
"Oluşturulacak ön bağlantı noktalarının sayısı ({frontport_count}) seçilen "
"arka port konumu sayısıyla eşleşmelidir ({rearport_count})."
-#: dcim/forms/object_create.py:408 dcim/tables/devices.py:1039
+#: dcim/forms/object_create.py:408 dcim/tables/devices.py:1043
#: ipam/tables/fhrp.py:31 templates/dcim/virtualchassis.html:54
#: templates/dcim/virtualchassis_edit.html:48 templates/ipam/fhrpgroup.html:39
msgid "Members"
@@ -4592,13 +4588,13 @@ msgstr "envanter kalemi rolü"
msgid "inventory item roles"
msgstr "envanter kalemi rolleri"
-#: dcim/models/device_components.py:1230 dcim/models/devices.py:595
-#: dcim/models/devices.py:1173 dcim/models/racks.py:113
+#: dcim/models/device_components.py:1230 dcim/models/devices.py:597
+#: dcim/models/devices.py:1178 dcim/models/racks.py:113
msgid "serial number"
msgstr "seri numarası"
-#: dcim/models/device_components.py:1238 dcim/models/devices.py:603
-#: dcim/models/devices.py:1180 dcim/models/racks.py:120
+#: dcim/models/device_components.py:1238 dcim/models/devices.py:605
+#: dcim/models/devices.py:1185 dcim/models/racks.py:120
msgid "asset tag"
msgstr "varlık etiketi"
@@ -4646,7 +4642,7 @@ msgstr "üretici firma"
msgid "manufacturers"
msgstr "üreticiler"
-#: dcim/models/devices.py:82 dcim/models/devices.py:381
+#: dcim/models/devices.py:82 dcim/models/devices.py:382
msgid "model"
msgstr "model"
@@ -4654,11 +4650,11 @@ msgstr "model"
msgid "default platform"
msgstr "varsayılan platform"
-#: dcim/models/devices.py:98 dcim/models/devices.py:385
+#: dcim/models/devices.py:98 dcim/models/devices.py:386
msgid "part number"
msgstr "parça numarası"
-#: dcim/models/devices.py:101 dcim/models/devices.py:388
+#: dcim/models/devices.py:101 dcim/models/devices.py:389
msgid "Discrete part number (optional)"
msgstr "Ayrık parça numarası (isteğe bağlı)"
@@ -4694,7 +4690,7 @@ msgstr ""
"Ana cihazlar, alt aygıtları cihaz yuvalarında barındırır. Bu cihaz türü "
"ebeveyn veya çocuk değilse boş bırakın."
-#: dcim/models/devices.py:128 dcim/models/devices.py:647
+#: dcim/models/devices.py:128 dcim/models/devices.py:649
msgid "airflow"
msgstr "hava akımı"
@@ -4706,11 +4702,11 @@ msgstr "cihaz tipi"
msgid "device types"
msgstr "cihaz türleri"
-#: dcim/models/devices.py:289
+#: dcim/models/devices.py:290
msgid "U height must be in increments of 0.5 rack units."
msgstr "U yüksekliği 0,5 raf ünitesi artışlarla olmalıdır."
-#: dcim/models/devices.py:306
+#: dcim/models/devices.py:307
#, python-brace-format
msgid ""
"Device {device} in rack {rack} does not have sufficient space to accommodate"
@@ -4719,7 +4715,7 @@ msgstr ""
"Aygıt {device} rafta {rack} bir yüksekliği barındırmak için yeterli alana "
"sahip değildir {height}U"
-#: dcim/models/devices.py:321
+#: dcim/models/devices.py:322
#, python-brace-format
msgid ""
"Unable to set 0U height: Found {racked_instance_count} "
@@ -4729,7 +4725,7 @@ msgstr ""
"href=\"{url}\">{racked_instance_count} örnekler zaten raflara monte "
"edilmiştir."
-#: dcim/models/devices.py:330
+#: dcim/models/devices.py:331
msgid ""
"Must delete all device bay templates associated with this device before "
"declassifying it as a parent device."
@@ -4737,164 +4733,164 @@ msgstr ""
"Ana aygıt olarak sınıflandırmadan önce bu aygıtla ilişkili tüm aygıt yuvası "
"şablonlarını silmeniz gerekir."
-#: dcim/models/devices.py:336
+#: dcim/models/devices.py:337
msgid "Child device types must be 0U."
msgstr "Çocuk cihaz türleri 0U olmalıdır."
-#: dcim/models/devices.py:404
+#: dcim/models/devices.py:405
msgid "module type"
msgstr "modül tipi"
-#: dcim/models/devices.py:405
+#: dcim/models/devices.py:406
msgid "module types"
msgstr "modül türleri"
-#: dcim/models/devices.py:473
+#: dcim/models/devices.py:475
msgid "Virtual machines may be assigned to this role"
msgstr "Sanal makineler bu role atanabilir"
-#: dcim/models/devices.py:485
+#: dcim/models/devices.py:487
msgid "device role"
msgstr "cihaz rolü"
-#: dcim/models/devices.py:486
+#: dcim/models/devices.py:488
msgid "device roles"
msgstr "cihaz rolleri"
-#: dcim/models/devices.py:503
+#: dcim/models/devices.py:505
msgid "Optionally limit this platform to devices of a certain manufacturer"
msgstr ""
"İsteğe bağlı olarak bu platformu belirli bir üreticinin cihazlarıyla "
"sınırlayın"
-#: dcim/models/devices.py:515
+#: dcim/models/devices.py:517
msgid "platform"
msgstr "platform"
-#: dcim/models/devices.py:516
+#: dcim/models/devices.py:518
msgid "platforms"
msgstr "platformlar"
-#: dcim/models/devices.py:564
+#: dcim/models/devices.py:566
msgid "The function this device serves"
msgstr "Bu cihazın hizmet ettiği işlev"
-#: dcim/models/devices.py:596
+#: dcim/models/devices.py:598
msgid "Chassis serial number, assigned by the manufacturer"
msgstr "Üretici tarafından atanan şasi seri numarası"
-#: dcim/models/devices.py:604 dcim/models/devices.py:1181
+#: dcim/models/devices.py:606 dcim/models/devices.py:1186
msgid "A unique tag used to identify this device"
msgstr "Bu cihazı tanımlamak için kullanılan benzersiz bir etiket"
-#: dcim/models/devices.py:631
+#: dcim/models/devices.py:633
msgid "position (U)"
msgstr "pozisyon (U)"
-#: dcim/models/devices.py:638
+#: dcim/models/devices.py:640
msgid "rack face"
msgstr "raf yüzü"
-#: dcim/models/devices.py:658 dcim/models/devices.py:1390
+#: dcim/models/devices.py:660 dcim/models/devices.py:1395
#: virtualization/models/virtualmachines.py:98
msgid "primary IPv4"
msgstr "birincil IPv4"
-#: dcim/models/devices.py:666 dcim/models/devices.py:1398
+#: dcim/models/devices.py:668 dcim/models/devices.py:1403
#: virtualization/models/virtualmachines.py:106
msgid "primary IPv6"
msgstr "birincil IPv6"
-#: dcim/models/devices.py:674
+#: dcim/models/devices.py:676
msgid "out-of-band IP"
msgstr "bant dışı IP"
-#: dcim/models/devices.py:691
+#: dcim/models/devices.py:693
msgid "VC position"
msgstr "VC pozisyonu"
-#: dcim/models/devices.py:695
+#: dcim/models/devices.py:697
msgid "Virtual chassis position"
msgstr "Sanal şasi konumu"
-#: dcim/models/devices.py:698
+#: dcim/models/devices.py:700
msgid "VC priority"
msgstr "VC önceliği"
-#: dcim/models/devices.py:702
+#: dcim/models/devices.py:704
msgid "Virtual chassis master election priority"
msgstr "Sanal şasi ana seçim önceliği"
-#: dcim/models/devices.py:705 dcim/models/sites.py:207
+#: dcim/models/devices.py:707 dcim/models/sites.py:207
msgid "latitude"
msgstr "enlem"
-#: dcim/models/devices.py:710 dcim/models/devices.py:718
+#: dcim/models/devices.py:712 dcim/models/devices.py:720
#: dcim/models/sites.py:212 dcim/models/sites.py:220
msgid "GPS coordinate in decimal format (xx.yyyyyy)"
msgstr "Ondalık formatta GPS koordinatı (xx.yyyyyy)"
-#: dcim/models/devices.py:713 dcim/models/sites.py:215
+#: dcim/models/devices.py:715 dcim/models/sites.py:215
msgid "longitude"
msgstr "boylam"
-#: dcim/models/devices.py:786
+#: dcim/models/devices.py:788
msgid "Device name must be unique per site."
msgstr "Aygıt adı site başına benzersiz olmalıdır."
-#: dcim/models/devices.py:797 ipam/models/services.py:75
+#: dcim/models/devices.py:799 ipam/models/services.py:75
msgid "device"
msgstr "cihaz"
-#: dcim/models/devices.py:798
+#: dcim/models/devices.py:800
msgid "devices"
msgstr "cihazlar"
-#: dcim/models/devices.py:838
+#: dcim/models/devices.py:840
#, python-brace-format
msgid "Rack {rack} does not belong to site {site}."
msgstr "Raf {rack} siteye ait değil {site}."
-#: dcim/models/devices.py:843
+#: dcim/models/devices.py:845
#, python-brace-format
msgid "Location {location} does not belong to site {site}."
msgstr "{location} Konum {site} adlı siteye ait değil."
-#: dcim/models/devices.py:849
+#: dcim/models/devices.py:851
#, python-brace-format
msgid "Rack {rack} does not belong to location {location}."
msgstr "{rack} rafı {location} adlı konuma ait değil."
-#: dcim/models/devices.py:856
+#: dcim/models/devices.py:858
msgid "Cannot select a rack face without assigning a rack."
msgstr "Bir raf atamadan raf yüzü seçilemez."
-#: dcim/models/devices.py:860
+#: dcim/models/devices.py:862
msgid "Cannot select a rack position without assigning a rack."
msgstr "Bir raf atamadan raf konumu seçilemez."
-#: dcim/models/devices.py:866
+#: dcim/models/devices.py:868
msgid "Position must be in increments of 0.5 rack units."
msgstr "Konum 0,5 raf ünitesinin artışlarında olmalıdır."
-#: dcim/models/devices.py:870
+#: dcim/models/devices.py:872
msgid "Must specify rack face when defining rack position."
msgstr "Raf konumunu tanımlarken raf yüzü belirtilmelidir."
-#: dcim/models/devices.py:878
+#: dcim/models/devices.py:880
#, python-brace-format
msgid ""
"A 0U device type ({device_type}) cannot be assigned to a rack position."
msgstr "Bir 0U cihaz tipi ({device_type}) bir raf konumuna atanamaz."
-#: dcim/models/devices.py:889
+#: dcim/models/devices.py:891
msgid ""
"Child device types cannot be assigned to a rack face. This is an attribute "
"of the parent device."
msgstr ""
"Alt aygıt türleri bir raf yüzüne atanamaz. Bu, ana cihazın bir özelliğidir."
-#: dcim/models/devices.py:896
+#: dcim/models/devices.py:898
msgid ""
"Child device types cannot be assigned to a rack position. This is an "
"attribute of the parent device."
@@ -4902,7 +4898,7 @@ msgstr ""
"Alt aygıt türleri bir raf konumuna atanamaz. Bu, ana aygıtın bir "
"özelliğidir."
-#: dcim/models/devices.py:910
+#: dcim/models/devices.py:912
#, python-brace-format
msgid ""
"U{position} is already occupied or does not have sufficient space to "
@@ -4911,22 +4907,22 @@ msgstr ""
"U{position} zaten işgal edilmiş veya bu cihaz tipini barındırmak için "
"yeterli alana sahip değil: {device_type} ({u_height}U)"
-#: dcim/models/devices.py:925
+#: dcim/models/devices.py:927
#, python-brace-format
msgid "{ip} is not an IPv4 address."
msgstr "{ip} Bu bir IPv4 adresi değildir."
-#: dcim/models/devices.py:934 dcim/models/devices.py:949
+#: dcim/models/devices.py:936 dcim/models/devices.py:951
#, python-brace-format
msgid "The specified IP address ({ip}) is not assigned to this device."
msgstr "Belirtilen IP adresi ({ip}) bu cihaza atanmamıştır."
-#: dcim/models/devices.py:940
+#: dcim/models/devices.py:942
#, python-brace-format
msgid "{ip} is not an IPv6 address."
msgstr "{ip} Bu bir IPv6 adresi değildir."
-#: dcim/models/devices.py:967
+#: dcim/models/devices.py:969
#, python-brace-format
msgid ""
"The assigned platform is limited to {platform_manufacturer} device types, "
@@ -4935,45 +4931,45 @@ msgstr ""
"Atanan platform aşağıdakilerle sınırlıdır {platform_manufacturer} cihaz "
"türleri, ancak bu cihazın türü şunlara aittir {devicetype_manufacturer}."
-#: dcim/models/devices.py:978
+#: dcim/models/devices.py:980
#, python-brace-format
msgid "The assigned cluster belongs to a different site ({site})"
msgstr "Atanan küme farklı bir siteye aittir ({site})"
-#: dcim/models/devices.py:986
+#: dcim/models/devices.py:988
msgid "A device assigned to a virtual chassis must have its position defined."
msgstr "Sanal bir kasaya atanan bir aygıtın konumu tanımlanmış olmalıdır."
-#: dcim/models/devices.py:1188
+#: dcim/models/devices.py:1193
msgid "module"
msgstr "modül"
-#: dcim/models/devices.py:1189
+#: dcim/models/devices.py:1194
msgid "modules"
msgstr "modülleri"
-#: dcim/models/devices.py:1205
+#: dcim/models/devices.py:1210
#, python-brace-format
msgid ""
"Module must be installed within a module bay belonging to the assigned "
"device ({device})."
msgstr "Modül, atanan cihaza ait bir modül bölmesine kurulmalıdır ({device})."
-#: dcim/models/devices.py:1309
+#: dcim/models/devices.py:1314
msgid "domain"
msgstr "domain"
-#: dcim/models/devices.py:1322 dcim/models/devices.py:1323
+#: dcim/models/devices.py:1327 dcim/models/devices.py:1328
msgid "virtual chassis"
msgstr "sanal kasa"
-#: dcim/models/devices.py:1338
+#: dcim/models/devices.py:1343
#, python-brace-format
msgid ""
"The selected master ({master}) is not assigned to this virtual chassis."
msgstr "Seçilen usta ({master}) bu sanal kasaya atanmamıştır."
-#: dcim/models/devices.py:1354
+#: dcim/models/devices.py:1359
#, python-brace-format
msgid ""
"Unable to delete virtual chassis {self}. There are member interfaces which "
@@ -4982,33 +4978,33 @@ msgstr ""
"Sanal kasa silinemiyor {self}. Çapraz şasi LAG arabirimleri oluşturan üye "
"arayüzleri vardır."
-#: dcim/models/devices.py:1379 vpn/models/l2vpn.py:37
+#: dcim/models/devices.py:1384 vpn/models/l2vpn.py:37
msgid "identifier"
msgstr "belirlemek"
-#: dcim/models/devices.py:1380
+#: dcim/models/devices.py:1385
msgid "Numeric identifier unique to the parent device"
msgstr "Ana aygıta benzersiz sayısal tanımlayıcı"
-#: dcim/models/devices.py:1408 extras/models/models.py:129
+#: dcim/models/devices.py:1413 extras/models/models.py:129
#: extras/models/models.py:724 netbox/models/__init__.py:114
msgid "comments"
msgstr "yorumlar"
-#: dcim/models/devices.py:1424
+#: dcim/models/devices.py:1429
msgid "virtual device context"
msgstr "sanal cihaz bağlamı"
-#: dcim/models/devices.py:1425
+#: dcim/models/devices.py:1430
msgid "virtual device contexts"
msgstr "sanal cihaz bağlamları"
-#: dcim/models/devices.py:1457
+#: dcim/models/devices.py:1462
#, python-brace-format
msgid "{ip} is not an IPv{family} address."
msgstr "{ip} IPV değil{family} adres."
-#: dcim/models/devices.py:1463
+#: dcim/models/devices.py:1468
msgid "Primary IP address must belong to an interface on the assigned device."
msgstr "Birincil IP adresi, atanan cihazdaki bir arayüze ait olmalıdır."
@@ -5390,7 +5386,7 @@ msgstr "Konsol Bağlantı Noktası"
msgid "Reachable"
msgstr "Ulaşılabilir"
-#: dcim/tables/connections.py:46 dcim/tables/devices.py:529
+#: dcim/tables/connections.py:46 dcim/tables/devices.py:533
#: templates/dcim/inventoryitem_edit.html:64
#: templates/dcim/poweroutlet.html:47 templates/dcim/powerport.html:18
msgid "Power Port"
@@ -5409,7 +5405,7 @@ msgstr "Aygıtlar"
msgid "VMs"
msgstr "Sanal Makineler"
-#: dcim/tables/devices.py:133 dcim/tables/devices.py:245
+#: dcim/tables/devices.py:133 dcim/tables/devices.py:249
#: extras/forms/model_forms.py:515 templates/dcim/device.html:114
#: templates/dcim/device/render_config.html:11
#: templates/dcim/device/render_config.html:15
@@ -5418,62 +5414,62 @@ msgstr "Sanal Makineler"
#: templates/virtualization/virtualmachine.html:47
#: templates/virtualization/virtualmachine/render_config.html:11
#: templates/virtualization/virtualmachine/render_config.html:15
-#: virtualization/tables/virtualmachines.py:93
+#: virtualization/tables/virtualmachines.py:106
msgid "Config Template"
msgstr "Yapılandırma Şablonu"
-#: dcim/tables/devices.py:216 dcim/tables/devices.py:1074
+#: dcim/tables/devices.py:220 dcim/tables/devices.py:1078
#: ipam/forms/bulk_import.py:511 ipam/forms/model_forms.py:296
#: ipam/tables/ip.py:352 ipam/tables/ip.py:418 ipam/tables/ip.py:441
#: templates/ipam/ipaddress.html:12 templates/ipam/ipaddress_edit.html:14
-#: virtualization/tables/virtualmachines.py:81
+#: virtualization/tables/virtualmachines.py:94
msgid "IP Address"
msgstr "IP Adresi"
-#: dcim/tables/devices.py:220 dcim/tables/devices.py:1078
-#: virtualization/tables/virtualmachines.py:72
+#: dcim/tables/devices.py:224 dcim/tables/devices.py:1082
+#: virtualization/tables/virtualmachines.py:85
msgid "IPv4 Address"
msgstr "IPv4 Adresi"
-#: dcim/tables/devices.py:224 dcim/tables/devices.py:1082
-#: virtualization/tables/virtualmachines.py:76
+#: dcim/tables/devices.py:228 dcim/tables/devices.py:1086
+#: virtualization/tables/virtualmachines.py:89
msgid "IPv6 Address"
msgstr "IPv6 Adresi"
-#: dcim/tables/devices.py:239
+#: dcim/tables/devices.py:243
msgid "VC Position"
msgstr "VC Pozisyonu"
-#: dcim/tables/devices.py:242
+#: dcim/tables/devices.py:246
msgid "VC Priority"
msgstr "VC Önceliği"
-#: dcim/tables/devices.py:249 templates/dcim/device_edit.html:38
+#: dcim/tables/devices.py:253 templates/dcim/device_edit.html:38
#: templates/dcim/devicebay_populate.html:16
msgid "Parent Device"
msgstr "Ebeveyn Aygıtı"
-#: dcim/tables/devices.py:254
+#: dcim/tables/devices.py:258
msgid "Position (Device Bay)"
msgstr "Konum (Aygıt Yuvası)"
-#: dcim/tables/devices.py:263
+#: dcim/tables/devices.py:267
msgid "Console ports"
msgstr "Konsol bağlantı noktaları"
-#: dcim/tables/devices.py:266
+#: dcim/tables/devices.py:270
msgid "Console server ports"
msgstr "Konsol sunucusu bağlantı noktaları"
-#: dcim/tables/devices.py:269
+#: dcim/tables/devices.py:273
msgid "Power ports"
msgstr "Güç bağlantı noktaları"
-#: dcim/tables/devices.py:272
+#: dcim/tables/devices.py:276
msgid "Power outlets"
msgstr "Elektrik prizleri"
-#: dcim/tables/devices.py:275 dcim/tables/devices.py:1087
+#: dcim/tables/devices.py:279 dcim/tables/devices.py:1091
#: dcim/tables/devicetypes.py:125 dcim/views.py:1005 dcim/views.py:1244
#: dcim/views.py:1930 netbox/navigation/menu.py:82
#: netbox/navigation/menu.py:238 templates/dcim/device/base.html:37
@@ -5483,53 +5479,53 @@ msgstr "Elektrik prizleri"
#: templates/dcim/virtualdevicecontext.html:85
#: templates/virtualization/virtualmachine/base.html:27
#: templates/virtualization/virtualmachine_list.html:14
-#: virtualization/tables/virtualmachines.py:87 virtualization/views.py:368
+#: virtualization/tables/virtualmachines.py:100 virtualization/views.py:368
#: wireless/tables/wirelesslan.py:55
msgid "Interfaces"
msgstr "Arayüzler"
-#: dcim/tables/devices.py:278
+#: dcim/tables/devices.py:282
msgid "Front ports"
msgstr "Ön bağlantı noktaları"
-#: dcim/tables/devices.py:284
+#: dcim/tables/devices.py:288
msgid "Device bays"
msgstr "Aygıt yuvaları"
-#: dcim/tables/devices.py:287
+#: dcim/tables/devices.py:291
msgid "Module bays"
msgstr "Modül bölmeleri"
-#: dcim/tables/devices.py:290
+#: dcim/tables/devices.py:294
msgid "Inventory items"
msgstr "Envanter kalemleri"
-#: dcim/tables/devices.py:329 dcim/tables/modules.py:56
+#: dcim/tables/devices.py:333 dcim/tables/modules.py:56
#: templates/dcim/modulebay.html:17
msgid "Module Bay"
msgstr "Modül Yuvası"
-#: dcim/tables/devices.py:350
+#: dcim/tables/devices.py:354
msgid "Cable Color"
msgstr "Kablo Rengi"
-#: dcim/tables/devices.py:356
+#: dcim/tables/devices.py:360
msgid "Link Peers"
msgstr "Meslektaşları Bağla"
-#: dcim/tables/devices.py:359
+#: dcim/tables/devices.py:363
msgid "Mark Connected"
msgstr "Bağlı İşaretle"
-#: dcim/tables/devices.py:475
+#: dcim/tables/devices.py:479
msgid "Maximum draw (W)"
msgstr "Maksimum çekim (W)"
-#: dcim/tables/devices.py:478
+#: dcim/tables/devices.py:482
msgid "Allocated draw (W)"
msgstr "Tahsis edilen çekiliş (W)"
-#: dcim/tables/devices.py:578 ipam/forms/model_forms.py:707
+#: dcim/tables/devices.py:582 ipam/forms/model_forms.py:711
#: ipam/tables/fhrp.py:28 ipam/views.py:597 ipam/views.py:691
#: netbox/navigation/menu.py:146 netbox/navigation/menu.py:148
#: templates/dcim/interface.html:351 templates/ipam/ipaddress_bulk_add.html:15
@@ -5538,12 +5534,12 @@ msgstr "Tahsis edilen çekiliş (W)"
msgid "IP Addresses"
msgstr "IP Adresleri"
-#: dcim/tables/devices.py:584 netbox/navigation/menu.py:190
+#: dcim/tables/devices.py:588 netbox/navigation/menu.py:190
#: templates/ipam/inc/panels/fhrp_groups.html:5
msgid "FHRP Groups"
msgstr "FHRP Grupları"
-#: dcim/tables/devices.py:596 templates/dcim/interface.html:90
+#: dcim/tables/devices.py:600 templates/dcim/interface.html:90
#: templates/virtualization/vminterface.html:70 templates/vpn/tunnel.html:18
#: templates/vpn/tunneltermination.html:14 vpn/forms/bulk_edit.py:75
#: vpn/forms/bulk_import.py:76 vpn/forms/filtersets.py:41
@@ -5552,20 +5548,20 @@ msgstr "FHRP Grupları"
msgid "Tunnel"
msgstr "Tünel"
-#: dcim/tables/devices.py:621 dcim/tables/devicetypes.py:224
+#: dcim/tables/devices.py:625 dcim/tables/devicetypes.py:224
#: templates/dcim/interface.html:66
msgid "Management Only"
msgstr "Yalnızca Yönetim"
-#: dcim/tables/devices.py:629
+#: dcim/tables/devices.py:633
msgid "Wireless link"
msgstr "Kablosuz bağlantı"
-#: dcim/tables/devices.py:639
+#: dcim/tables/devices.py:643
msgid "VDCs"
msgstr "VDC'ler"
-#: dcim/tables/devices.py:647 dcim/tables/devicetypes.py:48
+#: dcim/tables/devices.py:651 dcim/tables/devicetypes.py:48
#: dcim/tables/devicetypes.py:140 dcim/views.py:1080 dcim/views.py:2023
#: netbox/navigation/menu.py:91 templates/dcim/device/base.html:52
#: templates/dcim/device_list.html:71 templates/dcim/devicetype/base.html:49
@@ -5574,7 +5570,7 @@ msgstr "VDC'ler"
msgid "Inventory Items"
msgstr "Envanter Öğeleri"
-#: dcim/tables/devices.py:728
+#: dcim/tables/devices.py:732
#: templates/circuits/inc/circuit_termination.html:80
#: templates/dcim/consoleport.html:81 templates/dcim/consoleserverport.html:81
#: templates/dcim/frontport.html:53 templates/dcim/frontport.html:125
@@ -5583,28 +5579,28 @@ msgstr "Envanter Öğeleri"
msgid "Rear Port"
msgstr "Arka Bağlantı Noktası"
-#: dcim/tables/devices.py:893 templates/dcim/modulebay.html:51
+#: dcim/tables/devices.py:897 templates/dcim/modulebay.html:51
msgid "Installed Module"
msgstr "Yüklü Modül"
-#: dcim/tables/devices.py:896
+#: dcim/tables/devices.py:900
msgid "Module Serial"
msgstr "Modül Seri"
-#: dcim/tables/devices.py:900
+#: dcim/tables/devices.py:904
msgid "Module Asset Tag"
msgstr "Modül Varlık Etiketi"
-#: dcim/tables/devices.py:909
+#: dcim/tables/devices.py:913
msgid "Module Status"
msgstr "Modül Durumu"
-#: dcim/tables/devices.py:951 dcim/tables/devicetypes.py:308
+#: dcim/tables/devices.py:955 dcim/tables/devicetypes.py:308
#: templates/dcim/inventoryitem.html:41
msgid "Component"
msgstr "Bileşen"
-#: dcim/tables/devices.py:1006
+#: dcim/tables/devices.py:1010
msgid "Items"
msgstr "Öğeler"
@@ -6167,7 +6163,7 @@ msgid "Cluster type (slug)"
msgstr "Küme tipi (kısa ad)"
#: extras/filtersets.py:490 ipam/forms/bulk_edit.py:475
-#: ipam/forms/model_forms.py:585 virtualization/forms/filtersets.py:108
+#: ipam/forms/model_forms.py:589 virtualization/forms/filtersets.py:108
msgid "Cluster group"
msgstr "Küme grubu"
@@ -6298,8 +6294,8 @@ msgid "Is active"
msgstr "Aktif"
#: extras/forms/bulk_import.py:34 extras/forms/bulk_import.py:115
-#: extras/forms/bulk_import.py:130 extras/forms/bulk_import.py:153
-#: extras/forms/bulk_import.py:177 extras/forms/filtersets.py:114
+#: extras/forms/bulk_import.py:136 extras/forms/bulk_import.py:159
+#: extras/forms/bulk_import.py:183 extras/forms/filtersets.py:114
#: extras/forms/filtersets.py:160 extras/forms/filtersets.py:201
#: extras/forms/model_forms.py:43 extras/forms/model_forms.py:127
#: extras/forms/model_forms.py:156 extras/forms/model_forms.py:197
@@ -6308,8 +6304,8 @@ msgid "Content types"
msgstr "İçerik türleri"
#: extras/forms/bulk_import.py:36 extras/forms/bulk_import.py:117
-#: extras/forms/bulk_import.py:132 extras/forms/bulk_import.py:155
-#: extras/forms/bulk_import.py:179 tenancy/forms/bulk_import.py:96
+#: extras/forms/bulk_import.py:138 extras/forms/bulk_import.py:161
+#: extras/forms/bulk_import.py:185 tenancy/forms/bulk_import.py:96
msgid "One or more assigned object types"
msgstr "Bir veya daha fazla atanmış nesne türü"
@@ -6356,29 +6352,39 @@ msgstr ""
"seçeneklerinin alıntılanmış dizesi: “Seçim1:First Choice, Choice2:Second "
"Choice”"
-#: extras/forms/bulk_import.py:182
+#: extras/forms/bulk_import.py:120 extras/models/models.py:353
+msgid "button class"
+msgstr "düğme sınıfı"
+
+#: extras/forms/bulk_import.py:123 extras/models/models.py:357
+msgid ""
+"The class of the first link in a group will be used for the dropdown button"
+msgstr ""
+"Bir gruptaki ilk bağlantının sınıfı açılır düğme için kullanılacaktır."
+
+#: extras/forms/bulk_import.py:188
msgid "Action object"
msgstr "Eylem nesnesi"
-#: extras/forms/bulk_import.py:184
+#: extras/forms/bulk_import.py:190
msgid "Webhook name or script as dotted path module.Class"
msgstr "Noktalı yol olarak Webhook adı veya komut dosyası module.Class"
-#: extras/forms/bulk_import.py:205
+#: extras/forms/bulk_import.py:211
#, python-brace-format
msgid "Webhook {name} not found"
msgstr "Web kancası {name} bulunamadı"
-#: extras/forms/bulk_import.py:214
+#: extras/forms/bulk_import.py:220
#, python-brace-format
msgid "Script {name} not found"
msgstr "Senaryo {name} bulunamadı"
-#: extras/forms/bulk_import.py:236
+#: extras/forms/bulk_import.py:242
msgid "Assigned object type"
msgstr "Atanan nesne türü"
-#: extras/forms/bulk_import.py:241
+#: extras/forms/bulk_import.py:247
msgid "The classification of entry"
msgstr "Girişin sınıflandırılması"
@@ -7325,16 +7331,6 @@ msgstr "Bağlantı URL'si için Jinja2 şablon kodu"
msgid "Links with the same group will appear as a dropdown menu"
msgstr "Aynı gruba sahip bağlantılar açılır menü olarak görünecektir"
-#: extras/models/models.py:353
-msgid "button class"
-msgstr "düğme sınıfı"
-
-#: extras/models/models.py:357
-msgid ""
-"The class of the first link in a group will be used for the dropdown button"
-msgstr ""
-"Bir gruptaki ilk bağlantının sınıfı açılır düğme için kullanılacaktır."
-
#: extras/models/models.py:360
msgid "new window"
msgstr "yeni pencere"
@@ -7522,7 +7518,7 @@ msgid "staged changes"
msgstr "aşamalı değişiklikler"
#: extras/models/tags.py:40
-msgid "The object type(s) to which this this tag can be applied."
+msgid "The object type(s) to which this tag can be applied."
msgstr "Bu etiketin uygulanabileceği nesne türü (ler) dir."
#: extras/models/tags.py:49
@@ -7821,7 +7817,7 @@ msgid "VLAN number (1-4094)"
msgstr "VLAN numarası (1-4094)"
#: ipam/filtersets.py:437 ipam/filtersets.py:441 ipam/filtersets.py:533
-#: ipam/forms/model_forms.py:444 templates/tenancy/contact.html:54
+#: ipam/forms/model_forms.py:430 templates/tenancy/contact.html:54
#: tenancy/forms/bulk_edit.py:112
msgid "Address"
msgstr "Adres"
@@ -7990,7 +7986,7 @@ msgid "Authentication key"
msgstr "Kimlik doğrulama anahtarı"
#: ipam/forms/bulk_edit.py:404 ipam/forms/filtersets.py:369
-#: ipam/forms/model_forms.py:455 netbox/navigation/menu.py:376
+#: ipam/forms/model_forms.py:441 netbox/navigation/menu.py:376
#: templates/ipam/fhrpgroup.html:51
#: templates/wireless/inc/authentication_attrs.html:5
#: wireless/forms/bulk_edit.py:90 wireless/forms/bulk_edit.py:137
@@ -8007,11 +8003,11 @@ msgstr "Minimum çocuk VLAN VID"
msgid "Maximum child VLAN VID"
msgstr "Maksimum çocuk VLAN VID"
-#: ipam/forms/bulk_edit.py:428 ipam/forms/model_forms.py:527
+#: ipam/forms/bulk_edit.py:428 ipam/forms/model_forms.py:531
msgid "Scope type"
msgstr "Kapsam türü"
-#: ipam/forms/bulk_edit.py:489 ipam/forms/model_forms.py:600
+#: ipam/forms/bulk_edit.py:489 ipam/forms/model_forms.py:604
#: ipam/tables/vlans.py:71 templates/ipam/vlangroup.html:39
msgid "Scope"
msgstr "Kapsam"
@@ -8020,8 +8016,8 @@ msgstr "Kapsam"
msgid "Site & Group"
msgstr "Site ve Grup"
-#: ipam/forms/bulk_edit.py:574 ipam/forms/model_forms.py:663
-#: ipam/forms/model_forms.py:697 ipam/tables/services.py:19
+#: ipam/forms/bulk_edit.py:574 ipam/forms/model_forms.py:667
+#: ipam/forms/model_forms.py:701 ipam/tables/services.py:19
#: ipam/tables/services.py:49 templates/ipam/service.html:39
#: templates/ipam/servicetemplate.html:24
msgid "Ports"
@@ -8061,7 +8057,7 @@ msgid "Parent device of assigned interface (if any)"
msgstr "Atanan arayüzün ana cihazı (varsa)"
#: ipam/forms/bulk_import.py:310 ipam/forms/bulk_import.py:496
-#: ipam/forms/model_forms.py:691 virtualization/filtersets.py:284
+#: ipam/forms/model_forms.py:695 virtualization/filtersets.py:284
#: virtualization/filtersets.py:323 virtualization/forms/bulk_edit.py:199
#: virtualization/forms/bulk_edit.py:325
#: virtualization/forms/bulk_import.py:146
@@ -8237,8 +8233,8 @@ msgstr "Liman"
#: virtualization/forms/filtersets.py:189
#: virtualization/forms/filtersets.py:234
#: virtualization/forms/model_forms.py:223
-#: virtualization/tables/virtualmachines.py:115
-#: virtualization/tables/virtualmachines.py:168 vpn/choices.py:45
+#: virtualization/tables/virtualmachines.py:128
+#: virtualization/tables/virtualmachines.py:181 vpn/choices.py:45
#: vpn/forms/filtersets.py:289 vpn/forms/model_forms.py:161
#: vpn/forms/model_forms.py:172 vpn/forms/model_forms.py:274
msgid "Virtual Machine"
@@ -8261,7 +8257,7 @@ msgstr "Site/VLAN Ataması"
msgid "IP Range"
msgstr "IP Aralığı"
-#: ipam/forms/model_forms.py:285 ipam/forms/model_forms.py:454
+#: ipam/forms/model_forms.py:285 ipam/forms/model_forms.py:440
#: templates/ipam/fhrpgroup.html:19 templates/ipam/ipaddress_edit.html:52
msgid "FHRP Group"
msgstr "FHRP Grubu"
@@ -8274,7 +8270,7 @@ msgstr "Bunu cihaz/VM için birincil IP yapın"
msgid "An IP address can only be assigned to a single object."
msgstr "IP adresi yalnızca tek bir nesneye atanabilir."
-#: ipam/forms/model_forms.py:357 ipam/models/ip.py:877
+#: ipam/forms/model_forms.py:357 ipam/models/ip.py:896
msgid ""
"Cannot reassign IP address while it is designated as the primary IP for the "
"parent object"
@@ -8287,32 +8283,25 @@ msgid ""
msgstr ""
"Yalnızca bir arayüze atanan IP adresleri birincil IP olarak belirlenebilir."
-#: ipam/forms/model_forms.py:373
-#, python-brace-format
-msgid "{ip} is a network ID, which may not be assigned to an interface."
-msgstr "{ip} bir arayüze atanamayacak bir ağ kimliğidir."
-
-#: ipam/forms/model_forms.py:379
-#, python-brace-format
-msgid ""
-"{ip} is a broadcast address, which may not be assigned to an interface."
-msgstr "{ip} bir arayüze atanamayacak bir yayın adresidir."
-
-#: ipam/forms/model_forms.py:456
+#: ipam/forms/model_forms.py:442
msgid "Virtual IP Address"
msgstr "Sanal IP Adresi"
-#: ipam/forms/model_forms.py:598 ipam/forms/model_forms.py:637
+#: ipam/forms/model_forms.py:523
+msgid "Assignment already exists"
+msgstr "Atama zaten var"
+
+#: ipam/forms/model_forms.py:602 ipam/forms/model_forms.py:641
#: ipam/tables/ip.py:250 templates/ipam/vlan_edit.html:37
#: templates/ipam/vlangroup.html:27
msgid "VLAN Group"
msgstr "VLAN Grubu"
-#: ipam/forms/model_forms.py:599
+#: ipam/forms/model_forms.py:603
msgid "Child VLANs"
msgstr "Çocuk VLAN'ları"
-#: ipam/forms/model_forms.py:668 ipam/forms/model_forms.py:702
+#: ipam/forms/model_forms.py:672 ipam/forms/model_forms.py:706
msgid ""
"Comma-separated list of one or more port numbers. A range may be specified "
"using a hyphen."
@@ -8320,15 +8309,15 @@ msgstr ""
"Bir veya daha fazla bağlantı noktası numarasının virgülle ayrılmış listesi. "
"Bir aralık bir tire kullanılarak belirtilebilir."
-#: ipam/forms/model_forms.py:673 templates/ipam/servicetemplate.html:12
+#: ipam/forms/model_forms.py:677 templates/ipam/servicetemplate.html:12
msgid "Service Template"
msgstr "Hizmet Şablonu"
-#: ipam/forms/model_forms.py:724
+#: ipam/forms/model_forms.py:728
msgid "Service template"
msgstr "Hizmet şablonu"
-#: ipam/forms/model_forms.py:754
+#: ipam/forms/model_forms.py:758
msgid ""
"Must specify name, protocol, and port(s) if not using a service template."
msgstr ""
@@ -8494,12 +8483,12 @@ msgstr "önekleri"
msgid "Cannot create prefix with /0 mask."
msgstr "/0 maskesi ile önek oluşturulamıyor."
-#: ipam/models/ip.py:323 ipam/models/ip.py:854
+#: ipam/models/ip.py:323 ipam/models/ip.py:873
#, python-brace-format
msgid "VRF {vrf}"
msgstr "VRF {vrf}"
-#: ipam/models/ip.py:323 ipam/models/ip.py:854
+#: ipam/models/ip.py:323 ipam/models/ip.py:873
msgid "global table"
msgstr "küresel tablo"
@@ -8594,12 +8583,23 @@ msgstr "IP adresleri"
msgid "Cannot create IP address with /0 mask."
msgstr "/0 maskesi ile IP adresi oluşturulamıyor."
-#: ipam/models/ip.py:856
+#: ipam/models/ip.py:850
+#, python-brace-format
+msgid "{ip} is a network ID, which may not be assigned to an interface."
+msgstr "{ip} bir arayüze atanamayacak bir ağ kimliğidir."
+
+#: ipam/models/ip.py:861
+#, python-brace-format
+msgid ""
+"{ip} is a broadcast address, which may not be assigned to an interface."
+msgstr "{ip} bir arayüze atanamayacak bir yayın adresidir."
+
+#: ipam/models/ip.py:875
#, python-brace-format
msgid "Duplicate IP address found in {table}: {ipaddress}"
msgstr "Yinelenen IP adresi şurada bulundu {table}: {ipaddress}"
-#: ipam/models/ip.py:883
+#: ipam/models/ip.py:902
msgid "Only IPv6 addresses can be assigned SLAAC status"
msgstr "Yalnızca IPv6 adreslerine SLAAC durumu atanabilir"
@@ -9375,7 +9375,7 @@ msgstr "Sanal Makineler"
#: templates/virtualization/virtualmachine.html:177
#: templates/virtualization/virtualmachine/base.html:32
#: templates/virtualization/virtualmachine_list.html:21
-#: virtualization/tables/virtualmachines.py:90 virtualization/views.py:389
+#: virtualization/tables/virtualmachines.py:103 virtualization/views.py:389
msgid "Virtual Disks"
msgstr "Sanal Diskler"
@@ -10299,8 +10299,8 @@ msgstr "Çizelgeleme"
#: templates/core/job.html:66
#, python-format
-msgid "every %(interval)s seconds"
-msgstr "her bir %(interval)s saniyeler"
+msgid "every %(interval)s minutes"
+msgstr "her bir %(interval)s dakikalar"
#: templates/dcim/bulk_disconnect.html:9
#, python-format
@@ -12852,66 +12852,66 @@ msgstr "Bu nesne türü için kısıtlamalar desteklenmez."
msgid "Invalid filter for {model}: {error}"
msgstr "Geçersiz filtre {model}: {error}"
-#: users/models.py:54
+#: users/models.py:55
msgid "user"
msgstr "kullanıcı"
-#: users/models.py:55
+#: users/models.py:56
msgid "users"
msgstr "kullanıcıları"
-#: users/models.py:66
+#: users/models.py:67
msgid "A user with this username already exists."
msgstr "Bu kullanıcı adına sahip bir kullanıcı zaten var."
-#: users/models.py:78 vpn/models/crypto.py:42
+#: users/models.py:79 vpn/models/crypto.py:42
msgid "group"
msgstr "grup"
-#: users/models.py:79
+#: users/models.py:80
msgid "groups"
msgstr "gruplar"
-#: users/models.py:106 users/models.py:107
+#: users/models.py:107 users/models.py:108
msgid "user preferences"
msgstr "kullanıcı tercihleri"
-#: users/models.py:174
+#: users/models.py:175
#, python-brace-format
msgid "Key '{path}' is a leaf node; cannot assign new keys"
msgstr "Anahtar '{path}'bir yaprak düğümüdür; yeni anahtarlar atanamıyor"
-#: users/models.py:186
+#: users/models.py:187
#, python-brace-format
msgid "Key '{path}' is a dictionary; cannot assign a non-dictionary value"
msgstr "Anahtar '{path}'bir sözlüktür; sözlük dışı bir değer atayamaz"
-#: users/models.py:252
+#: users/models.py:253
msgid "expires"
msgstr "süresi dolmak"
-#: users/models.py:257
+#: users/models.py:258
msgid "last used"
msgstr "son kullanılan"
-#: users/models.py:262
+#: users/models.py:263
msgid "key"
msgstr "anahtar"
-#: users/models.py:268
+#: users/models.py:269
msgid "write enabled"
msgstr "yazma etkin"
-#: users/models.py:270
+#: users/models.py:271
msgid "Permit create/update/delete operations using this key"
msgstr ""
"Bu anahtarı kullanarak oluşturma/güncelleme/silme işlemlerine izin verin"
-#: users/models.py:281
+#: users/models.py:282
msgid "allowed IPs"
msgstr "izin verilen IP'ler"
-#: users/models.py:283
+#: users/models.py:284
msgid ""
"Allowed IPv4/IPv6 networks from where the token can be used. Leave blank for"
" no restrictions. Ex: \"10.1.1.0/24, 192.168.10.16/32, 2001:DB8:1::/64\""
@@ -12920,32 +12920,32 @@ msgstr ""
"olmadan boş bırakın. Örn: “10.1.1.0/24, 192.168.10.16/32, 2001: DB 8:1: "
":/64\""
-#: users/models.py:291
+#: users/models.py:296
msgid "token"
msgstr "jeton"
-#: users/models.py:292
+#: users/models.py:297
msgid "tokens"
msgstr "jetonlar"
-#: users/models.py:373
+#: users/models.py:378
msgid "The list of actions granted by this permission"
msgstr "Bu izin tarafından verilen eylemlerin listesi"
-#: users/models.py:378
+#: users/models.py:383
msgid "constraints"
msgstr "kısıtlamaları"
-#: users/models.py:379
+#: users/models.py:384
msgid ""
"Queryset filter matching the applicable objects of the selected type(s)"
msgstr "Seçili türlerin uygulanabilir nesneleriyle eşleşen Queryset filtresi"
-#: users/models.py:386
+#: users/models.py:391
msgid "permission"
msgstr "izin"
-#: users/models.py:387
+#: users/models.py:392
msgid "permissions"
msgstr "izinler"
@@ -13215,44 +13215,53 @@ msgstr ""
"Bu nesne, form oluşturulduğundan beri değiştirildi. Ayrıntılar için lütfen "
"nesnenin değişiklik günlüğüne bakın."
-#: utilities/forms/utils.py:42 utilities/forms/utils.py:65
-#: utilities/forms/utils.py:77 utilities/forms/utils.py:80
+#: utilities/forms/utils.py:42 utilities/forms/utils.py:68
+#: utilities/forms/utils.py:85 utilities/forms/utils.py:87
#, python-brace-format
msgid "Range \"{value}\" is invalid."
msgstr "Menzil”{value}“geçersiz."
-#: utilities/forms/utils.py:225
+#: utilities/forms/utils.py:74
+#, python-brace-format
+msgid ""
+"Invalid range: Ending value ({end}) must be greater than beginning value "
+"({begin})."
+msgstr ""
+"Geçersiz aralık: Bitiş değeri ({end}) başlangıç değerinden büyük olmalıdır "
+"({begin})."
+
+#: utilities/forms/utils.py:232
#, python-brace-format
msgid "Duplicate or conflicting column header for \"{field}\""
msgstr "Yinelenen veya çakışan sütun başlığı”{field}“"
-#: utilities/forms/utils.py:231
+#: utilities/forms/utils.py:238
#, python-brace-format
msgid "Duplicate or conflicting column header for \"{header}\""
msgstr "Yinelenen veya çakışan sütun başlığı”{header}“"
-#: utilities/forms/utils.py:240
+#: utilities/forms/utils.py:247
#, python-brace-format
msgid "Row {row}: Expected {count_expected} columns but found {count_found}"
msgstr ""
"Satır {row}: Bekleniyor {count_expected} sütunlar ama bulundu {count_found}"
-#: utilities/forms/utils.py:263
+#: utilities/forms/utils.py:270
#, python-brace-format
msgid "Unexpected column header \"{field}\" found."
msgstr "Beklenmeyen sütun başlığı”{field}“bulundu."
-#: utilities/forms/utils.py:265
+#: utilities/forms/utils.py:272
#, python-brace-format
msgid "Column \"{field}\" is not a related object; cannot use dots"
msgstr "Sütun”{field}“ilgili bir nesne değildir; nokta kullanamaz"
-#: utilities/forms/utils.py:269
+#: utilities/forms/utils.py:276
#, python-brace-format
msgid "Invalid related object attribute for column \"{field}\": {to_field}"
msgstr "Sütun için geçersiz ilgili nesne özniteliği”{field}“: {to_field}"
-#: utilities/forms/utils.py:277
+#: utilities/forms/utils.py:284
#, python-brace-format
msgid "Required column header \"{header}\" not found."
msgstr "Gerekli sütun başlığı”{header}“Bulunamadı."
@@ -13882,6 +13891,11 @@ msgstr "Teklif"
msgid "Assigned Object Type"
msgstr "Atanan Nesne Türü"
+#: vpn/forms/model_forms.py:94 vpn/forms/model_forms.py:129
+#: vpn/forms/model_forms.py:241 vpn/tables/tunnels.py:91
+msgid "Tunnel interface"
+msgstr "Tünel arayüzü"
+
#: vpn/forms/model_forms.py:147
msgid "First Termination"
msgstr "İlk Fesih"
diff --git a/netbox/users/forms/filtersets.py b/netbox/users/forms/filtersets.py
index 4ae2bd729..0e9e99a83 100644
--- a/netbox/users/forms/filtersets.py
+++ b/netbox/users/forms/filtersets.py
@@ -11,21 +11,21 @@ from utilities.forms.fields import DynamicModelMultipleChoiceField
from utilities.forms.widgets import DateTimePicker
__all__ = (
- 'GroupFilterForm',
+ 'NetBoxGroupFilterForm',
'ObjectPermissionFilterForm',
- 'UserFilterForm',
+ 'NetBoxUserFilterForm',
'TokenFilterForm',
)
-class GroupFilterForm(NetBoxModelFilterSetForm):
+class NetBoxGroupFilterForm(NetBoxModelFilterSetForm):
model = NetBoxGroup
fieldsets = (
(None, ('q', 'filter_id',)),
)
-class UserFilterForm(NetBoxModelFilterSetForm):
+class NetBoxUserFilterForm(NetBoxModelFilterSetForm):
model = NetBoxUser
fieldsets = (
(None, ('q', 'filter_id',)),
diff --git a/netbox/users/models.py b/netbox/users/models.py
index 52ce55e6c..160f49ac4 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -17,6 +17,7 @@ from netaddr import IPNetwork
from core.models import ContentType
from ipam.fields import IPNetworkField
from netbox.config import get_config
+from netbox.models.features import CloningMixin
from utilities.querysets import RestrictedQuerySet
from utilities.utils import flatten_dict
from .constants import *
@@ -234,7 +235,7 @@ def create_userconfig(instance, created, raw=False, **kwargs):
# REST API
#
-class Token(models.Model):
+class Token(CloningMixin, models.Model):
"""
An API token used for user authentication. This extends the stock model to allow each user to have multiple tokens.
It also supports setting an expiration time and toggling write ability.
@@ -285,6 +286,10 @@ class Token(models.Model):
),
)
+ clone_fields = (
+ 'user', 'expires', 'write_enabled', 'description', 'allowed_ips',
+ )
+
objects = RestrictedQuerySet.as_manager()
class Meta:
diff --git a/netbox/users/views.py b/netbox/users/views.py
index 2e7a47c12..e0fda403e 100644
--- a/netbox/users/views.py
+++ b/netbox/users/views.py
@@ -58,7 +58,7 @@ class TokenBulkDeleteView(generic.BulkDeleteView):
class UserListView(generic.ObjectListView):
queryset = NetBoxUser.objects.all()
filterset = filtersets.UserFilterSet
- filterset_form = forms.UserFilterForm
+ filterset_form = forms.NetBoxUserFilterForm
table = tables.UserTable
@@ -112,7 +112,7 @@ class UserBulkDeleteView(generic.BulkDeleteView):
class GroupListView(generic.ObjectListView):
queryset = NetBoxGroup.objects.annotate(users_count=Count('user'))
filterset = filtersets.GroupFilterSet
- filterset_form = forms.GroupFilterForm
+ filterset_form = forms.NetBoxGroupFilterForm
table = tables.GroupTable
diff --git a/netbox/utilities/forms/forms.py b/netbox/utilities/forms/forms.py
index 54c9e41cb..93227b1d0 100644
--- a/netbox/utilities/forms/forms.py
+++ b/netbox/utilities/forms/forms.py
@@ -70,6 +70,12 @@ class CSVModelForm(forms.ModelForm):
"""
ModelForm used for the import of objects in CSV format.
"""
+ id = forms.IntegerField(
+ label=_('ID'),
+ required=False,
+ help_text=_('Numeric ID of an existing object to update (if not creating a new object)')
+ )
+
def __init__(self, *args, headers=None, **kwargs):
self.headers = headers or {}
super().__init__(*args, **kwargs)
diff --git a/netbox/utilities/testing/base.py b/netbox/utilities/testing/base.py
index aa2093a9a..52e5d66ca 100644
--- a/netbox/utilities/testing/base.py
+++ b/netbox/utilities/testing/base.py
@@ -10,10 +10,11 @@ from django.test import Client, TestCase as _TestCase
from netaddr import IPNetwork
from taggit.managers import TaggableManager
+from netbox.models.features import CustomFieldsMixin
from users.models import ObjectPermission
from utilities.permissions import resolve_permission_ct
from utilities.utils import content_type_identifier
-from .utils import extract_form_failures
+from .utils import DUMMY_CF_DATA, extract_form_failures
__all__ = (
'ModelTestCase',
@@ -166,8 +167,12 @@ class ModelTestCase(TestCase):
model_dict = self.model_to_dict(instance, fields=fields, api=api)
# Omit any dictionary keys which are not instance attributes or have been excluded
- relevant_data = {
+ model_data = {
k: v for k, v in data.items() if hasattr(instance, k) and k not in exclude
}
- self.assertDictEqual(model_dict, relevant_data)
+ self.assertDictEqual(model_dict, model_data)
+
+ # Validate any custom field data, if present
+ if getattr(instance, 'custom_field_data', None):
+ self.assertDictEqual(instance.custom_field_data, DUMMY_CF_DATA)
diff --git a/netbox/utilities/testing/utils.py b/netbox/utilities/testing/utils.py
index fd6d72e27..238f8170e 100644
--- a/netbox/utilities/testing/utils.py
+++ b/netbox/utilities/testing/utils.py
@@ -1,13 +1,16 @@
+import json
import logging
import re
from contextlib import contextmanager
from django.contrib.auth import get_user_model
from django.contrib.auth.models import Permission
+from django.contrib.contenttypes.models import ContentType
from django.utils.text import slugify
from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Site
-from extras.models import Tag
+from extras.choices import CustomFieldTypeChoices
+from extras.models import CustomField, Tag
from virtualization.models import Cluster, ClusterType, VirtualMachine
@@ -102,3 +105,42 @@ def disable_warnings(logger_name):
logger.setLevel(logging.ERROR)
yield
logger.setLevel(current_level)
+
+
+#
+# Custom field testing
+#
+
+DUMMY_CF_DATA = {
+ 'text_field': 'foo123',
+ 'integer_field': 456,
+ 'decimal_field': 456.12,
+ 'boolean_field': True,
+ 'json_field': {'abc': 123},
+}
+
+
+def add_custom_field_data(form_data, model):
+ """
+ Create some custom fields for the model and add a value for each to the form data.
+
+ Args:
+ form_data: The dictionary of form data to be updated
+ model: The model of the object the form seeks to create or modify
+ """
+ content_type = ContentType.objects.get_for_model(model)
+ custom_fields = (
+ CustomField(type=CustomFieldTypeChoices.TYPE_TEXT, name='text_field', default='foo'),
+ CustomField(type=CustomFieldTypeChoices.TYPE_INTEGER, name='integer_field', default=123),
+ CustomField(type=CustomFieldTypeChoices.TYPE_DECIMAL, name='decimal_field', default=123.45),
+ CustomField(type=CustomFieldTypeChoices.TYPE_BOOLEAN, name='boolean_field', default=False),
+ CustomField(type=CustomFieldTypeChoices.TYPE_JSON, name='json_field', default='{"x": "y"}'),
+ )
+ CustomField.objects.bulk_create(custom_fields)
+ for cf in custom_fields:
+ cf.content_types.set([content_type])
+
+ form_data.update({
+ f'cf_{k}': v if type(v) is str else json.dumps(v)
+ for k, v in DUMMY_CF_DATA.items()
+ })
diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index daa44b905..22371db3c 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -10,11 +10,11 @@ from django.utils.translation import gettext as _
from extras.choices import ObjectChangeActionChoices
from extras.models import ObjectChange
-from netbox.models.features import ChangeLoggingMixin
+from netbox.models.features import ChangeLoggingMixin, CustomFieldsMixin
from users.models import ObjectPermission
from utilities.choices import CSVDelimiterChoices, ImportFormatChoices
from .base import ModelTestCase
-from .utils import disable_warnings, post_data
+from .utils import add_custom_field_data, disable_warnings, post_data
__all__ = (
'ModelViewTestCase',
@@ -26,7 +26,6 @@ __all__ = (
# UI Tests
#
-
class ModelViewTestCase(ModelTestCase):
"""
Base TestCase for model views. Subclass to test individual views.
@@ -166,6 +165,10 @@ class ViewTestCases:
# Try GET with model-level permission
self.assertHttpStatus(self.client.get(self._get_url('add')), 200)
+ # Add custom field data if the model supports it
+ if issubclass(self.model, CustomFieldsMixin):
+ add_custom_field_data(self.form_data, self.model)
+
# Try POST with model-level permission
initial_count = self._get_queryset().count()
request = {
@@ -265,6 +268,10 @@ class ViewTestCases:
# Try GET with model-level permission
self.assertHttpStatus(self.client.get(self._get_url('edit', instance)), 200)
+ # Add custom field data if the model supports it
+ if issubclass(self.model, CustomFieldsMixin):
+ add_custom_field_data(self.form_data, self.model)
+
# Try POST with model-level permission
request = {
'path': self._get_url('edit', instance),
diff --git a/netbox/virtualization/api/serializers.py b/netbox/virtualization/api/serializers.py
index 34e4037e9..a54643e62 100644
--- a/netbox/virtualization/api/serializers.py
+++ b/netbox/virtualization/api/serializers.py
@@ -76,7 +76,7 @@ class VirtualMachineSerializer(NetBoxModelSerializer):
role = NestedDeviceRoleSerializer(required=False, allow_null=True)
tenant = NestedTenantSerializer(required=False, allow_null=True)
platform = NestedPlatformSerializer(required=False, allow_null=True)
- primary_ip = NestedIPAddressSerializer(read_only=True)
+ primary_ip = NestedIPAddressSerializer(read_only=True, allow_null=True)
primary_ip4 = NestedIPAddressSerializer(required=False, allow_null=True)
primary_ip6 = NestedIPAddressSerializer(required=False, allow_null=True)
config_template = NestedConfigTemplateSerializer(required=False, allow_null=True, default=None)
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 6019fc227..ec19a1d22 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -388,7 +388,7 @@ class VirtualMachineVirtualDisksView(generic.ObjectChildrenView):
tab = ViewTab(
label=_('Virtual Disks'),
badge=lambda obj: obj.virtual_disk_count,
- permission='virtualization.view_virtual_disk',
+ permission='virtualization.view_virtualdisk',
weight=500
)
actions = {
diff --git a/netbox/vpn/api/serializers.py b/netbox/vpn/api/serializers.py
index 5f6fcd5f7..36ccf28de 100644
--- a/netbox/vpn/api/serializers.py
+++ b/netbox/vpn/api/serializers.py
@@ -98,6 +98,9 @@ class TunnelTerminationSerializer(NetBoxModelSerializer):
@extend_schema_field(serializers.JSONField(allow_null=True))
def get_termination(self, obj):
+ if not obj.termination:
+ return None
+
serializer = get_serializer_for_model(obj.termination, prefix=NESTED_SERIALIZER_PREFIX)
context = {'request': self.context['request']}
return serializer(obj.termination, context=context).data
diff --git a/netbox/vpn/filtersets.py b/netbox/vpn/filtersets.py
index 0647838a8..10f0834fb 100644
--- a/netbox/vpn/filtersets.py
+++ b/netbox/vpn/filtersets.py
@@ -136,6 +136,17 @@ class IKEProposalFilterSet(NetBoxModelFilterSet):
group = django_filters.MultipleChoiceFilter(
choices=DHGroupChoices
)
+ ike_policy_id = django_filters.ModelMultipleChoiceFilter(
+ field_name='ike_policies',
+ queryset=IKEPolicy.objects.all(),
+ label=_('IKE policy (ID)'),
+ )
+ ike_policy = django_filters.ModelMultipleChoiceFilter(
+ field_name='ike_policies__name',
+ queryset=IKEPolicy.objects.all(),
+ to_field_name='name',
+ label=_('IKE policy (name)'),
+ )
class Meta:
model = IKEProposal
diff --git a/netbox/vpn/forms/model_forms.py b/netbox/vpn/forms/model_forms.py
index f936de88c..adf358be7 100644
--- a/netbox/vpn/forms/model_forms.py
+++ b/netbox/vpn/forms/model_forms.py
@@ -91,7 +91,7 @@ class TunnelCreateForm(TunnelForm):
termination1_termination = DynamicModelChoiceField(
queryset=Interface.objects.all(),
required=False,
- label=_('Interface'),
+ label=_('Tunnel interface'),
query_params={
'device_id': '$termination1_parent',
}
@@ -126,7 +126,7 @@ class TunnelCreateForm(TunnelForm):
termination2_termination = DynamicModelChoiceField(
queryset=Interface.objects.all(),
required=False,
- label=_('Interface'),
+ label=_('Tunnel interface'),
query_params={
'device_id': '$termination2_parent',
}
@@ -238,7 +238,7 @@ class TunnelTerminationForm(NetBoxModelForm):
)
termination = DynamicModelChoiceField(
queryset=Interface.objects.all(),
- label=_('Interface'),
+ label=_('Tunnel interface'),
query_params={
'device_id': '$parent',
}
diff --git a/netbox/vpn/search.py b/netbox/vpn/search.py
index 066bc68bb..c1914dc22 100644
--- a/netbox/vpn/search.py
+++ b/netbox/vpn/search.py
@@ -75,6 +75,7 @@ class L2VPNIndex(SearchIndex):
fields = (
('name', 100),
('slug', 110),
+ ('identifier', 200),
('description', 500),
('comments', 5000),
)
diff --git a/netbox/vpn/tables/l2vpn.py b/netbox/vpn/tables/l2vpn.py
index 91fddbd66..9a614ab98 100644
--- a/netbox/vpn/tables/l2vpn.py
+++ b/netbox/vpn/tables/l2vpn.py
@@ -74,7 +74,7 @@ class L2VPNTerminationTable(NetBoxTable):
verbose_name=_('Object Site')
)
tags = columns.TagColumn(
- url_name='ipam:l2vpntermination_list'
+ url_name='vpn:l2vpntermination_list'
)
class Meta(NetBoxTable.Meta):
diff --git a/netbox/vpn/tables/tunnels.py b/netbox/vpn/tables/tunnels.py
index bc591c1e6..cf4230652 100644
--- a/netbox/vpn/tables/tunnels.py
+++ b/netbox/vpn/tables/tunnels.py
@@ -88,7 +88,7 @@ class TunnelTerminationTable(TenancyColumnsMixin, NetBoxTable):
verbose_name=_('Host')
)
termination = tables.Column(
- verbose_name=_('Interface'),
+ verbose_name=_('Tunnel interface'),
linkify=True
)
ip_addresses = tables.ManyToManyColumn(
diff --git a/netbox/vpn/tests/test_filtersets.py b/netbox/vpn/tests/test_filtersets.py
index d4e80750d..f11e63f10 100644
--- a/netbox/vpn/tests/test_filtersets.py
+++ b/netbox/vpn/tests/test_filtersets.py
@@ -331,6 +331,16 @@ class IKEProposalTestCase(TestCase, ChangeLoggedFilterSetTests):
)
IKEProposal.objects.bulk_create(ike_proposals)
+ ike_policies = (
+ IKEPolicy(name='IKE Policy 1'),
+ IKEPolicy(name='IKE Policy 2'),
+ IKEPolicy(name='IKE Policy 3'),
+ )
+ IKEPolicy.objects.bulk_create(ike_policies)
+ ike_policies[0].proposals.add(ike_proposals[0])
+ ike_policies[1].proposals.add(ike_proposals[1])
+ ike_policies[2].proposals.add(ike_proposals[2])
+
def test_q(self):
params = {'q': 'foobar1'}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
@@ -369,6 +379,13 @@ class IKEProposalTestCase(TestCase, ChangeLoggedFilterSetTests):
params = {'sa_lifetime': [1000, 2000]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+ def test_ike_policy(self):
+ ike_policies = IKEPolicy.objects.all()[:2]
+ params = {'ike_policy_id': [ike_policies[0].pk, ike_policies[1].pk]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+ params = {'ike_policy': [ike_policies[0].name, ike_policies[1].name]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
class IKEPolicyTestCase(TestCase, ChangeLoggedFilterSetTests):
queryset = IKEPolicy.objects.all()
diff --git a/netbox/wireless/forms/bulk_import.py b/netbox/wireless/forms/bulk_import.py
index c0e2dfb54..38bc37360 100644
--- a/netbox/wireless/forms/bulk_import.py
+++ b/netbox/wireless/forms/bulk_import.py
@@ -42,7 +42,7 @@ class WirelessLANImportForm(NetBoxModelImportForm):
status = CSVChoiceField(
label=_('Status'),
choices=WirelessLANStatusChoices,
- help_text='Operational status'
+ help_text=_('Operational status')
)
vlan = CSVModelChoiceField(
label=_('VLAN'),
diff --git a/requirements.txt b/requirements.txt
index 39922c9b5..0cf22c7d8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,34 +2,34 @@ bleach==6.1.0
Django==4.2.11
django-cors-headers==4.3.1
django-debug-toolbar==4.3.0
-django-filter==24.1
+django-filter==24.2
django-graphiql-debug-toolbar==0.2.0
django-mptt==0.14.0
django-pglocks==1.0.4
django-prometheus==2.3.1
django-redis==5.4.0
django-rich==1.8.0
-django-rq==2.10.1
+django-rq==2.10.2
django-taggit==5.0.1
django-tables2==2.7.0
django-timezone-field==6.1.0
djangorestframework==3.14.0
-drf-spectacular==0.27.1
-drf-spectacular-sidecar==2024.3.4
+drf-spectacular==0.27.2
+drf-spectacular-sidecar==2024.5.1
feedparser==6.0.11
graphene-django==3.0.0
-gunicorn==21.2.0
+gunicorn==22.0.0
Jinja2==3.1.3
-Markdown==3.5.2
-mkdocs-material==9.5.13
-mkdocstrings[python-legacy]==0.24.1
+Markdown==3.6
+mkdocs-material==9.5.20
+mkdocstrings[python-legacy]==0.25.0
netaddr==1.2.1
-Pillow==10.2.0
+Pillow==10.3.0
psycopg[binary,pool]==3.1.18
PyYAML==6.0.1
requests==2.31.0
-social-auth-app-django==5.4.0
-social-auth-core[openidconnect]==4.5.3
+social-auth-app-django==5.4.1
+social-auth-core==4.5.4
svgwrite==1.4.3
-tablib==3.5.0
+tablib==3.6.1
tzdata==2024.1