diff options
Diffstat (limited to 'modules')
49 files changed, 2945 insertions, 4660 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js index 6c35372cdd..0a1961916c 100644 --- a/modules/luci-base/htdocs/luci-static/resources/cbi.js +++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js @@ -1244,44 +1244,44 @@ function cbi_validate_field(cbid, optional, type) function cbi_row_swap(elem, up, store) { var tr = elem.parentNode; - while (tr && tr.nodeName.toLowerCase() != 'tr') + + while (tr && !tr.classList.contains('cbi-section-table-row')) tr = tr.parentNode; if (!tr) return false; - var table = tr.parentNode; - while (table && table.nodeName.toLowerCase() != 'table') - table = table.parentNode; - - if (!table) - return false; + if (up) { + var prev = tr.previousElementSibling; - var s = up ? 3 : 2; - var e = up ? table.rows.length : table.rows.length - 1; - - for (var idx = s; idx < e; idx++) - { - if (table.rows[idx] == tr) - { - if (up) - tr.parentNode.insertBefore(table.rows[idx], table.rows[idx-1]); - else - tr.parentNode.insertBefore(table.rows[idx+1], table.rows[idx]); + if (prev && prev.classList.contains('cbi-section-table-row')) + tr.parentNode.insertBefore(tr, prev); + else + return; + } + else { + var next = tr.nextElementSibling ? tr.nextElementSibling.nextElementSibling : null; - break; - } + if (next && next.classList.contains('cbi-section-table-row')) + tr.parentNode.insertBefore(tr, next); + else if (!next) + tr.parentNode.appendChild(tr); + else + return; } var ids = [ ]; - for (idx = 2; idx < table.rows.length; idx++) - { - table.rows[idx].className = table.rows[idx].className.replace( - /cbi-rowstyle-[12]/, 'cbi-rowstyle-' + (1 + (idx % 2)) - ); - if (table.rows[idx].id && table.rows[idx].id.match(/-([^\-]+)$/) ) - ids.push(RegExp.$1); + for (var i = 0, n = 0; i < tr.parentNode.childNodes.length; i++) { + var node = tr.parentNode.childNodes[i]; + if (node.classList && node.classList.contains('cbi-section-table-row')) { + node.classList.remove('cbi-rowstyle-1'); + node.classList.remove('cbi-rowstyle-2'); + node.classList.add((n++ % 2) ? 'cbi-rowstyle-2' : 'cbi-rowstyle-1'); + + if (/-([^\-]+)$/.test(node.id)) + ids.push(RegExp.$1); + } } var input = document.getElementById(store); @@ -1311,58 +1311,6 @@ function cbi_tag_last(container) } } -String.prototype.serialize = function() -{ - var o = this; - switch(typeof(o)) - { - case 'object': - // null - if( o == null ) - { - return 'null'; - } - - // array - else if( o.length ) - { - var i, s = ''; - - for( var i = 0; i < o.length; i++ ) - s += (s ? ', ' : '') + String.serialize(o[i]); - - return '[ ' + s + ' ]'; - } - - // object - else - { - var k, s = ''; - - for( k in o ) - s += (s ? ', ' : '') + k + ': ' + String.serialize(o[k]); - - return '{ ' + s + ' }'; - } - - break; - - case 'string': - // complex string - if( o.match(/[^a-zA-Z0-9_,.: -]/) ) - return 'decodeURIComponent("' + encodeURIComponent(o) + '")'; - - // simple string - else - return '"' + o + '"'; - - break; - - default: - return o.toString(); - } -} - String.prototype.format = function() { if (!RegExp) @@ -1473,10 +1421,6 @@ String.prototype.format = function() subst = esc(param, quot_esc); break; - case 'j': - subst = String.serialize(param); - break; - case 't': var td = 0; var th = 0; @@ -1543,14 +1487,6 @@ String.prototype.nobr = function() return this.replace(/[\s\n]+/g, ' '); } -String.serialize = function() -{ - var a = [ ]; - for (var i = 1; i < arguments.length; i++) - a.push(arguments[i]); - return ''.serialize.apply(arguments[0], a); -} - String.format = function() { var a = [ ]; @@ -1566,3 +1502,75 @@ String.nobr = function() a.push(arguments[i]); return ''.nobr.apply(arguments[0], a); } + + +var dummyElem, domParser; + +function isElem(e) +{ + return (typeof(e) === 'object' && e !== null && 'nodeType' in e); +} + +function toElem(s) +{ + var elem; + + try { + domParser = domParser || new DOMParser(); + elem = domParser.parseFromString(s, 'text/html').body.firstChild; + } + catch(e) {} + + if (!elem) { + try { + dummyElem = dummyElem || document.createElement('div'); + dummyElem.innerHTML = s; + elem = dummyElem.firstChild; + } + catch (e) {} + } + + return elem || null; +} + +function E() +{ + var html = arguments[0], + attr = (arguments[1] instanceof Object && !Array.isArray(arguments[1])) ? arguments[1] : null, + data = attr ? arguments[2] : arguments[1], + elem; + + if (isElem(html)) + elem = html; + else if (html.charCodeAt(0) === 60) + elem = toElem(html); + else + elem = document.createElement(html); + + if (!elem) + return null; + + if (attr) + for (var key in attr) + if (attr.hasOwnProperty(key)) + elem.setAttribute(key, attr[key]); + + if (typeof(data) === 'function') + data = data(elem); + + if (isElem(data)) { + elem.appendChild(data); + } + else if (Array.isArray(data)) { + for (var i = 0; i < data.length; i++) + if (isElem(data[i])) + elem.appendChild(data[i]); + else + elem.appendChild(document.createTextNode('' + data[i])); + } + else if (data !== null && data !== undefined) { + elem.innerHTML = '' + data; + } + + return elem; +} diff --git a/modules/luci-base/luasrc/dispatcher.lua b/modules/luci-base/luasrc/dispatcher.lua index 45e1e308f8..2c58b0ab3d 100644 --- a/modules/luci-base/luasrc/dispatcher.lua +++ b/modules/luci-base/luasrc/dispatcher.lua @@ -358,7 +358,7 @@ function dispatch(request) elseif key == "REQUEST_URI" then return build_url(unpack(ctx.requestpath)) elseif key == "FULL_REQUEST_URI" then - local url = { http.getenv("SCRIPT_NAME"), http.getenv("PATH_INFO") } + local url = { http.getenv("SCRIPT_NAME") or "" , http.getenv("PATH_INFO") } local query = http.getenv("QUERY_STRING") if query and #query > 0 then url[#url+1] = "?" diff --git a/modules/luci-base/luasrc/view/cbi/cell_valuefooter.htm b/modules/luci-base/luasrc/view/cbi/cell_valuefooter.htm index 786ee43d10..bdd6bc9687 100644 --- a/modules/luci-base/luasrc/view/cbi/cell_valuefooter.htm +++ b/modules/luci-base/luasrc/view/cbi/cell_valuefooter.htm @@ -1,2 +1,2 @@ </div> -</td> +</div> diff --git a/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm b/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm index 9c9c21814b..a4b68cda72 100644 --- a/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm +++ b/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm @@ -1,2 +1,2 @@ -<td class="cbi-value-field<% if self.error and self.error[section] then %> cbi-value-error<% end %>"> +<div class="td cbi-value-field<% if self.error and self.error[section] then %> cbi-value-error<% end %>"> <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/tblsection.htm b/modules/luci-base/luasrc/view/cbi/tblsection.htm index 3cb87563f1..bb11cf1c06 100644 --- a/modules/luci-base/luasrc/view/cbi/tblsection.htm +++ b/modules/luci-base/luasrc/view/cbi/tblsection.htm @@ -27,52 +27,52 @@ end <div class="cbi-section-descr"><%=self.description%></div> <div class="cbi-section-node"> <%- local count = 0 -%> - <table class="cbi-section-table"> - <tr class="cbi-section-table-titles"> + <div class="table cbi-section-table"> + <div class="tr cbi-section-table-titles"> <%- if not self.anonymous then -%> <%- if self.sectionhead then -%> - <th class="cbi-section-table-cell"><%=self.sectionhead%></th> + <div class="th cbi-section-table-cell"><%=self.sectionhead%></div> <%- else -%> - <th> </th> + <div class="th"> </div> <%- end -%> <%- count = count +1; end -%> <%- for i, k in pairs(self.children) do if not k.optional then -%> - <th class="cbi-section-table-cell"<%=width(k)%>> + <div class="th cbi-section-table-cell"<%=width(k)%>> <%- if k.titleref then -%><a title="<%=self.titledesc or translate('Go to relevant configuration page')%>" class="cbi-title-ref" href="<%=k.titleref%>"><%- end -%> <%-=k.title-%> <%- if k.titleref then -%></a><%- end -%> - </th> + </div> <%- count = count + 1; end; end; if self.sortable then -%> - <th class="cbi-section-table-cell"><%:Sort%></th> + <div class="th cbi-section-table-cell"><%:Sort%></div> <%- count = count + 1; end; if self.extedit or self.addremove then -%> - <th class="cbi-section-table-cell"> </th> + <div class="th cbi-section-table-cell"> </div> <%- count = count + 1; end -%> - </tr> - <tr class="cbi-section-table-descr"> + </div> + <div class="tr cbi-section-table-descr"> <%- if not self.anonymous then -%> <%- if self.sectiondesc then -%> - <th class="cbi-section-table-cell"><%=self.sectiondesc%></th> + <div class="th cbi-section-table-cell"><%=self.sectiondesc%></div> <%- else -%> - <th></th> + <div class="th"></div> <%- end -%> <%- end -%> <%- for i, k in pairs(self.children) do if not k.optional then -%> - <th class="cbi-section-table-cell"<%=width(k)%>><%=k.description%></th> + <div class="th cbi-section-table-cell"<%=width(k)%>><%=k.description%></div> <%- end; end; if self.sortable then -%> - <th class="cbi-section-table-cell"></th> + <div class="th cbi-section-table-cell"></div> <%- end; if self.extedit or self.addremove then -%> - <th class="cbi-section-table-cell"></th> + <div class="th cbi-section-table-cell"></div> <%- end -%> - </tr> + </div> <%- local isempty = true for i, k in ipairs(self:cfgsections()) do section = k isempty = false scope = { valueheader = "cbi/cell_valueheader", valuefooter = "cbi/cell_valuefooter" } -%> - <tr class="cbi-section-table-row<% if self.extedit or self.rowcolors then %> cbi-rowstyle-<%=rowstyle()%><% end %>" id="cbi-<%=self.config%>-<%=section%>"> + <div class="tr cbi-section-table-row<% if self.extedit or self.rowcolors then %> cbi-rowstyle-<%=rowstyle()%><% end %>" id="cbi-<%=self.config%>-<%=section%>"> <% if not self.anonymous then -%> - <th><h3><%=(type(self.sectiontitle) == "function") and self:sectiontitle(section) or k%></h3></th> + <div class="th"><h3><%=(type(self.sectiontitle) == "function") and self:sectiontitle(section) or k%></h3></div> <%- end %> @@ -85,14 +85,14 @@ end -%> <%- if self.sortable then -%> - <td class="cbi-section-table-cell"> + <div class="td cbi-section-table-cell"> <input class="cbi-button cbi-button-up" type="button" value="" onclick="return cbi_row_swap(this, true, 'cbi.sts.<%=self.config%>.<%=self.sectiontype%>')" alt="<%:Move up%>" title="<%:Move up%>" /> <input class="cbi-button cbi-button-down" type="button" value="" onclick="return cbi_row_swap(this, false, 'cbi.sts.<%=self.config%>.<%=self.sectiontype%>')" alt="<%:Move down%>" title="<%:Move down%>" /> - </td> + </div> <%- end -%> <%- if self.extedit or self.addremove then -%> - <td class="cbi-section-table-cell"> + <div class="td cbi-section-table-cell"> <%- if self.extedit then -%> <input class="cbi-button cbi-button-edit" type="button" value="<%:Edit%>" <%- if type(self.extedit) == "string" then @@ -104,17 +104,17 @@ end <%- end; if self.addremove then %> <input class="cbi-button cbi-button-remove" type="submit" value="<%:Delete%>" onclick="this.form.cbi_state='del-section'; return true" name="cbi.rts.<%=self.config%>.<%=k%>" alt="<%:Delete%>" title="<%:Delete%>" /> <%- end -%> - </td> + </div> <%- end -%> - </tr> + </div> <%- end -%> <%- if isempty then -%> - <tr class="cbi-section-table-row"> - <td colspan="<%=count%>"><em><br /><%:This section contains no values yet%></em></td> - </tr> + <div class="tr cbi-section-table-row"> + <div class="td" colspan="<%=count%>"><em><br /><%:This section contains no values yet%></em></div> + </div> <%- end -%> - </table> + </div> <% if self.error then %> <div class="cbi-section-error"> diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index b08344b404..f9976f3ebf 100644 --- a/modules/luci-base/po/ca/base.po +++ b/modules/luci-base/po/ca/base.po @@ -174,9 +174,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -213,9 +210,6 @@ msgstr "Número de dispositiu ATM" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Concentrador d'accés" @@ -323,11 +317,6 @@ msgstr "Permet respostes del rang 127.0.0.0/8, p.e. per serveis RBL" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -406,11 +395,11 @@ msgstr "Configuració d'antena" msgid "Any zone" msgstr "Qualsevol zona" -msgid "Apply" -msgstr "Aplica" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "Aplicant els canvis" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -517,9 +506,6 @@ msgstr "Adreça mal especificada!" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -593,12 +579,20 @@ msgstr "Canvis" msgid "Changes applied." msgstr "Canvis aplicats." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Canvia la paraula clau de l'administrador per accedir al dispositiu" msgid "Channel" msgstr "Canal" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Comprovació" @@ -678,12 +672,15 @@ msgstr "" msgid "Configuration" msgstr "Configuració" -msgid "Configuration applied." -msgstr "S'ha aplicat la configuració." - msgid "Configuration files will be kept." msgstr "Es mantindran els fitxers de configuració." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Confirmació" @@ -696,12 +693,15 @@ msgstr "Connectat" msgid "Connection Limit" msgstr "Límit de connexió" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Connexions" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "País" @@ -830,9 +830,6 @@ msgstr "Passarel·la per defecte" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Estat per defecte" @@ -872,6 +869,9 @@ msgstr "" msgid "Device unreachable" msgstr "" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "Diagnòstics" @@ -906,6 +906,9 @@ msgstr "" msgid "Discard upstream RFC1918 responses" msgstr "Descarta les respostes RFC1918 des de dalt" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Mostrant només els paquets que contenen" @@ -1160,6 +1163,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Fitxer" @@ -1355,9 +1361,6 @@ msgstr "Penja" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1475,9 +1478,6 @@ msgstr "Estat WAN IPv6" msgid "IPv6 address" msgstr "Adreça IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2056,9 +2056,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Candidats de servidor NTP" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nom" @@ -2182,6 +2179,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2233,12 +2233,6 @@ msgstr "Opció treta" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2699,9 +2693,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2760,6 +2751,15 @@ msgstr "Mostra/amaga la contrasenya" msgid "Revert" msgstr "Reverteix" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Arrel" @@ -2775,9 +2775,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2803,14 +2800,6 @@ msgstr "" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2838,9 +2827,6 @@ msgstr "Desa" msgid "Save & Apply" msgstr "Desa i aplica" -msgid "Save & Apply" -msgstr "Desa i aplica" - msgid "Scan" msgstr "Escaneja" @@ -2867,17 +2853,6 @@ msgstr "Clients separats" msgid "Server Settings" msgstr "Ajusts de servidor" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Nom de servei" @@ -2971,9 +2946,6 @@ msgstr "Ordena" msgid "Source" msgstr "Origen" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "Especifica el directori a que el dispositiu està adjuntat" @@ -3012,6 +2984,9 @@ msgstr "Inici" msgid "Start priority" msgstr "Prioritat d'inici" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "Arrencada" @@ -3166,6 +3141,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3191,9 +3176,6 @@ msgstr "" "<br />Fes clic a \"Procedeix\" a continuació per començar el procés " "d'escriptura a la memòria flaix." -msgid "The following changes have been committed" -msgstr "S'han comès els següents canvis" - msgid "The following changes have been reverted" msgstr "S'han desfet els següents canvis" @@ -3259,11 +3241,6 @@ msgstr "" "tinguis." msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3273,8 +3250,8 @@ msgstr "" msgid "There are no active leases." msgstr "No hi ha arrendaments actius." -msgid "There are no pending changes to apply!" -msgstr "No hi ha canvis pendents per aplicar!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "No hi ha canvis pendents per revertir!" @@ -3423,15 +3400,6 @@ msgstr "Interfície del túnel" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Potència Tx" @@ -3607,12 +3575,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "Classe de venidor per enviar al sol·licitar DHCP" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Verifica" @@ -3644,16 +3606,15 @@ msgstr "" "La xifratge WPA requereix que sigui instal·lat el wpa_supplicant (pel mode " "client) o el hostapd (pels modes AP i ad hoc)." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "Esperant que s'apliquin els canvis..." msgid "Waiting for command to complete..." msgstr "Esperant que s'acabi l'ordre..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "Esperant el dispositiu..." @@ -3668,12 +3629,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3817,9 +3772,6 @@ msgstr "kbit/s" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "fitxer <abbr title=\"Domain Name System\">DNS</abbr> local" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" @@ -3895,6 +3847,24 @@ msgstr "sí" msgid "« Back" msgstr "« Enrere" +#~ msgid "Apply" +#~ msgstr "Aplica" + +#~ msgid "Applying changes" +#~ msgstr "Aplicant els canvis" + +#~ msgid "Configuration applied." +#~ msgstr "S'ha aplicat la configuració." + +#~ msgid "Save & Apply" +#~ msgstr "Desa i aplica" + +#~ msgid "The following changes have been committed" +#~ msgstr "S'han comès els següents canvis" + +#~ msgid "There are no pending changes to apply!" +#~ msgstr "No hi ha canvis pendents per aplicar!" + #~ msgid "Action" #~ msgstr "Acció" diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po index aa4144758b..daae96c49d 100644 --- a/modules/luci-base/po/cs/base.po +++ b/modules/luci-base/po/cs/base.po @@ -169,9 +169,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -208,9 +205,6 @@ msgstr "číslo ATM zařízení" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Přístupový koncentrátor" @@ -319,11 +313,6 @@ msgstr "Povolit upstream odpovědi na 127.0.0.0/8 rozsah, např. pro RBL služby msgid "Allowed IPs" msgstr "" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -402,11 +391,11 @@ msgstr "Konfigurace antén" msgid "Any zone" msgstr "Libovolná zóna" -msgid "Apply" -msgstr "Použít" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "Probíhá uplatňování nastavení" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -512,9 +501,6 @@ msgstr "Zadána neplatná adresa!" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -586,12 +572,20 @@ msgstr "Změny" msgid "Changes applied." msgstr "Změny aplikovány." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Změní administrátorské heslo pro přístup k zařízení" msgid "Channel" msgstr "Kanál" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Kontrola" @@ -672,12 +666,15 @@ msgstr "" msgid "Configuration" msgstr "Nastavení" -msgid "Configuration applied." -msgstr "Nastavení uplatněno." - msgid "Configuration files will be kept." msgstr "Konfigurační soubory budou zachovány." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Ověření" @@ -690,12 +687,15 @@ msgstr "Připojeno" msgid "Connection Limit" msgstr "Omezení počtu připojení" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Připojení" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Země" @@ -824,9 +824,6 @@ msgstr "Výchozí brána" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Výchozí stav" @@ -868,6 +865,9 @@ msgstr "" msgid "Device unreachable" msgstr "" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "Diagnostika" @@ -902,6 +902,9 @@ msgstr "" msgid "Discard upstream RFC1918 responses" msgstr "Vyřadit upstream RFC1918 odpovědi" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Zobrazeny pouze balíčky obsahující" @@ -1162,6 +1165,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Soubor" @@ -1355,9 +1361,6 @@ msgstr "Zavěsit" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1474,9 +1477,6 @@ msgstr "Stav IPv6 WAN" msgid "IPv6 address" msgstr "IPv6 adresa" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2064,9 +2064,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Kandidáti NTP serveru" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Název" @@ -2190,6 +2187,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "Vypnutí prodlevy" @@ -2240,12 +2240,6 @@ msgstr "Volba odstraněna" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2723,9 +2717,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2785,6 +2776,15 @@ msgstr "Odhalit/skrýt heslo" msgid "Revert" msgstr "Vrátit zpět" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Root" @@ -2800,9 +2800,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2827,14 +2824,6 @@ msgstr "Spustit kontrolu souborového systému" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2862,9 +2851,6 @@ msgstr "Uložit" msgid "Save & Apply" msgstr "Uložit & použít" -msgid "Save & Apply" -msgstr "Uložit & použít" - msgid "Scan" msgstr "Skenovat" @@ -2893,17 +2879,6 @@ msgstr "Oddělovat klienty" msgid "Server Settings" msgstr "Nastavení serveru" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Název služby" @@ -3000,9 +2975,6 @@ msgstr "Seřadit" msgid "Source" msgstr "Zdroj" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -3043,6 +3015,9 @@ msgstr "Start" msgid "Start priority" msgstr "Priorita spouštění" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "Po spuštění" @@ -3206,6 +3181,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3230,9 +3215,6 @@ msgstr "" "souboru s originálním souborem pro zajištění integrity dat.<br /> Kliknutím " "na \"Pokračovat\" spustíte proceduru flashování." -msgid "The following changes have been committed" -msgstr "Následující změny byly provedeny" - msgid "The following changes have been reverted" msgstr "Následující změny byly vráceny" @@ -3302,11 +3284,6 @@ msgstr "" "mohli znovu připojit." msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3314,8 +3291,8 @@ msgstr "" msgid "There are no active leases." msgstr "Nejsou žádné aktivní zápůjčky." -msgid "There are no pending changes to apply!" -msgstr "Nejsou zde žádné nevyřízené změny k aplikaci!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Nejsou zde žádné nevyřízené změny k navrácení!" @@ -3463,15 +3440,6 @@ msgstr "Rozhraní tunelu" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Tx-Power" @@ -3650,12 +3618,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Ověřit" @@ -3687,16 +3649,15 @@ msgstr "" "Šifrování WPA vyžaduje nainstalovaný wpa_supplicant (pro klientský režim) " "nebo hostapd (pro AP a ad-hoc režim)." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "Čekání na realizaci změn..." msgid "Waiting for command to complete..." msgstr "Čekání na dokončení příkazu..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3711,12 +3672,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3858,9 +3813,6 @@ msgstr "kbit/s" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "místní <abbr title=\"Domain Name System\">DNS</abbr> soubor" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" @@ -3936,6 +3888,24 @@ msgstr "ano" msgid "« Back" msgstr "« Zpět" +#~ msgid "Apply" +#~ msgstr "Použít" + +#~ msgid "Applying changes" +#~ msgstr "Probíhá uplatňování nastavení" + +#~ msgid "Configuration applied." +#~ msgstr "Nastavení uplatněno." + +#~ msgid "Save & Apply" +#~ msgstr "Uložit & použít" + +#~ msgid "The following changes have been committed" +#~ msgstr "Následující změny byly provedeny" + +#~ msgid "There are no pending changes to apply!" +#~ msgstr "Nejsou zde žádné nevyřízené změny k aplikaci!" + #~ msgid "Action" #~ msgstr "Akce" diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index 574ddf184a..a7b003caf3 100644 --- a/modules/luci-base/po/de/base.po +++ b/modules/luci-base/po/de/base.po @@ -172,9 +172,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -211,9 +208,6 @@ msgstr "ATM Geräteindex" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Access Concentrator" @@ -322,13 +316,6 @@ msgstr "" msgid "Allowed IPs" msgstr "Erlaubte IP-Adressen" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" -"Siehe auch <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> bei SIXXS." - msgid "Always announce default router" msgstr "Immer Defaultrouter ankündigen" @@ -409,11 +396,11 @@ msgstr "Antennenkonfiguration" msgid "Any zone" msgstr "Beliebige Zone" -msgid "Apply" -msgstr "Anwenden" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "Änderungen werden angewandt" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -523,9 +510,6 @@ msgstr "Ungültige Adresse angegeben!" msgid "Band" msgstr "Frequenztyp" -msgid "Behind NAT" -msgstr "NAT" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -604,12 +588,20 @@ msgstr "Änderungen" msgid "Changes applied." msgstr "Änderungen angewendet." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Ändert das Administratorpasswort für den Zugriff auf dieses Gerät" msgid "Channel" msgstr "Kanal" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Prüfen" @@ -696,12 +688,15 @@ msgstr "" msgid "Configuration" msgstr "Konfiguration" -msgid "Configuration applied." -msgstr "Konfiguration angewendet." - msgid "Configuration files will be kept." msgstr "Konfigurationsdateien sichern" +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Bestätigung" @@ -714,12 +709,15 @@ msgstr "Verbunden" msgid "Connection Limit" msgstr "Verbindungslimit" -msgid "Connection to server fails when TLS cannot be used" -msgstr "TLS zwingend vorraussetzen und abbrechen wenn TLS fehlschlägt." - msgid "Connections" msgstr "Verbindungen" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Land" @@ -848,9 +846,6 @@ msgstr "Default Gateway" msgid "Default is stateless + stateful" msgstr "Der Standardwert ist zustandslos und zustandsorientiert" -msgid "Default route" -msgstr "Default Route" - msgid "Default state" msgstr "Ausgangszustand" @@ -892,6 +887,9 @@ msgstr "Das Gerät startet neu..." msgid "Device unreachable" msgstr "Das Gerät ist nicht erreichbar" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "Diagnosen" @@ -926,6 +924,9 @@ msgstr "Deaktiviert (Standard)" msgid "Discard upstream RFC1918 responses" msgstr "Eingehende RFC1918-Antworten verwerfen" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Nur Pakete mit folgendem Inhalt anzeigen" @@ -1192,6 +1193,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Datei" @@ -1394,9 +1398,6 @@ msgstr "Auflegen" msgid "Header Error Code Errors (HEC)" msgstr "Anzahl Header-Error-Code-Fehler (HEC)" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1512,9 +1513,6 @@ msgstr "IPv6 WAN Status" msgid "IPv6 address" msgstr "IPv6 Adresse" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "Zum lokalen Tunnelendpunkt delegierte IPv6-Adresse (optional)" - msgid "IPv6 assignment hint" msgstr "IPv6 Zuweisungshinweis" @@ -2129,9 +2127,6 @@ msgstr "" msgid "NTP server candidates" msgstr "NTP Server Kandidaten" -msgid "NTP sync time-out" -msgstr "NTP Synchronisierungstimeout" - msgid "Name" msgstr "Name" @@ -2256,6 +2251,9 @@ msgstr "Chiffriertes Gruppenpasswort" msgid "Obfuscated Password" msgstr "Chiffriertes Passwort" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "Verzögerung für Ausschalt-Zustand" @@ -2307,14 +2305,6 @@ msgstr "Option entfernt" msgid "Optional" msgstr "Optional" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" -"Optional, angeben um den Standardserver (tic.sixxs.net) zu überschreiben" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" -"Optional, angeben wenn das SIXSS Konto mehr als einen Tunnel beinhaltet" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2809,9 +2799,6 @@ msgstr "IPv6-Adresse anfordern" msgid "Request IPv6-prefix of length" msgstr "IPv6-Präfix dieser Länge anfordern" -msgid "Require TLS" -msgstr "TLS erfordern" - msgid "Required" msgstr "Benötigt" @@ -2879,6 +2866,15 @@ msgstr "Passwort zeigen/verstecken" msgid "Revert" msgstr "Verwerfen" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Root" @@ -2894,9 +2890,6 @@ msgstr "Erlaubte IP-Addressen routen" msgid "Route type" msgstr "Routen-Typ" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "Geroutetes IPv6-Präfix für nachgelagerte Schnittstellen" - msgid "Router Advertisement-Service" msgstr "Router-Advertisement-Dienst" @@ -2922,14 +2915,6 @@ msgstr "Dateisystemprüfung durchführen" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2957,9 +2942,6 @@ msgstr "Speichern" msgid "Save & Apply" msgstr "Speichern & Anwenden" -msgid "Save & Apply" -msgstr "Speichern & Anwenden" - msgid "Scan" msgstr "Scan" @@ -2988,19 +2970,6 @@ msgstr "Clients isolieren" msgid "Server Settings" msgstr "Servereinstellungen" -msgid "Server password" -msgstr "Server Passwort" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" -"Server Passwort bzw. das tunnelspezifische Passwort wenn der Benutzername " -"eine Tunnel-ID beinhaltet." - -msgid "Server username" -msgstr "Server Benutzername" - msgid "Service Name" msgstr "Service-Name" @@ -3101,9 +3070,6 @@ msgstr "Sortieren" msgid "Source" msgstr "Quelle" -msgid "Source routing" -msgstr "Quell-Routing" - msgid "Specifies the directory the device is attached to" msgstr "Nennt das Verzeichnis, an welches das Gerät angebunden ist" @@ -3150,6 +3116,9 @@ msgstr "Start" msgid "Start priority" msgstr "Startpriorität" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "Systemstart" @@ -3325,6 +3294,16 @@ msgstr "" "werden:" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "Die Gerätedatei des Speichers oder der Partition (z.B.: /dev/sda)" @@ -3345,9 +3324,6 @@ msgstr "" "Integrität sicherzustellen.<br /> Klicken Sie \"Fortfahren\" um die Flash-" "Prozedur zu starten." -msgid "The following changes have been committed" -msgstr "Die folgenden Änderungen wurden angewendet" - msgid "The following changes have been reverted" msgstr "Die folgenden Änderungen wurden verworfen" @@ -3422,13 +3398,6 @@ msgstr "" "Adresse beziehen müssen um auf das Gerät zugreifen zu können." msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" -"Der lokale Tunnel-Endpunkt ist hinter einem NAT. Standard ist deaktiviert, " -"nur auf AYIYA anwendbar." - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3438,8 +3407,8 @@ msgstr "" msgid "There are no active leases." msgstr "Es gibt z.Z. keine aktiven Leases." -msgid "There are no pending changes to apply!" -msgstr "Es gibt keine ausstehenen Änderungen anzuwenden!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Es gibt keine ausstehenen Änderungen zurückzusetzen!" @@ -3600,15 +3569,6 @@ msgstr "Tunnelschnittstelle" msgid "Tunnel Link" msgstr "Basisschnittstelle" -msgid "Tunnel broker protocol" -msgstr "Tunnel-Boker-Protokoll" - -msgid "Tunnel setup server" -msgstr "Tunnel-Setup-Server" - -msgid "Tunnel type" -msgstr "Tunneltyp" - msgid "Tx-Power" msgstr "Sendestärke" @@ -3790,12 +3750,6 @@ msgstr "Hersteller" msgid "Vendor Class to send when requesting DHCP" msgstr "Bei DHCP-Anfragen gesendete Vendor-Klasse" -msgid "Verbose" -msgstr "Umfangreiche Ausgaben" - -msgid "Verbose logging by aiccu daemon" -msgstr "Aktiviert erweiterte Protokollierung durch den AICCU-Prozess" - msgid "Verify" msgstr "Verifizieren" @@ -3827,18 +3781,15 @@ msgstr "" "WPA-Verschlüsselung benötigt wpa_supplicant (für Client-Modus) oder hostapd " "(für AP oder Ad-Hoc Modus)." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" -"Warte die angegebene Anzahl an Sekunden auf NTP-Synchronisierung, der Wert 0 " -"deaktiviert das Warten (optional)" - msgid "Waiting for changes to be applied..." msgstr "Änderungen werden angewandt..." msgid "Waiting for command to complete..." msgstr "Der Befehl wird ausgeführt..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "Warte auf Gerät..." @@ -3857,13 +3808,6 @@ msgstr "" "Wenn PSK in Verwendung ist, können PMK-Schlüssel lokal ohne Inter-Access-" "Point-Kommunikation erzeugt werden." -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" -"Gibt an, ob eine IPv6-Default-Route durch den Tunnel etabliert werden soll" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "Gibt an, ob nur Pakete von delegierten Präfixen geroutet werden sollen" - msgid "Width" msgstr "Breite" @@ -4005,9 +3949,6 @@ msgstr "kbit/s" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "Lokale DNS-Datei" -msgid "minimum 1280, maximum 1480" -msgstr "Minimum 1280, Maximum 1480" - msgid "minutes" msgstr "Minuten" @@ -4082,108 +4023,3 @@ msgstr "ja" msgid "« Back" msgstr "« Zurück" - -#~ msgid "Action" -#~ msgstr "Aktion" - -#~ msgid "Buttons" -#~ msgstr "Knöpfe" - -#~ msgid "Handler" -#~ msgstr "Handler" - -#~ msgid "Maximum hold time" -#~ msgstr "Maximalzeit zum Halten der Verbindung" - -#~ msgid "Minimum hold time" -#~ msgstr "Minimalzeit zum Halten der Verbindung" - -#~ msgid "Path to executable which handles the button event" -#~ msgstr "Ausführbare Datei welche das Schalter-Ereignis verarbeitet" - -#~ msgid "Specifies the button state to handle" -#~ msgstr "Gibt den zu behandelnden Tastenstatus an" - -#~ msgid "This page allows the configuration of custom button actions" -#~ msgstr "" -#~ "Diese Seite ermöglicht die Konfiguration benutzerdefinierter " -#~ "Tastenaktionen" - -#~ msgid "Leasetime" -#~ msgstr "Laufzeit" - -#~ msgid "Optional." -#~ msgstr "Optional" - -#~ msgid "AuthGroup" -#~ msgstr "Berechtigungsgruppe" - -#~ msgid "automatic" -#~ msgstr "automatisch" - -#~ msgid "AR Support" -#~ msgstr "AR-Unterstützung" - -#~ msgid "Atheros 802.11%s Wireless Controller" -#~ msgstr "Atheros 802.11%s W-LAN Adapter" - -#~ msgid "Background Scan" -#~ msgstr "Hintergrundscan" - -#~ msgid "Compression" -#~ msgstr "Kompression" - -#~ msgid "Disable HW-Beacon timer" -#~ msgstr "Deaktiviere Hardware-Beacon Zeitgeber" - -#~ msgid "Do not send probe responses" -#~ msgstr "Scan-Anforderungen nicht beantworten" - -#~ msgid "Fast Frames" -#~ msgstr "Schnelle Frames" - -#~ msgid "Maximum Rate" -#~ msgstr "Höchstübertragungsrate" - -#~ msgid "Minimum Rate" -#~ msgstr "Mindestübertragungsrate" - -#~ msgid "Multicast Rate" -#~ msgstr "Multicastrate" - -#~ msgid "Outdoor Channels" -#~ msgstr "Funkkanal für den Ausseneinsatz" - -#~ msgid "Regulatory Domain" -#~ msgstr "Geltungsbereich (Regulatory Domain)" - -#~ msgid "Separate WDS" -#~ msgstr "Separates WDS" - -#~ msgid "Static WDS" -#~ msgstr "Statisches WDS" - -#~ msgid "Turbo Mode" -#~ msgstr "Turbo Modus" - -#~ msgid "XR Support" -#~ msgstr "XR-Unterstützung" - -#~ msgid "An additional network will be created if you leave this unchecked." -#~ msgstr "" -#~ "Erzeugt ein zusätzliches Netzwerk wenn diese Option nicht ausgewählt ist" - -#~ msgid "Join Network: Settings" -#~ msgstr "Netzwerk beitreten: Einstellungen" - -#~ msgid "CPU" -#~ msgstr "Prozessor" - -#~ msgid "Port %d" -#~ msgstr "Port %d" - -#~ msgid "Port %d is untagged in multiple VLANs!" -#~ msgstr "Port %d ist untagged in mehreren VLANs!" - -#~ msgid "VLAN Interface" -#~ msgstr "VLAN Schnittstelle" diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po index f746db32a4..60566b8217 100644 --- a/modules/luci-base/po/el/base.po +++ b/modules/luci-base/po/el/base.po @@ -172,9 +172,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -211,9 +208,6 @@ msgstr "Αριθμός συσκευής ATM" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Συγκεντρωτής Πρόσβασης " @@ -326,11 +320,6 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -409,11 +398,11 @@ msgstr "" msgid "Any zone" msgstr "Οιαδήποτε ζώνη" -msgid "Apply" -msgstr "Εφαρμογή" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "Εφαρμογή αλλαγών" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -520,9 +509,6 @@ msgstr "Μη έγκυρη διεύθυνση!" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -595,12 +581,20 @@ msgstr "Αλλαγές" msgid "Changes applied." msgstr "Αλλαγές εφαρμόστηκαν." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Αλλάζει τον κωδικό διαχειριστή για πρόσβαση στη συσκευή" msgid "Channel" msgstr "Κανάλι" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Έλεγχος" @@ -681,12 +675,15 @@ msgstr "" msgid "Configuration" msgstr "Παραμετροποίηση" -msgid "Configuration applied." -msgstr "Η Παραμετροποίηση εφαρμόστηκε." - msgid "Configuration files will be kept." msgstr "Τα αρχεία παραμετροποίησης θα διατηρηθούν." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Επιβεβαίωση" @@ -699,12 +696,15 @@ msgstr "Συνδεδεμένος" msgid "Connection Limit" msgstr "Όριο Συνδέσεων" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Συνδέσεις" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Χώρα" @@ -833,9 +833,6 @@ msgstr "Προεπιλεγμένη πύλη" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Προεπιλεγμένη κατάσταση" @@ -877,6 +874,9 @@ msgstr "" msgid "Device unreachable" msgstr "" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "Διαγνωστικά" @@ -911,6 +911,9 @@ msgstr "" msgid "Discard upstream RFC1918 responses" msgstr "Αγνόησε τις απαντήσεις ανοδικής ροής RFC1918" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Εμφάνιση μόνο πακέτων που περιέχουν" @@ -1175,6 +1178,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Αρχείο" @@ -1369,9 +1375,6 @@ msgstr "Κρέμασμα" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1487,9 +1490,6 @@ msgstr "Κατάσταση IPv6 WAN" msgid "IPv6 address" msgstr "Διεύθυνση IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2072,9 +2072,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Όνομα" @@ -2198,6 +2195,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2249,12 +2249,6 @@ msgstr "Η επιλογή αφαιρέθηκε" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2716,9 +2710,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2777,6 +2768,15 @@ msgstr "" msgid "Revert" msgstr "Αναίρεση" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Root" @@ -2792,9 +2792,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2821,14 +2818,6 @@ msgstr "Εκτέλεση ελέγχου συστήματος αρχείων" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2856,9 +2845,6 @@ msgstr "Αποθήκευση" msgid "Save & Apply" msgstr "Αποθήκευση & Εφαρμογή" -msgid "Save & Apply" -msgstr "Αποθήκευση & Εφαρμογή" - msgid "Scan" msgstr "Σάρωση" @@ -2886,17 +2872,6 @@ msgstr "Απομόνωση Πελατών" msgid "Server Settings" msgstr "Ρυθμίσεις Εξυπηρετητή" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Όνομα Υπηρεσίας" @@ -2989,9 +2964,6 @@ msgstr "Ταξινόμηση" msgid "Source" msgstr "Πηγή" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -3032,6 +3004,9 @@ msgstr "Αρχή" msgid "Start priority" msgstr "Προτεραιότητα εκκίνησης" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "Εκκίνηση" @@ -3184,6 +3159,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3205,9 +3190,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "Οι παρακάτω αλλαγές έχουν υποβληθεί" - msgid "The following changes have been reverted" msgstr "Οι παρακάτω αλλαγές έχουν αναιρεθεί" @@ -3266,11 +3248,6 @@ msgstr "" "να αποκτήσετε ξανά πρόσβαση στη συσκευή." msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3280,7 +3257,7 @@ msgstr "" msgid "There are no active leases." msgstr "Δεν υπάρχουν ενεργά leases." -msgid "There are no pending changes to apply!" +msgid "There are no changes to apply." msgstr "" msgid "There are no pending changes to revert!" @@ -3422,15 +3399,6 @@ msgstr "Διεπαφή Τούνελ" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Ισχύς Εκπομπής" @@ -3603,12 +3571,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" @@ -3638,16 +3600,15 @@ msgid "" "and ad-hoc mode) to be installed." msgstr "" -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3662,12 +3623,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3810,9 +3765,6 @@ msgstr "" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "τοπικό αρχείο <abbr title=\"Domain Name System\">DNS</abbr>" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" @@ -3888,6 +3840,21 @@ msgstr "ναι" msgid "« Back" msgstr "« Πίσω" +#~ msgid "Apply" +#~ msgstr "Εφαρμογή" + +#~ msgid "Applying changes" +#~ msgstr "Εφαρμογή αλλαγών" + +#~ msgid "Configuration applied." +#~ msgstr "Η Παραμετροποίηση εφαρμόστηκε." + +#~ msgid "Save & Apply" +#~ msgstr "Αποθήκευση & Εφαρμογή" + +#~ msgid "The following changes have been committed" +#~ msgstr "Οι παρακάτω αλλαγές έχουν υποβληθεί" + #~ msgid "Action" #~ msgstr "Ενέργεια" diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po index 50a7c92815..5ff626f764 100644 --- a/modules/luci-base/po/en/base.po +++ b/modules/luci-base/po/en/base.po @@ -172,9 +172,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -211,9 +208,6 @@ msgstr "ATM device number" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Access Concentrator" @@ -317,11 +311,6 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -400,11 +389,11 @@ msgstr "" msgid "Any zone" msgstr "Any zone" -msgid "Apply" -msgstr "Apply" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "Applying changes" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -510,9 +499,6 @@ msgstr "Bad address specified!" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -584,12 +570,20 @@ msgstr "Changes" msgid "Changes applied." msgstr "Changes applied." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Changes the administrator password for accessing the device" msgid "Channel" msgstr "Channel" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Check" @@ -668,12 +662,15 @@ msgstr "" msgid "Configuration" msgstr "Configuration" -msgid "Configuration applied." -msgstr "Configuration applied." - msgid "Configuration files will be kept." msgstr "Configuration files will be kept." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Confirmation" @@ -686,12 +683,15 @@ msgstr "Connected" msgid "Connection Limit" msgstr "Connection Limit" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Connections" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Country" @@ -820,9 +820,6 @@ msgstr "Default gateway" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Default state" @@ -865,6 +862,9 @@ msgstr "" msgid "Device unreachable" msgstr "" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "Diagnostics" @@ -897,6 +897,9 @@ msgstr "" msgid "Discard upstream RFC1918 responses" msgstr "" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "" @@ -1151,6 +1154,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "" @@ -1344,9 +1350,6 @@ msgstr "Hang Up" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1461,9 +1464,6 @@ msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2039,9 +2039,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Name" @@ -2165,6 +2162,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2216,12 +2216,6 @@ msgstr "" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2682,9 +2676,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2743,6 +2734,15 @@ msgstr "" msgid "Revert" msgstr "Revert" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "" @@ -2758,9 +2758,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2786,14 +2783,6 @@ msgstr "" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2821,9 +2810,6 @@ msgstr "Save" msgid "Save & Apply" msgstr "Save & Apply" -msgid "Save & Apply" -msgstr "" - msgid "Scan" msgstr "Scan" @@ -2850,17 +2836,6 @@ msgstr "Separate Clients" msgid "Server Settings" msgstr "" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "" @@ -2953,9 +2928,6 @@ msgstr "" msgid "Source" msgstr "Source" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -2994,6 +2966,9 @@ msgstr "Start" msgid "Start priority" msgstr "Start priority" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "" @@ -3144,6 +3119,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3165,9 +3150,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "" - msgid "The following changes have been reverted" msgstr "The following changes have been reverted" @@ -3226,11 +3208,6 @@ msgstr "" "settings." msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3240,7 +3217,7 @@ msgstr "" msgid "There are no active leases." msgstr "" -msgid "There are no pending changes to apply!" +msgid "There are no changes to apply." msgstr "" msgid "There are no pending changes to revert!" @@ -3379,15 +3356,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3560,12 +3528,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" @@ -3597,16 +3559,15 @@ msgstr "" "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " "and ad-hoc mode) to be installed." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3621,12 +3582,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3767,9 +3722,6 @@ msgstr "" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "local <abbr title=\"Domain Name System\">DNS</abbr> file" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" @@ -3845,6 +3797,15 @@ msgstr "" msgid "« Back" msgstr "« Back" +#~ msgid "Apply" +#~ msgstr "Apply" + +#~ msgid "Applying changes" +#~ msgstr "Applying changes" + +#~ msgid "Configuration applied." +#~ msgstr "Configuration applied." + #~ msgid "Action" #~ msgstr "Action" diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index 8aed2e9ee3..3a408e4c7c 100644 --- a/modules/luci-base/po/es/base.po +++ b/modules/luci-base/po/es/base.po @@ -174,9 +174,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -213,9 +210,6 @@ msgstr "Número de dispositivo ATM" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Concentrador de acceso" @@ -323,11 +317,6 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -406,11 +395,11 @@ msgstr "Configuración de la antena" msgid "Any zone" msgstr "Cualquier zona" -msgid "Apply" -msgstr "Aplicar" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "Aplicando cambios" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -516,9 +505,6 @@ msgstr "¡Dirección no válida!" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -591,12 +577,20 @@ msgstr "Cambios" msgid "Changes applied." msgstr "Cambios aplicados." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Cambie la contraseña del administrador para acceder al dispositivo" msgid "Channel" msgstr "Canal" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Comprobar" @@ -677,12 +671,15 @@ msgstr "" msgid "Configuration" msgstr "Configuración" -msgid "Configuration applied." -msgstr "Configuración establecida." - msgid "Configuration files will be kept." msgstr "Se mantendrán los ficheros de configuración." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Confirmación" @@ -695,12 +692,15 @@ msgstr "Conectado" msgid "Connection Limit" msgstr "Límite de conexión" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Conexiones" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "País" @@ -829,9 +829,6 @@ msgstr "Gateway por defecto" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Estado por defecto" @@ -874,6 +871,9 @@ msgstr "" msgid "Device unreachable" msgstr "" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "Diagnósticos" @@ -908,6 +908,9 @@ msgstr "" msgid "Discard upstream RFC1918 responses" msgstr "Descartar respuestas RFC1918 salientes" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Mostrar sólo paquete que contienen" @@ -1169,6 +1172,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Fichero" @@ -1365,9 +1371,6 @@ msgstr "Suspender" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1483,9 +1486,6 @@ msgstr "Estado de la WAN IPv6" msgid "IPv6 address" msgstr "Dirección IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2078,9 +2078,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Servidores NTP a consultar" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nombre" @@ -2204,6 +2201,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "Retraso de desconexión" @@ -2254,12 +2254,6 @@ msgstr "Opción eliminada" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2736,9 +2730,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2797,6 +2788,15 @@ msgstr "Mostrar/ocultar contraseña" msgid "Revert" msgstr "Anular" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Raíz" @@ -2812,9 +2812,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2840,14 +2837,6 @@ msgstr "Comprobar el sistema de ficheros" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2875,9 +2864,6 @@ msgstr "Guardar" msgid "Save & Apply" msgstr "Guardar y aplicar" -msgid "Save & Apply" -msgstr "Guardar y aplicar" - msgid "Scan" msgstr "Explorar" @@ -2906,17 +2892,6 @@ msgstr "Aislar clientes" msgid "Server Settings" msgstr "Configuración del servidor" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Nombre de servicio" @@ -3013,9 +2988,6 @@ msgstr "Ordenar" msgid "Source" msgstr "Origen" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "Especifica el directorio al que está enlazado el dispositivo" @@ -3059,6 +3031,9 @@ msgstr "Arrancar" msgid "Start priority" msgstr "Prioridad de arranque" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "Arranque" @@ -3226,6 +3201,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3250,9 +3235,6 @@ msgstr "" "coinciden con los del original.<br />Pulse \"Proceder\" para empezar el " "grabado." -msgid "The following changes have been committed" -msgstr "Se han hecho los siguientes cambios" - msgid "The following changes have been reverted" msgstr "Se han anulado los siguientes cambios" @@ -3322,11 +3304,6 @@ msgstr "" "conexión de su ordenador para poder acceder de nuevo al dispositivo." msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3336,8 +3313,8 @@ msgstr "" msgid "There are no active leases." msgstr "Sin cesiones activas." -msgid "There are no pending changes to apply!" -msgstr "¡No hay cambios pendientes!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "¡No hay cambios a anular!" @@ -3488,15 +3465,6 @@ msgstr "Interfaz de túnel" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Potencia-TX" @@ -3676,12 +3644,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "Clase de vendedor a enviar cuando solicite DHCP" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Verificar" @@ -3713,16 +3675,15 @@ msgstr "" "WPA-Encryption necesita que estén instalados wpa_supplicant (para el modo " "cliente o hostapd (para los modos AP y ad-hoc)." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "Esperando a que se realicen los cambios..." msgid "Waiting for command to complete..." msgstr "Esperando a que termine el comando..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3737,12 +3698,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3885,9 +3840,6 @@ msgstr "Kbit/s" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "Archvo <abbr title=\"Domain Name System\">DNS</abbr> local" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" @@ -3963,6 +3915,24 @@ msgstr "sí" msgid "« Back" msgstr "« Volver" +#~ msgid "Apply" +#~ msgstr "Aplicar" + +#~ msgid "Applying changes" +#~ msgstr "Aplicando cambios" + +#~ msgid "Configuration applied." +#~ msgstr "Configuración establecida." + +#~ msgid "Save & Apply" +#~ msgstr "Guardar y aplicar" + +#~ msgid "The following changes have been committed" +#~ msgstr "Se han hecho los siguientes cambios" + +#~ msgid "There are no pending changes to apply!" +#~ msgstr "¡No hay cambios pendientes!" + #~ msgid "Action" #~ msgstr "Acción" diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po index e09343815d..777117f3e6 100644 --- a/modules/luci-base/po/fr/base.po +++ b/modules/luci-base/po/fr/base.po @@ -173,9 +173,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -216,9 +213,6 @@ msgstr "Numéro de périphérique ATM" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Concentrateur d'accès" @@ -329,11 +323,6 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -412,11 +401,11 @@ msgstr "Configuration de l'antenne" msgid "Any zone" msgstr "N'importe quelle zone" -msgid "Apply" -msgstr "Appliquer" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "Changements en cours" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -522,9 +511,6 @@ msgstr "Adresse spécifiée incorrecte!" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -596,12 +582,20 @@ msgstr "Changements" msgid "Changes applied." msgstr "Changements appliqués." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Change le mot de passe administrateur pour accéder à l'équipement" msgid "Channel" msgstr "Canal" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Vérification" @@ -684,12 +678,15 @@ msgstr "" msgid "Configuration" msgstr "Configuration" -msgid "Configuration applied." -msgstr "Configuration appliquée." - msgid "Configuration files will be kept." msgstr "Les fichiers de configuration seront préservés." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Confirmation" @@ -702,12 +699,15 @@ msgstr "Connecté" msgid "Connection Limit" msgstr "Limite de connexion" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Connexions" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Pays" @@ -836,9 +836,6 @@ msgstr "Passerelle par défaut" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "État par défaut" @@ -881,6 +878,9 @@ msgstr "" msgid "Device unreachable" msgstr "" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "Diagnostics" @@ -915,6 +915,9 @@ msgstr "" msgid "Discard upstream RFC1918 responses" msgstr "Jeter les réponses en RFC1918 amont" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "N'afficher que les paquets contenant" @@ -1181,6 +1184,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Fichier" @@ -1376,9 +1382,6 @@ msgstr "Signal (HUP)" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1495,9 +1498,6 @@ msgstr "État IPv6 du WAN" msgid "IPv6 address" msgstr "Adresse IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2092,9 +2092,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Serveurs NTP candidats" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nom" @@ -2218,6 +2215,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "Durée éteinte" @@ -2267,12 +2267,6 @@ msgstr "Option retirée" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2749,9 +2743,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2810,6 +2801,15 @@ msgstr "Montrer/cacher le mot de passe" msgid "Revert" msgstr "Revenir" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Racine" @@ -2825,9 +2825,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2854,14 +2851,6 @@ msgstr "Faire une vérification du système de fichiers" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2889,9 +2878,6 @@ msgstr "Sauvegarder" msgid "Save & Apply" msgstr "Sauvegarder et Appliquer" -msgid "Save & Apply" -msgstr "Sauvegarder et appliquer" - msgid "Scan" msgstr "Scan" @@ -2920,17 +2906,6 @@ msgstr "Isoler les clients" msgid "Server Settings" msgstr "Paramètres du serveur" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Nom du service" @@ -3028,9 +3003,6 @@ msgstr "Trier" msgid "Source" msgstr "Source" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "Indique le répertoire auquel le périphérique est rattaché" @@ -3071,6 +3043,9 @@ msgstr "Démarrer" msgid "Start priority" msgstr "Priorité de démarrage" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "Démarrage" @@ -3238,6 +3213,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "Le périphérique de bloc contenant la partition (ex : /dev/sda1)" @@ -3260,9 +3245,6 @@ msgstr "" "assurer de son intégrité.<br /> Cliquez sur \"Continuer\" pour lancer la " "procédure d'écriture." -msgid "The following changes have been committed" -msgstr "Les changements suivants ont été appliqués" - msgid "The following changes have been reverted" msgstr "Les changements suivants ont été annulés" @@ -3335,11 +3317,6 @@ msgstr "" "settings." msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3349,8 +3326,8 @@ msgstr "" msgid "There are no active leases." msgstr "Il n'y a aucun bail actif." -msgid "There are no pending changes to apply!" -msgstr "Il n'y a aucun changement en attente d'être appliqués !" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Il n'y a aucun changement à annuler !" @@ -3506,15 +3483,6 @@ msgstr "Interface du tunnel" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Puissance d'émission" @@ -3695,12 +3663,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "Classe de fournisseur à envoyer dans les requêtes DHCP" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Vérifier" @@ -3732,16 +3694,15 @@ msgstr "" "Le chiffrage WPA nécessite l'installation du paquet wpa_supplicant (en mode " "client) ou hostapd (en mode Point d'accès ou Ad-hoc)." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "En attente de l'application des changements..." msgid "Waiting for command to complete..." msgstr "En attente de la fin de la commande..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3756,12 +3717,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3903,9 +3858,6 @@ msgstr "kbit/s" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "fichier de résolution local" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" @@ -3981,6 +3933,24 @@ msgstr "oui" msgid "« Back" msgstr "« Retour" +#~ msgid "Apply" +#~ msgstr "Appliquer" + +#~ msgid "Applying changes" +#~ msgstr "Changements en cours" + +#~ msgid "Configuration applied." +#~ msgstr "Configuration appliquée." + +#~ msgid "Save & Apply" +#~ msgstr "Sauvegarder et appliquer" + +#~ msgid "The following changes have been committed" +#~ msgstr "Les changements suivants ont été appliqués" + +#~ msgid "There are no pending changes to apply!" +#~ msgstr "Il n'y a aucun changement en attente d'être appliqués !" + #~ msgid "Action" #~ msgstr "Action" diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po index cb4c74a3f6..5a179a3063 100644 --- a/modules/luci-base/po/he/base.po +++ b/modules/luci-base/po/he/base.po @@ -163,9 +163,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -203,9 +200,6 @@ msgstr "מס' התקן של ATM" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - #, fuzzy msgid "Access Concentrator" msgstr "מרכז גישות" @@ -316,11 +310,6 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -401,11 +390,11 @@ msgstr "הגדרות אנטנה" msgid "Any zone" msgstr "כל תחום" -msgid "Apply" -msgstr "החל" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "מחיל הגדרות" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -511,9 +500,6 @@ msgstr "פורטה כתובת לא תקינה" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -586,12 +572,20 @@ msgstr "שינויים" msgid "Changes applied." msgstr "השינויים הוחלו" +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "משנה את סיסמת המנהל לגישה למכשיר" msgid "Channel" msgstr "ערוץ" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "לבדוק" @@ -661,12 +655,15 @@ msgstr "" msgid "Configuration" msgstr "הגדרות" -msgid "Configuration applied." -msgstr "הגדרות הוחלו" - msgid "Configuration files will be kept." msgstr "קבצי ההגדרות ישמרו." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "אישור" @@ -679,12 +676,15 @@ msgstr "מחובר" msgid "Connection Limit" msgstr "מגבלת חיבורים" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "חיבורים" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "מדינה" @@ -813,9 +813,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "" @@ -857,6 +854,9 @@ msgstr "" msgid "Device unreachable" msgstr "" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "אבחון" @@ -889,6 +889,9 @@ msgstr "" msgid "Discard upstream RFC1918 responses" msgstr "" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "מציג רק חבילות המכילות" @@ -1136,6 +1139,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "" @@ -1329,9 +1335,6 @@ msgstr "" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1444,9 +1447,6 @@ msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2012,9 +2012,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "שם" @@ -2138,6 +2135,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2183,12 +2183,6 @@ msgstr "" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2650,9 +2644,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2711,6 +2702,15 @@ msgstr "" msgid "Revert" msgstr "" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "" @@ -2726,9 +2726,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2752,14 +2749,6 @@ msgstr "הרץ בדיקת מערכת קבצים" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2787,9 +2776,6 @@ msgstr "" msgid "Save & Apply" msgstr "" -msgid "Save & Apply" -msgstr "" - msgid "Scan" msgstr "" @@ -2816,17 +2802,6 @@ msgstr "" msgid "Server Settings" msgstr "" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "" @@ -2922,9 +2897,6 @@ msgstr "מיין" msgid "Source" msgstr "מקור" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -2963,6 +2935,9 @@ msgstr "" msgid "Start priority" msgstr "" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "אתחול" @@ -3116,6 +3091,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3132,9 +3117,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "" - msgid "The following changes have been reverted" msgstr "" @@ -3189,11 +3171,6 @@ msgid "" msgstr "" msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3201,7 +3178,7 @@ msgstr "" msgid "There are no active leases." msgstr "" -msgid "There are no pending changes to apply!" +msgid "There are no changes to apply." msgstr "" msgid "There are no pending changes to revert!" @@ -3337,15 +3314,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "עוצמת שידור" @@ -3518,12 +3486,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" @@ -3553,16 +3515,15 @@ msgid "" "and ad-hoc mode) to be installed." msgstr "" -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3577,12 +3538,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3718,9 +3673,6 @@ msgstr "" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" @@ -3796,6 +3748,15 @@ msgstr "כן" msgid "« Back" msgstr "<< אחורה" +#~ msgid "Apply" +#~ msgstr "החל" + +#~ msgid "Applying changes" +#~ msgstr "מחיל הגדרות" + +#~ msgid "Configuration applied." +#~ msgstr "הגדרות הוחלו" + #~ msgid "Action" #~ msgstr "פעולה" diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po index e49b5303f0..f8cee36c43 100644 --- a/modules/luci-base/po/hu/base.po +++ b/modules/luci-base/po/hu/base.po @@ -170,9 +170,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -209,9 +206,6 @@ msgstr "ATM eszközszám" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Elérési központ" @@ -322,11 +316,6 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -405,11 +394,11 @@ msgstr "Antenna beállítások" msgid "Any zone" msgstr "Bármelyik zóna" -msgid "Apply" -msgstr "Alkalmaz" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "Módosítások alkalmazása" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -515,9 +504,6 @@ msgstr "Hibás címet adott meg!" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -590,6 +576,9 @@ msgstr "Módosítások" msgid "Changes applied." msgstr "A módosítások alkalmazva." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "" "Itt módosíthatja az eszköz eléréséhez szükséges adminisztrátori jelszót" @@ -597,6 +586,11 @@ msgstr "" msgid "Channel" msgstr "Csatorna" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Ellenőrzés" @@ -679,12 +673,15 @@ msgstr "" msgid "Configuration" msgstr "Beállítás" -msgid "Configuration applied." -msgstr "Beállítások alkalmazva." - msgid "Configuration files will be kept." msgstr "A konfigurációs fájlok megmaradnak." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Megerősítés" @@ -697,12 +694,15 @@ msgstr "Kapcsolódva" msgid "Connection Limit" msgstr "Kapcsolati korlát" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Kapcsolatok" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Ország" @@ -831,9 +831,6 @@ msgstr "Alapértelmezett átjáró" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Alapértelmezett állapot" @@ -875,6 +872,9 @@ msgstr "" msgid "Device unreachable" msgstr "" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "Diagnosztika" @@ -909,6 +909,9 @@ msgstr "" msgid "Discard upstream RFC1918 responses" msgstr "Beérkező RFC1918 DHCP válaszok elvetése. " +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Csak azon csomagok megjelenítése, amelyek tartalmazzák" @@ -1170,6 +1173,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Fájl" @@ -1365,9 +1371,6 @@ msgstr "Befejezés" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1484,9 +1487,6 @@ msgstr "IPv6 WAN állapot" msgid "IPv6 address" msgstr "IPv6 cím" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2081,9 +2081,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Kijelölt NTP kiszolgálók" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Név" @@ -2207,6 +2204,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "Kikapcsolt állapot késleltetés" @@ -2257,12 +2257,6 @@ msgstr "Beállítás eltávolítva" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2740,9 +2734,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2802,6 +2793,15 @@ msgstr "Jelszó mutatása/elrejtése" msgid "Revert" msgstr "Visszavonás" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Gyökérkönyvtár" @@ -2817,9 +2817,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2845,14 +2842,6 @@ msgstr "Fájlrendszer ellenőrzés futtatása" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2880,9 +2869,6 @@ msgstr "Mentés" msgid "Save & Apply" msgstr "Mentés & Alkalmazás" -msgid "Save & Apply" -msgstr "Mentés & Alkalmazás" - msgid "Scan" msgstr "Felderítés" @@ -2911,17 +2897,6 @@ msgstr "Kliensek szétválasztása" msgid "Server Settings" msgstr "Kiszolgáló beállításai" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Szolgáltatás neve" @@ -3018,9 +2993,6 @@ msgstr "Sorbarendezés" msgid "Source" msgstr "Forrás" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "Megadja az eszköz csatlakozási könyvtárát." @@ -3062,6 +3034,9 @@ msgstr "Indítás" msgid "Start priority" msgstr "Indítás prioritása" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "Rendszerindítás" @@ -3227,6 +3202,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3252,9 +3237,6 @@ msgstr "" "ellenőrzéséhez.<br />Kattintson az alábbi \"Folytatás\" gombra a flash-elési " "eljárás elindításához." -msgid "The following changes have been committed" -msgstr "A következő módosítások lettek alkalmazva" - msgid "The following changes have been reverted" msgstr "A következő módosítások lettek visszavonva" @@ -3324,11 +3306,6 @@ msgstr "" "megújítása." msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3338,8 +3315,8 @@ msgstr "" msgid "There are no active leases." msgstr "Nincsenek aktív bérletek." -msgid "There are no pending changes to apply!" -msgstr "Nincsenek alkalmazásra váró módosítások!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Nincsenek visszavonásra váró változtatások!" @@ -3494,15 +3471,6 @@ msgstr "Tunnel interfész" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Adóteljesítmény" @@ -3682,12 +3650,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "DHCP kérés során küldendő 'Vendor Class'" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Ellenőrzés" @@ -3719,16 +3681,15 @@ msgstr "" "WPA titkosításhoz kliens módnál 'wpa_supplicant', hozzáférési pont illetve " "ad-hoc módnál 'hostapd' telepítése szükséges." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "Várakozás a változtatások alkalmazására..." msgid "Waiting for command to complete..." msgstr "Várakozás a parancs befejezésére..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3743,12 +3704,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3892,9 +3847,6 @@ msgstr "kbit/s" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "helyi <abbr title=\"Domain Name System\">DNS</abbr> fájl" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" @@ -3970,6 +3922,24 @@ msgstr "igen" msgid "« Back" msgstr "« Vissza" +#~ msgid "Apply" +#~ msgstr "Alkalmaz" + +#~ msgid "Applying changes" +#~ msgstr "Módosítások alkalmazása" + +#~ msgid "Configuration applied." +#~ msgstr "Beállítások alkalmazva." + +#~ msgid "Save & Apply" +#~ msgstr "Mentés & Alkalmazás" + +#~ msgid "The following changes have been committed" +#~ msgstr "A következő módosítások lettek alkalmazva" + +#~ msgid "There are no pending changes to apply!" +#~ msgstr "Nincsenek alkalmazásra váró módosítások!" + #~ msgid "Action" #~ msgstr "Művelet" diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po index ce866d9e7b..0bc37e4d0c 100644 --- a/modules/luci-base/po/it/base.po +++ b/modules/luci-base/po/it/base.po @@ -177,9 +177,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -216,9 +213,6 @@ msgstr "Numero dispositivo ATM " msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Accesso Concentratore" @@ -331,11 +325,6 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -414,11 +403,11 @@ msgstr "Configurazione dell'Antenna" msgid "Any zone" msgstr "Qualsiasi Zona" -msgid "Apply" -msgstr "Applica" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "Applica modifiche" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -524,9 +513,6 @@ msgstr "E' stato specificato un indirizzo errato!" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -598,12 +584,20 @@ msgstr "Modifiche" msgid "Changes applied." msgstr "Modifiche applicate." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Cambia la password di amministratore per accedere al dispositivo" msgid "Channel" msgstr "Canale" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Verifica" @@ -684,12 +678,15 @@ msgstr "" msgid "Configuration" msgstr "Configurazione" -msgid "Configuration applied." -msgstr "Configurazione salvata." - msgid "Configuration files will be kept." msgstr "I file di configurazione verranno mantenuti." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Conferma" @@ -702,12 +699,15 @@ msgstr "Connesso" msgid "Connection Limit" msgstr "Limite connessioni" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Connessioni" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Nazione" @@ -836,9 +836,6 @@ msgstr "Gateway predefinito" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Stato Predefinito" @@ -881,6 +878,9 @@ msgstr "Dispositivo in riavvio..." msgid "Device unreachable" msgstr "Dispositivo irraggiungibile" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "Diagnostica" @@ -915,6 +915,9 @@ msgstr "Disabilitato (default)" msgid "Discard upstream RFC1918 responses" msgstr "Ignora risposte RFC1918 upstream" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Visualizza solo i pacchetti contenenti" @@ -1174,6 +1177,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "File" @@ -1369,9 +1375,6 @@ msgstr "Hangup" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1489,9 +1492,6 @@ msgstr "Stato WAN IPv6" msgid "IPv6 address" msgstr "Indirizzi IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2081,9 +2081,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Candidati server NTP" -msgid "NTP sync time-out" -msgstr "Sincronizzazione NTP scaduta" - msgid "Name" msgstr "Nome" @@ -2207,6 +2204,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2257,12 +2257,6 @@ msgstr "Opzione cancellata" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2633,13 +2627,15 @@ msgid "" "Really shut down network?\\nYou might lose access to this device if you are " "connected via this interface." msgstr "" -"Vuoi davvero spegnere questa interfaccia \"%s\" ?\\nPotresti perdere " -"l'accesso a questo router se stai usando questa interfaccia." +"Vuoi davvero spegnere questa interfaccia?\\nPotresti perdere " +"l'accesso a questo router se sei connesso usando questa interfaccia." msgid "" "Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " "you are connected via this interface." msgstr "" +"Vuoi davvero spegnere questa interfaccia \"%s\" ?\\nPotresti perdere " +"l'accesso a questo router se stai usando questa interfaccia." msgid "Really switch protocol?" msgstr "Cambiare veramente il protocollo?" @@ -2728,9 +2724,6 @@ msgstr "Richiede indirizzo-IPv6" msgid "Request IPv6-prefix of length" msgstr "Richiede prefisso-IPv6 di lunghezza" -msgid "Require TLS" -msgstr "Richiede TLS" - msgid "Required" msgstr "Richiesto" @@ -2789,6 +2782,15 @@ msgstr "Rivela/nascondi password" msgid "Revert" msgstr "Ripristina" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "" @@ -2804,9 +2806,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2832,14 +2831,6 @@ msgstr "Esegui controllo del filesystem" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2867,9 +2858,6 @@ msgstr "Salva" msgid "Save & Apply" msgstr "Salva & applica" -msgid "Save & Apply" -msgstr "Salva & Applica" - msgid "Scan" msgstr "Scan" @@ -2896,17 +2884,6 @@ msgstr "Isola utenti" msgid "Server Settings" msgstr "Impostazioni Server" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "" @@ -3003,9 +2980,6 @@ msgstr "Ordina" msgid "Source" msgstr "Origine" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "Specifica la cartella a cui è collegato il dispositivo in" @@ -3048,6 +3022,9 @@ msgstr "Inizio" msgid "Start priority" msgstr "Priorità di avvio" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "Avvio" @@ -3213,6 +3190,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3233,9 +3220,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "" - msgid "The following changes have been reverted" msgstr "Le seguenti modifiche sono state annullate" @@ -3294,11 +3278,6 @@ msgstr "" "settings." msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3308,8 +3287,8 @@ msgstr "" msgid "There are no active leases." msgstr "Non ci sono contratti attivi." -msgid "There are no pending changes to apply!" -msgstr "Non ci sono cambiamenti pendenti da applicare!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Non ci sono cambiamenti pendenti da regredire" @@ -3451,15 +3430,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3641,12 +3611,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "Classe del Produttore da 'inviare al momento della richiesta DHCP" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Verifica" @@ -3678,18 +3642,15 @@ msgstr "" "La crittografia WPA richiede wpa_supplicant (per la modalità client) o " "hostapd (per AP e modalità ad hoc) per essere installato." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" -"Attendi sincro NTP quei dati secondi, immetti 0 per disabilitare l'attesa " -"(opzionale)" - msgid "Waiting for changes to be applied..." msgstr "In attesa delle modifiche da applicare ..." msgid "Waiting for command to complete..." msgstr "In attesa del comando da completare..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3704,12 +3665,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3854,9 +3809,6 @@ msgstr "kbit/s" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "File <abbr title=\"Sistema Nome Dominio\">DNS</abbr> locale" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" @@ -3932,84 +3884,3 @@ msgstr "Sì" msgid "« Back" msgstr "« Indietro" -#~ msgid "Action" -#~ msgstr "Azione" - -#~ msgid "Buttons" -#~ msgstr "Pulsanti" - -#~ msgid "Handler" -#~ msgstr "Gestore" - -#~ msgid "Maximum hold time" -#~ msgstr "Tempo massimo di attesa" - -#~ msgid "Minimum hold time" -#~ msgstr "Velocità minima" - -#~ msgid "Specifies the button state to handle" -#~ msgstr "Specifica lo stato del pulsante da gestire" - -#~ msgid "Leasetime" -#~ msgstr "Tempo di contratto" - -#, fuzzy -#~ msgid "automatic" -#~ msgstr "statico" - -#~ msgid "AR Support" -#~ msgstr "Supporto AR" - -#~ msgid "Atheros 802.11%s Wireless Controller" -#~ msgstr "Dispositivo Wireless Atheros 802.11%s" - -#~ msgid "Background Scan" -#~ msgstr "Scansione in background" - -#~ msgid "Compression" -#~ msgstr "Compressione" - -#~ msgid "Disable HW-Beacon timer" -#~ msgstr "Disabilita Timer Beacon HW" - -#~ msgid "Do not send probe responses" -#~ msgstr "Disabilita Probe-Responses" - -#~ msgid "Fast Frames" -#~ msgstr "Frame veloci" - -#~ msgid "Maximum Rate" -#~ msgstr "Velocità massima" - -#~ msgid "Minimum Rate" -#~ msgstr "Velocità minima" - -#~ msgid "Multicast Rate" -#~ msgstr "Velocità multicast" - -#~ msgid "Separate WDS" -#~ msgstr "WDS separati" - -#~ msgid "Static WDS" -#~ msgstr "WDS statico" - -#~ msgid "Turbo Mode" -#~ msgstr "Modalità turbo" - -#~ msgid "XR Support" -#~ msgstr "Supporto XR" - -#~ msgid "An additional network will be created if you leave this unchecked." -#~ msgstr "Sarà creata una rete aggiuntiva se lasci questo senza spunta." - -#~ msgid "Join Network: Settings" -#~ msgstr "Aggiunta Rete: Impostazioni" - -#~ msgid "CPU" -#~ msgstr "CPU" - -#~ msgid "Port %d" -#~ msgstr "Porta %d" - -#~ msgid "VLAN Interface" -#~ msgstr "Interfaccia VLAN" diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index 07eeec5ee3..ed36969885 100644 --- a/modules/luci-base/po/ja/base.po +++ b/modules/luci-base/po/ja/base.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-06-10 03:40+0200\n" -"PO-Revision-Date: 2018-05-03 00:23+0900\n" +"PO-Revision-Date: 2018-05-21 00:47+0900\n" "Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -175,9 +175,6 @@ msgstr "A43C + J43 + A43 + V43" msgid "ADSL" msgstr "ADSL" -msgid "AICCU (SIXXS)" -msgstr "AICCU (SIXXS)" - msgid "ANSI T1.413" msgstr "ANSI T1.413" @@ -211,9 +208,6 @@ msgstr "ATMデバイス番号" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Access Concentrator" @@ -321,11 +315,6 @@ msgstr "" msgid "Allowed IPs" msgstr "許可されるIP" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "常にデフォルト ルーターとして通知する" @@ -406,11 +395,11 @@ msgstr "アンテナ設定" msgid "Any zone" msgstr "全てのゾーン" -msgid "Apply" -msgstr "適用" +msgid "Apply request failed with status <code>%h</code>" +msgstr "適用リクエストはステータス <code>%h</code> により失敗しました" -msgid "Applying changes" -msgstr "変更を適用" +msgid "Apply unchecked" +msgstr "チェックなしの適用" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -516,9 +505,6 @@ msgstr "無効なアドレスです!" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -593,12 +579,22 @@ msgstr "変更" msgid "Changes applied." msgstr "変更が適用されました。" +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "デバイスの管理者パスワードを変更します" msgid "Channel" msgstr "チャネル" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" +"チャンネル %d は、 %s 領域内では規制により利用できません。%d へ自動調整されま" +"した。" + msgid "Check" msgstr "チェック" @@ -685,12 +681,15 @@ msgstr "" msgid "Configuration" msgstr "設定" -msgid "Configuration applied." -msgstr "設定を適用しました。" - msgid "Configuration files will be kept." msgstr "設定ファイルは保持されます。" +msgid "Configuration has been applied." +msgstr "設定が適用されました。" + +msgid "Configuration has been rolled back!" +msgstr "設定はロールバックされました！" + msgid "Confirmation" msgstr "確認" @@ -703,12 +702,18 @@ msgstr "接続中" msgid "Connection Limit" msgstr "接続制限" -msgid "Connection to server fails when TLS cannot be used" -msgstr "TLSが使用できないとき、サーバーへの接続は失敗します。" - msgid "Connections" msgstr "ネットワーク接続" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" +"設定の変更を適用後、デバイスへのアクセスを回復できませんでした。もし IP アド" +"レスや無線のセキュリティ認証情報などのネットワーク関連の設定を変更した場合、" +"再接続が必要かもしれません。" + msgid "Country" msgstr "国" @@ -841,9 +846,6 @@ msgstr "デフォルト ゲートウェイ" msgid "Default is stateless + stateful" msgstr "デフォルトは ステートレス + ステートフル です。" -msgid "Default route" -msgstr "デフォルト ルート" - msgid "Default state" msgstr "標準状態" @@ -885,6 +887,9 @@ msgstr "デバイスを再起動中です..." msgid "Device unreachable" msgstr "デバイスに到達できません" +msgid "Device unreachable!" +msgstr "デバイスに到達できません！" + msgid "Diagnostics" msgstr "診断機能" @@ -919,6 +924,9 @@ msgstr "無効（デフォルト）" msgid "Discard upstream RFC1918 responses" msgstr "RFC1918の応答を破棄します" +msgid "Dismiss" +msgstr "警告の除去" + msgid "Displaying only packages containing" msgstr "右記の文字列を含んだパッケージのみを表示中" @@ -1180,6 +1188,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "%d 秒以内の適用を確認できませんでした。ロールバック中です..." + msgid "File" msgstr "ファイル" @@ -1378,9 +1389,6 @@ msgstr "再起動" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "ハートビート" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1495,9 +1503,6 @@ msgstr "IPv6 WAN ステータス" msgid "IPv6 address" msgstr "IPv6 アドレス" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2092,9 +2097,6 @@ msgstr "NT ドメイン" msgid "NTP server candidates" msgstr "NTPサーバー候補" -msgid "NTP sync time-out" -msgstr "NTP 同期タイムアウト" - msgid "Name" msgstr "名前" @@ -2220,6 +2222,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "消灯時間" @@ -2271,12 +2276,6 @@ msgstr "削除されるオプション" msgid "Optional" msgstr "オプション" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2759,9 +2758,6 @@ msgstr "IPv6-アドレスのリクエスト" msgid "Request IPv6-prefix of length" msgstr "リクエストするIPv6-プレフィクス長" -msgid "Require TLS" -msgstr "TLSが必要" - msgid "Required" msgstr "必須" @@ -2822,6 +2818,15 @@ msgstr "パスワードを表示する/隠す" msgid "Revert" msgstr "元に戻す" +msgid "Revert changes" +msgstr "変更の取り消し" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "取り消しのリクエストはステータス <code>%h</code> により失敗しました" + +msgid "Reverting configuration…" +msgstr "設定を元に戻しています..." + msgid "Root" msgstr "ルート" @@ -2837,9 +2842,6 @@ msgstr "" msgid "Route type" msgstr "ルート タイプ" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "ルーター アドバタイズメント-サービス" @@ -2865,14 +2867,6 @@ msgstr "ファイルシステムチェックを行う" msgid "SHA256" msgstr "SHA256" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "SNR" @@ -2900,9 +2894,6 @@ msgstr "保存" msgid "Save & Apply" msgstr "保存 & 適用" -msgid "Save & Apply" -msgstr "保存 & 適用" - msgid "Scan" msgstr "スキャン" @@ -2931,17 +2922,6 @@ msgstr "クライアントの分離" msgid "Server Settings" msgstr "サーバー設定" -msgid "Server password" -msgstr "サーバー パスワード" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "サーバー ユーザー名" - msgid "Service Name" msgstr "サービス名" @@ -3037,9 +3017,6 @@ msgstr "ソート" msgid "Source" msgstr "送信元" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "デバイスが接続するディレクトリを設定します" @@ -3078,6 +3055,9 @@ msgstr "開始" msgid "Start priority" msgstr "優先順位" +msgid "Starting configuration apply…" +msgstr "設定の適用を開始しています..." + msgid "Startup" msgstr "スタートアップ" @@ -3240,6 +3220,22 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "設定ファイルは以下のエラーにより読み込めませんでした:" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" +"未適用の変更を適用後、デバイスは %d 秒以内に完了できなかった可能性がありま" +"す。これは、安全上の理由によりロールバックされる設定に起因するものです。それ" +"でも設定の変更が正しいと思う場合は、チェックなしの変更の適用を行ってくださ" +"い。もしくは、再度適用を試行する前にこの警告を除去して設定内容の編集を行う" +"か、現在動作している設定状況を維持するために未適用の変更を取り消してくださ" +"い。" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3264,9 +3260,6 @@ msgstr "" "イズです。オリジナルファイルと比較し、整合性を確認してください。<br />\"続行" "\"ボタンをクリックすると、更新処理を開始します。" -msgid "The following changes have been committed" -msgstr "以下の変更が適用されました" - msgid "The following changes have been reverted" msgstr "以下の変更が取り消されました" @@ -3332,11 +3325,6 @@ msgstr "" "ればならない場合があります。" msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3347,8 +3335,8 @@ msgstr "" msgid "There are no active leases." msgstr "リース中のIPアドレスはありません。" -msgid "There are no pending changes to apply!" -msgstr "適用が未完了の変更はありません！" +msgid "There are no changes to apply." +msgstr "適用する変更はありません。" msgid "There are no pending changes to revert!" msgstr "復元が未完了の変更はありません！" @@ -3504,15 +3492,6 @@ msgstr "トンネルインターフェース" msgid "Tunnel Link" msgstr "トンネルリンク" -msgid "Tunnel broker protocol" -msgstr "トンネルブローカー プロトコル" - -msgid "Tunnel setup server" -msgstr "トンネルセットアップ サーバー" - -msgid "Tunnel type" -msgstr "トンネルタイプ" - msgid "Tx-Power" msgstr "送信電力" @@ -3693,12 +3672,6 @@ msgstr "ベンダー" msgid "Vendor Class to send when requesting DHCP" msgstr "DHCPリクエスト送信時のベンダークラスを設定" -msgid "Verbose" -msgstr "詳細" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "確認" @@ -3731,16 +3704,15 @@ msgstr "" "hostapd (アクセスポイント及びアドホック) がインストールされている必要がありま" "す。" -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "変更を適用中です..." msgid "Waiting for command to complete..." msgstr "コマンド実行中です..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "設定を適用中です... %d 秒" + msgid "Waiting for device..." msgstr "デバイスを起動中です..." @@ -3755,12 +3727,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "帯域幅" @@ -3905,9 +3871,6 @@ msgstr "kbit/s" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "ローカル <abbr title=\"Domain Name System\">DNS</abbr>ファイル" -msgid "minimum 1280, maximum 1480" -msgstr "最小値 1280、最大値 1480" - msgid "minutes" msgstr "分" diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po index e4f77c78f5..50dc84e4d1 100644 --- a/modules/luci-base/po/ko/base.po +++ b/modules/luci-base/po/ko/base.po @@ -168,9 +168,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -204,9 +201,6 @@ msgstr "" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "" @@ -311,11 +305,6 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -394,10 +383,10 @@ msgstr "" msgid "Any zone" msgstr "" -msgid "Apply" -msgstr "적용" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" +msgid "Apply unchecked" msgstr "" msgid "" @@ -504,9 +493,6 @@ msgstr "" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -580,12 +566,20 @@ msgstr "변경 사항" msgid "Changes applied." msgstr "" +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "장비 접근을 위한 관리자 암호를 변경합니다" msgid "Channel" msgstr "" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "" @@ -664,10 +658,13 @@ msgstr "" msgid "Configuration" msgstr "설정" -msgid "Configuration applied." +msgid "Configuration files will be kept." msgstr "" -msgid "Configuration files will be kept." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" msgstr "" msgid "Confirmation" @@ -682,12 +679,15 @@ msgstr "연결 시간" msgid "Connection Limit" msgstr "" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "연결" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "" @@ -818,9 +818,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "기본 상태" @@ -863,6 +860,9 @@ msgstr "" msgid "Device unreachable" msgstr "" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "진단" @@ -897,6 +897,9 @@ msgstr "" msgid "Discard upstream RFC1918 responses" msgstr "" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "" @@ -1149,6 +1152,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "" @@ -1342,9 +1348,6 @@ msgstr "" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1460,9 +1463,6 @@ msgstr "IPv6 WAN 상태" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2030,9 +2030,6 @@ msgstr "" msgid "NTP server candidates" msgstr "NTP 서버 목록" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "이름" @@ -2156,6 +2153,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2207,12 +2207,6 @@ msgstr "삭제된 option" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2677,9 +2671,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2738,6 +2729,15 @@ msgstr "암호 보이기/숨기기" msgid "Revert" msgstr "변경 취소" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "" @@ -2753,9 +2753,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2781,14 +2778,6 @@ msgstr "" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2816,9 +2805,6 @@ msgstr "저장" msgid "Save & Apply" msgstr "저장 & 적용" -msgid "Save & Apply" -msgstr "저장 & 적용" - msgid "Scan" msgstr "Scan 하기" @@ -2845,17 +2831,6 @@ msgstr "" msgid "Server Settings" msgstr "서버 설정" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "" @@ -2948,9 +2923,6 @@ msgstr "순서" msgid "Source" msgstr "" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -2989,6 +2961,9 @@ msgstr "시작" msgid "Start priority" msgstr "시작 우선순위" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "시작 프로그램" @@ -3147,6 +3122,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3163,9 +3148,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "" - msgid "The following changes have been reverted" msgstr "다음의 변경 사항들이 취소되었습니다" @@ -3224,11 +3206,6 @@ msgid "" msgstr "" msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3236,7 +3213,7 @@ msgstr "" msgid "There are no active leases." msgstr "" -msgid "There are no pending changes to apply!" +msgid "There are no changes to apply." msgstr "" msgid "There are no pending changes to revert!" @@ -3381,15 +3358,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3570,12 +3538,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "DHCP 요청시 전송할 Vendor Class" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" @@ -3605,16 +3567,15 @@ msgid "" "and ad-hoc mode) to be installed." msgstr "" -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "변경 사항이 적용되기를 기다리는 중입니다..." msgid "Waiting for command to complete..." msgstr "실행한 명령이 끝나기를 기다리는 중입니다..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3629,12 +3590,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3776,9 +3731,6 @@ msgstr "" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "local <abbr title=\"Domain Name System\">DNS</abbr> 파일" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" @@ -3854,5 +3806,11 @@ msgstr "" msgid "« Back" msgstr "" +#~ msgid "Apply" +#~ msgstr "적용" + +#~ msgid "Save & Apply" +#~ msgstr "저장 & 적용" + #~ msgid "Leasetime" #~ msgstr "임대 시간" diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index d5c889580b..3f73db88f4 100644 --- a/modules/luci-base/po/ms/base.po +++ b/modules/luci-base/po/ms/base.po @@ -165,9 +165,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -201,9 +198,6 @@ msgstr "" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "" @@ -306,11 +300,6 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -389,11 +378,11 @@ msgstr "" msgid "Any zone" msgstr "" -msgid "Apply" -msgstr "Melaksanakan" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "Melaksanakan perubahan" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -499,9 +488,6 @@ msgstr "" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -570,12 +556,20 @@ msgstr "Laman" msgid "Changes applied." msgstr "Laman diterapkan." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "" msgid "Channel" msgstr "Saluran" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "" @@ -646,10 +640,13 @@ msgstr "" msgid "Configuration" msgstr "Konfigurasi" -msgid "Configuration applied." +msgid "Configuration files will be kept." msgstr "" -msgid "Configuration files will be kept." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" msgstr "" msgid "Confirmation" @@ -664,10 +661,13 @@ msgstr "" msgid "Connection Limit" msgstr "Sambungan Batas" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connections" msgstr "" -msgid "Connections" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." msgstr "" msgid "Country" @@ -796,9 +796,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "" @@ -838,6 +835,9 @@ msgstr "" msgid "Device unreachable" msgstr "" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "" @@ -870,6 +870,9 @@ msgstr "" msgid "Discard upstream RFC1918 responses" msgstr "" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "" @@ -1121,6 +1124,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "" @@ -1314,9 +1320,6 @@ msgstr "Menutup" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1431,9 +1434,6 @@ msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2010,9 +2010,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nama" @@ -2136,6 +2133,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2186,12 +2186,6 @@ msgstr "" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2651,9 +2645,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2712,6 +2703,15 @@ msgstr "" msgid "Revert" msgstr "Kembali" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "" @@ -2727,9 +2727,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2755,14 +2752,6 @@ msgstr "" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2790,9 +2779,6 @@ msgstr "Simpan" msgid "Save & Apply" msgstr "Simpan & Melaksanakan" -msgid "Save & Apply" -msgstr "" - msgid "Scan" msgstr "Scan" @@ -2819,17 +2805,6 @@ msgstr "Pisahkan Pelanggan" msgid "Server Settings" msgstr "" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "" @@ -2922,9 +2897,6 @@ msgstr "" msgid "Source" msgstr "Sumber" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -2963,6 +2935,9 @@ msgstr "Mula" msgid "Start priority" msgstr "" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "" @@ -3116,6 +3091,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "Fail peranti memori atau partisyen, (contohnya: /dev/sda)" @@ -3136,9 +3121,6 @@ msgstr "" "integriti data.<br /> Klik butang terus di bawah untuk memulakan prosedur " "flash." -msgid "The following changes have been committed" -msgstr "" - msgid "The following changes have been reverted" msgstr "Laman berikut telah kembali" @@ -3197,11 +3179,6 @@ msgstr "" "bergantung pada tetapan anda." msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3211,7 +3188,7 @@ msgstr "" msgid "There are no active leases." msgstr "" -msgid "There are no pending changes to apply!" +msgid "There are no changes to apply." msgstr "" msgid "There are no pending changes to revert!" @@ -3352,15 +3329,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3533,12 +3501,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" @@ -3570,16 +3532,15 @@ msgstr "" "WPA-Enkripsi memerlukan pemohan wpa (untuk mod pelanggan) atau hostapd " "(untuk AP dan mod ad-hoc) yang akan dipasangkan." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3594,12 +3555,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3735,9 +3690,6 @@ msgstr "" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "Fail DNS tempatan" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" @@ -3813,6 +3765,12 @@ msgstr "" msgid "« Back" msgstr "« Kembali" +#~ msgid "Apply" +#~ msgstr "Melaksanakan" + +#~ msgid "Applying changes" +#~ msgstr "Melaksanakan perubahan" + #~ msgid "Action" #~ msgstr "Aksi" diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po index 1805d8e990..d938c540fc 100644 --- a/modules/luci-base/po/no/base.po +++ b/modules/luci-base/po/no/base.po @@ -167,9 +167,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -210,9 +207,6 @@ msgstr "<abbr title=\"Asynchronous Transfer Mode\">ATM</abbr> enhetsnummer" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Tilgangskonsentrator" @@ -315,11 +309,6 @@ msgstr "Tillat oppstrøms svar i 127.0.0.0/8 nettet, f.eks for RBL tjenester" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -398,11 +387,11 @@ msgstr "Antennekonfigurasjon" msgid "Any zone" msgstr "Alle soner" -msgid "Apply" -msgstr "Bruk" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "Utfører endringer" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -508,9 +497,6 @@ msgstr "Ugyldig adresse oppgitt!" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -582,12 +568,20 @@ msgstr "Endringer" msgid "Changes applied." msgstr "Endringer utført." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Endrer administrator passordet for tilgang til enheten" msgid "Channel" msgstr "Kanal" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Kontroller" @@ -668,12 +662,15 @@ msgstr "" msgid "Configuration" msgstr "Konfigurasjon" -msgid "Configuration applied." -msgstr "Konfigurasjons endring utført." - msgid "Configuration files will be kept." msgstr "Konfigurasjonsfiler vil bli bevart." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Bekreftelse" @@ -686,12 +683,15 @@ msgstr "Tilkoblet" msgid "Connection Limit" msgstr "Tilkoblingsgrense (antall)" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Tilkoblinger" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Land" @@ -820,9 +820,6 @@ msgstr "Standard gateway" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Standard tilstand" @@ -864,6 +861,9 @@ msgstr "" msgid "Device unreachable" msgstr "" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "Nettverksdiagnostikk" @@ -898,6 +898,9 @@ msgstr "" msgid "Discard upstream RFC1918 responses" msgstr "Forkast oppstrøms RFC1918 svar" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Viser bare pakker som inneholder" @@ -1157,6 +1160,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Fil" @@ -1351,9 +1357,6 @@ msgstr "Slå av" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1470,9 +1473,6 @@ msgstr "IPv6 WAN Status" msgid "IPv6 address" msgstr "IPv6 adresse" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2055,9 +2055,6 @@ msgstr "" msgid "NTP server candidates" msgstr "NTP server kandidater" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Navn" @@ -2181,6 +2178,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "Forsinkelse ved tilstand Av" @@ -2232,12 +2232,6 @@ msgstr "Innstilling fjernet" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2714,9 +2708,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2775,6 +2766,15 @@ msgstr "Vis/Skjul passord" msgid "Revert" msgstr "Tilbakestill" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Rot" @@ -2790,9 +2790,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2818,14 +2815,6 @@ msgstr "Kjør filsystem sjekk" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2853,9 +2842,6 @@ msgstr "Lagre" msgid "Save & Apply" msgstr "Lagre & Aktiver" -msgid "Save & Apply" -msgstr "Lagre & Aktiver" - msgid "Scan" msgstr "Skann" @@ -2884,17 +2870,6 @@ msgstr "Separerte Klienter" msgid "Server Settings" msgstr "Server Innstillinger" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Tjeneste navn" @@ -2991,9 +2966,6 @@ msgstr "Sortering" msgid "Source" msgstr "Kilde" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "Hvor lagrings enheten blir tilsluttet filsystemet (f.eks. /mnt/sda1)" @@ -3033,6 +3005,9 @@ msgstr "Start" msgid "Start priority" msgstr "Start prioritet" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "Oppstart" @@ -3198,6 +3173,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3222,9 +3207,6 @@ msgstr "" "sammenlign dem med den opprinnelige filen for å sikre dataintegriteten.<br /" "> Klikk \"Fortsett\" nedenfor for å starte flash prosedyren." -msgid "The following changes have been committed" -msgstr "Følgende endringer er foretatt" - msgid "The following changes have been reverted" msgstr "Følgende endringer er forkastet" @@ -3293,11 +3275,6 @@ msgstr "" "datamaskinen din for å nå enheten på nytt. (avhengig av innstillingene dine)" msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3307,8 +3284,8 @@ msgstr "" msgid "There are no active leases." msgstr "Det er ingen aktive leieavtaler." -msgid "There are no pending changes to apply!" -msgstr "Det finnes ingen endringer som kan utføres!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Det finnes ingen endriger å reversere!" @@ -3459,15 +3436,6 @@ msgstr "Tunnel grensesnitt" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Tx-Styrke" @@ -3647,12 +3615,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "Leverandør klasse som sendes ved DHCP spørring" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Bekreft" @@ -3684,16 +3646,15 @@ msgstr "" "WPA-Kryptering krever at wpa_supplicant (for klient-modus) eller hostapd " "(for AP og ad-hoc-modus) er installert." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "Venter på at endringer utføres..." msgid "Waiting for command to complete..." msgstr "Venter på at kommando fullføres..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3708,12 +3669,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3857,9 +3812,6 @@ msgstr "kbit/s" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "lokal <abbr title=\"Domain Navn System\">DNS</abbr>-fil" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" @@ -3935,6 +3887,24 @@ msgstr "ja" msgid "« Back" msgstr "« Tilbake" +#~ msgid "Apply" +#~ msgstr "Bruk" + +#~ msgid "Applying changes" +#~ msgstr "Utfører endringer" + +#~ msgid "Configuration applied." +#~ msgstr "Konfigurasjons endring utført." + +#~ msgid "Save & Apply" +#~ msgstr "Lagre & Aktiver" + +#~ msgid "The following changes have been committed" +#~ msgstr "Følgende endringer er foretatt" + +#~ msgid "There are no pending changes to apply!" +#~ msgstr "Det finnes ingen endringer som kan utføres!" + #~ msgid "Action" #~ msgstr "Handling" diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index 390e489e29..bf43720174 100644 --- a/modules/luci-base/po/pl/base.po +++ b/modules/luci-base/po/pl/base.po @@ -162,8 +162,8 @@ msgid "" "<br/>Note: you need to manually restart the cron service if the crontab file " "was empty before editing." msgstr "" -"<br/>Uwaga: musisz ręcznie zrestartować usługę cron, jeśli plik crontab " -"był pusty przed edycją." +"<br/>Uwaga: musisz ręcznie zrestartować usługę cron, jeśli plik crontab był " +"pusty przed edycją." msgid "A43C + J43 + A43" msgstr "" @@ -174,9 +174,6 @@ msgstr "" msgid "ADSL" msgstr "ADSL" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -205,9 +202,9 @@ msgid "" "Linux network interfaces which can be used in conjunction with DHCP or PPP " "to dial into the provider network." msgstr "" -"Mosty ATM eksponują enkapsulowaną sieć Ethernet w połączeniach AAL5 jako wirtualne " -"interfejsy sieciowe systemu Linux, które mogą być używane w połączeniu z protokołem " -"DHCP lub PPP w celu polączenia się z siecią dostawcy." +"Mosty ATM eksponują enkapsulowaną sieć Ethernet w połączeniach AAL5 jako " +"wirtualne interfejsy sieciowe systemu Linux, które mogą być używane w " +"połączeniu z protokołem DHCP lub PPP w celu polączenia się z siecią dostawcy." msgid "ATM device number" msgstr "Numer urządzenia ATM" @@ -215,9 +212,6 @@ msgstr "Numer urządzenia ATM" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - # co to takiego? msgid "Access Concentrator" msgstr "Koncentrator dostępowy ATM" @@ -290,7 +284,8 @@ msgstr "Alarm" msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" -msgstr "Przydziel sekwencyjnie adresy IP, zaczynając od najmniejszego dostępnego" +msgstr "" +"Przydziel sekwencyjnie adresy IP, zaczynając od najmniejszego dostępnego" msgid "Allocate IP sequentially" msgstr "Przydzielaj adresy IP po kolei" @@ -311,7 +306,8 @@ msgid "Allow localhost" msgstr "Pozwól tylko sobie (localhost)" msgid "Allow remote hosts to connect to local SSH forwarded ports" -msgstr "Zezwalaj zdalnym hostom na łączenie się z lokalnie przekazywanymi portami SSH" +msgstr "" +"Zezwalaj zdalnym hostom na łączenie się z lokalnie przekazywanymi portami SSH" msgid "Allow root logins with password" msgstr "Zezwól na logowanie roota przy pomocy hasła" @@ -327,11 +323,6 @@ msgstr "" msgid "Allowed IPs" msgstr "Dozwolone adresy IP" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "Zawsze rozgłaszaj domyślny router" @@ -410,11 +401,11 @@ msgstr "Ustawienia anteny" msgid "Any zone" msgstr "Dowolna strefa" -msgid "Apply" -msgstr "Zatwierdź" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "Wprowadzam zmiany" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -521,9 +512,6 @@ msgstr "Wprowadzono zły adres" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -596,12 +584,20 @@ msgstr "Zmiany" msgid "Changes applied." msgstr "Zmiany zostały zastosowane." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Zmienia hasło administratora" msgid "Channel" msgstr "Kanał" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Sprawdź" @@ -678,17 +674,24 @@ msgid "" "workaround might cause interoperability issues and reduced robustness of key " "negotiation especially in environments with heavy traffic load." msgstr "" -"Komplikuje atak ponownej instalacji klucza po stronie klienta, wyłączając retransmisję ramek klucza EAPOL, które są używane do instalowania kluczy. To obejście może powodować problemy z interoperacyjnością i zmniejszoną odporność kluczowych negocjacji, szczególnie w środowiskach o dużym natężeniu ruchu." +"Komplikuje atak ponownej instalacji klucza po stronie klienta, wyłączając " +"retransmisję ramek klucza EAPOL, które są używane do instalowania kluczy. To " +"obejście może powodować problemy z interoperacyjnością i zmniejszoną " +"odporność kluczowych negocjacji, szczególnie w środowiskach o dużym " +"natężeniu ruchu." msgid "Configuration" msgstr "Konfiguracja" -msgid "Configuration applied." -msgstr "Konfiguracja została zastosowana." - msgid "Configuration files will be kept." msgstr "Pliki konfiguracyjne zostaną zachowane." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Potwierdzenie" @@ -701,12 +704,15 @@ msgstr "Połączony" msgid "Connection Limit" msgstr "Limit połączeń" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Połączenia" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Kraj" @@ -836,9 +842,6 @@ msgstr "Brama domyślna" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Stan domyślny" @@ -881,6 +884,9 @@ msgstr "Urządzenie jest uruchamiane ponownie ..." msgid "Device unreachable" msgstr "Urządzenie nieosiągalne" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "Diagnostyka" @@ -915,6 +921,9 @@ msgstr "Wyłączone (domyślnie)" msgid "Discard upstream RFC1918 responses" msgstr "Odrzuć wychodzące odpowiedzi RFC1918" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Pokazuję tylko paczki zawierające" @@ -1037,7 +1046,9 @@ msgstr "Włącz" msgid "" "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> " "snooping" -msgstr "Włącz nasłuchiwanie <abbr title=\"Internet Group Management Protocol\">IGMP</abbr>" +msgstr "" +"Włącz nasłuchiwanie <abbr title=\"Internet Group Management Protocol\">IGMP</" +"abbr>" msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgstr "Włącz <abbr title=\"Spanning Tree Protocol\">STP</abbr>" @@ -1102,8 +1113,9 @@ msgstr "Włącz nasłuchiwanie IGMP na tym moście" msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" -msgstr "Aktywuje szybki roaming pomiędzy punktami dostępowymi, które należą " -"do tej samej domeny" +msgstr "" +"Aktywuje szybki roaming pomiędzy punktami dostępowymi, które należą do tej " +"samej domeny" msgid "Enables the Spanning Tree Protocol on this bridge" msgstr "" @@ -1182,6 +1194,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Plik" @@ -1378,9 +1393,6 @@ msgstr "Rozłącz" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1500,9 +1512,6 @@ msgstr "Status WAN IPv6" msgid "IPv6 address" msgstr "Adres IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1623,7 +1632,8 @@ msgid "Install" msgstr "Instaluj" msgid "Install iputils-traceroute6 for IPv6 traceroute" -msgstr "Zainstaluj iputils-traceroute6 w celu skorzystania z traceroute dla iPv6" +msgstr "" +"Zainstaluj iputils-traceroute6 w celu skorzystania z traceroute dla iPv6" msgid "Install package %q" msgstr "Instaluj pakiet %q" @@ -1958,8 +1968,8 @@ msgid "" "Make sure to clone the root filesystem using something like the commands " "below:" msgstr "" -"Upewnij się, że klonujesz główny system plików, używając czegoś podobnego " -"do poleceń poniżej:" +"Upewnij się, że klonujesz główny system plików, używając czegoś podobnego do " +"poleceń poniżej:" msgid "Manual" msgstr "" @@ -2096,9 +2106,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Lista serwerów NTP" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nazwa" @@ -2222,6 +2229,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "Zwłoka wyłączenia" @@ -2272,12 +2282,6 @@ msgstr "Usunięto wartość" msgid "Optional" msgstr "Opcjonalny" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2755,9 +2759,6 @@ msgstr "Zażądaj adresu IPv6" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "Wymagaj TLS" - msgid "Required" msgstr "Wymagany" @@ -2816,6 +2817,15 @@ msgstr "Odsłoń/Ukryj hasło" msgid "Revert" msgstr "Przywróć" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Root" @@ -2831,9 +2841,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2860,14 +2867,6 @@ msgstr "Sprawdź czy system plików nie zawiera błędów" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "SNR" @@ -2895,9 +2894,6 @@ msgstr "Zapisz" msgid "Save & Apply" msgstr "Zapisz i zastosuj" -msgid "Save & Apply" -msgstr "Zapisz i zastosuj" - msgid "Scan" msgstr "Skanuj" @@ -2927,17 +2923,6 @@ msgstr "Rozdziel klientów" msgid "Server Settings" msgstr "Ustawienia serwera" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Nazwa serwisu" @@ -2951,8 +2936,8 @@ msgid "" "Set interface properties regardless of the link carrier (If set, carrier " "sense events do not invoke hotplug handlers)." msgstr "" -"Ustaw właściwości interfejsu, niezależnie od operatora łącza (nie wpływa" -" na programy operatora które ustanawiają połączenie)." +"Ustaw właściwości interfejsu, niezależnie od operatora łącza (nie wpływa na " +"programy operatora które ustanawiają połączenie)." #, fuzzy msgid "Set up Time Synchronization" @@ -3036,9 +3021,6 @@ msgstr "Posortuj" msgid "Source" msgstr "Źródło" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "Podaje katalog do którego jest podłączone urządzenie" @@ -3080,6 +3062,9 @@ msgstr "Uruchomienie" msgid "Start priority" msgstr "Priorytet uruchomienia" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "Autostart" @@ -3247,6 +3232,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3273,9 +3268,6 @@ msgstr "" "upewnić się, że został przesłany poprawnie.<br /> Wciśnij \"Wykonaj\" aby " "kontynuować aktualizację." -msgid "The following changes have been committed" -msgstr "Następujące zmiany zostały zatwierdzone" - msgid "The following changes have been reverted" msgstr "Następujące zmiany zostały odrzucone" @@ -3346,11 +3338,6 @@ msgstr "" "się do urządzenia." msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3360,8 +3347,8 @@ msgstr "" msgid "There are no active leases." msgstr "Brak aktywnych dzierżaw." -msgid "There are no pending changes to apply!" -msgstr "Brak oczekujących zmian do zastosowania!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Brak oczekujących zmian do przywrócenia!" @@ -3471,8 +3458,8 @@ msgid "" "To restore configuration files, you can upload a previously generated backup " "archive here." msgstr "" -"Aby przywrócić pliki konfiguracyjne, możesz tutaj przesłać wcześniej utworzoną " -"kopię zapasową." +"Aby przywrócić pliki konfiguracyjne, możesz tutaj przesłać wcześniej " +"utworzoną kopię zapasową." msgid "Tone" msgstr "" @@ -3516,15 +3503,6 @@ msgstr "Interfejs tunelu" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "Typ tunelu" - msgid "Tx-Power" msgstr "Moc nadawania" @@ -3582,8 +3560,9 @@ msgid "" "compatible firmware image)." msgstr "" "Prześlij tutaj obraz zgodny z funkcją sysupgrade, aby zastąpić aktualnie " -"działające opragramowanie. Zaznacz opcję \"Zachowaj ustawienia\", aby zachować " -"bieżącą konfigurację (wymagany obraz zgodny z bieżącym opragramowaniem)." +"działające opragramowanie. Zaznacz opcję \"Zachowaj ustawienia\", aby " +"zachować bieżącą konfigurację (wymagany obraz zgodny z bieżącym " +"opragramowaniem)." msgid "Upload archive..." msgstr "Załaduj archiwum..." @@ -3705,12 +3684,6 @@ msgstr "Producent" msgid "Vendor Class to send when requesting DHCP" msgstr "Klasa producenta do wysłania podczas żądania DHCP" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Zweryfikuj" @@ -3739,12 +3712,8 @@ msgid "" "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " "and ad-hoc mode) to be installed." msgstr "" -"Kodowanie WPA wymaga zainstalowanych modułów wpa_supplicant (tryb " -"klienta) lub hostapd (tryb AP lub ad-hoc)" - -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" +"Kodowanie WPA wymaga zainstalowanych modułów wpa_supplicant (tryb klienta) " +"lub hostapd (tryb AP lub ad-hoc)" msgid "Waiting for changes to be applied..." msgstr "Trwa wprowadzenie zmian..." @@ -3752,6 +3721,9 @@ msgstr "Trwa wprowadzenie zmian..." msgid "Waiting for command to complete..." msgstr "Trwa wykonanie polecenia..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "Oczekiwanie na urządzenie..." @@ -3759,20 +3731,15 @@ msgid "Warning" msgstr "Ostrzeżenie" msgid "Warning: There are unsaved changes that will get lost on reboot!" -msgstr "Ostrzeżenie: Istnieją niezapisane zmiany, które zostaną utracone " -"po ponownym uruchomieniu urządzenia!" +msgstr "" +"Ostrzeżenie: Istnieją niezapisane zmiany, które zostaną utracone po ponownym " +"uruchomieniu urządzenia!" msgid "" "When using a PSK, the PMK can be generated locally without inter AP " "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "Szerokość" @@ -3839,9 +3806,9 @@ msgid "" "upgrade it to at least version 7 or use another browser like Firefox, Opera " "or Safari." msgstr "" -"Twój Internet Explorer jest za stary, aby poprawnie wyświetlić tę stronę" -"zaktualizuj go do wersji co najmniej 7 lub użyj innej przeglądarki, takiej " -"jak Firefox, Opera czy Safari". +"Twój Internet Explorer jest za stary, aby poprawnie wyświetlić tę " +"stronę zaktualizuj go do wersji co najmniej 7 lub użyj innej przeglądarki, " +"takiej jak Firefox, Opera czy Safari." msgid "any" msgstr "dowolny" @@ -3919,9 +3886,6 @@ msgstr "kbit/s" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "lokalny plik <abbr title=\"Domain Name System\">DNS</abbr>" -msgid "minimum 1280, maximum 1480" -msgstr "minimum 1280, maksimum 1480" - msgid "minutes" msgstr "minuty" @@ -3998,101 +3962,3 @@ msgstr "tak" msgid "« Back" msgstr "« Wróć" -#~ msgid "Action" -#~ msgstr "Akcja" - -#~ msgid "Buttons" -#~ msgstr "Przyciski" - -#~ msgid "Handler" -#~ msgstr "Uchwyt" - -#~ msgid "Maximum hold time" -#~ msgstr "Maksymalny czas podtrzymania" - -#~ msgid "Minimum hold time" -#~ msgstr "Minimalny czas podtrzymania" - -#~ msgid "Path to executable which handles the button event" -#~ msgstr "" -#~ "Ścieżka do pliku wykonywalnego, który obsługuje zdarzenie dla danego " -#~ "przycisku" - -#~ msgid "Specifies the button state to handle" -#~ msgstr "Określa zachowanie w zależności od stanu przycisku" - -#~ msgid "This page allows the configuration of custom button actions" -#~ msgstr "" -#~ "Poniższa strona umożliwia konfigurację działania niestandardowych " -#~ "przycisków" - -#~ msgid "Leasetime" -#~ msgstr "Czas dzierżawy" - -# Wydaje mi się że brakuje litery R... -#~ msgid "AR Support" -#~ msgstr "Wsparcie dla ARP" - -#~ msgid "Atheros 802.11%s Wireless Controller" -#~ msgstr "Bezprzewodowy kontroler Atheros 802.11%s" - -#~ msgid "Background Scan" -#~ msgstr "Skanowanie w tle" - -#~ msgid "Compression" -#~ msgstr "Kompresja" - -#~ msgid "Disable HW-Beacon timer" -#~ msgstr "Wyłącz zegar HW-Beacon" - -#~ msgid "Do not send probe responses" -#~ msgstr "Nie wysyłaj ramek probe response" - -#~ msgid "Fast Frames" -#~ msgstr "Szybkie ramki (Fast Frames)" - -#~ msgid "Maximum Rate" -#~ msgstr "Maksymalna Szybkość" - -#~ msgid "Minimum Rate" -#~ msgstr "Minimalna Szybkość" - -#~ msgid "Multicast Rate" -#~ msgstr "Szybkość Multicast`u" - -#~ msgid "Outdoor Channels" -#~ msgstr "Kanały zewnętrzne" - -#~ msgid "Regulatory Domain" -#~ msgstr "Domena regulacji" - -#~ msgid "Separate WDS" -#~ msgstr "Rozdziel WDS" - -#~ msgid "Static WDS" -#~ msgstr "Statyczny WDS" - -#~ msgid "Turbo Mode" -#~ msgstr "Tryb Turbo" - -#~ msgid "XR Support" -#~ msgstr "Wsparcie XR" - -#~ msgid "An additional network will be created if you leave this unchecked." -#~ msgstr "" -#~ "Zostanie utworzona dodatkowa sieć jeśli zostawisz tą opcję niezaznaczoną." - -#~ msgid "Join Network: Settings" -#~ msgstr "Przyłącz do sieci: Ustawienia" - -#~ msgid "CPU" -#~ msgstr "CPU" - -#~ msgid "Port %d" -#~ msgstr "Port %d" - -#~ msgid "Port %d is untagged in multiple VLANs!" -#~ msgstr "Port %d jest nietagowany w wielu VLAN`ach!" - -#~ msgid "VLAN Interface" -#~ msgstr "Interfejs VLAN" diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po index a51d11d2a5..49b1494326 100644 --- a/modules/luci-base/po/pt-br/base.po +++ b/modules/luci-base/po/pt-br/base.po @@ -185,11 +185,6 @@ msgstr "" "<abbr title=\"Assymetrical Digital Subscriber Line/Linha Digital Assimétrica " "para Assinante\">ADSL</abbr>" -msgid "AICCU (SIXXS)" -msgstr "" -"<abbr title=\"Automatic IPv6 Connectivity Client Utility/Utilitário Cliente " -"de Conectividade IPv6 Automática\">AICCU (SIXXS)</abbr>" - msgid "ANSI T1.413" msgstr "ANSI T1.413" @@ -232,9 +227,6 @@ msgstr "Número do dispositivo ATM" msgid "ATU-C System Vendor ID" msgstr "Identificador de" -msgid "AYIYA" -msgstr "AYIYA" - msgid "Access Concentrator" msgstr "Concentrador de Acesso" @@ -348,13 +340,6 @@ msgstr "" msgid "Allowed IPs" msgstr "Endereços IP autorizados" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" -"Veja também a <a href=\"https://www.sixxs.net/faq/connectivity/?" -"faq=comparison\">Comparação de Tunelamentos</a> em SIXXS" - msgid "Always announce default router" msgstr "Sempre anuncie o roteador padrão" @@ -434,11 +419,11 @@ msgstr "configuração de antena" msgid "Any zone" msgstr "Qualquer zona" -msgid "Apply" -msgstr "Aplicar" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "Aplicar as alterações" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -552,9 +537,6 @@ msgstr "Endereço especificado está incorreto!" msgid "Band" msgstr "Banda" -msgid "Behind NAT" -msgstr "Atrás da NAT" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -631,12 +613,20 @@ msgstr "Alterações" msgid "Changes applied." msgstr "Alterações aplicadas." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Muda a senha do administrador para acessar este dispositivo" msgid "Channel" msgstr "Canal" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Verificar" @@ -719,12 +709,15 @@ msgstr "" msgid "Configuration" msgstr "Configuração" -msgid "Configuration applied." -msgstr "Configuração aplicada." - msgid "Configuration files will be kept." msgstr "Os arquivos de configuração serão mantidos." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Confirmação" @@ -737,12 +730,15 @@ msgstr "Conectado" msgid "Connection Limit" msgstr "Limite de conexão" -msgid "Connection to server fails when TLS cannot be used" -msgstr "A conexão para este servidor falhará quando o TLS não puder ser usado" - msgid "Connections" msgstr "Conexões" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "País" @@ -873,9 +869,6 @@ msgstr "Roteador Padrão" msgid "Default is stateless + stateful" msgstr "O padrão é sem estado + com estado" -msgid "Default route" -msgstr "Rota padrão" - msgid "Default state" msgstr "Estado padrão" @@ -918,6 +911,9 @@ msgstr "O dispositivo está reiniciando..." msgid "Device unreachable" msgstr "Dispositivo não alcançável" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "Diagnóstico" @@ -953,6 +949,9 @@ msgid "Discard upstream RFC1918 responses" msgstr "" "Descartar respostas de servidores externos para redes privadas (RFC1918)" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Mostre somente os pacotes contendo" @@ -1222,6 +1221,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Arquivo" @@ -1426,9 +1428,6 @@ msgstr "" "Erros de Código de Erro de Cabeçalho (<abbr title=\"Header Error Code\">HEC</" "abbr>)" -msgid "Heartbeat" -msgstr "Pulso de vida" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1553,9 +1552,6 @@ msgstr "Estado IPv6 da WAN" msgid "IPv6 address" msgstr "Endereço IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "Endereços IPv6 delegados para o ponta local do túnel (opcional)" - msgid "IPv6 assignment hint" msgstr "Sugestão de atribuição IPv6" @@ -2179,9 +2175,6 @@ msgstr "Domínio NT" msgid "NTP server candidates" msgstr "Candidatos a servidor NTP" -msgid "NTP sync time-out" -msgstr "Tempo limite da sincronia do NTP" - msgid "Name" msgstr "Nome" @@ -2307,6 +2300,9 @@ msgstr "Senha Ofuscada do Grupo" msgid "Obfuscated Password" msgstr "Senha Ofuscada" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "Atraso no estado de desligado" @@ -2359,13 +2355,6 @@ msgstr "Opção removida" msgid "Optional" msgstr "Opcional" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" -"Opcional, especifique para sobrescrever o servidor padrão (tic.sixxs.net)" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "Opcional, para usar quando a conta SIXXS tem mais de um túnel" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2856,9 +2845,6 @@ msgstr "Solicita endereço IPv6" msgid "Request IPv6-prefix of length" msgstr "Solicita prefixo IPv6 de tamanho" -msgid "Require TLS" -msgstr "Requer TLS" - msgid "Required" msgstr "Necessário" @@ -2923,6 +2909,15 @@ msgstr "Relevar/esconder senha" msgid "Revert" msgstr "Reverter" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Raiz" @@ -2938,9 +2933,6 @@ msgstr "Roteie Andereços IP Autorizados" msgid "Route type" msgstr "Tipo de rota" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "Prefixo roteável IPv6 para interfaces internas" - msgid "Router Advertisement-Service" msgstr "Serviço de Anúncio de Roteador" @@ -2967,16 +2959,6 @@ msgstr "Execute a verificação do sistema de arquivos " msgid "SHA256" msgstr "SHA256" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" -"O SIXXS suporta somente TIC. Use o 6in4 para túneis estáticos usando o " -"protocolo IP 41 (RFC4213)" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "Identificador do SIXXS[/Identificador do Túnel]" - msgid "SNR" msgstr "SNR" @@ -3004,9 +2986,6 @@ msgstr "Salvar" msgid "Save & Apply" msgstr "Salvar & Aplicar" -msgid "Save & Apply" -msgstr "Save & Aplicar" - msgid "Scan" msgstr "Procurar" @@ -3035,19 +3014,6 @@ msgstr "Isolar Clientes" msgid "Server Settings" msgstr "Configurações do Servidor" -msgid "Server password" -msgstr "Senha do servidor" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" -"Senha do servidor. Informe a senha para este túnel quando o nome do usuário " -"contiver o identificador do túnel" - -msgid "Server username" -msgstr "Usuário do servidor" - msgid "Service Name" msgstr "Nome do Serviço" @@ -3145,9 +3111,6 @@ msgstr "Ordenar" msgid "Source" msgstr "Origem" -msgid "Source routing" -msgstr "Roteamento pela origem" - msgid "Specifies the directory the device is attached to" msgstr "Especifica o diretório que o dispositivo está conectado" @@ -3194,6 +3157,9 @@ msgstr "Iniciar" msgid "Start priority" msgstr "Prioridade de iniciação" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "Iniciação" @@ -3364,6 +3330,16 @@ msgstr "" "O arquivo de configuração não pode ser carregado devido ao seguinte erro:" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3389,9 +3365,6 @@ msgstr "" "garantir a integridade dos dados. <br /> Clique em \"Proceder\" para iniciar " "o procedimetno de gravação." -msgid "The following changes have been committed" -msgstr "As seguintes mudanças foram aplicadas" - msgid "The following changes have been reverted" msgstr "As seguintes alterações foram revertidas" @@ -3461,13 +3434,6 @@ msgstr "" "computador para poder conectar novamente ao roteador." msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" -"O final do túnel está atrás de um NAT. Por padrão será desabilitado e " -"somente se aplica a AYIYA" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3477,8 +3443,8 @@ msgstr "" msgid "There are no active leases." msgstr "Não existem alocações ativas." -msgid "There are no pending changes to apply!" -msgstr "Não existem modificações pendentes para aplicar!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Não existem modificações pendentes para reverter!" @@ -3638,15 +3604,6 @@ msgstr "Interface de Tunelamento" msgid "Tunnel Link" msgstr "Enlace do túnel" -msgid "Tunnel broker protocol" -msgstr "Protocolo do agente do túnel" - -msgid "Tunnel setup server" -msgstr "Servidor de configuração do túnel" - -msgid "Tunnel type" -msgstr "Tipo de túnel" - msgid "Tx-Power" msgstr "Potência de transmissão" @@ -3833,12 +3790,6 @@ msgstr "Fabricante" msgid "Vendor Class to send when requesting DHCP" msgstr "Classe do fabricante para enviar quando requisitar o DHCP" -msgid "Verbose" -msgstr "Detalhado" - -msgid "Verbose logging by aiccu daemon" -msgstr "Habilite registros detalhados do serviço AICCU" - msgid "Verify" msgstr "Verificar" @@ -3870,18 +3821,15 @@ msgstr "" "A cifragem WPA requer a instalação do wpa_supplicant (para modo cliente) ou " "do hostapd (para modo AP ou ad-hoc)." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" -"Espere esta quantidade de segundos pela sincronia do NTP. Definindo como 0 " -"desabilita a espera (opcional)" - msgid "Waiting for changes to be applied..." msgstr "Esperando a aplicação das mudanças..." msgid "Waiting for command to complete..." msgstr "Esperando o término do comando..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "Esperando pelo dispositivo..." @@ -3896,12 +3844,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "Se deve criar uma rota padrão IPv6 sobre o túnel" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "Se deve rotear somente pacotes de prefixos delegados" - msgid "Width" msgstr "Largura" @@ -4050,9 +3992,6 @@ msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "" "Arquivo local de <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>" -msgid "minimum 1280, maximum 1480" -msgstr "mínimo 1280, máximo 1480" - msgid "minutes" msgstr "minutos" @@ -4128,117 +4067,3 @@ msgstr "sim" msgid "« Back" msgstr "« Voltar" - -#~ msgid "Action" -#~ msgstr "Ação" - -#~ msgid "Buttons" -#~ msgstr "Botões" - -# Não sei que contexto isto está sendo usado -#~ msgid "Handler" -#~ msgstr "Responsável" - -# Desconheço o uso -#~ msgid "Maximum hold time" -#~ msgstr "Tempo máximo de espera" - -#~ msgid "Minimum hold time" -#~ msgstr "Tempo mínimo de espera" - -#~ msgid "Path to executable which handles the button event" -#~ msgstr "Caminho para o executável que trata o evento do botão" - -#~ msgid "Specifies the button state to handle" -#~ msgstr "Especifica o estado do botão para ser tratado" - -#~ msgid "This page allows the configuration of custom button actions" -#~ msgstr "" -#~ "Esta página permite a configuração de ações personalizadas para os botões" - -#~ msgid "Leasetime" -#~ msgstr "Tempo de atribuição do DHCP" - -#~ msgid "Optional." -#~ msgstr "Opcional." - -#~ msgid "navigation Navigation" -#~ msgstr "navegação Navegação" - -#~ msgid "skiplink1 Skip to navigation" -#~ msgstr "skiplink1 Pular para a navegação" - -#~ msgid "skiplink2 Skip to content" -#~ msgstr "skiplink2 Pular para o conteúdo" - -#~ msgid "AuthGroup" -#~ msgstr "Grupo de Autenticação" - -#~ msgid "automatic" -#~ msgstr "automático" - -#~ msgid "AR Support" -#~ msgstr "Suporte AR" - -#~ msgid "Atheros 802.11%s Wireless Controller" -#~ msgstr "Controlador Wireless Atheros 802.11%s" - -#~ msgid "Background Scan" -#~ msgstr "Busca em Segundo Plano" - -#~ msgid "Compression" -#~ msgstr "Compressão" - -#~ msgid "Disable HW-Beacon timer" -#~ msgstr "Desativar temporizador de Beacon de Hardware" - -#~ msgid "Do not send probe responses" -#~ msgstr "Não enviar respostas de exames" - -#~ msgid "Fast Frames" -#~ msgstr "Quadros Rápidos" - -#~ msgid "Maximum Rate" -#~ msgstr "Taxa Máxima" - -#~ msgid "Minimum Rate" -#~ msgstr "Taxa Mínima" - -#~ msgid "Multicast Rate" -#~ msgstr "Taxa de Multicast" - -#~ msgid "Outdoor Channels" -#~ msgstr "Canais para externo" - -#~ msgid "Regulatory Domain" -#~ msgstr "Domínio Regulatório" - -#~ msgid "Separate WDS" -#~ msgstr "Separar WDS" - -#~ msgid "Static WDS" -#~ msgstr "WDS Estático" - -#~ msgid "Turbo Mode" -#~ msgstr "Modo Turbo" - -#~ msgid "XR Support" -#~ msgstr "Suporte a XR" - -#~ msgid "An additional network will be created if you leave this unchecked." -#~ msgstr "Uma rede adicional será criada se você deixar isto desmarcado." - -#~ msgid "Join Network: Settings" -#~ msgstr "Conectar à Rede: Configurações" - -#~ msgid "CPU" -#~ msgstr "CPU" - -#~ msgid "Port %d" -#~ msgstr "Porta %d" - -#~ msgid "Port %d is untagged in multiple VLANs!" -#~ msgstr "Porta %d está sem etiqueta para mútliplas VLANs!" - -#~ msgid "VLAN Interface" -#~ msgstr "Interface VLAN" diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po index 843a4cac86..a05bfc1cfc 100644 --- a/modules/luci-base/po/pt/base.po +++ b/modules/luci-base/po/pt/base.po @@ -177,9 +177,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -216,9 +213,6 @@ msgstr "Número de Dispositivo ATM" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Concentrador de Acesso" @@ -328,11 +322,6 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -411,11 +400,11 @@ msgstr "Configuração das Antenas" msgid "Any zone" msgstr "Qualquer zona" -msgid "Apply" -msgstr "Aplicar" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "A aplicar as alterações" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -521,9 +510,6 @@ msgstr "Endereço mal especificado!" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -595,12 +581,20 @@ msgstr "Alterações" msgid "Changes applied." msgstr "Alterações aplicadas." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Altera a password de administrador para acesso ao dispositivo" msgid "Channel" msgstr "Canal" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Verificar" @@ -681,12 +675,15 @@ msgstr "" msgid "Configuration" msgstr "Configuração" -msgid "Configuration applied." -msgstr "Configuração aplicada." - msgid "Configuration files will be kept." msgstr "Os ficheiros de configuração serão mantidos." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Confirmação" @@ -699,12 +696,15 @@ msgstr "Ligado" msgid "Connection Limit" msgstr "Limite de Ligações" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Ligações" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "País" @@ -833,9 +833,6 @@ msgstr "Gateway predefinido" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Estado predefinido" @@ -878,6 +875,9 @@ msgstr "" msgid "Device unreachable" msgstr "" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "Diagnósticos" @@ -912,6 +912,9 @@ msgstr "" msgid "Discard upstream RFC1918 responses" msgstr "Descartar respostas RFC1918 a montante" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Mostrar somente pacotes contendo" @@ -1175,6 +1178,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Ficheiro" @@ -1369,9 +1375,6 @@ msgstr "Suspender" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1491,9 +1494,6 @@ msgstr "Estado WAN IPv6" msgid "IPv6 address" msgstr "Endereço IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2079,9 +2079,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Candidatos a servidor NTP" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nome" @@ -2205,6 +2202,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "Atraso do Off-State" @@ -2256,12 +2256,6 @@ msgstr "Opção removida" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2733,9 +2727,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2794,6 +2785,15 @@ msgstr "Revelar/esconder password" msgid "Revert" msgstr "Reverter" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "" @@ -2809,9 +2809,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2838,14 +2835,6 @@ msgstr "Correr uma verificação do sistema de ficheiros" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2873,9 +2862,6 @@ msgstr "Salvar" msgid "Save & Apply" msgstr "Salvar & Aplicar" -msgid "Save & Apply" -msgstr "Salvar & Aplicar" - msgid "Scan" msgstr "Procurar" @@ -2902,17 +2888,6 @@ msgstr "Isolar Clientes" msgid "Server Settings" msgstr "" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Nome do Serviço" @@ -3006,9 +2981,6 @@ msgstr "Ordenar" msgid "Source" msgstr "Origem" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -3047,6 +3019,9 @@ msgstr "Iniciar" msgid "Start priority" msgstr "Prioridade de inicialização" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "" @@ -3203,6 +3178,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3227,9 +3212,6 @@ msgstr "" "compare com o ficheiro original para assegurar a integração de dados.<br /> " "Click em \"Proceder\" para iniciar o procedimento." -msgid "The following changes have been committed" -msgstr "As seguintes alterações foram escritas" - msgid "The following changes have been reverted" msgstr "Foram recuperadas as seguintes alterações " @@ -3300,11 +3282,6 @@ msgstr "" "para poder ligar novamente ao router." msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3314,8 +3291,8 @@ msgstr "" msgid "There are no active leases." msgstr "Não há concessões ativas." -msgid "There are no pending changes to apply!" -msgstr "Não há alterações pendentes para aplicar!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Não há alterações pendentes para reverter!" @@ -3460,15 +3437,6 @@ msgstr "Interface de Túnel" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Potência de Tx" @@ -3641,12 +3609,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Verificar" @@ -3678,16 +3640,15 @@ msgstr "" "A encriptação-WPA necessita do wpa_supplicant (para modo cliente) ou do " "hostapd (para modo AP ou ah-hoc) esteja instalado." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "A aguardar que as mudanças sejam aplicadas..." msgid "Waiting for command to complete..." msgstr "A aguardar que o comando termine..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3702,12 +3663,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3853,9 +3808,6 @@ msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "" "Ficheiro local de <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" @@ -3931,6 +3883,24 @@ msgstr "sim" msgid "« Back" msgstr "« Voltar" +#~ msgid "Apply" +#~ msgstr "Aplicar" + +#~ msgid "Applying changes" +#~ msgstr "A aplicar as alterações" + +#~ msgid "Configuration applied." +#~ msgstr "Configuração aplicada." + +#~ msgid "Save & Apply" +#~ msgstr "Salvar & Aplicar" + +#~ msgid "The following changes have been committed" +#~ msgstr "As seguintes alterações foram escritas" + +#~ msgid "There are no pending changes to apply!" +#~ msgstr "Não há alterações pendentes para aplicar!" + #~ msgid "Action" #~ msgstr "Acção" diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po index 748bfdbc53..1b7c612b22 100644 --- a/modules/luci-base/po/ro/base.po +++ b/modules/luci-base/po/ro/base.po @@ -168,9 +168,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -207,9 +204,6 @@ msgstr "ATM numar echipament" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Concentrator de Access " @@ -314,11 +308,6 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -397,11 +386,11 @@ msgstr "Configurarea Antenei" msgid "Any zone" msgstr "Orice Zona" -msgid "Apply" -msgstr "Aplica" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "Se aplica modificarile" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -507,9 +496,6 @@ msgstr "Adresa specificata gresit !" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -578,12 +564,20 @@ msgstr "Modificari" msgid "Changes applied." msgstr "Modificari aplicate." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Schimba parola administratorului pentru accesarea dispozitivului" msgid "Channel" msgstr "Canal" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Verificare" @@ -656,12 +650,15 @@ msgstr "" msgid "Configuration" msgstr "Configurare" -msgid "Configuration applied." -msgstr "Configurarea aplicata." - msgid "Configuration files will be kept." msgstr "Fisierele de configurare vor fi pastrate." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Confirmare" @@ -674,12 +671,15 @@ msgstr "Conectat" msgid "Connection Limit" msgstr "Limita de conexiune" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Conexiuni" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Tara" @@ -806,9 +806,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Stare implicita" @@ -848,6 +845,9 @@ msgstr "" msgid "Device unreachable" msgstr "" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "Diagnosticuri" @@ -882,6 +882,9 @@ msgstr "" msgid "Discard upstream RFC1918 responses" msgstr "" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "" @@ -1127,6 +1130,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Fisier" @@ -1321,9 +1327,6 @@ msgstr "" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1438,9 +1441,6 @@ msgstr "Statusul IPv6 pe WAN" msgid "IPv6 address" msgstr "Adresa IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2009,9 +2009,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nume" @@ -2135,6 +2132,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2180,12 +2180,6 @@ msgstr "Optiunea eliminata" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2646,9 +2640,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2707,6 +2698,15 @@ msgstr "Arata / ascunde parola" msgid "Revert" msgstr "" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "" @@ -2722,9 +2722,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2748,14 +2745,6 @@ msgstr "" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2783,9 +2772,6 @@ msgstr "Salveaza" msgid "Save & Apply" msgstr "Salveaza si aplica" -msgid "Save & Apply" -msgstr "Salveaza & Aplica" - msgid "Scan" msgstr "Scan" @@ -2812,17 +2798,6 @@ msgstr "" msgid "Server Settings" msgstr "Setarile serverului" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Nume serviciu" @@ -2916,9 +2891,6 @@ msgstr "" msgid "Source" msgstr "Sursa" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -2957,6 +2929,9 @@ msgstr "Start" msgid "Start priority" msgstr "" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "Pornire" @@ -3107,6 +3082,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3123,9 +3108,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "" - msgid "The following changes have been reverted" msgstr "" @@ -3179,11 +3161,6 @@ msgid "" msgstr "" msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3191,8 +3168,8 @@ msgstr "" msgid "There are no active leases." msgstr "" -msgid "There are no pending changes to apply!" -msgstr "Nu exista modificari in asteptare de aplicat !" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Nu exista modificari in asteptare de anulat !" @@ -3328,15 +3305,6 @@ msgstr "Interfata de tunel" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Puterea TX" @@ -3509,12 +3477,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" @@ -3546,16 +3508,15 @@ msgstr "" "Criptarea WPA necesita wpa_supplicant (pentru modul client) sau hostapd " "(pentru modul AP sau ad-hoc) instalate." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3570,12 +3531,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3711,9 +3666,6 @@ msgstr "" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" @@ -3789,6 +3741,21 @@ msgstr "da" msgid "« Back" msgstr "« Inapoi" +#~ msgid "Apply" +#~ msgstr "Aplica" + +#~ msgid "Applying changes" +#~ msgstr "Se aplica modificarile" + +#~ msgid "Configuration applied." +#~ msgstr "Configurarea aplicata." + +#~ msgid "Save & Apply" +#~ msgstr "Salveaza & Aplica" + +#~ msgid "There are no pending changes to apply!" +#~ msgstr "Nu exista modificari in asteptare de aplicat !" + #~ msgid "Action" #~ msgstr "Actiune" diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index 35a697620e..2514084b76 100644 --- a/modules/luci-base/po/ru/base.po +++ b/modules/luci-base/po/ru/base.po @@ -177,9 +177,6 @@ msgstr "A43C + J43 + A43 + V43" msgid "ADSL" msgstr "ADSL" -msgid "AICCU (SIXXS)" -msgstr "AICCU (SIXXS)" - msgid "ANSI T1.413" msgstr "ANSI T1.413" @@ -216,9 +213,6 @@ msgstr "ATM номер устройства" msgid "ATU-C System Vendor ID" msgstr "ATU-C System Vendor ID" -msgid "AYIYA" -msgstr "AYIYA" - msgid "Access Concentrator" msgstr "Концентратор доступа" @@ -330,13 +324,6 @@ msgstr "" msgid "Allowed IPs" msgstr "Разрешенные IP-адреса" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" -"Также смотрите <a href=\"https://www.sixxs.net/faq/connectivity/?" -"faq=comparison\">Tunneling Comparison</a> on SIXXS" - msgid "Always announce default router" msgstr "Объявлять всегда, как дефолтный маршрутизатор" @@ -417,11 +404,11 @@ msgstr "Настройка антенн" msgid "Any zone" msgstr "Любая зона" -msgid "Apply" -msgstr "Принять" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "Применение изменений" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -537,9 +524,6 @@ msgstr "Указан неправильный адрес!" msgid "Band" msgstr "Диапазон" -msgid "Behind NAT" -msgstr "За NAT-ом" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -616,12 +600,20 @@ msgstr "Изменения" msgid "Changes applied." msgstr "Изменения приняты." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Изменить пароль администратора для доступа к устройству." msgid "Channel" msgstr "Канал" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Проверить" @@ -710,12 +702,15 @@ msgstr "" msgid "Configuration" msgstr "Настройка config файла" -msgid "Configuration applied." -msgstr "Изменение настроек config файлов." - msgid "Configuration files will be kept." msgstr "Config файлы будут сохранены." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Подтверждение пароля" @@ -728,12 +723,15 @@ msgstr "Подключен" msgid "Connection Limit" msgstr "Ограничение соединений" -msgid "Connection to server fails when TLS cannot be used" -msgstr "Связь с сервером прерывается, когда TLS не может быть использован" - msgid "Connections" msgstr "Соединения" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Страна" @@ -864,9 +862,6 @@ msgstr "Шлюз по умолчанию" msgid "Default is stateless + stateful" msgstr "Значение по умолчанию - 'stateless + stateful'." -msgid "Default route" -msgstr "Маршрут по умолчанию" - msgid "Default state" msgstr "Начальное состояние" @@ -909,6 +904,9 @@ msgstr "Перезагрузка..." msgid "Device unreachable" msgstr "Устройство недоступно" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "Диагностика" @@ -943,6 +941,9 @@ msgstr "Отключено (по умолчанию)" msgid "Discard upstream RFC1918 responses" msgstr "Отбрасывать ответы внешней сети RFC1918." +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Показываются только пакеты, содержащие" @@ -1207,6 +1208,9 @@ msgstr "FT над the Air" msgid "FT protocol" msgstr "FT протокол" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Файл" @@ -1405,9 +1409,6 @@ msgstr "Перезапустить" msgid "Header Error Code Errors (HEC)" msgstr "Ошибки кода ошибки заголовка (HEC)" -msgid "Heartbeat" -msgstr "Heartbeat" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1524,10 +1525,6 @@ msgstr "Состояние IPv6 WAN" msgid "IPv6 address" msgstr "IPv6-адрес" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" -"IPv6-адрес, делегированный локальной конечной точке туннеля (необязательно)." - msgid "IPv6 assignment hint" msgstr "IPv6 подсказка присвоения" @@ -2137,9 +2134,6 @@ msgstr "NT домен" msgid "NTP server candidates" msgstr "Список NTP-серверов" -msgid "NTP sync time-out" -msgstr "NTP синхронизация времени ожидания" - msgid "Name" msgstr "Имя" @@ -2263,6 +2257,9 @@ msgstr "Obfuscated Group Password" msgid "Obfuscated Password" msgstr "Obfuscated Password" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "Задержка выключенного состояния" @@ -2314,16 +2311,6 @@ msgstr "Опция удалена" msgid "Optional" msgstr "Необязательно" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" -"Необязательно. Укажите, чтобы переопределить дефолтный сервер (tic.sixxs." -"net)." - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" -"Необязательно. Используется, когда учетная запись SIXXS имеет более одного " -"туннеля." - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2815,9 +2802,6 @@ msgstr "Запрос IPv6 адреса" msgid "Request IPv6-prefix of length" msgstr "Запрос IPv6 префикс длины" -msgid "Require TLS" -msgstr "Требовать TLS" - msgid "Required" msgstr "Требовать" @@ -2884,6 +2868,15 @@ msgstr "Показать/скрыть пароль" msgid "Revert" msgstr "Вернуть" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Корень" @@ -2899,9 +2892,6 @@ msgstr "Маршрут разрешенный для IP адресов" msgid "Route type" msgstr "Тип маршрута" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "Префикс маршрутизации IPv6 для интерфейсов внутренней сети" - msgid "Router Advertisement-Service" msgstr "Доступные<br />режимы работы" @@ -2927,16 +2917,6 @@ msgstr "Проверить" msgid "SHA256" msgstr "SHA256" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" -"SIXXS поддерживает только TIC, для статических туннелей с использованием IP-" -"протокола 41 (RFC4213) используется вместо 6in4." - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "SIXXS-управление[/Туннель-ID]" - msgid "SNR" msgstr "SNR" @@ -2964,9 +2944,6 @@ msgstr "Сохранить" msgid "Save & Apply" msgstr "Сохранить и применить" -msgid "Save & Apply" -msgstr "Сохранить и применить" - msgid "Scan" msgstr "Поиск" @@ -2995,19 +2972,6 @@ msgstr "Разделять клиентов" msgid "Server Settings" msgstr "Настройки сервера" -msgid "Server password" -msgstr "Пароль доступа к серверу" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" -"Пароль сервера. Введите пароль из тоннеля, когда имя пользователя содержит " -"ID туннеля." - -msgid "Server username" -msgstr "Логин доступа к серверу" - msgid "Service Name" msgstr "Имя службы" @@ -3104,9 +3068,6 @@ msgstr "Сортировка" msgid "Source" msgstr "Источник" -msgid "Source routing" -msgstr "маршрутизация от источника" - msgid "Specifies the directory the device is attached to" msgstr "Папка, к которой монтируется раздел устройства." @@ -3152,6 +3113,9 @@ msgstr "Старт" msgid "Start priority" msgstr "Приоритет" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "Загрузка" @@ -3320,6 +3284,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "Не удалось загрузить config файл из-за следующей ошибки:" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3343,9 +3317,6 @@ msgstr "" "удостовериться в целостности данных.<br /> Нажмите 'Продолжить', чтобы " "начать процедуру обновления прошивки." -msgid "The following changes have been committed" -msgstr "Ваши настройки были применены." - msgid "The following changes have been reverted" msgstr "Ваши настройки были отвергнуты." @@ -3413,13 +3384,6 @@ msgstr "" "в зависимости от настроек." msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" -"Конечная точка туннеля находится за NAT, по умолчанию отключена и " -"применяется только к AYIYA." - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3429,8 +3393,8 @@ msgstr "" msgid "There are no active leases." msgstr "Нет активных арендованных адресов." -msgid "There are no pending changes to apply!" -msgstr "Нет изменений, которые можно применить!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Нет изменений, которые можно отменить!" @@ -3589,15 +3553,6 @@ msgstr "Интерфейс туннеля" msgid "Tunnel Link" msgstr "Ссылка на туннель" -msgid "Tunnel broker protocol" -msgstr "Протокол посредника туннеля" - -msgid "Tunnel setup server" -msgstr "Сервер настройки туннеля" - -msgid "Tunnel type" -msgstr "Тип туннеля" - msgid "Tx-Power" msgstr "Мощность передатчика" @@ -3783,12 +3738,6 @@ msgid "Vendor Class to send when requesting DHCP" msgstr "" "Класс производителя (Vendor class), который отправлять при DHCP-запросах" -msgid "Verbose" -msgstr "Verbose" - -msgid "Verbose logging by aiccu daemon" -msgstr "Verbose ведение журнала демоном aiccu" - msgid "Verify" msgstr "Проверить" @@ -3820,18 +3769,15 @@ msgstr "" "Необходимо установить wpa_supplicant (режим клиента) или hostapd (режим " "точки доступа или ad-hoc) для поддержки шифрования WPA." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" -"Задать время ожидания синхронизации NTP, установка значения - '0', отключает " -"ожидание (необязательно)." - msgid "Waiting for changes to be applied..." msgstr "Ожидание применения изменений..." msgid "Waiting for command to complete..." msgstr "Ожидание завершения выполнения команды..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "Ожидание подключения устройства..." @@ -3848,12 +3794,6 @@ msgid "" "communications" msgstr "При использовании PSK, PMK может быть создан локально, без AP в связи." -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "Создание маршрута по умолчанию IPv6 через туннель." - -msgid "Whether to route only packets from delegated prefixes" -msgstr "Маршрутизация только пакетов из делегированных префиксов." - msgid "Width" msgstr "Ширина" @@ -4000,9 +3940,6 @@ msgstr "kbit/s" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "Локальный <abbr title=\"Служба доменных имён\">DNS</abbr>-файл." -msgid "minimum 1280, maximum 1480" -msgstr "минимум 1280, максимум 1480" - msgid "minutes" msgstr "минут(ы)" diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po index acc57792b3..e7e302b1b0 100644 --- a/modules/luci-base/po/sk/base.po +++ b/modules/luci-base/po/sk/base.po @@ -159,9 +159,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -195,9 +192,6 @@ msgstr "" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "" @@ -300,11 +294,6 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -383,10 +372,10 @@ msgstr "" msgid "Any zone" msgstr "" -msgid "Apply" +msgid "Apply request failed with status <code>%h</code>" msgstr "" -msgid "Applying changes" +msgid "Apply unchecked" msgstr "" msgid "" @@ -493,9 +482,6 @@ msgstr "" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -564,12 +550,20 @@ msgstr "" msgid "Changes applied." msgstr "" +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "" msgid "Channel" msgstr "" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "" @@ -639,10 +633,13 @@ msgstr "" msgid "Configuration" msgstr "" -msgid "Configuration applied." +msgid "Configuration files will be kept." msgstr "" -msgid "Configuration files will be kept." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" msgstr "" msgid "Confirmation" @@ -657,10 +654,13 @@ msgstr "" msgid "Connection Limit" msgstr "" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connections" msgstr "" -msgid "Connections" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." msgstr "" msgid "Country" @@ -789,9 +789,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "" @@ -831,6 +828,9 @@ msgstr "" msgid "Device unreachable" msgstr "" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "" @@ -863,6 +863,9 @@ msgstr "" msgid "Discard upstream RFC1918 responses" msgstr "" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "" @@ -1108,6 +1111,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "" @@ -1301,9 +1307,6 @@ msgstr "" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1416,9 +1419,6 @@ msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1984,9 +1984,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "" @@ -2110,6 +2107,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2155,12 +2155,6 @@ msgstr "" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2619,9 +2613,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2680,6 +2671,15 @@ msgstr "" msgid "Revert" msgstr "" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "" @@ -2695,9 +2695,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2721,14 +2718,6 @@ msgstr "" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2756,9 +2745,6 @@ msgstr "" msgid "Save & Apply" msgstr "" -msgid "Save & Apply" -msgstr "" - msgid "Scan" msgstr "" @@ -2785,17 +2771,6 @@ msgstr "" msgid "Server Settings" msgstr "" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "" @@ -2888,9 +2863,6 @@ msgstr "" msgid "Source" msgstr "" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -2929,6 +2901,9 @@ msgstr "" msgid "Start priority" msgstr "" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "" @@ -3079,6 +3054,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3095,9 +3080,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "" - msgid "The following changes have been reverted" msgstr "" @@ -3151,11 +3133,6 @@ msgid "" msgstr "" msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3163,7 +3140,7 @@ msgstr "" msgid "There are no active leases." msgstr "" -msgid "There are no pending changes to apply!" +msgid "There are no changes to apply." msgstr "" msgid "There are no pending changes to revert!" @@ -3298,15 +3275,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3479,12 +3447,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" @@ -3514,16 +3476,15 @@ msgid "" "and ad-hoc mode) to be installed." msgstr "" -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3538,12 +3499,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3679,9 +3634,6 @@ msgstr "" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po index 632ea6f745..dc68fdc368 100644 --- a/modules/luci-base/po/sv/base.po +++ b/modules/luci-base/po/sv/base.po @@ -167,9 +167,6 @@ msgstr "A43C + J43 + A43 + V43" msgid "ADSL" msgstr "ADSL" -msgid "AICCU (SIXXS)" -msgstr "AICCU (SIXXS)" - msgid "ANSI T1.413" msgstr "ANSI T1.413" @@ -203,9 +200,6 @@ msgstr "" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "AYIYA" - msgid "Access Concentrator" msgstr "" @@ -311,11 +305,6 @@ msgstr "" msgid "Allowed IPs" msgstr "Tillåtna IP-adresser" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -394,11 +383,11 @@ msgstr "Konfiguration av antenn" msgid "Any zone" msgstr "Någon zon" -msgid "Apply" -msgstr "Verkställ" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "Verkställer ändringar" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -504,9 +493,6 @@ msgstr "Fel adress angiven!" msgid "Band" msgstr "Band" -msgid "Behind NAT" -msgstr "Bakom NAT" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -576,12 +562,20 @@ msgstr "Ändringar" msgid "Changes applied." msgstr "Tillämpade ändringar" +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Ändrar administratörens lösenord för att få tillgång till enheten" msgid "Channel" msgstr "Kanal" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Kontrollera" @@ -653,12 +647,15 @@ msgstr "" msgid "Configuration" msgstr "Konfiguration" -msgid "Configuration applied." -msgstr "Konfigurationen tillämpades" - msgid "Configuration files will be kept." msgstr "Konfigurationsfiler kommer att behållas." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Bekräftelse" @@ -671,12 +668,15 @@ msgstr "Ansluten" msgid "Connection Limit" msgstr "Anslutningsgräns" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Anslutningar" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Land" @@ -803,9 +803,6 @@ msgstr "Standard gateway" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "Standardrutt" - msgid "Default state" msgstr "" @@ -845,6 +842,9 @@ msgstr "Enheten startar om..." msgid "Device unreachable" msgstr "Enheten kan inte nås" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "" @@ -879,6 +879,9 @@ msgstr "Inaktiverad (standard)" msgid "Discard upstream RFC1918 responses" msgstr "" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "" @@ -1128,6 +1131,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Fil" @@ -1321,9 +1327,6 @@ msgstr "Lägg på" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "Hjärtslag" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1436,9 +1439,6 @@ msgstr "" msgid "IPv6 address" msgstr "IPv6-adress" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2005,9 +2005,6 @@ msgstr "NT-domän" msgid "NTP server candidates" msgstr "NTP-serverkandidater" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Namn" @@ -2131,6 +2128,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2176,12 +2176,6 @@ msgstr "Alternativet togs bort" msgid "Optional" msgstr "Valfri" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2642,9 +2636,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "Kräv TLS" - msgid "Required" msgstr "Krävs!" @@ -2703,6 +2694,15 @@ msgstr "Visa/göm lösenord" msgid "Revert" msgstr "Återgå" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Root" @@ -2718,9 +2718,6 @@ msgstr "" msgid "Route type" msgstr "Typ av rutt" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2744,14 +2741,6 @@ msgstr "Kör filsystemskontrollen" msgid "SHA256" msgstr "SHA256" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "SNR" @@ -2779,9 +2768,6 @@ msgstr "Spara" msgid "Save & Apply" msgstr "Spara och Verkställ" -msgid "Save & Apply" -msgstr "Spara & Verkställ" - msgid "Scan" msgstr "Skanna" @@ -2808,17 +2794,6 @@ msgstr "Separera klienter" msgid "Server Settings" msgstr "Inställningar för server" -msgid "Server password" -msgstr "Lösenordet för servern" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "Användarnamnet för servern" - msgid "Service Name" msgstr "Namn på tjänst" @@ -2911,9 +2886,6 @@ msgstr "Sortera" msgid "Source" msgstr "Källa" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -2952,6 +2924,9 @@ msgstr "" msgid "Start priority" msgstr "" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "" @@ -3102,6 +3077,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3118,9 +3103,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "Följande ändringar har skickats in" - msgid "The following changes have been reverted" msgstr "" @@ -3174,11 +3156,6 @@ msgid "" msgstr "" msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3186,8 +3163,8 @@ msgstr "" msgid "There are no active leases." msgstr "Det finns inga aktiva kontrakt." -msgid "There are no pending changes to apply!" -msgstr "Det finns inga pendlande ändringar att verkställa!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Det finns inga pendlande ändringar att återkalla" @@ -3325,15 +3302,6 @@ msgstr "Tunnelgränssnitt" msgid "Tunnel Link" msgstr "Tunnel-länk" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "Tunnel-typ" - msgid "Tx-Power" msgstr "" @@ -3506,12 +3474,6 @@ msgstr "Tillverkare" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "Utförlig" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Verkställ" @@ -3541,16 +3503,15 @@ msgid "" "and ad-hoc mode) to be installed." msgstr "" -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "Väntar på att ändringarna ska tillämpas..." msgid "Waiting for command to complete..." msgstr "Väntar på att kommandot ska avsluta..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "Väntar på enheten..." @@ -3566,12 +3527,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "Bredd" @@ -3712,9 +3667,6 @@ msgstr "kbit/s" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "lokal <abbr title=\"Domain Name System\">DNS</abbr>-fil" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "minuter" @@ -3790,8 +3742,3 @@ msgstr "ja" msgid "« Back" msgstr "« Bakåt" -#~ msgid "Action" -#~ msgstr "Åtgärd" - -#~ msgid "Buttons" -#~ msgstr "Knappar" diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot index ddf2e56faa..b944566c09 100644 --- a/modules/luci-base/po/templates/base.pot +++ b/modules/luci-base/po/templates/base.pot @@ -152,9 +152,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -188,9 +185,6 @@ msgstr "" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "" @@ -293,11 +287,6 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -376,10 +365,10 @@ msgstr "" msgid "Any zone" msgstr "" -msgid "Apply" +msgid "Apply request failed with status <code>%h</code>" msgstr "" -msgid "Applying changes" +msgid "Apply unchecked" msgstr "" msgid "" @@ -486,9 +475,6 @@ msgstr "" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -557,12 +543,20 @@ msgstr "" msgid "Changes applied." msgstr "" +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "" msgid "Channel" msgstr "" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "" @@ -632,10 +626,13 @@ msgstr "" msgid "Configuration" msgstr "" -msgid "Configuration applied." +msgid "Configuration files will be kept." msgstr "" -msgid "Configuration files will be kept." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" msgstr "" msgid "Confirmation" @@ -650,10 +647,13 @@ msgstr "" msgid "Connection Limit" msgstr "" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connections" msgstr "" -msgid "Connections" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." msgstr "" msgid "Country" @@ -782,9 +782,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "" @@ -824,6 +821,9 @@ msgstr "" msgid "Device unreachable" msgstr "" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "" @@ -856,6 +856,9 @@ msgstr "" msgid "Discard upstream RFC1918 responses" msgstr "" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "" @@ -1101,6 +1104,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "" @@ -1294,9 +1300,6 @@ msgstr "" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1409,9 +1412,6 @@ msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1977,9 +1977,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "" @@ -2103,6 +2100,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2148,12 +2148,6 @@ msgstr "" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2612,9 +2606,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2673,6 +2664,15 @@ msgstr "" msgid "Revert" msgstr "" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "" @@ -2688,9 +2688,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2714,14 +2711,6 @@ msgstr "" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2749,9 +2738,6 @@ msgstr "" msgid "Save & Apply" msgstr "" -msgid "Save & Apply" -msgstr "" - msgid "Scan" msgstr "" @@ -2778,17 +2764,6 @@ msgstr "" msgid "Server Settings" msgstr "" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "" @@ -2881,9 +2856,6 @@ msgstr "" msgid "Source" msgstr "" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -2922,6 +2894,9 @@ msgstr "" msgid "Start priority" msgstr "" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "" @@ -3072,6 +3047,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3088,9 +3073,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "" - msgid "The following changes have been reverted" msgstr "" @@ -3144,11 +3126,6 @@ msgid "" msgstr "" msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3156,7 +3133,7 @@ msgstr "" msgid "There are no active leases." msgstr "" -msgid "There are no pending changes to apply!" +msgid "There are no changes to apply." msgstr "" msgid "There are no pending changes to revert!" @@ -3291,15 +3268,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3472,12 +3440,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" @@ -3507,16 +3469,15 @@ msgid "" "and ad-hoc mode) to be installed." msgstr "" -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3531,12 +3492,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3672,9 +3627,6 @@ msgstr "" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po index 953d1e9669..cfa7cd3c48 100644 --- a/modules/luci-base/po/tr/base.po +++ b/modules/luci-base/po/tr/base.po @@ -39,13 +39,13 @@ msgid "-- custom --" msgstr "-- özel --" msgid "-- match by device --" -msgstr "" +msgstr "-- cihaza göre eşleştir --" msgid "-- match by label --" -msgstr "" +msgstr "-- etikete göre eşleştir --" msgid "-- match by uuid --" -msgstr "" +msgstr "-- uuid'e göre eşleştir --" msgid "1 Minute Load:" msgstr "1 Dakikalık Yük:" @@ -54,7 +54,7 @@ msgid "15 Minute Load:" msgstr "15 Dakikalık Yük:" msgid "4-character hexadecimal ID" -msgstr "" +msgstr "4 karakterli HEX ID" msgid "464XLAT (CLAT)" msgstr "" @@ -168,9 +168,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -204,9 +201,6 @@ msgstr "" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "" @@ -313,11 +307,6 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -396,11 +385,11 @@ msgstr "Anten Yapılandırması" msgid "Any zone" msgstr "" -msgid "Apply" -msgstr "Uygula" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "Değişiklikleri uygula" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -435,7 +424,7 @@ msgid "Auto Refresh" msgstr "Otomatik Yenileme" msgid "Automatic" -msgstr "" +msgstr "Otomatik" msgid "Automatic Homenet (HNCP)" msgstr "" @@ -474,7 +463,7 @@ msgid "BR / DMR / AFTR" msgstr "" msgid "BSSID" -msgstr "" +msgstr "BSSID" msgid "Back" msgstr "Geri" @@ -506,9 +495,6 @@ msgstr "" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -560,27 +546,35 @@ msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" msgid "CPU usage (%)" -msgstr "" +msgstr "CPU kullanımı (%)" msgid "Cancel" -msgstr "" +msgstr "Vazgeç" msgid "Category" -msgstr "" +msgstr "Kategori" msgid "Chain" -msgstr "" +msgstr "Zincir" msgid "Changes" -msgstr "" +msgstr "Değişiklikler" msgid "Changes applied." msgstr "" +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "" msgid "Channel" +msgstr "Kanal" + +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." msgstr "" msgid "Check" @@ -652,10 +646,13 @@ msgstr "" msgid "Configuration" msgstr "" -msgid "Configuration applied." +msgid "Configuration files will be kept." +msgstr "" + +msgid "Configuration has been applied." msgstr "" -msgid "Configuration files will be kept." +msgid "Configuration has been rolled back!" msgstr "" msgid "Confirmation" @@ -670,10 +667,13 @@ msgstr "" msgid "Connection Limit" msgstr "" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connections" msgstr "" -msgid "Connections" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." msgstr "" msgid "Country" @@ -802,9 +802,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "" @@ -844,6 +841,9 @@ msgstr "" msgid "Device unreachable" msgstr "" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "" @@ -876,6 +876,9 @@ msgstr "" msgid "Discard upstream RFC1918 responses" msgstr "" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "" @@ -1121,6 +1124,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "" @@ -1314,9 +1320,6 @@ msgstr "" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1429,9 +1432,6 @@ msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1821,10 +1821,10 @@ msgid "Logging" msgstr "" msgid "Login" -msgstr "" +msgstr "Oturum Aç" msgid "Logout" -msgstr "" +msgstr "Oturumu Kapat" msgid "Loss of Signal Seconds (LOSS)" msgstr "" @@ -1997,9 +1997,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "" @@ -2123,6 +2120,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2168,12 +2168,6 @@ msgstr "" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2632,9 +2626,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2664,13 +2655,13 @@ msgid "" msgstr "" msgid "Reset" -msgstr "" +msgstr "Sıfırla" msgid "Reset Counters" -msgstr "" +msgstr "Sayaçları Sıfırla" msgid "Reset to defaults" -msgstr "" +msgstr "Varsayılanlara dön" msgid "Resolv and Hosts Files" msgstr "" @@ -2679,23 +2670,32 @@ msgid "Resolve file" msgstr "" msgid "Restart" -msgstr "" +msgstr "Tekrar başlat" msgid "Restart Firewall" msgstr "" msgid "Restore backup" -msgstr "" +msgstr "Yedeklemeyi geri yükle" msgid "Reveal/hide password" msgstr "" msgid "Revert" +msgstr "Dönmek" + +msgid "Revert changes" +msgstr "Değişiklikleri geri al" + +msgid "Revert request failed with status <code>%h</code>" msgstr "" -msgid "Root" +msgid "Reverting configuration…" msgstr "" +msgid "Root" +msgstr "Kök" + msgid "Root directory for files served via TFTP" msgstr "" @@ -2706,19 +2706,16 @@ msgid "Route Allowed IPs" msgstr "" msgid "Route type" -msgstr "" - -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" +msgstr "Yönlendirme Tipi" msgid "Router Advertisement-Service" msgstr "" msgid "Router Password" -msgstr "" +msgstr "Yönlendirici Parolası" msgid "Routes" -msgstr "" +msgstr "Yönlendirmeler" msgid "" "Routes specify over which interface and gateway a certain host or network " @@ -2726,63 +2723,52 @@ msgid "" msgstr "" msgid "Run a filesystem check before mounting the device" -msgstr "" +msgstr "Cihazı bağlamadan önce bir dosya sistemi kontrolü yapın" msgid "Run filesystem check" -msgstr "" +msgstr "Dosya sistemi kontrolünü çalıştır" msgid "SHA256" -msgstr "" - -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" +msgstr "SHA256" msgid "SNR" -msgstr "" +msgstr "SNR" msgid "SSH Access" -msgstr "" +msgstr "SSH Erişimi" msgid "SSH server address" -msgstr "" +msgstr "SSH sunucu adresi" msgid "SSH server port" -msgstr "" +msgstr "SSH sunucu portu" msgid "SSH username" -msgstr "" +msgstr "SSH kullanıcı adı" msgid "SSH-Keys" msgstr "" msgid "SSID" -msgstr "" +msgstr "SSID" msgid "Save" -msgstr "" +msgstr "Kaydet" msgid "Save & Apply" -msgstr "" - -msgid "Save & Apply" -msgstr "" +msgstr "Kaydet & Uygula" msgid "Scan" -msgstr "" +msgstr "Tara" msgid "Scheduled Tasks" -msgstr "" +msgstr "Zamanlanmış Görevler" msgid "Section added" -msgstr "" +msgstr "Bölüm eklendi" msgid "Section removed" -msgstr "" +msgstr "Bölüm kaldırıldı" msgid "See \"mount\" manpage for details" msgstr "" @@ -2798,17 +2784,6 @@ msgstr "" msgid "Server Settings" msgstr "" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "" @@ -2816,7 +2791,7 @@ msgid "Service Type" msgstr "" msgid "Services" -msgstr "" +msgstr "Servisler" msgid "" "Set interface properties regardless of the link carrier (If set, carrier " @@ -2845,25 +2820,25 @@ msgid "Shutdown this network" msgstr "" msgid "Signal" -msgstr "" +msgstr "Sinyal" msgid "Signal Attenuation (SATN)" -msgstr "" +msgstr "Sinyal Zayıflama (SATN)" msgid "Signal:" -msgstr "" +msgstr "Sinyal:" msgid "Size" -msgstr "" +msgstr "Boyut" msgid "Size (.ipk)" -msgstr "" +msgstr "Boyut (.ipk)" msgid "Size of DNS query cache" msgstr "" msgid "Skip" -msgstr "" +msgstr "Atla" msgid "Skip to content" msgstr "" @@ -2875,7 +2850,7 @@ msgid "Slot time" msgstr "" msgid "Software" -msgstr "" +msgstr "Yazılım" msgid "Software VLAN" msgstr "" @@ -2896,13 +2871,10 @@ msgid "" msgstr "" msgid "Sort" -msgstr "" +msgstr "Sıralama" msgid "Source" -msgstr "" - -msgid "Source routing" -msgstr "" +msgstr "Kaynak" msgid "Specifies the directory the device is attached to" msgstr "" @@ -2937,11 +2909,14 @@ msgid "Specify the secret encryption key here." msgstr "" msgid "Start" -msgstr "" +msgstr "Başlat" msgid "Start priority" msgstr "" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "" @@ -2967,16 +2942,16 @@ msgid "" msgstr "" msgid "Status" -msgstr "" +msgstr "Durum" msgid "Stop" -msgstr "" +msgstr "Durdur" msgid "Strict order" msgstr "" msgid "Submit" -msgstr "" +msgstr "Gönder" msgid "Suppress logging" msgstr "" @@ -3019,7 +2994,7 @@ msgid "Synchronizing..." msgstr "" msgid "System" -msgstr "" +msgstr "Sistem" msgid "System Log" msgstr "" @@ -3092,6 +3067,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3108,9 +3093,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "" - msgid "The following changes have been reverted" msgstr "" @@ -3164,11 +3146,6 @@ msgid "" msgstr "" msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3176,7 +3153,7 @@ msgstr "" msgid "There are no active leases." msgstr "" -msgid "There are no pending changes to apply!" +msgid "There are no changes to apply." msgstr "" msgid "There are no pending changes to revert!" @@ -3311,15 +3288,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3381,10 +3349,10 @@ msgid "Upload archive..." msgstr "" msgid "Uploaded File" -msgstr "" +msgstr "Yüklenen Dosya" msgid "Uptime" -msgstr "" +msgstr "Açılma süresi" msgid "Use <code>/etc/ethers</code>" msgstr "" @@ -3417,16 +3385,16 @@ msgid "Use builtin IPv6-management" msgstr "" msgid "Use custom DNS servers" -msgstr "" +msgstr "Özel DNS sunucularını kullan" msgid "Use default gateway" -msgstr "" +msgstr "Varsayılan ağ geçidini kullan" msgid "Use gateway metric" -msgstr "" +msgstr "Ağ geçidi metriğini kullan" msgid "Use routing table" -msgstr "" +msgstr "Yönlendirme tablosunu kullan" msgid "" "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</" @@ -3437,7 +3405,7 @@ msgid "" msgstr "" msgid "Used" -msgstr "" +msgstr "Kullanılmış" msgid "Used Key Slot" msgstr "" @@ -3454,7 +3422,7 @@ msgid "User key (PEM encoded)" msgstr "" msgid "Username" -msgstr "" +msgstr "Kullanıcı adı" msgid "VC-Mux" msgstr "" @@ -3487,22 +3455,16 @@ msgid "VPNC (CISCO 3000 (and others) VPN)" msgstr "" msgid "Vendor" -msgstr "" +msgstr "Satıcı" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" -msgstr "" +msgstr "Kontrol" msgid "Version" -msgstr "" +msgstr "Versiyon" msgid "WDS" msgstr "" @@ -3527,21 +3489,20 @@ msgid "" "and ad-hoc mode) to be installed." msgstr "" -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" msgid "Warning" -msgstr "" +msgstr "Uyarı" msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "" @@ -3551,20 +3512,14 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" -msgstr "" +msgstr "Genişlik" msgid "WireGuard VPN" msgstr "" msgid "Wireless" -msgstr "" +msgstr "Kablosuz" msgid "Wireless Adapter" msgstr "" @@ -3627,28 +3582,28 @@ msgid "auto" msgstr "otomatik" msgid "baseT" -msgstr "" +msgstr "baseT" msgid "bridged" msgstr "köprülü" msgid "create:" -msgstr "" +msgstr "oluşturma:" msgid "creates a bridge over specified interface(s)" msgstr "" msgid "dB" -msgstr "" +msgstr "dB" msgid "dBm" -msgstr "" +msgstr "dBm" msgid "disable" msgstr "etkin değil" msgid "disabled" -msgstr "" +msgstr "devre dışı" msgid "expired" msgstr "sona ermiş" @@ -3662,19 +3617,19 @@ msgid "forward" msgstr "ileri" msgid "full-duplex" -msgstr "" +msgstr "tam çift yönlü" msgid "half-duplex" -msgstr "" +msgstr "yarı çift yönlü" msgid "help" msgstr "yardım" msgid "hidden" -msgstr "" +msgstr "gizli" msgid "hybrid mode" -msgstr "" +msgstr "hibrit mod" msgid "if target is a network" msgstr "eğer hedef ağsa" @@ -3683,34 +3638,31 @@ msgid "input" msgstr "giriş" msgid "kB" -msgstr "" +msgstr "kB" msgid "kB/s" -msgstr "" +msgstr "kB/s" msgid "kbit/s" -msgstr "" +msgstr "kbit/s" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "yerel <abbr title=\"Domain Name System\">DNS</abbr> dosyası" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" -msgstr "" +msgstr "dakika" msgid "no" msgstr "hayır" msgid "no link" -msgstr "" +msgstr "bağlantı yok" msgid "none" msgstr "hiçbiri" msgid "not present" -msgstr "" +msgstr "mevcut değil" msgid "off" msgstr "kapalı" @@ -3719,31 +3671,31 @@ msgid "on" msgstr "açık" msgid "open" -msgstr "" +msgstr "açık" msgid "overlay" -msgstr "" +msgstr "bindirilmiş" msgid "random" -msgstr "" +msgstr "rastgele" msgid "relay mode" -msgstr "" +msgstr "anahtarlama modu" msgid "routed" msgstr "yönlendirildi" msgid "server mode" -msgstr "" +msgstr "sunucu modu" msgid "stateful-only" msgstr "" msgid "stateless" -msgstr "" +msgstr "durumsuz" msgid "stateless + stateful" -msgstr "" +msgstr "durumsuz + durumlu" msgid "tagged" msgstr "etiketlendi" @@ -3752,7 +3704,7 @@ msgid "time units (TUs / 1.024 ms) [1000-65535]" msgstr "" msgid "unknown" -msgstr "" +msgstr "bilinmeyen" msgid "unlimited" msgstr "sınırsız" @@ -3772,6 +3724,12 @@ msgstr "evet" msgid "« Back" msgstr "« Geri" +#~ msgid "Apply" +#~ msgstr "Uygula" + +#~ msgid "Applying changes" +#~ msgstr "Değişiklikleri uygula" + #~ msgid "Action" #~ msgstr "Eylem" diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po index 8ead616074..d053200496 100644 --- a/modules/luci-base/po/uk/base.po +++ b/modules/luci-base/po/uk/base.po @@ -183,9 +183,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -227,9 +224,6 @@ msgstr "Номер ATM-пристрою" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Концентратор доступу" @@ -337,11 +331,6 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -420,11 +409,11 @@ msgstr "Конфигурація антени" msgid "Any zone" msgstr "Будь-яка зона" -msgid "Apply" -msgstr "Застосувати" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "Застосування змін" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -530,9 +519,6 @@ msgstr "Вказана неправильна адреса!" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -604,12 +590,20 @@ msgstr "Зміни" msgid "Changes applied." msgstr "Зміни застосовано." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Зміна пароля адміністратора для доступу до пристрою" msgid "Channel" msgstr "Канал" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Перевірити" @@ -690,12 +684,15 @@ msgstr "" msgid "Configuration" msgstr "Конфігурація" -msgid "Configuration applied." -msgstr "Конфігурація застосована." - msgid "Configuration files will be kept." msgstr "Конфігураційні файли будуть збережені." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Підтвердження" @@ -708,12 +705,15 @@ msgstr "Підключений" msgid "Connection Limit" msgstr "Гранична кількість підключень" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Підключення" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Країна" @@ -842,9 +842,6 @@ msgstr "Типовий шлюз" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Типовий стан" @@ -887,6 +884,9 @@ msgstr "" msgid "Device unreachable" msgstr "" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "Діагностика" @@ -921,6 +921,9 @@ msgstr "" msgid "Discard upstream RFC1918 responses" msgstr "Відкидати RFC1918-відповіді від клієнта на сервер" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Показані тільки непорожні пакети" @@ -1184,6 +1187,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Файл" @@ -1377,9 +1383,6 @@ msgstr "Призупинити" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1498,9 +1501,6 @@ msgstr "Статус IPv6 WAN" msgid "IPv6 address" msgstr "Адреса IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2093,9 +2093,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Кандидати для синхронізації NTP-сервера" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Ім'я" @@ -2219,6 +2216,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "Затримка Off-State" @@ -2270,12 +2270,6 @@ msgstr "Опція видалена" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2757,9 +2751,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2818,6 +2809,15 @@ msgstr "Показати/приховати пароль" msgid "Revert" msgstr "Скасувати зміни" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Корінь" @@ -2833,9 +2833,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2861,14 +2858,6 @@ msgstr "Виконати перевірку файлової системи" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2896,9 +2885,6 @@ msgstr "Зберегти" msgid "Save & Apply" msgstr "Зберегти і застосувати" -msgid "Save & Apply" -msgstr "Зберегти і застосувати" - msgid "Scan" msgstr "Сканувати" @@ -2927,17 +2913,6 @@ msgstr "Розділяти клієнтів" msgid "Server Settings" msgstr "Настройки сервера" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Назва (ім'я) сервісу" @@ -3034,9 +3009,6 @@ msgstr "Сортування" msgid "Source" msgstr "Джерело" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "Визначає каталог, до якого приєднаний пристрій" @@ -3079,6 +3051,9 @@ msgstr "Запустити" msgid "Start priority" msgstr "Стартовий пріоритет" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "Запуск" @@ -3245,6 +3220,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "Файл пристрою пам'яті або розділу (наприклад, <code>/dev/sda1</code>)" @@ -3267,9 +3252,6 @@ msgstr "" "їх з вихідним файлом для забезпечення цілісності даних.<br /> Натисніть " "\"Продовжити\", щоб розпочати процедуру оновлення прошивки." -msgid "The following changes have been committed" -msgstr "Нижче наведені зміни були застосовані" - msgid "The following changes have been reverted" msgstr "Нижче наведені зміни були скасовані" @@ -3341,11 +3323,6 @@ msgstr "" "адресу вашого комп'ютера, щоб знову отримати доступ до пристрою." msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3355,8 +3332,8 @@ msgstr "" msgid "There are no active leases." msgstr "Активних оренд немає." -msgid "There are no pending changes to apply!" -msgstr "Немає жодних змін до застосування!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Немає жодних змін до скасування!" @@ -3511,15 +3488,6 @@ msgstr "Інтерфейс тунелю" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Потужність передавача" @@ -3699,12 +3667,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "Клас постачальника для відправки при запиті DHCP" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Перевірте" @@ -3736,16 +3698,15 @@ msgstr "" "WPA-шифрування потребує інсталяції <em>wpa_supplicant</em> (для режиму " "клієнта) або <em>hostapd</em> (для Точки доступу та режиму ad-hoc)." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "Очікуємо, доки зміни наберуть чинності..." msgid "Waiting for command to complete..." msgstr "Очікуємо завершення виконання команди..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3760,12 +3721,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3911,9 +3866,6 @@ msgstr "" "Локальний <abbr title=\"Domain Name System — система доменних імен\">DNS</" "abbr>-файл" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" @@ -3989,6 +3941,24 @@ msgstr "так" msgid "« Back" msgstr "« Назад" +#~ msgid "Apply" +#~ msgstr "Застосувати" + +#~ msgid "Applying changes" +#~ msgstr "Застосування змін" + +#~ msgid "Configuration applied." +#~ msgstr "Конфігурація застосована." + +#~ msgid "Save & Apply" +#~ msgstr "Зберегти і застосувати" + +#~ msgid "The following changes have been committed" +#~ msgstr "Нижче наведені зміни були застосовані" + +#~ msgid "There are no pending changes to apply!" +#~ msgstr "Немає жодних змін до застосування!" + #~ msgid "Action" #~ msgstr "Дія" diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po index 888fc92bfe..b5e712ca36 100644 --- a/modules/luci-base/po/vi/base.po +++ b/modules/luci-base/po/vi/base.po @@ -166,9 +166,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -202,9 +199,6 @@ msgstr "" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "" @@ -307,11 +301,6 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -390,11 +379,11 @@ msgstr "" msgid "Any zone" msgstr "" -msgid "Apply" -msgstr "Áp dụng" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "Tiến hành thay đổi" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -500,9 +489,6 @@ msgstr "" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -571,12 +557,20 @@ msgstr "Thay đổi" msgid "Changes applied." msgstr "Thay đổi đã áp dụng" +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "" msgid "Channel" msgstr "Kênh" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "" @@ -646,10 +640,13 @@ msgstr "" msgid "Configuration" msgstr "Cấu hình" -msgid "Configuration applied." +msgid "Configuration files will be kept." msgstr "" -msgid "Configuration files will be kept." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" msgstr "" msgid "Confirmation" @@ -664,10 +661,13 @@ msgstr "" msgid "Connection Limit" msgstr "Giới hạn kết nối" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connections" msgstr "" -msgid "Connections" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." msgstr "" msgid "Country" @@ -798,9 +798,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "" @@ -840,6 +837,9 @@ msgstr "" msgid "Device unreachable" msgstr "" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "" @@ -872,6 +872,9 @@ msgstr "" msgid "Discard upstream RFC1918 responses" msgstr "" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "" @@ -1126,6 +1129,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "" @@ -1319,9 +1325,6 @@ msgstr "Hang Up" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1436,9 +1439,6 @@ msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2014,9 +2014,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Tên" @@ -2140,6 +2137,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2191,12 +2191,6 @@ msgstr "" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2657,9 +2651,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2718,6 +2709,15 @@ msgstr "" msgid "Revert" msgstr "Revert" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "" @@ -2733,9 +2733,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2761,14 +2758,6 @@ msgstr "" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2796,9 +2785,6 @@ msgstr "Lưu" msgid "Save & Apply" msgstr "Lưu & áp dụng " -msgid "Save & Apply" -msgstr "" - msgid "Scan" msgstr "Scan" @@ -2825,17 +2811,6 @@ msgstr "Cô lập đối tượng" msgid "Server Settings" msgstr "" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "" @@ -2928,9 +2903,6 @@ msgstr "" msgid "Source" msgstr "Nguồn" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -2969,6 +2941,9 @@ msgstr "Bắt đầu " msgid "Start priority" msgstr "Bắt đầu ưu tiên" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "" @@ -3119,6 +3094,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3139,9 +3124,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "" - msgid "The following changes have been reverted" msgstr "Những thay đối sau đây đã được để trở về tình trạng cũ. " @@ -3199,11 +3181,6 @@ msgstr "" "máy tính để tiếp cận thiết bị một lần nữa, phụ thuộc vào cài đặt của bạn. " msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3213,7 +3190,7 @@ msgstr "" msgid "There are no active leases." msgstr "" -msgid "There are no pending changes to apply!" +msgid "There are no changes to apply." msgstr "" msgid "There are no pending changes to revert!" @@ -3353,15 +3330,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3534,12 +3502,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" @@ -3569,16 +3531,15 @@ msgid "" "and ad-hoc mode) to be installed." msgstr "" -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3593,12 +3554,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3740,9 +3695,6 @@ msgstr "" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "Tập tin <abbr title=\"Domain Name System\">DNS</abbr> địa phương" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" @@ -3818,6 +3770,12 @@ msgstr "" msgid "« Back" msgstr "" +#~ msgid "Apply" +#~ msgstr "Áp dụng" + +#~ msgid "Applying changes" +#~ msgstr "Tiến hành thay đổi" + #~ msgid "Action" #~ msgstr "Action" diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po index df6ce8b746..e0ef2eec71 100644 --- a/modules/luci-base/po/zh-cn/base.po +++ b/modules/luci-base/po/zh-cn/base.po @@ -162,9 +162,6 @@ msgstr "A43C + J43 + A43 + V43" msgid "ADSL" msgstr "ADSL" -msgid "AICCU (SIXXS)" -msgstr "AICCU (SIXXS)" - msgid "ANSI T1.413" msgstr "ANSI T1.413" @@ -200,9 +197,6 @@ msgstr "ATM 设备号码" msgid "ATU-C System Vendor ID" msgstr "ATU-C 系统供应商 ID" -msgid "AYIYA" -msgstr "AYIYA" - msgid "Access Concentrator" msgstr "接入集中器" @@ -305,13 +299,6 @@ msgstr "允许 127.0.0.0/8 回环范围内的上行响应，例如：RBL 服务" msgid "Allowed IPs" msgstr "允许的 IP" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" -"也请查看 SIXXS 上的<a href=\"https://www.sixxs.net/faq/connectivity/?" -"faq=comparison\">隧道对比</a>" - msgid "Always announce default router" msgstr "总是通告默认路由" @@ -390,11 +377,11 @@ msgstr "天线配置" msgid "Any zone" msgstr "任意区域" -msgid "Apply" -msgstr "应用" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "正在应用更改" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -500,9 +487,6 @@ msgstr "指定了错误的地址！" msgid "Band" msgstr "频宽" -msgid "Behind NAT" -msgstr "在 NAT 网络内" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -573,12 +557,20 @@ msgstr "修改数" msgid "Changes applied." msgstr "更改已应用" +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "修改访问设备的管理员密码" msgid "Channel" msgstr "信道" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "检查" @@ -655,12 +647,15 @@ msgstr "" msgid "Configuration" msgstr "配置" -msgid "Configuration applied." -msgstr "配置已应用。" - msgid "Configuration files will be kept." msgstr "配置文件将被保留。" +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "确认密码" @@ -673,12 +668,15 @@ msgstr "已连接" msgid "Connection Limit" msgstr "连接数限制" -msgid "Connection to server fails when TLS cannot be used" -msgstr "当 TLS 不可用时，与服务器连接失败" - msgid "Connections" msgstr "连接" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "国家" @@ -806,9 +804,6 @@ msgstr "默认网关" msgid "Default is stateless + stateful" msgstr "默认是无状态的 + 有状态的" -msgid "Default route" -msgstr "默认路由" - msgid "Default state" msgstr "默认状态" @@ -850,6 +845,9 @@ msgstr "设备正在重启..." msgid "Device unreachable" msgstr "无法连接到设备" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "网络诊断" @@ -884,6 +882,9 @@ msgstr "禁用（默认）" msgid "Discard upstream RFC1918 responses" msgstr "丢弃 RFC1918 上行响应数据" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "只显示有内容的软件包" @@ -1136,6 +1137,9 @@ msgstr "" msgid "FT protocol" msgstr "FT 协议" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "文件" @@ -1331,9 +1335,6 @@ msgstr "挂起" msgid "Header Error Code Errors (HEC)" msgstr "请求头错误代码错误（HEC）" -msgid "Heartbeat" -msgstr "心跳" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1446,9 +1447,6 @@ msgstr "IPv6 WAN 状态" msgid "IPv6 address" msgstr "IPv6 地址" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "绑定到隧道本端的 IPv6 地址（可选）" - msgid "IPv6 assignment hint" msgstr "IPv6 分配提示" @@ -2030,9 +2028,6 @@ msgstr "NT 域" msgid "NTP server candidates" msgstr "候选 NTP 服务器" -msgid "NTP sync time-out" -msgstr "NTP 同步超时" - msgid "Name" msgstr "名称" @@ -2156,6 +2151,9 @@ msgstr "混淆组密码" msgid "Obfuscated Password" msgstr "混淆密码" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "关闭时间" @@ -2205,12 +2203,6 @@ msgstr "移除的选项" msgid "Optional" msgstr "可选" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "可选，设置这个选项会覆盖默认服务器（tic.sixxs.net）" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "可选，如果您的 SIXXS 账号拥有一个以上的隧道请设置此项" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2684,9 +2676,6 @@ msgstr "请求 IPv6 地址" msgid "Request IPv6-prefix of length" msgstr "请求指定长度的 IPv6 前缀" -msgid "Require TLS" -msgstr "必须使用 TLS" - msgid "Required" msgstr "必须" @@ -2749,6 +2738,15 @@ msgstr "显示/隐藏 密码" msgid "Revert" msgstr "放弃" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Root" @@ -2764,9 +2762,6 @@ msgstr "路由允许的 IP" msgid "Route type" msgstr "路由类型" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "下行接口的路由 IPv6 前缀" - msgid "Router Advertisement-Service" msgstr "路由通告服务" @@ -2790,14 +2785,6 @@ msgstr "文件系统检查" msgid "SHA256" msgstr "SHA256" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "SIXXS 仅支持 TIC，对于使用 IP 协议 41（RFC4213）的静态隧道，使用 6in4" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "SIXXS-handle[/Tunnel-ID]" - msgid "SNR" msgstr "SNR" @@ -2825,9 +2812,6 @@ msgstr "保存" msgid "Save & Apply" msgstr "保存&应用" -msgid "Save & Apply" -msgstr "保存&应用" - msgid "Scan" msgstr "扫描" @@ -2854,17 +2838,6 @@ msgstr "隔离客户端" msgid "Server Settings" msgstr "服务器设置" -msgid "Server password" -msgstr "服务器密码" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "服务器密码，如果用户名包含隧道 ID 则在此填写隧道自己的密码" - -msgid "Server username" -msgstr "服务器用户名" - msgid "Service Name" msgstr "服务名" @@ -2961,9 +2934,6 @@ msgstr "排序" msgid "Source" msgstr "源地址" -msgid "Source routing" -msgstr "源路由" - msgid "Specifies the directory the device is attached to" msgstr "指定设备的挂载目录" @@ -3002,6 +2972,9 @@ msgstr "开始" msgid "Start priority" msgstr "启动优先级" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "启动项" @@ -3159,6 +3132,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "由于以下错误，配置文件无法被加载：" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "存储器或分区的设备文件，（例如：<code>/dev/sda1</code>）" @@ -3179,9 +3162,6 @@ msgstr "" "固件已上传，请注意核对文件大小和校验值！<br />点击下面的“继续”开始刷写，刷新" "过程中切勿断电！" -msgid "The following changes have been committed" -msgstr "以下更改已提交" - msgid "The following changes have been reverted" msgstr "以下更改已放弃" @@ -3241,11 +3221,6 @@ msgstr "" "钟后即可尝试重新连接到路由。您可能需要更改计算机的 IP 地址以重新连接。" msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "隧道端点在 NAT 之后，默认为禁用，仅适用于 AYIYA" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "不支持所上传的映像文件格式，请选择适合当前平台的通用映像文件。" @@ -3253,8 +3228,8 @@ msgstr "不支持所上传的映像文件格式，请选择适合当前平台的 msgid "There are no active leases." msgstr "没有已分配的租约。" -msgid "There are no pending changes to apply!" -msgstr "没有待生效的更改！" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "没有可放弃的更改！" @@ -3394,15 +3369,6 @@ msgstr "隧道接口" msgid "Tunnel Link" msgstr "隧道链接" -msgid "Tunnel broker protocol" -msgstr "隧道协议" - -msgid "Tunnel setup server" -msgstr "隧道配置服务器" - -msgid "Tunnel type" -msgstr "隧道类型" - msgid "Tx-Power" msgstr "传输功率" @@ -3582,12 +3548,6 @@ msgstr "Vendor" msgid "Vendor Class to send when requesting DHCP" msgstr "请求 DHCP 时发送的 Vendor Class 选项" -msgid "Verbose" -msgstr "详细" - -msgid "Verbose logging by aiccu daemon" -msgstr "Aiccu 守护程序详细日志" - msgid "Verify" msgstr "验证" @@ -3619,16 +3579,15 @@ msgstr "" "WPA 加密需要安装 wpa_supplicant（客户端模式）或安装 hostapd（接入点 AP、点对" "点 Ad-Hoc 模式）。" -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "NTP 同步前的等待时间，设置为 0 表示不等待（可选）" - msgid "Waiting for changes to be applied..." msgstr "正在应用更改..." msgid "Waiting for command to complete..." msgstr "等待命令执行完成..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "等待设备..." @@ -3643,12 +3602,6 @@ msgid "" "communications" msgstr "当使用 PSK 时，PMK 可以在没有 AP 间通信的情况下在本地生成" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "是否添加一条通向隧道的 IPv6 默认路由" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "是否仅路由来自分发前缀的数据包" - msgid "Width" msgstr "频宽" @@ -3790,9 +3743,6 @@ msgstr "kbit/s" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "本地 <abbr title=\"Domain Name Syste\">DNS</abbr> 解析文件" -msgid "minimum 1280, maximum 1480" -msgstr "最小值 1280，最大值 1480" - msgid "minutes" msgstr "分钟" @@ -3867,120 +3817,3 @@ msgstr "是" msgid "« Back" msgstr "« 后退" - -#~ msgid "Action" -#~ msgstr "动作" - -#~ msgid "Buttons" -#~ msgstr "按键" - -#~ msgid "Handler" -#~ msgstr "处理程序" - -#~ msgid "Maximum hold time" -#~ msgstr "最大持续时间" - -#~ msgid "Minimum hold time" -#~ msgstr "最低持续时间" - -#~ msgid "Path to executable which handles the button event" -#~ msgstr "处理按键动作的可执行文件路径" - -#~ msgid "Specifies the button state to handle" -#~ msgstr "指定要处理的按键状态" - -#~ msgid "This page allows the configuration of custom button actions" -#~ msgstr "自定义按键动作。" - -#~ msgid "Leasetime" -#~ msgstr "租用时间" - -#~ msgid "Optional." -#~ msgstr "可选。" - -#~ msgid "navigation Navigation" -#~ msgstr "导航" - -#~ msgid "skiplink1 Skip to navigation" -#~ msgstr "skiplink1 跳转到导航" - -#~ msgid "skiplink2 Skip to content" -#~ msgstr "skiplink2 跳到内容" - -#~ msgid "AuthGroup" -#~ msgstr "认证组" - -#~ msgid "automatic" -#~ msgstr "自动" - -#~ msgid "AR Support" -#~ msgstr "AR 支持" - -#~ msgid "Atheros 802.11%s Wireless Controller" -#~ msgstr "Qualcomm/Atheros 802.11%s 无线控制器" - -#~ msgid "Background Scan" -#~ msgstr "后台搜索" - -#~ msgid "Compression" -#~ msgstr "压缩" - -#~ msgid "Disable HW-Beacon timer" -#~ msgstr "停用 HW-Beacon 计时器" - -#~ msgid "Do not send probe responses" -#~ msgstr "不回送探测响应" - -#~ msgid "Fast Frames" -#~ msgstr "快速帧" - -#~ msgid "Maximum Rate" -#~ msgstr "最高速率" - -#~ msgid "Minimum Rate" -#~ msgstr "最低速率" - -#~ msgid "Multicast Rate" -#~ msgstr "多播速率" - -#~ msgid "Outdoor Channels" -#~ msgstr "户外频道" - -#~ msgid "Regulatory Domain" -#~ msgstr "无线网络国家区域" - -#~ msgid "Separate WDS" -#~ msgstr "隔离 WDS" - -#~ msgid "Static WDS" -#~ msgstr "静态 WDS" - -#~ msgid "Turbo Mode" -#~ msgstr "Turbo 模式" - -#~ msgid "XR Support" -#~ msgstr "XR 支持" - -#~ msgid "Required. Public key of peer." -#~ msgstr "必须，Peer 的公钥。" - -#~ msgid "An additional network will be created if you leave this checked." -#~ msgstr "如果选中此复选框，则会创建一个附加网络。" - -#~ msgid "An additional network will be created if you leave this unchecked." -#~ msgstr "取消选中将会另外创建一个新网络，而不会覆盖当前网络设置" - -#~ msgid "Join Network: Settings" -#~ msgstr "加入网络：设置" - -#~ msgid "CPU" -#~ msgstr "CPU" - -#~ msgid "Port %d" -#~ msgstr "端口 %d" - -#~ msgid "Port %d is untagged in multiple VLANs!" -#~ msgstr "端口 %d 在多个 VLAN 中均未标记！" - -#~ msgid "VLAN Interface" -#~ msgstr "VLAN 接口" diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po index edc5207bd9..82415865a5 100644 --- a/modules/luci-base/po/zh-tw/base.po +++ b/modules/luci-base/po/zh-tw/base.po @@ -167,9 +167,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -205,9 +202,6 @@ msgstr "ATM裝置號碼" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "接入集線器" @@ -310,11 +304,6 @@ msgstr "允許127.0.0.0/8範圍內的上游回應，例如：RBL服務" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" -"\">Tunneling Comparison</a> on SIXXS" -msgstr "" - msgid "Always announce default router" msgstr "" @@ -393,11 +382,11 @@ msgstr "天線設定" msgid "Any zone" msgstr "任意區域" -msgid "Apply" -msgstr "套用" +msgid "Apply request failed with status <code>%h</code>" +msgstr "" -msgid "Applying changes" -msgstr "正在套用變更" +msgid "Apply unchecked" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -503,9 +492,6 @@ msgstr "指定了錯誤的位置！" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" - msgid "" "Below is the determined list of files to backup. It consists of changed " "configuration files marked by opkg, essential base files and the user " @@ -576,12 +562,20 @@ msgstr "待修改" msgid "Changes applied." msgstr "修改已套用" +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "修改管理員密碼" msgid "Channel" msgstr "頻道" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "檢查" @@ -657,12 +651,15 @@ msgstr "" msgid "Configuration" msgstr "設定" -msgid "Configuration applied." -msgstr "啟用設定" - msgid "Configuration files will be kept." msgstr "設定檔將被存檔" +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "再確認" @@ -675,12 +672,15 @@ msgstr "已連線" msgid "Connection Limit" msgstr "連線限制" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "連線數" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "國別" @@ -809,9 +809,6 @@ msgstr "預設匝道器" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "預設狀態" @@ -853,6 +850,9 @@ msgstr "" msgid "Device unreachable" msgstr "" +msgid "Device unreachable!" +msgstr "" + msgid "Diagnostics" msgstr "診斷" @@ -886,6 +886,9 @@ msgstr "" msgid "Discard upstream RFC1918 responses" msgstr "丟棄上游RFC1918 虛擬IP網路的回應" +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "僅顯示內含的軟體" @@ -1139,6 +1142,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "檔案" @@ -1332,9 +1338,6 @@ msgstr "斷線" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1447,9 +1450,6 @@ msgstr "IPv6寬頻連線狀態" msgid "IPv6 address" msgstr "IPv6位址" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2021,9 +2021,6 @@ msgstr "" msgid "NTP server candidates" msgstr "NTP伺服器備選" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "名稱" @@ -2147,6 +2144,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "關閉狀態延遲" @@ -2196,12 +2196,6 @@ msgstr "選項已移除" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with <code>0x</code>." @@ -2671,9 +2665,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2732,6 +2723,15 @@ msgstr "明示/隱藏 密碼" msgid "Revert" msgstr "回溯" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status <code>%h</code>" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "根" @@ -2747,9 +2747,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2773,14 +2770,6 @@ msgstr "執行系統檢查" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2808,9 +2797,6 @@ msgstr "保存" msgid "Save & Apply" msgstr "保存並啟用" -msgid "Save & Apply" -msgstr "保存 & 啟用" - msgid "Scan" msgstr "掃描" @@ -2837,17 +2823,6 @@ msgstr "分隔用戶端" msgid "Server Settings" msgstr "伺服器設定值" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "服務名稱" @@ -2943,9 +2918,6 @@ msgstr "分類" msgid "Source" msgstr "來源" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "指定這個設備被附掛到那個目錄" @@ -2984,6 +2956,9 @@ msgstr "啟用" msgid "Start priority" msgstr "啟用優先權順序" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "啟動" @@ -3145,6 +3120,16 @@ msgid "The configuration file could not be loaded due to the following error:" msgstr "" msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + +msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" msgstr "" @@ -3167,9 +3152,6 @@ msgstr "" "要刷的映像檔已上傳.下面是這個校驗碼和檔案大小詳列, 用原始檔比對它門以確保資料" "完整性.<br />按下面的\"繼續\"便可以開啟更新流程." -msgid "The following changes have been committed" -msgstr "接下來的修改已經被承諾" - msgid "The following changes have been reverted" msgstr "接下來的修改已經被回復" @@ -3231,11 +3213,6 @@ msgstr "" "要更新您電腦的位址以便再連設備, 端看您的設定. " msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - -msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." msgstr "" @@ -3244,8 +3221,8 @@ msgstr "" msgid "There are no active leases." msgstr "租賃尚未啟動." -msgid "There are no pending changes to apply!" -msgstr "尚無聽候的修改被採用" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "尚無聽候的修改被復元!" @@ -3385,15 +3362,6 @@ msgstr "通道介面" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "傳送-功率" @@ -3571,12 +3539,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "當請求DHCP封包時要傳送的製造商類別碼" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "確認" @@ -3608,16 +3570,15 @@ msgstr "" "WPA-加密需要 wpa_supplican(終端模式)或者hostapd熱點(對AP或者是 ad-hoc模式)已" "被安裝." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "等待修改被啟用..." msgid "Waiting for command to complete..." msgstr "等待完整性指令..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3632,12 +3593,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3777,9 +3732,6 @@ msgstr "kbit/s" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "本地<abbr title=\"Domain Name System\">DNS</abbr> 檔案" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" @@ -3855,6 +3807,24 @@ msgstr "是的" msgid "« Back" msgstr "« 倒退" +#~ msgid "Apply" +#~ msgstr "套用" + +#~ msgid "Applying changes" +#~ msgstr "正在套用變更" + +#~ msgid "Configuration applied." +#~ msgstr "啟用設定" + +#~ msgid "Save & Apply" +#~ msgstr "保存 & 啟用" + +#~ msgid "The following changes have been committed" +#~ msgstr "接下來的修改已經被承諾" + +#~ msgid "There are no pending changes to apply!" +#~ msgstr "尚無聽候的修改被採用" + #~ msgid "Action" #~ msgstr "動作" diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview.htm index 2512a35b3c..14be401697 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview.htm @@ -164,7 +164,7 @@ ifc.ip6addrs[i] ); } - + if (ifc.ip6prefix) { html += String.format('<strong><%:IPv6-PD%>:</strong> %s<br />', ifc.ip6prefix); @@ -212,20 +212,20 @@ <fieldset class="cbi-section"> <legend><%:Interface Overview%></legend> - <table class="cbi-section-table" style="margin:10px; empty-cells:hide"> - <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell"><%:Network%></th> - <th class="cbi-section-table-cell" style="text-align:left"><%:Status%></th> - <th class="cbi-section-table-cell"><%:Actions%></th> - </tr> + <div class="table cbi-section-table" style="margin:10px; empty-cells:hide"> + <div class="tr cbi-section-table-titles"> + <div class="th"><%:Network%></div> + <div class="th left"><%:Status%></div> + <div class="th"><%:Actions%></div> + </div> <% for i, net in ipairs(netlist) do local z = net[3] local c = z and z:get_color() or "#EEEEEE" local t = z and translate("Part of zone %q" % z:name()) or translate("No zone assigned") %> - <tr class="cbi-section-table-row cbi-rowstyle-<%=i % 2 + 1%>"> - <td class="cbi-value-field" style="padding:3px"> + <div class="tr cbi-section-table-row cbi-rowstyle-<%=i % 2 + 1%>"> + <div class="td"> <div class="ifacebox"> <div class="ifacebox-head" style="background-color:<%=c%>" title="<%=pcdata(t)%>"> <strong><%=net[1]:upper()%></strong> @@ -235,19 +235,19 @@ <small>?</small> </div> </div> - </td> - <td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px" id="<%=net[1]%>-ifc-description"> + </div> + <div class="td left" id="<%=net[1]%>-ifc-description"> <em><%:Collecting data...%></em> - </td> - <td style="width:420px"> + </div> + <div class="td"> <input type="button" class="cbi-button cbi-button-reload" style="width:100px" onclick="iface_shutdown('<%=net[1]%>', true)" title="<%:Reconnect this interface%>" value="<%:Connect%>" /> <input type="button" class="cbi-button cbi-button-reset" style="width:100px" onclick="iface_shutdown('<%=net[1]%>', false)" title="<%:Shutdown this interface%>" value="<%:Stop%>" /> <input type="button" class="cbi-button cbi-button-edit" style="width:100px" onclick="location.href='<%=url("admin/network/network", net[1])%>'" title="<%:Edit this interface%>" value="<%:Edit%>" id="<%=net[1]%>-ifc-edit" /> <input type="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="iface_delete('<%=net[1]%>')" value="<%:Delete%>" /> - </td> - </tr> + </div> + </div> <% end %> - </table> + </div> <input type="button" class="cbi-button cbi-button-add" value="<%:Add new interface...%>" onclick="location.href='<%=url("admin/network/iface_add")%>'" /> </fieldset> 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 b15dd13f39..58f5400da7 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 @@ -71,17 +71,17 @@ ); //]]></script> -<table> - <tr class="cbi-section-table"> - <td></td> - <td class="cbi-value-field" style="min-width:16px; padding:3px; text-align:center" id="<%=self.option%>-ifc-signal"> +<div class="table"> + <div class="tr cbi-section-table"> + <div class="td"></div> + <div class="td cbi-value-field" style="min-width:16px; padding:3px; text-align:center" id="<%=self.option%>-ifc-signal"> <img src="<%=resource%>/icons/ethernet_disabled.png" style="width:16px; height:16px" /><br /> <small>?</small> - </td> - <td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px" id="<%=self.option%>-ifc-description"> + </div> + <div class="td cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px" id="<%=self.option%>-ifc-description"> <em><%:Collecting data...%></em> - </td> - </tr> -</table> + </div> + </div> +</div> <%+cbi/valuefooter%> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm index 28a37dcd98..9005279a4e 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm @@ -20,10 +20,10 @@ if (st && st[0] && tb) { /* clear all rows */ - while( tb.rows.length > 1 ) - tb.deleteRow(1); + while (tb.firstElementChild !== tb.lastElementChild) + tb.removeChild(tb.lastElementChild); - for( var i = 0; i < st[0].length; i++ ) + for (var i = 0; i < st[0].length; i++) { var timestr; @@ -34,24 +34,16 @@ else timestr = String.format('%t', st[0][i].expires); - var tr = tb.insertRow(-1); - tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1); - - tr.insertCell(-1).innerHTML = st[0][i].hostname ? st[0][i].hostname : '?'; - tr.insertCell(-1).innerHTML = st[0][i].ipaddr; - tr.insertCell(-1).innerHTML = st[0][i].macaddr; - tr.insertCell(-1).innerHTML = timestr; + tb.appendChild(E('<div class="tr cbi-section-table-row cbi-rowstyle-%d">'.format((i % 2) + 1), [ + E('<div class="td">', st[0][i].hostname || '?'), + E('<div class="td">', st[0][i].ipaddr), + E('<div class="td">', st[0][i].macaddr), + E('<div class="td">', timestr) + ])); } - if( tb.rows.length == 1 ) - { - var tr = tb.insertRow(-1); - tr.className = 'cbi-section-table-row'; - - var td = tr.insertCell(-1); - td.colSpan = 4; - td.innerHTML = '<em><br /><%:There are no active leases.%></em>'; - } + if (tb.firstElementChild === tb.lastElementChild) + tb.appendChild(E('<div class="tr cbi-section-table-row"><div class="td"><em><br /><%:There are no active leases.%></em></div></div>')); } var tb6 = document.getElementById('lease6_status_table'); @@ -60,10 +52,10 @@ tb6.parentNode.style.display = 'block'; /* clear all rows */ - while( tb6.rows.length > 1 ) - tb6.deleteRow(1); + while (tb6.firstElementChild !== tb6.lastElementChild) + tb6.removeChild(tb6.lastElementChild); - for( var i = 0; i < st[1].length; i++ ) + for (var i = 0; i < st[1].length; i++) { var timestr; @@ -74,35 +66,29 @@ else timestr = String.format('%t', st[1][i].expires); - var tr = tb6.insertRow(-1); - tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1); - - var host = hosts[duid2mac(st[1][i].duid)]; - if (!st[1][i].hostname) - tr.insertCell(-1).innerHTML = - (host && (host.name || host.ipv4 || host.ipv6)) - ? '<div style="max-width:200px;overflow:hidden;text-overflow:ellipsis;white-space: nowrap">? (%h)</div>'.format(host.name || host.ipv4 || host.ipv6) - : '?'; - else - tr.insertCell(-1).innerHTML = - (host && host.name && st[1][i].hostname != host.name) - ? '<div style="max-width:200px;overflow:hidden;text-overflow:ellipsis;white-space: nowrap">%h (%h)</div>'.format(st[1][i].hostname, host.name) - : st[1][i].hostname; - - tr.insertCell(-1).innerHTML = st[1][i].ip6addr; - tr.insertCell(-1).innerHTML = st[1][i].duid; - tr.insertCell(-1).innerHTML = timestr; + var host = hosts[duid2mac(st[1][i].duid)], + name = st[1][i].hostname, + hint = null; + + if (!name) { + if (host) + hint = host.name || host.ipv4 || host.ipv6; + } + else { + if (host && host.name && st[1][i].hostname != host.name) + hint = host.name; + } + + tb6.appendChild(E('<div class="tr cbi-section-table-row cbi-rowstyle-%d" style="max-width:200px;overflow:hidden;text-overflow:ellipsis;white-space: nowrap">'.format((i % 2) + 1), [ + E('<div class="td">', hint ? '<div style="max-width:200px;overflow:hidden;text-overflow:ellipsis;white-space: nowrap">%h (%h)</div>'.format(name || '?', hint) : (name || '?')), + E('<div class="td">', st[1][i].ip6addr), + E('<div class="td">', st[1][i].duid), + E('<div class="td">', timestr) + ])); } - if( tb6.rows.length == 1 ) - { - var tr = tb6.insertRow(-1); - tr.className = 'cbi-section-table-row'; - - var td = tr.insertCell(-1); - td.colSpan = 4; - td.innerHTML = '<em><br /><%:There are no active leases.%></em>'; - } + if (tb6.firstElementChild === tb6.lastElementChild) + tb6.appendChild(E('<div class="tr cbi-section-table-row"><div class="td"><em><br /><%:There are no active leases.%></em></div></div>')); } } ); @@ -110,30 +96,30 @@ <fieldset class="cbi-section"> <legend><%:Active DHCP Leases%></legend> - <table class="cbi-section-table" id="lease_status_table"> - <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell"><%:Hostname%></th> - <th class="cbi-section-table-cell"><%:IPv4-Address%></th> - <th class="cbi-section-table-cell"><%:MAC-Address%></th> - <th class="cbi-section-table-cell"><%:Leasetime remaining%></th> - </tr> - <tr class="cbi-section-table-row"> - <td colspan="4"><em><br /><%:Collecting data...%></em></td> - </tr> - </table> + <div class="table cbi-section-table" id="lease_status_table"> + <div class="tr cbi-section-table-titles"> + <div class="th cbi-section-table-cell"><%:Hostname%></div> + <div class="th cbi-section-table-cell"><%:IPv4-Address%></div> + <div class="th cbi-section-table-cell"><%:MAC-Address%></div> + <div class="th cbi-section-table-cell"><%:Leasetime remaining%></div> + </div> + <div class="tr cbi-section-table-row"> + <div class="td" colspan="4"><em><br /><%:Collecting data...%></em></div> + </div> + </div> </fieldset> <fieldset class="cbi-section" style="display:none"> <legend><%:Active DHCPv6 Leases%></legend> - <table class="cbi-section-table" id="lease6_status_table"> - <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell"><%:Host%></th> - <th class="cbi-section-table-cell"><%:IPv6-Address%></th> - <th class="cbi-section-table-cell"><%:DUID%></th> - <th class="cbi-section-table-cell"><%:Leasetime remaining%></th> - </tr> - <tr class="cbi-section-table-row"> - <td colspan="4"><em><br /><%:Collecting data...%></em></td> - </tr> - </table> + <div class="table cbi-section-table" id="lease6_status_table"> + <div class="tr cbi-section-table-titles"> + <div class="th cbi-section-table-cell"><%:Host%></div> + <div class="th cbi-section-table-cell"><%:IPv6-Address%></div> + <div class="th cbi-section-table-cell"><%:DUID%></div> + <div class="th cbi-section-table-cell"><%:Leasetime remaining%></div> + </div> + <div class="tr cbi-section-table-row"> + <div class="td" colspan="4"><em><br /><%:Collecting data...%></em></div> + </div> + </div> </fieldset> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm index 3533c6fa4d..e9cfb3e85b 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm @@ -91,24 +91,24 @@ <div class="cbi-map"> <fieldset class="cbi-section"> - <table class="cbi-section-table" style="empty-cells:hide"> + <div class="table cbi-section-table" style="empty-cells:hide"> <!-- scan list --> <% for i, net in ipairs(scanlist(3)) do net.encryption = net.encryption or { } %> - <tr class="cbi-section-table-row cbi-rowstyle-<%=1 + ((i-1) % 2)%>"> - <td class="cbi-value-field" style="width:16px; padding:3px"> + <div class="tr cbi-section-table-row cbi-rowstyle-<%=1 + ((i-1) % 2)%>"> + <div class="td cbi-value-field" style="width:16px; padding:3px"> <abbr title="<%:Signal%>: <%=net.signal%> <%:dB%> / <%:Quality%>: <%=net.quality%>/<%=net.quality_max%>"> <img src="<%=guess_wifi_signal(net)%>" /><br /> <small><%=percent_wifi_signal(net)%>%</small> </abbr> - </td> - <td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px"> + </div> + <div class="td cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px"> <big><strong><%=net.ssid and utl.pcdata(net.ssid) or "<em>%s</em>" % translate("hidden")%></strong></big><br /> <strong>Channel:</strong> <%=net.channel%> | <strong>Mode:</strong> <%=net.mode%> | <strong>BSSID:</strong> <%=net.bssid%> | <strong>Encryption:</strong> <%=format_wifi_encryption(net.encryption)%> - </td> - <td class="cbi-value-field" style="width:40px"> + </div> + <div class="td cbi-value-field" style="width:40px"> <form action="<%=url('admin/network/wireless_join')%>" method="post"> <input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>" /> @@ -128,11 +128,11 @@ <input class="cbi-button cbi-button-apply" type="submit" value="<%:Join Network%>" /> </form> - </td> - </tr> + </div> + </div> <% end %> <!-- /scan list --> - </table> + </div> </fieldset> </div> <div class="cbi-page-actions right"> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm index 4465095ff2..31f1fed81f 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm @@ -195,8 +195,8 @@ { var assoctable = document.getElementById('iw-assoclist'); if (assoctable) - while (assoctable.rows.length > 1) - assoctable.rows[1].parentNode.removeChild(assoctable.rows[1]); + while (assoctable.firstElementChild !== assoctable.lastElementChild) + assoctable.removeChild(assoctable.lastElementChild); var devup = { }; var rowstyle = 1; @@ -293,7 +293,7 @@ if (assoctable) { var assoclist = [ ]; - for( var bssid in iw.assoclist ) + for (var bssid in iw.assoclist) { assoclist.push(iw.assoclist[bssid]); assoclist[assoclist.length-1].bssid = bssid; @@ -301,11 +301,8 @@ assoclist.sort(function(a, b) { a.bssid < b.bssid }); - for( var j = 0; j < assoclist.length; j++ ) + for (var j = 0; j < assoclist.length; j++) { - var tr = assoctable.insertRow(-1); - tr.className = 'cbi-section-table-row cbi-rowstyle-' + rowstyle; - var icon; var q = (-1 * (assoclist[j].noise - assoclist[j].signal)) / 5; if (q < 1) @@ -319,48 +316,35 @@ else icon = "<%=resource%>/icons/signal-75-100.png"; - tr.insertCell(-1).innerHTML = String.format( - '<span class="ifacebadge" title="%q"><img src="<%=resource%>/icons/wifi.png" /> %h</span>', - iw.device.name, iw.ifname - ); - - tr.insertCell(-1).innerHTML = nowrap(String.format('%h', iw.ssid ? iw.ssid : '?')); - tr.insertCell(-1).innerHTML = assoclist[j].bssid; - - var host = hosts[assoclist[j].bssid]; - if (host) - tr.insertCell(-1).innerHTML = String.format( - '<div style="max-width:200px;overflow:hidden;text-overflow:ellipsis">%s</div>', - ((host.name && (host.ipv4 || host.ipv6)) - ? '%h (%s)'.format(host.name, host.ipv4 || host.ipv6) - : '%h'.format(host.name || host.ipv4 || host.ipv6)).nobr() - ); - else - tr.insertCell(-1).innerHTML = '?'; - - tr.insertCell(-1).innerHTML = String.format( - '<span class="ifacebadge" title="<%:Signal%>: %d <%:dBm%> / <%:Noise%>: %d <%:dBm%> / <%:SNR%>: %d"><img src="%s" /> %d / %d <%:dBm%></span>', - assoclist[j].signal, assoclist[j].noise, assoclist[j].signal - assoclist[j].noise, - icon, - assoclist[j].signal, assoclist[j].noise - ); - - tr.insertCell(-1).innerHTML = nowrap(wifirate(assoclist[j], true)) + '<br />' + nowrap(wifirate(assoclist[j], false)); + var host = hosts[assoclist[j].bssid], + name = host ? (host.name || host.ipv4 || host.ipv6) : null, + hint = (host && host.name && (host.ipv4 || host.ipv6)) ? (host.ipv4 || host.ipv6) : null; + + assoctable.appendChild(E('<div class="tr cbi-section-table-row cbi-rowstyle-%d">'.format(rowstyle), [ + E('<div class="td"><span class="ifacebadge" title="%q"><img src="<%=resource%>/icons/wifi.png" /> %h</span></div>' + .format(iw.device.name, iw.ifname)), + E('<div class="td" style="white-space:nowrap">%h</div>' + .format(iw.ssid || '?')), + E('<div class="td">%h</div>' + .format(assoclist[j].bssid)), + E('<div class="td">', hint ? '<div style="max-width:200px;overflow:hidden;text-overflow:ellipsis">%h (%h)</div>' + .format(name || '?', hint) : (name || '?')), + E('<div class="td"><span class="ifacebadge" title="<%:Signal%>: %d <%:dBm%> / <%:Noise%>: %d <%:dBm%> / <%:SNR%>: %d"><img src="%s" /> %d / %d <%:dBm%></span></div>' + .format(assoclist[j].signal, assoclist[j].noise, assoclist[j].signal - assoclist[j].noise, icon, assoclist[j].signal, assoclist[j].noise)), + E('<div class="td">', [ + E('<span style="white-space:nowrap">', wifirate(assoclist[j], true)), + E('<br />'), + E('<span style="white-space:nowrap">', wifirate(assoclist[j], false)) + ]) + ])); rowstyle = (rowstyle == 1) ? 2 : 1; } } } - if (assoctable && assoctable.rows.length == 1) - { - var tr = assoctable.insertRow(-1); - tr.className = 'cbi-section-table-row'; - - var td = tr.insertCell(-1); - td.colSpan = 8; - td.innerHTML = '<br /><em><%:No information available%></em>'; - } + if (assoctable && assoctable.firstElementChild === assoctable.lastElementChild) + assoctable.appendChild(E('<div class="tr cbi-section-table-row"><div class="td"><em><br /><%:No information available%></em></div></div>')); for (var dev in devup) { @@ -386,15 +370,17 @@ <% for _, dev in ipairs(devices) do local nets = dev:get_wifinets() %> <!-- device <%=dev:name()%> --> <fieldset class="cbi-section"> - <table class="cbi-section-table" style="margin:10px; empty-cells:hide"> + <div class="table cbi-section-table" style="margin:10px; empty-cells:hide"> <!-- physical device --> - <tr> - <td style="width:34px"><img src="<%=resource%>/icons/wifi_big_disabled.png" style="float:left; margin-right:10px" id="<%=dev:name()%>-iw-upstate" /></td> - <td colspan="2" style="text-align:left"> + <div class="tr"> + <div class="td"> + <img src="<%=resource%>/icons/wifi_big_disabled.png" id="<%=dev:name()%>-iw-upstate" /> + </div> + <div class="td left"> <big><strong><%=guess_wifi_hw(dev)%> (<%=dev:name()%>)</strong></big><br /> <span id="<%=dev:name()%>-iw-devinfo"></span> - </td> - <td style="width:310px;text-align:right"> + </div> + <div class="td right"> <form action="<%=url('admin/network/wireless_join')%>" method="post" class="inline"> <input type="hidden" name="device" value="<%=dev:name()%>" /> <input type="hidden" name="token" value="<%=token%>" /> @@ -405,38 +391,36 @@ <input type="hidden" name="token" value="<%=token%>" /> <input type="submit" class="cbi-button cbi-button-add" style="width:100px" title="<%:Provide new network%>" value="<%:Add%>" /> </form> - </td> - </tr> + </div> + </div> <!-- /physical device --> <!-- network list --> <% if #nets > 0 then %> <% for i, net in ipairs(nets) do %> - <tr class="cbi-section-table-row cbi-rowstyle-<%=1 + ((i-1) % 2)%>"> - <td></td> - <td class="cbi-value-field" style="vertical-align:middle; padding:3px" id="<%=net:id()%>-iw-signal"> + <div class="tr cbi-section-table-row cbi-rowstyle-<%=1 + ((i-1) % 2)%>"> + <div class="td" id="<%=net:id()%>-iw-signal"> <span class="ifacebadge" title="<%:Not associated%>"><img src="<%=resource%>/icons/signal-none.png" /> 0%</span> - </td> - <td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px" id="<%=net:id()%>-iw-status"> + </div> + <div class="td left" id="<%=net:id()%>-iw-status"> <em><%:Collecting data...%></em> - </td> - <td class="cbi-value-field" style="width:310px;text-align:right"> + </div> + <div class="td right"> <input id="<%=net:id()%>-iw-toggle" type="button" class="cbi-button cbi-button-reload" style="width:100px" onclick="wifi_shutdown('<%=net:id()%>', this)" title="<%:Delete this network%>" value="<%:Enable%>" /> <input type="button" class="cbi-button cbi-button-edit" style="width:100px" onclick="location.href='<%=net:adminlink()%>'" title="<%:Edit this network%>" value="<%:Edit%>" /> <input type="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="wifi_delete('<%=net:id()%>')" title="<%:Delete this network%>" value="<%:Remove%>" /> - </td> - </tr> + </div> + </div> <% end %> <% else %> - <tr class="cbi-section-table-row cbi-rowstyle-2"> - <td></td> - <td colspan="3" class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px"> + <div class="tr cbi-section-table-row cbi-rowstyle-2"> + <div class="td left"> <em><%:No network configured on this device%></em> - </td> - </tr> + </div> + </div> <% end %> <!-- /network list --> - </table> + </div> </fieldset> <!-- /device <%=dev:name()%> --> <% end %> @@ -445,21 +429,21 @@ <h2><%:Associated Stations%></h2> <fieldset class="cbi-section"> - <table class="cbi-section-table valign-middle" style="margin:10px" id="iw-assoclist"> - <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell"></th> - <th class="cbi-section-table-cell"><%:SSID%></th> - <th class="cbi-section-table-cell"><%:MAC-Address%></th> - <th class="cbi-section-table-cell"><%:Host%></th> - <th class="cbi-section-table-cell"><%:Signal%> / <%:Noise%></th> - <th class="cbi-section-table-cell"><%:RX Rate%> / <%:TX Rate%></th> - </tr> - <tr class="cbi-section-table-row cbi-rowstyle-2"> - <td class="cbi-value-field" colspan="6"> + <div class="table cbi-section-table valign-middle" style="margin:10px" id="iw-assoclist"> + <div class="tr cbi-section-table-titles"> + <div class="th cbi-section-table-cell"></div> + <div class="th cbi-section-table-cell"><%:SSID%></div> + <div class="th cbi-section-table-cell"><%:MAC-Address%></div> + <div class="th cbi-section-table-cell"><%:Host%></div> + <div class="th cbi-section-table-cell"><%:Signal%> / <%:Noise%></div> + <div class="th cbi-section-table-cell"><%:RX Rate%> / <%:TX Rate%></div> + </div> + <div class="tr cbi-section-table-row cbi-rowstyle-2"> + <div class="td"> <em><%:Collecting data...%></em> - </td> - </tr> - </table> + </div> + </div> + </div> </fieldset> </div> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm index 04687f38e7..85468252e9 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm @@ -62,17 +62,17 @@ ); //]]></script> -<table> - <tr class="cbi-section-table"> - <td></td> - <td class="cbi-value-field" style="width:16px; padding:3px" id="<%=self.option%>-iw-signal"> +<div class="table"> + <div class="tr cbi-section-table"> + <div class="td"></div> + <div class="td cbi-value-field" style="width:16px; padding:3px" id="<%=self.option%>-iw-signal"> <img src="<%=resource%>/icons/signal-none.png" title="<%:Not associated%>" /><br /> <small>0%</small> - </td> - <td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px" id="<%=self.option%>-iw-description"> + </div> + <div class="td cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px" id="<%=self.option%>-iw-description"> <em><%:Collecting data...%></em> - </td> - </tr> -</table> + </div> + </div> +</div> <%+cbi/valuefooter%> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm index 33bbee7843..db1d0b8883 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm @@ -275,27 +275,27 @@ <div style="text-align:right"><small id="scale">-</small></div> <br /> -<table style="width:100%; table-layout:fixed" cellspacing="5"> - <tr> - <td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid blue"><%:Inbound:%></strong></td> - <td id="rx_bw_cur">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td> - - <td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td> - <td id="rx_bw_avg">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td> - - <td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td> - <td id="rx_bw_peak">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td> - </tr> - <tr> - <td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid green"><%:Outbound:%></strong></td> - <td id="tx_bw_cur">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td> - - <td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td> - <td id="tx_bw_avg">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td> - - <td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td> - <td id="tx_bw_peak">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td> - </tr> -</table> +<div class="table" style="width:100%; table-layout:fixed" cellspacing="5"> + <div class="tr"> + <div class="td" style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid blue"><%:Inbound:%></strong></div> + <div class="td" id="rx_bw_cur">0 <%:kbit/s%><br />(0 <%:kB/s%>)</div> + + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></div> + <div class="td" id="rx_bw_avg">0 <%:kbit/s%><br />(0 <%:kB/s%>)</div> + + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></div> + <div class="td" id="rx_bw_peak">0 <%:kbit/s%><br />(0 <%:kB/s%>)</div> + </div> + <div class="tr"> + <div class="td" style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid green"><%:Outbound:%></strong></div> + <div class="td" id="tx_bw_cur">0 <%:kbit/s%><br />(0 <%:kB/s%>)</div> + + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></div> + <div class="td" id="tx_bw_avg">0 <%:kbit/s%><br />(0 <%:kB/s%>)</div> + + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></div> + <div class="td" id="tx_bw_peak">0 <%:kbit/s%><br />(0 <%:kB/s%>)</div> + </div> +</div> <%+footer%> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm index b7ebc41451..30d93f78bc 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm @@ -139,8 +139,8 @@ { var conn = json.connections; - while (conn_table.rows.length > 1) - conn_table.rows[0].parentNode.deleteRow(-1); + while (conn_table.firstElementChild !== conn_table.lastElementChild) + conn_table.removeChild(conn_table.lastElementChild); var lookup_queue = [ ]; @@ -153,13 +153,10 @@ { var c = conn[i]; - if ((c.src == '127.0.0.1' && c.dst == '127.0.0.1') - || (c.src == '::1' && c.dst == '::1')) + if ((c.src == '127.0.0.1' && c.dst == '127.0.0.1') || + (c.src == '::1' && c.dst == '::1')) continue; - var tr = conn_table.rows[0].parentNode.insertRow(-1); - tr.className = 'cbi-section-table-row cbi-rowstyle-' + (1 + (i % 2)); - if (!dns_cache[c.src]) lookup_queue.push(c.src); @@ -169,14 +166,13 @@ var src = dns_cache[c.src] || (c.layer3 == 'ipv6' ? '[' + c.src + ']' : c.src); var dst = dns_cache[c.dst] || (c.layer3 == 'ipv6' ? '[' + c.dst + ']' : c.dst); - tr.insertCell(-1).innerHTML = c.layer3.toUpperCase(); - tr.insertCell(-1).innerHTML = c.layer4.toUpperCase(); - tr.insertCell(-1).innerHTML = String.format('%s:%d', src, c.sport); - tr.insertCell(-1).innerHTML = String.format('%s:%d', dst, c.dport); - - var traf = tr.insertCell(-1); - traf.style.whiteSpace = 'nowrap'; - traf.innerHTML = String.format('%1024.2mB (%d <%:Pkts.%>)', c.bytes, c.packets); + conn_table.appendChild(E('<div class="tr cbi-section-table-row cbi-rowstyle-%d">'.format(1 + (i % 2)), [ + E('<div class="td">', c.layer3.toUpperCase()), + E('<div class="td">', c.layer4.toUpperCase()), + E('<div class="td">', [ src, ':', c.sport ]), + E('<div class="td">', [ dst, ':', c.dport ]), + E('<div class="td" style="white-space:nowrap">', '%1024.2mB (%d <%:Pkts.%>)'.format(c.bytes, c.packets)), + ])); } if (lookup_queue.length > 0) @@ -324,52 +320,52 @@ <div style="text-align:right"><small id="scale">-</small></div> <br /> - <table style="width:100%; table-layout:fixed" cellspacing="5"> - <tr> - <td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid blue"><%:UDP:%></strong></td> - <td id="lb_udp_cur">0</td> - - <td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td> - <td id="lb_udp_avg">0</td> - - <td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td> - <td id="lb_udp_peak">0</td> - </tr> - <tr> - <td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid green"><%:TCP:%></strong></td> - <td id="lb_tcp_cur">0</td> - - <td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td> - <td id="lb_tcp_avg">0</td> - - <td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td> - <td id="lb_tcp_peak">0</td> - </tr> - <tr> - <td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid red"><%:Other:%></strong></td> - <td id="lb_otr_cur">0</td> - - <td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td> - <td id="lb_otr_avg">0</td> - - <td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td> - <td id="lb_otr_peak">0</td> - </tr> - </table> + <div class="table" style="width:100%; table-layout:fixed" cellspacing="5"> + <div class="tr"> + <div class="td" style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid blue"><%:UDP:%></strong></div> + <div class="td" id="lb_udp_cur">0</div> + + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></div> + <div class="td" id="lb_udp_avg">0</div> + + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></div> + <div class="td" id="lb_udp_peak">0</div> + </div> + <div class="tr"> + <div class="td" style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid green"><%:TCP:%></strong></div> + <div class="td" id="lb_tcp_cur">0</div> + + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></div> + <div class="td" id="lb_tcp_avg">0</div> + + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></div> + <div class="td" id="lb_tcp_peak">0</div> + </div> + <div class="tr"> + <div class="td" style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid red"><%:Other:%></strong></div> + <div class="td" id="lb_otr_cur">0</div> + + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></div> + <div class="td" id="lb_otr_avg">0</div> + + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></div> + <div class="td" id="lb_otr_peak">0</div> + </div> + </div> <br /> <div class="cbi-section-node"> - <table class="cbi-section-table" id="connections"> - <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell"><%:Network%></th> - <th class="cbi-section-table-cell"><%:Protocol%></th> - <th class="cbi-section-table-cell"><%:Source%></th> - <th class="cbi-section-table-cell"><%:Destination%></th> - <th class="cbi-section-table-cell"><%:Transfer%></th> - </tr> - - <tr><td colspan="5"><em><%:Collecting data...%></em></td></tr> - </table> + <div class="table cbi-section-table" id="connections"> + <div class="tr cbi-section-table-titles"> + <div class="th cbi-section-table-cell"><%:Network%></div> + <div class="th cbi-section-table-cell"><%:Protocol%></div> + <div class="th cbi-section-table-cell"><%:Source%></div> + <div class="th cbi-section-table-cell"><%:Destination%></div> + <div class="th cbi-section-table-cell"><%:Transfer%></div> + </div> + + <div class="tr"><div class="td" colspan="5"><em><%:Collecting data...%></em></div></div> + </div> </div> </fieldset> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm index 5e6e494ad6..c5952064aa 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm @@ -6,6 +6,7 @@ <% local fs = require "nixio.fs" + local ipc = require "luci.ip" local util = require "luci.util" local stat = require "luci.tools.status" local ver = require "luci.version" @@ -58,6 +59,8 @@ } if wan then + local dev = wan:get_interface() + local link = dev and ipc.link(dev:name()) rv.wan = { ipaddr = wan:ipaddr(), gwaddr = wan:gwaddr(), @@ -66,12 +69,19 @@ expires = wan:expires(), uptime = wan:uptime(), proto = wan:proto(), + i18n = wan:get_i18n(), ifname = wan:ifname(), - link = wan:adminlink() + link = wan:adminlink(), + mac = dev and dev:mac(), + type = dev and dev:type(), + name = dev and dev:get_i18n(), + ether = link and link.type == 1 } end if wan6 then + local dev = wan6:get_interface() + local link = dev and ipc.link(dev:name()) rv.wan6 = { ip6addr = wan6:ip6addr(), gw6addr = wan6:gw6addr(), @@ -79,8 +89,13 @@ ip6prefix = wan6:ip6prefix(), uptime = wan6:uptime(), proto = wan6:proto(), + i18n = wan6:get_i18n(), ifname = wan6:ifname(), - link = wan6:adminlink() + link = wan6:adminlink(), + mac = dev and dev:mac(), + type = dev and dev:type(), + name = dev and dev:get_i18n(), + ether = link and link.type == 1 } end @@ -164,133 +179,95 @@ }); } - XHR.poll(5, '<%=REQUEST_URI%>', { status: 1 }, - function(x, info) - { - if (!(npoll++ % 5)) - updateHosts(); - - var si = document.getElementById('wan4_i'); - var ss = document.getElementById('wan4_s'); - var ifc = info.wan; + function labelList(items, offset) { + var rv = [ ]; - if (ifc && ifc.ifname && ifc.proto != 'none') - { - var s = String.format( - '<strong><%:Type%>: </strong>%s<br />' + - '<strong><%:Address%>: </strong>%s<br />' + - '<strong><%:Netmask%>: </strong>%s<br />' + - '<strong><%:Gateway%>: </strong>%s<br />', - ifc.proto, - (ifc.ipaddr) ? ifc.ipaddr : '0.0.0.0', - (ifc.netmask && ifc.netmask != ifc.ipaddr) ? ifc.netmask : '255.255.255.255', - (ifc.gwaddr) ? ifc.gwaddr : '0.0.0.0' - ); + for (var i = offset || 0; i < items.length; i += 2) { + var label = items[i], + value = items[i+1]; - for (var i = 0; i < ifc.dns.length; i++) - { - s += String.format( - '<strong><%:DNS%> %d: </strong>%s<br />', - i + 1, ifc.dns[i] - ); - } + if (value === undefined || value === null) + continue; - if (ifc.expires > -1) - { - s += String.format( - '<strong><%:Expires%>: </strong>%t<br />', - ifc.expires - ); - } + if (label) + rv.push(E('strong', [label, ': '])); - if (ifc.uptime > 0) - { - s += String.format( - '<strong><%:Connected%>: </strong>%t<br />', - ifc.uptime - ); - } + rv.push(value, E('br')); + } - ss.innerHTML = String.format('<small>%s</small>', s); - si.innerHTML = String.format( - '<img src="<%=resource%>/icons/ethernet.png" />' + - '<br /><small><a href="%s">%s</a></small>', - ifc.link, ifc.ifname - ); - } - else - { - si.innerHTML = '<img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small>'; - ss.innerHTML = '<em><%:Not connected%></em>'; - } + return rv; + } - <% if has_ipv6 then %> - var si6 = document.getElementById('wan6_i'); - var ss6 = document.getElementById('wan6_s'); - var ifc6 = info.wan6; + function renderBox(title, active, childs) { + childs = childs || []; + childs.unshift(E('span', labelList(arguments, 3))); - if (ifc6 && ifc6.ifname && ifc6.proto != 'none') - { - var s = String.format( - '<strong><%:Type%>: </strong>%s%s<br />', - ifc6.proto, (ifc6.ip6prefix) ? '-pd' : '' - ); - - if (!ifc6.ip6prefix) - { - s += String.format( - '<strong><%:Address%>: </strong>%s<br />', - (ifc6.ip6addr) ? ifc6.ip6addr : '::' - ); - } - else - { - s += String.format( - '<strong><%:Prefix Delegated%>: </strong>%s<br />', - ifc6.ip6prefix - ); - if (ifc6.ip6addr) - { - s += String.format( - '<strong><%:Address%>: </strong>%s<br />', - ifc6.ip6addr - ); - } - } + return E('div', { class: 'ifacebox' }, [ + E('div', { class: 'ifacebox-head center ' + (active ? 'active' : '') }, + E('strong', title)), + E('div', { class: 'ifacebox-body' }, childs) + ]); + } - s += String.format( - '<strong><%:Gateway%>: </strong>%s<br />', - (ifc6.gw6addr) ? ifc6.gw6addr : '::' - ); + function renderBadge(icon, title) { + return E('span', { class: 'ifacebadge' }, [ + E('img', { src: icon, title: title || '' }), + E('span', labelList(arguments, 2)) + ]); + } - for (var i = 0; i < ifc6.dns.length; i++) - { - s += String.format( - '<strong><%:DNS%> %d: </strong>%s<br />', - i + 1, ifc6.dns[i] - ); - } + XHR.poll(5, '<%=REQUEST_URI%>', { status: 1 }, + function(x, info) + { + if (!(npoll++ % 5)) + updateHosts(); - if (ifc6.uptime > 0) - { - s += String.format( - '<strong><%:Connected%>: </strong>%t<br />', - ifc6.uptime - ); - } + var us = document.getElementById('upstream_status_table'); + + while (us.lastElementChild) + us.removeChild(us.lastElementChild); + + var ifc = info.wan || {}; + + us.appendChild(renderBox( + '<%:IPv4 Upstream%>', + (ifc.ifname && ifc.proto != 'none'), + [ E('div', {}, renderBadge( + '<%=resource%>/icons/%s.png'.format((ifc && ifc.type) ? ifc.type : 'ethernet_disabled'), null, + '<%:Device%>', ifc ? (ifc.name || ifc.ifname || '-') : '-', + '<%:MAC-Address%>', (ifc && ifc.ether) ? ifc.mac : null)) ], + '<%:Protocol%>', ifc.i18n || E('em', '<%:Not connected%>'), + '<%:Address%>', (ifc.ipaddr) ? ifc.ipaddr : '0.0.0.0', + '<%:Netmask%>', (ifc.netmask && ifc.netmask != ifc.ipaddr) ? ifc.netmask : '255.255.255.255', + '<%:Gateway%>', (ifc.gwaddr) ? ifc.gwaddr : '0.0.0.0', + '<%:DNS%> 1', (ifc.dns) ? ifc.dns[0] : null, + '<%:DNS%> 2', (ifc.dns) ? ifc.dns[1] : null, + '<%:DNS%> 3', (ifc.dns) ? ifc.dns[2] : null, + '<%:DNS%> 4', (ifc.dns) ? ifc.dns[3] : null, + '<%:DNS%> 5', (ifc.dns) ? ifc.dns[4] : null, + '<%:Expires%>', (ifc.expires > -1) ? '%t'.format(ifc.expires) : null, + '<%:Connected%>', (ifc.uptime > 0) ? '%t'.format(ifc.uptime) : null)); - ss6.innerHTML = String.format('<small>%s</small>', s); - si6.innerHTML = String.format( - '<img src="<%=resource%>/icons/ethernet.png" />' + - '<br /><small><a href="%s">%s</a></small>', - ifc6.link, ifc6.ifname - ); - } - else - { - si6.innerHTML = '<img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small>'; - ss6.innerHTML = '<em><%:Not connected%></em>'; - } + <% if has_ipv6 then %> + var ifc6 = info.wan6 || {}; + + us.appendChild(renderBox( + '<%:IPv6 Upstream%>', + (ifc6.ifname && ifc6.proto != 'none'), + [ E('div', {}, renderBadge( + '<%=resource%>/icons/%s.png'.format(ifc6.type || 'ethernet_disabled'), null, + '<%:Device%>', ifc6 ? (ifc6.name || ifc6.ifname || '-') : '-', + '<%:MAC-Address%>', (ifc6 && ifc6.ether) ? ifc6.mac : null)) ], + '<%:Protocol%>', ifc6.i18n ? (ifc6.i18n + (ifc6.proto === 'dhcp' && ifc6.ip6prefix ? '-PD' : '')) : E('em', '<%:Not connected%>'), + '<%:Prefix Delegated%>', ifc6.ip6prefix, + '<%:Address%>', (ifc6.ip6prefix) ? (ifc6.ip6addr || null) : (ifc6.ipaddr || '::'), + '<%:Gateway%>', (ifc6.gw6addr) ? ifc6.gw6addr : '::', + '<%:DNS%> 1', (ifc6.dns) ? ifc6.dns[0] : null, + '<%:DNS%> 2', (ifc6.dns) ? ifc6.dns[1] : null, + '<%:DNS%> 3', (ifc6.dns) ? ifc6.dns[2] : null, + '<%:DNS%> 4', (ifc6.dns) ? ifc6.dns[3] : null, + '<%:DNS%> 5', (ifc6.dns) ? ifc6.dns[4] : null, + '<%:Connected%>', (ifc6.uptime > 0) ? '%t'.format(ifc6.uptime) : null)); <% end %> <% if has_dsl then %> @@ -358,10 +335,10 @@ if (ls) { /* clear all rows */ - while( ls.rows.length > 1 ) - ls.rows[0].parentNode.deleteRow(1); + while (ls.firstElementChild !== ls.lastElementChild) + ls.removeChild(ls.lastElementChild); - for( var i = 0; i < info.leases.length; i++ ) + for (var i = 0; i < info.leases.length; i++) { var timestr; @@ -372,24 +349,16 @@ else timestr = String.format('%t', info.leases[i].expires); - var tr = ls.rows[0].parentNode.insertRow(-1); - tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1); - - tr.insertCell(-1).innerHTML = info.leases[i].hostname ? info.leases[i].hostname : '?'; - tr.insertCell(-1).innerHTML = info.leases[i].ipaddr; - tr.insertCell(-1).innerHTML = info.leases[i].macaddr; - tr.insertCell(-1).innerHTML = timestr; + ls.appendChild(E('<div class="tr cbi-section-table-row cbi-rowstyle-%d">'.format((i % 2) + 1), [ + E('<div class="td">', info.leases[i].hostname ? info.leases[i].hostname : '?'), + E('<div class="td">', info.leases[i].ipaddr), + E('<div class="td">', info.leases[i].macaddr), + E('<div class="td">', timestr) + ])); } - if( ls.rows.length == 1 ) - { - var tr = ls.rows[0].parentNode.insertRow(-1); - tr.className = 'cbi-section-table-row'; - - var td = tr.insertCell(-1); - td.colSpan = 4; - td.innerHTML = '<em><br /><%:There are no active leases.%></em>'; - } + if (ls.firstElementChild === ls.lastElementChild) + ls.appendChild(E('<div class="tr cbi-section-table-row"><div class="td"><em><br /><%:There are no active leases.%></em></div></div>')); } var ls6 = document.getElementById('lease6_status_table'); @@ -398,10 +367,10 @@ ls6.parentNode.style.display = 'block'; /* clear all rows */ - while( ls6.rows.length > 1 ) - ls6.rows[0].parentNode.deleteRow(1); + while (ls6.firstElementChild !== ls6.lastElementChild) + ls6.removeChild(ls6.lastElementChild); - for( var i = 0; i < info.leases6.length; i++ ) + for (var i = 0; i < info.leases6.length; i++) { var timestr; @@ -412,35 +381,29 @@ else timestr = String.format('%t', info.leases6[i].expires); - var tr = ls6.rows[0].parentNode.insertRow(-1); - tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1); + var host = hosts[duid2mac(info.leases6[i].duid)], + name = info.leases6[i].hostname, + hint = null; - var host = hosts[duid2mac(info.leases6[i].duid)]; - if (!info.leases6[i].hostname) - tr.insertCell(-1).innerHTML = - (host && (host.name || host.ipv4 || host.ipv6)) - ? '<div style="max-width:200px;overflow:hidden;text-overflow:ellipsis;white-space: nowrap">? (%h)</div>'.format(host.name || host.ipv4 || host.ipv6) - : '?'; - else - tr.insertCell(-1).innerHTML = - (host && host.name && info.leases6[i].hostname != host.name) - ? '<div style="max-width:200px;overflow:hidden;text-overflow:ellipsis;white-space: nowrap">%h (%h)</div>'.format(info.leases6[i].hostname, host.name) - : info.leases6[i].hostname; - - tr.insertCell(-1).innerHTML = info.leases6[i].ip6addr; - tr.insertCell(-1).innerHTML = info.leases6[i].duid; - tr.insertCell(-1).innerHTML = timestr; - } - - if( ls6.rows.length == 1 ) - { - var tr = ls6.rows[0].parentNode.insertRow(-1); - tr.className = 'cbi-section-table-row'; + if (!name) { + if (host) + hint = host.name || host.ipv4 || host.ipv6; + } + else { + if (host && host.name && info.leases6[i].hostname != host.name) + hint = host.name; + } - var td = tr.insertCell(-1); - td.colSpan = 4; - td.innerHTML = '<em><br /><%:There are no active leases.%></em>'; + ls6.appendChild(E('<div class="tr cbi-section-table-row cbi-rowstyle-%d">'.format((i % 2) + 1), [ + E('<div class="td nowrap">', hint ? '<div>%h (%h)</div>'.format(name || '?', hint) : (name || '?')), + E('<div class="td nowrap">', info.leases6[i].ip6addr), + E('<div class="td nowrap">', info.leases6[i].duid), + E('<div class="td nowrap">', timestr) + ])); } + + if (ls6.firstElementChild === ls6.lastElementChild) + ls6.appendChild(E('<div class="tr cbi-section-table-row"><div class="td"><em><br /><%:There are no active leases.%></em></div></div>')); } <% end %> @@ -450,30 +413,34 @@ var ws = document.getElementById('wifi_status_table'); if (ws) { - var wsbody = ws.rows[0].parentNode; - while (ws.rows.length > 0) - wsbody.deleteRow(0); + while (ws.lastElementChild) + ws.removeChild(ws.lastElementChild); for (var didx = 0; didx < info.wifinets.length; didx++) { var dev = info.wifinets[didx]; - - var tr = wsbody.insertRow(-1); - var td; - - td = tr.insertCell(-1); - td.width = "33%"; - td.innerHTML = dev.name; - td.style.verticalAlign = "top"; - - td = tr.insertCell(-1); - - var s = ''; + var net0 = (dev.networks && dev.networks[0]) ? dev.networks[0] : {}; + var vifs = []; for (var nidx = 0; nidx < dev.networks.length; nidx++) { var net = dev.networks[nidx]; var is_assoc = (net.bssid != '00:00:00:00:00:00' && net.channel && !net.disabled); + var num_assoc = 0; + + for (var bssid in net.assoclist) + { + var bss = net.assoclist[bssid]; + + bss.bssid = bssid; + bss.link = net.link; + bss.name = net.name; + bss.ifname = net.ifname; + bss.radio = dev.name; + + assoclist.push(bss); + num_assoc++; + } var icon; if (!is_assoc) @@ -489,66 +456,35 @@ else icon = "<%=resource%>/icons/signal-75-100.png"; - s += String.format( - '<table><tr><td style="text-align:center; width:32px; padding:3px">' + - '<img src="%s" title="<%:Signal%>: %d dBm / <%:Noise%>: %d dBm" />' + - '<br /><small>%d%%</small>' + - '</td><td style="text-align:left; padding:3px"><small>' + - '<strong><%:SSID%>:</strong> <a href="%s">%h</a><br />' + - '<strong><%:Mode%>:</strong> %s<br />' + - '<strong><%:Channel%>:</strong> %d (%.3f <%:GHz%>)<br />' + - '<strong><%:Bitrate%>:</strong> %s <%:Mbit/s%><br />', - icon, net.signal, net.noise, - net.quality, - net.link, net.ssid || '?', - net.mode, - net.channel, net.frequency, - net.bitrate || '?' - ); - - if (is_assoc) - { - s += String.format( - '<strong><%:BSSID%>:</strong> %s<br />' + - '<strong><%:Encryption%>:</strong> %s', - net.bssid || '?', - net.encryption - ); - } - else - { - s += '<em><%:Wireless is disabled or not associated%></em>'; - } - - s += '</small></td></tr></table>'; - - for (var bssid in net.assoclist) - { - var bss = net.assoclist[bssid]; - - bss.bssid = bssid; - bss.link = net.link; - bss.name = net.name; - bss.ifname = net.ifname; - bss.radio = dev.name; - - assoclist.push(bss); - } + vifs.push(renderBadge( + icon, + '<%:Signal%>: %d dBm / <%:Quality%>: %d%%'.format(net.signal, net.quality), + '<%:SSID%>', E('a', { href: net.link }, [ net.ssid || '?' ]), + '<%:Mode%>', net.mode, + '<%:BSSID%>', is_assoc ? (net.bssid || '-') : null, + '<%:Encryption%>', is_assoc ? net.encryption : null, + '<%:Associations%>', is_assoc ? (num_assoc || '-') : null, + null, is_assoc ? null : E('em', '<%:Wireless is disabled or not associated%>'))); } - if (!s) - s = '<em><%:No information available%></em>'; - - td.innerHTML = s; + ws.appendChild(renderBox( + dev.device, dev.up || net0.up, + [ E('div', vifs) ], + '<%:Type%>', dev.name.replace(/^Generic | Wireless Controller .+$/g, ''), + '<%:Channel%>', net0.channel ? '%d (%.3f <%:GHz%>)'.format(net0.channel, net0.frequency) : '-', + '<%:Bitrate%>', net0.bitrate ? '%d <%:Mbit/s%>'.format(net0.bitrate) : '-')); } + + if (!ws.lastElementChild) + ws.appendChild(E('<em><%:No information available%></em>')); } var ac = document.getElementById('wifi_assoc_table'); if (ac) { /* clear all rows */ - while( ac.rows.length > 1 ) - ac.rows[0].parentNode.deleteRow(1); + while (ac.firstElementChild !== ac.lastElementChild) + ac.removeChild(ac.lastElementChild); assoclist.sort(function(a, b) { return (a.name == b.name) @@ -557,11 +493,8 @@ ; }); - for( var i = 0; i < assoclist.length; i++ ) + for (var i = 0; i < assoclist.length; i++) { - var tr = ac.rows[0].parentNode.insertRow(-1); - tr.className = 'cbi-section-table-row cbi-rowstyle-' + (1 + (i % 2)); - var icon; var q = (-1 * (assoclist[i].noise - assoclist[i].signal)) / 5; if (q < 1) @@ -575,49 +508,31 @@ else icon = "<%=resource%>/icons/signal-75-100.png"; - tr.insertCell(-1).innerHTML = String.format( - '<span class="ifacebadge" title="%q"><img src="<%=resource%>/icons/wifi.png" /> %h</span>', - assoclist[i].radio, assoclist[i].ifname - ); - - tr.insertCell(-1).innerHTML = String.format( - '<a href="%s">%s</a>', - assoclist[i].link, - '%h'.format(assoclist[i].name).nobr() - ); - - tr.insertCell(-1).innerHTML = assoclist[i].bssid; - - var host = hosts[assoclist[i].bssid]; - if (host) - tr.insertCell(-1).innerHTML = String.format( - '<div style="max-width:200px;overflow:hidden;text-overflow:ellipsis">%s</div>', - ((host.name && (host.ipv4 || host.ipv6)) - ? '%h (%s)'.format(host.name, host.ipv4 || host.ipv6) - : '%h'.format(host.name || host.ipv4 || host.ipv6)).nobr() - ); - else - tr.insertCell(-1).innerHTML = '?'; - - tr.insertCell(-1).innerHTML = String.format( - '<span class="ifacebadge" title="<%:Signal%>: %d <%:dBm%> / <%:Noise%>: %d <%:dBm%> / <%:SNR%>: %d"><img src="%s" /> %d / %d <%:dBm%></span>', - assoclist[i].signal, assoclist[i].noise, assoclist[i].signal - assoclist[i].noise, - icon, - assoclist[i].signal, assoclist[i].noise - ); - - tr.insertCell(-1).innerHTML = wifirate(assoclist[i], true).nobr() + '<br />' + wifirate(assoclist[i], false).nobr(); + var host = hosts[assoclist[i].bssid], + name = host ? (host.name || host.ipv4 || host.ipv6) : null, + hint = (host && host.name && (host.ipv4 || host.ipv6)) ? (host.ipv4 || host.ipv6) : null; + + ac.appendChild(E('<div class="tr cbi-section-table-row cbi-rowstyle-%d">'.format(1 + (i % 2)), [ + E('<div class="td"><span class="ifacebadge" title="%q"><img src="<%=resource%>/icons/wifi.png" /> %h</span></div>' + .format(assoclist[i].radio, assoclist[i].ifname)), + E('<div class="td"><a href="%s" style="white-space:nowrap">%h</a></div>' + .format(assoclist[i].link, assoclist[i].name)), + E('<div class="td">', + assoclist[i].bssid), + E('<div class="td nowrap">', + hint ? '<div>%h (%h)</div>'.format(name || '?', hint) : (name || '?')), + E('<div class="td"><span class="ifacebadge" title="<%:Signal%>: %d <%:dBm%> / <%:Noise%>: %d <%:dBm%> / <%:SNR%>: %d"><img src="%s" /> %d / %d <%:dBm%></span></div>' + .format(assoclist[i].signal, assoclist[i].noise, assoclist[i].signal - assoclist[i].noise, icon, assoclist[i].signal, assoclist[i].noise)), + E('<div class="td nowrap">', [ + E('<span style="white-space:nowrap">', wifirate(assoclist[i], true)), + E('<br />'), + E('<span style="white-space:nowrap">', wifirate(assoclist[i], false)) + ]) + ])); } - if (ac.rows.length == 1) - { - var tr = ac.rows[0].parentNode.insertRow(-1); - tr.className = 'cbi-section-table-row'; - - var td = tr.insertCell(-1); - td.colSpan = 7; - td.innerHTML = '<br /><em><%:No information available%></em>'; - } + if (ac.firstElementChild === ac.lastElementChild) + ac.appendChild(E('<div class="tr cbi-section-table-row"><div class="td"><em><br /><%:No information available%></em></div></div>')); } <% end %> @@ -679,108 +594,104 @@ <fieldset class="cbi-section"> <legend><%:System%></legend> - <table width="100%" cellspacing="10"> - <tr><td width="33%"><%:Hostname%></td><td><%=luci.sys.hostname() or "?"%></td></tr> - <tr><td width="33%"><%:Model%></td><td><%=pcdata(boardinfo.model or boardinfo.system or "?")%></td></tr> - <tr><td width="33%"><%:Firmware Version%></td><td> + <div class="table" width="100%"> + <div class="tr"><div class="td left" width="33%"><%:Hostname%></div><div class="td left"><%=luci.sys.hostname() or "?"%></div></div> + <div class="tr"><div class="td left" width="33%"><%:Model%></div><div class="td left"><%=pcdata(boardinfo.model or "?")%></div></div> + <div class="tr"><div class="td left" width="33%"><%:Architecture%></div><div class="td left"><%=pcdata(boardinfo.system or "?")%></div></div> + <div class="tr"><div class="td left" width="33%"><%:Firmware Version%></div><div class="td left"> <%=pcdata(ver.distname)%> <%=pcdata(ver.distversion)%> / <%=pcdata(ver.luciname)%> (<%=pcdata(ver.luciversion)%>) - </td></tr> - <tr><td width="33%"><%:Kernel Version%></td><td><%=unameinfo.release or "?"%></td></tr> - <tr><td width="33%"><%:Local Time%></td><td id="localtime">-</td></tr> - <tr><td width="33%"><%:Uptime%></td><td id="uptime">-</td></tr> - <tr><td width="33%"><%:Load Average%></td><td id="loadavg">-</td></tr> - </table> + </div></div> + <div class="tr"><div class="td left" width="33%"><%:Kernel Version%></div><div class="td left"><%=unameinfo.release or "?"%></div></div> + <div class="tr"><div class="td left" width="33%"><%:Local Time%></div><div class="td left" id="localtime">-</div></div> + <div class="tr"><div class="td left" width="33%"><%:Uptime%></div><div class="td left" id="uptime">-</div></div> + <div class="tr"><div class="td left" width="33%"><%:Load Average%></div><div class="td left" id="loadavg">-</div></div> + </div> </fieldset> <fieldset class="cbi-section"> <legend><%:Memory%></legend> - <table width="100%" cellspacing="10"> - <tr><td width="33%"><%:Total Available%></td><td id="memtotal">-</td></tr> - <tr><td width="33%"><%:Free%></td><td id="memfree">-</td></tr> - <tr><td width="33%"><%:Buffered%></td><td id="membuff">-</td></tr> - </table> + <div class="table" width="100%"> + <div class="tr"><div class="td left" width="33%"><%:Total Available%></div><div class="td left" id="memtotal">-</div></div> + <div class="tr"><div class="td left" width="33%"><%:Free%></div><div class="td left" id="memfree">-</div></div> + <div class="tr"><div class="td left" width="33%"><%:Buffered%></div><div class="td left" id="membuff">-</div></div> + </div> </fieldset> <% if swapinfo.total > 0 then %> <fieldset class="cbi-section"> <legend><%:Swap%></legend> - <table width="100%" cellspacing="10"> - <tr><td width="33%"><%:Total Available%></td><td id="swaptotal">-</td></tr> - <tr><td width="33%"><%:Free%></td><td id="swapfree">-</td></tr> - </table> + <div class="table" width="100%"> + <div class="tr"><div class="td left" width="33%"><%:Total Available%></div><div class="td left" id="swaptotal">-</div></div> + <div class="tr"><div class="td left" width="33%"><%:Free%></div><div class="td left" id="swapfree">-</div></div> + </div> </fieldset> <% end %> <fieldset class="cbi-section"> <legend><%:Network%></legend> - <table width="100%" cellspacing="10"> - <tr><td width="33%" style="vertical-align:top"><%:IPv4 WAN Status%></td><td> - <table><tr> - <td id="wan4_i" style="width:16px; text-align:center; padding:3px"><img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small></td> - <td id="wan4_s" style="vertical-align:middle; padding: 3px"><em><%:Collecting data...%></em></td> - </tr></table> - </td></tr> - <% if has_ipv6 then %> - <tr><td width="33%" style="vertical-align:top"><%:IPv6 WAN Status%></td><td> - <table><tr> - <td id="wan6_i" style="width:16px; text-align:center; padding:3px"><img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small></td> - <td id="wan6_s" style="vertical-align:middle; padding: 3px"><em><%:Collecting data...%></em></td> - </tr></table> - </td></tr> - <% end %> - <tr><td width="33%"><%:Active Connections%></td><td id="conns">-</td></tr> - </table> + <div id="upstream_status_table" class="network-status-table"> + <em><%:Collecting data...%></em> + </div> + + <div class="table" width="100%"> + <div class="tr"><div class="td left" width="33%"><%:Active Connections%></div><div class="td left" id="conns">-</div></div> + </div> </fieldset> <% if has_dhcp then %> <fieldset class="cbi-section"> <legend><%:DHCP Leases%></legend> - <table class="cbi-section-table" id="lease_status_table"> - <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell"><%:Hostname%></th> - <th class="cbi-section-table-cell"><%:IPv4-Address%></th> - <th class="cbi-section-table-cell"><%:MAC-Address%></th> - <th class="cbi-section-table-cell"><%:Leasetime remaining%></th> - </tr> - <tr class="cbi-section-table-row"> - <td colspan="4"><em><br /><%:Collecting data...%></em></td> - </tr> - </table> + <div class="table cbi-section-table" id="lease_status_table"> + <div class="tr cbi-section-table-titles"> + <div class="th"><%:Hostname%></div> + <div class="th"><%:IPv4-Address%></div> + <div class="th"><%:MAC-Address%></div> + <div class="th"><%:Leasetime remaining%></div> + </div> + <div class="tr cbi-section-table-row"> + <div class="td" colspan="4"><em><br /><%:Collecting data...%></em></div> + </div> + </div> </fieldset> <fieldset class="cbi-section" style="display:none"> <legend><%:DHCPv6 Leases%></legend> - <table class="cbi-section-table" id="lease6_status_table"> - <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell"><%:Host%></th> - <th class="cbi-section-table-cell"><%:IPv6-Address%></th> - <th class="cbi-section-table-cell"><%:DUID%></th> - <th class="cbi-section-table-cell"><%:Leasetime remaining%></th> - </tr> - <tr class="cbi-section-table-row"> - <td colspan="4"><em><br /><%:Collecting data...%></em></td> - </tr> - </table> + <div class="table cbi-section-table" id="lease6_status_table"> + <div class="tr cbi-section-table-titles"> + <div class="th"><%:Host%></div> + <div class="th"><%:IPv6-Address%></div> + <div class="th"><%:DUID%></div> + <div class="th"><%:Leasetime remaining%></div> + </div> + <div class="tr cbi-section-table-row"> + <div class="td" colspan="4"><em><br /><%:Collecting data...%></em></div> + </div> + </div> </fieldset> <% end %> <% if has_dsl then %> <fieldset class="cbi-section"> - <legend><%:DSL%></legend> - <table width="100%" cellspacing="10"> - <tr><td width="33%" style="vertical-align:top"><%:DSL Status%></td><td> - <table><tr> - <td id="dsl_i" style="width:16px; text-align:center; padding:3px"><img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small></td> - <td id="dsl_s" style="vertical-align:middle; padding: 3px"><em><%:Collecting data...%></em></td> - </tr></table> - </td></tr> - </table> + <legend><%:DSL%></legend> + <div class="table" width="100%"> + <div class="tr"> + <div class="td left" width="33%" style="vertical-align:top"><%:DSL Status%></div> + <div class="td"> + <div class="table"> + <div class="tr"> + <div class="td" id="dsl_i" style="width:16px; text-align:center; padding:3px"><img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small></div> + <div class="td left" id="dsl_s" style="vertical-align:middle; padding: 3px"><em><%:Collecting data...%></em></div> + </div> + </div> + </div> + </div> + </div> </fieldset> <% end %> @@ -788,27 +699,27 @@ <fieldset class="cbi-section"> <legend><%:Wireless%></legend> - <table id="wifi_status_table" width="100%" cellspacing="10"> - <tr><td><em><%:Collecting data...%></em></td></tr> - </table> + <div id="wifi_status_table" class="network-status-table"> + <em><%:Collecting data...%></em> + </div> </fieldset> <fieldset class="cbi-section"> <legend><%:Associated Stations%></legend> - <table class="cbi-section-table valign-middle" id="wifi_assoc_table"> - <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell"> </th> - <th class="cbi-section-table-cell"><%:Network%></th> - <th class="cbi-section-table-cell"><%:MAC-Address%></th> - <th class="cbi-section-table-cell"><%:Host%></th> - <th class="cbi-section-table-cell"><%:Signal%> / <%:Noise%></th> - <th class="cbi-section-table-cell"><%:RX Rate%> / <%:TX Rate%></th> - </tr> - <tr class="cbi-section-table-row"> - <td colspan="6"><em><br /><%:Collecting data...%></em></td> - </tr> - </table> + <div class="table cbi-section-table valign-middle" id="wifi_assoc_table"> + <div class="tr cbi-section-table-titles"> + <div class="th"> </div> + <div class="th"><%:Network%></div> + <div class="th"><%:MAC-Address%></div> + <div class="th"><%:Host%></div> + <div class="th"><%:Signal%> / <%:Noise%></div> + <div class="th"><%:RX Rate%> / <%:TX Rate%></div> + </div> + <div class="tr cbi-section-table-row"> + <div class="td" colspan="6"><em><br /><%:Collecting data...%></em></div> + </div> + </div> </fieldset> <% end %> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm index 3f4b83b80b..ced4d5f774 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm @@ -92,14 +92,14 @@ <% for _, tbl in ipairs(tables) do chaincnt = 0 %> <h3><%:Table%>: <%=tbl%></h3> - <table class="cbi-section-table" style="font-size:90%"> + <div class="table cbi-section-table" style="font-size:90%"> <% for _, chain in ipairs(ipt:chains(tbl)) do rowcnt = 0 chaincnt = chaincnt + 1 chaininfo = ipt:chain(tbl, chain) %> - <tr class="cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>"> - <th class="cbi-section-table-cell" style="text-align:left" colspan="11"> + <div class="tr cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>"> + <div class="th cbi-section-table-cell" style="text-align:left" colspan="11"> <br /><span id="rule_<%=tbl:lower()%>_<%=chain%>"> <%:Chain%> <em><%=chain%></em> (<%- if chaininfo.policy then -%> @@ -107,47 +107,47 @@ <%- else -%> <%:References%>: <%=chaininfo.references-%> <%- end -%>)</span> - </th> - </tr> - <tr class="cbi-section-table-descr"> - <th class="cbi-section-table-cell"><%:Pkts.%></th> - <th class="cbi-section-table-cell"><%:Traffic%></th> - <th class="cbi-section-table-cell"><%:Target%></th> - <th class="cbi-section-table-cell"><%:Prot.%></th> - <th class="cbi-section-table-cell"><%:In%></th> - <th class="cbi-section-table-cell"><%:Out%></th> - <th class="cbi-section-table-cell"><%:Source%></th> - <th class="cbi-section-table-cell"><%:Destination%></th> - <th class="cbi-section-table-cell" style="width:30%"><%:Options%></th> - </tr> + </div> + </div> + <div class="tr cbi-section-table-descr"> + <div class="th cbi-section-table-cell"><%:Pkts.%></div> + <div class="th cbi-section-table-cell"><%:Traffic%></div> + <div class="th cbi-section-table-cell"><%:Target%></div> + <div class="th cbi-section-table-cell"><%:Prot.%></div> + <div class="th cbi-section-table-cell"><%:In%></div> + <div class="th cbi-section-table-cell"><%:Out%></div> + <div class="th cbi-section-table-cell"><%:Source%></div> + <div class="th cbi-section-table-cell"><%:Destination%></div> + <div class="th cbi-section-table-cell" style="width:30%"><%:Options%></div> + </div> <% for _, rule in ipairs(ipt:find({table=tbl, chain=chain})) do %> - <tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>"> - <td><%=rule.packets%></td> - <td style="white-space: nowrap"><%=wba.byte_format(rule.bytes)%></td> - <td><%=rule.target and link_target(tbl, rule.target) or "-"%></td> - <td><%=rule.protocol%></td> - <td><%=link_iface(rule.inputif)%></td> - <td><%=link_iface(rule.outputif)%></td> - <td><%=rule.source%></td> - <td><%=rule.destination%></td> - <td style="width:30%"><small><%=#rule.options > 0 and luci.util.pcdata(table.concat(rule.options, " ")) or "-"%></small></td> - </tr> + <div class="tr cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>"> + <div class="td"><%=rule.packets%></div> + <div class="td" style="white-space: nowrap"><%=wba.byte_format(rule.bytes)%></div> + <div class="td"><%=rule.target and link_target(tbl, rule.target) or "-"%></div> + <div class="td"><%=rule.protocol%></div> + <div class="td"><%=link_iface(rule.inputif)%></div> + <div class="td"><%=link_iface(rule.outputif)%></div> + <div class="td"><%=rule.source%></div> + <div class="td"><%=rule.destination%></div> + <div class="td" style="width:30%"><small><%=#rule.options > 0 and luci.util.pcdata(table.concat(rule.options, " ")) or "-"%></small></div> + </div> <% end %> <% if rowcnt == 1 then %> - <tr class="cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>"> - <td colspan="9"><em><%:No rules in this chain%></em></td> - </tr> + <div class="tr cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>"> + <div class="td" colspan="9"><em><%:No rules in this chain%></em></div> + </div> <% end %> <% end %> <% if chaincnt == 0 then %> - <tr class="cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>"> - <td colspan="9"><em><%:No chains in this table%></em></td> - </tr> + <div class="tr cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>"> + <div class="td" colspan="9"><em><%:No chains in this table%></em></div> + </div> <% end %> - </table> + </div> <br /><br /> <% end %> </fieldset> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm index 97a2f5ed59..c8ada71569 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm @@ -248,37 +248,37 @@ <div style="text-align:right"><small id="scale">-</small></div> <br /> -<table style="width:100%; table-layout:fixed" cellspacing="5"> - <tr> - <td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid #ff0000; white-space:nowrap"><%:1 Minute Load:%></strong></td> - <td id="lb_load01_cur">0</td> - - <td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td> - <td id="lb_load01_avg">0</td> - - <td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td> - <td id="lb_load01_peak">0</td> - </tr> - <tr> - <td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid #ff6600; white-space:nowrap"><%:5 Minute Load:%></strong></td> - <td id="lb_load05_cur">0</td> - - <td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td> - <td id="lb_load05_avg">0</td> - - <td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td> - <td id="lb_load05_peak">0</td> - </tr> - <tr> - <td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid #ffaa00; white-space:nowrap"><%:15 Minute Load:%></strong></td> - <td id="lb_load15_cur">0</td> - - <td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td> - <td id="lb_load15_avg">0</td> - - <td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td> - <td id="lb_load15_peak">0</td> - </tr> -</table> +<div class="table" style="width:100%; table-layout:fixed" cellspacing="5"> + <div class="tr"> + <div class="td" style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid #ff0000; white-space:nowrap"><%:1 Minute Load:%></strong></div> + <div class="td" id="lb_load01_cur">0</div> + + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></div> + <div class="td" id="lb_load01_avg">0</div> + + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></div> + <div class="td" id="lb_load01_peak">0</div> + </div> + <div class="tr"> + <div class="td" style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid #ff6600; white-space:nowrap"><%:5 Minute Load:%></strong></div> + <div class="td" id="lb_load05_cur">0</div> + + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></div> + <div class="td" id="lb_load05_avg">0</div> + + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></div> + <div class="td" id="lb_load05_peak">0</div> + </div> + <div class="tr"> + <div class="td" style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid #ffaa00; white-space:nowrap"><%:15 Minute Load:%></strong></div> + <div class="td" id="lb_load15_cur">0</div> + + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></div> + <div class="td" id="lb_load15_avg">0</div> + + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></div> + <div class="td" id="lb_load15_peak">0</div> + </div> +</div> <%+footer%> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm index f474c71568..af80371353 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm @@ -39,28 +39,28 @@ <fieldset class="cbi-section"> <legend>ARP</legend> <div class="cbi-section-node"> - <table class="cbi-section-table"> - <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell"><%_<abbr title="Internet Protocol Version 4">IPv4</abbr>-Address%></th> - <th class="cbi-section-table-cell"><%_<abbr title="Media Access Control">MAC</abbr>-Address%></th> - <th class="cbi-section-table-cell"><%:Interface%></th> - </tr> + <div class="table cbi-section-table"> + <div class="tr cbi-section-table-titles"> + <div class="th cbi-section-table-cell"><%_<abbr title="Internet Protocol Version 4">IPv4</abbr>-Address%></div> + <div class="th cbi-section-table-cell"><%_<abbr title="Media Access Control">MAC</abbr>-Address%></div> + <div class="th cbi-section-table-cell"><%:Interface%></div> + </div> <% for _, v in ipairs(ip.neighbors({ family = 4 })) do if v.mac then %> - <tr class="cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>"> - <td class="cbi-value-field"><%=v.dest%></td> - <td class="cbi-value-field"><%=v.mac%></td> - <td class="cbi-value-field"><%=luci.tools.webadmin.iface_get_network(v.dev) or '(' .. v.dev .. ')'%></td> - </tr> + <div class="tr cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>"> + <div class="td cbi-value-field"><%=v.dest%></div> + <div class="td cbi-value-field"><%=v.mac%></div> + <div class="td cbi-value-field"><%=luci.tools.webadmin.iface_get_network(v.dev) or '(' .. v.dev .. ')'%></div> + </div> <% style = not style end end %> - </table> + </div> </div> </fieldset> <br /> @@ -69,24 +69,24 @@ <legend><%_Active <abbr title="Internet Protocol Version 4">IPv4</abbr>-Routes%></legend> <div class="cbi-section-node"> - <table class="cbi-section-table"> - <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell"><%:Network%></th> - <th class="cbi-section-table-cell"><%:Target%></th> - <th class="cbi-section-table-cell"><%_<abbr title="Internet Protocol Version 4">IPv4</abbr>-Gateway%></th> - <th class="cbi-section-table-cell"><%:Metric%></th> - <th class="cbi-section-table-cell"><%:Table%></th> - </tr> + <div class="table cbi-section-table"> + <div class="tr cbi-section-table-titles"> + <div class="th cbi-section-table-cell"><%:Network%></div> + <div class="th cbi-section-table-cell"><%:Target%></div> + <div class="th cbi-section-table-cell"><%_<abbr title="Internet Protocol Version 4">IPv4</abbr>-Gateway%></div> + <div class="th cbi-section-table-cell"><%:Metric%></div> + <div class="th cbi-section-table-cell"><%:Table%></div> + </div> <% for _, v in ipairs(ip.routes({ family = 4, type = 1 })) do %> - <tr class="cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>"> - <td class="cbi-value-field"><%=luci.tools.webadmin.iface_get_network(v.dev) or v.dev%></td> - <td class="cbi-value-field"><%=v.dest%></td> - <td class="cbi-value-field"><%=v.gw%></td> - <td class="cbi-value-field"><%=v.metric or 0%></td> - <td class="cbi-value-field"><%=rtn[v.table] or v.table%></td> - </tr> + <div class="tr cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>"> + <div class="td cbi-value-field"><%=luci.tools.webadmin.iface_get_network(v.dev) or v.dev%></div> + <div class="td cbi-value-field"><%=v.dest%></div> + <div class="td cbi-value-field"><%=v.gw%></div> + <div class="td cbi-value-field"><%=v.metric or 0%></div> + <div class="td cbi-value-field"><%=rtn[v.table] or v.table%></div> + </div> <% style = not style end %> - </table> + </div> </div> </fieldset> <br /> @@ -99,31 +99,31 @@ <legend><%_Active <abbr title="Internet Protocol Version 6">IPv6</abbr>-Routes%></legend> <div class="cbi-section-node"> - <table class="cbi-section-table"> - <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell"><%:Network%></th> - <th class="cbi-section-table-cell"><%:Target%></th> - <th class="cbi-section-table-cell"><%:Source%></th> - <th class="cbi-section-table-cell"><%:Metric%></th> - <th class="cbi-section-table-cell"><%:Table%></th> - </tr> + <div class="table cbi-section-table"> + <div class="tr cbi-section-table-titles"> + <div class="th cbi-section-table-cell"><%:Network%></div> + <div class="th cbi-section-table-cell"><%:Target%></div> + <div class="th cbi-section-table-cell"><%:Source%></div> + <div class="th cbi-section-table-cell"><%:Metric%></div> + <div class="th cbi-section-table-cell"><%:Table%></div> + </div> <% for _, v in ipairs(ip.routes({ family = 6, type = 1 })) do if v.dest and not v.dest:is6linklocal() then %> - <tr class="cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>"> - <td class="cbi-value-field"><%=luci.tools.webadmin.iface_get_network(v.dev) or '(' .. v.dev .. ')'%></td> - <td class="cbi-value-field"><%=v.dest%></td> - <td class="cbi-value-field"><%=v.from%></td> - <td class="cbi-value-field"><%=v.metric or 0%></td> - <td class="cbi-value-field"><%=rtn[v.table] or v.table%></td> - </tr> + <div class="tr cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>"> + <div class="td cbi-value-field"><%=luci.tools.webadmin.iface_get_network(v.dev) or '(' .. v.dev .. ')'%></div> + <div class="td cbi-value-field"><%=v.dest%></div> + <div class="td cbi-value-field"><%=v.from%></div> + <div class="td cbi-value-field"><%=v.metric or 0%></div> + <div class="td cbi-value-field"><%=rtn[v.table] or v.table%></div> + </div> <% style = not style end end %> - </table> + </div> </div> </fieldset> <br /> @@ -132,27 +132,27 @@ <legend><%:IPv6 Neighbours%></legend> <div class="cbi-section-node"> - <table class="cbi-section-table"> - <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell"><%:IPv6-Address%></th> - <th class="cbi-section-table-cell"><%:MAC-Address%></th> - <th class="cbi-section-table-cell"><%:Interface%></th> - </tr> + <div class="table cbi-section-table"> + <div class="tr cbi-section-table-titles"> + <div class="th cbi-section-table-cell"><%:IPv6-Address%></div> + <div class="th cbi-section-table-cell"><%:MAC-Address%></div> + <div class="th cbi-section-table-cell"><%:Interface%></div> + </div> <% for _, v in ipairs(ip.neighbors({ family = 6 })) do if v.dest and not v.dest:is6linklocal() and v.mac then %> - <tr class="cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>"> - <td class="cbi-value-field"><%=v.dest%></td> - <td class="cbi-value-field"><%=v.mac%></td> - <td class="cbi-value-field"><%=luci.tools.webadmin.iface_get_network(v.dev) or '(' .. v.dev .. ')'%></td> - </tr> + <div class="tr cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>"> + <div class="td cbi-value-field"><%=v.dest%></div> + <div class="td cbi-value-field"><%=v.mac%></div> + <div class="td cbi-value-field"><%=luci.tools.webadmin.iface_get_network(v.dev) or '(' .. v.dev .. ')'%></div> + </div> <% style = not style end end %> - </table> + </div> </div> </fieldset> <br /> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm index aa658ff0cb..4211b26471 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm @@ -325,28 +325,28 @@ <div style="text-align:right"><small id="scale">-</small></div> <br /> -<table style="width:100%; table-layout:fixed" cellspacing="5"> - <tr> - <td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid blue"><%:Signal:%></strong></td> - <td id="rssi_bw_cur">0 <%:dBm%></td> +<div class="table" style="width:100%; table-layout:fixed" cellspacing="5"> + <div class="tr"> + <div class="td" style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid blue"><%:Signal:%></strong></div> + <div class="td" id="rssi_bw_cur">0 <%:dBm%></div> - <td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td> - <td id="rssi_bw_avg">0 <%:dBm%></td> + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></div> + <div class="td" id="rssi_bw_avg">0 <%:dBm%></div> - <td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td> - <td id="rssi_bw_peak">0 <%:dBm%></td> - </tr> - <tr> - <td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid red"><%:Noise:%></strong></td> - <td id="noise_bw_cur">0 <%:dBm%></td> + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></div> + <div class="td" id="rssi_bw_peak">0 <%:dBm%></div> + </div> + <div class="tr"> + <div class="td" style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid red"><%:Noise:%></strong></div> + <div class="td" id="noise_bw_cur">0 <%:dBm%></div> - <td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td> - <td id="noise_bw_avg">0 <%:dBm%></td> + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></div> + <div class="td" id="noise_bw_avg">0 <%:dBm%></div> - <td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td> - <td id="noise_bw_peak">0 <%:dBm%></td> - </tr> -</table> + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></div> + <div class="td" id="noise_bw_peak">0 <%:dBm%></div> + </div> +</div> <br /> @@ -354,17 +354,17 @@ <div style="text-align:right"><small id="scale2">-</small></div> <br /> -<table style="width:100%; table-layout:fixed" cellspacing="5"> - <tr> - <td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid green"><%:Phy Rate:%></strong></td> - <td id="rate_bw_cur">0 MBit/s</td> +<div class="table" style="width:100%; table-layout:fixed" cellspacing="5"> + <div class="tr"> + <div class="td" style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid green"><%:Phy Rate:%></strong></div> + <div class="td" id="rate_bw_cur">0 MBit/s</div> - <td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td> - <td id="rate_bw_avg">0 MBit/s</td> + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></div> + <div class="td" id="rate_bw_avg">0 MBit/s</div> - <td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td> - <td id="rate_bw_peak">0 MBit/s</td> - </tr> -</table> + <div class="td" style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></div> + <div class="td" id="rate_bw_peak">0 MBit/s</div> + </div> +</div> <%+footer%> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm index 88e0fffd9c..4944a232b2 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm @@ -128,34 +128,34 @@ end <% if display ~= "available" then %> <fieldset class="cbi-section"> - <table class="cbi-section-table" style="width:100%"> - <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell" style="text-align:left"> </th> - <th class="cbi-section-table-cell" style="text-align:left"><%:Package name%></th> - <th class="cbi-section-table-cell" style="text-align:left"><%:Version%></th> - </tr> + <div class="table cbi-section-table" style="width:100%"> + <div class="tr cbi-section-table-titles"> + <div class="th cbi-section-table-cell" style="text-align:left"> </div> + <div class="th cbi-section-table-cell" style="text-align:left"><%:Package name%></div> + <div class="th cbi-section-table-cell" style="text-align:left"><%:Version%></div> + </div> <% local empty = true; luci.model.ipkg.list_installed(querypat, function(n, v, s, d) empty = false; filter[n] = true %> - <tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>"> - <td style="text-align:left; width:10%"> + <div class="tr cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>"> + <div class="td" style="text-align:left; width:10%"> <form method="post" class="inline" action="<%=REQUEST_URI%>"> <input type="hidden" name="exec" value="1" /> <input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="remove" value="<%=pcdata(n)%>" /> <a onclick="window.confirm('<%:Remove%> "<%=luci.util.pcdata(n)%>" ?') && this.parentNode.submit(); return false" href="#"><%:Remove%></a> </form> - </td> - <td style="text-align:left"><%=luci.util.pcdata(n)%></td> - <td style="text-align:left"><%=luci.util.pcdata(v)%></td> - </tr> + </div> + <div class="td" style="text-align:left"><%=luci.util.pcdata(n)%></div> + <div class="td" style="text-align:left"><%=luci.util.pcdata(v)%></div> + </div> <% end) %> <% if empty then %> - <tr class="cbi-section-table-row"> - <td style="text-align:left"> </td> - <td style="text-align:left"><em><%:none%></em></td> - <td style="text-align:left"><em><%:none%></em></td> - </tr> + <div class="tr cbi-section-table-row"> + <div class="td" style="text-align:left"> </div> + <div class="td" style="text-align:left"><em><%:none%></em></div> + <div class="td" style="text-align:left"><em><%:none%></em></div> + </div> <% end %> - </table> + </div> </fieldset> <% else %> <fieldset class="cbi-section"> @@ -168,40 +168,40 @@ end </ul> <div class="cbi-section-node"> <% end %> - <table class="cbi-section-table" style="width:100%"> - <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell" style="text-align:left"> </th> - <th class="cbi-section-table-cell" style="text-align:left"><%:Package name%></th> - <th class="cbi-section-table-cell" style="text-align:left"><%:Version%></th> - <th class="cbi-section-table-cell" style="text-align:right"><%:Size (.ipk)%></th> - <th class="cbi-section-table-cell" style="text-align:left"><%:Description%></th> - </tr> + <div class="table cbi-section-table" style="width:100%"> + <div class="tr cbi-section-table-titles"> + <div class="th cbi-section-table-cell" style="text-align:left"> </div> + <div class="th cbi-section-table-cell" style="text-align:left"><%:Package name%></div> + <div class="th cbi-section-table-cell" style="text-align:left"><%:Version%></div> + <div class="th cbi-section-table-cell" style="text-align:right"><%:Size (.ipk)%></div> + <div class="th cbi-section-table-cell" style="text-align:left"><%:Description%></div> + </div> <% local empty = true; opkg_list(querypat or letterpat, function(n, v, s, d) if filter[n] then return end; empty = false %> - <tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>"> - <td style="text-align:left; width:10%"> + <div class="tr cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>"> + <div class="td" style="text-align:left; width:10%"> <form method="post" class="inline" action="<%=REQUEST_URI%>"> <input type="hidden" name="exec" value="1" /> <input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="install" value="<%=pcdata(n)%>" /> <a onclick="window.confirm('<%:Install%> "<%=luci.util.pcdata(n)%>" ?') && this.parentNode.submit(); return false" href="#"><%:Install%></a> </form> - </td> - <td style="text-align:left"><%=luci.util.pcdata(n)%></td> - <td style="text-align:left"><%=luci.util.pcdata(v)%></td> - <td style="text-align:right"><%=luci.util.pcdata(s)%></td> - <td style="text-align:left"><%=luci.util.pcdata(d)%></td> - </tr> + </div> + <div class="td" style="text-align:left"><%=luci.util.pcdata(n)%></div> + <div class="td" style="text-align:left"><%=luci.util.pcdata(v)%></div> + <div class="td" style="text-align:right"><%=luci.util.pcdata(s)%></div> + <div class="td" style="text-align:left"><%=luci.util.pcdata(d)%></div> + </div> <% end) %> <% if empty then %> - <tr class="cbi-section-table-row"> - <td style="text-align:left"> </td> - <td style="text-align:left"><em><%:none%></em></td> - <td style="text-align:left"><em><%:none%></em></td> - <td style="text-align:right"><em><%:none%></em></td> - <td style="text-align:left"><em><%:none%></em></td> - </tr> + <div class="tr cbi-section-table-row"> + <div class="td" style="text-align:left"> </div> + <div class="td" style="text-align:left"><em><%:none%></em></div> + <div class="td" style="text-align:left"><em><%:none%></em></div> + <div class="td" style="text-align:right"><em><%:none%></em></div> + <div class="td" style="text-align:left"><em><%:none%></em></div> + </div> <% end %> - </table> + </div> <% if not querypat then %> </div> <% end %> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm b/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm index 9e9ce2be2a..c69ec1215a 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm @@ -36,7 +36,7 @@ <div style="text-align:right"> <input class="cbi-button cbi-button-save" type="button" id="apply_button" value="<%:Save & Apply%>" onclick="uci_apply(true); this.blur()" /> - <form class="inline" method="post" action="<%=controller%>/admin/uci/revert"> + <form class="inline" method="post" action="<%=url("admin/uci/revert")%>"> <input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="redir" value="<%=pcdata(luci.http.formvalue("redir"))%>" /> <input class="cbi-button cbi-button-reset" type="submit" value="<%:Revert%>" /> diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm index 1add595c6c..dca35376cb 100644 --- a/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm +++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm @@ -31,33 +31,33 @@ end <fieldset xmlns="http://www.w3.org/1999/xhtml" class="cbi-section"> <legend><%:Operator%></legend> - <table cellspacing="10" width="100%" style="text-align:left"> - <tr><th width="33%"><%:Nickname%>:</th><td><%=nickname%></td></tr> - <tr><th width="33%"><%:Realname%>:</th><td><%=name%></td></tr> - <tr><th width="33%"><%:Homepage%>:</th><td> + <div class="table" cellspacing="10" width="100%" style="text-align:left"> + <div class="tr"><div class="th" width="33%"><%:Nickname%>:</div><div class="td"><%=nickname%></div></div> + <div class="tr"><div class="th" width="33%"><%:Realname%>:</div><div class="td"><%=name%></div></div> + <div class="tr"><div class="th" width="33%"><%:Homepage%>:</div><div class="td"> <% for k, v in ipairs(homepage) do %> <a href="<%=v%>"><%=v%></a><br /> <% end %> - </td></tr> - <tr><th width="33%"><%:E-Mail%>:</th><td><a href="mailto:<%=mail%>"><%=mail%></a></td></tr> - <tr><th width="33%"><%:Phone%>:</th><td><%=phone%></td></tr> - </table> + </div></div> + <div class="tr"><div class="th" width="33%"><%:E-Mail%>:</div><div class="td"><a href="mailto:<%=mail%>"><%=mail%></a></div></div> + <div class="tr"><div class="th" width="33%"><%:Phone%>:</div><div class="td"><%=phone%></div></div> + </div> </fieldset> <fieldset xmlns="http://www.w3.org/1999/xhtml" class="cbi-section"> <legend><%:Location%></legend> - <table cellspacing="10" width="100%" style="text-align:left"> - <tr><th width="33%"><%:Location%>:</th><td><%=location%></td></tr> - <tr><th width="33%"><%:Coordinates%>:</th><td><%=lat%> <%=lon%> (<a href="<%=pcdata(luci.dispatcher.build_url("freifunk/map"))%>"><%:Show on map%>)</a></td></tr> - </table> + <div class="table" cellspacing="10" width="100%" style="text-align:left"> + <div class="tr"><div class="th" width="33%"><%:Location%>:</div><div class="td"><%=location%></div></div> + <div class="tr"><div class="th" width="33%"><%:Coordinates%>:</div><div class="td"><%=lat%> <%=lon%> (<a href="<%=pcdata(luci.dispatcher.build_url("freifunk/map"))%>"><%:Show on map%>)</a></div></div> + </div> </fieldset> <% if note then %> <fieldset xmlns="http://www.w3.org/1999/xhtml" class="cbi-section"> <legend><%:Notice%></legend> - <table cellspacing="10" width="100%" style="text-align:left"> - <tr><td><%=note%></td></tr> - </table> + <div class="table" cellspacing="10" width="100%" style="text-align:left"> + <div class="tr"><div class="td"><%=note%></div></div> + </div> </fieldset> <%end%> diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk/public_status.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk/public_status.htm index 1dc1d8b0d1..a71926141b 100644 --- a/modules/luci-mod-freifunk/luasrc/view/freifunk/public_status.htm +++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/public_status.htm @@ -246,17 +246,17 @@ end <div class="cbi-section"> <div class="cbi-section-node"> - <table class="cbi-section-table"> - <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell"><%:Signal%></th> - <th class="cbi-section-table-cell"><%:Bitrate%></th> - <th class="cbi-section-table-cell"><%:SSID%></th> - <th class="cbi-section-table-cell"><%:BSSID%></th> - <th class="cbi-section-table-cell"><%:Channel%></th> - <th class="cbi-section-table-cell"><%:Mode%></th> - <th class="cbi-section-table-cell"><%:TX%>-<%:Power%></th> - <th class="cbi-section-table-cell"><%:Interface%></th> - </tr> + <div class="table cbi-section-table"> + <div class="tr cbi-section-table-titles"> + <div class="th cbi-section-table-cell"><%:Signal%></div> + <div class="th cbi-section-table-cell"><%:Bitrate%></div> + <div class="th cbi-section-table-cell"><%:SSID%></div> + <div class="th cbi-section-table-cell"><%:BSSID%></div> + <div class="th cbi-section-table-cell"><%:Channel%></div> + <div class="th cbi-section-table-cell"><%:Mode%></div> + <div class="th cbi-section-table-cell"><%:TX%>-<%:Power%></div> + <div class="th cbi-section-table-cell"><%:Interface%></div> + </div> <% for _, dev in ipairs(devices) do local net @@ -301,20 +301,20 @@ end end local interface = net.iwinfo.ifname or "N/A" %> - <tr class="cbi-section-table-row cbi-rowstyle-1"> - <td class="cbi-value-field" id="<%=net:ifname()%>-signal"><%=signal_string%></td> - <td class="cbi-value-field" id="<%=net:ifname()%>-bitrate"><%=bitrate%></td> - <td class="cbi-value-field" id="<%=net:ifname()%>-ssid"><%=ssid%></td> - <td class="cbi-value-field" id="<%=net:ifname()%>-bssid"><%=bssid%></td> - <td class="cbi-value-field" id="<%=net:ifname()%>-channel"><%=chan%></td> - <td class="cbi-value-field" id="<%=net:ifname()%>-mode"><%=mode%></td> - <td class="cbi-value-field" id="<%=net:ifname()%>-txpower"><%=txpwr%></td> - <td class="cbi-value-field"><%=interface%></td> - </tr> + <div class="tr cbi-section-table-row cbi-rowstyle-1"> + <div class="td cbi-value-field" id="<%=net:ifname()%>-signal"><%=signal_string%></div> + <div class="td cbi-value-field" id="<%=net:ifname()%>-bitrate"><%=bitrate%></div> + <div class="td cbi-value-field" id="<%=net:ifname()%>-ssid"><%=ssid%></div> + <div class="td cbi-value-field" id="<%=net:ifname()%>-bssid"><%=bssid%></div> + <div class="td cbi-value-field" id="<%=net:ifname()%>-channel"><%=chan%></div> + <div class="td cbi-value-field" id="<%=net:ifname()%>-mode"><%=mode%></div> + <div class="td cbi-value-field" id="<%=net:ifname()%>-txpower"><%=txpwr%></div> + <div class="td cbi-value-field"><%=interface%></div> + </div> <% end end end %> - </table> + </div> </div> </div> </div> @@ -328,35 +328,35 @@ end <% if not def4 and not def6 then %> <%:No default routes known.%> <%else%> - <table class="cbi-section-table"> - <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell"><%:Network%></th> - <th class="cbi-section-table-cell"><%:Interface%></th> - <th class="cbi-section-table-cell"><%:Gateway%></th> - <th class="cbi-section-table-cell"><%:Metric%></th> - </tr> + <div class="table cbi-section-table"> + <div class="tr cbi-section-table-titles"> + <div class="th cbi-section-table-cell"><%:Network%></div> + <div class="th cbi-section-table-cell"><%:Interface%></div> + <div class="th cbi-section-table-cell"><%:Gateway%></div> + <div class="th cbi-section-table-cell"><%:Metric%></div> + </div> <% if def4 then %> - <tr class="cbi-section-table-row cbi-rowstyle-1"> - <td class="cbi-value-field" id="v4dst"><%=def4.dest%></td> - <td class="cbi-value-field" id="v4dev"><%=def4.dev%></td> - <td class="cbi-value-field" id="v4gw"><%=def4.gateway%></td> - <td class="cbi-value-field" id="v4metr"><%=def4.metr%></td> - </tr> + <div class="tr cbi-section-table-row cbi-rowstyle-1"> + <div class="td cbi-value-field" id="v4dst"><%=def4.dest%></div> + <div class="td cbi-value-field" id="v4dev"><%=def4.dev%></div> + <div class="td cbi-value-field" id="v4gw"><%=def4.gateway%></div> + <div class="td cbi-value-field" id="v4metr"><%=def4.metr%></div> + </div> <% end if def6 then %> - <tr class="cbi-section-table-row cbi-rowstyle-2"> - <td class="cbi-value-field" id="v6dst"><%=def6.dest%></td> - <td class="cbi-value-field" id="v6dev"><%=def6.dev%></td> - <td class="cbi-value-field" id="v6gw"><%=def6.gateway%></td> - <td class="cbi-value-field" id="v6metr"><%=def6.metr%></td> - </tr> + <div class="tr cbi-section-table-row cbi-rowstyle-2"> + <div class="td cbi-value-field" id="v6dst"><%=def6.dest%></div> + <div class="td cbi-value-field" id="v6dev"><%=def6.dev%></div> + <div class="td cbi-value-field" id="v6gw"><%=def6.gateway%></div> + <div class="td cbi-value-field" id="v6metr"><%=def6.metr%></div> + </div> <% end %> - </table> + </div> <% end %> </div> </div> |