Merge remote-tracking branch 'weblate/master'

Fixed weblate conflicts. Again. Hopefully.

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

3 files changed, 26 insertions, 13 deletions

diff --git a/applications/luci-app-https-dns-proxy/po/fr/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/fr/https-dns-proxy.po
index bc26fbdaf9..a1cc738c9e 100644
--- a/applications/luci-app-https-dns-proxy/po/fr/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/fr/https-dns-proxy.po
@@ -1,8 +1,14 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2020-01-03 04:36+0000\n"
+"Last-Translator: Philippe Paté <asushen@gmail.com>\n"
+"Language-Team: French <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationshttps-dns-proxy/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.10\n"
 
 #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
@@ -62,7 +68,7 @@ msgstr ""
 
 #: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
-msgstr ""
+msgstr "Activer"
 
 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
@@ -131,11 +137,11 @@ msgstr ""
 
 #: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
-msgstr ""
+msgstr "Démarrer"
 
 #: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
-msgstr ""
+msgstr "Arrêter"
 
 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
diff --git a/applications/luci-app-https-dns-proxy/po/pt/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/pt/https-dns-proxy.po
index 11fb4ed16f..347238f56b 100644
--- a/applications/luci-app-https-dns-proxy/po/pt/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/pt/https-dns-proxy.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-05 17:07+0000\n"
+"PO-Revision-Date: 2020-01-02 16:07+0000\n"
 "Last-Translator: ssantos <ssantos@web.de>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/openwrt/"
-"luciapplicationshttps_dns_proxy/pt/>\n"
+"luciapplicationshttps-dns-proxy/pt/>\n"
 "Language: pt\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.10-dev\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
@@ -40,11 +40,11 @@ msgstr "DHCP e DNS"
 
 #: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
 msgid "DNS Over HTTPS Proxy"
-msgstr ""
+msgstr "Proxy de DNS Over HTTPS"
 
 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
 msgid "DNS Over HTTPS Proxy Settings"
-msgstr ""
+msgstr "Configurações de Proxy de DNS Over HTTPS"
 
 #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
@@ -64,7 +64,7 @@ msgstr "DoH"
 
 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
 msgid "EDNS client subnet"
-msgstr ""
+msgstr "Sub-rede de clientes EDNS"
 
 #: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
@@ -124,7 +124,7 @@ msgstr "Recarregar"
 
 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
 msgid "Resolver"
-msgstr ""
+msgstr "Resolvedor"
 
 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
@@ -149,7 +149,7 @@ msgstr "Parado"
 
 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
 msgid "Unknown Provider"
-msgstr ""
+msgstr "Provedor Desconhecido"
 
 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
@@ -173,7 +173,7 @@ msgstr "não está instalado ou não foi encontrado"
 
 #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
 msgid "rubyfish.cn"
-msgstr ""
+msgstr "rubyfish.cn"
 
 #~ msgid "DNS over HTTPS Proxy"
 #~ msgstr "Proxy de DNS sobre HTTPS"
diff --git a/applications/luci-app-https-dns-proxy/po/ro/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/ro/https-dns-proxy.po
index e567be48aa..fca3ca5cf7 100644
--- a/applications/luci-app-https-dns-proxy/po/ro/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/ro/https-dns-proxy.po
@@ -1,8 +1,15 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2020-01-03 04:36+0000\n"
+"Last-Translator: Cristian Ciobanu <cioby.service@gmail.com>\n"
+"Language-Team: Romanian <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationshttps-dns-proxy/ro/>\n"
 "Language: ro\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
@@ -86,7 +93,7 @@ msgstr ""
 
 #: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
-msgstr ""
+msgstr "Încărcare"
 
 #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"