Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

2 files changed, 11 insertions, 11 deletions

diff --git a/applications/luci-app-tinyproxy/po/hu/tinyproxy.po b/applications/luci-app-tinyproxy/po/hu/tinyproxy.po
index edfb341c4d..dff71d6a4e 100644
--- a/applications/luci-app-tinyproxy/po/hu/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/hu/tinyproxy.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2019-12-13 23:06+0000\n"
+"PO-Revision-Date: 2020-01-01 02:21+0000\n"
 "Last-Translator: Balázs Úr <balazs@urbalazs.hu>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationstinyproxy/hu/>\n"
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.10-dev\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
 msgid ""
@@ -113,7 +113,7 @@ msgstr ""
 
 #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
 msgid "General settings"
-msgstr ""
+msgstr "Általános beállítások"
 
 #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
 msgid "Group"
@@ -144,11 +144,11 @@ msgstr ""
 
 #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
 msgid "Listen address"
-msgstr ""
+msgstr "Cím figyelése"
 
 #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
 msgid "Listen port"
-msgstr ""
+msgstr "Port figyelése"
 
 #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
 msgid "Log file"
@@ -214,7 +214,7 @@ msgstr ""
 
 #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
 msgid "Policy"
-msgstr "Szabály"
+msgstr "Házirend"
 
 #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
 msgid "Privacy settings"
diff --git a/applications/luci-app-tinyproxy/po/zh-cn/tinyproxy.po b/applications/luci-app-tinyproxy/po/zh-cn/tinyproxy.po
index ea7955b8c0..e7526dc621 100644
--- a/applications/luci-app-tinyproxy/po/zh-cn/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/zh-cn/tinyproxy.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2019-12-04 12:06+0000\n"
-"Last-Translator: lissom <kkjoy2617@gmail.com>\n"
+"PO-Revision-Date: 2020-01-01 02:21+0000\n"
+"Last-Translator: Zheng Qian <sotux82@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "openwrt/luciapplicationstinyproxy/zh_Hans/>\n"
 "Language: zh-cn\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 3.10-dev\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
 msgid ""
@@ -121,7 +121,7 @@ msgstr "基本设置"
 
 #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
 msgid "Group"
-msgstr "运行组"
+msgstr "组"
 
 #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
 msgid "HTML template file to serve for stat host requests"
@@ -318,7 +318,7 @@ msgstr "使用系统日志服务"
 
 #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
 msgid "User"
-msgstr "运行用户"
+msgstr "用户"
 
 #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
 msgid "Via hostname"