luci-proto-ipv6: clarify 6in4 local address hint

Make the hint message more explicit to tell users that the prefix size needs
to be specified as well.

Fixes #1559.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po
index 5d597cfca9862456a8f7a9079b2ecf66d2d3a616..0db5d300cf3c9d6d1795ba9b8e77428d6c4a1c0e 100644 (file)
--- a/modules/luci-base/po/ca/base.po
+++ b/modules/luci-base/po/ca/base.po
@@ -3310,7 +3310,7 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 
 msgid ""

diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po
index d1cef0c3681470dca7329e778fdc37603efeed52..53c714a16fb1e985034806423157c49b718a9d10 100644 (file)
--- a/modules/luci-base/po/cs/base.po
+++ b/modules/luci-base/po/cs/base.po
@@ -3352,7 +3352,7 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 
 msgid ""

diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po
index 414e475c859614caad2797fb97c8f4d5edf6a042..7b8ac4c290e74ddcbe026ba22bb008658f49568d 100644 (file)
--- a/modules/luci-base/po/de/base.po
+++ b/modules/luci-base/po/de/base.po
@@ -3485,10 +3485,10 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 "Dies ist die lokale, vom Broker zugewiesene IPv6-Adresse, sie endet "
-"üblicherweise mit <code>:2</code>"
+"üblicherweise mit <code>...:2/64</code>"
 
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"

diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po
index 86d6a0ad4465e9c885a9c7abcbd62de4de0cc9c2..9e740ede4fed62eb3d0f2695605d0638091060ce 100644 (file)
--- a/modules/luci-base/po/el/base.po
+++ b/modules/luci-base/po/el/base.po
@@ -3312,7 +3312,7 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 
 msgid ""

diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po
index cf6c82f55d6584ebec73b33ec0dde1bd6bf6459b..190a43f125ae04003a2bf28fafa1853713481009 100644 (file)
--- a/modules/luci-base/po/en/base.po
+++ b/modules/luci-base/po/en/base.po
@@ -3272,7 +3272,7 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 
 msgid ""

diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po
index a769a59da921dd380647dd64bb59ad5ce76990a1..7f7efbc2f0d3ffd6011b6d3bc4f0e07a7364faca 100644 (file)
--- a/modules/luci-base/po/es/base.po
+++ b/modules/luci-base/po/es/base.po
@@ -3377,10 +3377,10 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 "Esta es la dirección de punto final asignada por el broker del túnel, suele "
-"terminar con <code>:2</code>"
+"terminar con <code>...:2/64</code>"
 
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"

diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po
index d0dddc2f564191c1bcd0bd7c68b52eeb85b9f634..0fc12eaae223d2a328b1da7382e1714fe5b5cfce 100644 (file)
--- a/modules/luci-base/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
@@ -3392,10 +3392,10 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 "Il s'agit de l'adresse de l'extrémité locale attribuée par le fournisseur de "
-"tunnels, elle se termine habituellement avec <code>:2</code>"
+"tunnels, elle se termine habituellement avec <code>...:2/64</code>"
 
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"

diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po
index 13bc8c8b267060954bf3f7309335b2c74387dda4..0750481d0715e93461a1f7cd971ff80b8f3da105 100644 (file)
--- a/modules/luci-base/po/he/base.po
+++ b/modules/luci-base/po/he/base.po
@@ -3233,7 +3233,7 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 
 msgid ""

diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po
index 56aafeda82edb66965c524d700b19bf45d88d521..e55bab6bf2fd7116db250b770dc6ad94a51a9e74 100644 (file)
--- a/modules/luci-base/po/hu/base.po
+++ b/modules/luci-base/po/hu/base.po
@@ -3380,10 +3380,10 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 "Ez az alagút közvetítő (tunnel broker) által megadott helyi végpont címe, "
-"általában így végződik: <code>:2</code>"
+"általában így végződik: <code>...:2/64</code>"
 
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"

diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po
index 36aa0cd42e9ee704dd39d153817eec6c4ea1096f..ce4b79be1e2c7d5edbd6cd532bdf8edfcead68c6 100644 (file)
--- a/modules/luci-base/po/it/base.po
+++ b/modules/luci-base/po/it/base.po
@@ -3340,7 +3340,7 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 
 msgid ""

diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po
index df2323ca09aa8fbcc117c739561b5004ad82803e..d3c29bc419a6678254242649c357751c08043a38 100644 (file)
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@ -3374,10 +3374,10 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 "プロバイダからアサインされた、ローカルのエンドポイント アドレスです。通常、"
-"<code>:2</code>が終端に設定されます。"
+"<code>...:2/64</code>が終端に設定されます。"
 
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"

diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po
index d0ad869ad5f1bd32694d97e7c2aa36babae087c6..ae417e7c00e3c7cd9e90dee1beee099100e7a802 100644 (file)
--- a/modules/luci-base/po/ko/base.po
+++ b/modules/luci-base/po/ko/base.po
@@ -3275,7 +3275,7 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 
 msgid ""

diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po
index cfd5cf6ca7dbeb5e57bb69a45f05a60e8f7c51d4..1f53a0a017e2079cfce4d05a3eaaedfcf588c682 100644 (file)
--- a/modules/luci-base/po/ms/base.po
+++ b/modules/luci-base/po/ms/base.po
@@ -3243,7 +3243,7 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 
 msgid ""

diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po
index 1e3b4f90f7090e34d35fe56f675fdbb6199c52d1..e5002d5f012fac98d3ff674fc45c006c251223c6 100644 (file)
--- a/modules/luci-base/po/no/base.po
+++ b/modules/luci-base/po/no/base.po
@@ -3348,10 +3348,10 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 "Dette er den lokale endepunkt adressen som ble tildelt av tunnel 'broker', "
-"adressen ender vanligvis med <code>:2</code>"
+"adressen ender vanligvis med <code>...:2/64</code>"
 
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"

diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po
index 4fc0dd5925896704a469f06d4ccec30e45fcb92a..9d5ff5b4d1d05c6329159460d1f0b8a502eb3a22 100644 (file)
--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@@ -3405,10 +3405,10 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 "To jest lokalny adres końcowy przypisany przez tunnel broker'a, zwykle "
-"kończący się z <code>:2</code>"
+"kończący się z <code>...:2/64</code>"
 
 # w tłumaczeniu pojawiła się spacja po DHCP</abbr> co powoduje niepoprawne wyświetlanie się strony z lang PL
 msgid ""

diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po
index b0f372cc8f85a1afbe6cdf19fdfa42d1aee20733..4e9abab9db8f89d4b639e942e01785a36acbfd12 100644 (file)
--- a/modules/luci-base/po/pt-br/base.po
+++ b/modules/luci-base/po/pt-br/base.po
@@ -3524,10 +3524,10 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 "Este é o endereço da ponta local designado pelo agente de túnel. normalmente "
-"ele termina com <code>:2</code>"
+"ele termina com <code>...:2/64</code>"
 
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"

diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po
index 4fad056618211e21c4b4032237737661a64ef6ed..a54f5425b102a5fdebf40dc68c1c8a2f3969c180 100644 (file)
--- a/modules/luci-base/po/pt/base.po
+++ b/modules/luci-base/po/pt/base.po
@@ -3352,7 +3352,7 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 
 msgid ""

diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po
index 5070449a6b0ee3b661fb44d09d1b280a498e8113..e2edecbb2acf3d13d802351b18a76a91b6d55a11 100644 (file)
--- a/modules/luci-base/po/ro/base.po
+++ b/modules/luci-base/po/ro/base.po
@@ -3225,7 +3225,7 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 
 msgid ""

diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po
index ea80637ac0880fa9416ca927fb1cf763b32ea182..03b255fe938be77b511278e349fdf5bf7d7d9c64 100644 (file)
--- a/modules/luci-base/po/ru/base.po
+++ b/modules/luci-base/po/ru/base.po
@@ -3476,10 +3476,10 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 "Это локальный адрес, назначенный туннельным брокером, обычно заканчивается "
-"на <code>:2</code>."
+"на <code>...:2/64</code>."
 
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"

diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po
index 3c98dbbf20c25da848566240f0d9dfd58f132528..dc5bc91416d621f82421a923ff3ef76d1a80e24e 100644 (file)
--- a/modules/luci-base/po/sk/base.po
+++ b/modules/luci-base/po/sk/base.po
@@ -3195,7 +3195,7 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 
 msgid ""

diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po
index d76c7516f5cf448123f83071f5c751811a006405..d0bdb69450820e727277828007462b0888106618 100644 (file)
--- a/modules/luci-base/po/sv/base.po
+++ b/modules/luci-base/po/sv/base.po
@@ -3220,7 +3220,7 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 
 msgid ""

diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot
index 629278e716cde2d75376a7bfc4967c3aae1faaed..04c33ad9c3cc4973ae846681386acd6696c53b90 100644 (file)
--- a/modules/luci-base/po/templates/base.pot
+++ b/modules/luci-base/po/templates/base.pot
@@ -3188,7 +3188,7 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 
 msgid ""

diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po
index 0f8c059509bb01bf32396a30a8c808220ec6a36d..b0854158b4009854202cd960818d376404984db7 100644 (file)
--- a/modules/luci-base/po/tr/base.po
+++ b/modules/luci-base/po/tr/base.po
@@ -3208,7 +3208,7 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 
 msgid ""

diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po
index cbaade8c757faef0479b65a50e66c97aca4c2fbf..ba5a4b8566e3361e75bed9d89926562a27a16e2b 100644 (file)
--- a/modules/luci-base/po/uk/base.po
+++ b/modules/luci-base/po/uk/base.po
@@ -3396,10 +3396,10 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 "Це локальна адреса кінцевої точки, присвоєна тунельним брокером, зазвичай "
-"закінчується на <code>:2</code>"
+"закінчується на <code>...:2/64</code>"
 
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"

diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po
index dd5379b6485acfa89915249e02877801dbe27e44..f2eeb1f882fb638ca134e251f35abeb5bbf8f42e 100644 (file)
--- a/modules/luci-base/po/vi/base.po
+++ b/modules/luci-base/po/vi/base.po
@@ -3245,7 +3245,7 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
+"ends with <code>...:2/64</code>"
 msgstr ""
 
 msgid ""

diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po
index 188f8cb89bf395b20b7ff6530e0dfc84d7d3eff7..b8fc23b690871e278aa4b9d55f05fc9f17f98fb7 100644 (file)
--- a/modules/luci-base/po/zh-cn/base.po
+++ b/modules/luci-base/po/zh-cn/base.po
@@ -3288,8 +3288,8 @@ msgstr "启动脚本插入到 'exit 0' 之前即可随系统启动运行。"
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
-msgstr "隧道代理分配的本地终端地址，通常以 <code>:2</code> 结尾"
+"ends with <code>...:2/64</code>"
+msgstr "隧道代理分配的本地终端地址，通常以 <code>...:2/64</code> 结尾"
 
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"

diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po
index 54efec38c77ad9402f35f708590c978fabe1dd09..e31c01c55ca8892593b2ba153ff0bb8ce65336d1 100644 (file)
--- a/modules/luci-base/po/zh-tw/base.po
+++ b/modules/luci-base/po/zh-tw/base.po
@@ -3280,8 +3280,8 @@ msgstr ""
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
-"ends with <code>:2</code>"
-msgstr "這是由通道代理人指定的本地終端位址, 通常用 <code>:2</code>結尾."
+"ends with <code>...:2/64</code>"
+msgstr "這是由通道代理人指定的本地終端位址, 通常用 <code>...:2/64</code>結尾."
 
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"

diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
index 88dfe09289006803f48c0e630a25e55b6047c27f..16245b80e58de0d0d37e39cdce42211d5a69d2ba 100644 (file)
--- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
@@ -24,7 +24,7 @@ peeraddr.datatype = "ip4addr"
 
 ip6addr = s:taboption("general", Value, "ip6addr",
        translate("Local IPv6 address"),
-       translate("This is the local endpoint address assigned by the tunnel broker, it usually ends with <code>:2</code>"))
+       translate("This is the local endpoint address assigned by the tunnel broker, it usually ends with <code>...:2/64</code>"))
 
 ip6addr.datatype = "ip6addr"