diff options
Diffstat (limited to 'modules/admin-full/luasrc/model/cbi/admin_system')
7 files changed, 42 insertions, 42 deletions
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua b/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua index aa4f12e554..e55c44c885 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua @@ -29,17 +29,17 @@ for i, dev in ipairs(devices) do end -m = Map("fstab", translate("a_s_fstab")) +m = Map("fstab", translate("Mount Points")) local mounts = luci.sys.mounts() -v = m:section(Table, mounts, translate("a_s_fstab_active")) +v = m:section(Table, mounts, translate("Mounted file systems")) -fs = v:option(DummyValue, "fs", translate("filesystem")) +fs = v:option(DummyValue, "fs", translate("Filesystem")) -mp = v:option(DummyValue, "mountpoint", translate("a_s_fstab_mountpoint")) +mp = v:option(DummyValue, "mountpoint", translate("Mount Point")) -avail = v:option(DummyValue, "avail", translate("a_s_fstab_avail")) +avail = v:option(DummyValue, "avail", translate("Available")) function avail.cfgvalue(self, section) return luci.tools.webadmin.byte_format( ( tonumber(mounts[section].available) or 0 ) * 1024 @@ -48,7 +48,7 @@ function avail.cfgvalue(self, section) ) end -used = v:option(DummyValue, "used", translate("a_s_fstab_used")) +used = v:option(DummyValue, "used", translate("Used")) function used.cfgvalue(self, section) return ( mounts[section].percent or "0%" ) .. " (" .. luci.tools.webadmin.byte_format( @@ -58,29 +58,29 @@ end -mount = m:section(TypedSection, "mount", translate("a_s_fstab_mountpoints"), translate("a_s_fstab_mountpoints1")) +mount = m:section(TypedSection, "mount", translate("Mount Points"), translate("Mount Points define at which point a memory device will be attached to the filesystem")) mount.anonymous = true mount.addremove = true mount.template = "cbi/tblsection" mount:option(Flag, "enabled", translate("enable")).rmempty = false -dev = mount:option(Value, "device", translate("device"), translate("a_s_fstab_device1")) +dev = mount:option(Value, "device", translate("Device"), translate("The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)")) for i, d in ipairs(devices) do dev:value(d, size[d] and "%s (%s MB)" % {d, size[d]}) end -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")) +mount:option(Value, "target", translate("Mount Point")) +mount:option(Value, "fstype", translate("Filesystem"), translate("The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)")) +mount:option(Value, "options", translate("Options"), translatef("see \'%s\' manpage"%s' manpage", "mount")) -swap = m:section(TypedSection, "swap", "SWAP", translate("a_s_fstab_swap1")) +swap = m:section(TypedSection, "swap", "SWAP", translate("If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>.")) swap.anonymous = true swap.addremove = true swap.template = "cbi/tblsection" swap:option(Flag, "enabled", translate("enable")).rmempty = false -dev = swap:option(Value, "device", translate("device"), translate("a_s_fstab_device1")) +dev = swap:option(Value, "device", translate("Device"), translate("The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)")) for i, d in ipairs(devices) do dev:value(d, size[d] and "%s (%s MB)" % {d, size[d]}) end diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua b/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua index 1b540b7051..1db0f11748 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua @@ -14,7 +14,7 @@ $Id$ ]]-- local ipkgfile = "/etc/opkg.conf" -f = SimpleForm("ipkgconf", translate("a_s_p_ipkg")) +f = SimpleForm("ipkgconf", translate("OPKG-Configuration")) t = f:field(TextValue, "lines") t.rows = 10 diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/leds.lua b/modules/admin-full/luasrc/model/cbi/admin_system/leds.lua index 71bd7d0bb1..e4045d2f40 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_system/leds.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_system/leds.lua @@ -11,7 +11,7 @@ You may obtain a copy of the License at $Id$ ]]-- -m = Map("system", translate("leds"), translate("leds_desc")) +m = Map("system", translate("<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"), translate("Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible.")) local sysfs_path = "/sys/class/leds/" local leds = {} @@ -78,8 +78,8 @@ end mode = s:option(MultiValue, "mode") mode.rmempty = true mode:depends("trigger", "netdev") -mode:value("link", translate("system_led_mode_link")) -mode:value("tx", translate("system_led_mode_tx")) -mode:value("rx", translate("system_led_mode_rx")) +mode:value("link", translate("Link On")) +mode:value("tx", translate("Transmit")) +mode:value("rx", translate("Receive")) return m diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/passwd.lua b/modules/admin-full/luasrc/model/cbi/admin_system/passwd.lua index dff5aeb7b6..6f13bb0fc8 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_system/passwd.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_system/passwd.lua @@ -12,13 +12,13 @@ You may obtain a copy of the License at $Id$ ]]-- -f = SimpleForm("password", translate("a_s_changepw"), translate("a_s_changepw1")) +f = SimpleForm("password", translate("Admin Password"), translate("Change the password of the system administrator (User <code>root</code>)")) -pw1 = f:field(Value, "pw1", translate("password")) +pw1 = f:field(Value, "pw1", translate("Password")) pw1.password = true pw1.rmempty = false -pw2 = f:field(Value, "pw2", translate("confirmation")) +pw2 = f:field(Value, "pw2", translate("Confirmation")) pw2.password = true pw2.rmempty = false @@ -31,9 +31,9 @@ function f.handle(self, state, data) local stat = luci.sys.user.setpasswd("root", data.pw1) == 0 if stat then - f.message = translate("a_s_changepw_changed") + f.message = translate("Password successfully changed") else - f.errmessage = translate("unknownerror") + f.errmessage = translate("Unknown Error") end data.pw1 = nil diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/processes.lua b/modules/admin-full/luasrc/model/cbi/admin_system/processes.lua index 8ec027d115..c34c70ffae 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_system/processes.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_system/processes.lua @@ -12,30 +12,30 @@ You may obtain a copy of the License at $Id$ ]]-- -f = SimpleForm("processes", translate("process_head"), translate("process_descr")) +f = SimpleForm("processes", translate("Processes"), translate("This list gives an overview over currently running system processes and their status.")) f.reset = false f.submit = false t = f:section(Table, luci.sys.process.list()) -t:option(DummyValue, "PID", translate("process_pid")) -t:option(DummyValue, "USER", translate("process_owner")) -t:option(DummyValue, "COMMAND", translate("process_command")) -t:option(DummyValue, "%CPU", translate("process_cpu")) -t:option(DummyValue, "%MEM", translate("process_mem")) +t:option(DummyValue, "PID", translate("PID")) +t:option(DummyValue, "USER", translate("Owner")) +t:option(DummyValue, "COMMAND", translate("Command")) +t:option(DummyValue, "%CPU", translate("CPU usage (%)")) +t:option(DummyValue, "%MEM", translate("Memory usage (%)")) -hup = t:option(Button, "_hup", translate("process_hup")) +hup = t:option(Button, "_hup", translate("Hang Up")) hup.inputstyle = "reload" function hup.write(self, section) null, self.tag_error[section] = luci.sys.process.signal(section, 1) end -term = t:option(Button, "_term", translate("process_term")) +term = t:option(Button, "_term", translate("Terminate")) term.inputstyle = "remove" function term.write(self, section) null, self.tag_error[section] = luci.sys.process.signal(section, 15) end -kill = t:option(Button, "_kill", translate("process_kill")) +kill = t:option(Button, "_kill", translate("Kill")) kill.inputstyle = "reset" function kill.write(self, section) null, self.tag_error[section] = luci.sys.process.signal(section, 9) diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua b/modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua index b7ff482353..c18539c8e8 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua @@ -14,7 +14,7 @@ $Id$ ]]-- local keyfile = "/etc/dropbear/authorized_keys" -f = SimpleForm("sshkeys", translate("a_s_sshkeys"), translate("a_s_sshkeys1")) +f = SimpleForm("sshkeys", translate("<abbr title=\"Secure Shell\">SSH</abbr>-Keys"), translate("Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication.")) t = f:field(TextValue, "keys") t.rmempty = true diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua index c37e726293..99ab64df02 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua @@ -16,7 +16,7 @@ require("luci.sys") require("luci.sys.zoneinfo") require("luci.tools.webadmin") -m = Map("system", translate("system"), translate("a_s_desc")) +m = Map("system", translate("System"), translate("Here you can configure the basic aspects of your device like its hostname or the timezone.")) s = m:section(TypedSection, "system", "") s.anonymous = true @@ -25,14 +25,14 @@ s.addremove = false local system, model, memtotal, memcached, membuffers, memfree = luci.sys.sysinfo() local uptime = luci.sys.uptime() -s:option(DummyValue, "_system", translate("system")).value = system -s:option(DummyValue, "_cpu", translate("m_i_processor")).value = model +s:option(DummyValue, "_system", translate("System")).value = system +s:option(DummyValue, "_cpu", translate("Processor")).value = model local load1, load5, load15 = luci.sys.loadavg() -s:option(DummyValue, "_la", translate("load")).value = +s:option(DummyValue, "_la", translate("Load")).value = string.format("%.2f, %.2f, %.2f", load1, load5, load15) -s:option(DummyValue, "_memtotal", translate("m_i_memory")).value = +s:option(DummyValue, "_memtotal", translate("Memory")).value = string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)", tonumber(memtotal) / 1024, 100 * memcached / memtotal, @@ -43,13 +43,13 @@ s:option(DummyValue, "_memtotal", translate("m_i_memory")).value = tostring(translate("mem_free", "")) ) -s:option(DummyValue, "_systime", translate("m_i_systemtime")).value = +s:option(DummyValue, "_systime", translate("Local Time")).value = os.date("%c") -s:option(DummyValue, "_uptime", translate("m_i_uptime")).value = +s:option(DummyValue, "_uptime", translate("Uptime")).value = luci.tools.webadmin.date_format(tonumber(uptime)) -hn = s:option(Value, "hostname", translate("hostname")) +hn = s:option(Value, "hostname", translate("Hostname")) function hn.write(self, section, value) Value.write(self, section, value) @@ -57,7 +57,7 @@ function hn.write(self, section, value) end -tz = s:option(ListValue, "zonename", translate("timezone")) +tz = s:option(ListValue, "zonename", translate("Timezone")) tz:value("UTC") for i, zone in ipairs(luci.sys.zoneinfo.TZ) do |