Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

2 files changed, 38 insertions, 12 deletions

diff --git a/applications/luci-app-bcp38/po/cs/bcp38.po b/applications/luci-app-bcp38/po/cs/bcp38.po
index 1024f38b9b..b1f98ef252 100644
--- a/applications/luci-app-bcp38/po/cs/bcp38.po
+++ b/applications/luci-app-bcp38/po/cs/bcp38.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-09 20:05+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/"
 "luciapplicationsbcp38/cs/>\n"
@@ -12,31 +12,35 @@ msgstr ""
 
 #: applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua:61
 msgid "Allowed IP ranges"
-msgstr ""
+msgstr "Povolené IP rozsahy"
 
 #: applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua:34
+#, fuzzy
 msgid ""
 "Attempt to automatically detect if the upstream IP will be blocked by the "
 "configuration, and add an exception if it will. If this does not work "
 "correctly, you can add exceptions manually below."
 msgstr ""
+"Zkusit automaticky zjistit, zda je upstream IP adresa blokována konfigurací. "
+"Pokud ano, bude přidána výjimka. Jestliže tato možnost nefunguje správně, "
+"můžete přidat níže výjimky ručně."
 
 #: applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua:33
 msgid "Auto-detect upstream IP"
-msgstr ""
+msgstr "Autodetekovat upstream IP adresu"
 
 #: applications/luci-app-bcp38/luasrc/controller/bcp38.lua:6
 #: applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua:20
 msgid "BCP38"
-msgstr ""
+msgstr "BCP38"
 
 #: applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua:27
 msgid "BCP38 config"
-msgstr ""
+msgstr "Konfigurace BCP38"
 
 #: applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua:56
 msgid "Blocked IP ranges"
-msgstr ""
+msgstr "Blokované IP rozsahy"
 
 #: applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua:30
 msgid "Enable"
@@ -50,17 +54,27 @@ msgstr "Název rozhraní"
 msgid ""
 "Interface to apply the blocking to (should be the upstream WAN interface)."
 msgstr ""
+"Rozhraní, na kterém bude použito blokování (mělo by se jednat o rozhraní "
+"WAN)."
 
 #: applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua:61
 msgid ""
 "Takes precedence over blocked ranges. Use to whitelist your upstream network "
 "if you're behind a double NAT and the auto-detection doesn't work."
 msgstr ""
+"Má přednost před blokovanými rozsahy. Používá se pro whitelist vaší "
+"nadřazené sítě, pokud jste za dvojitým NAT překladem adres a automatické "
+"rozpoznání nefunguje."
 
 #: applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua:21
+#, fuzzy
 msgid ""
 "This function blocks packets with private address destinations from going "
 "out onto the internet as per <a href=\"http://tools.ietf.org/html/"
 "bcp38\">BCP 38</a>. For IPv6, only source specific default routes are "
 "installed, so no BCP38 firewall routes are needed."
 msgstr ""
+"Tato funkce blokuje odchozí pakety se soukromými cílovými adresami do "
+"internetu podle <a href=\"http://tools.ietf.org/html/bcp38\">BCP 38</a>. V "
+"případě protokolu IPv6 jsou instalovány pouze zdrojově specifické výchozí "
+"trasy, takže nejsou třeba BCP38 trasy firewallu."
diff --git a/applications/luci-app-bcp38/po/mr/bcp38.po b/applications/luci-app-bcp38/po/mr/bcp38.po
index cb12861460..ab53b84b32 100644
--- a/applications/luci-app-bcp38/po/mr/bcp38.po
+++ b/applications/luci-app-bcp38/po/mr/bcp38.po
@@ -1,12 +1,18 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2019-12-16 23:26+0000\n"
+"Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n"
+"Language-Team: Marathi <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsbcp38/mr/>\n"
 "Language: mr\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"
 
 #: applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua:61
 msgid "Allowed IP ranges"
-msgstr ""
+msgstr "परवानगी दिलेली आयपी श्रेण्या"
 
 #: applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua:34
 msgid ""
@@ -22,34 +28,40 @@ msgstr ""
 #: applications/luci-app-bcp38/luasrc/controller/bcp38.lua:6
 #: applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua:20
 msgid "BCP38"
-msgstr ""
+msgstr "बीसीपी 38"
 
 #: applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua:27
 msgid "BCP38 config"
-msgstr ""
+msgstr "बीसीपी 38 कॉन्फिगरेशन"
 
 #: applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua:56
 msgid "Blocked IP ranges"
-msgstr ""
+msgstr "अवरोधित IP श्रेणी"
 
 #: applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua:30
 msgid "Enable"
-msgstr ""
+msgstr "सक्षम करा"
 
 #: applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua:39
 msgid "Interface name"
-msgstr ""
+msgstr "इंटरफेस नाव"
 
 #: applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua:39
 msgid ""
 "Interface to apply the blocking to (should be the upstream WAN interface)."
 msgstr ""
+"यावर अवरोधित करणे लागू करण्यासाठी इंटरफेस (अपस्ट्रीम डब्ल्यूएएन इंटरफेस "
+"असावा)."
 
 #: applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua:61
+#, fuzzy
 msgid ""
 "Takes precedence over blocked ranges. Use to whitelist your upstream network "
 "if you're behind a double NAT and the auto-detection doesn't work."
 msgstr ""
+"अवरोधित श्रेण्यांपेक्षा अग्रक्रम घेतो. आपण दुहेरी NAT मागे असल्यास आणि "
+"स्वयंचलितपणे शोध कार्य करत नसल्यास आपल्या अपस्ट्रीम नेटवर्कची श्वेतसूची "
+"करण्यासाठी वापरा."
 
 #: applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua:21
 msgid ""