diff --git a/contrib/openapi2.json b/contrib/openapi2.json index 0889a3e67..ccc197500 100644 --- a/contrib/openapi2.json +++ b/contrib/openapi2.json @@ -72879,7 +72879,7 @@ "x-nullable": true }, "length_unit": { - "title": "Length unit", + "title": "Length Unit", "required": [ "label", "value" @@ -73038,7 +73038,7 @@ "x-nullable": true }, "length_unit": { - "title": "Length unit", + "title": "Length Unit", "type": "string", "enum": [ "km", @@ -89655,7 +89655,7 @@ "minimum": 0 }, "auth_type": { - "title": "Authentication type", + "title": "Authentication Type", "type": "string", "enum": [ "plaintext", @@ -95185,7 +95185,7 @@ } }, "auth_psk": { - "title": "Pre-shared key", + "title": "Pre-Shared Key", "type": "string", "maxLength": 64 }, @@ -95298,7 +95298,7 @@ ] }, "auth_psk": { - "title": "Pre-shared key", + "title": "Pre-Shared Key", "type": "string", "maxLength": 64 }, @@ -95451,7 +95451,7 @@ } }, "auth_psk": { - "title": "Pre-shared key", + "title": "Pre-Shared Key", "type": "string", "maxLength": 64 }, @@ -95561,7 +95561,7 @@ ] }, "auth_psk": { - "title": "Pre-shared key", + "title": "Pre-Shared Key", "type": "string", "maxLength": 64 }, diff --git a/contrib/openapi2.yaml b/contrib/openapi2.yaml index eabb7016e..ed3e7a0b8 100644 --- a/contrib/openapi2.yaml +++ b/contrib/openapi2.yaml @@ -51041,7 +51041,7 @@ definitions: format: decimal x-nullable: true length_unit: - title: Length unit + title: Length Unit required: - label - value @@ -51169,7 +51169,7 @@ definitions: format: decimal x-nullable: true length_unit: - title: Length unit + title: Length Unit type: string enum: - km @@ -65033,7 +65033,7 @@ definitions: maximum: 32767 minimum: 0 auth_type: - title: Authentication type + title: Authentication Type type: string enum: - plaintext @@ -69373,7 +69373,7 @@ definitions: - tkip - aes auth_psk: - title: Pre-shared key + title: Pre-Shared Key type: string maxLength: 64 comments: @@ -69462,7 +69462,7 @@ definitions: - tkip - aes auth_psk: - title: Pre-shared key + title: Pre-Shared Key type: string maxLength: 64 comments: @@ -69577,7 +69577,7 @@ definitions: - tkip - aes auth_psk: - title: Pre-shared key + title: Pre-Shared Key type: string maxLength: 64 description: @@ -69663,7 +69663,7 @@ definitions: - tkip - aes auth_psk: - title: Pre-shared key + title: Pre-Shared Key type: string maxLength: 64 description: diff --git a/docs/features/wireless.md b/docs/features/wireless.md index c78387efb..3ec7b304d 100644 --- a/docs/features/wireless.md +++ b/docs/features/wireless.md @@ -18,7 +18,7 @@ Authentication attributes for wireless LANs include: * **Type** - Open, WEP, WPA, etc. * **Cipher** - Auto, TKIP, or AES -* **Pre-shared key (PSK)** - The secret key configured on all participating clients +* **Pre-Shared Key (PSK)** - The secret key configured on all participating clients The definition of authentication parameters is optional. diff --git a/docs/models/vpn/ikeproposal.md b/docs/models/vpn/ikeproposal.md index 312ec1f6c..1c270aeb9 100644 --- a/docs/models/vpn/ikeproposal.md +++ b/docs/models/vpn/ikeproposal.md @@ -17,7 +17,7 @@ The strategy employed for authenticating the IKE peer. Available options are lis | Name | |----------------| -| Pre-shared key | +| Pre-Shared Key | | Certificate | | RSA signature | | DSA signature | diff --git a/netbox/dcim/forms/bulk_edit.py b/netbox/dcim/forms/bulk_edit.py index 2c943693b..21713ffaa 100644 --- a/netbox/dcim/forms/bulk_edit.py +++ b/netbox/dcim/forms/bulk_edit.py @@ -708,7 +708,7 @@ class CableBulkEditForm(NetBoxModelBulkEditForm): required=False ) length_unit = forms.ChoiceField( - label=_('Length unit'), + label=_('Length Unit'), choices=add_blank_choice(CableLengthUnitChoices), required=False, initial='' diff --git a/netbox/dcim/forms/bulk_import.py b/netbox/dcim/forms/bulk_import.py index 565486e75..8d614727c 100644 --- a/netbox/dcim/forms/bulk_import.py +++ b/netbox/dcim/forms/bulk_import.py @@ -1171,10 +1171,10 @@ class CableImportForm(NetBoxModelImportForm): help_text=_('Assigned tenant') ) length_unit = CSVChoiceField( - label=_('Length unit'), + label=_('Length Unit'), choices=CableLengthUnitChoices, required=False, - help_text=_('Length unit') + help_text=_('Length Unit') ) class Meta: diff --git a/netbox/dcim/forms/filtersets.py b/netbox/dcim/forms/filtersets.py index 0bb789534..d1c9ba082 100644 --- a/netbox/dcim/forms/filtersets.py +++ b/netbox/dcim/forms/filtersets.py @@ -980,7 +980,7 @@ class CableFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): required=False, ) length_unit = forms.ChoiceField( - label=_('Length unit'), + label=_('Length Unit'), choices=add_blank_choice(CableLengthUnitChoices), required=False ) diff --git a/netbox/ipam/forms/bulk_edit.py b/netbox/ipam/forms/bulk_edit.py index 592e136e4..b064cf126 100644 --- a/netbox/ipam/forms/bulk_edit.py +++ b/netbox/ipam/forms/bulk_edit.py @@ -380,7 +380,7 @@ class FHRPGroupBulkEditForm(NetBoxModelBulkEditForm): auth_type = forms.ChoiceField( choices=add_blank_choice(FHRPGroupAuthTypeChoices), required=False, - label=_('Authentication type') + label=_('Authentication Type') ) auth_key = forms.CharField( max_length=255, diff --git a/netbox/ipam/forms/filtersets.py b/netbox/ipam/forms/filtersets.py index b63abcf5b..9b5e94a55 100644 --- a/netbox/ipam/forms/filtersets.py +++ b/netbox/ipam/forms/filtersets.py @@ -399,7 +399,7 @@ class FHRPGroupFilterForm(NetBoxModelFilterSetForm): auth_type = forms.MultipleChoiceField( choices=FHRPGroupAuthTypeChoices, required=False, - label=_('Authentication type') + label=_('Authentication Type') ) auth_key = forms.CharField( required=False, diff --git a/netbox/translations/de/LC_MESSAGES/django.po b/netbox/translations/de/LC_MESSAGES/django.po index 6eac8a3a6..3cfc97f69 100644 --- a/netbox/translations/de/LC_MESSAGES/django.po +++ b/netbox/translations/de/LC_MESSAGES/django.po @@ -3075,7 +3075,7 @@ msgstr "Länge" #: dcim/forms/bulk_edit.py:711 dcim/forms/bulk_import.py:1174 #: dcim/forms/bulk_import.py:1177 dcim/forms/filtersets.py:983 -msgid "Length unit" +msgid "Length Unit" msgstr "Längeneinheit" #: dcim/forms/bulk_edit.py:735 templates/dcim/virtualchassis.html:23 @@ -8481,7 +8481,7 @@ msgstr "Gruppen-ID" #: wireless/forms/bulk_import.py:62 wireless/forms/bulk_import.py:65 #: wireless/forms/bulk_import.py:104 wireless/forms/bulk_import.py:107 #: wireless/forms/filtersets.py:54 wireless/forms/filtersets.py:88 -msgid "Authentication type" +msgid "Authentication Type" msgstr "Art der Authentifizierung" #: ipam/forms/bulk_edit.py:388 ipam/forms/filtersets.py:399 @@ -14221,7 +14221,7 @@ msgid "Main" msgstr "Haupt" #: vpn/choices.py:92 -msgid "Pre-shared keys" +msgid "Pre-Shared Keys" msgstr "Vorab geteilte Schlüssel" #: vpn/choices.py:93 @@ -14330,7 +14330,7 @@ msgstr "Ein Leben lang" #: vpn/forms/bulk_edit.py:151 wireless/forms/bulk_edit.py:79 #: wireless/forms/bulk_edit.py:126 wireless/forms/filtersets.py:64 #: wireless/forms/filtersets.py:98 -msgid "Pre-shared key" +msgid "Pre-Shared Key" msgstr "Vorab geteilter Schlüssel" #: vpn/forms/bulk_edit.py:237 vpn/forms/bulk_import.py:239 @@ -14669,7 +14669,7 @@ msgstr "WPA Enterprise" #: wireless/forms/bulk_import.py:68 wireless/forms/bulk_import.py:71 #: wireless/forms/bulk_import.py:110 wireless/forms/bulk_import.py:113 #: wireless/forms/filtersets.py:59 wireless/forms/filtersets.py:93 -msgid "Authentication cipher" +msgid "Authentication Cipher" msgstr "Authentifizierungchiffre" #: wireless/forms/bulk_import.py:52 diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index bc50990b6..f48492e2b 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -3023,7 +3023,7 @@ msgstr "" #: dcim/forms/bulk_edit.py:711 dcim/forms/bulk_import.py:1174 #: dcim/forms/bulk_import.py:1177 dcim/forms/filtersets.py:983 -msgid "Length unit" +msgid "Length Unit" msgstr "" #: dcim/forms/bulk_edit.py:735 templates/dcim/virtualchassis.html:23 @@ -8127,7 +8127,7 @@ msgstr "" #: wireless/forms/bulk_import.py:62 wireless/forms/bulk_import.py:65 #: wireless/forms/bulk_import.py:104 wireless/forms/bulk_import.py:107 #: wireless/forms/filtersets.py:54 wireless/forms/filtersets.py:88 -msgid "Authentication type" +msgid "Authentication Type" msgstr "" #: ipam/forms/bulk_edit.py:388 ipam/forms/filtersets.py:399 @@ -13614,7 +13614,7 @@ msgid "Main" msgstr "" #: vpn/choices.py:92 -msgid "Pre-shared keys" +msgid "Pre-Shared Keys" msgstr "" #: vpn/choices.py:93 @@ -13723,7 +13723,7 @@ msgstr "" #: vpn/forms/bulk_edit.py:151 wireless/forms/bulk_edit.py:79 #: wireless/forms/bulk_edit.py:126 wireless/forms/filtersets.py:64 #: wireless/forms/filtersets.py:98 -msgid "Pre-shared key" +msgid "Pre-Shared Key" msgstr "" #: vpn/forms/bulk_edit.py:237 vpn/forms/bulk_import.py:239 @@ -14050,7 +14050,7 @@ msgstr "" #: wireless/forms/bulk_import.py:68 wireless/forms/bulk_import.py:71 #: wireless/forms/bulk_import.py:110 wireless/forms/bulk_import.py:113 #: wireless/forms/filtersets.py:59 wireless/forms/filtersets.py:93 -msgid "Authentication cipher" +msgid "Authentication Cipher" msgstr "" #: wireless/forms/bulk_import.py:52 diff --git a/netbox/translations/es/LC_MESSAGES/django.po b/netbox/translations/es/LC_MESSAGES/django.po index 224945d0e..9cf965e16 100644 --- a/netbox/translations/es/LC_MESSAGES/django.po +++ b/netbox/translations/es/LC_MESSAGES/django.po @@ -3070,7 +3070,7 @@ msgstr "Longitud" #: dcim/forms/bulk_edit.py:711 dcim/forms/bulk_import.py:1174 #: dcim/forms/bulk_import.py:1177 dcim/forms/filtersets.py:983 -msgid "Length unit" +msgid "Length Unit" msgstr "Unidad de longitud" #: dcim/forms/bulk_edit.py:735 templates/dcim/virtualchassis.html:23 @@ -8439,7 +8439,7 @@ msgstr "ID de grupo" #: wireless/forms/bulk_import.py:62 wireless/forms/bulk_import.py:65 #: wireless/forms/bulk_import.py:104 wireless/forms/bulk_import.py:107 #: wireless/forms/filtersets.py:54 wireless/forms/filtersets.py:88 -msgid "Authentication type" +msgid "Authentication Type" msgstr "Tipo de autenticación" #: ipam/forms/bulk_edit.py:388 ipam/forms/filtersets.py:399 @@ -14161,7 +14161,7 @@ msgid "Main" msgstr "Principal" #: vpn/choices.py:92 -msgid "Pre-shared keys" +msgid "Pre-Shared Keys" msgstr "Claves previamente compartidas" #: vpn/choices.py:93 @@ -14270,7 +14270,7 @@ msgstr "Toda una vida" #: vpn/forms/bulk_edit.py:151 wireless/forms/bulk_edit.py:79 #: wireless/forms/bulk_edit.py:126 wireless/forms/filtersets.py:64 #: wireless/forms/filtersets.py:98 -msgid "Pre-shared key" +msgid "Pre-Shared Key" msgstr "Clave previamente compartida" #: vpn/forms/bulk_edit.py:237 vpn/forms/bulk_import.py:239 @@ -14603,7 +14603,7 @@ msgstr "Empresa WPA" #: wireless/forms/bulk_import.py:68 wireless/forms/bulk_import.py:71 #: wireless/forms/bulk_import.py:110 wireless/forms/bulk_import.py:113 #: wireless/forms/filtersets.py:59 wireless/forms/filtersets.py:93 -msgid "Authentication cipher" +msgid "Authentication Cipher" msgstr "Cifrado de autenticación" #: wireless/forms/bulk_import.py:52 diff --git a/netbox/translations/fr/LC_MESSAGES/django.po b/netbox/translations/fr/LC_MESSAGES/django.po index fac773a77..78bdc555b 100644 --- a/netbox/translations/fr/LC_MESSAGES/django.po +++ b/netbox/translations/fr/LC_MESSAGES/django.po @@ -3078,7 +3078,7 @@ msgstr "Longueur" #: dcim/forms/bulk_edit.py:711 dcim/forms/bulk_import.py:1174 #: dcim/forms/bulk_import.py:1177 dcim/forms/filtersets.py:983 -msgid "Length unit" +msgid "Length Unit" msgstr "Unité de longueur" #: dcim/forms/bulk_edit.py:735 templates/dcim/virtualchassis.html:23 @@ -8462,7 +8462,7 @@ msgstr "ID de groupe" #: wireless/forms/bulk_import.py:62 wireless/forms/bulk_import.py:65 #: wireless/forms/bulk_import.py:104 wireless/forms/bulk_import.py:107 #: wireless/forms/filtersets.py:54 wireless/forms/filtersets.py:88 -msgid "Authentication type" +msgid "Authentication Type" msgstr "Type d'authentification" #: ipam/forms/bulk_edit.py:388 ipam/forms/filtersets.py:399 @@ -14198,7 +14198,7 @@ msgid "Main" msgstr "Principal" #: vpn/choices.py:92 -msgid "Pre-shared keys" +msgid "Pre-Shared Keys" msgstr "Clés pré-partagées" #: vpn/choices.py:93 @@ -14307,7 +14307,7 @@ msgstr "Toute une vie" #: vpn/forms/bulk_edit.py:151 wireless/forms/bulk_edit.py:79 #: wireless/forms/bulk_edit.py:126 wireless/forms/filtersets.py:64 #: wireless/forms/filtersets.py:98 -msgid "Pre-shared key" +msgid "Pre-Shared Key" msgstr "Clé pré-partagée" #: vpn/forms/bulk_edit.py:237 vpn/forms/bulk_import.py:239 @@ -14641,7 +14641,7 @@ msgstr "WPA Entreprise" #: wireless/forms/bulk_import.py:68 wireless/forms/bulk_import.py:71 #: wireless/forms/bulk_import.py:110 wireless/forms/bulk_import.py:113 #: wireless/forms/filtersets.py:59 wireless/forms/filtersets.py:93 -msgid "Authentication cipher" +msgid "Authentication Cipher" msgstr "Chiffrement d'authentification" #: wireless/forms/bulk_import.py:52 diff --git a/netbox/translations/ja/LC_MESSAGES/django.po b/netbox/translations/ja/LC_MESSAGES/django.po index bdd1de37a..2845717b9 100644 --- a/netbox/translations/ja/LC_MESSAGES/django.po +++ b/netbox/translations/ja/LC_MESSAGES/django.po @@ -3057,7 +3057,7 @@ msgstr "長さ" #: dcim/forms/bulk_edit.py:711 dcim/forms/bulk_import.py:1174 #: dcim/forms/bulk_import.py:1177 dcim/forms/filtersets.py:983 -msgid "Length unit" +msgid "Length Unit" msgstr "長さの単位" #: dcim/forms/bulk_edit.py:735 templates/dcim/virtualchassis.html:23 @@ -8216,7 +8216,7 @@ msgstr "グループ ID" #: wireless/forms/bulk_import.py:62 wireless/forms/bulk_import.py:65 #: wireless/forms/bulk_import.py:104 wireless/forms/bulk_import.py:107 #: wireless/forms/filtersets.py:54 wireless/forms/filtersets.py:88 -msgid "Authentication type" +msgid "Authentication Type" msgstr "認証タイプ" #: ipam/forms/bulk_edit.py:388 ipam/forms/filtersets.py:399 @@ -13768,7 +13768,7 @@ msgid "Main" msgstr "メイン" #: vpn/choices.py:92 -msgid "Pre-shared keys" +msgid "Pre-Shared Keys" msgstr "事前共有キー" #: vpn/choices.py:93 @@ -13877,7 +13877,7 @@ msgstr "SA ライフタイム" #: vpn/forms/bulk_edit.py:151 wireless/forms/bulk_edit.py:79 #: wireless/forms/bulk_edit.py:126 wireless/forms/filtersets.py:64 #: wireless/forms/filtersets.py:98 -msgid "Pre-shared key" +msgid "Pre-Shared Key" msgstr "事前共有キー" #: vpn/forms/bulk_edit.py:237 vpn/forms/bulk_import.py:239 @@ -14205,7 +14205,7 @@ msgstr "WPA エンタープライズ" #: wireless/forms/bulk_import.py:68 wireless/forms/bulk_import.py:71 #: wireless/forms/bulk_import.py:110 wireless/forms/bulk_import.py:113 #: wireless/forms/filtersets.py:59 wireless/forms/filtersets.py:93 -msgid "Authentication cipher" +msgid "Authentication Cipher" msgstr "認証暗号" #: wireless/forms/bulk_import.py:52 diff --git a/netbox/translations/pt/LC_MESSAGES/django.po b/netbox/translations/pt/LC_MESSAGES/django.po index 8461a0428..4fd6643b9 100644 --- a/netbox/translations/pt/LC_MESSAGES/django.po +++ b/netbox/translations/pt/LC_MESSAGES/django.po @@ -3072,7 +3072,7 @@ msgstr "Comprimento" #: dcim/forms/bulk_edit.py:711 dcim/forms/bulk_import.py:1174 #: dcim/forms/bulk_import.py:1177 dcim/forms/filtersets.py:983 -msgid "Length unit" +msgid "Length Unit" msgstr "Unidade de comprimento" #: dcim/forms/bulk_edit.py:735 templates/dcim/virtualchassis.html:23 @@ -8416,7 +8416,7 @@ msgstr "ID do grupo" #: wireless/forms/bulk_import.py:62 wireless/forms/bulk_import.py:65 #: wireless/forms/bulk_import.py:104 wireless/forms/bulk_import.py:107 #: wireless/forms/filtersets.py:54 wireless/forms/filtersets.py:88 -msgid "Authentication type" +msgid "Authentication Type" msgstr "Tipo de autenticação" #: ipam/forms/bulk_edit.py:388 ipam/forms/filtersets.py:399 @@ -14108,7 +14108,7 @@ msgid "Main" msgstr "Principal" #: vpn/choices.py:92 -msgid "Pre-shared keys" +msgid "Pre-Shared Keys" msgstr "Chaves pré-compartilhadas" #: vpn/choices.py:93 @@ -14217,7 +14217,7 @@ msgstr "Uma vida útil" #: vpn/forms/bulk_edit.py:151 wireless/forms/bulk_edit.py:79 #: wireless/forms/bulk_edit.py:126 wireless/forms/filtersets.py:64 #: wireless/forms/filtersets.py:98 -msgid "Pre-shared key" +msgid "Pre-Shared Key" msgstr "Chave pré-compartilhada" #: vpn/forms/bulk_edit.py:237 vpn/forms/bulk_import.py:239 @@ -14549,7 +14549,7 @@ msgstr "WPA Empresarial" #: wireless/forms/bulk_import.py:68 wireless/forms/bulk_import.py:71 #: wireless/forms/bulk_import.py:110 wireless/forms/bulk_import.py:113 #: wireless/forms/filtersets.py:59 wireless/forms/filtersets.py:93 -msgid "Authentication cipher" +msgid "Authentication Cipher" msgstr "Cifra de autenticação" #: wireless/forms/bulk_import.py:52 diff --git a/netbox/translations/ru/LC_MESSAGES/django.po b/netbox/translations/ru/LC_MESSAGES/django.po index 6677c14c9..e0abc4bfc 100644 --- a/netbox/translations/ru/LC_MESSAGES/django.po +++ b/netbox/translations/ru/LC_MESSAGES/django.po @@ -3077,7 +3077,7 @@ msgstr "Длина" #: dcim/forms/bulk_edit.py:711 dcim/forms/bulk_import.py:1174 #: dcim/forms/bulk_import.py:1177 dcim/forms/filtersets.py:983 -msgid "Length unit" +msgid "Length Unit" msgstr "Единица длины" #: dcim/forms/bulk_edit.py:735 templates/dcim/virtualchassis.html:23 @@ -8406,7 +8406,7 @@ msgstr "Идентификатор группы" #: wireless/forms/bulk_import.py:62 wireless/forms/bulk_import.py:65 #: wireless/forms/bulk_import.py:104 wireless/forms/bulk_import.py:107 #: wireless/forms/filtersets.py:54 wireless/forms/filtersets.py:88 -msgid "Authentication type" +msgid "Authentication Type" msgstr "Тип аутентификации" #: ipam/forms/bulk_edit.py:388 ipam/forms/filtersets.py:399 @@ -14100,7 +14100,7 @@ msgid "Main" msgstr "Главная" #: vpn/choices.py:92 -msgid "Pre-shared keys" +msgid "Pre-Shared Keys" msgstr "PSK" #: vpn/choices.py:93 @@ -14209,7 +14209,7 @@ msgstr "Время жизни SA" #: vpn/forms/bulk_edit.py:151 wireless/forms/bulk_edit.py:79 #: wireless/forms/bulk_edit.py:126 wireless/forms/filtersets.py:64 #: wireless/forms/filtersets.py:98 -msgid "Pre-shared key" +msgid "Pre-Shared Key" msgstr "Предварительный общий ключ" #: vpn/forms/bulk_edit.py:237 vpn/forms/bulk_import.py:239 @@ -14541,7 +14541,7 @@ msgstr "Предприятие WPA" #: wireless/forms/bulk_import.py:68 wireless/forms/bulk_import.py:71 #: wireless/forms/bulk_import.py:110 wireless/forms/bulk_import.py:113 #: wireless/forms/filtersets.py:59 wireless/forms/filtersets.py:93 -msgid "Authentication cipher" +msgid "Authentication Cipher" msgstr "Шифр аутентификации" #: wireless/forms/bulk_import.py:52 diff --git a/netbox/translations/tr/LC_MESSAGES/django.po b/netbox/translations/tr/LC_MESSAGES/django.po index 6fbd73666..6e358e046 100644 --- a/netbox/translations/tr/LC_MESSAGES/django.po +++ b/netbox/translations/tr/LC_MESSAGES/django.po @@ -3066,7 +3066,7 @@ msgstr "Uzunluk" #: dcim/forms/bulk_edit.py:711 dcim/forms/bulk_import.py:1174 #: dcim/forms/bulk_import.py:1177 dcim/forms/filtersets.py:983 -msgid "Length unit" +msgid "Length Unit" msgstr "Uzunluk birimi" #: dcim/forms/bulk_edit.py:735 templates/dcim/virtualchassis.html:23 @@ -8336,7 +8336,7 @@ msgstr "Grup Kimliği" #: wireless/forms/bulk_import.py:62 wireless/forms/bulk_import.py:65 #: wireless/forms/bulk_import.py:104 wireless/forms/bulk_import.py:107 #: wireless/forms/filtersets.py:54 wireless/forms/filtersets.py:88 -msgid "Authentication type" +msgid "Authentication Type" msgstr "Kimlik doğrulama türü" #: ipam/forms/bulk_edit.py:388 ipam/forms/filtersets.py:399 @@ -14000,7 +14000,7 @@ msgid "Main" msgstr "Ana" #: vpn/choices.py:92 -msgid "Pre-shared keys" +msgid "Pre-Shared Keys" msgstr "Önceden paylaşılan anahtarlar" #: vpn/choices.py:93 @@ -14109,7 +14109,7 @@ msgstr "SA ömrü" #: vpn/forms/bulk_edit.py:151 wireless/forms/bulk_edit.py:79 #: wireless/forms/bulk_edit.py:126 wireless/forms/filtersets.py:64 #: wireless/forms/filtersets.py:98 -msgid "Pre-shared key" +msgid "Pre-Shared Key" msgstr "Önceden paylaşılan anahtar" #: vpn/forms/bulk_edit.py:237 vpn/forms/bulk_import.py:239 @@ -14440,7 +14440,7 @@ msgstr "WPA Kurumsal" #: wireless/forms/bulk_import.py:68 wireless/forms/bulk_import.py:71 #: wireless/forms/bulk_import.py:110 wireless/forms/bulk_import.py:113 #: wireless/forms/filtersets.py:59 wireless/forms/filtersets.py:93 -msgid "Authentication cipher" +msgid "Authentication Cipher" msgstr "Kimlik doğrulama şifresi" #: wireless/forms/bulk_import.py:52 diff --git a/netbox/translations/uk/LC_MESSAGES/django.po b/netbox/translations/uk/LC_MESSAGES/django.po index e014dd928..03cc433c9 100644 --- a/netbox/translations/uk/LC_MESSAGES/django.po +++ b/netbox/translations/uk/LC_MESSAGES/django.po @@ -3063,7 +3063,7 @@ msgstr "Довжина" #: dcim/forms/bulk_edit.py:711 dcim/forms/bulk_import.py:1174 #: dcim/forms/bulk_import.py:1177 dcim/forms/filtersets.py:983 -msgid "Length unit" +msgid "Length Unit" msgstr "одиниця довжини" #: dcim/forms/bulk_edit.py:735 templates/dcim/virtualchassis.html:23 @@ -8366,7 +8366,7 @@ msgstr "Ідентифікатор групи" #: wireless/forms/bulk_import.py:62 wireless/forms/bulk_import.py:65 #: wireless/forms/bulk_import.py:104 wireless/forms/bulk_import.py:107 #: wireless/forms/filtersets.py:54 wireless/forms/filtersets.py:88 -msgid "Authentication type" +msgid "Authentication Type" msgstr "Тип аутентифікації" #: ipam/forms/bulk_edit.py:388 ipam/forms/filtersets.py:399 @@ -14040,7 +14040,7 @@ msgid "Main" msgstr "Головний" #: vpn/choices.py:92 -msgid "Pre-shared keys" +msgid "Pre-Shared Keys" msgstr "Попередньо спільні ключі" #: vpn/choices.py:93 @@ -14149,7 +14149,7 @@ msgstr "Термін служби SA" #: vpn/forms/bulk_edit.py:151 wireless/forms/bulk_edit.py:79 #: wireless/forms/bulk_edit.py:126 wireless/forms/filtersets.py:64 #: wireless/forms/filtersets.py:98 -msgid "Pre-shared key" +msgid "Pre-Shared Key" msgstr "Попередньо спільний ключ" #: vpn/forms/bulk_edit.py:237 vpn/forms/bulk_import.py:239 @@ -14481,7 +14481,7 @@ msgstr "Підприємство WPA" #: wireless/forms/bulk_import.py:68 wireless/forms/bulk_import.py:71 #: wireless/forms/bulk_import.py:110 wireless/forms/bulk_import.py:113 #: wireless/forms/filtersets.py:59 wireless/forms/filtersets.py:93 -msgid "Authentication cipher" +msgid "Authentication Cipher" msgstr "Аутентифікаційний шифр" #: wireless/forms/bulk_import.py:52 diff --git a/netbox/translations/zh/LC_MESSAGES/django.po b/netbox/translations/zh/LC_MESSAGES/django.po index 586ddaab8..c1b8c01f1 100644 --- a/netbox/translations/zh/LC_MESSAGES/django.po +++ b/netbox/translations/zh/LC_MESSAGES/django.po @@ -3055,7 +3055,7 @@ msgstr "长度" #: dcim/forms/bulk_edit.py:711 dcim/forms/bulk_import.py:1174 #: dcim/forms/bulk_import.py:1177 dcim/forms/filtersets.py:983 -msgid "Length unit" +msgid "Length Unit" msgstr "长度单位" #: dcim/forms/bulk_edit.py:735 templates/dcim/virtualchassis.html:23 @@ -8188,7 +8188,7 @@ msgstr "群组 ID" #: wireless/forms/bulk_import.py:62 wireless/forms/bulk_import.py:65 #: wireless/forms/bulk_import.py:104 wireless/forms/bulk_import.py:107 #: wireless/forms/filtersets.py:54 wireless/forms/filtersets.py:88 -msgid "Authentication type" +msgid "Authentication Type" msgstr "身份验证类型" #: ipam/forms/bulk_edit.py:388 ipam/forms/filtersets.py:399 @@ -13708,7 +13708,7 @@ msgid "Main" msgstr "主要" #: vpn/choices.py:92 -msgid "Pre-shared keys" +msgid "Pre-Shared Keys" msgstr "预共享密钥" #: vpn/choices.py:93 @@ -13817,7 +13817,7 @@ msgstr "一生" #: vpn/forms/bulk_edit.py:151 wireless/forms/bulk_edit.py:79 #: wireless/forms/bulk_edit.py:126 wireless/forms/filtersets.py:64 #: wireless/forms/filtersets.py:98 -msgid "Pre-shared key" +msgid "Pre-Shared Key" msgstr "预共享密钥" #: vpn/forms/bulk_edit.py:237 vpn/forms/bulk_import.py:239 @@ -14144,7 +14144,7 @@ msgstr "WPA 企业版" #: wireless/forms/bulk_import.py:68 wireless/forms/bulk_import.py:71 #: wireless/forms/bulk_import.py:110 wireless/forms/bulk_import.py:113 #: wireless/forms/filtersets.py:59 wireless/forms/filtersets.py:93 -msgid "Authentication cipher" +msgid "Authentication Cipher" msgstr "身份验证密码" #: wireless/forms/bulk_import.py:52 diff --git a/netbox/vpn/choices.py b/netbox/vpn/choices.py index 4aa97f615..4c2b8ead8 100644 --- a/netbox/vpn/choices.py +++ b/netbox/vpn/choices.py @@ -89,7 +89,7 @@ class AuthenticationMethodChoices(ChoiceSet): DSA_SIGNATURES = 'dsa-signatures' CHOICES = ( - (PRESHARED_KEYS, _('Pre-shared keys')), + (PRESHARED_KEYS, _('Pre-Shared Keys')), (CERTIFICATES, _('Certificates')), (RSA_SIGNATURES, _('RSA signatures')), (DSA_SIGNATURES, _('DSA signatures')), diff --git a/netbox/vpn/forms/bulk_edit.py b/netbox/vpn/forms/bulk_edit.py index a7595a2a7..9886a2897 100644 --- a/netbox/vpn/forms/bulk_edit.py +++ b/netbox/vpn/forms/bulk_edit.py @@ -148,7 +148,7 @@ class IKEPolicyBulkEditForm(NetBoxModelBulkEditForm): required=False ) preshared_key = forms.CharField( - label=_('Pre-shared key'), + label=_('Pre-Shared Key'), required=False ) description = forms.CharField( diff --git a/netbox/wireless/forms/bulk_edit.py b/netbox/wireless/forms/bulk_edit.py index 84916e8d9..0fd4f7ca2 100644 --- a/netbox/wireless/forms/bulk_edit.py +++ b/netbox/wireless/forms/bulk_edit.py @@ -65,18 +65,18 @@ class WirelessLANBulkEditForm(NetBoxModelBulkEditForm): required=False ) auth_type = forms.ChoiceField( - label=_('Authentication type'), + label=_('Authentication Type'), choices=add_blank_choice(WirelessAuthTypeChoices), required=False ) auth_cipher = forms.ChoiceField( - label=_('Authentication cipher'), + label=_('Authentication Cipher'), choices=add_blank_choice(WirelessAuthCipherChoices), required=False ) auth_psk = forms.CharField( required=False, - label=_('Pre-shared key') + label=_('Pre-Shared Key') ) description = forms.CharField( label=_('Description'), @@ -112,18 +112,18 @@ class WirelessLinkBulkEditForm(NetBoxModelBulkEditForm): required=False ) auth_type = forms.ChoiceField( - label=_('Authentication type'), + label=_('Authentication Type'), choices=add_blank_choice(WirelessAuthTypeChoices), required=False ) auth_cipher = forms.ChoiceField( - label=_('Authentication cipher'), + label=_('Authentication Cipher'), choices=add_blank_choice(WirelessAuthCipherChoices), required=False ) auth_psk = forms.CharField( required=False, - label=_('Pre-shared key') + label=_('Pre-Shared Key') ) description = forms.CharField( label=_('Description'), diff --git a/netbox/wireless/forms/bulk_import.py b/netbox/wireless/forms/bulk_import.py index a1e44e0d6..1cfa63bed 100644 --- a/netbox/wireless/forms/bulk_import.py +++ b/netbox/wireless/forms/bulk_import.py @@ -59,16 +59,16 @@ class WirelessLANImportForm(NetBoxModelImportForm): help_text=_('Assigned tenant') ) auth_type = CSVChoiceField( - label=_('Authentication type'), + label=_('Authentication Type'), choices=WirelessAuthTypeChoices, required=False, - help_text=_('Authentication type') + help_text=_('Authentication Type') ) auth_cipher = CSVChoiceField( - label=_('Authentication cipher'), + label=_('Authentication Cipher'), choices=WirelessAuthCipherChoices, required=False, - help_text=_('Authentication cipher') + help_text=_('Authentication Cipher') ) class Meta: @@ -101,16 +101,16 @@ class WirelessLinkImportForm(NetBoxModelImportForm): help_text=_('Assigned tenant') ) auth_type = CSVChoiceField( - label=_('Authentication type'), + label=_('Authentication Type'), choices=WirelessAuthTypeChoices, required=False, - help_text=_('Authentication type') + help_text=_('Authentication Type') ) auth_cipher = CSVChoiceField( - label=_('Authentication cipher'), + label=_('Authentication Cipher'), choices=WirelessAuthCipherChoices, required=False, - help_text=_('Authentication cipher') + help_text=_('Authentication Cipher') ) class Meta: diff --git a/netbox/wireless/forms/filtersets.py b/netbox/wireless/forms/filtersets.py index 7bea23d6c..50dd807f4 100644 --- a/netbox/wireless/forms/filtersets.py +++ b/netbox/wireless/forms/filtersets.py @@ -51,17 +51,17 @@ class WirelessLANFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): choices=add_blank_choice(WirelessLANStatusChoices) ) auth_type = forms.ChoiceField( - label=_('Authentication type'), + label=_('Authentication Type'), required=False, choices=add_blank_choice(WirelessAuthTypeChoices) ) auth_cipher = forms.ChoiceField( - label=_('Authentication cipher'), + label=_('Authentication Cipher'), required=False, choices=add_blank_choice(WirelessAuthCipherChoices) ) auth_psk = forms.CharField( - label=_('Pre-shared key'), + label=_('Pre-Shared Key'), required=False ) tag = TagFilterField(model) @@ -85,17 +85,17 @@ class WirelessLinkFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): choices=add_blank_choice(LinkStatusChoices) ) auth_type = forms.ChoiceField( - label=_('Authentication type'), + label=_('Authentication Type'), required=False, choices=add_blank_choice(WirelessAuthTypeChoices) ) auth_cipher = forms.ChoiceField( - label=_('Authentication cipher'), + label=_('Authentication Cipher'), required=False, choices=add_blank_choice(WirelessAuthCipherChoices) ) auth_psk = forms.CharField( - label=_('Pre-shared key'), + label=_('Pre-Shared Key'), required=False ) tag = TagFilterField(model)