From ffe481ca49ea55f39e58ac276cff06b0844a43b2 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Tue, 7 Apr 2020 04:20:38 +0800 Subject: [PATCH] Revert " luci-app-diskman: sync with upstream source" This reverts commit fe56a42e8c926ceff4d62c22cd82bb27052b612b. --- package/ctcgfw/luci-app-diskman/Makefile | 4 ++-- package/ctcgfw/luci-app-diskman/po/zh-cn/diskman.po | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ctcgfw/luci-app-diskman/Makefile b/package/ctcgfw/luci-app-diskman/Makefile index 23d4688688..472e31a2ec 100644 --- a/package/ctcgfw/luci-app-diskman/Makefile +++ b/package/ctcgfw/luci-app-diskman/Makefile @@ -27,11 +27,9 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_mdadm bool "Include mdadm" default n config PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_raid456 - depends on PACKAGE_$(PKG_NAME)_INCLUDE_mdadm bool "Include kmod-md-raid456" default n config PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_linear - depends on PACKAGE_$(PKG_NAME)_INCLUDE_mdadm bool "Include kmod-md-linear" default n endef @@ -46,7 +44,9 @@ define Package/$(PKG_NAME) +PACKAGE_$(PKG_NAME)_INCLUDE_btrfs_progs:btrfs-progs \ +PACKAGE_$(PKG_NAME)_INCLUDE_lsblk:lsblk \ +PACKAGE_$(PKG_NAME)_INCLUDE_mdadm:mdadm \ + +PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_raid456:kmod-md-mod \ +PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_raid456:kmod-md-raid456 \ + +PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_linears:kmod-md-mod \ +PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_linears:kmod-md-linear endef diff --git a/package/ctcgfw/luci-app-diskman/po/zh-cn/diskman.po b/package/ctcgfw/luci-app-diskman/po/zh-cn/diskman.po index 7c1d78a2c6..3369fbb9b4 100644 --- a/package/ctcgfw/luci-app-diskman/po/zh-cn/diskman.po +++ b/package/ctcgfw/luci-app-diskman/po/zh-cn/diskman.po @@ -71,7 +71,7 @@ msgid "Free Space" msgstr "空闲空间" msgid "Model" -msgstr "型号" +msgstr "主机型号" msgid "Size" msgstr "容量"