summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHannu Nyman2026-02-09 17:54:23 +0000
committerHannu Nyman2026-02-09 17:54:23 +0000
commit5a7ee4322e7ba72e1c2f222397957974a3ff5e63 (patch)
tree05e6753b98fc320bd480d3a8dcdaaa45de5b38c1
parentdd8b1d8331bb579adf4588291d6b5a288663c6b4 (diff)
downloadluci-5a7ee4322e7ba72e1c2f222397957974a3ff5e63.tar.gz
luci-app-statistics: fix translation
Fix one item forgoteen in the previous fix/merge commit. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
-rw-r--r--applications/luci-app-statistics/po/zh_Hant/statistics.po5
1 files changed, 0 insertions, 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 ""