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 2d500b96868a305ad4e1eb23f6ed230dc56cf317..6ed52ddba518662c2df0429c48a08f8c493fe44d 100644 (file)
--- 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 <a href='https://github.com/openwrt/packages/tree/master/net/vpnbypass/files#bypass-domains-formatsyntax'>README</a> for syntax"))
+di = s4:option(DynamicList, "ipset", translate("Domains to Bypass"),
+    translate("Domains to be accessed directly (outside of the VPN tunnel), see ")
+    .. [[<a href="https://github.com/openwrt/packages/tree/master/net/vpnbypass/files#bypass-domains-formatsyntax" target="_blank">]]
+    .. translate("README") .. [[</a>]] .. 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 9463bc010c480cb530522f8c53a453bd11d31445..144adedc467022b0762b9cb958238c3b81742ee2 100644 (file)
--- 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 <a "
-"href='https://github.com/openwrt/packages/tree/master/net/vpnbypass/"
-"files#bypass-domains-formatsyntax'>README</a> 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 0a180d366455e1e823c349f537ba21b98d1f789d..62b0e0f617b2ef933cdf251b61d9dcf95bb7928c 100644 (file)
--- 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 <jow@openwrt.org>
+-- Copyright 2017 Dan Luedtke <mail@danrl.com>
 -- 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 21127042d5f45b55c4f3d219b88ea165776d8431..f72c2a634b2dcd7f5b5867b7b329717dc03c75bb 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 079bce729e72401d1e42beb276fe925de393c8de..3f6a4e10b99fb442f2d8a7f8b33d61ce2d13966c 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 a936d9d23e085c5fa4df663a8d209433fcca6971..ea2d7c917eb5bb1a26796a9207a5bc3f99ed9306 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 8a2423a9594a0378b06c5b4a650b6a208926c95c..8b11a99f08b15362d9afc1eecafeec6375864a60 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 d84c28e6ed637a974a53ed732df9fc23e4b9ff37..e11c0faac93dfa4957ac027dceabd62b16cdb11c 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 3217ddd2b85b779b373e62756d0fec6f8bb5d044..bfc0305a2e5d7aafb8fdf687434803a4f05b2577 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 59a81733b7a9fd1565785ea6ca4520f92cd92d15..8e610fb8640d3b5a2a0c63377476d0208d5dc521 100644 (file)
--- a/modules/luci-base/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
@@ -1772,17 +1772,17 @@ msgstr ""
 "Name System\">DNS</abbr>"
 
 msgid ""
-"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 4b938412dabd71370efd75884371dfed7e37d8c6..70a1238e532cbb6caa0580dc0c5e44f09044f757 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 9fc2703e2e0ab374bafeda24ce8e5fe4587eaa53..700efd964d729bc7f29474ebf16da2be3cf5150a 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 82d4d4e2cb9a5016d8c4b6c306006450a21f2775..06ae794f85d9bc8cbedf5dac5988bb2c817d160f 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 04030c99cd376b2e1cdfd0a72062701810270bb3..f6ac3bebf4bdd94ddd8f3f7327cc299c67879210 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
 msgstr ""
 "'フル' バージョンの wpad/hostapd と、無線LANドライバーによるサポートが必要で"
-"す。<br>（2017年2月現在: ath9k と ath10k、LEDE内では mwlwifi と mt76）"
+"す。<br />（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 f473301aad43f05af31fc4427a343e9700254a77..59372bd976efc32c8899b6ddb1f88a8e477e16a1 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 bf2960798bd597c3ddf015a29b5b19c85c3d2047..517d237d912d8e270a52c45c281387164b4dbe1a 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 fdb0435784ea87bf3f14d9c9a94b0e08eac57dbf..d17e4aadd9b5fc89792aa3d53cc98c414b8a6a1d 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 2aefc80e2b4035cf945406c75fffce45cc4ca592..8b0368bdebdb2e5fa521f1ecb100d469fcca5252 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 98cf52ca96523d84696a4f336a7ee01ebb50fb06..413cc792968d502884e6c9ab20220af34b387a85 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 8075b0b49f89225381595b76a0ddc87d41461c03..389b077a3201fa59f0f81ee96fc1865dbaeb635a 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 291c5a80fe0c399cf93d456cf235e57ed76ec3f1..365574b174e2523a32baf7aee4426f76570403f6 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 50a1b15206bbd16c4528455558cd4abaa67c468a..d11fbc2cde1a0bf8eaaf2e8d0602eef06c56032c 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 737952ebe3b34bba7897fde9787d4df5988b37d2..017865d13871ff16e7859c46ff32da7364ea86db 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 fea99e2cbd00251c5cb4ef88b4f5c0e2bad15e7b..e7e437fe5c84cde4ed7033b93b6827734672eef2 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 1a0235f9f3699d26acc31bb6feca4684bf64ef4c..cc47c2c6f204e1c262e23c81c1bf81004fd0070d 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 6c23aca2fb63eef64aab428f28cef3017ba42b77..09312734a2706c475ba22c627e1170e54efd8217 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 dd0d14f14930712867a5c35e64454eb82d0aa546..5abf039e854a67e4a617623e86341393a5ff1018 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 ee7147febe118095b157535b4ed9356790cd4732..162bd30664c400ef1ace2c1bb31cbe535ec97850 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 eff9c8497f04d34fa7bf21ccff3ca334cb6041cb..dca93f0a199070ebfa38db922b12be1b65908c15 100644 (file)
--- 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. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 1e90bf58bfef62c50a2a8f58a9d907a10244462b..8f759b8d5f1a5e66c3a4a4f07a030e33ef31b253 100644 (file)
--- a/modules/luci-base/po/zh-tw/base.po
+++ b/modules/luci-base/po/zh-tw/base.po
@@ -1712,17 +1712,17 @@ msgid ""
 msgstr "列出 <abbr title=\"Domain Name System\">DNS</abbr> 伺服器以便轉發請求"
 
 msgid ""
-"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-"
-"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID "
+"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
+"Identifier,128-bit key as hex string. <br />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. <br>Format: MAC-address,R1KH-ID "
-"as 6 octets with colons,128-bit key as hex string. <br>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. <br />Format: MAC-address,R1KH-ID "
+"as 6 octets with colons,128-bit key as hex string. <br />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 "
-"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
+"<br />(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 359d977c5238a0066b07dbf5f3047a46c6b0335e..33a8892ece086348678768051027d7df1f50ad76 100644 (file)
--- 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. " ..
-                       "<br>Format: MAC-address,NAS-Identifier,128-bit key as hex string. " ..
-                       "<br>This list is used to map R0KH-ID (NAS Identifier) to a destination " ..
+                       "<br />Format: MAC-address,NAS-Identifier,128-bit key as hex string. " ..
+                       "<br />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. "..
-                       "<br>Format: MAC-address,R1KH-ID as 6 octets with colons,128-bit key as hex string. "..
-                       "<br>This list is used to map R1KH-ID to a destination MAC address " ..
+                       "<br />Format: MAC-address,R1KH-ID as 6 octets with colons,128-bit key as hex string. "..
+                       "<br />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 <br>(as of Feb 2017: " ..
+                       "and support from the wifi driver <br />(as of Feb 2017: " ..
                        "ath9k and ath10k, in LEDE also mwlwifi and mt76)"))
        ieee80211w.default = "0"
        ieee80211w.rmempty = true