diff options
Diffstat (limited to 'modules/freifunk')
6 files changed, 55 insertions, 55 deletions
diff --git a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua index 5efd50f81..52b37dc6a 100644 --- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua +++ b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua @@ -45,7 +45,7 @@ function index() local page = node("freifunk", "status", "status") page.target = form("freifunk/public_status") - page.title = i18n("overview") + page.title = i18n("Overview") page.order = 20 page.i18n = "admin-core" page.setuser = false @@ -57,7 +57,7 @@ function index() assign({"freifunk", "olsr"}, {"admin", "status", "olsr"}, "OLSR", 30) if nixio.fs.access("/etc/config/luci_statistics") then - assign({"freifunk", "graph"}, {"admin", "statistics", "graph"}, i18n("stat_statistics", "Statistiken"), 40) + assign({"freifunk", "graph"}, {"admin", "statistics", "graph"}, i18n("Statistics"), 40) end assign({"mini", "freifunk"}, {"admin", "freifunk"}, "Freifunk", 15) @@ -72,7 +72,7 @@ function index() page.title = "Kontakt" page.order = 40 - entry({"freifunk", "map"}, template("freifunk-map/frame"), i18n("freifunk_map", "Karte"), 50) + entry({"freifunk", "map"}, template("freifunk-map/frame"), i18n("Karte"), 50) entry({"freifunk", "map", "content"}, template("freifunk-map/map"), nil, 51) end diff --git a/modules/freifunk/luasrc/controller/freifunk/remote_update.lua b/modules/freifunk/luasrc/controller/freifunk/remote_update.lua index badfbf2da..b894af7eb 100644 --- a/modules/freifunk/luasrc/controller/freifunk/remote_update.lua +++ b/modules/freifunk/luasrc/controller/freifunk/remote_update.lua @@ -20,7 +20,7 @@ function index() local i18n = luci.i18n.translate entry({"admin", "system", "remote_update"}, call("act_remote_update"), - i18n("ff_remote_update", "Freifunk Remote Update"), 90) + i18n("Freifunk Remote Update"), 90) end function act_remote_update() diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua b/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua index 2bb34a14a..41e709d95 100644 --- a/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua +++ b/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua @@ -18,17 +18,17 @@ m = Map("freifunk", translate("contact"), translate("contact1")) c = m:section(NamedSection, "contact", "public", "") -c:option(Value, "nickname", translate("ff_nickname")) -c:option(Value, "name", translate("ff_name")) -c:option(Value, "mail", translate("ff_mail"), translate("ff_mail1")) -c:option(Value, "phone", translate("ff_phone")) -c:option(Value, "location", translate("ff_location")) -c:option(Value, "note", translate("ff_note")) +c:option(Value, "nickname", translate("Nickname")) +c:option(Value, "name", translate("Realname")) +c:option(Value, "mail", translate("E-Mail"), translate("You really should provide your address here!")) +c:option(Value, "phone", translate("Phone")) +c:option(Value, "location", translate("Location")) +c:option(Value, "note", translate("Notice")) m2 = Map("system", translate("geo")) s = m2:section(TypedSection, "system", "") -s:option(Value, "latitude", translate("latitude", "Breite")).rmempty = true -s:option(Value, "longitude", translate("longitude", "Länge")).rmempty = true +s:option(Value, "latitude", translate("Breite")).rmempty = true +s:option(Value, "longitude", translate("Länge")).rmempty = true return m, m2 diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua b/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua index 2363c8c7f..7cf17dabb 100644 --- a/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua +++ b/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua @@ -16,14 +16,14 @@ f.reset = false local system, model, memtotal, memcached, membuffers, memfree = luci.sys.sysinfo() local uptime = luci.sys.uptime() -f:field(DummyValue, "_system", translate("system")).value = system -f:field(DummyValue, "_cpu", translate("m_i_processor")).value = model +f:field(DummyValue, "_system", translate("System")).value = system +f:field(DummyValue, "_cpu", translate("Processor")).value = model local load1, load5, load15 = luci.sys.loadavg() -f:field(DummyValue, "_la", translate("load")).value = +f:field(DummyValue, "_la", translate("Load")).value = string.format("%.2f, %.2f, %.2f", load1, load5, load15) -f:field(DummyValue, "_memtotal", translate("m_i_memory")).value = +f:field(DummyValue, "_memtotal", translate("Memory")).value = string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)", tonumber(memtotal) / 1024, 100 * memcached / memtotal, @@ -34,10 +34,10 @@ string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)", tostring(translate("mem_free", "")) ) -f:field(DummyValue, "_systime", translate("m_i_systemtime")).value = +f:field(DummyValue, "_systime", translate("Local Time")).value = os.date("%c") -f:field(DummyValue, "_uptime", translate("m_i_uptime")).value = +f:field(DummyValue, "_uptime", translate("Uptime")).value = luci.tools.webadmin.date_format(tonumber(uptime)) @@ -61,9 +61,9 @@ m = SimpleForm("wireless", "Freifunk WLAN") m.submit = false m.reset = false -s = m:section(Table, ifaces, translate("networks")) +s = m:section(Table, ifaces, translate("Networks")) -link = s:option(DummyValue, "_link", translate("link")) +link = s:option(DummyValue, "_link", translate("Link")) function link.cfgvalue(self, section) local ifname = self.map:get(section, "ifname") return wifidata[ifname] and wifidata[ifname]["Link Quality"] or "-" @@ -78,34 +78,34 @@ function bssid.cfgvalue(self, section) or wifidata[ifname]["Access Point"])) or "-" end -channel = s:option(DummyValue, "channel", translate("channel")) +channel = s:option(DummyValue, "channel", translate("Channel")) function channel.cfgvalue(self, section) return wireless[self.map:get(section, "device")].channel end -protocol = s:option(DummyValue, "_mode", translate("protocol")) +protocol = s:option(DummyValue, "_mode", translate("Protocol")) function protocol.cfgvalue(self, section) local mode = wireless[self.map:get(section, "device")].mode return mode and "802." .. mode end -mode = s:option(DummyValue, "mode", translate("mode")) -encryption = s:option(DummyValue, "encryption", translate("iwscan_encr")) +mode = s:option(DummyValue, "mode", translate("Mode")) +encryption = s:option(DummyValue, "encryption", translate("<abbr title=\"Encrypted\">Encr.</abbr>")) -power = s:option(DummyValue, "_power", translate("power")) +power = s:option(DummyValue, "_power", translate("Power")) function power.cfgvalue(self, section) local ifname = self.map:get(section, "ifname") return wifidata[ifname] and wifidata[ifname]["Tx-Power"] or "-" end -scan = s:option(Button, "_scan", translate("scan")) +scan = s:option(Button, "_scan", translate("Scan")) scan.inputstyle = "find" function scan.cfgvalue(self, section) return self.map:get(section, "ifname") or false end -t2 = m:section(Table, {}, translate("iwscan"), translate("iwscan1")) +t2 = m:section(Table, {}, translate("<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"), translate("Wifi networks in your local environment")) function scan.write(self, section) t2.render = t2._render @@ -116,26 +116,26 @@ end t2._render = t2.render t2.render = function() end -t2:option(DummyValue, "Quality", translate("iwscan_link")) +t2:option(DummyValue, "Quality", translate("Link")) essid = t2:option(DummyValue, "ESSID", "ESSID") function essid.cfgvalue(self, section) return luci.util.pcdata(self.map:get(section, "ESSID")) end t2:option(DummyValue, "Address", "BSSID") -t2:option(DummyValue, "Mode", translate("mode")) -chan = t2:option(DummyValue, "channel", translate("channel")) +t2:option(DummyValue, "Mode", translate("Mode")) +chan = t2:option(DummyValue, "channel", translate("Channel")) function chan.cfgvalue(self, section) return self.map:get(section, "Channel") or self.map:get(section, "Frequency") or "-" end -t2:option(DummyValue, "Encryption key", translate("iwscan_encr")) +t2:option(DummyValue, "Encryption key", translate("<abbr title=\"Encrypted\">Encr.</abbr>")) -t2:option(DummyValue, "Signal level", translate("iwscan_signal")) +t2:option(DummyValue, "Signal level", translate("Signal")) -t2:option(DummyValue, "Noise level", translate("iwscan_noise")) +t2:option(DummyValue, "Noise level", translate("Noise")) -- Routes -- @@ -152,28 +152,28 @@ end v = r:section(Table, routes) -net = v:option(DummyValue, "iface", translate("network")) +net = v:option(DummyValue, "iface", translate("Network")) function net.cfgvalue(self, section) return luci.tools.webadmin.iface_get_network(routes[section].device) or routes[section].device end -target = v:option(DummyValue, "target", translate("target")) +target = v:option(DummyValue, "target", translate("Target")) function target.cfgvalue(self, section) return routes[section].dest:network():string() end -netmask = v:option(DummyValue, "netmask", translate("netmask")) +netmask = v:option(DummyValue, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask")) function netmask.cfgvalue(self, section) return routes[section].dest:mask():string() end -gateway = v:option(DummyValue, "gateway", translate("gateway")) +gateway = v:option(DummyValue, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway")) function gateway.cfgvalue(self, section) return routes[section].gateway:string() end -metric = v:option(DummyValue, "metric", translate("metric")) +metric = v:option(DummyValue, "metric", translate("Metric")) function metric.cfgvalue(self, section) return routes[section].metric end @@ -189,23 +189,23 @@ end if #routes6 > 0 then v6 = r:section(Table, routes6) - net = v6:option(DummyValue, "iface", translate("network")) + net = v6:option(DummyValue, "iface", translate("Network")) function net.cfgvalue(self, section) return luci.tools.webadmin.iface_get_network(routes6[section].device) or routes6[section].device end - target = v6:option(DummyValue, "target", translate("target")) + target = v6:option(DummyValue, "target", translate("Target")) function target.cfgvalue(self, section) return routes6[section].dest:string() end - gateway = v6:option(DummyValue, "gateway6", translate("gateway6")) + gateway = v6:option(DummyValue, "gateway6", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway")) function gateway.cfgvalue(self, section) return routes6[section].source:string() end - metric = v6:option(DummyValue, "metric", translate("metric")) + metric = v6:option(DummyValue, "metric", translate("Metric")) function metric.cfgvalue(self, section) local metr = routes6[section].metric local lower = bit.band(metr, 0xffff) diff --git a/modules/freifunk/luasrc/view/freifunk/contact.htm b/modules/freifunk/luasrc/view/freifunk/contact.htm index 06177c205..59d508c6f 100644 --- a/modules/freifunk/luasrc/view/freifunk/contact.htm +++ b/modules/freifunk/luasrc/view/freifunk/contact.htm @@ -16,12 +16,12 @@ $Id$ <% local contact = luci.model.uci.cursor():get_all("freifunk", "contact") %> <h2><a id="content" name="content"><%:contact%></a></h2> <table cellspacing="0" cellpadding="6"> - <tr><th><%:ff_nickname%>:</th><td><%=contact.nickname%></td></tr> - <tr><th><%:ff_name%>:</th><td><%=contact.name%></td></tr> - <tr><th><%:ff_mail%>:</th><td><%=contact.mail%></td></tr> - <tr><th><%:ff_phone%>:</th><td><%=contact.phone%></td></tr> - <tr><th><%:ff_location%>:</th><td><%=contact.location%></td></tr> - <tr><th><%:ff_geocoord%>:</th><td><%=contact.geo%></td></tr> - <tr><th><%:ff_note%>:</th><td><%=contact.note%></td></tr> + <tr><th><%:Nickname%>:</th><td><%=contact.nickname%></td></tr> + <tr><th><%:Realname%>:</th><td><%=contact.name%></td></tr> + <tr><th><%:E-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><%:Coordinates%>:</th><td><%=contact.geo%></td></tr> + <tr><th><%:Notice%>:</th><td><%=contact.note%></td></tr> </table> <%+footer%> diff --git a/modules/freifunk/luasrc/view/freifunk/index.htm b/modules/freifunk/luasrc/view/freifunk/index.htm index 0b4d69771..736cf29da 100644 --- a/modules/freifunk/luasrc/view/freifunk/index.htm +++ b/modules/freifunk/luasrc/view/freifunk/index.htm @@ -14,11 +14,11 @@ $Id$ -%> <%+header%> <% local ff = luci.model.uci.cursor():get_all("freifunk") %> -<h2><a id="content" name="content"><%:ff_hellonet%> <%=ff.community.name or 'Freifunk Deutschland'%>!</a></h2> -<p><%:ff_public1%><br /> -<%:ff_public2%> <%=luci.sys.hostname()%>. <%:ff_public3%> +<h2><a id="content" name="content"><%:Hello and welcome in the network of%> <%=ff.community.name or 'Freifunk Deutschland'%>!</a></h2> +<p><%:We are an initiative to establish a free, independent and open wireless mesh network.%><br /> +<%:This is the access point%> <%=luci.sys.hostname()%>. <%:It is operated by%> <a href="<%=luci.dispatcher.build_url("freifunk", "index", "contact")%>"> <%=ff.contact.nickname%></a>.</p> -<p><%:ff_public4%> <a href="http://freifunk.net">Freifunk.net</a>.<br /> -<%:ff_public5%> <a href="<%=ff.community.homepage or 'http//freifunk.net'%>"><%=ff.community.name or 'Freifunk'%></a>.</p> -<p><strong><%:ff_note%></strong>: <%:ff_public6%></p> +<p><%:You can find further information about the global Freifunk initiative at%> <a href="http://freifunk.net">Freifunk.net</a>.<br /> +<%:If you are interested in our project then contact the local community%> <a href="<%=ff.community.homepage or 'http//freifunk.net'%>"><%=ff.community.name or 'Freifunk'%></a>.</p> +<p><strong><%:Notice%></strong>: <%:Internet access depends on technical and organisational conditions and may or may not work for you.%></p> <%+footer%> |