From 1adbf378429577fb505aee8d0f21637c8d318132 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Thu, 16 Jan 2020 14:27:43 +0800 Subject: [PATCH] luci-app-diskman: sync with upstream source --- .../luasrc/controller/diskman.lua | 0 .../luasrc/model/cbi/diskman/disks.lua | 8 ++-- .../luasrc/model/cbi/diskman/partition.lua | 4 +- .../luci-app-diskman/luasrc/model/diskman.lua | 0 .../luasrc/view/diskman/cbi/inlinebutton.htm | 0 .../luasrc/view/diskman/cbi/xsimpleform.htm | 0 .../luasrc/view/diskman/disk_info_tab.htm | 0 .../luasrc/view/diskman/smart_detail.htm | 0 .../ctcgfw/luci-app-diskman/po/pl/diskman.po | 42 +++++++++---------- 9 files changed, 27 insertions(+), 27 deletions(-) mode change 100755 => 100644 package/ctcgfw/luci-app-diskman/luasrc/controller/diskman.lua mode change 100755 => 100644 package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/disks.lua mode change 100755 => 100644 package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/partition.lua mode change 100755 => 100644 package/ctcgfw/luci-app-diskman/luasrc/model/diskman.lua mode change 100755 => 100644 package/ctcgfw/luci-app-diskman/luasrc/view/diskman/cbi/inlinebutton.htm mode change 100755 => 100644 package/ctcgfw/luci-app-diskman/luasrc/view/diskman/cbi/xsimpleform.htm mode change 100755 => 100644 package/ctcgfw/luci-app-diskman/luasrc/view/diskman/disk_info_tab.htm mode change 100755 => 100644 package/ctcgfw/luci-app-diskman/luasrc/view/diskman/smart_detail.htm diff --git a/package/ctcgfw/luci-app-diskman/luasrc/controller/diskman.lua b/package/ctcgfw/luci-app-diskman/luasrc/controller/diskman.lua old mode 100755 new mode 100644 diff --git a/package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/disks.lua b/package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/disks.lua old mode 100755 new mode 100644 index 002938e1a9..00f2cc85f4 --- a/package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/disks.lua +++ b/package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/disks.lua @@ -29,7 +29,7 @@ rescan_button.forcewrite = true rescan_button.write = function(self, section, value) luci.util.exec("echo '- - -' | tee /sys/class/scsi_host/host*/scan > /dev/null") if dm.command.mdadm then - luci.util.exec(d.command.mdadm .. " --assemble --scan") + luci.util.exec(dm.command.mdadm .. " --assemble --scan") end luci.http.redirect(luci.dispatcher.build_url("admin/system/diskman")) end @@ -224,7 +224,7 @@ local btn_umount = table_mp:option(Button, "_mount", translate("Mount")) btn_umount.forcewrite = true btn_umount.render = function(self, section, scope) if mount_point[section].device == 0 then - self.inputtitle = " "..translate("Mount").." " + self.inputtitle = translate("Mount") btn_umount.inputstyle = "add" else self.inputtitle = translate("Umount") @@ -234,10 +234,10 @@ btn_umount.render = function(self, section, scope) end btn_umount.write = function(self, section, value) local res - if value == " Mount " then + if value == translate("Mount") then luci.util.exec("mkdir -p ".. _mount_point.mount_point) res = luci.util.exec("mount ".. _mount_point.device .. (_mount_point.fs and (" -t ".. _mount_point.fs )or "") .. (_mount_point.mount_options and (" -o " .. _mount_point.mount_options) or " ").._mount_point.mount_point .. " 2>&1") - else + elseif value == translate("Umount") then res = luci.util.exec("umount "..mount_point[section].mount_point .. " 2>&1") end if res:match("^mount:") then diff --git a/package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/partition.lua b/package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/partition.lua old mode 100755 new mode 100644 index d4cbb9e5c4..9de1a98dc3 --- a/package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/partition.lua +++ b/package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/partition.lua @@ -251,7 +251,7 @@ if not disk_info.p_table:match("Raid") then end btn_action.write = function(self, section, value) -- luci.util.perror(value) - if value == "New" then + if value == translate("New") then local start_sec = disk_info.partitions[section]._sec_start and tonumber(disk_info.partitions[section]._sec_start) or tonumber(disk_info.partitions[section].sec_start) local end_sec = disk_info.partitions[section]._sec_end @@ -311,7 +311,7 @@ if not disk_info.p_table:match("Raid") then else luci.http.redirect(luci.dispatcher.build_url("admin/system/diskman/partition/" .. dev)) end - elseif value == "Remove" then + elseif value == translate("Remove") then -- remove partition local number = tostring(disk_info.partitions[section].number) if (not number) or (number == "") then diff --git a/package/ctcgfw/luci-app-diskman/luasrc/model/diskman.lua b/package/ctcgfw/luci-app-diskman/luasrc/model/diskman.lua old mode 100755 new mode 100644 diff --git a/package/ctcgfw/luci-app-diskman/luasrc/view/diskman/cbi/inlinebutton.htm b/package/ctcgfw/luci-app-diskman/luasrc/view/diskman/cbi/inlinebutton.htm old mode 100755 new mode 100644 diff --git a/package/ctcgfw/luci-app-diskman/luasrc/view/diskman/cbi/xsimpleform.htm b/package/ctcgfw/luci-app-diskman/luasrc/view/diskman/cbi/xsimpleform.htm old mode 100755 new mode 100644 diff --git a/package/ctcgfw/luci-app-diskman/luasrc/view/diskman/disk_info_tab.htm b/package/ctcgfw/luci-app-diskman/luasrc/view/diskman/disk_info_tab.htm old mode 100755 new mode 100644 diff --git a/package/ctcgfw/luci-app-diskman/luasrc/view/diskman/smart_detail.htm b/package/ctcgfw/luci-app-diskman/luasrc/view/diskman/smart_detail.htm old mode 100755 new mode 100644 diff --git a/package/ctcgfw/luci-app-diskman/po/pl/diskman.po b/package/ctcgfw/luci-app-diskman/po/pl/diskman.po index 19d5716be5..f4cab09d5d 100644 --- a/package/ctcgfw/luci-app-diskman/po/pl/diskman.po +++ b/package/ctcgfw/luci-app-diskman/po/pl/diskman.po @@ -2,13 +2,13 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8\n" msgid "DiskMan" -msgstr "Menadżer Dysków" +msgstr "Menadżer dysków" msgid "Manage Disks over LuCI." -msgstr "Zarządzaj dyskami z poziomu LuCI." +msgstr "Zarządzaj dyskami przez LuCI" msgid "Rescan Disks" -msgstr "Reskan Dysków" +msgstr "Skanuj dyski" msgid "Disks" msgstr "Dyski" @@ -17,13 +17,13 @@ msgid "Path" msgstr "Ścieżka" msgid "Serial Number" -msgstr "Nr Seryjny" +msgstr "Numer seryjny" msgid "Temp" msgstr "Temperatura" msgid "Partition Table" -msgstr "Tabela Partycji" +msgstr "Tablica partycji" msgid "SATA Version" msgstr "Wersja SATA" @@ -32,10 +32,10 @@ msgid "Health" msgstr "Kondycja" msgid "File System" -msgstr "System Plików" +msgstr "System plików" msgid "Mount Options" -msgstr "Opcje Montowania" +msgstr "Opcje montowania" msgid "Mount" msgstr "Montuj" @@ -47,25 +47,25 @@ msgid "Eject" msgstr "Wysuń" msgid "New" -msgstr "Nowy(a)" +msgstr "Nowa" msgid "Remove" -msgstr "Usuń" +msgstr "Wysuń" msgid "Format" -msgstr "Format" +msgstr "Formatuj" msgid "Start Sector" -msgstr "Sektor Początku" +msgstr "Sektor początkowy" msgid "End Sector" -msgstr "Sektor Końca" +msgstr "Sektor końcowy" msgid "Useage" msgstr "Użycie" msgid "Model" -msgstr "Model" +msgstr "Model urządzenia" msgid "Size" msgstr "Rozmiar" @@ -74,10 +74,10 @@ msgid "Status" msgstr "Status" msgid "Mount Point" -msgstr "Punkt Montowania" +msgstr "Punkt montowania" msgid "Sector Size" -msgstr "Rozmiar Sektora" +msgstr "Rozmiar sektora" msgid "Rotation Rate" msgstr "Obroty" @@ -110,19 +110,19 @@ msgid "Create Raid" msgstr "Utwórz RAID" msgid "Partition Management" -msgstr "Menadżer Partycji" +msgstr "Menadżer partycji" msgid "Partition Disk over LuCI." -msgstr "Zarządzaj Partycjami z poziomu LuCI." +msgstr "Zarządzaj partycjami przez LuCI" msgid "Device Info" -msgstr "Informacja o Urządzeniu" +msgstr "Informacja o urządzeniu" msgid "Disk Man" -msgstr "Menadżer Dysków" +msgstr "Menadżer dysków" msgid "Partitions Info" -msgstr "Informacja o Partycjach" +msgstr "Informacja o partycjach" msgid "Default 2048 sector alignment, support +size{b,k,m,g,t} in End Sector" -msgstr "Domyślnie 2048 ustawienie sektora, obsługiwane +rozmiar{b,k,m,g,t} w Sektorze Końcowym" +msgstr "Domyślne obsługiwane ustawienie sektora początkowego: 2048 +rozmiar w sektorze końcowym {b,k,m,g,t}"