diff options
Diffstat (limited to 'applications')
59 files changed, 4331 insertions, 748 deletions
diff --git a/applications/luci-app-adblock/luasrc/controller/adblock.lua b/applications/luci-app-adblock/luasrc/controller/adblock.lua index fad8834870..4c77244710 100644 --- a/applications/luci-app-adblock/luasrc/controller/adblock.lua +++ b/applications/luci-app-adblock/luasrc/controller/adblock.lua @@ -6,11 +6,9 @@ module("luci.controller.adblock", package.seeall) local sys = require("luci.sys") local util = require("luci.util") local http = require("luci.http") -local templ = require("luci.template") local i18n = require("luci.i18n") local json = require("luci.jsonc") local uci = require("luci.model.uci").cursor() -local fs = require("nixio.fs") function index() if not nixio.fs.access("/etc/config/adblock") then @@ -48,12 +46,10 @@ function status_update() rt_file = uci:get("adblock", "global", "adb_rtfile") or "/tmp/adb_runtime.json" - if fs.access(rt_file) then - content = json.parse(fs.readfile(rt_file)) - if content then - http.prepare_content("application/json") - http.write_json(content) - end + 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 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 3bf7392914..2ecaaab726 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 @@ -3,7 +3,6 @@ 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", {}) @@ -13,10 +12,6 @@ m = Map("adblock", translate("Adblock"), .. "<a href=\"%s\" target=\"_blank\">" .. "check the online documentation</a>", "https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md")) -function m.on_apply(self) - luci.sys.call("/etc/init.d/adblock reload >/dev/null 2>&1") -end - -- Main adblock options s = m:section(NamedSection, "global", "adblock") diff --git a/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm b/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm index f59e518574..a6f2286513 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm @@ -14,39 +14,39 @@ local anonclass = (not self.anonymous or self.sectiontitle) and "named" or "ano .cbi-section-table-row, .tr[data-title]::before { - text-align:left; - vertical-align:top; - margin-left:0px; - padding-left:2px; + 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; + width: 7em; } .cbi-input-text { - text-align:left; - padding-left:2px; - outline:none; - box-shadow:none; - background:transparent; - width:7em; + text-align: left; + padding-left: 2px; + outline: none; + box-shadow: none; + background: transparent; + width: 7em; } </style> <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"> diff --git a/applications/luci-app-adblock/luasrc/view/adblock/logread.htm b/applications/luci-app-adblock/luasrc/view/adblock/logread.htm index bb8d652fbc..b505233490 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/logread.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/logread.htm @@ -4,6 +4,21 @@ This is free software, licensed under the Apache License, Version 2.0 -%> <%+header%> +<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"> //<![CDATA[ @@ -28,7 +43,7 @@ This is free software, licensed under the Apache License, Version 2.0 <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" style="width:100%;height:450px;border:1px solid #cccccc;padding:5px;font-size:12px;font-family:monospace;resize:none;" readonly="readonly" wrap="off" value=""></textarea> + <textarea id="view_id" readonly="readonly" wrap="off" value=""></textarea> </div> </div> diff --git a/applications/luci-app-adblock/luasrc/view/adblock/query.htm b/applications/luci-app-adblock/luasrc/view/adblock/query.htm index 1fcd145803..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) @@ -48,7 +48,7 @@ This is free software, licensed under the Apache License, Version 2.0 <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" /> diff --git a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm index 7609ba5e66..3f4d642592 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm @@ -1,16 +1,15 @@ <%# Copyright 2017-2018 Dirk Brenken (dev@brenken.org) This is free software, licensed under the Apache License, Version 2.0 -local sys = require("luci.sys") - -%> + <style type="text/css"> .runtime { - color:#0069d6; - font-weight:bold; - display:inline-block; - width:100%; + color: #37c; + font-weight: bold; + display: inline-block; + width: 100%; padding-top: 0.5rem; } </style> @@ -19,10 +18,12 @@ local sys = require("luci.sys") //<![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; + var view = document.getElementById("value_1"); + var btn1 = document.getElementById("btn1"); + var btn1_running = document.getElementById("btn1_running"); + var btn2 = document.getElementById("btn2"); + var btn2_running = document.getElementById("btn2_running"); + var input = json.data.adblock_status; view.innerHTML = input || "-"; if (input === "enabled") @@ -127,7 +128,7 @@ local sys = require("luci.sys") btn2.value = "<%:Refresh%>"; btn2.name = "do_refresh"; btn1.disabled = true; - btn2.disabled = false; + btn2.disabled = true; return; } status_update(json_info) diff --git a/applications/luci-app-ddns/Makefile b/applications/luci-app-ddns/Makefile index 7295189518..195e08131b 100644 --- a/applications/luci-app-ddns/Makefile +++ b/applications/luci-app-ddns/Makefile @@ -19,8 +19,7 @@ PKG_VERSION:=2.4.9 PKG_RELEASE:=5 PKG_LICENSE:=Apache-2.0 -PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com>, \ - Ansuel Smith <ansuelsmth@gmail.com> +PKG_MAINTAINER:=Ansuel Smith <ansuelsmth@gmail.com> # LuCI specific settings LUCI_TITLE:=LuCI Support for Dynamic DNS Client (ddns-scripts) diff --git a/applications/luci-app-ddns/luasrc/tools/ddns.lua b/applications/luci-app-ddns/luasrc/tools/ddns.lua index 57913a51fe..6f0c7f0952 100755 --- a/applications/luci-app-ddns/luasrc/tools/ddns.lua +++ b/applications/luci-app-ddns/luasrc/tools/ddns.lua @@ -10,121 +10,120 @@ local SYS = require "luci.sys" function env_info(type) - if ( type == "has_ssl" ) or ( type == "has_proxy" ) or ( type == "has_forceip" ) - or ( type == "has_bindnet" ) or ( type == "has_fetch" ) - or ( type == "has_wgetssl" ) or ( type == "has_curl" ) - or ( type == "has_curlssl" ) or ( type == "has_curlpxy" ) - or ( type == "has_fetchssl" ) or ( type == "has_bbwget" ) then - - local function has_wgetssl() + if ( type == "has_ssl" ) or ( type == "has_proxy" ) or ( type == "has_forceip" ) + or ( type == "has_bindnet" ) or ( type == "has_fetch" ) + or ( type == "has_wgetssl" ) or ( type == "has_curl" ) + or ( type == "has_curlssl" ) or ( type == "has_curlpxy" ) + or ( type == "has_fetchssl" ) or ( type == "has_bbwget" ) then + + local function has_wgetssl() return (SYS.call( [[which wget-ssl >/dev/null 2>&1]] ) == 0) -- and true or nil end - - local function has_curlssl() + + local function has_curlssl() return (SYS.call( [[$(which curl) -V 2>&1 | grep "Protocols:" | grep -qF "https"]] ) ~= 0) end - + local function has_fetch() return (SYS.call( [[which uclient-fetch >/dev/null 2>&1]] ) == 0) end - + local function has_fetchssl() return NXFS.access("/lib/libustream-ssl.so") end - + local function has_curl() return (SYS.call( [[which curl >/dev/null 2>&1]] ) == 0) end - + local function has_curlpxy() return (SYS.call( [[grep -i "all_proxy" /usr/lib/libcurl.so* >/dev/null 2>&1]] ) == 0) end - + local function has_bbwget() return (SYS.call( [[$(which wget) -V 2>&1 | grep -iqF "busybox"]] ) == 0) end - + if type == "has_wgetssl" then return has_wgetssl() - + elseif type == "has_curl" then return has_curl() - + elseif type == "has_curlssl" then return has_curlssl() - + elseif type == "has_curlpxy" then return has_curlpxy() - + elseif type == "has_fetch" then return has_fetch() - + elseif type == "has_fetchssl" then return has_fetchssl() - + elseif type == "has_bbwget" then return has_bbwget() - + elseif type == "has_ssl" then if has_wgetssl() then return true end if has_curlssl() then return true end if (has_fetch() and has_fetchssl()) then return true end return false - + elseif type == "has_proxy" then if has_wgetssl() then return true end if has_curlpxy() then return true end if has_fetch() then return true end if has_bbwget() then return true end return false - + elseif type == "has_forceip" then if has_wgetssl() then return true end if has_curl() then return true end if has_fetch() then return true end -- only really needed for transfer return false - + elseif type == "has_bindnet" then if has_curl() then return true end if has_wgetssl() then return true end return false end - + elseif ( type == "has_dnsserver" ) or ( type == "has_bindhost" ) or ( type == "has_hostip" ) or ( type == "has_nslookup" ) then - local function has_bindhost() - if (SYS.call( [[which host >/dev/null 2>&1]] ) == 0) then return true end + local function has_bindhost() if (SYS.call( [[which host >/dev/null 2>&1]] ) == 0) then return true end if (SYS.call( [[which khost >/dev/null 2>&1]] ) == 0) then return true end if (SYS.call( [[which drill >/dev/null 2>&1]] ) == 0) then return true end return false end - + local function has_hostip() return (SYS.call( [[which hostip >/dev/null 2>&1]] ) == 0) end - + local function has_nslookup() return (SYS.call( [[$(which nslookup) localhost 2>&1 | grep -qF "(null)"]] ) ~= 0) end - + if type == "has_bindhost" then return has_bindhost() elseif type == "has_hostip" then return has_hostip() elseif type == "has_nslookup" then return has_nslookup() - elseif tyep == "has_dnsserver" then + elseif type == "has_dnsserver" then if has_bindhost() then return true end if has_hostip() then return true end if has_nslookup() then return true end return false end - + elseif type == "has_ipv6" then return (NXFS.access("/proc/net/ipv6_route") and NXFS.access("/usr/sbin/ip6tables")) - + elseif type == "has_cacerts" then - --old _check_certs() local function + --old _check_certs() local function local _, v = NXFS.glob("/etc/ssl/certs/*.crt") if ( v == 0 ) then _, v = NXFS.glob("/etc/ssl/certs/*.pem") end return (v > 0) diff --git a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm index 273675cd30..82168712ae 100644 --- a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm +++ b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm @@ -1,11 +1,9 @@ <% local fw = require "luci.model.firewall".init() - local wz = fw:get_zone("wan") - local lz = fw:get_zone("lan") local zones = fw:get_zones() %> -<% if wz then %> +<% if #zones > 0 then %> <h4><%:Open ports on router%></h4> <div class="table"> <div class="tr cbi-section-table-titles"> @@ -71,7 +69,7 @@ <input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" /> <% end %> -<% if wz then %> +<% if #zones > 0 then %> <script type="text/javascript">//<![CDATA[ cbi_validate_field('_newopen.extport', true, 'list(neg(portrange))'); cbi_bind(document.getElementById('_newopen.extport'), 'blur', diff --git a/applications/luci-app-radicale/Makefile b/applications/luci-app-radicale/Makefile index 2b969ace50..87180e77d6 100644 --- a/applications/luci-app-radicale/Makefile +++ b/applications/luci-app-radicale/Makefile @@ -14,10 +14,10 @@ PKG_VERSION:=1.1.0 # Release == build # increase on changes of translation files -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=Apache-2.0 -PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com> +PKG_MAINTAINER:= # LuCI specific settings LUCI_TITLE:=LuCI Support for Radicale CardDAV/CalDAV 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..3e82cbca2c --- /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: 2018-08-06 05:17+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.1.1\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 "Active Directory ドメインコントローラを無効化" + +msgid "Disable Netbios" +msgstr "Netbios を無効化" + +msgid "Disable Winbind" +msgstr "Winbind を無効化" + +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-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 = " <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-travelmate/luasrc/controller/travelmate.lua b/applications/luci-app-travelmate/luasrc/controller/travelmate.lua index 493a387c3e..775831d9d0 100644 --- a/applications/luci-app-travelmate/luasrc/controller/travelmate.lua +++ b/applications/luci-app-travelmate/luasrc/controller/travelmate.lua @@ -3,9 +3,12 @@ module("luci.controller.travelmate", package.seeall) -local util = require("luci.util") -local i18n = require("luci.i18n") -local templ = require("luci.template") +local sys = require("luci.sys") +local util = require("luci.util") +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/travelmate") then @@ -14,13 +17,16 @@ function index() entry({"admin", "services", "travelmate"}, firstchild(), _("Travelmate"), 40).dependent = false entry({"admin", "services", "travelmate", "tab_from_cbi"}, cbi("travelmate/overview_tab", {hideresetbtn=true, hidesavebtn=true}), _("Overview"), 10).leaf = true entry({"admin", "services", "travelmate", "stations"}, template("travelmate/stations"), _("Wireless Stations"), 20).leaf = true - entry({"admin", "services", "travelmate", "logfile"}, call("logread"), _("View Logfile"), 30).leaf = true + entry({"admin", "services", "travelmate", "log"}, template("travelmate/logread"), _("View Logfile"), 30).leaf = true entry({"admin", "services", "travelmate", "advanced"}, firstchild(), _("Advanced"), 100) entry({"admin", "services", "travelmate", "advanced", "configuration"}, form("travelmate/configuration_tab"), _("Edit Travelmate Configuration"), 110).leaf = true entry({"admin", "services", "travelmate", "advanced", "cfg_wireless"}, form("travelmate/cfg_wireless_tab"), _("Edit Wireless Configuration"), 120).leaf = true entry({"admin", "services", "travelmate", "advanced", "cfg_network"}, form("travelmate/cfg_network_tab"), _("Edit Network Configuration"), 130).leaf = true entry({"admin", "services", "travelmate", "advanced", "cfg_firewall"}, form("travelmate/cfg_firewall_tab"), _("Edit Firewall Configuration"), 140).leaf = true + entry({"admin", "services", "travelmate", "logread"}, call("logread"), nil).leaf = true + entry({"admin", "services", "travelmate", "status"}, call("status_update"), nil).leaf = true + entry({"admin", "services", "travelmate", "action"}, call("trm_action"), nil).leaf = true entry({"admin", "services", "travelmate", "apqr"}, template("travelmate/ap_qr")).leaf = true entry({"admin", "services", "travelmate", "wifiscan"}, template("travelmate/wifi_scan")).leaf = true entry({"admin", "services", "travelmate", "wifiadd"}, form("travelmate/wifi_add", {hideresetbtn=true, hidesavebtn=true})).leaf = true @@ -29,13 +35,38 @@ function index() entry({"admin", "services", "travelmate", "wifiorder"}, form("travelmate/wifi_order", {hideresetbtn=true, hidesavebtn=true})).leaf = true end +function trm_action(name) + if name == "do_restart" then + luci.sys.call("/etc/init.d/travelmate restart >/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("travelmate", "global", "trm_rtfile") or "/tmp/trm_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 'travelmate-' /var/log/messages")) - elseif nixio.fs.access("/sbin/logread") then - logfile = util.trim(util.exec("logread -e 'travelmate-'")) + content = util.trim(util.exec("grep -F 'travelmate-' /var/log/messages")) + else + content = util.trim(util.exec("logread -e 'travelmate-'")) + end + + if content == "" then + content = "No travelmate related logs yet!" end - templ.render("travelmate/logread", {title = i18n.translate("Travelmate Logfile"), content = logfile}) + http.write(content) end diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_firewall_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_firewall_tab.lua index e5a048fa88..fea190e9b9 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_firewall_tab.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_firewall_tab.lua @@ -1,11 +1,11 @@ --- 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 -local fs = require("nixio.fs") -local util = require("luci.util") -local trminput = "/etc/config/firewall" +local fs = require("nixio.fs") +local util = require("luci.util") +local input = "/etc/config/firewall" -if not nixio.fs.access(trminput) then +if not fs.access(input) then m = SimpleForm("error", nil, translate("Input file not found, please check your configuration.")) return m end @@ -23,11 +23,15 @@ f.rows = 20 f.rmempty = true function f.cfgvalue() - return nixio.fs.readfile(trminput) or "" + return fs.readfile(input) or "" end function f.write(self, section, data) - return nixio.fs.writefile(trminput, "\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-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua index 0096d6a8c2..6f0ade772d 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua @@ -1,11 +1,11 @@ --- 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 -local fs = require("nixio.fs") -local util = require("luci.util") -local trminput = "/etc/config/network" +local fs = require("nixio.fs") +local util = require("luci.util") +local input = "/etc/config/network" -if not nixio.fs.access(trminput) then +if not fs.access(input) then m = SimpleForm("error", nil, translate("Input file not found, please check your configuration.")) return m end @@ -23,11 +23,15 @@ f.rows = 20 f.rmempty = true function f.cfgvalue() - return nixio.fs.readfile(trminput) or "" + return fs.readfile(input) or "" end function f.write(self, section, data) - return nixio.fs.writefile(trminput, "\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-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua index 7ef9920a08..ab59dfb376 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua @@ -1,11 +1,11 @@ --- 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 -local fs = require("nixio.fs") -local util = require("luci.util") -local trminput = "/etc/config/wireless" +local fs = require("nixio.fs") +local util = require("luci.util") +local input = "/etc/config/wireless" -if not nixio.fs.access(trminput) then +if not fs.access(input) then m = SimpleForm("error", nil, translate("Input file not found, please check your configuration.")) return m end @@ -23,11 +23,15 @@ f.rows = 20 f.rmempty = true function f.cfgvalue() - return nixio.fs.readfile(trminput) or "" + return fs.readfile(input) or "" end function f.write(self, section, data) - return nixio.fs.writefile(trminput, "\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-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua index 8a20ab9cce..7bb32c1ec5 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua @@ -1,11 +1,11 @@ --- 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 -local fs = require("nixio.fs") -local util = require("luci.util") -local trminput = "/etc/config/travelmate" +local fs = require("nixio.fs") +local util = require("luci.util") +local input = "/etc/config/travelmate" -if not nixio.fs.access(trminput) 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 @@ -25,11 +25,15 @@ f.rows = 20 f.rmempty = true function f.cfgvalue() - return nixio.fs.readfile(trminput) or "" + return fs.readfile(input) or "" end function f.write(self, section, data) - return nixio.fs.writefile(trminput, "\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-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua index a1dcbc638c..a1a7ed72c3 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua @@ -3,15 +3,12 @@ local fs = require("nixio.fs") local uci = require("luci.model.uci").cursor() -local json = require("luci.jsonc") local util = require("luci.util") local nw = require("luci.model.network").init() local fw = require("luci.model.firewall").init() local dump = util.ubus("network.interface", "dump", {}) local trmiface = uci:get("travelmate", "global", "trm_iface") or "trm_wwan" -local trminput = uci:get("travelmate", "global", "trm_rtfile") or "/tmp/trm_runtime.json" local uplink = uci:get("network", trmiface) or "" -local parse = json.parse(fs.readfile(trminput) or "") m = Map("travelmate", translate("Travelmate"), translate("Configuration of the travelmate package to to enable travel router functionality. ") @@ -23,8 +20,7 @@ m:chain("firewall") m.apply_on_parse = true function m.on_apply(self) - luci.sys.call("env -i /etc/init.d/travelmate restart >/dev/null 2>&1") - luci.http.redirect(luci.dispatcher.build_url("admin", "services", "travelmate")) + luci.sys.call("/etc/init.d/travelmate restart >/dev/null 2>&1") end -- Interface Wizard @@ -33,7 +29,7 @@ if uplink == "" then ds = m:section(NamedSection, "global", "travelmate", translate("Interface Wizard")) o = ds:option(Value, "trm_iface", translate("Create Uplink interface"), translate("Create a new wireless wan uplink interface, configure it to use dhcp and ") - .. translate("add it to the wan zone of the firewall.<br />") + .. translate("add it to the wan zone of the firewall. ") .. translate("This step has only to be done once.")) o.datatype = "and(uciname,rangelength(3,15))" o.default = trmiface @@ -96,55 +92,8 @@ end -- Runtime information -ds = m:section(NamedSection, "global", "travelmate", translate("Runtime Information")) - -dv1 = ds:option(DummyValue, "status", translate("Travelmate Status (Quality)")) -dv1.template = "travelmate/runtime" -if parse ~= nil then - dv1.value = parse.data.travelmate_status or translate("n/a") -else - dv1.value = translate("n/a") -end - -dv2 = ds:option(DummyValue, "travelmate_version", translate("Travelmate Version")) -dv2.template = "travelmate/runtime" -if parse ~= nil then - dv2.value = parse.data.travelmate_version or translate("n/a") -else - dv2.value = translate("n/a") -end - -dv3 = ds:option(DummyValue, "station_id", translate("Station ID (SSID/BSSID)")) -dv3.template = "travelmate/runtime" -if parse ~= nil then - dv3.value = parse.data.station_id or translate("n/a") -else - dv3.value = translate("n/a") -end - -dv4 = ds:option(DummyValue, "station_interface", translate("Station Interface")) -dv4.template = "travelmate/runtime" -if parse ~= nil then - dv4.value = parse.data.station_interface or translate("n/a") -else - dv4.value = translate("n/a") -end - -dv5 = ds:option(DummyValue, "station_radio", translate("Station Radio")) -dv5.template = "travelmate/runtime" -if parse ~= nil then - dv5.value = parse.data.station_radio or translate("n/a") -else - dv5.value = translate("n/a") -end - -dv6 = ds:option(DummyValue, "last_rundate", translate("Last rundate")) -dv6.template = "travelmate/runtime" -if parse ~= nil then - dv6.value = parse.data.last_rundate or translate("n/a") -else - dv6.value = translate("n/a") -end +ds = s:option(DummyValue, "_dummy") +ds.template = "travelmate/runtime" -- Extra options diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/ap_qr.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/ap_qr.htm index a92dbe1469..3f01a81e35 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/ap_qr.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/ap_qr.htm @@ -6,60 +6,61 @@ This is free software, licensed under the Apache License, Version 2.0 <%+header%> <div class="cbi-map"> - <div class="cbi-map-descr"> - <%=translate("Here you'll find the QR codes from all of your configured Access Points. It allows you to connect your Android or iOS devices to your router's WiFi using the QR code shown below.")%> - </div> -<%- - local write = io.write - local uci = require("luci.model.uci").cursor() + <div class="cbi-map-descr"> + <%=translate("Here you'll find the QR codes from all of your configured Access Points. It allows you to connect your Android or iOS devices to your router's WiFi using the QR code shown below.")%> + </div> + <%- local uci = require("luci.model.uci").cursor() - uci:foreach("wireless", "wifi-iface", function(s) - local device = s.device or "" - local mode = s.mode or "" - local ssid = s.ssid or "" - local enc = s.encryption or "" - local key = s.key or "" - local hidden = s.hidden or "false" - local disabled = s.disabled or "" - local wep_slots = {s.key1 or "", s.key2 or "", s.key3 or "", s.key4 or ""} + uci:foreach("wireless", "wifi-iface", function(s) + local device = s.device or "" + local mode = s.mode or "" + local ssid = s.ssid or "" + local enc = s.encryption or "" + local key = s.key or "" + local hidden = s.hidden or "false" + local disabled = s.disabled or "" + local wep_slots = {s.key1 or "", s.key2 or "", s.key3 or "", s.key4 or ""} - if device and mode == "ap" and disabled ~= "1" then - if string.match(enc, '^psk') then - enc = "WPA" - elseif string.match(enc, '^wep') then - enc = "WEP" - if tonumber(key) then - key = wep_slots[tonumber(key)] - end - elseif enc == "none" then - enc = "nopass" - key = "nokey" - else - enc = "" - end - if hidden == "1" then - hidden = "true" - end - if ssid and enc and key then - local e_ssid = string.gsub(ssid,"[\"\\';:, ]",[[\\\%1]]) - local e_key = string.gsub(key,"[\"\\';:, ]",[[\\\%1]]) - local qrcode = "" - qrcode = luci.sys.exec("/usr/bin/qrencode --inline --8bit --type=SVG --output=- 'WIFI:S:\"'" .. e_ssid .. "'\";T:'" .. enc .. "';P:\"'" .. e_key .. "'\";H:'" .. hidden .. "';'") --%> - <fieldset class="cbi-section"> - <legend>AP on <%=device%> with SSID "<%=ssid%>"</legend> - <h3 name="content"><%=qrcode%></h3> - </fieldset> -<%- - end - end - end) -%> + if device and mode == "ap" and disabled ~= "1" then + if string.match(enc, '^psk') then + enc = "WPA" + elseif string.match(enc, '^wep') then + enc = "WEP" + if tonumber(key) then + key = wep_slots[tonumber(key)] + end + elseif enc == "none" then + enc = "nopass" + key = "nokey" + else + enc = "" + end + + if hidden == "1" then + hidden = "true" + end + + if ssid and enc and key then + local e_ssid = string.gsub(ssid,"[\"\\';:, ]",[[\\\%1]]) + local e_key = string.gsub(key,"[\"\\';:, ]",[[\\\%1]]) + local qrcode = "" + + qrcode = luci.sys.exec("/usr/bin/qrencode --inline --8bit --type=SVG --output=- 'WIFI:S:\"'" .. e_ssid .. "'\";T:'" .. enc .. "';P:\"'" .. e_key .. "'\";H:'" .. hidden .. "';'") + -%> + <div class="cbi-section"> + <h3>AP on <%=device%> with SSID "<%=ssid%>"</h3> + <h3><%=qrcode%></h3> + </div> + <%- + end + end + end) + -%> </div> <div class="cbi-page-actions right"> - <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/tab_from_cbi')%>" method="post"> - <input class="cbi-button cbi-button-reset" type="submit" value="<%:Back to overview%>"/> - </form> + <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/tab_from_cbi')%>" method="post"> + <input class="cbi-button cbi-button-reset" type="submit" value="<%:Back to overview%>" /> + </form> </div> <%+footer%> diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/logread.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/logread.htm index c40bdeeb59..4457296f54 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/logread.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/logread.htm @@ -5,16 +5,47 @@ This is free software, licensed under the Apache License, Version 2.0 <%+header%> +<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"> +//<![CDATA[ + function log_update() + { + XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "travelmate", "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"><%:This form shows the syslog output, pre-filtered for travelmate 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> + <div class="cbi-section-descr"><%:The syslog output, pre-filtered for travelmate related messages only.%></div> + <textarea id="view_id" readonly="readonly" wrap="off" value=""></textarea> </div> </div> -<script type="text/javascript"> - var textarea = document.getElementById('logread_id'); - textarea.scrollTop = textarea.scrollHeight; -</script> - <%+footer%> diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm index 7e93efab91..272612600c 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm @@ -3,8 +3,142 @@ 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: #37c; + 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:50em;" value="<%=self:cfgvalue(section)%>" disabled="disabled" /> +<script type="text/javascript"> +//<![CDATA[ + function status_update(json) + { + var btn1 = document.getElementById("btn1"); + var view = document.getElementById("value_1"); + var input = json.data.travelmate_status; -<%+cbi/valuefooter%> + btn1.value = "<%:Restart%>"; + btn1.name = "do_restart"; + view.innerHTML = input || "-"; + view = document.getElementById("value_2"); + input = json.data.travelmate_version; + view.innerHTML = input || "-"; + view = document.getElementById("value_3"); + input = json.data.station_id; + view.innerHTML = input || "-"; + view = document.getElementById("value_4"); + input = json.data.station_interface; + view.innerHTML = input || "-"; + view = document.getElementById("value_5"); + input = json.data.faulty_stations; + 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"); + + btn1.disabled = true; + running(btn1_running, 1); + + new XHR.get('<%=luci.dispatcher.build_url("admin", "services", "travelmate")%>/action/' + action.name, null, + function(x) + { + if (!x) + { + return; + } + btn1.disabled = false; + running(btn1_running, 0); + }); + } + + 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", "travelmate", "status")%>', null, + function(x, json_info) + { + if (!x || !json_info) + { + return; + } + status_update(json_info) + }); + + XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "travelmate", "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"><%:Travelmate Status (Quality)%></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"><%:Travelmate 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"><%:Station ID (RADIO/SSID/BSSID)%></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"><%:Station Interface%></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"><%:Faulty Stations%></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"><%:Restart Travelmate%></label> + <div class="cbi-value-field"> + <input class="cbi-button cbi-button-reset" id="btn1" type="button" name="do_restart" value="<%:Restart%>" onclick="btn_action(this)" /> + <span id="btn1_running" style="display:inline-block; width:16px; height:16px; margin:0 5px"></span> + </div> +</div> diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm index 74542a9ca5..98e2e64bce 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm @@ -4,75 +4,151 @@ This is free software, licensed under the Apache License, Version 2.0 -%> <%- - local write = io.write - local uci = require("luci.model.uci").cursor() - local trmiface = uci:get("travelmate", "global", "trm_iface") or "trm_wwan" + local uci = require("luci.model.uci").cursor() + local trmiface = uci:get("travelmate", "global", "trm_iface") or "trm_wwan" -%> <%+header%> +<script type="text/javascript"> +//<![CDATA[ + function status_update(json) + { + var i; + var j; + var search; + var view; + var list; + var status = json.data.travelmate_status; + var faulty = json.data.faulty_stations; + + if (faulty) + { + var faulty_array = faulty.split(' '); + for (i = 0; i < faulty_array.length; i++) + { + for (j = 1; j <= 5; j++) + { + search = j + "_" + faulty_array[i]; + view = document.getElementById(search); + if (view) + { + view.setAttribute("name", "station_nok"); + view.setAttribute("style", "color: #a22; font-weight: bold"); + } + } + } + } + else + { + list = document.getElementsByName("station_nok"); + if (list.length > 0) + { + for (i = 0; i < list.length; i++) + { + list[i].removeAttribute("style"); + } + } + } + + if (status.startsWith("connected")) + { + for (i = 1; i <= 5; i++) + { + search = i + "_" + json.data.station_id; + view = document.getElementById(search); + if (view) + { + view.setAttribute("style", "color: #37c; font-weight: bold"); + } + } + } + else + { + list = document.getElementsByName("station_ok"); + if (list.length > 0) + { + for (i = 0; i < list.length; i++) + { + list[i].removeAttribute("style"); + } + } + } + } + + XHR.get('<%=luci.dispatcher.build_url("admin", "services", "travelmate", "status")%>', null, + function(x, json_info) + { + if (!x || !json_info) + { + return; + } + status_update(json_info) + }); + + XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "travelmate", "status")%>', null, + function(x, json_info) + { + if (!x || !json_info) + { + return; + } + status_update(json_info) + }); +//]]> +</script> <div class="cbi-map"> -<div class="cbi-map-descr"> - <%=translatef("Provides an overview of all configured uplinks for the travelmate interface (%s). You can edit, delete or re-order existing uplinks or scan for a new one. The currently used uplink is emphasized in blue.", trmiface)%> -</div> + <div class="cbi-map-descr"> + <%=translatef("Provides an overview of all configured uplinks for the travelmate interface (%s). You can edit, delete or re-order existing uplinks or scan for a new one. The currently used uplink is emphasized in blue, faulty stations in red.", trmiface)%> + </div> -<div class="cbi-section"> - <div class="table cbi-section-table"> - <div class="tr cbi-section-table-titles"> - <div class="th left"><%:Device%></div> - <div class="th left"><%:SSID%></div> - <div class="th left"><%:BSSID%></div> - <div class="th left"><%:Encryption%></div> - <div class="th center"> </div> - </div> -<% - uci:foreach("wireless", "wifi-iface", function(s) - local iface = s.network or "" - if iface == trmiface then - local section = s['.name'] or "" - local device = s.device or "-" - local ssid = s.ssid or "-" - local bssid = s.bssid or "-" - local encryption = s.encryption or "-" - local disabled = s.disabled or "" - local style = "text-align:left;color:#000000" - if disabled == "0" then - style = "text-align:left;color:#0069d6;font-weight:bold" - end -%> - <div class="tr cbi-section-table-row cbi-rowstyle-1" style="<%=style%>"> - <div class="td" style="<%=style%>"><%=device%></div> - <div class="td" style="<%=style%>"><%=ssid%></div> - <div class="td" style="<%=style%>"><%=bssid%></div> - <div class="td" style="<%=style%>"><%=encryption%></div> - <div class="td cbi-section-actions"> - <input class="cbi-button cbi-button-up" type="button" value="<%:Up%>" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>&dir=up'" alt="<%:Move up%>" title="<%:Move up%>"/> - <input class="cbi-button cbi-button-down" type="button" value="<%:Down%>" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>&dir=down'" alt="<%:Move down%>" title="<%:Move down%>"/> - <input type="button" class="cbi-button cbi-button-edit" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiedit')%>?cfg=<%=section%>'" title="<%:Edit this Uplink%>" value="<%:Edit%>"/> - <input type="button" class="cbi-button cbi-button-remove" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifidelete')%>?cfg=<%=section%>'" title="<%:Delete this Uplink%>" value="<%:Delete%>"/> - </div> - </div> -<% - end - end) -%> - </div> -</div> -<div class="cbi-page-actions right"> -<% - uci:foreach("wireless", "wifi-device", function(s) - local device = s[".name"] -%> - <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/wifiscan')%>" method="post"> - <input type="hidden" name="device" value="<%=device%>"/> - <input type="hidden" name="token" value="<%=token%>"/> - <input type="submit" class="cbi-button cbi-button-action important" title="<%:Find and join network on%> <%=device%>" value="<%:Scan%> <%=device%>"/> - </form> -<% - end) -%> -</div> + <div class="cbi-section"> + <div class="table cbi-section-table"> + <div class="tr cbi-section-table-titles"> + <div class="th left"><%:Device%></div> + <div class="th left"><%:SSID%></div> + <div class="th left"><%:BSSID%></div> + <div class="th left"><%:Encryption%></div> + <div class="th center"><%:Action%></div> + </div> + <%- uci:foreach("wireless", "wifi-iface", function(s) + local iface = s.network or "" + if iface == trmiface then + local section = s['.name'] or "" + local device = s.device or "-" + local ssid = s.ssid or "-" + local bssid = s.bssid or "-" + local encr = s.encryption or "-" + -%> + <div class="tr cbi-section-table-row cbi-rowstyle-1" name="station_ok" id="1_<%=device%>/<%=ssid%>/<%=bssid%>"> + <div class="td left" name="station_ok" id="2_<%=device%>/<%=ssid%>/<%=bssid%>"><%=device%></div> + <div class="td left" name="station_ok" id="3_<%=device%>/<%=ssid%>/<%=bssid%>"><%=ssid%></div> + <div class="td left" name="station_ok" id="4_<%=device%>/<%=ssid%>/<%=bssid%>"><%=bssid%></div> + <div class="td left" name="station_ok" id="5_<%=device%>/<%=ssid%>/<%=bssid%>"><%=encr%></div> + <div class="td middle cbi-section-actions"> + <div> + <input class="cbi-button cbi-button-up" type="button" value="<%:Up%>" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>&dir=up'" alt="<%:Move up%>" title="<%:Move up%>" /> + <input class="cbi-button cbi-button-down" type="button" value="<%:Down%>" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>&dir=down'" alt="<%:Move down%>" title="<%:Move down%>" /> + <input class="cbi-button cbi-button-edit" type="button" value="<%:Edit%>" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiedit')%>?cfg=<%=section%>'" title="<%:Edit this Uplink%>" /> + <input class="cbi-button cbi-button-remove" type="button" value="<%:Delete%>" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifidelete')%>?cfg=<%=section%>'" title="<%:Delete this Uplink%>" /> + </div> + </div> + </div> + <%- end; end) -%> + </div> + </div> + <div class="cbi-page-actions right"> + <%- uci:foreach("wireless", "wifi-device", function(s) + local device = s[".name"] + local hwmode = s.hwmode or "-" -%> + <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/wifiscan')%>" method="post"> + <input type="hidden" name="device" value="<%=device%>" /> + <input type="hidden" name="token" value="<%=token%>" /> + <input type="submit" class="cbi-button cbi-button-action important" title="<%:Find and join network on%> <%=device%>" value="<%:Scan%> <%=device%> (<%=hwmode%>)" /> + </form> + <%- end) -%> + </div> </div> <%+footer%> diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm index 8a417d69c2..ab3fe77fbc 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm @@ -1,97 +1,99 @@ <%# -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 -%> <%- - local sys = require("luci.sys") - local utl = require("luci.util") - local dev = luci.http.formvalue("device") - local iw = luci.sys.wifi.getiwinfo(dev) - local wpa_label = {translate("WPA"), translate("WPA2"), translate("WPA/WPA2")} + local sys = require("luci.sys") + local utl = require("luci.util") + local dev = luci.http.formvalue("device") + local iw = luci.sys.wifi.getiwinfo(dev) + local label = {translate("WPA"), translate("WPA2"), translate("WPA/WPA2")} - if not iw then - luci.http.redirect(luci.dispatcher.build_url("admin/services/travelmate/stations")) - end + if not iw then + luci.http.redirect(luci.dispatcher.build_url("admin/services/travelmate/stations")) + end - function format_wifi_encryption(info) - if info.wep == true then - return translate("WEP") - elseif info.wpa > 0 then - return "%s (%s/%s)" %{wpa_label[info.wpa], table.concat(info.auth_suites), table.concat(info.group_ciphers)} - elseif info.enabled then - return translate("Unknown") - else - return translate("Open") - end - end + function format_wifi_encryption(info) + if info.wep == true then + return translate("WEP") + elseif info.wpa > 0 then + return "%s (%s/%s)" %{label[info.wpa], table.concat(info.auth_suites), table.concat(info.group_ciphers)} + elseif info.enabled then + return translate("Unknown") + else + return translate("Open") + end + end - function percent_wifi_signal(info) - local qc = info.quality or 0 - local qm = info.quality_max or 0 - if info.bssid and qc > 0 and qm > 0 then - return math.floor((100 / qm) * qc) - else - return 0 - end - end + function percent_wifi_signal(info) + local qc = info.quality or 0 + local qm = info.quality_max or 0 + if info.bssid and qc > 0 and qm > 0 then + return math.floor((100 / qm) * qc) + else + return 0 + end + end -%> <%+header%> - <div class="cbi-map"> -<h2 name="content"><%:Wireless Scan%></h2> - <div class="cbi-section"> - <div class="table cbi-section-table"> - <div class="tr cbi-section-table-titles"> - <div class="th left"><%:Uplink SSID%></div> - <div class="th left"><%:Uplink BSSID%></div> - <div class="th left"><%:Encryption%></div> - <div class="th left"><%:Signal strength%></div> - </div> - <% for i, net in ipairs(iw.scanlist or { }) do %> - <div class="tr cbi-section-table-row cbi-rowstyle-1"> - <div class="td left"> - <%=net.ssid and utl.pcdata(net.ssid) or "<em>%s</em>" % translate("hidden")%> - </div> - <div class="td left"> - <%=net.bssid and utl.pcdata(net.bssid)%> - </div> - <div class="td left"> - <%=format_wifi_encryption(net.encryption)%> - </div> - <div class="td left"> - <%=percent_wifi_signal(net)%> % - </div> - <div class="td cbi-section-actions"> - <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/wifiadd')%>" method="post"> - <input type="hidden" name="token" value="<%=token%>"/> - <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>"/> - <input type="hidden" name="ssid" value="<%=utl.pcdata(net.ssid)%>"/> - <input type="hidden" name="bssid" value="<%=utl.pcdata(net.bssid)%>"/> - <input type="hidden" name="wep" value="<%=net.encryption.wep and 1 or 0%>"/> - <% if net.encryption.wpa then %> - <input type="hidden" name="wpa_version" value="<%=net.encryption.wpa%>"/> - <% for _, v in ipairs(net.encryption.auth_suites) do %><input type="hidden" name="wpa_suites" value="<%=v%>"/><% end %> - <% end %> - <input class="cbi-button cbi-button-apply" type="submit" value="<%:Add Uplink%>"/> - </form> - </div> - </div> - <% end %> - </div> - </div> -<div class="cbi-page-actions right"> - <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/stations')%>" method="get"> - <input class="cbi-button cbi-button-reset" type="submit" value="<%:Back to overview%>"/> - </form> - <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/wifiscan')%>" method="post"> - <input type="hidden" name="token" value="<%=token%>"/> - <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>"/> - <input class="cbi-button cbi-input-find" type="submit" value="<%:Repeat scan%>"/> - </form> -</div> + <h3><%:Wireless Scan%></h3> + <div class="cbi-section"> + <div class="table cbi-section-table"> + <div class="tr cbi-section-table-titles"> + <div class="th left"><%:Uplink SSID%></div> + <div class="th left"><%:Uplink BSSID%></div> + <div class="th left"><%:Encryption%></div> + <div class="th left"><%:Signal strength%></div> + <div class="th center"><%:Action%></div> + </div> + <%- for i, net in ipairs(iw.scanlist or { }) do -%> + <div class="tr cbi-section-table-row cbi-rowstyle-1"> + <div class="td left"> + <%=net.ssid and utl.pcdata(net.ssid) or "<em>%s</em>" % translate("hidden")%> + </div> + <div class="td left"> + <%=net.bssid and utl.pcdata(net.bssid)%> + </div> + <div class="td left"> + <%=format_wifi_encryption(net.encryption)%> + </div> + <div class="td left"> + <%=percent_wifi_signal(net)%> % + </div> + <div class="td cbi-section-actions"> + <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/wifiadd')%>" method="post"> + <input type="hidden" name="token" value="<%=token%>"/> + <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>"/> + <input type="hidden" name="ssid" value="<%=utl.pcdata(net.ssid)%>"/> + <input type="hidden" name="bssid" value="<%=utl.pcdata(net.bssid)%>"/> + <input type="hidden" name="wep" value="<%=net.encryption.wep and 1 or 0%>"/> + <%- if net.encryption.wpa then -%> + <input type="hidden" name="wpa_version" value="<%=net.encryption.wpa%>"/> + <%- for _, v in ipairs(net.encryption.auth_suites) do -%> + <input type="hidden" name="wpa_suites" value="<%=v%>"/> + <%- end -%> + <%- end -%> + <input class="cbi-button cbi-button-apply" type="submit" value="<%:Add Uplink%>"/> + </form> + </div> + </div> + <%- end -%> + </div> + </div> + <div class="cbi-page-actions right"> + <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/stations')%>" method="get"> + <input class="cbi-button cbi-button-reset" type="submit" value="<%:Back to overview%>"/> + </form> + <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/wifiscan')%>" method="post"> + <input type="hidden" name="token" value="<%=token%>"/> + <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>"/> + <input class="cbi-button cbi-input-find" type="submit" value="<%:Repeat scan%>"/> + </form> + </div> </div> <%+footer%> diff --git a/applications/luci-app-unbound/luasrc/controller/unbound.lua b/applications/luci-app-unbound/luasrc/controller/unbound.lua index 730ca724a4..771385b798 100644 --- a/applications/luci-app-unbound/luasrc/controller/unbound.lua +++ b/applications/luci-app-unbound/luasrc/controller/unbound.lua @@ -1,151 +1,201 @@ -- Copyright 2008 Steven Barth <steven@midlink.org> -- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> --- Copyright 2017 Eric Luehrsen <ericluehrsen@hotmail.com> +-- Copyright 2017 Eric Luehrsen <ericluehrsen@gmail.com> -- Licensed to the public under the Apache License 2.0. module("luci.controller.unbound", package.seeall) function index() - local ucl = luci.model.uci.cursor() - local valexp = ucl:get_first("unbound", "unbound", "extended_luci") - local valman = ucl:get_first("unbound", "unbound", "manual_conf") + local fs = require "nixio.fs" + local ucl = luci.model.uci.cursor() + local valman = ucl:get_first("unbound", "unbound", "manual_conf") - if not nixio.fs.access("/etc/config/unbound") then - return - end + if not fs.access("/etc/config/unbound") then + return + end - if valexp == "1" then -- Expanded View - entry({"admin", "services", "unbound"}, firstchild(), _("Recursive DNS")).dependent = false + entry({"admin", "services", "unbound"}, + firstchild(), _("Recursive DNS")).dependent = false -- UCI Tab(s) - entry({"admin", "services", "unbound", "configure"}, cbi("unbound/configure"), _("Settings"), 10) + entry({"admin", "services", "unbound", "configure"}, + cbi("unbound/configure"), _("Unbound"), 10) + + + if (valman == "0") then + entry({"admin", "services", "unbound", "zones"}, + arcombine(cbi("unbound/zones"), cbi("unbound/zone-details")), + _("Zones"), 15).leaf = true + end + -- Status Tab(s) - entry({"admin", "services", "unbound", "status"}, firstchild(), _("Status"), 20) - entry({"admin", "services", "unbound", "status", "syslog"}, call("QuerySysLog"), _("Log"), 50).leaf = true + entry({"admin", "services", "unbound", "status"}, + firstchild(), _("Status"), 20) + + entry({"admin", "services", "unbound", "status", "syslog"}, + call("QuerySysLog"), _("Log"), 50).leaf = true + + + if fs.access("/usr/sbin/unbound-control") then + -- Require unbound-control to execute + entry({"admin", "services", "unbound", "status", "statistics"}, + call("QueryStatistics"), _("Statistics"), 10).leaf = true + entry({"admin", "services", "unbound", "status", "localdata"}, + call("QueryLocalData"), _("Local Data"), 20).leaf = true - if nixio.fs.access("/usr/sbin/unbound-control") then - -- Require unbound-control to execute - entry({"admin", "services", "unbound", "status", "statistics"}, call("QueryStatistics"), _("Statistics"), 10).leaf = true - entry({"admin", "services", "unbound", "status", "localdata"}, call("QueryLocalData"), _("Local Data"), 20).leaf = true - entry({"admin", "services", "unbound", "status", "localzone"}, call("QueryLocalZone"), _("Local Zones"), 30).leaf = true + entry({"admin", "services", "unbound", "status", "localzone"}, + call("QueryLocalZone"), _("Local Zones"), 30).leaf = true else - entry({"admin", "services", "unbound", "status", "statistics"}, call("ShowEmpty"), _("Statistics"), 10).leaf = true + entry({"admin", "services", "unbound", "status", "statistics"}, + call("ShowEmpty"), _("Statistics"), 10).leaf = true end -- Raw File Tab(s) - entry({"admin", "services", "unbound", "files"}, firstchild(), _("Files"), 30) + entry({"admin", "services", "unbound", "files"}, + firstchild(), _("Files"), 30) - if valman ~= "1" then - entry({"admin", "services", "unbound", "files", "base"}, call("ShowUnboundConf"), _("UCI: Unbound"), 10).leaf = true + if (valman == "0") then + entry({"admin", "services", "unbound", "files", "uci"}, + form("unbound/uciedit"), _("Edit: UCI"), 5).leaf = true + + entry({"admin", "services", "unbound", "files", "base"}, + call("ShowUnboundConf"), _("Show: Unbound"), 10).leaf = true + else - entry({"admin", "services", "unbound", "files", "base"}, form("unbound/manual"), _("Edit: Unbound"), 10).leaf = true + entry({"admin", "services", "unbound", "files", "base"}, + form("unbound/manual"), _("Edit: Unbound"), 10).leaf = true end - entry({"admin", "services", "unbound", "files", "server"}, form("unbound/server"), _("Edit: Server"), 20).leaf = true - entry({"admin", "services", "unbound", "files", "extended"}, form("unbound/extended"), _("Edit: Extended"), 30).leaf = true + entry({"admin", "services", "unbound", "files", "server"}, + form("unbound/server"), _("Edit: Server"), 20).leaf = true + entry({"admin", "services", "unbound", "files", "extended"}, + form("unbound/extended"), _("Edit: Extended"), 30).leaf = true - if nixio.fs.access("/var/lib/unbound/unbound_dhcp.conf") then - entry({"admin", "services", "unbound", "files", "dhcp"}, call("ShowDHCPConf"), _("Include: DHCP"), 40).leaf = true + + if fs.access("/var/lib/unbound/dhcp.conf") then + entry({"admin", "services", "unbound", "files", "dhcp"}, + call("ShowDHCPConf"), _("Show: DHCP"), 40).leaf = true end - if nixio.fs.access("/var/lib/unbound/adb_list.overall") then - entry({"admin", "services", "unbound", "files", "adblock"}, call("ShowAdblock"), _("Include: Adblock"), 50).leaf = true + if fs.access("/var/lib/unbound/adb_list.overall") then + entry({"admin", "services", "unbound", "files", "adblock"}, + call("ShowAdblock"), _("Show: Adblock"), 50).leaf = true end - - else - -- Simple View to UCI only - entry({"admin", "services", "unbound"}, cbi("unbound/configure"), _("Recursive DNS")).dependent = false - end end function ShowEmpty() - local lclhead = "Unbound Control" - local lcldesc = luci.i18n.translate("This could display more statistics with the unbound-control package.") - luci.template.render("unbound/show-empty", {heading = lclhead, description = lcldesc}) + local lclhead = "Unbound Control" + local lcldesc = luci.i18n.translate( + "This could display more statistics with the unbound-control package.") + + luci.template.render("unbound/show-empty", + {heading = lclhead, description = lcldesc}) end function QuerySysLog() - local lclhead = "System Log" - local lcldata = luci.util.exec("logread | grep -i unbound") - local lcldesc = luci.i18n.translate("This shows syslog filtered for events involving Unbound.") - luci.template.render("unbound/show-textbox", {heading = lclhead, description = lcldesc, content = lcldata}) + local lcldata = luci.util.exec("logread -e 'unbound'") + local lcldesc = luci.i18n.translate( + "This shows syslog filtered for events involving Unbound.") + + luci.template.render("unbound/show-textbox", + {heading = "", description = lcldesc, content = lcldata}) end function QueryStatistics() - local lclhead = "Unbound Control Stats" - local lcldata = luci.util.exec("unbound-control -c /var/lib/unbound/unbound.conf stats_noreset") - local lcldesc = luci.i18n.translate("This shows some performance statistics tracked by Unbound.") - luci.template.render("unbound/show-textbox", {heading = lclhead, description = lcldesc, content = lcldata}) + local lcldata = luci.util.exec( + "unbound-control -c /var/lib/unbound/unbound.conf stats_noreset") + + local lcldesc = luci.i18n.translate( + "This shows Unbound self reported performance statistics.") + + luci.template.render("unbound/show-textbox", + {heading = "", description = lcldesc, content = lcldata}) end function QueryLocalData() - local lclhead = "Unbound Control Local Data" - local lcldata = luci.util.exec("unbound-control -c /var/lib/unbound/unbound.conf list_local_data") - local lcldesc = luci.i18n.translate("This shows local host records that shortcut recursion.") - luci.template.render("unbound/show-textbox", {heading = lclhead, description = lcldesc, content = lcldata}) + local lcldata = luci.util.exec( + "unbound-control -c /var/lib/unbound/unbound.conf list_local_data") + + local lcldesc = luci.i18n.translate( + "This shows Unbound 'local-data:' entries from default, .conf, or control.") + + luci.template.render("unbound/show-textbox", + {heading = "", description = lcldesc, content = lcldata}) end function QueryLocalZone() - local lclhead = "Unbound Control Local Zones" - local lcldata = luci.util.exec("unbound-control -c /var/lib/unbound/unbound.conf list_local_zones") - local lcldesc = luci.i18n.translate("This shows local zone definitions that affect recursion routing or processing. ") - luci.template.render("unbound/show-textbox", {heading = lclhead, description = lcldesc, content = lcldata}) + local lcldata = luci.util.exec( + "unbound-control -c /var/lib/unbound/unbound.conf list_local_zones") + + local lcldesc = luci.i18n.translate( + "This shows Unbound 'local-zone:' entries from default, .conf, or control.") + + luci.template.render("unbound/show-textbox", + {heading = "", description = lcldesc, content = lcldata}) end function ShowUnboundConf() - local unboundfile = "/var/lib/unbound/unbound.conf" - local lclhead = "Unbound Conf" - local lcldata = nixio.fs.readfile(unboundfile) - local lcldesc = luci.i18n.translate("This shows configuration generated by UCI:") - lcldesc = lcldesc .. " (" .. unboundfile .. ")" - luci.template.render("unbound/show-textbox", {heading = lclhead, description = lcldesc, content = lcldata}) + local unboundfile = "/var/lib/unbound/unbound.conf" + local lcldata = nixio.fs.readfile(unboundfile) + local lcldesc = luci.i18n.translate( + "This shows '" .. unboundfile .. "' generated from UCI configuration.") + + luci.template.render("unbound/show-textbox", + {heading = "", description = lcldesc, content = lcldata}) end function ShowDHCPConf() - local dhcpfile = "/var/lib/unbound/unbound_dhcp.conf" - local lclhead = "DHCP Conf" - local lcldata = nixio.fs.readfile(dhcpfile) - local lcldesc = luci.i18n.translate("This shows LAN hosts added by DHCP hook scripts:") - lcldesc = lcldesc .. " (" .. dhcpfile .. ")" - luci.template.render("unbound/show-textbox", {heading = lclhead, description = lcldesc, content = lcldata}) + local dhcpfile = "/var/lib/unbound/dhcp.conf" + local lcldata = nixio.fs.readfile(dhcpfile) + local lcldesc = luci.i18n.translate( + "This shows '" .. dhcpfile .. "' list of hosts from DHCP hook scripts.") + + luci.template.render("unbound/show-textbox", + {heading = "", description = lcldesc, content = lcldata}) end function ShowAdblock() - local adblockfile = "/var/lib/unbound/adb_list.overall" - local lclhead = "Adblock Conf" - local lcldata, lcldesc - - - if nixio.fs.stat(adblockfile).size > 262144 then - lcldesc = luci.i18n.translate("Adblock domain list is too large for LuCI:") - lcldesc = lcldesc .. " (" .. adblockfile .. ")" - luci.template.render("unbound/show-empty", {heading = lclhead, description = lcldesc}) - - else - lcldata = nixio.fs.readfile(adblockfile) - lcldesc = luci.i18n.translate("This shows blocked domains provided by Adblock scripts:") - lcldesc = lcldesc .. " (" .. adblockfile .. ")" - luci.template.render("unbound/show-textbox", {heading = lclhead, description = lcldesc, content = lcldata}) - end + local fs = require "nixio.fs" + local tp = require "luci.template" + local tr = require "luci.i18n" + local adblockfile = "/var/lib/unbound/adb_list.overall" + local lcldata, lcldesc + + + if fs.stat(adblockfile).size > 262144 then + lcldesc = tr.translate( + "Adblock domain list '" .. adblockfile .. "' is too large for LuCI.") + + tp.render("unbound/show-empty", + {heading = "", description = lcldesc}) + + else + lcldata = fs.readfile(adblockfile) + lcldesc = tr.translate( + "This shows '" .. adblockfile .. "' list of adblock domains." ) + + tp.render("unbound/show-textbox", + {heading = "", description = lcldesc, content = lcldata}) + end end diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua index 256bbb8392..8170f3d2be 100644 --- a/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua +++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua @@ -1,5 +1,5 @@ -- Copyright 2008 Steven Barth <steven@midlink.org> --- Copyright 2016 Eric Luehrsen <ericluehrsen@hotmail.com> +-- Copyright 2016 Eric Luehrsen <ericluehrsen@gmail.com> -- Copyright 2016 Dan Luedtke <mail@danrl.com> -- Licensed to the public under the Apache License 2.0. @@ -9,307 +9,319 @@ local rlh, rpv, vld, nvd, eds, prt, tlm local ctl, dlk, dom, dty, lfq, wfq, exa local dp6, d64, pfx, qry, qrs local pro, tgr, rsc, rsn, ag2, stt -local rpn, din, dfw, ath +local rpn, din, ath + +local ut = require "luci.util" +local sy = require "luci.sys" +local ht = require "luci.http" +local ds = require "luci.dispatcher" local ucl = luci.model.uci.cursor() local valman = ucl:get_first("unbound", "unbound", "manual_conf") m1 = Map("unbound") +s1 = m1:section(TypedSection, "unbound", translate("Recursive DNS"), + translatef("Unbound <a href=\"%s\" target=\"_blank\">(NLnet Labs)</a>" + .. " is a validating, recursive, and caching DNS resolver" + .. " <a href=\"%s\" target=\"_blank\">(help)</a>.", + "https://www.unbound.net/", + "https://github.com/openwrt/packages/blob/master/net/unbound/files/README.md")) -s1 = m1:section(TypedSection, "unbound") s1.addremove = false s1.anonymous = true --LuCI, Unbound, or Not -s1:tab("basic", translate("Basic"), - translatef("<h3>Unbound Basic Settings</h3>\n" - .. "<a href=\"%s\" target=\"_blank\">Unbound (link)</a>" - .. " is a validating, recursive, and caching DNS resolver. " - .. "UCI documentation can be found on " - .. "<a href=\"%s\" target=\"_blank\">github (link)</a>.", - "https://www.unbound.net/", - "https://github.com/openwrt/packages/blob/master/net/unbound/files/README.md")) - - -if valman ~= "1" then - -- Not in manual configuration mode; show UCI - s1:tab("advanced", translate("Advanced"), - translatef("<h3>Unbound Advanced Settings</h3>\n" - .. "Domain manipulation, lookup protection, and workarounds for " - .. "<a href=\"%s\" target=\"_blank\">Unbound </a>" - .. " DNS resolver.", "https://www.unbound.net/")) - - s1:tab("DHCP", translate("DHCP"), - translatef("<h3>Unbound DHCP Settings</h3>\n" - .. "Link your DHCP server to " - .. "<a href=\"%s\" target=\"_blank\">Unbound </a>" - .. " DNS resolver.", "https://www.unbound.net/ ")) - - s1:tab("resource", translate("Resource"), - translatef("<h3>Unbound Resource Settings</h3>\n" - .. "Memory and protocol setttings for " - .. "<a href=\"%s\" target=\"_blank\">Unbound </a>" - .. " DNS resolver.", "https://www.unbound.net/")) -end +s1:tab("basic", translate("Basic")) -s1:tab("trigger", translate("Trigger"), - translatef("<h3>Unbound Event Trigger Settings</h3>\n" - .. "Start, reload, and save RFC5011 DNSKEY records for " - .. "<a href=\"%s\" target=\"_blank\">Unbound </a>" - .. " DNS resolver.", "https://www.unbound.net/")) +if (valman == "0") then + -- Not in manual configuration mode; show UCI + s1:tab("advanced", translate("Advanced")) + s1:tab("DHCP", translate("DHCP")) + s1:tab("resource", translate("Resource")) +end --Basic Tab, unconditional pieces -ena = s1:taboption("basic", Flag, "enabled", translate("Enable Unbound:"), - translate("Enable the initialization scripts for Unbound")) +ena = s1:taboption("basic", Flag, "enabled", translate("Enable Unbound"), + translate("Enable the initialization scripts for Unbound")) ena.rmempty = false -mcf = s1:taboption("basic", Flag, "manual_conf", translate("Manual Conf:"), - translate("Skip UCI and use /etc/unbound/unbound.conf")) +mcf = s1:taboption("basic", Flag, "manual_conf", translate("Manual Conf"), + translate("Skip UCI and use /etc/unbound/unbound.conf")) mcf.rmempty = false -lci = s1:taboption("basic", Flag, "extended_luci", translate("Extended Tabs:"), - translate("See detailed tabs for statistics, debug, and manual configuration")) -lci.rmempty = false - - -if valman ~= "1" then - -- Not in manual configuration mode; show UCI - --Basic Tab - lsv = s1:taboption("basic", Flag, "localservice", translate("Local Service:"), - translate("Accept queries only from local subnets")) - lsv.rmempty = false - - vld = s1:taboption("basic", Flag, "validator", translate("Enable DNSSEC:"), - translate("Enable the DNSSEC validator module")) - vld.rmempty = false - - nvd = s1:taboption("basic", Flag, "validator_ntp", translate("DNSSEC NTP Fix:"), - translate("Break the loop where DNSSEC needs NTP and NTP needs DNS")) - nvd.rmempty = false - nvd:depends({ validator = true }) - - d64 = s1:taboption("basic", Flag, "dns64", translate("Enable DNS64:"), - translate("Enable the DNS64 module")) - d64.rmempty = false - - pfx = s1:taboption("basic", Value, "dns64_prefix", translate("DNS64 Prefix:"), - translate("Prefix for generated DNS64 addresses")) - pfx.datatype = "ip6addr" - pfx.placeholder = "64:ff9b::/96" - pfx.optional = true - pfx:depends({ dns64 = true }) - - prt = s1:taboption("basic", Value, "listen_port", translate("Listening Port:"), - translate("Choose Unbounds listening port")) - prt.datatype = "port" - prt.rmempty = false - - --Avanced Tab - din = s1:taboption("advanced", DynamicList, "domain_insecure", - translate("Domain Insecure:"), - translate("List domains to bypass checks of DNSSEC")) - din:depends({ validator = true }) - - dfw = s1:taboption("advanced", DynamicList, "domain_forward", - translate("Domain Forward:"), - translate("List domains to simply forward to stub resolvers in /tmp/resolve.auto")) - - rlh = s1:taboption("advanced", Flag, "rebind_localhost", translate("Filter Localhost Rebind:"), - translate("Protect against upstream response of 127.0.0.0/8")) - rlh.rmempty = false - - rpv = s1:taboption("advanced", ListValue, "rebind_protection", translate("Filter Private Rebind:"), - translate("Protect against upstream responses within local subnets")) - rpv:value("0", translate("No Filter")) - rpv:value("1", translate("Filter RFC1918/4193")) - rpv:value("2", translate("Filter Entire Subnet")) - rpv.rmempty = false - - rpn = s1:taboption("advanced", Value, "rebind_interface", translate("Rebind Network Filter:"), - translate("Network subnets to filter from upstream responses")) - rpn.template = "cbi/network_netlist" - rpn.widget = "checkbox" - rpn.rmempty = true - rpn.cast = "string" - rpn.nocreate = true - rpn:depends({ rebind_protection = 2 }) - rpn:depends({ rebind_protection = 3 }) - - --DHCP Tab - dlk = s1:taboption("DHCP", ListValue, "dhcp_link", translate("DHCP Link:"), - translate("Link to supported programs to load DHCP into DNS")) - dlk:value("none", translate("No Link")) - dlk:value("dnsmasq", "dnsmasq") - dlk:value("odhcpd", "odhcpd") - dlk.rmempty = false - - dp6 = s1:taboption("DHCP", Flag, "dhcp4_slaac6", translate("DHCPv4 to SLAAC:"), - translate("Use DHCPv4 MAC to discover IP6 hosts SLAAC (EUI64)")) - dp6.rmempty = false - dp6:depends({ dhcp_link = "odhcpd" }) - - dom = s1:taboption("DHCP", Value, "domain", translate("Local Domain:"), - translate("Domain suffix for this router and DHCP clients")) - dom.placeholder = "lan" - dom:depends({ dhcp_link = "none" }) - dom:depends({ dhcp_link = "odhcpd" }) - - dty = s1:taboption("DHCP", ListValue, "domain_type", translate("Local Domain Type:"), - translate("How to treat queries of this local domain")) - dty:value("deny", translate("Ignored")) - dty:value("refuse", translate("Refused")) - dty:value("static", translate("Only Local")) - dty:value("transparent", translate("Also Forwarded")) - dty:depends({ dhcp_link = "none" }) - dty:depends({ dhcp_link = "odhcpd" }) - - lfq = s1:taboption("DHCP", ListValue, "add_local_fqdn", translate("LAN DNS:"), - translate("How to enter the LAN or local network router in DNS")) - lfq:value("0", translate("No Entry")) - lfq:value("1", translate("Hostname, Primary Address")) - lfq:value("2", translate("Hostname, All Addresses")) - lfq:value("3", translate("Host FQDN, All Addresses")) - lfq:value("4", translate("Interface FQDN, All Addresses")) - lfq:depends({ dhcp_link = "none" }) - lfq:depends({ dhcp_link = "odhcpd" }) - - wfq = s1:taboption("DHCP", ListValue, "add_wan_fqdn", translate("WAN DNS:"), - translate("Override the WAN side router entry in DNS")) - wfq:value("0", translate("Use Upstream")) - wfq:value("1", translate("Hostname, Primary Address")) - wfq:value("2", translate("Hostname, All Addresses")) - wfq:value("3", translate("Host FQDN, All Addresses")) - wfq:value("4", translate("Interface FQDN, All Addresses")) - wfq:depends({ dhcp_link = "none" }) - wfq:depends({ dhcp_link = "odhcpd" }) - - exa = s1:taboption("DHCP", ListValue, "add_extra_dns", translate("Extra DNS:"), - translate("Use extra DNS entries found in /etc/config/dhcp")) - exa:value("0", translate("Ignore")) - exa:value("1", translate("Include Network/Hostnames")) - exa:value("2", translate("Advanced MX/SRV RR")) - exa:value("3", translate("Advanced CNAME RR")) - exa:depends({ dhcp_link = "none" }) - exa:depends({ dhcp_link = "odhcpd" }) - - --TODO: dnsmasq needs to not reference resolve-file and get off port 53. - - --Resource Tuning Tab - ctl = s1:taboption("resource", ListValue, "unbound_control", translate("Unbound Control App:"), - translate("Enable access for unbound-control")) - ctl.rmempty = false - ctl:value("0", translate("No Remote Control")) - ctl:value("1", translate("Local Host, No Encryption")) - ctl:value("2", translate("Local Host, Encrypted")) - ctl:value("3", translate("Local Subnet, Encrypted")) - ctl:value("4", translate("Local Subnet, Static Encryption")) - - pro = s1:taboption("resource", ListValue, "protocol", translate("Recursion Protocol:"), - translate("Chose the protocol recursion queries leave on")) - pro:value("default", translate("Default")) - pro:value("ip4_only", translate("IP4 Only")) - pro:value("ip6_only", translate("IP6 Only")) - pro:value("ip6_prefer", translate("IP6 Preferred")) - pro:value("mixed", translate("IP4 and IP6")) - pro.rmempty = false - - rsc = s1:taboption("resource", ListValue, "resource", translate("Memory Resource:"), - translate("Use menu System/Processes to observe any memory growth")) - rsc:value("default", translate("Default")) - rsc:value("tiny", translate("Tiny")) - rsc:value("small", translate("Small")) - rsc:value("medium", translate("Medium")) - rsc:value("large", translate("Large")) - rsc.rmempty = false - - rsn = s1:taboption("resource", ListValue, "recursion", translate("Recursion Strength:"), - translate("Recursion activity affects memory growth and CPU load")) - rsn:value("default", translate("Default")) - rsn:value("passive", translate("Passive")) - rsn:value("aggressive", translate("Aggressive")) - rsn.rmempty = false - - qry = s1:taboption("resource", Flag, "query_minimize", translate("Query Minimize:"), - translate("Break down query components for limited added privacy")) - qry.rmempty = false - qry:depends({ recursion = "passive" }) - qry:depends({ recursion = "aggressive" }) - - qrs = s1:taboption("resource", Flag, "query_min_strict", translate("Strict Minimize:"), - translate("Strict version of 'query minimize' but it can break DNS")) - qrs.rmempty = false - qrs:depends({ query_minimize = true }) - - ath = s1:taboption("resource", Flag, "prefetch_root", translate("Prefetch Root:"), - translate("Obtain complete root zone files and install in auth-zone: clause")) - ath.rmempty = false - - eds = s1:taboption("resource", Value, "edns_size", translate("EDNS Size:"), - translate("Limit extended DNS packet size")) - eds.datatype = "and(uinteger,min(512),max(4096))" - eds.rmempty = false - - tlm = s1:taboption("resource", Value, "ttl_min", translate("TTL Minimum:"), - translate("Prevent excessively short cache periods")) - tlm.datatype = "and(uinteger,min(0),max(600))" - tlm.rmempty = false - - stt = s1:taboption("resource", Flag, "extended_stats", translate("Extended Statistics:"), - translate("Extended statistics are printed from unbound-control")) - stt.rmempty = false -end - - ---Trigger Tab, always unconditional -ag2 = s1:taboption("trigger", Value, "root_age", translate("Root DSKEY Age:"), - translate("Limit days between RFC5011 copies to reduce flash writes")) -ag2.datatype = "and(uinteger,min(1),max(99))" -ag2:value("3", "3") -ag2:value("9", "9 ("..translate("default")..")") -ag2:value("12", "12") -ag2:value("24", "24") -ag2:value("99", "99 ("..translate("never")..")") -tgr = s1:taboption("trigger", Value, "trigger_interface", translate("Trigger Networks:"), - translate("Networks that may trigger Unbound to reload (avoid wan6)")) -tgr.template = "cbi/network_netlist" -tgr.widget = "checkbox" -tgr.rmempty = true -tgr.cast = "string" -tgr.nocreate = true +if (valman == "0") then + -- Not in manual configuration mode; show UCI + --Basic Tab + lsv = s1:taboption("basic", Flag, "localservice", + translate("Local Service"), + translate("Accept queries only from local subnets")) + lsv.rmempty = false + + vld = s1:taboption("basic", Flag, "validator", + translate("Enable DNSSEC"), + translate("Enable the DNSSEC validator module")) + vld.rmempty = false + + nvd = s1:taboption("basic", Flag, "validator_ntp", + translate("DNSSEC NTP Fix"), + translate("Break the loop where DNSSEC needs NTP and NTP needs DNS")) + nvd.optional = true + nvd:depends("validator", true) + + prt = s1:taboption("basic", Value, "listen_port", + translate("Listening Port"), + translate("Choose Unbounds listening port")) + prt.datatype = "port" + prt.placeholder = "53" + + --Avanced Tab + rlh = s1:taboption("advanced", Flag, "rebind_localhost", + translate("Filter Localhost Rebind"), + translate("Protect against upstream response of 127.0.0.0/8")) + rlh.rmempty = false + + rpv = s1:taboption("advanced", ListValue, "rebind_protection", + translate("Filter Private Rebind"), + translate("Protect against upstream responses within local subnets")) + rpv:value("0", translate("No Filter")) + rpv:value("1", translate("Filter Private Address")) + rpv:value("2", translate("Filter Entire Subnet")) + rpv.rmempty = false + + d64 = s1:taboption("advanced", Flag, "dns64", translate("Enable DNS64"), + translate("Enable the DNS64 module")) + d64.rmempty = false + + pfx = s1:taboption("advanced", Value, "dns64_prefix", + translate("DNS64 Prefix"), + translate("Prefix for generated DNS64 addresses")) + pfx.datatype = "ip6addr" + pfx.placeholder = "64:ff9b::/96" + pfx.optional = true + pfx:depends("dns64", true) + + din = s1:taboption("advanced", DynamicList, "domain_insecure", + translate("Domain Insecure"), + translate("List domains to bypass checks of DNSSEC")) + din:depends("validator", true) + + ag2 = s1:taboption("advanced", Value, "root_age", + translate("Root DSKEY Age"), + translate("Limit days between RFC5011 copies to reduce flash writes")) + ag2.datatype = "and(uinteger,min(1),max(99))" + ag2:value("3", "3") + ag2:value("9", "9 ("..translate("default")..")") + ag2:value("12", "12") + ag2:value("24", "24") + ag2:value("99", "99 ("..translate("never")..")") + + tgr = s1:taboption("advanced", Value, "trigger_interface", + translate("Trigger Networks"), + translate("Networks that may trigger Unbound to reload (avoid wan6)")) + tgr.template = "cbi/network_netlist" + tgr.widget = "checkbox" + tgr.rmempty = true + tgr.cast = "string" + tgr.nocreate = true + + --DHCP Tab + dlk = s1:taboption("DHCP", ListValue, "dhcp_link", + translate("DHCP Link"), + translate("Link to supported programs to load DHCP into DNS")) + dlk:value("none", translate("No Link")) + dlk:value("dnsmasq", "dnsmasq") + dlk:value("odhcpd", "odhcpd") + dlk.rmempty = false + + dp6 = s1:taboption("DHCP", Flag, "dhcp4_slaac6", + translate("DHCPv4 to SLAAC"), + translate("Use DHCPv4 MAC to discover IP6 hosts SLAAC (EUI64)")) + dp6.optional = true + dp6:depends("dhcp_link", "odhcpd") + + dom = s1:taboption("DHCP", Value, "domain", + translate("Local Domain"), + translate("Domain suffix for this router and DHCP clients")) + dom.placeholder = "lan" + dom.optional = true + dom:depends("dhcp_link", "none") + dom:depends("dhcp_link", "odhcpd") + + dty = s1:taboption("DHCP", ListValue, "domain_type", + translate("Local Domain Type"), + translate("How to treat queries of this local domain")) + dty.optional = true + dty:value("deny", translate("Denied (nxdomain)")) + dty:value("refuse", translate("Refused")) + dty:value("static", translate("Static (local only)")) + dty:value("transparent", translate("Transparent (local/global)")) + dty:depends("dhcp_link", "none") + dty:depends("dhcp_link", "odhcpd") + + lfq = s1:taboption("DHCP", ListValue, "add_local_fqdn", + translate("LAN DNS"), + translate("How to enter the LAN or local network router in DNS")) + lfq.optional = true + lfq:value("0", translate("No Entry")) + lfq:value("1", translate("Hostname, Primary Address")) + lfq:value("2", translate("Hostname, All Addresses")) + lfq:value("3", translate("Host FQDN, All Addresses")) + lfq:value("4", translate("Interface FQDN, All Addresses")) + lfq:depends("dhcp_link", "none") + lfq:depends("dhcp_link", "odhcpd") + + wfq = s1:taboption("DHCP", ListValue, "add_wan_fqdn", + translate("WAN DNS"), + translate("Override the WAN side router entry in DNS")) + wfq.optional = true + wfq:value("0", translate("Use Upstream")) + wfq:value("1", translate("Hostname, Primary Address")) + wfq:value("2", translate("Hostname, All Addresses")) + wfq:value("3", translate("Host FQDN, All Addresses")) + wfq:value("4", translate("Interface FQDN, All Addresses")) + wfq:depends("dhcp_link", "none") + wfq:depends("dhcp_link", "odhcpd") + + exa = s1:taboption("DHCP", ListValue, "add_extra_dns", + translate("Extra DNS"), + translate("Use extra DNS entries found in /etc/config/dhcp")) + exa.optional = true + exa:value("0", translate("Ignore")) + exa:value("1", translate("Host Records")) + exa:value("2", translate("Host/MX/SRV RR")) + exa:value("3", translate("Host/MX/SRV/CNAME RR")) + exa:depends("dhcp_link", "none") + exa:depends("dhcp_link", "odhcpd") + + --TODO: dnsmasq needs to not reference resolve-file and get off port 53. + + --Resource Tuning Tab + ctl = s1:taboption("resource", ListValue, "unbound_control", + translate("Unbound Control App"), + translate("Enable access for unbound-control")) + ctl.rmempty = false + ctl:value("0", translate("No Remote Control")) + ctl:value("1", translate("Local Host, No Encryption")) + ctl:value("2", translate("Local Host, Encrypted")) + ctl:value("3", translate("Local Subnet, Encrypted")) + ctl:value("4", translate("Local Subnet, Static Encryption")) + + pro = s1:taboption("resource", ListValue, "protocol", + translate("Recursion Protocol"), + translate("Chose the protocol recursion queries leave on")) + pro:value("default", translate("Default")) + pro:value("ip4_only", translate("IP4 Only")) + pro:value("ip6_only", translate("IP6 Only")) + pro:value("ip6_prefer", translate("IP6 Preferred")) + pro:value("mixed", translate("IP4 and IP6")) + pro.rmempty = false + + rsc = s1:taboption("resource", ListValue, "resource", + translate("Memory Resource"), + translate("Use menu System/Processes to observe any memory growth")) + rsc:value("default", translate("Default")) + rsc:value("tiny", translate("Tiny")) + rsc:value("small", translate("Small")) + rsc:value("medium", translate("Medium")) + rsc:value("large", translate("Large")) + rsc.rmempty = false + + rsn = s1:taboption("resource", ListValue, "recursion", + translate("Recursion Strength"), + translate("Recursion activity affects memory growth and CPU load")) + rsn:value("default", translate("Default")) + rsn:value("passive", translate("Passive")) + rsn:value("aggressive", translate("Aggressive")) + rsn.rmempty = false + + qry = s1:taboption("resource", Flag, "query_minimize", + translate("Query Minimize"), + translate("Break down query components for limited added privacy")) + qry.optional = true + qry:depends("recursion", "passive") + qry:depends("recursion", "aggressive") + + qrs = s1:taboption("resource", Flag, "query_min_strict", + translate("Strict Minimize"), + translate("Strict version of 'query minimize' but it can break DNS")) + qrs.optional = true + qrs:depends("query_minimize", true) + + eds = s1:taboption("resource", Value, "edns_size", + translate("EDNS Size:"), + translate("Limit extended DNS packet size")) + eds.datatype = "and(uinteger,min(512),max(4096))" + eds.placeholder = "1280" + + tlm = s1:taboption("resource", Value, "ttl_min", + translate("TTL Minimum"), + translate("Prevent excessively short cache periods")) + tlm.datatype = "and(uinteger,min(0),max(1200))" + tlm.placeholder = "120" + + stt = s1:taboption("resource", Flag, "extended_stats", + translate("Extended Statistics"), + translate("Extended statistics are printed from unbound-control")) + stt.rmempty = false + +else + ag2 = s1:taboption("basic", Value, "root_age", + translate("Root DSKEY Age"), + translate("Limit days between RFC5011 copies to reduce flash writes")) + ag2.datatype = "and(uinteger,min(1),max(99))" + ag2:value("3", "3") + ag2:value("9", "9 ("..translate("default")..")") + ag2:value("12", "12") + ag2:value("24", "24") + ag2:value("99", "99 ("..translate("never")..")") + + tgr = s1:taboption("basic", Value, "trigger_interface", + translate("Trigger Networks"), + translate("Networks that may trigger Unbound to reload (avoid wan6)")) + tgr.template = "cbi/network_netlist" + tgr.widget = "checkbox" + tgr.rmempty = true + tgr.cast = "string" + tgr.nocreate = true +end function ena.cfgvalue(self, section) - return luci.sys.init.enabled("unbound") and self.enabled or self.disabled + return sy.init.enabled("unbound") and self.enabled or self.disabled end function ena.write(self, section, value) - if value == "1" then - luci.sys.init.enable("unbound") - luci.sys.call("/etc/init.d/unbound start >/dev/null") - else - luci.sys.call("/etc/init.d/unbound stop >/dev/null") - luci.sys.init.disable("unbound") - end - - return Flag.write(self, section, value) + if (value == "1") then + sy.init.enable("unbound") + sy.call("/etc/init.d/unbound start >/dev/null 2>&1") + + else + sy.call("/etc/init.d/unbound stop >/dev/null 2>&1") + sy.init.disable("unbound") + end + + + return Flag.write(self, section, value) end -function m1.on_apply(self) - function ena.validate(self, value) - if value ~= "0" then - luci.sys.call("/etc/init.d/unbound restart >/dev/null 2>&1") +function m1.on_commit(self) + if sy.init.enabled("unbound") then + -- Restart Unbound with configuration + sy.call("/etc/init.d/unbound restart >/dev/null 2>&1") + else - luci.sys.call("/etc/init.d/unbound stop >/dev/null 2>&1") + sy.call("/etc/init.d/unbound stop >/dev/null 2>&1") end - end +end - -- Restart Unbound with configuration and reload the page (some options hide) - luci.http.redirect(luci.dispatcher.build_url("admin", "services", "unbound")) +function m1.on_apply(self) + -- reload the page because some options hide + ht.redirect(ds.build_url("admin", "services", "unbound", "configure")) end diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound/extended.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound/extended.lua index 67d2ec6c6b..6c5e8c23ef 100644 --- a/applications/luci-app-unbound/luasrc/model/cbi/unbound/extended.lua +++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound/extended.lua @@ -1,28 +1,31 @@ --- Copyright 2016 Eric Luehrsen <ericluehrsen@hotmail.com> +-- Copyright 2016 Eric Luehrsen <ericluehrsen@gmail.com> -- Licensed to the public under the Apache License 2.0. local m4, s4, frm local filename = "/etc/unbound/unbound_ext.conf" -local description = translatef("Here you may edit 'forward:' and 'remote-control:' in an extended 'include:'") -description = description .. " (" .. filename .. ")" +local fs = require "nixio.fs" +local ut = require "luci.util" m4 = SimpleForm("editing", nil) m4:append(Template("unbound/css-editing")) m4.submit = translate("Save") m4.reset = false -s4 = m4:section(SimpleSection, "Unbound Extended Conf", description) +s4 = m4:section(SimpleSection, "", + translatef( + "Edit clauses such as 'forward-zone:' for 'include: " .. filename .. "'")) + frm = s4:option(TextValue, "data") frm.datatype = "string" frm.rows = 20 function frm.cfgvalue() - return nixio.fs.readfile(filename) or "" + return fs.readfile(filename) or "" end function frm.write(self, section, data) - return nixio.fs.writefile(filename, luci.util.trim(data:gsub("\r\n", "\n"))) + return fs.writefile(filename, ut.trim(data:gsub("\r\n", "\n"))) end diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound/manual.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound/manual.lua index 5cfb9c32c1..317c23fda0 100644 --- a/applications/luci-app-unbound/luasrc/model/cbi/unbound/manual.lua +++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound/manual.lua @@ -1,28 +1,31 @@ --- Copyright 2016 Eric Luehrsen <ericluehrsen@hotmail.com> +-- Copyright 2016 Eric Luehrsen <ericluehrsen@gmail.com> -- Licensed to the public under the Apache License 2.0. local m2, s2, frm local filename = "/etc/unbound/unbound.conf" -local description = translatef("Here you may edit raw 'unbound.conf' when you don't use UCI:") -description = description .. " (" .. filename .. ")" +local fs = require "nixio.fs" +local ut = require "luci.util" m2 = SimpleForm("editing", nil) m2:append(Template("unbound/css-editing")) m2.submit = translate("Save") m2.reset = false -s2 = m2:section(SimpleSection, "Unbound Conf", description) +s2 = m2:section(SimpleSection, "", + translatef( + "Edit '" .. filename .. "' when you do not use UCI.")) + frm = s2:option(TextValue, "data") frm.datatype = "string" frm.rows = 20 function frm.cfgvalue() - return nixio.fs.readfile(filename) or "" + return fs.readfile(filename) or "" end function frm.write(self, section, data) - return nixio.fs.writefile(filename, luci.util.trim(data:gsub("\r\n", "\n"))) + return fs.writefile(filename, ut.trim(data:gsub("\r\n", "\n"))) end diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound/server.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound/server.lua index d0ac407847..5cef2a67b0 100644 --- a/applications/luci-app-unbound/luasrc/model/cbi/unbound/server.lua +++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound/server.lua @@ -1,28 +1,31 @@ --- Copyright 2016 Eric Luehrsen <ericluehrsen@hotmail.com> +-- Copyright 2016 Eric Luehrsen <ericluehrsen@gmail.com> -- Licensed to the public under the Apache License 2.0. local m3, s3, frm local filename = "/etc/unbound/unbound_srv.conf" -local description = translatef("Here you may edit the 'server:' clause in an internal 'include:'") -description = description .. " (" .. filename .. ")" +local fs = require "nixio.fs" +local ut = require "luci.util" m3 = SimpleForm("editing", nil) m3:append(Template("unbound/css-editing")) m3.submit = translate("Save") m3.reset = false -s3 = m3:section(SimpleSection, "Unbound Server Conf", description) +s3 = m3:section(SimpleSection, "", + translatef( + "Edit 'server:' clause options for 'include: " .. filename .. "'")) + frm = s3:option(TextValue, "data") frm.datatype = "string" frm.rows = 20 function frm.cfgvalue() - return nixio.fs.readfile(filename) or "" + return fs.readfile(filename) or "" end function frm.write(self, section, data) - return nixio.fs.writefile(filename, luci.util.trim(data:gsub("\r\n", "\n"))) + return fs.writefile(filename, ut.trim(data:gsub("\r\n", "\n"))) end diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound/uciedit.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound/uciedit.lua new file mode 100644 index 0000000000..f1e1d842a1 --- /dev/null +++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound/uciedit.lua @@ -0,0 +1,37 @@ +-- Copyright 2016 Eric Luehrsen <ericluehrsen@gmail.com> +-- Licensed to the public under the Apache License 2.0. + +local m6, s6, frm +local filename = "/etc/config/unbound" +local fs = require "nixio.fs" +local ut = require "luci.util" + +m6 = SimpleForm("editing", nil) +m6:append(Template("unbound/css-editing")) +m6.submit = translate("Save") +m6.reset = false +s6 = m6:section(SimpleSection, "", + translatef("Edit '" .. filename .. "' " + .. "and recipes can be found in OpenWrt " + .. "<a href=\"%s\" target=\"_blank\">Guides</a> " + .. "and <a href=\"%s\" target=\"_blank\">Github</a>.", + "https://openwrt.org/docs/guide-user/services/dns/unbound", + "https://github.com/openwrt/packages/blob/master/net/unbound/files/README.md")) + +frm = s6:option(TextValue, "data") +frm.datatype = "string" +frm.rows = 20 + + +function frm.cfgvalue() + return fs.readfile(filename) or "" +end + + +function frm.write(self, section, data) + return fs.writefile(filename, ut.trim(data:gsub("\r\n", "\n"))) +end + + +return m6 + diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua new file mode 100644 index 0000000000..dcaa877fd0 --- /dev/null +++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua @@ -0,0 +1,95 @@ +-- Copyright 2018 Eric Luehrsen <ericluehrsen@gmail.com> +-- Licensed to the public under the Apache License 2.0. + +local sy = require "luci.sys" +local ds = require "luci.dispatcher" +local hp = require "luci.http" +local m7, s7 +local ena, flb, zty, znm, srv, rlv, tlu +local prt, tlp, tli, url + +arg[1] = arg[1] or "" +m7 = Map("unbound") +m7.redirect = ds.build_url("admin/services/unbound/zones") + + +if (arg[1] == "") then + hp.redirect(m7.redirect) + return + +else + s7 = m7:section(NamedSection, arg[1], "zone", + translatef("Directed Zone"), + translatef("Edit a forward, stub, or zone-file-cache zone " + .. "for Unbound to use instead of recursion.")) + + s7.anonymous = true + s7.addremove = false + + ena = s7:option(Flag, "enabled", translate("Enabled"), + translate("Enable this directed zone")) + ena.rmempty = false + + flb = s7:option(Flag, "fallback", translate("Fall Back"), + translate("Allow open recursion when record not in zone")) + flb.rmempty = false + + zty = s7:option(ListValue, "zone_type", translate("Zone Type")) + zty:value("auth_zone", translate("Authoritative (zone file)")) + zty:value("stub_zone", translate("Stub (forced recursion)")) + zty:value("forward_zone", translate("Forward (simple handoff)")) + zty.rmempty = false + + znm = s7:option(DynamicList, "zone_name", translate("Zone Names"), + translate("Zone (Domain) names included in this zone combination")) + znm.placeholder="new.example.net." + + srv = s7:option(DynamicList, "server", translate("Servers"), + translate("Servers for this zone; see README.md for optional form")) + srv.placeholder="192.0.2.53" + + rlv = s7:option(Flag, "resolv_conf", translate("Use 'resolv.conf.auto'"), + translate("Forward to upstream nameservers (ISP)")) + rlv:depends("zone_type", "forward_zone") + + tlu = s7:option(Flag, "tls_upstream", translate("DNS over TLS"), + translate("Connect to servers using TLS")) + tlu:depends("zone_type", "forward_zone") + + prt = s7:option(Value, "port", translate("Server Port"), + translate("Port servers will receive queries on")) + prt:depends("tls_upstream", false) + prt.datatype = "port" + prt.placeholder="53" + + tlp = s7:option(Value, "tls_port", translate("Server TLS Port"), + translate("Port servers will receive queries on")) + tlp:depends("tls_upstream", true) + tlp.datatype = "port" + tlp.placeholder="853" + + tli = s7:option(Value, "tls_index", translate("TLS Name Index"), + translate("Domain name to verify TLS certificate")) + tli:depends("tls_upstream", true) + tli.placeholder="dns.example.net" + + url = s7:option(Value, "url_dir", translate("Zone Download URL"), + translate("Directory only part of URL")) + url:depends("zone_type", "auth_zone") + url.placeholder="https://www.example.net/dl/zones/" +end + + +function m7.on_commit(self) + if sy.init.enabled("unbound") then + -- Restart Unbound with configuration + sy.call("/etc/init.d/unbound restart >/dev/null 2>&1") + + else + sy.call("/etc/init.d/unbound stop >/dev/null 2>&1") + end +end + + +return m7 + diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua new file mode 100644 index 0000000000..798ca6a45c --- /dev/null +++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua @@ -0,0 +1,232 @@ +-- Copyright 2018 Eric Luehrsen <ericluehrsen@gmail.com> +-- Licensed to the public under the Apache License 2.0. + +local m5, s5 +local ztype, zones, servers, fallback, enabled + +local fs = require "nixio.fs" +local ut = require "luci.util" +local sy = require "luci.sys" +local ds = require "luci.dispatcher" +local resolvfile = "/tmp/resolv.conf.auto" +local logerr = ut.exec("logread -e 'unbound.*error.*ssl library'") + +m5 = Map("unbound") +s5 = m5:section(TypedSection, "zone", "Zones", + translatef("Organize directed forward, stub, and authoritative zones" + .. " <a href=\"%s\" target=\"_blank\">(help)</a>.", + "https://www.unbound.net/", + "https://github.com/openwrt/packages/blob/master/net/unbound/files/README.md")) + +s5.addremove = true +s5.anonymous = true +s5.sortable = true +s5.template = "cbi/tblsection" +s5.extedit = ds.build_url("admin/services/unbound/zones/%s") + +ztype = s5:option(DummyValue, "DummyType", translate("Type")) +ztype.rawhtml = true + +zones = s5:option(DummyValue, "DummyZones", translate("Zones")) +zones.rawhtml = true + +servers = s5:option(DummyValue, "DummyServers", translate("Servers")) +servers.rawhtml = true + +fallback = s5:option(Flag, "fallback", translate("Fallback")) +fallback.rmempty = false + +enabled = s5:option(Flag, "enabled", translate("Enable")) +enabled.rmempty = false + + +if logerr and (#logerr > 0) then + logerr = logerr:sub((1 + #logerr - math.min(#logerr, 250)), #logerr) + m5.message = translatef( "Note: SSL/TLS library is missing an API. " + .. "Please review syslog. >> logread ... " .. logerr ) +end + + +function s5.create(self, section) + created = TypedSection.create(self, section) +end + + +function s5.parse(self, ...) + TypedSection.parse(self, ...) +end + + +function ztype.cfgvalue(self, s) + -- Format a meaninful tile for the Zone Type column + local itxt = self.map:get(s, "zone_type") + local itls = self.map:get(s, "tls_upstream") + + + if itxt and itxt:match("forward") then + if itls and (itls == "1") then + return translate("Forward TLS") + + else + return translate("Forward") + end + + elseif itxt and itxt:match("stub") then + return translate("Recurse") + + elseif itxt and itxt:match("auth") then + return translate("AXFR") + + else + return translate("Undefined") + end +end + + +function zones.cfgvalue(self, s) + -- Format a meaninful sentence for the Zones viewed column + local xtxt, otxt + local itxt = self.map:get(s, "zone_name") + local itype = self.map:get(s, "zone_type") + + + for xtxt in ut.imatch(itxt) do + if (xtxt == ".") then + -- zone_name lists + xtxt = translate("(root)") + end + + + if otxt and (#otxt > 0) then + otxt = otxt .. ", <var>%s</var>" % xtxt + + else + otxt = "<var>%s</var>" % xtxt + end + end + + + if otxt and (#otxt > 0) then + if itype and itype:match("forward") then + -- from zone_type create a readable hint for the action + otxt = translate("accept upstream results for ") .. otxt + + elseif itype and itype:match("stub") then + otxt = translate("select recursion for ") .. otxt + + elseif itype and itype:match("auth") then + otxt = translate("prefetch zone files for ") .. otxt + + else + otxt = translate("unknown action for ") .. otxt + end + + + return otxt + + else + return "(empty)" + end +end + + +function servers.cfgvalue(self, s) + -- Format a meaninful sentence for the Servers (and URL) column + local xtxt, otxt, rtxt, found + local itxt = self.map:get(s, "server") + local iurl = self.map:get(s, "url_dir") + local itype = self.map:get(s, "zone_type") + local itls = self.map:get(s, "tls_upstream") + local iidx = self.map:get(s, "tls_index") + local irslv = self.map:get(s, "resolv_conf") + + + for xtxt in ut.imatch(itxt) do + if otxt and (#otxt > 0) then + -- bundle and make pretty the server list + otxt = otxt .. ", <var>%s</var>" % xtxt + + else + otxt = "<var>%s</var>" % xtxt + end + end + + + if otxt and (#otxt > 0) then + otxt = translate("use nameservers ") .. otxt + end + + + if otxt and (#otxt > 0) + and itls and (itls == "1") + and iidx and (#iidx > 0) then + -- show TLS certificate name index if provided + otxt = otxt .. translatef( + " with default certificate for <var>%s</var>", iidx) + end + + + if iurl and (#iurl > 0) and itype and itype:match("auth") then + if otxt and (#otxt > 0) then + -- include optional URL filed for auth-zone: type + otxt = otxt .. translatef(", and try <var>%s</var>", iurl) + + else + otxt = translatef("download from <var>%s</var>", iurl) + end + end + + + if irslv and (irslv == "1") and itype and itype:match("forward") then + for xtxt in ut.imatch(fs.readfile(resolvfile)) do + if xtxt:match("nameserver") then + found = true + + elseif (found == true) then + if rtxt and (#rtxt > 0) then + -- fetch name servers from resolv.conf + rtxt = rtxt .. ", <var>%s</var>" % xtxt + + else + rtxt = "<var>%s</var>" % xtxt + end + + + found = false + end + end + + + if otxt and (#otxt > 0) and rtxt and (#rtxt > 0) then + otxt = otxt .. translatef( + ", and <var>%s</var> entries ", resolvfile) .. rtxt + + elseif rtxt and (#rtxt > 0) then + otxt = translatef( + "use <var>%s</var> nameservers ", resolvfile) .. rtxt + end + end + + + if otxt and (#otxt > 0) then + return otxt + + else + return "(empty)" + end +end + + +function m5.on_commit(self) + if sy.init.enabled("unbound") then + -- Restart Unbound with configuration + sy.call("/etc/init.d/unbound restart >/dev/null 2>&1") + + else + sy.call("/etc/init.d/unbound stop >/dev/null 2>&1") + end +end + + +return m5 + |