Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

2 files changed, 14 insertions, 13 deletions

diff --git a/applications/luci-app-radicale/po/hu/radicale.po b/applications/luci-app-radicale/po/hu/radicale.po
index 177959740..31c427bd1 100644
--- a/applications/luci-app-radicale/po/hu/radicale.po
+++ b/applications/luci-app-radicale/po/hu/radicale.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-10 23:15+0000\n"
+"PO-Revision-Date: 2019-12-21 21:42+0000\n"
 "Last-Translator: Balázs Úr <balazs@urbalazs.hu>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsradicale/hu/>\n"
@@ -8,7 +8,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-radicale/luasrc/model/cbi/radicale.lua:268
 msgid ""
@@ -122,7 +122,7 @@ msgstr ""
 
 #: applications/luci-app-radicale/luasrc/model/cbi/radicale.lua:491
 msgid "Custom"
-msgstr ""
+msgstr "Egyéni"
 
 #: applications/luci-app-radicale/luasrc/model/cbi/radicale.lua:490
 msgid "Database"
@@ -236,7 +236,7 @@ msgstr ""
 #: applications/luci-app-radicale/luasrc/model/cbi/radicale.lua:571
 #: applications/luci-app-radicale/luasrc/model/cbi/radicale.lua:593
 msgid "Info"
-msgstr "Információk"
+msgstr "Információ"
 
 #: applications/luci-app-radicale/luasrc/model/cbi/radicale.lua:83
 msgid "Keep in mind to use the correct hashing algorithm !"
@@ -524,7 +524,7 @@ msgstr ""
 
 #: applications/luci-app-radicale/luasrc/model/cbi/radicale.lua:364
 msgid "custom"
-msgstr ""
+msgstr "egyéni"
 
 #: applications/luci-app-radicale/luasrc/model/cbi/radicale.lua:357
 #: applications/luci-app-radicale/luasrc/model/cbi/radicale.lua:400
diff --git a/applications/luci-app-radicale/po/pl/radicale.po b/applications/luci-app-radicale/po/pl/radicale.po
index f4d9f365e..54608d03e 100644
--- a/applications/luci-app-radicale/po/pl/radicale.po
+++ b/applications/luci-app-radicale/po/pl/radicale.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-11-17 11:06+0000\n"
-"Last-Translator: Marcin Net <marcin.net@linux.pl>\n"
+"PO-Revision-Date: 2019-12-23 14:21+0000\n"
+"Last-Translator: Mateusz Ż <zochowski.mateusz@outlook.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsradicale/pl/>\n"
 "Language: pl\n"
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 3.10-dev\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-radicale/luasrc/model/cbi/radicale.lua:268
 msgid ""
@@ -29,23 +29,24 @@ msgstr "AUTO"
 
 #: applications/luci-app-radicale/luasrc/model/cbi/radicale.lua:734
 msgid "Access-Control-Allow-Headers"
-msgstr ""
+msgstr "Access-Control-Allow-Headers"
 
 #: applications/luci-app-radicale/luasrc/model/cbi/radicale.lua:726
 msgid "Access-Control-Allow-Methods"
-msgstr ""
+msgstr "Access-Control-Allow-Methods"
 
 #: applications/luci-app-radicale/luasrc/model/cbi/radicale.lua:718
 msgid "Access-Control-Allow-Origin"
-msgstr ""
+msgstr "Access-Control-Allow-Origin"
 
 #: applications/luci-app-radicale/luasrc/model/cbi/radicale.lua:742
+#, fuzzy
 msgid "Access-Control-Expose-Headers"
-msgstr ""
+msgstr "Access-Control-Expose-Headers"
 
 #: applications/luci-app-radicale/luasrc/model/cbi/radicale.lua:706
 msgid "Additional HTTP headers"
-msgstr ""
+msgstr "Dodatkowe nagłówki HTTP"
 
 #: applications/luci-app-radicale/luasrc/model/cbi/radicale.lua:222
 msgid "Address:Port"