From 7d03f8ea8a5edf72b708a8a4f45346048274fae6 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Sun, 8 Jun 2008 08:14:31 +0000 Subject: [PATCH] * Core translation * Added license headers * Splitted qos into separate application package --- .../luci-olsr/luasrc/controller/olsr.lua | 4 ++ applications/luci-qos/Makefile | 2 + .../luci-qos/luasrc/controller/qos.lua | 22 +++++++ .../luci-qos/luasrc/model/cbi/qos}/qos.lua | 14 ++++- contrib/package/luci/Makefile | 15 +++++ i18n/english/luasrc/i18n/admin-core.en.lua | 36 +++++++++++ i18n/english/luasrc/i18n/default.en.lua | 1 + i18n/german/luasrc/i18n/admin-core.de.lua | 34 +++++++++++ libs/cbi/luasrc/cbi.lua | 7 +-- libs/core/luasrc/util.lua | 14 ----- libs/sgi-webuci/luasrc/sgi/webuci.lua | 4 +- libs/web/luasrc/dispatcher.lua | 3 +- .../luasrc/controller/admin/index.lua | 13 ++++ .../luasrc/controller/admin/network.lua | 19 ++++-- .../luasrc/controller/admin/services.lua | 13 ++++ .../luasrc/controller/admin/status.lua | 13 ++++ .../luasrc/controller/admin/system.lua | 13 ++++ .../luasrc/controller/admin/uci.lua | 13 ++++ .../luasrc/controller/admin/wifi.lua | 13 ++++ .../luasrc/model/cbi/admin_index/luci.lua | 13 ++++ .../luasrc/model/cbi/admin_network/dhcp.lua | 14 ++++- .../luasrc/model/cbi/admin_network/ifaces.lua | 14 ++++- .../luasrc/model/cbi/admin_network/ptp.lua | 14 ++++- .../luasrc/model/cbi/admin_network/routes.lua | 14 ++++- .../luasrc/model/cbi/admin_network/vlan.lua | 14 ++++- .../model/cbi/admin_services/dnsmasq.lua | 61 +++++++++++-------- .../model/cbi/admin_services/dropbear.lua | 13 ++++ .../luasrc/model/cbi/admin_services/httpd.lua | 13 ++++ .../luasrc/model/cbi/admin_system/fstab.lua | 13 ++++ .../model/cbi/admin_system/hostname.lua | 13 ++++ .../luasrc/model/cbi/admin_wifi/devices.lua | 14 ++++- .../luasrc/model/cbi/admin_wifi/networks.lua | 14 ++++- .../luasrc/controller/freifunk/freifunk.lua | 13 ++++ .../luasrc/controller/freifunk/luciinfo.lua | 13 ++++ .../luasrc/model/cbi/freifunk/contact.lua | 14 ++++- .../luasrc/model/cbi/freifunk/freifunk.lua | 14 ++++- 36 files changed, 467 insertions(+), 64 deletions(-) create mode 100644 applications/luci-qos/Makefile create mode 100644 applications/luci-qos/luasrc/controller/qos.lua rename {modules/admin-core/luasrc/model/cbi/admin_network => applications/luci-qos/luasrc/model/cbi/qos}/qos.lua (82%) create mode 100644 i18n/german/luasrc/i18n/admin-core.de.lua diff --git a/applications/luci-olsr/luasrc/controller/olsr.lua b/applications/luci-olsr/luasrc/controller/olsr.lua index 24159b7cc4..d795dc4ed6 100644 --- a/applications/luci-olsr/luasrc/controller/olsr.lua +++ b/applications/luci-olsr/luasrc/controller/olsr.lua @@ -1,6 +1,10 @@ module("luci.controller.olsr", package.seeall) function index() + if not luci.fs.isfile("/etc/config/olsr") then + return + end + local page = node("admin", "status", "olsr") page.target = call("action_index") page.title = "OLSR" diff --git a/applications/luci-qos/Makefile b/applications/luci-qos/Makefile new file mode 100644 index 0000000000..81a96f6a83 --- /dev/null +++ b/applications/luci-qos/Makefile @@ -0,0 +1,2 @@ +include ../../build/config.mk +include ../../build/module.mk \ No newline at end of file diff --git a/applications/luci-qos/luasrc/controller/qos.lua b/applications/luci-qos/luasrc/controller/qos.lua new file mode 100644 index 0000000000..faddbace8e --- /dev/null +++ b/applications/luci-qos/luasrc/controller/qos.lua @@ -0,0 +1,22 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- +module("luci.controller.qos", package.seeall) + +function index() + if not luci.fs.isfile("/etc/config/qos") then + return + end + + entry({"admin", "network", "qos"}, cbi("qos/qos"), "Quality of Service") +end \ No newline at end of file diff --git a/modules/admin-core/luasrc/model/cbi/admin_network/qos.lua b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua similarity index 82% rename from modules/admin-core/luasrc/model/cbi/admin_network/qos.lua rename to applications/luci-qos/luasrc/model/cbi/qos/qos.lua index d58130f10f..2af820d6f9 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_network/qos.lua +++ b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua @@ -1,4 +1,16 @@ --- ToDo: Translate, Add descriptions and help texts +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- m = Map("qos", "Quality of Service", [[Mit Hilfe von QoS kann einzelnen Rechnern oder Netzwerkdiensten eine höhere oder niedrigere Priorität zugewiesen werden.]]) diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index d95d91c1d7..2e0a312009 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -272,6 +272,17 @@ define Package/luci-app-olsr/install endef +define Package/luci-app-qos + $(call Package/luci/webtemplate) + DEPENDS+=+luci-mod-admin-core +qos-scripts + TITLE:=Quality of Service configuration module +endef + +define Package/luci-app-qos/install + $(call Package/luci/install/template,$(1),applications/luci-qos) +endef + + define Package/luci-app-splash $(call Package/luci/fftemplate) DEPENDS+=+luci-sgi-haserl +iptables-mod-nat +iptables-mod-ipopt @@ -418,6 +429,9 @@ endif ifneq ($(CONFIG_PACKAGE_luci-app-olsr),) PKG_SELECTED_MODULES+=applications/luci-olsr endif +ifneq ($(CONFIG_PACKAGE_luci-app-qos),) + PKG_SELECTED_MODULES+=applications/luci-qos +endif ifneq ($(CONFIG_PACKAGE_luci-app-splash),) PKG_SELECTED_MODULES+=applications/luci-splash endif @@ -466,6 +480,7 @@ $(eval $(call BuildPackage,luci-mod-freifunk)) $(eval $(call BuildPackage,luci-app-ffwizard-leipzig)) $(eval $(call BuildPackage,luci-app-firewall)) $(eval $(call BuildPackage,luci-app-olsr)) +$(eval $(call BuildPackage,luci-app-qos)) $(eval $(call BuildPackage,luci-app-splash)) $(eval $(call BuildPackage,luci-app-statistics)) diff --git a/i18n/english/luasrc/i18n/admin-core.en.lua b/i18n/english/luasrc/i18n/admin-core.en.lua index 1c2d036591..c5d9e7db01 100644 --- a/i18n/english/luasrc/i18n/admin-core.en.lua +++ b/i18n/english/luasrc/i18n/admin-core.en.lua @@ -145,3 +145,39 @@ a_w_radiusport = "Radius-Port" a_w_apisolation = "AP-Isolation" a_w_apisolation1 = "Prevents Client to Client communication" a_w_hideessid = "Hide ESSID" + +dhcp_desc = "Dnsmasq is a combined DHCP-Server and DNS-Forwarder for NAT firewalls" +dhcp_dnsmasq_domainneeded = "Domain required" +dhcp_dnsmasq_domainneeded_desc = "Don't forward DNS-Requests without DNS-Name" +dhcp_dnsmasq_authoritative = "Authoritative" +dhcp_dnsmasq_authoritative_desc = "This is the only DHCP in the local network" +dhcp_dnsmasq_boguspriv = "Filter private" +dhcp_dnsmasq_boguspriv_desc = "Don't forward reverse lookups for local networks" +dhcp_dnsmasq_filterwin2k = "Filter useless" +dhcp_dnsmasq_filterwin2k_desc = "filter useless DNS-queries of Windows-systems" +dhcp_dnsmasq_localisequeries = "Localise queries" +dhcp_dnsmasq_localisequeries_desc = "localises the hostname depending on its subnet" +dhcp_dnsmasq_local = "Local Server" +dhcp_dnsmasq_domain = "Local Domain" +dhcp_dnsmasq_expandhosts = "Expand Hosts" +dhcp_dnsmasq_expandhosts_desc = "adds domain names to hostentries in the resolv file" +dhcp_dnsmasq_nonegcache = "don't cache unknown" +dhcp_dnsmasq_nonegcache_desc = "prevents caching of negative DNS-replies" +dhcp_dnsmasq_readethers = "Use /etc/ethers" +dhcp_dnsmasq_readethers_desc = "Read /etc/ethers to configure the DHCP-Server" +dhcp_dnsmasq_leasefile = "Leasefile" +dhcp_dnsmasq_leasefile_desc = "file where given DHCP-leases will be stored" +dhcp_dnsmasq_resolvfile = "Resolvfile" +dhcp_dnsmasq_resolvfile_desc = "local DNS file" +dhcp_dnsmasq_nohosts = "Ignore /etc/hosts" +dhcp_dnsmasq_strictorder = "Strict order" +dhcp_dnsmasq_strictorder_desc = "DNS-Server will be queried in the order of the resolvfile" +dhcp_dnsmasq_logqueries = "Log queries" +dhcp_dnsmasq_noresolv = "Ignore resolve file" +dhcp_dnsmasq_dnsforwardmax = "concurrent queries" +dhcp_dnsmasq_port = "DNS-Port" +dhcp_dnsmasq_ednspacket_max = "max. EDNS.0 paket size" +dhcp_dnsmasq_dhcpleasemax = "max. DHCP-Leases" +dhcp_dnsmasq_addnhosts = "additional hostfile" +dhcp_dnsmasq_queryport = "query port" + diff --git a/i18n/english/luasrc/i18n/default.en.lua b/i18n/english/luasrc/i18n/default.en.lua index 3009d308eb..b9933216c6 100644 --- a/i18n/english/luasrc/i18n/default.en.lua +++ b/i18n/english/luasrc/i18n/default.en.lua @@ -60,6 +60,7 @@ revert = "Revert" save = "Save" services = "Services" +settings = "Settings" statistics = "Statistics" syslog = "System Log" system = "System" diff --git a/i18n/german/luasrc/i18n/admin-core.de.lua b/i18n/german/luasrc/i18n/admin-core.de.lua new file mode 100644 index 0000000000..8b1cb3b471 --- /dev/null +++ b/i18n/german/luasrc/i18n/admin-core.de.lua @@ -0,0 +1,34 @@ +dhcp_desc = "Dnsmasq ist ein kombinierter DHCP-Server und DNS-Forwarder für NAT-Firewalls." +dhcp_dnsmasq_domainneeded = "Anfragen nur mit Domain" +dhcp_dnsmasq_domainneeded_desc = "Anfragen ohne Domainnamen nicht weiterleiten" +dhcp_dnsmasq_authoritative = "Authoritativ" +dhcp_dnsmasq_authoritative_desc = "Dies ist der einzige DHCP im lokalen Netz" +dhcp_dnsmasq_boguspriv = "Private Anfragen filtern" +dhcp_dnsmasq_boguspriv_desc = "Reverse DNS-Anfragen für lokale Netze nicht weiterleiten" +dhcp_dnsmasq_filterwin2k = "Windowsanfragen filtern" +dhcp_dnsmasq_filterwin2k_desc = "nutzlose DNS-Anfragen aktueller Windowssysteme filtern" +dhcp_dnsmasq_localisequeries = "Lokalisiere Anfragen" +dhcp_dnsmasq_localisequeries_desc = "Gibt die Adresse eines Hostnamen entsprechend seines Subnetzes zurück" +dhcp_dnsmasq_local = "Lokale Server" +dhcp_dnsmasq_domain = "Lokale Domain" +dhcp_dnsmasq_expandhosts = "Erweitere Hosts" +dhcp_dnsmasq_expandhosts_desc = "Fügt Domainnamen zu einfachen Hosteinträgen in der Resolvdatei hinzu" +dhcp_dnsmasq_nonegcache = "Unbekannte nicht cachen" +dhcp_dnsmasq_nonegcache_desc = "Negative DNS-Antworten nicht zwischenspeichern" +dhcp_dnsmasq_readethers = "Verwende /etc/ethers" +dhcp_dnsmasq_readethers_desc = "Lese Informationen aus /etc/ethers um den DHCP-Server zu konfigurieren" +dhcp_dnsmasq_leasefile = "Leasedatei" +dhcp_dnsmasq_leasefile_desc = "Speicherort für vergebenen DHCP-Adressen" +dhcp_dnsmasq_resolvfile = "Resolvdatei" +dhcp_dnsmasq_resolvfile_desc = "Lokale DNS-Datei" +dhcp_dnsmasq_nohosts = "Ignoriere /etc/hosts" +dhcp_dnsmasq_strictorder = "Strikte Reihenfolge" +dhcp_dnsmasq_strictorder_desc = "DNS-Server werden strikt der Reihenfolge in der Resolvdatei nach abgefragt" +dhcp_dnsmasq_logqueries = "Schreibe Abfragelog" +dhcp_dnsmasq_noresolv = "Ignoriere Resolvdatei" +dhcp_dnsmasq_dnsforwardmax = "gleichzeitige Abfragen" +dhcp_dnsmasq_port = "DNS-Port" +dhcp_dnsmasq_ednspacket_max = "max. EDNS.0 Paketgröße" +dhcp_dnsmasq_dhcpleasemax = "max. DHCP-Leases" +dhcp_dnsmasq_addnhosts = "Zusätzliche Hostdatei" +dhcp_dnsmasq_queryport = "Abfrageport" diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua index d6a5cca056..fbd235595f 100644 --- a/libs/cbi/luasrc/cbi.lua +++ b/libs/cbi/luasrc/cbi.lua @@ -579,9 +579,6 @@ end --[[ Value - A one-line value maxlength: The maximum length - isnumber: The value must be a valid (floating point) number - isinteger: The value must be a valid integer - ispositive: The value must be positive (and a number) ]]-- Value = class(AbstractValue) @@ -590,8 +587,6 @@ function Value.__init__(self, ...) self.template = "cbi/value" self.maxlength = nil - self.isnumber = false - self.isinteger = false end -- This validation is a bit more complex @@ -600,7 +595,7 @@ function Value.validate(self, val) val = nil end - return luci.util.validate(val, self.isnumber, self.isinteger) + return val end diff --git a/libs/core/luasrc/util.lua b/libs/core/luasrc/util.lua index 343c627259..11f77206bc 100644 --- a/libs/core/luasrc/util.lua +++ b/libs/core/luasrc/util.lua @@ -276,20 +276,6 @@ function updfenv(f, extscope) end --- Validates a variable -function validate(value, cast_number, cast_int) - if cast_number or cast_int then - value = tonumber(value) - end - - if cast_int and value and not(value % 1 == 0) then - value = nil - end - - return value -end - - -- Parse units from a string and return integer value function parse_units(ustr) diff --git a/libs/sgi-webuci/luasrc/sgi/webuci.lua b/libs/sgi-webuci/luasrc/sgi/webuci.lua index 1ad067c6ba..a40888e7e8 100644 --- a/libs/sgi-webuci/luasrc/sgi/webuci.lua +++ b/libs/sgi-webuci/luasrc/sgi/webuci.lua @@ -1,8 +1,8 @@ --[[ -LuCI - SGI-Module for Haserl +LuCI - SGI-Module for Webuci Description: -Server Gateway Interface for Haserl +Server Gateway Interface for Webuci FileId: $Id: webuci.lua 2027 2008-05-07 21:16:35Z Cyrus $ diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua index ff4170cb8a..64355439b2 100644 --- a/libs/web/luasrc/dispatcher.lua +++ b/libs/web/luasrc/dispatcher.lua @@ -158,10 +158,9 @@ function dispatch() local tpl = require("luci.template") tpl.viewns.translate = function(...) return require("luci.i18n").translate(...) end tpl.viewns.controller = luci.http.dispatcher() - tpl.viewns.uploadctrl = luci.http.dispatcher_upload() + tpl.viewns.uploadctrl = luci.http.dispatcher_upload() -- DEPRECATED tpl.viewns.media = luci.config.main.mediaurlbase tpl.viewns.resource = luci.config.main.resourcebase - tpl.viewns.uci = require("luci.model.uci").config tpl.viewns.REQUEST_URI = luci.http.env.SCRIPT_NAME .. (luci.http.env.PATH_INFO or "") diff --git a/modules/admin-core/luasrc/controller/admin/index.lua b/modules/admin-core/luasrc/controller/admin/index.lua index a6c57c6b09..93d2e47875 100644 --- a/modules/admin-core/luasrc/controller/admin/index.lua +++ b/modules/admin-core/luasrc/controller/admin/index.lua @@ -1,3 +1,16 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- module("luci.controller.admin.index", package.seeall) function index() diff --git a/modules/admin-core/luasrc/controller/admin/network.lua b/modules/admin-core/luasrc/controller/admin/network.lua index 397f2e4ca3..3f8c4f303c 100644 --- a/modules/admin-core/luasrc/controller/admin/network.lua +++ b/modules/admin-core/luasrc/controller/admin/network.lua @@ -1,3 +1,16 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- module("luci.controller.admin.network", package.seeall) function index() @@ -30,10 +43,4 @@ function index() page.target = cbi("admin_network/routes") page.title = "Statische Routen" page.order = 50 - - if luci.fs.isfile("/etc/config/qos") then - local page = node("admin", "network", "qos") - page.target = cbi("admin_network/qos") - page.title = "Quality of Service" - end end \ No newline at end of file diff --git a/modules/admin-core/luasrc/controller/admin/services.lua b/modules/admin-core/luasrc/controller/admin/services.lua index b0024fb4ad..59defbbbdf 100644 --- a/modules/admin-core/luasrc/controller/admin/services.lua +++ b/modules/admin-core/luasrc/controller/admin/services.lua @@ -1,3 +1,16 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- module("luci.controller.admin.services", package.seeall) function index() diff --git a/modules/admin-core/luasrc/controller/admin/status.lua b/modules/admin-core/luasrc/controller/admin/status.lua index afd6804f79..3a0f040747 100644 --- a/modules/admin-core/luasrc/controller/admin/status.lua +++ b/modules/admin-core/luasrc/controller/admin/status.lua @@ -1,3 +1,16 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- module("luci.controller.admin.status", package.seeall) function index() diff --git a/modules/admin-core/luasrc/controller/admin/system.lua b/modules/admin-core/luasrc/controller/admin/system.lua index 81034fddfa..ef4e303fb5 100644 --- a/modules/admin-core/luasrc/controller/admin/system.lua +++ b/modules/admin-core/luasrc/controller/admin/system.lua @@ -1,3 +1,16 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- module("luci.controller.admin.system", package.seeall) function index() diff --git a/modules/admin-core/luasrc/controller/admin/uci.lua b/modules/admin-core/luasrc/controller/admin/uci.lua index fc70b9b410..b69fef4cd2 100644 --- a/modules/admin-core/luasrc/controller/admin/uci.lua +++ b/modules/admin-core/luasrc/controller/admin/uci.lua @@ -1,3 +1,16 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- module("luci.controller.admin.uci", package.seeall) function index() diff --git a/modules/admin-core/luasrc/controller/admin/wifi.lua b/modules/admin-core/luasrc/controller/admin/wifi.lua index 84241b013e..4bef0b7a52 100644 --- a/modules/admin-core/luasrc/controller/admin/wifi.lua +++ b/modules/admin-core/luasrc/controller/admin/wifi.lua @@ -1,3 +1,16 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- module("luci.controller.admin.wifi", package.seeall) function index() diff --git a/modules/admin-core/luasrc/model/cbi/admin_index/luci.lua b/modules/admin-core/luasrc/model/cbi/admin_index/luci.lua index bdd8050bdd..6d495eaaba 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_index/luci.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_index/luci.lua @@ -1,3 +1,16 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- require("luci.config") m = Map("luci", translate("webui", "Oberfläche"), translate("a_i_luci1", "Hier können Eigenschaften und die Funktionalität der Oberfläche angepasst werden.")) diff --git a/modules/admin-core/luasrc/model/cbi/admin_network/dhcp.lua b/modules/admin-core/luasrc/model/cbi/admin_network/dhcp.lua index e02238e39f..321fd88ff4 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_network/dhcp.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_network/dhcp.lua @@ -1,4 +1,16 @@ --- ToDo: Translate, Add descriptions and help texts +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- require("luci.model.uci") require("luci.sys") diff --git a/modules/admin-core/luasrc/model/cbi/admin_network/ifaces.lua b/modules/admin-core/luasrc/model/cbi/admin_network/ifaces.lua index a0c80f0f9c..3e06d66236 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_network/ifaces.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_network/ifaces.lua @@ -1,4 +1,16 @@ --- ToDo: Translate, Add descriptions and help texts +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- m = Map("network", "Schnittstellen", [[An dieser Stelle können die einzelnen Schnittstellen des Netzwerkes konfiguriert werden. Es können mehrere Schnittstellen zu einer Brücke zusammengefasst werden, indem diese durch Leerzeichen getrennt aufgezählt werden und ein entsprechender Haken im Feld Netzwerkbrücke diff --git a/modules/admin-core/luasrc/model/cbi/admin_network/ptp.lua b/modules/admin-core/luasrc/model/cbi/admin_network/ptp.lua index 846bd75c2e..622240f1fc 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_network/ptp.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_network/ptp.lua @@ -1,4 +1,16 @@ --- ToDo: Translate, Add descriptions and help texts +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- m = Map("network", "Punkt-zu-Punkt Verbindungen", [[Punkt-zu-Punkt Verbindungen über PPPoE oder PPTP werden häufig dazu verwendet, um über DSL o.ä. Techniken eine Verbindung zum Internetgateway eines Internetzugangsanbieters aufzubauen.]]) diff --git a/modules/admin-core/luasrc/model/cbi/admin_network/routes.lua b/modules/admin-core/luasrc/model/cbi/admin_network/routes.lua index 7882e9afab..da115bdfee 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_network/routes.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_network/routes.lua @@ -1,4 +1,16 @@ --- ToDo: Translate, Add descriptions and help texts +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- m = Map("network", "Statische Routen", [[Statische Routen geben an, über welche Schnittstelle und welches Gateway ein bestimmter Host oder ein bestimmtes Netzwerk erreicht werden kann.]]) diff --git a/modules/admin-core/luasrc/model/cbi/admin_network/vlan.lua b/modules/admin-core/luasrc/model/cbi/admin_network/vlan.lua index 08371ea3f1..487c0371e7 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_network/vlan.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_network/vlan.lua @@ -1,4 +1,16 @@ --- ToDo: Autodetect things, maybe use MultiValue instead, Translate, Add descriptions +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- m = Map("network", "VLAN", [[Die Netzwerkschnittstellen am Router können zu verschienden VLANs zusammengefasst werden, in denen Geräte miteinander direkt kommunizieren können. VLANs werden auch häufig dazu genutzt, um Netzwerke voneiander zu trennen. diff --git a/modules/admin-core/luasrc/model/cbi/admin_services/dnsmasq.lua b/modules/admin-core/luasrc/model/cbi/admin_services/dnsmasq.lua index 86716ff9f3..ab18035ef3 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_services/dnsmasq.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_services/dnsmasq.lua @@ -1,29 +1,42 @@ -m = Map("dhcp", "Dnsmasq", "Dnsmasq ist ein kombinierter DHCP-Server und DNS-Forwarder für NAT-Firewalls.") +--[[ +LuCI - Lua Configuration Interface -s = m:section(TypedSection, "dnsmasq", "Einstellungen") +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- +m = Map("dhcp", "Dnsmasq") + +s = m:section(TypedSection, "dnsmasq", translate("settings", "Einstellungen")) s.anonymous = true -s:option(Flag, "domainneeded", "Anfragen nur mit Domain", "Anfragen ohne Domainnamen nicht weiterleiten") -s:option(Flag, "authoritative", "Authoritativ", "Dies ist der einzige DHCP im lokalen Netz") -s:option(Flag, "boguspriv", "Private Anfragen filtern", "Reverse DNS-Anfragen für lokalen Netze nicht weiterleiten") -s:option(Flag, "filterwin2k", "Windowsanfragen filtern", "nutzlose DNS-Anfragen aktueller Windowssysteme filtern") -s:option(Flag, "localise_queries", "Lokalisiere Anfragen", "Gibt die Adresse eines Hostnamen entsprechend seines Subnetzes zurück") -s:option(Value, "local", "Lokale Server") -s:option(Value, "domain", "Lokale Domain") -s:option(Flag, "expandhosts", "Erweitere Hosts", "Fügt Domainnamen zu einfachen Hosteinträgen in der Resolvdatei hinzu") -s:option(Flag, "nonegcache", "Unbekannte nicht cachen", "Negative DNS-Antworten nicht zwischenspeichern") -s:option(Flag, "readethers", "Verwende /etc/ethers", "Lese Informationen aus /etc/ethers um den DHCP-Server zu konfigurieren") -s:option(Value, "leasefile", "Leasedatei", "Speicherort für vergebenen DHCP-Adressen") -s:option(Value, "resolvfile", "Resolvdatei", "Lokale DNS-Datei") -s:option(Flag, "nohosts", "Ignoriere /etc/hosts").optional = true -s:option(Flag, "strictorder", "Strikte Reihenfolge", "DNS-Server werden strikt der Reihenfolge in der Resolvdatei nach abgefragt").optional = true -s:option(Flag, "logqueries", "Schreibe Abfragelog").optional = true -s:option(Flag, "noresolv", "Ignoriere Resolvdatei").optional = true -s:option(Value, "dnsforwardmax", "gleichzeitige Abfragen").optional = true -s:option(Value, "port", "DNS-Port").optional = true -s:option(Value, "ednspacket_max", "max. EDNS.0 Paketgröße").optional = true -s:option(Value, "dhcpleasemax", "max. DHCP-Leases").optional = true -s:option(Value, "addnhosts", "Zusätzliche Hostdatei").optional = true -s:option(Value, "queryport", "Abfrageport").optional = true +s:option(Flag, "domainneeded") +s:option(Flag, "authoritative") +s:option(Flag, "boguspriv") +s:option(Flag, "filterwin2k") +s:option(Flag, "localise_queries") +s:option(Value, "local") +s:option(Value, "domain") +s:option(Flag, "expandhosts") +s:option(Flag, "nonegcache") +s:option(Flag, "readethers") +s:option(Value, "leasefile") +s:option(Value, "resolvfile") +s:option(Flag, "nohosts").optional = true +s:option(Flag, "strictorder").optional = true +s:option(Flag, "logqueries").optional = true +s:option(Flag, "noresolv").optional = true +s:option(Value, "dnsforwardmax").optional = true +s:option(Value, "port").optional = true +s:option(Value, "ednspacket_max").optional = true +s:option(Value, "dhcpleasemax").optional = true +s:option(Value, "addnhosts").optional = true +s:option(Value, "queryport").optional = true return m \ No newline at end of file diff --git a/modules/admin-core/luasrc/model/cbi/admin_services/dropbear.lua b/modules/admin-core/luasrc/model/cbi/admin_services/dropbear.lua index 558cc9c7a7..991f8852a4 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_services/dropbear.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_services/dropbear.lua @@ -1,3 +1,16 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- m = Map("dropbear", "Dropbear SSHd", translate("a_srv_dropbear1", [[Der SSH-Server ermöglicht Shell-Zugriff über das Netzwerk und bietet einen integrierten SCP-Dienst.]])) diff --git a/modules/admin-core/luasrc/model/cbi/admin_services/httpd.lua b/modules/admin-core/luasrc/model/cbi/admin_services/httpd.lua index 083893d48d..32c1bab26c 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_services/httpd.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_services/httpd.lua @@ -1,3 +1,16 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- m = Map("httpd", "Busybox HTTPd", translate("a_srv_http1", "Ein kleiner Webserver, der für die Bereitstellung von LuCI genutzt werden kann.")) s = m:section(TypedSection, "httpd", "") diff --git a/modules/admin-core/luasrc/model/cbi/admin_system/fstab.lua b/modules/admin-core/luasrc/model/cbi/admin_system/fstab.lua index f8df235183..8370bee523 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_system/fstab.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_system/fstab.lua @@ -1,3 +1,16 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- m = Map("fstab", translate("a_s_fstab", "Einhängepunkte")) mount = m:section(TypedSection, "mount", translate("a_s_fstab_mountpoints", "Einhängepunkte"), translate("a_s_fstab_mountpoints1", [[Einhängepunkte bestimmen, an welcher Stelle des Dateisystems diff --git a/modules/admin-core/luasrc/model/cbi/admin_system/hostname.lua b/modules/admin-core/luasrc/model/cbi/admin_system/hostname.lua index b0b7998249..ad678f707a 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_system/hostname.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_system/hostname.lua @@ -1,3 +1,16 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- m = Map("system", translate("hostname", "Hostname"), translate("a_s_hostname1", [[Definiert den Hostnamen des Routers. Der Hostname ist eine im Netzwerk eindeutige Kennung, die dieses Gerät identifiziert.]])) diff --git a/modules/admin-core/luasrc/model/cbi/admin_wifi/devices.lua b/modules/admin-core/luasrc/model/cbi/admin_wifi/devices.lua index 1e5be667fc..1583222047 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_wifi/devices.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_wifi/devices.lua @@ -1,4 +1,16 @@ --- ToDo: Translate, Add descriptions and help texts +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- m = Map("wireless", translate("devices", "Geräte"), translate("a_w_devices1", "An dieser Stelle können eingebaute WLAN-Geräte konfiguriert werden.")) diff --git a/modules/admin-core/luasrc/model/cbi/admin_wifi/networks.lua b/modules/admin-core/luasrc/model/cbi/admin_wifi/networks.lua index 4220840a04..19aa0e1c4f 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_wifi/networks.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_wifi/networks.lua @@ -1,4 +1,16 @@ --- ToDo: Translate, Add descriptions and help texts +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- m = Map("wireless", translate("networks", "Netze"), translate("a_w_networks1", [[Pro WLAN-Gerät können mehrere Netze bereitgestellt werden. Es sollte beachtet werden, dass es hardware- / treiberspezifische Einschränkungen gibt. So kann pro WLAN-Gerät in der Regel entweder 1 Ad-Hoc-Zugang ODER bis zu 3 Access-Point und 1 Client-Zugang diff --git a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua index 636b9fcd37..a3bafc0eb2 100644 --- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua +++ b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua @@ -1,3 +1,16 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- module("luci.controller.freifunk.freifunk", package.seeall) function index() diff --git a/modules/freifunk/luasrc/controller/freifunk/luciinfo.lua b/modules/freifunk/luasrc/controller/freifunk/luciinfo.lua index f7cbbf0639..4c24c5732b 100644 --- a/modules/freifunk/luasrc/controller/freifunk/luciinfo.lua +++ b/modules/freifunk/luasrc/controller/freifunk/luciinfo.lua @@ -1,3 +1,16 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- module("luci.controller.freifunk.luciinfo", package.seeall) function index() diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua b/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua index 838f401a97..0998cb924d 100644 --- a/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua +++ b/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua @@ -1,4 +1,16 @@ --- Todo: Translate +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- m = Map("freifunk", translate("contact", "Kontakt"), translate("contact1", [[Diese Daten sind auf der öffentlichen Kontaktseite sichtbar. Bitte gib an, wie man dich am besten kontaktieren kann. Diese Informationen sollten nach der Picopeering Vereinbarung mindestens deine E-Mail-Adresse enthalten. diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/freifunk.lua b/modules/freifunk/luasrc/model/cbi/freifunk/freifunk.lua index fe9e285b49..54d984988e 100644 --- a/modules/freifunk/luasrc/model/cbi/freifunk/freifunk.lua +++ b/modules/freifunk/luasrc/model/cbi/freifunk/freifunk.lua @@ -1,4 +1,16 @@ --- Todo: Translate +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- m = Map("freifunk", "Freifunk") c = m:section(NamedSection, "community", "public", "Gemeinschaft", [[Dies sind die Grundeinstellungen -- 2.30.2