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-simple-adblock/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-simple-adblock/po/zh_Hans')
| -rw-r--r-- | applications/luci-app-simple-adblock/po/zh_Hans/simple-adblock.po | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/applications/luci-app-simple-adblock/po/zh_Hans/simple-adblock.po b/applications/luci-app-simple-adblock/po/zh_Hans/simple-adblock.po index f18c6a95c6..86fcc5a12f 100644 --- a/applications/luci-app-simple-adblock/po/zh_Hans/simple-adblock.po +++ b/applications/luci-app-simple-adblock/po/zh_Hans/simple-adblock.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2020-09-07 22:59+0000\n" -"Last-Translator: PassWall-OpenWrt <chanwang@yandex.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/luciapplicationssimple-adblock/zh_Hans/>\n" "Language: zh_Hans\n" @@ -14,7 +14,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.3-dev\n" +"X-Generator: Weblate 4.4-dev\n" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219 msgid "%s Error: %s" @@ -30,7 +30,7 @@ msgstr "" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:131 msgid "%s is not installed or not found" -msgstr "" +msgstr "%s 未安装或找不到" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:297 msgid "Add IPv6 entries" @@ -119,7 +119,7 @@ msgstr "DNSMASQ 配置" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:286 msgid "DNSMASQ IP Set" -msgstr "DNSMASQ IP Set" +msgstr "DNSMASQ IP 组" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:288 msgid "DNSMASQ Servers File" @@ -292,7 +292,7 @@ msgstr "服务状态" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168 msgid "Service Status [%s %s]" -msgstr "" +msgstr "服务状态 [%s %s]" #: applications/luci-app-simple-adblock/luasrc/controller/simple-adblock.lua:4 #: applications/luci-app-simple-adblock/root/usr/share/luci/menu.d/luci-app-simple-adblock.json:3 |