Merge pull request #653 from tsl0922/tsl0922-patch-1

luci-theme-material: remove the double slash (//) from menu url

diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
index a197f55..2603617 100644 (file)
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
@@ -22,6 +22,12 @@ o3 = s:option(Value, "adb_whitelist", translate("Whitelist file"),
 o3.rmempty = false
 o3.datatype = "file"
 
+fdns = s:option(Flag, "adb_forcedns", translate("Redirect all DNS queries to the local resolver"),
+        translate("When adblock is active, all DNS queries are redirected to the local resolver " ..
+        "in this server by default. You can disable that to allow queries to external DNS servers."))
+fdns.rmempty = false
+fdns.default = fdns.enabled
+
 -- Blocklist options
 
 bl = m:section(TypedSection, "source", translate("Blocklist sources"),
@@ -50,16 +56,6 @@ o5 = s2:option(Value, "adb_backupdir", translate("Backup directory"))
 o5.rmempty = false
 o5.datatype = "directory"
 
-s3 = m:section(NamedSection, "log", "service", translate("Log options"))
-
-o6 = s3:option(Flag, "enabled", translate("Enable log"))
-o6.rmempty = false
-o6.default = 0
-
-o7 = s3:option(Value, "adb_logfile", translate("Log file"))
-o7.rmempty = false
-o7.datatype = "string"
-
 -- Extra options
 
 e = m:section(NamedSection, "global", "adblock", translate("Extra options"),
@@ -67,31 +63,26 @@ e = m:section(NamedSection, "global", "adblock", translate("Extra options"),
 
 a1 = e:option(Value, "adb_port", translate("Port of the adblock uhttpd instance"))
 a1.optional = true
-a1.rmempty = true
 a1.default = 65535
 a1.datatype = "port"
 
 a2 = e:option(Value, "adb_nullipv4", translate("IPv4 blackhole ip address"))
 a2.optional = true
-a2.rmempty = true
 a2.default = "192.0.2.1"
 a2.datatype = "ip4addr"
 
 a3 = e:option(Value, "adb_nullipv6", translate("IPv6 blackhole ip address"))
 a3.optional = true
-a3.rmempty = true
 a3.default = "::ffff:c000:0201"
 a3.datatype = "ip6addr"
 
 a6 = e:option(Value, "adb_wanif", translate("Name of the logical wan interface"))
 a6.optional = true
-a6.rmempty = true
 a6.default = "wan"
 a6.datatype = "network"
 
 a7 = e:option(Value, "adb_lanif", translate("Name of the logical lan interface"))
 a7.optional = true
-a7.rmempty = true
 a7.default = "lan"
 a7.datatype = "network"
 

diff --git a/applications/luci-app-ddns/po/templates/ddns.pot b/applications/luci-app-ddns/po/templates/ddns.pot
index ba007c4..dbe317d 100644 (file)
--- a/applications/luci-app-ddns/po/templates/ddns.pot
+++ b/applications/luci-app-ddns/po/templates/ddns.pot
@@ -1,15 +1,5 @@
 msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: luci-app-ddns 2.4.0-1\n"
-"POT-Creation-Date: 2016-01-30 10:15+0100\n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+msgstr "Content-Type: text/plain; charset=UTF-8"
 
 msgid "&"
 msgstr ""

diff --git a/applications/luci-app-firewall/po/ca/firewall.po b/applications/luci-app-firewall/po/ca/firewall.po
index 7e50dee..d8f51b6 100644 (file)
--- a/applications/luci-app-firewall/po/ca/firewall.po
+++ b/applications/luci-app-firewall/po/ca/firewall.po
@@ -33,12 +33,6 @@ msgstr "(Regla sense nom)"
 msgid "(Unnamed SNAT)"
 msgstr "(SNAT sense nom)"
 
-msgid "-- Please choose --"
-msgstr "-- Si us plau, trieu --"
-
-msgid "-- custom --"
-msgstr "-- personalitzats --"
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> paquets al <var>%s</var>"
 
@@ -523,6 +517,12 @@ msgstr "rebutja"
 msgid "traffic"
 msgstr "trànsit"
 
+#~ msgid "-- Please choose --"
+#~ msgstr "-- Si us plau, trieu --"
+
+#~ msgid "-- custom --"
+#~ msgstr "-- personalitzats --"
+
 #~ msgid "Destination"
 #~ msgstr "Destí"
 

diff --git a/applications/luci-app-firewall/po/cs/firewall.po b/applications/luci-app-firewall/po/cs/firewall.po
index 6ffec17..5a631d0 100644 (file)
--- a/applications/luci-app-firewall/po/cs/firewall.po
+++ b/applications/luci-app-firewall/po/cs/firewall.po
@@ -29,12 +29,6 @@ msgstr "(Nepojmenované pravidlo)"
 msgid "(Unnamed SNAT)"
 msgstr "(Nepojmenovaný SNAT)"
 
-msgid "-- Please choose --"
-msgstr "-- Prosím zvolte --"
-
-msgid "-- custom --"
-msgstr "-- vlastní --"
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> paketů za <var>%s</var>"
 
@@ -518,6 +512,12 @@ msgstr "odmítnout"
 msgid "traffic"
 msgstr "provoz"
 
+#~ msgid "-- Please choose --"
+#~ msgstr "-- Prosím zvolte --"
+
+#~ msgid "-- custom --"
+#~ msgstr "-- vlastní --"
+
 #~ msgid "Destination"
 #~ msgstr "Cíl"
 

diff --git a/applications/luci-app-firewall/po/de/firewall.po b/applications/luci-app-firewall/po/de/firewall.po
index 232cb00..7a38d47 100644 (file)
--- a/applications/luci-app-firewall/po/de/firewall.po
+++ b/applications/luci-app-firewall/po/de/firewall.po
@@ -31,12 +31,6 @@ msgstr "(Unbenannte Regel)"
 msgid "(Unnamed SNAT)"
 msgstr "(Unbennanter SNAT-Eintrag)"
 
-msgid "-- Please choose --"
-msgstr "-- Bitte wählen --"
-
-msgid "-- custom --"
-msgstr "-- benutzerdefiniert --"
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> Pkte. pro <var>%s</var>"
 
@@ -524,6 +518,12 @@ msgstr "zurückweisen"
 msgid "traffic"
 msgstr ""
 
+#~ msgid "-- Please choose --"
+#~ msgstr "-- Bitte wählen --"
+
+#~ msgid "-- custom --"
+#~ msgstr "-- benutzerdefiniert --"
+
 #~ msgid "Destination"
 #~ msgstr "Ziel"
 

diff --git a/applications/luci-app-firewall/po/el/firewall.po b/applications/luci-app-firewall/po/el/firewall.po
index 73b62b4..6ec03df 100644 (file)
--- a/applications/luci-app-firewall/po/el/firewall.po
+++ b/applications/luci-app-firewall/po/el/firewall.po
@@ -31,12 +31,6 @@ msgstr ""
 msgid "(Unnamed SNAT)"
 msgstr ""
 
-msgid "-- Please choose --"
-msgstr "-- Παρακαλώ επιλέξτε --"
-
-msgid "-- custom --"
-msgstr "-- προσαρμοσμένο --"
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> πκτ. ανά <var>%s</var>"
 
@@ -488,6 +482,12 @@ msgstr "απόρριψη"
 msgid "traffic"
 msgstr ""
 
+#~ msgid "-- Please choose --"
+#~ msgstr "-- Παρακαλώ επιλέξτε --"
+
+#~ msgid "-- custom --"
+#~ msgstr "-- προσαρμοσμένο --"
+
 #~ msgid "Destination"
 #~ msgstr "Προορισμός"
 

diff --git a/applications/luci-app-firewall/po/en/firewall.po b/applications/luci-app-firewall/po/en/firewall.po
index 9c13518..ac91bb8 100644 (file)
--- a/applications/luci-app-firewall/po/en/firewall.po
+++ b/applications/luci-app-firewall/po/en/firewall.po
@@ -29,12 +29,6 @@ msgstr ""
 msgid "(Unnamed SNAT)"
 msgstr ""
 
-msgid "-- Please choose --"
-msgstr ""
-
-msgid "-- custom --"
-msgstr ""
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 

diff --git a/applications/luci-app-firewall/po/es/firewall.po b/applications/luci-app-firewall/po/es/firewall.po
index 1c626b5..5aef537 100644 (file)
--- a/applications/luci-app-firewall/po/es/firewall.po
+++ b/applications/luci-app-firewall/po/es/firewall.po
@@ -31,12 +31,6 @@ msgstr "(Reglas sin nombre)"
 msgid "(Unnamed SNAT)"
 msgstr "(SNAT sin nombre)"
 
-msgid "-- Please choose --"
-msgstr "-- Seleccione --"
-
-msgid "-- custom --"
-msgstr "-- propio --"
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> paquetes por <var>%s</var>"
 
@@ -521,6 +515,12 @@ msgstr "rechazar"
 msgid "traffic"
 msgstr "tráfico"
 
+#~ msgid "-- Please choose --"
+#~ msgstr "-- Seleccione --"
+
+#~ msgid "-- custom --"
+#~ msgstr "-- propio --"
+
 #~ msgid "Destination"
 #~ msgstr "Destino"
 

diff --git a/applications/luci-app-firewall/po/fr/firewall.po b/applications/luci-app-firewall/po/fr/firewall.po
index 88efd66..796c4c2 100644 (file)
--- a/applications/luci-app-firewall/po/fr/firewall.po
+++ b/applications/luci-app-firewall/po/fr/firewall.po
@@ -31,12 +31,6 @@ msgstr ""
 msgid "(Unnamed SNAT)"
 msgstr ""
 
-msgid "-- Please choose --"
-msgstr "-- Choisissez SVP --"
-
-msgid "-- custom --"
-msgstr ""
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
@@ -542,6 +536,9 @@ msgstr "rejeter"
 msgid "traffic"
 msgstr ""
 
+#~ msgid "-- Please choose --"
+#~ msgstr "-- Choisissez SVP --"
+
 #~ msgid "Destination"
 #~ msgstr "Destination"
 

diff --git a/applications/luci-app-firewall/po/he/firewall.po b/applications/luci-app-firewall/po/he/firewall.po
index 1bbcb55..54316ad 100644 (file)
--- a/applications/luci-app-firewall/po/he/firewall.po
+++ b/applications/luci-app-firewall/po/he/firewall.po
@@ -26,12 +26,6 @@ msgstr ""
 msgid "(Unnamed SNAT)"
 msgstr ""
 
-msgid "-- Please choose --"
-msgstr ""
-
-msgid "-- custom --"
-msgstr ""
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 

diff --git a/applications/luci-app-firewall/po/hu/firewall.po b/applications/luci-app-firewall/po/hu/firewall.po
index de67dac..130e604 100644 (file)
--- a/applications/luci-app-firewall/po/hu/firewall.po
+++ b/applications/luci-app-firewall/po/hu/firewall.po
@@ -29,12 +29,6 @@ msgstr "(Névtelen szabály)"
 msgid "(Unnamed SNAT)"
 msgstr "(Névtelen SNAT)"
 
-msgid "-- Please choose --"
-msgstr "-- Kérem válasszon --"
-
-msgid "-- custom --"
-msgstr "-- egyéni --"
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> csomag/<var>%s</var>"
 
@@ -525,6 +519,12 @@ msgstr "visszautasítás"
 msgid "traffic"
 msgstr ""
 
+#~ msgid "-- Please choose --"
+#~ msgstr "-- Kérem válasszon --"
+
+#~ msgid "-- custom --"
+#~ msgstr "-- egyéni --"
+
 #~ msgid "Destination"
 #~ msgstr "Cél"
 

diff --git a/applications/luci-app-firewall/po/it/firewall.po b/applications/luci-app-firewall/po/it/firewall.po
index 1b3ec60..c256b12 100644 (file)
--- a/applications/luci-app-firewall/po/it/firewall.po
+++ b/applications/luci-app-firewall/po/it/firewall.po
@@ -31,12 +31,6 @@ msgstr ""
 msgid "(Unnamed SNAT)"
 msgstr ""
 
-msgid "-- Please choose --"
-msgstr " -- Selezionare --"
-
-msgid "-- custom --"
-msgstr " -- personalizzata --"
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
@@ -503,6 +497,12 @@ msgstr "rifiuta"
 msgid "traffic"
 msgstr ""
 
+#~ msgid "-- Please choose --"
+#~ msgstr " -- Selezionare --"
+
+#~ msgid "-- custom --"
+#~ msgstr " -- personalizzata --"
+
 #~ msgid "Destination"
 #~ msgstr "Destinazione"
 

diff --git a/applications/luci-app-firewall/po/ja/firewall.po b/applications/luci-app-firewall/po/ja/firewall.po
index 207e9e2..2eefd55 100644 (file)
--- a/applications/luci-app-firewall/po/ja/firewall.po
+++ b/applications/luci-app-firewall/po/ja/firewall.po
@@ -31,12 +31,6 @@ msgstr "(名前設定の無いルール)"
 msgid "(Unnamed SNAT)"
 msgstr "(名前設定の無いSNAT)"
 
-msgid "-- Please choose --"
-msgstr "-- 選択してください --"
-
-msgid "-- custom --"
-msgstr "-- 手動設定 --"
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> パケット / <var>%s</var>"
 
@@ -558,6 +552,12 @@ msgstr "拒否"
 msgid "traffic"
 msgstr ""
 
+#~ msgid "-- Please choose --"
+#~ msgstr "-- 選択してください --"
+
+#~ msgid "-- custom --"
+#~ msgstr "-- 手動設定 --"
+
 #~ msgid "Destination"
 #~ msgstr "宛先"
 

diff --git a/applications/luci-app-firewall/po/ms/firewall.po b/applications/luci-app-firewall/po/ms/firewall.po
index f939ba3..185aeb9 100644 (file)
--- a/applications/luci-app-firewall/po/ms/firewall.po
+++ b/applications/luci-app-firewall/po/ms/firewall.po
@@ -25,12 +25,6 @@ msgstr ""
 msgid "(Unnamed SNAT)"
 msgstr ""
 
-msgid "-- Please choose --"
-msgstr ""
-
-msgid "-- custom --"
-msgstr ""
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 

diff --git a/applications/luci-app-firewall/po/no/firewall.po b/applications/luci-app-firewall/po/no/firewall.po
index 6682b9e..8938378 100644 (file)
--- a/applications/luci-app-firewall/po/no/firewall.po
+++ b/applications/luci-app-firewall/po/no/firewall.po
@@ -26,12 +26,6 @@ msgstr "(regel uten navn)"
 msgid "(Unnamed SNAT)"
 msgstr "(SNAT uten navn)"
 
-msgid "-- Please choose --"
-msgstr "-- Vennligst velg --"
-
-msgid "-- custom --"
-msgstr "-- egendefinert --"
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> pakker per <var>%s</var>"
 
@@ -519,6 +513,12 @@ msgstr "avslå"
 msgid "traffic"
 msgstr ""
 
+#~ msgid "-- Please choose --"
+#~ msgstr "-- Vennligst velg --"
+
+#~ msgid "-- custom --"
+#~ msgstr "-- egendefinert --"
+
 #~ msgid "Destination"
 #~ msgstr "Destinasjon"
 

diff --git a/applications/luci-app-firewall/po/pl/firewall.po b/applications/luci-app-firewall/po/pl/firewall.po
index a26ccce..da6917f 100644 (file)
--- a/applications/luci-app-firewall/po/pl/firewall.po
+++ b/applications/luci-app-firewall/po/pl/firewall.po
@@ -32,12 +32,6 @@ msgstr "(Nienazwana reguła)"
 msgid "(Unnamed SNAT)"
 msgstr "(Nienazwany SNAT)"
 
-msgid "-- Please choose --"
-msgstr "-- Proszę wybrać --"
-
-msgid "-- custom --"
-msgstr "-- własne --"
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> pakiet. na <var>%s</var>"
 
@@ -532,6 +526,12 @@ msgstr "odrzucaj"
 msgid "traffic"
 msgstr ""
 
+#~ msgid "-- Please choose --"
+#~ msgstr "-- Proszę wybrać --"
+
+#~ msgid "-- custom --"
+#~ msgstr "-- własne --"
+
 #~ msgid "Destination"
 #~ msgstr "Miejsce przeznaczenia"
 

diff --git a/applications/luci-app-firewall/po/pt-br/firewall.po b/applications/luci-app-firewall/po/pt-br/firewall.po
index d9d2f82..eba3393 100644 (file)
--- a/applications/luci-app-firewall/po/pt-br/firewall.po
+++ b/applications/luci-app-firewall/po/pt-br/firewall.po
@@ -31,12 +31,6 @@ msgstr "(Regra Sem Nome)"
 msgid "(Unnamed SNAT)"
 msgstr "(SNAT Sem Nome)"
 
-msgid "-- Please choose --"
-msgstr "-- Por favor, escolha --"
-
-msgid "-- custom --"
-msgstr "-- personalizado --"
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> pcts. por <var>%s</var>"
 
@@ -524,6 +518,12 @@ msgstr "rejeitar"
 msgid "traffic"
 msgstr "Tráfego"
 
+#~ msgid "-- Please choose --"
+#~ msgstr "-- Por favor, escolha --"
+
+#~ msgid "-- custom --"
+#~ msgstr "-- personalizado --"
+
 #~ msgid "Destination"
 #~ msgstr "Destino"
 

diff --git a/applications/luci-app-firewall/po/pt/firewall.po b/applications/luci-app-firewall/po/pt/firewall.po
index 87e6263..1c17aff 100644 (file)
--- a/applications/luci-app-firewall/po/pt/firewall.po
+++ b/applications/luci-app-firewall/po/pt/firewall.po
@@ -31,12 +31,6 @@ msgstr "(Regra Sem Nome)"
 msgid "(Unnamed SNAT)"
 msgstr "(SNAT Sem Nome)"
 
-msgid "-- Please choose --"
-msgstr "-- Escolha por favor --"
-
-msgid "-- custom --"
-msgstr "-- personalizado --"
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> pkts. por <var>%s</var>"
 
@@ -507,6 +501,12 @@ msgstr "rejeitar"
 msgid "traffic"
 msgstr ""
 
+#~ msgid "-- Please choose --"
+#~ msgstr "-- Escolha por favor --"
+
+#~ msgid "-- custom --"
+#~ msgstr "-- personalizado --"
+
 #~ msgid "Destination"
 #~ msgstr "Destino"
 

diff --git a/applications/luci-app-firewall/po/ro/firewall.po b/applications/luci-app-firewall/po/ro/firewall.po
index 382c293..9927d34 100644 (file)
--- a/applications/luci-app-firewall/po/ro/firewall.po
+++ b/applications/luci-app-firewall/po/ro/firewall.po
@@ -30,12 +30,6 @@ msgstr "(Regulă fără nume)"
 msgid "(Unnamed SNAT)"
 msgstr "(SNAT fără nume)"
 
-msgid "-- Please choose --"
-msgstr "-- Alege --"
-
-msgid "-- custom --"
-msgstr "-- personalizat --"
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
@@ -477,6 +471,12 @@ msgstr ""
 msgid "traffic"
 msgstr ""
 
+#~ msgid "-- Please choose --"
+#~ msgstr "-- Alege --"
+
+#~ msgid "-- custom --"
+#~ msgstr "-- personalizat --"
+
 #~ msgid "Destination"
 #~ msgstr "Destinatie"
 

diff --git a/applications/luci-app-firewall/po/ru/firewall.po b/applications/luci-app-firewall/po/ru/firewall.po
index 40afc66..4c57719 100644 (file)
--- a/applications/luci-app-firewall/po/ru/firewall.po
+++ b/applications/luci-app-firewall/po/ru/firewall.po
@@ -33,12 +33,6 @@ msgstr "(Правило без имени)"
 msgid "(Unnamed SNAT)"
 msgstr "(SNAT без имени)"
 
-msgid "-- Please choose --"
-msgstr "-- Пожалуйста, выберите --"
-
-msgid "-- custom --"
-msgstr "-- пользовательский --"
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> пакетов за <var>%s</var>"
 
@@ -547,6 +541,12 @@ msgstr "отвергать"
 msgid "traffic"
 msgstr ""
 
+#~ msgid "-- Please choose --"
+#~ msgstr "-- Пожалуйста, выберите --"
+
+#~ msgid "-- custom --"
+#~ msgstr "-- пользовательский --"
+
 #~ msgid "Destination"
 #~ msgstr "Назначение"
 

diff --git a/applications/luci-app-firewall/po/sk/firewall.po b/applications/luci-app-firewall/po/sk/firewall.po
index fa43403..59613a8 100644 (file)
--- a/applications/luci-app-firewall/po/sk/firewall.po
+++ b/applications/luci-app-firewall/po/sk/firewall.po
@@ -26,12 +26,6 @@ msgstr ""
 msgid "(Unnamed SNAT)"
 msgstr ""
 
-msgid "-- Please choose --"
-msgstr ""
-
-msgid "-- custom --"
-msgstr ""
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 

diff --git a/applications/luci-app-firewall/po/sv/firewall.po b/applications/luci-app-firewall/po/sv/firewall.po
index f8f05e9..79af5a2 100644 (file)
--- a/applications/luci-app-firewall/po/sv/firewall.po
+++ b/applications/luci-app-firewall/po/sv/firewall.po
@@ -27,12 +27,6 @@ msgstr ""
 msgid "(Unnamed SNAT)"
 msgstr ""
 
-msgid "-- Please choose --"
-msgstr ""
-
-msgid "-- custom --"
-msgstr ""
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 

diff --git a/applications/luci-app-firewall/po/templates/firewall.pot b/applications/luci-app-firewall/po/templates/firewall.pot
index 5415aef..7ea06e0 100644 (file)
--- a/applications/luci-app-firewall/po/templates/firewall.pot
+++ b/applications/luci-app-firewall/po/templates/firewall.pot
@@ -19,12 +19,6 @@ msgstr ""
 msgid "(Unnamed SNAT)"
 msgstr ""
 
-msgid "-- Please choose --"
-msgstr ""
-
-msgid "-- custom --"
-msgstr ""
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 

diff --git a/applications/luci-app-firewall/po/tr/firewall.po b/applications/luci-app-firewall/po/tr/firewall.po
index cc4c693..89cbfe1 100644 (file)
--- a/applications/luci-app-firewall/po/tr/firewall.po
+++ b/applications/luci-app-firewall/po/tr/firewall.po
@@ -26,12 +26,6 @@ msgstr ""
 msgid "(Unnamed SNAT)"
 msgstr ""
 
-msgid "-- Please choose --"
-msgstr ""
-
-msgid "-- custom --"
-msgstr ""
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 

diff --git a/applications/luci-app-firewall/po/uk/firewall.po b/applications/luci-app-firewall/po/uk/firewall.po
index 9e79b41..0eeed83 100644 (file)
--- a/applications/luci-app-firewall/po/uk/firewall.po
+++ b/applications/luci-app-firewall/po/uk/firewall.po
@@ -30,12 +30,6 @@ msgstr "(Правило без імені)"
 msgid "(Unnamed SNAT)"
 msgstr "(SNAT без імені)"
 
-msgid "-- Please choose --"
-msgstr "-- Виберіть --"
-
-msgid "-- custom --"
-msgstr "-- додатково --"
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> пакетів за <var>%s</var>"
 
@@ -521,6 +515,12 @@ msgstr "відкидати"
 msgid "traffic"
 msgstr ""
 
+#~ msgid "-- Please choose --"
+#~ msgstr "-- Виберіть --"
+
+#~ msgid "-- custom --"
+#~ msgstr "-- додатково --"
+
 #~ msgid "Destination"
 #~ msgstr "Призначення"
 

diff --git a/applications/luci-app-firewall/po/vi/firewall.po b/applications/luci-app-firewall/po/vi/firewall.po
index 80fb5e1..dbbf3b0 100644 (file)
--- a/applications/luci-app-firewall/po/vi/firewall.po
+++ b/applications/luci-app-firewall/po/vi/firewall.po
@@ -31,12 +31,6 @@ msgstr ""
 msgid "(Unnamed SNAT)"
 msgstr ""
 
-msgid "-- Please choose --"
-msgstr ""
-
-msgid "-- custom --"
-msgstr ""
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 

diff --git a/applications/luci-app-firewall/po/zh-cn/firewall.po b/applications/luci-app-firewall/po/zh-cn/firewall.po
index f094890..99e12e8 100644 (file)
--- a/applications/luci-app-firewall/po/zh-cn/firewall.po
+++ b/applications/luci-app-firewall/po/zh-cn/firewall.po
@@ -31,12 +31,6 @@ msgstr "(未命名规则)"
 msgid "(Unnamed SNAT)"
 msgstr "(未命名SNAT)"
 
-msgid "-- Please choose --"
-msgstr "-- 请选择 --"
-
-msgid "-- custom --"
-msgstr "-- 自定义 --"
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> 包.每 <var>%s</var>"
 
@@ -523,6 +517,12 @@ msgstr "拒绝"
 msgid "traffic"
 msgstr "交通"
 
+#~ msgid "-- Please choose --"
+#~ msgstr "-- 请选择 --"
+
+#~ msgid "-- custom --"
+#~ msgstr "-- 自定义 --"
+
 #~ msgid "Destination"
 #~ msgstr "目标"
 

diff --git a/applications/luci-app-firewall/po/zh-tw/firewall.po b/applications/luci-app-firewall/po/zh-tw/firewall.po
index 3a83420..b768d43 100644 (file)
--- a/applications/luci-app-firewall/po/zh-tw/firewall.po
+++ b/applications/luci-app-firewall/po/zh-tw/firewall.po
@@ -29,12 +29,6 @@ msgstr "(未命名的規則)"
 msgid "(Unnamed SNAT)"
 msgstr "(未命名的來源NAT)"
 
-msgid "-- Please choose --"
-msgstr "-- 請選擇 --"
-
-msgid "-- custom --"
-msgstr "-- 自訂 --"
-
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> 封包數. 每<var>%s</var>"
 
@@ -489,3 +483,9 @@ msgstr "拒絕"
 
 msgid "traffic"
 msgstr ""
+
+#~ msgid "-- Please choose --"
+#~ msgstr "-- 請選擇 --"
+
+#~ msgid "-- custom --"
+#~ msgstr "-- 自訂 --"

diff --git a/applications/luci-app-radicale/po/de/radicale.po b/applications/luci-app-radicale/po/de/radicale.po
index ef47988..fda4245 100644 (file)
--- a/applications/luci-app-radicale/po/de/radicale.po
+++ b/applications/luci-app-radicale/po/de/radicale.po
@@ -25,12 +25,6 @@ msgstr ""
 "'Hostname:Port' oder 'IPv4:Port' oder '[IPv6]:Port' die Radicale überwachen "
 "soll."
 
-msgid "-- Please choose --"
-msgstr "-- Bitte auswählen --"
-
-msgid "-- custom --"
-msgstr "-- benutzerdefiniert --"
-
 msgid "AUTO"
 msgstr "AUTO"
 
@@ -305,9 +299,6 @@ msgstr "Neu laden"
 msgid "Response Encoding"
 msgstr "Antwort Zeichenkodierung"
 
-msgid "Reveal/hide password"
-msgstr "Passwort zeigen/verstecken"
-
 msgid "Rights"
 msgstr "Zugriffsrechte"
 
@@ -457,3 +448,12 @@ msgstr "erforderlich"
 
 msgid "salted SHA-1"
 msgstr "Salted SHA-1"
+
+#~ msgid "-- Please choose --"
+#~ msgstr "-- Bitte auswählen --"
+
+#~ msgid "-- custom --"
+#~ msgstr "-- benutzerdefiniert --"
+
+#~ msgid "Reveal/hide password"
+#~ msgstr "Passwort zeigen/verstecken"

diff --git a/applications/luci-app-radicale/po/sv/radicale.po b/applications/luci-app-radicale/po/sv/radicale.po
index cf899d8..18adf26 100644 (file)
--- a/applications/luci-app-radicale/po/sv/radicale.po
+++ b/applications/luci-app-radicale/po/sv/radicale.po
@@ -19,12 +19,6 @@ msgid ""
 "'Hostname:Port' or 'IPv4:Port' or '[IPv6]:Port' Radicale should listen on"
 msgstr ""
 
-msgid "-- Please choose --"
-msgstr "-- Vänligen välj --"
-
-msgid "-- custom --"
-msgstr "-- anpassad --"
-
 msgid "AUTO"
 msgstr "AUTO"
 
@@ -279,9 +273,6 @@ msgstr "Ladda om"
 msgid "Response Encoding"
 msgstr ""
 
-msgid "Reveal/hide password"
-msgstr "Visa/göm lösenordet"
-
 msgid "Rights"
 msgstr "Rättigheter"
 
@@ -423,3 +414,12 @@ msgstr "krävs"
 
 msgid "salted SHA-1"
 msgstr "saltad SHA-1"
+
+#~ msgid "-- Please choose --"
+#~ msgstr "-- Vänligen välj --"
+
+#~ msgid "-- custom --"
+#~ msgstr "-- anpassad --"
+
+#~ msgid "Reveal/hide password"
+#~ msgstr "Visa/göm lösenordet"

diff --git a/applications/luci-app-radicale/po/templates/radicale.pot b/applications/luci-app-radicale/po/templates/radicale.pot
index 1c01c4a..181c4f3 100644 (file)
--- a/applications/luci-app-radicale/po/templates/radicale.pot
+++ b/applications/luci-app-radicale/po/templates/radicale.pot
@@ -9,12 +9,6 @@ msgid ""
 "'Hostname:Port' or 'IPv4:Port' or '[IPv6]:Port' Radicale should listen on"
 msgstr ""
 
-msgid "-- Please choose --"
-msgstr ""
-
-msgid "-- custom --"
-msgstr ""
-
 msgid "AUTO"
 msgstr ""
 
@@ -266,9 +260,6 @@ msgstr ""
 msgid "Response Encoding"
 msgstr ""
 
-msgid "Reveal/hide password"
-msgstr ""
-
 msgid "Rights"
 msgstr ""
 

diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po
index 7f98588..935c18d 100644 (file)
--- a/modules/luci-base/po/ca/base.po
+++ b/modules/luci-base/po/ca/base.po
@@ -1468,6 +1468,9 @@ msgstr "Llengua i estil"
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr "Duració de validitat d'arrendament"
 
@@ -1902,6 +1905,9 @@ msgstr "Cal especificar o el nom de host o l'adreça MAC!"
 msgid "One or more fields contain invalid values!"
 msgstr "Un o més dels camps requerits conté un valor invàlid!"
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr "Un o més dels camps requerits no té valor!"
 
@@ -3042,7 +3048,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 
 msgid "Used"

diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po
index 21bc3a8..14db525 100644 (file)
--- a/modules/luci-base/po/cs/base.po
+++ b/modules/luci-base/po/cs/base.po
@@ -1481,6 +1481,9 @@ msgstr "Jazyk a styl"
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr "Doba platnosti zápůjčky"
 
@@ -1923,6 +1926,9 @@ msgstr "Jedno jméno nebo mac adresa, musí být zadáno!"
 msgid "One or more fields contain invalid values!"
 msgstr "Jedno nebo více polí obsahuje neplatné hodnoty!"
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr "Jedno nebo více požadovaných polí neobsahuje hodnotu!"
 
@@ -3112,7 +3118,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 "Použitím tlačítka <em>Přidat</em> přidáte novou zápůjčku (lease). <em>MAC "
 "adresa</em> identifikuje počítač, <em>IPv4 adresa</em> určuje, jaká pevná "

diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po
index f36d490..a324e9f 100644 (file)
--- a/modules/luci-base/po/de/base.po
+++ b/modules/luci-base/po/de/base.po
@@ -1482,6 +1482,9 @@ msgstr "Sprache und Aussehen"
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr "Lease-Gültigkeitsdauer"
 
@@ -3139,7 +3142,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 "Die <em>Hinzufügen</em> Schaltfläche fügt einen neuen Lease-Eintrag hinzu. "
 "Die <em>MAC-Adresse</em> identifiziert den Host, die <em>IPv4-Adresse</em> "

diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po
index 11f4614..a087846 100644 (file)
--- a/modules/luci-base/po/el/base.po
+++ b/modules/luci-base/po/el/base.po
@@ -1496,6 +1496,9 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr ""
 
@@ -1932,6 +1935,9 @@ msgstr ""
 msgid "One or more fields contain invalid values!"
 msgstr "Ένα ή περισσότερα πεδία περιέχουν μη έγκυρες τιμές!"
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr "Ένα ή περισσότερα πεδία δεν περιέχουν τιμές!"
 
@@ -3067,7 +3073,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 
 msgid "Used"

diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po
index ffa554a..ee7e817 100644 (file)
--- a/modules/luci-base/po/en/base.po
+++ b/modules/luci-base/po/en/base.po
@@ -1465,6 +1465,9 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr ""
 
@@ -1899,6 +1902,9 @@ msgstr ""
 msgid "One or more fields contain invalid values!"
 msgstr ""
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr ""
 
@@ -3024,7 +3030,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 
 msgid "Used"

diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po
index 1fad2cc..a1fe187 100644 (file)
--- a/modules/luci-base/po/es/base.po
+++ b/modules/luci-base/po/es/base.po
@@ -1495,6 +1495,9 @@ msgstr "Idioma y Estilo"
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr "Tiempo de validación de cesión"
 
@@ -1937,6 +1940,9 @@ msgstr "¡Debe especificar al menos un nombre de máquina o dirección mac!"
 msgid "One or more fields contain invalid values!"
 msgstr "¡Valores no válidos!"
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr "¡Campos vacíos!"
 
@@ -3137,7 +3143,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 "Pulse el botón <em>Añadir</em> para insertar una nueva cesión. <em>Dirección "
 "MAC</em> identificará la máquina, <em>dirección IPv4</em> especificará la "

diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po
index 830857a..6de11dc 100644 (file)
--- a/modules/luci-base/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
@@ -1506,6 +1506,9 @@ msgstr "Langue et apparence"
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr "Durée de validité d'un bail"
 
@@ -1950,6 +1953,9 @@ msgstr "Il faut indiquer un nom d'hôte ou une adresse MAC !"
 msgid "One or more fields contain invalid values!"
 msgstr "Un ou plusieurs champs contiennent des valeurs incorrectes !"
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr "Un ou plusieurs champs n'ont pas de valeur !"
 
@@ -3156,7 +3162,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 "Utiliser le bouton <em>Ajouter</em> pour créer un nouveau bail. "
 "L'<em>adresse MAC</em> identifie l'hôte, l'<em>adresse IPv4</em> décrit "

diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po
index bd05b5a..58abf37 100644 (file)
--- a/modules/luci-base/po/he/base.po
+++ b/modules/luci-base/po/he/base.po
@@ -1441,6 +1441,9 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr ""
 
@@ -1867,6 +1870,9 @@ msgstr ""
 msgid "One or more fields contain invalid values!"
 msgstr "ישנם שדות המכילים ערכים בלתי חוקיים!"
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr ""
 
@@ -2984,7 +2990,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 
 msgid "Used"

diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po
index 5f10e73..a486de7 100644 (file)
--- a/modules/luci-base/po/hu/base.po
+++ b/modules/luci-base/po/hu/base.po
@@ -1495,6 +1495,9 @@ msgstr "Nyelv és megjelenés"
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr "Bérlet érvényességi ideje"
 
@@ -1940,6 +1943,9 @@ msgstr "Legalább gépnevet vagy MAC-címet meg kell adni!"
 msgid "One or more fields contain invalid values!"
 msgstr "Egy vagy több mező érvénytelen adatot tartalmaz!"
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr "Egy vagy több kötelezően kitöltendő mező üres!"
 
@@ -3144,7 +3150,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 "Használja a <em>Hozzáadás</em> gombot új bérleti bejegyzés hozzáadásához. A "
 "<em>MAC-cím</em> azonosítja a gépet. az <em>IPv4-cím</em> adja meg a "

diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po
index 00faad6..92d0841 100644 (file)
--- a/modules/luci-base/po/it/base.po
+++ b/modules/luci-base/po/it/base.po
@@ -1497,6 +1497,9 @@ msgstr "Lingua e Stile"
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr "Periodo di Validità del Lease"
 
@@ -1938,6 +1941,9 @@ msgstr ""
 msgid "One or more fields contain invalid values!"
 msgstr "Uno o più campi contengono valori non validi!"
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr "Uno o più campi obbligatori sono vuoti!"
 
@@ -3095,7 +3101,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 "Utilizzare il pulsante <em>Aggiungi</em> per aggiungere una nuova voce di "
 "locazione. L'<em>Indirizzo-MAC</em> identifica l'host, l'<em>Indirizzo-IPv4</"

diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po
index b083726..54bf5bf 100644 (file)
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@ -1478,6 +1478,9 @@ msgstr "言語とスタイル"
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr "リース有効時間"
 
@@ -1917,6 +1920,9 @@ msgstr "1つ以上のホスト名またはmacアドレスを設定してくだ
 msgid "One or more fields contain invalid values!"
 msgstr "1つ以上のフィールドに無効な値が設定されています！"
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr "1つ以上のフィールドに値が設定されていません！"
 
@@ -3107,7 +3113,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 "<em>追加</em> ボタンを押して、新しくエントリーを作成してください。<em>MAC-ア"
 "ドレス</em> はそのホストを識別し, <em>IPv4-アドレス</em> には払いだす固定のア"

diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po
index 0761693..0e94725 100644 (file)
--- a/modules/luci-base/po/ms/base.po
+++ b/modules/luci-base/po/ms/base.po
@@ -1436,6 +1436,9 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr ""
 
@@ -1871,6 +1874,9 @@ msgstr ""
 msgid "One or more fields contain invalid values!"
 msgstr ""
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr ""
 
@@ -3000,7 +3006,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 
 msgid "Used"

diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po
index 64e0b9c..c24d1d1 100644 (file)
--- a/modules/luci-base/po/no/base.po
+++ b/modules/luci-base/po/no/base.po
@@ -1473,6 +1473,9 @@ msgstr "Språk og Utseende"
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr "Gyldig leietid"
 
@@ -1915,6 +1918,9 @@ msgstr "Enten Vertsnavn eller Mac-adresse må oppgis!"
 msgid "One or more fields contain invalid values!"
 msgstr "Ett eller flere felt inneholder ugyldige verdier!"
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr "Ett eller flere obligatoriske felter har ingen verdi!"
 
@@ -3109,7 +3115,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 "Bruk <em>Legg til</em> knappen får å legge til en leieavtale. <em>MAC-"
 "Adresse</em> identifiserer verten, <em>IPv4-Adresse</em> angir hvilken "

diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po
index 0864c2c..44f4f5e 100644 (file)
--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@@ -1519,6 +1519,9 @@ msgstr "Wygląd i język"
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr "Czas ważności dzierżawy"
 
@@ -1961,6 +1964,9 @@ msgstr "Nazwa hosta lub adres MAC musu być podany!"
 msgid "One or more fields contain invalid values!"
 msgstr "Jedno lub więcej pól zawiera nieprawidłowe wartości!"
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr "Jedno lub więcej pól nie posiada wpisanych wartości!"
 
@@ -3173,7 +3179,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 "Użyj przycisku <em>Dodaj</em>, aby dodać nowy wpis dzierżawy. <em>Adres MAC</"
 "em> identyfikuje hosta, <em>Adres IPv4</em> określa, którego stałego adresu "

diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po
index 4f2b8cc..194fa11 100644 (file)
--- a/modules/luci-base/po/pt-br/base.po
+++ b/modules/luci-base/po/pt-br/base.po
@@ -1514,6 +1514,9 @@ msgstr "Idioma e Estilo"
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr "Tempo de validade da atribuição"
 
@@ -1967,6 +1970,9 @@ msgstr ""
 msgid "One or more fields contain invalid values!"
 msgstr "Um ou mais campos contém valores inválidos!"
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr "Um ou mais campos obrigatórios não tem valor!"
 
@@ -3175,7 +3181,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 "Use o botão <em>Adicionar</em> para adicionar uma nova entrada de "
 "atribuição. O endereço <em>MAC-Address</em> identifica o equipamento, o "

diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po
index 1086289..3c0391b 100644 (file)
--- a/modules/luci-base/po/pt/base.po
+++ b/modules/luci-base/po/pt/base.po
@@ -1497,6 +1497,9 @@ msgstr "Língua e Tema"
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr "Tempo de validade da concessão"
 
@@ -1939,6 +1942,9 @@ msgstr "Um nome de host ou endereço MAC deve ser especificado!"
 msgid "One or more fields contain invalid values!"
 msgstr "Um ou mais campos contêm valores inválidos!"
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr "Um ou mais campos obrigatórios não têm valores!"
 
@@ -3106,7 +3112,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 
 msgid "Used"

diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po
index 414dd35..eb463e8 100644 (file)
--- a/modules/luci-base/po/ro/base.po
+++ b/modules/luci-base/po/ro/base.po
@@ -1438,6 +1438,9 @@ msgstr "Limba si stilul interfetei"
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr ""
 
@@ -1864,6 +1867,9 @@ msgstr ""
 msgid "One or more fields contain invalid values!"
 msgstr "Unul sau mai multe campuri contin valori invalide !"
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr "Unul sau mai multe campuri nu contin valori !"
 
@@ -2974,7 +2980,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 
 msgid "Used"

diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po
index bf69d49..2d697ed 100644 (file)
--- a/modules/luci-base/po/ru/base.po
+++ b/modules/luci-base/po/ru/base.po
@@ -1501,6 +1501,9 @@ msgstr "Язык и тема"
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr "Срок действия аренды"
 
@@ -1945,6 +1948,9 @@ msgstr "Должен быть указан либо MAC-адрес, либо и
 msgid "One or more fields contain invalid values!"
 msgstr "Одно или несколько полей содержат недопустимые значения!"
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr "Одно или несколько обязательных полей не заполнены!"
 
@@ -3144,7 +3150,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 "Нажмите кнопку <em>Добавить</em>, чтобы добавить новую запись аренды. "
 "<em>MAC-адрес</em> идентифицирует хост, <em>IPv4-адрес</em> указывает "

diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po
index b8d0622..c328699 100644 (file)
--- a/modules/luci-base/po/sk/base.po
+++ b/modules/luci-base/po/sk/base.po
@@ -1412,6 +1412,9 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr ""
 
@@ -1838,6 +1841,9 @@ msgstr ""
 msgid "One or more fields contain invalid values!"
 msgstr ""
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr ""
 
@@ -2943,7 +2949,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 
 msgid "Used"

diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po
index 3bd3ae2..b9a37ce 100644 (file)
--- a/modules/luci-base/po/sv/base.po
+++ b/modules/luci-base/po/sv/base.po
@@ -1418,6 +1418,9 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr ""
 
@@ -1844,6 +1847,9 @@ msgstr ""
 msgid "One or more fields contain invalid values!"
 msgstr ""
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr ""
 
@@ -2949,7 +2955,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 
 msgid "Used"

diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot
index e466a90..30c94e9 100644 (file)
--- a/modules/luci-base/po/templates/base.pot
+++ b/modules/luci-base/po/templates/base.pot
@@ -1405,6 +1405,9 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr ""
 
@@ -2939,7 +2942,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 
 msgid "Used"

diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po
index d209ea7..1b8dafc 100644 (file)
--- a/modules/luci-base/po/tr/base.po
+++ b/modules/luci-base/po/tr/base.po
@@ -1425,6 +1425,9 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr ""
 
@@ -1851,6 +1854,9 @@ msgstr ""
 msgid "One or more fields contain invalid values!"
 msgstr ""
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr ""
 
@@ -2956,7 +2962,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 
 msgid "Used"

diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po
index c28446b..6c7f641 100644 (file)
--- a/modules/luci-base/po/uk/base.po
+++ b/modules/luci-base/po/uk/base.po
@@ -1508,6 +1508,9 @@ msgstr "Мова та стиль"
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr "Час чинності оренди"
 
@@ -1953,6 +1956,9 @@ msgstr "Має бути вказане одне з двох - ім'я вузла
 msgid "One or more fields contain invalid values!"
 msgstr "Одне або декілька полів містять неприпустимі значення!"
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr "Одне або декілька обов'язкових полів не мають значень!"
 
@@ -3160,7 +3166,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 "Використовуйте кнопку <em>Додати</em>, щоб додати новий запис оренди. "
 "<em>MAC-адреса</em> ідентифікує вузол, <em>IPv4-адреса</em> визначає "

diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po
index 4e89732..55035f1 100644 (file)
--- a/modules/luci-base/po/vi/base.po
+++ b/modules/luci-base/po/vi/base.po
@@ -1440,6 +1440,9 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr ""
 
@@ -1874,6 +1877,9 @@ msgstr ""
 msgid "One or more fields contain invalid values!"
 msgstr ""
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr ""
 
@@ -2998,7 +3004,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 
 msgid "Used"

diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po
index 561b613..7b52d0b 100644 (file)
--- a/modules/luci-base/po/zh-cn/base.po
+++ b/modules/luci-base/po/zh-cn/base.po
@@ -1437,6 +1437,9 @@ msgstr "语言和界面"
 msgid "Leaf"
 msgstr "叶子"
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr "有效租期"
 
@@ -1864,6 +1867,9 @@ msgstr "请指定主机名或MAC地址！"
 msgid "One or more fields contain invalid values!"
 msgstr "一个或多个选项值有误！"
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr "一个或多个必选项值为空！"
 
@@ -3007,7 +3013,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 "使用<em>添加</em>来增加新的租约条目。使用<em>MAC-地址</em>鉴别主机，<em>IPv4-"
 "地址</em>分配地址，<em>主机名</em>分配标识。"

diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po
index 2d9d2c1..e64ada1 100644 (file)
--- a/modules/luci-base/po/zh-tw/base.po
+++ b/modules/luci-base/po/zh-tw/base.po
@@ -1448,6 +1448,9 @@ msgstr "語言和風格"
 msgid "Leaf"
 msgstr ""
 
+msgid "Lease time"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr "租賃有效時間"
 
@@ -1879,6 +1882,9 @@ msgstr "主機名稱或mac位址任選一個被指定"
 msgid "One or more fields contain invalid values!"
 msgstr "有一個以上的欄位包含失效數值!"
 
+msgid "One or more invalid/required values on tab"
+msgstr ""
+
 msgid "One or more required fields have no value!"
 msgstr "有一個以上的欄位缺乏任何數值!"
 
@@ -3033,7 +3039,8 @@ msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host."
+"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 "使用 <em>Add</em> 鍵以便新增一個租賃的項目. 這個 <em>MAC-Address</em> 標誌這"
 "個主機, the <em>IPv4-Address</em> 指定固定位址以便使用,<em>Hostname</em> 備指"

diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
index 572446f..ff9438a 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
@@ -215,7 +215,9 @@ s = m:section(TypedSection, "host", translate("Static Leases"),
                "only hosts with a corresponding lease are served.") .. "<br />" ..
        translate("Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</em> " ..
                "indentifies the host, the <em>IPv4-Address</em> specifies to the fixed address to " ..
-               "use and the <em>Hostname</em> is assigned as symbolic name to the requesting host."))
+               "use and the <em>Hostname</em> is assigned as symbolic name to the requesting host. " ..
+               "The optional <em>Lease time</em> can be used to set non-standard host-specific " ..
+               "lease time, e.g. 12h, 3d or infinite."))
 
 s.addremove = true
 s.anonymous = true
@@ -232,6 +234,9 @@ mac.rmempty  = true
 ip = s:option(Value, "ip", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
 ip.datatype = "or(ip4addr,'ignore')"
 
+time = s:option(Value, "leasetime", translate("Lease time"))
+time.rmempty  = true
+
 hostid = s:option(Value, "hostid", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"))
 
 ipc.neighbors({ family = 4 }, function(n)