Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #953 from musashino205/mount-fix-disp

Browse source 
luci-mod-admin-full: Fix display problems of mount
This commit is contained in:
Daniel Dickinson 2017-01-16 10:45:20 -05:00 committed by GitHub
commit f00a1ac2d9
28 changed files with 87 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/luci-base/po/ca/base.po
View file

@ -43,6 +43,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "Càrrega d'1 minut:" msgstr "Càrrega d'1 minut:"

3
modules/luci-base/po/cs/base.po
View file

@ -41,6 +41,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "Zatížení za 1 minutu:" msgstr "Zatížení za 1 minutu:"

3
modules/luci-base/po/de/base.po
View file

@ -43,6 +43,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "Systemlast (1 Minute):" msgstr "Systemlast (1 Minute):"

3
modules/luci-base/po/el/base.po
View file

@ -43,6 +43,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "Φορτίο 1 λεπτού:" msgstr "Φορτίο 1 λεπτού:"

3
modules/luci-base/po/en/base.po
View file

@ -43,6 +43,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "1 Minute Load:" msgstr "1 Minute Load:"

3
modules/luci-base/po/es/base.po
View file

@ -43,6 +43,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "Carga a 1 minuto:" msgstr "Carga a 1 minuto:"

3
modules/luci-base/po/fr/base.po
View file

@ -43,6 +43,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "Charge sur 1 minute :" msgstr "Charge sur 1 minute :"

3
modules/luci-base/po/he/base.po
View file

@ -41,6 +41,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "עומס במשך דקה:" msgstr "עומס במשך דקה:"

3
modules/luci-base/po/hu/base.po
View file

@ -41,6 +41,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "Terhelés (utolsó 1 perc):" msgstr "Terhelés (utolsó 1 perc):"

3
modules/luci-base/po/it/base.po
View file

@ -43,6 +43,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "Carico in 1 minuto:" msgstr "Carico in 1 minuto:"

3
modules/luci-base/po/ja/base.po
View file

@ -43,6 +43,9 @@ msgstr "-- デバイスで設定 --"
msgid "-- match by label --" msgid "-- match by label --"
msgstr "-- ラベルで設定 --" msgstr "-- ラベルで設定 --"
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "過去1分の負荷:" msgstr "過去1分の負荷:"

3
modules/luci-base/po/ko/base.po
View file

@ -43,6 +43,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "1 분 부하:" msgstr "1 분 부하:"

3
modules/luci-base/po/ms/base.po
View file

@ -43,6 +43,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "" msgstr ""

3
modules/luci-base/po/no/base.po
View file

@ -38,6 +38,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "1 minutts belastning:" msgstr "1 minutts belastning:"

3
modules/luci-base/po/pl/base.po
View file

@ -44,6 +44,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "Obciążenie 1 min.:" msgstr "Obciążenie 1 min.:"

3
modules/luci-base/po/pt-br/base.po
View file

@ -43,6 +43,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "Carga 1 Minuto:" msgstr "Carga 1 Minuto:"

3
modules/luci-base/po/pt/base.po
View file

@ -43,6 +43,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "Carga de 1 Minuto:" msgstr "Carga de 1 Minuto:"

3
modules/luci-base/po/ro/base.po
View file

@ -42,6 +42,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "Incarcarea in ultimul minut" msgstr "Incarcarea in ultimul minut"

3
modules/luci-base/po/ru/base.po
View file

@ -45,6 +45,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "Загрузка за 1 минуту:" msgstr "Загрузка за 1 минуту:"

3
modules/luci-base/po/sk/base.po
View file

@ -38,6 +38,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "" msgstr ""

3
modules/luci-base/po/sv/base.po
View file

@ -41,6 +41,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "Belastning senaste minuten:" msgstr "Belastning senaste minuten:"

3
modules/luci-base/po/templates/base.pot
View file

@ -31,6 +31,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "" msgstr ""

3
modules/luci-base/po/tr/base.po
View file

@ -41,6 +41,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "1 Dakikalık Yük:" msgstr "1 Dakikalık Yük:"

3
modules/luci-base/po/uk/base.po
View file

@ -42,6 +42,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "Навантаження за 1 хвилину:" msgstr "Навантаження за 1 хвилину:"

3
modules/luci-base/po/vi/base.po
View file

@ -43,6 +43,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "" msgstr ""

3
modules/luci-base/po/zh-cn/base.po
View file

@ -43,6 +43,9 @@ msgstr "-- 根据设备匹配 --"
msgid "-- match by label --" msgid "-- match by label --"
msgstr "-- 根据标签匹配 --" msgstr "-- 根据标签匹配 --"
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "1分钟负载:" msgstr "1分钟负载:"

3
modules/luci-base/po/zh-tw/base.po
View file

@ -41,6 +41,9 @@ msgstr ""
msgid "-- match by label --" msgid "-- match by label --"
msgstr "" msgstr ""
msgid "-- match by uuid --"
msgstr ""
msgid "1 Minute Load:" msgid "1 Minute Load:"
msgstr "1分鐘負載" msgstr "1分鐘負載"

10
modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua
View file

@ -56,6 +56,8 @@ mount:taboption("general", Flag, "enabled", translate("Enable this mount")).rmem
o = mount:taboption("general", Value, "uuid", translate("UUID"), o = mount:taboption("general", Value, "uuid", translate("UUID"),
translate("If specified, mount the device by its UUID instead of a fixed device node")) translate("If specified, mount the device by its UUID instead of a fixed device node"))
o:value("", translate("-- match by uuid --"))
for i, d in ipairs(devices) do for i, d in ipairs(devices) do
if d.uuid and d.size then if d.uuid and d.size then
o:value(d.uuid, "%s (%s, %d MB)" %{ d.uuid, d.dev, d.size }) o:value(d.uuid, "%s (%s, %d MB)" %{ d.uuid, d.dev, d.size })
@ -64,12 +66,12 @@ for i, d in ipairs(devices) do
end end
end end
o:value("", translate("-- match by label --"))
o = mount:taboption("general", Value, "label", translate("Label"), o = mount:taboption("general", Value, "label", translate("Label"),
translate("If specified, mount the device by the partition label instead of a fixed device node")) translate("If specified, mount the device by the partition label instead of a fixed device node"))
o:value("", translate("-- match by label --"))
o:depends("uuid", "") o:depends("uuid", "")
for i, d in ipairs(devices) do for i, d in ipairs(devices) do
@ -80,12 +82,12 @@ for i, d in ipairs(devices) do
end end
end end
o:value("", translate("-- match by device --"))
o = mount:taboption("general", Value, "device", translate("Device"), o = mount:taboption("general", Value, "device", translate("Device"),
translate("The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)")) translate("The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"))
o:value("", translate("-- match by device --"))
o:depends({ uuid = "", label = "" }) o:depends({ uuid = "", label = "" })
for i, d in ipairs(devices) do for i, d in ipairs(devices) do