diff --git a/package/lean/autocore/files/arm/index.htm b/package/lean/autocore/files/arm/index.htm index 074c3177b..b2eb1fccd 100644 --- a/package/lean/autocore/files/arm/index.htm +++ b/package/lean/autocore/files/arm/index.htm @@ -738,7 +738,7 @@ <%:Local Time%>- <%:Uptime%>- <%:Load Average%>- - <%:CPU usage (%)%>- + <%:CPU usage%>- diff --git a/package/lean/autocore/files/arm/sbin/usage b/package/lean/autocore/files/arm/sbin/usage index d6c483e95..6a170393f 100755 --- a/package/lean/autocore/files/arm/sbin/usage +++ b/package/lean/autocore/files/arm/sbin/usage @@ -8,7 +8,7 @@ cpu_usage="$(top -n1 | awk '/^CPU/ {printf("%d%", 100 - $8)}')" npu_usage="$(grep '%' "$NSS_PATH"/cpu_load_ubi | awk -F ' ' '{print $2}')" if [ -d "$NSS_PATH" ]; then - echo -n "CPU: ${cpu_usage}%, NPU: ${npu_usage}" + echo -n "CPU: ${cpu_usage}, NPU: ${npu_usage}" else - echo -n "CPU: ${cpu_usage}%" + echo -n "CPU: ${cpu_usage}" fi diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile index 5a411dc8b..acd35b1bb 100644 --- a/package/lean/default-settings/Makefile +++ b/package/lean/default-settings/Makefile @@ -7,8 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=default-settings -PKG_VERSION:=3 -PKG_RELEASE:=12 +PKG_RELEASE:=$(COMMITCOUNT) PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE diff --git a/package/lean/default-settings/files/zzz-default-settings b/package/lean/default-settings/files/zzz-default-settings index cb44bf041..61b4c5e2c 100755 --- a/package/lean/default-settings/files/zzz-default-settings +++ b/package/lean/default-settings/files/zzz-default-settings @@ -51,7 +51,7 @@ sed -i '/option disabled/d' /etc/config/wireless sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release -echo "DISTRIB_REVISION='R24.5.1'" >> /etc/openwrt_release +echo "DISTRIB_REVISION='R24.6.6'" >> /etc/openwrt_release sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release echo "DISTRIB_DESCRIPTION='OpenWrt '" >> /etc/openwrt_release diff --git a/package/lean/default-settings/po/zh-cn/default.po b/package/lean/default-settings/po/zh-cn/default.po index f6c36823c..9ba70ec28 100644 --- a/package/lean/default-settings/po/zh-cn/default.po +++ b/package/lean/default-settings/po/zh-cn/default.po @@ -1,3 +1,6 @@ +msgid "Swap" +msgstr "虚拟内存" + msgid "Processor" msgstr "处理器" @@ -13,6 +16,9 @@ msgstr "CPU 信息" msgid "CPU Model" msgstr "处理器型号" +msgid "CPU usage" +msgstr "CPU 使用率" + msgid "CPU frequency" msgstr "CPU 频率" @@ -49,9 +55,6 @@ msgstr "划分给 ZRam 分区的内存大小(MB),推荐留空由系统自 msgid "Number of parallel threads used for compression" msgstr "用于压缩内存数据的CPU并发线程数" -msgid "Swap" -msgstr "虚拟内存" - msgid "Force 40MHz mode" msgstr "强制 40MHz 频宽"