summaryrefslogtreecommitdiffhomepage
path: root/applications
diff options
context:
space:
mode:
Diffstat (limited to 'applications')
-rw-r--r--applications/luci-app-adblock/luasrc/controller/adblock.lua47
-rw-r--r--applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua22
-rw-r--r--applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua18
-rw-r--r--applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua171
-rw-r--r--applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua22
-rw-r--r--applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm74
-rw-r--r--applications/luci-app-adblock/luasrc/view/adblock/logread.htm48
-rw-r--r--applications/luci-app-adblock/luasrc/view/adblock/query.htm16
-rw-r--r--applications/luci-app-adblock/luasrc/view/adblock/runtime.htm195
-rw-r--r--applications/luci-app-adblock/po/it/adblock.po3
-rw-r--r--applications/luci-app-adblock/po/ja/adblock.po3
-rw-r--r--applications/luci-app-adblock/po/pt-br/adblock.po3
-rw-r--r--applications/luci-app-adblock/po/ru/adblock.po144
-rw-r--r--applications/luci-app-adblock/po/sv/adblock.po3
-rw-r--r--applications/luci-app-adblock/po/templates/adblock.pot3
-rw-r--r--applications/luci-app-adblock/po/zh-cn/adblock.po39
-rw-r--r--applications/luci-app-adblock/po/zh-tw/adblock.po3
-rw-r--r--applications/luci-app-advanced-reboot/Makefile4
-rw-r--r--applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua2
-rw-r--r--applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm14
-rw-r--r--applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/alternative_reboot.htm6
-rw-r--r--applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/power_off.htm6
-rw-r--r--applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po18
-rw-r--r--applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po15
-rw-r--r--applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot5
-rw-r--r--applications/luci-app-ddns/po/ru/ddns.po235
-rw-r--r--applications/luci-app-ocserv/luasrc/view/ocserv_status.htm61
-rw-r--r--applications/luci-app-samba4/Makefile10
-rw-r--r--applications/luci-app-samba4/luasrc/controller/samba4.lua14
-rw-r--r--applications/luci-app-samba4/luasrc/model/cbi/samba4.lua90
-rw-r--r--applications/luci-app-samba4/po/ca/samba4.po121
-rw-r--r--applications/luci-app-samba4/po/cs/samba4.po109
-rw-r--r--applications/luci-app-samba4/po/de/samba4.po113
-rw-r--r--applications/luci-app-samba4/po/el/samba4.po98
-rw-r--r--applications/luci-app-samba4/po/en/samba4.po108
-rw-r--r--applications/luci-app-samba4/po/es/samba4.po118
-rw-r--r--applications/luci-app-samba4/po/fr/samba4.po110
-rw-r--r--applications/luci-app-samba4/po/he/samba4.po93
-rw-r--r--applications/luci-app-samba4/po/hu/samba4.po110
-rw-r--r--applications/luci-app-samba4/po/it/samba4.po113
-rw-r--r--applications/luci-app-samba4/po/ja/samba4.po109
-rw-r--r--applications/luci-app-samba4/po/ms/samba4.po92
-rw-r--r--applications/luci-app-samba4/po/no/samba4.po98
-rw-r--r--applications/luci-app-samba4/po/pl/samba4.po109
-rw-r--r--applications/luci-app-samba4/po/pt-br/samba4.po119
-rw-r--r--applications/luci-app-samba4/po/pt/samba4.po119
-rw-r--r--applications/luci-app-samba4/po/ro/samba4.po108
-rw-r--r--applications/luci-app-samba4/po/ru/samba4.po114
-rw-r--r--applications/luci-app-samba4/po/sk/samba4.po93
-rw-r--r--applications/luci-app-samba4/po/sv/samba4.po101
-rw-r--r--applications/luci-app-samba4/po/templates/samba4.pot86
-rw-r--r--applications/luci-app-samba4/po/tr/samba4.po93
-rw-r--r--applications/luci-app-samba4/po/uk/samba4.po110
-rw-r--r--applications/luci-app-samba4/po/vi/samba4.po122
-rw-r--r--applications/luci-app-samba4/po/zh-cn/samba4.po112
-rw-r--r--applications/luci-app-samba4/po/zh-tw/samba4.po112
-rw-r--r--applications/luci-app-simple-adblock/Makefile2
-rw-r--r--applications/luci-app-simple-adblock/luasrc/controller/simpleadblock.lua7
-rw-r--r--applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua6
-rw-r--r--applications/luci-app-simple-adblock/po/ja/simple-adblock.po54
-rw-r--r--applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po54
-rw-r--r--applications/luci-app-simple-adblock/po/pt/simple-adblock.po54
-rw-r--r--applications/luci-app-simple-adblock/po/ru/simple-adblock.po54
-rw-r--r--applications/luci-app-simple-adblock/po/sv/simple-adblock.po54
-rw-r--r--applications/luci-app-simple-adblock/po/templates/simple-adblock.pot42
-rw-r--r--applications/luci-app-transmission/luasrc/model/cbi/transmission.lua3
-rw-r--r--applications/luci-app-upnp/po/ca/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/cs/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/de/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/el/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/en/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/es/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/fr/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/he/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/hu/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/it/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/ja/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/ms/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/no/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/pl/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/pt-br/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/pt/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/ro/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/ru/upnp.po18
-rw-r--r--applications/luci-app-upnp/po/sk/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/sv/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/templates/upnp.pot6
-rw-r--r--applications/luci-app-upnp/po/tr/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/uk/upnp.po8
-rw-r--r--applications/luci-app-upnp/po/vi/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/zh-cn/upnp.po6
-rw-r--r--applications/luci-app-upnp/po/zh-tw/upnp.po6
-rw-r--r--applications/luci-app-wol/po/uk/wol.po23
93 files changed, 4057 insertions, 550 deletions
diff --git a/applications/luci-app-adblock/luasrc/controller/adblock.lua b/applications/luci-app-adblock/luasrc/controller/adblock.lua
index 10110666c3..4c77244710 100644
--- a/applications/luci-app-adblock/luasrc/controller/adblock.lua
+++ b/applications/luci-app-adblock/luasrc/controller/adblock.lua
@@ -3,9 +3,12 @@
module("luci.controller.adblock", package.seeall)
+local sys = require("luci.sys")
local util = require("luci.util")
-local templ = require("luci.template")
+local http = require("luci.http")
local i18n = require("luci.i18n")
+local json = require("luci.jsonc")
+local uci = require("luci.model.uci").cursor()
function index()
if not nixio.fs.access("/etc/config/adblock") then
@@ -13,24 +16,56 @@ function index()
end
entry({"admin", "services", "adblock"}, firstchild(), _("Adblock"), 30).dependent = false
entry({"admin", "services", "adblock", "tab_from_cbi"}, cbi("adblock/overview_tab", {hideresetbtn=true, hidesavebtn=true}), _("Overview"), 10).leaf = true
- entry({"admin", "services", "adblock", "logfile"}, call("logread"), _("View Logfile"), 20).leaf = true
+ entry({"admin", "services", "adblock", "log"}, template("adblock/logread"), _("View Logfile"), 20).leaf = true
entry({"admin", "services", "adblock", "advanced"}, firstchild(), _("Advanced"), 100)
entry({"admin", "services", "adblock", "advanced", "blacklist"}, form("adblock/blacklist_tab"), _("Edit Blacklist"), 110).leaf = true
entry({"admin", "services", "adblock", "advanced", "whitelist"}, form("adblock/whitelist_tab"), _("Edit Whitelist"), 120).leaf = true
entry({"admin", "services", "adblock", "advanced", "configuration"}, form("adblock/configuration_tab"), _("Edit Configuration"), 130).leaf = true
entry({"admin", "services", "adblock", "advanced", "query"}, template("adblock/query"), _("Query domains"), 140).leaf = true
entry({"admin", "services", "adblock", "advanced", "result"}, call("queryData"), nil, 150).leaf = true
+ entry({"admin", "services", "adblock", "logread"}, call("logread"), nil).leaf = true
+ entry({"admin", "services", "adblock", "status"}, call("status_update"), nil).leaf = true
+ entry({"admin", "services", "adblock", "action"}, call("adb_action"), nil).leaf = true
+end
+
+function adb_action(name)
+ if name == "do_suspend" then
+ luci.sys.call("/etc/init.d/adblock suspend >/dev/null 2>&1")
+ elseif name == "do_resume" then
+ luci.sys.call("/etc/init.d/adblock resume >/dev/null 2>&1")
+ elseif name == "do_refresh" then
+ luci.sys.call("/etc/init.d/adblock reload >/dev/null 2>&1")
+ end
+ luci.http.prepare_content("text/plain")
+ luci.http.write("0")
+end
+
+function status_update()
+ local rt_file
+ local content
+
+ rt_file = uci:get("adblock", "global", "adb_rtfile") or "/tmp/adb_runtime.json"
+
+ if nixio.fs.access(rt_file) then
+ content = json.parse(nixio.fs.readfile(rt_file) or "")
+ http.prepare_content("application/json")
+ http.write_json(content)
+ end
end
function logread()
- local logfile
+ local content
if nixio.fs.access("/var/log/messages") then
- logfile = util.trim(util.exec("grep -F 'adblock-' /var/log/messages"))
+ content = util.trim(util.exec("grep -F 'adblock-' /var/log/messages"))
else
- logfile = util.trim(util.exec("logread -e 'adblock-'"))
+ content = util.trim(util.exec("logread -e 'adblock-'"))
+ end
+
+ if content == "" then
+ content = "No adblock related logs yet!"
end
- templ.render("adblock/logread", {title = i18n.translate("Adblock Logfile"), content = logfile})
+ http.write(content)
end
function queryData(domain)
diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua
index 39688dc194..b3b3f8d0eb 100644
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua
@@ -1,19 +1,19 @@
-- Copyright 2017-2018 Dirk Brenken (dev@brenken.org)
-- This is free software, licensed under the Apache License, Version 2.0
-local fs = require("nixio.fs")
-local util = require("luci.util")
-local uci = require("luci.model.uci").cursor()
-local adbinput = uci:get("adblock", "blacklist", "adb_src") or "/etc/adblock/adblock.blacklist"
+local fs = require("nixio.fs")
+local util = require("luci.util")
+local uci = require("luci.model.uci").cursor()
+local input = uci:get("adblock", "blacklist", "adb_src") or "/etc/adblock/adblock.blacklist"
-if not fs.access(adbinput) then
+if not fs.access(input) then
m = SimpleForm("error", nil, translate("Input file not found, please check your configuration."))
m.reset = false
m.submit = false
return m
end
-if fs.stat(adbinput).size >= 102400 then
+if fs.stat(input).size >= 102400 then
m = SimpleForm("error", nil,
translate("The file size is too large for online editing in LuCI (≥ 100 KB). ")
.. translate("Please edit this file directly in a terminal session."))
@@ -28,7 +28,7 @@ m.submit = translate("Save")
m.reset = false
s = m:section(SimpleSection, nil,
- translatef("This form allows you to modify the content of the adblock blacklist (%s).<br />", adbinput)
+ translatef("This form allows you to modify the content of the adblock blacklist (%s). ", input)
.. translate("Please add only one domain per line. Comments introduced with '#' are allowed - ip addresses, wildcards and regex are not."))
f = s:option(TextValue, "data")
@@ -37,11 +37,15 @@ f.rows = 20
f.rmempty = true
function f.cfgvalue()
- return fs.readfile(adbinput) or ""
+ return fs.readfile(input) or ""
end
function f.write(self, section, data)
- return fs.writefile(adbinput, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n")
+ return fs.writefile(input, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n")
+end
+
+function f.remove(self, section, value)
+ return fs.writefile(input, "")
end
function s.handle(self, state, data)
diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua
index 78636038bf..1e98f0204b 100644
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua
@@ -1,18 +1,18 @@
-- Copyright 2017-2018 Dirk Brenken (dev@brenken.org)
-- This is free software, licensed under the Apache License, Version 2.0
-local fs = require("nixio.fs")
-local util = require("luci.util")
-local adbinput = "/etc/config/adblock"
+local fs = require("nixio.fs")
+local util = require("luci.util")
+local input = "/etc/config/adblock"
-if not fs.access(adbinput) then
+if not fs.access(input) then
m = SimpleForm("error", nil, translate("Input file not found, please check your configuration."))
m.reset = false
m.submit = false
return m
end
-if fs.stat(adbinput).size >= 102400 then
+if fs.stat(input).size >= 102400 then
m = SimpleForm("error", nil,
translate("The file size is too large for online editing in LuCI (&ge; 100 KB). ")
.. translate("Please edit this file directly in a terminal session."))
@@ -34,11 +34,15 @@ f.rows = 20
f.rmempty = true
function f.cfgvalue()
- return fs.readfile(adbinput) or ""
+ return fs.readfile(input) or ""
end
function f.write(self, section, data)
- return fs.writefile(adbinput, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n")
+ return fs.writefile(input, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n")
+end
+
+function f.remove(self, section, value)
+ return fs.writefile(input, "")
end
function s.handle(self, state, data)
diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
index da783e3361..3bf7392914 100644
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
@@ -1,69 +1,32 @@
-- Copyright 2017-2018 Dirk Brenken (dev@brenken.org)
-- This is free software, licensed under the Apache License, Version 2.0
-local fs = require("nixio.fs")
-local uci = require("luci.model.uci").cursor()
-local sys = require("luci.sys")
-local util = require("luci.util")
-local dump = util.ubus("network.interface", "dump", {})
-local json = require("luci.jsonc")
-local adbinput = uci:get("adblock", "global", "adb_rtfile") or "/tmp/adb_runtime.json"
+local fs = require("nixio.fs")
+local uci = require("luci.model.uci").cursor()
+local sys = require("luci.sys")
+local util = require("luci.util")
+local dump = util.ubus("network.interface", "dump", {})
m = Map("adblock", translate("Adblock"),
translate("Configuration of the adblock package to block ad/abuse domains by using DNS. ")
.. translatef("For further information "
.. "<a href=\"%s\" target=\"_blank\">"
.. "check the online documentation</a>", "https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md"))
-m.apply_on_parse = true
function m.on_apply(self)
luci.sys.call("/etc/init.d/adblock reload >/dev/null 2>&1")
- luci.http.redirect(luci.dispatcher.build_url("admin", "services", "adblock"))
end
-- Main adblock options
s = m:section(NamedSection, "global", "adblock")
-local parse = json.parse(fs.readfile(adbinput) or "")
-if parse then
- status = parse.data.adblock_status
- version = parse.data.adblock_version
- domains = parse.data.overall_domains
- fetch = parse.data.fetch_utility
- backend = parse.data.dns_backend
- rundate = parse.data.last_rundate
-end
-
o1 = s:option(Flag, "adb_enabled", translate("Enable Adblock"))
o1.default = o1.disabled
o1.rmempty = false
-btn = s:option(Button, "", translate("Suspend / Resume Adblock"))
-if parse and status == "enabled" then
- btn.inputtitle = translate("Suspend")
- btn.inputstyle = "reset"
- btn.disabled = false
- function btn.write()
- luci.sys.call("/etc/init.d/adblock suspend >/dev/null 2>&1")
- luci.http.redirect(luci.dispatcher.build_url("admin", "services", "adblock"))
- end
-elseif parse and status == "paused" then
- btn.inputtitle = translate("Resume")
- btn.inputstyle = "apply"
- btn.disabled = false
- function btn.write()
- luci.sys.call("/etc/init.d/adblock resume >/dev/null 2>&1")
- luci.http.redirect(luci.dispatcher.build_url("admin", "services", "adblock"))
- end
-else
- btn.inputtitle = translate("-------")
- btn.inputstyle = "button"
- btn.disabled = true
-end
-
o2 = s:option(ListValue, "adb_dns", translate("DNS Backend (DNS Directory)"),
- translate("List of supported DNS backends with their default list export directory.<br />")
+ translate("List of supported DNS backends with their default list export directory. ")
.. translate("To overwrite the default path use the 'DNS Directory' option in the extra section below."))
o2:value("dnsmasq", "dnsmasq (/tmp)")
o2:value("unbound", "unbound (/var/lib/unbound)")
@@ -85,7 +48,7 @@ o3.default = "uclient-fetch"
o3.rmempty = false
o4 = s:option(ListValue, "adb_trigger", translate("Startup Trigger"),
- translate("List of available network interfaces. Usually the startup will be triggered by the 'wan' interface.<br />")
+ translate("List of available network interfaces. Usually the startup will be triggered by the 'wan' interface. ")
.. translate("Choose 'none' to disable automatic startups, 'timed' to use a classic timeout (default 30 sec.) or select another trigger interface."))
o4:value("none")
o4:value("timed")
@@ -101,66 +64,8 @@ o4.rmempty = false
-- Runtime information
-ds = m:section(NamedSection, "global", "adblock", translate("Runtime Information"))
-
-dv1 = ds:option(DummyValue, "", translate("Adblock Status"))
-dv1.template = "adblock/runtime"
-if parse == nil then
- dv1.value = translate("n/a")
-else
- if status == "error" then
- dv1.value = translate("error")
- elseif status == "disabled" then
- dv1.value = translate("disabled")
- elseif status == "paused" then
- dv1.value = translate("paused")
- elseif status == "running" then
- dv1.value = translate("running")
- else
- dv1.value = translate("enabled")
- end
-end
-
-dv2 = ds:option(DummyValue, "", translate("Adblock Version"))
-dv2.template = "adblock/runtime"
-if parse == nil then
- dv2.value = translate("n/a")
-else
- dv2.value = version
-end
-
-dv3 = ds:option(DummyValue, "", translate("Download Utility (SSL Library)"),
- translate("For SSL protected blocklist sources you need a suitable SSL library, e.g. 'libustream-ssl' or 'built-in'."))
-dv3.template = "adblock/runtime"
-if parse == nil then
- dv3.value = translate("n/a")
-else
- dv3.value = fetch
-end
-
-dv4 = ds:option(DummyValue, "", translate("DNS Backend (DNS Directory)"))
-dv4.template = "adblock/runtime"
-if parse == nil then
- dv4.value = translate("n/a")
-else
- dv4.value = backend
-end
-
-dv5 = ds:option(DummyValue, "", translate("Overall Domains"))
-dv5.template = "adblock/runtime"
-if parse == nil then
- dv5.value = translate("n/a")
-else
- dv5.value = domains
-end
-
-dv6 = ds:option(DummyValue, "", translate("Last Run"))
-dv6.template = "adblock/runtime"
-if parse == nil then
- dv6.value = translate("n/a")
-else
- dv6.value = rundate
-end
+ds = s:option(DummyValue, "_dummy")
+ds.template = "adblock/runtime"
-- Blocklist table
@@ -197,46 +102,54 @@ e1 = e:option(Flag, "adb_debug", translate("Verbose Debug Logging"),
e1.default = e1.disabled
e1.rmempty = false
-e2 = e:option(Flag, "adb_forcedns", translate("Force Local DNS"),
- translate("Redirect all DNS queries from 'lan' zone to the local resolver."))
+e2 = e:option(Flag, "adb_nice", translate("Low Priority Service"),
+ translate("Set the nice level to 'low priority' and the adblock background processing will take less resources from the system. ")
+ ..translate("This change requires a manual service stop/re-start to take effect."))
e2.default = e2.disabled
+e2.disabled = "0"
+e2.enabled = "10"
e2.rmempty = false
-e3 = e:option(Flag, "adb_forcesrt", translate("Force Overall Sort"),
- translate("Enable memory intense overall sort / duplicate removal on low memory devices (&lt; 64 MB free RAM)"))
+e3 = e:option(Flag, "adb_forcedns", translate("Force Local DNS"),
+ translate("Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp and tcp protocol on ports 53, 853 and 5353."))
e3.default = e3.disabled
e3.rmempty = false
-e4 = e:option(Flag, "adb_backup", translate("Enable Blocklist Backup"),
- translate("Create compressed blocklist backups, they will be used in case of download errors or during startup in backup mode."))
+e4 = e:option(Flag, "adb_forcesrt", translate("Force Overall Sort"),
+ translate("Enable memory intense overall sort / duplicate removal on low memory devices (&lt; 64 MB free RAM)"))
e4.default = e4.disabled
e4.rmempty = false
-e5 = e:option(Value, "adb_backupdir", translate("Backup Directory"),
+e5 = e:option(Flag, "adb_backup", translate("Enable Blocklist Backup"),
+ translate("Create compressed blocklist backups, they will be used in case of download errors or during startup in backup mode."))
+e5.default = e5.disabled
+e5.rmempty = false
+
+e6 = e:option(Value, "adb_backupdir", translate("Backup Directory"),
translate("Target directory for adblock backups. Please use only non-volatile disks, e.g. an external usb stick."))
-e5:depends("adb_backup", 1)
-e5.datatype = "directory"
-e5.default = "/mnt"
+e6:depends("adb_backup", 1)
+e6.datatype = "directory"
+e6.default = "/mnt"
e5.rmempty = true
-e6 = e:option(Flag, "adb_backup_mode", translate("Backup Mode"),
+e7 = e:option(Flag, "adb_backup_mode", translate("Backup Mode"),
translate("Do not automatically update blocklists during startup, use blocklist backups instead."))
-e6:depends("adb_backup", 1)
-e6.default = e6.disabled
-e6.rmempty = true
+e7:depends("adb_backup", 1)
+e7.default = e7.disabled
+e7.rmempty = true
-e7 = e:option(Value, "adb_maxqueue", translate("Max. Download Queue"),
- translate("Size of the download queue to handle downloads &amp; list processing in parallel (default '4').<br />")
+e8 = e:option(Value, "adb_maxqueue", translate("Max. Download Queue"),
+ translate("Size of the download queue to handle downloads &amp; list processing in parallel (default '4'). ")
.. translate("For further performance improvements you can raise this value, e.g. '8' or '16' should be safe."))
-e7.default = 4
-e7.datatype = "range(1,32)"
-e7.rmempty = false
+e8.default = 4
+e8.datatype = "range(1,32)"
+e8.rmempty = false
-e8 = e:option(Flag, "adb_jail", translate("'Jail' Blocklist Creation"),
- translate("Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all domains except those listed in the whitelist file.<br />")
+e9 = e:option(Flag, "adb_jail", translate("'Jail' Blocklist Creation"),
+ translate("Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all domains except those listed in the whitelist file. ")
.. translate("You can use this restrictive blocklist manually e.g. for guest wifi or kidsafe configurations."))
-e8.default = e8.disabled
-e8.rmempty = true
+e9.default = e9.disabled
+e9.rmempty = true
e9 = e:option(Flag, "adb_dnsflush", translate("Flush DNS Cache"),
translate("Flush DNS Cache after adblock processing."))
@@ -244,13 +157,13 @@ e9.default = e9.disabled
e9.rmempty = true
e10 = e:option(Flag, "adb_notify", translate("Email Notification"),
- translate("Send notification emails in case of a processing error or if domain count is &le; 0.<br />")
+ translate("Send notification emails in case of a processing error or if domain count is &le; 0. ")
.. translate("Please note: this needs additional 'msmtp' package installation and setup."))
e10.default = e10.disabled
e10.rmempty = true
e11 = e:option(Value, "adb_notifycnt", translate("Email Notification Count"),
- translate("Raise the minimum email notification count, to get emails if the overall count is less or equal to the given limit (default 0),<br />")
+ translate("Raise the minimum email notification count, to get emails if the overall count is less or equal to the given limit (default 0), ")
.. translate("e.g. to receive an email notification with every adblock update set this value to 150000."))
e11.default = 0
e11.datatype = "min(0)"
diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua
index 01d3911f6e..a78d9af4ac 100644
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua
@@ -1,19 +1,19 @@
-- Copyright 2017-2018 Dirk Brenken (dev@brenken.org)
-- This is free software, licensed under the Apache License, Version 2.0
-local fs = require("nixio.fs")
-local util = require("luci.util")
-local uci = require("luci.model.uci").cursor()
-local adbinput = uci:get("adblock", "global", "adb_whitelist") or "/etc/adblock/adblock.whitelist"
+local fs = require("nixio.fs")
+local util = require("luci.util")
+local uci = require("luci.model.uci").cursor()
+local input = uci:get("adblock", "global", "adb_whitelist") or "/etc/adblock/adblock.whitelist"
-if not fs.access(adbinput) then
+if not fs.access(input) then
m = SimpleForm("error", nil, translate("Input file not found, please check your configuration."))
m.reset = false
m.submit = false
return m
end
-if fs.stat(adbinput).size >= 102400 then
+if fs.stat(input).size >= 102400 then
m = SimpleForm("error", nil,
translate("The file size is too large for online editing in LuCI (&ge; 100 KB). ")
.. translate("Please edit this file directly in a terminal session."))
@@ -28,7 +28,7 @@ m.submit = translate("Save")
m.reset = false
s = m:section(SimpleSection, nil,
- translatef("This form allows you to modify the content of the adblock whitelist (%s).<br />", adbinput)
+ translatef("This form allows you to modify the content of the adblock whitelist (%s). ", input)
.. translate("Please add only one domain per line. Comments introduced with '#' are allowed - ip addresses, wildcards and regex are not."))
f = s:option(TextValue, "data")
@@ -37,11 +37,15 @@ f.rows = 20
f.rmempty = true
function f.cfgvalue()
- return fs.readfile(adbinput) or ""
+ return fs.readfile(input) or ""
end
function f.write(self, section, data)
- return fs.writefile(adbinput, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n")
+ return fs.writefile(input, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n")
+end
+
+function f.remove(self, section, value)
+ return fs.writefile(input, "")
end
function s.handle(self, state, data)
diff --git a/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm b/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm
index 93713c92b1..a6f2286513 100644
--- a/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm
+++ b/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm
@@ -4,81 +4,65 @@ This is free software, licensed under the Apache License, Version 2.0
-%>
<%-
-local rowcnt = 1
-function rowstyle()
- rowcnt = rowcnt + 1
- return (rowcnt % 2) + 1
-end
-
-function width(o)
- if o.width then
- if type(o.width) == 'number' then
- return ' style="width:%dpx"' % o.width
- end
- return ' style="width:%s"' % o.width
- end
- return ''
-end
+local anonclass = (not self.anonymous or self.sectiontitle) and "named" or "anonymous"
-%>
<style type="text/css">
.table.cbi-section-table .th,
.table.cbi-section-table .td,
.cbi-section-table-cell,
-.cbi-section-table-row
+.cbi-section-table-row,
+.tr[data-title]::before
{
- text-align:left;
- vertical-align:top;
- margin-right:auto;
- margin-left:0px;
- padding-left:2px;
- line-height:20px;
+ text-align: left;
+ vertical-align: top;
+ margin-left: 0px;
+ padding-left: 2px;
}
.table.cbi-section-table .th
{
- white-space:nowrap;
+ white-space: nowrap;
}
.table.cbi-section-table input
{
- width:7em;
+ width: 7em;
}
+.cbi-section-table-row > .cbi-value-field [data-dynlist] > input,
+.table.cbi-section-table input
+{
+ width: 7em;
+}
+
.cbi-input-text
{
- text-align:left;
- padding-left:2px;
- outline:none;
- box-shadow:none;
- background:transparent;
- height:20px;
- width:10em;
+ text-align: left;
+ padding-left: 2px;
+ outline: none;
+ box-shadow: none;
+ background: transparent;
+ width: 7em;
}
</style>
-<%-
- local anonclass = (not self.anonymous or self.sectiontitle) and "named" or "anonymous"
- local titlename = ifattr(not self.anonymous or self.sectiontitle, "data-title", translate("Name"))
--%>
-
-<fieldset class="cbi-section" id="cbi-<%=self.config%>-<%=self.sectiontype%>">
+<div class="cbi-section" id="cbi-<%=self.config%>-<%=self.sectiontype%>">
<% if self.title then -%>
- <legend><%=self.title%></legend>
+ <h3><%=self.title%></h3>
<%- end %>
<div class="cbi-section-descr"><%=self.description%></div>
<div class="cbi-section-node">
<div class="table cbi-section-table">
- <div class="tr cbi-section-table-titles <%=anonclass%>"<%=titlename%>>
+ <div class="tr cbi-section-table-titles <%=anonclass%>">
<%- for i, k in pairs(self.children) do -%>
- <div class="th cbi-section-table-cell"<%=width(k)%>>
+ <div class="th cbi-section-table-cell">
<%-=k.title-%>
</div>
<%- end -%>
</div>
- <%- local isempty = true
+ <%- local section, scope, isempty = true
for i, k in ipairs(self:cfgsections()) do
- local section = k
- local sectionname = striptags((type(self.sectiontitle) == "function") and self:sectiontitle(section) or k)
+ section = k
+ local sectionname = striptags((type(self.sectiontitle) == "function") and self:sectiontitle(section) or k)
local sectiontitle = ifattr(sectionname and (not self.anonymous or self.sectiontitle), "data-title", sectionname)
-
isempty = false
scope = { valueheader = "cbi/cell_valueheader", valuefooter = "cbi/cell_valuefooter" }
-%>
@@ -95,4 +79,4 @@ end
<%- end -%>
</div>
</div>
-</fieldset>
+</div>
diff --git a/applications/luci-app-adblock/luasrc/view/adblock/logread.htm b/applications/luci-app-adblock/luasrc/view/adblock/logread.htm
index 082ec806f8..b505233490 100644
--- a/applications/luci-app-adblock/luasrc/view/adblock/logread.htm
+++ b/applications/luci-app-adblock/luasrc/view/adblock/logread.htm
@@ -4,17 +4,47 @@ This is free software, licensed under the Apache License, Version 2.0
-%>
<%+header%>
-
-<div class="cbi-map">
- <fieldset class="cbi-section">
- <div class="cbi-section-descr"><%:This form shows the syslog output, pre-filtered for adblock related messages only.%></div>
- <textarea id="logread_id" style="width: 100%; height: 450px; border: 1px solid #cccccc; padding: 5px; font-size: 12px; font-family: monospace; resize: none;" readonly="readonly" wrap="off" rows="<%=content:cmatch("\n")+2%>"><%=content:pcdata()%></textarea>
- </fieldset>
-</div>
+<style type="text/css">
+ select[readonly],
+ textarea[readonly]
+ {
+ width: 100%;
+ height: 450px;
+ border: 1px solid #cccccc;
+ padding: 5px;
+ font-size: 12px;
+ font-family: monospace;
+ resize: none;
+ pointer-events: auto;
+ cursor: auto;
+ }
+</style>
<script type="text/javascript">
- var textarea = document.getElementById('logread_id');
- textarea.scrollTop = textarea.scrollHeight;
+//<![CDATA[
+ function log_update()
+ {
+ XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "adblock", "logread")%>', null,
+ function(x)
+ {
+ if (!x)
+ {
+ return;
+ }
+ var view = document.getElementById("view_id");
+ view.value = x.responseText;
+ view.scrollTop = view.scrollHeight;
+ });
+ }
+ window.onload = log_update();
+//]]>
</script>
+<div class="cbi-map">
+ <div class="cbi-section">
+ <div class="cbi-section-descr"><%:The syslog output, pre-filtered for adblock related messages only.%></div>
+ <textarea id="view_id" readonly="readonly" wrap="off" value=""></textarea>
+ </div>
+</div>
+
<%+footer%>
diff --git a/applications/luci-app-adblock/luasrc/view/adblock/query.htm b/applications/luci-app-adblock/luasrc/view/adblock/query.htm
index 72dc16b1d8..2cf7e5baaf 100644
--- a/applications/luci-app-adblock/luasrc/view/adblock/query.htm
+++ b/applications/luci-app-adblock/luasrc/view/adblock/query.htm
@@ -1,5 +1,5 @@
<%#
-Copyright 2017 Dirk Brenken (dev@brenken.org)
+Copyright 2017-2018 Dirk Brenken (dev@brenken.org)
This is free software, licensed under the Apache License, Version 2.0
-%>
@@ -12,7 +12,7 @@ This is free software, licensed under the Apache License, Version 2.0
function update_status(data)
{
var domain = data.value;
- var input = document.getElementById('query_input');
+ var input = document.getElementById('query_input');
var output = document.getElementById('query_output');
if (input && output)
@@ -45,20 +45,20 @@ This is free software, licensed under the Apache License, Version 2.0
<form method="post" action="<%=REQUEST_URI%>">
<div class="cbi-map">
- <fieldset class="cbi-section">
+ <div class="cbi-section">
<div class="cbi-section-descr"><%:This form allows you to query active block lists for certain domains, e.g. for whitelisting.%></div>
<div style="width:33%; float:left;">
- <input style="margin: 5px 0" type="text" value="google.com" name="input" />
+ <input type="text" value="google.com" name="input" />
<input type="button" value="<%:Query%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.input)" />
</div>
<br style="clear:both" />
<br />
- </fieldset>
+ </div>
</div>
- <fieldset class="cbi-section" style="display:none">
- <legend id="query_input"><%:Collecting data...%></legend>
+ <div class="cbi-section" style="display:none">
+ <h3 id="query_input"><%:Collecting data...%></h3>
<span id="query_output"></span>
- </fieldset>
+ </div>
</form>
<%+footer%>
diff --git a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm
index c01d9a5c08..05cdde73b9 100644
--- a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm
+++ b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm
@@ -3,8 +3,197 @@ Copyright 2017-2018 Dirk Brenken (dev@brenken.org)
This is free software, licensed under the Apache License, Version 2.0
-%>
-<%+cbi/valueheader%>
+<style type="text/css">
+.runtime
+{
+ color: #0069d6;
+ font-weight: bold;
+ display: inline-block;
+ width: 100%;
+ padding-top: 0.5rem;
+}
+</style>
-<input name="runtime" id="runtime" type="text" class="cbi-input-text" style="outline:none;border:none;box-shadow:none;background:transparent;color:#0069d6;font-weight:bold;line-height:30px;height:30px;width:20em;" value="<%=self:cfgvalue(section)%>" disabled="disabled" />
+<script type="text/javascript">
+//<![CDATA[
+ function status_update(json)
+ {
+ var view = document.getElementById("value_1");
+ var btn1 = document.getElementById("btn1");
+ var btn2 = document.getElementById("btn2");
+ var input = json.data.adblock_status;
-<%+cbi/valuefooter%>
+ view.innerHTML = input || "-";
+ if (input === "enabled")
+ {
+ btn1.value = "<%:Suspend%>";
+ btn1.name = "do_suspend";
+ btn2.value = "<%:Refresh%>";
+ btn2.name = "do_refresh";
+ btn1.disabled = false;
+ running(btn1_running, 0);
+ btn2.disabled = false;
+ running(btn2_running, 0);
+ }
+ else if (input === "paused")
+ {
+ btn1.value = "<%:Resume%>";
+ btn1.name = "do_resume";
+ btn2.value = "<%:Refresh%>";
+ btn2.name = "do_refresh";
+ btn1.disabled = false;
+ running(btn1_running, 0);
+ btn2.disabled = false;
+ running(btn2_running, 0);
+ }
+ else
+ {
+ btn1.value = "<%:Suspend%>";
+ btn1.name = "do_suspend";
+ btn2.value = "<%:Refresh%>";
+ btn2.name = "do_refresh";
+ btn1.disabled = true;
+ btn2.disabled = true;
+ }
+ view = document.getElementById("value_2");
+ input = json.data.adblock_version;
+ view.innerHTML = input || "-";
+ view = document.getElementById("value_3");
+ input = json.data.fetch_utility;
+ view.innerHTML = input || "-";
+ view = document.getElementById("value_4");
+ input = json.data.dns_backend;
+ view.innerHTML = input || "-";
+ view = document.getElementById("value_5");
+ input = json.data.overall_domains;
+ view.innerHTML = input || "-";
+ view = document.getElementById("value_6");
+ input = json.data.last_rundate;
+ view.innerHTML = input || "-";
+ }
+
+ function btn_action(action)
+ {
+ var btn1 = document.getElementById("btn1");
+ var btn1_running = document.getElementById("btn1_running");
+ var btn2 = document.getElementById("btn2");
+ var btn2_running = document.getElementById("btn2_running");
+
+ btn1.disabled = true;
+ btn2.disabled = true;
+
+ if (action.name === "do_refresh")
+ {
+ running(btn2_running, 1);
+ }
+ else
+ {
+ running(btn1_running, 1);
+ }
+
+ new XHR.get('<%=luci.dispatcher.build_url("admin", "services", "adblock")%>/action/' + action.name, null,
+ function(x)
+ {
+ if (!x)
+ {
+ return;
+ }
+ });
+ }
+
+ function running(element, state)
+ {
+ if (state === 1)
+ {
+ var running_html = '<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" width="16" height="16" style="vertical-align:middle" />';
+ element.innerHTML = running_html;
+ }
+ else
+ {
+ element.innerHTML = '';
+ }
+ }
+
+ XHR.get('<%=luci.dispatcher.build_url("admin", "services", "adblock", "status")%>', null,
+ function(x, json_info)
+ {
+ if (!x || !json_info)
+ {
+ var btn1 = document.getElementById("btn1");
+ var btn2 = document.getElementById("btn2");
+ btn1.value = "<%:Suspend%>";
+ btn1.name = "do_suspend";
+ btn2.value = "<%:Refresh%>";
+ btn2.name = "do_refresh";
+ btn1.disabled = true;
+ btn2.disabled = false;
+ return;
+ }
+ status_update(json_info)
+ });
+
+ XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "adblock", "status")%>', null,
+ function(x, json_info)
+ {
+ if (!x || !json_info)
+ {
+ return;
+ }
+ status_update(json_info)
+ });
+//]]>
+</script>
+
+<h3><%:Runtime Information%></h3>
+<div class="cbi-value" id="status_1">
+ <label class="cbi-value-title" for="status_1"><%:Adblock Status%></label>
+ <div class="cbi-value-field">
+ <span class="runtime" id="value_1">-</span>
+ </div>
+</div>
+<div class="cbi-value" id="status_2">
+ <label class="cbi-value-title" for="status_2"><%:Adblock Version%></label>
+ <div class="cbi-value-field">
+ <span class="runtime" id="value_2">-</span>
+ </div>
+</div>
+<div class="cbi-value" id="status_3">
+ <label class="cbi-value-title" for="status_3"><%:Download Utility (SSL Library)%></label>
+ <div class="cbi-value-field">
+ <span class="runtime" id="value_3">-</span>
+ </div>
+</div>
+<div class="cbi-value" id="status_4">
+ <label class="cbi-value-title" for="status_4"><%:DNS Backend (DNS Directory)%></label>
+ <div class="cbi-value-field">
+ <span class="runtime" id="value_4">-</span>
+ </div>
+</div>
+<div class="cbi-value" id="status_5">
+ <label class="cbi-value-title" for="status_5"><%:Overall Domains%></label>
+ <div class="cbi-value-field">
+ <span class="runtime" id="value_5">-</span>
+ </div>
+</div>
+<div class="cbi-value" id="status_6">
+ <label class="cbi-value-title" for="status_6"><%:Last Run%></label>
+ <div class="cbi-value-field">
+ <span class="runtime" id="value_6">-</span>
+ </div>
+</div>
+<hr />
+<div class="cbi-value" id="button_1">
+ <label class="cbi-value-title" for="button_1"><%:Suspend / Resume Adblock%></label>
+ <div class="cbi-value-field">
+ <input class="cbi-button cbi-button-reset" id="btn1" type="button" value="" onclick="btn_action(this)" />
+ <span id="btn1_running" style="display:inline-block; width:16px; height:16px; margin:0 5px"></span>
+ </div>
+</div>
+<p />
+<div class="cbi-value" id="button_2">
+ <label class="cbi-value-title" for="button_2"><%:Refresh Blocklist Sources%></label>
+ <div class="cbi-value-field">
+ <input class="cbi-button cbi-button-apply" id="btn2" type="button" value="" onclick="btn_action(this)" />
+ <span id="btn2_running" style="display:inline-block; width:16px; height:16px; margin:0 5px"></span>
+ </div>
+</div>
diff --git a/applications/luci-app-adblock/po/it/adblock.po b/applications/luci-app-adblock/po/it/adblock.po
index c2db36effc..9eddb7d91b 100644
--- a/applications/luci-app-adblock/po/it/adblock.po
+++ b/applications/luci-app-adblock/po/it/adblock.po
@@ -196,6 +196,9 @@ msgstr "Caricando"
msgid "Max. Download Queue"
msgstr ""
+msgid "Name"
+msgstr ""
+
msgid "No"
msgstr "No"
diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po
index cddedacd43..ff3234175a 100644
--- a/applications/luci-app-adblock/po/ja/adblock.po
+++ b/applications/luci-app-adblock/po/ja/adblock.po
@@ -214,6 +214,9 @@ msgstr "読込中"
msgid "Max. Download Queue"
msgstr "ダウンロード キューの上限"
+msgid "Name"
+msgstr ""
+
msgid "No"
msgstr "いいえ"
diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po
index 07d0f9a8d2..6e5c7497c7 100644
--- a/applications/luci-app-adblock/po/pt-br/adblock.po
+++ b/applications/luci-app-adblock/po/pt-br/adblock.po
@@ -194,6 +194,9 @@ msgstr "Carregando"
msgid "Max. Download Queue"
msgstr ""
+msgid "Name"
+msgstr ""
+
msgid "No"
msgstr "Não"
diff --git a/applications/luci-app-adblock/po/ru/adblock.po b/applications/luci-app-adblock/po/ru/adblock.po
index c1193d38e1..f4957994b6 100644
--- a/applications/luci-app-adblock/po/ru/adblock.po
+++ b/applications/luci-app-adblock/po/ru/adblock.po
@@ -8,7 +8,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7.1\n"
-"Last-Translator: Vladimir aka sunny <picfun@ya.ru>\n"
+"Last-Translator: Olimjon aka Kobin23 <olimko98@gmail.com>\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"Language: ru\n"
@@ -25,21 +25,23 @@ msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
msgstr ""
+"<b>Внимание:</b> Для предотвращения переполнения ОЗУ, на устройствах"
+"с ОЗУ менее 64MB, выбирайте только необходимый минимум списков!"
msgid "Adblock"
msgstr "AdBlock"
msgid "Adblock Logfile"
-msgstr "Ведение системного журала Adblock-ом"
+msgstr "Системный журнал Adblock"
msgid "Adblock Status"
-msgstr "Состояние Adblock-а"
+msgstr "Состояние Adblock"
msgid "Adblock Version"
-msgstr "Версия Adblock-а"
+msgstr "Версия Adblock"
msgid "Additional trigger delay in seconds before adblock processing begins."
-msgstr "Дополнительная задержка в секундах до начала работы Adblock-a."
+msgstr "Дополнительная задержка в секундах до начала работы Adblock."
msgid "Advanced"
msgstr "Дополнительно"
@@ -54,10 +56,10 @@ msgid "Backup Mode"
msgstr "Режим сохранения бекапа"
msgid "Blocklist Sources"
-msgstr "Источники списков блокировки"
+msgstr "Источники списков блокировок"
msgid "Blocklist not found!"
-msgstr ""
+msgstr "Список блокировок не найден!"
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
@@ -72,8 +74,8 @@ msgid ""
"timeout (default 30 sec.) or select another trigger interface."
msgstr ""
"Выберите 'none', чтобы отключить автоматический старт, 'timed', чтобы "
-"использовать дефолтную задержку (по умолчанию 30 сек.) или выберите другой "
-"интерфейс запуска."
+"использовать стандартную задержку (по умолчанию 30 сек.) или выберите другой "
+"интерфейс для запуска."
msgid "Collecting data..."
msgstr "Сбор данных..."
@@ -88,7 +90,7 @@ msgid ""
"Create compressed blocklist backups, they will be used in case of download "
"errors or during startup in backup mode."
msgstr ""
-"Создавайте сжатые резервные копии списков блокировки, они будут "
+"Создание сжатых резервных копий списков блокировок, они будут "
"использоваться в случае ошибок загрузки или при запуске в ручном режиме."
msgid "DNS Backend (DNS Directory)"
@@ -104,14 +106,14 @@ msgid ""
"Do not automatically update blocklists during startup, use blocklist backups "
"instead."
msgstr ""
-"Не обновляйте списки блокировок автоматически во время запуска, вместо этого "
-"используйте резервные копии списков блокировок."
+"Не обновлять списки блокировок автоматически во время запуска, вместо этого "
+"использовать резервные копии списков блокировок."
msgid "Download Utility"
-msgstr "Скачать утилиту"
+msgstr "Утилита для скачивания"
msgid "Download Utility (SSL Library)"
-msgstr "Загрузить утилиту (библиотека SSL)"
+msgstr "Утилита для скачивания (с библиотекой SSL)"
msgid "Edit Blacklist"
msgstr "Редактировать Черный список"
@@ -123,26 +125,26 @@ msgid "Edit Whitelist"
msgstr "Редактировать Белый список"
msgid "Email Notification"
-msgstr "Уведомление на email"
+msgstr "Email уведомления"
msgid "Email Notification Count"
-msgstr "Кол-во уведомлений на email"
+msgstr "Кол-во email уведомлений"
msgid "Enable Adblock"
msgstr "Включить Adblock"
msgid "Enable Blocklist Backup"
-msgstr "Включить сохранение<br />списка блокировок"
+msgstr "Бэкап списка блокировок"
msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
msgstr ""
-"Включите полную сортировку / удаление дубликатов памяти на устройствах с "
+"Включить полную сортировку / удаление дубликатов в памяти. Используйте на устройствах с "
"низким объемом памяти (&lt; 64 MB свободной оперативной памяти)."
msgid "Enable verbose debug logging in case of any processing error."
-msgstr "Включите подробное ведение журнала отладки в случае ошибки обработки."
+msgstr "Включить подробное ведение журнала отладки в случае ошибок обработки."
msgid "Enabled"
msgstr "Включено"
@@ -154,7 +156,7 @@ msgid "Flush DNS Cache"
msgstr "Очистка кэша DNS"
msgid "Flush DNS Cache after adblock processing."
-msgstr "Очистки DNS-кэша после обработки Adblock-ом."
+msgstr "Очистка DNS-кэша после обработки Adblock-ом."
msgid ""
"For SSL protected blocklist sources you need a suitable SSL library, e.g. "
@@ -174,14 +176,14 @@ msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
msgstr ""
-"Для повышения производительности вы можете увеличить это значение, например "
-"значения '8' или '16' повысят безопасность."
+"Для дополнительного повышения производительности вы можете увеличить это значение, например "
+"значения '8' или '16' должны быть безопасными."
msgid "Force Local DNS"
-msgstr "Назначить локальный DNS"
+msgstr "Локальный DNS"
msgid "Force Overall Sort"
-msgstr "Назначить полную сортировку"
+msgstr "Принудительная полная сортировка"
msgid "Full path to the whitelist file."
msgstr "Полный путь к файлу Белого списка."
@@ -190,7 +192,7 @@ msgid "Input file not found, please check your configuration."
msgstr "Config файл не найден, настройте config файл."
msgid "Last Run"
-msgstr "Последнее время запуска"
+msgstr "Последний запуск"
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
@@ -203,17 +205,20 @@ msgid ""
"List of supported DNS backends with their default list export directory.<br /"
">"
msgstr ""
-"Список поддерживаемых серверов DNS перемещается в папку по умолчанию.<br />"
+"Список поддерживаемых серверов DNS с их стандартными папками для экспорта списков.<br />"
msgid "List of supported and fully pre-configured download utilities."
msgstr ""
-"Список поддерживаемых и полностью предварительно настроенных утилит загрузки."
+"Список поддерживаемых и полностью предварительно настроенных утилит для скачивания."
msgid "Loading"
msgstr "Загрузка"
msgid "Max. Download Queue"
-msgstr "Максимальное значение очереди загрузки"
+msgstr "Максимальная очередь загрузки"
+
+msgid "Name"
+msgstr ""
msgid "No"
msgstr "Нет"
@@ -225,7 +230,7 @@ msgstr ""
"подходят для вас."
msgid "Overall Domains"
-msgstr "Итоговые домены"
+msgstr "Всего доменов"
msgid "Overview"
msgstr "Главное меню"
@@ -234,11 +239,11 @@ msgid ""
"Please add only one domain per line. Comments introduced with '#' are "
"allowed - ip addresses, wildcards and regex are not."
msgstr ""
-"Добавляйте только один домен в строке. Комментарии вводятся используя '#' "
-"разрешенные - ip адреса, метасимволы и нерегулярные выражения."
+"Добавляйте только один домен на строку. Комментарии вводятся используя '#'. "
+"IP адреса, wildcard и регулярные выражения запрещены."
msgid "Please edit this file directly in a terminal session."
-msgstr "Отредактируйте данный файл, строго в терминале."
+msgstr "Редактируйте данный файл только в терминале."
msgid ""
"Please note: this needs additional 'msmtp' package installation and setup."
@@ -254,7 +259,7 @@ msgid ""
"Raise the minimum email notification count, to get emails if the overall "
"count is less or equal to the given limit (default 0),<br />"
msgstr ""
-"Увеличьте количество уведомлений по email, чтобы получить сообщения, если "
+"Увеличьте количество email уведомлений, чтобы получить сообщения, если "
"общее количество меньше или равно заданному пределу (по умолчанию 0),<br />"
msgid "Redirect all DNS queries from 'lan' zone to the local resolver."
@@ -277,18 +282,18 @@ msgid ""
"Send notification emails in case of a processing error or if domain count is "
"&le; 0.<br />"
msgstr ""
-"Отправлять по email уведомления в случае ошибки обработки или если домен "
-"&le; 0.<br />"
+"Отправлять email уведомления в случае ошибки обработки или если количество обработанных доменов равно"
+" 0.<br />"
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
"parallel (default '4').<br />"
msgstr ""
-"Значение очереди загрузки для выполнения параллельных загрузок (по умолчанию "
+"Количество потоков для скачивания списков блокировок (по умолчанию "
"'4').<br />"
msgid "Startup Trigger"
-msgstr "Назначить"
+msgstr "Триггер запуска"
msgid "Suspend"
msgstr "Приостановить"
@@ -300,39 +305,39 @@ msgid ""
"Target directory for adblock backups. Please use only non-volatile disks, e."
"g. an external usb stick."
msgstr ""
-"Назначить папку для резервного копирования Adblock. Используйте такие "
+"Папка для бэкапов списков блокировок. Используйте такие "
"накопители, как usb флешка."
msgid "Target directory for the generated blocklist 'adb_list.overall'."
-msgstr "Назначить папку для создания списка блокировки 'adb_list.overall'."
+msgstr "Папка для созданного списка блокировки 'adb_list.overall'."
msgid "The file size is too large for online editing in LuCI (&ge; 100 KB)."
-msgstr ""
+msgstr "Этот файл слишком большой для редактирования в Web-интерфейсе LuCI (&ge; 100 KB)."
msgid ""
"This form allows you to modify the content of the adblock blacklist (%s)."
"<br />"
msgstr ""
-"Страница позволяет изменять содержимое Черного списка Adblock (%s).<br />"
+"Данное поле позволяет изменять содержимое Черного списка Adblock (%s).<br />"
msgid ""
"This form allows you to modify the content of the adblock whitelist (%s)."
"<br />"
msgstr ""
-"Страница позволяет изменять содержимое Белого списка Adblock (%s).<br />"
+"Данное поле позволяет изменять содержимое Белого списка Adblock (%s).<br />"
msgid ""
"This form allows you to modify the content of the main adblock configuration "
"file (/etc/config/adblock)."
msgstr ""
-"Страница позволяет изменять содержимое главного config файла Adblock-a (/etc/"
+"Данное поле позволяет изменять содержимое config файла Adblock-a (/etc/"
"config/adblock)."
msgid ""
"This form allows you to query active block lists for certain domains, e.g. "
"for whitelisting."
msgstr ""
-"Страница позволяет запросить домены для конкретных списков, например для "
+"Данное поле позволяет запросить домены для конкретных списков, например для "
"Белого списка."
msgid ""
@@ -344,17 +349,17 @@ msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
msgstr ""
-"Чтобы заменить дефолтный путь, используйте строку ниже 'Папка DNS' в разделе "
+"Чтобы заменить путь по умолчанию, используйте пункт 'Папка DNS' в разделе "
"'Дополнительные настройки'."
msgid "Trigger Delay"
msgstr "Задержка запуска"
msgid "Verbose Debug Logging"
-msgstr "Подробное ведение<br />журнала отладки"
+msgstr "Подробный журнал отладки"
msgid "View Logfile"
-msgstr "Показать системный журнал"
+msgstr "Системный журнал"
msgid "Waiting for command to complete..."
msgstr "Ожидание завершения выполнения команды..."
@@ -379,7 +384,7 @@ msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
msgstr ""
-"например, чтобы получать уведомления по электронной почте при каждом "
+"например, чтобы получать email уведомления при каждом "
"обновлении Adblock-а установите значение 150000."
msgid "enabled"
@@ -392,48 +397,7 @@ msgid "n/a"
msgstr "нет данных"
msgid "paused"
-msgstr "остановлено"
+msgstr "приостановлено"
msgid "running"
msgstr "работает"
-
-#~ msgid "Invalid domain specified!"
-#~ msgstr "Задан недопустимый домен!"
-
-#~ msgid "Available blocklist sources."
-#~ msgstr "Источники списков блокировки. "
-
-#~ msgid ""
-#~ "Caution: To prevent OOM exceptions on low memory devices with less than "
-#~ "64 MB free RAM, please do not select more than five blocklist sources!"
-#~ msgstr ""
-#~ "ВНИМАНИЕ: Для предотвращения возможного программного сбоя и перезагрузки, "
-#~ "на устройствах с объемом оперативной памяти менее 64MB, не выбирайте "
-#~ "больше 5 списков."
-
-#~ msgid ""
-#~ "During opkg package installation use the '--force-maintainer' option to "
-#~ "overwrite the pre-existing config file or download a fresh default config "
-#~ "from <a href=\"%s\" target=\"_blank\">here</a>"
-#~ msgstr ""
-#~ "Устанавливая пакет с помощью opkg, используйте '--force-maintainer', "
-#~ "чтобы перезаписать существующий config файл или загрузить новый дефолтный "
-#~ "config файл <a href=\"%s\" target=\"_blank\">здесь</a>"
-
-#~ msgid ""
-#~ "List URLs and Shallalist category selections are configurable in the "
-#~ "'Advanced' section.<br />"
-#~ msgstr ""
-#~ "Список URL-адресов и настройка списка использования, настраиваются на "
-#~ "странице 'Дополнительно'.<br />"
-
-#~ msgid "Please update your adblock config file to use this package.<br />"
-#~ msgstr "Обновите config файл Adblock, чтобы использовать этот пакет.<br />"
-
-#~ msgid "The file size is too large for online editing in LuCI (&gt; 512 KB)."
-#~ msgstr ""
-#~ "Размер файла слишком большой, для онлайн редактирования в LuCI (&gt; 512 "
-#~ "KB)."
-
-#~ msgid "This section contains no values yet"
-#~ msgstr "Здесь не содержатся необходимые значения"
diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po
index 4a7ca4b738..3fb7bbe2e0 100644
--- a/applications/luci-app-adblock/po/sv/adblock.po
+++ b/applications/luci-app-adblock/po/sv/adblock.po
@@ -185,6 +185,9 @@ msgstr "Laddar"
msgid "Max. Download Queue"
msgstr ""
+msgid "Name"
+msgstr ""
+
msgid "No"
msgstr "Nej"
diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot
index a375d0edb6..e4c2a71418 100644
--- a/applications/luci-app-adblock/po/templates/adblock.pot
+++ b/applications/luci-app-adblock/po/templates/adblock.pot
@@ -177,6 +177,9 @@ msgstr ""
msgid "Max. Download Queue"
msgstr ""
+msgid "Name"
+msgstr ""
+
msgid "No"
msgstr ""
diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po
index 408d04055c..f7d1833c83 100644
--- a/applications/luci-app-adblock/po/zh-cn/adblock.po
+++ b/applications/luci-app-adblock/po/zh-cn/adblock.po
@@ -25,7 +25,8 @@ msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
msgstr ""
-"<b>注意:</b>为防止在小于 64M 空闲内存的设备上出现内存不足异常,请只选择其中的几个!"
+"<b>注意:</b>为防止在小于 64M 空闲内存的设备上出现内存不足异常,请只选择其中"
+"的几个!"
msgid "Adblock"
msgstr "Adblock"
@@ -82,8 +83,7 @@ msgstr "Adblock 配置工具,通过 DNS 来拦截广告和阻止域名。"
msgid ""
"Create compressed blocklist backups, they will be used in case of download "
"errors or during startup in backup mode."
-msgstr ""
-"创建压缩的拦截列表备份,它们将在下载错误或备份模式启动期间使用。"
+msgstr "创建压缩的拦截列表备份,它们将在下载错误或备份模式启动期间使用。"
msgid "DNS Backend (DNS Directory)"
msgstr "DNS 后端(DNS 目录)"
@@ -129,8 +129,7 @@ msgstr "启用 Blocklist 备份"
msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
-msgstr ""
-"在低内存设备上启用积极的内存整体排序/重复移除(&lt; 64 MB 空闲内存)"
+msgstr "在低内存设备上启用积极的内存整体排序/重复移除(&lt; 64 MB 空闲内存)"
msgid "Enable verbose debug logging in case of any processing error."
msgstr "在出现任何处理错误的情况下启用详细调试日志记录。"
@@ -157,14 +156,12 @@ msgstr ""
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
-msgstr ""
-"进一步信息<a href=\"%s\" target=\"_blank\">请访问在线文档"
+msgstr "进一步信息<a href=\"%s\" target=\"_blank\">请访问在线文档"
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
-msgstr ""
-"为了进一步提高性能,您可以提高此值,例如:8 或 16 应该是安全的。"
+msgstr "为了进一步提高性能,您可以提高此值,例如:8 或 16 应该是安全的。"
msgid "Force Local DNS"
msgstr "强制本地 DNS"
@@ -184,8 +181,7 @@ msgstr "最后运行"
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface.<br />"
-msgstr ""
-"可用网络接口列表。通常启动将由 “wan” 接口触发。<br />"
+msgstr "可用网络接口列表。通常启动将由 “wan” 接口触发。<br />"
msgid ""
"List of supported DNS backends with their default list export directory.<br /"
@@ -201,6 +197,9 @@ msgstr "加载中"
msgid "Max. Download Queue"
msgstr "最大下载队列"
+msgid "Name"
+msgstr ""
+
msgid "No"
msgstr "否"
@@ -226,8 +225,7 @@ msgstr "请在终端会话中直接编辑此文件。"
msgid ""
"Please note: this needs additional 'msmtp' package installation and setup."
-msgstr ""
-"请注意:这需要额外的 “msmtp” 软件包安装和设置。"
+msgstr "请注意:这需要额外的 “msmtp” 软件包安装和设置。"
msgid "Query"
msgstr "查询"
@@ -239,7 +237,8 @@ msgid ""
"Raise the minimum email notification count, to get emails if the overall "
"count is less or equal to the given limit (default 0),<br />"
msgstr ""
-"如果总数小于或等于给定限制(默认为 0),请提高最小电子邮件通知数,以获取电子邮件。"
+"如果总数小于或等于给定限制(默认为 0),请提高最小电子邮件通知数,以获取电子"
+"邮件。"
msgid "Redirect all DNS queries from 'lan' zone to the local resolver."
msgstr "将所有 DNS 查询从“lan”区域重定向到本地解析器。"
@@ -259,14 +258,12 @@ msgstr "保存"
msgid ""
"Send notification emails in case of a processing error or if domain count is "
"&le; 0.<br />"
-msgstr ""
-"如果发生错误或域计数 &le; 0,发送通知电子邮件。<br />"
+msgstr "如果发生错误或域计数 &le; 0,发送通知电子邮件。<br />"
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
"parallel (default '4').<br />"
-msgstr ""
-"处理下载队列的大小 &amp; 并行处理列表(默认 “4”)。<br />"
+msgstr "处理下载队列的大小 &amp; 并行处理列表(默认 “4”)。<br />"
msgid "Startup Trigger"
msgstr "启动触发器"
@@ -280,15 +277,13 @@ msgstr "暂停/恢复 Adblock"
msgid ""
"Target directory for adblock backups. Please use only non-volatile disks, e."
"g. an external usb stick."
-msgstr ""
-"adblock 备份的目标目录。 请仅使用非易失性磁盘,例如:一个外置 U 盘。"
+msgstr "adblock 备份的目标目录。 请仅使用非易失性磁盘,例如:一个外置 U 盘。"
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "生成的 blocklist 'adb_list.overall'的目标目录。"
msgid "The file size is too large for online editing in LuCI (&ge; 100 KB)."
-msgstr ""
-"文件过大,无法使用 LuCI 的在线编辑(&ge; 100 KB)。"
+msgstr "文件过大,无法使用 LuCI 的在线编辑(&ge; 100 KB)。"
msgid ""
"This form allows you to modify the content of the adblock blacklist (%s)."
diff --git a/applications/luci-app-adblock/po/zh-tw/adblock.po b/applications/luci-app-adblock/po/zh-tw/adblock.po
index 45b19cdc80..ab3a1c4f4b 100644
--- a/applications/luci-app-adblock/po/zh-tw/adblock.po
+++ b/applications/luci-app-adblock/po/zh-tw/adblock.po
@@ -193,6 +193,9 @@ msgstr "載入中"
msgid "Max. Download Queue"
msgstr ""
+msgid "Name"
+msgstr ""
+
msgid "No"
msgstr "否"
diff --git a/applications/luci-app-advanced-reboot/Makefile b/applications/luci-app-advanced-reboot/Makefile
index b1ecf677f0..08919640d7 100644
--- a/applications/luci-app-advanced-reboot/Makefile
+++ b/applications/luci-app-advanced-reboot/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Stan Grishin (stangri@melmac.net)
+# Copyright 2017-2018 Stan Grishin (stangri@melmac.net)
# This is free software, licensed under the GNU General Public License v3.
include $(TOPDIR)/rules.mk
@@ -13,7 +13,7 @@ LUCI_DESCRIPTION:=Provides Web UI (found under System/Advanced Reboot) to reboot
LUCI_DEPENDS:=+luci-mod-admin-full
LUCI_PKGARCH:=all
-PKG_RELEASE:=32
+PKG_RELEASE:=33
include ../../luci.mk
diff --git a/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua b/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua
index f4d28145ea..dd8071677e 100644
--- a/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua
+++ b/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua
@@ -1,4 +1,4 @@
--- Copyright 2017 Stan Grishin <stangri@melmac.net>
+-- Copyright 2017-2018 Stan Grishin <stangri@melmac.net>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.advanced_reboot", package.seeall)
diff --git a/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm b/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm
index dcf51c749e..5c14f52ff8 100644
--- a/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm
+++ b/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm
@@ -1,7 +1,7 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
Copyright 2008-2015 Jo-Philipp Wich <jow@openwrt.org>
- Copyright 2017 Stan Grishin <stangri@melmac.net>
+ Copyright 2017-2018 Stan Grishin <stangri@melmac.net>
Licensed to the public under the Apache License 2.0.
-%>
@@ -42,12 +42,12 @@
<%- if boot_envvar1_partition_one == current_partition then -%>
<form method="post" action="<%=url('admin/system/advanced_reboot/reboot')%>">
<input type="hidden" name="token" value="<%=token%>" />
- <input id="reboot-button" type="submit" class="cbi-button cbi-button-apply" value="<%:Reboot to current partition%>" />
+ <input id="reboot-button" type="submit" class="cbi-button cbi-button-apply important" value="<%:Reboot to current partition%>" />
</form>
<%- else -%>
<form method="post" action="<%=url('admin/system/advanced_reboot/alternative_reboot')%>">
<input type="hidden" name="token" value="<%=token%>" />
- <input id="altreboot-button" type="submit" class="cbi-button cbi-button-apply" value="<%:Reboot to alternative partition...%>" />
+ <input id="altreboot-button" type="submit" class="cbi-button cbi-button-apply important" value="<%:Reboot to alternative partition...%>" />
</form>
<%- end -%>
</div>
@@ -66,12 +66,12 @@
<%- if boot_envvar1_partition_two == current_partition then -%>
<form method="post" action="<%=url('admin/system/advanced_reboot/reboot')%>">
<input type="hidden" name="token" value="<%=token%>" />
- <input id="reboot-button" type="submit" class="cbi-button cbi-button-apply" value="<%:Reboot to current partition%>" />
+ <input id="reboot-button" type="submit" class="cbi-button cbi-button-apply important" value="<%:Reboot to current partition%>" />
</form>
<%- else -%>
<form method="post" action="<%=url('admin/system/advanced_reboot/alternative_reboot')%>">
<input type="hidden" name="token" value="<%=token%>" />
- <input id="altreboot-button" type="submit" class="cbi-button cbi-button-apply" value="<%:Reboot to alternative partition...%>" />
+ <input id="altreboot-button" type="submit" class="cbi-button cbi-button-apply important" value="<%:Reboot to alternative partition...%>" />
</form>
<%- end -%>
</div>
@@ -82,7 +82,7 @@
<%- if rom_board_name then -%>
<p class="alert-message warning"><%=pcdata(translatef("Warning: Device (%s) is unknown or isn't a dual-partition device!", rom_board_name))%></p>
<%- else -%>
- <p class="alert-message warning"><%:Warning: Unable to obtain device information!%></p>
+ <p class="alert-message warning"><%=pcdata(translatef("Warning: Unable to obtain device information!"))%></p>
<%- end -%>
<%- end -%>
@@ -91,7 +91,7 @@
<%- if nixio.fs.access("/sbin/poweroff") then -%>
<form method="post" action="<%=url('admin/system/advanced_reboot/power_off')%>">
<input type="hidden" name="token" value="<%=token%>" />
- <input id="poweroff-button" type="submit" class="cbi-button cbi-button-apply" value="<%:Perform power off...%>" />
+ <input id="poweroff-button" type="submit" class="cbi-button cbi-button-apply important" value="<%:Perform power off...%>" />
</form>
<%- else -%>
<p class="alert-message warning"><%:Warning: This system does not support powering off!%></p>
diff --git a/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/alternative_reboot.htm b/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/alternative_reboot.htm
index 6325934094..b15f16b0d5 100644
--- a/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/alternative_reboot.htm
+++ b/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/alternative_reboot.htm
@@ -1,7 +1,7 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
Copyright 2008-2009 Jo-Philipp Wich <jow@openwrt.org>
- Copyright 2017 Stan Grishin <stangri@melmac.net>
+ Copyright 2017-2018 Stan Grishin <stangri@melmac.net>
Licensed to the public under the Apache License 2.0.
-%>
@@ -21,8 +21,8 @@
<form class="inline" action="<%=REQUEST_URI%>" method="post">
<input type="hidden" name="token" value="<%=token%>" />
<input type="hidden" name="step" value="2" />
- <input class="cbi-button cbi-button-reset" name="cancel" type="submit" value="<%:Cancel%>" />
- <input class="cbi-button cbi-button-apply" type="submit" value="<%:Proceed%>" />
+ <input class="cbi-button cbi-button-reset important" name="cancel" type="submit" value="<%:Cancel%>" />
+ <input class="cbi-button cbi-button-apply important" type="submit" value="<%:Proceed%>" />
</form>
</div>
diff --git a/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/power_off.htm b/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/power_off.htm
index 0ddea11e65..1acf01b995 100644
--- a/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/power_off.htm
+++ b/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/power_off.htm
@@ -1,7 +1,7 @@
<%#
Copyright 2008 Steven Barth <steven@midlink.org>
Copyright 2008-2009 Jo-Philipp Wich <jow@openwrt.org>
- Copyright 2017 Stan Grishin <stangri@melmac.net>
+ Copyright 2017-2018 Stan Grishin <stangri@melmac.net>
Licensed to the public under the Apache License 2.0.
-%>
@@ -17,8 +17,8 @@
<form class="inline" action="<%=REQUEST_URI%>" method="post">
<input type="hidden" name="token" value="<%=token%>" />
<input type="hidden" name="step" value="2" />
- <input class="cbi-button cbi-button-reset" name="cancel" type="submit" value="<%:Cancel%>" />
- <input class="cbi-button cbi-button-apply" type="submit" value="<%:Proceed%>" />
+ <input class="cbi-button cbi-button-reset important" name="cancel" type="submit" value="<%:Cancel%>" />
+ <input class="cbi-button cbi-button-apply important" type="submit" value="<%:Proceed%>" />
</form>
</div>
diff --git a/applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po
index 75d463677b..8ad352055f 100644
--- a/applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po
@@ -22,9 +22,6 @@ msgstr "Дополнительная перезагрузка"
msgid "Alternative"
msgstr "Альтернатива"
-msgid "Alternative reboot cancelled."
-msgstr "Альтернативная перезагрузка отменена."
-
msgid "Cancel"
msgstr "Отменить"
@@ -148,16 +145,25 @@ msgstr ""
"которое не поддерживает выключение питания.<br /><br /> Нажмите \"Продолжить"
"\" ниже, чтобы выключить устройство."
+msgid "Warning: Device (%s) is unknown or isn't a dual-partition device!"
+msgstr ""
+
msgid "Warning: There are unsaved changes that will get lost on reboot!"
msgstr ""
"Внимание: Есть несохраненные изменения, которые будут потеряны при "
"перезагрузке!"
-msgid "Warning: This system does not have two partitions!"
-msgstr "Внимание: Эта система не имеет двух разделов!"
-
msgid "Warning: This system does not support powering off!"
msgstr "Внимание: Эта система не поддерживает отключение питания!"
+msgid "Warning: Unable to obtain device information!"
+msgstr ""
+
msgid "to"
msgstr ""
+
+#~ msgid "Alternative reboot cancelled."
+#~ msgstr "Альтернативная перезагрузка отменена."
+
+#~ msgid "Warning: This system does not have two partitions!"
+#~ msgstr "Внимание: Эта система не имеет двух разделов!"
diff --git a/applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po
index e0e13cfda9..46008b1322 100644
--- a/applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po
@@ -10,9 +10,6 @@ msgstr "Avancerad omstart"
msgid "Alternative"
msgstr "Alternativ"
-msgid "Alternative reboot cancelled."
-msgstr ""
-
msgid "Cancel"
msgstr "Avbryt"
@@ -119,15 +116,21 @@ msgstr ""
"stöd för avstängning.<br /><br /> Klicka på \"Fortsätt\" nedanför för att "
"stänga av din enhet."
+msgid "Warning: Device (%s) is unknown or isn't a dual-partition device!"
+msgstr ""
+
msgid "Warning: There are unsaved changes that will get lost on reboot!"
msgstr ""
"Varning: Det finns osparade ändringar som kommer att förloras vid omstart!"
-msgid "Warning: This system does not have two partitions!"
-msgstr "Varning: Det här systemet har inte två partitioner!"
-
msgid "Warning: This system does not support powering off!"
msgstr "Varning: Det här systemet har inte stöd för avstängning!"
+msgid "Warning: Unable to obtain device information!"
+msgstr ""
+
msgid "to"
msgstr ""
+
+#~ msgid "Warning: This system does not have two partitions!"
+#~ msgstr "Varning: Det här systemet har inte två partitioner!"
diff --git a/applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot b/applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot
index edc8c2a062..8324ea4e2e 100644
--- a/applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot
+++ b/applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot
@@ -1,9 +1,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
-msgid ") is unknown or isn't a dual-partition device!"
-msgstr ""
-
msgid "Action"
msgstr ""
@@ -113,7 +110,7 @@ msgid ""
"device."
msgstr ""
-msgid "Warning: Device ("
+msgid "Warning: Device (%s) is unknown or isn't a dual-partition device!"
msgstr ""
msgid "Warning: There are unsaved changes that will get lost on reboot!"
diff --git a/applications/luci-app-ddns/po/ru/ddns.po b/applications/luci-app-ddns/po/ru/ddns.po
index fae11275d3..4731cc379f 100644
--- a/applications/luci-app-ddns/po/ru/ddns.po
+++ b/applications/luci-app-ddns/po/ru/ddns.po
@@ -3,12 +3,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: LuCI: ddns\n"
"POT-Creation-Date: 2017-10-17 21:00+0300\n"
-"PO-Revision-Date: 2018-01-24 14:58+0300\n"
+"PO-Revision-Date: 2018-07-20 03:03+0300\n"
"Language-Team: http://cyber-place.ru\n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7.1\n"
-"Last-Translator: Vladimir aka sunny <picfun@ya.ru>\n"
+"Last-Translator: Anton Kikin <a.kikin@tano-systems.com>\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"Language: ru\n"
@@ -28,7 +28,7 @@ msgid "Advanced Settings"
msgstr "Дополнительные настройки"
msgid "Allow non-public IP's"
-msgstr "Разрешить<br />не публичные IP-адреса"
+msgstr "Разрешить не публичные IP-адреса"
msgid "Applying changes"
msgstr "Применение изменений"
@@ -56,25 +56,25 @@ msgid ""
"BusyBox's nslookup and Wget do not support to specify the IP version to use "
"for communication with DDNS Provider!"
msgstr ""
-"nslookup и Wget - BusyBox-а, не поддерживают указание IP-версии, "
-"используемой для связи с DDNS провайдером!"
+"Утилиты nslookup и wget из состава busybox не поддерживают указание IP-версии"
+", используемой для связи с DDNS провайдером!"
msgid ""
"BusyBox's nslookup and hostip do not support to specify to use TCP instead "
"of default UDP when requesting DNS server!"
msgstr ""
-"nslookup и hostip - BusyBox-а, не поддерживают указание использовать TCP "
-"вместо UDP по умолчанию при запросе DNS сервера!"
+"Утилиты nslookup и hostip из состава busybox не поддерживают указание использ"
+"овать TCP вместо UDP по умолчанию при запросе DNS сервера!"
msgid ""
"BusyBox's nslookup in the current compiled version does not handle given DNS "
"Servers correctly!"
msgstr ""
-"Благодаря текущей скомпилированной версии nslookup, BusyBox не обрабатывает "
-"данные DNS сервера правильно!"
+"Благодаря текущей скомпилированной версии busybox, утилита nslookup не обраба"
+"тывает данные DNS сервера правильно!"
msgid "Casual users should not change this setting"
-msgstr "Случайные пользователи, не должны изменять эти настройки"
+msgstr "Обычный пользователь не должен изменять данную опцию"
msgid "Change provider"
msgstr "Сменить провайдера"
@@ -108,7 +108,7 @@ msgid ""
"force_interval set to '0')"
msgstr ""
"В настоящее время, обновления DDNS не запускаются при загрузке или при "
-"событиях интерфейса.<br />по умолчанию, если вы запускаете DDNS скрипты сами "
+"событиях интерфейса.<br />По умолчанию, если вы запускаете DDNS скрипты сами "
"(т.е. через cron с force_interval set to '0')"
msgid ""
@@ -116,7 +116,7 @@ msgid ""
">You can start/stop each configuration here. It will run until next reboot."
msgstr ""
"В настоящее время, обновления DDNS не запускаются при загрузке или при "
-"событиях интерфейса.<br />.<br />Вы можете запустить/остановить каждый "
+"событиях интерфейса.<br />Вы можете запустить/остановить каждый "
"config здесь. Он будет работать до следующей перезагрузки."
msgid "Custom update script to be used for updating your DDNS Provider."
@@ -125,10 +125,10 @@ msgstr ""
"провайдера DDNS."
msgid "Custom update-URL"
-msgstr "Пользовательский<br />URL обновления"
+msgstr "Пользовательский URL обновления"
msgid "Custom update-script"
-msgstr "Пользовательский<br />скрипт обновления"
+msgstr "Пользовательский скрипт обновления"
msgid "DDNS Autostart disabled"
msgstr "Автостарт DDNS отключен"
@@ -140,7 +140,7 @@ msgid "DDNS Client Documentation"
msgstr "Информация для клиента DDNS"
msgid "DDNS Service provider"
-msgstr "Провайдер службы<br />DDNS"
+msgstr "Провайдер службы DDNS"
msgid "DNS requests via TCP not supported"
msgstr "DNS запросы по протоколу TCP не поддерживаются"
@@ -161,38 +161,38 @@ msgid "Defines the interface to read systems IP-Address from"
msgstr "Задайте интерфейс для чтения системного IP-адреса из"
msgid "Defines the network to read systems IPv4-Address from"
-msgstr "Задайте сеть для связи с системным IPv4-адресом из."
+msgstr "Задайте сеть для связи с системным IPv4-адресом из"
msgid "Defines the network to read systems IPv6-Address from"
-msgstr "Задайте сеть для связи с системным IPv6-адреса из."
+msgstr "Задайте сеть для связи с системным IPv6-адреса из"
msgid ""
"Defines the source to read systems IPv4-Address from, that will be send to "
"the DDNS provider"
msgstr ""
"Задайте источник для связи с системным IPv4-адресом, который будет отправлен "
-"DDNS провайдеру."
+"DDNS провайдеру"
msgid ""
"Defines the source to read systems IPv6-Address from, that will be send to "
"the DDNS provider"
msgstr ""
"Задайте источник для связи с системным IPv6-адресом, который будет отправлен "
-"DDNS провайдеру."
+"DDNS провайдеру"
msgid "Defines which IP address 'IPv4/IPv6' is send to the DDNS provider"
msgstr ""
-"Задайте версию протокола IP-адреса 'IPv4/IPv6' отправляется провайдеру DDNS."
+"Задайте версию протокола IP-адреса 'IPv4/IPv6' отправляется провайдеру DDNS"
msgid "Details for"
msgstr "Подробности для"
msgid "Directory contains Log files for each running section"
-msgstr "Папка содержит файлы системного журнала для каждого запуска."
+msgstr "Папка содержит файлы системного журнала для каждого запуска"
msgid ""
"Directory contains PID and other status information for each running section"
-msgstr "Папка содержит PID и прочую информацию о состояниии каждого запуска."
+msgstr "Папка содержит PID и прочую информацию о состояниии каждого запуска"
msgid "Disabled"
msgstr "Отключено"
@@ -211,7 +211,7 @@ msgstr ""
"динамически изменяемом IP-адресе."
msgid "Enable secure communication with DDNS provider"
-msgstr "Включить безопасное соединение с провайдером DDNS."
+msgstr "Включить безопасное соединение с провайдером DDNS"
msgid "Enabled"
msgstr "Включено"
@@ -220,10 +220,10 @@ msgid "Error"
msgstr "Ошибка"
msgid "Error Retry Counter"
-msgstr "Учет попыток повтора<br />при ошибке"
+msgstr "Учет попыток повтора при ошибке"
msgid "Error Retry Interval"
-msgstr "Интервал попытки<br />повтора при ошибке"
+msgstr "Интервал попытки повтора при ошибке"
msgid "Event Network"
msgstr "Событие сети"
@@ -241,21 +241,21 @@ msgid ""
"Follow this link<br />You will find more hints to optimize your system to "
"run DDNS scripts with all options"
msgstr ""
-"Пройдите по этой ссылке<br />там вы найдете больше информации, как настроить "
+"Пройдите по этой ссылке<br />Там вы найдете больше информации, как настроить "
"вашу систему с использованием DDNS скриптов с наиболее полным функционалом."
msgid "For detailed information about parameter settings look here."
msgstr ""
-"Здесь вы сможете получить, более подробную информацию о параметрах настройки."
+"Здесь вы сможете получить более подробную информацию о параметрах настройки."
msgid "For supported codes look here"
-msgstr "С поддерживаемыми кодами, вы сможете ознакомится здесь."
+msgstr "С поддерживаемыми кодами вы можете ознакомится здесь"
msgid "Force IP Version"
-msgstr "Назначенная версия<br />IP-адреса"
+msgstr "Назначенная версия IP протокола"
msgid "Force IP Version not supported"
-msgstr "Назначенная версия протокола IP-адреса, не поддерживается"
+msgstr "Назначенная версия IP протокола не поддерживается"
msgid "Force Interval"
msgstr "Назначить интервал"
@@ -264,19 +264,19 @@ msgid "Force TCP on DNS"
msgstr "Выбрать протокол TCP для DNS"
msgid "Forced IP Version don't matched"
-msgstr "Назначенная версия протокола IP-адреса не проверялась"
+msgstr "Назначенная версия IP протокола не соответствует"
msgid "Format"
msgstr "Формат"
msgid "Format: IP or FQDN"
-msgstr "В виде: IP-адрес или полное доменное имя."
+msgstr "В виде: IP-адрес или полное доменное имя"
msgid ""
"GNU Wget will use the IP of given network, cURL will use the physical "
"interface."
msgstr ""
-"GNU wget будет использовать IP присвоенный сетью, cURL будет использовать "
+"GNU wget будет использовать IP заданной сети, cURL будет использовать "
"физический интерфейс."
msgid "Global Settings"
@@ -291,10 +291,10 @@ msgstr "Подсказки"
msgid "Hostname/FQDN to validate, if IP update happen or necessary"
msgstr ""
"Имя хоста/полное доменное имя для проверки, если происходит обновление IP-"
-"адреса или оно необходимо."
+"адреса или оно необходимо"
msgid "IP address source"
-msgstr "IP адрес источника"
+msgstr "IP-адрес источника"
msgid "IP address version"
msgstr "Версия IP-адреса"
@@ -303,16 +303,16 @@ msgid "IPv4-Address"
msgstr "IPv4-адрес"
msgid "IPv6 address must be given in square brackets"
-msgstr "IPv6 адрес должен быть указан в квадратных скобках"
+msgstr "IPv6-адрес должен быть указан в квадратных скобках"
msgid ""
"IPv6 is currently not (fully) supported by this system<br />Please follow "
"the instructions on OpenWrt's homepage to enable IPv6 support<br />or update "
"your system to the latest OpenWrt Release"
msgstr ""
-"IPv6 не поддерживается вашей прошивкой < br />, следуйте инструкциям на "
+"IPv6 не поддерживается вашей прошивкой.<br />Следуйте инструкциям на "
"главной странице OpenWrt, чтобы включить поддержку IPv6<br / >или обновить "
-"прошивку до последнего выпуска OpenWrt с включением поддержки IPv6."
+"прошивку до последнего выпуска OpenWrt с включенной поддержкой IPv6"
msgid "IPv6 not supported"
msgstr "IPv6 не поддерживается"
@@ -322,15 +322,15 @@ msgstr "IPv6-адрес"
msgid "If both cURL and GNU Wget are installed, Wget is used by default."
msgstr ""
-"Если установлены cURL и GNU Wget вместе, Wget будет использоваться по "
-"умолчанию."
+"Если установлены и cURL и GNU wget, по умолчанию будет использоваться "
+"wget."
msgid ""
"If this service section is disabled it could not be started.<br />Neither "
"from LuCI interface nor from console"
msgstr ""
-"Если этот режим службы отключен, его нельзя будет запустить. Не с веб-"
-"интерфейса LuCI, ни с консоли."
+"Если этот режим службы отключен, её нельзя будет запустить ни с веб-"
+"интерфейса LuCI, ни с консоли"
msgid "If using secure communication you should verify server certificates!"
msgstr ""
@@ -341,13 +341,13 @@ msgid ""
"If you want to send updates for IPv4 and IPv6 you need to define two "
"separate Configurations i.e. 'myddns_ipv4' and 'myddns_ipv6'"
msgstr ""
-"Версии протоколов IPv4 и IPv6 необходимо настроить раздельно , т. е. "
+"Версии протоколов IPv4 и IPv6 необходимо настроить раздельно, т.е. "
"'myddns_ipv4' и 'myddns_ipv6'."
msgid ""
"In some versions cURL/libcurl in OpenWrt is compiled without proxy support."
msgstr ""
-"В некоторых случаях cURL/libcurl, если OpenWrt скомпилирован без поддержки "
+"В некоторых версиях OpenWrt пакеты cURL/libcurl скомпилированы без поддержки "
"прокси."
msgid "Info"
@@ -357,8 +357,8 @@ msgid ""
"Install 'ca-certificates' package or needed certificates by hand into /etc/"
"ssl/certs default directory"
msgstr ""
-"Установите 'ca-certificates' или пакет необходимых сертификатов вручную в "
-"папку/etc/ssl/certs"
+"Установите пакет 'ca-certificates' или необходимые сертификаты вручную в "
+"папку /etc/ssl/certs"
msgid "Interface"
msgstr "Интерфейс"
@@ -367,8 +367,8 @@ msgid ""
"Interval to check for changed IP<br />Values below 5 minutes == 300 seconds "
"are not supported"
msgstr ""
-"Интервал для проверки измененных IP-адресов.<br />ниже 5 минут = = 300 "
-"секунд не поддерживаются."
+"Интервал для проверки измененных IP-адресов.<br />Значения ниже 5 минут (300 "
+"секунд) не поддерживаются"
msgid ""
"Interval to force updates send to DDNS Provider<br />Setting this parameter "
@@ -376,13 +376,13 @@ msgid ""
"Interval' except '0' are not supported"
msgstr ""
"Интервал для назначения отправки обновлений провайдеру DDNS.<br />Установка "
-"значения '0', заставит сценарий отработать только один раз, значения ниже "
-"'Интервал проверки' за исключением '0' не поддерживаются."
+"значения '0' заставит сценарий отработать только один раз, значения ниже "
+"'Интервал проверки', за исключением '0', не поддерживаются"
msgid "It is NOT recommended for casual users to change settings on this page."
msgstr ""
-"Не рекомендуется случайным пользователям, изменять настройки на этой "
-"странице."
+"Настройки на данной странице не рекомендуется изменять обычным "
+"пользователям."
msgid "Last Update"
msgstr "Последнее обновление"
@@ -394,7 +394,7 @@ msgid "Log File Viewer"
msgstr "Просмотр системного журнала"
msgid "Log directory"
-msgstr "Папка системного<br />журнала"
+msgstr "Папка системного журнала"
msgid "Log length"
msgstr "Просмотр журнала"
@@ -409,19 +409,20 @@ msgid "Lookup Hostname"
msgstr "Поиск имени хоста"
msgid "NOT installed"
-msgstr "Не установлена"
+msgstr "Не установлено"
msgid ""
"Neither GNU Wget with SSL nor cURL installed to select a network to use for "
"communication."
-msgstr "Neither GNU Wget с SSL nor cURL установлены для выбора сети для связи."
+msgstr "Не установлены пакеты GNU wget c SSL или cURL для возможности выбора "
+"сети для связи."
msgid ""
"Neither GNU Wget with SSL nor cURL installed to support secure updates via "
"HTTPS protocol."
msgstr ""
-"Neither GNU Wget с SSL nor cURL установлены для поддержки безопасных "
-"обновлений по протоколу HTTPS."
+"Не установлены пакеты GNU wget с SSL или cURL для поддержки безопасных "
+"обновлений по протоколу HTTPS."
msgid "Network"
msgstr "Сеть"
@@ -442,44 +443,44 @@ msgid "No data"
msgstr "Нет данных"
msgid "No logging"
-msgstr "Нет записи в системный журнал"
+msgstr "Отключить журналирование"
msgid "Non-public and by default blocked IP's"
-msgstr "Непубличные и по умолчанию заблокированные IP-адреса"
+msgstr "Непубличные и заблокированные по умолчанию IP-адреса"
msgid "Notice"
msgstr "Заметка"
msgid "Number of last lines stored in log files"
-msgstr "Число последних строк, системного журнала."
+msgstr "Число последних строк, для хранения в системном журнале"
msgid "OPTIONAL: Force the usage of pure IPv4/IPv6 only communication."
-msgstr "Необязательно: Назначить использование версии протоколов IPv4/IPv6."
+msgstr "Необязательно: использовать только чистые версий протоколов IPv4/IPv6."
msgid "OPTIONAL: Force the use of TCP instead of default UDP on DNS requests."
msgstr ""
-"Необязательно: Назначить использование протокола TCP вместо UDP по умолчанию "
+"Необязательно: использовать протокол TCP вместо UDP по умолчанию "
"для DNS-запросов."
msgid "OPTIONAL: Network to use for communication"
-msgstr "Необязательно: Сеть для связи"
+msgstr "Необязательно: сеть для связи"
msgid "OPTIONAL: Proxy-Server for detection and updates."
-msgstr "Необязательно: Прокси-сервер для обнаружения и обновления."
+msgstr "Необязательно: прокси-сервер для обнаружения и обновления."
msgid "OPTIONAL: Use non-default DNS-Server to detect 'Registered IP'."
msgstr ""
-"Необязательно: Использовать по умолчанию DNS сервер, чтобы обнаружить "
-"'Зарегистрированный IP-адрес'."
+"Необязательно: использовать DNS сервер не используемый по умолчанию, "
+"для обнаружения 'Зарегистрированного IP-адреса'."
msgid "On Error the script will retry the failed action after given time"
msgstr ""
-"В случае ошибки, скрипт повторит неудавшееся действие по истечении заданного "
+"В случае ошибки, скрипт повторит требуемые действия по истечении заданного "
"времени."
msgid "On Error the script will stop execution after given number of retrys"
msgstr ""
-"В случае ошибки, скрипт прекратит выполнение, после заданного количества "
+"В случае ошибки, скрипт прекратит выполнение после заданного количества "
"повторных попыток."
msgid "OpenWrt Wiki"
@@ -489,17 +490,17 @@ msgid "Optional Encoded Parameter"
msgstr "Необязательный кодированный параметр"
msgid "Optional Parameter"
-msgstr "Необязательный<br />параметр"
+msgstr "Необязательный параметр"
msgid "Optional: Replaces [PARAMENC] in Update-URL (URL-encoded)"
-msgstr "Необязательно: заменяет [PARAMENC] в Update-URL-адрес (URL-encoded)."
+msgstr "Необязательно: заменяет [PARAMENC] в Update-URL (URL-encoded)"
msgid "Optional: Replaces [PARAMOPT] in Update-URL (NOT URL-encoded)"
msgstr ""
-"Необязательно: заменяет [PARAMOPT] в Update-URL-адрес (не URL-encoded)."
+"Необязательно: заменяет [PARAMOPT] в Update-URL (не URL-encoded)"
msgid "Overview"
-msgstr "Главное меню"
+msgstr "Обзор"
msgid "PROXY-Server"
msgstr "Прокси сервер"
@@ -511,10 +512,10 @@ msgid "Password"
msgstr "Пароль"
msgid "Path to CA-Certificate"
-msgstr "Путь к CA-Сертификату"
+msgstr "Путь к CA-сертификату"
msgid "Please [Save & Apply] your changes first"
-msgstr "Нажмите [Сохранить и применить] чтобы сохранить ваши настройки."
+msgstr "Нажмите [Сохранить и применить] чтобы сохранить ваши настройки"
msgid "Please press [Read] button"
msgstr "Нажмите кнопку [Читать / Перечитывать системный журнал]"
@@ -532,19 +533,19 @@ msgid "Really change DDNS provider?"
msgstr "Действительно сменить DDNS провайдера?"
msgid "Registered IP"
-msgstr "Зарегистрированный<br />IP-адрес"
+msgstr "Зарегистрированный IP-адрес"
msgid "Replaces [DOMAIN] in Update-URL"
-msgstr "Заменяет [ДОМЕН] в Update-URL."
+msgstr "Заменяет [ДОМЕН] в Update-URL"
msgid "Replaces [PASSWORD] in Update-URL (URL-encoded)"
-msgstr "Заменяет [ПАРОЛЬ] в Update-URL (URL-encoded)."
+msgstr "Заменяет [ПАРОЛЬ] в Update-URL (URL-encoded)"
msgid "Replaces [USERNAME] in Update-URL (URL-encoded)"
-msgstr "Заменяет [ЛОГИН] in Update-URL (URL-encoded)."
+msgstr "Заменяет [ЛОГИН] in Update-URL (URL-encoded)"
msgid "Run once"
-msgstr "Запуск один раз"
+msgstr "Запустить один раз"
msgid "Script"
msgstr "Скрипт"
@@ -553,7 +554,7 @@ msgid "Show more"
msgstr "Показать больше"
msgid "Software update required"
-msgstr "Требуется обновление программного обеспечения."
+msgstr "Требуется обновление программного обеспечения"
msgid "Specifying a DNS-Server is not supported"
msgstr "Указанный DNS сервер не поддерживается"
@@ -574,28 +575,28 @@ msgid ""
"The currently installed 'ddns-scripts' package did not support all available "
"settings."
msgstr ""
-"Пакет установленных 'ddns-scripts' не поддерживает все доступные настройки."
+"Установленный пакет 'ddns-scripts' не поддерживает все доступные настройки"
msgid "The default setting of '0' will retry infinite."
-msgstr "Значение по умолчанию '0' будет повторяться бесконечно."
+msgstr "Значение по умолчанию '0' используется для бесконечного повтора."
msgid "There is no service configured."
-msgstr "Сервис не настроен."
+msgstr "Сервис не настроен"
msgid "Timer Settings"
msgstr "Настройка таймера"
msgid "To change global settings click here"
-msgstr "Чтобы изменить основные настройки, нажмите здесь."
+msgstr "Чтобы изменить основные настройки, нажмите здесь"
msgid "To use cURL activate this option."
-msgstr "Для использования cURL активируйте режим."
+msgstr "Для использования cURL активируйте эту опцию."
msgid "URL"
msgstr "URL"
msgid "URL to detect"
-msgstr "обнаружен URL"
+msgstr "URL для обнаружения"
msgid "Unknown error"
msgstr "Неизвестная ошибка"
@@ -604,8 +605,8 @@ msgid ""
"Update URL to be used for updating your DDNS Provider.<br />Follow "
"instructions you will find on their WEB page."
msgstr ""
-"Update URL используется для обновления DDNS-провайдера.<br />Следуйте "
-"инструкциям, вы найдете их на веб-странице."
+"URL обновления используется для обновления вашего DDNS-провайдера.<br />Следуйте "
+"инструкциям, которые вы найдете на их на веб-странице."
msgid "Update error"
msgstr "Ошибка обновления"
@@ -617,13 +618,13 @@ msgid "Use cURL"
msgstr "Использовать cURL"
msgid "User defined script to read systems IP-Address"
-msgstr "Заданный пользователем скрипт для чтения системного IP-адреса."
+msgstr "Заданный пользователем скрипт для чтения системного IP-адреса"
msgid "Username"
msgstr "Имя пользователя"
msgid "Using specific DNS Server not supported"
-msgstr "Использование определенного DNS сервера не поддерживается."
+msgstr "Использование определенного DNS сервера не поддерживается"
msgid "Verify"
msgstr "Проверить"
@@ -644,44 +645,44 @@ msgid ""
"Writes detailed messages to log file. File will be truncated automatically."
msgstr ""
"Записывать подробные сообщения в системный журнал. Файл будет автоматически "
-"обрезан."
+"обрезан "
msgid ""
"Writes log messages to syslog. Critical Errors will always be written to "
"syslog."
msgstr ""
-"Задайте уровень журналирования. Критические ошибки, всегда будут записаны в "
+"Задайте уровень журналирования. Критические ошибки всегда будут записаны в "
"системный журнал."
msgid ""
"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
"package, if you need to specify a DNS server to detect your registered IP."
msgstr ""
-"Установите 'bind-host' или 'knot-host' или 'drill' или 'hostip' пакеты если "
+"Установите пакет 'bind-host', 'knot-host', 'drill' или 'hostip' если "
"вам нужно указать DNS сервер для обнаружения вашего зарегистрированного IP-"
"адреса."
msgid ""
"You should install 'bind-host' or 'knot-host' or 'drill' package for DNS "
"requests."
-msgstr "Установите 'bind-host' или 'knot-host' или 'drill' для DNS запросов."
+msgstr "Установите пакет 'bind-host', 'knot-host' или 'drill' для DNS запросов."
msgid "You should install 'wget' or 'curl' or 'uclient-fetch' package."
-msgstr "Установите 'wget' или 'curl' или 'uclient-fetch' пакет."
+msgstr "Установите пакет 'wget', 'curl' или 'uclient-fetch'."
msgid ""
"You should install 'wget' or 'curl' or 'uclient-fetch' with 'libustream-"
"*ssl' package."
msgstr ""
-"Установите 'wget' или 'curl' или 'uclient-fetch' с 'libustream-*ssl' пакетом."
+"Установите пакет 'wget', 'curl' или 'uclient-fetch' с 'libustream-*ssl'."
msgid "You should install 'wget' or 'curl' package."
-msgstr "Установите 'wget' или 'curl' пакеты."
+msgstr "Установите пакет 'wget' или 'curl'."
msgid ""
"You should install 'wget' or 'uclient-fetch' package or replace libcurl."
msgstr ""
-"Вы должны установить 'wget' или пакет 'uclient-fetch' или заменить libcurl."
+"Вы должны установить пакет 'wget' или 'uclient-fetch' или заменить 'libcurl'."
msgid "cURL is installed, but libcurl was compiled without proxy support."
msgstr "cURL установлен, но libcurl был скомпилирован без поддержки прокси."
@@ -690,28 +691,28 @@ msgid "cURL without Proxy Support"
msgstr "cURL без поддержки прокси"
msgid "can not detect local IP. Please select a different Source combination"
-msgstr "не может определить локальный IP-адрес. Выберите другой вариант"
+msgstr "Невозможно определить локальный IP-адрес. Выберите другой источник"
msgid "can not resolve host:"
-msgstr "не может разрешить хост:"
+msgstr "Невозможно разрешить хост:"
msgid "config error"
-msgstr "ошибка в config файле"
+msgstr "Ошибка в config файле"
msgid "days"
msgstr "дни"
msgid "directory or path/file"
-msgstr "папка или путь/к файлу"
+msgstr "папка или путь/файл"
msgid "either url or script could be set"
-msgstr "или url или скрипт смог быть установлен"
+msgstr "URL или скрипт должны быть установлены"
msgid "enable here"
msgstr "Включить здесь"
msgid "file or directory not found or not 'IGNORE'"
-msgstr "файл или папка не найдена или не 'Игнорировать'"
+msgstr "Файл или папка не найдены (не установлено 'Игнорировать')"
msgid "help"
msgstr "помощь"
@@ -723,31 +724,31 @@ msgid "installed"
msgstr "установлено"
msgid "invalid FQDN / required - Sample"
-msgstr "недопустимое полное доменное имя / обязательный образец"
+msgstr "Недопустимое полное доменное имя (обязательное поле) — пример"
msgid "minimum value '0'"
-msgstr "минимальное значение '0'"
+msgstr "Минимальное значение '0'"
msgid "minimum value '1'"
-msgstr "минимальное значение '1'"
+msgstr "Минимальное значение '1'"
msgid "minimum value 5 minutes == 300 seconds"
-msgstr "минимальное значение 5 минут == 300 секунд"
+msgstr "Минимальное значение 5 минут (300 секунд)"
msgid "minutes"
msgstr "минут(ы)"
msgid "missing / required"
-msgstr "отсутствует / не требуется"
+msgstr "отсутствует (обязательное поле)"
msgid "must be greater or equal 'Check Interval'"
-msgstr "должно быть больше или равно 'Интервал проверки'"
+msgstr "Должно быть больше или равно 'Интервал проверки'"
msgid "must start with 'http://'"
-msgstr "должны начинаться с 'http://'"
+msgstr "Должны начинаться с 'http://'"
msgid "nc (netcat) can not connect"
-msgstr "NC (netcat) не может подключиться"
+msgstr "Утилита nc (netcat) не может подключиться"
msgid "never"
msgstr "никогда"
@@ -757,10 +758,10 @@ msgstr "нет данных"
msgid "not found or not executable - Sample: '/path/to/script.sh'"
msgstr ""
-"не найден или не является исполнительным, например: '/path/to/script.sh'"
+"Не найден или не является исполняемым — пример: '/path/to/script.sh'"
msgid "nslookup can not resolve host"
-msgstr "nslookup не может разрешить хост"
+msgstr "Утилита nslookup не может разрешить хост"
msgid "or"
msgstr "или"
@@ -772,7 +773,7 @@ msgid "please disable"
msgstr "отключите"
msgid "please remove entry"
-msgstr "удалите эту запись"
+msgstr "удалите запись"
msgid "please select 'IPv4' address version"
msgstr "выберите версию протокола 'IPv4' адреса"
@@ -784,10 +785,10 @@ msgid "please set to 'default'"
msgstr "установите режим 'по умолчанию'"
msgid "proxy port missing"
-msgstr "отсутствует прокси порт"
+msgstr "отсутствует порт прокси"
msgid "required"
-msgstr "требовать"
+msgstr "требуется"
msgid "seconds"
msgstr "секунд(ы)"
diff --git a/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm b/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm
index 66e44e9676..c8f3f33d6b 100644
--- a/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm
+++ b/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm
@@ -17,29 +17,28 @@
var tb = document.getElementById('ocserv_status_table');
if (st && tb)
{
- /* clear all rows */
- while (tb.firstElementChild !== tb.lastElementChild)
- tb.removeChild(tb.lastElementChild);
+ var rows = [];
for (var i = 0; i < st.length; i++)
{
- tb.appendChild(E('<div class="tr cbi-section-table-row cbi-rowstyle-%d">'.format((i % 2) + 1), [
- E('<div class="td">', st[i].user),
- E('<div class="td">', st[i].group),
- E('<div class="td">', st[i].vpn_ip),
- E('<div class="td">', st[i].ip),
- E('<div class="td">', st[i].device),
- E('<div class="td">', st[i].time),
- E('<div class="td">', st[i].cipher),
- E('<div class="td">', st[i].status),
- E('<div class="td">',
- E('<input class="cbi-button cbi-input-remove" type="button" value="<%:Disconnect%>" onclick="ocserv_disconnect(%d)" />'
- .format(st[i].id)))
- ]));
+ rows.push([
+ st[i].user,
+ st[i].group,
+ st[i].vpn_ip,
+ st[i].ip,
+ st[i].device,
+ st[i].time,
+ st[i].cipher,
+ st[i].status,
+ E('input', {
+ type: 'button',
+ class: 'cbi-button cbi-button-remove',
+ onclick: 'ocserv_disconnect(%d)'.format(st[i].id)
+ })
+ ]);
}
- if (tb.firstElementChild === tb.lastElementChild)
- tb.appendChild(E('<div class="tr cbi-section-table-row"><div class="td"><em><br /><%:There are no active users.%></em></div></div>'));
+ cbi_update_table(tb, rows, '<em><%:There are no active users.%></em>');
}
}
);
@@ -47,20 +46,20 @@
<fieldset class="cbi-section">
<legend><%:Active OpenConnect Users%></legend>
- <div class="table cbi-section-table" id="ocserv_status_table">
- <div class="tr cbi-section-table-titles">
- <div class="th cbi-section-table-cell"><%:User%></div>
- <div class="th cbi-section-table-cell"><%:Group%></div>
- <div class="th cbi-section-table-cell"><%:IP Address%></div>
- <div class="th cbi-section-table-cell"><%:VPN IP Address%></div>
- <div class="th cbi-section-table-cell"><%:Device%></div>
- <div class="th cbi-section-table-cell"><%:Time%></div>
- <div class="th cbi-section-table-cell"><%:Cipher%></div>
- <div class="th cbi-section-table-cell"><%:Status%></div>
- <div class="th cbi-section-table-cell">&#160;</div>
+ <div class="table" id="ocserv_status_table">
+ <div class="tr table-titles">
+ <div class="th"><%:User%></div>
+ <div class="th"><%:Group%></div>
+ <div class="th"><%:IP Address%></div>
+ <div class="th"><%:VPN IP Address%></div>
+ <div class="th"><%:Device%></div>
+ <div class="th"><%:Time%></div>
+ <div class="th"><%:Cipher%></div>
+ <div class="th"><%:Status%></div>
+ <div class="th">&#160;</div>
</div>
- <div class="tr cbi-section-table-row">
- <div class="td" colspan="5"><em><br /><%:Collecting data...%></em></div>
+ <div class="tr placeholder">
+ <div class="td"><em><%:Collecting data...%></em></div>
</div>
</div>
</fieldset>
diff --git a/applications/luci-app-samba4/Makefile b/applications/luci-app-samba4/Makefile
new file mode 100644
index 0000000000..08403fb2fc
--- /dev/null
+++ b/applications/luci-app-samba4/Makefile
@@ -0,0 +1,10 @@
+# This is free software, licensed under the Apache License, Version 2.0 .
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Network Shares - Samba 4 SMB/CIFS module
+LUCI_DEPENDS:=+samba4-server
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-app-samba4/luasrc/controller/samba4.lua b/applications/luci-app-samba4/luasrc/controller/samba4.lua
new file mode 100644
index 0000000000..8ad0e52e36
--- /dev/null
+++ b/applications/luci-app-samba4/luasrc/controller/samba4.lua
@@ -0,0 +1,14 @@
+-- Licensed to the public under the Apache License 2.0.
+
+module("luci.controller.samba4", package.seeall)
+
+function index()
+ if not nixio.fs.access("/etc/config/samba4") then
+ return
+ end
+
+ local page
+
+ page = entry({"admin", "services", "samba4"}, cbi("samba4"), _("Network Shares"))
+ page.dependent = true
+end
diff --git a/applications/luci-app-samba4/luasrc/model/cbi/samba4.lua b/applications/luci-app-samba4/luasrc/model/cbi/samba4.lua
new file mode 100644
index 0000000000..e5c0a1bed0
--- /dev/null
+++ b/applications/luci-app-samba4/luasrc/model/cbi/samba4.lua
@@ -0,0 +1,90 @@
+-- Licensed to the public under the Apache License 2.0.
+
+m = Map("samba4", translate("Network Shares"))
+
+s = m:section(TypedSection, "samba", "Samba")
+s.anonymous = true
+
+s:tab("general", translate("General Settings"))
+s:tab("template", translate("Edit Template"))
+
+s:taboption("general", Value, "name", translate("Hostname"))
+s:taboption("general", Value, "description", translate("Description"))
+s:taboption("general", Value, "workgroup", translate("Workgroup"))
+h = s:taboption("general", Flag, "homes", translate("Share home-directories"),
+ translate("Allow system users to reach their home directories via " ..
+ "network shares"))
+h.rmempty = false
+s:taboption("general", Flag, "disable_netbios", translate("Disable Netbios"))
+s:taboption("general", Flag, "disable_ad_dc", translate("Disable Active Directory Domain Controller"))
+s:taboption("general", Flag, "disable_winbind", translate("Disable Winbind"))
+
+tmpl = s:taboption("template", Value, "_tmpl",
+ translate("Edit the template that is used for generating the samba configuration."),
+ translate("This is the content of the file '/etc/samba/smb.conf.template' from which your samba configuration will be generated. " ..
+ "Values enclosed by pipe symbols ('|') should not be changed. They get their values from the 'General Settings' tab."))
+
+tmpl.template = "cbi/tvalue"
+tmpl.rows = 20
+
+function tmpl.cfgvalue(self, section)
+ return nixio.fs.readfile("/etc/samba/smb.conf.template")
+end
+
+function tmpl.write(self, section, value)
+ value = value:gsub("\r\n?", "\n")
+ nixio.fs.writefile("/etc/samba/smb.conf.template", value)
+end
+
+
+s = m:section(TypedSection, "sambashare", translate("Shared Directories")
+ , translate("Please add directories to share. Each directory refers to a folder on a mounted device."))
+s.anonymous = true
+s.addremove = true
+s.template = "cbi/tblsection"
+
+s:option(Value, "name", translate("Name"))
+pth = s:option(Value, "path", translate("Path"))
+if nixio.fs.access("/etc/config/fstab") then
+ pth.titleref = luci.dispatcher.build_url("admin", "system", "fstab")
+end
+
+s:option(Value, "users", translate("Allowed users")).rmempty = true
+
+ro = s:option(Flag, "read_only", translate("Read-only"))
+ro.rmempty = false
+ro.enabled = "yes"
+ro.disabled = "no"
+
+br = s:option(Flag, "browseable", translate("Browseable"))
+br.rmempty = false
+br.default = "yes"
+br.enabled = "yes"
+br.disabled = "no"
+
+go = s:option(Flag, "guest_ok", translate("Allow guests"))
+go.rmempty = false
+go.enabled = "yes"
+go.disabled = "no"
+
+gon = s:option(Flag, "guest_only", translate("Guests only"))
+gon.rmempty = false
+gon.enabled = "yes"
+gon.disabled = "no"
+
+io = s:option(Flag, "inherit_owner", translate("Inherit owner"))
+io.rmempty = false
+io.enabled = "yes"
+io.disabled = "no"
+
+cm = s:option(Value, "create_mask", translate("Create mask"))
+cm.rmempty = true
+cm.size = 4
+
+dm = s:option(Value, "dir_mask", translate("Directory mask"))
+dm.rmempty = true
+dm.size = 4
+
+s:option(Value, "vfs_objects", translate("Vfs objects")).rmempty = true
+
+return m
diff --git a/applications/luci-app-samba4/po/ca/samba4.po b/applications/luci-app-samba4/po/ca/samba4.po
new file mode 100644
index 0000000000..ddd306d07a
--- /dev/null
+++ b/applications/luci-app-samba4/po/ca/samba4.po
@@ -0,0 +1,121 @@
+# samba.pot
+# generated from ./applications/luci-samba/luasrc/i18n/samba.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2014-07-01 05:47+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow guests"
+msgstr "Permet convidats"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Permet que els usuaris del sistema pugin arribar als seus directoris d'inici "
+"via comparticions de xarxa"
+
+msgid "Allowed users"
+msgstr "Usuaris permesos"
+
+msgid "Browseable"
+msgstr ""
+
+msgid "Create mask"
+msgstr "Crea màscara"
+
+msgid "Description"
+msgstr "Descripció"
+
+msgid "Directory mask"
+msgstr "Màscara de directori"
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr "Edita plantilla"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "Edita la plantilla que s'usa per generar la configuració de samba."
+
+msgid "General Settings"
+msgstr "Ajusts generals"
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Nom de màquina"
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr "Nom"
+
+msgid "Network Shares"
+msgstr "Comparticions de xarxa"
+
+msgid "Path"
+msgstr "Ruta"
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+msgid "Read-only"
+msgstr "Només lectura"
+
+msgid "Share home-directories"
+msgstr "Comparteix directoris d'inici"
+
+msgid "Shared Directories"
+msgstr "Directoris compartits"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Això és el contingut del fitxer '/etc/samba/smb.conf.template' del qual la "
+"vostra configuració de samba es generarà. Valors encerclats per símbols de "
+"barra ('|') no es deuen canviar. Reben els seus valors de la pestanya "
+"'Ajusts generals'."
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Grup de treball"
+
+#~ msgid "Mask for new directories"
+#~ msgstr "Màscara per directoris nous"
+
+#~ msgid "Mask for new files"
+#~ msgstr "Màscara per fitxers nous"
+
+#~ msgid "Shared Directory"
+#~ msgstr "Directori compartit"
+
+#~ msgid "Physical Path"
+#~ msgstr "Ruta física"
+
+#~ msgid "optional"
+#~ msgstr "opcional"
diff --git a/applications/luci-app-samba4/po/cs/samba4.po b/applications/luci-app-samba4/po/cs/samba4.po
new file mode 100644
index 0000000000..a013bcc13e
--- /dev/null
+++ b/applications/luci-app-samba4/po/cs/samba4.po
@@ -0,0 +1,109 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-31 13:56+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow guests"
+msgstr "Povolení hosté"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Povoluje systémovým uživatelům přístup do jejich domácích adresářů skrze "
+"sdílení přes síť."
+
+msgid "Allowed users"
+msgstr "Povolení uživatelé"
+
+msgid "Browseable"
+msgstr ""
+
+msgid "Create mask"
+msgstr "Vytvořit masku"
+
+msgid "Description"
+msgstr "Popis"
+
+msgid "Directory mask"
+msgstr "Maska adresáře"
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr "Editovat šablonu"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+"Editovat šablonu, která je použita pro generování konfiguračního souboru pro "
+"sambu."
+
+msgid "General Settings"
+msgstr "Obecné nastavení"
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Název počítače."
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr "Jméno"
+
+msgid "Network Shares"
+msgstr "Síťová sdílení"
+
+msgid "Path"
+msgstr "Cesta"
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+msgid "Read-only"
+msgstr "Pouze pro čtení"
+
+msgid "Share home-directories"
+msgstr "Sdílet domácí adresáře"
+
+msgid "Shared Directories"
+msgstr "Sdílené adresáře"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Toto je obsah souboru \"/etc/samba/smb.conf.template\", ze kterého je "
+"konfigurace samby generována. Hodnoty uzavřené rourou (\"|\"), by se neměly "
+"měnit. Tyto hodnoty jsou brány ze záložky \"Obecná nastavení\"."
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Skupina"
+
+#~ msgid "Mask for new directories"
+#~ msgstr "Maska pro nové adresáře"
+
+#~ msgid "Mask for new files"
+#~ msgstr "Maska pro nové soubory"
diff --git a/applications/luci-app-samba4/po/de/samba4.po b/applications/luci-app-samba4/po/de/samba4.po
new file mode 100644
index 0000000000..b9caa61d1c
--- /dev/null
+++ b/applications/luci-app-samba4/po/de/samba4.po
@@ -0,0 +1,113 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 17:57+0200\n"
+"PO-Revision-Date: 2011-10-18 13:13+0200\n"
+"Last-Translator: Manuel <freifunk@somakoma.de>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow guests"
+msgstr "Gastzugang"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Systembenutzer dürfen ihre Heimatverzeichnis über Netzwerkfreigaben "
+"erreichen."
+
+msgid "Allowed users"
+msgstr "Legitimierte Benutzer"
+
+msgid "Browseable"
+msgstr "Suchbar"
+
+msgid "Create mask"
+msgstr "Berechtigungsmaske für neue Dateien"
+
+msgid "Description"
+msgstr "Beschreibung"
+
+msgid "Directory mask"
+msgstr "Verzeichnismaske"
+
+msgid "Disable Active Directory Domain Controller"
+msgstr "Deaktiviere Active Directory Domain Controller"
+
+msgid "Disable Netbios"
+msgstr "Deaktiviere Netbios"
+
+msgid "Disable Winbind"
+msgstr "Deaktiviere Winbind"
+
+msgid "Edit Template"
+msgstr "Template bearbeiten"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+"Hier kann das Template bearbeitet werden, das zur Erstellung der Samba-"
+"Konfigurationsdateien verwendet wird."
+
+msgid "General Settings"
+msgstr "Allgemeine Einstellungen"
+
+msgid "Guests only"
+msgstr "Nur Gaeste"
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "Inherit owner"
+msgstr "Besitzer Erben"
+
+msgid "Name"
+msgstr "Name"
+
+msgid "Network Shares"
+msgstr "Netzwerkfreigaben"
+
+msgid "Path"
+msgstr "Pfad"
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+msgid "Read-only"
+msgstr "Nur Lesen"
+
+msgid "Share home-directories"
+msgstr "Heimatverzeichnisse freigeben"
+
+msgid "Shared Directories"
+msgstr "Freigegebene Verzeichnisse"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Dieses Fenster zeigt den Inhalt der Datei '/etc/samba/smb.conf.template', "
+"die als Template zum Erstellen der Samba-Konfiguration verwendet wird. Werte "
+"die von Pipe Symbolen (|) eingeschlossen sind sollten nicht verändert "
+"werden, da diese beim Erstellen der Konfiguration mit den Werten aus dem Tab "
+"'Allgemeine Einstellungen' ersetzt werden."
+
+msgid "Vfs objects"
+msgstr "Virtuelle Filesystem Module"
+
+msgid "Workgroup"
+msgstr "Arbeitsgruppe"
+
+#~ msgid "Mask for new directories"
+#~ msgstr "Maske für neue Verzeichnisse"
+
+#~ msgid "Mask for new files"
+#~ msgstr "Maske für neue Dateien"
diff --git a/applications/luci-app-samba4/po/el/samba4.po b/applications/luci-app-samba4/po/el/samba4.po
new file mode 100644
index 0000000000..946915f74d
--- /dev/null
+++ b/applications/luci-app-samba4/po/el/samba4.po
@@ -0,0 +1,98 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-28 02:08+0200\n"
+"PO-Revision-Date: 2012-03-18 15:31+0200\n"
+"Last-Translator: Vasilis <acinonyx@openwrt.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow guests"
+msgstr ""
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+
+msgid "Allowed users"
+msgstr ""
+
+msgid "Browseable"
+msgstr ""
+
+msgid "Create mask"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Directory mask"
+msgstr ""
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr "Όνομα"
+
+msgid "Network Shares"
+msgstr ""
+
+msgid "Path"
+msgstr ""
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+msgid "Read-only"
+msgstr ""
+
+msgid "Share home-directories"
+msgstr ""
+
+msgid "Shared Directories"
+msgstr ""
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr ""
diff --git a/applications/luci-app-samba4/po/en/samba4.po b/applications/luci-app-samba4/po/en/samba4.po
new file mode 100644
index 0000000000..75ef0f96e9
--- /dev/null
+++ b/applications/luci-app-samba4/po/en/samba4.po
@@ -0,0 +1,108 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-22 15:23+0100\n"
+"PO-Revision-Date: 2011-10-25 21:26+0200\n"
+"Last-Translator: awm1 <awm1klimes8vladimir@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow guests"
+msgstr "Allow guests"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr "Allow system users to reach their home directories via network shares"
+
+msgid "Allowed users"
+msgstr "Allowed users"
+
+msgid "Browseable"
+msgstr ""
+
+msgid "Create mask"
+msgstr "Create mask"
+
+msgid "Description"
+msgstr "Description"
+
+msgid "Directory mask"
+msgstr "Directory mask"
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr "Edit template"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "Edit the template that is used for generating the Samba configuration."
+
+msgid "General Settings"
+msgstr "General settings"
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr "Name"
+
+msgid "Network Shares"
+msgstr "Network Shares"
+
+msgid "Path"
+msgstr "Path"
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+msgid "Read-only"
+msgstr "Read-only"
+
+msgid "Share home-directories"
+msgstr "Share home-directories"
+
+msgid "Shared Directories"
+msgstr "Shared Directories"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your Samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"settings' tab."
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Workgroup"
+
+#~ msgid "Mask for new directories"
+#~ msgstr "Mask for new directories"
+
+#~ msgid "Mask for new files"
+#~ msgstr "Mask for new files"
diff --git a/applications/luci-app-samba4/po/es/samba4.po b/applications/luci-app-samba4/po/es/samba4.po
new file mode 100644
index 0000000000..1e6b8fd368
--- /dev/null
+++ b/applications/luci-app-samba4/po/es/samba4.po
@@ -0,0 +1,118 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2012-08-22 17:45+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow guests"
+msgstr "Permitir invitados"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Permitir a los usuarios acceder a sus directorios de inicio vía "
+"comparticiones de red"
+
+msgid "Allowed users"
+msgstr "Usuarios permitidos"
+
+msgid "Browseable"
+msgstr ""
+
+msgid "Create mask"
+msgstr "Crear máscara"
+
+msgid "Description"
+msgstr "Descripción"
+
+msgid "Directory mask"
+msgstr "Máscara de directorio"
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr "Editar plantilla"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "Editar la plantilla usada para generar la configuración de samba."
+
+msgid "General Settings"
+msgstr "Configuración general"
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Nombre de máquina"
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr "Nombre"
+
+msgid "Network Shares"
+msgstr "Comparticiones de red"
+
+msgid "Path"
+msgstr "Dirección"
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+msgid "Read-only"
+msgstr "Solo lectura"
+
+msgid "Share home-directories"
+msgstr "Compartir directorios personales"
+
+msgid "Shared Directories"
+msgstr "Directorios compartidos"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Contenido del fichero '/etc/samba/smb.conf.template' desde el que se "
+"generará la configuración de samba. Los valores entre tuberías ('|') no "
+"deben cambiarse. Su valor se toma desde la pestaña 'Configuración General'."
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Grupo de trabajo"
+
+#~ msgid "Mask for new directories"
+#~ msgstr "Máscara para directorios nuevos"
+
+#~ msgid "Mask for new files"
+#~ msgstr "Máscara para archivos nuevos"
+
+#~ msgid "Shared Directory"
+#~ msgstr "Directorio compatido"
+
+#~ msgid "Physical Path"
+#~ msgstr "Ruta Física"
+
+#~ msgid "optional"
+#~ msgstr "opcional"
diff --git a/applications/luci-app-samba4/po/fr/samba4.po b/applications/luci-app-samba4/po/fr/samba4.po
new file mode 100644
index 0000000000..53212311cf
--- /dev/null
+++ b/applications/luci-app-samba4/po/fr/samba4.po
@@ -0,0 +1,110 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2011-11-23 22:36+0200\n"
+"Last-Translator: fredb <fblistes+luci@free.fr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow guests"
+msgstr "Invités autorisés"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Autoriser les utilisateurs système à atteindre leurs dossiers personnels via "
+"les partages réseau"
+
+msgid "Allowed users"
+msgstr "Utilisateurs autorisés"
+
+msgid "Browseable"
+msgstr ""
+
+msgid "Create mask"
+msgstr "Maque de création"
+
+msgid "Description"
+msgstr "Description"
+
+msgid "Directory mask"
+msgstr "Masque des dossiers"
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr "Éditer le modèle"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "Éditer le modèle utilisé pour générer la configuration Samba."
+
+msgid "General Settings"
+msgstr "Paramètres généraux"
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Nom d'hôte"
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr "Nom"
+
+msgid "Network Shares"
+msgstr "Partages réseau"
+
+msgid "Path"
+msgstr "Chemin"
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+msgid "Read-only"
+msgstr "Lecture seule"
+
+msgid "Share home-directories"
+msgstr "Partager les dossiers personnels"
+
+msgid "Shared Directories"
+msgstr "Dossiers partagés"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Voici le contenu du fichier '/etc/samba/smb.conf.template' d'où sera généré "
+"votre configuration Samba. Les valeurs entre les symboles barre-verticale "
+" (« | ») ne doivent pas être modifiées, elles proviennent de l'onglet "
+"« Paramètres généraux »."
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Groupe de travail"
+
+#~ msgid "Mask for new directories"
+#~ msgstr "Masque pour les nouveaux dossiers"
+
+#~ msgid "Mask for new files"
+#~ msgstr "Masque pour les nouveaux fichiers"
diff --git a/applications/luci-app-samba4/po/he/samba4.po b/applications/luci-app-samba4/po/he/samba4.po
new file mode 100644
index 0000000000..3f670e6c2d
--- /dev/null
+++ b/applications/luci-app-samba4/po/he/samba4.po
@@ -0,0 +1,93 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Allow guests"
+msgstr ""
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+
+msgid "Allowed users"
+msgstr ""
+
+msgid "Browseable"
+msgstr ""
+
+msgid "Create mask"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Directory mask"
+msgstr ""
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr ""
+
+msgid "Path"
+msgstr ""
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+msgid "Read-only"
+msgstr ""
+
+msgid "Share home-directories"
+msgstr ""
+
+msgid "Shared Directories"
+msgstr ""
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr ""
diff --git a/applications/luci-app-samba4/po/hu/samba4.po b/applications/luci-app-samba4/po/hu/samba4.po
new file mode 100644
index 0000000000..08ff729f4b
--- /dev/null
+++ b/applications/luci-app-samba4/po/hu/samba4.po
@@ -0,0 +1,110 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-06 10:56+0200\n"
+"Last-Translator: juhosg <juhosg@openwrt.org>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow guests"
+msgstr "Vendég hozzáférés"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"A rendszerfelhasználók hálózati megosztáson keresztül hozzáférhetnek a home "
+"könyvtárukhoz."
+
+msgid "Allowed users"
+msgstr "Engedélyezett felhasználók"
+
+msgid "Browseable"
+msgstr ""
+
+msgid "Create mask"
+msgstr "Létrehozási maszk"
+
+msgid "Description"
+msgstr "Leírás"
+
+msgid "Directory mask"
+msgstr "Könyvtár maszk"
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr "Sablon szerkesztése"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+"Itt szerkesztheti a sablont, ami a végleges samba konfiguráció "
+"elkészítéséhez kerül felhasználásra."
+
+msgid "General Settings"
+msgstr "Általános beállítások"
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Gépnév"
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr "Név"
+
+msgid "Network Shares"
+msgstr "Hálózati megosztások"
+
+msgid "Path"
+msgstr "Elérési út"
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+msgid "Read-only"
+msgstr "Csak olvasható"
+
+msgid "Share home-directories"
+msgstr "Home könyvtárak megosztása"
+
+msgid "Shared Directories"
+msgstr "Megosztott könyvtárak"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Itt látható a /etc/samba/smb.conf.template file tartalma, ami a samba "
+"konfiguráció előállításához kerül felhasználásra. A pipe szimbólumok ('|') "
+"közé zárt értékek módosítása nem szükséges, az értéküket az általános "
+"beállítások fülről kapják."
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Munkacsoport"
+
+#~ msgid "Mask for new directories"
+#~ msgstr "Új könyvtárak maszkja"
+
+#~ msgid "Mask for new files"
+#~ msgstr "Új fájlok maszkja"
diff --git a/applications/luci-app-samba4/po/it/samba4.po b/applications/luci-app-samba4/po/it/samba4.po
new file mode 100644
index 0000000000..93359d7ba7
--- /dev/null
+++ b/applications/luci-app-samba4/po/it/samba4.po
@@ -0,0 +1,113 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2017-09-06 01:28+0200\n"
+"Last-Translator: bubu83 <bubu83@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow guests"
+msgstr "Permetti ospiti"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Autorizza gli utenti del sistema a raggiungere la loro cartella home "
+"attraverso le condivisioni di rete"
+
+msgid "Allowed users"
+msgstr "Utenti ammessi"
+
+msgid "Browseable"
+msgstr "Sfogliabile"
+
+msgid "Create mask"
+msgstr "Crea maschera"
+
+msgid "Description"
+msgstr "Descrizione"
+
+msgid "Directory mask"
+msgstr "Maschera della cartella"
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr "Modifica Template"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+"Modifica il template utilizzato per generare la configurazione di samba."
+
+msgid "General Settings"
+msgstr "Opzioni Generali"
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "Network Shares"
+msgstr "Condivisioni di rete"
+
+msgid "Path"
+msgstr "Percorso"
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+"Per favore aggiungi le directory da condividere. Ogni directory si riferisce "
+"a una cartella su un dispositivo montato."
+
+msgid "Read-only"
+msgstr "Solo lettura"
+
+msgid "Share home-directories"
+msgstr "Condividi cartelle home"
+
+msgid "Shared Directories"
+msgstr "Cartelle Condivise"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Questo è il contenuto del file '/etc/samba/smb.conf.template' dal quale sarà "
+"generata la tua configurazione di samba. I valori racchiusi tra il simbolo "
+"('|') non dovrebbero essere toccati. Essi vengono generati dalla schermata "
+"'Opzioni Generali'."
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Gruppo di lavoro"
+
+#~ msgid "Mask for new directories"
+#~ msgstr "Maschera per le nuove cartelle"
+
+#~ msgid "Mask for new files"
+#~ msgstr "Maschera per i nuovi files"
diff --git a/applications/luci-app-samba4/po/ja/samba4.po b/applications/luci-app-samba4/po/ja/samba4.po
new file mode 100644
index 0000000000..3c75275c0b
--- /dev/null
+++ b/applications/luci-app-samba4/po/ja/samba4.po
@@ -0,0 +1,109 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2017-08-16 00:41+0900\n"
+"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 2.0.3\n"
+"Language-Team: \n"
+
+msgid "Allow guests"
+msgstr "ゲストアクセスを許可"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr "sambaを介してユーザーのホームディレクトリへのアクセスを許可します"
+
+msgid "Allowed users"
+msgstr "許可されたユーザー"
+
+msgid "Browseable"
+msgstr ""
+
+msgid "Create mask"
+msgstr "マスクの作成"
+
+msgid "Description"
+msgstr "説明"
+
+msgid "Directory mask"
+msgstr "ディレクトリのマスク"
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr "テンプレートの編集"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "samba設定を生成するテンプレートを編集します。"
+
+msgid "General Settings"
+msgstr "一般設定"
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr "ホスト名"
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr "名前"
+
+msgid "Network Shares"
+msgstr "ネットワーク共有"
+
+msgid "Path"
+msgstr "パス"
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+"共有するディレクトリを追加してください。マウントされたデバイス等のディレクト"
+"リを設定し、公開することができます。"
+
+msgid "Read-only"
+msgstr "読み込みのみ"
+
+msgid "Share home-directories"
+msgstr "ホームディレクトリの共有"
+
+msgid "Shared Directories"
+msgstr "共有ディレクトリ"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"これは、samba設定を生成するための'/etc/samba/smb.conf.template' ファイルの内"
+"容です。パイプ('|')で閉じられた値は変更しないでください。これらの値は'一般設"
+"定'タブ内の値によって置き換えられます。"
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr "ワークグループ"
+
+#~ msgid "Mask for new directories"
+#~ msgstr "新規ディレクトリのマスク"
+
+#~ msgid "Mask for new files"
+#~ msgstr "新規ファイルのマスク"
diff --git a/applications/luci-app-samba4/po/ms/samba4.po b/applications/luci-app-samba4/po/ms/samba4.po
new file mode 100644
index 0000000000..9e138471d0
--- /dev/null
+++ b/applications/luci-app-samba4/po/ms/samba4.po
@@ -0,0 +1,92 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Allow guests"
+msgstr ""
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+
+msgid "Allowed users"
+msgstr ""
+
+msgid "Browseable"
+msgstr ""
+
+msgid "Create mask"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Directory mask"
+msgstr ""
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr ""
+
+msgid "Path"
+msgstr ""
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+msgid "Read-only"
+msgstr ""
+
+msgid "Share home-directories"
+msgstr ""
+
+msgid "Shared Directories"
+msgstr ""
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr ""
diff --git a/applications/luci-app-samba4/po/no/samba4.po b/applications/luci-app-samba4/po/no/samba4.po
new file mode 100644
index 0000000000..6e84259337
--- /dev/null
+++ b/applications/luci-app-samba4/po/no/samba4.po
@@ -0,0 +1,98 @@
+msgid ""
+msgstr ""
+"Last-Translator: Lars Hardy <lars.hardy@gmail.com>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Allow guests"
+msgstr "Tillat gjester"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr "Tillat systembrukere å nå sine hjemmekataloger via nettverks mapper."
+
+msgid "Allowed users"
+msgstr "Tillatte brukere"
+
+msgid "Browseable"
+msgstr ""
+
+msgid "Create mask"
+msgstr "Opprett Maske"
+
+msgid "Description"
+msgstr "Beskrivelse"
+
+msgid "Directory mask"
+msgstr "Katalog maske"
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr "Rediger Mal"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "Rediger malen som brukes til å generere samba konfigurasjonen."
+
+msgid "General Settings"
+msgstr "Generelle Innstillinger"
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Vertsnavn"
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr "Navn"
+
+msgid "Network Shares"
+msgstr "Nettverks Mapper"
+
+msgid "Path"
+msgstr "Fysisk bane"
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+msgid "Read-only"
+msgstr "Skrivebeskyttet"
+
+msgid "Share home-directories"
+msgstr "Del Hjemmekataloger"
+
+msgid "Shared Directories"
+msgstr "Delte Kataloger"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Dette er innholdet av filen '/etc/samba/smb.conf.template' som din samba "
+"konfigurasjon vil bli generert fra. Verdier omsluttet av ('|') bør ikke "
+"endres. De får sine verdier fra 'Generelle Innstillinger' fanen."
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Arbeidsgruppe"
+
+#~ msgid "Mask for new directories"
+#~ msgstr "Maske for nye kataloger"
+
+#~ msgid "Mask for new files"
+#~ msgstr "Maske for nye filer"
diff --git a/applications/luci-app-samba4/po/pl/samba4.po b/applications/luci-app-samba4/po/pl/samba4.po
new file mode 100644
index 0000000000..aec7082d53
--- /dev/null
+++ b/applications/luci-app-samba4/po/pl/samba4.po
@@ -0,0 +1,109 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-08-26 09:51+0200\n"
+"Last-Translator: Staszek <fistaszek@tlen.pl>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow guests"
+msgstr "Zezwalaj Gościom"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Użytkownicy systemu mogą dostać się do swoich katalogów domowych za "
+"pośrednictwem udziałów sieciowych."
+
+msgid "Allowed users"
+msgstr "Użytkownicy z prawem dostępu"
+
+msgid "Browseable"
+msgstr ""
+
+msgid "Create mask"
+msgstr "Utwórz maskę"
+
+msgid "Description"
+msgstr "Opis"
+
+msgid "Directory mask"
+msgstr "Maska katalogu"
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr "Edytuj szablon"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "Edytuj szablon, który jest używany do generowania konfiguracji samby."
+
+msgid "General Settings"
+msgstr "Ustawienia ogólne"
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Nazwa hosta"
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr "Nazwa"
+
+msgid "Network Shares"
+msgstr "Udziały sieciowe"
+
+msgid "Path"
+msgstr "Ścieżka"
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+msgid "Read-only"
+msgstr "Tylko do odczytu"
+
+msgid "Share home-directories"
+msgstr "Udostępniaj katalogi domowe"
+
+msgid "Shared Directories"
+msgstr "Udostępniane katalogi"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"To jest zawartość pliku '/etc/samba/smb.conf.template\", na podstawie "
+"którego zostanie wygenerowana konfiguracja samby. Wartości otoczone symbolem "
+"kreski pionowej ('|') nie powinny być zmieniane. Wartości ich zostaną "
+"pobrane z zakładki \"Ustawienia ogólne\"."
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Grupa robocza"
+
+#~ msgid "Mask for new directories"
+#~ msgstr "Maska dla nowych katalogów"
+
+#~ msgid "Mask for new files"
+#~ msgstr "Maska dla nowych plików"
diff --git a/applications/luci-app-samba4/po/pt-br/samba4.po b/applications/luci-app-samba4/po/pt-br/samba4.po
new file mode 100644
index 0000000000..8f6dbb6c99
--- /dev/null
+++ b/applications/luci-app-samba4/po/pt-br/samba4.po
@@ -0,0 +1,119 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2013-04-06 22:54+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow guests"
+msgstr "Permitir convidados"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Usuários do sistema poderão acessar seu diretório home através dos "
+"compartilhamentos de rede"
+
+msgid "Allowed users"
+msgstr "Usuários permitidos"
+
+msgid "Browseable"
+msgstr ""
+
+msgid "Create mask"
+msgstr "Máscara de criação"
+
+msgid "Description"
+msgstr "Descrição"
+
+msgid "Directory mask"
+msgstr "Máscara do diretório"
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr "Editar modelo"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "Edita o modelo que é usado para gerar a configuração do samba."
+
+msgid "General Settings"
+msgstr "Configurações Gerais"
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Nome do equipamento"
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "Network Shares"
+msgstr "Compartilhamentos de Rede"
+
+msgid "Path"
+msgstr "Caminho"
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+msgid "Read-only"
+msgstr "Somente leitura"
+
+msgid "Share home-directories"
+msgstr "Compartilhar diretórios home"
+
+msgid "Shared Directories"
+msgstr "Diretórios Compartilhados"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Este é o conteúdo do arquivo '/etc/samba/smb.conf.template' a partir do qual "
+"sua configuração do samba será gerada. Valores entre simbolos de pipe ('|') "
+"não devem ser alterados. Estes valores serão obtidos a partir da aba "
+"'Configurações Gerais'."
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Grupo de trabalho"
+
+#~ msgid "Mask for new directories"
+#~ msgstr "Máscara para novos diretórios"
+
+#~ msgid "Mask for new files"
+#~ msgstr "Máscara para novos arquivos"
+
+#~ msgid "Shared Directory"
+#~ msgstr "Diretório Compartilhado"
+
+#~ msgid "Physical Path"
+#~ msgstr "Caminho Físico"
+
+#~ msgid "optional"
+#~ msgstr "opcional"
diff --git a/applications/luci-app-samba4/po/pt/samba4.po b/applications/luci-app-samba4/po/pt/samba4.po
new file mode 100644
index 0000000000..2f8f2dafc0
--- /dev/null
+++ b/applications/luci-app-samba4/po/pt/samba4.po
@@ -0,0 +1,119 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 19:03+0200\n"
+"PO-Revision-Date: 2013-05-01 01:13+0200\n"
+"Last-Translator: pedromrgoncalves <pedromrgoncalves@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow guests"
+msgstr "Permitir Convidados"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Utilizadores do sistema poderão aceder ao seu directório home através das "
+"partilhas de rede."
+
+msgid "Allowed users"
+msgstr "Utilizadores Permitidos"
+
+msgid "Browseable"
+msgstr ""
+
+msgid "Create mask"
+msgstr "Criar Máscara"
+
+msgid "Description"
+msgstr "Descrição"
+
+msgid "Directory mask"
+msgstr "Máscara do Directório"
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr "Editar Template"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "Editar a template que é utilizada para gerar a configuração samba"
+
+msgid "General Settings"
+msgstr "Definições Gerais"
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Nome do host"
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "Network Shares"
+msgstr "Partilhas da Rede"
+
+msgid "Path"
+msgstr "Caminho"
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+msgid "Read-only"
+msgstr "Apenas Leitura"
+
+msgid "Share home-directories"
+msgstr "Partilha de directórios home"
+
+msgid "Shared Directories"
+msgstr "Directórios Partilhados"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Isto é o conteúdo do ficheiro 'etc/samba/smb.conf.template' a partir do qual "
+"será gerado o ficheiro de configuração do samba. Os valores entre o símbolo "
+"| não devem ser alterados. Eles recebem os valores do separador 'Definições "
+"Gerais'."
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Grupo de trabalho"
+
+#~ msgid "Mask for new directories"
+#~ msgstr "Máscara para novos directórios"
+
+#~ msgid "Mask for new files"
+#~ msgstr "Máscara para novos ficheiros"
+
+#~ msgid "Shared Directory"
+#~ msgstr "Diretório Compartilhado"
+
+#~ msgid "Physical Path"
+#~ msgstr "Caminho Físico"
+
+#~ msgid "optional"
+#~ msgstr "opcional"
diff --git a/applications/luci-app-samba4/po/ro/samba4.po b/applications/luci-app-samba4/po/ro/samba4.po
new file mode 100644
index 0000000000..d9f698971e
--- /dev/null
+++ b/applications/luci-app-samba4/po/ro/samba4.po
@@ -0,0 +1,108 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-10-07 17:16+0200\n"
+"Last-Translator: Daniel <daniel.petre@pitesti.rcs-rds.ro>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow guests"
+msgstr "Permite oaspeti"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Permite utilizatorii de sistem sa acceseze directoarele lor peste "
+"partajarile de retea"
+
+msgid "Allowed users"
+msgstr "Utilizatori acceptati"
+
+msgid "Browseable"
+msgstr ""
+
+msgid "Create mask"
+msgstr "Creaza masca"
+
+msgid "Description"
+msgstr "Descriere"
+
+msgid "Directory mask"
+msgstr "Masca director"
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr "Editeaza sablon"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "Editeaza sablonul care e folosit pentru generarea configuratiei samba."
+
+msgid "General Settings"
+msgstr "Setari generale"
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Numele de host"
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr "Nume"
+
+msgid "Network Shares"
+msgstr "Partajari pe retea"
+
+msgid "Path"
+msgstr "Cale"
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+msgid "Read-only"
+msgstr "Doar citire"
+
+msgid "Share home-directories"
+msgstr "Partajeaza directoarele proprii"
+
+msgid "Shared Directories"
+msgstr "Directoare partajate"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Acesta este continutul fisierului '/etc/samba/smb.conf.template' din care se "
+"genereaza configuratia samba. Valorile dintre liniuta verticala ('|') n-ar "
+"trebui schimbate, ele iau valorile direct din tab-ul de \"Setari generale\"."
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Workgroup"
+
+#~ msgid "Mask for new directories"
+#~ msgstr "Masca pentru directoarele noi"
+
+#~ msgid "Mask for new files"
+#~ msgstr "Masca pentru fisierele noi"
diff --git a/applications/luci-app-samba4/po/ru/samba4.po b/applications/luci-app-samba4/po/ru/samba4.po
new file mode 100644
index 0000000000..f588424d95
--- /dev/null
+++ b/applications/luci-app-samba4/po/ru/samba4.po
@@ -0,0 +1,114 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: LuCI: samba\n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2018-01-14 11:43+0300\n"
+"Language-Team: http://cyber-place.ru\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.7.1\n"
+"Last-Translator: Vladimir aka sunny <picfun@ya.ru>\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: ru\n"
+"Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
+"интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
+
+msgid "Allow guests"
+msgstr "Разрешить гостевой вход"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Разрешить пользователям получать доступ к их домашним папкам, через "
+"локальную сеть."
+
+msgid "Allowed users"
+msgstr "Разрешенные пользователи"
+
+msgid "Browseable"
+msgstr "Виден в списке доступных ресурсов"
+
+msgid "Create mask"
+msgstr "Создать маску"
+
+msgid "Description"
+msgstr "Описание"
+
+msgid "Directory mask"
+msgstr "Маска папок"
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr "Настройка config файла"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "Настройка config<br />файла samba."
+
+msgid "General Settings"
+msgstr "Основные настройки"
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Имя хоста"
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr "Имя"
+
+msgid "Network Shares"
+msgstr "Сетевые ресурсы"
+
+msgid "Path"
+msgstr "Путь"
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+"Добавьте папки для совместного доступа. Каждая папка - соответствует разделу "
+"на подключенном устройстве."
+
+msgid "Read-only"
+msgstr "Только для чтения"
+
+msgid "Share home-directories"
+msgstr "Совместно использовать домашние папки"
+
+msgid "Shared Directories"
+msgstr "Совместно используемые папки"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Это содержимое файла '/etc/samba/smb.conf.template', из которого "
+"генерируется config файл - samba.<br />Значения, заключенные в символы "
+"('|'), не должны быть изменены.<br />Они будут автоматически заменены на "
+"значения со страницы 'Основные настройки'."
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Рабочая группа"
+
+#~ msgid "Mask for new directories"
+#~ msgstr "Маска для новых папок"
+
+#~ msgid "Mask for new files"
+#~ msgstr "Маска для новых файлов"
diff --git a/applications/luci-app-samba4/po/sk/samba4.po b/applications/luci-app-samba4/po/sk/samba4.po
new file mode 100644
index 0000000000..53e8e214ea
--- /dev/null
+++ b/applications/luci-app-samba4/po/sk/samba4.po
@@ -0,0 +1,93 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Allow guests"
+msgstr ""
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+
+msgid "Allowed users"
+msgstr ""
+
+msgid "Browseable"
+msgstr ""
+
+msgid "Create mask"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Directory mask"
+msgstr ""
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr ""
+
+msgid "Path"
+msgstr ""
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+msgid "Read-only"
+msgstr ""
+
+msgid "Share home-directories"
+msgstr ""
+
+msgid "Shared Directories"
+msgstr ""
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr ""
diff --git a/applications/luci-app-samba4/po/sv/samba4.po b/applications/luci-app-samba4/po/sv/samba4.po
new file mode 100644
index 0000000000..d9c0cc0df9
--- /dev/null
+++ b/applications/luci-app-samba4/po/sv/samba4.po
@@ -0,0 +1,101 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Allow guests"
+msgstr "Tillåt gäster"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr "Tillåt systemanvändare att nå deras hem-mappar via nätverksdelningar"
+
+msgid "Allowed users"
+msgstr "Tillåtna användare"
+
+msgid "Browseable"
+msgstr ""
+
+msgid "Create mask"
+msgstr "Skapa mask"
+
+msgid "Description"
+msgstr "Beskrivning"
+
+msgid "Directory mask"
+msgstr "Mask för mapp"
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr "Redigera mall"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+"Redigera mallen som används för att generera konfigurationen för samba."
+
+msgid "General Settings"
+msgstr "Generella inställningar"
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Värdnamn"
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr "Namn"
+
+msgid "Network Shares"
+msgstr "Nätverksdelningar"
+
+msgid "Path"
+msgstr "Genväg"
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+msgid "Read-only"
+msgstr "Endast läsbar"
+
+msgid "Share home-directories"
+msgstr "Dela hem-mappar"
+
+msgid "Shared Directories"
+msgstr "Delade mappar"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Arbetsgrupp"
+
+#~ msgid "Mask for new directories"
+#~ msgstr "Mask för nya mappar"
+
+#~ msgid "Mask for new files"
+#~ msgstr "Mask för nya filer"
diff --git a/applications/luci-app-samba4/po/templates/samba4.pot b/applications/luci-app-samba4/po/templates/samba4.pot
new file mode 100644
index 0000000000..3041807b14
--- /dev/null
+++ b/applications/luci-app-samba4/po/templates/samba4.pot
@@ -0,0 +1,86 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Allow guests"
+msgstr ""
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+
+msgid "Allowed users"
+msgstr ""
+
+msgid "Browseable"
+msgstr ""
+
+msgid "Create mask"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Directory mask"
+msgstr ""
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr ""
+
+msgid "Path"
+msgstr ""
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+msgid "Read-only"
+msgstr ""
+
+msgid "Share home-directories"
+msgstr ""
+
+msgid "Shared Directories"
+msgstr ""
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr ""
diff --git a/applications/luci-app-samba4/po/tr/samba4.po b/applications/luci-app-samba4/po/tr/samba4.po
new file mode 100644
index 0000000000..1c233f1ec3
--- /dev/null
+++ b/applications/luci-app-samba4/po/tr/samba4.po
@@ -0,0 +1,93 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Allow guests"
+msgstr ""
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+
+msgid "Allowed users"
+msgstr ""
+
+msgid "Browseable"
+msgstr ""
+
+msgid "Create mask"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Directory mask"
+msgstr ""
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr ""
+
+msgid "Path"
+msgstr ""
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+msgid "Read-only"
+msgstr ""
+
+msgid "Share home-directories"
+msgstr ""
+
+msgid "Shared Directories"
+msgstr ""
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr ""
diff --git a/applications/luci-app-samba4/po/uk/samba4.po b/applications/luci-app-samba4/po/uk/samba4.po
new file mode 100644
index 0000000000..e228baec2e
--- /dev/null
+++ b/applications/luci-app-samba4/po/uk/samba4.po
@@ -0,0 +1,110 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-03-18 20:35+0200\n"
+"Last-Translator: YuriPet <yuripet@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow guests"
+msgstr "Дозволити гостьовий вхід"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Дозволити користувачам системи досягати своїх домашніх каталогів через "
+"загальні мережеві ресурси"
+
+msgid "Allowed users"
+msgstr "Дозволені користувачі"
+
+msgid "Browseable"
+msgstr ""
+
+msgid "Create mask"
+msgstr "Створити маску"
+
+msgid "Description"
+msgstr "Опис"
+
+msgid "Directory mask"
+msgstr "Маска каталогу"
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr "Редагувати шаблон"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+"Редагувати шаблон, який використовується для створення конфігурації samba."
+
+msgid "General Settings"
+msgstr "Загальні настройки"
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Назва (ім'я) вузла"
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr "Ім'я"
+
+msgid "Network Shares"
+msgstr "Загальні мережеві ресурси"
+
+msgid "Path"
+msgstr "Шлях"
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+msgid "Read-only"
+msgstr "Тільки читання"
+
+msgid "Share home-directories"
+msgstr "Спільно використовувати домашні каталоги"
+
+msgid "Shared Directories"
+msgstr "Загальні каталоги"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Це вміст файлу '/etc/samba/smb.conf.template', з якого буде генеруватися "
+"ваша конфігурація samba. Значення, укладені в символи \"вертикальна риска"
+"\" (\"|\") не повинні змінюватися. Вони отримують свої значення з вкладки "
+"\"Загальні налаштування\"."
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Робоча група"
+
+#~ msgid "Mask for new directories"
+#~ msgstr "Маска для нових каталогів"
+
+#~ msgid "Mask for new files"
+#~ msgstr "Маска для нових файлів"
diff --git a/applications/luci-app-samba4/po/vi/samba4.po b/applications/luci-app-samba4/po/vi/samba4.po
new file mode 100644
index 0000000000..b176471b0d
--- /dev/null
+++ b/applications/luci-app-samba4/po/vi/samba4.po
@@ -0,0 +1,122 @@
+# samba.pot
+# generated from ./applications/luci-samba/luasrc/i18n/samba.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-16 06:59+0200\n"
+"PO-Revision-Date: 2009-08-13 03:54+0200\n"
+"Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#, fuzzy
+msgid "Allow guests"
+msgstr "Cho phép khách"
+
+#, fuzzy
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Những người sử dụng hệ thống có thể tiếp cận những thư mục tại nhà thông qua "
+"mạng lưới chia sẻ trực tuyến."
+
+#, fuzzy
+msgid "Allowed users"
+msgstr "Người sử dụng được cho phép"
+
+msgid "Browseable"
+msgstr ""
+
+#, fuzzy
+msgid "Create mask"
+msgstr "Tạo Mask"
+
+msgid "Description"
+msgstr "Mô tả"
+
+#, fuzzy
+msgid "Directory mask"
+msgstr "Thư mục Mask"
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr "tên máy chủ"
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr "Mạng chia sẻ"
+
+msgid "Path"
+msgstr ""
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr ""
+
+#, fuzzy
+msgid "Read-only"
+msgstr "Chỉ đọc "
+
+msgid "Share home-directories"
+msgstr "Chia sẻ danh bạ chính"
+
+msgid "Shared Directories"
+msgstr "Thư mục chia sẻ"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Nhóm làm việc "
+
+#~ msgid "Mask for new directories"
+#~ msgstr "Mask cho thư mục mới"
+
+#~ msgid "Mask for new files"
+#~ msgstr "Mask cho tập tin mới"
+
+#~ msgid "Shared Directory"
+#~ msgstr "Đã chia sẻ thư mục"
+
+#~ msgid "Physical Path"
+#~ msgstr "Đường dẫn vật lý"
+
+#~ msgid "optional"
+#~ msgstr "Tùy thích"
diff --git a/applications/luci-app-samba4/po/zh-cn/samba4.po b/applications/luci-app-samba4/po/zh-cn/samba4.po
new file mode 100644
index 0000000000..3790355d9a
--- /dev/null
+++ b/applications/luci-app-samba4/po/zh-cn/samba4.po
@@ -0,0 +1,112 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2017-10-29 15:36+0800\n"
+"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+msgid "Allow guests"
+msgstr "允许匿名用户"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr "允许系统用户通过网络共享访问他们的家目录"
+
+msgid "Allowed users"
+msgstr "允许用户"
+
+msgid "Browseable"
+msgstr "可浏览"
+
+msgid "Create mask"
+msgstr "创建权限掩码"
+
+msgid "Description"
+msgstr "描述"
+
+msgid "Directory mask"
+msgstr "目录权限掩码"
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr "编辑模板"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "编辑用来生成 samba 设置的模板"
+
+msgid "General Settings"
+msgstr "基本设置"
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr "主机名"
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr "共享名"
+
+msgid "Network Shares"
+msgstr "网络共享"
+
+msgid "Path"
+msgstr "目录"
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr "请添加要共享的目录。每个目录指到已挂载设备上的文件夹。"
+
+msgid "Read-only"
+msgstr "只读"
+
+msgid "Share home-directories"
+msgstr "共享家目录"
+
+msgid "Shared Directories"
+msgstr "共享目录"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"这是将从其上生成 samba 配置的文件“/etc/samba/smb.conf.template”的内容。由管道"
+"符(“|”)包围的值不应更改。它们将从“常规设置”标签中获取其值。"
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr "工作组"
+
+#~ msgid "Mask for new directories"
+#~ msgstr "新目录权限掩码"
+
+#~ msgid "Mask for new files"
+#~ msgstr "新文件权限掩码"
+
+#~ msgid "Physical Path"
+#~ msgstr "物理路径"
diff --git a/applications/luci-app-samba4/po/zh-tw/samba4.po b/applications/luci-app-samba4/po/zh-tw/samba4.po
new file mode 100644
index 0000000000..a897f8957d
--- /dev/null
+++ b/applications/luci-app-samba4/po/zh-tw/samba4.po
@@ -0,0 +1,112 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2017-10-29 15:36+0800\n"
+"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+msgid "Allow guests"
+msgstr "允許匿名使用者"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr "允許系統使用者通過網路共享訪問他們的家目錄"
+
+msgid "Allowed users"
+msgstr "允許使用者"
+
+msgid "Browseable"
+msgstr "可瀏覽"
+
+msgid "Create mask"
+msgstr "建立權限掩碼"
+
+msgid "Description"
+msgstr "描述"
+
+msgid "Directory mask"
+msgstr "目錄權限掩碼"
+
+msgid "Disable Active Directory Domain Controller"
+msgstr ""
+
+msgid "Disable Netbios"
+msgstr ""
+
+msgid "Disable Winbind"
+msgstr ""
+
+msgid "Edit Template"
+msgstr "編輯模板"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "編輯用來生成 samba 設定的模板"
+
+msgid "General Settings"
+msgstr "基本設定"
+
+msgid "Guests only"
+msgstr ""
+
+msgid "Hostname"
+msgstr "主機名"
+
+msgid "Inherit owner"
+msgstr ""
+
+msgid "Name"
+msgstr "共享名"
+
+msgid "Network Shares"
+msgstr "網路共享"
+
+msgid "Path"
+msgstr "目錄"
+
+msgid ""
+"Please add directories to share. Each directory refers to a folder on a "
+"mounted device."
+msgstr "請新增要共享的目錄。每個目錄指到已掛載裝置上的資料夾。"
+
+msgid "Read-only"
+msgstr "只讀"
+
+msgid "Share home-directories"
+msgstr "共享家目錄"
+
+msgid "Shared Directories"
+msgstr "共享目錄"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"這是將從其上生成 samba 配置的檔案“/etc/samba/smb.conf.template”的內容。由管道"
+"符(“|”)包圍的值不應更改。它們將從“常規設定”標籤中獲取其值。"
+
+msgid "Vfs objects"
+msgstr ""
+
+msgid "Workgroup"
+msgstr "工作組"
+
+#~ msgid "Mask for new directories"
+#~ msgstr "新目錄權限掩碼"
+
+#~ msgid "Mask for new files"
+#~ msgstr "新檔案權限掩碼"
+
+#~ msgid "Physical Path"
+#~ msgstr "物理路徑"
diff --git a/applications/luci-app-simple-adblock/Makefile b/applications/luci-app-simple-adblock/Makefile
index fa98f8e0f4..2471078fc3 100644
--- a/applications/luci-app-simple-adblock/Makefile
+++ b/applications/luci-app-simple-adblock/Makefile
@@ -10,7 +10,7 @@ LUCI_TITLE:=Simple Adblock Web UI
LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service.
LUCI_DEPENDS:=+luci-mod-admin-full +simple-adblock
LUCI_PKGARCH:=all
-PKG_RELEASE:=14
+PKG_RELEASE:=16
include ../../luci.mk
diff --git a/applications/luci-app-simple-adblock/luasrc/controller/simpleadblock.lua b/applications/luci-app-simple-adblock/luasrc/controller/simpleadblock.lua
deleted file mode 100644
index 46125b3098..0000000000
--- a/applications/luci-app-simple-adblock/luasrc/controller/simpleadblock.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-module("luci.controller.simpleadblock", package.seeall)
-function index()
- if not nixio.fs.access("/etc/config/simple-adblock") then
- return
- end
- entry({"admin", "services", "simpleadblock"}, cbi("simpleadblock"), _("Simple AdBlock"))
-end
diff --git a/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua
index aa62ff56c0..4dbb21c6ed 100644
--- a/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua
+++ b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua
@@ -24,7 +24,7 @@ else
if enabledFlag ~= "1" or status:match("Stopped") then
en.title = translate("Service is disabled/stopped")
en.inputtitle = translate("Enable/Start")
- en.inputstyle = "apply"
+ en.inputstyle = "apply important"
if nixio.fs.access("/var/simple-adblock.cache") then
ds = h:option(DummyValue, "_dummy", translate("Service Status"))
ds.template = "simple-adblock/status"
@@ -33,7 +33,7 @@ else
else
en.title = translate("Service is enabled/started")
en.inputtitle = translate("Stop/Disable")
- en.inputstyle = "reset"
+ en.inputstyle = "reset important"
ds = h:option(DummyValue, "_dummy", translate("Service Status"))
ds.template = "simple-adblock/status"
ds.value = status
@@ -41,7 +41,7 @@ else
reload = h:option(Button, "__reload")
reload.title = translate("Service started with error")
reload.inputtitle = translate("Reload")
- reload.inputstyle = "apply"
+ reload.inputstyle = "apply important"
function reload.write()
luci.sys.exec("/etc/init.d/simple-adblock reload")
luci.http.redirect(luci.dispatcher.build_url("admin/services/" .. packageName))
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 6c98eb6cea..21e34d5bca 100644
--- a/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
@@ -12,6 +12,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"Language: ja\n"
+msgid "Advanced Configuration"
+msgstr ""
+
+msgid "Basic Configuration"
+msgstr ""
+
msgid "Blacklisted Domain URLs"
msgstr "ドメイン ブラックリストのURL"
@@ -21,9 +27,30 @@ msgstr "ブラックリスト ドメイン"
msgid "Blacklisted Hosts URLs"
msgstr "hosts ブラックリストのURL"
+msgid "Configuration"
+msgstr ""
+
msgid "Controls system log and console output verbosity"
msgstr "システム ログとコンソール出力の冗長性を設定します。"
+msgid "Delay (in seconds) for on-boot start"
+msgstr ""
+
+msgid "Disable Debugging"
+msgstr ""
+
+msgid "Download time-out (in seconds)"
+msgstr ""
+
+msgid "Enable Debugging"
+msgstr ""
+
+msgid "Enable/Start"
+msgstr ""
+
+msgid "Enables debug output to /tmp/simple-adblock.log"
+msgstr ""
+
msgid "Force Router DNS"
msgstr "ルーターDNSの強制"
@@ -53,6 +80,24 @@ msgstr "出力詳細度の設定"
msgid "Pick the LED not already used in"
msgstr "右の設定で既に使用されていないLEDを選択します"
+msgid "Reload"
+msgstr ""
+
+msgid "Run service after set delay on boot"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid "Service is disabled/stopped"
+msgstr ""
+
+msgid "Service is enabled/started"
+msgstr ""
+
+msgid "Service started with error"
+msgstr ""
+
msgid "Simple AdBlock"
msgstr "Simple AdBlock"
@@ -65,6 +110,12 @@ msgstr "軽量出力"
msgid "Start Simple Adblock service"
msgstr ""
+msgid "Stop the download if it is stalled for set number of seconds"
+msgstr ""
+
+msgid "Stop/Disable"
+msgstr ""
+
msgid "Suppress output"
msgstr "出力の抑制"
@@ -83,6 +134,9 @@ msgstr "ブラックリストに登録するドメインが列挙された、hos
msgid "Verbose output"
msgstr "詳細出力"
+msgid "Whitelist and Blocklist Management"
+msgstr ""
+
msgid "Whitelisted Domain URLs"
msgstr "ドメイン ホワイトリストのURL"
diff --git a/applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po b/applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po
index d298e94902..7c55805fab 100644
--- a/applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po
@@ -1,6 +1,12 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8\n"
+msgid "Advanced Configuration"
+msgstr ""
+
+msgid "Basic Configuration"
+msgstr ""
+
msgid "Blacklisted Domain URLs"
msgstr "Endereço com lista de Domínio para a Lista Negra"
@@ -10,11 +16,32 @@ msgstr "Domínios para a Lista Negra"
msgid "Blacklisted Hosts URLs"
msgstr "Endereços de Hosts para a Lista Negra"
+msgid "Configuration"
+msgstr ""
+
msgid "Controls system log and console output verbosity"
msgstr ""
"Controla o sistema de registro e o detalhamento das mensagens de saída do "
"console"
+msgid "Delay (in seconds) for on-boot start"
+msgstr ""
+
+msgid "Disable Debugging"
+msgstr ""
+
+msgid "Download time-out (in seconds)"
+msgstr ""
+
+msgid "Enable Debugging"
+msgstr ""
+
+msgid "Enable/Start"
+msgstr ""
+
+msgid "Enables debug output to /tmp/simple-adblock.log"
+msgstr ""
+
msgid "Force Router DNS"
msgstr "Forçar o DNS do Roteador"
@@ -46,6 +73,24 @@ msgstr "Definição do detalhamento do registro"
msgid "Pick the LED not already used in"
msgstr "Escolha um LED não usando em"
+msgid "Reload"
+msgstr ""
+
+msgid "Run service after set delay on boot"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid "Service is disabled/stopped"
+msgstr ""
+
+msgid "Service is enabled/started"
+msgstr ""
+
+msgid "Service started with error"
+msgstr ""
+
msgid "Simple AdBlock"
msgstr "Simple AdBlock"
@@ -58,6 +103,12 @@ msgstr "Pouco detalhado"
msgid "Start Simple Adblock service"
msgstr ""
+msgid "Stop the download if it is stalled for set number of seconds"
+msgstr ""
+
+msgid "Stop/Disable"
+msgstr ""
+
msgid "Suppress output"
msgstr "Suprimir"
@@ -76,6 +127,9 @@ msgstr "Endereço da lista dos hosts para a Lista Negra"
msgid "Verbose output"
msgstr "Detalhado"
+msgid "Whitelist and Blocklist Management"
+msgstr ""
+
msgid "Whitelisted Domain URLs"
msgstr "Endereço com lista de domínio para a Lista Branca"
diff --git a/applications/luci-app-simple-adblock/po/pt/simple-adblock.po b/applications/luci-app-simple-adblock/po/pt/simple-adblock.po
index d298e94902..7c55805fab 100644
--- a/applications/luci-app-simple-adblock/po/pt/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/pt/simple-adblock.po
@@ -1,6 +1,12 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8\n"
+msgid "Advanced Configuration"
+msgstr ""
+
+msgid "Basic Configuration"
+msgstr ""
+
msgid "Blacklisted Domain URLs"
msgstr "Endereço com lista de Domínio para a Lista Negra"
@@ -10,11 +16,32 @@ msgstr "Domínios para a Lista Negra"
msgid "Blacklisted Hosts URLs"
msgstr "Endereços de Hosts para a Lista Negra"
+msgid "Configuration"
+msgstr ""
+
msgid "Controls system log and console output verbosity"
msgstr ""
"Controla o sistema de registro e o detalhamento das mensagens de saída do "
"console"
+msgid "Delay (in seconds) for on-boot start"
+msgstr ""
+
+msgid "Disable Debugging"
+msgstr ""
+
+msgid "Download time-out (in seconds)"
+msgstr ""
+
+msgid "Enable Debugging"
+msgstr ""
+
+msgid "Enable/Start"
+msgstr ""
+
+msgid "Enables debug output to /tmp/simple-adblock.log"
+msgstr ""
+
msgid "Force Router DNS"
msgstr "Forçar o DNS do Roteador"
@@ -46,6 +73,24 @@ msgstr "Definição do detalhamento do registro"
msgid "Pick the LED not already used in"
msgstr "Escolha um LED não usando em"
+msgid "Reload"
+msgstr ""
+
+msgid "Run service after set delay on boot"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid "Service is disabled/stopped"
+msgstr ""
+
+msgid "Service is enabled/started"
+msgstr ""
+
+msgid "Service started with error"
+msgstr ""
+
msgid "Simple AdBlock"
msgstr "Simple AdBlock"
@@ -58,6 +103,12 @@ msgstr "Pouco detalhado"
msgid "Start Simple Adblock service"
msgstr ""
+msgid "Stop the download if it is stalled for set number of seconds"
+msgstr ""
+
+msgid "Stop/Disable"
+msgstr ""
+
msgid "Suppress output"
msgstr "Suprimir"
@@ -76,6 +127,9 @@ msgstr "Endereço da lista dos hosts para a Lista Negra"
msgid "Verbose output"
msgstr "Detalhado"
+msgid "Whitelist and Blocklist Management"
+msgstr ""
+
msgid "Whitelisted Domain URLs"
msgstr "Endereço com lista de domínio para a Lista Branca"
diff --git a/applications/luci-app-simple-adblock/po/ru/simple-adblock.po b/applications/luci-app-simple-adblock/po/ru/simple-adblock.po
index 01e07ddd24..bb536b2306 100644
--- a/applications/luci-app-simple-adblock/po/ru/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/ru/simple-adblock.po
@@ -15,6 +15,12 @@ msgstr ""
"Project-Info: Это технический перевод, не дословный. Главное-удобный русский интерфейс, все проверялось в "
"графическом режиме, совместим с другими apps\n"
+msgid "Advanced Configuration"
+msgstr ""
+
+msgid "Basic Configuration"
+msgstr ""
+
msgid "Blacklisted Domain URLs"
msgstr "URL ссылки Черных<br />списков доменов"
@@ -24,9 +30,30 @@ msgstr "Черный список доменов"
msgid "Blacklisted Hosts URLs"
msgstr "URL ссылки Черных<br />списков хостов"
+msgid "Configuration"
+msgstr ""
+
msgid "Controls system log and console output verbosity"
msgstr "Детальная настройка записи событий в системный журнал."
+msgid "Delay (in seconds) for on-boot start"
+msgstr ""
+
+msgid "Disable Debugging"
+msgstr ""
+
+msgid "Download time-out (in seconds)"
+msgstr ""
+
+msgid "Enable Debugging"
+msgstr ""
+
+msgid "Enable/Start"
+msgstr ""
+
+msgid "Enables debug output to /tmp/simple-adblock.log"
+msgstr ""
+
msgid "Force Router DNS"
msgstr "Назначить DNS роутера"
@@ -57,6 +84,24 @@ msgstr "Настройка журнала"
msgid "Pick the LED not already used in"
msgstr "Выберите LED не используется на странице"
+msgid "Reload"
+msgstr ""
+
+msgid "Run service after set delay on boot"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid "Service is disabled/stopped"
+msgstr ""
+
+msgid "Service is enabled/started"
+msgstr ""
+
+msgid "Service started with error"
+msgstr ""
+
msgid "Simple AdBlock"
msgstr "Simple AdBlock"
@@ -69,6 +114,12 @@ msgstr "Частичная запись"
msgid "Start Simple Adblock service"
msgstr "Запуск сервиса Simple Adblock"
+msgid "Stop the download if it is stalled for set number of seconds"
+msgstr ""
+
+msgid "Stop/Disable"
+msgstr ""
+
msgid "Suppress output"
msgstr "Запретить запись"
@@ -87,6 +138,9 @@ msgstr "URL ссылки Черных списков хостов."
msgid "Verbose output"
msgstr "Подробная запись"
+msgid "Whitelist and Blocklist Management"
+msgstr ""
+
msgid "Whitelisted Domain URLs"
msgstr "URL ссылки Белых списков доменов"
diff --git a/applications/luci-app-simple-adblock/po/sv/simple-adblock.po b/applications/luci-app-simple-adblock/po/sv/simple-adblock.po
index 33408e1839..5d9b9c4adc 100644
--- a/applications/luci-app-simple-adblock/po/sv/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/sv/simple-adblock.po
@@ -1,6 +1,12 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8\n"
+msgid "Advanced Configuration"
+msgstr ""
+
+msgid "Basic Configuration"
+msgstr ""
+
msgid "Blacklisted Domain URLs"
msgstr "Svartlistade domänadresser"
@@ -10,9 +16,30 @@ msgstr "Svartlistade domäner"
msgid "Blacklisted Hosts URLs"
msgstr "Svartlistade värdadresser"
+msgid "Configuration"
+msgstr ""
+
msgid "Controls system log and console output verbosity"
msgstr "Kontrollerar systemloggar och detaljnivån för konsoll-utmatningen"
+msgid "Delay (in seconds) for on-boot start"
+msgstr ""
+
+msgid "Disable Debugging"
+msgstr ""
+
+msgid "Download time-out (in seconds)"
+msgstr ""
+
+msgid "Enable Debugging"
+msgstr ""
+
+msgid "Enable/Start"
+msgstr ""
+
+msgid "Enables debug output to /tmp/simple-adblock.log"
+msgstr ""
+
msgid "Force Router DNS"
msgstr ""
@@ -40,6 +67,24 @@ msgstr ""
msgid "Pick the LED not already used in"
msgstr ""
+msgid "Reload"
+msgstr ""
+
+msgid "Run service after set delay on boot"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid "Service is disabled/stopped"
+msgstr ""
+
+msgid "Service is enabled/started"
+msgstr ""
+
+msgid "Service started with error"
+msgstr ""
+
msgid "Simple AdBlock"
msgstr "Simple AdBlock"
@@ -52,6 +97,12 @@ msgstr "Viss utmatning"
msgid "Start Simple Adblock service"
msgstr ""
+msgid "Stop the download if it is stalled for set number of seconds"
+msgstr ""
+
+msgid "Stop/Disable"
+msgstr ""
+
msgid "Suppress output"
msgstr "Förträng utmatning"
@@ -70,6 +121,9 @@ msgstr ""
msgid "Verbose output"
msgstr "Utförlig utmatning"
+msgid "Whitelist and Blocklist Management"
+msgstr ""
+
msgid "Whitelisted Domain URLs"
msgstr "Vitlistade domänadresser"
diff --git a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
index 8414e4a2c9..38baf58a44 100644
--- a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
+++ b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
@@ -1,6 +1,12 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
+msgid "Advanced Configuration"
+msgstr ""
+
+msgid "Basic Configuration"
+msgstr ""
+
msgid "Blacklisted Domain URLs"
msgstr ""
@@ -10,12 +16,30 @@ msgstr ""
msgid "Blacklisted Hosts URLs"
msgstr ""
+msgid "Configuration"
+msgstr ""
+
msgid "Controls system log and console output verbosity"
msgstr ""
+msgid "Delay (in seconds) for on-boot start"
+msgstr ""
+
+msgid "Disable Debugging"
+msgstr ""
+
+msgid "Download time-out (in seconds)"
+msgstr ""
+
+msgid "Enable Debugging"
+msgstr ""
+
msgid "Enable/Start"
msgstr ""
+msgid "Enables debug output to /tmp/simple-adblock.log"
+msgstr ""
+
msgid "Force Router DNS"
msgstr ""
@@ -43,12 +67,24 @@ msgstr ""
msgid "Pick the LED not already used in"
msgstr ""
+msgid "Reload"
+msgstr ""
+
+msgid "Run service after set delay on boot"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
msgid "Service is disabled/stopped"
msgstr ""
msgid "Service is enabled/started"
msgstr ""
+msgid "Service started with error"
+msgstr ""
+
msgid "Simple AdBlock"
msgstr ""
@@ -58,6 +94,9 @@ msgstr ""
msgid "Some output"
msgstr ""
+msgid "Stop the download if it is stalled for set number of seconds"
+msgstr ""
+
msgid "Stop/Disable"
msgstr ""
@@ -79,6 +118,9 @@ msgstr ""
msgid "Verbose output"
msgstr ""
+msgid "Whitelist and Blocklist Management"
+msgstr ""
+
msgid "Whitelisted Domain URLs"
msgstr ""
diff --git a/applications/luci-app-transmission/luasrc/model/cbi/transmission.lua b/applications/luci-app-transmission/luasrc/model/cbi/transmission.lua
index ec19f477b2..fd4deba97f 100644
--- a/applications/luci-app-transmission/luasrc/model/cbi/transmission.lua
+++ b/applications/luci-app-transmission/luasrc/model/cbi/transmission.lua
@@ -8,7 +8,7 @@ require("luci.model.ipkg")
local uci = require "luci.model.uci".cursor()
local trport = uci:get_first("transmission", "transmission", "rpc_port") or 9091
local running = (luci.sys.call("pidof transmission-daemon > /dev/null") == 0)
-local webinstalled = luci.model.ipkg.installed("transmission-web")
+local webinstalled = luci.model.ipkg.installed("transmission-web") or uci:get_first("transmission", "transmission", "web_home")
local button = ""
if running and webinstalled then
button = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type=\"button\" value=\" " .. translate("Open Web Interface") .. " \" onclick=\"window.open('http://'+window.location.hostname+':" .. trport .. "')\"/>"
@@ -29,6 +29,7 @@ for _, p_user in luci.util.vspairs(luci.util.split(luci.sys.exec("cat /etc/passw
user:value(p_user)
end
cache_size_mb=s:option(Value, "cache_size_mb", translate("Cache size in MB"))
+web_home=s:option(Value, "web_home", translate("Custom WEB UI directory"))
bandwidth=m:section(TypedSection, "transmission", translate("Bandwidth settings"))
bandwidth.anonymous=true
diff --git a/applications/luci-app-upnp/po/ca/upnp.po b/applications/luci-app-upnp/po/ca/upnp.po
index 398c87ecb6..0248b669bf 100644
--- a/applications/luci-app-upnp/po/ca/upnp.po
+++ b/applications/luci-app-upnp/po/ca/upnp.po
@@ -97,6 +97,9 @@ msgstr "Ports externs"
msgid "General Settings"
msgstr "Ajusts generals"
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr "Adreces internes"
@@ -149,6 +152,9 @@ msgstr "Fitxer d'arrendament UPnP"
msgid "Universal Plug & Play"
msgstr "Universal Plug & Play"
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr "Enllaç de pujada"
diff --git a/applications/luci-app-upnp/po/cs/upnp.po b/applications/luci-app-upnp/po/cs/upnp.po
index adb4d19ab1..4757826ccd 100644
--- a/applications/luci-app-upnp/po/cs/upnp.po
+++ b/applications/luci-app-upnp/po/cs/upnp.po
@@ -93,6 +93,9 @@ msgstr "Vnější porty"
msgid "General Settings"
msgstr "Obecné nastavení"
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr "Vnitřní adresy"
@@ -144,6 +147,9 @@ msgstr "Soubor UPnP výpůjček"
msgid "Universal Plug & Play"
msgstr "Univerzální Plug & Play"
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr "Uplink"
diff --git a/applications/luci-app-upnp/po/de/upnp.po b/applications/luci-app-upnp/po/de/upnp.po
index bdafbf1054..8609f18703 100644
--- a/applications/luci-app-upnp/po/de/upnp.po
+++ b/applications/luci-app-upnp/po/de/upnp.po
@@ -95,6 +95,9 @@ msgstr "Externe Ports"
msgid "General Settings"
msgstr "Allgemeine Einstellungen"
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr "Interne Adressen"
@@ -147,6 +150,9 @@ msgstr "UPnP Lease-Datei"
msgid "Universal Plug & Play"
msgstr "Universal Plug & Play"
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr "Uplink"
diff --git a/applications/luci-app-upnp/po/el/upnp.po b/applications/luci-app-upnp/po/el/upnp.po
index c02b0ce29a..74035ff923 100644
--- a/applications/luci-app-upnp/po/el/upnp.po
+++ b/applications/luci-app-upnp/po/el/upnp.po
@@ -92,6 +92,9 @@ msgstr ""
msgid "General Settings"
msgstr ""
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr ""
@@ -142,6 +145,9 @@ msgstr ""
msgid "Universal Plug & Play"
msgstr ""
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr ""
diff --git a/applications/luci-app-upnp/po/en/upnp.po b/applications/luci-app-upnp/po/en/upnp.po
index eae23a13a0..462e82522f 100644
--- a/applications/luci-app-upnp/po/en/upnp.po
+++ b/applications/luci-app-upnp/po/en/upnp.po
@@ -92,6 +92,9 @@ msgstr ""
msgid "General Settings"
msgstr ""
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr ""
@@ -142,6 +145,9 @@ msgstr ""
msgid "Universal Plug & Play"
msgstr "Universal Plug & Play"
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr "Uplink"
diff --git a/applications/luci-app-upnp/po/es/upnp.po b/applications/luci-app-upnp/po/es/upnp.po
index 6c9c262607..bc2f341fad 100644
--- a/applications/luci-app-upnp/po/es/upnp.po
+++ b/applications/luci-app-upnp/po/es/upnp.po
@@ -95,6 +95,9 @@ msgstr "Puertos externos"
msgid "General Settings"
msgstr "Configuración general"
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr "Direcciones internas"
@@ -147,6 +150,9 @@ msgstr "Tiempo de cesión UPnP"
msgid "Universal Plug & Play"
msgstr "Plug & Play universal"
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr "Enlace de subida"
diff --git a/applications/luci-app-upnp/po/fr/upnp.po b/applications/luci-app-upnp/po/fr/upnp.po
index f8b2a8536a..eb6cc84764 100644
--- a/applications/luci-app-upnp/po/fr/upnp.po
+++ b/applications/luci-app-upnp/po/fr/upnp.po
@@ -97,6 +97,9 @@ msgstr "Ports externes"
msgid "General Settings"
msgstr "Paramètres généraux"
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr "Adresses internes"
@@ -150,6 +153,9 @@ msgstr "Fichier des baux UPnP"
msgid "Universal Plug & Play"
msgstr "Universal Plug & Play"
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr "Lien remontant"
diff --git a/applications/luci-app-upnp/po/he/upnp.po b/applications/luci-app-upnp/po/he/upnp.po
index 387444f152..9d5e30b82d 100644
--- a/applications/luci-app-upnp/po/he/upnp.po
+++ b/applications/luci-app-upnp/po/he/upnp.po
@@ -88,6 +88,9 @@ msgstr ""
msgid "General Settings"
msgstr ""
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr ""
@@ -138,6 +141,9 @@ msgstr ""
msgid "Universal Plug & Play"
msgstr ""
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr ""
diff --git a/applications/luci-app-upnp/po/hu/upnp.po b/applications/luci-app-upnp/po/hu/upnp.po
index 21bc7b59c0..7e08cc0967 100644
--- a/applications/luci-app-upnp/po/hu/upnp.po
+++ b/applications/luci-app-upnp/po/hu/upnp.po
@@ -95,6 +95,9 @@ msgstr "Külső portok"
msgid "General Settings"
msgstr "Általános beállítások"
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr "Belső címek"
@@ -147,6 +150,9 @@ msgstr "UPnP bérlet fájl"
msgid "Universal Plug & Play"
msgstr "Univerzális Plug and Play"
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr "Feltöltés"
diff --git a/applications/luci-app-upnp/po/it/upnp.po b/applications/luci-app-upnp/po/it/upnp.po
index 8e498c34b0..6c419aa6e6 100644
--- a/applications/luci-app-upnp/po/it/upnp.po
+++ b/applications/luci-app-upnp/po/it/upnp.po
@@ -95,6 +95,9 @@ msgstr "Porte Esterne"
msgid "General Settings"
msgstr "Opzioni Generali"
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr "Indirizzi Interni"
@@ -147,6 +150,9 @@ msgstr "UPnP lease file"
msgid "Universal Plug & Play"
msgstr "Universal Plug & Play"
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr "Uplink"
diff --git a/applications/luci-app-upnp/po/ja/upnp.po b/applications/luci-app-upnp/po/ja/upnp.po
index 4e6f879dc0..cb4608a316 100644
--- a/applications/luci-app-upnp/po/ja/upnp.po
+++ b/applications/luci-app-upnp/po/ja/upnp.po
@@ -95,6 +95,9 @@ msgstr "外部ポート"
msgid "General Settings"
msgstr "一般設定"
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr "内部アドレス"
@@ -147,6 +150,9 @@ msgstr "UPnP リースファイル"
msgid "Universal Plug & Play"
msgstr "ユニバーサル プラグ & プレイ"
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr "アップリンク"
diff --git a/applications/luci-app-upnp/po/ms/upnp.po b/applications/luci-app-upnp/po/ms/upnp.po
index 834d6546ab..07f9757160 100644
--- a/applications/luci-app-upnp/po/ms/upnp.po
+++ b/applications/luci-app-upnp/po/ms/upnp.po
@@ -87,6 +87,9 @@ msgstr ""
msgid "General Settings"
msgstr ""
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr ""
@@ -137,6 +140,9 @@ msgstr ""
msgid "Universal Plug & Play"
msgstr ""
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr ""
diff --git a/applications/luci-app-upnp/po/no/upnp.po b/applications/luci-app-upnp/po/no/upnp.po
index f313b42ee9..e4800e897b 100644
--- a/applications/luci-app-upnp/po/no/upnp.po
+++ b/applications/luci-app-upnp/po/no/upnp.po
@@ -86,6 +86,9 @@ msgstr "Eksterne porter"
msgid "General Settings"
msgstr "Generelle Innstillinger"
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr "Interne adresser"
@@ -138,6 +141,9 @@ msgstr "UPnP leie fil"
msgid "Universal Plug & Play"
msgstr "Universal Plug & Play"
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr "Opplinje"
diff --git a/applications/luci-app-upnp/po/pl/upnp.po b/applications/luci-app-upnp/po/pl/upnp.po
index fb1f0a4bdd..0b282ea248 100644
--- a/applications/luci-app-upnp/po/pl/upnp.po
+++ b/applications/luci-app-upnp/po/pl/upnp.po
@@ -94,6 +94,9 @@ msgstr "Porty zewnętrzne"
msgid "General Settings"
msgstr "Ustawienia główne"
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr "Adresy wewnętrzne"
@@ -145,6 +148,9 @@ msgstr "Plik dzierżawy UPnP"
msgid "Universal Plug & Play"
msgstr "Universal Plug & Play"
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr "Uplink"
diff --git a/applications/luci-app-upnp/po/pt-br/upnp.po b/applications/luci-app-upnp/po/pt-br/upnp.po
index 705bbde617..0fcf6eb369 100644
--- a/applications/luci-app-upnp/po/pt-br/upnp.po
+++ b/applications/luci-app-upnp/po/pt-br/upnp.po
@@ -96,6 +96,9 @@ msgstr "Portas Externas"
msgid "General Settings"
msgstr "Configurações Gerais"
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr "Endereços internos"
@@ -148,6 +151,9 @@ msgstr "Arquivo de concessão do UPnP"
msgid "Universal Plug & Play"
msgstr "Plug & Play Universal"
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr "Velocidade de envio do enlace (uplink)"
diff --git a/applications/luci-app-upnp/po/pt/upnp.po b/applications/luci-app-upnp/po/pt/upnp.po
index e1ee340e30..a46d5e6295 100644
--- a/applications/luci-app-upnp/po/pt/upnp.po
+++ b/applications/luci-app-upnp/po/pt/upnp.po
@@ -92,6 +92,9 @@ msgstr ""
msgid "General Settings"
msgstr ""
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr ""
@@ -142,6 +145,9 @@ msgstr ""
msgid "Universal Plug & Play"
msgstr "Plug & Play Universal"
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr "Link para Upload"
diff --git a/applications/luci-app-upnp/po/ro/upnp.po b/applications/luci-app-upnp/po/ro/upnp.po
index 8525279d00..12623db658 100644
--- a/applications/luci-app-upnp/po/ro/upnp.po
+++ b/applications/luci-app-upnp/po/ro/upnp.po
@@ -94,6 +94,9 @@ msgstr "Porturi externe"
msgid "General Settings"
msgstr "Setari generale"
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr "Adrese interne"
@@ -145,6 +148,9 @@ msgstr "Fisierul de conexiuni UPnP"
msgid "Universal Plug & Play"
msgstr "Universal Plug & Play"
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr "Uplink"
diff --git a/applications/luci-app-upnp/po/ru/upnp.po b/applications/luci-app-upnp/po/ru/upnp.po
index 878f83eafb..5e0074534a 100644
--- a/applications/luci-app-upnp/po/ru/upnp.po
+++ b/applications/luci-app-upnp/po/ru/upnp.po
@@ -8,7 +8,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7.1\n"
-"Last-Translator: Vladimir aka sunny <picfun@ya.ru>\n"
+"Last-Translator: Olimjon aka Kobin23 <olimko98@gmail.com>\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"Language: ru\n"
@@ -32,7 +32,7 @@ msgid "Advanced Settings"
msgstr "Дополнительные настройки"
msgid "Advertise as IGDv1 device instead of IGDv2"
-msgstr ""
+msgstr "Объявить как IGDv1 устройство вместо IGDv2"
msgid "Allow adding forwards only to requesting ip addresses"
msgstr "Разрешить перенаправление только для запрашивающих IP-адресов."
@@ -74,7 +74,7 @@ msgid "Downlink"
msgstr "Внутреннее соединение"
msgid "Enable IGDv1 mode"
-msgstr ""
+msgstr "IGDv1 режим"
msgid "Enable NAT-PMP functionality"
msgstr "Включить NAT-PMP"
@@ -83,10 +83,10 @@ msgid "Enable UPnP functionality"
msgstr "Включить UPnP"
msgid "Enable additional logging"
-msgstr "Включить дополнительное журналирование"
+msgstr "Дополнительное журналирование"
msgid "Enable secure mode"
-msgstr "Использовать<br />защищённый режим"
+msgstr "Защищённый режим"
msgid "External Port"
msgstr "Внешний порт"
@@ -97,6 +97,9 @@ msgstr "Внешние порты"
msgid "General Settings"
msgstr "Основные настройки"
+msgid "Host"
+msgstr "Хост"
+
msgid "Internal addresses"
msgstr "Внутренние адреса"
@@ -125,7 +128,7 @@ msgid "Puts extra debugging information into the system log"
msgstr "Добавлять дополнительную отладочную информацию в системный журнал."
msgid "Report system instead of daemon uptime"
-msgstr "Сообщать время работы системы вместо сервиса"
+msgstr "Сообщать время работы системы вместо службы"
msgid "Start UPnP and NAT-PMP service"
msgstr "Запустить службы<br />UPnP и NAT-PMP"
@@ -149,6 +152,9 @@ msgstr "Файл аренды UPnP"
msgid "Universal Plug & Play"
msgstr "Universal Plug & Play"
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr "Внешнее соединение"
diff --git a/applications/luci-app-upnp/po/sk/upnp.po b/applications/luci-app-upnp/po/sk/upnp.po
index 81ded2220f..fda2e6be7f 100644
--- a/applications/luci-app-upnp/po/sk/upnp.po
+++ b/applications/luci-app-upnp/po/sk/upnp.po
@@ -88,6 +88,9 @@ msgstr ""
msgid "General Settings"
msgstr ""
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr ""
@@ -138,6 +141,9 @@ msgstr ""
msgid "Universal Plug & Play"
msgstr ""
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr ""
diff --git a/applications/luci-app-upnp/po/sv/upnp.po b/applications/luci-app-upnp/po/sv/upnp.po
index c2d1c6b0bf..c19eaa1847 100644
--- a/applications/luci-app-upnp/po/sv/upnp.po
+++ b/applications/luci-app-upnp/po/sv/upnp.po
@@ -91,6 +91,9 @@ msgstr "Externa portar"
msgid "General Settings"
msgstr "Generella inställningar"
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr "Interna adresser"
@@ -143,6 +146,9 @@ msgstr "Hyr-fil för UPnP"
msgid "Universal Plug & Play"
msgstr "Universiell Plug & Play"
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr "Upplänk"
diff --git a/applications/luci-app-upnp/po/templates/upnp.pot b/applications/luci-app-upnp/po/templates/upnp.pot
index e3b1f1a26c..3ffad7a705 100644
--- a/applications/luci-app-upnp/po/templates/upnp.pot
+++ b/applications/luci-app-upnp/po/templates/upnp.pot
@@ -81,6 +81,9 @@ msgstr ""
msgid "General Settings"
msgstr ""
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr ""
@@ -131,6 +134,9 @@ msgstr ""
msgid "Universal Plug & Play"
msgstr ""
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr ""
diff --git a/applications/luci-app-upnp/po/tr/upnp.po b/applications/luci-app-upnp/po/tr/upnp.po
index 2a997a79b0..8415d31170 100644
--- a/applications/luci-app-upnp/po/tr/upnp.po
+++ b/applications/luci-app-upnp/po/tr/upnp.po
@@ -88,6 +88,9 @@ msgstr ""
msgid "General Settings"
msgstr ""
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr ""
@@ -138,6 +141,9 @@ msgstr ""
msgid "Universal Plug & Play"
msgstr ""
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr ""
diff --git a/applications/luci-app-upnp/po/uk/upnp.po b/applications/luci-app-upnp/po/uk/upnp.po
index 478ac7eab7..7a843960e6 100644
--- a/applications/luci-app-upnp/po/uk/upnp.po
+++ b/applications/luci-app-upnp/po/uk/upnp.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"PO-Revision-Date: 2018-07-16 15:50+0300\n"
+"PO-Revision-Date: 2018-07-20 10:30+0300\n"
"Last-Translator: Yurii <yuripet@gmail.com>\n"
"Language-Team: none\n"
"Language: uk\n"
@@ -94,6 +94,9 @@ msgstr "Зовнішні порти"
msgid "General Settings"
msgstr "Загальні настройки"
+msgid "Host"
+msgstr "Вузол"
+
msgid "Internal addresses"
msgstr "Внутрішні адреси"
@@ -146,6 +149,9 @@ msgstr "Файл оренд UPnP"
msgid "Universal Plug & Play"
msgstr "Universal Plug & Play"
+msgid "Unknown"
+msgstr "Невідомо"
+
msgid "Uplink"
msgstr "Висхідне з’єднання"
diff --git a/applications/luci-app-upnp/po/vi/upnp.po b/applications/luci-app-upnp/po/vi/upnp.po
index c933777478..d128bb6bbd 100644
--- a/applications/luci-app-upnp/po/vi/upnp.po
+++ b/applications/luci-app-upnp/po/vi/upnp.po
@@ -93,6 +93,9 @@ msgstr ""
msgid "General Settings"
msgstr ""
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr ""
@@ -143,6 +146,9 @@ msgstr ""
msgid "Universal Plug & Play"
msgstr "Universal Plug & Play"
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr "Uplink"
diff --git a/applications/luci-app-upnp/po/zh-cn/upnp.po b/applications/luci-app-upnp/po/zh-cn/upnp.po
index 588ad2cf19..e2e5ea12de 100644
--- a/applications/luci-app-upnp/po/zh-cn/upnp.po
+++ b/applications/luci-app-upnp/po/zh-cn/upnp.po
@@ -93,6 +93,9 @@ msgstr "外部端口"
msgid "General Settings"
msgstr "基本设置"
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr "内部地址"
@@ -143,6 +146,9 @@ msgstr "UPnP 租约文件"
msgid "Universal Plug & Play"
msgstr "通用即插即用(UPnP)"
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr "上行速率"
diff --git a/applications/luci-app-upnp/po/zh-tw/upnp.po b/applications/luci-app-upnp/po/zh-tw/upnp.po
index 57edb9e460..fdbae80093 100644
--- a/applications/luci-app-upnp/po/zh-tw/upnp.po
+++ b/applications/luci-app-upnp/po/zh-tw/upnp.po
@@ -91,6 +91,9 @@ msgstr "外部埠號範圍"
msgid "General Settings"
msgstr "一般設定"
+msgid "Host"
+msgstr ""
+
msgid "Internal addresses"
msgstr "內部位址"
@@ -141,6 +144,9 @@ msgstr "UPnP租賃文件"
msgid "Universal Plug & Play"
msgstr "通用序列埠隨插隨用"
+msgid "Unknown"
+msgstr ""
+
msgid "Uplink"
msgstr "上傳"
diff --git a/applications/luci-app-wol/po/uk/wol.po b/applications/luci-app-wol/po/uk/wol.po
index 703cd370ff..d1fd7c7e2d 100644
--- a/applications/luci-app-wol/po/uk/wol.po
+++ b/applications/luci-app-wol/po/uk/wol.po
@@ -1,37 +1,32 @@
-# Generated from applications/luci-wol/luasrc/model/cbi/wol.lua
-#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-19 00:29+0200\n"
-"PO-Revision-Date: 2013-05-26 19:00+0200\n"
+"Project-Id-Version: \n"
+"PO-Revision-Date: 2018-07-20 10:10+0300\n"
"Last-Translator: Yurii <yuripet@gmail.com>\n"
"Language-Team: none\n"
"Language: uk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Pootle 2.0.6\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
msgid "Broadcast on all interfaces"
msgstr "Широкомовна трансляція на всіх інтерфейсах"
msgid "Choose the host to wake up or enter a custom MAC address to use"
msgstr ""
-"Виберіть комп'ютер, який необхідно розбудити або введіть користувацьку MAC-"
+"Виберіть комп’ютер, який необхідно розбудити або введіть користувацьку MAC-"
"адресу"
msgid "Host to wake up"
-msgstr "Комп'ютер, який необхідно розбудити"
+msgstr "Комп’ютер, який необхідно розбудити"
msgid "Network interface to use"
msgstr "Використовувати мережевий інтерфейс"
msgid "Send to broadcast address"
-msgstr ""
+msgstr "Надіслати на широкомовну адресу"
#, fuzzy
msgid ""
@@ -53,10 +48,10 @@ msgid ""
"Wake on LAN is a mechanism to remotely boot computers in the local network."
msgstr ""
"Пробудження через LAN (Wake on LAN) є технологією, що дає змогу віддалено "
-"\"будити\" (вмикати) комп'ютери у локальній мережі."
+"\"будити\" (вмикати) комп’ютери у локальній мережі."
msgid "Wake up host"
-msgstr "Розбудити комп'ютер"
+msgstr "Розбудити комп’ютер"
msgid "WoL program"
msgstr "Программа WoL"