summaryrefslogtreecommitdiffhomepage
path: root/modules
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2019-09-24 19:56:44 +0200
committerGitHub <noreply@github.com>2019-09-24 19:56:44 +0200
commit66749b4fe33987b5326bc5d6f5ef4979a230cb49 (patch)
treec2abb5eed2be766fb8dc10bc3d52cd4f82a54427 /modules
parentaac046271b4ca7f4504d213f1f7a56f41c66abba (diff)
parent9f0f6cbd315e0ca5da53cb045a72be76c07da675 (diff)
Merge pull request #2756 from Ansuel/wps
luci-mod-network: permit WPS push-button on WPA3
Diffstat (limited to 'modules')
-rw-r--r--modules/luci-base/po/ca/base.po4
-rw-r--r--modules/luci-base/po/cs/base.po4
-rw-r--r--modules/luci-base/po/de/base.po8
-rw-r--r--modules/luci-base/po/el/base.po4
-rw-r--r--modules/luci-base/po/en/base.po4
-rw-r--r--modules/luci-base/po/es/base.po6
-rw-r--r--modules/luci-base/po/fr/base.po4
-rw-r--r--modules/luci-base/po/he/base.po4
-rw-r--r--modules/luci-base/po/hu/base.po4
-rw-r--r--modules/luci-base/po/it/base.po6
-rw-r--r--modules/luci-base/po/ja/base.po6
-rw-r--r--modules/luci-base/po/ko/base.po4
-rw-r--r--modules/luci-base/po/ms/base.po4
-rw-r--r--modules/luci-base/po/no/base.po4
-rw-r--r--modules/luci-base/po/pl/base.po6
-rw-r--r--modules/luci-base/po/pt-br/base.po8
-rw-r--r--modules/luci-base/po/pt/base.po4
-rw-r--r--modules/luci-base/po/ro/base.po4
-rw-r--r--modules/luci-base/po/ru/base.po8
-rw-r--r--modules/luci-base/po/sk/base.po4
-rw-r--r--modules/luci-base/po/sv/base.po6
-rw-r--r--modules/luci-base/po/templates/base.pot4
-rw-r--r--modules/luci-base/po/tr/base.po4
-rw-r--r--modules/luci-base/po/uk/base.po8
-rw-r--r--modules/luci-base/po/vi/base.po4
-rw-r--r--modules/luci-base/po/zh-cn/base.po8
-rw-r--r--modules/luci-base/po/zh-tw/base.po6
-rw-r--r--modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js4
28 files changed, 73 insertions, 71 deletions
diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po
index 18bd3fd96..3eb122101 100644
--- a/modules/luci-base/po/ca/base.po
+++ b/modules/luci-base/po/ca/base.po
@@ -1771,7 +1771,7 @@ msgid "Enable VLAN functionality"
msgstr "Habilita la funcionalitat VLAN"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
@@ -5840,7 +5840,7 @@ msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po
index 7b6e6ebeb..cd9fcc2f0 100644
--- a/modules/luci-base/po/cs/base.po
+++ b/modules/luci-base/po/cs/base.po
@@ -1774,7 +1774,7 @@ msgid "Enable VLAN functionality"
msgstr "Povolit funkcionalitu VLAN"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
@@ -5867,7 +5867,7 @@ msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po
index 534b4a4a7..05e752256 100644
--- a/modules/luci-base/po/de/base.po
+++ b/modules/luci-base/po/de/base.po
@@ -1818,8 +1818,8 @@ msgid "Enable VLAN functionality"
msgstr "VLAN-Funktionalität aktivieren"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
-msgstr "WPS-via-Knopfdruck aktivieren, erfordert WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
+msgstr "WPS-via-Knopfdruck aktivieren, erfordert WPA(2)-PSK/WPA3-SAE"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
msgid "Enable key reinstallation (KRACK) countermeasures"
@@ -6053,10 +6053,10 @@ msgstr "Benutzer Schlüsselindex"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
"Wird als RADIUS-NAS-ID und als 802.11r R0KH-ID verwendet. Nicht benötigt für "
-"WPA(2)-PSK."
+"WPA(2)-PSK/WPA3-SAE."
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
msgid "User certificate (PEM encoded)"
diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po
index 6eabd350e..559faa59c 100644
--- a/modules/luci-base/po/el/base.po
+++ b/modules/luci-base/po/el/base.po
@@ -1786,7 +1786,7 @@ msgid "Enable VLAN functionality"
msgstr "Ενεργοποίηση λειτουργίας VLAN"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
@@ -5849,7 +5849,7 @@ msgstr "Χρησιμοποιούμενη Υποδοχή Κλειδιού"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po
index 8a3e13b77..d963a3cd6 100644
--- a/modules/luci-base/po/en/base.po
+++ b/modules/luci-base/po/en/base.po
@@ -1766,7 +1766,7 @@ msgid "Enable VLAN functionality"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
@@ -5810,7 +5810,7 @@ msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po
index 698eb23ea..ff74c7de1 100644
--- a/modules/luci-base/po/es/base.po
+++ b/modules/luci-base/po/es/base.po
@@ -1821,8 +1821,8 @@ msgid "Enable VLAN functionality"
msgstr "Habilitar funcionalidad VLAN"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
-msgstr "Habilitar botón WPS, requiere WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
+msgstr "Habilitar botón WPS, requiere WPA(2)-PSK/WPA3-SAE"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
msgid "Enable key reinstallation (KRACK) countermeasures"
@@ -6033,7 +6033,7 @@ msgstr "Espacio de clave usado"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
"Se utiliza para dos propósitos diferentes: RADIUS NAS ID y 802.11r R0KH-ID. "
"No es necesario con WPA normal (2)-PSK."
diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po
index 861ce6219..9d0f15e9d 100644
--- a/modules/luci-base/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
@@ -1790,7 +1790,7 @@ msgid "Enable VLAN functionality"
msgstr "Acviter la gestion des VLANs"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
@@ -5911,7 +5911,7 @@ msgstr "Clé utilisée"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po
index cae8c1f90..15ac02071 100644
--- a/modules/luci-base/po/he/base.po
+++ b/modules/luci-base/po/he/base.po
@@ -1752,7 +1752,7 @@ msgid "Enable VLAN functionality"
msgstr "אפשר תפקוד VLAN"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
@@ -5770,7 +5770,7 @@ msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po
index a9fe24957..a13e64e95 100644
--- a/modules/luci-base/po/hu/base.po
+++ b/modules/luci-base/po/hu/base.po
@@ -1783,7 +1783,7 @@ msgid "Enable VLAN functionality"
msgstr "VLAN funkció engedélyezése"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
@@ -5898,7 +5898,7 @@ msgstr "Használt kulcsindex"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po
index e5ec4380f..be9c2ce44 100644
--- a/modules/luci-base/po/it/base.po
+++ b/modules/luci-base/po/it/base.po
@@ -1787,8 +1787,8 @@ msgid "Enable VLAN functionality"
msgstr "Abilita la funzionalità VLAN"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
-msgstr "Abilita pulsante WPS, richiede WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
+msgstr "Abilita pulsante WPS, richiede WPA(2)-PSK/WPA3-SAE"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
msgid "Enable key reinstallation (KRACK) countermeasures"
@@ -5877,7 +5877,7 @@ msgstr "Slot Chiave Usata"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po
index eaf59765a..52718fcf7 100644
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@ -1805,8 +1805,8 @@ msgid "Enable VLAN functionality"
msgstr "VLAN機能を有効にする"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
-msgstr "WPS プッシュボタンを有効化するには、WPA(2)-PSKが必要です。"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
+msgstr "WPS プッシュボタンを有効化するには、WPA(2)-PSK/WPA3-SAEが必要です。"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
msgid "Enable key reinstallation (KRACK) countermeasures"
@@ -5970,7 +5970,7 @@ msgstr "使用するキースロット"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po
index c6ce3291e..3d4c13d8a 100644
--- a/modules/luci-base/po/ko/base.po
+++ b/modules/luci-base/po/ko/base.po
@@ -1760,7 +1760,7 @@ msgid "Enable VLAN functionality"
msgstr "VLAN 기능 활성화"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
@@ -5808,7 +5808,7 @@ msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po
index 5bb8c8811..1830e05c6 100644
--- a/modules/luci-base/po/ms/base.po
+++ b/modules/luci-base/po/ms/base.po
@@ -1737,7 +1737,7 @@ msgid "Enable VLAN functionality"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
@@ -5781,7 +5781,7 @@ msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po
index 676370af4..1aa8f2a01 100644
--- a/modules/luci-base/po/no/base.po
+++ b/modules/luci-base/po/no/base.po
@@ -1771,7 +1771,7 @@ msgid "Enable VLAN functionality"
msgstr "Aktiver VLAN funksjonalitet"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
@@ -5865,7 +5865,7 @@ msgstr "Brukte Nøkler"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po
index bba5ddd58..70d9feb4c 100644
--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@@ -1805,8 +1805,8 @@ msgid "Enable VLAN functionality"
msgstr "Włącz funkcjonalność VLAN"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
-msgstr "Włącz przycisk WPS, wymaga WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
+msgstr "Włącz przycisk WPS, wymaga WPA(2)-PSK/WPA3-SAE"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
msgid "Enable key reinstallation (KRACK) countermeasures"
@@ -5953,7 +5953,7 @@ msgstr "Użyte gniazdo klucza"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po
index 9f1eeb382..79169cbdf 100644
--- a/modules/luci-base/po/pt-br/base.po
+++ b/modules/luci-base/po/pt-br/base.po
@@ -1850,8 +1850,8 @@ msgid "Enable VLAN functionality"
msgstr "Ativar funcionalidade de VLAN"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
-msgstr "Habilite o botão WPS. requer WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
+msgstr "Habilite o botão WPS. requer WPA(2)-PSK/WPA3-SAE"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
msgid "Enable key reinstallation (KRACK) countermeasures"
@@ -6087,10 +6087,10 @@ msgstr "Posição da Chave Usada"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
"Usado para dois diferentes propósitos: identificador do RADIUS NAS e do "
-"802.11r R0KH. Não necessário com o WPA(2)-PSK normal."
+"802.11r R0KH. Não necessário com o WPA(2)-PSK/WPA3-SAE normal."
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
msgid "User certificate (PEM encoded)"
diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po
index 89a8d0b9a..1dca92fa0 100644
--- a/modules/luci-base/po/pt/base.po
+++ b/modules/luci-base/po/pt/base.po
@@ -1787,7 +1787,7 @@ msgid "Enable VLAN functionality"
msgstr "Ativar a funcionalidade VLAN"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
@@ -5865,7 +5865,7 @@ msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po
index f9e143a01..65a432aa9 100644
--- a/modules/luci-base/po/ro/base.po
+++ b/modules/luci-base/po/ro/base.po
@@ -1743,7 +1743,7 @@ msgid "Enable VLAN functionality"
msgstr "Activeaza VLAN-urile"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
@@ -5765,7 +5765,7 @@ msgstr "Slot de cheie folosit"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po
index 4adefd908..970da27ef 100644
--- a/modules/luci-base/po/ru/base.po
+++ b/modules/luci-base/po/ru/base.po
@@ -1826,8 +1826,8 @@ msgid "Enable VLAN functionality"
msgstr "Включить поддержку VLAN"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
-msgstr "Включить WPS при нажатии на кнопку, в режиме WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
+msgstr "Включить WPS при нажатии на кнопку, в режиме WPA(2)-PSK/WPA3-SAE"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
msgid "Enable key reinstallation (KRACK) countermeasures"
@@ -6030,10 +6030,10 @@ msgstr "Используемый слот ключа"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
"Используется для двух различных целей: RADIUS NAS ID и 802.11r R0KH-ID. Не "
-"используется с обычным WPA(2)-PSK."
+"используется с обычным WPA(2)-PSK/WPA3-SAE."
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
msgid "User certificate (PEM encoded)"
diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po
index 773ce8215..2a6e089a9 100644
--- a/modules/luci-base/po/sk/base.po
+++ b/modules/luci-base/po/sk/base.po
@@ -1725,7 +1725,7 @@ msgid "Enable VLAN functionality"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
@@ -5737,7 +5737,7 @@ msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po
index 3a59ca978..4a17cd9c4 100644
--- a/modules/luci-base/po/sv/base.po
+++ b/modules/luci-base/po/sv/base.po
@@ -1744,8 +1744,8 @@ msgid "Enable VLAN functionality"
msgstr "Aktivera VLAN-funktionalitet"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
-msgstr "Aktivera WPS-tryckknapp, kräver WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
+msgstr "Aktivera WPS-tryckknapp, kräver WPA(2)-PSK/WPA3-SAE"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
msgid "Enable key reinstallation (KRACK) countermeasures"
@@ -5763,7 +5763,7 @@ msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot
index 7b86cd725..f4d56954c 100644
--- a/modules/luci-base/po/templates/base.pot
+++ b/modules/luci-base/po/templates/base.pot
@@ -1717,7 +1717,7 @@ msgid "Enable VLAN functionality"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
@@ -5729,7 +5729,7 @@ msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po
index 4e79ba327..c26dbe240 100644
--- a/modules/luci-base/po/tr/base.po
+++ b/modules/luci-base/po/tr/base.po
@@ -1742,7 +1742,7 @@ msgid "Enable VLAN functionality"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
@@ -5754,7 +5754,7 @@ msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po
index 70e0b82e4..bdad591f1 100644
--- a/modules/luci-base/po/uk/base.po
+++ b/modules/luci-base/po/uk/base.po
@@ -1839,8 +1839,8 @@ msgid "Enable VLAN functionality"
msgstr "Увімкнути підтримку VLAN"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
-msgstr "Увімкнути кнопку WPS, потребує WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
+msgstr "Увімкнути кнопку WPS, потребує WPA(2)-PSK/WPA3-SAE"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
msgid "Enable key reinstallation (KRACK) countermeasures"
@@ -6063,11 +6063,11 @@ msgstr "Використовується слот ключа"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
"Використовується для двох різних цілей: RADIUS NAS ID і 802.11r <abbr title="
"\"ідентифікатор власника ключа R0\">R0KH-ID</abbr>. Не потрібно за "
-"звичайного WPA(2)-PSK."
+"звичайного WPA(2)-PSK/WPA3-SAE."
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
msgid "User certificate (PEM encoded)"
diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po
index a2bc0358a..11415e12c 100644
--- a/modules/luci-base/po/vi/base.po
+++ b/modules/luci-base/po/vi/base.po
@@ -1741,7 +1741,7 @@ msgid "Enable VLAN functionality"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
@@ -5782,7 +5782,7 @@ msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po
index 1db59fc50..50317fbd2 100644
--- a/modules/luci-base/po/zh-cn/base.po
+++ b/modules/luci-base/po/zh-cn/base.po
@@ -1764,8 +1764,8 @@ msgid "Enable VLAN functionality"
msgstr "启用 VLAN"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
-msgstr "启用 WPS 一键加密按钮,需要 WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
+msgstr "启用 WPS 一键加密按钮,需要 WPA(2)-PSK/WPA3-SAE"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
msgid "Enable key reinstallation (KRACK) countermeasures"
@@ -5834,9 +5834,9 @@ msgstr "启用密码组"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
-"用于两种不同的用途:RADIUS NAS ID 和 802.11r R0KH-ID,普通 WPA(2)-PSK 不需"
+"用于两种不同的用途:RADIUS NAS ID 和 802.11r R0KH-ID,普通 WPA(2)-PSK/WPA3-SAE 不需"
"要。"
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po
index 29e487a9f..549b4f61b 100644
--- a/modules/luci-base/po/zh-tw/base.po
+++ b/modules/luci-base/po/zh-tw/base.po
@@ -1754,8 +1754,8 @@ msgid "Enable VLAN functionality"
msgstr "啟用VLAN功能"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
-msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
-msgstr "啟用 WPS 按鈕, 這需要 WPA(2)-PSK"
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE"
+msgstr "啟用 WPS 按鈕, 這需要 WPA(2)-PSK/WPA3-SAE"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
msgid "Enable key reinstallation (KRACK) countermeasures"
@@ -5804,7 +5804,7 @@ msgstr "已使用的關鍵插槽"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
msgid ""
"Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
-"needed with normal WPA(2)-PSK."
+"needed with normal WPA(2)-PSK/WPA3-SAE."
msgstr ""
#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
index e6494f6b2..f02b25464 100644
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
@@ -1592,13 +1592,15 @@ return L.view.extend({
o.depends({ mode: 'ap-wds', encryption: 'sae-mixed' });
if (L.hasSystemFeature('hostapd', 'cli') && L.hasSystemFeature('wpasupplicant')) {
- o = ss.taboption('encryption', form.Flag, 'wps_pushbutton', _('Enable WPS pushbutton, requires WPA(2)-PSK'))
+ o = ss.taboption('encryption', form.Flag, 'wps_pushbutton', _('Enable WPS pushbutton, requires WPA(2)-PSK/WPA3-SAE'))
o.enabled = '1';
o.disabled = '0';
o.default = o.disabled;
o.depends('encryption', 'psk');
o.depends('encryption', 'psk2');
o.depends('encryption', 'psk-mixed');
+ o.depends('encryption', 'sae');
+ o.depends('encryption', 'sae-mixed');
}
}
}