From 5a7ee4322e7ba72e1c2f222397957974a3ff5e63 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Mon, 9 Feb 2026 19:54:23 +0200 Subject: [PATCH] luci-app-statistics: fix translation Fix one item forgoteen in the previous fix/merge commit. Signed-off-by: Hannu Nyman --- applications/luci-app-statistics/po/zh_Hant/statistics.po | 5 ----- 1 file changed, 5 deletions(-) diff --git a/applications/luci-app-statistics/po/zh_Hant/statistics.po b/applications/luci-app-statistics/po/zh_Hant/statistics.po index 0bbe87cb67..af1f20b9d2 100644 --- a/applications/luci-app-statistics/po/zh_Hant/statistics.po +++ b/applications/luci-app-statistics/po/zh_Hant/statistics.po @@ -1681,13 +1681,8 @@ msgid "" "read from /sys/class/thermal/*/temp ( '*' denotes the thermal device to be " "read, e.g. thermal_zone1 )" msgstr "" -<<<<<<< HEAD -"溫感外掛程式將會監測系統溫度。資料主要取自 /sys/class/thermal/*/temp ('*' 表" -"示溫感裝置的名稱,例如: thermal_zone1)" -======= "溫感外掛將會監測系統溫度。資料主要取自 /sys/class/thermal/*/temp ('*' 表示溫" "感裝置的名稱,例如: thermal_zone1)" ->>>>>>> weblate/master #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/unixsock.js:8 msgid ""