From: Hannu Nyman <redacted>
Date: Mon, 6 Jan 2020 09:39:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'weblate/master' into wlfix
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=55dcc8ab5c60334becd783e1c01f8de8ae3a9977;p=openwrt-luci.git

Merge remote-tracking branch 'weblate/master' into wlfix

Fixed one conflict.

Signed-off-by: Hannu Nyman <redacted>
---

55dcc8ab5c60334becd783e1c01f8de8ae3a9977
diff --cc applications/luci-app-mwan3/po/mr/mwan3.po
index 9540d1171b,b04d2808bd..0aafc25ad8
--- a/applications/luci-app-mwan3/po/mr/mwan3.po
+++ b/applications/luci-app-mwan3/po/mr/mwan3.po
@@@ -8,11 -8,11 +8,11 @@@ 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-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:177
 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:193
 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:213
 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:176
 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:192
 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:212
  msgid "%d hour"
  msgstr ""
  
@@@ -767,10 -767,10 +767,10 @@@ msgstr "
  #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:164
  #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:49
  msgid "Yes"
- msgstr ""
+ msgstr "होय"
  
 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:29
  #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:80
 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:29
  #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:73
  msgid "blackhole (drop)"
  msgstr ""
diff --cc modules/luci-base/po/mr/base.po
index 04a36a4eaf,8e6e93fe4f..73c0fe3bea
--- a/modules/luci-base/po/mr/base.po
+++ b/modules/luci-base/po/mr/base.po
@@@ -3374,10 -3373,10 +3374,10 @@@ msgstr "
  msgid "Next »"
  msgstr ""
  
 -#: modules/luci-base/htdocs/luci-static/resources/form.js:1757
 +#: modules/luci-base/htdocs/luci-static/resources/form.js:1762
  #: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
  msgid "No"
- msgstr ""
+ msgstr "नाही"
  
  #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:557
  msgid "No DHCP Server configured for this interface"
@@@ -5905,10 -5887,10 +5905,10 @@@ msgstr "
  msgid "Write system log to file"
  msgstr ""
  
 -#: modules/luci-base/htdocs/luci-static/resources/form.js:1757
 +#: modules/luci-base/htdocs/luci-static/resources/form.js:1762
  #: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
  msgid "Yes"
- msgstr ""
+ msgstr "होय"
  
  #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:171
  msgid ""
diff --cc modules/luci-base/po/pl/base.po
index 6bf80ed013,3235b2aec0..d4f7891d9d
--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@@@ -4746,9 -4741,9 +4746,9 @@@ msgstr "Skanuj
  #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
  #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
  msgid "Scheduled Tasks"
- msgstr "Zaplanowane Zadania"
+ msgstr "Zaplanowane zadania"
  
 -#: modules/luci-base/htdocs/luci-static/resources/ui.js:2472
 +#: modules/luci-base/htdocs/luci-static/resources/ui.js:2536
  msgid "Section added"
  msgstr "Dodano sekcję"
  
@@@ -4858,9 -4853,9 +4858,9 @@@ msgstr "Krótki Wstęp
  #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:431
  #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:18
  msgid "Show current backup file list"
- msgstr "Pokaż aktualną listę plików do backupu"
+ msgstr "Pokaż aktualną listę plików kopii zapasowej"
  
 -#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:99
 +#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:262
  msgid "Show empty chains"
  msgstr "Pokaż puste łańcuchy"