summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--applications/luci-app-hd-idle/luasrc/controller/hd_idle.lua2
-rw-r--r--applications/luci-app-hd-idle/luasrc/model/cbi/hd_idle.lua8
-rw-r--r--applications/luci-app-hd-idle/po/ca/hd_idle.po12
-rw-r--r--applications/luci-app-hd-idle/po/cs/hd_idle.po12
-rw-r--r--applications/luci-app-hd-idle/po/de/hd_idle.po12
-rw-r--r--applications/luci-app-hd-idle/po/el/hd_idle.po8
-rw-r--r--applications/luci-app-hd-idle/po/en/hd_idle.po14
-rw-r--r--applications/luci-app-hd-idle/po/es/hd_idle.po12
-rw-r--r--applications/luci-app-hd-idle/po/fr/hd_idle.po12
-rw-r--r--applications/luci-app-hd-idle/po/he/hd_idle.po10
-rw-r--r--applications/luci-app-hd-idle/po/hu/hd_idle.po12
-rw-r--r--applications/luci-app-hd-idle/po/it/hd_idle.po12
-rw-r--r--applications/luci-app-hd-idle/po/ja/hd_idle.po12
-rw-r--r--applications/luci-app-hd-idle/po/ms/hd_idle.po8
-rw-r--r--applications/luci-app-hd-idle/po/no/hd_idle.po12
-rw-r--r--applications/luci-app-hd-idle/po/pl/hd_idle.po12
-rw-r--r--applications/luci-app-hd-idle/po/pt-br/hd_idle.po12
-rw-r--r--applications/luci-app-hd-idle/po/pt/hd_idle.po12
-rw-r--r--applications/luci-app-hd-idle/po/ro/hd_idle.po12
-rw-r--r--applications/luci-app-hd-idle/po/ru/hd_idle.po12
-rw-r--r--applications/luci-app-hd-idle/po/sk/hd_idle.po8
-rw-r--r--applications/luci-app-hd-idle/po/sv/hd_idle.po8
-rw-r--r--applications/luci-app-hd-idle/po/templates/hd_idle.pot8
-rw-r--r--applications/luci-app-hd-idle/po/tr/hd_idle.po8
-rw-r--r--applications/luci-app-hd-idle/po/uk/hd_idle.po8
-rw-r--r--applications/luci-app-hd-idle/po/vi/hd_idle.po12
-rw-r--r--applications/luci-app-hd-idle/po/zh-cn/hd_idle.po8
-rw-r--r--applications/luci-app-hd-idle/po/zh-tw/hd_idle.po8
-rw-r--r--applications/luci-app-samba/luasrc/model/cbi/samba.lua9
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/processes.lua45
30 files changed, 182 insertions, 158 deletions
diff --git a/applications/luci-app-hd-idle/luasrc/controller/hd_idle.lua b/applications/luci-app-hd-idle/luasrc/controller/hd_idle.lua
index f273a551df..9a981acac3 100644
--- a/applications/luci-app-hd-idle/luasrc/controller/hd_idle.lua
+++ b/applications/luci-app-hd-idle/luasrc/controller/hd_idle.lua
@@ -10,6 +10,6 @@ function index()
local page
- page = entry({"admin", "services", "hd_idle"}, cbi("hd_idle"), _("hd-idle"), 60)
+ page = entry({"admin", "services", "hd_idle"}, cbi("hd_idle"), _("HDD Idle"), 60)
page.dependent = true
end
diff --git a/applications/luci-app-hd-idle/luasrc/model/cbi/hd_idle.lua b/applications/luci-app-hd-idle/luasrc/model/cbi/hd_idle.lua
index 70b04af909..c15fdc028a 100644
--- a/applications/luci-app-hd-idle/luasrc/model/cbi/hd_idle.lua
+++ b/applications/luci-app-hd-idle/luasrc/model/cbi/hd_idle.lua
@@ -3,8 +3,8 @@
require("nixio.fs")
-m = Map("hd-idle", "hd-idle",
- translate("hd-idle is a utility program for spinning-down external " ..
+m = Map("hd-idle", translate("HDD Idle"),
+ translate("HDD Idle is a utility program for spinning-down external " ..
"disks after a period of idle time."))
s = m:section(TypedSection, "hd-idle", translate("Settings"))
@@ -18,9 +18,9 @@ for dev in nixio.fs.glob("/dev/[sh]d[a-z]") do
disk:value(nixio.fs.basename(dev))
end
-s:option(Value, "idle_time_interval", translate("Idle-time")).default = 10
+s:option(Value, "idle_time_interval", translate("Idle time")).default = 10
s.rmempty = true
-unit = s:option(ListValue, "idle_time_unit", translate("Idle-time unit"))
+unit = s:option(ListValue, "idle_time_unit", translate("Idle time unit"))
unit.default = "minutes"
unit:value("minutes", translate("min"))
unit:value("hours", translate("h"))
diff --git a/applications/luci-app-hd-idle/po/ca/hd_idle.po b/applications/luci-app-hd-idle/po/ca/hd_idle.po
index 29618a8961..cb76456608 100644
--- a/applications/luci-app-hd-idle/po/ca/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/ca/hd_idle.po
@@ -21,10 +21,10 @@ msgstr "Disc"
msgid "Enable"
msgstr "Habilita"
-msgid "Idle-time"
+msgid "Idle time"
msgstr "Temps d'inactivitat"
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr "Unitat de temps d'inactivitat"
msgid "Settings"
@@ -34,14 +34,14 @@ msgstr "Ajusts"
msgid "h"
msgstr "h"
-msgid "hd-idle"
-msgstr "hd-idle"
+msgid "HDD Idle"
+msgstr "HDD Idle"
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
-"hd-idle és un programa per ralentitzar els discos externs després d'un "
+"HDD Idle és un programa per ralentitzar els discos externs després d'un "
"període de temps inactiu."
# Minutes (not minimum)
diff --git a/applications/luci-app-hd-idle/po/cs/hd_idle.po b/applications/luci-app-hd-idle/po/cs/hd_idle.po
index e2deb9b20c..72851b5711 100644
--- a/applications/luci-app-hd-idle/po/cs/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/cs/hd_idle.po
@@ -21,10 +21,10 @@ msgstr "Disk"
msgid "Enable"
msgstr "Povolit"
-msgid "Idle-time"
+msgid "Idle time"
msgstr "Čas nečinnosti"
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr "Čas nečinnosti - jednotka"
msgid "Settings"
@@ -34,14 +34,14 @@ msgstr "Nastavení"
msgid "h"
msgstr "h"
-msgid "hd-idle"
-msgstr "hd-idle"
+msgid "HDD Idle"
+msgstr "HDD Idle"
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
-"hd-idle je utilita pro vypnutí externích pevných disků po určité době "
+"HDD Idle je utilita pro vypnutí externích pevných disků po určité době "
"nečinnosti."
# Minut (ne minimum)
diff --git a/applications/luci-app-hd-idle/po/de/hd_idle.po b/applications/luci-app-hd-idle/po/de/hd_idle.po
index fa54896571..c3162bd206 100644
--- a/applications/luci-app-hd-idle/po/de/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/de/hd_idle.po
@@ -19,10 +19,10 @@ msgstr "Festplatte"
msgid "Enable"
msgstr "Aktivieren"
-msgid "Idle-time"
+msgid "Idle time"
msgstr "Leerlaufzeit"
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr "Leerlaufzeiteinheit"
msgid "Settings"
@@ -32,14 +32,14 @@ msgstr "Einstellungen"
msgid "h"
msgstr "Stunden"
-msgid "hd-idle"
-msgstr "hd-idle"
+msgid "HDD Idle"
+msgstr "HDD Idle"
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
-"hd-idle ist ein Hilfsprogramm um externe Festplatten nach einer festgelegten "
+"HDD Idle ist ein Hilfsprogramm um externe Festplatten nach einer festgelegten "
"Leerlaufzeit herunter zu fahren."
# Minutes (not minimum)
diff --git a/applications/luci-app-hd-idle/po/el/hd_idle.po b/applications/luci-app-hd-idle/po/el/hd_idle.po
index 4d7c23dfa4..8357560362 100644
--- a/applications/luci-app-hd-idle/po/el/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/el/hd_idle.po
@@ -19,10 +19,10 @@ msgstr "Δίσκος"
msgid "Enable"
msgstr "Ενεργοποίηση"
-msgid "Idle-time"
+msgid "Idle time"
msgstr ""
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr ""
msgid "Settings"
@@ -32,11 +32,11 @@ msgstr "Ρυθμίσεις"
msgid "h"
msgstr "ω"
-msgid "hd-idle"
+msgid "HDD Idle"
msgstr ""
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
diff --git a/applications/luci-app-hd-idle/po/en/hd_idle.po b/applications/luci-app-hd-idle/po/en/hd_idle.po
index 7aa4db5fe5..1d3e42ffde 100644
--- a/applications/luci-app-hd-idle/po/en/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/en/hd_idle.po
@@ -17,11 +17,11 @@ msgstr "Disk"
msgid "Enable"
msgstr "Enable"
-msgid "Idle-time"
-msgstr "Idle-time"
+msgid "Idle time"
+msgstr "Idle time"
-msgid "Idle-time unit"
-msgstr "Idle-time unit"
+msgid "Idle time unit"
+msgstr "Idle time unit"
msgid "Settings"
msgstr "Settings"
@@ -30,14 +30,14 @@ msgstr "Settings"
msgid "h"
msgstr "h"
-msgid "hd-idle"
+msgid "HDD Idle"
msgstr ""
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
# Minutes (not minimum)
diff --git a/applications/luci-app-hd-idle/po/es/hd_idle.po b/applications/luci-app-hd-idle/po/es/hd_idle.po
index d2bb017a05..f01a8ae33c 100644
--- a/applications/luci-app-hd-idle/po/es/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/es/hd_idle.po
@@ -19,10 +19,10 @@ msgstr "Disco"
msgid "Enable"
msgstr "Activar"
-msgid "Idle-time"
+msgid "Idle time"
msgstr "Tiempo de inactividad"
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr "Unidad de tiempo"
msgid "Settings"
@@ -32,14 +32,14 @@ msgstr "Configuración"
msgid "h"
msgstr "h"
-msgid "hd-idle"
-msgstr "hd-idle"
+msgid "HDD Idle"
+msgstr "HDD Idle"
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
-"hd-idle es un programa que gestiona el reposo de discos externos tras un "
+"HDD Idle es un programa que gestiona el reposo de discos externos tras un "
"tiempo de inactividad."
# Minutes (not minimum)
diff --git a/applications/luci-app-hd-idle/po/fr/hd_idle.po b/applications/luci-app-hd-idle/po/fr/hd_idle.po
index 00c092d487..b03094228c 100644
--- a/applications/luci-app-hd-idle/po/fr/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/fr/hd_idle.po
@@ -19,10 +19,10 @@ msgstr "Disque"
msgid "Enable"
msgstr "Activer"
-msgid "Idle-time"
+msgid "Idle time"
msgstr "Temps d'inactivité"
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr "Unité de temps"
msgid "Settings"
@@ -32,14 +32,14 @@ msgstr "Réglages"
msgid "h"
msgstr "h"
-msgid "hd-idle"
-msgstr "hd-idle"
+msgid "HDD Idle"
+msgstr "HDD Idle"
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
-"hd-idle est un utilitaire pour arrêter la rotation des disques externes "
+"HDD Idle est un utilitaire pour arrêter la rotation des disques externes "
"après une période d'inactivité."
# Minutes (not minimum)
diff --git a/applications/luci-app-hd-idle/po/he/hd_idle.po b/applications/luci-app-hd-idle/po/he/hd_idle.po
index 0ffde90453..f433e423b0 100644
--- a/applications/luci-app-hd-idle/po/he/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/he/hd_idle.po
@@ -21,10 +21,10 @@ msgstr "כונן"
msgid "Enable"
msgstr "אפשר"
-msgid "Idle-time"
+msgid "Idle time"
msgstr "זמן חוסר פעילות"
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr "יחידת זמן חוסר פעילות"
msgid "Settings"
@@ -34,14 +34,14 @@ msgstr "הגדרות"
msgid "h"
msgstr "ש'"
-msgid "hd-idle"
+msgid "HDD Idle"
msgstr ""
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
-"hd-idle הינה תוכנת שירות שמטרתה להקטין את מהירות הסיבוב של כוננים חיצוניים "
+"HDD Idle הינה תוכנת שירות שמטרתה להקטין את מהירות הסיבוב של כוננים חיצוניים "
"לאחר זמן מסוים של חוסר פעילות."
# Minutes (not minimum)
diff --git a/applications/luci-app-hd-idle/po/hu/hd_idle.po b/applications/luci-app-hd-idle/po/hu/hd_idle.po
index 543a8fc2cc..94d4b95e4f 100644
--- a/applications/luci-app-hd-idle/po/hu/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/hu/hd_idle.po
@@ -21,10 +21,10 @@ msgstr "Lemez"
msgid "Enable"
msgstr "Engedélyezés"
-msgid "Idle-time"
+msgid "Idle time"
msgstr "Üresjárati idő"
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr "Üresjárati idő egysége"
msgid "Settings"
@@ -34,14 +34,14 @@ msgstr "Beállítások"
msgid "h"
msgstr "óra"
-msgid "hd-idle"
-msgstr "hd-idle"
+msgid "HDD Idle"
+msgstr "HDD Idle"
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
-"hd-idle egy a külső lemezek adott üresjárati idő után történő leállítására "
+"HDD Idle egy a külső lemezek adott üresjárati idő után történő leállítására "
"szolgáló segédprogram."
# Minutes (not minimum)
diff --git a/applications/luci-app-hd-idle/po/it/hd_idle.po b/applications/luci-app-hd-idle/po/it/hd_idle.po
index ffd118dd13..8b443b47c0 100644
--- a/applications/luci-app-hd-idle/po/it/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/it/hd_idle.po
@@ -19,10 +19,10 @@ msgstr "Disco"
msgid "Enable"
msgstr "Abilita"
-msgid "Idle-time"
+msgid "Idle time"
msgstr "Tempo di inattività"
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr "Unità di misura del tempo di inattività"
msgid "Settings"
@@ -32,14 +32,14 @@ msgstr "Opzioni"
msgid "h"
msgstr "ora/e"
-msgid "hd-idle"
-msgstr "hd-idle"
+msgid "HDD Idle"
+msgstr "HDD Idle"
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
-"HD-idle è un programma per mettere in standby i dischi esterni dopo un "
+"HDD Idle è un programma per mettere in standby i dischi esterni dopo un "
"periodo di inattività."
# Minutes (not minimum)
diff --git a/applications/luci-app-hd-idle/po/ja/hd_idle.po b/applications/luci-app-hd-idle/po/ja/hd_idle.po
index 9e724ebeb5..3f753a2c5d 100644
--- a/applications/luci-app-hd-idle/po/ja/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/ja/hd_idle.po
@@ -19,10 +19,10 @@ msgstr "ディスク"
msgid "Enable"
msgstr "有効"
-msgid "Idle-time"
+msgid "Idle time"
msgstr "アイドル時間"
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr "アイドル時間 (単位)"
msgid "Settings"
@@ -32,14 +32,14 @@ msgstr "設定"
msgid "h"
msgstr "時"
-msgid "hd-idle"
-msgstr "hd-idle"
+msgid "HDD Idle"
+msgstr "HDD Idle"
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
-"hd-idleはアイドル時に外部ディスクをスピンダウンさせるための、ユーティリティプ"
+"HDD Idleはアイドル時に外部ディスクをスピンダウンさせるための、ユーティリティプ"
"ログラムです。"
# Minutes (not minimum)
diff --git a/applications/luci-app-hd-idle/po/ms/hd_idle.po b/applications/luci-app-hd-idle/po/ms/hd_idle.po
index 45402b8c52..245f5b1dd9 100644
--- a/applications/luci-app-hd-idle/po/ms/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/ms/hd_idle.po
@@ -18,10 +18,10 @@ msgstr ""
msgid "Enable"
msgstr ""
-msgid "Idle-time"
+msgid "Idle time"
msgstr ""
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr ""
msgid "Settings"
@@ -31,11 +31,11 @@ msgstr ""
msgid "h"
msgstr ""
-msgid "hd-idle"
+msgid "HDD Idle"
msgstr ""
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
diff --git a/applications/luci-app-hd-idle/po/no/hd_idle.po b/applications/luci-app-hd-idle/po/no/hd_idle.po
index dc0c2f8904..70b2a2c0eb 100644
--- a/applications/luci-app-hd-idle/po/no/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/no/hd_idle.po
@@ -10,10 +10,10 @@ msgstr "Disk"
msgid "Enable"
msgstr "Aktiver"
-msgid "Idle-time"
+msgid "Idle time"
msgstr "Tid inaktiv"
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr "Tidsenhet"
msgid "Settings"
@@ -22,14 +22,14 @@ msgstr "Innstillinger"
msgid "h"
msgstr "timer"
-msgid "hd-idle"
-msgstr "Hd-Idle"
+msgid "HDD Idle"
+msgstr "HDD Idle"
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
-"hd-idle er et verktøy for å spinne ned eksterne disker etter en periode med "
+"HDD Idle er et verktøy for å spinne ned eksterne disker etter en periode med "
"inaktivitet."
msgid "min"
diff --git a/applications/luci-app-hd-idle/po/pl/hd_idle.po b/applications/luci-app-hd-idle/po/pl/hd_idle.po
index c6522c19c0..c19130c6e4 100644
--- a/applications/luci-app-hd-idle/po/pl/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/pl/hd_idle.po
@@ -20,10 +20,10 @@ msgstr "Dysk"
msgid "Enable"
msgstr "Włącz"
-msgid "Idle-time"
+msgid "Idle time"
msgstr "Czas bezczynności"
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr "Jednostka czasu bezczynności"
msgid "Settings"
@@ -33,14 +33,14 @@ msgstr "Ustawienia"
msgid "h"
msgstr "godz."
-msgid "hd-idle"
-msgstr "hd-idle"
+msgid "HDD Idle"
+msgstr "HDD Idle"
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
-"hd-idle jest narzędziem do zwalniania obrotów zewnętrznych dysków po "
+"HDD Idle jest narzędziem do zwalniania obrotów zewnętrznych dysków po "
"określonym czasie bezczynności."
# Minutes (not minimum)
diff --git a/applications/luci-app-hd-idle/po/pt-br/hd_idle.po b/applications/luci-app-hd-idle/po/pt-br/hd_idle.po
index 0aaca9389a..0bcae067eb 100644
--- a/applications/luci-app-hd-idle/po/pt-br/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/pt-br/hd_idle.po
@@ -19,10 +19,10 @@ msgstr "Disco"
msgid "Enable"
msgstr "Habilitar"
-msgid "Idle-time"
+msgid "Idle time"
msgstr "Tempo de ociosidade"
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr "Unidade do tempo da ociosidade"
msgid "Settings"
@@ -32,14 +32,14 @@ msgstr "Configurações"
msgid "h"
msgstr "horas"
-msgid "hd-idle"
-msgstr "Hd-idle"
+msgid "HDD Idle"
+msgstr "HDD Idle"
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
-"Hd-idle é um programa utilitário para ativar o modo \"economia de energia"
+"HDD Idle é um programa utilitário para ativar o modo \"economia de energia"
"\" (spinning-down) de discos externos após um período de ociosidade."
# Minutes (not minimum)
diff --git a/applications/luci-app-hd-idle/po/pt/hd_idle.po b/applications/luci-app-hd-idle/po/pt/hd_idle.po
index 16cb085b10..59c7c1d1cc 100644
--- a/applications/luci-app-hd-idle/po/pt/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/pt/hd_idle.po
@@ -19,10 +19,10 @@ msgstr "Disco"
msgid "Enable"
msgstr "Ativar"
-msgid "Idle-time"
+msgid "Idle time"
msgstr "Tempo de ociosidade"
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr "Unidade de tempo de ociosidade"
msgid "Settings"
@@ -32,14 +32,14 @@ msgstr "Configurações"
msgid "h"
msgstr "h"
-msgid "hd-idle"
-msgstr "hd-idle"
+msgid "HDD Idle"
+msgstr "HDD Idle"
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
-"hd-idle é um programa utilitário para activar o modo \"economia de energia"
+"HDD Idle é um programa utilitário para activar o modo \"economia de energia"
"\" (spinning-down) de discos externos após um período de ociosidade."
# Minutes (not minimum)
diff --git a/applications/luci-app-hd-idle/po/ro/hd_idle.po b/applications/luci-app-hd-idle/po/ro/hd_idle.po
index ae6a8b0904..f79adff869 100644
--- a/applications/luci-app-hd-idle/po/ro/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/ro/hd_idle.po
@@ -22,10 +22,10 @@ msgstr "Disc"
msgid "Enable"
msgstr "Activeaza"
-msgid "Idle-time"
+msgid "Idle time"
msgstr "Timp de inactivitate"
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr "Unitatea de timp pentru masurarea inactivitatii"
msgid "Settings"
@@ -35,14 +35,14 @@ msgstr "Setari"
msgid "h"
msgstr "ore"
-msgid "hd-idle"
-msgstr "hd-idle"
+msgid "HDD Idle"
+msgstr "HDD Idle"
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
-"hd-idle este un utilitar pentru a oprit din rotatie hard disc-urile externe "
+"HDD Idle este un utilitar pentru a oprit din rotatie hard disc-urile externe "
"dupa o anumita perioada de inactivitate."
# Minutes (not minimum)
diff --git a/applications/luci-app-hd-idle/po/ru/hd_idle.po b/applications/luci-app-hd-idle/po/ru/hd_idle.po
index 45d4a519be..2ecc90fa2a 100644
--- a/applications/luci-app-hd-idle/po/ru/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/ru/hd_idle.po
@@ -21,10 +21,10 @@ msgstr "Диск"
msgid "Enable"
msgstr "Включить"
-msgid "Idle-time"
+msgid "Idle time"
msgstr "Время бездействия"
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr "Единицы времени бездействия"
msgid "Settings"
@@ -34,14 +34,14 @@ msgstr "Настройки"
msgid "h"
msgstr "ч"
-msgid "hd-idle"
-msgstr "hd-idle"
+msgid "HDD Idle"
+msgstr "HDD Idle"
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
-"Утилита hd-idle позволяет замедлять внешние диски после определённого "
+"Утилита HDD Idle позволяет замедлять внешние диски после определённого "
"времени бездействия."
# Minutes (not minimum)
diff --git a/applications/luci-app-hd-idle/po/sk/hd_idle.po b/applications/luci-app-hd-idle/po/sk/hd_idle.po
index 0ae82d8f93..2eb6dba6c9 100644
--- a/applications/luci-app-hd-idle/po/sk/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/sk/hd_idle.po
@@ -14,10 +14,10 @@ msgstr ""
msgid "Enable"
msgstr ""
-msgid "Idle-time"
+msgid "Idle time"
msgstr ""
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr ""
msgid "Settings"
@@ -26,11 +26,11 @@ msgstr ""
msgid "h"
msgstr ""
-msgid "hd-idle"
+msgid "HDD Idle"
msgstr ""
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
diff --git a/applications/luci-app-hd-idle/po/sv/hd_idle.po b/applications/luci-app-hd-idle/po/sv/hd_idle.po
index 1d63095c4f..fc877ddf12 100644
--- a/applications/luci-app-hd-idle/po/sv/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/sv/hd_idle.po
@@ -15,10 +15,10 @@ msgstr ""
msgid "Enable"
msgstr ""
-msgid "Idle-time"
+msgid "Idle time"
msgstr ""
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr ""
msgid "Settings"
@@ -27,11 +27,11 @@ msgstr ""
msgid "h"
msgstr ""
-msgid "hd-idle"
+msgid "HDD Idle"
msgstr ""
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
diff --git a/applications/luci-app-hd-idle/po/templates/hd_idle.pot b/applications/luci-app-hd-idle/po/templates/hd_idle.pot
index 56079ed2b5..57ed13538e 100644
--- a/applications/luci-app-hd-idle/po/templates/hd_idle.pot
+++ b/applications/luci-app-hd-idle/po/templates/hd_idle.pot
@@ -7,10 +7,10 @@ msgstr ""
msgid "Enable"
msgstr ""
-msgid "Idle-time"
+msgid "Idle time"
msgstr ""
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr ""
msgid "Settings"
@@ -19,11 +19,11 @@ msgstr ""
msgid "h"
msgstr ""
-msgid "hd-idle"
+msgid "HDD Idle"
msgstr ""
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
diff --git a/applications/luci-app-hd-idle/po/tr/hd_idle.po b/applications/luci-app-hd-idle/po/tr/hd_idle.po
index f9ace872aa..5598ac21dc 100644
--- a/applications/luci-app-hd-idle/po/tr/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/tr/hd_idle.po
@@ -21,10 +21,10 @@ msgstr "Disk"
msgid "Enable"
msgstr "Kullanıma Aç"
-msgid "Idle-time"
+msgid "Idle time"
msgstr "Bekleme Zamanı"
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr "bekleme zamanı birimi"
msgid "Settings"
@@ -34,11 +34,11 @@ msgstr "Ayarlar"
msgid "h"
msgstr "s"
-msgid "hd-idle"
+msgid "HDD Idle"
msgstr "Harddisk-Park"
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
"Harddisk-Park belirli bir zaman sonra diskleri beklemeye alan bir yardımcı "
diff --git a/applications/luci-app-hd-idle/po/uk/hd_idle.po b/applications/luci-app-hd-idle/po/uk/hd_idle.po
index 129fd7b4bc..9f1969877b 100644
--- a/applications/luci-app-hd-idle/po/uk/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/uk/hd_idle.po
@@ -22,10 +22,10 @@ msgstr "Диск"
msgid "Enable"
msgstr "Активувати"
-msgid "Idle-time"
+msgid "Idle time"
msgstr "Час простою"
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr ""
msgid "Settings"
@@ -36,11 +36,11 @@ msgid "h"
msgstr ""
#, fuzzy
-msgid "hd-idle"
+msgid "HDD Idle"
msgstr "HD-простій"
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
diff --git a/applications/luci-app-hd-idle/po/vi/hd_idle.po b/applications/luci-app-hd-idle/po/vi/hd_idle.po
index 03ee2c1baa..60d6b6fd56 100644
--- a/applications/luci-app-hd-idle/po/vi/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/vi/hd_idle.po
@@ -21,11 +21,11 @@ msgid "Enable"
msgstr "Kích hoạt debug"
#, fuzzy
-msgid "Idle-time"
+msgid "Idle time"
msgstr "Thời gian Idle"
#, fuzzy
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr "Đơn vị thời gian Idle"
msgid "Settings"
@@ -35,14 +35,14 @@ msgstr "Sắp đặt"
msgid "h"
msgstr ""
-msgid "hd-idle"
-msgstr "hd-idle"
+msgid "HDD Idle"
+msgstr "HDD Idle"
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr ""
-"hd-idle là một chương trình tiện ích để quay các đĩa ngoài sau một khoảng "
+"HDD Idle là một chương trình tiện ích để quay các đĩa ngoài sau một khoảng "
"thời gian idle."
# Minutes (not minimum)
diff --git a/applications/luci-app-hd-idle/po/zh-cn/hd_idle.po b/applications/luci-app-hd-idle/po/zh-cn/hd_idle.po
index 8bc14dcc8b..fbef6b6b11 100644
--- a/applications/luci-app-hd-idle/po/zh-cn/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/zh-cn/hd_idle.po
@@ -19,10 +19,10 @@ msgstr "硬盘"
msgid "Enable"
msgstr "开启"
-msgid "Idle-time"
+msgid "Idle time"
msgstr "空闲时间"
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr "空闲时间单位"
msgid "Settings"
@@ -32,11 +32,11 @@ msgstr "设置"
msgid "h"
msgstr "小时"
-msgid "hd-idle"
+msgid "HDD Idle"
msgstr "硬盘休眠"
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr "硬盘休眠是一个让硬盘在空闲一段时间后休眠的工具"
diff --git a/applications/luci-app-hd-idle/po/zh-tw/hd_idle.po b/applications/luci-app-hd-idle/po/zh-tw/hd_idle.po
index bd69785e37..a1c5fe1ae3 100644
--- a/applications/luci-app-hd-idle/po/zh-tw/hd_idle.po
+++ b/applications/luci-app-hd-idle/po/zh-tw/hd_idle.po
@@ -17,10 +17,10 @@ msgstr "磁碟"
msgid "Enable"
msgstr "啟用"
-msgid "Idle-time"
+msgid "Idle time"
msgstr "休眠時間"
-msgid "Idle-time unit"
+msgid "Idle time unit"
msgstr "休眠時間單位"
msgid "Settings"
@@ -29,11 +29,11 @@ msgstr "設定"
msgid "h"
msgstr "小時"
-msgid "hd-idle"
+msgid "HDD Idle"
msgstr "硬碟休眠"
msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
+"HDD Idle is a utility program for spinning-down external disks after a period "
"of idle time."
msgstr "硬碟休眠是控制當硬碟閒置一段時間後進入休眠模式的工具"
diff --git a/applications/luci-app-samba/luasrc/model/cbi/samba.lua b/applications/luci-app-samba/luasrc/model/cbi/samba.lua
index 721191a7ee..68a5b3a9bc 100644
--- a/applications/luci-app-samba/luasrc/model/cbi/samba.lua
+++ b/applications/luci-app-samba/luasrc/model/cbi/samba.lua
@@ -13,9 +13,10 @@ s:tab("template", translate("Edit Template"))
s:taboption("general", Value, "name", translate("Hostname"))
s:taboption("general", Value, "description", translate("Description"))
s:taboption("general", Value, "workgroup", translate("Workgroup"))
-s:taboption("general", Value, "homes", translate("Share home-directories"),
+h = s:taboption("general", Flag, "homes", translate("Share home-directories"),
translate("Allow system users to reach their home directories via " ..
"network shares"))
+h.rmempty = false
tmpl = s:taboption("template", Value, "_tmpl",
translate("Edit the template that is used for generating the samba configuration."),
@@ -53,6 +54,12 @@ ro.rmempty = false
ro.enabled = "yes"
ro.disabled = "no"
+br = s:option(Flag, "browseable", translate("Browseable"))
+br.rmempty = false
+br.default = "yes"
+br.enabled = "yes"
+br.disabled = "no"
+
go = s:option(Flag, "guest_ok", translate("Allow guests"))
go.rmempty = false
go.enabled = "yes"
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/processes.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
index d48441abd2..323c3c2308 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
@@ -12,17 +12,18 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
data = {
instances = {
ps_state = {
- "sleeping", "running", "paging", "blocked", "stopped", "zombies"
+ "sleeping", "running", "paging",
+ "blocked", "stopped", "zombies"
}
},
options = {
- ps_state_sleeping = { color = "0000ff" },
- ps_state_running = { color = "008000" },
- ps_state_paging = { color = "ffff00" },
- ps_state_blocked = { color = "ff5000" },
- ps_state_stopped = { color = "555555" },
- ps_state_zombies = { color = "ff0000" }
+ ps_state_sleeping = { color = "0000ff", title = "Sleeping" },
+ ps_state_running = { color = "008000", title = "Running" },
+ ps_state_paging = { color = "ffff00", title = "Paging" },
+ ps_state_blocked = { color = "ff5000", title = "Blocked" },
+ ps_state_stopped = { color = "555555", title = "Stopped" },
+ ps_state_zombies = { color = "ff0000", title = "Zombies" }
}
}
},
@@ -38,11 +39,13 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
options = {
ps_cputime__user = {
color = "0000ff",
+ title = "User",
overlay = true
},
ps_cputime__syst = {
color = "ff0000",
+ title = "System",
overlay = true
}
}
@@ -59,15 +62,15 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
},
options = {
- ps_count__threads = { color = "00ff00" },
- ps_count__processes = { color = "0000bb" }
+ ps_count__threads = { color = "00ff00", title = "Threads" },
+ ps_count__processes = { color = "0000bb", title = "Processes" }
}
}
},
{
title = "%H: Page faults in %pi",
- vlabel = "Pagefaults",
+ vlabel = "Page faults",
detail = true,
data = {
sources = {
@@ -75,14 +78,14 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
},
options = {
- ps_pagefaults__minflt = { color = "ff0000" },
- ps_pagefaults__majflt = { color = "ff5500" }
+ ps_pagefaults__minflt = { color = "0000ff", title = "Minor" },
+ ps_pagefaults__majflt = { color = "ff0000", title = "Major" }
}
}
},
{
- title = "%H: Virtual memory size of %pi",
+ title = "%H: Resident segment size (RSS) of %pi",
vlabel = "Bytes",
detail = true,
number_format = "%5.1lf%sB",
@@ -90,7 +93,21 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
types = { "ps_rss" },
options = {
- ps_rss = { color = "0000ff" }
+ ps_rss = { color = "0000ff", title = "Resident segment" }
+ }
+ }
+ },
+
+ {
+ title = "%H: Virtual memory size (VSZ) of %pi",
+ vlabel = "Bytes",
+ detail = true,
+ number_format = "%5.1lf%sB",
+ data = {
+ types = { "ps_vm" },
+
+ options = {
+ ps_vm = { color = "0000ff", title = "Virtual memory" }
}
}
}