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

luci-mod-admin-full: Fix display problems of mount
2017-01-16 10:45:20 -05:00 · 2017-01-16 10:45:20 -05:00 · f00a1ac2d9
commit f00a1ac2d9
parent be28190838 bc8f58a2ef
28 changed files with 87 additions and 4 deletions
--- a/modules/luci-base/po/ca/base.po
+++ b/modules/luci-base/po/ca/base.po
@ -43,6 +43,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "Càrrega d'1 minut:"

--- a/modules/luci-base/po/cs/base.po
+++ b/modules/luci-base/po/cs/base.po
@ -41,6 +41,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "Zatížení za 1 minutu:"

--- a/modules/luci-base/po/de/base.po
+++ b/modules/luci-base/po/de/base.po
@ -43,6 +43,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "Systemlast (1 Minute):"

--- a/modules/luci-base/po/el/base.po
+++ b/modules/luci-base/po/el/base.po
@ -43,6 +43,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "Φορτίο 1 λεπτού:"

--- a/modules/luci-base/po/en/base.po
+++ b/modules/luci-base/po/en/base.po
@ -43,6 +43,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "1 Minute Load:"

--- a/modules/luci-base/po/es/base.po
+++ b/modules/luci-base/po/es/base.po
@ -43,6 +43,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "Carga a 1 minuto:"

--- a/modules/luci-base/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
@ -43,6 +43,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "Charge sur 1 minute :"

--- a/modules/luci-base/po/he/base.po
+++ b/modules/luci-base/po/he/base.po
@ -41,6 +41,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "עומס במשך דקה:"

--- a/modules/luci-base/po/hu/base.po
+++ b/modules/luci-base/po/hu/base.po
@ -41,6 +41,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "Terhelés (utolsó 1 perc):"

--- a/modules/luci-base/po/it/base.po
+++ b/modules/luci-base/po/it/base.po
@ -43,6 +43,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "Carico in 1 minuto:"

--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@ -43,6 +43,9 @@ msgstr "-- デバイスで設定 --"
 msgid "-- match by label --"
 msgstr "-- ラベルで設定 --"

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "過去1分の負荷:"

--- a/modules/luci-base/po/ko/base.po
+++ b/modules/luci-base/po/ko/base.po
@ -43,6 +43,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "1 분 부하:"

--- a/modules/luci-base/po/ms/base.po
+++ b/modules/luci-base/po/ms/base.po
@ -43,6 +43,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr ""

--- a/modules/luci-base/po/no/base.po
+++ b/modules/luci-base/po/no/base.po
@ -38,6 +38,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "1 minutts belastning:"

--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@ -44,6 +44,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "Obciążenie 1 min.:"

--- a/modules/luci-base/po/pt-br/base.po
+++ b/modules/luci-base/po/pt-br/base.po
@ -43,6 +43,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "Carga 1 Minuto:"

--- a/modules/luci-base/po/pt/base.po
+++ b/modules/luci-base/po/pt/base.po
@ -43,6 +43,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "Carga de 1 Minuto:"

--- a/modules/luci-base/po/ro/base.po
+++ b/modules/luci-base/po/ro/base.po
@ -42,6 +42,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "Incarcarea in ultimul minut"

--- a/modules/luci-base/po/ru/base.po
+++ b/modules/luci-base/po/ru/base.po
@ -45,6 +45,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "Загрузка за 1 минуту:"

--- a/modules/luci-base/po/sk/base.po
+++ b/modules/luci-base/po/sk/base.po
@ -38,6 +38,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr ""

--- a/modules/luci-base/po/sv/base.po
+++ b/modules/luci-base/po/sv/base.po
@ -41,6 +41,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "Belastning senaste minuten:"

--- a/modules/luci-base/po/templates/base.pot
+++ b/modules/luci-base/po/templates/base.pot
@ -31,6 +31,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr ""

--- a/modules/luci-base/po/tr/base.po
+++ b/modules/luci-base/po/tr/base.po
@ -41,6 +41,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "1 Dakikalık Yük:"

--- a/modules/luci-base/po/uk/base.po
+++ b/modules/luci-base/po/uk/base.po
@ -42,6 +42,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

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

--- a/modules/luci-base/po/vi/base.po
+++ b/modules/luci-base/po/vi/base.po
@ -43,6 +43,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr ""

--- a/modules/luci-base/po/zh-cn/base.po
+++ b/modules/luci-base/po/zh-cn/base.po
@ -43,6 +43,9 @@ msgstr "-- 根据设备匹配 --"
 msgid "-- match by label --"
 msgstr "-- 根据标签匹配 --"

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "1分钟负载:"

--- a/modules/luci-base/po/zh-tw/base.po
+++ b/modules/luci-base/po/zh-tw/base.po
@ -41,6 +41,9 @@ msgstr ""
 msgid "-- match by label --"
 msgstr ""

+msgid "-- match by uuid --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "1分鐘負載"

--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua
@ -56,6 +56,8 @@ mount:taboption("general", Flag, "enabled", translate("Enable this mount")).rmem
 o = mount:taboption("general", Value, "uuid", translate("UUID"),
 	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
 	if d.uuid and d.size then
 		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

-o:value("", translate("-- match by 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"))

+o:value("", translate("-- match by label --"))
+
 o:depends("uuid", "")

 for i, d in ipairs(devices) do
@ -80,12 +82,12 @@ for i, d in ipairs(devices) do
 	end
 end

-o:value("", translate("-- match by 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>)"))

+o:value("", translate("-- match by device --"))
+
 o:depends({ uuid = "", label = "" })

 for i, d in ipairs(devices) do