diff options
Diffstat (limited to 'modules')
37 files changed, 244 insertions, 277 deletions
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 6d495eaaba..f7616610b4 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_index/luci.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_index/luci.lua @@ -12,34 +12,31 @@ You may obtain a copy of the License at $Id$ ]]-- require("luci.config") -m = Map("luci", translate("webui", "Oberfläche"), translate("a_i_luci1", +m = Map("luci", translate("webui"), translate("a_i_luci1", "Hier können Eigenschaften und die Funktionalität der Oberfläche angepasst werden.")) -c = m:section(NamedSection, "main", "core", translate("general", "Allgemein")) +c = m:section(NamedSection, "main", "core", translate("general")) -l = c:option(ListValue, "lang", translate("language", "Sprache")) +l = c:option(ListValue, "lang", translate("language")) for k, v in pairs(luci.config.languages) do if k:sub(1, 1) ~= "." then l:value(k, v) end end -t = c:option(ListValue, "mediaurlbase", translate("design", "Design")) +t = c:option(ListValue, "mediaurlbase", translate("design")) for k, v in pairs(luci.config.themes) do if k:sub(1, 1) ~= "." then t:value(v, k) end end -u = m:section(NamedSection, "uci_oncommit", "event", translate("a_i_ucicommit", "UCI-Befehle beim Anwenden"), - translate("a_i_ucicommit1", [[Beim Anwenden -der Konfiguration aus der Oberflächliche heraus können automatisch die relevanten Dienste neugestart werden, -sodass Änderungen sofort nach dem Anwenden aktiv werden und der Router nicht erst neugestartet werden muss.]])) +u = m:section(NamedSection, "uci_oncommit", "event", translate("a_i_ucicommit"), + translate("a_i_ucicommit1")) u.dynamic = true -f = m:section(NamedSection, "flash_keep", "extern", translate("a_i_keepflash", "Zu übernehmende Dateien bei Firmwareupgrade"), - translate("a_i_keepflash1", [[Die folgenden Dateien und Verzeichnisse werden beim Aktualisieren der Firmware -über die Oberfläche automatisch in die neue Firmware übernommen.]])) +f = m:section(NamedSection, "flash_keep", "extern", translate("a_i_keepflash"), + translate("a_i_keepflash1")) f.dynamic = true return m
\ No newline at end of file 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 32e73a79ba..b22f7354ae 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_network/dhcp.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_network/dhcp.lua @@ -20,7 +20,7 @@ s = m:section(TypedSection, "dhcp", "") s.addremove = true s.anonymous = true -iface = s:option(ListValue, "interface", translate("interface", "Schnittstelle")) +iface = s:option(ListValue, "interface", translate("interface")) luci.model.uci.foreach("network", "interface", function (section) if section[".name"] ~= "loopback" then @@ -29,19 +29,19 @@ luci.model.uci.foreach("network", "interface", end end) -s:option(Value, "start", translate("start", "Start")).rmempty = true +s:option(Value, "start", translate("start")).rmempty = true -s:option(Value, "limit", translate("limit", "Limit")).rmempty = true +s:option(Value, "limit", translate("limit")).rmempty = true s:option(Value, "leasetime").rmempty = true s:option(Flag, "dynamicdhcp").rmempty = true -s:option(Value, "name", translate("name", "Name")).optional = true +s:option(Value, "name", translate("name")).optional = true s:option(Flag, "ignore").optional = true -s:option(Value, "netmask", translate("netmask", "Netzmaske")).optional = true +s:option(Value, "netmask", translate("netmask")).optional = true s:option(Flag, "force").optional = true 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 d44206ed83..2851f3ad54 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_network/ifaces.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_network/ifaces.lua @@ -11,7 +11,7 @@ You may obtain a copy of the License at $Id$ ]]-- -m = Map("network", translate("interfaces", "Schnittstellen"), translate("a_n_ifaces1")) +m = Map("network", translate("interfaces"), translate("a_n_ifaces1")) s = m:section(TypedSection, "interface", "") s.addremove = true @@ -19,8 +19,8 @@ s:exclude("loopback") s:depends("proto", "static") s:depends("proto", "dhcp") -p = s:option(ListValue, "proto", translate("protocol", "Protokoll")) -p:value("static", translate("static", "statisch")) +p = s:option(ListValue, "proto", translate("protocol")) +p:value("static", translate("static")) p:value("dhcp", "DHCP") p.default = "static" @@ -28,17 +28,17 @@ br = s:option(Flag, "type", translate("a_n_i_bridge"), translate("a_n_i_bridge1" br.enabled = "bridge" br.rmempty = true -s:option(Value, "ifname", translate("interface", "Schnittstelle")) +s:option(Value, "ifname", translate("interface")) -s:option(Value, "ipaddr", translate("ipaddress", "IP-Adresse")) +s:option(Value, "ipaddr", translate("ipaddress")) -s:option(Value, "netmask", translate("netmask", "Netzmaske")):depends("proto", "static") +s:option(Value, "netmask", translate("netmask")):depends("proto", "static") -gw = s:option(Value, "gateway", translate("gateway", "Gateway")) +gw = s:option(Value, "gateway", translate("gateway")) gw:depends("proto", "static") gw.rmempty = true -dns = s:option(Value, "dns", translate("dnsserver", "DNS-Server")) +dns = s:option(Value, "dns", translate("dnsserver")) dns:depends("proto", "static") dns.optional = true @@ -46,7 +46,7 @@ mtu = s:option(Value, "mtu", "MTU") mtu.optional = true mtu.isinteger = true -mac = s:option(Value, "macaddr", translate("macaddress", "MAC-Adresse")) +mac = s:option(Value, "macaddr", translate("macaddress")) mac.optional = true return m
\ No newline at end of file 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 956e234f2f..565edb7fd7 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_network/ptp.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_network/ptp.lua @@ -18,15 +18,15 @@ s.addremove = true s:depends("proto", "pppoe") s:depends("proto", "pptp") -p = s:option(ListValue, "proto", translate("protocol", "Protokoll")) +p = s:option(ListValue, "proto", translate("protocol")) p:value("pppoe", "PPPoE") p:value("pptp", "PPTP") p.default = "pppoe" -s:option(Value, "ifname", translate("interface", "Schnittstelle")) +s:option(Value, "ifname", translate("interface")) -s:option(Value, "username", translate("username", "Benutzername")) -s:option(Value, "password", translate("password", "Passwort")) +s:option(Value, "username", translate("username")) +s:option(Value, "password", translate("password")) s:option(Value, "keepalive").optional = true 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 a261c10208..15f994c160 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_network/routes.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_network/routes.lua @@ -18,7 +18,7 @@ s.addremove = true s.anonymous = true s.template = "cbi/tblsection" -iface = s:option(ListValue, "interface", translate("interface", "Schnittstelle")) +iface = s:option(ListValue, "interface", translate("interface")) luci.model.uci.foreach("network", "interface", function (section) if section[".name"] ~= "loopback" then @@ -26,10 +26,10 @@ luci.model.uci.foreach("network", "interface", end end) -s:option(Value, "target", translate("target", "Ziel"), translate("a_n_r_target1")) +s:option(Value, "target", translate("target"), translate("a_n_r_target1")) -s:option(Value, "netmask", translate("netmask", "Netzmaske"), translate("a_n_r_netmask1")).rmemepty = true +s:option(Value, "netmask", translate("netmask"), translate("a_n_r_netmask1")).rmemepty = true -s:option(Value, "gateway", translate("gateway", "Gateway")) +s:option(Value, "gateway", translate("gateway")) return m
\ No newline at end of file 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 7f52555945..8cae7f94b8 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_network/vlan.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_network/vlan.lua @@ -11,7 +11,7 @@ You may obtain a copy of the License at $Id$ ]]-- -m = Map("network", translate("a_n_switch", "Switch"), translate("a_n_switch1")) +m = Map("network", translate("a_n_switch"), translate("a_n_switch1")) s = m:section(TypedSection, "switch", "") 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 ab18035ef3..e853064715 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_services/dnsmasq.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_services/dnsmasq.lua @@ -13,7 +13,7 @@ $Id$ ]]-- m = Map("dhcp", "Dnsmasq") -s = m:section(TypedSection, "dnsmasq", translate("settings", "Einstellungen")) +s = m:section(TypedSection, "dnsmasq", translate("settings")) s.anonymous = true s:option(Flag, "domainneeded") 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 991f8852a4..a8ce2694a5 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_services/dropbear.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_services/dropbear.lua @@ -11,16 +11,15 @@ You may obtain a copy of the License at $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.]])) +m = Map("dropbear", "Dropbear SSHd", translate("a_srv_dropbear1")) s = m:section(TypedSection, "dropbear", "") s.anonymous = true -port = s:option(Value, "Port", translate("port", "Port")) +port = s:option(Value, "Port", translate("port")) port.isinteger = true -pwauth = s:option(Flag, "PasswordAuth", translate("a_srv_d_pwauth", "Passwortanmeldung"), translate("a_srv_d_pwauth1", "Erlaube Anmeldung per Passwort")) +pwauth = s:option(Flag, "PasswordAuth", translate("a_srv_d_pwauth"), translate("a_srv_d_pwauth1")) pwauth.enabled = 'on' pwauth.disabled = 'off' 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 32c1bab26c..44beb9c9ef 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_services/httpd.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_services/httpd.lua @@ -11,20 +11,20 @@ You may obtain a copy of the License at $Id$ ]]-- -m = Map("httpd", "Busybox HTTPd", translate("a_srv_http1", "Ein kleiner Webserver, der für die Bereitstellung von LuCI genutzt werden kann.")) +m = Map("httpd", "Busybox HTTPd", translate("a_srv_http1")) s = m:section(TypedSection, "httpd", "") s.anonymous = true -port = s:option(Value, "port", translate("port", "Port")) +port = s:option(Value, "port", translate("port")) port.isinteger = true -s:option(Value, "home", translate("a_srv_http_root", "Wurzelverzeichnis")) +s:option(Value, "home", translate("a_srv_http_root")) -config = s:option(Value, "c_file", translate("configfile", "Konfigurationsdatei"), translate("a_srv_http_config1", "/etc/httpd.conf wenn leer")) +config = s:option(Value, "c_file", translate("configfile"), translate("a_srv_http_config1")) config.rmempty = true -realm = s:option(Value, "realm", translate("a_srv_http_authrealm", "Anmeldeaufforderung"), translate("a_srv_http_authrealm1", "Aufforderungstext zum Anmelden im Administrationsbereich")) +realm = s:option(Value, "realm", translate("a_srv_http_authrealm"), translate("a_srv_http_authrealm1")) realm.rmempty = true return m
\ No newline at end of file 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 8370bee523..be2562ca0f 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_system/fstab.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_system/fstab.lua @@ -11,28 +11,24 @@ You may obtain a copy of the License at $Id$ ]]-- -m = Map("fstab", translate("a_s_fstab", "Einhängepunkte")) +m = Map("fstab", translate("a_s_fstab")) -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 -bestimmte Laufwerke und Speicher zur Verwendung eingebunden werden.]])) +mount = m:section(TypedSection, "mount", translate("a_s_fstab_mountpoints"), translate("a_s_fstab_mountpoints1")) mount.anonymous = true mount.addremove = true -mount:option(Flag, "enabled", translate("enable", "aktivieren")) -mount:option(Value, "device", translate("device", "Gerät"), translate("a_s_fstab_device1", "Die Gerätedatei des Speichers oder der Partition (z.B.: /dev/sda)")) -mount:option(Value, "target", translate("a_s_fstab_mountpoint", "Einhängepunkt")) -mount:option(Value, "fstype", translate("filesystem", "Dateisystem"), translate("a_s_fstab_fs1", "Das Dateisystem mit dem der Speicher formatiert ist (z.B.: ext3)")) -mount:option(Value, "options", translate("options", "Optionen"), translatef("manpage", "siehe '%s' manpage", "mount")) +mount:option(Flag, "enabled", translate("enable")) +mount:option(Value, "device", translate("device"), translate("a_s_fstab_device1")) +mount:option(Value, "target", translate("a_s_fstab_mountpoint")) +mount:option(Value, "fstype", translate("filesystem"), translate("a_s_fstab_fs1")) +mount:option(Value, "options", translate("options"), translatef("manpage", "siehe '%s' manpage", "mount")) -swap = m:section(TypedSection, "swap", "SWAP", translate("a_s_fstab_swap1", [[Falls der Arbeitsspeicher des Routers nicht ausreicht, -kann dieser nicht benutzte Daten zeitweise auf einem SWAP-Laufwerk auslagern um so die -effektive Größe des Arbeitsspeichers zu erhöhen. Die Auslagerung der Daten ist natürlich bedeutend langsamer -als direkte Arbeitsspeicherzugriffe.]])) +swap = m:section(TypedSection, "swap", "SWAP", translate("a_s_fstab_swap1")) swap.anonymous = true swap.addremove = true -swap:option(Flag, "enabled", translate("enable", "aktivieren")) -swap:option(Value, "device", translate("device", "Gerät"), translate("a_s_fstab_device1", "Die Gerätedatei des Speichers oder der Partition (z.B.: /dev/sda)")) +swap:option(Flag, "enabled", translate("enable")) +swap:option(Value, "device", translate("device"), translate("a_s_fstab_device1")) return m 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 ad678f707a..1c74d90d7d 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_system/hostname.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_system/hostname.lua @@ -11,12 +11,11 @@ You may obtain a copy of the License at $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.]])) +m = Map("system", translate("hostname"), translate("a_s_hostname1")) s = m:section(TypedSection, "system", "") s.anonymous = true -s:option(Value, "hostname", translate("hostname", "Hostname")) +s:option(Value, "hostname", translate("hostname")) return m
\ No newline at end of file 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 1583222047..b4e0e2915b 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_wifi/devices.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_wifi/devices.lua @@ -11,17 +11,17 @@ You may obtain a copy of the License at $Id$ ]]-- -m = Map("wireless", translate("devices", "Geräte"), translate("a_w_devices1", +m = Map("wireless", translate("devices"), translate("a_w_devices1", "An dieser Stelle können eingebaute WLAN-Geräte konfiguriert werden.")) s = m:section(TypedSection, "wifi-device", "") --s.addremove = true -en = s:option(Flag, "disabled", translate("enable", "Aktivieren")) +en = s:option(Flag, "disabled", translate("enable")) en.enabled = "0" en.disabled = "1" -t = s:option(ListValue, "type", translate("type", "Typ")) +t = s:option(ListValue, "type", translate("type")) t:value("broadcom") t:value("atheros") t:value("mac80211") @@ -34,7 +34,7 @@ for driver in luci.sys.execl(c)[1]:gmatch("[^ ]+") do end ]]-- -mode = s:option(ListValue, "mode", translate("mode", "Modus")) +mode = s:option(ListValue, "mode", translate("mode")) mode:value("", "standard") mode:value("11b", "802.11b") mode:value("11g", "802.11g") @@ -42,22 +42,22 @@ mode:value("11a", "802.11a") mode:value("11bg", "802.11b+g") mode.rmempty = true -s:option(Value, "channel", translate("a_w_channel", "Funkkanal")) +s:option(Value, "channel", translate("a_w_channel")) -s:option(Value, "txantenna", translate("a_w_txantenna", "Sendeantenne")).rmempty = true +s:option(Value, "txantenna", translate("a_w_txantenna")).rmempty = true -s:option(Value, "rxantenna", translate("a_w_rxantenna", "Empfangsantenne")).rmempty = true +s:option(Value, "rxantenna", translate("a_w_rxantenna")).rmempty = true -s:option(Value, "distance", translate("distance", "Distanz"), - translate("a_w_distance1", "Distanz zum am weitesten entfernten Funkpartner (m)")).rmempty = true +s:option(Value, "distance", translate("distance"), + translate("a_w_distance1")).rmempty = true -s:option(Value, "diversity", translate("a_w_diversity", "Diversität")):depends("type", "atheros") +s:option(Value, "diversity", translate("a_w_diversity")):depends("type", "atheros") -country = s:option(Value, "country", translate("a_w_countrycode", "Ländercode")) +country = s:option(Value, "country", translate("a_w_countrycode")) country.optional = true country:depends("type", "broadcom") -maxassoc = s:option(Value, "maxassoc", translate("a_w_connlimit", "Verbindungslimit")) +maxassoc = s:option(Value, "maxassoc", translate("a_w_connlimit")) maxassoc:depends("type", "broadcom") maxassoc.optional = true 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 19aa0e1c4f..f0379b3708 100644 --- a/modules/admin-core/luasrc/model/cbi/admin_wifi/networks.lua +++ b/modules/admin-core/luasrc/model/cbi/admin_wifi/networks.lua @@ -11,24 +11,21 @@ You may obtain a copy of the License at $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 -gleichzeitig erstellt werden.]])) +m = Map("wireless", translate("networks"), translate("a_w_networks1")) s = m:section(TypedSection, "wifi-iface", "") s.addremove = true s.anonymous = true -s:option(Value, "ssid", translate("a_w_netid", "Netzkennung (ESSID)")).maxlength = 32 +s:option(Value, "ssid", translate("a_w_netid")).maxlength = 32 -device = s:option(ListValue, "device", translate("device", "Gerät")) +device = s:option(ListValue, "device", translate("device")) luci.model.uci.foreach("wireless", "wifi-device", function (section) device:value(section[".name"]) end) -network = s:option(ListValue, "network", translate("network", "Netzwerk"), translate("a_w_network1", "WLAN-Netz zu Netzwerk hinzufügen")) +network = s:option(ListValue, "network", translate("network"), translate("a_w_network1")) network:value("") luci.model.uci.foreach("network", "interface", function (section) @@ -37,7 +34,7 @@ luci.model.uci.foreach("network", "interface", end end) -mode = s:option(ListValue, "mode", translate("mode", "Modus")) +mode = s:option(ListValue, "mode", translate("mode")) mode:value("ap", "Access Point") mode:value("adhoc", "Ad-Hoc") mode:value("sta", "Client") @@ -45,13 +42,13 @@ mode:value("wds", "WDS") s:option(Value, "bssid", "BSSID").optional = true -s:option(Value, "txpower", translate("a_w_txpwr", "Sendeleistung"), "dbm").rmempty = true +s:option(Value, "txpower", translate("a_w_txpwr"), "dbm").rmempty = true -s:option(Flag, "frameburst", translate("a_w_brcmburst", "Broadcom-Frameburst")).optional = true -s:option(Flag, "bursting", translate("a_w_athburst", "Atheros-Frameburst")).optional = true +s:option(Flag, "frameburst", translate("a_w_brcmburst")).optional = true +s:option(Flag, "bursting", translate("a_w_athburst")).optional = true -encr = s:option(ListValue, "encryption", translate("encryption", "Verschlüsselung")) +encr = s:option(ListValue, "encryption", translate("encryption")) encr:value("none", "keine") encr:value("wep", "WEP") encr:value("psk", "WPA-PSK") @@ -59,7 +56,7 @@ encr:value("wpa", "WPA-Radius") encr:value("psk2", "WPA2-PSK") encr:value("wpa2", "WPA2-Radius") -key = s:option(Value, "key", translate("key", "Schlüssel")) +key = s:option(Value, "key", translate("key")) key:depends("encryption", "wep") key:depends("encryption", "psk") key:depends("encryption", "wpa") @@ -67,19 +64,19 @@ key:depends("encryption", "psk2") key:depends("encryption", "wpa2") key.rmempty = true -server = s:option(Value, "server", translate("a_w_radiussrv", "Radius-Server")) +server = s:option(Value, "server", translate("a_w_radiussrv")) server:depends("encryption", "wpa") server:depends("encryption", "wpa2") server.rmempty = true -port = s:option(Value, "port", translate("a_w_radiusport", "Radius-Port")) +port = s:option(Value, "port", translate("a_w_radiusport")) port:depends("encryption", "wpa") port:depends("encryption", "wpa2") port.rmempty = true -s:option(Flag, "isolate", translate("a_w_apisolation", "AP-Isolation"), translate("a_w_apisolation1", "Unterbindet Client-Client-Verkehr")).optional = true +s:option(Flag, "isolate", translate("a_w_apisolation"), translate("a_w_apisolation1")).optional = true -s:option(Flag, "hidden", translate("a_w_hideessid", "ESSID verstecken")).optional = true +s:option(Flag, "hidden", translate("a_w_hideessid")).optional = true diff --git a/modules/admin-core/luasrc/view/about.htm b/modules/admin-core/luasrc/view/about.htm index 1046d8023b..84b26db1df 100644 --- a/modules/admin-core/luasrc/view/about.htm +++ b/modules/admin-core/luasrc/view/about.htm @@ -1,12 +1,11 @@ <%+header%> -<h1><%:about Über%> LuCI</h1> -<p><%:c_lucidesc LuCI ist eine freie Lua-Bibliothek mit integriertem MVC-Webframework und Weboberfläche für eingebettete Geräte, -speziell Netzwerkrouter unter OpenWRT. Luci steht unter der Apache-Lizenz.%></p> +<h1><%:about%> LuCI</h1> +<p><%:c_lucidesc%></p> -<p><strong><%:c_projecthome Projekt-Homepage%>: </strong><a href="http://luci.freifunk-halle.net">luci.freifunk-halle.net</a></p> +<p><strong><%:c_projecthome%>: </strong><a href="http://luci.freifunk-halle.net">luci.freifunk-halle.net</a></p> <br /> -<h2><%:c_leaddev Leitende Entwicklung%></h2> +<h2><%:c_leaddev%></h2> <ul style="font-weight: bold"> <li><a href="mailto:steven-at-midlink-dot-org">Steven "Cyrus" Barth</a> (OpenWRT, Freifunk Halle)</li> <li><a href="mailto:xm-at-leipzig.freifunk-dot-net">Jo-Philipp "Jow" Wich</a> (Freifunk Leipzig)</li> @@ -14,12 +13,12 @@ speziell Netzwerkrouter unter OpenWRT. Luci steht unter der Apache-Lizenz.%></p> </ul> <br /> -<h2><%:c_contributors Mitwirkende Entwickler%></h2> +<h2><%:c_contributors%></h2> <ul style="font-weight: bold"> </ul> <br /> -<h2><%:c_thanksto Dank an%></h2> +<h2><%:c_thanksto%></h2> <ul style="font-weight: bold"> <li><a href="http://www.computerhilfe-halle.de">Mono</a> (Computerhilfe-Halle.de)</li> <li><a href="mailto:mickey-at-netfreaks-dot-org">Mickey Knox</a> (Freifunk Hannover)</li> diff --git a/modules/admin-core/luasrc/view/admin_index/index.htm b/modules/admin-core/luasrc/view/admin_index/index.htm index 0623eddae0..30282843dd 100644 --- a/modules/admin-core/luasrc/view/admin_index/index.htm +++ b/modules/admin-core/luasrc/view/admin_index/index.htm @@ -1,11 +1,10 @@ <%+header%> -<h1><%:a_i_i_hello Hallo!%></h1> -<p><%:a_i_i_admin1 Dies ist der Administrationsbereich von LuCI.%></p> -<p><%:a_i_i_admin2 LuCI ist eine freie, flexible und benutzerfreundliche grafische Oberfläche zur Konfiguration von OpenWRT Kamikaze.%><br /> -<%:a_i_i_admin3 Auf den folgenden Seiten können alle wichtigen Einstellungen des Routers vorgenommen werden.%></p> -<p><%:a_i_i_admin4 Auf der linken Seite befindet sich eine Navigation, die zu den einzelnen Konfigurationsseiten führt.%></p> -<p><%:a_i_i_admin5 Wir sind natürlich stets darum bemüht, diese Oberfläche -noch besser und intuitiver zu Gestalten und freuen uns über jegliche Art von Feedback oder Verbesserungsvorschlägen.%></p> -<p><%:a_i_i_admin6 Und nun wünschen wir viel Spaß mit dem Router!%></p> -<p><em><strong><a href="<%=controller%>/about"><%:a_i_i_team Das LuCI-Team%></a></strong></em></p> +<h1><%:a_i_i_hello%></h1> +<p><%:a_i_i_admin1%></p> +<p><%:a_i_i_admin2%><br /> +<%:a_i_i_admin3%></p> +<p><%:a_i_i_admin4%></p> +<p><%:a_i_i_admin5%></p> +<p><%:a_i_i_admin6%></p> +<p><em><strong><a href="<%=controller%>/about"><%:a_i_i_team%></a></strong></em></p> <%+footer%>
\ No newline at end of file diff --git a/modules/admin-core/luasrc/view/admin_network/index.htm b/modules/admin-core/luasrc/view/admin_network/index.htm index fb42201cc4..87d160bf25 100644 --- a/modules/admin-core/luasrc/view/admin_network/index.htm +++ b/modules/admin-core/luasrc/view/admin_network/index.htm @@ -1,11 +1,8 @@ <%+header%> -<h1><%:network Netzwerk%></h1> -<p><%:a_network1 In diesem Bereich finden sich alle netzwerkbezogenen Einstellungen.%></p> -<p><%:a_network2 Der Netzwerkswitch kann bei den meisten Routern frei konfiguriert -und in mehrere VLANs aufgeteilt werden. %></p> -<p><%:a_network3 Schnittstellen und PPPoE/PPTP-Einstellungen ermöglichen -die freie Organisation des Netzwerks und die Anbindung an ein WAN.%></p> -<p><%:a_network4 DHCP ermöglichst die automatische Netzwerkkonfiguration von Rechnern im (W)LAN.%></p> -<p><%:a_network5 Portweiterleitung und Firewall erlauben eine effektive Absicherung des Netzes, bei gleichzeitiger -Bereitstellung von externen Diensten.%></p> +<h1><%:network%></h1> +<p><%:a_network1%></p> +<p><%:a_network2%></p> +<p><%:a_network3%></p> +<p><%:a_network4%></p> +<p><%:a_network5%></p> <%+footer%>
\ No newline at end of file diff --git a/modules/admin-core/luasrc/view/admin_services/index.htm b/modules/admin-core/luasrc/view/admin_services/index.htm index f31d557466..eaf121c061 100644 --- a/modules/admin-core/luasrc/view/admin_services/index.htm +++ b/modules/admin-core/luasrc/view/admin_services/index.htm @@ -1,6 +1,5 @@ <%+header%> -<h1><%:services Dienste%></h1> -<p><%:a_srv_services1 Dienste und Dämonen stellen bestimmte Funktionalitäten auf dem Router zur Verfügung.%></p> -<p><%:a_srv_services2 Es handelt sich hierbei meist um Netzwerkserver, die verschiedene Aufgaben auf dem Router erfüllen, -beispielsweise Shell-Zugang ermöglichen oder diese Weboberfläche per HTTP anbieten.%></p> +<h1><%:services%></h1> +<p><%:a_srv_services1%></p> +<p><%:a_srv_services2%></p> <%+footer%>
\ No newline at end of file diff --git a/modules/admin-core/luasrc/view/admin_status/index.htm b/modules/admin-core/luasrc/view/admin_status/index.htm index 184e523a7c..3a3775ecc5 100644 --- a/modules/admin-core/luasrc/view/admin_status/index.htm +++ b/modules/admin-core/luasrc/view/admin_status/index.htm @@ -1,7 +1,5 @@ <%+header%> -<h1><%:status Status%></h1> -<p><%:a_st_i_status1 Hier finden sich Informationen über den aktuellen Status des Systems, beispielsweise -Prozessortakt, Speicherauslastung und Netzwerkschnittstellen.%></p> -<p><%:a_st_i_status2 Zusätzlich können hier Protokolldaten, des Kernels und diverser Systemdienste eingesehen werden, -um deren Zustand zu kontrollieren.%></p> +<h1><%:status%></h1> +<p><%:a_st_i_status1%></p> +<p><%:a_st_i_status2%></p> <%+footer%>
\ No newline at end of file diff --git a/modules/admin-core/luasrc/view/admin_status/iwscan.htm b/modules/admin-core/luasrc/view/admin_status/iwscan.htm index c2b53d3bfb..66f4718e6f 100644 --- a/modules/admin-core/luasrc/view/admin_status/iwscan.htm +++ b/modules/admin-core/luasrc/view/admin_status/iwscan.htm @@ -1,19 +1,19 @@ <%+header%> -<h1><%:iwscan WLAN-Scan%></h1> -<p><%:iwscan1 Drahtlosnetzwerke in der lokalen Umgebung des Routers:%></p> +<h1><%:iwscan%></h1> +<p><%:iwscan1%></p> <br /> <table cellspacing="0" cellpadding="6" class="smalltext"> <tr> -<th><%:interface Schnittstelle%></th> +<th><%:interface%></th> <th>ESSID</th> <th>BSSID</th> -<th><%:mode Modus%></th> -<th><%:channel Kanal%></th> -<th><%:iwscan_encr Vers.%></th> -<th><%:iwscan_link Verb.%></th> -<th><%:iwscan_signal Signal%></th> -<th><%:iwscan_noise Rausch%></th> +<th><%:mode%></th> +<th><%:channel%></th> +<th><%:iwscan_encr%></th> +<th><%:iwscan_link%></th> +<th><%:iwscan_signal%></th> +<th><%:iwscan_noise%></th> </tr> <%for iface, cells in pairs(luci.sys.wifi.iwscan()) do for i, cell in ipairs(cells) do diff --git a/modules/admin-core/luasrc/view/admin_status/routes.htm b/modules/admin-core/luasrc/view/admin_status/routes.htm index 09d5bf9bde..fec783e75b 100644 --- a/modules/admin-core/luasrc/view/admin_status/routes.htm +++ b/modules/admin-core/luasrc/view/admin_status/routes.htm @@ -1,14 +1,14 @@ <%+header%> -<h1><%:routes Routen%></h1> +<h1><%:routes%></h1> <br /> <table cellspacing="0" cellpadding="6" class="smalltext"> <tr> -<th><%:target Ziel%></th> -<th><%:routes_netmask Netzmaske%></th> -<th><%:routes_gateway Gateway%></th> -<th><%:routes_metric Metrik%></th> -<th><%:interface Schnittstelle%></th> +<th><%:target%></th> +<th><%:routes_netmask%></th> +<th><%:routes_gateway%></th> +<th><%:routes_metric%></th> +<th><%:interface%></th> </tr> <% local routes = luci.sys.net.routes() diff --git a/modules/admin-core/luasrc/view/admin_status/syslog.htm b/modules/admin-core/luasrc/view/admin_status/syslog.htm index 905161be20..5701779c75 100644 --- a/modules/admin-core/luasrc/view/admin_status/syslog.htm +++ b/modules/admin-core/luasrc/view/admin_status/syslog.htm @@ -1,5 +1,5 @@ <%+header%> -<h1><%:status Status%></h1> -<h2><%:syslog Systemprotokoll%></h2> +<h1><%:status%></h1> +<h2><%:syslog%></h2> <code><%=syslog%></code> <%+footer%>
\ No newline at end of file diff --git a/modules/admin-core/luasrc/view/admin_system/editor.htm b/modules/admin-core/luasrc/view/admin_system/editor.htm index ef3e0d8abd..9085fb7ff3 100644 --- a/modules/admin-core/luasrc/view/admin_system/editor.htm +++ b/modules/admin-core/luasrc/view/admin_system/editor.htm @@ -1,14 +1,14 @@ <%+header%> -<h1><%:texteditor Texteditor%></h1> +<h1><%:texteditor%></h1> <form method="post" action="<%=controller%>/admin/system/editor"> -<div><%:file Datei%>: <input type="text" name="file" size="30" value="<%=fn%>" /> -<% if msg then %><span class="error"><%:error Fehler%>: <%=msg%></span><% end %></div> +<div><%:file%>: <input type="text" name="file" size="30" value="<%=fn%>" /> +<% if msg then %><span class="error"><%:error%>: <%=msg%></span><% end %></div> <br /> <div><textarea style="width: 100%" rows="20" name="data"><%=cnt%></textarea></div> <br /> <div> - <input type="submit" value="<%:save Speichern%>" /> - <input type="reset" value="<%:reset Zurücksetzen%>" /> + <input type="submit" value="<%:save%>" /> + <input type="reset" value="<%:reset%>" /> </div> </form> <%+footer%>
\ No newline at end of file diff --git a/modules/admin-core/luasrc/view/admin_system/index.htm b/modules/admin-core/luasrc/view/admin_system/index.htm index 1c594d95ba..e843714661 100644 --- a/modules/admin-core/luasrc/view/admin_system/index.htm +++ b/modules/admin-core/luasrc/view/admin_system/index.htm @@ -1,9 +1,6 @@ <%+header%> -<h1><%:system System%></h1> -<p><%:a_s_i_system1 Hier finden sich Einstellungen, die das System selbst, dessen Kennung, -installierte Software und Hardware, Authentifizierung oder eingehängte Speicher betreffen.%></p> -<p><%:a_s_i_system2 Diese Einstellungen definieren die Grundlage des Systems, auf dem die -installierte Software aufbaut.%></p> -<p><%:a_s_i_system3 Beachte bitte, dass eine fehlerhafte Konfiguration den Start -des Routers verhindern oder dich vom Zugriff auf diesen ausschließen kann.%></p> +<h1><%:system%></h1> +<p><%:a_s_i_system1%></p> +<p><%:a_s_i_system2%></p> +<p><%:a_s_i_system3%></p> <%+footer%>
\ No newline at end of file diff --git a/modules/admin-core/luasrc/view/admin_system/ipkg.htm b/modules/admin-core/luasrc/view/admin_system/ipkg.htm index 7d27fa38a9..214f80f726 100644 --- a/modules/admin-core/luasrc/view/admin_system/ipkg.htm +++ b/modules/admin-core/luasrc/view/admin_system/ipkg.htm @@ -1,11 +1,11 @@ <%+header%> -<h1><%:system System%></h1> -<h2><%:a_s_p_ipkg IPKG-Konfiguration%></h2> +<h1><%:system%></h1> +<h2><%:a_s_p_ipkg%></h2> <br /> -<div><strong><%:a_s_p_ipkg_pkglists Paketlisten%>:</strong><code>src <em>Name</em> <em>URL</em></code></div> -<div><strong><%:a_s_p_ipkg_targets Installationsziele%>:</strong><code>dest <em>Name</em> <em>Pfad</em></code></div> +<div><strong><%:a_s_p_ipkg_pkglists%>:</strong><code>src <em>Name</em> <em>URL</em></code></div> +<div><strong><%:a_s_p_ipkg_targets%>:</strong><code>dest <em>Name</em> <em>Pfad</em></code></div> <br /> @@ -18,9 +18,9 @@ </div> </div> <div> - <input type="submit" value="<%:save Speichern%>" /> - <input type="reset" value="<%:reset Zurücksetzen%>" /> + <input type="submit" value="<%:save%>" /> + <input type="reset" value="<%:reset%>" /> </div> - <% if msg then %><br /><div class="error"><%:error Fehler%>: <%=msg%></div><% end %> + <% if msg then %><br /><div class="error"><%:error%>: <%=msg%></div><% end %> </form> <%+footer%>
\ No newline at end of file diff --git a/modules/admin-core/luasrc/view/admin_system/packages.htm b/modules/admin-core/luasrc/view/admin_system/packages.htm index 49c46a0919..685c3d1bc5 100644 --- a/modules/admin-core/luasrc/view/admin_system/packages.htm +++ b/modules/admin-core/luasrc/view/admin_system/packages.htm @@ -1,31 +1,31 @@ <%+header%> -<h1><%:system System%></h1> -<h2><%:a_s_packages Paketverwaltung%></h2> +<h1><%:system%></h1> +<h2><%:a_s_packages%></h2> <br /> <% if install or remove or update or upgrade then %> -<div class="code"><strong><%:status Status%>:</strong><br /> +<div class="code"><strong><%:status%>:</strong><br /> <% if update then %> - <%:a_s_packages_update Paketlisten aktualisieren%>: <% if update == 0 then %><span class="ok"><%:ok OK%></span><% else %><span class="error"><%:error Fehler%> (<%:code Code%> <%=update%>)</span><% end %><br /> + <%:a_s_packages_update%>: <% if update == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%:code%> <%=update%>)</span><% end %><br /> <% end %> <% if upgrade then%> - <%:a_s_packages_upgrade Installierte Pakete aktualisieren%>: <% if upgrade == 0 then %><span class="ok"><%:ok OK%></span><% else %><span class="error"><%:error Fehler%> (<%:code Code%> <%=upgrade%>)</span><% end %><br /> + <%:a_s_packages_upgrade%>: <% if upgrade == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%:code%> <%=upgrade%>)</span><% end %><br /> <% end %> <% if install then for k,v in pairs(install) do %> - <%:a_s_packages_install Installation von%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:ok OK%></span><% else %><span class="error"><%:error Fehler%> (<%:code Code%> <%=v%>)</span><% end %><br /> + <%:a_s_packages_install%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%:code%> <%=v%>)</span><% end %><br /> <% end end %> <% if remove then for k,v in pairs(remove) do %> - <%:a_s_packages_remove Deinstallation von%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:ok OK%></span><% else %><span class="error"><%:error Fehler%> (<%:code Code%> <%=v%>)</span><% end %><br /> + <%:a_s_packages_remove%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%:code%> <%=v%>)</span><% end %><br /> <% end end %> </div> <br /> <% end %> <div> -<a href="<%=controller%>/admin/system/packages/ipkg"><%:a_s_packages_ipkg Paketlisten und Installationsziele bearbeiten%></a><br /> -<a href="<%=controller%>/admin/system/packages?update=1"><%:a_s_packages_updatelist Paketlisten aktualisieren%></a><br /> -<a href="<%=controller%>/admin/system/packages?upgrade=1"><%:a_s_packages_upgrade Installierte Pakete aktualisieren%></a> +<a href="<%=controller%>/admin/system/packages/ipkg"><%:a_s_packages_ipkg%></a><br /> +<a href="<%=controller%>/admin/system/packages?update=1"><%:a_s_packages_updatelist%></a><br /> +<a href="<%=controller%>/admin/system/packages?upgrade=1"><%:a_s_packages_upgrade%></a> </div> <br /> @@ -33,19 +33,19 @@ <form method="post" action="<%=controller%>/admin/system/packages"> <div> - <span class="bold"><%:a_s_packages_installurl Paket herunterladen und installieren%>:</span><br /> + <span class="bold"><%:a_s_packages_installurl%>:</span><br /> <input type="text" name="url" size="30" value="" /> - <input type="submit" name="submit" value="<%:ok OK%>" /> + <input type="submit" name="submit" value="<%:ok%>" /> </div> <br /> <br /> <div> - <span class="bold"><%:filter Filter%>:</span> + <span class="bold"><%:filter%>:</span> <input type="text" name="query" size="20" value="<%=query%>" /> - <input type="submit" name="search" value="<%:a_s_packages_search Paket suchen%>" /> - <input type="submit" name="submit" value="<%:a_s_packages_do Aktionen ausführen%>" /> + <input type="submit" name="search" value="<%:a_s_packages_search%>" /> + <input type="submit" name="submit" value="<%:a_s_packages_do%>" /> </div> <br /> @@ -54,24 +54,24 @@ <div> <table style="font-size: 0.8em"> <tr> - <th><%:a_s_packages_name Paketname%></th> - <th><%:version Version%></th> - <th><%:install Installieren%></th> - <th><%:delete Löschen%></th> - <th><%:descr Beschreibung%></th> + <th><%:a_s_packages_name%></th> + <th><%:version%></th> + <th><%:install%></th> + <th><%:delete%></th> + <th><%:descr%></th> </tr> <% for k, pkg in pairs(pkgs) do %> <tr> <td><%=pkg.Package%></td> <td><%=pkg.Version%></td> - <td><% if not pkg.Status or not pkg.Status.installed then %><input type="checkbox" name="install.<%=pkg.Package%>" value="1" /><% else %><%:installed installiert%><% end %></td> - <td><% if pkg.Status and pkg.Status.installed then %><input type="checkbox" name="remove.<%=pkg.Package%>" value="1" /><% else %><%:notinstalled nicht installiert%><% end %></td> + <td><% if not pkg.Status or not pkg.Status.installed then %><input type="checkbox" name="install.<%=pkg.Package%>" value="1" /><% else %><%:installed%><% end %></td> + <td><% if pkg.Status and pkg.Status.installed then %><input type="checkbox" name="remove.<%=pkg.Package%>" value="1" /><% else %><%:notinstalled%><% end %></td> <td><%=pkg.Description%></td> </tr> <% end %> </table> </div> <br /> - <input type="submit" name="submit" value="<%:a_s_packages_do Aktionen ausführen%>" /> + <input type="submit" name="submit" value="<%:a_s_packages_do%>" /> </form> <%+footer%>
\ No newline at end of file diff --git a/modules/admin-core/luasrc/view/admin_system/passwd.htm b/modules/admin-core/luasrc/view/admin_system/passwd.htm index c6aefb4ea0..30db61c467 100644 --- a/modules/admin-core/luasrc/view/admin_system/passwd.htm +++ b/modules/admin-core/luasrc/view/admin_system/passwd.htm @@ -1,32 +1,32 @@ <%+header%> -<h1><%:system System%></h1> -<h2><%:a_s_changepw Passwort ändern%></h2> -<p><%:a_s_changepw1 Ändert das Passwort des Systemverwalters (Benutzer "root")%></p> +<h1><%:system%></h1> +<h2><%:a_s_changepw%></h2> +<p><%:a_s_changepw1%></p> <div><br /> <% if stat then %> <% if stat == 0 then %> - <code><%:a_s_changepw_changed Passwort erfolgreich geändert%>!</code> + <code><%:a_s_changepw_changed%>!</code> <% elseif stat == 10 then %> - <code class="error"><%:a_s_changepw_nomatch Passwörter stimmen nicht überein%>!</code> + <code class="error"><%:a_s_changepw_nomatch%>!</code> <% else %> - <code class="error"><%:unknownerror Unbekannter Fehler%>!</code> + <code class="error"><%:unknownerror%>!</code> <% end %> <% end %> <% if not stat or stat == 10 then %> <form method="post" action="<%=controller%>/admin/system/passwd"> <div class="cbi-section-node"> <div class="cbi-value"> - <div class="cbi-value-title"><%:password Passwort%></div> + <div class="cbi-value-title"><%:password%></div> <div class="cbi-value-field"><input type="password" name="pwd1" /></div> </div> <div class="cbi-value"> - <div class="cbi-value-title"><%:confirmation Bestätigung%></div> + <div class="cbi-value-title"><%:confirmation%></div> <div class="cbi-value-field"><input type="password" name="pwd2" /></div> </div> <br /> <div> - <input type="submit" value="<%:save Speichern%>" /> - <input type="reset" value="<%:reset Zurücksetzen%>" /> + <input type="submit" value="<%:save%>" /> + <input type="reset" value="<%:reset%>" /> </div> </div> </form> diff --git a/modules/admin-core/luasrc/view/admin_system/reboot.htm b/modules/admin-core/luasrc/view/admin_system/reboot.htm index cd6edfc64b..51f925dfa3 100644 --- a/modules/admin-core/luasrc/view/admin_system/reboot.htm +++ b/modules/admin-core/luasrc/view/admin_system/reboot.htm @@ -1,11 +1,11 @@ <%+header%> -<h1><%:system System%></h1> -<h2><%:reboot Neu starten%></h2> -<p><%:a_s_reboot1 Startet das Betriebssystem des Routers neu.%></p> +<h1><%:system%></h1> +<h2><%:reboot%></h2> +<p><%:a_s_reboot1%></p> <% if not reboot then %> -<p><a href="<%=controller%>/admin/system/reboot?reboot=1"><%:a_s_reboot_do Neustart durchführen%></a></p> +<p><a href="<%=controller%>/admin/system/reboot?reboot=1"><%:a_s_reboot_do%></a></p> <% else %> -<p><%:a_s_reboot_running Bitte warten: Neustart wird durchgeführt...%></p> +<p><%:a_s_reboot_running%></p> <script type="text/javascript">setTimeout("location='<%=controller%>/admin'", 60000)</script> <% end %> <%+footer%>
\ No newline at end of file diff --git a/modules/admin-core/luasrc/view/admin_system/sshkeys.htm b/modules/admin-core/luasrc/view/admin_system/sshkeys.htm index cfaf0a26e6..b6c7cd443d 100644 --- a/modules/admin-core/luasrc/view/admin_system/sshkeys.htm +++ b/modules/admin-core/luasrc/view/admin_system/sshkeys.htm @@ -1,11 +1,10 @@ <%+header%> -<h1><%:system System%></h1> -<h2><%:a_s_sshkeys SSH-Schlüssel%></h2> +<h1><%:system%></h1> +<h2><%:a_s_sshkeys%></h2> <br /> -<div><%:a_s_sshkeys1 Hier können öffentliche SSH-Schlüssel (einer pro Zeile) - zur Authentifizierung abgelegt werden.%></div> +<div><%:a_s_sshkeys1%></div> <br /> @@ -18,9 +17,9 @@ </div> </div> <div> - <input type="submit" value="<%:save Speichern%>" /> - <input type="reset" value="<%:reset Zurücksetzen%>" /> + <input type="submit" value="<%:save%>" /> + <input type="reset" value="<%:reset%>" /> </div> - <% if msg then %><br /><div class="error"><%:error Fehler%>: <%=msg%></div><% end %> + <% if msg then %><br /><div class="error"><%:error%>: <%=msg%></div><% end %> </form> <%+footer%>
\ No newline at end of file diff --git a/modules/admin-core/luasrc/view/admin_system/upgrade.htm b/modules/admin-core/luasrc/view/admin_system/upgrade.htm index ea523d7c8b..7e23c5400f 100644 --- a/modules/admin-core/luasrc/view/admin_system/upgrade.htm +++ b/modules/admin-core/luasrc/view/admin_system/upgrade.htm @@ -1,34 +1,33 @@ <%+header%> -<h1><%:system System%></h1> -<h2><%:a_s_flash Upgrade%></h2> -<p><%:a_s_flash_upgrade1 Ersetzt die installierte Firmware (das Betriebssystem des Routers) durch ein neues. -Das Format der Firmware ist plattformabhängig.%></p> +<h1><%:system%></h1> +<h2><%:a_s_flash%></h2> +<p><%:a_s_flash_upgrade1%></p> <br /> <% if sysupgrade and not ret then %> <form method="post" action="<%=uploadctrl%><%=luci.http.env.PATH_INFO%>" enctype="multipart/form-data"> <div class="cbi-section-node"> <div class="cbi-value clear"> - <div class="cbi-value-title left"><%:a_s_flash_fwimage Firmwareimage%></div> + <div class="cbi-value-title left"><%:a_s_flash_fwimage%></div> <div class="cbi-value-field"><input type="file" size="30" name="image" /></div> </div> <br /> <div class="cbi-value clear"> <input type="checkbox" name="keepcfg" value="1" checked="checked" /> - <span class="bold"><%:a_s_flash_keepcfg Konfigurationsdateien übernehmen%></span> + <span class="bold"><%:a_s_flash_keepcfg%></span> </div> <br /> <div> - <input type="submit" value="<%:a_s_flash_fwupgrade Firmware aktualisieren%>" /> + <input type="submit" value="<%:a_s_flash_fwupgrade%>" /> </div> </div> </form> <% elseif ret then %> <% if ret == 0 then %> -<div class="ok"><%:a_s_flash_flashed Flashvorgang erfolgreich. Router startet neu...%></div> +<div class="ok"><%:a_s_flash_flashed%></div> <% else %> -<div class="error"><%:a_s_flash_flasherr Flashvorgang fehlgeschlagen%>! (<%:code Code%> <%=ret%>)</div> +<div class="error"><%:a_s_flash_flasherr%>! (<%:code%> <%=ret%>)</div> <% end %> <% else %> -<div class="error"><%:a_s_flash_notimplemented Diese Funktion steht leider (noch) nicht zur Verfügung.%></div> +<div class="error"><%:a_s_flash_notimplemented%></div> <% end %> <%+footer%>
\ No newline at end of file diff --git a/modules/admin-core/luasrc/view/admin_uci/apply.htm b/modules/admin-core/luasrc/view/admin_uci/apply.htm index 090967a2d9..3cfc037e48 100644 --- a/modules/admin-core/luasrc/view/admin_uci/apply.htm +++ b/modules/admin-core/luasrc/view/admin_uci/apply.htm @@ -1,6 +1,6 @@ <%+header%> -<h1><%:config Konfiguration%></h1> -<p><%:uci_applied Die folgenden Änderungen wurden übernommen%>:</p> +<h1><%:config%></h1> +<p><%:uci_applied%>:</p> <code><%=(changes or "-")%> <%=output%></code> <%+footer%>
\ No newline at end of file diff --git a/modules/admin-core/luasrc/view/admin_uci/changes.htm b/modules/admin-core/luasrc/view/admin_uci/changes.htm index 002c0236df..c1f410c14f 100644 --- a/modules/admin-core/luasrc/view/admin_uci/changes.htm +++ b/modules/admin-core/luasrc/view/admin_uci/changes.htm @@ -1,11 +1,11 @@ <%+header%> -<h1><%:config Konfiguration%></h1> -<h2><%:changes Änderungen%></h2> +<h1><%:config%></h1> +<h2><%:changes%></h2> <code><%=changes%></code> <form class="inline" method="get" action="<%=controller%>/admin/uci/apply"> - <input type="submit" value="<%:apply Anwenden%>" /> + <input type="submit" value="<%:apply%>" /> </form> <form class="inline" method="get" action="<%=controller%>/admin/uci/revert"> - <input type="submit" value="<%:revert Verwerfen%>" /> + <input type="submit" value="<%:revert%>" /> </form> <%+footer%>
\ No newline at end of file diff --git a/modules/admin-core/luasrc/view/admin_uci/revert.htm b/modules/admin-core/luasrc/view/admin_uci/revert.htm index 39aaabcd81..1c039f6d3c 100644 --- a/modules/admin-core/luasrc/view/admin_uci/revert.htm +++ b/modules/admin-core/luasrc/view/admin_uci/revert.htm @@ -1,5 +1,5 @@ <%+header%> -<h1><%:config Konfiguration%></h1> -<p><%:uci_reverted Die folgenden Änderungen wurden verworfen%>:</p> +<h1><%:config%></h1> +<p><%:uci_reverted%>:</p> <code><%=(changes or "-")%></code> <%+footer%>
\ No newline at end of file diff --git a/modules/admin-core/luasrc/view/admin_wifi/index.htm b/modules/admin-core/luasrc/view/admin_wifi/index.htm index 8de3df90c4..3ba1819ba1 100644 --- a/modules/admin-core/luasrc/view/admin_wifi/index.htm +++ b/modules/admin-core/luasrc/view/admin_wifi/index.htm @@ -1,9 +1,6 @@ <%+header%> -<h1><%:wifi Drahtlos%></h1> -<p><%:a_w_wifi1 Hier finden sich Konfiugrationsmöglichkeiten für Drahtlos-Netzwerke nach dem WLAN-Standard.%></p> -<p><%:a_w_wifi2 802.11b/g/a/n-Geräte können so einfach in das bestehende physische Netzwerk integriert werden. -Die Unterstützung von virtuellen Adaptern ermöglicht auch den Einsatz als Wireless-Repeater oder von -mehreren Netzwerken gleichzeitig auf einem Gerät.%></p> -<p><%:a_w_wifi3 Es werden Managed, Client, Ad-Hoc und WDS-Modus unterstützt sowie WPA und WPA2-Verschlüsselung zur gesicherten -Kommunikation.%></p> +<h1><%:wifi%></h1> +<p><%:a_w_wifi1%></p> +<p><%:a_w_wifi2%></p> +<p><%:a_w_wifi3%></p> <%+footer%>
\ No newline at end of file diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua b/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua index 0998cb924d..203b1ce6dc 100644 --- a/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua +++ b/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua @@ -11,20 +11,16 @@ You may obtain a copy of the License at $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. -Damit dein Knoten durch Topographieprogramme erfasst werden kann, gib bitte deine Geokoordinaten oder -zumindest deine Straße und Hausnummer unter Standort an.]])) +m = Map("freifunk", translate("contact"), translate("contact1")) c = m:section(NamedSection, "contact", "public", "") -c:option(Value, "nickname", translate("nickname", "Pseudonym")) -c:option(Value, "name", translate("name", "Name")) -c:option(Value, "mail", translate("mail", "E-Mail"), translate("mail1", "Bitte unbedingt angeben!")) -c:option(Value, "phone", translate("phone", "Telefon")) -c:option(Value, "location", translate("location", "Standort")) -c:option(Value, "geo", translate("coord", "Koordinaten"), translate("coord1", "Bitte als Breite;Länge (z.B: 51.5;12.9) angeben")) -c:option(Value, "note", translate("note", "Notiz")) +c:option(Value, "nickname", translate("nickname")) +c:option(Value, "name", translate("name")) +c:option(Value, "mail", translate("mail"), translate("mail1")) +c:option(Value, "phone", translate("phone")) +c:option(Value, "location", translate("location")) +c:option(Value, "geo", translate("coord"), translate("coord1")) +c:option(Value, "note", translate("note")) return m
\ No newline at end of file diff --git a/modules/freifunk/luasrc/view/freifunk/contact.htm b/modules/freifunk/luasrc/view/freifunk/contact.htm index 7e6a39d22e..a1edb2e7f6 100644 --- a/modules/freifunk/luasrc/view/freifunk/contact.htm +++ b/modules/freifunk/luasrc/view/freifunk/contact.htm @@ -1,13 +1,13 @@ <%+header%> <% local contact = luci.model.uci.get_all("freifunk", "contact") %> -<h1><%:contact Kontakt%></h1> +<h1><%:contact%></h1> <table cellspacing="0" cellpadding="6"> - <tr><th><%:nickname Pseudonym%>:</th><td><%=contact.nickname%></td></tr> - <tr><th><%:name Name%>:</th><td><%=contact.name%></td></tr> - <tr><th><%:mail E-Mail%>:</th><td><%=contact.mail%></td></tr> - <tr><th><%:phone Telefon%>:</th><td><%=contact.phone%></td></tr> - <tr><th><%:location Standort%>:</th><td><%=contact.location%></td></tr> - <tr><th><%:geocoord Geokoordinaten%>:</th><td><%=contact.geo%></td></tr> - <tr><th><%:note Notiz%>:</th><td><%=contact.note%></td></tr> + <tr><th><%:nickname%>:</th><td><%=contact.nickname%></td></tr> + <tr><th><%:name%>:</th><td><%=contact.name%></td></tr> + <tr><th><%:mail%>:</th><td><%=contact.mail%></td></tr> + <tr><th><%:phone%>:</th><td><%=contact.phone%></td></tr> + <tr><th><%:location%>:</th><td><%=contact.location%></td></tr> + <tr><th><%:geocoord%>:</th><td><%=contact.geo%></td></tr> + <tr><th><%:note%>:</th><td><%=contact.note%></td></tr> </table> <%+footer%>
\ No newline at end of file diff --git a/modules/freifunk/luasrc/view/freifunk/index.htm b/modules/freifunk/luasrc/view/freifunk/index.htm index 6a1d805f27..7fa2b4e4b0 100644 --- a/modules/freifunk/luasrc/view/freifunk/index.htm +++ b/modules/freifunk/luasrc/view/freifunk/index.htm @@ -1,11 +1,10 @@ <%+header%> <% local ff = luci.model.uci.get_all("freifunk") %> -<h1><%:hellonet Hallo und willkommen im Netz von%> <%=ff.community.name%>!</h1> -<p><%:public1 Wir sind eine Initiative zur Schaffung eines freien, offenen und unabhängigen Funknetzwerks auf WLAN-Basis.%><br /> -<%:public2 Dies ist der Zugangspunkt %><%=luci.sys.hostname()%>. <%:public3 Er wird betrieben von %> +<h1><%:hellonet%> <%=ff.community.name%>!</h1> +<p><%:public1%><br /> +<%:public2%><%=luci.sys.hostname()%>. <%:public3%> <a href="<%=controller%>/public/index/contact"><%=ff.contact.nickname%></a>.</p> -<p><%:public4 Weitere Informationen zur globalen Freifunkinitiative findest du unter%> <a href="http://freifunk.net">Freifunk.net</a>.<br /> -<%:public5 Hast du Interesse an diesem Projekt, dann wende dich an deine lokale Gemeinschaft%> <a href="<%=ff.community.homepage%>"><%=ff.community.name%></a>.</p> -<p><strong><%:note Hinweis%></strong>: <%:public6 Der Internetzugang über das experimentelle Freifunknetz ist an technische und organisatorische Bedingungen geknüpft und deshalb möglicherweise -nicht (immer) gewährleistet.%></p> +<p><%:public4%> <a href="http://freifunk.net">Freifunk.net</a>.<br /> +<%:public5%> <a href="<%=ff.community.homepage%>"><%=ff.community.name%></a>.</p> +<p><strong><%:note%></strong>: <%:public6%></p> <%+footer%>
\ No newline at end of file diff --git a/modules/freifunk/luasrc/view/public_status/index.htm b/modules/freifunk/luasrc/view/public_status/index.htm index 653baf9843..ee1504dc38 100644 --- a/modules/freifunk/luasrc/view/public_status/index.htm +++ b/modules/freifunk/luasrc/view/public_status/index.htm @@ -1,38 +1,38 @@ <%+header%> -<h1><%:status Status%></h1> -<h2><%:system System%></h2> +<h1><%:status%></h1> +<h2><%:system%></h2> <br /> <table cellspacing="0" cellpadding="6" class="smalltext"> <tr> -<th><%:system_type Systemtyp%>:</th> +<th><%:system_type%>:</th> <td><%=s%></td> </tr> <tr> -<th><%:cpu Prozessor%>:</th> +<th><%:cpu%>:</th> <td><%=m%></td> </tr> <tr> -<th><%:ram Hauptspeicher%>:</th> +<th><%:ram%>:</th> <td><%=r%></td> </tr> </table> <br /><br /> -<h2><%:wifi Drahtlos%></h2> +<h2><%:wifi%></h2> <br /> <table cellspacing="0" cellpadding="6" class="smalltext"> <tr> -<th><%:name Name%></th> -<th><%:protocol Protokoll%></th> -<th><%:frequency Frequenz%></th> -<th><%:power Leistung%></th> -<th><%:bitrate Bitrate%></th> -<th><%:rts RTS%></th> -<th><%:frag Frag.%></th> -<th><%:link Verb.%></th> -<th><%:signal Signal%></th> -<th><%:noise Rausch%></th> +<th><%:name%></th> +<th><%:protocol%></th> +<th><%:frequency%></th> +<th><%:power%></th> +<th><%:bitrate%></th> +<th><%:rts%></th> +<th><%:frag%></th> +<th><%:link%></th> +<th><%:signal%></th> +<th><%:noise%></th> </tr> <%for k, v in pairs(luci.sys.wifi.getiwconfig()) do %> @@ -56,13 +56,13 @@ </table> <br /> <br /> -<h2><%:defroutes Standardrouten%></h2> +<h2><%:defroutes%></h2> <br /> <table cellspacing="0" cellpadding="6" class="smalltext"> <tr> -<th><%:gateway Gateway%></th> -<th><%:metric Metrik%></th> -<th><%:iface Schnittstelle%></th> +<th><%:gateway%></th> +<th><%:metric%></th> +<th><%:iface%></th> </tr> <% for i, rt in pairs(routes) do |