diff options
Diffstat (limited to 'modules')
34 files changed, 63 insertions, 128 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js index 89dfac9e46..fcfc506942 100644 --- a/modules/luci-base/htdocs/luci-static/resources/cbi.js +++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js @@ -627,6 +627,18 @@ function cbi_init() { s.parentNode.classList.add('cbi-tooltip-container'); }); + document.querySelectorAll('.cbi-section-remove > input[name^="cbi.rts"]').forEach(function(i) { + var handler = function(ev) { + var bits = this.name.split(/\./), + section = document.getElementById('cbi-' + bits[2] + '-' + bits[3]); + + section.style.opacity = (ev.type === 'mouseover') ? 0.5 : ''; + }; + + i.addEventListener('mouseover', handler); + i.addEventListener('mouseout', handler); + }); + cbi_d_update(); } @@ -818,9 +830,9 @@ function cbi_dynlist_init(parent, datatype, optional, choices) t.placeholder = holder; } - var b = document.createElement('img'); - b.src = cbi_strings.path.resource + ((i+1) < values.length ? '/cbi/remove.gif' : '/cbi/add.gif'); - b.className = 'cbi-image-button'; + var b = E('div', { + class: 'cbi-button cbi-button-' + ((i+1) < values.length ? 'remove' : 'add') + }, (i+1) < values.length ? '×' : '+'); parent.appendChild(t); parent.appendChild(b); @@ -986,8 +998,7 @@ function cbi_dynlist_init(parent, datatype, optional, choices) input = input.previousSibling; } - if (se.src.indexOf('remove') > -1) - { + if (se.classList.contains('cbi-button-remove')) { input.value = ''; cbi_dynlist_keydown({ @@ -995,8 +1006,7 @@ function cbi_dynlist_init(parent, datatype, optional, choices) keyCode: 8 }); } - else - { + else { cbi_dynlist_keydown({ target: input, keyCode: 13 diff --git a/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm b/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm index dbb0e1120b..ea0568f409 100644 --- a/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm +++ b/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm @@ -1,10 +1,12 @@ <%- local title = luci.util.trim(striptags(self.title)) - local ftype = self.template and self.template:gsub("^.+/", "") + local descr = luci.util.trim(striptags(self.description)) + local ftype = self.typename or (self.template and self.template:gsub("^.+/", "")) -%> <div class="td cbi-value-field<% if self.error and self.error[section] then %> cbi-value-error<% end %>"<%= attr("data-name", self.option) .. ifattr(ftype and #ftype > 0, "data-type", ftype) .. - ifattr(title and #title > 0, "data-title", title) + ifattr(title and #title > 0, "data-title", title) .. + ifattr(descr and #descr > 0, "data-description", descr) %>> <div id="cbi-<%=self.config.."-"..section.."-"..self.option%>" data-index="<%=self.index%>" data-depends="<%=pcdata(self:deplist2json(section))%>"> diff --git a/modules/luci-base/luasrc/view/cbi/ucisection.htm b/modules/luci-base/luasrc/view/cbi/ucisection.htm index 2cb1e75d0e..8fa11d68f8 100644 --- a/modules/luci-base/luasrc/view/cbi/ucisection.htm +++ b/modules/luci-base/luasrc/view/cbi/ucisection.htm @@ -32,25 +32,25 @@ <% if self.optionals[section] and #self.optionals[section] > 0 or self.dynamic then %> <div class="cbi-optionals" data-index="<%=#self.children + 1%>"> - <% + <%- if self.dynamic then local keys, vals, name, opt = { }, { } for name, opt in pairs(self.optionals[section]) do keys[#keys+1] = name vals[#vals+1] = opt.title end - %> + -%> <input type="text" id="cbi.opt.<%=self.config%>.<%=section%>" name="cbi.opt.<%=self.config%>.<%=section%>" data-type="uciname" data-optional="true"<%= ifattr(#keys > 0, "data-choices", luci.util.json_encode({keys, vals})) %> /> - <% else %> + <%- else -%> <select id="cbi.opt.<%=self.config%>.<%=section%>" name="cbi.opt.<%=self.config%>.<%=section%>" data-optionals="true"> <option><%: -- Additional Field -- %></option> <% for key, val in pairs(self.optionals[section]) do -%> <option id="cbi-<%=self.config.."-"..section.."-"..val.option%>" value="<%=val.option%>" data-index="<%=val.index%>" data-depends="<%=pcdata(val:deplist2json(section))%>"><%=striptags(val.title)%></option> <%- end %> </select> - <% end %> + <%- end -%> <input type="submit" class="cbi-button cbi-button-fieldadd" value="<%:Add%>" /> </div> <% end %> diff --git a/modules/luci-base/luasrc/view/cbi/value.htm b/modules/luci-base/luasrc/view/cbi/value.htm index c8c905eb11..942ab72e77 100644 --- a/modules/luci-base/luasrc/view/cbi/value.htm +++ b/modules/luci-base/luasrc/view/cbi/value.htm @@ -1,10 +1,16 @@ <%+cbi/valueheader%> + <%- if self.password then -%> + <input type="password" style="position:absolute; left:-1000px"<%= + attr("name", "password." .. cbid) + %> /> + <%- end -%> <input data-update="change"<%= attr("id", cbid) .. attr("name", cbid) .. attr("type", self.password and "password" or "text") .. attr("class", self.password and "cbi-input-password" or "cbi-input-text") .. attr("value", self:cfgvalue(section) or self.default) .. + ifattr(self.password, "autocomplete", "new-password") .. ifattr(self.size, "size") .. ifattr(self.placeholder, "placeholder") .. ifattr(self.readonly, "readonly") .. @@ -14,5 +20,7 @@ ifattr(self.combobox_manual, "data-manual", self.combobox_manual) .. ifattr(#self.keylist > 0, "data-choices", { self.keylist, self.vallist }) %> /> - <% if self.password then %><img src="<%=resource%>/cbi/reload.gif" style="vertical-align:middle" title="<%:Reveal/hide password%>" onclick="var e = document.getElementById('<%=cbid%>'); e.type = (e.type=='password') ? 'text' : 'password';" /><% end %> + <%- if self.password then -%> + <div class="cbi-button cbi-button-neutral" title="<%:Reveal/hide password%>" onclick="var e = this.previousElementSibling; e.type = (e.type === 'password') ? 'text' : 'password'">∗</div> + <% end %> <%+cbi/valuefooter%> diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index 12ccb0a42a..5885894499 100644 --- a/modules/luci-base/po/ca/base.po +++ b/modules/luci-base/po/ca/base.po @@ -274,9 +274,6 @@ msgstr "Alerta" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po index 2d81e890ff..4075c5b06f 100644 --- a/modules/luci-base/po/cs/base.po +++ b/modules/luci-base/po/cs/base.po @@ -272,9 +272,6 @@ msgstr "Upozornění" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index 7775e65a83..fd7bb4c388 100644 --- a/modules/luci-base/po/de/base.po +++ b/modules/luci-base/po/de/base.po @@ -271,9 +271,6 @@ msgid "Alert" msgstr "Alarm" msgid "Alias Interface" -msgstr "" - -msgid "Alias interface" msgstr "Alias-Schnittstelle" msgid "Alias of \"%s\"" diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po index 86483ca6d9..cb5706930a 100644 --- a/modules/luci-base/po/el/base.po +++ b/modules/luci-base/po/el/base.po @@ -274,9 +274,6 @@ msgstr "Ειδοποίηση" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po index c5e15b492d..dc5c22a659 100644 --- a/modules/luci-base/po/en/base.po +++ b/modules/luci-base/po/en/base.po @@ -271,9 +271,6 @@ msgstr "Alert" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index 2c1459b66d..635dc11603 100644 --- a/modules/luci-base/po/es/base.po +++ b/modules/luci-base/po/es/base.po @@ -275,9 +275,6 @@ msgstr "Alerta" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po index 56944b263e..3805627b6b 100644 --- a/modules/luci-base/po/fr/base.po +++ b/modules/luci-base/po/fr/base.po @@ -277,9 +277,6 @@ msgstr "Alerte" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po index dee9e73e5f..6a5be78feb 100644 --- a/modules/luci-base/po/he/base.po +++ b/modules/luci-base/po/he/base.po @@ -269,9 +269,6 @@ msgstr "אזעקה" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po index 6dab15caa9..4b66806a83 100644 --- a/modules/luci-base/po/hu/base.po +++ b/modules/luci-base/po/hu/base.po @@ -272,9 +272,6 @@ msgstr "Riasztás" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po index e7d6d6b242..1fe6d06cb9 100644 --- a/modules/luci-base/po/it/base.po +++ b/modules/luci-base/po/it/base.po @@ -281,9 +281,6 @@ msgstr "Allerta" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index e1610d09ba..fd60f84da6 100644 --- a/modules/luci-base/po/ja/base.po +++ b/modules/luci-base/po/ja/base.po @@ -275,9 +275,6 @@ msgstr "警告" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po index 647d910100..2d53437dbd 100644 --- a/modules/luci-base/po/ko/base.po +++ b/modules/luci-base/po/ko/base.po @@ -266,9 +266,6 @@ msgstr "" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index c183f702e5..891db2e41f 100644 --- a/modules/luci-base/po/ms/base.po +++ b/modules/luci-base/po/ms/base.po @@ -261,9 +261,6 @@ msgstr "" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po index e5470e03e2..d5c65659e8 100644 --- a/modules/luci-base/po/no/base.po +++ b/modules/luci-base/po/no/base.po @@ -270,9 +270,6 @@ msgstr "Varsle" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index e872c7e204..61aee199b7 100644 --- a/modules/luci-base/po/pl/base.po +++ b/modules/luci-base/po/pl/base.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: LuCI\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-20 09:40+0200\n" -"PO-Revision-Date: 2018-07-14 21:35+0200\n" +"PO-Revision-Date: 2018-07-21 18:35+0200\n" "Last-Translator: Rixerx <krystian.kozak20@gmail.com>\n" "Language-Team: Polish\n" "Language: pl\n" @@ -279,16 +279,13 @@ msgid "Alert" msgstr "Alarm" msgid "Alias Interface" -msgstr "" - -msgid "Alias interface" -msgstr "Alias interfejsu" +msgstr "Alias Interfejsu" msgid "Alias of \"%s\"" -msgstr "" +msgstr "Alias \"%s\"" msgid "All Servers" -msgstr "" +msgstr "Wszystkie serwery" msgid "" "Allocate IP addresses sequentially, starting from the lowest available " @@ -303,7 +300,7 @@ msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication" msgstr "Pozwól na logowanie <abbr title=\"Secure Shell\">SSH</abbr>" msgid "Allow AP mode to disconnect STAs based on low ACK condition" -msgstr "" +msgstr "Pozwól aby tryb AP rozłączał stacje STA w oparciu o niski stan ACK" msgid "Allow all except listed" msgstr "Pozwól wszystkim oprócz wymienionych" @@ -342,6 +339,8 @@ msgid "" "Always use 40MHz channels even if the secondary channel overlaps. Using this " "option does not comply with IEEE 802.11n-2009!" msgstr "" +"Zawsze używaj kanału 40 MHz, nawet jeśli kanał dodatkowy nachodzi na inny. " +"Używanie tej opcji nie jest zgodne z IEEE 802.11n-2009!" msgid "Annex" msgstr "" @@ -541,7 +540,7 @@ msgid "Band" msgstr "" msgid "Beacon Interval" -msgstr "" +msgstr "Interwał Beaconu" msgid "" "Below is the determined list of files to backup. It consists of changed " @@ -577,7 +576,6 @@ msgstr "Interfejs mostu" msgid "Bridge unit number" msgstr "Numer Mostu (urządzenia)" -# Podejrzewam że chodzi o interfejs? mam rację? msgid "Bring up on boot" msgstr "Podnieś przy stracie" @@ -860,7 +858,7 @@ msgid "DSL line mode" msgstr "" msgid "DTIM Interval" -msgstr "" +msgstr "Interwał DTIM" msgid "DUID" msgstr "DUID" @@ -901,12 +899,11 @@ msgid "Delete this network" msgstr "Usuń tą sieć" msgid "Delivery Traffic Indication Message Interval" -msgstr "" +msgstr "Interwał komunikatu o wskazaniu dostawy ruchu" msgid "Description" msgstr "Opis" -# Ktoś tłumaczył bez zobaczenia tego w gui. Dotyczy zmiany motywu ten opis. msgid "Design" msgstr "Motyw" @@ -963,7 +960,7 @@ msgid "Disabled (default)" msgstr "Wyłączone (domyślnie)" msgid "Disassociate On Low Acknowledgement" -msgstr "" +msgstr "Rozłączaj przy niskim stanie ramek ACK" msgid "Discard upstream RFC1918 responses" msgstr "Odrzuć wychodzące odpowiedzi RFC1918" @@ -990,15 +987,14 @@ msgstr "" msgid "Diversity" msgstr "Wielorakość" -# Nie wiem czy nie zamotałem ja rozumiem;) msgid "" "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol" "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-" "Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> " "firewalls" msgstr "" -"Dnsmasq jest to serwer <abbr title=\"Dynamic Host Configuration Protocol" -"\">DHCP</abbr> połączony z serwerem <abbr title=\"Domain Name System\">DNS</" +"Dnsmasq jest kombajnem serwera <abbr title=\"Dynamic Host Configuration Protocol" +"\">DHCP</abbr> połączonym z serwerem <abbr title=\"Domain Name System\">DNS</" "abbr>. Jest to serwer przekazujący (Fowarder) dla firewalli <abbr title=" "\"Network Address Translation\">NAT</abbr>" @@ -1055,7 +1051,6 @@ msgstr "" msgid "Dual-Stack Lite (RFC6333)" msgstr "" -# "n" brakowało... msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>" msgstr "" "<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> dynamiczne" @@ -1334,7 +1329,7 @@ msgid "Force" msgstr "Wymuś" msgid "Force 40MHz mode" -msgstr "" +msgstr "Wymuś tryb 40MHz" msgid "Force CCMP (AES)" msgstr "Wymuś CCMP (AES)" @@ -1733,7 +1728,6 @@ msgstr "" msgid "Interface Configuration" msgstr "Konfiguracja Interfejsu" -# Tam jest lista interfejsów.... msgid "Interface Overview" msgstr "Przegląd Interfejsów" @@ -1752,7 +1746,6 @@ msgstr "Interfejsy" msgid "Internal" msgstr "" -# Nadużycie tagu abbr uważam za uzasadnione. msgid "Internal Server Error" msgstr "Wewnętrzny błąd serwera" @@ -2013,7 +2006,7 @@ msgid "Lowest leased address as offset from the network address." msgstr "Najniższy wydzierżawiony adres jako offset dla adresu sieci." msgid "MAC" -msgstr "" +msgstr "MAC" msgid "MAC-Address" msgstr "Adres MAC" @@ -2260,7 +2253,7 @@ msgid "No rules in this chain" msgstr "Brak zasad w tym łańcuchu" msgid "No scan results available yet..." -msgstr "" +msgstr "Brak wyników skanowania..." msgid "No zone assigned" msgstr "Brak przypisanej strefy" @@ -2699,6 +2692,7 @@ msgid "" "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> " "servers" msgstr "" +"Zapytaj o wszystkie dostępne serwery <abbr title=\"Domain Name System\">DNS</abbr> " msgid "R0 Key Lifetime" msgstr "" @@ -2995,11 +2989,10 @@ msgid "Scan" msgstr "Skanuj" msgid "Scan request failed" -msgstr "" +msgstr "Próba skanowania nie powiodła się" -# Raczej nie stosuje się kilku dużych liter w tym samym msgid "Scheduled Tasks" -msgstr "Zaplanowane zadania" +msgstr "Zaplanowane Zadania" msgid "Section added" msgstr "Dodano sekcję" @@ -3059,7 +3052,7 @@ msgid "Short GI" msgstr "" msgid "Short Preamble" -msgstr "" +msgstr "Krótki Wstęp" msgid "Show current backup file list" msgstr "Pokaż aktualną listę plików do backupu" @@ -3169,7 +3162,7 @@ msgid "Starting configuration apply…" msgstr "" msgid "Starting wireless scan..." -msgstr "" +msgstr "Rozpoczynanie skanowania..." msgid "Startup" msgstr "Autostart" @@ -3936,7 +3929,7 @@ msgid "" msgstr "" "Tutaj można włączyć lub wyłączyć zainstalowane skrypty. Zmiany zostaną " "zastosowane po ponownym uruchomieniu urządzenia.<br /><strong>Ostrzeżenie: " -"Jeśli wyłączysz podstawowe skrypty typu \"networks\", urządzenie może stać " +"Jeśli wyłączysz podstawowe skrypty typu \"network\", urządzenie może stać " "się nieosiągalne!</strong>" msgid "" @@ -4034,7 +4027,7 @@ msgid "minutes" msgstr "minuty" msgid "mixed WPA/WPA2" -msgstr "" +msgstr "mieszany WPA/WPA2" msgid "no" msgstr "nie" diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po index d440b2872d..63a8b2f340 100644 --- a/modules/luci-base/po/pt-br/base.po +++ b/modules/luci-base/po/pt-br/base.po @@ -294,9 +294,6 @@ msgstr "Alerta" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po index 36320d9954..d548b7c8d5 100644 --- a/modules/luci-base/po/pt/base.po +++ b/modules/luci-base/po/pt/base.po @@ -280,9 +280,6 @@ msgstr "Alerta" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po index 109550a90b..a28235bbd7 100644 --- a/modules/luci-base/po/ro/base.po +++ b/modules/luci-base/po/ro/base.po @@ -267,9 +267,6 @@ msgstr "Alerta" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index 4f40770984..8d542e6018 100644 --- a/modules/luci-base/po/ru/base.po +++ b/modules/luci-base/po/ru/base.po @@ -276,9 +276,6 @@ msgstr "Тревога" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po index 750fe8c809..7cf9f6febb 100644 --- a/modules/luci-base/po/sk/base.po +++ b/modules/luci-base/po/sk/base.po @@ -255,9 +255,6 @@ msgstr "" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po index b88715debc..76b5825906 100644 --- a/modules/luci-base/po/sv/base.po +++ b/modules/luci-base/po/sv/base.po @@ -263,9 +263,6 @@ msgstr "Varning" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot index 80feb44efa..2dacedfe79 100644 --- a/modules/luci-base/po/templates/base.pot +++ b/modules/luci-base/po/templates/base.pot @@ -248,9 +248,6 @@ msgstr "" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po index 5710ff3f4f..383c683068 100644 --- a/modules/luci-base/po/tr/base.po +++ b/modules/luci-base/po/tr/base.po @@ -266,9 +266,6 @@ msgstr "Uyarı" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po index e58b2d9d6e..e4cf1ed0a8 100644 --- a/modules/luci-base/po/uk/base.po +++ b/modules/luci-base/po/uk/base.po @@ -291,9 +291,6 @@ msgstr "Тривога" msgid "Alias Interface" msgstr "Інтерфейс псевдоніма" -msgid "Alias interface" -msgstr "Інтерфейс псевдоніма" - msgid "Alias of \"%s\"" msgstr "Псевдонім \"%s\"" diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po index 315f260d02..6451853bb4 100644 --- a/modules/luci-base/po/vi/base.po +++ b/modules/luci-base/po/vi/base.po @@ -262,9 +262,6 @@ msgstr "" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po index 23a3ee2940..d142390e1a 100644 --- a/modules/luci-base/po/zh-cn/base.po +++ b/modules/luci-base/po/zh-cn/base.po @@ -260,9 +260,6 @@ msgstr "警戒" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po index c4e29a31cc..579d52656a 100644 --- a/modules/luci-base/po/zh-tw/base.po +++ b/modules/luci-base/po/zh-tw/base.po @@ -265,9 +265,6 @@ msgstr "警示" msgid "Alias Interface" msgstr "" -msgid "Alias interface" -msgstr "" - msgid "Alias of \"%s\"" msgstr "" diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua index 32bf1965f3..ad20f09187 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua @@ -70,7 +70,7 @@ local tpl_radio = tpl.Template(nil, [[ <!-- physical device --> <div class="tr cbi-rowstyle-2"> <div class="td col-2 center middle"> - <span class="ifacebadge"><img src="<%=resource%>/icons/wifi_toggled.png" id="<%=dev:name()%>-iw-upstate" /> <%=dev:name()%></span> + <span class="ifacebadge"><img src="<%=resource%>/icons/wifi_disabled.png" id="<%=dev:name()%>-iw-upstate" /> <%=dev:name()%></span> </div> <div class="td col-7 left middle"> <big><strong><%=hw%></strong></big><br /> @@ -115,8 +115,8 @@ local tpl_radio = tpl.Template(nil, [[ </div> <% end %> <% else %> - <div class="tr cbi-rowstyle-2"> - <div class="td left"> + <div class="tr placeholder"> + <div class="td"> <em><%:No network configured on this device%></em> </div> </div> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview_status.htm index 2c89d10430..7427154a04 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview_status.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview_status.htm @@ -94,7 +94,7 @@ if (ifc.is_dynamic) desc = '<%:Virtual dynamic interface%>'; else if (ifc.is_alias) - desc = '<%:Alias interface%>'; + desc = '<%:Alias Interface%>'; if (ifc.desc) desc = desc ? '%s (%s)'.format(desc, ifc.desc) : ifc.desc; @@ -110,7 +110,7 @@ if (!ifc.is_dynamic && !ifc.is_alias) { if (ifc.macaddr) - html += String.format('<strong><%:MAC-Address%>:</strong> %s<br />', ifc.macaddr); + html += String.format('<strong><%:MAC%>:</strong> %s<br />', ifc.macaddr); html += String.format( '<strong><%:RX%>:</strong> %.2mB (%d <%:Pkts.%>)<br />' + diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm index 9c5173dae2..34be35dd20 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm @@ -17,7 +17,7 @@ html += String.format('<strong><%:Uptime%>:</strong> %t<br />', ifc.uptime); if (ifc.macaddr) - html += String.format('<strong><%:MAC-Address%>:</strong> %s<br />', ifc.macaddr); + html += String.format('<strong><%:MAC%>:</strong> %s<br />', ifc.macaddr); html += String.format( '<strong><%:RX%></strong>: %.2mB (%d <%:Pkts.%>)<br />' + |