diff options
Diffstat (limited to 'applications')
4 files changed, 403 insertions, 357 deletions
diff --git a/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js b/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js index e23414f705..2cf5cc6e1b 100644 --- a/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js +++ b/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js @@ -1,382 +1,427 @@ -function $(s) { return document.getElementById(s.substring(1)); } +function $(s) { + return document.getElementById(s.substring(1)); +} -function show(s) { $(s).style.display = 'block'; } +function show(s) { + $(s).style.display = 'block'; +} -function hide(s) { $(s).style.display = 'none'; } +function hide(s) { + $(s).style.display = 'none'; +} function set_server() { - hide("#status_box"); - data.url = $("#server").value; - ubus_call("uci", "set", { "config": "attendedsysupgrade", "section": "server", values: { "url": data.url } }) - ubus_call("uci", "commit", { "config": "attendedsysupgrade" }) - var server_button = $("#server") - server_button.type = 'button'; - server_button.className = 'cbi-button cbi-button-edit'; - server_button.parentElement.removeChild($("#button_set")); - server_button.onclick = edit_server; + hide("#status_box"); + data.url = $("#server").value; + ubus_call("uci", "set", { + "config": "attendedsysupgrade", + "section": "server", + values: { + "url": data.url + } + }) + ubus_call("uci", "commit", { + "config": "attendedsysupgrade" + }) + var server_button = $("#server") + server_button.type = 'button'; + server_button.className = 'cbi-button cbi-button-edit'; + server_button.parentElement.removeChild($("#button_set")); + server_button.onclick = edit_server; } function edit_server() { - $("#server").type = 'text'; - $("#server").onkeydown = function(event) { - if(event.key === 'Enter') { - set_server(); - return false; - } - } - $("#server").className = ''; - $("#server").onclick = null; - - var button_set = document.createElement("input"); - button_set.type = "button"; - button_set.value = "Save"; - button_set.name = "button_set"; - button_set.id = "button_set"; - button_set.className = 'cbi-button cbi-button-save'; - button_set.onclick = set_server - $("#server").parentElement.appendChild(button_set); + $("#server").type = 'text'; + $("#server").onkeydown = function(event) { + if (event.key === 'Enter') { + set_server(); + return false; + } + } + $("#server").className = ''; + $("#server").onclick = null; + + var button_set = document.createElement("input"); + button_set.type = "button"; + button_set.value = "Save"; + button_set.name = "button_set"; + button_set.id = "button_set"; + button_set.className = 'cbi-button cbi-button-save'; + button_set.onclick = set_server + $("#server").parentElement.appendChild(button_set); } function edit_packages() { - data.edit_packages = true - hide("#edit_button"); - $("#edit_packages").value = data.packages.join("\n"); - show("#edit_packages"); + data.edit_packages = true + hide("#edit_button"); + $("#edit_packages").value = data.packages.join("\n"); + show("#edit_packages"); } // requests to the upgrade server -function server_request(request_dict, path, callback) { - request_dict.distro = data.release.distribution; - request_dict.target = data.release.target; - var request = new XMLHttpRequest(); - request.open("POST", data.url + "/" + path, true); - request.setRequestHeader("Content-type", "application/json"); - request.send(JSON.stringify(request_dict)); - request.onerror = function(e) { - set_status("danger", "upgrade server down") - show("#server_div"); - } - request.addEventListener('load', function(event) { - callback(request) - }); +function server_request(path, callback) { + var request = new XMLHttpRequest(); + request.open("POST", data.url + "/" + path, true); + request.setRequestHeader("Content-type", "application/json"); + request.send(JSON.stringify(request_dict)); + request.onerror = function(e) { + set_status("danger", "upgrade server down") + show("#server_div"); + } + request.addEventListener('load', function(event) { + callback(request) + }); } // initial setup, get system information function setup() { - ubus_call("rpc-sys", "packagelist", {}, "packages"); - ubus_call("system", "board", {}, "release"); - ubus_call("system", "board", {}, "board_name"); - ubus_call("system", "board", {}, "model"); - ubus_call("system", "info", {}, "memory"); - uci_get({ "config": "attendedsysupgrade", "section": "server", "option": "url" }) - uci_get({ "config": "attendedsysupgrade", "section": "client", "option": "upgrade_packages" }) - uci_get({ "config": "attendedsysupgrade", "section": "client", "option": "advanced_mode" }) - uci_get({ "config": "attendedsysupgrade", "section": "client", "option": "auto_search" }) - setup_ready(); + ubus_call("rpc-sys", "packagelist", {}, "packages"); + ubus_call("system", "board", {}, "release"); + ubus_call("system", "board", {}, "board_name"); + ubus_call("system", "board", {}, "model"); + ubus_call("system", "info", {}, "memory"); + uci_get({ + "config": "attendedsysupgrade", + "section": "server", + "option": "url" + }) + uci_get({ + "config": "attendedsysupgrade", + "section": "client", + "option": "upgrade_packages" + }) + uci_get({ + "config": "attendedsysupgrade", + "section": "client", + "option": "advanced_mode" + }) + uci_get({ + "config": "attendedsysupgrade", + "section": "client", + "option": "auto_search" + }) + setup_ready(); } function setup_ready() { - // checks if a async ubus calls have finished - if(ubus_counter != ubus_closed) { - setTimeout(setup_ready, 300) - } else { - if(data.auto_search == 1) { - upgrade_check(); - } else { - show("#upgrade_button"); - show("#server_div"); - $("#server").value = data.url; - } - } + // checks if a async ubus calls have finished + if (ubus_counter != ubus_closed) { + setTimeout(setup_ready, 300) + } else { + if (data.auto_search == 1) { + upgrade_check(); + } else { + show("#upgrade_button"); + show("#server_div"); + $("#server").value = data.url; + } + } } function uci_get(option) { - // simple wrapper to get a uci value store in data.<option> - ubus_call("uci", "get", option, option["option"]) + // simple wrapper to get a uci value store in data.<option> + ubus_call("uci", "get", option, option["option"]) } ubus_counter = 0; ubus_closed = 0; + function ubus_call(command, argument, params, variable) { - var request_data = {}; - request_data.jsonrpc = "2.0"; - request_data.id = ubus_counter; - request_data.method = "call"; - request_data.params = [ data.ubus_rpc_session, command, argument, params ] - var request_json = JSON.stringify(request_data) - ubus_counter++; - var request = new XMLHttpRequest(); - request.open("POST", ubus_url, true); - request.setRequestHeader("Content-type", "application/json"); - request.onload = function(event) { - if(request.status === 200) { - var response = JSON.parse(request.responseText) - if(!("error" in response) && "result" in response) { - if(response.result.length === 2) { - if(command === "uci") { - data[variable] = response.result[1].value - } else { - data[variable] = response.result[1][variable] - } - } - } else { - set_status("danger", "<b>Ubus call failed:</b><br />Request: " + request_json + "<br />Response: " + JSON.stringify(response)) - } - ubus_closed++; - } - } - request.send(request_json); + var request_data = {}; + request_data.jsonrpc = "2.0"; + request_data.id = ubus_counter; + request_data.method = "call"; + request_data.params = [data.ubus_rpc_session, command, argument, params] + var request_json = JSON.stringify(request_data) + ubus_counter++; + var request = new XMLHttpRequest(); + request.open("POST", ubus_url, true); + request.setRequestHeader("Content-type", "application/json"); + request.onload = function(event) { + if (request.status === 200) { + var response = JSON.parse(request.responseText) + if (!("error" in response) && "result" in response) { + if (response.result.length === 2) { + if (command === "uci") { + data[variable] = response.result[1].value + } else { + data[variable] = response.result[1][variable] + } + } + } else { + set_status("danger", "<b>Ubus call failed:</b><br />Request: " + request_json + "<br />Response: " + JSON.stringify(response)) + } + ubus_closed++; + } + } + request.send(request_json); } -function set_status(type, message, loading) { - $("#status_box").className = "alert-message " + type; - var loading_image = ''; - if(loading) { - loading_image = '<img src="/luci-static/resources/icons/loading.gif" alt="Loading" style="vertical-align:middle"> '; - } - $("#status_box").innerHTML = loading_image + message; - show("#status_box") +function set_status(type, message, loading, show_log) { + $("#status_box").className = "alert-message " + type; + var loading_image = ''; + if (loading) { + loading_image = '<img src="/luci-static/resources/icons/loading.gif" alt="Loading" style="vertical-align:middle"> '; + } + if (show_log && data.log) { + message += ' <p><a target="_blank" href="' + data.url + data.log + '">Build log</a></p>' + } + $("#status_box").innerHTML = loading_image + message; + show("#status_box") } function upgrade_check() { - // Asks server for new firmware - // If data.upgrade_packages is set to true search for new package versions as well - hide("#status_box"); - hide("#server_div"); - set_status("info", "Searching for upgrades", true); - var request_dict = {} - request_dict.version = data.release.version; - request_dict.revision = data.release.revision; - request_dict.installed = data.packages; - request_dict.upgrade_packages = data.upgrade_packages - server_request(request_dict, "api/upgrade-check", upgrade_check_callback) + // Asks server for new firmware + // If data.upgrade_packages is set to true search for new package versions as well + hide("#status_box"); + hide("#server_div"); + set_status("info", "Searching for upgrades", true); + request_dict.distro = data.release.distribution; + request_dict.version = data.release.version; + request_dict.target = data.release.target; + request_dict.revision = data.release.revision; + request_dict.installed = data.packages; + request_dict.upgrade_packages = data.upgrade_packages + server_request("api/upgrade-check", upgrade_check_callback) } function upgrade_check_callback(request_text) { - var request_json = JSON.parse(request_text) - - // create simple output to tell user what's going to be upgrade (release/packages) - var info_output = "" - if(request_json.version != undefined) { - info_output += "<h3>New firmware release available</h3>" - info_output += data.release.version + " to " + request_json.version - data.latest_version = request_json.version; - } - if(request_json.upgrades != undefined) { - info_output += "<h3>Package upgrades available</h3>" - for (var upgrade in request_json.upgrades) { - info_output += "<b>" + upgrade + "</b>: " + request_json.upgrades[upgrade][1] + " to " + request_json.upgrades[upgrade][0] + "<br />" - } - } - data.packages = request_json.packages - set_status("success", info_output) - - if(data.advanced_mode == 1) { - show("#edit_button"); - } - var upgrade_button = $("#upgrade_button") - upgrade_button.value = "Request firmware"; - upgrade_button.style.display = "block"; - upgrade_button.disabled = false; - upgrade_button.onclick = upgrade_request; - + var request_json = JSON.parse(request_text) + + // create simple output to tell user what's going to be upgrade (release/packages) + var info_output = "" + if (request_json.version) { + info_output += "<h3>New release <b>" + request_json.version + "</b> available</h3>" + info_output += "Installed version: " + data.release.version + request_dict.version = request_json.version; + } + if (request_json.upgrades) { + if (request_json.upgrades != {}) { + info_output += "<h3>Package upgrades available</h3>" + for (var upgrade in request_json.upgrades) { + info_output += "<b>" + upgrade + "</b>: " + request_json.upgrades[upgrade][1] + " to " + request_json.upgrades[upgrade][0] + "<br />" + } + } + } + data.packages = request_json.packages + set_status("success", info_output) + + if (data.advanced_mode == 1) { + show("#edit_button"); + } + var upgrade_button = $("#upgrade_button") + upgrade_button.value = "Request firmware"; + upgrade_button.style.display = "block"; + upgrade_button.disabled = false; + upgrade_button.onclick = upgrade_request; } function upgrade_request() { - // Request the image - // Needed values - // version/release - // board_name or model (server tries to find the correct profile) - // packages - // The rest is added by server_request() - $("#upgrade_button").disabled = true; - hide("#edit_packages"); - hide("#edit_button"); - hide("#keep_container"); - - var request_dict = {} - request_dict.version = data.latest_version; - request_dict.board = data.board_name - request_dict.model = data.model - - if(data.edit_packages == true) { - request_dict.packages = $("#edit_packages").value.split("\n") - } else { - request_dict.packages = data.packages; - } - - server_request(request_dict, "api/upgrade-request", upgrade_request_callback) + // Request firmware using the following parameters + // distro, version, target, board_name/model, packages + $("#upgrade_button").disabled = true; + hide("#edit_packages"); + hide("#edit_button"); + hide("#keep_container"); + + // remove "installed" entry as unused by build requests + delete request_dict.installed + // add board info to let server determine profile + request_dict.board_name = data.board_name + request_dict.board = data.board_name + request_dict.model = data.model + + if (data.edit_packages == true) { + request_dict.packages = $("#edit_packages").value.split("\n") + } else { + request_dict.packages = data.packages; + } + server_request("api/upgrade-request", upgrade_request_callback) } function upgrade_request_callback(request) { - // ready to download - var request_json = JSON.parse(request); - data.files = request_json.files; - data.sysupgrade = request_json.sysupgrade; - - var info_output = 'Firmware created: <a href="' + data.url + data.files + data.sysupgrade + '"><b>' + data.sysupgrade+ '</b></a>' - info_output += ' <a target="_blank" href="' + data.url + request_json.log + '">Build log</a>' - set_status("info", info_output); - - show("#keep_container"); - var upgrade_button = $("#upgrade_button") - upgrade_button.disabled = false; - upgrade_button.style.display = "block"; - upgrade_button.value = "Flash firmware"; - upgrade_button.onclick = download_image; + // ready to download + var request_json = JSON.parse(request) + data.files = request_json.files + data.sysupgrade = request_json.sysupgrade + data.log = request_json.log + + var info_output = '<h3>Firmware created</h3><p>Created file: <a href="' + data.url + data.files + data.sysupgrade + '">' + data.sysupgrade + '</p></a>' + set_status("success", info_output, false, true); + + show("#keep_container"); + var upgrade_button = $("#upgrade_button") + upgrade_button.disabled = false; + upgrade_button.style.display = "block"; + upgrade_button.value = "Flash firmware"; + upgrade_button.onclick = download_image; } function flash_image() { - // Flash image via rpc-sys upgrade_start - set_status("warning", "Flashing firmware. Don't unpower device", true) - ubus_call("rpc-sys", "upgrade_start", { "keep": $("#keep").checked }, 'message'); - ping_max = 3600; // in seconds - setTimeout(ping_ubus, 10000) + // Flash image via rpc-sys upgrade_start + set_status("warning", "Flashing firmware. Don't unpower device", true) + ubus_call("rpc-sys", "upgrade_start", { + "keep": $("#keep").checked + }, 'message'); + ping_max = 3600; // in seconds + setTimeout(ping_ubus, 10000) } function ping_ubus() { - // Tries to connect to ubus. If the connection fails the device is likely still rebooting. - // If more time than ping_max passes update may failed - if(ping_max > 0) { - ping_max--; - var request = new XMLHttpRequest(); - request.open("GET", ubus_url, true); - request.addEventListener('error', function(event) { - set_status("warning", "Rebooting device - please wait!", true); - setTimeout(ping_ubus, 5000) - }); - request.addEventListener('load', function(event) { - set_status("success", "Success! Please reload web interface"); - $("#upgrade_button").value = "Reload page"; - show("#upgrade_button"); - $("#upgrade_button").disabled = false; - $("#upgrade_button").onclick = function() { location.reload(); } - }); - request.send(); - } else { - set_status("danger", "Web interface could not reconnect to your device. Please reload web interface or check device manually") - } + // Tries to connect to ubus. If the connection fails the device is likely still rebooting. + // If more time than ping_max passes update may failed + if (ping_max > 0) { + ping_max--; + var request = new XMLHttpRequest(); + request.open("GET", ubus_url, true); + request.addEventListener('error', function(event) { + set_status("warning", "Rebooting device - please wait!", true); + setTimeout(ping_ubus, 5000) + }); + request.addEventListener('load', function(event) { + set_status("success", "Success! Please reload web interface"); + $("#upgrade_button").value = "Reload page"; + show("#upgrade_button"); + $("#upgrade_button").disabled = false; + $("#upgrade_button").onclick = function() { + location.reload(); + } + }); + request.send(); + } else { + set_status("danger", "Web interface could not reconnect to your device. Please reload web interface or check device manually") + } } function upload_image(blob) { - // Uploads received blob data to the server using cgi-io - set_status("info", "Uploading firmware to device", true); - var request = new XMLHttpRequest(); - var form_data = new FormData(); - - form_data.append("sessionid", data.ubus_rpc_session) - form_data.append("filename", "/tmp/firmware.bin") - form_data.append("filemode", 755) // insecure? - form_data.append("filedata", blob) - - request.addEventListener('load', function(event) { - request_json = JSON.parse(request.responseText) - flash_image(); - }); - - request.addEventListener('error', function(event) { - set_status("danger", "Upload of firmware failed, please retry by reloading web interface") - }); - - request.open('POST', origin + '/cgi-bin/cgi-upload'); - request.send(form_data); + // Uploads received blob data to the server using cgi-io + set_status("info", "Uploading firmware to device", true); + var request = new XMLHttpRequest(); + var form_data = new FormData(); + + form_data.append("sessionid", data.ubus_rpc_session) + form_data.append("filename", "/tmp/firmware.bin") + form_data.append("filemode", 755) // insecure? + form_data.append("filedata", blob) + + request.addEventListener('load', function(event) { + request_json = JSON.parse(request.responseText) + flash_image(); + }); + + request.addEventListener('error', function(event) { + set_status("danger", "Upload of firmware failed, please retry by reloading web interface") + }); + + request.open('POST', origin + '/cgi-bin/cgi-upload'); + request.send(form_data); } function download_image() { - // Download image from server once the url was received by upgrade_request - hide("#keep_container"); - hide("#upgrade_button"); - var download_request = new XMLHttpRequest(); - download_request.open("GET", data.url + data.files + data.sysupgrade); - download_request.responseType = "arraybuffer"; - - download_request.onload = function () { - if (this.status === 200) { - var blob = new Blob([download_request.response], {type: "application/octet-stream"}); - upload_image(blob) - } - }; - set_status("info", "Downloading firmware to web browser memory", true); - download_request.send(); + // Download image from server once the url was received by upgrade_request + hide("#keep_container"); + hide("#upgrade_button"); + var download_request = new XMLHttpRequest(); + download_request.open("GET", data.url + data.files + data.sysupgrade); + download_request.responseType = "arraybuffer"; + + download_request.onload = function() { + if (this.status === 200) { + var blob = new Blob([download_request.response], { + type: "application/octet-stream" + }); + upload_image(blob) + } + }; + set_status("info", "Downloading firmware to web browser memory", true); + download_request.send(); } -function server_request(request_dict, path, callback) { - var request_json; - request_dict.distro = data.release.distribution; - request_dict.target = data.release.target; - var request = new XMLHttpRequest(); - request.open("POST", data.url + "/" + path, true); - request.setRequestHeader("Content-type", "application/json"); - request.send(JSON.stringify(request_dict)); - request.onerror = function(e) { - set_status("danger", "Upgrade server down or could not connect") - show("#server_div"); - } - request.addEventListener('load', function(event) { - var request_text = request.responseText; - if (request.status === 200) { - callback(request_text) - - } else if (request.status === 202) { - var imagebuilder = request.getResponseHeader("X-Imagebuilder-Status"); - if(imagebuilder === "queue") { - // in queue - var queue = request.getResponseHeader("X-Build-Queue-Position"); - set_status("info", "In build queue position " + queue, true) - console.log("queued"); - } else if(imagebuilder === "initialize") { - set_status("info", "Setting up ImageBuilder", true) - console.log("Setting up imagebuilder"); - } else if(imagebuilder === "building") { - set_status("info", "Building image", true); - console.log("building"); - } else { - // fallback if for some reasons the headers are missing e.g. browser blocks access - set_status("info", "Processing request", true); - console.log(imagebuilder) - } - setTimeout(function() { server_request(request_dict, path, callback) }, 5000) - - } else if (request.status === 204) { - // no upgrades available - set_status("success", "No upgrades available") - - } else if (request.status === 400) { - // bad request - request_json = JSON.parse(request_text) - set_status("danger", request_json.error) - - } else if (request.status === 412) { - // this is a bit generic - set_status("danger", "Unsupported device, release, target, subtraget or board") - - } else if (request.status === 413) { - set_status("danger", "No firmware created due to image size. Try again with less packages selected.") - - } else if (request.status === 422) { - var package_missing = request.getResponseHeader("X-Unknown-Package"); - set_status("danger", "Unknown package in request: <b>" + package_missing + "</b>") - } else if (request.status === 500) { - request_json = JSON.parse(request_text) - - var error_box_content = "<b>Internal server error</b><br />" - error_box_content += request_json.error - if(request_json.log != undefined) { - data.log_url = request_json.log - } - set_status("danger", error_box_content) - - } else if (request.status === 501) { - set_status("danger", "No sysupgrade file produced, may not supported by model.") - } else if (request.status === 502) { - // python part offline - set_status("danger", "Server down for maintenance") - setTimeout(function() { server_request(request_dict, path, callback) }, 30000) - } else if (request.status === 503) { - set_status("danger", "Server overloaded") - setTimeout(function() { server_request(request_dict, path, callback) }, 30000) - } - }); +function server_request(path, callback) { + var request_json; + var request = new XMLHttpRequest(); + request.open("POST", data.url + "/" + path, true); + request.setRequestHeader("Content-type", "application/json"); + request.send(JSON.stringify(request_dict)); + request.onerror = function(e) { + set_status("danger", "Upgrade server down or could not connect") + show("#server_div"); + } + request.addEventListener('load', function(event) { + var request_text = request.responseText; + if (request.status === 200) { + callback(request_text) + + } else if (request.status === 202) { + var imagebuilder = request.getResponseHeader("X-Imagebuilder-Status"); + if (imagebuilder === "queue") { + // in queue + var queue = request.getResponseHeader("X-Build-Queue-Position"); + set_status("info", "In build queue position " + queue, true) + console.log("queued"); + } else if (imagebuilder === "building") { + set_status("info", "Building image", true); + console.log("building"); + } else { + // fallback if for some reasons the headers are missing e.g. browser blocks access + set_status("info", "Processing request", true); + console.log(imagebuilder) + } + setTimeout(function() { + server_request(path, callback) + }, 5000) + + } else if (request.status === 204) { + // no upgrades available + set_status("success", "No upgrades available") + + } else if (request.status === 400) { + // bad request + request_json = JSON.parse(request_text) + set_status("danger", request_json.error) + + } else if (request.status === 409) { + // bad request + request_json = JSON.parse(request_text) + data.log = request_json.log + set_status("danger", "Incompatible package selection. See build log for details", false, true) + + } else if (request.status === 412) { + // this is a bit generic + set_status("danger", "Unsupported device, release, target, subtraget or board") + + } else if (request.status === 413) { + set_status("danger", "No firmware created due to image size. Try again with less packages selected.") + + } else if (request.status === 422) { + var package_missing = request.getResponseHeader("X-Unknown-Package"); + set_status("danger", "Unknown package in request: <b>" + package_missing + "</b>") + } else if (request.status === 500) { + request_json = JSON.parse(request_text) + + var error_box_content = "<b>Internal server error</b><br />" + error_box_content += request_json.error + if (request_json.log != undefined) { + data.log = request_json.log + } + set_status("danger", error_box_content, false, true) + + } else if (request.status === 501) { + set_status("danger", "No sysupgrade file produced, may not supported by model.") + } else if (request.status === 502) { + // python part offline + set_status("danger", "Server down for maintenance") + setTimeout(function() { + server_request(path, callback) + }, 30000) + } else if (request.status === 503) { + set_status("danger", "Server overloaded") + setTimeout(function() { + server_request(path, callback) + }, 30000) + } + }); } +request_dict = {} document.onload = setup() diff --git a/applications/luci-app-firewall/po/es/firewall.po b/applications/luci-app-firewall/po/es/firewall.po index 8e7d1be3b8..67d93ac408 100644 --- a/applications/luci-app-firewall/po/es/firewall.po +++ b/applications/luci-app-firewall/po/es/firewall.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-03-30 17:00+0200\n" -"PO-Revision-Date: 2019-03-01 17:36-0300\n" +"PO-Revision-Date: 2019-03-27 14:22-0300\n" "Last-Translator: José Vicente <josevteg@gmail.com>\n" "Language: es\n" "MIME-Version: 1.0\n" @@ -438,7 +438,7 @@ msgstr "Nueva regla SNAT" #: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37 #: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47 msgid "New forward rule" -msgstr "Nueva regla de traspaso" +msgstr "Nueva regla de reenvío" #: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17 msgid "New input rule" @@ -629,7 +629,7 @@ msgstr "Dirección MAC origen" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194 msgid "Source NAT" -msgstr "NAT origen" +msgstr "Origen NAT" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195 msgid "" @@ -637,7 +637,7 @@ msgid "" "control over the source IP used for outgoing traffic, for example to map " "multiple WAN addresses to internal subnets." msgstr "" -"NAT origen es una forma específica de enmascaramiento que permite el control " +"Origen NAT es una forma específica de enmascaramiento que permite el control " "fino del origen IP que se usa en el tráfico de salida por ejemplo para " "dirigir múltiples direcciones WAN a las subredes internas." @@ -673,7 +673,7 @@ msgstr "Fecha de finalización (aaaa-mm-dd)" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355 msgid "Stop Time (hh:mm:ss)" -msgstr "Tiempo de parada (hh:mm:ss)" +msgstr "Hora de finalización (hh:mm:ss)" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338 msgid "Sunday" @@ -841,7 +841,7 @@ msgstr "Zonas" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33 #: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98 msgid "accept" -msgstr "aceptar" +msgstr "Aceptar" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66 #: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78 @@ -886,7 +886,7 @@ msgstr "día" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327 msgid "don't track" -msgstr "no seguir" +msgstr "No seguir" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324 #: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81 @@ -921,7 +921,7 @@ msgstr "puertos" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31 #: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96 msgid "reject" -msgstr "rechazar" +msgstr "Rechazar" #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183 msgid "second" diff --git a/applications/luci-app-simple-adblock/po/ja/simple-adblock.po b/applications/luci-app-simple-adblock/po/ja/simple-adblock.po index e5eea47615..5b46eb9332 100644 --- a/applications/luci-app-simple-adblock/po/ja/simple-adblock.po +++ b/applications/luci-app-simple-adblock/po/ja/simple-adblock.po @@ -7,18 +7,18 @@ msgstr "" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.12\n" +"X-Generator: Poedit 2.2.1\n" "Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Plural-Forms: nplurals=1; plural=0;\n" "Language: ja\n" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:100 msgid "Advanced Configuration" -msgstr "" +msgstr "詳細設定" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:69 msgid "Basic Configuration" -msgstr "" +msgstr "基本設定" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:134 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60 @@ -37,7 +37,7 @@ msgstr "hosts ブラックリストのURL" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:67 msgid "Configuration" -msgstr "" +msgstr "設定" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:71 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14 @@ -46,28 +46,28 @@ msgstr "システム ログとコンソール出力の冗長性を設定しま #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:102 msgid "Delay (in seconds) for on-boot start" -msgstr "" +msgstr "ブート時遅延実行（秒）" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:111 msgid "Disable Debugging" -msgstr "" +msgstr "デバッグ無効" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106 msgid "Download time-out (in seconds)" -msgstr "" +msgstr "ダウンロード タイムアウト（秒）" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:112 msgid "Enable Debugging" -msgstr "" +msgstr "デバッグ有効" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:26 msgid "Enable/Start" -msgstr "" +msgstr "有効化/開始" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110 msgid "Enables debug output to /tmp/simple-adblock.log" -msgstr "" +msgstr "/tmp/simple-adblock.log へのデバッグ出力を有効にします。" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:78 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21 @@ -83,8 +83,8 @@ msgstr "全ローカル デバイスにルーター DNSサーバーの使用を #: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21 msgid "Forces Router DNS use on local devices, also known as DNS Hijacking" msgstr "" -"ローカル デバイスに対し、ルーター上のDNSサーバーの使用を強制します。これは、" -"DNS ハイジャックとしても知られています。" +"ローカル デバイスに対し、ルーター上のDNSサーバーの使用を強制します。これ" +"は、DNS ハイジャックとしても知られています。" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:124 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50 @@ -118,30 +118,30 @@ msgstr "右の設定で既に使用されていないLEDを選択します" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:43 msgid "Reload" -msgstr "" +msgstr "リロード" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:102 msgid "Run service after set delay on boot" -msgstr "" +msgstr "システムのブート時に、設定された遅延でサービスを開始します。" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:6 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:19 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:29 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:37 msgid "Service Status" -msgstr "" +msgstr "サービス ステータス" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:25 msgid "Service is disabled/stopped" -msgstr "" +msgstr "サービスは無効/停止中" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:34 msgid "Service is enabled/started" -msgstr "" +msgstr "サービスは有効/実行中" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:42 msgid "Service started with error" -msgstr "" +msgstr "サービス開始時にエラーが発生" #: applications/luci-app-simple-adblock/luasrc/controller/simple-adblock.lua:6 msgid "Simple AdBlock" @@ -159,15 +159,16 @@ msgstr "軽量出力" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5 msgid "Start Simple Adblock service" -msgstr "" +msgstr "Simple Adblock サービスを開始" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106 msgid "Stop the download if it is stalled for set number of seconds" msgstr "" +"問題等が発生して指定された秒数を超過した場合、ダウンロードを停止します。" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:35 msgid "Stop/Disable" -msgstr "" +msgstr "停止/無効化" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:72 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15 @@ -192,7 +193,8 @@ msgstr "ホワイトリストに登録するドメインのリストのURLです #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65 msgid "URLs to lists of hosts to be blacklisted" -msgstr "ブラックリストに登録するドメインが列挙された、hostsファイルのURLです。" +msgstr "" +"ブラックリストに登録するドメインが列挙された、hostsファイルのURLです。" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:74 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17 @@ -201,7 +203,7 @@ msgstr "詳細出力" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:117 msgid "Whitelist and Blocklist Management" -msgstr "" +msgstr "ホワイトリストとブラックリストの管理" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:129 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55 @@ -217,6 +219,3 @@ msgstr "ホワイトリスト ドメイン" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37 msgid "none" msgstr "なし" - -#~ msgid "Enable/start service" -#~ msgstr "サービスの有効化/開始" diff --git a/applications/luci-app-wifischedule/luasrc/model/cbi/wifischedule/wifi_schedule.lua b/applications/luci-app-wifischedule/luasrc/model/cbi/wifischedule/wifi_schedule.lua index 61a94ca5dc..1644514166 100644 --- a/applications/luci-app-wifischedule/luasrc/model/cbi/wifischedule/wifi_schedule.lua +++ b/applications/luci-app-wifischedule/luasrc/model/cbi/wifischedule/wifi_schedule.lua @@ -37,7 +37,9 @@ end -- BEGIN Map m = Map("wifi_schedule", translate("Wifi Schedule"), translate("Defines a schedule when to turn on and off wifi.")) -function m.on_commit(self) +m.apply_on_parse = true + +function m.on_apply(self) sys.exec("/usr/bin/wifi_schedule.sh cron") end -- END Map |