diff options
169 files changed, 1862 insertions, 1874 deletions
diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua index d80cb486e..0a4a4cdd2 100644 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua +++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua @@ -34,13 +34,13 @@ des = bl:option(DummyValue, "adb_src_desc", translate("Description")) -- Additional options -s2 = m:section(NamedSection, "backup", "service", translate("Backup options")) +s2 = m:section(NamedSection, "global", "adblock", translate("Backup options")) -o4 = s2:option(Flag, "enabled", translate("Enable blocklist backup")) +o4 = s2:option(Flag, "adb_backup", translate("Enable blocklist backup")) o4.rmempty = false o4.default = 0 -o5 = s2:option(Value, "adb_dir", translate("Backup directory")) +o5 = s2:option(Value, "adb_backupdir", translate("Backup directory")) o5.rmempty = false o5.datatype = "directory" diff --git a/applications/luci-app-commands/luasrc/controller/commands.lua b/applications/luci-app-commands/luasrc/controller/commands.lua index 16528d117..ca91813b1 100644 --- a/applications/luci-app-commands/luasrc/controller/commands.lua +++ b/applications/luci-app-commands/luasrc/controller/commands.lua @@ -153,8 +153,8 @@ local function parse_cmdline(cmdid, args) end end -function action_run(...) - local fs = require "nixio.fs" +function execute_command(callback, ...) + local fs = require "nixio.fs" local argv = parse_cmdline(...) if argv then local outfile = os.tmpname() @@ -169,8 +169,8 @@ function action_run(...) local binary = not not (stdout:match("[%z\1-\8\14-\31]")) - luci.http.prepare_content("application/json") - luci.http.write_json({ + callback({ + ok = true, command = table.concat(argv, " "), stdout = not binary and stdout, stderr = stderr, @@ -178,10 +178,41 @@ function action_run(...) binary = binary }) else - luci.http.status(404, "No such command") + callback({ + ok = false, + code = 404, + reason = "No such command" + }) + end +end + +function return_json(result) + if result.ok then + luci.http.prepare_content("application/json") + luci.http.write_json(result) + else + luci.http.status(result.code, result.reason) end end +function action_run(...) + execute_command(return_json, ...) +end + +function return_html(result) + if result.ok then + require("luci.template") + luci.template.render("commands_public", { + exitcode = result.exitcode, + stdout = result.stdout, + stderr = result.stderr + }) + else + luci.http.status(result.code, result.reason) + end + +end + function action_download(...) local fs = require "nixio.fs" local argv = parse_cmdline(...) @@ -192,11 +223,11 @@ function action_download(...) local name if chunk:match("[%z\1-\8\14-\31]") then luci.http.header("Content-Disposition", "attachment; filename=%s" - % fs.basename(argv[1]):gsub("%W+", ".") .. ".bin") + % fs.basename(argv[1]):gsub("%W+", ".") .. ".bin") luci.http.prepare_content("application/octet-stream") else luci.http.header("Content-Disposition", "attachment; filename=%s" - % fs.basename(argv[1]):gsub("%W+", ".") .. ".txt") + % fs.basename(argv[1]):gsub("%W+", ".") .. ".txt") luci.http.prepare_content("text/plain") end @@ -214,14 +245,24 @@ function action_download(...) end end + function action_public(cmdid, args) + local disp = false + if string.sub(cmdid, -1) == "s" then + disp = true + cmdid = string.sub(cmdid, 1, -2) + end local uci = require "luci.model.uci".cursor() if cmdid and - uci:get("luci", cmdid) == "command" and - uci:get("luci", cmdid, "public") == "1" - then - action_download(cmdid, args) - else - luci.http.status(403, "Access to command denied") + uci:get("luci", cmdid) == "command" and + uci:get("luci", cmdid, "public") == "1" + then + if disp then + execute_command(return_html, cmdid, args) + else + action_download(cmdid, args) + end + else + luci.http.status(403, "Access to command denied") + end end -end diff --git a/applications/luci-app-commands/luasrc/view/commands.htm b/applications/luci-app-commands/luasrc/view/commands.htm index 73b9e6a2c..f094e186d 100644 --- a/applications/luci-app-commands/luasrc/view/commands.htm +++ b/applications/luci-app-commands/luasrc/view/commands.htm @@ -108,16 +108,19 @@ if (legend && output) { - var link = location.protocol + '//' + location.hostname + + var prefix = location.protocol + '//' + location.hostname + (location.port ? ':' + location.port : '') + - location.pathname.split(';')[0] + 'command/' + - id + (args ? '/' + args : ''); - + location.pathname.split(';')[0] + 'command/'; + var suffix = (args ? '/' + args : ''); + + var link = prefix + id + suffix; + var link_nodownload = prefix + id + "s" + suffix; + legend.style.display = 'none'; output.parentNode.style.display = 'block'; output.innerHTML = String.format( - '<div class="alert-message"><%:Access command with%> <a href="%s">%s</a></div>', - link, link + '<div class="alert-message"><p><%:Download execution result%> <a href="%s">%s</a></p><p><%:Or display result%> <a href="%s">%s</a></p></div>', + link, link, link_nodownload, link_nodownload ); location.hash = '#output'; diff --git a/applications/luci-app-commands/luasrc/view/commands_public.htm b/applications/luci-app-commands/luasrc/view/commands_public.htm new file mode 100644 index 000000000..f20799d40 --- /dev/null +++ b/applications/luci-app-commands/luasrc/view/commands_public.htm @@ -0,0 +1,50 @@ +<%# + Copyright 2016 t123yh <t123yh@outlook.com> + Licensed to the public under the Apache License 2.0. +-%> + +<% css = [[ +.alert-success { + color: #3c763d; + background-color: #dff0d8; + border-color: #d6e9c6; +} + +.alert { + padding: 15px; + margin-bottom: 20px; + border: 1px solid transparent; + border-radius: 4px; +} + +.alert-warning { + color: #8a6d3b; + background-color: #fcf8e3; + border-color: #faebcc; +} +]] -%> + +<%+header%> + +<% if exitcode == 0 then %> + <div class="alert alert-success" role="alert"> <%:Command executed successfully.%> </div> +<% else %> + <div class="alert alert-warning" role="alert"> <%:Command exited with status code %> <%= exitcode %> </div> +<% end %> + +<% if stdout ~= "" then %> + <h3><%:Standard Output%></h3> + <pre><%= stdout %></pre> +<% end %> + +<% if stderr ~= "" then %> + <h3><%:Standard Error%></h3> + <pre><%= stderr %></pre> +<% end %> + +<script> + <%# Display top bar on mobile devices -%> + document.getElementsByClassName('brand')[0].style.setProperty("display", "block", "important"); +</script> + +<%+footer%>
\ No newline at end of file diff --git a/applications/luci-app-commands/po/ca/commands.po b/applications/luci-app-commands/po/ca/commands.po index 9dc23b2f4..11ea8960d 100644 --- a/applications/luci-app-commands/po/ca/commands.po +++ b/applications/luci-app-commands/po/ca/commands.po @@ -14,9 +14,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "Una breva descripció textual de l'ordre configurat" -msgid "Access command with" -msgstr "Accedeix l'ordre amb" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -42,6 +39,12 @@ msgstr "Recollint dades..." msgid "Command" msgstr "Ordre" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "L'ordre ha fallat" @@ -72,6 +75,9 @@ msgstr "Descripció" msgid "Download" msgstr "Baixa" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "L'execució de l'ordre ha fallat!" @@ -81,12 +87,21 @@ msgstr "Enllaç" msgid "Loading" msgstr "Carregant" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "Accés públic" msgid "Run" msgstr "Executa" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." @@ -96,3 +111,6 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "Esperant que l'ordre acabi..." + +#~ msgid "Access command with" +#~ msgstr "Accedeix l'ordre amb" diff --git a/applications/luci-app-commands/po/cs/commands.po b/applications/luci-app-commands/po/cs/commands.po index 64949bdef..f6aa3cc44 100644 --- a/applications/luci-app-commands/po/cs/commands.po +++ b/applications/luci-app-commands/po/cs/commands.po @@ -14,9 +14,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "Krátky popis nastaveného příkazu" -msgid "Access command with" -msgstr "" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -40,6 +37,12 @@ msgstr "Sbírání dat..." msgid "Command" msgstr "Příkaz" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "Příkaz selhal" @@ -70,6 +73,9 @@ msgstr "Popis" msgid "Download" msgstr "Stáhnout" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "Chyba při zpracování příkazu!" @@ -79,12 +85,21 @@ msgstr "Odkaz" msgid "Loading" msgstr "Nahrávám" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "Veřejný přístup" msgid "Run" msgstr "Spustit" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." diff --git a/applications/luci-app-commands/po/de/commands.po b/applications/luci-app-commands/po/de/commands.po index 2b7c631ac..e67404afa 100644 --- a/applications/luci-app-commands/po/de/commands.po +++ b/applications/luci-app-commands/po/de/commands.po @@ -14,9 +14,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "Kurze Beschreibung des abgespeicherten Kommandos" -msgid "Access command with" -msgstr "Kommando aufrufen mit" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -42,6 +39,12 @@ msgstr "Sammle Daten..." msgid "Command" msgstr "Kommando" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "Kommando fehlgeschlagen" @@ -72,6 +75,9 @@ msgstr "Beschreibung" msgid "Download" msgstr "Herunterladen" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "Kommando konnte nicht ausgeführt werden!" @@ -81,12 +87,21 @@ msgstr "Link" msgid "Loading" msgstr "Lade" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "Öffentlicher Zugriff" msgid "Run" msgstr "Ausführen" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." @@ -96,3 +111,6 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "Warte auf die Ausführung des Kommandos..." + +#~ msgid "Access command with" +#~ msgstr "Kommando aufrufen mit" diff --git a/applications/luci-app-commands/po/el/commands.po b/applications/luci-app-commands/po/el/commands.po index 0e9e65d26..48b18366f 100644 --- a/applications/luci-app-commands/po/el/commands.po +++ b/applications/luci-app-commands/po/el/commands.po @@ -11,9 +11,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "" -msgid "Access command with" -msgstr "" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -37,6 +34,12 @@ msgstr "" msgid "Command" msgstr "" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "" @@ -67,6 +70,9 @@ msgstr "" msgid "Download" msgstr "" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "" @@ -76,12 +82,21 @@ msgstr "" msgid "Loading" msgstr "" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "" msgid "Run" msgstr "" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." diff --git a/applications/luci-app-commands/po/en/commands.po b/applications/luci-app-commands/po/en/commands.po index 754a229c1..ec192e4c1 100644 --- a/applications/luci-app-commands/po/en/commands.po +++ b/applications/luci-app-commands/po/en/commands.po @@ -1,19 +1,20 @@ msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Last-Translator: Automatically generated\n" +"Project-Id-Version: \n" +"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Language-Team: none\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Language: en\n" +"X-Generator: Poedit 1.8.11\n" msgid "A short textual description of the configured command" msgstr "A short textual description of the configured command" -msgid "Access command with" -msgstr "Access command with" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -39,6 +40,12 @@ msgstr "Collecting data..." msgid "Command" msgstr "Command" +msgid "Command executed successfully." +msgstr "Command executed successfully." + +msgid "Command exited with status code" +msgstr "Command exited with status code" + msgid "Command failed" msgstr "Command failed" @@ -69,6 +76,9 @@ msgstr "Description" msgid "Download" msgstr "Download" +msgid "Download execution result" +msgstr "Download execution result" + msgid "Failed to execute command!" msgstr "Failed to execute command!" @@ -78,12 +88,21 @@ msgstr "Link" msgid "Loading" msgstr "Loading" +msgid "Or display result" +msgstr "Or display result" + msgid "Public access" msgstr "Public access" msgid "Run" msgstr "Run" +msgid "Standard Error" +msgstr "Standard Error" + +msgid "Standard Output" +msgstr "Standard Output" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." @@ -93,3 +112,6 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "Waiting for command to complete..." + +#~ msgid "Command exited with status code " +#~ msgstr "Command exited with status code " diff --git a/applications/luci-app-commands/po/es/commands.po b/applications/luci-app-commands/po/es/commands.po index 80524529b..b9029b904 100644 --- a/applications/luci-app-commands/po/es/commands.po +++ b/applications/luci-app-commands/po/es/commands.po @@ -14,9 +14,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "Descripción breve del comando a configurar" -msgid "Access command with" -msgstr "Acceder al comando con" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -41,6 +38,12 @@ msgstr "Recuperando datos..." msgid "Command" msgstr "Comando" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "Falló" @@ -71,6 +74,9 @@ msgstr "Descripción" msgid "Download" msgstr "Descarga" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "¡Error al ejecutar el comando!" @@ -80,12 +86,21 @@ msgstr "Enlace" msgid "Loading" msgstr "Cargando" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "Acceso público" msgid "Run" msgstr "Ejecutar" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." @@ -95,3 +110,6 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "Esperando a que termine el comando..." + +#~ msgid "Access command with" +#~ msgstr "Acceder al comando con" diff --git a/applications/luci-app-commands/po/fr/commands.po b/applications/luci-app-commands/po/fr/commands.po index fac1aff9c..f348326a0 100644 --- a/applications/luci-app-commands/po/fr/commands.po +++ b/applications/luci-app-commands/po/fr/commands.po @@ -14,9 +14,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "Une courte description de la commande configurée" -msgid "Access command with" -msgstr "Accéder à la commande par" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -44,6 +41,12 @@ msgstr "Récupération des données ..." msgid "Command" msgstr "Commande" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "Echec de la commande" @@ -74,6 +77,9 @@ msgstr "Description" msgid "Download" msgstr "Télécharger" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "Echec de l'exécution de la commande ! " @@ -83,12 +89,21 @@ msgstr "Lien" msgid "Loading" msgstr "Chargement" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "Accès public" msgid "Run" msgstr "Exécuter" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." @@ -98,3 +113,6 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "En attente de la commande pour finir..." + +#~ msgid "Access command with" +#~ msgstr "Accéder à la commande par" diff --git a/applications/luci-app-commands/po/he/commands.po b/applications/luci-app-commands/po/he/commands.po index 0e9e65d26..48b18366f 100644 --- a/applications/luci-app-commands/po/he/commands.po +++ b/applications/luci-app-commands/po/he/commands.po @@ -11,9 +11,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "" -msgid "Access command with" -msgstr "" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -37,6 +34,12 @@ msgstr "" msgid "Command" msgstr "" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "" @@ -67,6 +70,9 @@ msgstr "" msgid "Download" msgstr "" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "" @@ -76,12 +82,21 @@ msgstr "" msgid "Loading" msgstr "" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "" msgid "Run" msgstr "" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." diff --git a/applications/luci-app-commands/po/hu/commands.po b/applications/luci-app-commands/po/hu/commands.po index 5cd0ec743..a9c759b9a 100644 --- a/applications/luci-app-commands/po/hu/commands.po +++ b/applications/luci-app-commands/po/hu/commands.po @@ -14,9 +14,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "A beállított parancs rövid szöveges leírása" -msgid "Access command with" -msgstr "Parancs hozzáférése" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -42,6 +39,12 @@ msgstr "Adatgyűjtés..." msgid "Command" msgstr "Paracs" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "Parancs végrehajtás sikertelen" @@ -72,6 +75,9 @@ msgstr "Leírás" msgid "Download" msgstr "Letöltés" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "Parancs végrehajtása sikertelen!" @@ -81,12 +87,21 @@ msgstr "Link" msgid "Loading" msgstr "Betöltés" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "Nyilvános hozzáférés" msgid "Run" msgstr "Futtatás" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." @@ -96,3 +111,6 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "Várakozás a parancs befejezésére..." + +#~ msgid "Access command with" +#~ msgstr "Parancs hozzáférése" diff --git a/applications/luci-app-commands/po/it/commands.po b/applications/luci-app-commands/po/it/commands.po index c14b910fc..8155a07ef 100644 --- a/applications/luci-app-commands/po/it/commands.po +++ b/applications/luci-app-commands/po/it/commands.po @@ -14,9 +14,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "Una breve descrizione testuale del comando configurato" -msgid "Access command with" -msgstr "Accesso comando con" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -43,6 +40,12 @@ msgstr "Raccolta dei dati..." msgid "Command" msgstr "Comando" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "Comando fallito" @@ -73,6 +76,9 @@ msgstr "Descrizione" msgid "Download" msgstr "Download" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "Impossibile eseguire il comando!" @@ -82,12 +88,21 @@ msgstr "Collegamento" msgid "Loading" msgstr "Caricamento" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "Accesso Pubblico" msgid "Run" msgstr "Esegui" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." @@ -97,3 +112,6 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "In attesa del comando da completare..." + +#~ msgid "Access command with" +#~ msgstr "Accesso comando con" diff --git a/applications/luci-app-commands/po/ja/commands.po b/applications/luci-app-commands/po/ja/commands.po index 99b5a452e..307951c9c 100644 --- a/applications/luci-app-commands/po/ja/commands.po +++ b/applications/luci-app-commands/po/ja/commands.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2016-12-21 11:59+0900\n" +"PO-Revision-Date: 2017-01-21 18:09+0900\n" "Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Language-Team: none\n" "Language: ja\n" @@ -15,9 +15,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "設定したコマンドの簡単な説明文を記載します" -msgid "Access command with" -msgstr "コマンドへのアクセス" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -41,6 +38,12 @@ msgstr "データ収集中です..." msgid "Command" msgstr "コマンド" +msgid "Command executed successfully." +msgstr "コマンドの実行に成功しました。" + +msgid "Command exited with status code" +msgstr "コマンドは次のステータス コードで終了しました:" + msgid "Command failed" msgstr "コマンド失敗" @@ -71,6 +74,9 @@ msgstr "説明" msgid "Download" msgstr "ダウンロード" +msgid "Download execution result" +msgstr "実行結果のダウンロード:" + msgid "Failed to execute command!" msgstr "コマンドの実行に失敗しました!" @@ -80,12 +86,21 @@ msgstr "リンク" msgid "Loading" msgstr "読み込み中" +msgid "Or display result" +msgstr "または結果の表示:" + msgid "Public access" msgstr "パブリック・アクセス" msgid "Run" msgstr "実行" +msgid "Standard Error" +msgstr "標準エラー" + +msgid "Standard Output" +msgstr "標準出力" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." @@ -95,3 +110,6 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "コマンド実行中です..." + +#~ msgid "Access command with" +#~ msgstr "コマンドへのアクセス" diff --git a/applications/luci-app-commands/po/ms/commands.po b/applications/luci-app-commands/po/ms/commands.po index 6fbb9834e..ad2f1518a 100644 --- a/applications/luci-app-commands/po/ms/commands.po +++ b/applications/luci-app-commands/po/ms/commands.po @@ -10,9 +10,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "" -msgid "Access command with" -msgstr "" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -36,6 +33,12 @@ msgstr "" msgid "Command" msgstr "" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "" @@ -66,6 +69,9 @@ msgstr "" msgid "Download" msgstr "" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "" @@ -75,12 +81,21 @@ msgstr "" msgid "Loading" msgstr "" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "" msgid "Run" msgstr "" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." diff --git a/applications/luci-app-commands/po/no/commands.po b/applications/luci-app-commands/po/no/commands.po index 29b76e5a2..593c9764f 100644 --- a/applications/luci-app-commands/po/no/commands.po +++ b/applications/luci-app-commands/po/no/commands.po @@ -14,9 +14,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "En kort tekstlig beskrivelse av den konfigurerte kommandoen" -msgid "Access command with" -msgstr "Åpne kommandoen med" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -42,6 +39,12 @@ msgstr "Henter data..." msgid "Command" msgstr "Kommando" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "Kommando feilet" @@ -72,6 +75,9 @@ msgstr "Beskrivelse" msgid "Download" msgstr "Nedlasting" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "Kunne ikke utføre kommandoen!" @@ -81,12 +87,21 @@ msgstr "Link" msgid "Loading" msgstr "Laster" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "Tilgjengelig for alle" msgid "Run" msgstr "Kjør" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." @@ -96,3 +111,6 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "Venter på at kommandoen fullføres..." + +#~ msgid "Access command with" +#~ msgstr "Åpne kommandoen med" diff --git a/applications/luci-app-commands/po/pl/commands.po b/applications/luci-app-commands/po/pl/commands.po index 6f660ba12..7c62eb05c 100644 --- a/applications/luci-app-commands/po/pl/commands.po +++ b/applications/luci-app-commands/po/pl/commands.po @@ -15,9 +15,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "Krótki opis konfigurowanej komendy" -msgid "Access command with" -msgstr "Dostęp do komendy przez" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -43,6 +40,12 @@ msgstr "Zbieram dane:" msgid "Command" msgstr "Komenda" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "Zła komenda" @@ -73,6 +76,9 @@ msgstr "Opis" msgid "Download" msgstr "Download" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "Nie można wykonać komendy!" @@ -82,12 +88,21 @@ msgstr "Łącze" msgid "Loading" msgstr "Ładowanie" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "Publiczny dostęp" msgid "Run" msgstr "Uruchom" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." @@ -97,3 +112,6 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "Czekanie na wykonanie komendy..." + +#~ msgid "Access command with" +#~ msgstr "Dostęp do komendy przez" diff --git a/applications/luci-app-commands/po/pt-br/commands.po b/applications/luci-app-commands/po/pt-br/commands.po index 83c7bd5db..f6bee73c9 100644 --- a/applications/luci-app-commands/po/pt-br/commands.po +++ b/applications/luci-app-commands/po/pt-br/commands.po @@ -14,9 +14,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "Uma pequena descrição textual do comando configurado" -msgid "Access command with" -msgstr "Acessar o comando com" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -42,6 +39,12 @@ msgstr "Adquirindo dados..." msgid "Command" msgstr "Comando" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "O comando falhou" @@ -72,6 +75,9 @@ msgstr "Descrição" msgid "Download" msgstr "Baixar" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "Falha ao executar comando!" @@ -81,12 +87,21 @@ msgstr "Endereço" msgid "Loading" msgstr "Carregando" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "Acesso público" msgid "Run" msgstr "Executar" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." @@ -96,3 +111,6 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "Aguardando a conclusão do comando..." + +#~ msgid "Access command with" +#~ msgstr "Acessar o comando com" diff --git a/applications/luci-app-commands/po/pt/commands.po b/applications/luci-app-commands/po/pt/commands.po index a46b7d21b..b2ad0ae44 100644 --- a/applications/luci-app-commands/po/pt/commands.po +++ b/applications/luci-app-commands/po/pt/commands.po @@ -14,9 +14,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "Uma pequena descrição textual do comando configurado" -msgid "Access command with" -msgstr "Aceder ao comando com" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -43,6 +40,12 @@ msgstr "A obter dados..." msgid "Command" msgstr "Comando" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "O comando falhou" @@ -73,6 +76,9 @@ msgstr "Descrição" msgid "Download" msgstr "Descarregar" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "Falha ao executar comando!" @@ -82,12 +88,21 @@ msgstr "Link" msgid "Loading" msgstr "A carregar" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "Acesso público" msgid "Run" msgstr "Executar" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." @@ -97,3 +112,6 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "A aguardar que o comando termine..." + +#~ msgid "Access command with" +#~ msgstr "Aceder ao comando com" diff --git a/applications/luci-app-commands/po/ro/commands.po b/applications/luci-app-commands/po/ro/commands.po index 05c4574b9..57d1f7bb2 100644 --- a/applications/luci-app-commands/po/ro/commands.po +++ b/applications/luci-app-commands/po/ro/commands.po @@ -15,9 +15,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "O scurta descriere textuala a comenzii configurate" -msgid "Access command with" -msgstr "Acces la comanda cu" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -43,6 +40,12 @@ msgstr "Colectare date..." msgid "Command" msgstr "Comandă" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "Comandă eşuată" @@ -73,6 +76,9 @@ msgstr "Descriere" msgid "Download" msgstr "Descarca" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "S-a esuat executarea comenzii!!" @@ -82,12 +88,21 @@ msgstr "Link" msgid "Loading" msgstr "Se incarca" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "Access public" msgid "Run" msgstr "Ruleaza" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." @@ -97,3 +112,6 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "Astept finalizarea comenzii..." + +#~ msgid "Access command with" +#~ msgstr "Acces la comanda cu" diff --git a/applications/luci-app-commands/po/ru/commands.po b/applications/luci-app-commands/po/ru/commands.po index 6197231c1..0c035ab73 100644 --- a/applications/luci-app-commands/po/ru/commands.po +++ b/applications/luci-app-commands/po/ru/commands.po @@ -15,9 +15,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "Короткое текстовое описание команды" -msgid "Access command with" -msgstr "Доступ к команде через" - #, fuzzy msgid "" "Allow executing the command and downloading its output without prior " @@ -46,6 +43,12 @@ msgstr "Сбор данных..." msgid "Command" msgstr "Команда" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "Команда не выполнена" @@ -76,6 +79,9 @@ msgstr "Описание" msgid "Download" msgstr "Скачать" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "Ошибка выполнения команды!" @@ -85,12 +91,21 @@ msgstr "Ссылка" msgid "Loading" msgstr "Загрузка" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "Публичный доступ" msgid "Run" msgstr "Запуск" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." @@ -100,3 +115,6 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "Ожидание завершения команды..." + +#~ msgid "Access command with" +#~ msgstr "Доступ к команде через" diff --git a/applications/luci-app-commands/po/sk/commands.po b/applications/luci-app-commands/po/sk/commands.po index 4133dfb2d..17bed402d 100644 --- a/applications/luci-app-commands/po/sk/commands.po +++ b/applications/luci-app-commands/po/sk/commands.po @@ -11,9 +11,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "" -msgid "Access command with" -msgstr "" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -37,6 +34,12 @@ msgstr "" msgid "Command" msgstr "" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "" @@ -67,6 +70,9 @@ msgstr "" msgid "Download" msgstr "" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "" @@ -76,12 +82,21 @@ msgstr "" msgid "Loading" msgstr "" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "" msgid "Run" msgstr "" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." diff --git a/applications/luci-app-commands/po/sv/commands.po b/applications/luci-app-commands/po/sv/commands.po index 9fbe0afee..5a4c255e4 100644 --- a/applications/luci-app-commands/po/sv/commands.po +++ b/applications/luci-app-commands/po/sv/commands.po @@ -12,9 +12,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "" -msgid "Access command with" -msgstr "" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -38,6 +35,12 @@ msgstr "" msgid "Command" msgstr "" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "" @@ -68,6 +71,9 @@ msgstr "" msgid "Download" msgstr "" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "" @@ -77,12 +83,21 @@ msgstr "" msgid "Loading" msgstr "" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "" msgid "Run" msgstr "" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." diff --git a/applications/luci-app-commands/po/templates/commands.pot b/applications/luci-app-commands/po/templates/commands.pot index 5d2ffae6d..31df11dc1 100644 --- a/applications/luci-app-commands/po/templates/commands.pot +++ b/applications/luci-app-commands/po/templates/commands.pot @@ -4,9 +4,6 @@ msgstr "Content-Type: text/plain; charset=UTF-8" msgid "A short textual description of the configured command" msgstr "" -msgid "Access command with" -msgstr "" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -30,6 +27,12 @@ msgstr "" msgid "Command" msgstr "" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "" @@ -60,6 +63,9 @@ msgstr "" msgid "Download" msgstr "" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "" @@ -69,12 +75,21 @@ msgstr "" msgid "Loading" msgstr "" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "" msgid "Run" msgstr "" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." diff --git a/applications/luci-app-commands/po/tr/commands.po b/applications/luci-app-commands/po/tr/commands.po index 413227402..587bc2b84 100644 --- a/applications/luci-app-commands/po/tr/commands.po +++ b/applications/luci-app-commands/po/tr/commands.po @@ -11,9 +11,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "" -msgid "Access command with" -msgstr "" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -37,6 +34,12 @@ msgstr "" msgid "Command" msgstr "" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "" @@ -67,6 +70,9 @@ msgstr "" msgid "Download" msgstr "" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "" @@ -76,12 +82,21 @@ msgstr "" msgid "Loading" msgstr "" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "" msgid "Run" msgstr "" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." diff --git a/applications/luci-app-commands/po/uk/commands.po b/applications/luci-app-commands/po/uk/commands.po index 74a19f374..f72fc9354 100644 --- a/applications/luci-app-commands/po/uk/commands.po +++ b/applications/luci-app-commands/po/uk/commands.po @@ -16,9 +16,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "Короткий опис команд налаштування" -msgid "Access command with" -msgstr "" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -43,6 +40,12 @@ msgstr "Збирання даних..." msgid "Command" msgstr "" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "Команда не виконана" @@ -74,6 +77,9 @@ msgstr "Опис" msgid "Download" msgstr "Завантажити" +msgid "Download execution result" +msgstr "" + #, fuzzy msgid "Failed to execute command!" msgstr "Помилка під час запуску команди!" @@ -84,12 +90,21 @@ msgstr "" msgid "Loading" msgstr "Триває завантаження" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "Відкритий доступ" msgid "Run" msgstr "Запустити" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + #, fuzzy msgid "" "This page allows you to configure custom shell commands which can be easily " diff --git a/applications/luci-app-commands/po/vi/commands.po b/applications/luci-app-commands/po/vi/commands.po index 413227402..587bc2b84 100644 --- a/applications/luci-app-commands/po/vi/commands.po +++ b/applications/luci-app-commands/po/vi/commands.po @@ -11,9 +11,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "" -msgid "Access command with" -msgstr "" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -37,6 +34,12 @@ msgstr "" msgid "Command" msgstr "" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "" @@ -67,6 +70,9 @@ msgstr "" msgid "Download" msgstr "" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "" @@ -76,12 +82,21 @@ msgstr "" msgid "Loading" msgstr "" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "" msgid "Run" msgstr "" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." diff --git a/applications/luci-app-commands/po/zh-cn/commands.po b/applications/luci-app-commands/po/zh-cn/commands.po index 8b2b032b6..90f1dbed2 100644 --- a/applications/luci-app-commands/po/zh-cn/commands.po +++ b/applications/luci-app-commands/po/zh-cn/commands.po @@ -1,22 +1,20 @@ msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2013-10-08 15:47+0200\n" -"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n" +"Project-Id-Version: \n" +"PO-Revision-Date: 2017-01-21 09:34+0900\n" +"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Language-Team: none\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.6\n" +"X-Generator: Poedit 1.8.11\n" +"POT-Creation-Date: \n" msgid "A short textual description of the configured command" msgstr "简短描述命令用途" -msgid "Access command with" -msgstr "访问命令" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -40,6 +38,12 @@ msgstr "收集数据：" msgid "Command" msgstr "命令" +msgid "Command executed successfully." +msgstr "命令成功执行。" + +msgid "Command exited with status code" +msgstr "命令退出，状态码：" + msgid "Command failed" msgstr "执行命令失败" @@ -70,6 +74,9 @@ msgstr "描述" msgid "Download" msgstr "下载" +msgid "Download execution result" +msgstr "下载执行结果" + msgid "Failed to execute command!" msgstr "执行命令失败！" @@ -79,12 +86,21 @@ msgstr "连接" msgid "Loading" msgstr "加载中" +msgid "Or display result" +msgstr "显示执行结果" + msgid "Public access" msgstr "公共访问" msgid "Run" msgstr "运行" +msgid "Standard Error" +msgstr "标准错误流" + +msgid "Standard Output" +msgstr "标准输出流" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." @@ -92,3 +108,6 @@ msgstr "此页面允许您配置自定义Shell命令，并可以从Web界面调 msgid "Waiting for command to complete..." msgstr "等待命令执行完成... ..." + +#~ msgid "Command exited with status code " +#~ msgstr "命令退出，状态码：" diff --git a/applications/luci-app-commands/po/zh-tw/commands.po b/applications/luci-app-commands/po/zh-tw/commands.po index 4377ead46..f1f452518 100644 --- a/applications/luci-app-commands/po/zh-tw/commands.po +++ b/applications/luci-app-commands/po/zh-tw/commands.po @@ -14,9 +14,6 @@ msgstr "" msgid "A short textual description of the configured command" msgstr "以短文描述設定指令" -msgid "Access command with" -msgstr "存取指令" - msgid "" "Allow executing the command and downloading its output without prior " "authentication" @@ -40,6 +37,12 @@ msgstr "收集資料中..." msgid "Command" msgstr "指令" +msgid "Command executed successfully." +msgstr "" + +msgid "Command exited with status code" +msgstr "" + msgid "Command failed" msgstr "命令失敗" @@ -70,6 +73,9 @@ msgstr "描述" msgid "Download" msgstr "下載" +msgid "Download execution result" +msgstr "" + msgid "Failed to execute command!" msgstr "執行指令失敗!" @@ -79,12 +85,21 @@ msgstr "連結" msgid "Loading" msgstr "掛載" +msgid "Or display result" +msgstr "" + msgid "Public access" msgstr "公用存取" msgid "Run" msgstr "執行" +msgid "Standard Error" +msgstr "" + +msgid "Standard Output" +msgstr "" + msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." @@ -92,3 +107,6 @@ msgstr "只要可以從web介輕易調用, 這頁面允許你自定shell指令." msgid "Waiting for command to complete..." msgstr "等待完整命令中..." + +#~ msgid "Access command with" +#~ msgstr "存取指令" diff --git a/applications/luci-app-dynapoint/po/ja/dynapoint.po b/applications/luci-app-dynapoint/po/ja/dynapoint.po index 02737395b..75031985f 100644 --- a/applications/luci-app-dynapoint/po/ja/dynapoint.po +++ b/applications/luci-app-dynapoint/po/ja/dynapoint.po @@ -19,13 +19,11 @@ msgid "Append hostname to ssid" msgstr "ホスト名をSSIDに追加する" msgid "Append the router's hostname to the SSID when connectivity check fails" -msgstr "" -"接続性のチェックが失敗した場合、ルーターのホスト名をSSIDに追加します。" +msgstr "接続性のチェックが失敗した場合、ルーターのホスト名をSSIDに追加します。" msgid "Check Internet connectivity via HTTP header download" msgstr "" -"HTTP ヘッダーのダウンロードを通して、インターネットの接続性をチェックしま" -"す。" +"HTTP ヘッダーのダウンロードを通して、インターネットの接続性をチェックします。" msgid "Configuration" msgstr "設定" @@ -62,8 +60,8 @@ msgstr "ホストアドレスのリスト" msgid "" "List of host addresses (url or IP) to track and request http headers from" msgstr "" -"HTTP ヘッダーの追跡およびリクエストを行う、ホスト アドレス（URLまたはIP）の" -"リストです。" +"HTTP ヘッダーの追跡およびリクエストを行う、ホスト アドレス（URLまたはIP）のリ" +"ストです。" msgid "Mode" msgstr "モード" @@ -103,8 +101,8 @@ msgstr "使用するインターフェース" msgid "Which interface should curl use. (Use ifconfig to find out)" msgstr "" -"curl が使用するインターフェースです。ifconfigを使用してインターフェース名を" -"確認します。" +"curl が使用するインターフェースです。ifconfigを使用してインターフェース名を確" +"認します。" msgid "WiFi Status" msgstr "無線ステータス" diff --git a/applications/luci-app-dynapoint/po/templates/dynapoint.pot b/applications/luci-app-dynapoint/po/templates/dynapoint.pot index d72e0c941..f352425be 100644 --- a/applications/luci-app-dynapoint/po/templates/dynapoint.pot +++ b/applications/luci-app-dynapoint/po/templates/dynapoint.pot @@ -90,4 +90,3 @@ msgstr "" msgid "WiFi Status" msgstr "" - diff --git a/applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua b/applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua index 22f1c7716..17a49483d 100644 --- a/applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua +++ b/applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua @@ -73,7 +73,7 @@ o = s:option(Value, "src_ip", translate("Source IP address"), translate("Only match incoming traffic from this IP or range.")) o.rmempty = true -o.datatype = "neg(ip4addr)" +o.datatype = "neg(ipmask4)" o.placeholder = translate("any") luci.sys.net.ipv4_hints(function(ip, name) @@ -99,7 +99,7 @@ end) o.rmempty = true -o.datatype = "neg(ip4addr)" +o.datatype = "neg(ipmask4)" o.placeholder = translate("any") @@ -119,7 +119,7 @@ o.template = "cbi/firewall_zonelist" o = s:option(Value, "dest_ip", translate("Internal IP address"), translate("Redirect matched incoming traffic to the specified \ internal host")) -o.datatype = "ip4addr" +o.datatype = "ipmask4" luci.sys.net.ipv4_hints(function(ip, name) o:value(ip, "%s (%s)" %{ ip, name }) diff --git a/applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua b/applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua index 97e93ae05..1c838888f 100644 --- a/applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua +++ b/applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua @@ -99,7 +99,7 @@ elseif rule_type == "redirect" then o = s:option(Value, "src_ip", translate("Source IP address")) o.rmempty = true - o.datatype = "neg(ipaddr)" + o.datatype = "neg(ipmask4)" o.placeholder = translate("any") luci.sys.net.ipv4_hints(function(ip, name) @@ -123,7 +123,7 @@ elseif rule_type == "redirect" then o = s:option(Value, "dest_ip", translate("Destination IP address")) - o.datatype = "neg(ip4addr)" + o.datatype = "neg(ipmask4)" luci.sys.net.ipv4_hints(function(ip, name) o:value(ip, "%s (%s)" %{ ip, name }) @@ -269,7 +269,7 @@ else o = s:option(Value, "src_ip", translate("Source address")) - o.datatype = "neg(ipaddr)" + o.datatype = "neg(ipmask)" o.placeholder = translate("any") luci.sys.net.ipv4_hints(function(ip, name) @@ -290,7 +290,7 @@ else o = s:option(Value, "dest_ip", translate("Destination address")) - o.datatype = "neg(ipaddr)" + o.datatype = "neg(ipmask)" o.placeholder = translate("any") luci.sys.net.ipv4_hints(function(ip, name) diff --git a/applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua b/applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua index c8b8f22bd..500d1bf32 100644 --- a/applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua +++ b/applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua @@ -126,7 +126,7 @@ msrc = s:taboption("advanced", DynamicList, "masq_src", translate("Restrict Masquerading to given source subnets")) msrc.optional = true -msrc.datatype = "list(neg(or(uciname,hostname,ip4addr)))" +msrc.datatype = "list(neg(or(uciname,hostname,ipmask4)))" msrc.placeholder = "0.0.0.0/0" msrc:depends("family", "") msrc:depends("family", "ipv4") @@ -135,7 +135,7 @@ mdest = s:taboption("advanced", DynamicList, "masq_dest", translate("Restrict Masquerading to given destination subnets")) mdest.optional = true -mdest.datatype = "list(neg(or(uciname,hostname,ip4addr)))" +mdest.datatype = "list(neg(or(uciname,hostname,ipmask4)))" mdest.placeholder = "0.0.0.0/0" mdest:depends("family", "") mdest:depends("family", "ipv4") diff --git a/applications/luci-app-firewall/po/ko/firewall.po b/applications/luci-app-firewall/po/ko/firewall.po index 699af7b3b..f43fdc882 100644 --- a/applications/luci-app-firewall/po/ko/firewall.po +++ b/applications/luci-app-firewall/po/ko/firewall.po @@ -72,9 +72,9 @@ msgid "" "otherwise covered by the firewall framework. The commands are executed after " "each firewall restart, right after the default ruleset has been loaded." msgstr "" -"Custom rule 은 방화벽 UI 로 해결이 되지 않는 임의의 iptables 명령을 " -"실행할 수 있도록 합니다. 입력된 명령어들은 매 방화벽 재시작시 실행되는데 " -"default ruleset 이 load 된 후 시점입니다." +"Custom rule 은 방화벽 UI 로 해결이 되지 않는 임의의 iptables 명령을 실행할 " +"수 있도록 합니다. 입력된 명령어들은 매 방화벽 재시작시 실행되는데 default " +"ruleset 이 load 된 후 시점입니다." msgid "Destination IP address" msgstr "Destination IP 주소" @@ -272,8 +272,8 @@ msgid "" "Port forwarding allows remote computers on the Internet to connect to a " "specific computer or service within the private LAN." msgstr "" -"Port forwarding 기능은 인터넷 상의 원격 컴퓨터가 내부 LAN 에 속한 " -"특정 컴퓨터나 서비스에 접속할 수 있도록 합니다." +"Port forwarding 기능은 인터넷 상의 원격 컴퓨터가 내부 LAN 에 속한 특정 컴퓨터" +"나 서비스에 접속할 수 있도록 합니다." msgid "Protocol" msgstr "" @@ -285,6 +285,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "주어진 destination subnet 으로 Masquerading 제한" @@ -332,8 +335,8 @@ msgid "" "multiple WAN addresses to internal subnets." msgstr "" "Source NAT 기능은 masquerading 의 한 형태로써 outgoing 트래픽이 사용할 " -"source IP 를 세밀하게 제어할 수 있습니다. 예를 들어 다수의 WAN 주소들을 " -"내부 subnet 에 매핑(mapping) 할 경우 사용됩니다." +"source IP 를 세밀하게 제어할 수 있습니다. 예를 들어 다수의 WAN 주소들을 내" +"부 subnet 에 매핑(mapping) 할 경우 사용됩니다." msgid "Source address" msgstr "Source 주소" @@ -363,8 +366,8 @@ msgid "" "The firewall creates zones over your network interfaces to control network " "traffic flow." msgstr "" -"방화벽 기능을 이용하여 네트워크 인터페이스와 연결된 zone 을 생성할 수 있고 " -"이를 이용하여 네트워크 traffic flow 를 제어할 수 있습니다." +"방화벽 기능을 이용하여 네트워크 인터페이스와 연결된 zone 을 생성할 수 있고 이" +"를 이용하여 네트워크 traffic flow 를 제어할 수 있습니다." msgid "" "The options below control the forwarding policies between this zone (%s) and " @@ -375,19 +378,18 @@ msgid "" "<em>not</em> imply a permission to forward from wan to lan as well." msgstr "" "이 zone (%s) 과 다른 zone 들 사이의 forwarding 정책을 제어하는 옵션들입니다. " -"<em>Destination zones</em> 은 <strong>%q 에서 출발한 </strong> " -"forward traffic 을 뜻하고, <em>Source zones</em> 은 다른 zone 들에서 " -"<strong>%q 로 전달되는</strong> forward traffic 을 뜻합니다. " -"Forwarding rule 은 <em>unidirectional</em> 인데, 예를 들어 LAN 에서 WAN " -"으로의 forward 규칙이 WAN 에서 LAN 으로의 forward 를 허락하는 것이 " -"아닙니다." +"<em>Destination zones</em> 은 <strong>%q 에서 출발한 </strong> forward " +"traffic 을 뜻하고, <em>Source zones</em> 은 다른 zone 들에서 <strong>%q 로 전" +"달되는</strong> forward traffic 을 뜻합니다. Forwarding rule 은 " +"<em>unidirectional</em> 인데, 예를 들어 LAN 에서 WAN 으로의 forward 규칙이 " +"WAN 에서 LAN 으로의 forward 를 허락하는 것이 아닙니다." msgid "" "This page allows you to change advanced properties of the port forwarding " "entry. In most cases there is no need to modify those settings." msgstr "" -"이 메뉴에서는 port forwarding 의 고급 설정 정보를 변경할 수 있습니다. " -"대부분의 경우 이 설정을 수정할 일이 없습니다." +"이 메뉴에서는 port forwarding 의 고급 설정 정보를 변경할 수 있습니다. 대부분" +"의 경우 이 설정을 수정할 일이 없습니다." msgid "" "This page allows you to change advanced properties of the traffic rule " @@ -405,11 +407,10 @@ msgid "" "networks</em> specifies which available networks are members of this zone." msgstr "" "이 섹션은 %q 의 공통 속성을 설정할 수 있습니다. <em>input</em> 과 " -"<em>output</em> 옵션은 이 zone 으로 전달되어 들오거나 나가는 트래픽에 대한 " -"기본 정책을 뜻합니다. <em>forward</em> 옵션은 zone 내에서 다른 네트워크들 " -"사이를 오가는 forward traffic 에 대한 정책을 뜻합니다. " -"<em>Covered networks</em> 에서는 zone 의 영향을 받을 네트워크들을 지정할 수 " -"있습니다." +"<em>output</em> 옵션은 이 zone 으로 전달되어 들오거나 나가는 트래픽에 대한 기" +"본 정책을 뜻합니다. <em>forward</em> 옵션은 zone 내에서 다른 네트워크들 사이" +"를 오가는 forward traffic 에 대한 정책을 뜻합니다. <em>Covered networks</em> " +"에서는 zone 의 영향을 받을 네트워크들을 지정할 수 있습니다." msgid "Thursday" msgstr "목요일" @@ -443,9 +444,9 @@ msgid "" "for example to reject traffic between certain hosts or to open WAN ports on " "the router." msgstr "" -"Traffic rule 은 서로 다른 zone 사이를 오가는 패킷들에 대한 정책을 " -"정의합니다. 예를 들어 특정 host 들 사이의 트래픽을 차단하거나 " -"공유기의 WAN port 를 open 할때 사용됩니다." +"Traffic rule 은 서로 다른 zone 사이를 오가는 패킷들에 대한 정책을 정의합니" +"다. 예를 들어 특정 host 들 사이의 트래픽을 차단하거나 공유기의 WAN port 를 " +"open 할때 사용됩니다." msgid "Tuesday" msgstr "화요일" diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua index f31fb2093..fa00bbbf5 100644 --- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua +++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua @@ -19,7 +19,12 @@ enable = s:option( Flag, "enable", translate("Enable this plugin") ) enable.default = 1 -- collectd_rrdtool.datadir (DataDir) -datadir = s:option( Value, "DataDir", translate("Storage directory") ) +datadir = s:option( Value, "DataDir", + translate("Storage directory"), + translate("Note: as pages are rendered by user 'nobody', the *.rrd files, " .. + "the storage directory and all its parent directories need " .. + "to be world readable." + )) datadir.default = "/tmp" datadir.rmempty = true datadir.optional = true diff --git a/applications/luci-app-statistics/po/ca/statistics.po b/applications/luci-app-statistics/po/ca/statistics.po index fd3b6d19b..b6a98a099 100644 --- a/applications/luci-app-statistics/po/ca/statistics.po +++ b/applications/luci-app-statistics/po/ca/statistics.po @@ -331,6 +331,11 @@ msgstr "Connectors de xarxa" msgid "Network protocol" msgstr "Protocol de xarxa" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "Número de fils de recol·lecció de dades" diff --git a/applications/luci-app-statistics/po/cs/statistics.po b/applications/luci-app-statistics/po/cs/statistics.po index 9678726ab..b4a936a7c 100644 --- a/applications/luci-app-statistics/po/cs/statistics.po +++ b/applications/luci-app-statistics/po/cs/statistics.po @@ -326,6 +326,11 @@ msgstr "Síťové pluginy" msgid "Network protocol" msgstr "Síťový protokol" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "Počet vláken pro sběr dat" diff --git a/applications/luci-app-statistics/po/de/statistics.po b/applications/luci-app-statistics/po/de/statistics.po index 2923f05c0..ef29176f6 100644 --- a/applications/luci-app-statistics/po/de/statistics.po +++ b/applications/luci-app-statistics/po/de/statistics.po @@ -333,6 +333,11 @@ msgstr "Netzwerkplugins" msgid "Network protocol" msgstr "Netzwerkprotokoll" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "Anzahl paralleler Sammelprozesse" diff --git a/applications/luci-app-statistics/po/el/statistics.po b/applications/luci-app-statistics/po/el/statistics.po index 379d443ec..9b530c013 100644 --- a/applications/luci-app-statistics/po/el/statistics.po +++ b/applications/luci-app-statistics/po/el/statistics.po @@ -324,6 +324,11 @@ msgstr "Πρόσθετα δικτύου" msgid "Network protocol" msgstr "" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "Αριθμός νημάτων για τη συλλογή δεδομένων" diff --git a/applications/luci-app-statistics/po/en/statistics.po b/applications/luci-app-statistics/po/en/statistics.po index aa956de12..3e9c82915 100644 --- a/applications/luci-app-statistics/po/en/statistics.po +++ b/applications/luci-app-statistics/po/en/statistics.po @@ -329,6 +329,11 @@ msgstr "Network plugins" msgid "Network protocol" msgstr "Network protocol" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "Number of threads for data collection" diff --git a/applications/luci-app-statistics/po/es/statistics.po b/applications/luci-app-statistics/po/es/statistics.po index ef186b120..2db483cfa 100644 --- a/applications/luci-app-statistics/po/es/statistics.po +++ b/applications/luci-app-statistics/po/es/statistics.po @@ -328,6 +328,11 @@ msgstr "Plugins de red" msgid "Network protocol" msgstr "Protocolo de red" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "Número de hilos para recolección de datos" diff --git a/applications/luci-app-statistics/po/fr/statistics.po b/applications/luci-app-statistics/po/fr/statistics.po index cacc64ab4..d4190d34a 100644 --- a/applications/luci-app-statistics/po/fr/statistics.po +++ b/applications/luci-app-statistics/po/fr/statistics.po @@ -330,6 +330,11 @@ msgstr "Greffons liés au réseau" msgid "Network protocol" msgstr "Protocole réseau" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "Nombre de fils pour la récupération des données" diff --git a/applications/luci-app-statistics/po/he/statistics.po b/applications/luci-app-statistics/po/he/statistics.po index 0f876e6e4..e27d219b0 100644 --- a/applications/luci-app-statistics/po/he/statistics.po +++ b/applications/luci-app-statistics/po/he/statistics.po @@ -319,6 +319,11 @@ msgstr "" msgid "Network protocol" msgstr "" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "" diff --git a/applications/luci-app-statistics/po/hu/statistics.po b/applications/luci-app-statistics/po/hu/statistics.po index 78dfd6038..476744211 100644 --- a/applications/luci-app-statistics/po/hu/statistics.po +++ b/applications/luci-app-statistics/po/hu/statistics.po @@ -331,6 +331,11 @@ msgstr "Hálózati bővítmények" msgid "Network protocol" msgstr "Hálózati protokoll" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "Az adatgyűjtő szálak száma" diff --git a/applications/luci-app-statistics/po/it/statistics.po b/applications/luci-app-statistics/po/it/statistics.po index eb1a3cb6f..3c50ac3d3 100644 --- a/applications/luci-app-statistics/po/it/statistics.po +++ b/applications/luci-app-statistics/po/it/statistics.po @@ -329,6 +329,11 @@ msgstr "" msgid "Network protocol" msgstr "" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "" diff --git a/applications/luci-app-statistics/po/ja/statistics.po b/applications/luci-app-statistics/po/ja/statistics.po index 218712b53..2a3ffe54c 100644 --- a/applications/luci-app-statistics/po/ja/statistics.po +++ b/applications/luci-app-statistics/po/ja/statistics.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-05-19 19:36+0200\n" -"PO-Revision-Date: 2016-12-23 15:07+0900\n" +"PO-Revision-Date: 2017-01-24 15:08+0900\n" "Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -216,7 +216,7 @@ msgid "IRQ Plugin Configuration" msgstr "IRQ プラグイン設定" msgid "Ignore source addresses" -msgstr "" +msgstr "無視するアクセス元アドレス" msgid "Incoming interface" msgstr "着信インターフェース" @@ -331,6 +331,14 @@ msgstr "ネットワークプラグイン" msgid "Network protocol" msgstr "ネットワークプロトコル" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" +"注意: ページは 'nobody' ユーザーとしてレンダリングされます。*.rrd ファイルと" +"保存先ディレクトリ、およびそのペアレントディレクトリは、worldアクセス権が " +"\"読み取り可能\" に設定されている必要があります。" + msgid "Number of threads for data collection" msgstr "データ収集用スレッド数" @@ -377,7 +385,7 @@ msgid "Processes Plugin Configuration" msgstr "プロセス プラグイン設定" msgid "Processes to monitor separated by space" -msgstr "" +msgstr "スペースで区切られた、モニターするプロセスです。" msgid "Processor" msgstr "プロセッサー" @@ -628,7 +636,7 @@ msgid "" "memory usage of selected processes." msgstr "" "プロセス プラグインは、選択されたプロセスのCPU時間やページフォルト、メモリー" -"使用率のような情報を収集します。" +"使用率などの情報を収集します。" msgid "" "The rrdtool plugin stores the collected data in rrd database files, the " @@ -666,6 +674,8 @@ msgid "" "The tcpconns plugin collects informations about open tcp connections on " "selected ports." msgstr "" +"TCP接続プラグインは、選択されたポートにおいてオープンなTCP接続についての情報" +"を収集します。" msgid "" "The thermal plugin will monitor temperature of the system. Data is typically " diff --git a/applications/luci-app-statistics/po/ms/statistics.po b/applications/luci-app-statistics/po/ms/statistics.po index a18826f42..2a047767e 100644 --- a/applications/luci-app-statistics/po/ms/statistics.po +++ b/applications/luci-app-statistics/po/ms/statistics.po @@ -316,6 +316,11 @@ msgstr "" msgid "Network protocol" msgstr "" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "" diff --git a/applications/luci-app-statistics/po/no/statistics.po b/applications/luci-app-statistics/po/no/statistics.po index 2072cbfff..3e3a8e125 100644 --- a/applications/luci-app-statistics/po/no/statistics.po +++ b/applications/luci-app-statistics/po/no/statistics.po @@ -318,6 +318,11 @@ msgstr "Nettverks plugin" msgid "Network protocol" msgstr "Nettverks protokoll" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "Antall tråder for datainnsamling" diff --git a/applications/luci-app-statistics/po/pl/statistics.po b/applications/luci-app-statistics/po/pl/statistics.po index ea8fc81f5..474b673ef 100644 --- a/applications/luci-app-statistics/po/pl/statistics.po +++ b/applications/luci-app-statistics/po/pl/statistics.po @@ -332,6 +332,11 @@ msgstr "Wtyczki sieciowe" msgid "Network protocol" msgstr "Protokoły sieciowe" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "Liczba wątków do zbierania danych" diff --git a/applications/luci-app-statistics/po/pt-br/statistics.po b/applications/luci-app-statistics/po/pt-br/statistics.po index 3b3590f26..44f53f046 100644 --- a/applications/luci-app-statistics/po/pt-br/statistics.po +++ b/applications/luci-app-statistics/po/pt-br/statistics.po @@ -332,6 +332,11 @@ msgstr "Plugins de rede" msgid "Network protocol" msgstr "Protocolo de rede" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "Número de threads para o coletor de dados" diff --git a/applications/luci-app-statistics/po/pt/statistics.po b/applications/luci-app-statistics/po/pt/statistics.po index f30bf90fd..1913d7749 100644 --- a/applications/luci-app-statistics/po/pt/statistics.po +++ b/applications/luci-app-statistics/po/pt/statistics.po @@ -331,6 +331,11 @@ msgstr "Plugins de rede" msgid "Network protocol" msgstr "Protocolo de rede" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "Número de threads para o coletor de dados" diff --git a/applications/luci-app-statistics/po/ro/statistics.po b/applications/luci-app-statistics/po/ro/statistics.po index 0c52e3281..008cc8880 100644 --- a/applications/luci-app-statistics/po/ro/statistics.po +++ b/applications/luci-app-statistics/po/ro/statistics.po @@ -323,6 +323,11 @@ msgstr "Pluginuri de retea" msgid "Network protocol" msgstr "" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "Numarul de threaduri pentru colectarea datelor" diff --git a/applications/luci-app-statistics/po/ru/statistics.po b/applications/luci-app-statistics/po/ru/statistics.po index d1dddbb6b..cb14847a4 100644 --- a/applications/luci-app-statistics/po/ru/statistics.po +++ b/applications/luci-app-statistics/po/ru/statistics.po @@ -333,6 +333,11 @@ msgstr "Сетевые модули" msgid "Network protocol" msgstr "Сетевой протокол" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "Количество потоков сбора данных" diff --git a/applications/luci-app-statistics/po/sk/statistics.po b/applications/luci-app-statistics/po/sk/statistics.po index 6b0caa64c..1d1f013ca 100644 --- a/applications/luci-app-statistics/po/sk/statistics.po +++ b/applications/luci-app-statistics/po/sk/statistics.po @@ -314,6 +314,11 @@ msgstr "" msgid "Network protocol" msgstr "" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "" diff --git a/applications/luci-app-statistics/po/sv/statistics.po b/applications/luci-app-statistics/po/sv/statistics.po index 035d9403f..b6d562be9 100644 --- a/applications/luci-app-statistics/po/sv/statistics.po +++ b/applications/luci-app-statistics/po/sv/statistics.po @@ -319,6 +319,11 @@ msgstr "Insticksprogram för nätverket" msgid "Network protocol" msgstr "Nätverksprotokoll" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "Antalet trådar för insamling av data" diff --git a/applications/luci-app-statistics/po/templates/statistics.pot b/applications/luci-app-statistics/po/templates/statistics.pot index 8f6fecc48..1b83826ad 100644 --- a/applications/luci-app-statistics/po/templates/statistics.pot +++ b/applications/luci-app-statistics/po/templates/statistics.pot @@ -307,6 +307,11 @@ msgstr "" msgid "Network protocol" msgstr "" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "" diff --git a/applications/luci-app-statistics/po/tr/statistics.po b/applications/luci-app-statistics/po/tr/statistics.po index 0f0bc459e..a30b0b966 100644 --- a/applications/luci-app-statistics/po/tr/statistics.po +++ b/applications/luci-app-statistics/po/tr/statistics.po @@ -315,6 +315,11 @@ msgstr "" msgid "Network protocol" msgstr "" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "" diff --git a/applications/luci-app-statistics/po/uk/statistics.po b/applications/luci-app-statistics/po/uk/statistics.po index ca82efe8d..13e52d965 100644 --- a/applications/luci-app-statistics/po/uk/statistics.po +++ b/applications/luci-app-statistics/po/uk/statistics.po @@ -320,6 +320,11 @@ msgstr "" msgid "Network protocol" msgstr "Мережевий протокол" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "" diff --git a/applications/luci-app-statistics/po/vi/statistics.po b/applications/luci-app-statistics/po/vi/statistics.po index f6d54bcd6..a5fd33d05 100644 --- a/applications/luci-app-statistics/po/vi/statistics.po +++ b/applications/luci-app-statistics/po/vi/statistics.po @@ -330,6 +330,11 @@ msgstr "Network plugins" msgid "Network protocol" msgstr "Network protocol" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "Số lượng các chủ đề để thu thập dữ liệu" diff --git a/applications/luci-app-statistics/po/zh-cn/statistics.po b/applications/luci-app-statistics/po/zh-cn/statistics.po index 0c8775f3f..a55f73fb1 100644 --- a/applications/luci-app-statistics/po/zh-cn/statistics.po +++ b/applications/luci-app-statistics/po/zh-cn/statistics.po @@ -325,6 +325,11 @@ msgstr "Network插件" msgid "Network protocol" msgstr "Network协议" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "收集程序使用线程数" diff --git a/applications/luci-app-statistics/po/zh-tw/statistics.po b/applications/luci-app-statistics/po/zh-tw/statistics.po index 404092bed..f9e72b54d 100644 --- a/applications/luci-app-statistics/po/zh-tw/statistics.po +++ b/applications/luci-app-statistics/po/zh-tw/statistics.po @@ -313,6 +313,11 @@ msgstr "" msgid "Network protocol" msgstr "" +msgid "" +"Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " +"directory and all its parent directories need to be world readable." +msgstr "" + msgid "Number of threads for data collection" msgstr "" diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound.lua index 6d876c2c8..847c98a3e 100644 --- a/applications/luci-app-unbound/luasrc/model/cbi/unbound.lua +++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound.lua @@ -5,26 +5,29 @@ m = Map("unbound", translate("Recursive DNS"), translate("Unbound is a validating, recursive, and caching DNS resolver.")) - -s = m:section(TypedSection, "unbound", translate("Unbound Settings")) -s.addremove = false -s.anonymous = true -s:tab("service", translate("Unbound Service")) -s:tab("resource", translate("Unbound Resources")) -s:tab("dnsmasq", translate("Dnsmasq Link")) +s1 = m:section(TypedSection, "unbound") +s1.addremove = false +s1.anonymous = true +s1:tab("service", translate("Basic Settings")) +s1:tab("advanced", translate("Advanced Settings")) +s1:tab("resource", translate("Resource Settings")) ---Enable Unbound +--LuCI or Not -e = s:taboption("service", Flag, "enabled", translate("Enable Unbound:"), +ena = s1:taboption("service", Flag, "enabled", translate("Enable Unbound:"), translate("Enable the initialization scripts for Unbound")) -e.rmempty = false +ena.rmempty = false -function e.cfgvalue(self, section) +mcf = s1:taboption("service", Flag, "manual_conf", translate("Manual Conf:"), + translate("Skip UCI and use /etc/unbound/unbound.conf")) +mcf.rmempty = false + +function ena.cfgvalue(self, section) return luci.sys.init.enabled("unbound") and self.enabled or self.disabled end -function e.write(self, section, value) +function ena.write(self, section, value) if value == "1" then luci.sys.init.enable("unbound") luci.sys.call("/etc/init.d/unbound start >/dev/null") @@ -36,72 +39,136 @@ function e.write(self, section, value) return Flag.write(self, section, value) end ---Service Tab - -mcf = s:taboption("service", Flag, "manual_conf", translate("Manual Conf:"), - translate("Skip UCI and use /etc/unbound/unbound.conf")) -mcf.rmempty = false +--Basic Tab -lsv = s:taboption("service", Flag, "localservice", translate("Local Service:"), +lsv = s1:taboption("service", Flag, "localservice", translate("Local Service:"), translate("Accept queries only from local subnets")) lsv.rmempty = false -qry = s:taboption("service", Flag, "query_minimize", translate("Query Minimize:"), - translate("Break down query components for small added privacy")) -qry.rmempty = false - -rlh = s:taboption("service", Flag, "rebind_localhost", translate("Block Localhost Rebind:"), +rlh = s1:taboption("service", Flag, "rebind_localhost", translate("Block Localhost Rebind:"), translate("Prevent upstream response of 127.0.0.0/8")) rlh.rmempty = false -rpv = s:taboption("service", Flag, "rebind_protection", translate("Block Private Rebind:"), +rpv = s1:taboption("service", Flag, "rebind_protection", translate("Block Private Rebind:"), translate("Prevent upstream response of RFC1918 ranges")) rpv.rmempty = false -vld = s:taboption("service", Flag, "validator", translate("Enable DNSSEC:"), +vld = s1:taboption("service", Flag, "validator", translate("Enable DNSSEC:"), translate("Enable the DNSSEC validator module")) vld.rmempty = false -nvd = s:taboption("service", Flag, "validator_ntp", translate("DNSSEC NTP Fix:"), +nvd = s1:taboption("service", Flag, "validator_ntp", translate("DNSSEC NTP Fix:"), translate("Break the loop where DNSSEC needs NTP and NTP needs DNS")) nvd.rmempty = false +nvd:depends({ validator = true }) -eds = s:taboption("service", Value, "edns_size", translate("EDNS Size:"), +eds = s1:taboption("service", Value, "edns_size", translate("EDNS Size:"), translate("Limit extended DNS packet size")) eds.datatype = "and(uinteger,min(512),max(4096))" eds.rmempty = false -prt = s:taboption("service", Value, "listen_port", translate("Listening Port:"), +prt = s1:taboption("service", Value, "listen_port", translate("Listening Port:"), translate("Choose Unbounds listening port")) prt.datatype = "port" prt.rmempty = false -tlm = s:taboption("service", Value, "ttl_min", translate("TTL Minimum:"), +tlm = s1:taboption("service", Value, "ttl_min", translate("TTL Minimum:"), translate("Prevent excessively short cache periods")) tlm.datatype = "and(uinteger,min(0),max(600))" tlm.rmempty = false -d64 = s:taboption("service", Flag, "dns64", translate("Enable DNS64:"), +--Advanced Tab + +ctl = s1:taboption("advanced", Flag, "unbound_control", translate("Unbound Control App:"), + translate("Enable unecrypted localhost access for unbound-control")) +ctl.rmempty = false + +dlk = s1:taboption("advanced", ListValue, "dhcp_link", translate("DHCP Link:"), + translate("Link to supported programs to load DHCP into DNS")) +dlk:value("none", translate("No Link")) +dlk:value("dnsmasq", "dnsmasq") +dlk:value("odhcpd", "odhcpd") +dlk.rmempty = false + +dom = s1:taboption("advanced", Value, "domain", translate("Local Domain:"), + translate("Domain suffix for this router and DHCP clients")) +dom.placeholder = "lan" +dom:depends({ dhcp_link = "none" }) +dom:depends({ dhcp_link = "odhcpd" }) + +dty = s1:taboption("advanced", ListValue, "domain_type", translate("Local Domain Type:"), + translate("How to treat queries of this local domain")) +dty:value("deny", translate("Ignored")) +dty:value("refuse", translate("Refused")) +dty:value("static", translate("Only Local")) +dty:value("transparent", translate("Also Forwarded")) +dty:depends({ dhcp_link = "none" }) +dty:depends({ dhcp_link = "odhcpd" }) + +lfq = s1:taboption("advanced", ListValue, "add_local_fqdn", translate("LAN DNS:"), + translate("How to enter the LAN or local network router in DNS")) +lfq:value("0", translate("No DNS")) +lfq:value("1", translate("Hostname, Primary Address")) +lfq:value("2", translate("Hostname, All Addresses")) +lfq:value("3", translate("Host FQDN, All Addresses")) +lfq:value("4", translate("Interface FQDN, All Addresses")) +lfq:depends({ dhcp_link = "none" }) +lfq:depends({ dhcp_link = "odhcpd" }) + +wfq = s1:taboption("advanced", ListValue, "add_wan_fqdn", translate("WAN DNS:"), + translate("Override the WAN side router entry in DNS")) +wfq:value("0", translate("Upstream")) +wfq:value("1", translate("Hostname, Primary Address")) +wfq:value("2", translate("Hostname, All Addresses")) +wfq:value("3", translate("Host FQDN, All Addresses")) +wfq:value("4", translate("Interface FQDN, All Addresses")) +wfq:depends({ dhcp_link = "none" }) +wfq:depends({ dhcp_link = "odhcpd" }) + +ctl = s1:taboption("advanced", Flag, "dhcp4_slaac6", translate("DHCPv4 to SLAAC:"), + translate("Use DHCPv4 MAC to discover IP6 hosts SLAAC (EUI64)")) +ctl.rmempty = false + +d64 = s1:taboption("advanced", Flag, "dns64", translate("Enable DNS64:"), translate("Enable the DNS64 module")) d64.rmempty = false -pfx = s:taboption("service", Value, "dns64_prefix", translate("DNS64 Prefix:"), +pfx = s1:taboption("advanced", Value, "dns64_prefix", translate("DNS64 Prefix:"), translate("Prefix for generated DNS64 addresses")) pfx.datatype = "ip6addr" pfx.placeholder = "64:ff9b::/96" pfx.optional = true -pfx:depends({ dns64 = "1" }) +pfx:depends({ dns64 = true }) + +qry = s1:taboption("advanced", Flag, "query_minimize", translate("Query Minimize:"), + translate("Break down query components for limited added privacy")) +qry.rmempty = false + +qrs = s1:taboption("advanced", Flag, "query_min_strict", translate("Strict Minimize:"), + translate("Strict version of 'query minimize' but it can break DNS")) +qrs.rmempty = false +qrs:depends({ query_minimize = true }) + +--TODO: dnsmasq needs to not reference resolve-file and get off port 53. --Resource Tuning Tab -rsn = s:taboption("resource", ListValue, "recursion", translate("Recursion Strength:"), +pro = s1:taboption("resource", ListValue, "protocol", translate("Recursion Protocol:"), + translate("Chose the protocol recursion queries leave on")) +pro:value("mixed", translate("IP4 and IP6")) +pro:value("ip6_prefer", translate("IP6 Preferred")) +pro:value("ip4_only", translate("IP4 Only")) +pro:value("ip6_only", translate("IP6 Only")) +pro.rmempty = false + +rsn = s1:taboption("resource", ListValue, "recursion", translate("Recursion Strength:"), translate("Recursion activity affects memory growth and CPU load")) rsn:value("aggressive", translate("Aggressive")) rsn:value("default", translate("Default")) rsn:value("passive", translate("Passive")) rsn.rmempty = false -rsc = s:taboption("resource", ListValue, "resource", translate("Memory Resource:"), +rsc = s1:taboption("resource", ListValue, "resource", translate("Memory Resource:"), translate("Use menu System/Processes to observe any memory growth")) rsc:value("large", translate("Large")) rsc:value("medium", translate("Medium")) @@ -109,27 +176,14 @@ rsc:value("small", translate("Small")) rsc:value("tiny", translate("Tiny")) rsc.rmempty = false -age = s:taboption("resource", Value, "root_age", translate("Root DSKEY Age:"), +ag2 = s1:taboption("resource", Value, "root_age", translate("Root DSKEY Age:"), translate("Limit days between RFC5011 to reduce flash writes")) -age.datatype = "and(uinteger,min(1),max(99))" -age:value("14", "14") -age:value("28", "28 ("..translate("default")..")") -age:value("45", "45") -age:value("90", "90") -age:value("99", "99 ("..translate("never")..")") - ---Dnsmasq Link Tab - -dld = s:taboption("dnsmasq", Flag, "dnsmasq_link_dns", translate("Link dnsmasq:"), - translate("Forward queries to dnsmasq for local clients")) -dld.rmempty = false - -dgn = s:taboption("dnsmasq", Flag, "dnsmsaq_gate_name", translate("Local Gateway Name:"), - translate("Also query dnsmasq for this hosts outbound gateway")) -dgn.rmempty = false - ---TODO: Read only repective dnsmasq options and inform user of link requirements. ---TODO: dnsmasq needs to not reference resolve-file and get off port 53. +ag2.datatype = "and(uinteger,min(1),max(99))" +ag2:value("14", "14") +ag2:value("28", "28 ("..translate("default")..")") +ag2:value("45", "45") +ag2:value("90", "90") +ag2:value("99", "99 ("..translate("never")..")") return m diff --git a/applications/luci-app-vpnbypass/Makefile b/applications/luci-app-vpnbypass/Makefile new file mode 100644 index 000000000..5f63dcee7 --- /dev/null +++ b/applications/luci-app-vpnbypass/Makefile @@ -0,0 +1,17 @@ +# Copyright (c) 2017 Stan Grishin (stangri@melmac.net) +# This is free software, licensed under the GNU General Public License v3. + +include $(TOPDIR)/rules.mk + +PKG_VERSION:=1.0.0 +PKG_RELEASE:=5 +PKG_LICENSE:=GPL-3.0+ +PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net> + +LUCI_TITLE:=VPN Bypass Web UI +LUCI_DEPENDS:=+vpnbypass +LUCI_PKGARCH:=all + +include ../../luci.mk + +# call BuildPackage - OpenWrt buildroot signature
\ No newline at end of file diff --git a/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua new file mode 100644 index 000000000..6becd6791 --- /dev/null +++ b/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua @@ -0,0 +1,8 @@ +module("luci.controller.vpnbypass", package.seeall) +function index() + if not nixio.fs.access("/etc/config/vpnbypass") then + return + end + entry({"admin", "services", "vpnbypass"}, cbi("vpnbypass"), translate("VPN Bypass"), 1) +end + diff --git a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua new file mode 100644 index 000000000..195794838 --- /dev/null +++ b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua @@ -0,0 +1,35 @@ +m = Map("vpnbypass", translate("VPN Bypass Settings"), translate("Configuration of VPN Bypass Settings")) +s = m:section(NamedSection, "config", "vpnbypass") + +-- General options +o1 = s:option(Flag, "enabled", translate("Enable VPN Bypass")) +o1.rmempty = false +o1.default = 0 + +-- Local Ports +p1 = s:option(DynamicList, "localport", translate("Local Ports to Bypass"), translate("Local ports to trigger VPN Bypass")) +p1.addremove = true +p1.optional = true + +-- Remote Ports +p2 = s:option(DynamicList, "remoteport", translate("Remote Ports to Bypass"), translate("Remote ports to trigger VPN Bypass")) +p2.addremove = true +p2.optional = true + +-- Local Subnets +r1 = s:option(DynamicList, "localsubnet", translate("Local IP Subnets to Bypass"), translate("Local IP ranges with direct internet access (outside of the VPN tunnel)")) +r1.addremove = true +r1.optional = true + +-- Remote Subnets +r2 = s:option(DynamicList, "remotesubnet", translate("Remote IP Subnets to Bypass"), translate("Remote IP ranges which will be accessed directly (outside of the VPN tunnel)")) +r2.addremove = true +r2.optional = true + +-- Domains +d1 = s:option(DynamicList, "domain", translate("Domains to Bypass"), translate("Domains which will be accessed directly (outside of the VPN tunnel)")) +d1.addremove = true +d1.optional = true + +return m + diff --git a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot new file mode 100644 index 000000000..c0dd33dfb --- /dev/null +++ b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot @@ -0,0 +1,45 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8" + +msgid "Configuration of VPN Bypass Settings" +msgstr "" + +msgid "Domains to Bypass" +msgstr "" + +msgid "Domains which will be accessed directly (outside of the VPN tunnel)" +msgstr "" + +msgid "Enable VPN Bypass" +msgstr "" + +msgid "Local IP Subnets to Bypass" +msgstr "" + +msgid "Local IP ranges with direct internet access (outside of the VPN tunnel)" +msgstr "" + +msgid "Local Ports to Bypass" +msgstr "" + +msgid "Local ports to trigger VPN Bypass" +msgstr "" + +msgid "Remote IP Subnets to Bypass" +msgstr "" + +msgid "" +"Remote IP ranges which will be accessed directly (outside of the VPN tunnel)" +msgstr "" + +msgid "Remote Ports to Bypass" +msgstr "" + +msgid "Remote ports to trigger VPN Bypass" +msgstr "" + +msgid "VPN Bypass" +msgstr "" + +msgid "VPN Bypass Settings" +msgstr "" diff --git a/applications/luci-app-vpnbypass/root/etc/uci-defaults/40_luci-vpnbypass b/applications/luci-app-vpnbypass/root/etc/uci-defaults/40_luci-vpnbypass new file mode 100644 index 000000000..9455701a0 --- /dev/null +++ b/applications/luci-app-vpnbypass/root/etc/uci-defaults/40_luci-vpnbypass @@ -0,0 +1,11 @@ +#!/bin/sh +uci -q batch <<-EOF >/dev/null + delete ucitrack.@vpnbypass[-1] + add ucitrack vpnbypass + set ucitrack.@vpnbypass[-1].init=vpnbypass + commit ucitrack +EOF + +rm -f /tmp/luci-indexcache +exit 0 + diff --git a/applications/luci-app-wol/luasrc/controller/wol.lua b/applications/luci-app-wol/luasrc/controller/wol.lua index 73a9594b2..dbbfdde12 100644 --- a/applications/luci-app-wol/luasrc/controller/wol.lua +++ b/applications/luci-app-wol/luasrc/controller/wol.lua @@ -1,6 +1,6 @@ module("luci.controller.wol", package.seeall) function index() - entry({"admin", "network", "wol"}, cbi("wol"), _("Wake on LAN"), 90) - entry({"mini", "network", "wol"}, cbi("wol"), _("Wake on LAN"), 90) + entry({"admin", "services", "wol"}, cbi("wol"), _("Wake on LAN"), 90) + entry({"mini", "services", "wol"}, cbi("wol"), _("Wake on LAN"), 90) end diff --git a/applications/luci-app-wol/luasrc/model/cbi/wol.lua b/applications/luci-app-wol/luasrc/model/cbi/wol.lua index e87cac3dc..ec6a1be2a 100644 --- a/applications/luci-app-wol/luasrc/model/cbi/wol.lua +++ b/applications/luci-app-wol/luasrc/model/cbi/wol.lua @@ -48,6 +48,13 @@ sys.net.mac_hints(function(mac, name) host:value(mac, "%s (%s)" %{ mac, name }) end) +if has_ewk then + broadcast = s:option(Flag, "broadcast", + translate("Send to broadcast address")) + if has_wol then + broadcast:depends("binary", "/usr/bin/etherwake") + end +end function host.write(self, s, val) local host = luci.http.formvalue("cbid.wol.1.mac") @@ -59,8 +66,10 @@ function host.write(self, s, val) if util == "/usr/bin/etherwake" then local iface = luci.http.formvalue("cbid.wol.1.iface") - cmd = "%s -D%s %q" %{ - util, (iface ~= "" and " -i %q" % iface or ""), host + local broadcast = luci.http.formvalue("cbid.wol.1.broadcast") + cmd = "%s -D%s %s %q" %{ + util, (iface ~= "" and " -i %q" % iface or ""), + (broadcast == "1" and " -b" or ""), host } else cmd = "%s -v %q" %{ util, host } diff --git a/applications/luci-app-wol/po/ca/wol.po b/applications/luci-app-wol/po/ca/wol.po index 42f7cf75a..387b4717c 100644 --- a/applications/luci-app-wol/po/ca/wol.po +++ b/applications/luci-app-wol/po/ca/wol.po @@ -29,6 +29,9 @@ msgstr "Host per a despertar" msgid "Network interface to use" msgstr "Interfície de xarxa per a utilitzar" +msgid "Send to broadcast address" +msgstr "" + #, fuzzy msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" diff --git a/applications/luci-app-wol/po/cs/wol.po b/applications/luci-app-wol/po/cs/wol.po index 6ee7f67b8..49488125e 100644 --- a/applications/luci-app-wol/po/cs/wol.po +++ b/applications/luci-app-wol/po/cs/wol.po @@ -27,6 +27,9 @@ msgstr "Adresa zařízení, které má být probuzeno" msgid "Network interface to use" msgstr "Použité síťové rozhraní" +msgid "Send to broadcast address" +msgstr "" + #, fuzzy msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" diff --git a/applications/luci-app-wol/po/de/wol.po b/applications/luci-app-wol/po/de/wol.po index 52940efa3..efbd122d4 100644 --- a/applications/luci-app-wol/po/de/wol.po +++ b/applications/luci-app-wol/po/de/wol.po @@ -28,6 +28,9 @@ msgstr "Anzuschaltender Rechner" msgid "Network interface to use" msgstr "Verwendete Schnittstelle" +msgid "Send to broadcast address" +msgstr "" + #, fuzzy msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" diff --git a/applications/luci-app-wol/po/el/wol.po b/applications/luci-app-wol/po/el/wol.po index cb7c3b971..422a51b3d 100644 --- a/applications/luci-app-wol/po/el/wol.po +++ b/applications/luci-app-wol/po/el/wol.po @@ -25,6 +25,9 @@ msgstr "" msgid "Network interface to use" msgstr "" +msgid "Send to broadcast address" +msgstr "" + msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" msgstr "" diff --git a/applications/luci-app-wol/po/en/wol.po b/applications/luci-app-wol/po/en/wol.po index 48c7302a3..877ba34fa 100644 --- a/applications/luci-app-wol/po/en/wol.po +++ b/applications/luci-app-wol/po/en/wol.po @@ -23,6 +23,9 @@ msgstr "Host to wake up" msgid "Network interface to use" msgstr "Network interface to use" +msgid "Send to broadcast address" +msgstr "" + #, fuzzy msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" diff --git a/applications/luci-app-wol/po/es/wol.po b/applications/luci-app-wol/po/es/wol.po index f5bcf6bf4..e54ffdc78 100644 --- a/applications/luci-app-wol/po/es/wol.po +++ b/applications/luci-app-wol/po/es/wol.po @@ -27,6 +27,9 @@ msgstr "Máquina a despertar" msgid "Network interface to use" msgstr "Interfaz de red a utilizar" +msgid "Send to broadcast address" +msgstr "" + #, fuzzy msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" diff --git a/applications/luci-app-wol/po/fr/wol.po b/applications/luci-app-wol/po/fr/wol.po index 0bed86d8f..848690568 100644 --- a/applications/luci-app-wol/po/fr/wol.po +++ b/applications/luci-app-wol/po/fr/wol.po @@ -27,6 +27,9 @@ msgstr "Hôte à réveiller" msgid "Network interface to use" msgstr "Interface réseau à utiliser" +msgid "Send to broadcast address" +msgstr "" + #, fuzzy msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" diff --git a/applications/luci-app-wol/po/he/wol.po b/applications/luci-app-wol/po/he/wol.po index cb7c3b971..422a51b3d 100644 --- a/applications/luci-app-wol/po/he/wol.po +++ b/applications/luci-app-wol/po/he/wol.po @@ -25,6 +25,9 @@ msgstr "" msgid "Network interface to use" msgstr "" +msgid "Send to broadcast address" +msgstr "" + msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" msgstr "" diff --git a/applications/luci-app-wol/po/hu/wol.po b/applications/luci-app-wol/po/hu/wol.po index f47191cba..3895e92e7 100644 --- a/applications/luci-app-wol/po/hu/wol.po +++ b/applications/luci-app-wol/po/hu/wol.po @@ -29,6 +29,9 @@ msgstr "Felélesztendő gép" msgid "Network interface to use" msgstr "Használandó interfész" +msgid "Send to broadcast address" +msgstr "" + #, fuzzy msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" diff --git a/applications/luci-app-wol/po/it/wol.po b/applications/luci-app-wol/po/it/wol.po index 63ac0d8dc..bf23eb8ce 100644 --- a/applications/luci-app-wol/po/it/wol.po +++ b/applications/luci-app-wol/po/it/wol.po @@ -27,6 +27,9 @@ msgstr "Host da \"svegliare\"" msgid "Network interface to use" msgstr "Interfacci di rete da usare" +msgid "Send to broadcast address" +msgstr "" + #, fuzzy msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" diff --git a/applications/luci-app-wol/po/ja/wol.po b/applications/luci-app-wol/po/ja/wol.po index c18b83193..bedcbbfc4 100644 --- a/applications/luci-app-wol/po/ja/wol.po +++ b/applications/luci-app-wol/po/ja/wol.po @@ -2,18 +2,18 @@ # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-19 00:29+0200\n" -"PO-Revision-Date: 2013-10-06 17:12+0200\n" -"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n" +"PO-Revision-Date: 2017-01-27 21:03+0900\n" +"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Language-Team: none\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.6\n" +"X-Generator: Poedit 1.8.11\n" msgid "Broadcast on all interfaces" msgstr "全てのインターフェースへブロードキャスト" @@ -27,12 +27,14 @@ msgstr "起動するホストを指定" msgid "Network interface to use" msgstr "使用するネットワークインターフェース" -#, fuzzy +msgid "Send to broadcast address" +msgstr "ブロードキャスト アドレスに送信する" + msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" msgstr "" -"片方のツールのみが動作する場合があるため、片方が失敗する場合は別のツールを試" -"してみてください。" +"片方のツールのみが動作する場合があるため、片方が失敗する場合は別のツールを" +"試してみてください。" msgid "Specifies the interface the WoL packet is sent on" msgstr "WoLパケットを送信するインタフェースを指定" @@ -46,8 +48,8 @@ msgstr "Wake on LAN" msgid "" "Wake on LAN is a mechanism to remotely boot computers in the local network." msgstr "" -"Wake on LANはローカルネットワーク内のコンピュータを遠隔で起動させることができ" -"る機能です。" +"Wake on LANはローカルネットワーク内のコンピュータを遠隔で起動させることがで" +"きる機能です。" msgid "Wake up host" msgstr "ホストを起動" diff --git a/applications/luci-app-wol/po/ms/wol.po b/applications/luci-app-wol/po/ms/wol.po index 74380f27b..47c335d2e 100644 --- a/applications/luci-app-wol/po/ms/wol.po +++ b/applications/luci-app-wol/po/ms/wol.po @@ -24,6 +24,9 @@ msgstr "" msgid "Network interface to use" msgstr "" +msgid "Send to broadcast address" +msgstr "" + msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" msgstr "" diff --git a/applications/luci-app-wol/po/no/wol.po b/applications/luci-app-wol/po/no/wol.po index 2f0a8ad63..6dd0c0ea6 100644 --- a/applications/luci-app-wol/po/no/wol.po +++ b/applications/luci-app-wol/po/no/wol.po @@ -18,6 +18,9 @@ msgstr "Vert som skal startes opp" msgid "Network interface to use" msgstr "Nettverksgrensesnitt" +msgid "Send to broadcast address" +msgstr "" + #, fuzzy msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" diff --git a/applications/luci-app-wol/po/pl/wol.po b/applications/luci-app-wol/po/pl/wol.po index c599b9ec3..3533e4574 100644 --- a/applications/luci-app-wol/po/pl/wol.po +++ b/applications/luci-app-wol/po/pl/wol.po @@ -28,6 +28,9 @@ msgstr "Host do wybudzenia" msgid "Network interface to use" msgstr "Użyty interfejs sieciowy" +msgid "Send to broadcast address" +msgstr "" + #, fuzzy msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" diff --git a/applications/luci-app-wol/po/pt-br/wol.po b/applications/luci-app-wol/po/pt-br/wol.po index 6a21a855b..6195e4cba 100644 --- a/applications/luci-app-wol/po/pt-br/wol.po +++ b/applications/luci-app-wol/po/pt-br/wol.po @@ -27,6 +27,9 @@ msgstr "Computador para acordar" msgid "Network interface to use" msgstr "Interfaces de rede para usar" +msgid "Send to broadcast address" +msgstr "" + #, fuzzy msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" diff --git a/applications/luci-app-wol/po/pt/wol.po b/applications/luci-app-wol/po/pt/wol.po index 540e54369..1cce43086 100644 --- a/applications/luci-app-wol/po/pt/wol.po +++ b/applications/luci-app-wol/po/pt/wol.po @@ -27,6 +27,9 @@ msgstr "Host a acordar" msgid "Network interface to use" msgstr "Interface de rede a usar" +msgid "Send to broadcast address" +msgstr "" + #, fuzzy msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" diff --git a/applications/luci-app-wol/po/ro/wol.po b/applications/luci-app-wol/po/ro/wol.po index 154a3f9fb..71a06975c 100644 --- a/applications/luci-app-wol/po/ro/wol.po +++ b/applications/luci-app-wol/po/ro/wol.po @@ -28,6 +28,9 @@ msgstr "Statie pentru \"trezire\"" msgid "Network interface to use" msgstr "Interfata de retea pentru utilizare" +msgid "Send to broadcast address" +msgstr "" + #, fuzzy msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" diff --git a/applications/luci-app-wol/po/ru/wol.po b/applications/luci-app-wol/po/ru/wol.po index 9a8436601..9d3e08d56 100644 --- a/applications/luci-app-wol/po/ru/wol.po +++ b/applications/luci-app-wol/po/ru/wol.po @@ -29,6 +29,9 @@ msgstr "Хост, который необходимо разбудить" msgid "Network interface to use" msgstr "Используемый сетевой интерфейс" +msgid "Send to broadcast address" +msgstr "" + #, fuzzy msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" diff --git a/applications/luci-app-wol/po/sk/wol.po b/applications/luci-app-wol/po/sk/wol.po index eea59ebc3..bdaf4e70c 100644 --- a/applications/luci-app-wol/po/sk/wol.po +++ b/applications/luci-app-wol/po/sk/wol.po @@ -20,6 +20,9 @@ msgstr "" msgid "Network interface to use" msgstr "" +msgid "Send to broadcast address" +msgstr "" + msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" msgstr "" diff --git a/applications/luci-app-wol/po/sv/wol.po b/applications/luci-app-wol/po/sv/wol.po index f08f727a8..5b3e92347 100644 --- a/applications/luci-app-wol/po/sv/wol.po +++ b/applications/luci-app-wol/po/sv/wol.po @@ -23,6 +23,9 @@ msgstr "Värd som ska väckas upp" msgid "Network interface to use" msgstr "Nätverksgränssnitt som ska användas" +msgid "Send to broadcast address" +msgstr "" + msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" msgstr "" diff --git a/applications/luci-app-wol/po/templates/wol.pot b/applications/luci-app-wol/po/templates/wol.pot index 1305c5388..9593dea65 100644 --- a/applications/luci-app-wol/po/templates/wol.pot +++ b/applications/luci-app-wol/po/templates/wol.pot @@ -13,6 +13,9 @@ msgstr "" msgid "Network interface to use" msgstr "" +msgid "Send to broadcast address" +msgstr "" + msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" msgstr "" diff --git a/applications/luci-app-wol/po/tr/wol.po b/applications/luci-app-wol/po/tr/wol.po index 9be6934cf..684a9ae5f 100644 --- a/applications/luci-app-wol/po/tr/wol.po +++ b/applications/luci-app-wol/po/tr/wol.po @@ -25,6 +25,9 @@ msgstr "" msgid "Network interface to use" msgstr "" +msgid "Send to broadcast address" +msgstr "" + msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" msgstr "" diff --git a/applications/luci-app-wol/po/uk/wol.po b/applications/luci-app-wol/po/uk/wol.po index c09d144b3..703cd370f 100644 --- a/applications/luci-app-wol/po/uk/wol.po +++ b/applications/luci-app-wol/po/uk/wol.po @@ -30,6 +30,9 @@ msgstr "Комп'ютер, який необхідно розбудити" msgid "Network interface to use" msgstr "Використовувати мережевий інтерфейс" +msgid "Send to broadcast address" +msgstr "" + #, fuzzy msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" diff --git a/applications/luci-app-wol/po/vi/wol.po b/applications/luci-app-wol/po/vi/wol.po index 9be6934cf..684a9ae5f 100644 --- a/applications/luci-app-wol/po/vi/wol.po +++ b/applications/luci-app-wol/po/vi/wol.po @@ -25,6 +25,9 @@ msgstr "" msgid "Network interface to use" msgstr "" +msgid "Send to broadcast address" +msgstr "" + msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" msgstr "" diff --git a/applications/luci-app-wol/po/zh-cn/wol.po b/applications/luci-app-wol/po/zh-cn/wol.po index 6d9cc7227..7bbae6117 100644 --- a/applications/luci-app-wol/po/zh-cn/wol.po +++ b/applications/luci-app-wol/po/zh-cn/wol.po @@ -25,6 +25,9 @@ msgstr "选择要唤醒的主机" msgid "Network interface to use" msgstr "选择使用的网络接口" +msgid "Send to broadcast address" +msgstr "" + #, fuzzy msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" diff --git a/applications/luci-app-wol/po/zh-tw/wol.po b/applications/luci-app-wol/po/zh-tw/wol.po index ee290ec2e..553d2d04f 100644 --- a/applications/luci-app-wol/po/zh-tw/wol.po +++ b/applications/luci-app-wol/po/zh-tw/wol.po @@ -23,6 +23,9 @@ msgstr "要喚醒主機清單" msgid "Network interface to use" msgstr "使用的網路介面" +msgid "Send to broadcast address" +msgstr "" + #, fuzzy msgid "" "Sometimes only one of the two tools works. If one fails, try the other one" diff --git a/applications/luci-app-wshaper/Makefile b/applications/luci-app-wshaper/Makefile deleted file mode 100644 index 63e63aba2..000000000 --- a/applications/luci-app-wshaper/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# -# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org> -# -# This is free software, licensed under the Apache License, Version 2.0 . -# - -include $(TOPDIR)/rules.mk - -LUCI_TITLE:=LuCI Support for wshaper -LUCI_DEPENDS:=+wshaper - -include ../../luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/applications/luci-app-wshaper/luasrc/controller/wshaper.lua b/applications/luci-app-wshaper/luasrc/controller/wshaper.lua deleted file mode 100644 index 2d0fe484f..000000000 --- a/applications/luci-app-wshaper/luasrc/controller/wshaper.lua +++ /dev/null @@ -1,9 +0,0 @@ --- Copyright 2011 Manuel Munz <freifunk somakoma de> --- Licensed to the public under the Apache License 2.0. - -module "luci.controller.wshaper" - -function index() - entry({"admin", "network", "wshaper"}, cbi("wshaper"), _("Wondershaper"), 80) -end - diff --git a/applications/luci-app-wshaper/luasrc/model/cbi/wshaper.lua b/applications/luci-app-wshaper/luasrc/model/cbi/wshaper.lua deleted file mode 100644 index 6bd0255cd..000000000 --- a/applications/luci-app-wshaper/luasrc/model/cbi/wshaper.lua +++ /dev/null @@ -1,46 +0,0 @@ --- Copyright 2011 Manuel Munz <freifunk at somakoma dot de> --- Licensed to the public under the Apache License 2.0. - -require("luci.tools.webadmin") - -m = Map("wshaper", translate("Wondershaper"), - translate("Wondershaper shapes traffic to ensure low latencies for interactive traffic even when your " .. - "internet connection is highly saturated.")) - -s = m:section(NamedSection, "settings", "wshaper", translate("Wondershaper settings")) -s.anonymous = true - -network = s:option(ListValue, "network", translate("Interface")) -luci.tools.webadmin.cbi_add_networks(network) - -uplink = s:option(Value, "uplink", translate("Uplink"), translate("Upstream bandwidth in kbit/s")) -uplink.optional = false -uplink.datatype = "uinteger" -uplink.default = "240" - -uplink = s:option(Value, "downlink", translate("Downlink"), translate("Downstream bandwidth in kbit/s")) -uplink.optional = false -uplink.datatype = "uinteger" -uplink.default = "200" - -nopriohostsrc = s:option(DynamicList, "nopriohostsrc", translate("Low priority hosts (Source)"), translate("Host or Network in CIDR notation.")) -nopriohostsrc.optional = true -nopriohostsrc.datatype = ipaddr -nopriohostsrc.placeholder = "10.0.0.1/32" - -nopriohostdst = s:option(DynamicList, "nopriohostdst", translate("Low priority hosts (Destination)"), translate("Host or Network in CIDR notation.")) -nopriohostdst.optional = true -nopriohostdst.datatype = ipaddr -nopriohostdst.placeholder = "10.0.0.1/32" - -noprioportsrc = s:option(DynamicList, "noprioportsrc", translate("Low priority source ports")) -noprioportsrc.optional = true -noprioportsrc.datatype = "range(0,65535)" -noprioportsrc.placeholder = "21" - -noprioportdst = s:option(DynamicList, "noprioportdst", translate("Low priority destination ports")) -noprioportdst.optional = true -noprioportdst.datatype = "range(0,65535)" -noprioportdst.placeholder = "21" - -return m diff --git a/applications/luci-app-wshaper/po/ca/wshaper.po b/applications/luci-app-wshaper/po/ca/wshaper.po deleted file mode 100644 index 256038332..000000000 --- a/applications/luci-app-wshaper/po/ca/wshaper.po +++ /dev/null @@ -1,59 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-01 22:51+0200\n" -"PO-Revision-Date: 2014-07-01 03:51+0200\n" -"Last-Translator: Alex <alexhenrie24@gmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: ca\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.6\n" - -msgid "Downlink" -msgstr "Enllaç descendent" - -msgid "Downstream bandwidth in kbit/s" -msgstr "Amplada de banda descendent en kbit/s" - -msgid "Host or Network in CIDR notation." -msgstr "Host o xarxa en notació CIDR." - -msgid "Interface" -msgstr "Interfície" - -msgid "Low priority destination ports" -msgstr "Ports de destí de baixa prioritat" - -msgid "Low priority hosts (Destination)" -msgstr "Hosts de baixa prioritat (destí)" - -msgid "Low priority hosts (Source)" -msgstr "Hosts de baixa prioritat (origen)" - -msgid "Low priority source ports" -msgstr "Ports d'origen de baixa prioritat" - -msgid "Uplink" -msgstr "Enllaç ascendent" - -msgid "Upstream bandwidth in kbit/s" -msgstr "Amplada de banda ascendent en kbit/s" - -msgid "Wondershaper" -msgstr "Wondershaper" - -msgid "Wondershaper settings" -msgstr "Ajusts del Wondershaper" - -#, fuzzy -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" -"Wondershapter afaiçona el trànsit per assegurar latències baixes per a " -"trànsit interactiu encara que la vostra connexió de Internet estigui " -"altament saturada." diff --git a/applications/luci-app-wshaper/po/cs/wshaper.po b/applications/luci-app-wshaper/po/cs/wshaper.po deleted file mode 100644 index bca6c4e57..000000000 --- a/applications/luci-app-wshaper/po/cs/wshaper.po +++ /dev/null @@ -1,58 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2012-04-24 15:20+0200\n" -"Last-Translator: awm1 <awm1klimes8vladimir@gmail.com>\n" -"Language-Team: none\n" -"Language: cs\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Pootle 2.0.4\n" - -msgid "Downlink" -msgstr "Příchozí rychlost" - -msgid "Downstream bandwidth in kbit/s" -msgstr "Rychlost stahování dat v kbit/s" - -msgid "Host or Network in CIDR notation." -msgstr "Adresa počítače nebo sítě v CIDR notaci." - -msgid "Interface" -msgstr "Síťové rozhraní" - -msgid "Low priority destination ports" -msgstr "Cílové porty s nízkou prioritou" - -msgid "Low priority hosts (Destination)" -msgstr "Adresy cílových počítačů s nízkou prioritou" - -msgid "Low priority hosts (Source)" -msgstr "Adresy zdrojových počítačů s nízkou prioritou" - -msgid "Low priority source ports" -msgstr "Zdrojové porty s nízkou prioritou" - -msgid "Uplink" -msgstr "Odchozí rychlost" - -msgid "Upstream bandwidth in kbit/s" -msgstr "Rychlost odesílání dat v kbit/s" - -msgid "Wondershaper" -msgstr "Wondershaper" - -msgid "Wondershaper settings" -msgstr "Nastavení skriptu Wondershaper" - -#, fuzzy -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" -"Úkolem skriptu Wondershaper je řízení provozu na daném síťovém rozhraní. " -"Snaží se zajistit nízké přenosové zpoždění pro \"interaktivní\" síťový " -"provoz (např. SSH), a to především v okamžicích, kdy ostatní síťový provoz " -"zahltí linku." diff --git a/applications/luci-app-wshaper/po/de/wshaper.po b/applications/luci-app-wshaper/po/de/wshaper.po deleted file mode 100644 index 39dd61771..000000000 --- a/applications/luci-app-wshaper/po/de/wshaper.po +++ /dev/null @@ -1,58 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"POT-Creation-Date: \n" -"PO-Revision-Date: 2011-10-18 12:28+0200\n" -"Last-Translator: Manuel <freifunk@somakoma.de>\n" -"Language-Team: \n" -"Language: de\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.4\n" - -msgid "Downlink" -msgstr "Download" - -msgid "Downstream bandwidth in kbit/s" -msgstr "Download Bandbreite in kbit/s" - -msgid "Host or Network in CIDR notation." -msgstr "Rechner oder Netzwerk in CIDR Schreibweise" - -msgid "Interface" -msgstr "Schnittstelle" - -msgid "Low priority destination ports" -msgstr "Zielports mit niedriger Priorität" - -msgid "Low priority hosts (Destination)" -msgstr "Zielrechner mit nideriger Priorität" - -msgid "Low priority hosts (Source)" -msgstr "Quellrechner mit neidriger Priorität" - -msgid "Low priority source ports" -msgstr "Quellports mit niedriger Priorität" - -msgid "Uplink" -msgstr "Upload" - -msgid "Upstream bandwidth in kbit/s" -msgstr "Upload Bandbreite in kbit/s" - -msgid "Wondershaper" -msgstr "Wondershaper" - -msgid "Wondershaper settings" -msgstr "Wondershaper Einstellungen" - -#, fuzzy -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" -"Wondershaper ermöglicht mit Hilfe von Traffic Shaping niedrige Latenzzeiten " -"für interaktiven Internetverkehr selbst wenn die Internetverbindung extrem " -"ausgelastet ist." diff --git a/applications/luci-app-wshaper/po/el/wshaper.po b/applications/luci-app-wshaper/po/el/wshaper.po deleted file mode 100644 index 6d2f09284..000000000 --- a/applications/luci-app-wshaper/po/el/wshaper.po +++ /dev/null @@ -1,55 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-18 17:10+0200\n" -"PO-Revision-Date: 2012-03-18 17:10+0200\n" -"Last-Translator: Vasilis <acinonyx@openwrt.gr>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: el\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.4\n" - -msgid "Downlink" -msgstr "" - -msgid "Downstream bandwidth in kbit/s" -msgstr "" - -msgid "Host or Network in CIDR notation." -msgstr "" - -msgid "Interface" -msgstr "Διεπαφή" - -msgid "Low priority destination ports" -msgstr "" - -msgid "Low priority hosts (Destination)" -msgstr "" - -msgid "Low priority hosts (Source)" -msgstr "" - -msgid "Low priority source ports" -msgstr "" - -msgid "Uplink" -msgstr "" - -msgid "Upstream bandwidth in kbit/s" -msgstr "" - -msgid "Wondershaper" -msgstr "" - -msgid "Wondershaper settings" -msgstr "" - -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" diff --git a/applications/luci-app-wshaper/po/en/wshaper.po b/applications/luci-app-wshaper/po/en/wshaper.po deleted file mode 100644 index b6858398c..000000000 --- a/applications/luci-app-wshaper/po/en/wshaper.po +++ /dev/null @@ -1,54 +0,0 @@ -msgid "" -msgstr "" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Project-Id-Version: LuCI\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: en\n" -"X-Generator: Poedit 1.6.10\n" - -msgid "Downlink" -msgstr "" - -msgid "Downstream bandwidth in kbit/s" -msgstr "" - -msgid "Host or Network in CIDR notation." -msgstr "" - -msgid "Interface" -msgstr "" - -msgid "Low priority destination ports" -msgstr "" - -msgid "Low priority hosts (Destination)" -msgstr "" - -msgid "Low priority hosts (Source)" -msgstr "" - -msgid "Low priority source ports" -msgstr "" - -msgid "Uplink" -msgstr "" - -msgid "Upstream bandwidth in kbit/s" -msgstr "" - -msgid "Wondershaper" -msgstr "" - -msgid "Wondershaper settings" -msgstr "" - -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" diff --git a/applications/luci-app-wshaper/po/es/wshaper.po b/applications/luci-app-wshaper/po/es/wshaper.po deleted file mode 100644 index f562760d5..000000000 --- a/applications/luci-app-wshaper/po/es/wshaper.po +++ /dev/null @@ -1,58 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-16 01:00+0200\n" -"PO-Revision-Date: 2012-09-03 18:57+0200\n" -"Last-Translator: José Vicente <josevteg@gmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: es\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.6\n" - -msgid "Downlink" -msgstr "Enlace de bajada" - -msgid "Downstream bandwidth in kbit/s" -msgstr "Ancho de banda de bajada en Kbit/s" - -msgid "Host or Network in CIDR notation." -msgstr "Máquina o red en notación CIDR." - -msgid "Interface" -msgstr "Interfaz" - -msgid "Low priority destination ports" -msgstr "Puertos de destino de prioridad baja" - -msgid "Low priority hosts (Destination)" -msgstr "Máquinas de prioridad baja (destino)" - -msgid "Low priority hosts (Source)" -msgstr "Máquinas de prioridad baja (origen)" - -msgid "Low priority source ports" -msgstr "Puertos de origen de prioridad baja" - -msgid "Uplink" -msgstr "Enlace de salida" - -msgid "Upstream bandwidth in kbit/s" -msgstr "Ancho de banda de subida en Kbit/s" - -msgid "Wondershaper" -msgstr "Wondershaper" - -msgid "Wondershaper settings" -msgstr "Configuración de Wondershaper" - -#, fuzzy -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" -"Wondershaper modela el tráfico para asegurar latencias bajas al tráfico " -"interactivo incluso cuando la conexión a Internet esté muy saturada." diff --git a/applications/luci-app-wshaper/po/fr/wshaper.po b/applications/luci-app-wshaper/po/fr/wshaper.po deleted file mode 100644 index 2fc9f53c5..000000000 --- a/applications/luci-app-wshaper/po/fr/wshaper.po +++ /dev/null @@ -1,62 +0,0 @@ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"Project-Id-Version: LuCI\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" -"X-Generator: Poedit 1.6.10\n" - -msgid "Downlink" -msgstr "Lien descendant (télé-chargement)" - -msgid "Downstream bandwidth in kbit/s" -msgstr "Bande-passante descendante en kbit/s" - -msgid "Host or Network in CIDR notation." -msgstr "Hôte ou réseau en notation CIDR." - -msgid "Interface" -msgstr "Interface" - -msgid "Low priority destination ports" -msgstr "Ports-cible à faible priorité" - -msgid "Low priority hosts (Destination)" -msgstr "Hôtes-cible à faible priorité" - -msgid "Low priority hosts (Source)" -msgstr "Hôtes-source à faible priorité" - -msgid "Low priority source ports" -msgstr "Ports-source à faible priorité" - -msgid "Uplink" -msgstr "Lien montant (envois)" - -msgid "Upstream bandwidth in kbit/s" -msgstr "Bande-passante montante en kbit/s" - -msgid "Wondershaper" -msgstr "Wondershaper" - -msgid "Wondershaper settings" -msgstr "Paramètres Wondershaper" - -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" - -#~ msgid "" -#~ "Wondershaper uses traffic shaping to ensure low latencies for interactive " -#~ "traffic even when your internet connection is highly saturated." -#~ msgstr "" -#~ "Wondershaper gère la priorités entre les flux pour assurer une faible " -#~ "latence au trafic interactif même quand votre connexion Internet est très " -#~ "chargée." diff --git a/applications/luci-app-wshaper/po/he/wshaper.po b/applications/luci-app-wshaper/po/he/wshaper.po deleted file mode 100644 index f03d5df03..000000000 --- a/applications/luci-app-wshaper/po/he/wshaper.po +++ /dev/null @@ -1,54 +0,0 @@ -msgid "" -msgstr "" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Project-Id-Version: LuCI\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: he\n" -"X-Generator: Poedit 1.6.10\n" - -msgid "Downlink" -msgstr "" - -msgid "Downstream bandwidth in kbit/s" -msgstr "" - -msgid "Host or Network in CIDR notation." -msgstr "" - -msgid "Interface" -msgstr "" - -msgid "Low priority destination ports" -msgstr "" - -msgid "Low priority hosts (Destination)" -msgstr "" - -msgid "Low priority hosts (Source)" -msgstr "" - -msgid "Low priority source ports" -msgstr "" - -msgid "Uplink" -msgstr "" - -msgid "Upstream bandwidth in kbit/s" -msgstr "" - -msgid "Wondershaper" -msgstr "" - -msgid "Wondershaper settings" -msgstr "" - -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" diff --git a/applications/luci-app-wshaper/po/hu/wshaper.po b/applications/luci-app-wshaper/po/hu/wshaper.po deleted file mode 100644 index 2377fa543..000000000 --- a/applications/luci-app-wshaper/po/hu/wshaper.po +++ /dev/null @@ -1,54 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -msgid "Downlink" -msgstr "Letöltés" - -msgid "Downstream bandwidth in kbit/s" -msgstr "Letöltési sebesség kbit/másodberc-ben" - -msgid "Host or Network in CIDR notation." -msgstr "Gép vagy hálózat (CIDR jelöléssel)" - -msgid "Interface" -msgstr "Interfész" - -msgid "Low priority destination ports" -msgstr "Alacsony prioritású cél portok" - -msgid "Low priority hosts (Destination)" -msgstr "Alacson prioritású cél gépek" - -msgid "Low priority hosts (Source)" -msgstr "Alacsony prioritású forrás gépek" - -msgid "Low priority source ports" -msgstr "Alacson prioritású forrás portok" - -msgid "Uplink" -msgstr "Feltöltés" - -msgid "Upstream bandwidth in kbit/s" -msgstr "Feltöltési sebesség kbit/másodperc-ben" - -msgid "Wondershaper" -msgstr "Wondershaper" - -msgid "Wondershaper settings" -msgstr "Wondershaper beállítások" - -#, fuzzy -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" -"A Wondershaper 'traffic shaping'-et használatával biztosítja az interaktív " -"forgalom alacsony késleletetését még akkor is ha az internet kapcsolat " -"erősen leterhelt." diff --git a/applications/luci-app-wshaper/po/it/wshaper.po b/applications/luci-app-wshaper/po/it/wshaper.po deleted file mode 100644 index 6a72c7e5d..000000000 --- a/applications/luci-app-wshaper/po/it/wshaper.po +++ /dev/null @@ -1,59 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 01:36+0200\n" -"PO-Revision-Date: 2013-02-03 14:07+0200\n" -"Last-Translator: Francesco <3gasas@gmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: it\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.6\n" - -msgid "Downlink" -msgstr "Collegamento discendente" - -msgid "Downstream bandwidth in kbit/s" -msgstr "Larghezza di banda in downstream in kbit/s" - -msgid "Host or Network in CIDR notation." -msgstr "Host o rete in notazione CIDR." - -msgid "Interface" -msgstr "Interfaccia" - -msgid "Low priority destination ports" -msgstr "Porte di destinazione a bassa priorità" - -msgid "Low priority hosts (Destination)" -msgstr "Hosts a bassa priorità (Destinazione)" - -msgid "Low priority hosts (Source)" -msgstr "Hosts a bassa priorità (Fonte)" - -msgid "Low priority source ports" -msgstr "Porte sorgenti a bassa priorità" - -msgid "Uplink" -msgstr "Uplink" - -msgid "Upstream bandwidth in kbit/s" -msgstr "Larghezza di banda in upstream in kbit/s" - -msgid "Wondershaper" -msgstr "Wondershaper" - -msgid "Wondershaper settings" -msgstr "Impostazioni Wondershaper" - -#, fuzzy -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" -"WonderShaper usa la regolazione del traffico per garantire bassa latenza per " -"il traffico interattivo anche quando la connessione a Internet è molto " -"satura." diff --git a/applications/luci-app-wshaper/po/ja/wshaper.po b/applications/luci-app-wshaper/po/ja/wshaper.po deleted file mode 100644 index d58476cf3..000000000 --- a/applications/luci-app-wshaper/po/ja/wshaper.po +++ /dev/null @@ -1,58 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-17 18:28+0200\n" -"PO-Revision-Date: 2012-03-18 09:07+0200\n" -"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: ja\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.4\n" - -msgid "Downlink" -msgstr "下りリンク" - -msgid "Downstream bandwidth in kbit/s" -msgstr "下りリンク帯域 (kbit/sec)" - -msgid "Host or Network in CIDR notation." -msgstr "ホスト名またはCIDR表記のネットワークアドレス" - -msgid "Interface" -msgstr "インターフェース" - -msgid "Low priority destination ports" -msgstr "低優先度の宛先ポート" - -msgid "Low priority hosts (Destination)" -msgstr "低優先度の宛先ホスト" - -msgid "Low priority hosts (Source)" -msgstr "低優先度の送信元ホスト" - -msgid "Low priority source ports" -msgstr "低優先度の送信元ポート" - -msgid "Uplink" -msgstr "上りリンク" - -msgid "Upstream bandwidth in kbit/s" -msgstr "上りリンク帯域 (kbit/sec)" - -msgid "Wondershaper" -msgstr "Wondershaper" - -msgid "Wondershaper settings" -msgstr "Wondershaper 設定" - -#, fuzzy -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" -"Wondweshaperは、インターネット接続が飽和状態の場合でも、低いレイテンシ・円滑" -"な通信を実現するためにトラフィック・シェーピングを行います。" diff --git a/applications/luci-app-wshaper/po/ms/wshaper.po b/applications/luci-app-wshaper/po/ms/wshaper.po deleted file mode 100644 index ede138662..000000000 --- a/applications/luci-app-wshaper/po/ms/wshaper.po +++ /dev/null @@ -1,54 +0,0 @@ -msgid "" -msgstr "" -"Plural-Forms: nplurals=1; plural=0;\n" -"Project-Id-Version: LuCI\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: ms\n" -"X-Generator: Poedit 1.6.10\n" - -msgid "Downlink" -msgstr "" - -msgid "Downstream bandwidth in kbit/s" -msgstr "" - -msgid "Host or Network in CIDR notation." -msgstr "" - -msgid "Interface" -msgstr "" - -msgid "Low priority destination ports" -msgstr "" - -msgid "Low priority hosts (Destination)" -msgstr "" - -msgid "Low priority hosts (Source)" -msgstr "" - -msgid "Low priority source ports" -msgstr "" - -msgid "Uplink" -msgstr "" - -msgid "Upstream bandwidth in kbit/s" -msgstr "" - -msgid "Wondershaper" -msgstr "" - -msgid "Wondershaper settings" -msgstr "" - -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" diff --git a/applications/luci-app-wshaper/po/no/wshaper.po b/applications/luci-app-wshaper/po/no/wshaper.po deleted file mode 100644 index 1b1ab329e..000000000 --- a/applications/luci-app-wshaper/po/no/wshaper.po +++ /dev/null @@ -1,54 +0,0 @@ -msgid "" -msgstr "" -"Language: nn\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Project-Id-Version: LuCI\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.6.10\n" - -msgid "Downlink" -msgstr "" - -msgid "Downstream bandwidth in kbit/s" -msgstr "" - -msgid "Host or Network in CIDR notation." -msgstr "" - -msgid "Interface" -msgstr "" - -msgid "Low priority destination ports" -msgstr "" - -msgid "Low priority hosts (Destination)" -msgstr "" - -msgid "Low priority hosts (Source)" -msgstr "" - -msgid "Low priority source ports" -msgstr "" - -msgid "Uplink" -msgstr "" - -msgid "Upstream bandwidth in kbit/s" -msgstr "" - -msgid "Wondershaper" -msgstr "" - -msgid "Wondershaper settings" -msgstr "" - -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" diff --git a/applications/luci-app-wshaper/po/pl/wshaper.po b/applications/luci-app-wshaper/po/pl/wshaper.po deleted file mode 100644 index a85bf0044..000000000 --- a/applications/luci-app-wshaper/po/pl/wshaper.po +++ /dev/null @@ -1,59 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-14 14:15+0200\n" -"PO-Revision-Date: 2012-04-14 17:21+0200\n" -"Last-Translator: Tomecki <przykryweczka@gmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: pl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.4\n" - -msgid "Downlink" -msgstr "Downlink" - -msgid "Downstream bandwidth in kbit/s" -msgstr "Przepustowość pobierania w kbit/s" - -msgid "Host or Network in CIDR notation." -msgstr "Adres hosta lub adres sieci w notacji CIDR" - -msgid "Interface" -msgstr "Interfejs" - -msgid "Low priority destination ports" -msgstr "Porty docelowe o niskim priorytecie" - -msgid "Low priority hosts (Destination)" -msgstr "Hosty docelowe o niskim priorytecie" - -msgid "Low priority hosts (Source)" -msgstr "Hosty źródłowe o niskim priorytecie" - -msgid "Low priority source ports" -msgstr "Porty źródłowe o niskim priorytecie" - -msgid "Uplink" -msgstr "Uplink" - -msgid "Upstream bandwidth in kbit/s" -msgstr "Przepustowość wysyłania w kbit/s" - -msgid "Wondershaper" -msgstr "Wondershaper" - -msgid "Wondershaper settings" -msgstr "Ustawienia Wondershaper" - -#, fuzzy -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" -"Wondershaper wykorzystuje kształtowanie ruchu aby zapewnić niskie opóźnienia " -"nawet wtedy, gdy Twoje połączenie internetowe jest wysycone." diff --git a/applications/luci-app-wshaper/po/pt-br/wshaper.po b/applications/luci-app-wshaper/po/pt-br/wshaper.po deleted file mode 100644 index f973ebb5c..000000000 --- a/applications/luci-app-wshaper/po/pt-br/wshaper.po +++ /dev/null @@ -1,59 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-18 19:32+0200\n" -"PO-Revision-Date: 2011-10-18 19:39+0200\n" -"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: pt_BR\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Pootle 2.0.4\n" - -msgid "Downlink" -msgstr "Velocidade para baixar (downlink)" - -msgid "Downstream bandwidth in kbit/s" -msgstr "Taxa de transferência para baixar em kbit/s" - -msgid "Host or Network in CIDR notation." -msgstr "Equipamento ou Rede na notação CIDR." - -msgid "Interface" -msgstr "Interface" - -msgid "Low priority destination ports" -msgstr "Portas de destino de baixa prioridade" - -msgid "Low priority hosts (Destination)" -msgstr "Equipamentos de baixa prioridade (Destino)" - -msgid "Low priority hosts (Source)" -msgstr "Equipamentos de baixa prioridade (Origem)" - -msgid "Low priority source ports" -msgstr "Portas de origem de baixa prioridade" - -msgid "Uplink" -msgstr "Velocidade para subir (uplink)" - -msgid "Upstream bandwidth in kbit/s" -msgstr "Taxa de transferência para subir em kbit/s" - -msgid "Wondershaper" -msgstr "Wondershaper" - -msgid "Wondershaper settings" -msgstr "Configuração do Wondershaper" - -#, fuzzy -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" -"Wondershaper usa o controle de tráfego para garantir baixa latência para " -"tráfego interativo mesmo quando sua conexão com a internet está extremamente " -"saturada." diff --git a/applications/luci-app-wshaper/po/pt/wshaper.po b/applications/luci-app-wshaper/po/pt/wshaper.po deleted file mode 100644 index 96a7be816..000000000 --- a/applications/luci-app-wshaper/po/pt/wshaper.po +++ /dev/null @@ -1,55 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-31 12:13+0200\n" -"PO-Revision-Date: 2013-05-31 12:15+0200\n" -"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: pt\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.6\n" - -msgid "Downlink" -msgstr "" - -msgid "Downstream bandwidth in kbit/s" -msgstr "" - -msgid "Host or Network in CIDR notation." -msgstr "" - -msgid "Interface" -msgstr "Interface" - -msgid "Low priority destination ports" -msgstr "Porta de destino com baixa prioridade" - -msgid "Low priority hosts (Destination)" -msgstr "Hosts com baixa prioridade (Destino)" - -msgid "Low priority hosts (Source)" -msgstr "Hosts com baixa prioridade (Origem)" - -msgid "Low priority source ports" -msgstr "Portas de origem com baixa prioridade" - -msgid "Uplink" -msgstr "" - -msgid "Upstream bandwidth in kbit/s" -msgstr "" - -msgid "Wondershaper" -msgstr "" - -msgid "Wondershaper settings" -msgstr "" - -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" diff --git a/applications/luci-app-wshaper/po/ro/wshaper.po b/applications/luci-app-wshaper/po/ro/wshaper.po deleted file mode 100644 index d2569f6d2..000000000 --- a/applications/luci-app-wshaper/po/ro/wshaper.po +++ /dev/null @@ -1,56 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-28 18:45+0200\n" -"PO-Revision-Date: 2014-06-28 18:46+0200\n" -"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: ro\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " -"20)) ? 1 : 2);;\n" -"X-Generator: Pootle 2.0.6\n" - -msgid "Downlink" -msgstr "" - -msgid "Downstream bandwidth in kbit/s" -msgstr "" - -msgid "Host or Network in CIDR notation." -msgstr "" - -msgid "Interface" -msgstr "" - -msgid "Low priority destination ports" -msgstr "" - -msgid "Low priority hosts (Destination)" -msgstr "" - -msgid "Low priority hosts (Source)" -msgstr "" - -msgid "Low priority source ports" -msgstr "" - -msgid "Uplink" -msgstr "" - -msgid "Upstream bandwidth in kbit/s" -msgstr "" - -msgid "Wondershaper" -msgstr "" - -msgid "Wondershaper settings" -msgstr "" - -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" diff --git a/applications/luci-app-wshaper/po/ru/wshaper.po b/applications/luci-app-wshaper/po/ru/wshaper.po deleted file mode 100644 index 1984aacb6..000000000 --- a/applications/luci-app-wshaper/po/ru/wshaper.po +++ /dev/null @@ -1,61 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: LuCI: wsharper\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-26 15:09+0200\n" -"PO-Revision-Date: 2012-08-15 11:53+0300\n" -"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n" -"Language-Team: Russian <x12ozmouse@ya.ru>\n" -"Language: ru\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.4\n" -"X-Poedit-SourceCharset: UTF-8\n" - -msgid "Downlink" -msgstr "Нисходящий канал" - -msgid "Downstream bandwidth in kbit/s" -msgstr "Ширина полосы пропускания прямого канала (кбит/с)" - -msgid "Host or Network in CIDR notation." -msgstr "Хост или сеть в нотации CIDR." - -msgid "Interface" -msgstr "Интерфейс" - -msgid "Low priority destination ports" -msgstr "Низкоприоритетные порты назначения" - -msgid "Low priority hosts (Destination)" -msgstr "Низкоприоритетные хосты назначения" - -msgid "Low priority hosts (Source)" -msgstr "Низкоприоритетные хосты источника" - -msgid "Low priority source ports" -msgstr "Низкоприоритетные порты источника" - -msgid "Uplink" -msgstr "Восходящий канал" - -msgid "Upstream bandwidth in kbit/s" -msgstr "Пропускная способность обратного канала (кбит/c)" - -msgid "Wondershaper" -msgstr "Wondershaper" - -msgid "Wondershaper settings" -msgstr "Установки Wondershaper" - -#, fuzzy -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" -"Wondershaper использует формирование трафика для обеспечения низких задержек " -"интерактивного трафика даже в случае высокой загруженности интернет-" -"соединения." diff --git a/applications/luci-app-wshaper/po/sk/wshaper.po b/applications/luci-app-wshaper/po/sk/wshaper.po deleted file mode 100644 index 4e03aa8f8..000000000 --- a/applications/luci-app-wshaper/po/sk/wshaper.po +++ /dev/null @@ -1,50 +0,0 @@ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" - -msgid "Downlink" -msgstr "" - -msgid "Downstream bandwidth in kbit/s" -msgstr "" - -msgid "Host or Network in CIDR notation." -msgstr "" - -msgid "Interface" -msgstr "" - -msgid "Low priority destination ports" -msgstr "" - -msgid "Low priority hosts (Destination)" -msgstr "" - -msgid "Low priority hosts (Source)" -msgstr "" - -msgid "Low priority source ports" -msgstr "" - -msgid "Uplink" -msgstr "" - -msgid "Upstream bandwidth in kbit/s" -msgstr "" - -msgid "Wondershaper" -msgstr "" - -msgid "Wondershaper settings" -msgstr "" - -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" diff --git a/applications/luci-app-wshaper/po/sv/wshaper.po b/applications/luci-app-wshaper/po/sv/wshaper.po deleted file mode 100644 index 4f0fc5346..000000000 --- a/applications/luci-app-wshaper/po/sv/wshaper.po +++ /dev/null @@ -1,53 +0,0 @@ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: sv\n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -msgid "Downlink" -msgstr "Nerladdningslänk" - -msgid "Downstream bandwidth in kbit/s" -msgstr "Nerströms bandbredd i kbit/s" - -msgid "Host or Network in CIDR notation." -msgstr "Värd eller Nätverk i CIDR-noteringen" - -msgid "Interface" -msgstr "Gränssnitt" - -msgid "Low priority destination ports" -msgstr "Destinations-portar med låg prioritet" - -msgid "Low priority hosts (Destination)" -msgstr "Värdar med låg prioritet (Destination)" - -msgid "Low priority hosts (Source)" -msgstr "Värdar med låg prioritet (Källa)" - -msgid "Low priority source ports" -msgstr "Käll-portar med låg prioritet" - -msgid "Uplink" -msgstr "Uppladdningslänk" - -msgid "Upstream bandwidth in kbit/s" -msgstr "Bandbredd uppströms i kbit/s" - -msgid "Wondershaper" -msgstr "Wondershaper" - -msgid "Wondershaper settings" -msgstr "Inställningar för Wondershaper" - -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" -"Wondershaper formar trafiken för att säkerställa låga latenser för " -"interaktiv trafik även när din internetanslutning är mättad som mest." diff --git a/applications/luci-app-wshaper/po/templates/wshaper.pot b/applications/luci-app-wshaper/po/templates/wshaper.pot deleted file mode 100644 index 42de011b3..000000000 --- a/applications/luci-app-wshaper/po/templates/wshaper.pot +++ /dev/null @@ -1,43 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -msgid "Downlink" -msgstr "" - -msgid "Downstream bandwidth in kbit/s" -msgstr "" - -msgid "Host or Network in CIDR notation." -msgstr "" - -msgid "Interface" -msgstr "" - -msgid "Low priority destination ports" -msgstr "" - -msgid "Low priority hosts (Destination)" -msgstr "" - -msgid "Low priority hosts (Source)" -msgstr "" - -msgid "Low priority source ports" -msgstr "" - -msgid "Uplink" -msgstr "" - -msgid "Upstream bandwidth in kbit/s" -msgstr "" - -msgid "Wondershaper" -msgstr "" - -msgid "Wondershaper settings" -msgstr "" - -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" diff --git a/applications/luci-app-wshaper/po/tr/wshaper.po b/applications/luci-app-wshaper/po/tr/wshaper.po deleted file mode 100644 index 7c0acb06d..000000000 --- a/applications/luci-app-wshaper/po/tr/wshaper.po +++ /dev/null @@ -1,50 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -msgid "Downlink" -msgstr "" - -msgid "Downstream bandwidth in kbit/s" -msgstr "" - -msgid "Host or Network in CIDR notation." -msgstr "" - -msgid "Interface" -msgstr "" - -msgid "Low priority destination ports" -msgstr "" - -msgid "Low priority hosts (Destination)" -msgstr "" - -msgid "Low priority hosts (Source)" -msgstr "" - -msgid "Low priority source ports" -msgstr "" - -msgid "Uplink" -msgstr "" - -msgid "Upstream bandwidth in kbit/s" -msgstr "" - -msgid "Wondershaper" -msgstr "" - -msgid "Wondershaper settings" -msgstr "" - -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" diff --git a/applications/luci-app-wshaper/po/uk/wshaper.po b/applications/luci-app-wshaper/po/uk/wshaper.po deleted file mode 100644 index 94d20df99..000000000 --- a/applications/luci-app-wshaper/po/uk/wshaper.po +++ /dev/null @@ -1,58 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2012-04-28 21:54+0200\n" -"Last-Translator: Yurii <yuripet@gmail.com>\n" -"Language-Team: none\n" -"Language: uk\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.6\n" - -msgid "Downlink" -msgstr "Прямий канал" - -msgid "Downstream bandwidth in kbit/s" -msgstr "Ширина смуги пропускання прямого каналу (кбіт/с)" - -msgid "Host or Network in CIDR notation." -msgstr "Вузол або мережа в нотації CIDR." - -msgid "Interface" -msgstr "Інтерфейс" - -msgid "Low priority destination ports" -msgstr "Низькопріоритетні порти призначення" - -msgid "Low priority hosts (Destination)" -msgstr "Низькопріоритетні вузли призначення" - -msgid "Low priority hosts (Source)" -msgstr "Низькопріоритетні вузли джерела" - -msgid "Low priority source ports" -msgstr "Низькопріоритетні порти джерела" - -msgid "Uplink" -msgstr "Зворотній канал" - -msgid "Upstream bandwidth in kbit/s" -msgstr "Ширина смуги пропускання зворотного каналу (кбіт/c)" - -msgid "Wondershaper" -msgstr "Wondershaper" - -msgid "Wondershaper settings" -msgstr "Налаштування Wondershaper" - -#, fuzzy -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" -"Wondershaper використовує формування трафіку для забезпечення низької " -"затримки інтерактивного трафіку, навіть якщо ваше з'єднання з інтернетом " -"дуже насичене." diff --git a/applications/luci-app-wshaper/po/vi/wshaper.po b/applications/luci-app-wshaper/po/vi/wshaper.po deleted file mode 100644 index e0b8e5324..000000000 --- a/applications/luci-app-wshaper/po/vi/wshaper.po +++ /dev/null @@ -1,54 +0,0 @@ -msgid "" -msgstr "" -"Plural-Forms: nplurals=1; plural=0;\n" -"Project-Id-Version: LuCI\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: vi\n" -"X-Generator: Poedit 1.6.10\n" - -msgid "Downlink" -msgstr "" - -msgid "Downstream bandwidth in kbit/s" -msgstr "" - -msgid "Host or Network in CIDR notation." -msgstr "" - -msgid "Interface" -msgstr "" - -msgid "Low priority destination ports" -msgstr "" - -msgid "Low priority hosts (Destination)" -msgstr "" - -msgid "Low priority hosts (Source)" -msgstr "" - -msgid "Low priority source ports" -msgstr "" - -msgid "Uplink" -msgstr "" - -msgid "Upstream bandwidth in kbit/s" -msgstr "" - -msgid "Wondershaper" -msgstr "" - -msgid "Wondershaper settings" -msgstr "" - -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" diff --git a/applications/luci-app-wshaper/po/zh-cn/wshaper.po b/applications/luci-app-wshaper/po/zh-cn/wshaper.po deleted file mode 100644 index a35ccd02d..000000000 --- a/applications/luci-app-wshaper/po/zh-cn/wshaper.po +++ /dev/null @@ -1,58 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-03 08:25+0200\n" -"PO-Revision-Date: 2013-10-10 20:15+0200\n" -"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: zh_CN\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.6\n" - -msgid "Downlink" -msgstr "下载链接" - -msgid "Downstream bandwidth in kbit/s" -msgstr "下载带宽kbit/s" - -msgid "Host or Network in CIDR notation." -msgstr "主机或网络的CIDR标记。" - -msgid "Interface" -msgstr "端口" - -msgid "Low priority destination ports" -msgstr "低优先级目标端口" - -msgid "Low priority hosts (Destination)" -msgstr "低优先级目标主机" - -msgid "Low priority hosts (Source)" -msgstr "低优先级源主机" - -msgid "Low priority source ports" -msgstr "低优先级源端口" - -msgid "Uplink" -msgstr "上联" - -msgid "Upstream bandwidth in kbit/s" -msgstr "上行带宽kbit/s" - -msgid "Wondershaper" -msgstr "Wondershaper" - -msgid "Wondershaper settings" -msgstr "Wondershaper设置" - -#, fuzzy -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" -"Wondershaper通过流量匹配,确保低延时的交互数据包，甚至当你的互联网连接是高度饱" -"和。" diff --git a/applications/luci-app-wshaper/po/zh-tw/wshaper.po b/applications/luci-app-wshaper/po/zh-tw/wshaper.po deleted file mode 100644 index 18148259f..000000000 --- a/applications/luci-app-wshaper/po/zh-tw/wshaper.po +++ /dev/null @@ -1,56 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2014-05-14 12:40+0200\n" -"Last-Translator: omnistack <omnistack@gmail.com>\n" -"Language-Team: none\n" -"Language: zh_TW\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.6\n" - -msgid "Downlink" -msgstr "下載" - -msgid "Downstream bandwidth in kbit/s" -msgstr "以 kbit/s表示的下載頻寬" - -msgid "Host or Network in CIDR notation." -msgstr "CIDR無類別域間路由中的主機或網路" - -msgid "Interface" -msgstr "介面" - -msgid "Low priority destination ports" -msgstr "低優先權目地埠號" - -msgid "Low priority hosts (Destination)" -msgstr "低優先權主機(目的地)" - -msgid "Low priority hosts (Source)" -msgstr "低優先權主機(來源)" - -msgid "Low priority source ports" -msgstr "低優先權來源埠號" - -msgid "Uplink" -msgstr "上傳" - -msgid "Upstream bandwidth in kbit/s" -msgstr "以kbit/s表示的上傳頻寬" - -msgid "Wondershaper" -msgstr "Wondershaper頻寬管理" - -msgid "Wondershaper settings" -msgstr "Wondershaper設定值" - -#, fuzzy -msgid "" -"Wondershaper shapes traffic to ensure low latencies for interactive traffic " -"even when your internet connection is highly saturated." -msgstr "" -"既使你的網路連線達到高飽和, Wondershaper採用流量銳化塑形以針對未知的流量保證" -"低延遲" diff --git a/applications/luci-app-wshaper/root/etc/uci-defaults/40_wshaper b/applications/luci-app-wshaper/root/etc/uci-defaults/40_wshaper deleted file mode 100644 index 918dff280..000000000 --- a/applications/luci-app-wshaper/root/etc/uci-defaults/40_wshaper +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -uci -q batch <<-EOF >/dev/null - delete ucitrack.@wshaper[-1] - set ucitrack.wshaper="wshaper" - set ucitrack.wshaper.exec='/etc/init.d/wshaper start' - commit ucitrack -EOF - -rm -f /tmp/luci-indexcache -exit 0 diff --git a/collections/luci-ssl-openssl/Makefile b/collections/luci-ssl-openssl/Makefile index b5f4b091b..d1e752e8b 100644 --- a/collections/luci-ssl-openssl/Makefile +++ b/collections/luci-ssl-openssl/Makefile @@ -11,10 +11,10 @@ LUCI_BASENAME:=ssl-openssl LUCI_TITLE:=LuCI with HTTPS support (OpenSSL as SSL backend) LUCI_DESCRIPTION:=LuCI with OpenSSL as the SSL backend (libustream-openssl). \ - Note: px5g still requires libmbedtls (in LEDE) or libpolarssl (in Openwrt). \ - In LEDE it is also possible to replace px5g with openssl-util as uhttpd can \ - also generate keys with openssl commandline tools if px5g is not installed. -LUCI_DEPENDS:=+luci +libustream-openssl +px5g + OpenSSL cmd tools (openssl-util) are used by uhttpd for SSL key generation \ + instead of the default px5g. (If px5g is installed, uhttpd will prefer that.) + +LUCI_DEPENDS:=+luci +libustream-openssl +openssl-util include ../../luci.mk diff --git a/libs/luci-lib-nixio/src/fs.c b/libs/luci-lib-nixio/src/fs.c index 12ca111ac..ba184ed11 100644 --- a/libs/luci-lib-nixio/src/fs.c +++ b/libs/luci-lib-nixio/src/fs.c @@ -355,7 +355,7 @@ static int nixio_stat(lua_State *L) { static int nixio_lstat(lua_State *L) { nixio_stat_t buf; - if (stat(luaL_checkstring(L, 1), &buf)) { + if (lstat(luaL_checkstring(L, 1), &buf)) { return nixio__perror(L); } else { nixio__push_stat(L, &buf); diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js index 0ca7e264a..8e66cbc38 100644 --- a/modules/luci-base/htdocs/luci-static/resources/cbi.js +++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js @@ -118,6 +118,50 @@ var cbi_validators = { return false; }, + 'ipmask': function() + { + return cbi_validators.ipmask4.apply(this) || + cbi_validators.ipmask6.apply(this); + }, + + 'ipmask4': function() + { + var ip = this, mask = 32; + + if (ip.match(/^(\S+)\/(\S+)$/)) + { + ip = RegExp.$1; + mask = RegExp.$2; + } + + if (!isNaN(mask) && (mask < 0 || mask > 32)) + return false; + + if (isNaN(mask) && !cbi_validators.ip4addr.apply(mask)) + return false; + + return cbi_validators.ip4addr.apply(ip); + }, + + 'ipmask6': function() + { + var ip = this, mask = 128; + + if (ip.match(/^(\S+)\/(\S+)$/)) + { + ip = RegExp.$1; + mask = RegExp.$2; + } + + if (!isNaN(mask) && (mask < 0 || mask > 128)) + return false; + + if (isNaN(mask) && !cbi_validators.ip6addr.apply(mask)) + return false; + + return cbi_validators.ip6addr.apply(ip); + }, + 'port': function() { var p = Int(this); diff --git a/modules/luci-base/luasrc/cbi/datatypes.lua b/modules/luci-base/luasrc/cbi/datatypes.lua index 626ad91c7..72b41ddad 100644 --- a/modules/luci-base/luasrc/cbi/datatypes.lua +++ b/modules/luci-base/luasrc/cbi/datatypes.lua @@ -131,6 +131,40 @@ function ip6prefix(val) return ( val and val >= 0 and val <= 128 ) end +function ipmask(val) + return ipmask4(val) or ipmask6(val) +end + +function ipmask4(val) + local ip, mask = val:match("^([^/]+)/([^/]+)$") + local bits = tonumber(mask) + + if bits and (bits < 0 or bits > 32) then + return false + end + + if not bits and mask and not ip4addr(mask) then + return false + end + + return ip4addr(ip or val) +end + +function ipmask6(val) + local ip, mask = val:match("^([^/]+)/([^/]+)$") + local bits = tonumber(mask) + + if bits and (bits < 0 or bits > 128) then + return false + end + + if not bits and mask and not ip6addr(mask) then + return false + end + + return ip6addr(ip or val) +end + function port(val) val = tonumber(val) return ( val and val >= 0 and val <= 65535 ) @@ -378,29 +412,29 @@ function dateyyyymmdd(val) return false; end - local days_in_month = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } - - local function is_leap_year(year) - return (year % 4 == 0) and ((year % 100 ~= 0) or (year % 400 == 0)) - end - - function get_days_in_month(month, year) - if (month == 2) and is_leap_year(year) then - return 29 - else - return days_in_month[month] - end - end - if (year < 2015) then - return false - end - if ((month == 0) or (month > 12)) then - return false - end - if ((day == 0) or (day > get_days_in_month(month, year))) then - return false - end - return true + local days_in_month = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } + + local function is_leap_year(year) + return (year % 4 == 0) and ((year % 100 ~= 0) or (year % 400 == 0)) + end + + function get_days_in_month(month, year) + if (month == 2) and is_leap_year(year) then + return 29 + else + return days_in_month[month] + end + end + if (year < 2015) then + return false + end + if ((month == 0) or (month > 12)) then + return false + end + if ((day == 0) or (day > get_days_in_month(month, year))) then + return false + end + return true end return false end diff --git a/modules/luci-base/luasrc/model/network.lua b/modules/luci-base/luasrc/model/network.lua index 2d8336bf3..49d91b875 100644 --- a/modules/luci-base/luasrc/model/network.lua +++ b/modules/luci-base/luasrc/model/network.lua @@ -950,6 +950,13 @@ function protocol.dns6addrs(self) return dns end +function protocol.ip6prefix(self) + local prefix = self:_ubus("ipv6-prefix") + if prefix and #prefix > 0 then + return "%s/%d" %{ prefix[1].address, prefix[1].mask } + end +end + function protocol.is_bridge(self) return (not self:is_virtual() and self:type() == "bridge") end diff --git a/modules/luci-base/luasrc/tools/status.lua b/modules/luci-base/luasrc/tools/status.lua index b0df9d365..95ff46df1 100644 --- a/modules/luci-base/luasrc/tools/status.lua +++ b/modules/luci-base/luasrc/tools/status.lua @@ -26,17 +26,18 @@ local function dhcp_leases_common(family) break else local ts, mac, ip, name, duid = ln:match("^(%d+) (%S+) (%S+) (%S+) (%S+)") + local expire = tonumber(ts) or 0 if ts and mac and ip and name and duid then if family == 4 and not ip:match(":") then rv[#rv+1] = { - expires = os.difftime(tonumber(ts) or 0, os.time()), + expires = (expire ~= 0) and os.difftime(expire, os.time()), macaddr = mac, ipaddr = ip, hostname = (name ~= "*") and name } elseif family == 6 and ip:match(":") then rv[#rv+1] = { - expires = os.difftime(tonumber(ts) or 0, os.time()), + expires = (expire ~= 0) and os.difftime(expire, os.time()), ip6addr = ip, duid = (duid ~= "*") and duid, hostname = (name ~= "*") and name diff --git a/modules/luci-base/luasrc/view/cbi/mvalue.htm b/modules/luci-base/luasrc/view/cbi/mvalue.htm index 246ef43aa..db17450d2 100644 --- a/modules/luci-base/luasrc/view/cbi/mvalue.htm +++ b/modules/luci-base/luasrc/view/cbi/mvalue.htm @@ -36,7 +36,7 @@ <label<%= attr("for", cbid.."-"..key)%>></label> <%=pcdata(self.vallist[i])%> </label> - <% if i == self.size then write('<br />') end %> + <% if self.size and (i % self.size) == 0 then write('<br />') end %> <% end %> </div> <% end %> diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index ec573915b..3139ecace 100644 --- a/modules/luci-base/po/ca/base.po +++ b/modules/luci-base/po/ca/base.po @@ -1328,6 +1328,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "Adreça IP" @@ -1421,6 +1424,9 @@ msgstr "" msgid "IPv6-Address" msgstr "Adreça IPv6" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "IPv6-en-IPv4 (RFC4213)" @@ -2352,6 +2358,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2516,6 +2525,9 @@ msgstr "Rep" msgid "Receiver Antenna" msgstr "Antena receptora" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "Reconnex aquesta interfície" @@ -3299,6 +3311,9 @@ msgstr "UMTS/GPRS/EV-DO" msgid "USB Device" msgstr "Dispositiu USB" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "UUID" diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po index 1438b11a4..a487f85c5 100644 --- a/modules/luci-base/po/cs/base.po +++ b/modules/luci-base/po/cs/base.po @@ -1339,6 +1339,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "IP adresy" @@ -1432,6 +1435,9 @@ msgstr "" msgid "IPv6-Address" msgstr "IPv6 adresa" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "IPv6-in-IPv4 (RFC4213)" @@ -2375,6 +2381,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2554,6 +2563,9 @@ msgstr "Přijmout" msgid "Receiver Antenna" msgstr "Přijímací anténa" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "Přepojit toto rozhraní" @@ -3365,6 +3377,9 @@ msgstr "UMTS/GPRS/EV-DO" msgid "USB Device" msgstr "USB zařízení" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "UUID" diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index 3650235a6..ffcb00ac8 100644 --- a/modules/luci-base/po/de/base.po +++ b/modules/luci-base/po/de/base.po @@ -1338,6 +1338,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "IP-Adresse" @@ -1431,6 +1434,9 @@ msgstr "" msgid "IPv6-Address" msgstr "IPv6-Adresse" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "IPv6-in-IPv4 (RFC4213)" @@ -2380,6 +2386,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2560,6 +2569,9 @@ msgstr "Empfangen" msgid "Receiver Antenna" msgstr "Empfangsantenne" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "Diese Schnittstelle neu verbinden" @@ -3388,6 +3400,9 @@ msgstr "UMTS/GPRS/EV-DO" msgid "USB Device" msgstr "USB-Gerät" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "UUID" diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po index d5dbff890..cbe1fa6ce 100644 --- a/modules/luci-base/po/el/base.po +++ b/modules/luci-base/po/el/base.po @@ -1352,6 +1352,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "Διεύθυνση IP" @@ -1445,6 +1448,9 @@ msgstr "" msgid "IPv6-Address" msgstr "" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "IPv6-in-IPv4 (RFC4213)" @@ -2382,6 +2388,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2547,6 +2556,9 @@ msgstr "Λήψη" msgid "Receiver Antenna" msgstr "Κεραία Λήψης" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "Επανασύνδεση της διεπαφής" @@ -3324,6 +3336,9 @@ msgstr "UMTS/GPRS/EV-DO" msgid "USB Device" msgstr "Συσκευή USB" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "UUID" diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po index 4afe6165c..215c1a878 100644 --- a/modules/luci-base/po/en/base.po +++ b/modules/luci-base/po/en/base.po @@ -1326,6 +1326,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "IP address" @@ -1419,6 +1422,9 @@ msgstr "" msgid "IPv6-Address" msgstr "" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "" @@ -2349,6 +2355,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2513,6 +2522,9 @@ msgstr "Receive" msgid "Receiver Antenna" msgstr "Receiver Antenna" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "" @@ -3281,6 +3293,9 @@ msgstr "" msgid "USB Device" msgstr "" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "" diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index d466cf05e..52e21f346 100644 --- a/modules/luci-base/po/es/base.po +++ b/modules/luci-base/po/es/base.po @@ -1348,6 +1348,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "Dirección IP" @@ -1441,6 +1444,9 @@ msgstr "" msgid "IPv6-Address" msgstr "Dirección IPv6" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "IPv6-en-IPv4 (RFC4213)" @@ -2389,6 +2395,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2567,6 +2576,9 @@ msgstr "Recibir" msgid "Receiver Antenna" msgstr "Antena Receptora" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "Reconectar esta interfaz" @@ -3390,6 +3402,9 @@ msgstr "UMTS/GPRS/EV-DO" msgid "USB Device" msgstr "Dispositivo USB" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "UUID" diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po index b8a68f05d..bb11239d9 100644 --- a/modules/luci-base/po/fr/base.po +++ b/modules/luci-base/po/fr/base.po @@ -1360,6 +1360,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "Adresse IP" @@ -1453,6 +1456,9 @@ msgstr "" msgid "IPv6-Address" msgstr "Adresse IPv6" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "IPv6 dans IPv4 (RFC 4213)" @@ -2402,6 +2408,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2580,6 +2589,9 @@ msgstr "Reçoit" msgid "Receiver Antenna" msgstr "Antenne émettrice" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "Reconnecter cet interface" @@ -3408,6 +3420,9 @@ msgstr "UMTS/GPRS/EV-DO" msgid "USB Device" msgstr "Périphérique USB" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "UUID" diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po index 5ed0029b7..a2ce3ef29 100644 --- a/modules/luci-base/po/he/base.po +++ b/modules/luci-base/po/he/base.po @@ -1309,6 +1309,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "" @@ -1402,6 +1405,9 @@ msgstr "" msgid "IPv6-Address" msgstr "" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "" @@ -2316,6 +2322,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2481,6 +2490,9 @@ msgstr "" msgid "Receiver Antenna" msgstr "" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "" @@ -3239,6 +3251,9 @@ msgstr "" msgid "USB Device" msgstr "" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "" diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po index d7c19278e..6a543d9ee 100644 --- a/modules/luci-base/po/hu/base.po +++ b/modules/luci-base/po/hu/base.po @@ -1349,6 +1349,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "IP cím" @@ -1442,6 +1445,9 @@ msgstr "" msgid "IPv6-Address" msgstr "IPv6-cím" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "IPv6 IPv4-ben (RFC4213)" @@ -2392,6 +2398,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2571,6 +2580,9 @@ msgstr "Fogadás" msgid "Receiver Antenna" msgstr "Vevő antenna" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "Csatlakoztassa újra az interfészt" @@ -3396,6 +3408,9 @@ msgstr "UMTS/GPRS/EV-DO" msgid "USB Device" msgstr "USB eszköz" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "UUID" diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po index 199ffcb8f..dbfc8dba3 100644 --- a/modules/luci-base/po/it/base.po +++ b/modules/luci-base/po/it/base.po @@ -1352,6 +1352,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "Indirizzo IP" @@ -1445,6 +1448,9 @@ msgstr "" msgid "IPv6-Address" msgstr "Indirizzo-IPv6" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "IPv6-in-IPv4 (RFC4213)" @@ -2388,6 +2394,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2555,6 +2564,9 @@ msgstr "Ricezione" msgid "Receiver Antenna" msgstr "Antenna ricevente" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "Ricollega questa interfaccia" @@ -3347,6 +3359,9 @@ msgstr "" msgid "USB Device" msgstr "" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "" diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index ac17c21f0..15ad1a48f 100644 --- a/modules/luci-base/po/ja/base.po +++ b/modules/luci-base/po/ja/base.po @@ -1,17 +1,17 @@ msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-06-10 03:40+0200\n" -"PO-Revision-Date: 2016-12-16 15:23+0900\n" -"Last-Translator: musashino205 <musashino.open@gmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2017-01-30 02:40+0900\n" +"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.5.7\n" +"X-Generator: Poedit 1.8.11\n" +"Language-Team: \n" msgid "%s is untagged in multiple VLANs!" msgstr "%s は複数のVLANにUntaggedしています!" @@ -44,7 +44,7 @@ msgid "-- match by label --" msgstr "-- ラベルで設定 --" msgid "-- match by uuid --" -msgstr "" +msgstr "-- UUIDで設定 --" msgid "1 Minute Load:" msgstr "過去1分の負荷:" @@ -136,7 +136,7 @@ msgid "A43C + J43 + A43 + V43" msgstr "" msgid "ADSL" -msgstr "" +msgstr "ADSL" msgid "AICCU (SIXXS)" msgstr "" @@ -228,7 +228,7 @@ msgid "Additional Hosts files" msgstr "追加のホストファイル" msgid "Additional servers file" -msgstr "" +msgstr "追加のサーバー ファイル" msgid "Address" msgstr "アドレス" @@ -283,7 +283,7 @@ msgid "" msgstr "" msgid "Allowed IPs" -msgstr "" +msgstr "許可されるIP" msgid "" "Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" @@ -394,7 +394,7 @@ msgid "Atheros 802.11%s Wireless Controller" msgstr "Atheros 802.11%s 無線LANコントローラ" msgid "Auth Group" -msgstr "" +msgstr "認証グループ" msgid "AuthGroup" msgstr "" @@ -583,6 +583,7 @@ msgstr "マウント前にファイルシステムをチェックする" msgid "Check this option to delete the existing networks from this radio." msgstr "" +"この無線から既存のネットワークを削除する場合、このオプションを有効にします。" msgid "Checksum" msgstr "チェックサム" @@ -775,7 +776,7 @@ msgid "DS-Lite AFTR address" msgstr "DS-Lite AFTR アドレス" msgid "DSL" -msgstr "" +msgstr "DSL" msgid "DSL Status" msgstr "" @@ -802,7 +803,7 @@ msgid "Default is stateless + stateful" msgstr "デフォルトは ステートレス + ステートフル です。" msgid "Default route" -msgstr "" +msgstr "デフォルト ルート" msgid "Default state" msgstr "標準状態" @@ -868,7 +869,7 @@ msgid "Disable DNS setup" msgstr "DNSセットアップを無効にする" msgid "Disable Encryption" -msgstr "" +msgstr "暗号化を無効にする" msgid "Disable HW-Beacon timer" msgstr "HWビーコンタイマーを無効にする" @@ -1001,7 +1002,7 @@ msgid "Enable HE.net dynamic endpoint update" msgstr "HE.netの動的endpoint更新を有効にします" msgid "Enable IPv6 negotiation" -msgstr "" +msgstr "IPv6 ネゴシエーションの有効化" msgid "Enable IPv6 negotiation on the PPP link" msgstr "PPPリンクのIPv6ネゴシエーションを有効にする" @@ -1013,7 +1014,7 @@ msgid "Enable NTP client" msgstr "NTPクライアント機能を有効にする" msgid "Enable Single DES" -msgstr "" +msgstr "シングルDESの有効化" msgid "Enable TFTP server" msgstr "TFTPサーバーを有効にする" @@ -1022,7 +1023,7 @@ msgid "Enable VLAN functionality" msgstr "VLAN機能を有効にする" msgid "Enable WPS pushbutton, requires WPA(2)-PSK" -msgstr "" +msgstr "WPS プッシュボタンを有効化するには、WPA(2)-PSKが必要です。" msgid "Enable learning and aging" msgstr "ラーニング・エイジング機能を有効にする" @@ -1058,10 +1059,10 @@ msgid "Encryption" msgstr "暗号化モード" msgid "Endpoint Host" -msgstr "" +msgstr "エンドポイント ホスト" msgid "Endpoint Port" -msgstr "" +msgstr "エンドポイント ポート" msgid "Erasing..." msgstr "消去中..." @@ -1087,7 +1088,6 @@ msgstr "拡張ホスト設定" msgid "Expires" msgstr "期限切れ" -#, fuzzy msgid "" "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)." msgstr "" @@ -1196,7 +1196,7 @@ msgid "Force TKIP and CCMP (AES)" msgstr "TKIP 及びCCMP (AES) を使用" msgid "Force use of NAT-T" -msgstr "" +msgstr "NAT-Tの強制使用" msgid "Form token mismatch" msgstr "" @@ -1229,6 +1229,8 @@ msgid "" "Further information about WireGuard interfaces and peers at <a href=\"http://" "wireguard.io\">wireguard.io</a>." msgstr "" +"WireGuard インターフェースとピアについての詳細情報: <a href=\"http://" +"wireguard.io\">wireguard.io</a>" msgid "GHz" msgstr "GHz" @@ -1267,7 +1269,7 @@ msgid "Global Settings" msgstr "全体設定" msgid "Global network options" -msgstr "" +msgstr "グローバル ネットワークオプション" msgid "Go to password configuration..." msgstr "パスワード設定へ移動..." @@ -1276,7 +1278,7 @@ msgid "Go to relevant configuration page" msgstr "関連する設定ページへ移動" msgid "Group Password" -msgstr "" +msgstr "グループ パスワード" msgid "Guest" msgstr "ゲスト" @@ -1345,7 +1347,10 @@ msgid "Hybrid" msgstr "ハイブリッド" msgid "IKE DH Group" -msgstr "" +msgstr "IKE DHグループ" + +msgid "IP Addresses" +msgstr "IPアドレス" msgid "IP address" msgstr "IPアドレス" @@ -1366,7 +1371,7 @@ msgid "IPv4 and IPv6" msgstr "IPv4及びIPv6" msgid "IPv4 assignment length" -msgstr "" +msgstr "IPv4 割り当て長" msgid "IPv4 broadcast" msgstr "IPv4 ブロードキャスト" @@ -1420,7 +1425,7 @@ msgid "IPv6 assignment hint" msgstr "" msgid "IPv6 assignment length" -msgstr "" +msgstr "IPv6 割り当て長" msgid "IPv6 gateway" msgstr "IPv6 ゲートウェイ" @@ -1440,6 +1445,9 @@ msgstr "" msgid "IPv6-Address" msgstr "IPv6-アドレス" +msgid "IPv6-PD" +msgstr "IPv6-PD" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "IPv6-in-IPv4 (RFC4213)" @@ -1456,7 +1464,7 @@ msgid "If checked, 1DES is enaled" msgstr "" msgid "If checked, encryption is disabled" -msgstr "" +msgstr "チェックした場合、暗号化は無効になります。" msgid "" "If specified, mount the device by its UUID instead of a fixed device node" @@ -1826,7 +1834,7 @@ msgid "MB/s" msgstr "MB/s" msgid "MD5" -msgstr "" +msgstr "MD5" msgid "MHz" msgstr "MHz" @@ -1969,7 +1977,7 @@ msgid "NAS ID" msgstr "NAS ID" msgid "NAT-T Mode" -msgstr "" +msgstr "NAT-T モード" msgid "NAT64 Prefix" msgstr "NAT64 プレフィクス" @@ -1978,13 +1986,13 @@ msgid "NDP-Proxy" msgstr "NDP-プロキシ" msgid "NT Domain" -msgstr "" +msgstr "NT ドメイン" msgid "NTP server candidates" msgstr "NTPサーバー候補" msgid "NTP sync time-out" -msgstr "" +msgstr "NTP 同期タイムアウト" msgid "Name" msgstr "名前" @@ -2020,7 +2028,7 @@ msgid "No DHCP Server configured for this interface" msgstr "このインターフェースにはDHCPサーバーが設定されていません" msgid "No NAT-T" -msgstr "" +msgstr "NAT-Tを使用しない" msgid "No chains in this table" msgstr "チェイン内にルールがありません" @@ -2086,7 +2094,7 @@ msgid "Note: Configuration files will be erased." msgstr "注意: 設定ファイルは消去されます。" msgid "Note: interface name length" -msgstr "" +msgstr "注意: インターフェース名の長さ" msgid "Notice" msgstr "注意" @@ -2134,7 +2142,7 @@ msgid "One or more fields contain invalid values!" msgstr "1つ以上のフィールドに無効な値が設定されています！" msgid "One or more invalid/required values on tab" -msgstr "" +msgstr "タブに1つ以上の 無効/必須 の値があります。" msgid "One or more required fields have no value!" msgstr "1つ以上のフィールドに値が設定されていません！" @@ -2143,7 +2151,7 @@ msgid "Open list..." msgstr "リストを開く" msgid "OpenConnect (CISCO AnyConnect)" -msgstr "" +msgstr "OpenConnect (CISCO AnyConnect)" msgid "Operating frequency" msgstr "動作周波数" @@ -2161,7 +2169,7 @@ msgid "Optional, use when the SIXXS account has more than one tunnel" msgstr "" msgid "Optional." -msgstr "" +msgstr "（オプション）" msgid "" "Optional. Adds in an additional layer of symmetric-key cryptography for post-" @@ -2175,20 +2183,24 @@ msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." msgstr "" +"ピアのホストです。名前はインターフェースの起動前に解決されます。（オプショ" +"ン）" msgid "Optional. Maximum Transmission Unit of tunnel interface." -msgstr "" +msgstr "トンネル インターフェースのMaximum Transmission Unit（オプション）" msgid "Optional. Port of peer." -msgstr "" +msgstr "ピアのポート（オプション）" msgid "" "Optional. Seconds between keep alive messages. Default is 0 (disabled). " "Recommended value if this device is behind a NAT is 25." msgstr "" +"キープアライブ メッセージの送信間隔（秒）です。既定値: ０。このデバイスがNAT" +"以下に存在する場合の推奨値は25です。（オプション）" msgid "Optional. UDP port used for outgoing and incoming packets." -msgstr "" +msgstr "発信パケットと受信パケットに使用されるUDPポート（オプション）" msgid "Options" msgstr "オプション" @@ -2206,7 +2218,7 @@ msgid "Outdoor Channels" msgstr "屋外用周波数" msgid "Output Interface" -msgstr "" +msgstr "出力インターフェース" msgid "Override MAC address" msgstr "MACアドレスを上書きする" @@ -2339,7 +2351,7 @@ msgid "Peer IP address to assign" msgstr "" msgid "Peers" -msgstr "" +msgstr "ピア" msgid "Perfect Forward Secrecy" msgstr "" @@ -2351,7 +2363,7 @@ msgid "Perform reset" msgstr "設定リセットを実行" msgid "Persistent Keep Alive" -msgstr "" +msgstr "永続的なキープアライブ" msgid "Phy Rate:" msgstr "物理レート:" @@ -2383,6 +2395,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "委任されたプレフィクス (PD)" + msgid "Preshared Key" msgstr "事前共有鍵" @@ -2412,7 +2427,7 @@ msgid "Processes" msgstr "プロセス" msgid "Profile" -msgstr "" +msgstr "プロファイル" msgid "Prot." msgstr "プロトコル" @@ -2451,7 +2466,7 @@ msgid "Quality" msgstr "クオリティ" msgid "RFC3947 NAT-T mode" -msgstr "" +msgstr "RFC3947 NAT-Tモード" msgid "RTS/CTS Threshold" msgstr "RTS/CTS閾値" @@ -2563,6 +2578,9 @@ msgstr "受信" msgid "Receiver Antenna" msgstr "受信アンテナ" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "WireGuard インターフェースのIPアドレスです。（推奨）" + msgid "Reconnect this interface" msgstr "インターフェースの再接続" @@ -2591,7 +2609,7 @@ msgid "Remote IPv4 address" msgstr "リモートIPv4アドレス" msgid "Remote IPv4 address or FQDN" -msgstr "" +msgstr "リモート IPv4アドレス または FQDN" msgid "Remove" msgstr "削除" @@ -2609,7 +2627,7 @@ msgid "Request IPv6-address" msgstr "IPv6-アドレスのリクエスト" msgid "Request IPv6-prefix of length" -msgstr "" +msgstr "リクエストするIPv6-プレフィクス長" msgid "Require TLS" msgstr "TLSが必要" @@ -2618,7 +2636,7 @@ msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3" msgstr "DOCSIS 3.0を使用するいくつかのISPでは必要になります" msgid "Required. Base64-encoded private key for this interface." -msgstr "" +msgstr "このインターフェースに使用するBase64-エンコード 秘密鍵（必須）" msgid "" "Required. IP addresses and prefixes that this peer is allowed to use inside " @@ -2627,7 +2645,7 @@ msgid "" msgstr "" msgid "Required. Public key of peer." -msgstr "" +msgstr "ピアの公開鍵（必須）" msgid "" "Requires upstream supports DNSSEC; verify unsigned domain responses really " @@ -2677,7 +2695,7 @@ msgid "Route Allowed IPs" msgstr "" msgid "Route type" -msgstr "" +msgstr "ルート タイプ" msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" @@ -2705,7 +2723,7 @@ msgid "Run filesystem check" msgstr "ファイルシステムチェックを行う" msgid "SHA256" -msgstr "" +msgstr "SHA256" msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " @@ -2716,7 +2734,7 @@ msgid "SIXXS-handle[/Tunnel-ID]" msgstr "" msgid "SNR" -msgstr "" +msgstr "SNR" msgid "SSH Access" msgstr "SSHアクセス" @@ -2806,7 +2824,7 @@ msgid "Severely Errored Seconds (SES)" msgstr "" msgid "Short GI" -msgstr "" +msgstr "Short GI" msgid "Show current backup file list" msgstr "現在のバックアップファイルのリストを表示する" @@ -3031,12 +3049,11 @@ msgid "Target" msgstr "ターゲット" msgid "Target network" -msgstr "" +msgstr "対象ネットワーク" msgid "Terminate" msgstr "停止" -#, fuzzy msgid "" "The <em>Device Configuration</em> section covers physical settings of the " "radio hardware such as channel, transmit power or antenna selection which " @@ -3117,12 +3134,11 @@ msgstr "このシステムでは、現在以下のルールが有効になって msgid "The given network name is not unique" msgstr "設定されたネットワーク名はユニークなものではありません" -#, fuzzy msgid "" "The hardware is not multi-SSID capable and the existing configuration will " "be replaced if you proceed." msgstr "" -"このハードウェアではマルチESSIDを設定することができないため、続行した場合、設" +"このハードウェアでは複数のESSIDを設定することができないため、続行した場合、設" "定は既存の設定と置き換えられます。" msgid "" @@ -3156,7 +3172,6 @@ msgid "" "when finished." msgstr "システムは設定領域を消去中です。完了後、自動的に再起動します。" -#, fuzzy msgid "" "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a " "few minutes before you try to reconnect. It might be necessary to renew the " @@ -3339,16 +3354,16 @@ msgid "Tunnel Interface" msgstr "トンネルインターフェース" msgid "Tunnel Link" -msgstr "" +msgstr "トンネルリンク" msgid "Tunnel broker protocol" -msgstr "" +msgstr "トンネルブローカー プロトコル" msgid "Tunnel setup server" -msgstr "" +msgstr "トンネルセットアップ サーバー" msgid "Tunnel type" -msgstr "" +msgstr "トンネルタイプ" msgid "Turbo Mode" msgstr "ターボモード" @@ -3371,6 +3386,9 @@ msgstr "UMTS/GPRS/EV-DO" msgid "USB Device" msgstr "USBデバイス" +msgid "USB Ports" +msgstr "USB ポート" + msgid "UUID" msgstr "UUID" @@ -3493,7 +3511,7 @@ msgid "VC-Mux" msgstr "VC-Mux" msgid "VDSL" -msgstr "" +msgstr "VDSL" msgid "VLANs on %q" msgstr "%q上のVLANs" @@ -3502,25 +3520,25 @@ msgid "VLANs on %q (%s)" msgstr "%q上のVLAN (%s)" msgid "VPN Local address" -msgstr "" +msgstr "VPN ローカルアドレス" msgid "VPN Local port" -msgstr "" +msgstr "VPN ローカルポート" msgid "VPN Server" msgstr "VPN サーバー" msgid "VPN Server port" -msgstr "" +msgstr "VPN サーバーポート" msgid "VPN Server's certificate SHA1 hash" -msgstr "" +msgstr "VPN サーバー証明書 SHA1ハッシュ" msgid "VPNC (CISCO 3000 (and others) VPN)" -msgstr "" +msgstr "VPNC (CISCO 3000 (またはその他の) VPN)" msgid "Vendor" -msgstr "" +msgstr "ベンダー" msgid "Vendor Class to send when requesting DHCP" msgstr "DHCPリクエスト送信時のベンダークラスを設定" @@ -3574,7 +3592,7 @@ msgid "Waiting for command to complete..." msgstr "コマンド実行中です..." msgid "Waiting for device..." -msgstr "" +msgstr "デバイスの起動をお待ちください..." msgid "Warning" msgstr "警告" @@ -3592,7 +3610,7 @@ msgid "Width" msgstr "帯域幅" msgid "WireGuard VPN" -msgstr "" +msgstr "WireGuard VPN" msgid "Wireless" msgstr "無線" @@ -3655,6 +3673,9 @@ msgid "" "upgrade it to at least version 7 or use another browser like Firefox, Opera " "or Safari." msgstr "" +"Internet Explorerが古すぎるため、このページを正しく表示することができません。" +"バージョン 7以上にアップグレードするか、FirefoxやOpera、Safariなど別のブラウ" +"ザーを使用してください。" msgid "any" msgstr "全て" @@ -3712,7 +3733,7 @@ msgid "help" msgstr "ヘルプ" msgid "hidden" -msgstr "" +msgstr "(不明)" msgid "hybrid mode" msgstr "ハイブリッド モード" @@ -3721,7 +3742,7 @@ msgid "if target is a network" msgstr "ターゲットがネットワークの場合" msgid "input" -msgstr "" +msgstr "入力" msgid "kB" msgstr "kB" @@ -3736,7 +3757,7 @@ msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" msgstr "ローカル <abbr title=\"Domain Name System\">DNS</abbr>ファイル" msgid "minimum 1280, maximum 1480" -msgstr "" +msgstr "最小値 1280、最大値 1480" msgid "navigation Navigation" msgstr "" @@ -3760,10 +3781,10 @@ msgid "on" msgstr "オン" msgid "open" -msgstr "" +msgstr "オープン" msgid "overlay" -msgstr "" +msgstr "オーバーレイ" msgid "relay mode" msgstr "リレー モード" diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po index c20444e10..9d41800d6 100644 --- a/modules/luci-base/po/ko/base.po +++ b/modules/luci-base/po/ko/base.po @@ -1325,6 +1325,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "IP 주소" @@ -1418,6 +1421,9 @@ msgstr "" msgid "IPv6-Address" msgstr "IPv6-주소" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "" @@ -2342,6 +2348,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2508,6 +2517,9 @@ msgstr "" msgid "Receiver Antenna" msgstr "" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "이 인터페이스를 재연결합니다" @@ -3123,8 +3135,8 @@ msgid "" "There is no password set on this router. Please configure a root password to " "protect the web interface and enable SSH." msgstr "" -"이 공유기에 암호 설정이 되지 않았습니다. 웹 UI 와 SSH 부분을 보호하기 " -"위해서 꼭 root 암호를 설정해 주세요." +"이 공유기에 암호 설정이 되지 않았습니다. 웹 UI 와 SSH 부분을 보호하기 위해서 " +"꼭 root 암호를 설정해 주세요." msgid "This IPv4 address of the relay" msgstr "" @@ -3283,6 +3295,9 @@ msgstr "" msgid "USB Device" msgstr "" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "" diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index 971afd4fe..5d9cc831a 100644 --- a/modules/luci-base/po/ms/base.po +++ b/modules/luci-base/po/ms/base.po @@ -1296,6 +1296,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "Alamat IP" @@ -1389,6 +1392,9 @@ msgstr "" msgid "IPv6-Address" msgstr "" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "" @@ -2321,6 +2327,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2484,6 +2493,9 @@ msgstr "Menerima" msgid "Receiver Antenna" msgstr "Antena Penerima" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "" @@ -3257,6 +3269,9 @@ msgstr "" msgid "USB Device" msgstr "" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "" diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po index 400876dbb..454486606 100644 --- a/modules/luci-base/po/no/base.po +++ b/modules/luci-base/po/no/base.po @@ -1335,6 +1335,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "IP adresse" @@ -1428,6 +1431,9 @@ msgstr "" msgid "IPv6-Address" msgstr "IPv6-Adresse" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "IPv6-i-IPv4 (RFC4213)" @@ -2367,6 +2373,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2545,6 +2554,9 @@ msgstr "Motta" msgid "Receiver Antenna" msgstr "Mottak antenne" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "Koble til igjen" @@ -3362,6 +3374,9 @@ msgstr "UMTS/GPRS/EV-DO" msgid "USB Device" msgstr "USB Enhet" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "UUID" diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index e77a51548..9983b7901 100644 --- a/modules/luci-base/po/pl/base.po +++ b/modules/luci-base/po/pl/base.po @@ -1372,6 +1372,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "Adres IP" @@ -1465,6 +1468,9 @@ msgstr "" msgid "IPv6-Address" msgstr "Adres IPv6" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "IPv6-w-IPv4 (RFC4213)" @@ -2414,6 +2420,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2594,6 +2603,9 @@ msgstr "Odebrane" msgid "Receiver Antenna" msgstr "Antena odbiorcza" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "Połącz ponownie ten interfejs" @@ -3425,6 +3437,9 @@ msgstr "UMTS/GPRS/EV-DO" msgid "USB Device" msgstr "Urządzenie USB" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "UUID" diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po index e33bcb20e..0b1a76387 100644 --- a/modules/luci-base/po/pt-br/base.po +++ b/modules/luci-base/po/pt-br/base.po @@ -1364,6 +1364,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "Endereço IP" @@ -1457,6 +1460,9 @@ msgstr "" msgid "IPv6-Address" msgstr "Endereço IPv6" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "IPv6-in-IPv4 (RFC4213)" @@ -2420,6 +2426,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2600,6 +2609,9 @@ msgstr "Receber" msgid "Receiver Antenna" msgstr "Antena de Recepção" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "Reconectar esta interface" @@ -3428,6 +3440,9 @@ msgstr "UMTS/GPRS/EV-DO" msgid "USB Device" msgstr "Dispositivo USB" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "UUID" diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po index 86e9e1b9d..eb6a17741 100644 --- a/modules/luci-base/po/pt/base.po +++ b/modules/luci-base/po/pt/base.po @@ -1356,6 +1356,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "Endereço IP" @@ -1449,6 +1452,9 @@ msgstr "" msgid "IPv6-Address" msgstr "Endereço-IPv6" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "IPv6-em-IPv4 (RFC4213)" @@ -2389,6 +2395,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2564,6 +2573,9 @@ msgstr "Receber" msgid "Receiver Antenna" msgstr "Antena de Recepção" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "Reconetar esta interface" @@ -3363,6 +3375,9 @@ msgstr "UMTS/GPRS/EV-DO" msgid "USB Device" msgstr "Dispositivo USB" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "UUID" diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po index 4763d6335..c40c61e4e 100644 --- a/modules/luci-base/po/ro/base.po +++ b/modules/luci-base/po/ro/base.po @@ -1303,6 +1303,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "Adresa IP" @@ -1396,6 +1399,9 @@ msgstr "" msgid "IPv6-Address" msgstr "" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "" @@ -2313,6 +2319,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2477,6 +2486,9 @@ msgstr "" msgid "Receiver Antenna" msgstr "Antena receptorului" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "Reconecteaza aceasta interfata" @@ -3230,6 +3242,9 @@ msgstr "" msgid "USB Device" msgstr "Dispozitiv USB" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "UUID" diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index 8394b3c6f..21ec525a2 100644 --- a/modules/luci-base/po/ru/base.po +++ b/modules/luci-base/po/ru/base.po @@ -1355,6 +1355,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "IP-адрес" @@ -1448,6 +1451,9 @@ msgstr "" msgid "IPv6-Address" msgstr "IPv6-адрес" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "IPv6 в IPv4 (RFC4213)" @@ -2397,6 +2403,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2574,6 +2583,9 @@ msgstr "Приём" msgid "Receiver Antenna" msgstr "Приёмная антенна" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "Переподключить этот интерфейс" @@ -3397,6 +3409,9 @@ msgstr "UMTS/GPRS/EV-DO" msgid "USB Device" msgstr "USB-устройство" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "UUID" diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po index 694608a2b..f2ffac719 100644 --- a/modules/luci-base/po/sk/base.po +++ b/modules/luci-base/po/sk/base.po @@ -1281,6 +1281,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "" @@ -1374,6 +1377,9 @@ msgstr "" msgid "IPv6-Address" msgstr "" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "" @@ -2288,6 +2294,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2450,6 +2459,9 @@ msgstr "" msgid "Receiver Antenna" msgstr "" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "" @@ -3200,6 +3212,9 @@ msgstr "" msgid "USB Device" msgstr "" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "" diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po index fac272abe..e3d158945 100644 --- a/modules/luci-base/po/sv/base.po +++ b/modules/luci-base/po/sv/base.po @@ -1287,6 +1287,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "" @@ -1380,6 +1383,9 @@ msgstr "" msgid "IPv6-Address" msgstr "" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "" @@ -2294,6 +2300,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2456,6 +2465,9 @@ msgstr "" msgid "Receiver Antenna" msgstr "" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "" @@ -3206,6 +3218,9 @@ msgstr "" msgid "USB Device" msgstr "" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "" diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot index 42eb60b25..f26b54e7c 100644 --- a/modules/luci-base/po/templates/base.pot +++ b/modules/luci-base/po/templates/base.pot @@ -1274,6 +1274,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "" @@ -1367,6 +1370,9 @@ msgstr "" msgid "IPv6-Address" msgstr "" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "" @@ -2281,6 +2287,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2443,6 +2452,9 @@ msgstr "" msgid "Receiver Antenna" msgstr "" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "" @@ -3193,6 +3205,9 @@ msgstr "" msgid "USB Device" msgstr "" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "" diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po index 5a3d2f512..dd461339b 100644 --- a/modules/luci-base/po/tr/base.po +++ b/modules/luci-base/po/tr/base.po @@ -1294,6 +1294,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "" @@ -1387,6 +1390,9 @@ msgstr "" msgid "IPv6-Address" msgstr "" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "" @@ -2301,6 +2307,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2463,6 +2472,9 @@ msgstr "" msgid "Receiver Antenna" msgstr "" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "" @@ -3213,6 +3225,9 @@ msgstr "" msgid "USB Device" msgstr "" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "" diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po index cb790520c..61d7194a2 100644 --- a/modules/luci-base/po/uk/base.po +++ b/modules/luci-base/po/uk/base.po @@ -1363,6 +1363,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "IP-адреса" @@ -1456,6 +1459,9 @@ msgstr "" msgid "IPv6-Address" msgstr "IPv6-адреса" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "IPv6 у IPv4 (RFC4213)" @@ -2408,6 +2414,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2588,6 +2597,9 @@ msgstr "Прийом" msgid "Receiver Antenna" msgstr "Антена приймача" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "Перепідключити цей інтерфейс" @@ -3413,6 +3425,9 @@ msgstr "UMTS/GPRS/EV-DO" msgid "USB Device" msgstr "USB-пристрій" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "UUID" diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po index 178bf30ac..fcb17f4f3 100644 --- a/modules/luci-base/po/vi/base.po +++ b/modules/luci-base/po/vi/base.po @@ -1301,6 +1301,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "Địa chỉ IP" @@ -1394,6 +1397,9 @@ msgstr "" msgid "IPv6-Address" msgstr "" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "" @@ -2324,6 +2330,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2488,6 +2497,9 @@ msgstr "Receive" msgid "Receiver Antenna" msgstr "Máy thu Antenna" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "" @@ -3255,6 +3267,9 @@ msgstr "" msgid "USB Device" msgstr "" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "" diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po index db02643de..28417f008 100644 --- a/modules/luci-base/po/zh-cn/base.po +++ b/modules/luci-base/po/zh-cn/base.po @@ -1303,6 +1303,9 @@ msgstr "混合" msgid "IKE DH Group" msgstr "IKE DH组" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "IP地址" @@ -1396,6 +1399,9 @@ msgstr "IPv6路由前缀" msgid "IPv6-Address" msgstr "IPv6-地址" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "IPv6-in-IPv4 (RFC4213)" @@ -2315,6 +2321,9 @@ msgstr "电源管理模式" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "抢占式CRC错误(CRCP_P)" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "预共享密钥" @@ -2486,6 +2495,9 @@ msgstr "接收" msgid "Receiver Antenna" msgstr "接收天线" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "重连此接口" @@ -3260,6 +3272,9 @@ msgstr "UMTS/GPRS/EV-DO" msgid "USB Device" msgstr "USB设备" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "UUID" diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po index 4acb190cc..fa68112da 100644 --- a/modules/luci-base/po/zh-tw/base.po +++ b/modules/luci-base/po/zh-tw/base.po @@ -1312,6 +1312,9 @@ msgstr "" msgid "IKE DH Group" msgstr "" +msgid "IP Addresses" +msgstr "" + msgid "IP address" msgstr "IP位址" @@ -1405,6 +1408,9 @@ msgstr "" msgid "IPv6-Address" msgstr "IPv6-位址" +msgid "IPv6-PD" +msgstr "" + msgid "IPv6-in-IPv4 (RFC4213)" msgstr "IPv6包覆在IPv4內(RFC4213)" @@ -2329,6 +2335,9 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefix Delegated" +msgstr "" + msgid "Preshared Key" msgstr "" @@ -2502,6 +2511,9 @@ msgstr "接收" msgid "Receiver Antenna" msgstr "接收天線" +msgid "Recommended. IP addresses of the WireGuard interface." +msgstr "" + msgid "Reconnect this interface" msgstr "重新連接這個介面" @@ -3287,6 +3299,9 @@ msgstr "UMTS/GPRS/EV-DO" msgid "USB Device" msgstr "USB設備" +msgid "USB Ports" +msgstr "" + msgid "UUID" msgstr "設備通用唯一識別碼UUID" diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua index 3b5f3eb8d..2cb2108b9 100644 --- a/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua +++ b/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua @@ -238,6 +238,7 @@ function iface_status(ifaces) ipaddrs = net:ipaddrs(), ip6addrs = net:ip6addrs(), dnsaddrs = net:dnsaddrs(), + ip6prefix = net:ip6prefix(), name = device:shortname(), type = device:type(), ifname = device:name(), diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua index 2dff4ddc8..afe0d662b 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -42,6 +42,9 @@ end -- wireless toggle was requested, commit and reload page function m.parse(map) + local new_cc = m:formvalue("cbid.wireless.%s.country" % wdev:name()) + local old_cc = m:get(wdev:name(), "country") + if m:formvalue("cbid.wireless.%s.__toggle" % wdev:name()) then if wdev:get("disabled") == "1" or wnet:get("disabled") == "1" then wnet:set("disabled", nil) @@ -56,7 +59,14 @@ function m.parse(map) luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless", arg[1])) return end + Map.parse(map) + + if m:get(wdev:name(), "type") == "mac80211" and new_cc and new_cc ~= old_cc then + luci.sys.call("iw reg set %q" % new_cc) + luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless", arg[1])) + return + end end m.title = luci.util.pcdata(wnet:get_i18n()) @@ -94,7 +104,7 @@ local function txpower_current(pwr, list) end end end - return (list[#list] and list[#list].driver_dbm) or pwr or 0 + return pwr or "" end local iw = luci.sys.wifi.getiwinfo(arg[1]) @@ -191,7 +201,7 @@ end ------------------- MAC80211 Device ------------------ if hwtype == "mac80211" then - if #tx_power_list > 1 then + if #tx_power_list > 0 then tp = s:taboption("general", ListValue, "txpower", translate("Transmit Power"), "dBm") tp.rmempty = true @@ -200,6 +210,7 @@ if hwtype == "mac80211" then return txpower_current(Value.cfgvalue(...), tx_power_list) end + tp:value("", translate("auto")) for _, p in ipairs(tx_power_list) do tp:value(p.driver_dbm, "%i dBm (%i mW)" %{ p.display_dbm, p.display_mw }) @@ -251,6 +262,7 @@ if hwtype == "atheros" then return txpower_current(Value.cfgvalue(...), tx_power_list) end + tp:value("", translate("auto")) for _, p in ipairs(tx_power_list) do tp:value(p.driver_dbm, "%i dBm (%i mW)" %{ p.display_dbm, p.display_mw }) @@ -308,6 +320,7 @@ if hwtype == "broadcom" then return txpower_current(Value.cfgvalue(...), tx_power_list) end + tp:value("", translate("auto")) for _, p in ipairs(tx_power_list) do tp:value(p.driver_dbm, "%i dBm (%i mW)" %{ p.display_dbm, p.display_mw }) diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua index 1e475640b..493a735bd 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua @@ -21,7 +21,7 @@ function s.cfgsections() return { "_pass" } end -function m.on_commit(map) +function m.parse(map) local v1 = pw1:formvalue("_pass") local v2 = pw2:formvalue("_pass") @@ -36,6 +36,8 @@ function m.on_commit(map) m.message = translate("Given password confirmation did not match, password not changed!") end end + + Map.parse(map) end diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/leds.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/leds.lua index 8d9bcb137..74e2f1a19 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/leds.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/leds.lua @@ -7,10 +7,11 @@ local sysfs_path = "/sys/class/leds/" local leds = {} local fs = require "nixio.fs" -local util = require "nixio.util" +local nu = require "nixio.util" +local util = require "luci.util" if fs.access(sysfs_path) then - leds = util.consume((fs.dir(sysfs_path))) + leds = nu.consume((fs.dir(sysfs_path))) end if #leds == 0 then @@ -109,6 +110,33 @@ function usbdev.remove(self, section) end end + +usbport = s:option(MultiValue, "port", translate("USB Ports")) +usbport:depends("trigger", "usbport") +usbport.rmempty = true +usbport.widget = "checkbox" +usbport.cast = "table" +usbport.size = 1 + +function usbport.valuelist(self, section) + local port, ports = nil, {} + for port in util.imatch(m.uci:get("system", section, "port")) do + local b, n = port:match("^usb(%d+)-port(%d+)$") + if not (b and n) then + b, n = port:match("^(%d+)-(%d+)$") + end + if b and n then + ports[#ports+1] = "usb%u-port%u" %{ tonumber(b), tonumber(n) } + end + end + return ports +end + +function usbport.validate(self, value) + return type(value) == "string" and { value } or value +end + + for p in nixio.fs.glob("/sys/bus/usb/devices/[0-9]*/manufacturer") do local id = p:match("%d+-%d+") local mf = nixio.fs.readfile("/sys/bus/usb/devices/" .. id .. "/manufacturer") or "?" @@ -116,4 +144,12 @@ for p in nixio.fs.glob("/sys/bus/usb/devices/[0-9]*/manufacturer") do usbdev:value(id, "%s (%s - %s)" %{ id, mf, pr }) end +for p in nixio.fs.glob("/sys/bus/usb/devices/*/usb[0-9]*-port[0-9]*") do + local bus, port = p:match("usb(%d+)-port(%d+)") + if bus and port then + usbport:value("usb%u-port%u" %{ tonumber(bus), tonumber(port) }, + "Hub %u, Port %u" %{ tonumber(bus), tonumber(port) }) + end +end + return m 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 646d931f3..2512a35b3 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,6 +164,11 @@ ifc.ip6addrs[i] ); } + + if (ifc.ip6prefix) + { + html += String.format('<strong><%:IPv6-PD%>:</strong> %s<br />', ifc.ip6prefix); + } d.innerHTML = html; } 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 8c3b1abcc..b15dd13f3 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 @@ -54,6 +54,11 @@ ifc.ip6addrs[i] ); } + + if (ifc.ip6prefix) + { + html += String.format('<strong><%:IPv6-PD%>:</strong> %s<br />', ifc.ip6prefix); + } d.innerHTML = html; } 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 8976e30cb..206f9ef82 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 @@ -76,12 +76,14 @@ if wan6 then rv.wan6 = { - ip6addr = wan6:ip6addr(), - gw6addr = wan6:gw6addr(), - dns = wan6:dns6addrs(), - uptime = wan6:uptime(), - ifname = wan6:ifname(), - link = wan6:adminlink() + ip6addr = wan6:ip6addr(), + gw6addr = wan6:gw6addr(), + dns = wan6:dns6addrs(), + ip6prefix = wan6:ip6prefix(), + uptime = wan6:uptime(), + proto = wan6:proto(), + ifname = wan6:ifname(), + link = wan6:adminlink() } end @@ -233,9 +235,34 @@ if (ifc6 && ifc6.ifname && ifc6.proto != 'none') { var s = String.format( - '<strong><%:Address%>: </strong>%s<br />' + + '<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 + ); + } + } + + s += String.format( '<strong><%:Gateway%>: </strong>%s<br />', - (ifc6.ip6addr) ? ifc6.ip6addr : '::', (ifc6.gw6addr) ? ifc6.gw6addr : '::' ); diff --git a/protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua b/protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua index e58532410..de4ece347 100644 --- a/protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua +++ b/protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua @@ -66,8 +66,8 @@ mtu = section:taboption( translate("MTU"), translate("Optional. Maximum Transmission Unit of tunnel interface.") ) -mtu.datatype = "range(1280,1423)" -mtu.placeholder = "1423" +mtu.datatype = "range(1280,1420)" +mtu.placeholder = "1420" mtu.optional = true |