diff options
author | Daniel Dickinson <cshoredaniel@users.noreply.github.com> | 2017-01-16 10:45:20 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-16 10:45:20 -0500 |
commit | f00a1ac2d98e6063e8bc40f3a6b158a063f008a7 (patch) | |
tree | cb8e2eda275aef6021cd4418c575355b8a5bb5cd | |
parent | be28190838b7390727285a28b80372ca7369202d (diff) | |
parent | bc8f58a2ef302f539852b69ac8fab1fd82446b7f (diff) |
Merge pull request #953 from musashino205/mount-fix-disp
luci-mod-admin-full: Fix display problems of mount
28 files changed, 87 insertions, 4 deletions
diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index 044339bc0f..ec573915b3 100644 --- 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:" diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po index 8c850a26e8..1438b11a46 100644 --- 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:" diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index e44d8bb234..3650235a6d 100644 --- 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):" diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po index a196f5b08e..d5dbff8907 100644 --- 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 λεπτού:" diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po index 125314d83b..4afe6165c5 100644 --- 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:" diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index da786b69d6..d466cf05e1 100644 --- 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:" diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po index cce8ee20ad..b8a68f05d9 100644 --- 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 :" diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po index 0b11005ca0..5ed0029b79 100644 --- 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 "עומס במשך דקה:" diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po index 2b85df15aa..d7c19278eb 100644 --- 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):" diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po index 2f5350dd78..199ffcb8f3 100644 --- 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:" diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index ed72412540..ac17c21f05 100644 --- 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分の負荷:" diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po index af52ee7334..c20444e10c 100644 --- 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 분 부하:" diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index 8ba922f87f..971afd4fe4 100644 --- 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 "" diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po index f9dad0a4e6..400876dbb3 100644 --- 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:" diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index a78584cbbc..e77a51548a 100644 --- 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.:" diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po index 0bcd6398d5..e33bcb20e7 100644 --- 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:" diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po index d8790dc1ff..86e9e1b9d5 100644 --- 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:" diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po index 4135c796a8..4763d63352 100644 --- 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" diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index e7045884be..8394b3c6fd 100644 --- 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 минуту:" diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po index f824029498..694608a2b0 100644 --- 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 "" diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po index 4e228082e2..fac272abe6 100644 --- 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:" diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot index 5a77cd2938..42eb60b25a 100644 --- 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 "" diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po index 7f0ea7e166..5a3d2f5121 100644 --- 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:" diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po index 29b1514e27..cb790520cf 100644 --- 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 хвилину:" diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po index 0cc83bf5a1..178bf30ac3 100644 --- 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 "" diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po index 7c00f8ff88..db02643dea 100644 --- 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分钟负载:" diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po index 15ffafc2b4..4acb190cce 100644 --- 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分鐘負載" diff --git 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 index f5751673fd..a85872afad 100644 --- 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 |