From: Hannu Nyman <redacted>
Date: Mon, 9 Feb 2026 17:48:11 +0000 (+0200)
Subject: treewide: fix conflicts with remote-tracking branch 'weblate/master'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=dd8b1d8331bb579adf4588291d6b5a288663c6b4;p=openwrt-luci.git

treewide: fix conflicts with remote-tracking branch 'weblate/master'

Fix conflicts. Merge weblate translations.

Signed-off-by: Hannu Nyman <redacted>
---

dd8b1d8331bb579adf4588291d6b5a288663c6b4
diff --cc applications/luci-app-statistics/po/zh_Hant/statistics.po
index 46063067a7,af1f20b9d2..0bbe87cb67
--- a/applications/luci-app-statistics/po/zh_Hant/statistics.po
+++ b/applications/luci-app-statistics/po/zh_Hant/statistics.po
@@@ -1683,8 -1681,8 +1681,13 @@@ 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 ""