From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Fri, 1 May 2020 21:00:22 +0000 (+0300)
Subject: Merge branch 'master' into weblate-openwrt-luci
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=refs%2Fpull%2F3985%2Fhead;p=oweals%2Fluci.git

Merge branch 'master' into weblate-openwrt-luci
---

0302dd2174bc44ca1d8f8bde0450a8d4d9cd79c5
diff --cc applications/luci-app-simple-adblock/po/pl/simple-adblock.po
index a0e41dc9f,1734f44ba..afa11ae96
--- a/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"
  
@@@ -241,11 -245,8 +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 241a66a0b,c91251daf..bc4953866
--- a/applications/luci-app-sqm/po/pl/sqm.po
+++ b/applications/luci-app-sqm/po/pl/sqm.po
@@@ -62,12 -52,14 +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."