Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

4 files changed, 16 insertions, 16 deletions

diff --git a/applications/luci-app-squid/po/cs/squid.po b/applications/luci-app-squid/po/cs/squid.po
index 449b9e3153..34d72b4aed 100644
--- a/applications/luci-app-squid/po/cs/squid.po
+++ b/applications/luci-app-squid/po/cs/squid.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-02 16:11+0000\n"
+"PO-Revision-Date: 2019-12-16 23:26+0000\n"
 "Last-Translator: Jiri Tersel <jiri.tersel@seznam.cz>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationssquid/cs/>\n"
@@ -16,7 +16,7 @@ msgstr "Pokročilé nastavení"
 
 #: applications/luci-app-squid/luasrc/model/cbi/squid.lua:38
 msgid "Coredump files directory"
-msgstr ""
+msgstr "Adresář se soubory výpisu jádra (coredump)"
 
 #: applications/luci-app-squid/luasrc/model/cbi/squid.lua:28
 msgid "General Settings"
@@ -29,8 +29,8 @@ msgstr "Port"
 #: applications/luci-app-squid/luasrc/controller/squid.lua:20
 #: applications/luci-app-squid/luasrc/model/cbi/squid.lua:21
 msgid "Squid"
-msgstr ""
+msgstr "Squid"
 
 #: applications/luci-app-squid/luasrc/model/cbi/squid.lua:34
 msgid "Visible Hostname"
-msgstr ""
+msgstr "Viditelný název hostitele"
diff --git a/applications/luci-app-squid/po/fr/squid.po b/applications/luci-app-squid/po/fr/squid.po
index 1613f2a664..286f206a8a 100644
--- a/applications/luci-app-squid/po/fr/squid.po
+++ b/applications/luci-app-squid/po/fr/squid.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-10-25 18:00+0000\n"
-"Last-Translator: Nathan <bonnemainsnathan@gmail.com>\n"
+"PO-Revision-Date: 2019-12-26 18:23+0000\n"
+"Last-Translator: reyur <remicaruyer@gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationssquid/fr/>\n"
 "Language: fr\n"
 "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.9.1-dev\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-squid/luasrc/model/cbi/squid.lua:42
 msgid "Advanced Settings"
@@ -24,7 +24,7 @@ msgstr "Paramètres généraux"
 
 #: applications/luci-app-squid/luasrc/model/cbi/squid.lua:30
 msgid "Port"
-msgstr ""
+msgstr "Port"
 
 #: applications/luci-app-squid/luasrc/controller/squid.lua:20
 #: applications/luci-app-squid/luasrc/model/cbi/squid.lua:21
diff --git a/applications/luci-app-squid/po/mr/squid.po b/applications/luci-app-squid/po/mr/squid.po
index 9a050aa737..be4b096cd1 100644
--- a/applications/luci-app-squid/po/mr/squid.po
+++ b/applications/luci-app-squid/po/mr/squid.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-15 21:23+0000\n"
+"PO-Revision-Date: 2019-12-28 03:17+0000\n"
 "Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n"
 "Language-Team: Marathi <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationssquid/mr/>\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-squid/luasrc/model/cbi/squid.lua:42
 msgid "Advanced Settings"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: applications/luci-app-squid/luasrc/model/cbi/squid.lua:28
 msgid "General Settings"
-msgstr ""
+msgstr "सामान्य सेटिंग्ज"
 
 #: applications/luci-app-squid/luasrc/model/cbi/squid.lua:30
 msgid "Port"
diff --git a/applications/luci-app-squid/po/ru/squid.po b/applications/luci-app-squid/po/ru/squid.po
index 6e3689e090..b050cb85e9 100644
--- a/applications/luci-app-squid/po/ru/squid.po
+++ b/applications/luci-app-squid/po/ru/squid.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-10-19 18:26+0000\n"
-"Last-Translator: Anton Kikin <a.a.kikin@gmail.com>\n"
+"PO-Revision-Date: 2019-12-26 18:23+0000\n"
+"Last-Translator: Alex Ky <esthomolupus@gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationssquid/ru/>\n"
 "Language: ru\n"
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
 "4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 3.9.1-dev\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-squid/luasrc/model/cbi/squid.lua:42
 msgid "Advanced Settings"
@@ -21,11 +21,11 @@ msgstr ""
 
 #: applications/luci-app-squid/luasrc/model/cbi/squid.lua:28
 msgid "General Settings"
-msgstr ""
+msgstr "Основные настройки"
 
 #: applications/luci-app-squid/luasrc/model/cbi/squid.lua:30
 msgid "Port"
-msgstr ""
+msgstr "Порт"
 
 #: applications/luci-app-squid/luasrc/controller/squid.lua:20
 #: applications/luci-app-squid/luasrc/model/cbi/squid.lua:21