summaryrefslogtreecommitdiffhomepage
path: root/applications
diff options
context:
space:
mode:
Diffstat (limited to 'applications')
-rw-r--r--applications/luci-app-adblock/po/ja/adblock.po16
-rw-r--r--applications/luci-app-adblock/po/pt-br/adblock.po2
-rw-r--r--applications/luci-app-adblock/po/sv/adblock.po2
-rw-r--r--applications/luci-app-adblock/po/templates/adblock.pot2
-rw-r--r--applications/luci-app-adblock/po/zh-cn/adblock.po2
-rw-r--r--applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua28
-rw-r--r--applications/luci-app-simple-adblock/po/ja/simple-adblock.po4
-rw-r--r--applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po7
8 files changed, 52 insertions, 11 deletions
diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po
index 39bc183493..56b45a2c34 100644
--- a/applications/luci-app-adblock/po/ja/adblock.po
+++ b/applications/luci-app-adblock/po/ja/adblock.po
@@ -8,7 +8,7 @@ msgstr ""
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.12\n"
+"X-Generator: Poedit 2.0\n"
"Language: ja\n"
msgid "."
@@ -107,10 +107,10 @@ msgstr "概要"
msgid ""
"Please add only one domain per line. Comments introduced with '#' are "
-"allowed - ip addresses, wildcards & regex are not."
+"allowed - ip addresses, wildcards and regex are not."
msgstr ""
-"一行に一つのドメインを追加してください。'#' から始まるコメントを記述できます"
-"が、IPアドレスやワイルドカード、正規表現を設定値として使用することはできませ"
+"1行に1つのドメインを追加してください。'#' から始まるコメントを記述できます"
+"が、IP アドレスやワイルドカード、正規表現を設定値として使用することはできませ"
"ん。"
msgid "Query"
@@ -183,6 +183,14 @@ msgid "see online documentation"
msgstr "オンライン ドキュメントを確認してください"
#~ msgid ""
+#~ "Please add only one domain per line. Comments introduced with '#' are "
+#~ "allowed - ip addresses, wildcards & regex are not."
+#~ msgstr ""
+#~ "一行に一つのドメインを追加してください。'#' から始まるコメントを記述できま"
+#~ "すが、IPアドレスやワイルドカード、正規表現を設定値として使用することはでき"
+#~ "ません。"
+
+#~ msgid ""
#~ "). Note that list URLs and Shallalist category selections are not "
#~ "configurable via Luci."
#~ msgstr ""
diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po
index 013768773e..c0a4c0ea01 100644
--- a/applications/luci-app-adblock/po/pt-br/adblock.po
+++ b/applications/luci-app-adblock/po/pt-br/adblock.po
@@ -106,7 +106,7 @@ msgstr ""
msgid ""
"Please add only one domain per line. Comments introduced with '#' are "
-"allowed - ip addresses, wildcards & regex are not."
+"allowed - ip addresses, wildcards and regex are not."
msgstr ""
msgid "Query"
diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po
index 9fcc36d26b..1d2e2351a0 100644
--- a/applications/luci-app-adblock/po/sv/adblock.po
+++ b/applications/luci-app-adblock/po/sv/adblock.po
@@ -95,7 +95,7 @@ msgstr ""
msgid ""
"Please add only one domain per line. Comments introduced with '#' are "
-"allowed - ip addresses, wildcards & regex are not."
+"allowed - ip addresses, wildcards and regex are not."
msgstr ""
msgid "Query"
diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot
index 9282768892..1f27213e44 100644
--- a/applications/luci-app-adblock/po/templates/adblock.pot
+++ b/applications/luci-app-adblock/po/templates/adblock.pot
@@ -93,7 +93,7 @@ msgstr ""
msgid ""
"Please add only one domain per line. Comments introduced with '#' are "
-"allowed - ip addresses, wildcards & regex are not."
+"allowed - ip addresses, wildcards and regex are not."
msgstr ""
msgid "Query"
diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po
index 277be1a6a3..7fc5dcc4fa 100644
--- a/applications/luci-app-adblock/po/zh-cn/adblock.po
+++ b/applications/luci-app-adblock/po/zh-cn/adblock.po
@@ -104,7 +104,7 @@ msgstr ""
msgid ""
"Please add only one domain per line. Comments introduced with '#' are "
-"allowed - ip addresses, wildcards & regex are not."
+"allowed - ip addresses, wildcards and regex are not."
msgstr ""
msgid "Query"
diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
index 387ff01a8d..b1820cc68a 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
@@ -102,6 +102,11 @@ enabled = mwan_interface:option(ListValue, "enabled", translate("Enabled"))
enabled:value("1", translate("Yes"))
enabled:value("0", translate("No"))
+family = mwan_interface:option(ListValue, "family", translate("Internet Protocol"))
+ family.default = "ipv4"
+ family:value("ipv4", translate("IPv4"))
+ family:value("ipv6", translate("IPv6"))
+
track_ip = mwan_interface:option(DynamicList, "track_ip", translate("Tracking IP"),
translate("This IP address will be pinged to dermine if the link is up or down. Leave blank to assume interface is always online"))
track_ip.datatype = "ipaddr"
@@ -119,6 +124,21 @@ count = mwan_interface:option(ListValue, "count", translate("Ping count"))
count:value("4")
count:value("5")
+size = mwan_interface:option(Value, "size", translate("Ping size"))
+ size.default = "56"
+ size:value("8")
+ size:value("24")
+ size:value("56")
+ size:value("120")
+ size:value("248")
+ size:value("504")
+ size:value("1016")
+ size:value("1472")
+ size:value("2040")
+ size.datatype = "range(1, 65507)"
+ size.rmempty = false
+ size.optional = false
+
timeout = mwan_interface:option(ListValue, "timeout", translate("Ping timeout"))
timeout.default = "2"
timeout:value("1", translate("1 second"))
@@ -175,6 +195,14 @@ up = mwan_interface:option(ListValue, "up", translate("Interface up"),
up:value("9")
up:value("10")
+flush = mwan_interface:option(ListValue, "flush_conntrack", translate("Flush conntrack table"),
+ translate("Flush global firewall conntrack table on interface events"))
+ flush.default = "never"
+ flush:value("ifup", translate("ifup"))
+ flush:value("ifdown", translate("ifdown"))
+ flush:value("never", translate("never"))
+ flush:value("always", translate("always"))
+
metric = mwan_interface:option(DummyValue, "metric", translate("Metric"),
translate("This displays the metric assigned to this interface in /etc/config/network"))
metric.rawhtml = true
diff --git a/applications/luci-app-simple-adblock/po/ja/simple-adblock.po b/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
index ff75c8bf1d..7926595b6e 100644
--- a/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
@@ -34,7 +34,9 @@ msgid "Force Router DNS server to all local devices"
msgstr "全ローカル デバイスにルーター DNSサーバーの使用を強制"
msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
-msgstr "ローカル デバイスに対し、ルーター上のDNSサーバーの使用を強制します。これは、DNS ハイジャックとしても知られています。"
+msgstr ""
+"ローカル デバイスに対し、ルーター上のDNSサーバーの使用を強制します。これは、"
+"DNS ハイジャックとしても知られています。"
msgid "Individual domains to be blacklisted"
msgstr "ブラックリストに登録する、個々のドメインです。"
diff --git a/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po b/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po
index 5adc5ed4f4..9f3fa2a679 100644
--- a/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po
@@ -18,8 +18,8 @@ msgstr "Domínios para evitar a VPN"
msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
msgstr ""
-msgid "Enable VPN Bypass"
-msgstr "Habilitar o VPN Bypass"
+msgid "Enable/start service"
+msgstr ""
msgid "Local IP Addresses to Bypass"
msgstr ""
@@ -61,6 +61,9 @@ msgstr "Configurações do VPN Bypass"
msgid "for syntax"
msgstr ""
+#~ msgid "Enable VPN Bypass"
+#~ msgstr "Habilitar o VPN Bypass"
+
#~ msgid "Configuration of VPN Bypass Settings"
#~ msgstr "Configurações do VPN Bypass"