diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2020-11-22 17:59:52 +0200 |
|---|---|---|
| committer | Hannu Nyman <hannu.nyman@iki.fi> | 2020-11-22 17:59:52 +0200 |
| commit | 87d64ee27978ad008743e69e2e1c198e89a598ff (patch) | |
| tree | 5579fb973a11bc80430f2821928b2178d82a0b04 /applications/luci-app-statistics/po/zh_Hans | |
| parent | 0f3f464adc9e24646638aa5d71edb995a352dec5 (diff) | |
| parent | 06dcfeffa03b2cfa5a2b739f603d98b67a5786bd (diff) | |
treewide: fix conflicts with weblate
Merge remote-tracking branch 'weblate/master' after fixing
modules/luci-base/po/ja/base.po
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'applications/luci-app-statistics/po/zh_Hans')
| -rw-r--r-- | applications/luci-app-statistics/po/zh_Hans/statistics.po | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/applications/luci-app-statistics/po/zh_Hans/statistics.po b/applications/luci-app-statistics/po/zh_Hans/statistics.po index fdcc50181e..a4d1c580a0 100644 --- a/applications/luci-app-statistics/po/zh_Hans/statistics.po +++ b/applications/luci-app-statistics/po/zh_Hans/statistics.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-06-10 03:40+0200\n" -"PO-Revision-Date: 2020-07-31 18:41+0000\n" -"Last-Translator: Zkdc <Zkdc2345@qq.com>\n" +"PO-Revision-Date: 2020-11-22 15:35+0000\n" +"Last-Translator: Eric <spice2wolf@gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "openwrt/luciapplicationsstatistics/zh_Hans/>\n" "Language: zh_Hans\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.2-dev\n" +"X-Generator: Weblate 4.4-dev\n" #: applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/apcups.js:7 #: applications/luci-app-statistics/root/usr/share/luci/statistics/plugins/apcups.json:2 @@ -1029,7 +1029,7 @@ msgstr "收集指定拓扑相关信息。" #: applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/splash_leases.js:10 #: applications/luci-app-statistics/root/usr/share/luci/statistics/plugins/splash_leases.json:2 msgid "Splash Leases" -msgstr "Splash Leases" +msgstr "" #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/splash_leases.js:6 msgid "Splash Leases Plugin Configuration" @@ -1293,8 +1293,8 @@ msgid "" "read from /sys/class/thermal/*/temp ( '*' denotes the thermal device to be " "read, e.g. thermal_zone1 )" msgstr "" -"温感插件将会监控系统温度。数据主要取自 /sys/class/thermal/*/temp ('*' 表示温" -"感设备的名字，比如 thermal_zone1) 。" +"温感插件将会监控系统温度。数据主要读取自 /sys/class/thermal/*/temp ('*' 表示温感设备的名字，比如 " +"thermal_zone1) 。" #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/unixsock.js:8 msgid "" |