Merge pull request #5095 from jow-/dhcpv6-rework

luci-mod-network: interfaces: restructure DHCPv6 and IPv6 RA options

diff --git a/applications/luci-app-adblock/po/bg/adblock.po b/applications/luci-app-adblock/po/bg/adblock.po
index 082cdef2991b6ed35f26673204e6b576721891de..47e9f31da8142494b01806acb23d6c4cee15f108 100644 (file)
--- a/applications/luci-app-adblock/po/bg/adblock.po
+++ b/applications/luci-app-adblock/po/bg/adblock.po
@@ -1,8 +1,14 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2021-06-01 13:26+0000\n"
+"Last-Translator: Kalin Iliev <kalin.t.iliev@gmail.com>\n"
+"Language-Team: Bulgarian <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsadblock/bg/>\n"
 "Language: bg\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 4.7-dev\n"
 
 #: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js:258
 msgid "Action"
@@ -150,7 +156,7 @@ msgstr ""
 #: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js:163
 #: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:72
 msgid "Cancel"
-msgstr ""
+msgstr "Отмени"
 
 #: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:567
 #: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:582

diff --git a/applications/luci-app-advanced-reboot/po/bg/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/bg/advanced-reboot.po
index 2dc89dd0593337dde2bec16b10618eab99296f99..6137217ce47ed8533d8b1b0dfeff12acd2bcfafa 100644 (file)
--- a/applications/luci-app-advanced-reboot/po/bg/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/bg/advanced-reboot.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2021-01-26 11:29+0000\n"
-"Last-Translator: Iskren Mihaylov <iskren.mihaylov91@gmail.com>\n"
+"PO-Revision-Date: 2021-06-01 13:26+0000\n"
+"Last-Translator: Kalin Iliev <kalin.t.iliev@gmail.com>\n"
 "Language-Team: Bulgarian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsadvanced-reboot/bg/>\n"
 "Language: bg\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 4.5-dev\n"
+"X-Generator: Weblate 4.7-dev\n"
 
 #: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:188
 #: applications/luci-app-advanced-reboot/root/usr/share/luci/menu.d/luci-app-advanced-reboot.json:3
@@ -18,7 +18,7 @@ msgstr ""
 #: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:53
 #: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:136
 msgid "Cancel"
-msgstr ""
+msgstr "Отмени"
 
 #: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:163
 msgid "Compressed"
@@ -68,7 +68,7 @@ msgstr ""
 #: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:57
 #: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:140
 msgid "Proceed"
-msgstr ""
+msgstr "Продължи"
 
 #: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:207
 msgid "Reboot"

diff --git a/applications/luci-app-attendedsysupgrade/po/bg/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/bg/attendedsysupgrade.po
index 3737505efd894650703d86a38aa9b88a11a7d49e..5785a47d1f3361652f0270d8ce4201808b445953 100644 (file)
--- a/applications/luci-app-attendedsysupgrade/po/bg/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/bg/attendedsysupgrade.po
@@ -1,8 +1,14 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2021-06-01 13:26+0000\n"
+"Last-Translator: Kalin Iliev <kalin.t.iliev@gmail.com>\n"
+"Language-Team: Bulgarian <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsattendedsysupgrade/bg/>\n"
 "Language: bg\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 4.7-dev\n"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:16
 msgid "Address"
@@ -37,7 +43,7 @@ msgstr ""
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:155
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:295
 msgid "Cancel"
-msgstr ""
+msgstr "Отмени"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:19
 msgid "Client"

diff --git a/applications/luci-app-banip/po/bg/banip.po b/applications/luci-app-banip/po/bg/banip.po
index aa0e3d785c6ddbe23ce910f3114b93abaa951e45..c99b6f07451d59272b1efb2fd7e3a9271f9ebd16 100644 (file)
--- a/applications/luci-app-banip/po/bg/banip.po
+++ b/applications/luci-app-banip/po/bg/banip.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2020-05-22 12:40+0000\n"
-"Last-Translator: Stefan M <sm@voip-office.eu>\n"
+"PO-Revision-Date: 2021-06-01 13:26+0000\n"
+"Last-Translator: Kalin Iliev <kalin.t.iliev@gmail.com>\n"
 "Language-Team: Bulgarian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsbanip/bg/>\n"
 "Language: bg\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 4.1-dev\n"
+"X-Generator: Weblate 4.7-dev\n"
 
 #: applications/luci-app-banip/htdocs/luci-static/resources/view/banip/overview.js:705
 #: applications/luci-app-banip/htdocs/luci-static/resources/view/banip/overview.js:713
@@ -155,7 +155,7 @@ msgstr ""
 #: applications/luci-app-banip/htdocs/luci-static/resources/view/banip/ipsetreport.js:73
 #: applications/luci-app-banip/htdocs/luci-static/resources/view/banip/overview.js:73
 msgid "Cancel"
-msgstr ""
+msgstr "Отмени"
 
 #: applications/luci-app-banip/htdocs/luci-static/resources/view/banip/overview.js:139
 msgid ""

diff --git a/applications/luci-app-commands/po/bg/commands.po b/applications/luci-app-commands/po/bg/commands.po
index 123111c6d67b7626c73e839000ea68741c5e8d3b..85d7da92a2cedb1c1c800d5dee2c69aaac7d4fe3 100644 (file)
--- a/applications/luci-app-commands/po/bg/commands.po
+++ b/applications/luci-app-commands/po/bg/commands.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2020-05-22 12:40+0000\n"
-"Last-Translator: Stefan M <sm@voip-office.eu>\n"
+"PO-Revision-Date: 2021-06-01 13:26+0000\n"
+"Last-Translator: Kalin Iliev <kalin.t.iliev@gmail.com>\n"
 "Language-Team: Bulgarian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationscommands/bg/>\n"
 "Language: bg\n"
@@ -11,11 +11,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 4.1-dev\n"
+"X-Generator: Weblate 4.7-dev\n"
 
 #: applications/luci-app-commands/luasrc/model/cbi/commands.lua:16
 msgid "A short textual description of the configured command"
-msgstr ""
+msgstr "Кратко текстово описание на конфигурираната команда"
 
 #: applications/luci-app-commands/luasrc/model/cbi/commands.lua:25
 msgid ""

diff --git a/applications/luci-app-ddns/po/bg/ddns.po b/applications/luci-app-ddns/po/bg/ddns.po
index 2c64bbfd717269fbf9bd9a63a5fda4976644c1b3..7f12288adba5907ef1658491edfa185c162bc113 100644 (file)
--- a/applications/luci-app-ddns/po/bg/ddns.po
+++ b/applications/luci-app-ddns/po/bg/ddns.po
@@ -1,8 +1,14 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2021-06-01 13:26+0000\n"
+"Last-Translator: Kalin Iliev <kalin.t.iliev@gmail.com>\n"
+"Language-Team: Bulgarian <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsddns/bg/>\n"
 "Language: bg\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 4.7-dev\n"
 
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:430
 msgid "\"../\" not allowed in path for Security Reason."
@@ -63,7 +69,7 @@ msgstr ""
 
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:537
 msgid "Cancel"
-msgstr ""
+msgstr "Отмени"
 
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:962
 msgid "Check Interval"

diff --git a/applications/luci-app-dockerman/po/bg/dockerman.po b/applications/luci-app-dockerman/po/bg/dockerman.po
index c1eef4c93a8423f309a1de06f84107ec6de1fbfe..8468ad92795993513933547afd8efeb135ea16ee 100644 (file)
--- a/applications/luci-app-dockerman/po/bg/dockerman.po
+++ b/applications/luci-app-dockerman/po/bg/dockerman.po
@@ -1,8 +1,14 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2021-06-01 13:26+0000\n"
+"Last-Translator: Kalin Iliev <kalin.t.iliev@gmail.com>\n"
+"Language-Team: Bulgarian <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsdockerman/bg/>\n"
 "Language: bg\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 4.7-dev\n"
 
 #: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:604
 msgid "A list of kernel capabilities to add to the container"
@@ -120,7 +126,7 @@ msgstr ""
 
 #: applications/luci-app-dockerman/luasrc/view/dockerman/newcontainer_resolve.htm:91
 msgid "Cancel"
-msgstr ""
+msgstr "Отмени"
 
 #: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/configuration.lua:65
 msgid "Client connection"

diff --git a/applications/luci-app-opkg/po/bg/opkg.po b/applications/luci-app-opkg/po/bg/opkg.po
index 689dd0fcfb79609621db170579b69e02dc38ff4b..405a76343273a0aa541d1024630e39b312e90a1d 100644 (file)
--- a/applications/luci-app-opkg/po/bg/opkg.po
+++ b/applications/luci-app-opkg/po/bg/opkg.po
@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-06-10 03:40+0200\n"
-"PO-Revision-Date: 2021-02-18 13:59+0000\n"
-"Last-Translator: Iskren Mihaylov <iskren.mihaylov91@gmail.com>\n"
+"PO-Revision-Date: 2021-06-01 13:26+0000\n"
+"Last-Translator: Kalin Iliev <kalin.t.iliev@gmail.com>\n"
 "Language-Team: Bulgarian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsopkg/bg/>\n"
 "Language: bg\n"
@@ -12,7 +12,7 @@ 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 4.5\n"
+"X-Generator: Weblate 4.7-dev\n"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:1044
 msgid "Actions"
@@ -40,7 +40,7 @@ msgstr ""
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:856
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:949
 msgid "Cancel"
-msgstr ""
+msgstr "Отмени"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:1031
 msgid "Clear"

diff --git a/applications/luci-app-shadowsocks-libev/po/bg/shadowsocks-libev.po b/applications/luci-app-shadowsocks-libev/po/bg/shadowsocks-libev.po
index c6547bd21ac9991c410b42d095a01029b48efc5c..f9f33b3fa558c8be58953a410ffdd8ace5ed6512 100644 (file)
--- a/applications/luci-app-shadowsocks-libev/po/bg/shadowsocks-libev.po
+++ b/applications/luci-app-shadowsocks-libev/po/bg/shadowsocks-libev.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2020-01-14 15:23+0000\n"
-"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
+"PO-Revision-Date: 2021-06-01 13:26+0000\n"
+"Last-Translator: Kalin Iliev <kalin.t.iliev@gmail.com>\n"
 "Language-Team: Bulgarian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsshadowsocks-libev/bg/>\n"
 "Language: bg\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.11-dev\n"
+"X-Generator: Weblate 4.7-dev\n"
 
 #: applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js:45
 msgid "-- instance type --"
@@ -32,7 +32,7 @@ msgstr ""
 
 #: applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/servers.js:28
 msgid "Cancel"
-msgstr ""
+msgstr "Отмени"
 
 #: applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/rules.js:80
 msgid ""

diff --git a/applications/luci-app-vnstat2/po/bg/vnstat2.po b/applications/luci-app-vnstat2/po/bg/vnstat2.po
index 83bbac40aa1d9bc5b68be13a9be101dd06e56cdb..ceb1ff2cbfa064ee05a8a7068970483f6f814bd1 100644 (file)
--- a/applications/luci-app-vnstat2/po/bg/vnstat2.po
+++ b/applications/luci-app-vnstat2/po/bg/vnstat2.po
@@ -1,8 +1,14 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2021-06-01 13:26+0000\n"
+"Last-Translator: Kalin Iliev <kalin.t.iliev@gmail.com>\n"
+"Language-Team: Bulgarian <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsvnstat2/bg/>\n"
 "Language: bg\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 4.7-dev\n"
 
 #: applications/luci-app-vnstat2/htdocs/luci-static/resources/view/vnstat2/graphs.js:57
 msgid "5 Minute"
@@ -10,7 +16,7 @@ msgstr ""
 
 #: applications/luci-app-vnstat2/htdocs/luci-static/resources/view/vnstat2/config.js:21
 msgid "Cancel"
-msgstr ""
+msgstr "Отмени"
 
 #: applications/luci-app-vnstat2/root/usr/share/luci/menu.d/luci-app-vnstat2.json:27
 msgid "Configuration"

diff --git a/libs/rpcd-mod-luci/src/luci.c b/libs/rpcd-mod-luci/src/luci.c
index 030dabb82371a2e76171dd07f0343e8c6488602d..258d2ec86b58a5fd23a74a5425b2c716f2034754 100644 (file)
--- a/libs/rpcd-mod-luci/src/luci.c
+++ b/libs/rpcd-mod-luci/src/luci.c
@@ -879,6 +879,9 @@ static bool rpc_luci_get_iwinfo(struct blob_buf *buf, const char *devname,
        if (!iw->hwmodelist(devname, &nret)) {
                a = blobmsg_open_array(buf, "hwmodes");
 
+               if (nret & IWINFO_80211_AX)
+                       blobmsg_add_string(buf, NULL, "ax");
+
                if (nret & IWINFO_80211_AC)
                        blobmsg_add_string(buf, NULL, "ac");
 
@@ -921,6 +924,18 @@ static bool rpc_luci_get_iwinfo(struct blob_buf *buf, const char *devname,
                if (nret & IWINFO_HTMODE_VHT160)
                        blobmsg_add_string(buf, NULL, "VHT160");
 
+               if (nret & IWINFO_HTMODE_HE20)
+                       blobmsg_add_string(buf, NULL, "HE20");
+
+               if (nret & IWINFO_HTMODE_HE40)
+                       blobmsg_add_string(buf, NULL, "HE40");
+
+               if (nret & IWINFO_HTMODE_HE80)
+                       blobmsg_add_string(buf, NULL, "HE80");
+
+               if (nret & IWINFO_HTMODE_HE160)
+                       blobmsg_add_string(buf, NULL, "HE160");
+
                blobmsg_close_array(buf, a);
        }
 

diff --git a/luci.mk b/luci.mk
index 636cf316ec3fdaf154685750760210a447e46969..fb49da0eeed5f4e603a41ed25b4bd323c9be418c 100644 (file)
--- a/luci.mk
+++ b/luci.mk
@@ -206,8 +206,7 @@ endef
 
 ifndef Package/$(PKG_NAME)/postinst
 define Package/$(PKG_NAME)/postinst
-[ -n "$${IPKG_INSTROOT}" ] || {$(foreach script,$(LUCI_DEFAULTS),
-       (. /etc/uci-defaults/$(script)) && rm -f /etc/uci-defaults/$(script))
+[ -n "$${IPKG_INSTROOT}" ] || { \
        rm -f /tmp/luci-indexcache
        rm -rf /tmp/luci-modulecache/
        killall -HUP rpcd 2>/dev/null

diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js
index b1dfcfd77c4e686a4a081991f170b71889686c38..39b8b2dc853c923b9acbcb803205e7d96f725ddd 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/network.js
+++ b/modules/luci-base/htdocs/luci-static/resources/network.js
@@ -3303,6 +3303,7 @@ WifiDevice = baseclass.extend(/** @lends LuCI.network.WifiDevice.prototype */ {
         *  - `g` - Legacy 802.11g mode, 2.4 GHz, up to 54 Mbit/s
         *  - `n` - IEEE 802.11n mode, 2.4 or 5 GHz, up to 600 Mbit/s
         *  - `ac` - IEEE 802.11ac mode, 5 GHz, up to 6770 Mbit/s
+        *  - `ax` - IEEE 802.11ax mode, 2.4 or 5 GHz
         */
        getHWModes: function() {
                var hwmodes = this.ubus('dev', 'iwinfo', 'hwmodes');
@@ -3324,6 +3325,10 @@ WifiDevice = baseclass.extend(/** @lends LuCI.network.WifiDevice.prototype */ {
         *  - `VHT40` - applicable to IEEE 802.11ac, 40 MHz wide channels
         *  - `VHT80` - applicable to IEEE 802.11ac, 80 MHz wide channels
         *  - `VHT160` - applicable to IEEE 802.11ac, 160 MHz wide channels
+        *  - `HE20` - applicable to IEEE 802.11ax, 20 MHz wide channels
+        *  - `HE40` - applicable to IEEE 802.11ax, 40 MHz wide channels
+        *  - `HE80` - applicable to IEEE 802.11ax, 80 MHz wide channels
+        *  - `HE160` - applicable to IEEE 802.11ax, 160 MHz wide channels
         */
        getHTModes: function() {
                var htmodes = this.ubus('dev', 'iwinfo', 'htmodes');
@@ -4021,6 +4026,17 @@ WifiNetwork = baseclass.extend(/** @lends LuCI.network.WifiNetwork.prototype */
         * @property {number} [nss]
         * Specifies the number of spatial streams used by the transmission.
         * Only applicable to VHT rates.
+        *
+        * @property {boolean} [he]
+        * Specifies whether this rate is an HE (IEEE 802.11ax) rate.
+        *
+        * @property {number} [he_gi]
+        * Specifies whether the guard interval used for the transmission.
+        * Only applicable to HE rates.
+        *
+        * @property {number} [he_dcm]
+        * Specifies whether dual concurrent modulation is used for the transmission.
+        * Only applicable to HE rates.
         */
 
        /**

diff --git a/modules/luci-base/po/bg/base.po b/modules/luci-base/po/bg/base.po
index 6c95d3c3c6cb5dc48662bff9d9192fd1f8f515ac..7b2d1043283953ea23c3d19e4faf90547fbc7bf5 100644 (file)
--- a/modules/luci-base/po/bg/base.po
+++ b/modules/luci-base/po/bg/base.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2021-02-18 13:59+0000\n"
-"Last-Translator: Iskren Mihaylov <iskren.mihaylov91@gmail.com>\n"
+"PO-Revision-Date: 2021-06-01 13:26+0000\n"
+"Last-Translator: Kalin Iliev <kalin.t.iliev@gmail.com>\n"
 "Language-Team: Bulgarian <https://hosted.weblate.org/projects/openwrt/luci/"
 "bg/>\n"
 "Language: bg\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 4.5\n"
+"X-Generator: Weblate 4.7-dev\n"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:1309
 msgid "%.1f dB"
@@ -1150,7 +1150,7 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:270
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:203
 msgid "Cancel"
-msgstr ""
+msgstr "Отмени"
 
 #: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"

diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po
index a8ef8d291a528d8edf68d5ea0e16ad077fd771de..9d0ad4ecaf9877b88b2360999da2969e4c3150ab 100644 (file)
--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: LuCI\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-04-20 09:40+0200\n"
-"PO-Revision-Date: 2021-05-28 17:32+0000\n"
-"Last-Translator: Matthaiks <kitynska@gmail.com>\n"
+"PO-Revision-Date: 2021-06-03 20:17+0000\n"
+"Last-Translator: Marcin Net <marcin.net@linux.pl>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/openwrt/luci/pl/>"
 "\n"
 "Language: pl\n"
@@ -1120,7 +1120,7 @@ msgstr "Podrobione statystyki NXDOMAIN"
 
 #: protocols/luci-proto-bonding/htdocs/luci-static/resources/protocol/bonding.js:199
 msgid "Bonding Policy"
-msgstr "Polityka obligacji"
+msgstr "Polityka wiązania"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:2954
 #: modules/luci-compat/luasrc/model/network.lua:1421
@@ -1161,7 +1161,7 @@ msgstr "Podnieś pusty most"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:492
 msgid "Bring up on boot"
-msgstr "Podnieś przy stracie"
+msgstr "Podnieś przy starcie"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js:533
 msgid "Bring up the bridge interface even if no ports are attached"
@@ -8796,7 +8796,7 @@ msgstr "prawidłowy identyfikator UCI"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:365
 msgid "valid UCI identifier, hostname or IP address range"
-msgstr "prawidłowy identyfikator UCI, nazwa hosta lub adres IP"
+msgstr "prawidłowy identyfikator UCI, nazwa hosta lub zakres adresów IP"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:386
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:389

diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po
index 4cfaab3ad5831ad250211e1c5993fdca47ceedd5..624eb33fbdabee63533d866b307b0e6730a160eb 100644 (file)
--- a/modules/luci-base/po/ru/base.po
+++ b/modules/luci-base/po/ru/base.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LuCI: base\n"
 "POT-Creation-Date: 2010-05-09 01:01+0300\n"
-"PO-Revision-Date: 2021-05-04 13:52+0000\n"
+"PO-Revision-Date: 2021-06-02 06:20+0000\n"
 "Last-Translator: Anton Kikin <a.a.kikin@gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/openwrt/luci/ru/>"
 "\n"
@@ -4641,7 +4641,7 @@ msgstr "Образ системы для сетевой загрузки"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:346
 msgid "Network bridge configuration migration"
-msgstr ""
+msgstr "Миграция конфигурации сетевого моста"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js:397
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:1203
@@ -7168,6 +7168,8 @@ msgid ""
 "The existing network configuration needs to be changed for LuCI to function "
 "properly."
 msgstr ""
+"Для правильной работы LuCI необходимо изменить существующую конфигурацию "
+"сети."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:740
 msgid ""
@@ -7875,6 +7877,8 @@ msgid ""
 "Upon pressing \"Continue\", bridges configuration will be updated and the "
 "network will be restarted to apply the updated configuration."
 msgstr ""
+"После нажатия кнопки «Продолжить» конфигурация мостов будет обновлена, и "
+"сеть будет перезапущена для применения обновленной конфигурации."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:60

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js b/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js
index 80b4b2b34308ec6abfd2d1b492536e361eb50f79..d008feb56af75881831d0d84e53a1a5c601fc49b 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js
@@ -46,11 +46,15 @@ function validateQoSMap(section_id, value) {
        return true;
 }
 
-function deviceSectionExists(section_id, devname, devtype) {
+function deviceSectionExists(section_id, devname, ignore_type_match) {
        var exists = false;
 
        uci.sections('network', 'device', function(ss) {
-               exists = exists || (ss['.name'] != section_id && ss.name == devname && (!devtype || devtype == ss.type));
+               exists = exists || (
+                       ss['.name'] != section_id &&
+                       ss.name == devname &&
+                       (!ignore_type_match || !ignore_type_match.test(ss.type || ''))
+               );
        });
 
        return exists;
@@ -409,10 +413,11 @@ return baseclass.extend({
                o.ucioption = 'name';
                o.write = o.remove = setIfActive;
                o.filter = function(section_id, value) {
-                       return !deviceSectionExists(section_id, value);
+                       return !deviceSectionExists(section_id, value, /^(?:bridge|8021q|8021ad|macvlan|veth)$/);
                };
                o.validate = function(section_id, value) {
-                       return deviceSectionExists(section_id, value) ? _('A configuration for the device "%s" already exists').format(value) : true;
+                       return deviceSectionExists(section_id, value, /^(?:bridge|8021q|8021ad|macvlan|veth)$/)
+                               ? _('A configuration for the device "%s" already exists').format(value) : true;
                };
                o.depends('type', '');
 
@@ -479,7 +484,7 @@ return baseclass.extend({
                o.ucioption = 'name';
                o.write = o.remove = setIfActive;
                o.validate = function(section_id, value) {
-                       return deviceSectionExists(section_id, value) ? _('The device name "%s" is already taken').format(value) : true;
+                       return deviceSectionExists(section_id, value, /^$/) ? _('The device name "%s" is already taken').format(value) : true;
                };
                o.depends({ type: '', '!reverse': true });
 

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
index bb9e63d1e596d7f369d7662ac7fa7a0726f8a4ec..9b2c9bfd5df21d47a208b23d108b363b9308b235 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
@@ -1246,6 +1246,18 @@ return view.extend({
                        if (m) {
                                var devtype = getDevType(section_id);
 
+                               /* Treat not explicitly configured, preexisting VLAN interfaces
+                                  as simple network devices when adding configuration for them,
+                                  since it is more likely that people want to set general device
+                                  properties such as MAC address instead of reconfiguring ingress/
+                                  egress QoS mapping, which is the only editable property of
+                                  preexisting VLAN device config dialogs.
+
+                                  Ref: https://github.com/openwrt/luci/issues/5102
+                                */
+                               if (devtype == '8021q')
+                                       devtype = 'ethernet';
+
                                section_id = uci.add('network', 'device');
 
                                uci.set('network', section_id, 'name', m[1]);
@@ -1301,10 +1313,11 @@ return view.extend({
                }
 
                function getDevType(section_id) {
-                       var cfgtype = uci.get('network', section_id, 'type'),
-                           dev = getDevice(section_id);
+                       var dev = getDevice(section_id),
+                           cfg = uci.get('network', section_id),
+                           type = cfg ? (uci.get('network', section_id, 'type') || 'ethernet') : (dev ? dev.getType() : '');
 
-                       switch (cfgtype || (dev ? dev.getType() : '')) {
+                       switch (type) {
                        case '':
                                return null;
 

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
index 748cb6254f4aeb67300a2e1130aae894717bb455..e9707e85abf9277aff365c05bdc3b83fdfe6ef45 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
@@ -199,7 +199,9 @@ function format_wifirate(rate) {
        var s = '%.1f\xa0%s, %d\xa0%s'.format(rate.rate / 1000, _('Mbit/s'), rate.mhz, _('MHz')),
            ht = rate.ht, vht = rate.vht,
            mhz = rate.mhz, nss = rate.nss,
-           mcs = rate.mcs, sgi = rate.short_gi;
+           mcs = rate.mcs, sgi = rate.short_gi,
+           he = rate.he, he_gi = rate.he_gi,
+           he_dcm = rate.he_dcm;
 
        if (ht || vht) {
                if (vht) s += ', VHT-MCS\xa0%d'.format(mcs);
@@ -208,6 +210,13 @@ function format_wifirate(rate) {
                if (sgi) s += ', ' + _('Short GI').replace(/ /g, '\xa0');
        }
 
+       if (he) {
+               s += ', HE-MCS\xa0%d'.format(mcs);
+               if (nss) s += ', HE-NSS\xa0%d'.format(nss);
+               if (he_gi) s += ', HE-GI\xa0%d'.format(he_gi);
+               if (he_dcm) s += ', HE-DCM\xa0%d'.format(he_dcm);
+       }
+
        return s;
 }
 
@@ -320,7 +329,8 @@ var CBIWifiFrequencyValue = form.Value.extend({
                        this.modes = [
                                '', 'Legacy', true,
                                'n', 'N', hwmodelist.n,
-                               'ac', 'AC', hwmodelist.ac
+                               'ac', 'AC', hwmodelist.ac,
+                               'ax', 'AX', hwmodelist.ax
                        ];
 
                        var htmodelist = L.toArray(data[0] ? data[0].getHTModes() : null)
@@ -337,6 +347,12 @@ var CBIWifiFrequencyValue = form.Value.extend({
                                        'VHT40', '40 MHz', htmodelist.VHT40,
                                        'VHT80', '80 MHz', htmodelist.VHT80,
                                        'VHT160', '160 MHz', htmodelist.VHT160
+                               ],
+                               'ax': [
+                                       'HE20', '20 MHz', htmodelist.HE20,
+                                       'HE40', '40 MHz', htmodelist.HE40,
+                                       'HE80', '80 MHz', htmodelist.HE80,
+                                       'HE160', '160 MHz', htmodelist.HE160
                                ]
                        };
 
@@ -351,6 +367,10 @@ var CBIWifiFrequencyValue = form.Value.extend({
                                ],
                                'ac': [
                                        '11a', '5 GHz', true
+                               ],
+                               'ax': [
+                                       '11g', '2.4 GHz', this.channels['11g'].length > 3,
+                                       '11a', '5 GHz', this.channels['11a'].length > 3
                                ]
                        };
                }, this));