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-radicale2/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-radicale2/po/zh_Hans')
| -rw-r--r-- | applications/luci-app-radicale2/po/zh_Hans/radicale2.po | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/applications/luci-app-radicale2/po/zh_Hans/radicale2.po b/applications/luci-app-radicale2/po/zh_Hans/radicale2.po index 89594fe823..3ab191d2d0 100644 --- a/applications/luci-app-radicale2/po/zh_Hans/radicale2.po +++ b/applications/luci-app-radicale2/po/zh_Hans/radicale2.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: luci-app-radicale 2\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/luciapplicationsradicale2/zh_Hans/>\n" "Language: zh_Hans\n" @@ -10,7 +10,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-radicale2/luasrc/model/cbi/radicale2/auth.lua:8 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/logging.lua:4 @@ -181,9 +181,8 @@ msgid "HTTP(S) Listeners (address:port)" msgstr "HTTP(S) 监听（地址:端口）" #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:128 -#, fuzzy msgid "Header: X-Access-Control-Allow-Origin" -msgstr "Header: X-Access-Control-Allow-Origin" +msgstr "标头: X-Access-Control-Allow-Origin" #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:124 msgid "Headers" @@ -356,7 +355,7 @@ msgstr "" #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:57 msgid "Retry Delay" -msgstr "" +msgstr "重试延迟" #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:162 msgid "Rights" @@ -479,7 +478,7 @@ msgstr "" #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:35 msgid "crypt" -msgstr "" +msgstr "加密" #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:16 msgid "htpasswd file (manually populated)" |