Merge remote-tracking branch 'weblate/master'

Fix conflicts.

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

diff --cc applications/luci-app-simple-adblock/po/pl/simple-adblock.po
index 1734f44baf1a63ab4ed0974830af9e1bb61b55c1,a0e41dc9fab565ca6d4fe028a54662b6f2ade801..afa11ae9644ee19999ce5c20f02330310e4c9924
--- 1/applications/luci-app-simple-adblock/po/pl/simple-adblock.po
--- 2/applications/luci-app-simple-adblock/po/pl/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/pl/simple-adblock.po
@@@ -9,9 -9,9 +9,9 @@@ 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 4.0.2-dev\n"
+ "X-Generator: Weblate 4.1-dev\n"
  
 -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
  msgid "%s Error: %s"
  msgstr "%s Błąd: %s"
  
@@@ -19,11 -19,11 +19,11 @@@
  msgid "%s Error: %s %s"
  msgstr "%s Błąd: %s %s"
  
 -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:146
 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:142
  msgid "%s is blocking %s domains (with %s)."
- msgstr ""
+ msgstr "%s zablokowane %s domen (z %s)."
  
 -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:80
 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
  msgid "%s is not installed or not found"
  msgstr "%s nie jest zainstalowany lub nie został znaleziony"
  
@@@ -62,11 -62,11 +62,11 @@@ msgstr "Domeny na czarnej liście
  msgid "Blacklisted Hosts URLs"
  msgstr "Adresy URL hostów na czarnej liście"
  
 -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:136
 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:132
  msgid "Cache file containing %s domains found."
- msgstr ""
+ msgstr "Znaleziono plik pamięci podręcznej zawierający %s domen."
  
 -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:156
 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
  msgid "Collected Errors"
  msgstr "Zebrane błędy"
  
@@@ -245,8 -241,11 +245,11 @@@ msgid "
  "Pick the DNS resolution option to create the adblock list for, see the <a "
  "href=\"%s#dns-resolution-option\" target=\"_blank\">README</a> for details."
  msgstr ""
+ "Wybierz opcję rozpoznawania DNS, aby utworzyć listę adblock, zobacz <a href="
+ "\"%s#dns-resolution-option\" target=\"_blank\"> README</a>, aby uzyskać "
+ "szczegółowe informacje."
  
 -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:198
 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:194
  msgid ""
  "Pick the LED not already used in <a href=\"%s\">System LED Configuration</a>."
  msgstr ""

diff --cc applications/luci-app-sqm/po/pl/sqm.po
index c91251daf54e51969038d1c23feb5c45d29f42ef,241a66a0bb53bae6ba920a5b72615d06b92d4617..bc4953866e559e5b783f979c5c26962e7285e222
--- 1/applications/luci-app-sqm/po/pl/sqm.po
--- 2/applications/luci-app-sqm/po/pl/sqm.po
+++ b/applications/luci-app-sqm/po/pl/sqm.po
@@@ -52,14 -62,12 +62,16 @@@ msgstr "
  msgid ""
  "Explicit congestion notification (ECN) status on outbound packets (egress)."
  msgstr ""
+ "Status jawnego powiadomienia o przeciążeniu (ECN) na pakietach wychodzących "
+ "(egress)."
  
 +#: applications/luci-app-sqm/root/usr/share/rpcd/acl.d/luci-app-sqm.json:3
 +msgid "Grant UCI access for luci-app-sqm"
 +msgstr ""
 +
  #: applications/luci-app-sqm/luasrc/model/cbi/sqm.lua:183
  msgid "Hard limit on egress queues; leave empty for default."
- msgstr ""
+ msgstr "Twardy limit kolejek egress; pozostawić puste dla domyślnego."
  
  #: applications/luci-app-sqm/luasrc/model/cbi/sqm.lua:176
  msgid "Hard limit on ingress queues; leave empty for default."

diff --cc applications/luci-app-vpn-policy-routing/po/pl/vpn-policy-routing.po
Simple merge

diff --cc applications/luci-app-wol/po/de/wol.po
index 299db2ab4c430bb2ceb7c6d76a544e9a6adb16cf,cec96ae5925752bb7c51704ce762e29c73261487..0d321be2e5725e191dd89f2f7546be71e7275dcd
--- 1/applications/luci-app-wol/po/de/wol.po
--- 2/applications/luci-app-wol/po/de/wol.po
+++ b/applications/luci-app-wol/po/de/wol.po
@@@ -23,12 -23,8 +23,12 @@@ msgstr "
  
  #: applications/luci-app-wol/htdocs/luci-static/resources/view/wol.js:118
  msgid "Dismiss"
- msgstr "Schließen"
+ msgstr "Verwerfen"
  
 +#: applications/luci-app-wol/root/usr/share/rpcd/acl.d/luci-app-wol.json:3
 +msgid "Grant access to wake-on-lan executables"
 +msgstr ""
 +
  #: applications/luci-app-wol/htdocs/luci-static/resources/view/wol.js:64
  msgid "Host to wake up"
  msgstr "Anzuschaltender Rechner"

diff --cc applications/luci-app-yggdrasil/po/de/yggdrasil.po
index 2171b1f86bfc7ff2c349179e26ae52667e7e87e2,9304feace8772eecc0b58f91e0bfc761b715f150..a69d72962699d296a8513144ac7c79b7160213f5
--- 1/applications/luci-app-yggdrasil/po/de/yggdrasil.po
--- 2/applications/luci-app-yggdrasil/po/de/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/de/yggdrasil.po
@@@ -73,10 -86,10 +86,10 @@@ msgstr "Aktiviere NodeInfo-Privacy
  
  #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
  msgid "Enable session firewall"
- msgstr ""
+ msgstr "Aktiviere Session-Firewall"
  
  #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
 -#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:40
 +#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:41
  msgid "Encryption keys"
  msgstr ""
  
@@@ -92,13 -105,9 +105,13 @@@ msgstr "
  msgid "General settings"
  msgstr "Allgemeine Einstellungen"
  
 +#: applications/luci-app-yggdrasil/root/usr/share/rpcd/acl.d/luci-app-yggdrasil.json:3
 +msgid "Grant access to LuCI app yggdrasil"
 +msgstr ""
 +
  #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
  msgid "IPv4 local subnet"
- msgstr ""
+ msgstr "IPv4 lokales Subnetz"
  
  #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
  msgid "IPv4 remote subnet"