From: Hannu Nyman Date: Wed, 15 Feb 2017 09:09:17 +0000 (+0200) Subject: Merge pull request #1015 from danrl/proto-wireguard X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=dea880ef7229a846b60ffcb98931cb4d58afe8ea;hp=8fc55591b9adb10c17b506a2e2d178055d07cba7 Merge pull request #1015 from danrl/proto-wireguard luci-proto-wireguard: stricter input validation --- diff --git a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua index 2d500b968..6ed52ddba 100644 --- a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua +++ b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua @@ -27,13 +27,12 @@ r2.addremove = true r2.optional = true -- Domains -d1 = s:option(DynamicList, "domain", translate("Domains to Bypass"), translate("Domains which will be accessed directly (outside of the VPN tunnel)")) -d1.addremove = true -d1.optional = true - d = Map("dhcp") s4 = d:section(TypedSection, "dnsmasq") s4.anonymous = true -di = s4:option(DynamicList, "ipset", translate("Domains to Bypass"), translate("Domains to be accessed directly (outside of the VPN tunnel), see README for syntax")) +di = s4:option(DynamicList, "ipset", translate("Domains to Bypass"), + translate("Domains to be accessed directly (outside of the VPN tunnel), see ") + .. [[]] + .. translate("README") .. [[]] .. translate(" for syntax")) return m, d diff --git a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot index 9463bc010..144adedc4 100644 --- a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot +++ b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot @@ -4,13 +4,7 @@ msgstr "Content-Type: text/plain; charset=UTF-8" msgid "Domains to Bypass" msgstr "" -msgid "" -"Domains to be accessed directly (outside of the VPN tunnel), see README for syntax" -msgstr "" - -msgid "Domains which will be accessed directly (outside of the VPN tunnel)" +msgid "Domains to be accessed directly (outside of the VPN tunnel), see" msgstr "" msgid "Enable VPN Bypass" @@ -28,6 +22,9 @@ msgstr "" msgid "Local ports to trigger VPN Bypass" msgstr "" +msgid "README" +msgstr "" + msgid "Remote IP Subnets to Bypass" msgstr "" @@ -46,3 +43,6 @@ msgstr "" msgid "VPN Bypass Settings" msgstr "" + +msgid "for syntax" +msgstr "" diff --git a/modules/luci-base/luasrc/cbi/datatypes.lua b/modules/luci-base/luasrc/cbi/datatypes.lua index 0a180d366..62b0e0f61 100644 --- a/modules/luci-base/luasrc/cbi/datatypes.lua +++ b/modules/luci-base/luasrc/cbi/datatypes.lua @@ -1,4 +1,5 @@ -- Copyright 2010 Jo-Philipp Wich +-- Copyright 2017 Dan Luedtke -- Licensed to the public under the Apache License 2.0. local fs = require "nixio.fs" @@ -165,6 +166,14 @@ function ipmask6(val) return ip6addr(ip or val) end +function ip6hostid(val) + if val and val:match("^[a-fA-F0-9:]+$") and (#val > 2) then + return (ip6addr("2001:db8:0:0" .. val) or ip6addr("2001:db8:0:0:" .. val)) + end + + return false +end + function port(val) val = tonumber(val) return ( val and val >= 0 and val <= 65535 ) @@ -268,17 +277,24 @@ function wepkey(val) end function hexstring(val) - if val then - return (val:match("^[a-fA-F0-9]+$") ~= nil) - end - return false + if val then + return (val:match("^[a-fA-F0-9]+$") ~= nil) + end + return false +end + +function base64(val) + if val then + return (val:match("^[a-zA-Z0-9/+]+=?=?$") ~= nil) and (math.fmod(#val, 4) == 0) + end + return false end function string(val) return true -- Everything qualifies as valid string end -function directory( val, seen ) +function directory(val, seen) local s = fs.stat(val) seen = seen or { } @@ -294,7 +310,7 @@ function directory( val, seen ) return false end -function file( val, seen ) +function file(val, seen) local s = fs.stat(val) seen = seen or { } @@ -310,7 +326,7 @@ function file( val, seen ) return false end -function device( val, seen ) +function device(val, seen) local s = fs.stat(val) seen = seen or { } @@ -445,4 +461,3 @@ function dateyyyymmdd(val) end return false end - diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index 21127042d..f72c2a634 100644 --- a/modules/luci-base/po/ca/base.po +++ b/modules/luci-base/po/ca/base.po @@ -1732,17 +1732,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2671,7 +2671,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po index 079bce729..3f6a4e10b 100644 --- a/modules/luci-base/po/cs/base.po +++ b/modules/luci-base/po/cs/base.po @@ -1747,17 +1747,17 @@ msgstr "" "přeposílat požadavky" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2710,7 +2710,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index a936d9d23..ea2d7c917 100644 --- a/modules/luci-base/po/de/base.po +++ b/modules/luci-base/po/de/base.po @@ -1747,17 +1747,17 @@ msgstr "" "Requests weitergeleitet werden" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2716,7 +2716,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po index 8a2423a95..8b11a99f0 100644 --- a/modules/luci-base/po/el/base.po +++ b/modules/luci-base/po/el/base.po @@ -1760,17 +1760,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2702,7 +2702,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po index d84c28e6e..e11c0faac 100644 --- a/modules/luci-base/po/en/base.po +++ b/modules/luci-base/po/en/base.po @@ -1729,17 +1729,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2668,7 +2668,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index 3217ddd2b..bfc0305a2 100644 --- a/modules/luci-base/po/es/base.po +++ b/modules/luci-base/po/es/base.po @@ -1761,17 +1761,17 @@ msgstr "" "enviar solicitudes" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2722,7 +2722,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po index 59a81733b..8e610fb86 100644 --- a/modules/luci-base/po/fr/base.po +++ b/modules/luci-base/po/fr/base.po @@ -1772,17 +1772,17 @@ msgstr "" "Name System\">DNS" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2735,7 +2735,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po index 4b938412d..70a1238e5 100644 --- a/modules/luci-base/po/he/base.po +++ b/modules/luci-base/po/he/base.po @@ -1704,17 +1704,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2636,7 +2636,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po index 9fc2703e2..700efd964 100644 --- a/modules/luci-base/po/hu/base.po +++ b/modules/luci-base/po/hu/base.po @@ -1761,17 +1761,17 @@ msgstr "" "kérések továbbításra kerülnek" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2727,7 +2727,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po index 82d4d4e2c..06ae794f8 100644 --- a/modules/luci-base/po/it/base.po +++ b/modules/luci-base/po/it/base.po @@ -1763,17 +1763,17 @@ msgstr "" "inoltrare le richieste in" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2710,7 +2710,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index 04030c99c..f6ac3bebf 100644 --- a/modules/luci-base/po/ja/base.po +++ b/modules/luci-base/po/ja/base.po @@ -1755,17 +1755,17 @@ msgstr "" "リストを設定します" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2724,10 +2724,10 @@ msgstr "ピアの公開鍵（必須）" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" "'フル' バージョンの wpad/hostapd と、無線LANドライバーによるサポートが必要で" -"す。
（2017年2月現在: ath9k と ath10k、LEDE内では mwlwifi と mt76）" +"す。
（2017年2月現在: ath9k と ath10k、LEDE内では mwlwifi と mt76）" msgid "" "Requires upstream supports DNSSEC; verify unsigned domain responses really " diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po index f473301aa..59372bd97 100644 --- a/modules/luci-base/po/ko/base.po +++ b/modules/luci-base/po/ko/base.po @@ -1721,17 +1721,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2663,7 +2663,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index bf2960798..517d237d9 100644 --- a/modules/luci-base/po/ms/base.po +++ b/modules/luci-base/po/ms/base.po @@ -1700,17 +1700,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2639,7 +2639,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po index fdb043578..d17e4aadd 100644 --- a/modules/luci-base/po/no/base.po +++ b/modules/luci-base/po/no/base.po @@ -1739,17 +1739,17 @@ msgstr "" "forespørsler blir videresendt til" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2700,7 +2700,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index 2aefc80e2..8b0368bde 100644 --- a/modules/luci-base/po/pl/base.po +++ b/modules/luci-base/po/pl/base.po @@ -1784,17 +1784,17 @@ msgstr "" "przekazywane zapytania" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2749,7 +2749,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po index 98cf52ca9..413cc7929 100644 --- a/modules/luci-base/po/pt-br/base.po +++ b/modules/luci-base/po/pt-br/base.po @@ -1780,17 +1780,17 @@ msgstr "" "encaminhar as requisições" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2755,7 +2755,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po index 8075b0b49..389b077a3 100644 --- a/modules/luci-base/po/pt/base.po +++ b/modules/luci-base/po/pt/base.po @@ -1763,17 +1763,17 @@ msgstr "" "onde encaminhar os pedidos" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2719,7 +2719,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po index 291c5a80f..365574b17 100644 --- a/modules/luci-base/po/ro/base.po +++ b/modules/luci-base/po/ro/base.po @@ -1701,17 +1701,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2632,7 +2632,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index 50a1b1520..d11fbc2cd 100644 --- a/modules/luci-base/po/ru/base.po +++ b/modules/luci-base/po/ru/base.po @@ -1767,17 +1767,17 @@ msgstr "" "перенаправления запросов" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2730,7 +2730,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po index 737952ebe..017865d13 100644 --- a/modules/luci-base/po/sk/base.po +++ b/modules/luci-base/po/sk/base.po @@ -1676,17 +1676,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2605,7 +2605,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po index fea99e2cb..e7e437fe5 100644 --- a/modules/luci-base/po/sv/base.po +++ b/modules/luci-base/po/sv/base.po @@ -1682,17 +1682,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2611,7 +2611,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot index 1a0235f9f..cc47c2c6f 100644 --- a/modules/luci-base/po/templates/base.pot +++ b/modules/luci-base/po/templates/base.pot @@ -1669,17 +1669,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2598,7 +2598,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po index 6c23aca2f..09312734a 100644 --- a/modules/luci-base/po/tr/base.po +++ b/modules/luci-base/po/tr/base.po @@ -1689,17 +1689,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2618,7 +2618,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po index dd0d14f14..5abf039e8 100644 --- a/modules/luci-base/po/uk/base.po +++ b/modules/luci-base/po/uk/base.po @@ -1774,17 +1774,17 @@ msgstr "" "пересилати запити" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2743,7 +2743,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po index ee7147feb..162bd3066 100644 --- a/modules/luci-base/po/vi/base.po +++ b/modules/luci-base/po/vi/base.po @@ -1704,17 +1704,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2643,7 +2643,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po index eff9c8497..dca93f0a1 100644 --- a/modules/luci-base/po/zh-cn/base.po +++ b/modules/luci-base/po/zh-cn/base.po @@ -1700,17 +1700,17 @@ msgid "" msgstr "将指定的域名DNS解析转发到指定的DNS服务器（按照示例填写）" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2643,7 +2643,7 @@ msgstr "必须，Peer的公钥。" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po index 1e90bf58b..8f759b8d5 100644 --- a/modules/luci-base/po/zh-tw/base.po +++ b/modules/luci-base/po/zh-tw/base.po @@ -1712,17 +1712,17 @@ msgid "" msgstr "列出 DNS 伺服器以便轉發請求" msgid "" -"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string.
This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string.
This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string.
This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2657,7 +2657,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua index 359d977c5..33a8892ec 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -967,8 +967,8 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then r0kh = s:taboption("encryption", DynamicList, "r0kh", translate("External R0 Key Holder List"), translate("List of R0KHs in the same Mobility Domain. " .. - "
Format: MAC-address,NAS-Identifier,128-bit key as hex string. " .. - "
This list is used to map R0KH-ID (NAS Identifier) to a destination " .. + "
Format: MAC-address,NAS-Identifier,128-bit key as hex string. " .. + "
This list is used to map R0KH-ID (NAS Identifier) to a destination " .. "MAC address when requesting PMK-R1 key from the R0KH that the STA " .. "used during the Initial Mobility Domain Association.")) @@ -977,8 +977,8 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then r1kh = s:taboption("encryption", DynamicList, "r1kh", translate("External R1 Key Holder List"), translate ("List of R1KHs in the same Mobility Domain. ".. - "
Format: MAC-address,R1KH-ID as 6 octets with colons,128-bit key as hex string. ".. - "
This list is used to map R1KH-ID to a destination MAC address " .. + "
Format: MAC-address,R1KH-ID as 6 octets with colons,128-bit key as hex string. ".. + "
This list is used to map R1KH-ID to a destination MAC address " .. "when sending PMK-R1 key from the R0KH. This is also the " .. "list of authorized R1KHs in the MD that can request PMK-R1 keys.")) r1kh:depends({ieee80211r="1"}) @@ -1130,7 +1130,7 @@ if hwtype == "mac80211" then ieee80211w = s:taboption("encryption", ListValue, "ieee80211w", translate("802.11w Management Frame Protection"), translate("Requires the 'full' version of wpad/hostapd " .. - "and support from the wifi driver
(as of Feb 2017: " .. + "and support from the wifi driver
(as of Feb 2017: " .. "ath9k and ath10k, in LEDE also mwlwifi and mt76)")) ieee80211w.default = "0" ieee80211w.rmempty = true