diff options
Diffstat (limited to 'modules')
53 files changed, 1597 insertions, 4613 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 2c58b0ab3d..6850d7e3a9 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") or "" , 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] = "?" @@ -507,10 +507,11 @@ function dispatch(request) else ok, err = util.copcall(target, unpack(args)) end - assert(ok, - "Failed to execute " .. (type(c.target) == "function" and "function" or c.target.type or "unknown") .. - " dispatcher target for entry '/" .. table.concat(request, "/") .. "'.\n" .. - "The called action terminated with an exception:\n" .. tostring(err or "(unknown)")) + if not ok then + error500("Failed to execute " .. (type(c.target) == "function" and "function" or c.target.type or "unknown") .. + " dispatcher target for entry '/" .. table.concat(request, "/") .. "'.\n" .. + "The called action terminated with an exception:\n" .. tostring(err or "(unknown)")) + end else local root = node() if not root or not root.target then diff --git a/modules/luci-base/luasrc/util.lua b/modules/luci-base/luasrc/util.lua index ce42af2fb0..10428b0b35 100644 --- a/modules/luci-base/luasrc/util.lua +++ b/modules/luci-base/luasrc/util.lua @@ -100,6 +100,8 @@ end -- Scope manipulation routines -- +coxpt = setmetatable({}, { __mode = "kv" }) + local tl_meta = { __mode = "k", @@ -697,73 +699,69 @@ function checklib(fullpathexe, wantedlib) return false end +------------------------------------------------------------------------------- +-- Coroutine safe xpcall and pcall versions -- --- Coroutine safe xpcall and pcall versions modified for Luci --- original version: --- coxpcall 1.13 - Copyright 2005 - Kepler Project (www.keplerproject.org) +-- Encapsulates the protected calls with a coroutine based loop, so errors can +-- be dealed without the usual Lua 5.x pcall/xpcall issues with coroutines +-- yielding inside the call to pcall or xpcall. -- --- Copyright © 2005 Kepler Project. --- Permission is hereby granted, free of charge, to any person obtaining a --- copy of this software and associated documentation files (the "Software"), --- to deal in the Software without restriction, including without limitation --- the rights to use, copy, modify, merge, publish, distribute, sublicense, --- and/or sell copies of the Software, and to permit persons to whom the --- Software is furnished to do so, subject to the following conditions: +-- Authors: Roberto Ierusalimschy and Andre Carregal +-- Contributors: Thomas Harning Jr., Ignacio Burgueño, Fabio Mascarenhas -- --- The above copyright notice and this permission notice shall be --- included in all copies or substantial portions of the Software. +-- Copyright 2005 - Kepler Project -- --- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, --- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES --- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. --- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, --- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, --- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE --- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -local performResume, handleReturnValue -local oldpcall, oldxpcall = pcall, xpcall -coxpt = {} -setmetatable(coxpt, {__mode = "kv"}) - --- Identity function for copcall -local function copcall_id(trace, ...) - return ... -end - --- values of either the function or the error handler -function coxpcall(f, err, ...) - local res, co = oldpcall(coroutine.create, f) - if not res then - local params = {...} - local newf = function() return f(unpack(params)) end - co = coroutine.create(newf) - end - local c = coroutine.running() - coxpt[co] = coxpt[c] or c or 0 +-- $Id: coxpcall.lua,v 1.13 2008/05/19 19:20:02 mascarenhas Exp $ +------------------------------------------------------------------------------- - return performResume(err, co, ...) -end - --- values of the function or the error object -function copcall(f, ...) - return coxpcall(f, copcall_id, ...) -end +------------------------------------------------------------------------------- +-- Implements xpcall with coroutines +------------------------------------------------------------------------------- +local coromap = setmetatable({}, { __mode = "k" }) --- Handle return value of protected call -function handleReturnValue(err, co, status, ...) +local function handleReturnValue(err, co, status, ...) if not status then return false, err(debug.traceback(co, (...)), ...) end - - if coroutine.status(co) ~= 'suspended' then + if coroutine.status(co) == 'suspended' then + return performResume(err, co, coroutine.yield(...)) + else return true, ... end - - return performResume(err, co, coroutine.yield(...)) end --- Resume execution of protected function call function performResume(err, co, ...) return handleReturnValue(err, co, coroutine.resume(co, ...)) end + +local function id(trace, ...) + return trace +end + +function coxpcall(f, err, ...) + local current = coroutine.running() + if not current then + if err == id then + return pcall(f, ...) + else + if select("#", ...) > 0 then + local oldf, params = f, { ... } + f = function() return oldf(unpack(params)) end + end + return xpcall(f, err) + end + else + local res, co = pcall(coroutine.create, f) + if not res then + local newf = function(...) return f(...) end + co = coroutine.create(newf) + end + coromap[co] = current + coxpt[co] = coxpt[current] or current or 0 + return performResume(err, co, ...) + end +end + +function copcall(f, ...) + return coxpcall(f, id, ...) +end diff --git a/modules/luci-base/luasrc/view/cbi/apply_widget.htm b/modules/luci-base/luasrc/view/cbi/apply_widget.htm index 543ef0b80b..702512f495 100644 --- a/modules/luci-base/luasrc/view/cbi/apply_widget.htm +++ b/modules/luci-base/luasrc/view/cbi/apply_widget.htm @@ -1,59 +1,98 @@ <% export("cbi_apply_widget", function(redirect_ok) -%> <style type="text/css"> - #cbi_apply_status { + .alert-message.notice { + background: linear-gradient(#fff 0%, #eee 100%); + } + + #cbi_apply_overlay { + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; + background: rgba(0, 0, 0, 0.7); + display: none; + z-index: 20000; + } + + #cbi_apply_overlay .alert-message { + position: relative; + top: 10%; + width: 60%; + margin: auto; display: flex; flex-wrap: wrap; min-height: 32px; align-items: center; - margin: 1.5em 0 1.5em 0; } - #cbi_apply_status > h4, - #cbi_apply_status > p, - #cbi_apply_status > div { + #cbi_apply_overlay .alert-message > h4, + #cbi_apply_overlay .alert-message > p, + #cbi_apply_overlay .alert-message > div { flex-basis: 100%; } - #cbi_apply_status > img { + #cbi_apply_overlay .alert-message > img { margin-right: 1em; flex-basis: 32px; } - #cbi_apply_status + script + .cbi-section { - margin-top: -1em; + body.apply-overlay-active { + overflow: hidden; + height: 100vh; } - .alert-message.notice { - background: linear-gradient(#fff 0%, #eee 100%); + body.apply-overlay-active #cbi_apply_overlay { + display: block; } </style> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> +<script type="text/javascript" src="<%=resource%>/cbi.js?v=git-18.138.59467-72fe5dd"></script> <script type="text/javascript">//<![CDATA[ var xhr = new XHR(), - stat, indicator, uci_apply_auth = { sid: '<%=luci.dispatcher.context.authsession%>', token: '<%=token%>' }, uci_apply_rollback = <%=math.max(luci.config and luci.config.apply and luci.config.apply.rollback or 30, 30)%>, uci_apply_holdoff = <%=math.max(luci.config and luci.config.apply and luci.config.apply.holdoff or 4, 1)%>, uci_apply_timeout = <%=math.max(luci.config and luci.config.apply and luci.config.apply.timeout or 5, 1)%>, uci_apply_display = <%=math.max(luci.config and luci.config.apply and luci.config.apply.display or 1.5, 1)%>; + function uci_status_message(type, content) { + var overlay = document.getElementById('cbi_apply_overlay') || document.body.appendChild(E('<div id="cbi_apply_overlay"><div class="alert-message"></div></div>')), + message = overlay.querySelector('.alert-message'); + + if (message && type) { + if (!message.classList.contains(type)) { + message.classList.remove('notice'); + message.classList.remove('warning'); + message.classList.add(type); + } + + if (content) + message.innerHTML = content; + + document.body.classList.add('apply-overlay-active'); + } + else { + document.body.classList.remove('apply-overlay-active'); + } + } + function uci_rollback(checked) { if (checked) { - stat.classList.remove('notice'); - stat.classList.add('warning'); - stat.innerHTML = '<img src="<%=resource%>/icons/loading.gif" alt="" style="vertical-align:middle" /> ' + - '<%:Failed to confirm apply within %ds, waiting for rollback…%>'.format(uci_apply_rollback); + uci_status_message('warning', + '<img src="<%=resource%>/icons/loading.gif" alt="" style="vertical-align:middle" /> ' + + '<%:Failed to confirm apply within %ds, waiting for rollback…%>'.format(uci_apply_rollback)); var call = function(r) { if (r.status === 204) { - stat.innerHTML = '<h4><%:Configuration has been rolled back!%></h4>' + + uci_status_message('warning', + '<h4><%:Configuration has been rolled back!%></h4>' + '<p><%: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.%></p>'.format(uci_apply_rollback) + '<div class="right">' + - '<input type="button" class="btn" onclick="this.parentNode.parentNode.style.display=\'none\'" value="<%:Dismiss%>" /> ' + + '<input type="button" class="btn" onclick="uci_status_message(false)" value="<%:Dismiss%>" /> ' + '<input type="button" class="btn" onclick="uci_revert()" value="<%:Revert changes%>" /> ' + '<input type="button" class="btn danger" onclick="uci_apply(false)" value="<%:Apply unchecked%>" />' + - '</div>'; + '</div>'); return; } @@ -64,10 +103,9 @@ call({ status: 0 }); } else { - stat.classList.remove('notice'); - stat.classList.add('warning'); - stat.innerHTML = '<h4><%:Device unreachable!%></h4>' + - '<p><%: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.%></p>'; + uci_status_message('warning', + '<h4><%:Device unreachable!%></h4>' + + '<p><%: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.%></p>'); } } @@ -75,12 +113,7 @@ var tt; var ts = Date.now(); - stat = document.getElementById('cbi_apply_status'); - stat.style.display = ''; - stat.classList.remove('warning'); - stat.classList.add('notice'); - - indicator = document.querySelector('.uci_change_indicator'); + uci_status_message('notice'); var call = function(r) { if (Date.now() >= deadline) { @@ -88,15 +121,18 @@ return; } else if (r && (r.status === 200 || r.status === 204)) { - if (indicator) - indicator.style.display = 'none'; + var indicator = document.querySelector('.uci_change_indicator'); + if (indicator) indicator.style.display = 'none'; - stat.innerHTML = '<%:Configuration has been applied.%>'; + uci_status_message('notice', '<%:Configuration has been applied.%>'); window.clearTimeout(tt); window.setTimeout(function() { - stat.style.display = 'none'; - <% if redirect_ok then %>location.href = decodeURIComponent('<%=luci.util.urlencode(redirect_ok)%>');<% end %> + <% if redirect_ok then -%> + location.href = decodeURIComponent('<%=luci.util.urlencode(redirect_ok)%>'); + <%- else -%> + window.location = window.location.href.split('#')[0]; + <% end %> }, uci_apply_display * 1000); return; @@ -108,8 +144,9 @@ var tick = function() { var now = Date.now(); - stat.innerHTML = '<img src="<%=resource%>/icons/loading.gif" alt="" style="vertical-align:middle" /> ' + - '<%:Waiting for configuration to get applied… %ds%>'.format(Math.max(Math.floor((deadline - Date.now()) / 1000), 0)); + uci_status_message('notice', + '<img src="<%=resource%>/icons/loading.gif" alt="" style="vertical-align:middle" /> ' + + '<%:Waiting for configuration to get applied… %ds%>'.format(Math.max(Math.floor((deadline - Date.now()) / 1000), 0))); if (now >= deadline) return; @@ -125,43 +162,39 @@ } function uci_apply(checked) { - stat = document.getElementById('cbi_apply_status'); - stat.style.display = ''; - stat.classList.remove('warning'); - stat.classList.add('notice'); - stat.innerHTML = '<img src="<%=resource%>/icons/loading.gif" alt="" style="vertical-align:middle" /> ' + - '<%:Starting configuration apply…%>'; + uci_status_message('notice', + '<img src="<%=resource%>/icons/loading.gif" alt="" style="vertical-align:middle" /> ' + + '<%:Starting configuration apply…%>'); xhr.post('<%=url("admin/uci")%>/' + (checked ? 'apply_rollback' : 'apply_unchecked'), uci_apply_auth, function(r) { if (r.status === (checked ? 200 : 204)) { uci_confirm(checked, Date.now() + uci_apply_rollback * 1000); } else if (checked && r.status === 204) { - stat.innerHTML = '<%:There are no changes to apply.%>'; + uci_status_message('notice', '<%:There are no changes to apply.%>'); window.setTimeout(function() { - stat.style.display = 'none'; - <% if redirect_ok then %>location.href = decodeURIComponent('<%=luci.util.urlencode(redirect_ok)%>');<% end %> + <% if redirect_ok then -%> + location.href = decodeURIComponent('<%=luci.util.urlencode(redirect_ok)%>'); + <%- else -%> + uci_status_message(false); + <%- end %> }, uci_apply_display * 1000); } else { - stat.classList.add('warning'); - stat.classList.remove('notice'); - stat.innerHTML = '<%_Apply request failed with status <code>%h</code>%>'.format(r.responseText || r.statusText || r.status); + uci_status_message('warning', '<%_Apply request failed with status <code>%h</code>%>'.format(r.responseText || r.statusText || r.status)); + window.setTimeout(function() { uci_status_message(false); }, uci_apply_display * 1000); } }); } function uci_revert() { - stat = document.getElementById('cbi_apply_status'); - stat.style.display = ''; - stat.classList.remove('warning'); - stat.classList.add('notice'); - stat.innerHTML = '<img src="<%=resource%>/icons/loading.gif" alt="" style="vertical-align:middle" /> ' + - '<%:Reverting configuration…%>'; + uci_status_message('notice', + '<img src="<%=resource%>/icons/loading.gif" alt="" style="vertical-align:middle" /> ' + + '<%:Reverting configuration…%>'); xhr.post('<%=url("admin/uci/revert")%>', uci_apply_auth, function(r) { if (r.status === 200) { - stat.innerHTML = '<%:Changes have been reverted.%>'; + uci_status_message('notice', '<%:Changes have been reverted.%>'); window.setTimeout(function() { <% if redirect_ok then -%> location.href = decodeURIComponent('<%=luci.util.urlencode(redirect_ok)%>'); @@ -171,9 +204,8 @@ }, uci_apply_display * 1000); } else { - stat.classList.add('warning'); - stat.classList.remove('notice'); - stat.innerHTML = '<%_Revert request failed with status <code>%h</code>%>'.format(r.statusText || r.status); + uci_status_message('warning', '<%_Revert request failed with status <code>%h</code>%>'.format(r.statusText || r.status)); + window.setTimeout(function() { uci_status_message(false); }, uci_apply_display * 1000); } }); } 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/map.htm b/modules/luci-base/luasrc/view/cbi/map.htm index 69ef3615a2..02b47f5455 100644 --- a/modules/luci-base/luasrc/view/cbi/map.htm +++ b/modules/luci-base/luasrc/view/cbi/map.htm @@ -1,5 +1,5 @@ <%- if firstmap and messages then local msg; for _, msg in ipairs(messages) do -%> - <div class="errorbox"><%=pcdata(msg)%></div> + <div class="alert-message warning"><%=pcdata(msg)%></div> <%- end end -%> <div class="cbi-map" id="cbi-<%=self.config%>"> 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/luasrc/view/sysauth.htm b/modules/luci-base/luasrc/view/sysauth.htm index b3ec9b7617..e7a741aaab 100644 --- a/modules/luci-base/luasrc/view/sysauth.htm +++ b/modules/luci-base/luasrc/view/sysauth.htm @@ -8,7 +8,9 @@ <form method="post" action="<%=pcdata(FULL_REQUEST_URI)%>"> <%- if fuser then %> - <div class="errorbox"><%:Invalid username and/or password! Please try again.%></div> + <div class="alert-message warning"> + <p><%:Invalid username and/or password! Please try again.%></p> + </div> <% end -%> <div class="cbi-map"> diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index 22889f5dbe..740795ec92 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 "" @@ -412,6 +401,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -426,6 +418,9 @@ msgstr "" msgid "Associated Stations" msgstr "Estacions associades" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -517,9 +512,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 " @@ -707,9 +699,6 @@ 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" @@ -847,9 +836,6 @@ msgstr "Passarel·la per defecte" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Estat per defecte" @@ -1381,9 +1367,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." @@ -1444,8 +1427,8 @@ msgstr "IPv4" msgid "IPv4 Firewall" msgstr "Tallafocs IPv4" -msgid "IPv4 WAN Status" -msgstr "Estat WAN IPv4" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "Adreça IPv4" @@ -1495,15 +1478,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "Estat WAN IPv6" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "Adreça IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2082,9 +2062,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Candidats de servidor NTP" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nom" @@ -2262,12 +2239,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>." @@ -2728,9 +2699,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2813,9 +2781,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2841,14 +2806,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 "" @@ -2902,17 +2859,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" @@ -3006,9 +2952,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" @@ -3304,11 +3247,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 "" @@ -3468,15 +3406,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" @@ -3652,12 +3581,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" @@ -3689,10 +3612,6 @@ 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..." @@ -3716,12 +3635,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 "" @@ -3865,9 +3778,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 "" @@ -3943,6 +3853,12 @@ msgstr "sí" msgid "« Back" msgstr "« Enrere" +#~ msgid "IPv4 WAN Status" +#~ msgstr "Estat WAN IPv4" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "Estat WAN IPv6" + #~ msgid "Apply" #~ msgstr "Aplica" diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po index 924d0e6769..b9523193ef 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 "" @@ -408,6 +397,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -422,6 +414,9 @@ msgstr "" msgid "Associated Stations" msgstr "Připojení klienti" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -512,9 +507,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 " @@ -701,9 +693,6 @@ 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í" @@ -841,9 +830,6 @@ msgstr "Výchozí brána" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Výchozí stav" @@ -1381,9 +1367,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." @@ -1443,8 +1426,8 @@ msgstr "IPv4" msgid "IPv4 Firewall" msgstr "IPv4 firewall" -msgid "IPv4 WAN Status" -msgstr "Stav IPv4 WAN" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "IPv4 adresa" @@ -1494,15 +1477,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "Stav IPv6 WAN" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "IPv6 adresa" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2090,9 +2070,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Kandidáti NTP serveru" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Název" @@ -2269,12 +2246,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>." @@ -2752,9 +2723,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2838,9 +2806,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2865,14 +2830,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 "" @@ -2928,17 +2885,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" @@ -3035,9 +2981,6 @@ msgstr "Seřadit" msgid "Source" msgstr "Zdroj" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -3347,11 +3290,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 "" @@ -3508,15 +3446,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" @@ -3695,12 +3624,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" @@ -3732,10 +3655,6 @@ 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..." @@ -3759,12 +3678,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 "" @@ -3906,9 +3819,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 "" @@ -3984,6 +3894,12 @@ msgstr "ano" msgid "« Back" msgstr "« Zpět" +#~ msgid "IPv4 WAN Status" +#~ msgstr "Stav IPv4 WAN" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "Stav IPv6 WAN" + #~ msgid "Apply" #~ msgstr "Použít" diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index 4271d8e901..63cfaeaffd 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" @@ -415,6 +402,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -433,6 +423,9 @@ msgstr "" msgid "Associated Stations" msgstr "Assoziierte Clients" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "Berechtigungsgruppe" @@ -523,9 +516,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 " @@ -725,9 +715,6 @@ 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" @@ -865,9 +852,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" @@ -1420,9 +1404,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." @@ -1481,8 +1462,8 @@ msgstr "IPv4" msgid "IPv4 Firewall" msgstr "IPv4 Firewall" -msgid "IPv4 WAN Status" -msgstr "IPv4 WAN Status" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "IPv4 Adresse" @@ -1532,15 +1513,12 @@ msgstr "IPv6 Einstellungen" msgid "IPv6 ULA-Prefix" msgstr "IPv6 ULA-Präfix" -msgid "IPv6 WAN Status" -msgstr "IPv6 WAN Status" +msgid "IPv6 Upstream" +msgstr "" 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" @@ -2155,9 +2133,6 @@ msgstr "" msgid "NTP server candidates" msgstr "NTP Server Kandidaten" -msgid "NTP sync time-out" -msgstr "NTP Synchronisierungstimeout" - msgid "Name" msgstr "Name" @@ -2336,14 +2311,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>." @@ -2838,9 +2805,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" @@ -2932,9 +2896,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" @@ -2960,14 +2921,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 "" @@ -3023,19 +2976,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" @@ -3136,9 +3076,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" @@ -3467,13 +3404,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 "" @@ -3645,15 +3575,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" @@ -3835,12 +3756,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" @@ -3872,12 +3787,6 @@ 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..." @@ -3905,13 +3814,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" @@ -4053,9 +3955,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" @@ -4131,125 +4030,8 @@ msgstr "ja" msgid "« Back" msgstr "« Zurück" -#~ msgid "Apply" -#~ msgstr "Anwenden" - -#~ msgid "Applying changes" -#~ msgstr "Änderungen werden angewandt" - -#~ msgid "Configuration applied." -#~ msgstr "Konfiguration angewendet." - -#~ msgid "Save & Apply" -#~ msgstr "Speichern & Anwenden" - -#~ msgid "The following changes have been committed" -#~ msgstr "Die folgenden Änderungen wurden angewendet" - -#~ msgid "There are no pending changes to apply!" -#~ msgstr "Es gibt keine ausstehenen Änderungen anzuwenden!" - -#~ 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 "IPv4 WAN Status" +#~ msgstr "IPv4 WAN Status" -#~ msgid "VLAN Interface" -#~ msgstr "VLAN Schnittstelle" +#~ msgid "IPv6 WAN Status" +#~ msgstr "IPv6 WAN Status" diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po index 60d62f3dd6..16008ddc9c 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 "" @@ -415,6 +404,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -429,6 +421,9 @@ msgstr "" msgid "Associated Stations" msgstr "Συνδεδεμένοι Σταθμοί" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -520,9 +515,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 " @@ -710,9 +702,6 @@ msgstr "Συνδεδεμένος" msgid "Connection Limit" msgstr "Όριο Συνδέσεων" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Συνδέσεις" @@ -850,9 +839,6 @@ msgstr "Προεπιλεγμένη πύλη" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Προεπιλεγμένη κατάσταση" @@ -1395,9 +1381,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." @@ -1456,7 +1439,7 @@ msgstr "IPv4" msgid "IPv4 Firewall" msgstr "IPv4 Τείχος Προστασίας" -msgid "IPv4 WAN Status" +msgid "IPv4 Upstream" msgstr "" msgid "IPv4 address" @@ -1507,15 +1490,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "Κατάσταση IPv6 WAN" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "Διεύθυνση IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2098,9 +2078,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Όνομα" @@ -2278,12 +2255,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>." @@ -2745,9 +2716,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2830,9 +2798,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2859,14 +2824,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 "" @@ -2921,17 +2878,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 "Όνομα Υπηρεσίας" @@ -3024,9 +2970,6 @@ msgstr "Ταξινόμηση" msgid "Source" msgstr "Πηγή" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -3311,11 +3254,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 "" @@ -3467,15 +3405,6 @@ msgstr "Διεπαφή Τούνελ" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Ισχύς Εκπομπής" @@ -3648,12 +3577,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" @@ -3683,10 +3606,6 @@ 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 "" @@ -3710,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 "" @@ -3858,9 +3771,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 "" @@ -3936,6 +3846,9 @@ msgstr "ναι" msgid "« Back" msgstr "« Πίσω" +#~ msgid "IPv6 WAN Status" +#~ msgstr "Κατάσταση IPv6 WAN" + #~ msgid "Apply" #~ msgstr "Εφαρμογή" diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po index 5340e83eb4..7c5f56d837 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 "" @@ -406,6 +395,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -420,6 +412,9 @@ msgstr "" msgid "Associated Stations" msgstr "Associated Stations" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -510,9 +505,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 " @@ -697,9 +689,6 @@ msgstr "Connected" msgid "Connection Limit" msgstr "Connection Limit" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Connections" @@ -837,9 +826,6 @@ msgstr "Default gateway" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Default state" @@ -1370,9 +1356,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." @@ -1430,7 +1413,7 @@ msgstr "" msgid "IPv4 Firewall" msgstr "" -msgid "IPv4 WAN Status" +msgid "IPv4 Upstream" msgstr "" msgid "IPv4 address" @@ -1481,15 +1464,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" +msgid "IPv6 Upstream" msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2065,9 +2045,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Name" @@ -2245,12 +2222,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>." @@ -2711,9 +2682,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2796,9 +2764,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2824,14 +2789,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 "" @@ -2885,17 +2842,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 "" @@ -2988,9 +2934,6 @@ msgstr "" msgid "Source" msgstr "Source" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -3271,11 +3214,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 "" @@ -3424,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 "" @@ -3605,12 +3534,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" @@ -3642,10 +3565,6 @@ 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 "" @@ -3669,12 +3588,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 "" @@ -3815,9 +3728,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 "" diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index 66811e74ce..fabfded2c4 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 "" @@ -412,6 +401,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -426,6 +418,9 @@ msgstr "" msgid "Associated Stations" msgstr "Estaciones asociadas" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -516,9 +511,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 " @@ -706,9 +698,6 @@ 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" @@ -846,9 +835,6 @@ msgstr "Gateway por defecto" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Estado por defecto" @@ -1391,9 +1377,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." @@ -1452,8 +1435,8 @@ msgstr "IPv4" msgid "IPv4 Firewall" msgstr "Cortafuegos IPv4" -msgid "IPv4 WAN Status" -msgstr "Estado de la WAN IPv4" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "Dirección IPv4" @@ -1503,15 +1486,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "Estado de la WAN IPv6" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "Dirección IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2104,9 +2084,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Servidores NTP a consultar" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nombre" @@ -2283,12 +2260,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>." @@ -2765,9 +2736,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2850,9 +2818,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2878,14 +2843,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 "" @@ -2941,17 +2898,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" @@ -3048,9 +2994,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" @@ -3367,11 +3310,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 "" @@ -3533,15 +3471,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" @@ -3721,12 +3650,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" @@ -3758,10 +3681,6 @@ 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..." @@ -3785,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 "" @@ -3933,9 +3846,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 "" @@ -4011,6 +3921,12 @@ msgstr "sí" msgid "« Back" msgstr "« Volver" +#~ msgid "IPv4 WAN Status" +#~ msgstr "Estado de la WAN IPv4" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "Estado de la WAN IPv6" + #~ msgid "Apply" #~ msgstr "Aplicar" diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po index 17d1248518..148b39e011 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 "" @@ -418,6 +407,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -432,6 +424,9 @@ msgstr "" msgid "Associated Stations" msgstr "Équipements associés" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -522,9 +517,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 " @@ -713,9 +705,6 @@ msgstr "Connecté" msgid "Connection Limit" msgstr "Limite de connexion" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Connexions" @@ -853,9 +842,6 @@ msgstr "Passerelle par défaut" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "État par défaut" @@ -1402,9 +1388,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." @@ -1464,8 +1447,8 @@ msgstr "IPv4" msgid "IPv4 Firewall" msgstr "Pare-feu IPv4" -msgid "IPv4 WAN Status" -msgstr "État IPv4 du WAN" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "Adresse IPv4" @@ -1515,15 +1498,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "État IPv6 du WAN" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "Adresse IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2118,9 +2098,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Serveurs NTP candidats" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nom" @@ -2296,12 +2273,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>." @@ -2778,9 +2749,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2863,9 +2831,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2892,14 +2857,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 "" @@ -2955,17 +2912,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" @@ -3063,9 +3009,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é" @@ -3380,11 +3323,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 "" @@ -3551,15 +3489,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" @@ -3740,12 +3669,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" @@ -3777,10 +3700,6 @@ 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..." @@ -3804,12 +3723,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 "" @@ -3951,9 +3864,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 "" @@ -4029,6 +3939,12 @@ msgstr "oui" msgid "« Back" msgstr "« Retour" +#~ msgid "IPv4 WAN Status" +#~ msgstr "État IPv4 du WAN" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "État IPv6 du WAN" + #~ msgid "Apply" #~ msgstr "Appliquer" diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po index 793dc80715..9ac8e74162 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 "" @@ -407,6 +396,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -421,6 +413,9 @@ msgstr "" msgid "Associated Stations" msgstr "תחנות קשורות" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -511,9 +506,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 " @@ -690,9 +682,6 @@ msgstr "מחובר" msgid "Connection Limit" msgstr "מגבלת חיבורים" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "חיבורים" @@ -830,9 +819,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "" @@ -1355,9 +1341,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." @@ -1413,7 +1396,7 @@ msgstr "" msgid "IPv4 Firewall" msgstr "" -msgid "IPv4 WAN Status" +msgid "IPv4 Upstream" msgstr "" msgid "IPv4 address" @@ -1464,15 +1447,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" +msgid "IPv6 Upstream" msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2038,9 +2018,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "שם" @@ -2212,12 +2189,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>." @@ -2679,9 +2650,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2764,9 +2732,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2790,14 +2755,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 "" @@ -2851,17 +2808,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 "" @@ -2957,9 +2903,6 @@ msgstr "מיין" msgid "Source" msgstr "מקור" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -3234,11 +3177,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 "" @@ -3382,15 +3320,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "עוצמת שידור" @@ -3563,12 +3492,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" @@ -3598,10 +3521,6 @@ 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 "" @@ -3625,12 +3544,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 "" @@ -3766,9 +3679,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/hu/base.po b/modules/luci-base/po/hu/base.po index a900733ae7..42eb6bc907 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 "" @@ -411,6 +400,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -425,6 +417,9 @@ msgstr "" msgid "Associated Stations" msgstr "Kapcsolódó kliensek" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -515,9 +510,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 " @@ -708,9 +700,6 @@ 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" @@ -848,9 +837,6 @@ msgstr "Alapértelmezett átjáró" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Alapértelmezett állapot" @@ -1391,9 +1377,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." @@ -1453,8 +1436,8 @@ msgstr "IPv4" msgid "IPv4 Firewall" msgstr "IPv4 tűzfal" -msgid "IPv4 WAN Status" -msgstr "IPv4 WAN állapot" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "IPv4 cím" @@ -1504,15 +1487,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "IPv6 WAN állapot" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "IPv6 cím" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2107,9 +2087,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Kijelölt NTP kiszolgálók" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Név" @@ -2286,12 +2263,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>." @@ -2769,9 +2740,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2855,9 +2823,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2883,14 +2848,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 "" @@ -2946,17 +2903,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" @@ -3053,9 +2999,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." @@ -3369,11 +3312,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 "" @@ -3539,15 +3477,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" @@ -3727,12 +3656,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" @@ -3764,10 +3687,6 @@ 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..." @@ -3791,12 +3710,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 "" @@ -3940,9 +3853,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 "" @@ -4018,6 +3928,12 @@ msgstr "igen" msgid "« Back" msgstr "« Vissza" +#~ msgid "IPv4 WAN Status" +#~ msgstr "IPv4 WAN állapot" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "IPv6 WAN állapot" + #~ msgid "Apply" #~ msgstr "Alkalmaz" diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po index b90d9cf7b0..3f687f0977 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 "" @@ -420,6 +409,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -434,6 +426,9 @@ msgstr "" msgid "Associated Stations" msgstr "Dispositivi Wi-Fi connessi" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -524,9 +519,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 " @@ -713,9 +705,6 @@ msgstr "Connesso" msgid "Connection Limit" msgstr "Limite connessioni" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Connessioni" @@ -853,9 +842,6 @@ msgstr "Gateway predefinito" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Stato Predefinito" @@ -1395,9 +1381,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." @@ -1458,8 +1441,8 @@ msgstr "IPv4" msgid "IPv4 Firewall" msgstr "IPv4 Firewall" -msgid "IPv4 WAN Status" -msgstr "Stato WAN IPv4" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "Indirizzi IPv4" @@ -1509,15 +1492,12 @@ msgstr "Impostazioni IPv6" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "Stato WAN IPv6" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "Indirizzi IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2107,9 +2087,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Candidati server NTP" -msgid "NTP sync time-out" -msgstr "Sincronizzazione NTP scaduta" - msgid "Name" msgstr "Nome" @@ -2286,12 +2263,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>." @@ -2662,13 +2633,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?" @@ -2757,9 +2730,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" @@ -2842,9 +2812,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2870,14 +2837,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 "" @@ -2931,17 +2890,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 "" @@ -3038,9 +2986,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" @@ -3339,11 +3284,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 "" @@ -3496,15 +3436,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3686,12 +3617,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" @@ -3723,12 +3648,6 @@ 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 ..." @@ -3752,12 +3671,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 "" @@ -3902,9 +3815,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 "" @@ -3980,99 +3890,8 @@ msgstr "Sì" msgid "« Back" msgstr "« Indietro" -#~ msgid "Apply" -#~ msgstr "Applica" - -#~ msgid "Applying changes" -#~ msgstr "Applica modifiche" - -#~ msgid "Configuration applied." -#~ msgstr "Configurazione salvata." - -#~ msgid "Save & Apply" -#~ msgstr "Salva & Applica" - -#~ msgid "There are no pending changes to apply!" -#~ msgstr "Non ci sono cambiamenti pendenti da applicare!" - -#~ 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 "IPv4 WAN Status" +#~ msgstr "Stato WAN IPv4" -#~ msgid "VLAN Interface" -#~ msgstr "Interfaccia VLAN" +#~ msgid "IPv6 WAN Status" +#~ msgstr "Stato WAN IPv6" diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index c0cbb6b6d9..20c2449594 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-21 00:47+0900\n" +"PO-Revision-Date: 2018-06-01 02:42+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 "常にデフォルト ルーターとして通知する" @@ -412,6 +401,9 @@ msgstr "適用リクエストはステータス <code>%h</code> により失敗 msgid "Apply unchecked" msgstr "チェックなしの適用" +msgid "Architecture" +msgstr "アーキテクチャ" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -426,6 +418,9 @@ msgstr "" msgid "Associated Stations" msgstr "認証済み端末" +msgid "Associations" +msgstr "アソシエーション数" + msgid "Auth Group" msgstr "認証グループ" @@ -516,9 +511,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 " @@ -594,7 +586,7 @@ msgid "Changes applied." msgstr "変更が適用されました。" msgid "Changes have been reverted." -msgstr "" +msgstr "変更は取り消されました。" msgid "Changes the administrator password for accessing the device" msgstr "デバイスの管理者パスワードを変更します" @@ -716,9 +708,6 @@ msgstr "接続中" msgid "Connection Limit" msgstr "接続制限" -msgid "Connection to server fails when TLS cannot be used" -msgstr "TLSが使用できないとき、サーバーへの接続は失敗します。" - msgid "Connections" msgstr "ネットワーク接続" @@ -727,8 +716,8 @@ msgid "" "changes. You might need to reconnect if you modified network related " "settings such as the IP address or wireless security credentials." msgstr "" -"設定の変更を適用後、デバイスへのアクセスを回復できませんでした。もし IP アドレスや" -"無線のセキュリティ認証情報などのネットワーク関連の設定を変更した場合、" +"設定の変更を適用後、デバイスへのアクセスを回復できませんでした。もし IP アド" +"レスや無線のセキュリティ認証情報などのネットワーク関連の設定を変更した場合、" "再接続が必要かもしれません。" msgid "Country" @@ -863,9 +852,6 @@ msgstr "デフォルト ゲートウェイ" msgid "Default is stateless + stateful" msgstr "デフォルトは ステートレス + ステートフル です。" -msgid "Default route" -msgstr "デフォルト ルート" - msgid "Default state" msgstr "標準状態" @@ -1409,9 +1395,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." @@ -1469,8 +1452,8 @@ msgstr "IPv4" msgid "IPv4 Firewall" msgstr "IPv4 ファイアウォール" -msgid "IPv4 WAN Status" -msgstr "IPv4 WAN ステータス" +msgid "IPv4 Upstream" +msgstr "IPv4 アップストリーム" msgid "IPv4 address" msgstr "IPv4 アドレス" @@ -1520,15 +1503,12 @@ msgstr "IPv6 設定" msgid "IPv6 ULA-Prefix" msgstr "IPv6 ULA-プレフィクス" -msgid "IPv6 WAN Status" -msgstr "IPv6 WAN ステータス" +msgid "IPv6 Upstream" +msgstr "IPv6 アップストリーム" msgid "IPv6 address" msgstr "IPv6 アドレス" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2123,9 +2103,6 @@ msgstr "NT ドメイン" msgid "NTP server candidates" msgstr "NTPサーバー候補" -msgid "NTP sync time-out" -msgstr "NTP 同期タイムアウト" - msgid "Name" msgstr "名前" @@ -2305,12 +2282,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>." @@ -2793,9 +2764,6 @@ msgstr "IPv6-アドレスのリクエスト" msgid "Request IPv6-prefix of length" msgstr "リクエストするIPv6-プレフィクス長" -msgid "Require TLS" -msgstr "TLSが必要" - msgid "Required" msgstr "必須" @@ -2880,9 +2848,6 @@ msgstr "" msgid "Route type" msgstr "ルート タイプ" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "ルーター アドバタイズメント-サービス" @@ -2908,14 +2873,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" @@ -2971,17 +2928,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 "サービス名" @@ -3077,9 +3023,6 @@ msgstr "ソート" msgid "Source" msgstr "送信元" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "デバイスが接続するディレクトリを設定します" @@ -3295,8 +3238,8 @@ msgstr "" "す。これは、安全上の理由によりロールバックされる設定に起因するものです。それ" "でも設定の変更が正しいと思う場合は、チェックなしの変更の適用を行ってくださ" "い。もしくは、再度適用を試行する前にこの警告を除去して設定内容の編集を行う" -"か、現在動作している設定状況を維持するために未適用の変更を取り消してくだ" -"さい。" +"か、現在動作している設定状況を維持するために未適用の変更を取り消してくださ" +"い。" msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." @@ -3388,11 +3331,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 "" @@ -3560,15 +3498,6 @@ msgstr "トンネルインターフェース" msgid "Tunnel Link" msgstr "トンネルリンク" -msgid "Tunnel broker protocol" -msgstr "トンネルブローカー プロトコル" - -msgid "Tunnel setup server" -msgstr "トンネルセットアップ サーバー" - -msgid "Tunnel type" -msgstr "トンネルタイプ" - msgid "Tx-Power" msgstr "送信電力" @@ -3749,12 +3678,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 "確認" @@ -3787,10 +3710,6 @@ 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 "変更を適用中です..." @@ -3814,12 +3733,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 "帯域幅" @@ -3964,9 +3877,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 7f1bf22e03..d7b33cf0d7 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 "" @@ -400,6 +389,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -414,6 +406,9 @@ msgstr "" msgid "Associated Stations" msgstr "연결된 station 들" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -504,9 +499,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 " @@ -693,9 +685,6 @@ msgstr "연결 시간" msgid "Connection Limit" msgstr "" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "연결" @@ -835,9 +824,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "기본 상태" @@ -1368,9 +1354,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,8 +1412,8 @@ msgstr "" msgid "IPv4 Firewall" msgstr "IPv4 방화벽" -msgid "IPv4 WAN Status" -msgstr "IPv4 WAN 상태" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "IPv4 주소" @@ -1480,13 +1463,10 @@ msgstr "IPv6 설정" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "IPv6 WAN 상태" - -msgid "IPv6 address" +msgid "IPv6 Upstream" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" +msgid "IPv6 address" msgstr "" msgid "IPv6 assignment hint" @@ -2056,9 +2036,6 @@ msgstr "" msgid "NTP server candidates" msgstr "NTP 서버 목록" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "이름" @@ -2236,12 +2213,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>." @@ -2706,9 +2677,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2791,9 +2759,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2819,14 +2784,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 "" @@ -2880,17 +2837,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 "" @@ -2983,9 +2929,6 @@ msgstr "순서" msgid "Source" msgstr "" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -3269,11 +3212,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 "" @@ -3426,15 +3364,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3615,12 +3544,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 "" @@ -3650,10 +3573,6 @@ 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 "변경 사항이 적용되기를 기다리는 중입니다..." @@ -3677,12 +3596,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 "" @@ -3824,9 +3737,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 "" @@ -3902,6 +3812,12 @@ msgstr "" msgid "« Back" msgstr "" +#~ msgid "IPv4 WAN Status" +#~ msgstr "IPv4 WAN 상태" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "IPv6 WAN 상태" + #~ msgid "Apply" #~ msgstr "적용" diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index cadaf9b3b2..be6d707279 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 "" @@ -395,6 +384,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -409,6 +401,9 @@ msgstr "" msgid "Associated Stations" msgstr "Associated Stesen" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -499,9 +494,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 " @@ -675,9 +667,6 @@ msgstr "" msgid "Connection Limit" msgstr "Sambungan Batas" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "" @@ -813,9 +802,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "" @@ -1340,9 +1326,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." @@ -1400,7 +1383,7 @@ msgstr "" msgid "IPv4 Firewall" msgstr "" -msgid "IPv4 WAN Status" +msgid "IPv4 Upstream" msgstr "" msgid "IPv4 address" @@ -1451,15 +1434,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" +msgid "IPv6 Upstream" msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2036,9 +2016,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nama" @@ -2215,12 +2192,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>." @@ -2680,9 +2651,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2765,9 +2733,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2793,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 "" @@ -2854,17 +2811,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 "" @@ -2957,9 +2903,6 @@ msgstr "" msgid "Source" msgstr "Sumber" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -3242,11 +3185,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 "" @@ -3397,15 +3335,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3578,12 +3507,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" @@ -3615,10 +3538,6 @@ 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 "" @@ -3642,12 +3561,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 "" @@ -3783,9 +3696,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 "" diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po index 600d007247..7212e4b80e 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 "" @@ -404,6 +393,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -418,6 +410,9 @@ msgstr "" msgid "Associated Stations" msgstr "Tilkoblede Klienter" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -508,9 +503,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 " @@ -697,9 +689,6 @@ msgstr "Tilkoblet" msgid "Connection Limit" msgstr "Tilkoblingsgrense (antall)" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Tilkoblinger" @@ -837,9 +826,6 @@ msgstr "Standard gateway" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Standard tilstand" @@ -1377,9 +1363,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." @@ -1439,8 +1422,8 @@ msgstr "IPv4" msgid "IPv4 Firewall" msgstr "IPv4 Brannmur" -msgid "IPv4 WAN Status" -msgstr "IPv4 WAN Status" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "IPv4 adresse" @@ -1490,15 +1473,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "IPv6 WAN Status" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "IPv6 adresse" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2081,9 +2061,6 @@ msgstr "" msgid "NTP server candidates" msgstr "NTP server kandidater" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Navn" @@ -2261,12 +2238,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>." @@ -2743,9 +2714,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2828,9 +2796,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2856,14 +2821,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 "" @@ -2919,17 +2876,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" @@ -3026,9 +2972,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)" @@ -3338,11 +3281,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 "" @@ -3504,15 +3442,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" @@ -3692,12 +3621,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" @@ -3729,10 +3652,6 @@ 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..." @@ -3756,12 +3675,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 +3818,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 "" @@ -3983,6 +3893,12 @@ msgstr "ja" msgid "« Back" msgstr "« Tilbake" +#~ msgid "IPv4 WAN Status" +#~ msgstr "IPv4 WAN Status" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "IPv6 WAN Status" + #~ msgid "Apply" #~ msgstr "Bruk" diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index 390e489e29..bc5734bd8a 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,14 @@ 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 "Architecture" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -430,6 +424,9 @@ msgstr "" msgid "Associated Stations" msgstr "Połączone stacje" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -521,9 +518,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 +590,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 +680,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 +710,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 +848,6 @@ msgstr "Brama domyślna" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Stan domyślny" @@ -881,6 +890,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 +927,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 +1052,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 +1119,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 +1200,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Plik" @@ -1378,9 +1399,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." @@ -1443,8 +1461,8 @@ msgstr "IPv4" msgid "IPv4 Firewall" msgstr "Firewall IPv4" -msgid "IPv4 WAN Status" -msgstr "Status IPv4 WAN" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "Adres IPv4" @@ -1494,15 +1512,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "Status WAN IPv6" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "Adres IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1623,7 +1638,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 +1974,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 +2112,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Lista serwerów NTP" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nazwa" @@ -2222,6 +2235,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "Zwłoka wyłączenia" @@ -2272,12 +2288,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 +2765,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 +2823,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 +2847,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2860,14 +2873,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 +2900,6 @@ msgstr "Zapisz" msgid "Save & Apply" msgstr "Zapisz i zastosuj" -msgid "Save & Apply" -msgstr "Zapisz i zastosuj" - msgid "Scan" msgstr "Skanuj" @@ -2927,17 +2929,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 +2942,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 +3027,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 +3068,9 @@ msgstr "Uruchomienie" msgid "Start priority" msgstr "Priorytet uruchomienia" +msgid "Starting configuration apply…" +msgstr "" + msgid "Startup" msgstr "Autostart" @@ -3247,6 +3238,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 +3274,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 +3344,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 +3353,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 +3464,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 +3509,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 +3566,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 +3690,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 +3718,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 +3727,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 +3737,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 +3812,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ę" +"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". +"jak Firefox, Opera czy Safari." msgid "any" msgstr "dowolny" @@ -3919,9 +3892,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 +3968,8 @@ 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 "IPv4 WAN Status" +#~ msgstr "Status IPv4 WAN" -#~ msgid "VLAN Interface" -#~ msgstr "Interfejs VLAN" +#~ msgid "IPv6 WAN Status" +#~ msgstr "Status WAN IPv6" diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po index bbfb8cf8d9..eeb7208c0b 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" @@ -440,6 +425,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -458,6 +446,9 @@ msgstr "" msgid "Associated Stations" msgstr "Estações associadas" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "Grupo de Autenticação" @@ -552,9 +543,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 " @@ -748,9 +736,6 @@ 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" @@ -890,9 +875,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" @@ -1452,9 +1434,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." @@ -1520,8 +1499,8 @@ msgstr "IPv4" msgid "IPv4 Firewall" msgstr "Firewall para IPv4" -msgid "IPv4 WAN Status" -msgstr "Estado IPv4 da WAN" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "Endereço IPv4" @@ -1573,15 +1552,12 @@ msgstr "" "Prefixo <abbr title=\"Unique Local Address/Endereço Local Único\">ULA</abbr> " "IPv6" -msgid "IPv6 WAN Status" -msgstr "Estado IPv6 da WAN" +msgid "IPv6 Upstream" +msgstr "" 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" @@ -2205,9 +2181,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" @@ -2388,13 +2361,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>." @@ -2885,9 +2851,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" @@ -2976,9 +2939,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" @@ -3005,16 +2965,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" @@ -3070,19 +3020,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" @@ -3180,9 +3117,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" @@ -3506,13 +3440,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 "" @@ -3683,15 +3610,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" @@ -3878,12 +3796,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" @@ -3915,12 +3827,6 @@ 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..." @@ -3944,12 +3850,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" @@ -4098,9 +3998,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" @@ -4177,134 +4074,8 @@ msgstr "sim" msgid "« Back" msgstr "« Voltar" -#~ msgid "Apply" -#~ msgstr "Aplicar" - -#~ msgid "Applying changes" -#~ msgstr "Aplicar as alterações" - -#~ msgid "Configuration applied." -#~ msgstr "Configuração aplicada." - -#~ msgid "Save & Apply" -#~ msgstr "Save & Aplicar" - -#~ msgid "The following changes have been committed" -#~ msgstr "As seguintes mudanças foram aplicadas" - -#~ msgid "There are no pending changes to apply!" -#~ msgstr "Não existem modificações pendentes para aplicar!" - -#~ 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 "IPv4 WAN Status" +#~ msgstr "Estado IPv4 da WAN" -#~ msgid "VLAN Interface" -#~ msgstr "Interface VLAN" +#~ msgid "IPv6 WAN Status" +#~ msgstr "Estado IPv6 da WAN" diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po index 7e191809b8..96efbe2721 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 "" @@ -417,6 +406,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -431,6 +423,9 @@ msgstr "" msgid "Associated Stations" msgstr "Estações Associadas" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -521,9 +516,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 " @@ -710,9 +702,6 @@ 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" @@ -850,9 +839,6 @@ msgstr "Gateway predefinido" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Estado predefinido" @@ -1395,9 +1381,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." @@ -1460,8 +1443,8 @@ msgstr "IPv4" msgid "IPv4 Firewall" msgstr "Firewall IPv4" -msgid "IPv4 WAN Status" -msgstr "Estado WAN IPv4" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "Endereço IPv4" @@ -1511,15 +1494,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "Estado WAN IPv6" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "Endereço IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2105,9 +2085,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Candidatos a servidor NTP" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nome" @@ -2285,12 +2262,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>." @@ -2762,9 +2733,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2847,9 +2815,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2876,14 +2841,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 "" @@ -2937,17 +2894,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" @@ -3041,9 +2987,6 @@ msgstr "Ordenar" msgid "Source" msgstr "Origem" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -3345,11 +3288,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 "" @@ -3505,15 +3443,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" @@ -3686,12 +3615,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" @@ -3723,10 +3646,6 @@ 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..." @@ -3750,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 "" @@ -3901,9 +3814,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 "" @@ -3979,6 +3889,12 @@ msgstr "sim" msgid "« Back" msgstr "« Voltar" +#~ msgid "IPv4 WAN Status" +#~ msgstr "Estado WAN IPv4" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "Estado WAN IPv6" + #~ msgid "Apply" #~ msgstr "Aplicar" diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po index a7d45e6f6d..058c3e8db1 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 "" @@ -403,6 +392,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -417,6 +409,9 @@ msgstr "" msgid "Associated Stations" msgstr "Statiile asociate" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -507,9 +502,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 " @@ -685,9 +677,6 @@ msgstr "Conectat" msgid "Connection Limit" msgstr "Limita de conexiune" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Conexiuni" @@ -823,9 +812,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Stare implicita" @@ -1347,9 +1333,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." @@ -1407,8 +1390,8 @@ msgstr "IPv4" msgid "IPv4 Firewall" msgstr "Firewall IPv4" -msgid "IPv4 WAN Status" -msgstr "Statusul IPv4 pe WAN" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "Adresa IPv4" @@ -1458,15 +1441,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "Statusul IPv6 pe WAN" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "Adresa IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2035,9 +2015,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nume" @@ -2209,12 +2186,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>." @@ -2675,9 +2646,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2760,9 +2728,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2786,14 +2751,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 "" @@ -2847,17 +2804,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" @@ -2951,9 +2897,6 @@ msgstr "" msgid "Source" msgstr "Sursa" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -3224,11 +3167,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 "" @@ -3373,15 +3311,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" @@ -3554,12 +3483,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" @@ -3591,10 +3514,6 @@ 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 "" @@ -3618,12 +3537,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 "" @@ -3759,9 +3672,6 @@ msgstr "" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" @@ -3837,6 +3747,12 @@ msgstr "da" msgid "« Back" msgstr "« Inapoi" +#~ msgid "IPv4 WAN Status" +#~ msgstr "Statusul IPv4 pe WAN" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "Statusul IPv6 pe WAN" + #~ msgid "Apply" #~ msgstr "Aplica" diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index 91aacdeb49..d43cc266cc 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 "Объявлять всегда, как дефолтный маршрутизатор" @@ -423,6 +410,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -441,6 +431,9 @@ msgstr "" msgid "Associated Stations" msgstr "Подключенные клиенты" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "Группа аутентификации" @@ -537,9 +530,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 " @@ -739,9 +729,6 @@ msgstr "Подключен" msgid "Connection Limit" msgstr "Ограничение соединений" -msgid "Connection to server fails when TLS cannot be used" -msgstr "Связь с сервером прерывается, когда TLS не может быть использован" - msgid "Connections" msgstr "Соединения" @@ -881,9 +868,6 @@ msgstr "Шлюз по умолчанию" msgid "Default is stateless + stateful" msgstr "Значение по умолчанию - 'stateless + stateful'." -msgid "Default route" -msgstr "Маршрут по умолчанию" - msgid "Default state" msgstr "Начальное состояние" @@ -1431,9 +1415,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." @@ -1493,8 +1474,8 @@ msgstr "IPv4" msgid "IPv4 Firewall" msgstr "Межсетевой экран IPv4" -msgid "IPv4 WAN Status" -msgstr "Состояние IPv4 WAN" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "IPv4-адрес" @@ -1544,16 +1525,12 @@ msgstr "IPv6 Настройки" msgid "IPv6 ULA-Prefix" msgstr "IPv6 ULA-Prefix" -msgid "IPv6 WAN Status" -msgstr "Состояние IPv6 WAN" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "IPv6-адрес" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" -"IPv6-адрес, делегированный локальной конечной точке туннеля (необязательно)." - msgid "IPv6 assignment hint" msgstr "IPv6 подсказка присвоения" @@ -2163,9 +2140,6 @@ msgstr "NT домен" msgid "NTP server candidates" msgstr "Список NTP-серверов" -msgid "NTP sync time-out" -msgstr "NTP синхронизация времени ожидания" - msgid "Name" msgstr "Имя" @@ -2343,16 +2317,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>." @@ -2844,9 +2808,6 @@ msgstr "Запрос IPv6 адреса" msgid "Request IPv6-prefix of length" msgstr "Запрос IPv6 префикс длины" -msgid "Require TLS" -msgstr "Требовать TLS" - msgid "Required" msgstr "Требовать" @@ -2937,9 +2898,6 @@ msgstr "Маршрут разрешенный для IP адресов" msgid "Route type" msgstr "Тип маршрута" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "Префикс маршрутизации IPv6 для интерфейсов внутренней сети" - msgid "Router Advertisement-Service" msgstr "Доступные<br />режимы работы" @@ -2965,16 +2923,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" @@ -3030,19 +2978,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 "Имя службы" @@ -3139,9 +3074,6 @@ msgstr "Сортировка" msgid "Source" msgstr "Источник" -msgid "Source routing" -msgstr "маршрутизация от источника" - msgid "Specifies the directory the device is attached to" msgstr "Папка, к которой монтируется раздел устройства." @@ -3458,13 +3390,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 "" @@ -3634,15 +3559,6 @@ msgstr "Интерфейс туннеля" msgid "Tunnel Link" msgstr "Ссылка на туннель" -msgid "Tunnel broker protocol" -msgstr "Протокол посредника туннеля" - -msgid "Tunnel setup server" -msgstr "Сервер настройки туннеля" - -msgid "Tunnel type" -msgstr "Тип туннеля" - msgid "Tx-Power" msgstr "Мощность передатчика" @@ -3828,12 +3744,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 "Проверить" @@ -3865,12 +3775,6 @@ 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 "Ожидание применения изменений..." @@ -3896,12 +3800,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 "Ширина" @@ -4048,9 +3946,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 "минут(ы)" @@ -4126,20 +4021,8 @@ msgstr "да" msgid "« Back" msgstr "« Назад" -#~ msgid "Apply" -#~ msgstr "Принять" - -#~ msgid "Applying changes" -#~ msgstr "Применение изменений" - -#~ msgid "Configuration applied." -#~ msgstr "Изменение настроек config файлов." - -#~ msgid "Save & Apply" -#~ msgstr "Сохранить и применить" - -#~ msgid "The following changes have been committed" -#~ msgstr "Ваши настройки были применены." +#~ msgid "IPv4 WAN Status" +#~ msgstr "Состояние IPv4 WAN" -#~ msgid "There are no pending changes to apply!" -#~ msgstr "Нет изменений, которые можно применить!" +#~ msgid "IPv6 WAN Status" +#~ msgstr "Состояние IPv6 WAN" diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po index 7f3d249e15..36d7bd6325 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 "" @@ -389,6 +378,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -403,6 +395,9 @@ msgstr "" msgid "Associated Stations" msgstr "" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -493,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 " @@ -668,9 +660,6 @@ msgstr "" msgid "Connection Limit" msgstr "" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "" @@ -806,9 +795,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "" @@ -1327,9 +1313,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." @@ -1385,7 +1368,7 @@ msgstr "" msgid "IPv4 Firewall" msgstr "" -msgid "IPv4 WAN Status" +msgid "IPv4 Upstream" msgstr "" msgid "IPv4 address" @@ -1436,15 +1419,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" +msgid "IPv6 Upstream" msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2010,9 +1990,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "" @@ -2184,12 +2161,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>." @@ -2648,9 +2619,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2733,9 +2701,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2759,14 +2724,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 "" @@ -2820,17 +2777,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 "" @@ -2923,9 +2869,6 @@ msgstr "" msgid "Source" msgstr "" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -3196,11 +3139,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 "" @@ -3343,15 +3281,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3524,12 +3453,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" @@ -3559,10 +3482,6 @@ 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 "" @@ -3586,12 +3505,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 "" @@ -3727,9 +3640,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 770fca2e53..be886c1df2 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 "" @@ -400,6 +389,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -414,6 +406,9 @@ msgstr "" msgid "Associated Stations" msgstr "Associerade stationer" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "Autentiseringsgrupp" @@ -504,9 +499,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 " @@ -682,9 +674,6 @@ msgstr "Ansluten" msgid "Connection Limit" msgstr "Anslutningsgräns" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Anslutningar" @@ -820,9 +809,6 @@ msgstr "Standard gateway" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "Standardrutt" - msgid "Default state" msgstr "" @@ -1347,9 +1333,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." @@ -1405,7 +1388,7 @@ msgstr "IPv4" msgid "IPv4 Firewall" msgstr "IPv4-brandvägg" -msgid "IPv4 WAN Status" +msgid "IPv4 Upstream" msgstr "" msgid "IPv4 address" @@ -1456,15 +1439,12 @@ msgstr "IPv6-inställningar" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" +msgid "IPv6 Upstream" msgstr "" msgid "IPv6 address" msgstr "IPv6-adress" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2031,9 +2011,6 @@ msgstr "NT-domän" msgid "NTP server candidates" msgstr "NTP-serverkandidater" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Namn" @@ -2205,12 +2182,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>." @@ -2671,9 +2642,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "Kräv TLS" - msgid "Required" msgstr "Krävs!" @@ -2756,9 +2724,6 @@ msgstr "" msgid "Route type" msgstr "Typ av rutt" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2782,14 +2747,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" @@ -2843,17 +2800,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" @@ -2946,9 +2892,6 @@ msgstr "Sortera" msgid "Source" msgstr "Källa" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -3219,11 +3162,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 "" @@ -3370,15 +3308,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 "" @@ -3551,12 +3480,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" @@ -3586,10 +3509,6 @@ 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..." @@ -3614,12 +3533,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" @@ -3760,9 +3673,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" @@ -3837,27 +3747,3 @@ msgstr "ja" msgid "« Back" msgstr "« Bakåt" - -#~ msgid "Apply" -#~ msgstr "Verkställ" - -#~ msgid "Applying changes" -#~ msgstr "Verkställer ändringar" - -#~ msgid "Configuration applied." -#~ msgstr "Konfigurationen tillämpades" - -#~ msgid "Save & Apply" -#~ msgstr "Spara & Verkställ" - -#~ msgid "The following changes have been committed" -#~ msgstr "Följande ändringar har skickats in" - -#~ msgid "There are no pending changes to apply!" -#~ msgstr "Det finns inga pendlande ändringar att verkställa!" - -#~ 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 ebbe6c6dcf..e39fd962ef 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 "" @@ -382,6 +371,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -396,6 +388,9 @@ msgstr "" msgid "Associated Stations" msgstr "" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -486,9 +481,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 " @@ -661,9 +653,6 @@ msgstr "" msgid "Connection Limit" msgstr "" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "" @@ -799,9 +788,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "" @@ -1320,9 +1306,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." @@ -1378,7 +1361,7 @@ msgstr "" msgid "IPv4 Firewall" msgstr "" -msgid "IPv4 WAN Status" +msgid "IPv4 Upstream" msgstr "" msgid "IPv4 address" @@ -1429,15 +1412,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" +msgid "IPv6 Upstream" msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2003,9 +1983,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "" @@ -2177,12 +2154,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>." @@ -2641,9 +2612,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2726,9 +2694,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2752,14 +2717,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 "" @@ -2813,17 +2770,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 "" @@ -2916,9 +2862,6 @@ msgstr "" msgid "Source" msgstr "" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -3189,11 +3132,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 "" @@ -3336,15 +3274,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3517,12 +3446,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" @@ -3552,10 +3475,6 @@ 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 "" @@ -3579,12 +3498,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 "" @@ -3720,9 +3633,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 aba91126d6..5f8fb29c57 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 "" @@ -402,6 +391,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -416,6 +408,9 @@ msgstr "" msgid "Associated Stations" msgstr "" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -435,7 +430,7 @@ msgid "Auto Refresh" msgstr "Otomatik Yenileme" msgid "Automatic" -msgstr "" +msgstr "Otomatik" msgid "Automatic Homenet (HNCP)" msgstr "" @@ -474,7 +469,7 @@ msgid "BR / DMR / AFTR" msgstr "" msgid "BSSID" -msgstr "" +msgstr "BSSID" msgid "Back" msgstr "Geri" @@ -506,9 +501,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,19 +552,19 @@ 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 "" @@ -584,7 +576,7 @@ msgid "Changes the administrator password for accessing the device" msgstr "" msgid "Channel" -msgstr "" +msgstr "Kanal" msgid "" "Channel %d is not available in the %s regulatory domain and has been auto-" @@ -681,9 +673,6 @@ msgstr "" msgid "Connection Limit" msgstr "" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "" @@ -819,9 +808,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "" @@ -1340,9 +1326,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." @@ -1398,7 +1381,7 @@ msgstr "" msgid "IPv4 Firewall" msgstr "" -msgid "IPv4 WAN Status" +msgid "IPv4 Upstream" msgstr "" msgid "IPv4 address" @@ -1449,15 +1432,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" +msgid "IPv6 Upstream" msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1847,10 +1827,10 @@ msgid "Logging" msgstr "" msgid "Login" -msgstr "" +msgstr "Oturum Aç" msgid "Logout" -msgstr "" +msgstr "Oturumu Kapat" msgid "Loss of Signal Seconds (LOSS)" msgstr "" @@ -2023,9 +2003,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "" @@ -2197,12 +2174,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>." @@ -2661,9 +2632,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2693,13 +2661,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 "" @@ -2708,22 +2676,22 @@ 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 "" +msgstr "Dönmek" msgid "Revert changes" -msgstr "" +msgstr "Değişiklikleri geri al" msgid "Revert request failed with status <code>%h</code>" msgstr "" @@ -2732,7 +2700,7 @@ msgid "Reverting configuration…" msgstr "" msgid "Root" -msgstr "" +msgstr "Kök" msgid "Root directory for files served via TFTP" msgstr "" @@ -2744,19 +2712,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 " @@ -2764,60 +2729,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 "" +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 "" @@ -2833,17 +2790,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 "" @@ -2851,7 +2797,7 @@ msgid "Service Type" msgstr "" msgid "Services" -msgstr "" +msgstr "Servisler" msgid "" "Set interface properties regardless of the link carrier (If set, carrier " @@ -2880,25 +2826,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 "" @@ -2910,7 +2856,7 @@ msgid "Slot time" msgstr "" msgid "Software" -msgstr "" +msgstr "Yazılım" msgid "Software VLAN" msgstr "" @@ -2931,13 +2877,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 "" @@ -2972,7 +2915,7 @@ msgid "Specify the secret encryption key here." msgstr "" msgid "Start" -msgstr "" +msgstr "Başlat" msgid "Start priority" msgstr "" @@ -3005,16 +2948,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 "" @@ -3057,7 +3000,7 @@ msgid "Synchronizing..." msgstr "" msgid "System" -msgstr "" +msgstr "Sistem" msgid "System Log" msgstr "" @@ -3209,11 +3152,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 "" @@ -3356,15 +3294,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3426,10 +3355,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 "" @@ -3462,16 +3391,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</" @@ -3482,7 +3411,7 @@ msgid "" msgstr "" msgid "Used" -msgstr "" +msgstr "Kullanılmış" msgid "Used Key Slot" msgstr "" @@ -3499,7 +3428,7 @@ msgid "User key (PEM encoded)" msgstr "" msgid "Username" -msgstr "" +msgstr "Kullanıcı adı" msgid "VC-Mux" msgstr "" @@ -3532,22 +3461,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 "" @@ -3572,10 +3495,6 @@ 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 "" @@ -3589,7 +3508,7 @@ msgid "Waiting for device..." msgstr "" msgid "Warning" -msgstr "" +msgstr "Uyarı" msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "" @@ -3599,20 +3518,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 "" @@ -3675,28 +3588,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ş" @@ -3710,19 +3623,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" @@ -3731,34 +3644,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ı" @@ -3767,31 +3677,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" @@ -3800,7 +3710,7 @@ msgid "time units (TUs / 1.024 ms) [1000-65535]" msgstr "" msgid "unknown" -msgstr "" +msgstr "bilinmeyen" msgid "unlimited" msgstr "sınırsız" diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po index e86bd81a8e..ce77675000 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 "" @@ -426,6 +415,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -440,6 +432,9 @@ msgstr "" msgid "Associated Stations" msgstr "Приєднані станції" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -530,9 +525,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 " @@ -719,9 +711,6 @@ msgstr "Підключений" msgid "Connection Limit" msgstr "Гранична кількість підключень" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "Підключення" @@ -859,9 +848,6 @@ msgstr "Типовий шлюз" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Типовий стан" @@ -1403,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." @@ -1467,8 +1450,8 @@ msgstr "IPv4" msgid "IPv4 Firewall" msgstr "Брандмауер IPv4" -msgid "IPv4 WAN Status" -msgstr "Статус IPv4 WAN" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "Адреса IPv4" @@ -1518,15 +1501,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "Статус IPv6 WAN" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "Адреса IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2119,9 +2099,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Кандидати для синхронізації NTP-сервера" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Ім'я" @@ -2299,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>." @@ -2786,9 +2757,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2871,9 +2839,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2899,14 +2864,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 "" @@ -2962,17 +2919,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 "Назва (ім'я) сервісу" @@ -3069,9 +3015,6 @@ msgstr "Сортування" msgid "Source" msgstr "Джерело" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "Визначає каталог, до якого приєднаний пристрій" @@ -3386,11 +3329,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 "" @@ -3556,15 +3494,6 @@ msgstr "Інтерфейс тунелю" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Потужність передавача" @@ -3744,12 +3673,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 "Перевірте" @@ -3781,10 +3704,6 @@ 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 "Очікуємо, доки зміни наберуть чинності..." @@ -3808,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 "" @@ -3959,9 +3872,6 @@ msgstr "" "Локальний <abbr title=\"Domain Name System — система доменних імен\">DNS</" "abbr>-файл" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "" @@ -4037,6 +3947,12 @@ msgstr "так" msgid "« Back" msgstr "« Назад" +#~ msgid "IPv4 WAN Status" +#~ msgstr "Статус IPv4 WAN" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "Статус IPv6 WAN" + #~ msgid "Apply" #~ msgstr "Застосувати" diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po index 8dacc12e65..c70b740ddb 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 "" @@ -396,6 +385,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -410,6 +402,9 @@ msgstr "" msgid "Associated Stations" msgstr "" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -500,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 " @@ -675,9 +667,6 @@ msgstr "" msgid "Connection Limit" msgstr "Giới hạn kết nối" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "" @@ -815,9 +804,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "" @@ -1345,9 +1331,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." @@ -1405,7 +1388,7 @@ msgstr "" msgid "IPv4 Firewall" msgstr "" -msgid "IPv4 WAN Status" +msgid "IPv4 Upstream" msgstr "" msgid "IPv4 address" @@ -1456,15 +1439,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" +msgid "IPv6 Upstream" msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2040,9 +2020,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Tên" @@ -2220,12 +2197,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>." @@ -2686,9 +2657,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2771,9 +2739,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2799,14 +2764,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 "" @@ -2860,17 +2817,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 "" @@ -2963,9 +2909,6 @@ msgstr "" msgid "Source" msgstr "Nguồn" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -3244,11 +3187,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 "" @@ -3398,15 +3336,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3579,12 +3508,6 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" @@ -3614,10 +3537,6 @@ 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 "" @@ -3641,12 +3560,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 "" @@ -3788,9 +3701,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 "" diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po index 8399e947b8..f588adcfa7 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 "总是通告默认路由" @@ -396,6 +383,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "将每个公共 IPv6 前缀的给定长度部分分配给此接口" @@ -410,6 +400,9 @@ msgstr "将此十六进制子 ID 前缀分配给此接口" msgid "Associated Stations" msgstr "已连接站点" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "认证组" @@ -500,9 +493,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 " @@ -684,9 +674,6 @@ msgstr "已连接" msgid "Connection Limit" msgstr "连接数限制" -msgid "Connection to server fails when TLS cannot be used" -msgstr "当 TLS 不可用时，与服务器连接失败" - msgid "Connections" msgstr "连接" @@ -823,9 +810,6 @@ msgstr "默认网关" msgid "Default is stateless + stateful" msgstr "默认是无状态的 + 有状态的" -msgid "Default route" -msgstr "默认路由" - msgid "Default state" msgstr "默认状态" @@ -1357,9 +1341,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." @@ -1415,8 +1396,8 @@ msgstr "IPv4" msgid "IPv4 Firewall" msgstr "IPv4 防火墙" -msgid "IPv4 WAN Status" -msgstr "IPv4 WAN 状态" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "IPv4 地址" @@ -1466,15 +1447,12 @@ msgstr "IPv6 设置" msgid "IPv6 ULA-Prefix" msgstr "IPv6 ULA 前缀" -msgid "IPv6 WAN Status" -msgstr "IPv6 WAN 状态" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "IPv6 地址" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "绑定到隧道本端的 IPv6 地址（可选）" - msgid "IPv6 assignment hint" msgstr "IPv6 分配提示" @@ -2056,9 +2034,6 @@ msgstr "NT 域" msgid "NTP server candidates" msgstr "候选 NTP 服务器" -msgid "NTP sync time-out" -msgstr "NTP 同步超时" - msgid "Name" msgstr "名称" @@ -2234,12 +2209,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>." @@ -2713,9 +2682,6 @@ msgstr "请求 IPv6 地址" msgid "Request IPv6-prefix of length" msgstr "请求指定长度的 IPv6 前缀" -msgid "Require TLS" -msgstr "必须使用 TLS" - msgid "Required" msgstr "必须" @@ -2802,9 +2768,6 @@ msgstr "路由允许的 IP" msgid "Route type" msgstr "路由类型" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "下行接口的路由 IPv6 前缀" - msgid "Router Advertisement-Service" msgstr "路由通告服务" @@ -2828,14 +2791,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" @@ -2889,17 +2844,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 "服务名" @@ -2996,9 +2940,6 @@ msgstr "排序" msgid "Source" msgstr "源地址" -msgid "Source routing" -msgstr "源路由" - msgid "Specifies the directory the device is attached to" msgstr "指定设备的挂载目录" @@ -3286,11 +3227,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 "不支持所上传的映像文件格式，请选择适合当前平台的通用映像文件。" @@ -3439,15 +3375,6 @@ msgstr "隧道接口" msgid "Tunnel Link" msgstr "隧道链接" -msgid "Tunnel broker protocol" -msgstr "隧道协议" - -msgid "Tunnel setup server" -msgstr "隧道配置服务器" - -msgid "Tunnel type" -msgstr "隧道类型" - msgid "Tx-Power" msgstr "传输功率" @@ -3627,12 +3554,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 "验证" @@ -3664,10 +3585,6 @@ 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 "正在应用更改..." @@ -3691,12 +3608,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 "频宽" @@ -3838,9 +3749,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 "分钟" @@ -3916,137 +3824,8 @@ 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 "动作" - -#~ 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 "IPv4 WAN Status" +#~ msgstr "IPv4 WAN 状态" -#~ msgid "VLAN Interface" -#~ msgstr "VLAN 接口" +#~ msgid "IPv6 WAN Status" +#~ msgstr "IPv6 WAN 状态" diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po index c62fd0d9b9..c1b7cac6fd 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 "" @@ -399,6 +388,9 @@ msgstr "" msgid "Apply unchecked" msgstr "" +msgid "Architecture" +msgstr "" + msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" @@ -413,6 +405,9 @@ msgstr "" msgid "Associated Stations" msgstr "已連接站點" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -503,9 +498,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 " @@ -686,9 +678,6 @@ msgstr "已連線" msgid "Connection Limit" msgstr "連線限制" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" - msgid "Connections" msgstr "連線數" @@ -826,9 +815,6 @@ msgstr "預設匝道器" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "預設狀態" @@ -1358,9 +1344,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,8 +1399,8 @@ msgstr "IPv4版" msgid "IPv4 Firewall" msgstr "IPv4防火牆" -msgid "IPv4 WAN Status" -msgstr "IPv4寬頻連線狀態" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "IPv4位址" @@ -1467,15 +1450,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "IPv6寬頻連線狀態" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "IPv6位址" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -2047,9 +2027,6 @@ msgstr "" msgid "NTP server candidates" msgstr "NTP伺服器備選" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "名稱" @@ -2225,12 +2202,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>." @@ -2700,9 +2671,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2785,9 +2753,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2811,14 +2776,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 "" @@ -2872,17 +2829,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 "服務名稱" @@ -2978,9 +2924,6 @@ msgstr "分類" msgid "Source" msgstr "來源" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "指定這個設備被附掛到那個目錄" @@ -3276,11 +3219,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 "" @@ -3430,15 +3368,6 @@ msgstr "通道介面" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "傳送-功率" @@ -3616,12 +3545,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 "確認" @@ -3653,10 +3576,6 @@ 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 "等待修改被啟用..." @@ -3680,12 +3599,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 "" @@ -3825,9 +3738,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 "" @@ -3903,6 +3813,12 @@ msgstr "是的" msgid "« Back" msgstr "« 倒退" +#~ msgid "IPv4 WAN Status" +#~ msgstr "IPv4寬頻連線狀態" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "IPv6寬頻連線狀態" + #~ msgid "Apply" #~ 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..d6140c81f4 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 @@ -101,9 +101,9 @@ <%+header%> <% if not has_iwinfo then %> - <div class="errorbox"> - <strong><%:Package libiwinfo required!%></strong><br /> - <%_The <em>libiwinfo-lua</em> package is not installed. You must install this component for working wireless configuration!%> + <div class="alert-message warning"> + <h4><%:Package libiwinfo required!%></h4> + <p><%_The <em>libiwinfo-lua</em> package is not installed. You must install this component for working wireless configuration!%></p> </div> <% end %> @@ -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..a56e4826a9 100644 --- a/modules/luci-mod-freifunk/luasrc/view/freifunk/public_status.htm +++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/public_status.htm @@ -238,25 +238,25 @@ end <h2><%:Wireless Overview%></h2> <% if not has_iwinfo then %> - <div class="errorbox"> - <strong><%:Package libiwinfo required!%></strong><br /> - <%_The <em>libiwinfo</em> package is not installed. You must install this component for working wireless configuration!%> + <div class="alert-message warning"> + <h4><%:Package libiwinfo required!%></h4> + <p><%_The <em>libiwinfo</em> package is not installed. You must install this component for working wireless configuration!%></p> </div> <% 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> |