diff options
author | Hannu Nyman <hannu.nyman@iki.fi> | 2020-01-01 12:39:48 +0200 |
---|---|---|
committer | Hannu Nyman <hannu.nyman@iki.fi> | 2020-01-01 12:39:48 +0200 |
commit | 7c46a0703ce2ba79d08509fc64eb48c811fa88f6 (patch) | |
tree | fd5c701a556b12485e877cd5f67b80b1ef2c94fb /applications/luci-app-adblock/po/zh-cn/adblock.po | |
parent | 13f9718be05d159fb351d9ea4965490ffb61a69a (diff) | |
parent | 5ff23089a271f04a158fd39ed2ebf637060355ad (diff) |
Merge remote-tracking branch 'weblate/master'
Fixed the weblate conflicts. Hopefully...
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'applications/luci-app-adblock/po/zh-cn/adblock.po')
-rw-r--r-- | applications/luci-app-adblock/po/zh-cn/adblock.po | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po index 3c4f80eaa9..015092b34c 100644 --- a/applications/luci-app-adblock/po/zh-cn/adblock.po +++ b/applications/luci-app-adblock/po/zh-cn/adblock.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-10-18 07:55+0000\n" -"Last-Translator: Zheng Qian <sotux82@gmail.com>\n" +"PO-Revision-Date: 2019-12-19 19:40+0000\n" +"Last-Translator: 孤爺仔 <7312140@qq.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "openwrt/luciapplicationsadblock/zh_Hans/>\n" "Language: zh-cn\n" @@ -15,15 +15,13 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 3.9.1-dev\n" +"X-Generator: Weblate 3.10-dev\n" #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78 msgid "" "<b>Caution:</b> To prevent OOM exceptions on low memory devices with less " "than 64 MB free RAM, please only select a few of them!" -msgstr "" -"<b>注意:</b>为防止在小于 64M 空闲内存的设备上出现内存不足异常,请只选择其中" -"的几个!" +msgstr "<b>警告:</b>为防止可用内存少于64 MB的低内存设备出现OOM异常,请仅选择其中一些!" #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 @@ -33,7 +31,7 @@ msgstr "动作" #: applications/luci-app-adblock/luasrc/controller/adblock.lua:17 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10 msgid "Adblock" -msgstr "Adblock" +msgstr "阿達鎖" #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151 msgid "Adblock Status" |