From 85c8d5ff6991998067156e85e158281e769c291f Mon Sep 17 00:00:00 2001 From: "Daniel W. Anner" Date: Tue, 21 May 2024 20:17:08 +0000 Subject: [PATCH] VPN filters --- netbox/templates/vpn/ikeproposal.html | 6 ++-- netbox/templates/vpn/ipsecproposal.html | 4 +-- netbox/templates/vpn/tunnel.html | 2 +- netbox/translations/de/LC_MESSAGES/django.po | 32 ++++++++++---------- netbox/translations/en/LC_MESSAGES/django.po | 32 ++++++++++---------- netbox/translations/es/LC_MESSAGES/django.po | 32 ++++++++++---------- netbox/translations/fr/LC_MESSAGES/django.po | 32 ++++++++++---------- netbox/translations/ja/LC_MESSAGES/django.po | 32 ++++++++++---------- netbox/translations/pt/LC_MESSAGES/django.po | 32 ++++++++++---------- netbox/translations/ru/LC_MESSAGES/django.po | 32 ++++++++++---------- netbox/translations/tr/LC_MESSAGES/django.po | 32 ++++++++++---------- netbox/translations/uk/LC_MESSAGES/django.po | 32 ++++++++++---------- netbox/translations/zh/LC_MESSAGES/django.po | 32 ++++++++++---------- netbox/vpn/filtersets.py | 24 +++++++-------- netbox/vpn/forms/bulk_edit.py | 16 +++++----- netbox/vpn/forms/bulk_import.py | 16 +++++----- netbox/vpn/forms/filtersets.py | 18 +++++------ netbox/vpn/forms/model_forms.py | 4 +-- netbox/vpn/migrations/0001_initial.py | 8 ++--- netbox/vpn/models/crypto.py | 12 ++++---- netbox/vpn/tables/tunnels.py | 2 +- 21 files changed, 216 insertions(+), 216 deletions(-) diff --git a/netbox/templates/vpn/ikeproposal.html b/netbox/templates/vpn/ikeproposal.html index 616bca16a..b4e683d13 100644 --- a/netbox/templates/vpn/ikeproposal.html +++ b/netbox/templates/vpn/ikeproposal.html @@ -18,15 +18,15 @@ {{ object.description|placeholder }} - {% trans "Authentication method" %} + {% trans "Authentication Method" %} {{ object.get_authentication_method_display }} - {% trans "Encryption algorithm" %} + {% trans "Encryption Algorithm" %} {{ object.get_encryption_algorithm_display }} - {% trans "Authentication algorithm" %} + {% trans "Authentication Algorithm" %} {{ object.get_authentication_algorithm_display }} diff --git a/netbox/templates/vpn/ipsecproposal.html b/netbox/templates/vpn/ipsecproposal.html index 68c516a6a..5c0a17ec4 100644 --- a/netbox/templates/vpn/ipsecproposal.html +++ b/netbox/templates/vpn/ipsecproposal.html @@ -18,11 +18,11 @@ {{ object.description|placeholder }} - {% trans "Encryption algorithm" %} + {% trans "Encryption Algorithm" %} {{ object.get_encryption_algorithm_display }} - {% trans "Authentication algorithm" %} + {% trans "Authentication Algorithm" %} {{ object.get_authentication_algorithm_display }} diff --git a/netbox/templates/vpn/tunnel.html b/netbox/templates/vpn/tunnel.html index 09b11305a..ace6a8a67 100644 --- a/netbox/templates/vpn/tunnel.html +++ b/netbox/templates/vpn/tunnel.html @@ -38,7 +38,7 @@ {{ object.get_encapsulation_display }} - {% trans "IPSec profile" %} + {% trans "IPSec Profile" %} {{ object.ipsec_profile|linkify|placeholder }} diff --git a/netbox/translations/de/LC_MESSAGES/django.po b/netbox/translations/de/LC_MESSAGES/django.po index 4fd3b0021..28f630fc9 100644 --- a/netbox/translations/de/LC_MESSAGES/django.po +++ b/netbox/translations/de/LC_MESSAGES/django.po @@ -12996,21 +12996,21 @@ msgstr "IKE-Vorschlag" #: templates/vpn/ikeproposal.html:21 vpn/forms/bulk_edit.py:97 #: vpn/forms/bulk_import.py:145 vpn/forms/filtersets.py:101 -msgid "Authentication method" +msgid "Authentication Method" msgstr "Methode der Authentifizierung" #: templates/vpn/ikeproposal.html:25 templates/vpn/ipsecproposal.html:21 #: vpn/forms/bulk_edit.py:102 vpn/forms/bulk_edit.py:172 #: vpn/forms/bulk_import.py:149 vpn/forms/bulk_import.py:195 #: vpn/forms/filtersets.py:106 vpn/forms/filtersets.py:154 -msgid "Encryption algorithm" +msgid "Encryption Algorithm" msgstr "Verschlüsselungsalgorithmus" #: templates/vpn/ikeproposal.html:29 templates/vpn/ipsecproposal.html:25 #: vpn/forms/bulk_edit.py:107 vpn/forms/bulk_edit.py:177 #: vpn/forms/bulk_import.py:153 vpn/forms/bulk_import.py:200 #: vpn/forms/filtersets.py:111 vpn/forms/filtersets.py:159 -msgid "Authentication algorithm" +msgid "Authentication Algorithm" msgstr "Authentifizierungsalgorithmus" #: templates/vpn/ikeproposal.html:33 @@ -13069,7 +13069,7 @@ msgstr "Verkapselung" #: templates/vpn/tunnel.html:41 vpn/forms/bulk_edit.py:55 #: vpn/forms/bulk_import.py:53 vpn/forms/filtersets.py:64 #: vpn/models/crypto.py:250 vpn/tables/tunnels.py:51 -msgid "IPSec profile" +msgid "IPSec Profile" msgstr "IPSec-Profil" #: templates/vpn/tunnel.html:45 vpn/forms/bulk_edit.py:69 @@ -14271,11 +14271,11 @@ msgid "Tunnel group (slug)" msgstr "Tunnelgruppe (Schnecke)" #: vpn/filtersets.py:54 -msgid "IPSec profile (ID)" +msgid "IPSec Profile (ID)" msgstr "IPSec-Profil (ID)" #: vpn/filtersets.py:60 -msgid "IPSec profile (name)" +msgid "IPSec Profile (name)" msgstr "IPSec-Profil (Name)" #: vpn/filtersets.py:81 @@ -14291,19 +14291,19 @@ msgid "Outside IP (ID)" msgstr "Externe IP (ID)" #: vpn/filtersets.py:130 vpn/filtersets.py:153 vpn/filtersets.py:282 -msgid "IKE policy (ID)" +msgid "IKE Policy (ID)" msgstr "IKE-Richtlinie (ID)" #: vpn/filtersets.py:136 vpn/filtersets.py:159 vpn/filtersets.py:288 -msgid "IKE policy (name)" +msgid "IKE Policy (name)" msgstr "IKE-Richtlinie (Name)" #: vpn/filtersets.py:215 vpn/filtersets.py:292 -msgid "IPSec policy (ID)" +msgid "IPSec Policy (ID)" msgstr "IPSec-Richtlinie (ID)" #: vpn/filtersets.py:221 vpn/filtersets.py:298 -msgid "IPSec policy (name)" +msgid "IPSec Policy (name)" msgstr "IPSec-Richtlinie (Name)" #: vpn/filtersets.py:367 @@ -14336,13 +14336,13 @@ msgstr "Vorab geteilter Schlüssel" #: vpn/forms/bulk_edit.py:237 vpn/forms/bulk_import.py:239 #: vpn/forms/filtersets.py:199 vpn/forms/model_forms.py:370 #: vpn/models/crypto.py:104 -msgid "IKE policy" +msgid "IKE Policy" msgstr "IKE-Richtlinie" #: vpn/forms/bulk_edit.py:242 vpn/forms/bulk_import.py:244 #: vpn/forms/filtersets.py:204 vpn/forms/model_forms.py:374 #: vpn/models/crypto.py:209 -msgid "IPSec policy" +msgid "IPSec Policy" msgstr "IPSec-Richtlinie" #: vpn/forms/bulk_import.py:50 @@ -14415,7 +14415,7 @@ msgstr "" "Es kann nicht sowohl eine Schnittstelle als auch ein VLAN zugewiesen werden." #: vpn/forms/filtersets.py:130 -msgid "IKE version" +msgid "IKE Version" msgstr "IKE-Ausführung" #: vpn/forms/filtersets.py:142 vpn/forms/filtersets.py:175 @@ -14501,11 +14501,11 @@ msgid "IKE policies" msgstr "IKE-Richtlinien" #: vpn/models/crypto.py:118 -msgid "Mode is required for selected IKE version" +msgid "Mode is required for selected IKE Version" msgstr "Der Modus ist für die ausgewählte IKE-Version erforderlich" #: vpn/models/crypto.py:122 -msgid "Mode cannot be used for selected IKE version" +msgid "Mode cannot be used for selected IKE Version" msgstr "Der Modus kann nicht für die ausgewählte IKE-Version verwendet werden" #: vpn/models/crypto.py:136 @@ -14543,7 +14543,7 @@ msgid "IPSec policies" msgstr "IPSec-Richtlinien" #: vpn/models/crypto.py:251 -msgid "IPSec profiles" +msgid "IPSec Profiles" msgstr "IPSec-Profile" #: vpn/models/l2vpn.py:116 diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index 839394d20..0cae767d1 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -12493,21 +12493,21 @@ msgstr "" #: templates/vpn/ikeproposal.html:21 vpn/forms/bulk_edit.py:97 #: vpn/forms/bulk_import.py:145 vpn/forms/filtersets.py:101 -msgid "Authentication method" +msgid "Authentication Method" msgstr "" #: templates/vpn/ikeproposal.html:25 templates/vpn/ipsecproposal.html:21 #: vpn/forms/bulk_edit.py:102 vpn/forms/bulk_edit.py:172 #: vpn/forms/bulk_import.py:149 vpn/forms/bulk_import.py:195 #: vpn/forms/filtersets.py:106 vpn/forms/filtersets.py:154 -msgid "Encryption algorithm" +msgid "Encryption Algorithm" msgstr "" #: templates/vpn/ikeproposal.html:29 templates/vpn/ipsecproposal.html:25 #: vpn/forms/bulk_edit.py:107 vpn/forms/bulk_edit.py:177 #: vpn/forms/bulk_import.py:153 vpn/forms/bulk_import.py:200 #: vpn/forms/filtersets.py:111 vpn/forms/filtersets.py:159 -msgid "Authentication algorithm" +msgid "Authentication Algorithm" msgstr "" #: templates/vpn/ikeproposal.html:33 @@ -12566,7 +12566,7 @@ msgstr "" #: templates/vpn/tunnel.html:41 vpn/forms/bulk_edit.py:55 #: vpn/forms/bulk_import.py:53 vpn/forms/filtersets.py:64 #: vpn/models/crypto.py:250 vpn/tables/tunnels.py:51 -msgid "IPSec profile" +msgid "IPSec Profile" msgstr "" #: templates/vpn/tunnel.html:45 vpn/forms/bulk_edit.py:69 @@ -13664,11 +13664,11 @@ msgid "Tunnel group (slug)" msgstr "" #: vpn/filtersets.py:54 -msgid "IPSec profile (ID)" +msgid "IPSec Profile (ID)" msgstr "" #: vpn/filtersets.py:60 -msgid "IPSec profile (name)" +msgid "IPSec Profile (name)" msgstr "" #: vpn/filtersets.py:81 @@ -13684,19 +13684,19 @@ msgid "Outside IP (ID)" msgstr "" #: vpn/filtersets.py:130 vpn/filtersets.py:153 vpn/filtersets.py:282 -msgid "IKE policy (ID)" +msgid "IKE Policy (ID)" msgstr "" #: vpn/filtersets.py:136 vpn/filtersets.py:159 vpn/filtersets.py:288 -msgid "IKE policy (name)" +msgid "IKE Policy (name)" msgstr "" #: vpn/filtersets.py:215 vpn/filtersets.py:292 -msgid "IPSec policy (ID)" +msgid "IPSec Policy (ID)" msgstr "" #: vpn/filtersets.py:221 vpn/filtersets.py:298 -msgid "IPSec policy (name)" +msgid "IPSec Policy (name)" msgstr "" #: vpn/filtersets.py:367 @@ -13729,13 +13729,13 @@ msgstr "" #: vpn/forms/bulk_edit.py:237 vpn/forms/bulk_import.py:239 #: vpn/forms/filtersets.py:199 vpn/forms/model_forms.py:370 #: vpn/models/crypto.py:104 -msgid "IKE policy" +msgid "IKE Policy" msgstr "" #: vpn/forms/bulk_edit.py:242 vpn/forms/bulk_import.py:244 #: vpn/forms/filtersets.py:204 vpn/forms/model_forms.py:374 #: vpn/models/crypto.py:209 -msgid "IPSec policy" +msgid "IPSec Policy" msgstr "" #: vpn/forms/bulk_import.py:50 @@ -13803,7 +13803,7 @@ msgid "Cannot assign both an interface and a VLAN." msgstr "" #: vpn/forms/filtersets.py:130 -msgid "IKE version" +msgid "IKE Version" msgstr "" #: vpn/forms/filtersets.py:142 vpn/forms/filtersets.py:175 @@ -13886,11 +13886,11 @@ msgid "IKE policies" msgstr "" #: vpn/models/crypto.py:118 -msgid "Mode is required for selected IKE version" +msgid "Mode is required for selected IKE Version" msgstr "" #: vpn/models/crypto.py:122 -msgid "Mode cannot be used for selected IKE version" +msgid "Mode cannot be used for selected IKE Version" msgstr "" #: vpn/models/crypto.py:136 @@ -13926,7 +13926,7 @@ msgid "IPSec policies" msgstr "" #: vpn/models/crypto.py:251 -msgid "IPSec profiles" +msgid "IPSec Profiles" msgstr "" #: vpn/models/l2vpn.py:116 diff --git a/netbox/translations/es/LC_MESSAGES/django.po b/netbox/translations/es/LC_MESSAGES/django.po index 70f031660..bf9f83af4 100644 --- a/netbox/translations/es/LC_MESSAGES/django.po +++ b/netbox/translations/es/LC_MESSAGES/django.po @@ -12943,21 +12943,21 @@ msgstr "Propuesta IKE" #: templates/vpn/ikeproposal.html:21 vpn/forms/bulk_edit.py:97 #: vpn/forms/bulk_import.py:145 vpn/forms/filtersets.py:101 -msgid "Authentication method" +msgid "Authentication Method" msgstr "Método de autenticación" #: templates/vpn/ikeproposal.html:25 templates/vpn/ipsecproposal.html:21 #: vpn/forms/bulk_edit.py:102 vpn/forms/bulk_edit.py:172 #: vpn/forms/bulk_import.py:149 vpn/forms/bulk_import.py:195 #: vpn/forms/filtersets.py:106 vpn/forms/filtersets.py:154 -msgid "Encryption algorithm" +msgid "Encryption Algorithm" msgstr "Algoritmo de cifrado" #: templates/vpn/ikeproposal.html:29 templates/vpn/ipsecproposal.html:25 #: vpn/forms/bulk_edit.py:107 vpn/forms/bulk_edit.py:177 #: vpn/forms/bulk_import.py:153 vpn/forms/bulk_import.py:200 #: vpn/forms/filtersets.py:111 vpn/forms/filtersets.py:159 -msgid "Authentication algorithm" +msgid "Authentication Algorithm" msgstr "Algoritmo de autenticación" #: templates/vpn/ikeproposal.html:33 @@ -13016,7 +13016,7 @@ msgstr "Encapsulación" #: templates/vpn/tunnel.html:41 vpn/forms/bulk_edit.py:55 #: vpn/forms/bulk_import.py:53 vpn/forms/filtersets.py:64 #: vpn/models/crypto.py:250 vpn/tables/tunnels.py:51 -msgid "IPSec profile" +msgid "IPSec Profile" msgstr "Perfil IPSec" #: templates/vpn/tunnel.html:45 vpn/forms/bulk_edit.py:69 @@ -14211,11 +14211,11 @@ msgid "Tunnel group (slug)" msgstr "Grupo de túneles (babosas)" #: vpn/filtersets.py:54 -msgid "IPSec profile (ID)" +msgid "IPSec Profile (ID)" msgstr "Perfil IPSec (ID)" #: vpn/filtersets.py:60 -msgid "IPSec profile (name)" +msgid "IPSec Profile (name)" msgstr "Perfil IPSec (nombre)" #: vpn/filtersets.py:81 @@ -14231,19 +14231,19 @@ msgid "Outside IP (ID)" msgstr "IP externa (ID)" #: vpn/filtersets.py:130 vpn/filtersets.py:153 vpn/filtersets.py:282 -msgid "IKE policy (ID)" +msgid "IKE Policy (ID)" msgstr "Política de IKE (ID)" #: vpn/filtersets.py:136 vpn/filtersets.py:159 vpn/filtersets.py:288 -msgid "IKE policy (name)" +msgid "IKE Policy (name)" msgstr "Política IKE (nombre)" #: vpn/filtersets.py:215 vpn/filtersets.py:292 -msgid "IPSec policy (ID)" +msgid "IPSec Policy (ID)" msgstr "Política IPSec (ID)" #: vpn/filtersets.py:221 vpn/filtersets.py:298 -msgid "IPSec policy (name)" +msgid "IPSec Policy (name)" msgstr "Política IPSec (nombre)" #: vpn/filtersets.py:367 @@ -14276,13 +14276,13 @@ msgstr "Clave previamente compartida" #: vpn/forms/bulk_edit.py:237 vpn/forms/bulk_import.py:239 #: vpn/forms/filtersets.py:199 vpn/forms/model_forms.py:370 #: vpn/models/crypto.py:104 -msgid "IKE policy" +msgid "IKE Policy" msgstr "Política de IKE" #: vpn/forms/bulk_edit.py:242 vpn/forms/bulk_import.py:244 #: vpn/forms/filtersets.py:204 vpn/forms/model_forms.py:374 #: vpn/models/crypto.py:209 -msgid "IPSec policy" +msgid "IPSec Policy" msgstr "Política IPSec" #: vpn/forms/bulk_import.py:50 @@ -14352,7 +14352,7 @@ msgid "Cannot assign both an interface and a VLAN." msgstr "No se puede asignar una interfaz y una VLAN a la vez." #: vpn/forms/filtersets.py:130 -msgid "IKE version" +msgid "IKE Version" msgstr "Versión IKE" #: vpn/forms/filtersets.py:142 vpn/forms/filtersets.py:175 @@ -14437,11 +14437,11 @@ msgid "IKE policies" msgstr "Políticas de IKE" #: vpn/models/crypto.py:118 -msgid "Mode is required for selected IKE version" +msgid "Mode is required for selected IKE Version" msgstr "El modo es necesario para la versión IKE seleccionada" #: vpn/models/crypto.py:122 -msgid "Mode cannot be used for selected IKE version" +msgid "Mode cannot be used for selected IKE Version" msgstr "El modo no se puede usar para la versión IKE seleccionada" #: vpn/models/crypto.py:136 @@ -14477,7 +14477,7 @@ msgid "IPSec policies" msgstr "Políticas IPSec" #: vpn/models/crypto.py:251 -msgid "IPSec profiles" +msgid "IPSec Profiles" msgstr "Perfiles IPSec" #: vpn/models/l2vpn.py:116 diff --git a/netbox/translations/fr/LC_MESSAGES/django.po b/netbox/translations/fr/LC_MESSAGES/django.po index 94bd5d0f7..343c1cf43 100644 --- a/netbox/translations/fr/LC_MESSAGES/django.po +++ b/netbox/translations/fr/LC_MESSAGES/django.po @@ -12982,21 +12982,21 @@ msgstr "Proposition IKE" #: templates/vpn/ikeproposal.html:21 vpn/forms/bulk_edit.py:97 #: vpn/forms/bulk_import.py:145 vpn/forms/filtersets.py:101 -msgid "Authentication method" +msgid "Authentication Method" msgstr "Méthode d'authentification" #: templates/vpn/ikeproposal.html:25 templates/vpn/ipsecproposal.html:21 #: vpn/forms/bulk_edit.py:102 vpn/forms/bulk_edit.py:172 #: vpn/forms/bulk_import.py:149 vpn/forms/bulk_import.py:195 #: vpn/forms/filtersets.py:106 vpn/forms/filtersets.py:154 -msgid "Encryption algorithm" +msgid "Encryption Algorithm" msgstr "Algorithme de chiffrement" #: templates/vpn/ikeproposal.html:29 templates/vpn/ipsecproposal.html:25 #: vpn/forms/bulk_edit.py:107 vpn/forms/bulk_edit.py:177 #: vpn/forms/bulk_import.py:153 vpn/forms/bulk_import.py:200 #: vpn/forms/filtersets.py:111 vpn/forms/filtersets.py:159 -msgid "Authentication algorithm" +msgid "Authentication Algorithm" msgstr "Algorithme d'authentification" #: templates/vpn/ikeproposal.html:33 @@ -13055,7 +13055,7 @@ msgstr "Encapsulation" #: templates/vpn/tunnel.html:41 vpn/forms/bulk_edit.py:55 #: vpn/forms/bulk_import.py:53 vpn/forms/filtersets.py:64 #: vpn/models/crypto.py:250 vpn/tables/tunnels.py:51 -msgid "IPSec profile" +msgid "IPSec Profile" msgstr "profil IPSec" #: templates/vpn/tunnel.html:45 vpn/forms/bulk_edit.py:69 @@ -14248,11 +14248,11 @@ msgid "Tunnel group (slug)" msgstr "Groupe de tunnels (slug)" #: vpn/filtersets.py:54 -msgid "IPSec profile (ID)" +msgid "IPSec Profile (ID)" msgstr "profil IPSec (ID)" #: vpn/filtersets.py:60 -msgid "IPSec profile (name)" +msgid "IPSec Profile (name)" msgstr "Profil IPSec (nom)" #: vpn/filtersets.py:81 @@ -14268,19 +14268,19 @@ msgid "Outside IP (ID)" msgstr "IP externe (ID)" #: vpn/filtersets.py:130 vpn/filtersets.py:153 vpn/filtersets.py:282 -msgid "IKE policy (ID)" +msgid "IKE Policy (ID)" msgstr "Politique IKE (ID)" #: vpn/filtersets.py:136 vpn/filtersets.py:159 vpn/filtersets.py:288 -msgid "IKE policy (name)" +msgid "IKE Policy (name)" msgstr "Politique IKE (nom)" #: vpn/filtersets.py:215 vpn/filtersets.py:292 -msgid "IPSec policy (ID)" +msgid "IPSec Policy (ID)" msgstr "Politique IPSec (ID)" #: vpn/filtersets.py:221 vpn/filtersets.py:298 -msgid "IPSec policy (name)" +msgid "IPSec Policy (name)" msgstr "Politique IPSec (nom)" #: vpn/filtersets.py:367 @@ -14313,13 +14313,13 @@ msgstr "Clé pré-partagée" #: vpn/forms/bulk_edit.py:237 vpn/forms/bulk_import.py:239 #: vpn/forms/filtersets.py:199 vpn/forms/model_forms.py:370 #: vpn/models/crypto.py:104 -msgid "IKE policy" +msgid "IKE Policy" msgstr "Politique IKE" #: vpn/forms/bulk_edit.py:242 vpn/forms/bulk_import.py:244 #: vpn/forms/filtersets.py:204 vpn/forms/model_forms.py:374 #: vpn/models/crypto.py:209 -msgid "IPSec policy" +msgid "IPSec Policy" msgstr "Politique IPSec" #: vpn/forms/bulk_import.py:50 @@ -14389,7 +14389,7 @@ msgid "Cannot assign both an interface and a VLAN." msgstr "Impossible d'attribuer à la fois une interface et un VLAN." #: vpn/forms/filtersets.py:130 -msgid "IKE version" +msgid "IKE Version" msgstr "Version IKE" #: vpn/forms/filtersets.py:142 vpn/forms/filtersets.py:175 @@ -14474,11 +14474,11 @@ msgid "IKE policies" msgstr "Politiques IKE" #: vpn/models/crypto.py:118 -msgid "Mode is required for selected IKE version" +msgid "Mode is required for selected IKE Version" msgstr "Le mode est requis pour la version IKE sélectionnée" #: vpn/models/crypto.py:122 -msgid "Mode cannot be used for selected IKE version" +msgid "Mode cannot be used for selected IKE Version" msgstr "Le mode ne peut pas être utilisé pour la version IKE sélectionnée" #: vpn/models/crypto.py:136 @@ -14515,7 +14515,7 @@ msgid "IPSec policies" msgstr "Politiques IPSec" #: vpn/models/crypto.py:251 -msgid "IPSec profiles" +msgid "IPSec Profiles" msgstr "Profils IPSec" #: vpn/models/l2vpn.py:116 diff --git a/netbox/translations/ja/LC_MESSAGES/django.po b/netbox/translations/ja/LC_MESSAGES/django.po index ffde57441..c81b134b6 100644 --- a/netbox/translations/ja/LC_MESSAGES/django.po +++ b/netbox/translations/ja/LC_MESSAGES/django.po @@ -12620,21 +12620,21 @@ msgstr "イケアの提案" #: templates/vpn/ikeproposal.html:21 vpn/forms/bulk_edit.py:97 #: vpn/forms/bulk_import.py:145 vpn/forms/filtersets.py:101 -msgid "Authentication method" +msgid "Authentication Method" msgstr "認証方法" #: templates/vpn/ikeproposal.html:25 templates/vpn/ipsecproposal.html:21 #: vpn/forms/bulk_edit.py:102 vpn/forms/bulk_edit.py:172 #: vpn/forms/bulk_import.py:149 vpn/forms/bulk_import.py:195 #: vpn/forms/filtersets.py:106 vpn/forms/filtersets.py:154 -msgid "Encryption algorithm" +msgid "Encryption Algorithm" msgstr "暗号化アルゴリズム" #: templates/vpn/ikeproposal.html:29 templates/vpn/ipsecproposal.html:25 #: vpn/forms/bulk_edit.py:107 vpn/forms/bulk_edit.py:177 #: vpn/forms/bulk_import.py:153 vpn/forms/bulk_import.py:200 #: vpn/forms/filtersets.py:111 vpn/forms/filtersets.py:159 -msgid "Authentication algorithm" +msgid "Authentication Algorithm" msgstr "認証アルゴリズム" #: templates/vpn/ikeproposal.html:33 @@ -12693,7 +12693,7 @@ msgstr "カプセル化" #: templates/vpn/tunnel.html:41 vpn/forms/bulk_edit.py:55 #: vpn/forms/bulk_import.py:53 vpn/forms/filtersets.py:64 #: vpn/models/crypto.py:250 vpn/tables/tunnels.py:51 -msgid "IPSec profile" +msgid "IPSec Profile" msgstr "IPsec プロファイル" #: templates/vpn/tunnel.html:45 vpn/forms/bulk_edit.py:69 @@ -13818,11 +13818,11 @@ msgid "Tunnel group (slug)" msgstr "トンネルグループ (slug)" #: vpn/filtersets.py:54 -msgid "IPSec profile (ID)" +msgid "IPSec Profile (ID)" msgstr "IPsec プロファイル (ID)" #: vpn/filtersets.py:60 -msgid "IPSec profile (name)" +msgid "IPSec Profile (name)" msgstr "IPsec プロファイル (名前)" #: vpn/filtersets.py:81 @@ -13838,19 +13838,19 @@ msgid "Outside IP (ID)" msgstr "外部IP (ID)" #: vpn/filtersets.py:130 vpn/filtersets.py:153 vpn/filtersets.py:282 -msgid "IKE policy (ID)" +msgid "IKE Policy (ID)" msgstr "IKE ポリシー (ID)" #: vpn/filtersets.py:136 vpn/filtersets.py:159 vpn/filtersets.py:288 -msgid "IKE policy (name)" +msgid "IKE Policy (name)" msgstr "IKE ポリシー (名前)" #: vpn/filtersets.py:215 vpn/filtersets.py:292 -msgid "IPSec policy (ID)" +msgid "IPSec Policy (ID)" msgstr "IPsec ポリシー (ID)" #: vpn/filtersets.py:221 vpn/filtersets.py:298 -msgid "IPSec policy (name)" +msgid "IPSec Policy (name)" msgstr "IPsec ポリシー (名前)" #: vpn/filtersets.py:367 @@ -13883,13 +13883,13 @@ msgstr "事前共有キー" #: vpn/forms/bulk_edit.py:237 vpn/forms/bulk_import.py:239 #: vpn/forms/filtersets.py:199 vpn/forms/model_forms.py:370 #: vpn/models/crypto.py:104 -msgid "IKE policy" +msgid "IKE Policy" msgstr "IKE ポリシー" #: vpn/forms/bulk_edit.py:242 vpn/forms/bulk_import.py:244 #: vpn/forms/filtersets.py:204 vpn/forms/model_forms.py:374 #: vpn/models/crypto.py:209 -msgid "IPSec policy" +msgid "IPSec Policy" msgstr "IPsec ポリシー" #: vpn/forms/bulk_import.py:50 @@ -13957,7 +13957,7 @@ msgid "Cannot assign both an interface and a VLAN." msgstr "インタフェースと VLAN の両方を割り当てることはできません。" #: vpn/forms/filtersets.py:130 -msgid "IKE version" +msgid "IKE Version" msgstr "IKE バージョン" #: vpn/forms/filtersets.py:142 vpn/forms/filtersets.py:175 @@ -14040,11 +14040,11 @@ msgid "IKE policies" msgstr "IKE ポリシー" #: vpn/models/crypto.py:118 -msgid "Mode is required for selected IKE version" +msgid "Mode is required for selected IKE Version" msgstr "選択した IKE バージョンにはモードが必要です" #: vpn/models/crypto.py:122 -msgid "Mode cannot be used for selected IKE version" +msgid "Mode cannot be used for selected IKE Version" msgstr "モードは選択された IKE バージョンでは使用できません" #: vpn/models/crypto.py:136 @@ -14080,7 +14080,7 @@ msgid "IPSec policies" msgstr "IPsec ポリシー" #: vpn/models/crypto.py:251 -msgid "IPSec profiles" +msgid "IPSec Profiles" msgstr "IPsec プロファイル" #: vpn/models/l2vpn.py:116 diff --git a/netbox/translations/pt/LC_MESSAGES/django.po b/netbox/translations/pt/LC_MESSAGES/django.po index 752ecbd83..c58a73572 100644 --- a/netbox/translations/pt/LC_MESSAGES/django.po +++ b/netbox/translations/pt/LC_MESSAGES/django.po @@ -12904,21 +12904,21 @@ msgstr "Proposta IKE" #: templates/vpn/ikeproposal.html:21 vpn/forms/bulk_edit.py:97 #: vpn/forms/bulk_import.py:145 vpn/forms/filtersets.py:101 -msgid "Authentication method" +msgid "Authentication Method" msgstr "Método de autenticação" #: templates/vpn/ikeproposal.html:25 templates/vpn/ipsecproposal.html:21 #: vpn/forms/bulk_edit.py:102 vpn/forms/bulk_edit.py:172 #: vpn/forms/bulk_import.py:149 vpn/forms/bulk_import.py:195 #: vpn/forms/filtersets.py:106 vpn/forms/filtersets.py:154 -msgid "Encryption algorithm" +msgid "Encryption Algorithm" msgstr "algoritmo de criptografia" #: templates/vpn/ikeproposal.html:29 templates/vpn/ipsecproposal.html:25 #: vpn/forms/bulk_edit.py:107 vpn/forms/bulk_edit.py:177 #: vpn/forms/bulk_import.py:153 vpn/forms/bulk_import.py:200 #: vpn/forms/filtersets.py:111 vpn/forms/filtersets.py:159 -msgid "Authentication algorithm" +msgid "Authentication Algorithm" msgstr "algoritmo de autenticação" #: templates/vpn/ikeproposal.html:33 @@ -12977,7 +12977,7 @@ msgstr "Encapsulamento" #: templates/vpn/tunnel.html:41 vpn/forms/bulk_edit.py:55 #: vpn/forms/bulk_import.py:53 vpn/forms/filtersets.py:64 #: vpn/models/crypto.py:250 vpn/tables/tunnels.py:51 -msgid "IPSec profile" +msgid "IPSec Profile" msgstr "Perfil IPsec" #: templates/vpn/tunnel.html:45 vpn/forms/bulk_edit.py:69 @@ -14158,11 +14158,11 @@ msgid "Tunnel group (slug)" msgstr "Grupo de túneis (slug)" #: vpn/filtersets.py:54 -msgid "IPSec profile (ID)" +msgid "IPSec Profile (ID)" msgstr "Perfil IPsec (ID)" #: vpn/filtersets.py:60 -msgid "IPSec profile (name)" +msgid "IPSec Profile (name)" msgstr "Perfil IPsec (nome)" #: vpn/filtersets.py:81 @@ -14178,19 +14178,19 @@ msgid "Outside IP (ID)" msgstr "IP externo (ID)" #: vpn/filtersets.py:130 vpn/filtersets.py:153 vpn/filtersets.py:282 -msgid "IKE policy (ID)" +msgid "IKE Policy (ID)" msgstr "Política IKE (ID)" #: vpn/filtersets.py:136 vpn/filtersets.py:159 vpn/filtersets.py:288 -msgid "IKE policy (name)" +msgid "IKE Policy (name)" msgstr "Política IKE (nome)" #: vpn/filtersets.py:215 vpn/filtersets.py:292 -msgid "IPSec policy (ID)" +msgid "IPSec Policy (ID)" msgstr "Política IPsec (ID)" #: vpn/filtersets.py:221 vpn/filtersets.py:298 -msgid "IPSec policy (name)" +msgid "IPSec Policy (name)" msgstr "Política IPsec (nome)" #: vpn/filtersets.py:367 @@ -14223,13 +14223,13 @@ msgstr "Chave pré-compartilhada" #: vpn/forms/bulk_edit.py:237 vpn/forms/bulk_import.py:239 #: vpn/forms/filtersets.py:199 vpn/forms/model_forms.py:370 #: vpn/models/crypto.py:104 -msgid "IKE policy" +msgid "IKE Policy" msgstr "Política do IKE" #: vpn/forms/bulk_edit.py:242 vpn/forms/bulk_import.py:244 #: vpn/forms/filtersets.py:204 vpn/forms/model_forms.py:374 #: vpn/models/crypto.py:209 -msgid "IPSec policy" +msgid "IPSec Policy" msgstr "Política IPsec" #: vpn/forms/bulk_import.py:50 @@ -14299,7 +14299,7 @@ msgid "Cannot assign both an interface and a VLAN." msgstr "Não é possível atribuir uma interface e uma VLAN." #: vpn/forms/filtersets.py:130 -msgid "IKE version" +msgid "IKE Version" msgstr "Versão IKE" #: vpn/forms/filtersets.py:142 vpn/forms/filtersets.py:175 @@ -14383,11 +14383,11 @@ msgid "IKE policies" msgstr "Políticas do IKE" #: vpn/models/crypto.py:118 -msgid "Mode is required for selected IKE version" +msgid "Mode is required for selected IKE Version" msgstr "O modo é necessário para a versão IKE selecionada" #: vpn/models/crypto.py:122 -msgid "Mode cannot be used for selected IKE version" +msgid "Mode cannot be used for selected IKE Version" msgstr "O modo não pode ser usado para a versão IKE selecionada" #: vpn/models/crypto.py:136 @@ -14423,7 +14423,7 @@ msgid "IPSec policies" msgstr "Políticas IPsec" #: vpn/models/crypto.py:251 -msgid "IPSec profiles" +msgid "IPSec Profiles" msgstr "Perfis IPsec" #: vpn/models/l2vpn.py:116 diff --git a/netbox/translations/ru/LC_MESSAGES/django.po b/netbox/translations/ru/LC_MESSAGES/django.po index 883c83820..d683c2cd5 100644 --- a/netbox/translations/ru/LC_MESSAGES/django.po +++ b/netbox/translations/ru/LC_MESSAGES/django.po @@ -12895,21 +12895,21 @@ msgstr "Предложение IKE" #: templates/vpn/ikeproposal.html:21 vpn/forms/bulk_edit.py:97 #: vpn/forms/bulk_import.py:145 vpn/forms/filtersets.py:101 -msgid "Authentication method" +msgid "Authentication Method" msgstr "Метод аутентификации" #: templates/vpn/ikeproposal.html:25 templates/vpn/ipsecproposal.html:21 #: vpn/forms/bulk_edit.py:102 vpn/forms/bulk_edit.py:172 #: vpn/forms/bulk_import.py:149 vpn/forms/bulk_import.py:195 #: vpn/forms/filtersets.py:106 vpn/forms/filtersets.py:154 -msgid "Encryption algorithm" +msgid "Encryption Algorithm" msgstr "Алгоритм шифрования" #: templates/vpn/ikeproposal.html:29 templates/vpn/ipsecproposal.html:25 #: vpn/forms/bulk_edit.py:107 vpn/forms/bulk_edit.py:177 #: vpn/forms/bulk_import.py:153 vpn/forms/bulk_import.py:200 #: vpn/forms/filtersets.py:111 vpn/forms/filtersets.py:159 -msgid "Authentication algorithm" +msgid "Authentication Algorithm" msgstr "Алгоритм аутентификации" #: templates/vpn/ikeproposal.html:33 @@ -12968,7 +12968,7 @@ msgstr "Инкапсуляция" #: templates/vpn/tunnel.html:41 vpn/forms/bulk_edit.py:55 #: vpn/forms/bulk_import.py:53 vpn/forms/filtersets.py:64 #: vpn/models/crypto.py:250 vpn/tables/tunnels.py:51 -msgid "IPSec profile" +msgid "IPSec Profile" msgstr "Профиль IPsec" #: templates/vpn/tunnel.html:45 vpn/forms/bulk_edit.py:69 @@ -14150,11 +14150,11 @@ msgid "Tunnel group (slug)" msgstr "Группа туннелей (подстрока)" #: vpn/filtersets.py:54 -msgid "IPSec profile (ID)" +msgid "IPSec Profile (ID)" msgstr "Профиль IPsec (ID)" #: vpn/filtersets.py:60 -msgid "IPSec profile (name)" +msgid "IPSec Profile (name)" msgstr "Профиль IPsec (имя)" #: vpn/filtersets.py:81 @@ -14170,19 +14170,19 @@ msgid "Outside IP (ID)" msgstr "Внешний IP-адрес (ID)" #: vpn/filtersets.py:130 vpn/filtersets.py:153 vpn/filtersets.py:282 -msgid "IKE policy (ID)" +msgid "IKE Policy (ID)" msgstr "Политика IKE (ID)" #: vpn/filtersets.py:136 vpn/filtersets.py:159 vpn/filtersets.py:288 -msgid "IKE policy (name)" +msgid "IKE Policy (name)" msgstr "Политика IKE (название)" #: vpn/filtersets.py:215 vpn/filtersets.py:292 -msgid "IPSec policy (ID)" +msgid "IPSec Policy (ID)" msgstr "Политика IPsec (ID)" #: vpn/filtersets.py:221 vpn/filtersets.py:298 -msgid "IPSec policy (name)" +msgid "IPSec Policy (name)" msgstr "Политика IPsec (имя)" #: vpn/filtersets.py:367 @@ -14215,13 +14215,13 @@ msgstr "Предварительный общий ключ" #: vpn/forms/bulk_edit.py:237 vpn/forms/bulk_import.py:239 #: vpn/forms/filtersets.py:199 vpn/forms/model_forms.py:370 #: vpn/models/crypto.py:104 -msgid "IKE policy" +msgid "IKE Policy" msgstr "Политика IKE" #: vpn/forms/bulk_edit.py:242 vpn/forms/bulk_import.py:244 #: vpn/forms/filtersets.py:204 vpn/forms/model_forms.py:374 #: vpn/models/crypto.py:209 -msgid "IPSec policy" +msgid "IPSec Policy" msgstr "Политика IPsec" #: vpn/forms/bulk_import.py:50 @@ -14291,7 +14291,7 @@ msgid "Cannot assign both an interface and a VLAN." msgstr "Невозможно назначить одновременно интерфейс и VLAN." #: vpn/forms/filtersets.py:130 -msgid "IKE version" +msgid "IKE Version" msgstr "Версия IKE" #: vpn/forms/filtersets.py:142 vpn/forms/filtersets.py:175 @@ -14375,11 +14375,11 @@ msgid "IKE policies" msgstr "Политики IKE" #: vpn/models/crypto.py:118 -msgid "Mode is required for selected IKE version" +msgid "Mode is required for selected IKE Version" msgstr "Режим необходим для выбранной версии IKE" #: vpn/models/crypto.py:122 -msgid "Mode cannot be used for selected IKE version" +msgid "Mode cannot be used for selected IKE Version" msgstr "Режим не может быть использован для выбранной версии IKE" #: vpn/models/crypto.py:136 @@ -14415,7 +14415,7 @@ msgid "IPSec policies" msgstr "Политики IPsec" #: vpn/models/crypto.py:251 -msgid "IPSec profiles" +msgid "IPSec Profiles" msgstr "Профили IPsec" #: vpn/models/l2vpn.py:116 diff --git a/netbox/translations/tr/LC_MESSAGES/django.po b/netbox/translations/tr/LC_MESSAGES/django.po index afc6ff27c..b78669b4e 100644 --- a/netbox/translations/tr/LC_MESSAGES/django.po +++ b/netbox/translations/tr/LC_MESSAGES/django.po @@ -12810,21 +12810,21 @@ msgstr "IKE Teklifi" #: templates/vpn/ikeproposal.html:21 vpn/forms/bulk_edit.py:97 #: vpn/forms/bulk_import.py:145 vpn/forms/filtersets.py:101 -msgid "Authentication method" +msgid "Authentication Method" msgstr "Kimlik doğrulama yöntemi" #: templates/vpn/ikeproposal.html:25 templates/vpn/ipsecproposal.html:21 #: vpn/forms/bulk_edit.py:102 vpn/forms/bulk_edit.py:172 #: vpn/forms/bulk_import.py:149 vpn/forms/bulk_import.py:195 #: vpn/forms/filtersets.py:106 vpn/forms/filtersets.py:154 -msgid "Encryption algorithm" +msgid "Encryption Algorithm" msgstr "Şifreleme algoritması" #: templates/vpn/ikeproposal.html:29 templates/vpn/ipsecproposal.html:25 #: vpn/forms/bulk_edit.py:107 vpn/forms/bulk_edit.py:177 #: vpn/forms/bulk_import.py:153 vpn/forms/bulk_import.py:200 #: vpn/forms/filtersets.py:111 vpn/forms/filtersets.py:159 -msgid "Authentication algorithm" +msgid "Authentication Algorithm" msgstr "Kimlik doğrulama algoritması" #: templates/vpn/ikeproposal.html:33 @@ -12883,7 +12883,7 @@ msgstr "Kapsülleme" #: templates/vpn/tunnel.html:41 vpn/forms/bulk_edit.py:55 #: vpn/forms/bulk_import.py:53 vpn/forms/filtersets.py:64 #: vpn/models/crypto.py:250 vpn/tables/tunnels.py:51 -msgid "IPSec profile" +msgid "IPSec Profile" msgstr "IPsec profili" #: templates/vpn/tunnel.html:45 vpn/forms/bulk_edit.py:69 @@ -14050,11 +14050,11 @@ msgid "Tunnel group (slug)" msgstr "Tünel grubu (kısa ad)" #: vpn/filtersets.py:54 -msgid "IPSec profile (ID)" +msgid "IPSec Profile (ID)" msgstr "IPsec profili (ID)" #: vpn/filtersets.py:60 -msgid "IPSec profile (name)" +msgid "IPSec Profile (name)" msgstr "IPsec profili (ad)" #: vpn/filtersets.py:81 @@ -14070,19 +14070,19 @@ msgid "Outside IP (ID)" msgstr "Dış IP (ID)" #: vpn/filtersets.py:130 vpn/filtersets.py:153 vpn/filtersets.py:282 -msgid "IKE policy (ID)" +msgid "IKE Policy (ID)" msgstr "IKE ilkesi (ID)" #: vpn/filtersets.py:136 vpn/filtersets.py:159 vpn/filtersets.py:288 -msgid "IKE policy (name)" +msgid "IKE Policy (name)" msgstr "IKE ilkesi (isim)" #: vpn/filtersets.py:215 vpn/filtersets.py:292 -msgid "IPSec policy (ID)" +msgid "IPSec Policy (ID)" msgstr "IPsec ilkesi (ID)" #: vpn/filtersets.py:221 vpn/filtersets.py:298 -msgid "IPSec policy (name)" +msgid "IPSec Policy (name)" msgstr "IPsec ilkesi (ad)" #: vpn/filtersets.py:367 @@ -14115,13 +14115,13 @@ msgstr "Önceden paylaşılan anahtar" #: vpn/forms/bulk_edit.py:237 vpn/forms/bulk_import.py:239 #: vpn/forms/filtersets.py:199 vpn/forms/model_forms.py:370 #: vpn/models/crypto.py:104 -msgid "IKE policy" +msgid "IKE Policy" msgstr "IKE ilkesi" #: vpn/forms/bulk_edit.py:242 vpn/forms/bulk_import.py:244 #: vpn/forms/filtersets.py:204 vpn/forms/model_forms.py:374 #: vpn/models/crypto.py:209 -msgid "IPSec policy" +msgid "IPSec Policy" msgstr "IPsec ilkesi" #: vpn/forms/bulk_import.py:50 @@ -14189,7 +14189,7 @@ msgid "Cannot assign both an interface and a VLAN." msgstr "Hem arabirim hem de VLAN atanamıyor." #: vpn/forms/filtersets.py:130 -msgid "IKE version" +msgid "IKE Version" msgstr "IKE versiyonu" #: vpn/forms/filtersets.py:142 vpn/forms/filtersets.py:175 @@ -14274,11 +14274,11 @@ msgid "IKE policies" msgstr "IKE politikaları" #: vpn/models/crypto.py:118 -msgid "Mode is required for selected IKE version" +msgid "Mode is required for selected IKE Version" msgstr "Seçilen IKE sürümü için mod gereklidir" #: vpn/models/crypto.py:122 -msgid "Mode cannot be used for selected IKE version" +msgid "Mode cannot be used for selected IKE Version" msgstr "Seçilen IKE sürümü için mod kullanılamaz" #: vpn/models/crypto.py:136 @@ -14314,7 +14314,7 @@ msgid "IPSec policies" msgstr "IPsec ilkeleri" #: vpn/models/crypto.py:251 -msgid "IPSec profiles" +msgid "IPSec Profiles" msgstr "IPsec profilleri" #: vpn/models/l2vpn.py:116 diff --git a/netbox/translations/uk/LC_MESSAGES/django.po b/netbox/translations/uk/LC_MESSAGES/django.po index f7078a981..72d8ddfc8 100644 --- a/netbox/translations/uk/LC_MESSAGES/django.po +++ b/netbox/translations/uk/LC_MESSAGES/django.po @@ -12840,21 +12840,21 @@ msgstr "Пропозиція IKE" #: templates/vpn/ikeproposal.html:21 vpn/forms/bulk_edit.py:97 #: vpn/forms/bulk_import.py:145 vpn/forms/filtersets.py:101 -msgid "Authentication method" +msgid "Authentication Method" msgstr "Метод аутентифікації" #: templates/vpn/ikeproposal.html:25 templates/vpn/ipsecproposal.html:21 #: vpn/forms/bulk_edit.py:102 vpn/forms/bulk_edit.py:172 #: vpn/forms/bulk_import.py:149 vpn/forms/bulk_import.py:195 #: vpn/forms/filtersets.py:106 vpn/forms/filtersets.py:154 -msgid "Encryption algorithm" +msgid "Encryption Algorithm" msgstr "Алгоритм шифрування" #: templates/vpn/ikeproposal.html:29 templates/vpn/ipsecproposal.html:25 #: vpn/forms/bulk_edit.py:107 vpn/forms/bulk_edit.py:177 #: vpn/forms/bulk_import.py:153 vpn/forms/bulk_import.py:200 #: vpn/forms/filtersets.py:111 vpn/forms/filtersets.py:159 -msgid "Authentication algorithm" +msgid "Authentication Algorithm" msgstr "Алгоритм авторизації" #: templates/vpn/ikeproposal.html:33 @@ -12913,7 +12913,7 @@ msgstr "Інкапсуляція" #: templates/vpn/tunnel.html:41 vpn/forms/bulk_edit.py:55 #: vpn/forms/bulk_import.py:53 vpn/forms/filtersets.py:64 #: vpn/models/crypto.py:250 vpn/tables/tunnels.py:51 -msgid "IPSec profile" +msgid "IPSec Profile" msgstr "Профіль IPsec" #: templates/vpn/tunnel.html:45 vpn/forms/bulk_edit.py:69 @@ -14090,11 +14090,11 @@ msgid "Tunnel group (slug)" msgstr "Тунельна група (слимак)" #: vpn/filtersets.py:54 -msgid "IPSec profile (ID)" +msgid "IPSec Profile (ID)" msgstr "Профіль IPsec (ідентифікатор)" #: vpn/filtersets.py:60 -msgid "IPSec profile (name)" +msgid "IPSec Profile (name)" msgstr "Профіль IPsec (ім'я)" #: vpn/filtersets.py:81 @@ -14110,19 +14110,19 @@ msgid "Outside IP (ID)" msgstr "Зовнішній IP (ID)" #: vpn/filtersets.py:130 vpn/filtersets.py:153 vpn/filtersets.py:282 -msgid "IKE policy (ID)" +msgid "IKE Policy (ID)" msgstr "Політика IKE (ID)" #: vpn/filtersets.py:136 vpn/filtersets.py:159 vpn/filtersets.py:288 -msgid "IKE policy (name)" +msgid "IKE Policy (name)" msgstr "Політика IKE (назва)" #: vpn/filtersets.py:215 vpn/filtersets.py:292 -msgid "IPSec policy (ID)" +msgid "IPSec Policy (ID)" msgstr "Політика IPsec (ідентифікатор)" #: vpn/filtersets.py:221 vpn/filtersets.py:298 -msgid "IPSec policy (name)" +msgid "IPSec Policy (name)" msgstr "Політика IPsec (назва)" #: vpn/filtersets.py:367 @@ -14155,13 +14155,13 @@ msgstr "Попередньо спільний ключ" #: vpn/forms/bulk_edit.py:237 vpn/forms/bulk_import.py:239 #: vpn/forms/filtersets.py:199 vpn/forms/model_forms.py:370 #: vpn/models/crypto.py:104 -msgid "IKE policy" +msgid "IKE Policy" msgstr "Політика IKE" #: vpn/forms/bulk_edit.py:242 vpn/forms/bulk_import.py:244 #: vpn/forms/filtersets.py:204 vpn/forms/model_forms.py:374 #: vpn/models/crypto.py:209 -msgid "IPSec policy" +msgid "IPSec Policy" msgstr "Політика IPsec" #: vpn/forms/bulk_import.py:50 @@ -14231,7 +14231,7 @@ msgid "Cannot assign both an interface and a VLAN." msgstr "Не вдається призначити як інтерфейс, так і VLAN." #: vpn/forms/filtersets.py:130 -msgid "IKE version" +msgid "IKE Version" msgstr "Версія IKE" #: vpn/forms/filtersets.py:142 vpn/forms/filtersets.py:175 @@ -14315,11 +14315,11 @@ msgid "IKE policies" msgstr "Політика IKE" #: vpn/models/crypto.py:118 -msgid "Mode is required for selected IKE version" +msgid "Mode is required for selected IKE Version" msgstr "Режим необхідний для вибраної версії IKE" #: vpn/models/crypto.py:122 -msgid "Mode cannot be used for selected IKE version" +msgid "Mode cannot be used for selected IKE Version" msgstr "Режим не може бути використаний для вибраної версії IKE" #: vpn/models/crypto.py:136 @@ -14355,7 +14355,7 @@ msgid "IPSec policies" msgstr "Політики IPsec" #: vpn/models/crypto.py:251 -msgid "IPSec profiles" +msgid "IPSec Profiles" msgstr "Профілі IPsec" #: vpn/models/l2vpn.py:116 diff --git a/netbox/translations/zh/LC_MESSAGES/django.po b/netbox/translations/zh/LC_MESSAGES/django.po index a2afb48ea..1fd3888ed 100644 --- a/netbox/translations/zh/LC_MESSAGES/django.po +++ b/netbox/translations/zh/LC_MESSAGES/django.po @@ -12574,21 +12574,21 @@ msgstr "IKE 提案" #: templates/vpn/ikeproposal.html:21 vpn/forms/bulk_edit.py:97 #: vpn/forms/bulk_import.py:145 vpn/forms/filtersets.py:101 -msgid "Authentication method" +msgid "Authentication Method" msgstr "身份验证方法" #: templates/vpn/ikeproposal.html:25 templates/vpn/ipsecproposal.html:21 #: vpn/forms/bulk_edit.py:102 vpn/forms/bulk_edit.py:172 #: vpn/forms/bulk_import.py:149 vpn/forms/bulk_import.py:195 #: vpn/forms/filtersets.py:106 vpn/forms/filtersets.py:154 -msgid "Encryption algorithm" +msgid "Encryption Algorithm" msgstr "加密算法" #: templates/vpn/ikeproposal.html:29 templates/vpn/ipsecproposal.html:25 #: vpn/forms/bulk_edit.py:107 vpn/forms/bulk_edit.py:177 #: vpn/forms/bulk_import.py:153 vpn/forms/bulk_import.py:200 #: vpn/forms/filtersets.py:111 vpn/forms/filtersets.py:159 -msgid "Authentication algorithm" +msgid "Authentication Algorithm" msgstr "身份验证算法" #: templates/vpn/ikeproposal.html:33 @@ -12647,7 +12647,7 @@ msgstr "封装" #: templates/vpn/tunnel.html:41 vpn/forms/bulk_edit.py:55 #: vpn/forms/bulk_import.py:53 vpn/forms/filtersets.py:64 #: vpn/models/crypto.py:250 vpn/tables/tunnels.py:51 -msgid "IPSec profile" +msgid "IPSec Profile" msgstr "IPsec 配置文件" #: templates/vpn/tunnel.html:45 vpn/forms/bulk_edit.py:69 @@ -13758,11 +13758,11 @@ msgid "Tunnel group (slug)" msgstr "隧道群（slug）" #: vpn/filtersets.py:54 -msgid "IPSec profile (ID)" +msgid "IPSec Profile (ID)" msgstr "IPsec 配置文件 (ID)" #: vpn/filtersets.py:60 -msgid "IPSec profile (name)" +msgid "IPSec Profile (name)" msgstr "IPsec 配置文件（名称）" #: vpn/filtersets.py:81 @@ -13778,19 +13778,19 @@ msgid "Outside IP (ID)" msgstr "外部 IP (ID)" #: vpn/filtersets.py:130 vpn/filtersets.py:153 vpn/filtersets.py:282 -msgid "IKE policy (ID)" +msgid "IKE Policy (ID)" msgstr "IKE 策略 (ID)" #: vpn/filtersets.py:136 vpn/filtersets.py:159 vpn/filtersets.py:288 -msgid "IKE policy (name)" +msgid "IKE Policy (name)" msgstr "IKE 策略（名称）" #: vpn/filtersets.py:215 vpn/filtersets.py:292 -msgid "IPSec policy (ID)" +msgid "IPSec Policy (ID)" msgstr "IPsec 策略 (ID)" #: vpn/filtersets.py:221 vpn/filtersets.py:298 -msgid "IPSec policy (name)" +msgid "IPSec Policy (name)" msgstr "IPsec 策略（名称）" #: vpn/filtersets.py:367 @@ -13823,13 +13823,13 @@ msgstr "预共享密钥" #: vpn/forms/bulk_edit.py:237 vpn/forms/bulk_import.py:239 #: vpn/forms/filtersets.py:199 vpn/forms/model_forms.py:370 #: vpn/models/crypto.py:104 -msgid "IKE policy" +msgid "IKE Policy" msgstr "IKE 政策" #: vpn/forms/bulk_edit.py:242 vpn/forms/bulk_import.py:244 #: vpn/forms/filtersets.py:204 vpn/forms/model_forms.py:374 #: vpn/models/crypto.py:209 -msgid "IPSec policy" +msgid "IPSec Policy" msgstr "IPsec 政策" #: vpn/forms/bulk_import.py:50 @@ -13897,7 +13897,7 @@ msgid "Cannot assign both an interface and a VLAN." msgstr "无法同时分配接口和 VLAN。" #: vpn/forms/filtersets.py:130 -msgid "IKE version" +msgid "IKE Version" msgstr "IKE 版本" #: vpn/forms/filtersets.py:142 vpn/forms/filtersets.py:175 @@ -13980,11 +13980,11 @@ msgid "IKE policies" msgstr "IKE 策略" #: vpn/models/crypto.py:118 -msgid "Mode is required for selected IKE version" +msgid "Mode is required for selected IKE Version" msgstr "所选 IKE 版本需要模式" #: vpn/models/crypto.py:122 -msgid "Mode cannot be used for selected IKE version" +msgid "Mode cannot be used for selected IKE Version" msgstr "模式不能用于选定的 IKE 版本" #: vpn/models/crypto.py:136 @@ -14020,7 +14020,7 @@ msgid "IPSec policies" msgstr "IPsec 策略" #: vpn/models/crypto.py:251 -msgid "IPSec profiles" +msgid "IPSec Profiles" msgstr "IPsec 配置文件" #: vpn/models/l2vpn.py:116 diff --git a/netbox/vpn/filtersets.py b/netbox/vpn/filtersets.py index 3f8b2ee78..679b7a794 100644 --- a/netbox/vpn/filtersets.py +++ b/netbox/vpn/filtersets.py @@ -51,13 +51,13 @@ class TunnelFilterSet(NetBoxModelFilterSet, TenancyFilterSet): ) ipsec_profile_id = django_filters.ModelMultipleChoiceFilter( queryset=IPSecProfile.objects.all(), - label=_('IPSec profile (ID)'), + label=_('IPSec Profile (ID)'), ) ipsec_profile = django_filters.ModelMultipleChoiceFilter( field_name='ipsec_profile__name', queryset=IPSecProfile.objects.all(), to_field_name='name', - label=_('IPSec profile (name)'), + label=_('IPSec Profile (name)'), ) class Meta: @@ -127,13 +127,13 @@ class IKEProposalFilterSet(NetBoxModelFilterSet): ike_policy_id = django_filters.ModelMultipleChoiceFilter( field_name='ike_policies', queryset=IKEPolicy.objects.all(), - label=_('IKE policy (ID)'), + 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)'), + label=_('IKE Policy (name)'), ) authentication_method = django_filters.MultipleChoiceFilter( choices=AuthenticationMethodChoices @@ -150,13 +150,13 @@ class IKEProposalFilterSet(NetBoxModelFilterSet): ike_policy_id = django_filters.ModelMultipleChoiceFilter( field_name='ike_policies', queryset=IKEPolicy.objects.all(), - label=_('IKE policy (ID)'), + 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)'), + label=_('IKE Policy (name)'), ) class Meta: @@ -212,13 +212,13 @@ class IPSecProposalFilterSet(NetBoxModelFilterSet): ipsec_policy_id = django_filters.ModelMultipleChoiceFilter( field_name='ipsec_policies', queryset=IPSecPolicy.objects.all(), - label=_('IPSec policy (ID)'), + label=_('IPSec Policy (ID)'), ) ipsec_policy = django_filters.ModelMultipleChoiceFilter( field_name='ipsec_policies__name', queryset=IPSecPolicy.objects.all(), to_field_name='name', - label=_('IPSec policy (name)'), + label=_('IPSec Policy (name)'), ) encryption_algorithm = django_filters.MultipleChoiceFilter( choices=EncryptionAlgorithmChoices @@ -279,23 +279,23 @@ class IPSecProfileFilterSet(NetBoxModelFilterSet): ) ike_policy_id = django_filters.ModelMultipleChoiceFilter( queryset=IKEPolicy.objects.all(), - label=_('IKE policy (ID)'), + label=_('IKE Policy (ID)'), ) ike_policy = django_filters.ModelMultipleChoiceFilter( field_name='ike_policy__name', queryset=IKEPolicy.objects.all(), to_field_name='name', - label=_('IKE policy (name)'), + label=_('IKE Policy (name)'), ) ipsec_policy_id = django_filters.ModelMultipleChoiceFilter( queryset=IPSecPolicy.objects.all(), - label=_('IPSec policy (ID)'), + label=_('IPSec Policy (ID)'), ) ipsec_policy = django_filters.ModelMultipleChoiceFilter( field_name='ipsec_policy__name', queryset=IPSecPolicy.objects.all(), to_field_name='name', - label=_('IPSec policy (name)'), + label=_('IPSec Policy (name)'), ) class Meta: diff --git a/netbox/vpn/forms/bulk_edit.py b/netbox/vpn/forms/bulk_edit.py index 9886a2897..eeb47ed20 100644 --- a/netbox/vpn/forms/bulk_edit.py +++ b/netbox/vpn/forms/bulk_edit.py @@ -52,7 +52,7 @@ class TunnelBulkEditForm(NetBoxModelBulkEditForm): ) ipsec_profile = DynamicModelMultipleChoiceField( queryset=IPSecProfile.objects.all(), - label=_('IPSec profile'), + label=_('IPSec Profile'), required=False ) tenant = DynamicModelChoiceField( @@ -94,17 +94,17 @@ class TunnelTerminationBulkEditForm(NetBoxModelBulkEditForm): class IKEProposalBulkEditForm(NetBoxModelBulkEditForm): authentication_method = forms.ChoiceField( - label=_('Authentication method'), + label=_('Authentication Method'), choices=add_blank_choice(AuthenticationMethodChoices), required=False ) encryption_algorithm = forms.ChoiceField( - label=_('Encryption algorithm'), + label=_('Encryption Algorithm'), choices=add_blank_choice(EncryptionAlgorithmChoices), required=False ) authentication_algorithm = forms.ChoiceField( - label=_('Authentication algorithm'), + label=_('Authentication Algorithm'), choices=add_blank_choice(AuthenticationAlgorithmChoices), required=False ) @@ -169,12 +169,12 @@ class IKEPolicyBulkEditForm(NetBoxModelBulkEditForm): class IPSecProposalBulkEditForm(NetBoxModelBulkEditForm): encryption_algorithm = forms.ChoiceField( - label=_('Encryption algorithm'), + label=_('Encryption Algorithm'), choices=add_blank_choice(EncryptionAlgorithmChoices), required=False ) authentication_algorithm = forms.ChoiceField( - label=_('Authentication algorithm'), + label=_('Authentication Algorithm'), choices=add_blank_choice(AuthenticationAlgorithmChoices), required=False ) @@ -234,12 +234,12 @@ class IPSecProfileBulkEditForm(NetBoxModelBulkEditForm): required=False ) ike_policy = DynamicModelChoiceField( - label=_('IKE policy'), + label=_('IKE Policy'), queryset=IKEPolicy.objects.all(), required=False ) ipsec_policy = DynamicModelChoiceField( - label=_('IPSec policy'), + label=_('IPSec Policy'), queryset=IPSecPolicy.objects.all(), required=False ) diff --git a/netbox/vpn/forms/bulk_import.py b/netbox/vpn/forms/bulk_import.py index b8d19bb38..07a1da97a 100644 --- a/netbox/vpn/forms/bulk_import.py +++ b/netbox/vpn/forms/bulk_import.py @@ -50,7 +50,7 @@ class TunnelImportForm(NetBoxModelImportForm): help_text=_('Tunnel encapsulation') ) ipsec_profile = CSVModelChoiceField( - label=_('IPSec profile'), + label=_('IPSec Profile'), queryset=IPSecProfile.objects.all(), required=False, to_field_name='name' @@ -142,15 +142,15 @@ class TunnelTerminationImportForm(NetBoxModelImportForm): class IKEProposalImportForm(NetBoxModelImportForm): authentication_method = CSVChoiceField( - label=_('Authentication method'), + label=_('Authentication Method'), choices=AuthenticationMethodChoices ) encryption_algorithm = CSVChoiceField( - label=_('Encryption algorithm'), + label=_('Encryption Algorithm'), choices=EncryptionAlgorithmChoices ) authentication_algorithm = CSVChoiceField( - label=_('Authentication algorithm'), + label=_('Authentication Algorithm'), choices=AuthenticationAlgorithmChoices, required=False ) @@ -192,12 +192,12 @@ class IKEPolicyImportForm(NetBoxModelImportForm): class IPSecProposalImportForm(NetBoxModelImportForm): encryption_algorithm = CSVChoiceField( - label=_('Encryption algorithm'), + label=_('Encryption Algorithm'), choices=EncryptionAlgorithmChoices, required=False ) authentication_algorithm = CSVChoiceField( - label=_('Authentication algorithm'), + label=_('Authentication Algorithm'), choices=AuthenticationAlgorithmChoices, required=False ) @@ -236,12 +236,12 @@ class IPSecProfileImportForm(NetBoxModelImportForm): help_text=_('IPSec protocol') ) ike_policy = CSVModelChoiceField( - label=_('IKE policy'), + label=_('IKE Policy'), queryset=IKEPolicy.objects.all(), to_field_name='name' ) ipsec_policy = CSVModelChoiceField( - label=_('IPSec policy'), + label=_('IPSec Policy'), queryset=IPSecPolicy.objects.all(), to_field_name='name' ) diff --git a/netbox/vpn/forms/filtersets.py b/netbox/vpn/forms/filtersets.py index a614d0761..84f2702c0 100644 --- a/netbox/vpn/forms/filtersets.py +++ b/netbox/vpn/forms/filtersets.py @@ -61,7 +61,7 @@ class TunnelFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): ipsec_profile_id = DynamicModelMultipleChoiceField( queryset=IPSecProfile.objects.all(), required=False, - label=_('IPSec profile') + label=_('IPSec Profile') ) tunnel_id = forms.IntegerField( required=False, @@ -98,17 +98,17 @@ class IKEProposalFilterForm(NetBoxModelFilterSetForm): ), ) authentication_method = forms.MultipleChoiceField( - label=_('Authentication method'), + label=_('Authentication Method'), choices=AuthenticationMethodChoices, required=False ) encryption_algorithm = forms.MultipleChoiceField( - label=_('Encryption algorithm'), + label=_('Encryption Algorithm'), choices=EncryptionAlgorithmChoices, required=False ) authentication_algorithm = forms.MultipleChoiceField( - label=_('Authentication algorithm'), + label=_('Authentication Algorithm'), choices=AuthenticationAlgorithmChoices, required=False ) @@ -127,7 +127,7 @@ class IKEPolicyFilterForm(NetBoxModelFilterSetForm): FieldSet('version', 'mode', 'proposal_id', name=_('Parameters')), ) version = forms.MultipleChoiceField( - label=_('IKE version'), + label=_('IKE Version'), choices=IKEVersionChoices, required=False ) @@ -151,12 +151,12 @@ class IPSecProposalFilterForm(NetBoxModelFilterSetForm): FieldSet('encryption_algorithm', 'authentication_algorithm', name=_('Parameters')), ) encryption_algorithm = forms.MultipleChoiceField( - label=_('Encryption algorithm'), + label=_('Encryption Algorithm'), choices=EncryptionAlgorithmChoices, required=False ) authentication_algorithm = forms.MultipleChoiceField( - label=_('Authentication algorithm'), + label=_('Authentication Algorithm'), choices=AuthenticationAlgorithmChoices, required=False ) @@ -196,12 +196,12 @@ class IPSecProfileFilterForm(NetBoxModelFilterSetForm): ike_policy_id = DynamicModelMultipleChoiceField( queryset=IKEPolicy.objects.all(), required=False, - label=_('IKE policy') + label=_('IKE Policy') ) ipsec_policy_id = DynamicModelMultipleChoiceField( queryset=IPSecPolicy.objects.all(), required=False, - label=_('IPSec policy') + label=_('IPSec Policy') ) tag = TagFilterField(model) diff --git a/netbox/vpn/forms/model_forms.py b/netbox/vpn/forms/model_forms.py index 73e5b2c45..a8e7e0ad4 100644 --- a/netbox/vpn/forms/model_forms.py +++ b/netbox/vpn/forms/model_forms.py @@ -367,11 +367,11 @@ class IPSecPolicyForm(NetBoxModelForm): class IPSecProfileForm(NetBoxModelForm): ike_policy = DynamicModelChoiceField( queryset=IKEPolicy.objects.all(), - label=_('IKE policy') + label=_('IKE Policy') ) ipsec_policy = DynamicModelChoiceField( queryset=IPSecPolicy.objects.all(), - label=_('IPSec policy') + label=_('IPSec Policy') ) comments = CommentField() diff --git a/netbox/vpn/migrations/0001_initial.py b/netbox/vpn/migrations/0001_initial.py index 681474837..b0db325a0 100644 --- a/netbox/vpn/migrations/0001_initial.py +++ b/netbox/vpn/migrations/0001_initial.py @@ -55,7 +55,7 @@ class Migration(migrations.Migration): ('preshared_key', models.TextField(blank=True)), ], options={ - 'verbose_name': 'IKE policy', + 'verbose_name': 'IKE Policy', 'verbose_name_plural': 'IKE policies', 'ordering': ('name',), }, @@ -107,7 +107,7 @@ class Migration(migrations.Migration): ('pfs_group', models.PositiveSmallIntegerField(blank=True, null=True)), ], options={ - 'verbose_name': 'IPSec policy', + 'verbose_name': 'IPSec Policy', 'verbose_name_plural': 'IPSec policies', 'ordering': ('name',), }, @@ -138,8 +138,8 @@ class Migration(migrations.Migration): ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), ], options={ - 'verbose_name': 'IPSec profile', - 'verbose_name_plural': 'IPSec profiles', + 'verbose_name': 'IPSec Profile', + 'verbose_name_plural': 'IPSec Profiles', 'ordering': ('name',), }, ), diff --git a/netbox/vpn/models/crypto.py b/netbox/vpn/models/crypto.py index 2769430fd..f1b311286 100644 --- a/netbox/vpn/models/crypto.py +++ b/netbox/vpn/models/crypto.py @@ -101,7 +101,7 @@ class IKEPolicy(PrimaryModel): class Meta: ordering = ('name',) - verbose_name = _('IKE policy') + verbose_name = _('IKE Policy') verbose_name_plural = _('IKE policies') def __str__(self): @@ -115,11 +115,11 @@ class IKEPolicy(PrimaryModel): # Mode is required if self.version == IKEVersionChoices.VERSION_1 and not self.mode: - raise ValidationError(_("Mode is required for selected IKE version")) + raise ValidationError(_("Mode is required for selected IKE Version")) # Mode cannot be used if self.version == IKEVersionChoices.VERSION_2 and self.mode: - raise ValidationError(_("Mode cannot be used for selected IKE version")) + raise ValidationError(_("Mode cannot be used for selected IKE Version")) # @@ -206,7 +206,7 @@ class IPSecPolicy(PrimaryModel): class Meta: ordering = ('name',) - verbose_name = _('IPSec policy') + verbose_name = _('IPSec Policy') verbose_name_plural = _('IPSec policies') def __str__(self): @@ -247,8 +247,8 @@ class IPSecProfile(PrimaryModel): class Meta: ordering = ('name',) - verbose_name = _('IPSec profile') - verbose_name_plural = _('IPSec profiles') + verbose_name = _('IPSec Profile') + verbose_name_plural = _('IPSec Profiles') def __str__(self): return self.name diff --git a/netbox/vpn/tables/tunnels.py b/netbox/vpn/tables/tunnels.py index 94f65e573..20fa5e1e6 100644 --- a/netbox/vpn/tables/tunnels.py +++ b/netbox/vpn/tables/tunnels.py @@ -48,7 +48,7 @@ class TunnelTable(TenancyColumnsMixin, NetBoxTable): verbose_name=_('Status') ) ipsec_profile = tables.Column( - verbose_name=_('IPSec profile'), + verbose_name=_('IPSec Profile'), linkify=True ) terminations_count = columns.LinkedCountColumn(