diff options
282 files changed, 6110 insertions, 2793 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7c4291318e..a392ade0c2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,16 +1,16 @@ # Contributing Guidelines -Patches and pull-requests: +## Patches and Pull requests: If you want to contribute a change to LuCI, please either send a patch using git send-email -or open a pull request against the openwrt/luci repository. +or open a "pull request" against the openwrt/luci repository. Regardless of whether you send a patch or open a pull request, please try to follow these rules: -* Have a useful subject prefixed with the component name - (E.g.: "modules/admin-full: fix wifi channel selection on multiple STA networks") +* Have a useful subject prefixed with the component name + (E.g.: "luci-mod-admin-full: fix wifi channel selection on multiple STA networks") * Shortly explain the changes made and - if applicable - the reasoning behind them -* Include Signed-off-by in the comment +* Include Signed-off-by in the comment (See <https://dev.openwrt.org/wiki/SubmittingPatches#a10.Signyourwork>) In case you like to send patches by mail, please use the [LuCI mailinglist](https://lists.subsignal.org/mailman/listinfo/luci) @@ -19,22 +19,41 @@ or the [OpenWrt Development List](https://lists.openwrt.org/cgi-bin/mailman/list If you send via the OpenWrt list, include a "[luci]" tag in your subject line. For general information on patch submission, follow the [OpenWrt patch submission guideline](https://dev.openwrt.org/wiki/SubmittingPatches). +## Advice on pull requests: -If you have commit access: +Pull requests are the easiest way to contribute changes to git repos at Github. They are the preferred contribution method, as they offer a nice way for commenting and amending the proposed changes. + +* You need a local "fork" of the Github repo. +* Use a "feature branch" for your changes. That separates the changes in the pull request from your other changes and makes it easy to edit/amend commits in the pull request. Workflow using "feature_x" as the example: + - Update your local git fork to the tip (of the master, usually) + - Create the feature branch with `git checkout -b feature_x` + - Edit changes and commit them locally + - Push them to your Github fork by `git push -u origin feature_x`. That creates the "feature_x" branch at your Github fork and sets it as the remote of this branch + - When you now visit Github, you should see a proposal to create a pull request + +* If you later need to add new commits to the pull request, you can simply commit the changes to the local branch and then use `git push` to automatically update the pull request. + +* If you need to change something in the existing pull request (e.g. to add a missing signed-off-by line to the commit message), you can use `git push -f` to overwrite the original commits. That is easy and safe when using a feature branch. Example workflow: + - Checkout the feature branch by `git checkout feature_x` + - Edit changes and commit them locally. If you are just updating the commit message in the last commit, you can use `git commit --amend` to do that + - If you added several new commits or made other changes that require cleaning up, you can use `git rebase -i HEAD~X` (X = number of commits to edit) to possibly squash some commits + - Push the changed commits to Github with `git push -f` to overwrite the original commits in the "feature_x" branch with the new ones. The pull request gets automatically updated + +## If you have commit access: * Do NOT use git push --force. * Use Pull Requests if you are unsure and to suggest changes to other developers. -Gaining commit access: +## Gaining commit access: * Commit access will be granted to responsible contributors who have made useful pull requests and / or feedback or patches to this repository or OpenWrt in general. Please include your request for commit access in your next pull request or ticket. -Release Branches: +## Release Branches: -* Branches named "luci-X.Y" (e.g. luci-0.12) are release branches. +* Branches named "for-XX.YY" or "luci-X.Y" (e.g. "for-15.05") are release branches. * These branches are built with the respective OpenWrt release and are created during the release stabilisation phase. * Please ONLY cherry-pick or commit security and bug-fixes to these branches. diff --git a/applications/luci-app-ahcp/luasrc/view/ahcp_status.htm b/applications/luci-app-ahcp/luasrc/view/ahcp_status.htm index 88796cb1c5..946828953e 100644 --- a/applications/luci-app-ahcp/luasrc/view/ahcp_status.htm +++ b/applications/luci-app-ahcp/luasrc/view/ahcp_status.htm @@ -1,5 +1,5 @@ <script type="text/javascript">//<![CDATA[ - XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "ahcpd", "status")%>', null, + XHR.poll(5, '<%=url('admin/network/ahcpd/status')%>', null, function(x, st) { var tb = document.getElementById('ahcpd_status_table'); diff --git a/applications/luci-app-asterisk/Makefile b/applications/luci-app-asterisk/Makefile index f2f3cd1e73..3434e167f4 100644 --- a/applications/luci-app-asterisk/Makefile +++ b/applications/luci-app-asterisk/Makefile @@ -7,7 +7,6 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI Support for Asterisk -LUCI_DEPENDS:=+ahcpd include ../../luci.mk diff --git a/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm b/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm index 70f986c5bb..9f644ba074 100644 --- a/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm +++ b/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm @@ -56,7 +56,7 @@ %> -<form method="post" action="<%=luci.dispatcher.build_url("admin", "asterisk", "dialplans")%>" enctype="multipart/form-data"> +<form method="post" action="<%=url('admin/asterisk/dialplans')%>" enctype="multipart/form-data"> <div> <script type="text/javascript" src="/luci-static/resources/cbi.js"></script> <input type="hidden" name="cbi.submit" value="1" /> @@ -64,13 +64,13 @@ </div> <div class="cbi-map" id="cbi-asterisk"> - <h2><a id="content" name="content">Outgoing Call Routing</a></h2> + <h2 name="content">Outgoing Call Routing</h2> <div class="cbi-map-descr"> Here you can manage your dial plans which are used to route outgoing calls from your local extensions.<br /><br /> Related tasks:<br /> - <a href="<%=luci.dispatcher.build_url('admin/asterisk/dialplans/zones')%>" class="cbi-title-ref">Manage dialzones</a> | - <a href="<%=luci.dispatcher.build_url('admin/asterisk/voicemail/mailboxes')%>" class="cbi-title-ref">Manage voicemail boxes</a> | - <a href="<%=luci.dispatcher.build_url('admin/asterisk/meetme/rooms')%>" class="cbi-title-ref">Manage meetme rooms</a> + <a href="<%=url('admin/asterisk/dialplans/zones')%>" class="cbi-title-ref">Manage dialzones</a> | + <a href="<%=url('admin/asterisk/voicemail/mailboxes')%>" class="cbi-title-ref">Manage voicemail boxes</a> | + <a href="<%=url('admin/asterisk/meetme/rooms')%>" class="cbi-title-ref">Manage meetme rooms</a> </div> <!-- tblsection --> <fieldset class="cbi-section" id="cbi-asterisk-sip"> @@ -85,7 +85,7 @@ <big>Dialplan <em><%=plan.name%></em></big> </th> <td> - <a href="<%=luci.dispatcher.build_url('admin', 'asterisk', 'dialplans')%>?delplan=<%=plan.name%>"> + <a href="<%=url('admin/asterisk/dialplans')%>?delplan=<%=plan.name%>"> <img style="border:none" alt="Remove this dialplan" title="Remove this dialplan" src="/luci-static/resources/cbi/remove.gif" /> </a> </td> @@ -109,10 +109,10 @@ </p> </td> <td style="width:5%" class="cbi-value-field"> - <a href="<%=luci.dispatcher.build_url('admin/asterisk/dialplans/out', zone.name)%>"> + <a href="<%=url('admin/asterisk/dialplans/out', zone.name)%>"> <img style="border:none" alt="Edit dialzone" title="Edit dialzone" src="/luci-static/resources/cbi/edit.gif" /> </a> - <a href="<%=luci.dispatcher.build_url('admin/asterisk/dialplans')%>?delzone.<%=plan.name%>=<%=zone.name%>"> + <a href="<%=url('admin/asterisk/dialplans')%>?delzone.<%=plan.name%>=<%=zone.name%>"> <img style="border:none" alt="Remove from this dialplan" title="Remove from this dialplan" src="/luci-static/resources/cbi/remove.gif" /> </a> </td> @@ -134,10 +134,10 @@ </p> </td> <td style="width:5%" class="cbi-value-field"> - <a href="<%=luci.dispatcher.build_url('admin/asterisk/voicemail/mailboxes')%>"> + <a href="<%=url('admin/asterisk/voicemail/mailboxes')%>"> <img style="border:none" alt="Manage mailboxes ..." title="Manage mailboxes ..." src="/luci-static/resources/cbi/edit.gif" /> </a> - <a href="<%=luci.dispatcher.build_url('admin/asterisk/dialplans')%>?delvbox.<%=plan.name%>=<%=ext%>"> + <a href="<%=url('admin/asterisk/dialplans')%>?delvbox.<%=plan.name%>=<%=ext%>"> <img style="border:none" alt="Remove from this dialplan" title="Remove from this dialplan" src="/luci-static/resources/cbi/remove.gif" /> </a> </td> @@ -157,10 +157,10 @@ </p> </td> <td style="width:5%" class="cbi-value-field"> - <a href="<%=luci.dispatcher.build_url('admin/asterisk/meetme/rooms')%>"> + <a href="<%=url('admin/asterisk/meetme/rooms')%>"> <img style="border:none" alt="Manage conferences ..." title="Manage conferences ..." src="/luci-static/resources/cbi/edit.gif" /> </a> - <a href="<%=luci.dispatcher.build_url('admin/asterisk/dialplans')%>?delmeetme.<%=plan.name%>=<%=ext%>"> + <a href="<%=url('admin/asterisk/dialplans')%>?delmeetme.<%=plan.name%>=<%=ext%>"> <img style="border:none" alt="Remove from this dialplan" title="Remove from this dialplan" src="/luci-static/resources/cbi/remove.gif" /> </a> </td> diff --git a/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm b/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm index ac527918bc..ffdbbcf359 100644 --- a/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm +++ b/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm @@ -47,7 +47,7 @@ %> -<form method="post" action="<%=luci.dispatcher.build_url("admin", "asterisk", "dialplans", "zones")%>" enctype="multipart/form-data"> +<form method="post" action="<%=url('admin/asterisk/dialplans/zones')%>" enctype="multipart/form-data"> <div> <script type="text/javascript" src="/luci-static/resources/cbi.js"></script> <input type="hidden" name="cbi.submit" value="1" /> @@ -55,9 +55,9 @@ </div> <div class="cbi-map" id="cbi-asterisk"> - <h2><a id="content" name="content">Dial Zone Management</a></h2> + <h2 name="content">Dial Zone Management</h2> <div class="cbi-map-descr"> - <a href="<%=luci.dispatcher.build_url("admin/asterisk/dialplans")%>" class="cbi-title-ref">Back to dialplan overview</a><br /><br /> + <a href="<%=url("admin/asterisk/dialplans")%>" class="cbi-title-ref">Back to dialplan overview</a><br /><br /> Here you can manage your dial zones. The zones are used to route outgoing calls to the destination. Each zone groups multiple trunks and number matches to represent a logical destination. Zones can also be used to enforce certain dial restrictions on selected extensions. @@ -109,10 +109,10 @@ <%=rule.description or rule.name%> </td> <td style="text-align:left" class="cbi-value-field"> - <a href="<%=luci.dispatcher.build_url('admin', 'asterisk', 'dialplans', 'out', rule.name)%>"> + <a href="<%=url('admin/asterisk/dialplans/out', rule.name)%>"> <img style="border:none" alt="Edit entry" title="Edit entry" src="/luci-static/resources/cbi/edit.gif" /> </a> - <a href="<%=luci.dispatcher.build_url('admin', 'asterisk', 'dialplans', 'zones')%>?delzone=<%=rule.name%>"> + <a href="<%=url('admin/asterisk/dialplans/zones')%>?delzone=<%=rule.name%>"> <img style="border:none" alt="Delete entry" title="Delete entry" src="/luci-static/resources/cbi/remove.gif" /> </a> </td> diff --git a/applications/luci-app-commands/luasrc/view/commands.htm b/applications/luci-app-commands/luasrc/view/commands.htm index 72f1e1dab3..73b9e6a2ce 100644 --- a/applications/luci-app-commands/luasrc/view/commands.htm +++ b/applications/luci-app-commands/luasrc/view/commands.htm @@ -58,7 +58,7 @@ legend.parentNode.style.display = 'block'; legend.style.display = 'inline'; - stxhr.get('<%=luci.dispatcher.build_url("admin", "system", "commands", "run")%>/' + id + (args ? '/' + args : ''), null, + stxhr.get('<%=url('admin/system/commands/run')%>/' + id + (args ? '/' + args : ''), null, function(x, st) { if (st) @@ -93,7 +93,7 @@ if (field) args = encodeURIComponent(field.value); - location.href = '<%=luci.dispatcher.build_url("admin", "system", "commands", "download")%>/' + id + (args ? '/' + args : ''); + location.href = '<%=url('admin/system/commands/download')%>/' + id + (args ? '/' + args : ''); } function command_link(id) @@ -135,7 +135,7 @@ <form method="get" action="<%=pcdata(luci.http.getenv("REQUEST_URI"))%>"> <div class="cbi-map"> - <h2><a id="content" name="content"><%:Custom Commands%></a></h2> + <h2 name="content"><%:Custom Commands%></h2> <fieldset class="cbi-section"> <% local _, command; for _, command in ipairs(commands) do %> diff --git a/applications/luci-app-ddns/luasrc/controller/ddns.lua b/applications/luci-app-ddns/luasrc/controller/ddns.lua index 946dfefbc8..4fbd3c3fcf 100644 --- a/applications/luci-app-ddns/luasrc/controller/ddns.lua +++ b/applications/luci-app-ddns/luasrc/controller/ddns.lua @@ -38,7 +38,7 @@ function index() {hideapplybtn=true, hidesavebtn=true, hideresetbtn=true}), nil ).leaf = true entry( {"admin", "services", "ddns", "global"}, cbi("ddns/global"), nil ).leaf = true entry( {"admin", "services", "ddns", "logview"}, call("logread") ).leaf = true - entry( {"admin", "services", "ddns", "startstop"}, call("startstop") ).leaf = true + entry( {"admin", "services", "ddns", "startstop"}, post("startstop") ).leaf = true entry( {"admin", "services", "ddns", "status"}, call("status") ).leaf = true end diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua index 27f9a9f264..e655ce5219 100644 --- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua +++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua @@ -108,9 +108,8 @@ end -- cbi-map definition -- ####################################################### m = Map("ddns") --- first need to close <a> from cbi map template our <a> closed by template -m.title = [[</a><a href="]] .. DISP.build_url("admin", "services", "ddns") .. [[">]] .. - translate("Dynamic DNS") +m.title = [[<a href="]] .. DISP.build_url("admin", "services", "ddns") .. [[">]] .. + translate("Dynamic DNS") .. [[</a>]] m.description = translate("Dynamic DNS allows that your router can be reached with " .. "a fixed hostname while having a dynamically changing " .. diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua index fbd3cb3377..25d09b73bb 100644 --- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua +++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua @@ -10,9 +10,8 @@ local DDNS = require "luci.tools.ddns" -- ddns multiused functions -- cbi-map definition -- ####################################################### local m = Map("ddns") --- first need to close <a> from cbi map template our <a> closed by template -m.title = [[</a><a href="]] .. DISP.build_url("admin", "services", "ddns") .. [[">]] - .. translate("Dynamic DNS") +m.title = [[<a href="]] .. DISP.build_url("admin", "services", "ddns") .. [[">]] + .. translate("Dynamic DNS") .. [[</a>]] m.description = translate("Dynamic DNS allows that your router can be reached with " .. "a fixed hostname while having a dynamically changing IP address.") diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua index ff7aa7a41c..2a65fd04fa 100644 --- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua +++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua @@ -23,9 +23,8 @@ bold_off = [[</strong>]] -- cbi-map definition -- ####################################################### m = Map("ddns") --- first need to close <a> from cbi map template our <a> closed by template -m.title = [[</a><a href="]] .. DISP.build_url("admin", "services", "ddns") .. [[">]] .. - translate("Dynamic DNS") +m.title = [[<a href="]] .. DISP.build_url("admin", "services", "ddns") .. [[">]] .. + translate("Dynamic DNS") .. [[</a>]] m.description = translate("Dynamic DNS allows that your router can be reached with " .. "a fixed hostname while having a dynamically changing " .. diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/overview.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/overview.lua index 9e8df2d089..5b5925b25e 100644 --- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/overview.lua +++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/overview.lua @@ -26,8 +26,7 @@ bold_off = [[</strong>]] -- cbi-map definition -- ####################################################### m = Map("ddns") --- first need to close <a> from cbi map template our <a> closed by template -m.title = [[</a><a href="javascript:alert(']] +m.title = [[<a href="javascript:alert(']] .. translate("Version Information") .. [[\n\nluci-app-ddns]] .. [[\n\t]] .. translate("Version") .. [[:\t]] .. DDNS.ipkg_ver_installed("luci-app-ddns") @@ -37,7 +36,7 @@ m.title = [[</a><a href="javascript:alert(']] .. [[\n\t]] .. translate("Version") .. [[:\t]] .. DDNS.ipkg_ver_installed("ddns-scripts") .. [[\n\n]] .. [[')">]] - .. translate("Dynamic DNS") + .. translate("Dynamic DNS") .. [[</a>]] m.description = translate("Dynamic DNS allows that your router can be reached with " .. "a fixed hostname while having a dynamically changing " .. diff --git a/applications/luci-app-ddns/luasrc/view/ddns/detail_logview.htm b/applications/luci-app-ddns/luasrc/view/ddns/detail_logview.htm index 494b7435cd..4dcb7bb6fe 100644 --- a/applications/luci-app-ddns/luasrc/view/ddns/detail_logview.htm +++ b/applications/luci-app-ddns/luasrc/view/ddns/detail_logview.htm @@ -6,7 +6,7 @@ var txt = document.getElementById("cbid.ddns." + section + "._logview.txt"); // TextArea if ( !txt ) { return; } // security check - XHR.get('<%=luci.dispatcher.build_url("admin", "services", "ddns", "logview")%>/' + section, null, + XHR.get('<%=url('admin/services/ddns/logview')%>/' + section, null, function(x) { if (x.responseText == "_nodata_") txt.value = "<%:File not found or empty%>"; diff --git a/applications/luci-app-ddns/luasrc/view/ddns/overview_status.htm b/applications/luci-app-ddns/luasrc/view/ddns/overview_status.htm index ea8e4a1e31..b6d4ebb9fd 100644 --- a/applications/luci-app-ddns/luasrc/view/ddns/overview_status.htm +++ b/applications/luci-app-ddns/luasrc/view/ddns/overview_status.htm @@ -136,7 +136,7 @@ // do start/stop var btnXHR = new XHR(); - btnXHR.get('<%=luci.dispatcher.build_url("admin", "services", "ddns", "startstop")%>/' + section + '/' + cbx.checked, null, + btnXHR.post('<%=url('admin/services/ddns/startstop')%>/' + section + '/' + cbx.checked, { token: '<%=token%>' }, function(x, data) { if (x.responseText == "_uncommitted_") { // we need a trick to display Ampersand "&" in stead of "&" or "&" @@ -155,7 +155,7 @@ } // force to immediate show status on page load (not waiting for XHR.poll) - XHR.get('<%=luci.dispatcher.build_url("admin", "services", "ddns", "status")%>', null, + XHR.get('<%=url('admin/services/ddns/status')%>', null, function(x, data) { if (data) { _data2elements(data); } } @@ -164,7 +164,7 @@ // define only ONE XHR.poll in a page because if one is running it blocks the other one // optimum is to define on Map or Section Level from here you can reach all elements // we need update every 15 seconds only - XHR.poll(15, '<%=luci.dispatcher.build_url("admin", "services", "ddns", "status")%>', null, + XHR.poll(15, '<%=url('admin/services/ddns/status')%>', null, function(x, data) { if (data) { _data2elements(data); } } diff --git a/applications/luci-app-ddns/luasrc/view/ddns/system_status.htm b/applications/luci-app-ddns/luasrc/view/ddns/system_status.htm index 4ca0abb0e5..06dca48a9c 100644 --- a/applications/luci-app-ddns/luasrc/view/ddns/system_status.htm +++ b/applications/luci-app-ddns/luasrc/view/ddns/system_status.htm @@ -111,13 +111,13 @@ } // force to immediate show status (not waiting for XHR.poll) - XHR.get('<%=luci.dispatcher.build_url("admin", "services", "ddns", "status")%>', null, + XHR.get('<%=url('admin/services/ddns/status')%>', null, function(x, data) { if (data) { _data2elements(x, data); } } ); - XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "ddns", "status")%>', null, + XHR.poll(5, '<%=url('admin/services/ddns/status')%>', null, function(x, data) { if (data) { _data2elements(x, data); } } @@ -126,7 +126,7 @@ //]]></script> <fieldset class="cbi-section" id="ddns_status_section"> - <legend><a href="<%=luci.dispatcher.build_url([[admin]], [[services]], [[ddns]])%>"><%:Dynamic DNS%></a></legend> + <legend><a href="<%=url([[admin]], [[services]], [[ddns]])%>"><%:Dynamic DNS%></a></legend> <table class="cbi-section-table" id="ddns_status_table"> <tr class="cbi-section-table-titles"> diff --git a/applications/luci-app-ddns/po/ca/ddns.po b/applications/luci-app-ddns/po/ca/ddns.po index 35f13eba5d..c57b68938f 100644 --- a/applications/luci-app-ddns/po/ca/ddns.po +++ b/applications/luci-app-ddns/po/ca/ddns.po @@ -462,6 +462,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/cs/ddns.po b/applications/luci-app-ddns/po/cs/ddns.po index 455c72a6aa..e957d58abb 100644 --- a/applications/luci-app-ddns/po/cs/ddns.po +++ b/applications/luci-app-ddns/po/cs/ddns.po @@ -460,6 +460,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/el/ddns.po b/applications/luci-app-ddns/po/el/ddns.po index edbe19d146..821e17e655 100644 --- a/applications/luci-app-ddns/po/el/ddns.po +++ b/applications/luci-app-ddns/po/el/ddns.po @@ -459,6 +459,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/en/ddns.po b/applications/luci-app-ddns/po/en/ddns.po index b706fa29e9..a6ba0bb127 100644 --- a/applications/luci-app-ddns/po/en/ddns.po +++ b/applications/luci-app-ddns/po/en/ddns.po @@ -457,6 +457,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/es/ddns.po b/applications/luci-app-ddns/po/es/ddns.po index 1948155d28..ebee43d74f 100644 --- a/applications/luci-app-ddns/po/es/ddns.po +++ b/applications/luci-app-ddns/po/es/ddns.po @@ -458,6 +458,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/fr/ddns.po b/applications/luci-app-ddns/po/fr/ddns.po index 94b61b6954..84e86a9646 100644 --- a/applications/luci-app-ddns/po/fr/ddns.po +++ b/applications/luci-app-ddns/po/fr/ddns.po @@ -458,6 +458,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/he/ddns.po b/applications/luci-app-ddns/po/he/ddns.po index a6d20303bc..45f5a6db9c 100644 --- a/applications/luci-app-ddns/po/he/ddns.po +++ b/applications/luci-app-ddns/po/he/ddns.po @@ -461,6 +461,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/hu/ddns.po b/applications/luci-app-ddns/po/hu/ddns.po index fdd9a17a86..20388d3ea6 100644 --- a/applications/luci-app-ddns/po/hu/ddns.po +++ b/applications/luci-app-ddns/po/hu/ddns.po @@ -460,6 +460,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/it/ddns.po b/applications/luci-app-ddns/po/it/ddns.po index 48e6809120..77ebfb727f 100644 --- a/applications/luci-app-ddns/po/it/ddns.po +++ b/applications/luci-app-ddns/po/it/ddns.po @@ -458,6 +458,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/ja/ddns.po b/applications/luci-app-ddns/po/ja/ddns.po index 488bac9906..1b608aa222 100644 --- a/applications/luci-app-ddns/po/ja/ddns.po +++ b/applications/luci-app-ddns/po/ja/ddns.po @@ -458,6 +458,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/ms/ddns.po b/applications/luci-app-ddns/po/ms/ddns.po index 5b7f0dea6b..ea11b9e354 100644 --- a/applications/luci-app-ddns/po/ms/ddns.po +++ b/applications/luci-app-ddns/po/ms/ddns.po @@ -456,6 +456,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/no/ddns.po b/applications/luci-app-ddns/po/no/ddns.po index b805aa4f80..80374ee7cf 100644 --- a/applications/luci-app-ddns/po/no/ddns.po +++ b/applications/luci-app-ddns/po/no/ddns.po @@ -449,6 +449,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/pl/ddns.po b/applications/luci-app-ddns/po/pl/ddns.po index e016cc4a43..9907b1e644 100644 --- a/applications/luci-app-ddns/po/pl/ddns.po +++ b/applications/luci-app-ddns/po/pl/ddns.po @@ -459,6 +459,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/pt-br/ddns.po b/applications/luci-app-ddns/po/pt-br/ddns.po index df2fff538e..5dd243fe66 100644 --- a/applications/luci-app-ddns/po/pt-br/ddns.po +++ b/applications/luci-app-ddns/po/pt-br/ddns.po @@ -458,6 +458,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/pt/ddns.po b/applications/luci-app-ddns/po/pt/ddns.po index 57654928d8..a788ad257b 100644 --- a/applications/luci-app-ddns/po/pt/ddns.po +++ b/applications/luci-app-ddns/po/pt/ddns.po @@ -460,6 +460,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/ro/ddns.po b/applications/luci-app-ddns/po/ro/ddns.po index 78c39d5e94..f32c6e98cf 100644 --- a/applications/luci-app-ddns/po/ro/ddns.po +++ b/applications/luci-app-ddns/po/ro/ddns.po @@ -461,6 +461,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/ru/ddns.po b/applications/luci-app-ddns/po/ru/ddns.po index d4c0eb4a88..e76cda60c5 100644 --- a/applications/luci-app-ddns/po/ru/ddns.po +++ b/applications/luci-app-ddns/po/ru/ddns.po @@ -460,6 +460,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/sk/ddns.po b/applications/luci-app-ddns/po/sk/ddns.po index 3cd0f4c2c6..45e6632f0a 100644 --- a/applications/luci-app-ddns/po/sk/ddns.po +++ b/applications/luci-app-ddns/po/sk/ddns.po @@ -451,6 +451,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/sv/ddns.po b/applications/luci-app-ddns/po/sv/ddns.po index cee36e7254..c3b7c56e24 100644 --- a/applications/luci-app-ddns/po/sv/ddns.po +++ b/applications/luci-app-ddns/po/sv/ddns.po @@ -452,6 +452,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/tr/ddns.po b/applications/luci-app-ddns/po/tr/ddns.po index 10492bccc6..74be14ab20 100644 --- a/applications/luci-app-ddns/po/tr/ddns.po +++ b/applications/luci-app-ddns/po/tr/ddns.po @@ -458,6 +458,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/uk/ddns.po b/applications/luci-app-ddns/po/uk/ddns.po index 0e2c5804a0..58ded215e6 100644 --- a/applications/luci-app-ddns/po/uk/ddns.po +++ b/applications/luci-app-ddns/po/uk/ddns.po @@ -461,6 +461,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/vi/ddns.po b/applications/luci-app-ddns/po/vi/ddns.po index 5d5a7ede70..4b0cc91fd9 100644 --- a/applications/luci-app-ddns/po/vi/ddns.po +++ b/applications/luci-app-ddns/po/vi/ddns.po @@ -461,6 +461,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-ddns/po/zh-cn/ddns.po b/applications/luci-app-ddns/po/zh-cn/ddns.po index 862c2a052a..381e6684e8 100644 --- a/applications/luci-app-ddns/po/zh-cn/ddns.po +++ b/applications/luci-app-ddns/po/zh-cn/ddns.po @@ -12,6 +12,9 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 1.7.5\n" +msgid "&" +msgstr "" + msgid "-- custom --" msgstr "-- 自定义 --" @@ -30,10 +33,13 @@ msgstr "正在应用更改" msgid "Basic Settings" msgstr "基础设置" -msgid "Below a list of configuration tips for your system to run Dynamic DNS updates without limitations" +msgid "" +"Below a list of configuration tips for your system to run Dynamic DNS " +"updates without limitations" msgstr "以下是一个能够让你的系统不受限制地进行动态DNS更新的设置贴士." -msgid "Below is a list of configured DDNS configurations and their current state." +msgid "" +"Below is a list of configured DDNS configurations and their current state." msgstr "一下是当前已经配置好的DDNS设置项列表以及它们的当前状态." msgid "Bind Network" @@ -42,10 +48,14 @@ msgstr "使用的接口" msgid "Binding to a specific network not supported" msgstr "不支持绑定到一个指定的网络" -msgid "BusyBox's nslookup and Wget do not support to specify the IP version to use for communication with DDNS Provider." +msgid "" +"BusyBox's nslookup and Wget do not support to specify the IP version to use " +"for communication with DDNS Provider." msgstr "与DDNS供应商通讯时BusyBox的nslookup和Wget不支持设置特定的IP协议版本." -msgid "BusyBox's nslookup does not support to specify to use TCP instead of default UDP when requesting DNS server" +msgid "" +"BusyBox's nslookup does not support to specify to use TCP instead of default " +"UDP when requesting DNS server" msgstr "BusyBox的nslookup不支持使用TCP协议代替UDP协议请求DNS记录" msgid "Casual users should not change this setting" @@ -63,7 +73,9 @@ msgstr "配置错误" msgid "Configuration" msgstr "设置" -msgid "Configure here the details for all Dynamic DNS services including this LuCI application." +msgid "" +"Configure here the details for all Dynamic DNS services including this LuCI " +"application." msgstr "在这里修改动态DNS服务的详细配置" msgid "Configure here the details for selected Dynamic DNS service." @@ -72,11 +84,20 @@ msgstr "在这里修改选择的DDNS服务的详细配置" msgid "Current setting" msgstr "当前设置" -msgid "Currently DDNS updates are not started at boot or on interface events.<br />This is the default if you run DDNS scripts by yourself (i.e. via cron with force_interval set to '0')" -msgstr "现在,DDNS更新在开机或者接口动作时不会被触发<br />如果你手工运行DDNS脚本的话(例如使用cron时把force_interval设置为0),这是默认设置." +msgid "" +"Currently DDNS updates are not started at boot or on interface events.<br /" +">This is the default if you run DDNS scripts by yourself (i.e. via cron with " +"force_interval set to '0')" +msgstr "" +"现在,DDNS更新在开机或者接口动作时不会被触发<br />如果你手工运行DDNS脚本的话" +"(例如使用cron时把force_interval设置为0),这是默认设置." -msgid "Currently DDNS updates are not started at boot or on interface events.<br />You can start/stop each configuration here. It will run until next reboot." -msgstr "现在,DDNS更新在开机或者接口动作时不会被触发<br />你可以在这里开始/停止每一个设置的条目.它在下次重启之前一直有效." +msgid "" +"Currently DDNS updates are not started at boot or on interface events.<br /" +">You can start/stop each configuration here. It will run until next reboot." +msgstr "" +"现在,DDNS更新在开机或者接口动作时不会被触发<br />你可以在这里开始/停止每一个" +"设置的条目.它在下次重启之前一直有效." msgid "Custom update script to be used for updating your DDNS Provider." msgstr "用来更新动态DNS的自定义脚本" @@ -117,10 +138,14 @@ msgstr "设定用来读取系统IPv4地址的网络" msgid "Defines the network to read systems IPv6-Address from" msgstr "设定用来读取系统IPv6地址的网络" -msgid "Defines the source to read systems IPv4-Address from, that will be send to the DDNS provider" +msgid "" +"Defines the source to read systems IPv4-Address from, that will be send to " +"the DDNS provider" msgstr "设定IPv4地址的来源.这将会被发送给DDNS提供商" -msgid "Defines the source to read systems IPv6-Address from, that will be send to the DDNS provider" +msgid "" +"Defines the source to read systems IPv6-Address from, that will be send to " +"the DDNS provider" msgstr "设定IPv6地址的来源.这将会被发送给DDNS提供商" msgid "Defines which IP address 'IPv4/IPv6' is send to the DDNS provider" @@ -132,7 +157,8 @@ msgstr "详情:" msgid "Directory contains Log files for each running section" msgstr "保存每一个运行中的设置的运行日志的目录" -msgid "Directory contains PID and other status information for each running section" +msgid "" +"Directory contains PID and other status information for each running section" msgstr "保存每个运行中的设置的PID以及其它状态信息的目录" msgid "Disabled" @@ -141,7 +167,9 @@ msgstr "已禁用" msgid "Dynamic DNS" msgstr "动态DNS" -msgid "Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP address." +msgid "" +"Dynamic DNS allows that your router can be reached with a fixed hostname " +"while having a dynamically changing IP address." msgstr "动态DNS允许为拥有动态IP的主机配置一个固定的可访问域名." msgid "Enable secure communication with DDNS provider" @@ -171,8 +199,12 @@ msgstr "文件未找到" msgid "File not found or empty" msgstr "文件未找到或为空" -msgid "Follow this link<br />You will find more hints to optimize your system to run DDNS scripts with all options" -msgstr "打开这个链接<br />你将会得到更多关于如何通过所有设置项优化你的系统以运行DDNS脚本的提示." +msgid "" +"Follow this link<br />You will find more hints to optimize your system to " +"run DDNS scripts with all options" +msgstr "" +"打开这个链接<br />你将会得到更多关于如何通过所有设置项优化你的系统以运行DDNS" +"脚本的提示." msgid "For detailed information about parameter settings look here." msgstr "请看这里获得关于参数设置的详细信息" @@ -201,7 +233,9 @@ msgstr "格式" msgid "Format: IP or FQDN" msgstr "格式:IP或者FQDN" -msgid "GNU Wget will use the IP of given network, cURL will use the physical interface." +msgid "" +"GNU Wget will use the IP of given network, cURL will use the physical " +"interface." msgstr "GNU Wget将会使用给定的网络的IP地址,而cURL将会使用物理接口" msgid "Global Settings" @@ -228,8 +262,13 @@ msgstr "IPv4地址" msgid "IPv6 address must be given in square brackets" msgstr "IPv6地址必须填写在中括号(\"[ ]\")内" -msgid "IPv6 is currently not (fully) supported by this system<br />Please follow the instructions on OpenWrt's homepage to enable IPv6 support<br />or update your system to the latest OpenWrt Release" -msgstr "当前系统暂时不能(完整地)支持IPv6<br />请查看OpenWrt首页的介绍以启用IPv6支持<br />或者更新你的系统到最新OpenWrt版本" +msgid "" +"IPv6 is currently not (fully) supported by this system<br />Please follow " +"the instructions on OpenWrt's homepage to enable IPv6 support<br />or update " +"your system to the latest OpenWrt Release" +msgstr "" +"当前系统暂时不能(完整地)支持IPv6<br />请查看OpenWrt首页的介绍以启用IPv6支持" +"<br />或者更新你的系统到最新OpenWrt版本" msgid "IPv6 not supported" msgstr "IPv6不被支持" @@ -240,13 +279,21 @@ msgstr "IPv6地址" msgid "If both cURL and GNU Wget are installed, Wget is used by default." msgstr "如果cURL和GNU Wget同时被安装,那么Wget将会被优先使用." -msgid "If this service section is disabled it could not be started.<br />Neither from LuCI interface nor from console" -msgstr "如果服务配置被禁用那么它将不能被启动.<br />无论是通过LuCI页面或者是通过终端." +msgid "" +"If this service section is disabled it could not be started.<br />Neither " +"from LuCI interface nor from console" +msgstr "" +"如果服务配置被禁用那么它将不能被启动.<br />无论是通过LuCI页面或者是通过终端." -msgid "If you want to send updates for IPv4 and IPv6 you need to define two separate Configurations i.e. 'myddns_ipv4' and 'myddns_ipv6'" -msgstr "如果你需要同时更新IPv4和IPv6地址,你需要单独添加两个配置项(例如'myddns_ipv4'和'myddns_ipv6')" +msgid "" +"If you want to send updates for IPv4 and IPv6 you need to define two " +"separate Configurations i.e. 'myddns_ipv4' and 'myddns_ipv6'" +msgstr "" +"如果你需要同时更新IPv4和IPv6地址,你需要单独添加两个配置项(例" +"如'myddns_ipv4'和'myddns_ipv6')" -msgid "In some versions cURL/libcurl in OpenWrt is compiled without proxy support." +msgid "" +"In some versions cURL/libcurl in OpenWrt is compiled without proxy support." msgstr "OpenWrt中,cURL/libcurl的某些版本编译时没有启用代理服务器支持" msgid "Info" @@ -255,11 +302,18 @@ msgstr "信息" msgid "Interface" msgstr "接口" -msgid "Interval to check for changed IP<br />Values below 5 minutes == 300 seconds are not supported" +msgid "" +"Interval to check for changed IP<br />Values below 5 minutes == 300 seconds " +"are not supported" msgstr "检查IP是否改变的时间隔<br />不支持低于5分钟(300秒)的数值." -msgid "Interval to force updates send to DDNS Provider<br />Setting this parameter to 0 will force the script to only run once<br />Values lower 'Check Interval' except '0' are not supported" -msgstr "强制向提供商更新DDNS的时间周期<br />把这个参数设置为0将会让脚本仅执行一次<br />不支持低于\"检查时间周期\"的数值(除了0)." +msgid "" +"Interval to force updates send to DDNS Provider<br />Setting this parameter " +"to 0 will force the script to only run once<br />Values lower 'Check " +"Interval' except '0' are not supported" +msgstr "" +"强制向提供商更新DDNS的时间周期<br />把这个参数设置为0将会让脚本仅执行一次" +"<br />不支持低于\"检查时间周期\"的数值(除了0)." msgid "It is NOT recommended for casual users to change settings on this page." msgstr "强烈不建议初次使用的用户修改本页设定." @@ -285,10 +339,14 @@ msgstr "把日志记录到文件" msgid "Log to syslog" msgstr "把日志记录到系统日志" -msgid "Neither GNU Wget with SSL nor cURL installed to select a network to use for communication." +msgid "" +"Neither GNU Wget with SSL nor cURL installed to select a network to use for " +"communication." msgstr "包含SSL支持的GNU Wget或者cURL均未被安装.无法选择一个网络用于通信." -msgid "Neither GNU Wget with SSL nor cURL installed to support updates via HTTPS protocol." +msgid "" +"Neither GNU Wget with SSL nor cURL installed to support updates via HTTPS " +"protocol." msgstr "包含SSL支持的GNU Wget或者cURL均未被安装.无法使用HTTPS更新DDNS" msgid "Network" @@ -405,9 +463,14 @@ msgstr "状态目录" msgid "Stopped" msgstr "已停止" -msgid "The currently installed 'ddns-scripts' package did not support all available settings." +msgid "" +"The currently installed 'ddns-scripts' package did not support all available " +"settings." msgstr "当前已安装的'ddns-scripts'软件包暂不支持所有可用设置项" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "没有已经配置好的服务项" @@ -429,8 +492,11 @@ msgstr "用于检测的URL" msgid "Unknown error" msgstr "未知错误" -msgid "Update URL to be used for updating your DDNS Provider.<br />Follow instructions you will find on their WEB page." -msgstr "DDNS提供商用于更新DDNS的URL<br />跟随教程你将会在它们的网站上提供这个URL." +msgid "" +"Update URL to be used for updating your DDNS Provider.<br />Follow " +"instructions you will find on their WEB page." +msgstr "" +"DDNS提供商用于更新DDNS的URL<br />跟随教程你将会在它们的网站上提供这个URL." msgid "Update error" msgstr "更新错误" @@ -462,10 +528,13 @@ msgstr "正在应用更改..." msgid "Warning" msgstr "等待" -msgid "Writes detailed messages to log file. File will be truncated automatically." +msgid "" +"Writes detailed messages to log file. File will be truncated automatically." msgstr "向日志中写入详细信息.文件将会被自动减小." -msgid "Writes log messages to syslog. Critical Errors will always be written to syslog." +msgid "" +"Writes log messages to syslog. Critical Errors will always be written to " +"syslog." msgstr "把日志写入系统日志.无论是否启用这项,错误信息总是会被写入系统日志" msgid "You should install BIND host package for DNS requests." diff --git a/applications/luci-app-ddns/po/zh-tw/ddns.po b/applications/luci-app-ddns/po/zh-tw/ddns.po index ec930f432a..ec1fe779eb 100644 --- a/applications/luci-app-ddns/po/zh-tw/ddns.po +++ b/applications/luci-app-ddns/po/zh-tw/ddns.po @@ -455,6 +455,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/applications/luci-app-diag-core/luasrc/view/diag/index.htm b/applications/luci-app-diag-core/luasrc/view/diag/index.htm index 328c4eccb9..c66776771f 100644 --- a/applications/luci-app-diag-core/luasrc/view/diag/index.htm +++ b/applications/luci-app-diag-core/luasrc/view/diag/index.htm @@ -4,7 +4,7 @@ -%> <%+header%> -<h2><a id="content" name="content"><%:Diagnostics%></a></h2> +<h2 name="content"><%:Diagnostics%></h2> <p><%:The entries in the menu allow you to perform diagnostic tests on your system to aid in troubleshooting.%></p> <p><%:The diagnostics available under this menu depend on what modules you have installed on your device.%></p> <%+footer%> diff --git a/applications/luci-app-diag-core/luasrc/view/diag/network_config_index.htm b/applications/luci-app-diag-core/luasrc/view/diag/network_config_index.htm index 595cc5f5fe..3d01453e48 100644 --- a/applications/luci-app-diag-core/luasrc/view/diag/network_config_index.htm +++ b/applications/luci-app-diag-core/luasrc/view/diag/network_config_index.htm @@ -4,7 +4,7 @@ -%> <%+header%> -<h2><a id="content" name="content"><%:Diagnostics%></a></h2> +<h2 name="content"><%:Diagnostics%></h2> <p><%:With this menu you can configure network diagnostics, such as network device scans and ping tests.%></p> <p><%:The diagnostics available under this menu depend on what modules you have installed on your device.%></p> <%+footer%> diff --git a/applications/luci-app-dump1090/luasrc/model/cbi/dump1090.lua b/applications/luci-app-dump1090/luasrc/model/cbi/dump1090.lua index 6015ffe1fc..4470a0d2f0 100644 --- a/applications/luci-app-dump1090/luasrc/model/cbi/dump1090.lua +++ b/applications/luci-app-dump1090/luasrc/model/cbi/dump1090.lua @@ -1,4 +1,4 @@ --- Copyright 2014 Álvaro Fernández Rojas <noltari@gmail.com> +-- Copyright 2014-2015 Álvaro Fernández Rojas <noltari@gmail.com> -- Licensed to the public under the Apache License 2.0. m = Map("dump1090", "dump1090", translate("dump1090 is a Mode S decoder specifically designed for RTLSDR devices, here you can configure the settings.")) @@ -12,6 +12,7 @@ enable.enabled="0" enable.disabled="1" enable.default = "1" enable.rmempty = false + respawn=s:option(Flag, "respawn", translate("Respawn")) respawn.default = false @@ -34,6 +35,15 @@ ifile=s:option(Value, "ifile", translate("Data file")) ifile.rmempty = true ifile.datatype = "file" +iformat=s:option(ListValue, "iformat", translate("Sample format for data file")) +iformat:value("", translate("Default")) +iformat:value("UC8") +iformat:value("SC16") +iformat:value("SC16Q11") + +throttle=s:option(Flag, "throttle", translate("When reading from a file play back in realtime, not at max speed")) +throttle.default = false + raw=s:option(Flag, "raw", translate("Show only messages hex values")) raw.default = false @@ -76,13 +86,17 @@ net_bo_port=s:option(Value, "net_bo_port", translate("TCP Beast output listen po net_bo_port.rmempty = true net_bo_port.datatype = "port" +net_fatsv_port=s:option(Value, "net_fatsv_port", translate("FlightAware TSV output port")) +net_fatsv_port.rmempty = true +net_fatsv_port.datatype = "port" + net_ro_size=s:option(Value, "net_ro_size", translate("TCP raw output minimum size")) net_ro_size.rmempty = true net_ro_size.datatype = "uinteger" -net_ro_rate=s:option(Value, "net_ro_rate", translate("TCP raw output memory flush rate")) -net_ro_rate.rmempty = true -net_ro_rate.datatype = "uinteger" +net_ro_interval=s:option(Value, "net_ro_interval", translate("TCP raw output memory flush rate in seconds")) +net_ro_interval.rmempty = true +net_ro_interval.datatype = "uinteger" net_heartbeat=s:option(Value, "net_heartbeat", translate("TCP heartbeat rate in seconds")) net_heartbeat.rmempty = true @@ -92,13 +106,23 @@ net_buffer=s:option(Value, "net_buffer", translate("TCP buffer size 64Kb * (2^n) net_buffer.rmempty = true net_buffer.datatype = "uinteger" +net_verbatim=s:option(Flag, "net_verbatim", translate("Do not apply CRC corrections to messages we forward")) +net_verbatim.default = false + +forward_mlat=s:option(Flag, "forward_mlat", translate("Allow forwarding of received mlat results to output ports")) +forward_mlat.default = false + lat=s:option(Value, "lat", translate("Reference/receiver latitude for surface posn")) lat.rmempty = true -lat.datatype = "integer" +lat.datatype = "float" lon=s:option(Value, "lon", translate("Reference/receiver longitude for surface posn")) lon.rmempty = true -lon.datatype = "integer" +lon.datatype = "float" + +max_range=s:option(Value, "max_range", translate("Absolute maximum range for position decoding")) +max_range.rmempty = true +max_range.datatype = "uinteger" fix=s:option(Flag, "fix", translate("Enable single-bits error correction using CRC")) fix.default = false @@ -121,6 +145,9 @@ mlat.default = false stats=s:option(Flag, "stats", translate("Print stats at exit")) stats.default = false +stats_range=s:option(Flag, "stats_range", translate("Collect/show range histogram")) +stats_range.default = false + stats_every=s:option(Value, "stats_every", translate("Show and reset stats every seconds")) stats_every.rmempty = true stats_every.datatype = "uinteger" @@ -131,15 +158,42 @@ onlyaddr.default = false metric=s:option(Flag, "metric", translate("Use metric units")) metric.default = false -snip=s:option(Flag, "snip", translate("Strip IQ file removing samples")) +snip=s:option(Value, "snip", translate("Strip IQ file removing samples")) snip.rmempty = true snip.datatype = "uinteger" -debug_mode=s:option(Flag, "debug", translate("Debug mode flags")) +debug_mode=s:option(Value, "debug", translate("Debug mode flags")) debug_mode.rmempty = true -ppm=s:option(Flag, "ppm", translate("Set receiver error in parts per million")) +ppm=s:option(Value, "ppm", translate("Set receiver error in parts per million")) ppm.rmempty = true ppm.datatype = "uinteger" +html_dir=s:option(Value, "html_dir", translate("Base directory for the internal HTTP server")) +html_dir.rmempty = true +html_dir.datatype = "directory" + +write_json=s:option(Value, "write_json", translate("Periodically write json output to a directory")) +write_json.rmempty = true +write_json.datatype = "directory" + +write_json_every=s:option(Flag, "write_json_every", translate("Write json output every t seconds")) +write_json_every.rmempty = true +write_json_every.datatype = "uinteger" + +json_location_accuracy=s:option(ListValue, "json_location_accuracy", translate("Accuracy of receiver location in json metadata")) +json_location_accuracy:value("", translate("Default")) +json_location_accuracy:value("0", "No location") +json_location_accuracy:value("1", "Approximate") +json_location_accuracy:value("2", "Exact") + +oversample=s:option(Flag, "oversample", translate("Use the 2.4MHz demodulator")) +oversample.default = false + +dcfilter=s:option(Flag, "dcfilter", translate("Apply a 1Hz DC filter to input data")) +dcfilter.default = false + +measure_noise=s:option(Flag, "measure_noise", translate("Measure noise power")) +measure_noise.default = false + return m 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 46b3744403..6c90476f81 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 @@ -60,7 +60,7 @@ s:tab("advanced", translate("Advanced Settings")) name = s:taboption("general", Value, "name", translate("Name")) name.optional = false name.forcewrite = true -name.datatype = "uciname" +name.datatype = "and(uciname,maxlength(14))" function name.write(self, section, value) if zone:name() ~= value then @@ -76,15 +76,6 @@ function name.write(self, section, value) } end -function name.validate(self, value) - -- fw3 defines 14 as the maximum length of zone name - if #value > 14 then - return nil, translate("Zone name is too long") - else - return value - end -end - p = { s:taboption("general", ListValue, "input", translate("Input")), s:taboption("general", ListValue, "output", translate("Output")), diff --git a/applications/luci-app-firewall/po/pl/firewall.po b/applications/luci-app-firewall/po/pl/firewall.po index 18be74d231..2ccd25ccc1 100644 --- a/applications/luci-app-firewall/po/pl/firewall.po +++ b/applications/luci-app-firewall/po/pl/firewall.po @@ -301,7 +301,7 @@ msgid "Restrict Masquerading to given destination subnets" msgstr "Ogranicz maskaradę do wskazanych sieci docelowych" msgid "Restrict Masquerading to given source subnets" -msgstr "Ogranicz maskaradę do wskazanych sieci żródłowych" +msgstr "Ogranicz maskaradę do wskazanych sieci źródłowych" # Wstawiłem rodzinę gdyż gdzieś wcześniej było tak opisane ale klasa pasuje mi tu bardziej. # Obsy - niestety ale "rodzina". W gui dotyczy to wyboru IPv4/IPv6, więc "rodzina" a nie klasa. @@ -317,7 +317,7 @@ msgid "" "Rewrite matched traffic to the given source port. May be left empty to only " "rewrite the IP address." msgstr "" -"Przepisz dopasowany ruch do danego portu żródłowego. Można zostawić puste " +"Przepisz dopasowany ruch do danego portu źródłowego. Można zostawić puste " "aby przepisać tylko adres IP" msgid "Rewrite to source %s" @@ -339,7 +339,7 @@ msgid "Source MAC address" msgstr "Źródłowy adres MAC" msgid "Source NAT" -msgstr "NAT żródłowy" +msgstr "NAT źródłowy" # http://www.digipedia.pl/def/doc/id/677604507/name/SNAT/ msgid "" @@ -348,7 +348,7 @@ msgid "" "multiple WAN addresses to internal subnets." msgstr "" "SNAT używany jest wtedy, gdy zmieniane są adresy pakietów połączenia " -"wychodzącego, czyli pakiety żródłowe. Wykonywany jest zawsze po routowaniu " +"wychodzącego, czyli pakiety źródłowe. Wykonywany jest zawsze po routowaniu " "(POSTROUTING), a więc w chwili, gdy pakiety są gotowe opuścić host. " "IPmasquerading jest formą SNAT." diff --git a/applications/luci-app-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm b/applications/luci-app-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm index 2f4914e5d5..fe205d053b 100644 --- a/applications/luci-app-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm +++ b/applications/luci-app-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm @@ -34,7 +34,7 @@ local has_traceroute6 = fs.access("/usr/bin/traceroute6") legend.parentNode.style.display = 'block'; legend.style.display = 'inline'; - stxhr.get('<%=luci.dispatcher.build_url("freifunk", "status")%>/diag_' + tool + protocol + '/' + addr, null, + stxhr.get('<%=url('freifunk/status')%>/diag_' + tool + protocol + '/' + addr, null, function(x) { if (x.responseText) @@ -55,7 +55,7 @@ local has_traceroute6 = fs.access("/usr/bin/traceroute6") <form method="post" action="<%=pcdata(luci.http.getenv("REQUEST_URI"))%>"> <div class="cbi-map"> - <h2><a id="content" name="content"><%:Diagnostics%></a></h2> + <h2 name="content"><%:Diagnostics%></h2> <fieldset class="cbi-section"> <legend><%:Network Utilities%></legend> diff --git a/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm index e319f15fbc..f2e2fb9069 100644 --- a/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm +++ b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm @@ -33,7 +33,7 @@ end <div id="<%=name%>" style="width:<%=width%>;float:left"> <h2><%=title%></h2> <div id="form_<%=name%>"> - <form name="searchform" id="search_<%=name%>" action="<%=luci.dispatcher.build_url('freifunk', 'search_redirect')%>"> + <form name="searchform" id="search_<%=name%>" action="<%=url('freifunk/search_redirect')%>"> <input type="text" name="searchterms" style="margin-bottom:15px; width: 90%"><br /> <% local checked = " checked" diff --git a/applications/luci-app-ltqtapi/luasrc/view/telephony_status.htm b/applications/luci-app-ltqtapi/luasrc/view/telephony_status.htm index 234f909342..d861ef9fcb 100644 --- a/applications/luci-app-ltqtapi/luasrc/view/telephony_status.htm +++ b/applications/luci-app-ltqtapi/luasrc/view/telephony_status.htm @@ -1,5 +1,5 @@ <script type="text/javascript">//<![CDATA[ -XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "telephony", "status")%>', null, +XHR.poll(5, '<%=url('admin/telephony/status')%>', null, function(x, st) { var tb = document.getElementById('telephony_status_table'); diff --git a/applications/luci-app-minidlna/luasrc/view/minidlna_status.htm b/applications/luci-app-minidlna/luasrc/view/minidlna_status.htm index 098a72a073..866eded03e 100644 --- a/applications/luci-app-minidlna/luasrc/view/minidlna_status.htm +++ b/applications/luci-app-minidlna/luasrc/view/minidlna_status.htm @@ -1,5 +1,5 @@ <script type="text/javascript">//<![CDATA[ - XHR.poll(5, '<%=luci.dispatcher.build_url("admin/services/minidlna_status")%>', null, + XHR.poll(5, '<%=url("admin/services/minidlna_status")%>', null, function(x, st) { var tb = document.getElementById('minidlna_status'); diff --git a/applications/luci-app-mjpg-streamer/po/templates/mjpg-streamer.pot b/applications/luci-app-mjpg-streamer/po/templates/mjpg-streamer.pot index 5cd722f3a7..ecb374d7f3 100644 --- a/applications/luci-app-mjpg-streamer/po/templates/mjpg-streamer.pot +++ b/applications/luci-app-mjpg-streamer/po/templates/mjpg-streamer.pot @@ -37,9 +37,15 @@ msgstr "" msgid "Drop frames smaller then this limit" msgstr "" +msgid "Enable MJPG-streamer" +msgstr "" + msgid "Enable YUYV format" msgstr "" +msgid "Enabled" +msgstr "" + msgid "Exceed" msgstr "" @@ -63,9 +69,15 @@ msgstr "" msgid "Frames per second" msgstr "" +msgid "General" +msgstr "" + msgid "HTTP output" msgstr "" +msgid "Input plugin" +msgstr "" + msgid "Interval between saving pictures" msgstr "" @@ -90,9 +102,15 @@ msgstr "" msgid "On" msgstr "" +msgid "Output plugin" +msgstr "" + msgid "Password" msgstr "" +msgid "Plugin settings" +msgstr "" + msgid "Port" msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/zh-cn/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/zh-cn/mjpg-streamer.po index 3ad9a4a53b..8b51f6ad4b 100644 --- a/applications/luci-app-mjpg-streamer/po/zh-cn/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/zh-cn/mjpg-streamer.po @@ -13,25 +13,6 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-SourceCharset: UTF-8\n" - -msgid "Enabled" -msgstr "启用" - -msgid "Enable MJPG-streamer" -msgstr "启用MJPG-streamer" - -msgid "General" -msgstr "一般设置" - -msgid "Plugin settings" -msgstr "插件设置" - -msgid "Input plugin" -msgstr "输入插件" - -msgid "Output plugin" -msgstr "输出插件" - msgid "Allow ringbuffer to exceed limit by this amount" msgstr "允许环形缓冲区最多超过这个数值" @@ -68,9 +49,15 @@ msgstr "不要初始化dynctrls" msgid "Drop frames smaller then this limit" msgstr "丢弃小于该尺寸限制的帧" +msgid "Enable MJPG-streamer" +msgstr "启用MJPG-streamer" + msgid "Enable YUYV format" msgstr "启用YUYV格式" +msgid "Enabled" +msgstr "启用" + msgid "Exceed" msgstr "超出" @@ -94,9 +81,15 @@ msgstr "保存网页的文件夹" msgid "Frames per second" msgstr "帧每秒" +msgid "General" +msgstr "一般设置" + msgid "HTTP output" msgstr "HTTP输出" +msgid "Input plugin" +msgstr "输入插件" + msgid "Interval between saving pictures" msgstr "图片保存时间间隔" @@ -121,9 +114,15 @@ msgstr "关" msgid "On" msgstr "开" +msgid "Output plugin" +msgstr "输出插件" + msgid "Password" msgstr "密码" +msgid "Plugin settings" +msgstr "插件设置" + msgid "Port" msgstr "端口" diff --git a/applications/luci-app-multiwan/luasrc/view/multiwan_status.htm b/applications/luci-app-multiwan/luasrc/view/multiwan_status.htm index 8c4127b237..03bfad1c5d 100644 --- a/applications/luci-app-multiwan/luasrc/view/multiwan_status.htm +++ b/applications/luci-app-multiwan/luasrc/view/multiwan_status.htm @@ -1,5 +1,5 @@ <script type="text/javascript">//<![CDATA[ - XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "multiwan", "status")%>', null, + XHR.poll(5, '<%=url('admin/network/multiwan/status')%>', null, function(x, st) { var tx = document.getElementById('multiwan_status_text'); diff --git a/applications/luci-app-multiwan/po/es/multiwan.po b/applications/luci-app-multiwan/po/es/multiwan.po index 1a54f7557b..4d2447eecc 100644 --- a/applications/luci-app-multiwan/po/es/multiwan.po +++ b/applications/luci-app-multiwan/po/es/multiwan.po @@ -118,7 +118,7 @@ msgid "WAN Interfaces" msgstr "Interfaces WAN" msgid "WAN Uplink" -msgstr "Enalce saliente WAN" +msgstr "Enlace saliente WAN" msgid "all" msgstr "todos" diff --git a/applications/luci-app-ocserv/luasrc/controller/ocserv.lua b/applications/luci-app-ocserv/luasrc/controller/ocserv.lua index dbeaaf8524..79c6ddb78e 100644 --- a/applications/luci-app-ocserv/luasrc/controller/ocserv.lua +++ b/applications/luci-app-ocserv/luasrc/controller/ocserv.lua @@ -28,7 +28,7 @@ function index() call("ocserv_status")).leaf = true entry({"admin", "services", "ocserv", "disconnect"}, - call("ocserv_disconnect")).leaf = true + post("ocserv_disconnect")).leaf = true end diff --git a/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm b/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm index fabc1bca9e..03a9ed70ee 100644 --- a/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm +++ b/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm @@ -1,7 +1,7 @@ <script type="text/javascript">//<![CDATA[ function ocserv_disconnect(idx) { - XHR.get('<%=luci.dispatcher.build_url("admin", "services", "ocserv", "disconnect")%>/' + idx, null, + (new XHR()).post('<%=url('admin/services/ocserv/disconnect')%>/' + idx, { token: '<%=token%>' }, function(x) { var tb = document.getElementById('ocserv_status_table'); @@ -11,7 +11,7 @@ ); } - XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "ocserv", "status")%>', null, + XHR.poll(5, '<%=url('admin/services/ocserv/status')%>', null, function(x, st) { var tb = document.getElementById('ocserv_status_table'); diff --git a/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm b/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm index 0e59c61258..476150dd28 100644 --- a/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm +++ b/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm @@ -149,7 +149,7 @@ end - <h2><a id="content" name="content"><%:Services%></a></h2> + <h2 name="content"><%:Services%></h2> <fieldset class="cbi-section"> <legend><%:Internal services%></legend> diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm index d9976701fa..eb41219c7e 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm @@ -5,7 +5,7 @@ -%> <%+header%> -<h2><a id="content" name="content"><%:OLSR Daemon%></a></h2> +<h2 name="content"><%:OLSR Daemon%></h2> <p class="error"><%:Unable to connect to the OLSR daemon!%></p> <p><%:Make sure that OLSRd is running, the "jsoninfo" plugin is loaded, configured on port 9090 and accepts connections from "127.0.0.1".%></p> <%+footer%> diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm index 89e4436f72..5ea7b74e4d 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm @@ -73,7 +73,7 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 }, ); //]]></script> -<h2><a id="content" name="content"><%:Active host net announcements%></a></h2> +<h2 name="content"><%:Active host net announcements%></h2> <div id="togglebuttons"></div> <fieldset class="cbi-section"> diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm index 3fb3a58e9c..81d0a3dd31 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm @@ -11,7 +11,7 @@ local i = 1 <%+header%> -<h2><a id="content" name="content"><%:Interfaces%></a></h2> +<h2 name="content"><%:Interfaces%></h2> <div id="togglebuttons"></div> diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm index 3c10bd66aa..f658288fc1 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm @@ -10,7 +10,7 @@ local i = 1 %> <%+header%> -<h2><a id="content" name="content"><%:Active MID announcements%></a></h2> +<h2 name="content"><%:Active MID announcements%></h2> <div id="togglebuttons"></div> <fieldset class="cbi-section"> diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm index 9ad0d8f898..31dd7d05ac 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm @@ -105,7 +105,7 @@ end //]]></script> -<h2><a id="content" name="content"><%:OLSR connections%></a></h2> +<h2 name="content"><%:OLSR connections%></h2> <div id="togglebuttons"></div> diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm index fa32315280..61e17b3b2d 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm @@ -155,7 +155,7 @@ XHR.poll(10, '<%=REQUEST_URI%>/json', { }, <div id="error" class="error"></div> -<h2><a id="content" name="content">OLSR <%:Overview%></a></h2> +<h2 name="content">OLSR <%:Overview%></h2> <fieldset class="cbi-section"> <legend><%:Network%></legend> diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm index d2b0c1be8d..8e46daa022 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm @@ -89,7 +89,7 @@ XHR.poll(20, '<%=REQUEST_URI%>', { status: 1 }, -<h2><a id="content" name="content"><%:Known OLSR routes%></a></h2> +<h2 name="content"><%:Known OLSR routes%></h2> <div id="togglebuttons"></div> diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm index 45f6515339..6aa7a75461 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm @@ -86,7 +86,7 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 }, <%+header%> -<h2><a id="content" name="content"><%:SmartGW announcements%></a></h2> +<h2 name="content"><%:SmartGW announcements%></h2> <div id="togglebuttons"></div> diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm index ee69f72d75..b3abeaecbe 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm @@ -11,7 +11,7 @@ local olsrtools = require "luci.tools.olsr" %> <%+header%> -<h2><a id="content" name="content"><%:Active OLSR nodes%></a></h2> +<h2 name="content"><%:Active OLSR nodes%></h2> <div id="togglebuttons"></div> diff --git a/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm index ac5c8936ec..f22cb68c7b 100644 --- a/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm +++ b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm @@ -6,14 +6,14 @@ <fieldset class="cbi-section"> <legend> - <a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn")%>"><%:Overview%></a> » + <a href="<%=url('admin/services/openvpn')%>"><%:Overview%></a> » <%=luci.i18n.translatef("Instance \"%s\"", self.instance)%> </legend> <% if self.mode == "basic" then %> - <a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn", "advanced", self.instance, "Service")%>"><%:Switch to advanced configuration »%></a> + <a href="<%=url('admin/services/openvpn/advanced', self.instance, "Service")%>"><%:Switch to advanced configuration »%></a> <% else %> - <a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn", "basic", self.instance)%>"><%:« Switch to basic configuration%></a> + <a href="<%=url('admin/services/openvpn/basic', self.instance)%>"><%:« Switch to basic configuration%></a> <hr style="margin:0.5em 0" /> <%:Configuration category%>: <% for i, c in ipairs(self.categories) do %> diff --git a/applications/luci-app-polipo/luasrc/view/polipo_status.htm b/applications/luci-app-polipo/luasrc/view/polipo_status.htm index c2695ca82b..007d2d5e4e 100644 --- a/applications/luci-app-polipo/luasrc/view/polipo_status.htm +++ b/applications/luci-app-polipo/luasrc/view/polipo_status.htm @@ -9,7 +9,7 @@ local port = uci:get("polipo", "general", "proxyPort") or "8123" <%+header%> <div class="cbi-map"> - <h2><a id="content" name="content"><%:Polipo Status%></a></h2> + <h2 name="content"><%:Polipo Status%></h2> <div class="cbi-section"> <iframe id="sf" src="http://<%=luci.http.getenv('SERVER_NAME')%>:<%=port%>/polipo/" style="width:100%; height:350px; border:none"></iframe> </div> diff --git a/applications/luci-app-privoxy/luasrc/controller/privoxy.lua b/applications/luci-app-privoxy/luasrc/controller/privoxy.lua index 58ba80724c..0cedab48ae 100644 --- a/applications/luci-app-privoxy/luasrc/controller/privoxy.lua +++ b/applications/luci-app-privoxy/luasrc/controller/privoxy.lua @@ -15,7 +15,7 @@ PRIVOXY_MIN = "3.0.22-0" -- minimum version of service required function index() entry( {"admin", "services", "privoxy"}, cbi("privoxy"), _("Privoxy WEB proxy"), 59) entry( {"admin", "services", "privoxy", "logview"}, call("logread") ).leaf = true - entry( {"admin", "services", "privoxy", "startstop"}, call("startstop") ).leaf = true + entry( {"admin", "services", "privoxy", "startstop"}, post("startstop") ).leaf = true entry( {"admin", "services", "privoxy", "status"}, call("get_pid") ).leaf = true end diff --git a/applications/luci-app-privoxy/luasrc/view/privoxy/detail_logview.htm b/applications/luci-app-privoxy/luasrc/view/privoxy/detail_logview.htm index 3e190709fb..ab0019bdd4 100644 --- a/applications/luci-app-privoxy/luasrc/view/privoxy/detail_logview.htm +++ b/applications/luci-app-privoxy/luasrc/view/privoxy/detail_logview.htm @@ -6,7 +6,7 @@ var txt = document.getElementById("cbid.privoxy.privoxy._logview.txt"); // TextArea if ( !txt ) { return; } // security check var lvXHR = new XHR(); - lvXHR.get('<%=luci.dispatcher.build_url("admin", "services", "privoxy", "logview")%>', null, + lvXHR.get('<%=url('admin/services/privoxy/logview')%>', null, function(x) { if (x.responseText == "_nodata_") txt.value = "<%:File not found or empty%>"; diff --git a/applications/luci-app-privoxy/luasrc/view/privoxy/detail_startstop.htm b/applications/luci-app-privoxy/luasrc/view/privoxy/detail_startstop.htm index b9de8864e4..85975ac7d1 100644 --- a/applications/luci-app-privoxy/luasrc/view/privoxy/detail_startstop.htm +++ b/applications/luci-app-privoxy/luasrc/view/privoxy/detail_startstop.htm @@ -21,12 +21,12 @@ function onclick_startstop(id) { // do start/stop var btnXHR = new XHR(); - btnXHR.get('<%=luci.dispatcher.build_url("admin", "services", "privoxy", "startstop")%>', null, + btnXHR.post('<%=url('admin/services/privoxy/startstop')%>', { token: '<%=token%>' }, function(x) { _data2elements(x); } ); } - XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "privoxy", "status")%>', null, + XHR.poll(5, '<%=url('admin/services/privoxy/status')%>', null, function(x, data) { _data2elements(x); } ); diff --git a/applications/luci-app-qos/po/ca/qos.po b/applications/luci-app-qos/po/ca/qos.po index 7871b12066..e1430f1ad3 100644 --- a/applications/luci-app-qos/po/ca/qos.po +++ b/applications/luci-app-qos/po/ca/qos.po @@ -59,9 +59,6 @@ msgstr "QoS" msgid "Quality of Service" msgstr "Qualitat de Servei" -msgid "Service" -msgstr "Servei" - msgid "Source host" msgstr "Host d'origen" @@ -97,6 +94,9 @@ msgstr "normal" msgid "priority" msgstr "prioritat" +#~ msgid "Service" +#~ msgstr "Servei" + #~ msgid "Downlink" #~ msgstr "Enllaç de baixada" diff --git a/applications/luci-app-qos/po/cs/qos.po b/applications/luci-app-qos/po/cs/qos.po index 361e4d5426..884310f665 100644 --- a/applications/luci-app-qos/po/cs/qos.po +++ b/applications/luci-app-qos/po/cs/qos.po @@ -59,9 +59,6 @@ msgstr "QoS" msgid "Quality of Service" msgstr "Quality of Service" -msgid "Service" -msgstr "Služba" - msgid "Source host" msgstr "Zdrojová adresa" @@ -97,6 +94,9 @@ msgstr "normální priorita" msgid "priority" msgstr "nejvyšší priorita (malé rámce)" +#~ msgid "Service" +#~ msgstr "Služba" + #~ msgid "Downlink" #~ msgstr "Stahování" diff --git a/applications/luci-app-qos/po/de/qos.po b/applications/luci-app-qos/po/de/qos.po index 6ba5701fd7..46060de216 100644 --- a/applications/luci-app-qos/po/de/qos.po +++ b/applications/luci-app-qos/po/de/qos.po @@ -57,9 +57,6 @@ msgstr "QoS" msgid "Quality of Service" msgstr "Quality of Service" -msgid "Service" -msgstr "Dienst" - msgid "Source host" msgstr "Quelladresse" @@ -94,6 +91,9 @@ msgstr "normal" msgid "priority" msgstr "Priorität" +#~ msgid "Service" +#~ msgstr "Dienst" + #~ msgid "Downlink" #~ msgstr "Downlink" diff --git a/applications/luci-app-qos/po/el/qos.po b/applications/luci-app-qos/po/el/qos.po index b417b8b9aa..9c8a9851ad 100644 --- a/applications/luci-app-qos/po/el/qos.po +++ b/applications/luci-app-qos/po/el/qos.po @@ -60,9 +60,6 @@ msgstr "" msgid "Quality of Service" msgstr "Ποιότητα Υπηρεσίας" -msgid "Service" -msgstr "Υπηρεσία" - #, fuzzy msgid "Source host" msgstr "Διεύθυνση πηγής" @@ -100,6 +97,9 @@ msgstr "κανονική" msgid "priority" msgstr "προτεραιότητα" +#~ msgid "Service" +#~ msgstr "Υπηρεσία" + #, fuzzy #~ msgid "Downlink" #~ msgstr "Ταχύτητα κατεβάσματος" diff --git a/applications/luci-app-qos/po/en/qos.po b/applications/luci-app-qos/po/en/qos.po index aeb7b27b29..b20180f0d8 100644 --- a/applications/luci-app-qos/po/en/qos.po +++ b/applications/luci-app-qos/po/en/qos.po @@ -53,9 +53,6 @@ msgstr "" msgid "Quality of Service" msgstr "Quality of Service" -msgid "Service" -msgstr "Service" - msgid "Source host" msgstr "Source host" @@ -89,3 +86,6 @@ msgstr "normal" msgid "priority" msgstr "priority" + +#~ msgid "Service" +#~ msgstr "Service" diff --git a/applications/luci-app-qos/po/es/qos.po b/applications/luci-app-qos/po/es/qos.po index 3c8206ddca..83ace8d1f8 100644 --- a/applications/luci-app-qos/po/es/qos.po +++ b/applications/luci-app-qos/po/es/qos.po @@ -55,9 +55,6 @@ msgstr "QoS" msgid "Quality of Service" msgstr "Calidad de Servicio" -msgid "Service" -msgstr "Servicio" - msgid "Source host" msgstr "Máquina origen" @@ -92,6 +89,9 @@ msgstr "normal" msgid "priority" msgstr "prioritario" +#~ msgid "Service" +#~ msgstr "Servicio" + #~ msgid "Downlink" #~ msgstr "Enlace de bajada" diff --git a/applications/luci-app-qos/po/fr/qos.po b/applications/luci-app-qos/po/fr/qos.po index a4a81f124d..38e9ce8633 100644 --- a/applications/luci-app-qos/po/fr/qos.po +++ b/applications/luci-app-qos/po/fr/qos.po @@ -55,9 +55,6 @@ msgstr "" msgid "Quality of Service" msgstr "Qualité de service" -msgid "Service" -msgstr "Service" - msgid "Source host" msgstr "Hôte source" @@ -93,5 +90,8 @@ msgstr "normal" msgid "priority" msgstr "prioritaire" +#~ msgid "Service" +#~ msgstr "Service" + #~ msgid "qos_connbytes" #~ msgstr "qos_connbytes" diff --git a/applications/luci-app-qos/po/he/qos.po b/applications/luci-app-qos/po/he/qos.po index 71c2e3c073..e2d42ef014 100644 --- a/applications/luci-app-qos/po/he/qos.po +++ b/applications/luci-app-qos/po/he/qos.po @@ -55,9 +55,6 @@ msgstr "" msgid "Quality of Service" msgstr "" -msgid "Service" -msgstr "" - msgid "Source host" msgstr "" diff --git a/applications/luci-app-qos/po/hu/qos.po b/applications/luci-app-qos/po/hu/qos.po index d69ff082a7..c77ac3cd7c 100644 --- a/applications/luci-app-qos/po/hu/qos.po +++ b/applications/luci-app-qos/po/hu/qos.po @@ -57,9 +57,6 @@ msgstr "QoS" msgid "Quality of Service" msgstr "Quality of Service" -msgid "Service" -msgstr "Szolgáltatás" - msgid "Source host" msgstr "Forrás gép" @@ -95,6 +92,9 @@ msgstr "normál" msgid "priority" msgstr "prioritás" +#~ msgid "Service" +#~ msgstr "Szolgáltatás" + #~ msgid "Downlink" #~ msgstr "Downlink" diff --git a/applications/luci-app-qos/po/it/qos.po b/applications/luci-app-qos/po/it/qos.po index 00fb331b34..686c74519a 100644 --- a/applications/luci-app-qos/po/it/qos.po +++ b/applications/luci-app-qos/po/it/qos.po @@ -55,9 +55,6 @@ msgstr "QoS" msgid "Quality of Service" msgstr "Qualità del Servizio" -msgid "Service" -msgstr "Servizi" - msgid "Source host" msgstr "Host sorgente" @@ -92,6 +89,9 @@ msgstr "normale" msgid "priority" msgstr "priorità" +#~ msgid "Service" +#~ msgstr "Servizi" + #~ msgid "Downlink" #~ msgstr "Collegamento discendente" diff --git a/applications/luci-app-qos/po/ja/qos.po b/applications/luci-app-qos/po/ja/qos.po index 857cf5b83b..deeb23f60c 100644 --- a/applications/luci-app-qos/po/ja/qos.po +++ b/applications/luci-app-qos/po/ja/qos.po @@ -55,9 +55,6 @@ msgstr "" msgid "Quality of Service" msgstr "Quality of Service" -msgid "Service" -msgstr "サービス" - msgid "Source host" msgstr "送信元ホスト" @@ -91,3 +88,6 @@ msgstr "標準" msgid "priority" msgstr "最優先" + +#~ msgid "Service" +#~ msgstr "サービス" diff --git a/applications/luci-app-qos/po/ms/qos.po b/applications/luci-app-qos/po/ms/qos.po index ab30492127..f8d4ab3d25 100644 --- a/applications/luci-app-qos/po/ms/qos.po +++ b/applications/luci-app-qos/po/ms/qos.po @@ -54,9 +54,6 @@ msgstr "" msgid "Quality of Service" msgstr "" -msgid "Service" -msgstr "" - msgid "Source host" msgstr "" diff --git a/applications/luci-app-qos/po/no/qos.po b/applications/luci-app-qos/po/no/qos.po index a560b0fa0e..6b390a1d6c 100644 --- a/applications/luci-app-qos/po/no/qos.po +++ b/applications/luci-app-qos/po/no/qos.po @@ -50,9 +50,6 @@ msgstr "QoS" msgid "Quality of Service" msgstr "Quality of Service" -msgid "Service" -msgstr "Service" - msgid "Source host" msgstr "Kilde vert" @@ -87,6 +84,9 @@ msgstr "normal" msgid "priority" msgstr "prioritet" +#~ msgid "Service" +#~ msgstr "Service" + #~ msgid "Downlink" #~ msgstr "Nedlinje" diff --git a/applications/luci-app-qos/po/pl/qos.po b/applications/luci-app-qos/po/pl/qos.po index 7b740c78f8..3c6a28ccca 100644 --- a/applications/luci-app-qos/po/pl/qos.po +++ b/applications/luci-app-qos/po/pl/qos.po @@ -56,9 +56,6 @@ msgstr "QoS" msgid "Quality of Service" msgstr "Jakość usługi (ang. Quality of Service)" -msgid "Service" -msgstr "Usługa" - msgid "Source host" msgstr "Host źródłowy" @@ -93,6 +90,9 @@ msgstr "normalny" msgid "priority" msgstr "priorytetowy" +#~ msgid "Service" +#~ msgstr "Usługa" + #~ msgid "Downlink" #~ msgstr "Ruch przychodzący" diff --git a/applications/luci-app-qos/po/pt-br/qos.po b/applications/luci-app-qos/po/pt-br/qos.po index 1ebaea2a2e..43cd6e2a66 100644 --- a/applications/luci-app-qos/po/pt-br/qos.po +++ b/applications/luci-app-qos/po/pt-br/qos.po @@ -58,9 +58,6 @@ msgstr "<abbr title=\"Quality of Service, Qualidade de serviço\">QoS</abbr>" msgid "Quality of Service" msgstr "Qualidade de Serviço" -msgid "Service" -msgstr "Serviço" - msgid "Source host" msgstr "Endereço de origem" @@ -96,6 +93,9 @@ msgstr "normal" msgid "priority" msgstr "prioritário" +#~ msgid "Service" +#~ msgstr "Serviço" + #~ msgid "Downlink" #~ msgstr "Link para download" diff --git a/applications/luci-app-qos/po/pt/qos.po b/applications/luci-app-qos/po/pt/qos.po index 2299a78484..449ddce4c9 100644 --- a/applications/luci-app-qos/po/pt/qos.po +++ b/applications/luci-app-qos/po/pt/qos.po @@ -57,9 +57,6 @@ msgstr "QoS" msgid "Quality of Service" msgstr "Qualidade de Serviço" -msgid "Service" -msgstr "Serviço" - msgid "Source host" msgstr "Host de origem" @@ -94,6 +91,9 @@ msgstr "normal" msgid "priority" msgstr "prioridade" +#~ msgid "Service" +#~ msgstr "Serviço" + #~ msgid "Downlink" #~ msgstr "Link para download" diff --git a/applications/luci-app-qos/po/ro/qos.po b/applications/luci-app-qos/po/ro/qos.po index 239c1f8506..9c88f7c2c9 100644 --- a/applications/luci-app-qos/po/ro/qos.po +++ b/applications/luci-app-qos/po/ro/qos.po @@ -58,9 +58,6 @@ msgstr "QoS" msgid "Quality of Service" msgstr "Quality of Service" -msgid "Service" -msgstr "Serviciu" - msgid "Source host" msgstr "" @@ -93,5 +90,8 @@ msgstr "normala" msgid "priority" msgstr "ridicata" +#~ msgid "Service" +#~ msgstr "Serviciu" + #~ msgid "Internet Connection" #~ msgstr "Conexiune internet" diff --git a/applications/luci-app-qos/po/ru/qos.po b/applications/luci-app-qos/po/ru/qos.po index 6c3639243e..811cbf1e01 100644 --- a/applications/luci-app-qos/po/ru/qos.po +++ b/applications/luci-app-qos/po/ru/qos.po @@ -57,9 +57,6 @@ msgstr "QoS" msgid "Quality of Service" msgstr "Качество обслуживания (QoS)" -msgid "Service" -msgstr "Служба" - msgid "Source host" msgstr "Хост источника" @@ -94,6 +91,9 @@ msgstr "обычный" msgid "priority" msgstr "приоритетный" +#~ msgid "Service" +#~ msgstr "Служба" + #~ msgid "Downlink" #~ msgstr "Нисходящий канал" diff --git a/applications/luci-app-qos/po/sk/qos.po b/applications/luci-app-qos/po/sk/qos.po index 102e5a94e9..b4d10ab317 100644 --- a/applications/luci-app-qos/po/sk/qos.po +++ b/applications/luci-app-qos/po/sk/qos.po @@ -50,9 +50,6 @@ msgstr "" msgid "Quality of Service" msgstr "" -msgid "Service" -msgstr "" - msgid "Source host" msgstr "" diff --git a/applications/luci-app-qos/po/sv/qos.po b/applications/luci-app-qos/po/sv/qos.po index 44f8a351eb..1ba407e4b7 100644 --- a/applications/luci-app-qos/po/sv/qos.po +++ b/applications/luci-app-qos/po/sv/qos.po @@ -51,9 +51,6 @@ msgstr "" msgid "Quality of Service" msgstr "" -msgid "Service" -msgstr "" - msgid "Source host" msgstr "" diff --git a/applications/luci-app-qos/po/templates/qos.pot b/applications/luci-app-qos/po/templates/qos.pot index 26ea8f7971..48333e4565 100644 --- a/applications/luci-app-qos/po/templates/qos.pot +++ b/applications/luci-app-qos/po/templates/qos.pot @@ -43,9 +43,6 @@ msgstr "" msgid "Quality of Service" msgstr "" -msgid "Service" -msgstr "" - msgid "Source host" msgstr "" diff --git a/applications/luci-app-qos/po/tr/qos.po b/applications/luci-app-qos/po/tr/qos.po index 74647be141..d2f3611cf3 100644 --- a/applications/luci-app-qos/po/tr/qos.po +++ b/applications/luci-app-qos/po/tr/qos.po @@ -55,9 +55,6 @@ msgstr "" msgid "Quality of Service" msgstr "" -msgid "Service" -msgstr "" - msgid "Source host" msgstr "" diff --git a/applications/luci-app-qos/po/uk/qos.po b/applications/luci-app-qos/po/uk/qos.po index d48100b121..5ec9f37264 100644 --- a/applications/luci-app-qos/po/uk/qos.po +++ b/applications/luci-app-qos/po/uk/qos.po @@ -58,9 +58,6 @@ msgstr "QoS" msgid "Quality of Service" msgstr "Якість обслуговування (QoS)" -msgid "Service" -msgstr "Сервіс" - msgid "Source host" msgstr "Вихідний вузол" @@ -96,6 +93,9 @@ msgstr "звичайний" msgid "priority" msgstr "пріоритетний" +#~ msgid "Service" +#~ msgstr "Сервіс" + #~ msgid "Downlink" #~ msgstr "Низхідний канал" diff --git a/applications/luci-app-qos/po/vi/qos.po b/applications/luci-app-qos/po/vi/qos.po index 82492727c9..32e7ed17ab 100644 --- a/applications/luci-app-qos/po/vi/qos.po +++ b/applications/luci-app-qos/po/vi/qos.po @@ -60,9 +60,6 @@ msgstr "" msgid "Quality of Service" msgstr "Chất lượng dịch vụ " -msgid "Service" -msgstr "" - #, fuzzy msgid "Source host" msgstr "Địa chỉ nguồn" diff --git a/applications/luci-app-qos/po/zh-cn/qos.po b/applications/luci-app-qos/po/zh-cn/qos.po index 92ff7d0897..0a5cd6220c 100644 --- a/applications/luci-app-qos/po/zh-cn/qos.po +++ b/applications/luci-app-qos/po/zh-cn/qos.po @@ -55,9 +55,6 @@ msgstr "QoS" msgid "Quality of Service" msgstr "QOS服务" -msgid "Service" -msgstr "服务" - msgid "Source host" msgstr "源主机" @@ -90,6 +87,9 @@ msgstr "普通" msgid "priority" msgstr "最高" +#~ msgid "Service" +#~ msgstr "服务" + #~ msgid "Downlink" #~ msgstr "下行" diff --git a/applications/luci-app-qos/po/zh-tw/qos.po b/applications/luci-app-qos/po/zh-tw/qos.po index 5cc338bb0d..a011e9ca9a 100644 --- a/applications/luci-app-qos/po/zh-tw/qos.po +++ b/applications/luci-app-qos/po/zh-tw/qos.po @@ -53,9 +53,6 @@ msgstr "先進先出頻寬管理" msgid "Quality of Service" msgstr "連線品質服務" -msgid "Service" -msgstr "服務" - msgid "Source host" msgstr "來源主機" @@ -90,6 +87,9 @@ msgstr "一般優先權" msgid "priority" msgstr "優先權" +#~ msgid "Service" +#~ msgstr "服務" + #~ msgid "Downlink" #~ msgstr "下載" diff --git a/applications/luci-app-radicale/luasrc/controller/radicale.lua b/applications/luci-app-radicale/luasrc/controller/radicale.lua index d384b00d9e..35f5a83a0c 100644 --- a/applications/luci-app-radicale/luasrc/controller/radicale.lua +++ b/applications/luci-app-radicale/luasrc/controller/radicale.lua @@ -15,7 +15,7 @@ function index() entry( {"admin", "services", "radicale"}, alias("admin", "services", "radicale", "edit"), _("CalDAV/CardDAV"), 58) entry( {"admin", "services", "radicale", "edit"}, cbi("radicale") ).leaf = true entry( {"admin", "services", "radicale", "logview"}, call("_logread") ).leaf = true - entry( {"admin", "services", "radicale", "startstop"}, call("_startstop") ).leaf = true + entry( {"admin", "services", "radicale", "startstop"}, post("_startstop") ).leaf = true entry( {"admin", "services", "radicale", "status"}, call("_status") ).leaf = true end diff --git a/applications/luci-app-radicale/luasrc/view/radicale/btn_startstop.htm b/applications/luci-app-radicale/luasrc/view/radicale/btn_startstop.htm index 79d1c36297..dbf4dddbca 100644 --- a/applications/luci-app-radicale/luasrc/view/radicale/btn_startstop.htm +++ b/applications/luci-app-radicale/luasrc/view/radicale/btn_startstop.htm @@ -21,12 +21,12 @@ function onclick_startstop(id) { // do start/stop var btnXHR = new XHR(); - btnXHR.get('<%=luci.dispatcher.build_url("admin", "services", "radicale", "startstop")%>', null, + btnXHR.post('<%=url('admin/services/radicale/startstop')%>', { token: '<%=token%>' }, function(x) { _data2elements(x); } ); } - XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "radicale", "status")%>', null, + XHR.poll(5, '<%=url('admin/services/radicale/status')%>', null, function(x, data) { _data2elements(x); } ); diff --git a/applications/luci-app-shadowsocks-libev/po/templates/shadowsocks-libev.pot b/applications/luci-app-shadowsocks-libev/po/templates/shadowsocks-libev.pot index c2bde961e0..81bbcb72f4 100644 --- a/applications/luci-app-shadowsocks-libev/po/templates/shadowsocks-libev.pot +++ b/applications/luci-app-shadowsocks-libev/po/templates/shadowsocks-libev.pot @@ -1,80 +1,86 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" -msgid "ShadowSocks-libev" +msgid "Access Control" msgstr "" -msgid "ShadowSocks-libev is running" +msgid "Allow all except listed" msgstr "" -msgid "ShadowSocks-libev is not running" +msgid "Allow listed only" msgstr "" -msgid "Global Setting" +msgid "Bypassed IP" msgstr "" -msgid "Enable" +msgid "Connection Timeout" msgstr "" -msgid "Enabled" +msgid "Custom" msgstr "" msgid "Disabled" msgstr "" -msgid "Custom" +msgid "Enable" msgstr "" -msgid "Server Address" +msgid "Enabled" msgstr "" -msgid "Server Port" +msgid "Encrypt Method" msgstr "" -msgid "Local Port" +msgid "Forwarded IP" msgstr "" -msgid "Connection Timeout" +msgid "Forwarding Tunnel" msgstr "" -msgid "Password" +msgid "Global Setting" msgstr "" -msgid "Encrypt Method" +msgid "Ignore List" msgstr "" -msgid "Ignore List" +msgid "LAN" msgstr "" -msgid "UDP Relay" +msgid "LAN IP List" +msgstr "" + +msgid "Local Port" +msgstr "" + +msgid "Password" msgstr "" msgid "Relay Mode" msgstr "" -msgid "UDP Forward" +msgid "Server Address" msgstr "" -msgid "UDP Local Port" +msgid "Server Port" msgstr "" -msgid "Forwarding Tunnel" +msgid "ShadowSocks-libev" msgstr "" -msgid "Access Control" +msgid "ShadowSocks-libev is not running" msgstr "" -msgid "Allow listed only" +msgid "ShadowSocks-libev is running" msgstr "" -msgid "Allow all except listed" +msgid "UDP Forward" msgstr "" -msgid "LAN IP List" +msgid "UDP Local Port" msgstr "" -msgid "Bypassed IP" +msgid "UDP Relay" msgstr "" -msgid "Forwarded IP" +msgid "WAN" msgstr "" diff --git a/applications/luci-app-shadowsocks-libev/po/zh-cn/shadowsocks-libev.po b/applications/luci-app-shadowsocks-libev/po/zh-cn/shadowsocks-libev.po index 90a0eff996..f86eee7e9f 100644 --- a/applications/luci-app-shadowsocks-libev/po/zh-cn/shadowsocks-libev.po +++ b/applications/luci-app-shadowsocks-libev/po/zh-cn/shadowsocks-libev.po @@ -12,17 +12,26 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.6\n" -msgid "ShadowSocks-libev" -msgstr "ShadowSocks-libev" +msgid "Access Control" +msgstr "访问控制" -msgid "ShadowSocks-libev is running" -msgstr "ShadowSocks-libev 运行中" +msgid "Allow all except listed" +msgstr "仅允许列表外" -msgid "ShadowSocks-libev is not running" -msgstr "ShadowSocks-libev 未运行" +msgid "Allow listed only" +msgstr "仅允许列表内" -msgid "Global Setting" -msgstr "全局设置" +msgid "Bypassed IP" +msgstr "被忽略的IP" + +msgid "Connection Timeout" +msgstr "连接超时" + +msgid "Custom" +msgstr "自定义" + +msgid "Disabled" +msgstr "已禁用" msgid "Enable" msgstr "启用" @@ -30,62 +39,59 @@ msgstr "启用" msgid "Enabled" msgstr "已启用" -msgid "Disabled" -msgstr "已禁用" +msgid "Encrypt Method" +msgstr "加密方式" -msgid "Custom" -msgstr "自定义" +msgid "Forwarded IP" +msgstr "走代理的IP" -msgid "Server Address" -msgstr "服务器地址" +msgid "Forwarding Tunnel" +msgstr "UDP转发地址" -msgid "Server Port" -msgstr "服务器端口" +msgid "Global Setting" +msgstr "全局设置" + +msgid "Ignore List" +msgstr "忽略列表" + +msgid "LAN" +msgstr "" + +msgid "LAN IP List" +msgstr "内网IP列表" msgid "Local Port" msgstr "本地端口" -msgid "Connection Timeout" -msgstr "连接超时" - msgid "Password" msgstr "密码" -msgid "Encrypt Method" -msgstr "加密方式" - -msgid "Ignore List" -msgstr "忽略列表" - -msgid "UDP Relay" -msgstr "UDP中继" - msgid "Relay Mode" msgstr "中继模式" -msgid "UDP Forward" -msgstr "UDP转发" +msgid "Server Address" +msgstr "服务器地址" -msgid "UDP Local Port" -msgstr "UDP本地端口" +msgid "Server Port" +msgstr "服务器端口" -msgid "Forwarding Tunnel" -msgstr "UDP转发地址" +msgid "ShadowSocks-libev" +msgstr "ShadowSocks-libev" -msgid "Access Control" -msgstr "访问控制" +msgid "ShadowSocks-libev is not running" +msgstr "ShadowSocks-libev 未运行" -msgid "Allow listed only" -msgstr "仅允许列表内" +msgid "ShadowSocks-libev is running" +msgstr "ShadowSocks-libev 运行中" -msgid "Allow all except listed" -msgstr "仅允许列表外" +msgid "UDP Forward" +msgstr "UDP转发" -msgid "LAN IP List" -msgstr "内网IP列表" +msgid "UDP Local Port" +msgstr "UDP本地端口" -msgid "Bypassed IP" -msgstr "被忽略的IP" +msgid "UDP Relay" +msgstr "UDP中继" -msgid "Forwarded IP" -msgstr "走代理的IP" +msgid "WAN" +msgstr "" diff --git a/applications/luci-app-splash/luasrc/controller/splash/splash.lua b/applications/luci-app-splash/luasrc/controller/splash/splash.lua index 4add43559f..13b8edce6d 100644 --- a/applications/luci-app-splash/luasrc/controller/splash/splash.lua +++ b/applications/luci-app-splash/luasrc/controller/splash/splash.lua @@ -16,7 +16,7 @@ function index() node("splash", "splash").target = template("splash_splash/splash") node("splash", "blocked").target = template("splash/blocked") - entry({"admin", "status", "splash"}, call("action_status_admin"), _("Client-Splash")) + entry({"admin", "status", "splash"}, post("action_status_admin"), _("Client-Splash")) local page = node("splash", "publicstatus") page.target = call("action_status_public") diff --git a/applications/luci-app-splash/luasrc/view/admin_status/splash.htm b/applications/luci-app-splash/luasrc/view/admin_status/splash.htm index 831fa75f65..3415c205d5 100644 --- a/applications/luci-app-splash/luasrc/view/admin_status/splash.htm +++ b/applications/luci-app-splash/luasrc/view/admin_status/splash.htm @@ -210,11 +210,11 @@ end <div id="cbi-splash-leases" class="cbi-map"> - <h2><a id="content" name="content"><%:Client-Splash%></a></h2> + <h2 name="content"><%:Client-Splash%></h2> <fieldset id="cbi-table-table" class="cbi-section"> <legend><%:Active Clients%></legend> <div class="cbi-section-node"> - <% if is_admin then %><form action="<%=REQUEST_URI%>" method="post"><% end %> + <% if is_admin then %><form action="<%=REQUEST_URI%>" method="post"><input type="hidden" name="token" value="<%=token%>" /><% end %> <table class="cbi-section-table"> <thead> <tr class="cbi-section-table-titles"> diff --git a/applications/luci-app-splash/luasrc/view/splash/blocked.htm b/applications/luci-app-splash/luasrc/view/splash/blocked.htm index 406139b51b..c27e2fab6e 100644 --- a/applications/luci-app-splash/luasrc/view/splash/blocked.htm +++ b/applications/luci-app-splash/luasrc/view/splash/blocked.htm @@ -9,7 +9,7 @@ local contacturl = luci.dispatcher.build_url("freifunk", "contact") <%+header%> -<h2><a id="content" name="content"><%:Blocked%></a></h2> +<h2 name="content"><%:Blocked%></h2> <p><%:Your access to this network has been blocked, most likely because you did something that our rules explicitly forbid.%></p> <p><%:To ask for the reason why you have been blocked or ask for access again you can try to contact the owner of this access point:%> <a href="<%=contacturl%>"><%:Contact%></a></p> diff --git a/applications/luci-app-splash/luasrc/view/splash/splash.htm b/applications/luci-app-splash/luasrc/view/splash/splash.htm index 7626b600dc..8d84463ef7 100644 --- a/applications/luci-app-splash/luasrc/view/splash/splash.htm +++ b/applications/luci-app-splash/luasrc/view/splash/splash.htm @@ -72,7 +72,7 @@ if has_custom_splash then <% else %> - <h2><a id="content" name="content"><%:Welcome%></a></h2> + <h2 name="content"><%:Welcome%></h2> <p><%:You are now connected to the free wireless mesh network%> <a href="<%=homepage%>"><%=community%></a>. <%:Please note that we are not an internet service provider but an experimental community network.%></p> diff --git a/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua index 49eab5acd4..3f26aeed6f 100644 --- a/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua +++ b/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua @@ -20,7 +20,7 @@ function index() local labels = { s_output = _("Output plugins"), - s_system = _("System plugins"), + s_general = _("General plugins"), s_network = _("Network plugins"), conntrack = _("Conntrack"), @@ -42,9 +42,11 @@ function index() network = _("Network"), nut = _("UPS"), olsrd = _("OLSRd"), + openvpn = _("OpenVPN"), ping = _("Ping"), processes = _("Processes"), rrdtool = _("RRDTool"), + sensors = _("Sensors"), splash_leases = _("Splash Leases"), tcpconns = _("TCP Connections"), unixsock = _("UnixSock"), @@ -54,15 +56,15 @@ function index() -- our collectd menu local collectd_menu = { output = { "csv", "network", "rrdtool", "unixsock" }, - system = { "cpu", "df", "disk", "email", "entropy", "exec", "irq", "load", "memory", "nut", "processes", "uptime" }, - network = { "conntrack", "dns", "interface", "iptables", "netlink", "olsrd", "ping", "splash_leases", "tcpconns", "iwinfo" } + general = { "cpu", "df", "disk", "email", "entropy", "exec", "irq", "load", "memory", "nut", "processes", "sensors", "uptime" }, + network = { "conntrack", "dns", "interface", "iptables", "netlink", "olsrd", "openvpn", "ping", "splash_leases", "tcpconns", "iwinfo" } } -- create toplevel menu nodes local st = entry({"admin", "statistics"}, template("admin_statistics/index"), _("Statistics"), 80) st.index = true - entry({"admin", "statistics", "collectd"}, cbi("luci_statistics/collectd"), _("Collectd"), 10).subindex = true + entry({"admin", "statistics", "collectd"}, cbi("luci_statistics/collectd"), _("Setup"), 20).subindex = true -- populate collectd plugin menu @@ -87,7 +89,7 @@ function index() end -- output views - local page = entry( { "admin", "statistics", "graph" }, template("admin_statistics/index"), _("Graphs"), 80) + local page = entry( { "admin", "statistics", "graph" }, template("admin_statistics/index"), _("Graphs"), 10) page.setuser = "nobody" page.setgroup = "nogroup" @@ -170,7 +172,7 @@ function statistics_render() if #instances == 0 then --instances = { graph.tree:plugin_instances( plugin )[1] } instances = graph.tree:plugin_instances( plugin ) - is_index = true + is_index = (#instances > 1) -- index instance requested elseif instances[1] == "-" then diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/openvpn.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/openvpn.lua new file mode 100644 index 0000000000..193f0448ae --- /dev/null +++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/openvpn.lua @@ -0,0 +1,56 @@ +-- Copyright 2015 Jo-Philipp Wich <jow@openwrt.org> +-- Licensed to the public under the Apache License 2.0. + +require "luci.sys" + +local m, s, o + + +m = Map("luci_statistics", + translate("OpenVPN Plugin Configuration"), + translate("The OpenVPN plugin gathers information about the current vpn connection status.")) + +s = m:section( NamedSection, "collectd_openvpn", "luci_statistics" ) + + +o = s:option( Flag, "enable", translate("Enable this plugin") ) +o.default = "0" + + +o = s:option(Flag, "CollectIndividualUsers", translate("Generate a separate graph for each logged user")) +o.default = "0" +o.rmempty = true +o:depends("enable", 1) + + +o = s:option(Flag, "CollectUserCount", translate("Aggregate number of connected users")) +o.default = "0" +o.rmempty = true +o:depends("enable", 1) + + +o = s:option(Flag, "CollectCompression", translate("Gather compression statistics")) +o.default = "0" +o.rmempty = true +o:depends("enable", 1) + + +o = s:option(Flag, "ImprovedNamingSchema", translate("Use improved naming schema")) +o.default = "0" +o.rmempty = true +o:depends("enable", 1) + + +o = s:option(DynamicList, "StatusFile", translate("OpenVPN status files")) +o.rmempty = true +o:depends("enable", 1) + +local status_files = nixio.fs.glob("/var/run/openvpn.*.status") +if status_files then + local status_file + for status_file in status_files do + o:value(status_file) + end +end + +return m diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/sensors.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/sensors.lua new file mode 100644 index 0000000000..77e36bfaff --- /dev/null +++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/sensors.lua @@ -0,0 +1,125 @@ +-- Copyright 2015 Jo-Philipp Wich <jow@openwrt.org> +-- Licensed to the public under the Apache License 2.0. + +require "luci.sys" + +local m, s, o +local sensor_types = { + ["12v"] = "voltage", + ["2.0v"] = "voltage", + ["2.5v"] = "voltage", + ["3.3v"] = "voltage", + ["5.0v"] = "voltage", + ["5v"] = "voltage", + ["ain1"] = "voltage", + ["ain2"] = "voltage", + ["cpu_temp"] = "temperature", + ["fan1"] = "fanspeed", + ["fan2"] = "fanspeed", + ["fan3"] = "fanspeed", + ["fan4"] = "fanspeed", + ["fan5"] = "fanspeed", + ["fan6"] = "fanspeed", + ["fan7"] = "fanspeed", + ["in0"] = "voltage", + ["in10"] = "voltage", + ["in2"] = "voltage", + ["in3"] = "voltage", + ["in4"] = "voltage", + ["in5"] = "voltage", + ["in6"] = "voltage", + ["in7"] = "voltage", + ["in8"] = "voltage", + ["in9"] = "voltage", + ["power1"] = "power", + ["remote_temp"] = "temperature", + ["temp1"] = "temperature", + ["temp2"] = "temperature", + ["temp3"] = "temperature", + ["temp4"] = "temperature", + ["temp5"] = "temperature", + ["temp6"] = "temperature", + ["temp7"] = "temperature", + ["temp"] = "temperature", + ["vccp1"] = "voltage", + ["vccp2"] = "voltage", + ["vdd"] = "voltage", + ["vid1"] = "voltage", + ["vid2"] = "voltage", + ["vid3"] = "voltage", + ["vid4"] = "voltage", + ["vid5"] = "voltage", + ["vid"] = "voltage", + ["vin1"] = "voltage", + ["vin2"] = "voltage", + ["vin3"] = "voltage", + ["vin4"] = "voltage", + ["volt12"] = "voltage", + ["volt5"] = "voltage", + ["voltbatt"] = "voltage", + ["vrm"] = "voltage" + +} + + +m = Map("luci_statistics", + translate("Sensors Plugin Configuration"), + translate("The sensors plugin uses the Linux Sensors framework to gather environmental statistics.")) + +s = m:section( NamedSection, "collectd_sensors", "luci_statistics" ) + + +o = s:option( Flag, "enable", translate("Enable this plugin") ) +o.default = 0 + + +o = s:option(Flag, "__all", translate("Monitor all sensors")) +o:depends("enable", 1) +o.default = 1 +o.write = function() end +o.cfgvalue = function(self, sid) + local v = self.map:get(sid, "Sensor") + if v == nil or (type(v) == "table" and #v == 0) or (type(v) == "string" and #v == 0) then + return "1" + end +end + + +o = s:option(MultiValue, "Sensor", translate("Sensor list"), translate("Hold Ctrl to select multiple items or to deselect entries.")) +o:depends({enable = 1, __all = "" }) +o.widget = "select" +o.rmempty = true +o.size = 0 + +local sensorcli = io.popen("/usr/sbin/sensors -u -A") +if sensorcli then + local bus, sensor + + while true do + local ln = sensorcli:read("*ln") + if not ln then + break + elseif ln:match("^[%w-]+$") then + bus = ln + elseif ln:match("^[%w-]+:$") then + sensor = ln:sub(0, -2):lower() + if bus and sensor_types[sensor] then + o:value("%s/%s-%s" %{ bus, sensor_types[sensor], sensor }) + o.size = o.size + 1 + end + elseif ln == "" then + bus = nil + sensor = nil + end + end + + sensorcli:close() +end + + +o = s:option( Flag, "IgnoreSelected", translate("Monitor all except specified") ) +o.default = 0 +o.rmempty = true +o:depends({ enable = 1, __all = "" }) + +return m diff --git a/applications/luci-app-statistics/luasrc/statistics/i18n.lua b/applications/luci-app-statistics/luasrc/statistics/i18n.lua index 5a2800d5f4..7877e61ab3 100644 --- a/applications/luci-app-statistics/luasrc/statistics/i18n.lua +++ b/applications/luci-app-statistics/luasrc/statistics/i18n.lua @@ -26,15 +26,6 @@ function Instance._subst( self, str, val ) return str end -function Instance._translate( self, key, alt ) - local val = self.i18n.string(key) - if val ~= key then - return val - else - return alt - end -end - function Instance.title( self, plugin, pinst, dtype, dinst, user_title ) local title = user_title or @@ -73,24 +64,17 @@ end function Instance.ds( self, source ) - local label = source.title or self:_translate( - string.format( "stat_ds_%s_%s_%s", source.type, source.instance, source.ds ), - self:_translate( - string.format( "stat_ds_%s_%s", source.type, source.instance ), - self:_translate( - string.format( "stat_ds_label_%s__%s", source.type, source.ds ), - self:_translate( - string.format( "stat_ds_%s", source.type ), - source.type .. "_" .. source.instance:gsub("[^%w]","_") .. "_" .. source.ds - ) - ) - ) - ) + local label = source.title or + "dt=%s/di=%s/ds=%s" % { + (source.type and #source.type > 0) and source.type or "(nil)", + (source.instance and #source.instance > 0) and source.instance or "(nil)", + (source.ds and #source.ds > 0) and source.ds or "(nil)" + } return self:_subst( label, { dtype = source.type, dinst = source.instance, dsrc = source.ds - } ) + } ):gsub(":", "\\:") end diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua index d8317a8177..5d4ad9859d 100644 --- a/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua @@ -397,6 +397,7 @@ function Graph._generic( self, opts, plugin, plugin_instance, dtype, index ) transform_rpn = dopts.transform_rpn or "0,+", noarea = dopts.noarea or false, title = dopts.title or nil, + weight = dopts.weight or nil, ds = dsource, type = dtype, instance = dinst, @@ -469,6 +470,12 @@ function Graph._generic( self, opts, plugin, plugin_instance, dtype, index ) for i, o in ipairs(opts.rrdopts) do _ti( _args, o ) end end + -- sort sources + table.sort(_sources, function(a, b) + local x = a.weight or a.index or 0 + local y = b.weight or b.index or 0 + return x < y + end) -- create DEF statements for each instance for i, source in ipairs(_sources) do diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua index efa631d557..6f687d218d 100644 --- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua @@ -66,36 +66,40 @@ function rrdargs( graph, plugin, plugin_instance ) options = { -- processed packets (tx DS) if_packets__tx = { + weight = 1, overlay = true, -- don't summarize total = true, -- report total amount of bytes color = "00ff00", -- processed tx is green - title = "Processed (tx)" + title = "Processed (TX)" }, -- processed packets (rx DS) if_packets__rx = { + weight = 2, overlay = true, -- don't summarize flip = true, -- flip rx line total = true, -- report total amount of bytes color = "0000ff", -- processed rx is blue - title = "Processed (rx)" + title = "Processed (RX)" }, -- packet errors (tx DS) if_errors__tx = { + weight = 0, overlay = true, -- don't summarize total = true, -- report total amount of packets color = "ff5500", -- tx errors are orange - title = "Errors (tx)" + title = "Errors (TX)" }, -- packet errors (rx DS) if_errors__rx = { + weight = 3, overlay = true, -- don't summarize flip = true, -- flip rx line total = true, -- report total amount of packets color = "ff0000", -- rx errors are red - title = "Errors (rx)" + title = "Errors (RX)" } } } diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua index b4f2ac185e..7b6acf3663 100644 --- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua @@ -22,11 +22,13 @@ function rrdargs( graph, plugin, plugin_instance ) -- special options for single data lines options = { if_octets__tx = { + title = "Bytes (TX)", total = true, -- report total amount of bytes color = "00ff00" -- tx is green }, if_octets__rx = { + title = "Bytes (RX)", flip = true, -- flip rx line total = true, -- report total amount of bytes color = "0000ff" -- rx is blue @@ -59,6 +61,8 @@ function rrdargs( graph, plugin, plugin_instance ) options = { -- processed packets (tx DS) if_packets__tx = { + weight = 2, + title = "Total (TX)", overlay = true, -- don't summarize total = true, -- report total amount of bytes color = "00ff00" -- processed tx is green @@ -66,6 +70,8 @@ function rrdargs( graph, plugin, plugin_instance ) -- processed packets (rx DS) if_packets__rx = { + weight = 3, + title = "Total (RX)", overlay = true, -- don't summarize flip = true, -- flip rx line total = true, -- report total amount of bytes @@ -74,6 +80,8 @@ function rrdargs( graph, plugin, plugin_instance ) -- dropped packets (tx DS) if_dropped__tx = { + weight = 1, + title = "Dropped (TX)", overlay = true, -- don't summarize total = true, -- report total amount of bytes color = "660055" -- dropped tx is ... dunno ;) @@ -81,14 +89,18 @@ function rrdargs( graph, plugin, plugin_instance ) -- dropped packets (rx DS) if_dropped__rx = { + weight = 4, + title = "Dropped (RX)", overlay = true, -- don't summarize flip = true, -- flip rx line total = true, -- report total amount of bytes - color = "440066" -- dropped rx is violett + color = "ff00ff" -- dropped rx is violett }, -- packet errors (tx DS) if_errors__tx = { + weight = 0, + title = "Errors (TX)", overlay = true, -- don't summarize total = true, -- report total amount of packets color = "ff5500" -- tx errors are orange @@ -96,6 +108,8 @@ function rrdargs( graph, plugin, plugin_instance ) -- packet errors (rx DS) if_errors__rx = { + weight = 5, + title = "Errors (RX)", overlay = true, -- don't summarize flip = true, -- flip rx line total = true, -- report total amount of packets @@ -122,6 +136,7 @@ function rrdargs( graph, plugin, plugin_instance ) options = { -- multicast packets if_multicast = { + title = "Packets", total = true, -- report total amount of packets color = "0000ff" -- multicast is blue } @@ -146,6 +161,7 @@ function rrdargs( graph, plugin, plugin_instance ) options = { -- collision rate if_collisions = { + title = "Collisions", total = true, -- report total amount of packets color = "ff0000" -- collsions are red } @@ -173,15 +189,19 @@ function rrdargs( graph, plugin, plugin_instance ) }, -- special options for single data lines - options = { -- XXX: fixme (define colors...) - if_tx_errors = { - total = true - }, - - if_rx_errors = { - flip = true, - total = true - } + options = { + if_tx_errors_aborted_value = { total = true, color = "ffff00", title = "Aborted (TX)" }, + if_tx_errors_carrier_value = { total = true, color = "ffcc00", title = "Carrier (TX)" }, + if_tx_errors_fifo_value = { total = true, color = "ff9900", title = "Fifo (TX)" }, + if_tx_errors_heartbeat_value = { total = true, color = "ff6600", title = "Heartbeat (TX)" }, + if_tx_errors_window_value = { total = true, color = "ff3300", title = "Window (TX)" }, + + if_rx_errors_length_value = { flip = true, total = true, color = "ff0000", title = "Length (RX)" }, + if_rx_errors_missed_value = { flip = true, total = true, color = "ff0033", title = "Missed (RX)" }, + if_rx_errors_over_value = { flip = true, total = true, color = "ff0066", title = "Over (RX)" }, + if_rx_errors_crc_value = { flip = true, total = true, color = "ff0099", title = "CRC (RX)" }, + if_rx_errors_fifo_value = { flip = true, total = true, color = "ff00cc", title = "Fifo (RX)" }, + if_rx_errors_frame_value = { flip = true, total = true, color = "ff00ff", title = "Frame (RX)" } } } } diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua index 6dc81bc1d7..8b04ab8b38 100644 --- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua @@ -44,9 +44,6 @@ function rrdargs( graph, plugin, plugin_instance, dtype ) y_max = "100", number_format = "%5.1lf%%", data = { - sources = { - percent = { "percent" } - }, instances = { percent = "charge" }, @@ -77,9 +74,6 @@ function rrdargs( graph, plugin, plugin_instance, dtype ) vlabel = "Minutes", number_format = "%.1lfm", data = { - sources = { - timeleft = { "timeleft" } - }, instances = { timeleft = { "battery" } }, diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/openvpn.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/openvpn.lua new file mode 100644 index 0000000000..876e871d1d --- /dev/null +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/openvpn.lua @@ -0,0 +1,48 @@ +-- Copyright 2015 Jo-Philipp Wich <jow@openwrt.org> +-- Licensed to the public under the Apache License 2.0. + +module("luci.statistics.rrdtool.definitions.openvpn", package.seeall) + +function rrdargs( graph, plugin, plugin_instance ) + local inst = plugin_instance:gsub("^openvpn%.(.+)%.status$", "%1") + + return { + { + title = "%%H: OpenVPN \"%s\" - Traffic" % inst, + vlabel = "Bytes/s", + data = { + instances = { + if_octets = { "traffic", "overhead" } + }, + sources = { + if_octets = { "tx", "rx" } + }, + options = { + if_octets_traffic_tx = { weight = 0, title = "Bytes (TX)", total = true, color = "00ff00" }, + if_octets_overhead_tx = { weight = 1, title = "Overhead (TX)", total = true, color = "ff9900" }, + if_octets_overhead_rx = { weight = 2, title = "Overhead (RX)", total = true, flip = true, color = "ff00ff" }, + if_octets_traffic_rx = { weight = 3, title = "Bytes (RX)", total = true, flip = true, color = "0000ff" } + } + } + }, + + { + title = "%%H: OpenVPN \"%s\" - Compression" % inst, + vlabel = "Bytes/s", + data = { + instances = { + compression = { "data_out", "data_in" } + }, + sources = { + compression = { "uncompressed", "compressed" } + }, + options = { + compression_data_out_uncompressed = { weight = 0, title = "Uncompressed (TX)", total = true, color = "00ff00" }, + compression_data_out_compressed = { weight = 1, title = "Compressed (TX)", total = true, color = "008800" }, + compression_data_in_compressed = { weight = 2, title = "Compressed (RX)", total = true, flip = true, color = "000088" }, + compression_data_in_uncompressed = { weight = 3, title = "Uncompressed (RX)", total = true, flip = true, color = "0000ff" } + } + } + } + } +end diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/sensors.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/sensors.lua new file mode 100644 index 0000000000..f8bddb96e3 --- /dev/null +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/sensors.lua @@ -0,0 +1,24 @@ +-- Copyright 2015 Jo-Philipp Wich <jow@openwrt.org> +-- Licensed to the public under the Apache License 2.0. + +module("luci.statistics.rrdtool.definitions.sensors", package.seeall) + +function rrdargs( graph, plugin, plugin_instance ) + return { + { + per_instance = true, + title = "%H: %pi - %di", + vlabel = "\176C", + number_format = "%4.1lf\176C", + data = { + types = { "temperature" }, + options = { + temperature__value = { + color = "ff0000", + title = "Temperature" + } + } + } + } + } +end diff --git a/applications/luci-app-statistics/luasrc/view/admin_statistics/index.htm b/applications/luci-app-statistics/luasrc/view/admin_statistics/index.htm index 0fb3d56375..38271995ed 100644 --- a/applications/luci-app-statistics/luasrc/view/admin_statistics/index.htm +++ b/applications/luci-app-statistics/luasrc/view/admin_statistics/index.htm @@ -6,7 +6,7 @@ <%+header%> -<h2><a id="content" name="content"><%:Statistics%></a></h2> +<h2 name="content"><%:Statistics%></h2> <p><%_The statistics package uses <a href="https://collectd.org/">Collectd</a> to gather data and <a href="http://oss.oetiker.ch/rrdtool/">RRDtool</a> to diff --git a/applications/luci-app-statistics/luasrc/view/public_statistics/graph.htm b/applications/luci-app-statistics/luasrc/view/public_statistics/graph.htm index 77169518d2..ebc78badb0 100644 --- a/applications/luci-app-statistics/luasrc/view/public_statistics/graph.htm +++ b/applications/luci-app-statistics/luasrc/view/public_statistics/graph.htm @@ -6,7 +6,7 @@ <%+header%> -<h2><a id="content" name="content"><%:Statistics%></a></h2> +<h2 name="content"><%:Statistics%></h2> <form action="" method="get"> <select name="host"> diff --git a/applications/luci-app-statistics/po/ca/statistics.po b/applications/luci-app-statistics/po/ca/statistics.po index ba47db0231..5ccaa4a409 100644 --- a/applications/luci-app-statistics/po/ca/statistics.po +++ b/applications/luci-app-statistics/po/ca/statistics.po @@ -30,6 +30,9 @@ msgstr "Afegeix múltiples hosts separats per espai." msgid "Add notification command" msgstr "Afegeix ordre de notificació" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "Directori base" @@ -63,9 +66,6 @@ msgstr "" msgid "CollectTopology" msgstr "" -msgid "Collectd" -msgstr "Collectd" - msgid "Collectd Settings" msgstr "Configuració Collectd" @@ -132,6 +132,12 @@ msgstr "Adreça electrònica" msgid "Enable this plugin" msgstr "Activa aquest connector" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "Exec" @@ -150,6 +156,15 @@ msgstr "Neteja la memòria cau després de" msgid "Forwarding between listen and server addresses" msgstr "Readreçant entre adreces que reben connexions i adreces de servidors" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "Gràfics" @@ -179,6 +194,9 @@ msgstr "" "Ací pots definir diversos criteris pels que es seleccionaran les regles " "iptables monitoritzades ." +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "Host" @@ -242,6 +260,9 @@ msgstr "" msgid "Monitor all local listen ports" msgstr "Monitoritza tots els ports locals que reben connexions" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "Monitoritza dispositius" @@ -305,6 +326,15 @@ msgstr "Configuració del connector OLSRd" msgid "Only create average RRAs" msgstr "Crea només RRAs mitjans" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "Opcions" @@ -362,12 +392,24 @@ msgstr "" msgid "Seconds" msgstr "Segons" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "Màquina servidor" msgid "Server port" msgstr "Port del servidor" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "Monitoreig de classe shaping" @@ -418,9 +460,6 @@ msgstr "Marques de temps emmagatzemades" msgid "System Load" msgstr "Càrrega de sistema" -msgid "System plugins" -msgstr "Connectors de sistema" - msgid "TCP Connections" msgstr "Connexions TCP" @@ -445,6 +484,11 @@ msgid "" msgstr "" msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -492,6 +536,9 @@ msgstr "" "es fa servir en conjunció amb Mail::SpamAssassin::Plugin. Plugin::Collectd " "també es pot utilitzar d'altres maneres." +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -580,19 +627,20 @@ msgstr "" "Això pot inutilitzar el dispositiu!</strong>" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" -"El paquet d'estadísitiques està basat en <a href=\"http://collectd.org/index." -"shtml\">Collectd</a> i utilitza l'eina <a href=\"http://oss.oetiker.ch/" -"rrdtool/\">RRD</a> per renderitzar imatges de diagrama de les dades " -"recoliildes." msgid "" "The tcpconns plugin collects informations about open tcp connections on " @@ -648,6 +696,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "Fitxer PID usat" @@ -663,6 +714,10 @@ msgstr "Wireless" msgid "Wireless iwinfo Plugin Configuration" msgstr "" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "p.e. br-ff" @@ -684,6 +739,22 @@ msgstr "segons; múltiples separats per espais" msgid "server interfaces" msgstr "interfícies de servidor" +#~ msgid "Collectd" +#~ msgstr "Collectd" + +#~ msgid "System plugins" +#~ msgstr "Connectors de sistema" + +#~ msgid "" +#~ "The statistics package is based on <a href=\"http://collectd.org/index." +#~ "shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/" +#~ "\">RRD Tool</a> to render diagram images from collected data." +#~ msgstr "" +#~ "El paquet d'estadísitiques està basat en <a href=\"http://collectd.org/" +#~ "index.shtml\">Collectd</a> i utilitza l'eina <a href=\"http://oss.oetiker." +#~ "ch/rrdtool/\">RRD</a> per renderitzar imatges de diagrama de les dades " +#~ "recoliildes." + #~ msgid "" #~ "The wireless plugin collects statistics about wireless signal strength, " #~ "noise and quality." diff --git a/applications/luci-app-statistics/po/cs/statistics.po b/applications/luci-app-statistics/po/cs/statistics.po index 9a3ab67d27..bfa1b899ba 100644 --- a/applications/luci-app-statistics/po/cs/statistics.po +++ b/applications/luci-app-statistics/po/cs/statistics.po @@ -26,6 +26,9 @@ msgstr "Přidat více hostů, oddělených mezerou" msgid "Add notification command" msgstr "Přidat příkaz pro upozornění" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "Základní adresář" @@ -59,9 +62,6 @@ msgstr "CollectRoutes" msgid "CollectTopology" msgstr "CollectTopology" -msgid "Collectd" -msgstr "Collectd" - msgid "Collectd Settings" msgstr "Nastavení Collectd" @@ -128,6 +128,12 @@ msgstr "Email" msgid "Enable this plugin" msgstr "Povolit tento plugin" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "Exec" @@ -146,6 +152,15 @@ msgstr "Vyprázdnit cache po" msgid "Forwarding between listen and server addresses" msgstr "" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "Grafy" @@ -173,6 +188,9 @@ msgstr "" "Zde můžete definovat různá kritéria, podle kterých budou vybrána sledovaná " "pravidla iptables." +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "Hostitel" @@ -237,6 +255,9 @@ msgstr "Sledovat vše kromě vybraných" msgid "Monitor all local listen ports" msgstr "Monitorovat všechny naslouchající porty" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "Sledovat zařízení" @@ -300,6 +321,15 @@ msgstr "Nastavení pluginu OLSRd" msgid "Only create average RRAs" msgstr "" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "Možnosti" @@ -358,12 +388,24 @@ msgstr "Skript" msgid "Seconds" msgstr "Sekundy" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "Hostitel serveru" msgid "Server port" msgstr "Port serveru" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "" @@ -412,9 +454,6 @@ msgstr "" msgid "System Load" msgstr "Zatížení systému" -msgid "System plugins" -msgstr "Systémové pluginy" - msgid "TCP Connections" msgstr "TCP spojení" @@ -439,6 +478,11 @@ msgid "" msgstr "" msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "Plugin Conntrack shromažďuje statistiky o počtu sledovaných spojení." @@ -485,6 +529,9 @@ msgstr "" "použití ve spojení s Mail::SpamAssasin::Plugin::Collectd, ale stejně dobře " "může být využit jinak." +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -566,18 +613,20 @@ msgstr "" "</strong>" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" -"Balíček Statistiky je založen na <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> a využívá <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> pro kreslení diagramů z collectd." msgid "" "The tcpconns plugin collects informations about open tcp connections on " @@ -631,6 +680,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "Použitý soubor PID (identifikátoru procesu)" @@ -646,6 +698,10 @@ msgstr "Wireless" msgid "Wireless iwinfo Plugin Configuration" msgstr "Nastavení pluginu Wireless Iwinfo" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "např. br-ff" @@ -667,6 +723,21 @@ msgstr "sekundy, více hodnot oddělených mezerou" msgid "server interfaces" msgstr "rozhraní serveru" +#~ msgid "Collectd" +#~ msgstr "Collectd" + +#~ msgid "System plugins" +#~ msgstr "Systémové pluginy" + +#~ msgid "" +#~ "The statistics package is based on <a href=\"http://collectd.org/index." +#~ "shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/" +#~ "\">RRD Tool</a> to render diagram images from collected data." +#~ msgstr "" +#~ "Balíček Statistiky je založen na <a href=\"http://collectd.org/index.shtml" +#~ "\">Collectd</a> a využívá <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " +#~ "Tool</a> pro kreslení diagramů z collectd." + #~ msgid "Installed network plugins:" #~ msgstr "Instalované síťové pluginy:" diff --git a/applications/luci-app-statistics/po/de/statistics.po b/applications/luci-app-statistics/po/de/statistics.po index 6c93589bce..91baf0e064 100644 --- a/applications/luci-app-statistics/po/de/statistics.po +++ b/applications/luci-app-statistics/po/de/statistics.po @@ -28,6 +28,9 @@ msgstr "Mehrere Hosts durch Leerzeichen getrennt hinzufuegen" msgid "Add notification command" msgstr "Benachrichtigungskommando hinzufügen" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "Basisverzeichnis" @@ -61,9 +64,6 @@ msgstr "Informationen über Routen sammeln (CollectRoutes)" msgid "CollectTopology" msgstr "Informationen über die Netzwerktopologie sammeln (CollectTopology)" -msgid "Collectd" -msgstr "Collectd" - msgid "Collectd Settings" msgstr "Collectd Einstellungen" @@ -130,6 +130,12 @@ msgstr "Email" msgid "Enable this plugin" msgstr "Plugin aktivieren" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "Exec" @@ -148,6 +154,15 @@ msgstr "Leerungsintervall für Zwischenspeicher" msgid "Forwarding between listen and server addresses" msgstr "Weiterleitung zwischen Listen- und Server-Adressen" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "Diagramme" @@ -179,6 +194,9 @@ msgstr "" "Hier werden die Kriterien festgelegt nach welchen die zu überwachenden " "Firewall-Regeln ausgewählt werden." +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "Host" @@ -244,6 +262,9 @@ msgstr "Alle bis auf Angegebene überwachen" msgid "Monitor all local listen ports" msgstr "Alle durch lokale Dienste genutzten Ports überwachen" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "Geräte überwachen" @@ -307,6 +328,15 @@ msgstr "OLSRd-Plugin-Konfiguration" msgid "Only create average RRAs" msgstr "Nur 'average' RRAs erzeugen" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "Optionen" @@ -364,12 +394,24 @@ msgstr "Skript" msgid "Seconds" msgstr "Sekunden" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "Server-Host" msgid "Server port" msgstr "Server-Port" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "Shapingklassen überwachen" @@ -418,9 +460,6 @@ msgstr "gespeicherte Zeitspannen" msgid "System Load" msgstr "Systemlast" -msgid "System plugins" -msgstr "Systemplugins" - msgid "TCP Connections" msgstr "TCP-Verbindungen" @@ -448,6 +487,11 @@ msgstr "" "Erweiterung." msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -497,6 +541,9 @@ msgstr "" "Plugin ist primär für die Verwendung zusammen mit Mail::SpamAssasin::Plugin::" "Collectd gedacht, kann aber auch anderweitig verwendet werden." +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -585,18 +632,20 @@ msgstr "" "machen, da Systemspeicher für den regulären Betrieb fehlt!</strong>" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" -"Das Statistik-Paket basiert auf <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> und nutzt <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> um die gesammelten Daten in Diagramme zu rendern." msgid "" "The tcpconns plugin collects informations about open tcp connections on " @@ -652,6 +701,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "Pfad zu PID-Datei" @@ -667,6 +719,10 @@ msgstr "Drahtlos" msgid "Wireless iwinfo Plugin Configuration" msgstr "Wireless-iwinfo Plugin Konfiguration" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "z.B. br-ff" @@ -688,6 +744,21 @@ msgstr "mehrere mit Leerzeichen trennen" msgid "server interfaces" msgstr "Server-Schnittstellen" +#~ msgid "Collectd" +#~ msgstr "Collectd" + +#~ msgid "System plugins" +#~ msgstr "Systemplugins" + +#~ msgid "" +#~ "The statistics package is based on <a href=\"http://collectd.org/index." +#~ "shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/" +#~ "\">RRD Tool</a> to render diagram images from collected data." +#~ msgstr "" +#~ "Das Statistik-Paket basiert auf <a href=\"http://collectd.org/index.shtml" +#~ "\">Collectd</a> und nutzt <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " +#~ "Tool</a> um die gesammelten Daten in Diagramme zu rendern." + #~ msgid "Installed network plugins:" #~ msgstr "Installierte Netzwerk-Plugins:" diff --git a/applications/luci-app-statistics/po/el/statistics.po b/applications/luci-app-statistics/po/el/statistics.po index 0893e2e23b..746284f8d8 100644 --- a/applications/luci-app-statistics/po/el/statistics.po +++ b/applications/luci-app-statistics/po/el/statistics.po @@ -28,6 +28,9 @@ msgstr "" msgid "Add notification command" msgstr "" +msgid "Aggregate number of connected users" +msgstr "" + #, fuzzy msgid "Base Directory" msgstr "Κατάλογος βάσης" @@ -62,9 +65,6 @@ msgstr "" msgid "CollectTopology" msgstr "" -msgid "Collectd" -msgstr "Collectd" - msgid "Collectd Settings" msgstr "Ρυθμίσεις Collectd" @@ -132,6 +132,12 @@ msgstr "Ηλ. Ταχυδρομείο" msgid "Enable this plugin" msgstr "" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "Exec" @@ -150,6 +156,15 @@ msgstr "" msgid "Forwarding between listen and server addresses" msgstr "" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "Γραφήματα" @@ -172,6 +187,9 @@ msgid "" "are selected." msgstr "" +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "" @@ -235,6 +253,9 @@ msgstr "" msgid "Monitor all local listen ports" msgstr "" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "" @@ -298,6 +319,15 @@ msgstr "" msgid "Only create average RRAs" msgstr "" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "" @@ -355,12 +385,24 @@ msgstr "" msgid "Seconds" msgstr "Δευτερόλεπτα" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "" msgid "Server port" msgstr "" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "" @@ -409,9 +451,6 @@ msgstr "" msgid "System Load" msgstr "Φόρτος Συστήματος" -msgid "System plugins" -msgstr "Πρόσθετα συστήματος" - msgid "TCP Connections" msgstr "Συνδέσεις TCP" @@ -436,6 +475,11 @@ msgid "" msgstr "" msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -470,6 +514,9 @@ msgid "" "be used in other ways as well." msgstr "" +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -530,18 +577,20 @@ msgid "" msgstr "" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" -"Το πακέτο στατιστικών βασίζεται στο <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> και χρησιμοποιεί το <a href=\"http://oss.oetiker.ch/rrdtool/" -"\">RRD Tool</a> για να σχεδιάσει διαγράμματα από τα συλλεγόμενα δεδομένα." msgid "" "The tcpconns plugin collects informations about open tcp connections on " @@ -589,6 +638,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "Αρχείο PID σε χρήση" @@ -604,6 +656,10 @@ msgstr "Ασύρματο" msgid "Wireless iwinfo Plugin Configuration" msgstr "" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "π.χ. br-ff" @@ -624,3 +680,19 @@ msgstr "" msgid "server interfaces" msgstr "" + +#~ msgid "Collectd" +#~ msgstr "Collectd" + +#~ msgid "System plugins" +#~ msgstr "Πρόσθετα συστήματος" + +#~ msgid "" +#~ "The statistics package is based on <a href=\"http://collectd.org/index." +#~ "shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/" +#~ "\">RRD Tool</a> to render diagram images from collected data." +#~ msgstr "" +#~ "Το πακέτο στατιστικών βασίζεται στο <a href=\"http://collectd.org/index." +#~ "shtml\">Collectd</a> και χρησιμοποιεί το <a href=\"http://oss.oetiker.ch/" +#~ "rrdtool/\">RRD Tool</a> για να σχεδιάσει διαγράμματα από τα συλλεγόμενα " +#~ "δεδομένα." diff --git a/applications/luci-app-statistics/po/en/statistics.po b/applications/luci-app-statistics/po/en/statistics.po index 4d94313770..79f710c97a 100644 --- a/applications/luci-app-statistics/po/en/statistics.po +++ b/applications/luci-app-statistics/po/en/statistics.po @@ -28,6 +28,9 @@ msgstr "" msgid "Add notification command" msgstr "Add notification command" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "Base Directory" @@ -61,9 +64,6 @@ msgstr "" msgid "CollectTopology" msgstr "" -msgid "Collectd" -msgstr "Collectd" - msgid "Collectd Settings" msgstr "Collectd Settings" @@ -130,6 +130,12 @@ msgstr "Email" msgid "Enable this plugin" msgstr "Enable this plugin" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "Exec" @@ -148,6 +154,15 @@ msgstr "Flush cache after" msgid "Forwarding between listen and server addresses" msgstr "Forwarding between listen and server addresses" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "Graphs" @@ -177,6 +192,9 @@ msgstr "" "Here you can define various criteria by which the monitored iptables rules " "are selected." +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "" @@ -240,6 +258,9 @@ msgstr "" msgid "Monitor all local listen ports" msgstr "Monitor all local listen ports" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "Monitor devices" @@ -303,6 +324,15 @@ msgstr "" msgid "Only create average RRAs" msgstr "Only create average RRAs" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "Options" @@ -360,12 +390,24 @@ msgstr "" msgid "Seconds" msgstr "Seconds" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "Server host" msgid "Server port" msgstr "Server port" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "Shaping class monitoring" @@ -414,9 +456,6 @@ msgstr "Stored timespans" msgid "System Load" msgstr "System Load" -msgid "System plugins" -msgstr "System plugins" - msgid "TCP Connections" msgstr "TCP Connections" @@ -441,6 +480,11 @@ msgid "" msgstr "" msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -487,6 +531,9 @@ msgstr "" "to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can " "be used in other ways as well." +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -568,18 +615,20 @@ msgstr "" "directory. This can render the device unusable!</strong>" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." msgid "" "The tcpconns plugin collects informations about open tcp connections on " @@ -634,6 +683,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "Used PID file" @@ -649,6 +701,10 @@ msgstr "Wireless" msgid "Wireless iwinfo Plugin Configuration" msgstr "" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "e.g. br-ff" @@ -670,6 +726,21 @@ msgstr "seconds; multiple separated by space" msgid "server interfaces" msgstr "server interfaces" +#~ msgid "Collectd" +#~ msgstr "Collectd" + +#~ msgid "System plugins" +#~ msgstr "System plugins" + +#~ msgid "" +#~ "The statistics package is based on <a href=\"http://collectd.org/index." +#~ "shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/" +#~ "\">RRD Tool</a> to render diagram images from collected data." +#~ msgstr "" +#~ "The statistics package is based on <a href=\"http://collectd.org/index." +#~ "shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/" +#~ "\">RRD Tool</a> to render diagram images from collected data." + #~ msgid "" #~ "The wireless plugin collects statistics about wireless signal strength, " #~ "noise and quality." diff --git a/applications/luci-app-statistics/po/es/statistics.po b/applications/luci-app-statistics/po/es/statistics.po index f43ea4c408..7067710f13 100644 --- a/applications/luci-app-statistics/po/es/statistics.po +++ b/applications/luci-app-statistics/po/es/statistics.po @@ -28,6 +28,9 @@ msgstr "Añadir múltiples máquinas separadas por espacio." msgid "Add notification command" msgstr "Añadir comando de notificación" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "Directorio Base" @@ -61,9 +64,6 @@ msgstr "Rutas" msgid "CollectTopology" msgstr "Topología" -msgid "Collectd" -msgstr "Collectd" - msgid "Collectd Settings" msgstr "Configuración de Collectd" @@ -130,6 +130,12 @@ msgstr "Correo electrónico" msgid "Enable this plugin" msgstr "Activar este plugin" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "Exec" @@ -148,6 +154,15 @@ msgstr "Vaciar caché tras" msgid "Forwarding between listen and server addresses" msgstr "Retransmitir entre las direcciones de escucha y servidor" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "Gráficas" @@ -176,6 +191,9 @@ msgstr "" "Aquí puede definir varios criterios de selección de reglas de iptables " "monitorizadas." +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "Máquina" @@ -239,6 +257,9 @@ msgstr "Monitorizar todos menos los especificados" msgid "Monitor all local listen ports" msgstr "Monitorizar todos los puertos de escucha locales" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "Dispositivos a monitonizar" @@ -302,6 +323,15 @@ msgstr "Configuración del plugin \"OLSRd\"" msgid "Only create average RRAs" msgstr "Crear sólo RRAs medias" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "Opciones" @@ -359,12 +389,24 @@ msgstr "Guión" msgid "Seconds" msgstr "Segundos" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "Máquina servidor" msgid "Server port" msgstr "Puerto servidor" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "Monitorización de la clase shaping" @@ -413,9 +455,6 @@ msgstr "Intervalos almacenados" msgid "System Load" msgstr "Carga del sistema" -msgid "System plugins" -msgstr "Plugins del sistema" - msgid "TCP Connections" msgstr "Conexiones TCP" @@ -444,6 +483,11 @@ msgstr "" "txtinfo de OLSRd." msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -495,6 +539,9 @@ msgstr "" "utilizado en conjunto con Mail::SpamAssasin::Plugin::Collectd pero puede " "utilizarse de diferentes formas." +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -581,18 +628,20 @@ msgstr "" "puede hacer que el dispositivo funcione mal!</strong>" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" -"El paquete \"estadísticas\" está basado en <a href=\"http://collectd.org/" -"index.shtml\">Collectd</a> y utiliza <a href=\"http://oss.oetiker.ch/rrdtool/" -"\">RRD Tool</a> para dibujar gráficos con los datos recogidos." msgid "" "The tcpconns plugin collects informations about open tcp connections on " @@ -648,6 +697,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "Archivo PID utilizado" @@ -663,6 +715,10 @@ msgstr "Red inalámbrica" msgid "Wireless iwinfo Plugin Configuration" msgstr "Configuración plugin \"Wireless iwinfo\"" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "p.e. br-ff" @@ -684,6 +740,21 @@ msgstr "segundos (varios separados por espacio)" msgid "server interfaces" msgstr "interfaces servidores" +#~ msgid "Collectd" +#~ msgstr "Collectd" + +#~ msgid "System plugins" +#~ msgstr "Plugins del sistema" + +#~ msgid "" +#~ "The statistics package is based on <a href=\"http://collectd.org/index." +#~ "shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/" +#~ "\">RRD Tool</a> to render diagram images from collected data." +#~ msgstr "" +#~ "El paquete \"estadísticas\" está basado en <a href=\"http://collectd.org/" +#~ "index.shtml\">Collectd</a> y utiliza <a href=\"http://oss.oetiker.ch/" +#~ "rrdtool/\">RRD Tool</a> para dibujar gráficos con los datos recogidos." + #~ msgid "Installed network plugins:" #~ msgstr "Plugins de red instalados:" diff --git a/applications/luci-app-statistics/po/fr/statistics.po b/applications/luci-app-statistics/po/fr/statistics.po index 643c2686c7..194a220480 100644 --- a/applications/luci-app-statistics/po/fr/statistics.po +++ b/applications/luci-app-statistics/po/fr/statistics.po @@ -28,6 +28,9 @@ msgstr "" msgid "Add notification command" msgstr "Ajoute une commande de notification" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "Répertoire de base" @@ -61,9 +64,6 @@ msgstr "" msgid "CollectTopology" msgstr "" -msgid "Collectd" -msgstr "Collectd" - msgid "Collectd Settings" msgstr "Paramètres Collectd" @@ -130,6 +130,12 @@ msgstr "Courriel" msgid "Enable this plugin" msgstr "Activer ce greffon" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "Exec" @@ -148,6 +154,15 @@ msgstr "Vidanger le cache après" msgid "Forwarding between listen and server addresses" msgstr "Transfert entre les adresses en écoute et du serveur" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "Graphiques" @@ -178,6 +193,9 @@ msgstr "" "Vous pouvez définir ici les critères variés pour sélectionner les règles " "iptables à surveiller." +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "" @@ -241,6 +259,9 @@ msgstr "" msgid "Monitor all local listen ports" msgstr "Surveiller tous les ports en écoute locaux" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "Périphériques à surveiller" @@ -304,6 +325,15 @@ msgstr "" msgid "Only create average RRAs" msgstr "Créer seulement des RRAs moyens" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "Options" @@ -361,12 +391,24 @@ msgstr "" msgid "Seconds" msgstr "Secondes" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "Hôte du serveur" msgid "Server port" msgstr "Port du serveur" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "Surveillance liées à la priorité" @@ -415,9 +457,6 @@ msgstr "Durée de la période enregistrée" msgid "System Load" msgstr "Charge-système" -msgid "System plugins" -msgstr "Greffons liés au système" - msgid "TCP Connections" msgstr "Connexions TCP" @@ -442,6 +481,11 @@ msgid "" msgstr "" msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -488,6 +532,9 @@ msgstr "" "Ce greffon est d'abord destiné à être utilisé avec Mail::SpamAssasin::" "Plugin::Collectd mais peut être utilisé d'autres manières également." +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -576,19 +623,20 @@ msgstr "" "le matériel inutilisable !</strong>" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" -"Ce paquet d'outils statistiques s'appuie sur le logiciel <a href=\"http://" -"collectd.org/index.shtml\">Collectd</a> et utilise <a href=\"http://oss." -"oetiker.ch/rrdtool/\">RRD Tool</a> pour calculer les graphes issus des " -"données collectées." msgid "" "The tcpconns plugin collects informations about open tcp connections on " @@ -642,6 +690,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "Fichier PID utilisé" @@ -657,6 +708,10 @@ msgstr "Sans-fil" msgid "Wireless iwinfo Plugin Configuration" msgstr "" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "p.ex. br-ff" @@ -678,6 +733,22 @@ msgstr "En secondes ; séparer différentes valeurs par des espaces" msgid "server interfaces" msgstr "Interfaces du serveur" +#~ msgid "Collectd" +#~ msgstr "Collectd" + +#~ msgid "System plugins" +#~ msgstr "Greffons liés au système" + +#~ msgid "" +#~ "The statistics package is based on <a href=\"http://collectd.org/index." +#~ "shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/" +#~ "\">RRD Tool</a> to render diagram images from collected data." +#~ msgstr "" +#~ "Ce paquet d'outils statistiques s'appuie sur le logiciel <a href=\"http://" +#~ "collectd.org/index.shtml\">Collectd</a> et utilise <a href=\"http://oss." +#~ "oetiker.ch/rrdtool/\">RRD Tool</a> pour calculer les graphes issus des " +#~ "données collectées." + #~ msgid "" #~ "The wireless plugin collects statistics about wireless signal strength, " #~ "noise and quality." diff --git a/applications/luci-app-statistics/po/he/statistics.po b/applications/luci-app-statistics/po/he/statistics.po index 542a9c012f..10e8a12688 100644 --- a/applications/luci-app-statistics/po/he/statistics.po +++ b/applications/luci-app-statistics/po/he/statistics.po @@ -28,6 +28,9 @@ msgstr "" msgid "Add notification command" msgstr "" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "" @@ -61,9 +64,6 @@ msgstr "" msgid "CollectTopology" msgstr "" -msgid "Collectd" -msgstr "" - msgid "Collectd Settings" msgstr "" @@ -127,6 +127,12 @@ msgstr "" msgid "Enable this plugin" msgstr "" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "" @@ -145,6 +151,15 @@ msgstr "" msgid "Forwarding between listen and server addresses" msgstr "" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "" @@ -167,6 +182,9 @@ msgid "" "are selected." msgstr "" +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "" @@ -230,6 +248,9 @@ msgstr "" msgid "Monitor all local listen ports" msgstr "" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "" @@ -293,6 +314,15 @@ msgstr "" msgid "Only create average RRAs" msgstr "" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "" @@ -350,12 +380,24 @@ msgstr "" msgid "Seconds" msgstr "" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "" msgid "Server port" msgstr "" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "" @@ -404,9 +446,6 @@ msgstr "" msgid "System Load" msgstr "" -msgid "System plugins" -msgstr "" - msgid "TCP Connections" msgstr "" @@ -431,6 +470,11 @@ msgid "" msgstr "" msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -465,6 +509,9 @@ msgid "" "be used in other ways as well." msgstr "" +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -525,14 +572,19 @@ msgid "" msgstr "" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" msgid "" @@ -581,6 +633,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "" @@ -596,6 +651,10 @@ msgstr "" msgid "Wireless iwinfo Plugin Configuration" msgstr "" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "" diff --git a/applications/luci-app-statistics/po/hu/statistics.po b/applications/luci-app-statistics/po/hu/statistics.po index b91db79800..5d384144bd 100644 --- a/applications/luci-app-statistics/po/hu/statistics.po +++ b/applications/luci-app-statistics/po/hu/statistics.po @@ -26,6 +26,9 @@ msgstr "" msgid "Add notification command" msgstr "Értesítési parancs hozzáadása" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "Alapkönyvtár" @@ -59,9 +62,6 @@ msgstr "" msgid "CollectTopology" msgstr "" -msgid "Collectd" -msgstr "Collectd" - msgid "Collectd Settings" msgstr "Collectd beállítások" @@ -128,6 +128,12 @@ msgstr "E-mail" msgid "Enable this plugin" msgstr "Bővítmény engedélyezése" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "Exec" @@ -146,6 +152,15 @@ msgstr "Gyorsítótár ürítése ezután:" msgid "Forwarding between listen and server addresses" msgstr "" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "Grafikonok" @@ -176,6 +191,9 @@ msgstr "" "Itt addhatók meg különböző feltételek, amelyek alapján a megfigyelt iptables " "szabályok kiválasztásra kerülnek." +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "Gép" @@ -242,6 +260,9 @@ msgstr "" msgid "Monitor all local listen ports" msgstr "" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "Eszközök figyelése" @@ -305,6 +326,15 @@ msgstr "OLSRd bővítmény beállítása" msgid "Only create average RRAs" msgstr "Csak átlag RRA-k létrehozása" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "Lehetőségek" @@ -362,12 +392,24 @@ msgstr "Parancsfájl" msgid "Seconds" msgstr "másodperc" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "Kiszolgáló gép" msgid "Server port" msgstr "Kiszolgáló port" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "" @@ -420,9 +462,6 @@ msgstr "Tárolt időszakok" msgid "System Load" msgstr "Rendszerterhelés" -msgid "System plugins" -msgstr "Rendszer bővítmények" - msgid "TCP Connections" msgstr "TCP kapcsolatok" @@ -449,6 +488,11 @@ msgstr "" "txttinfo bővítményén keresztül." msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -499,6 +543,9 @@ msgstr "" "elsősorban a Mail::SpamAssasin::Plugin::Collectd bővítménnyel együtt történő " "használatra szolgál, de egyéb módokon is használható." +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -568,19 +615,20 @@ msgid "" msgstr "" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" -"A statisztikai csomag a <a href=\"http://collectd.org/index.shtml" -"\">collectd</a> segédprogramon alapul és az <a href=\"http://oss.oetiker.ch/" -"rrdtool/\">RRD Tool</a> segédprogramot használja a grafikonok elkészítésére " -"az összegyűjtött adatokból." msgid "" "The tcpconns plugin collects informations about open tcp connections on " @@ -634,6 +682,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "Használt PID fájl" @@ -649,6 +700,10 @@ msgstr "Vezeték nélküli" msgid "Wireless iwinfo Plugin Configuration" msgstr "iwinfo vezeték nélküli bővítmény beállítása" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "pl. br-ff" @@ -670,6 +725,22 @@ msgstr "másodpercek; több szóközzel elválasztott érték is megadható" msgid "server interfaces" msgstr "kiszolgáló interfész" +#~ msgid "Collectd" +#~ msgstr "Collectd" + +#~ msgid "System plugins" +#~ msgstr "Rendszer bővítmények" + +#~ msgid "" +#~ "The statistics package is based on <a href=\"http://collectd.org/index." +#~ "shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/" +#~ "\">RRD Tool</a> to render diagram images from collected data." +#~ msgstr "" +#~ "A statisztikai csomag a <a href=\"http://collectd.org/index.shtml" +#~ "\">collectd</a> segédprogramon alapul és az <a href=\"http://oss.oetiker." +#~ "ch/rrdtool/\">RRD Tool</a> segédprogramot használja a grafikonok " +#~ "elkészítésére az összegyűjtött adatokból." + #~ msgid "Installed network plugins:" #~ msgstr "Telepített hálózati bővítmények:" diff --git a/applications/luci-app-statistics/po/it/statistics.po b/applications/luci-app-statistics/po/it/statistics.po index d1015367ae..ab5a783b37 100644 --- a/applications/luci-app-statistics/po/it/statistics.po +++ b/applications/luci-app-statistics/po/it/statistics.po @@ -28,6 +28,9 @@ msgstr "" msgid "Add notification command" msgstr "" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "" @@ -61,9 +64,6 @@ msgstr "" msgid "CollectTopology" msgstr "" -msgid "Collectd" -msgstr "" - msgid "Collectd Settings" msgstr "" @@ -130,6 +130,12 @@ msgstr "" msgid "Enable this plugin" msgstr "Abilita questo plugin" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "" @@ -148,6 +154,15 @@ msgstr "" msgid "Forwarding between listen and server addresses" msgstr "" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "" @@ -175,6 +190,9 @@ msgid "" "are selected." msgstr "" +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "" @@ -240,6 +258,9 @@ msgstr "" msgid "Monitor all local listen ports" msgstr "" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "" @@ -303,6 +324,15 @@ msgstr "" msgid "Only create average RRAs" msgstr "" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "" @@ -360,12 +390,24 @@ msgstr "" msgid "Seconds" msgstr "" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "" msgid "Server port" msgstr "" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "" @@ -414,9 +456,6 @@ msgstr "" msgid "System Load" msgstr "" -msgid "System plugins" -msgstr "" - msgid "TCP Connections" msgstr "" @@ -441,6 +480,11 @@ msgid "" msgstr "" msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -475,6 +519,9 @@ msgid "" "be used in other ways as well." msgstr "" +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -535,14 +582,19 @@ msgid "" msgstr "" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" msgid "" @@ -591,6 +643,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "" @@ -606,6 +661,10 @@ msgstr "" msgid "Wireless iwinfo Plugin Configuration" msgstr "" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "" diff --git a/applications/luci-app-statistics/po/ja/statistics.po b/applications/luci-app-statistics/po/ja/statistics.po index 7a4657d534..7ee9ae0846 100644 --- a/applications/luci-app-statistics/po/ja/statistics.po +++ b/applications/luci-app-statistics/po/ja/statistics.po @@ -28,6 +28,9 @@ msgstr "" msgid "Add notification command" msgstr "" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "ベース・ディレクトリ" @@ -61,9 +64,6 @@ msgstr "" msgid "CollectTopology" msgstr "" -msgid "Collectd" -msgstr "Collectd" - msgid "Collectd Settings" msgstr "Collectd 設定" @@ -127,6 +127,12 @@ msgstr "Eメール" msgid "Enable this plugin" msgstr "プラグイン設定を有効にする" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "" @@ -145,6 +151,15 @@ msgstr "" msgid "Forwarding between listen and server addresses" msgstr "" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "グラフ" @@ -167,6 +182,9 @@ msgid "" "are selected." msgstr "" +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "" @@ -230,6 +248,9 @@ msgstr "設定値以外の全てのインターフェースをモニターする msgid "Monitor all local listen ports" msgstr "" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "" @@ -293,6 +314,15 @@ msgstr "OLSRd プラグイン設定" msgid "Only create average RRAs" msgstr "平均値のRRAsのみ作成する" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "オプション" @@ -350,12 +380,24 @@ msgstr "スクリプト" msgid "Seconds" msgstr "秒" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "" msgid "Server port" msgstr "" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "" @@ -404,9 +446,6 @@ msgstr "" msgid "System Load" msgstr "" -msgid "System plugins" -msgstr "システムプラグイン" - msgid "TCP Connections" msgstr "" @@ -431,6 +470,11 @@ msgid "" msgstr "" msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -465,6 +509,9 @@ msgid "" "be used in other ways as well." msgstr "" +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -528,14 +575,19 @@ msgid "" msgstr "" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" msgid "" @@ -584,6 +636,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "使用するPIDファイルの保存場所" @@ -599,6 +654,10 @@ msgstr "" msgid "Wireless iwinfo Plugin Configuration" msgstr "無線LAN iwinfo プラグイン設定" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "" @@ -619,3 +678,9 @@ msgstr "" msgid "server interfaces" msgstr "" + +#~ msgid "Collectd" +#~ msgstr "Collectd" + +#~ msgid "System plugins" +#~ msgstr "システムプラグイン" diff --git a/applications/luci-app-statistics/po/ms/statistics.po b/applications/luci-app-statistics/po/ms/statistics.po index c82120bbde..02dfae9eef 100644 --- a/applications/luci-app-statistics/po/ms/statistics.po +++ b/applications/luci-app-statistics/po/ms/statistics.po @@ -25,6 +25,9 @@ msgstr "" msgid "Add notification command" msgstr "" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "" @@ -58,9 +61,6 @@ msgstr "" msgid "CollectTopology" msgstr "" -msgid "Collectd" -msgstr "" - msgid "Collectd Settings" msgstr "" @@ -124,6 +124,12 @@ msgstr "" msgid "Enable this plugin" msgstr "" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "" @@ -142,6 +148,15 @@ msgstr "" msgid "Forwarding between listen and server addresses" msgstr "" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "" @@ -164,6 +179,9 @@ msgid "" "are selected." msgstr "" +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "" @@ -227,6 +245,9 @@ msgstr "" msgid "Monitor all local listen ports" msgstr "" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "" @@ -290,6 +311,15 @@ msgstr "" msgid "Only create average RRAs" msgstr "" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "" @@ -347,12 +377,24 @@ msgstr "" msgid "Seconds" msgstr "" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "" msgid "Server port" msgstr "" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "" @@ -401,9 +443,6 @@ msgstr "" msgid "System Load" msgstr "" -msgid "System plugins" -msgstr "" - msgid "TCP Connections" msgstr "" @@ -428,6 +467,11 @@ msgid "" msgstr "" msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -462,6 +506,9 @@ msgid "" "be used in other ways as well." msgstr "" +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -522,14 +569,19 @@ msgid "" msgstr "" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" msgid "" @@ -578,6 +630,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "" @@ -593,6 +648,10 @@ msgstr "" msgid "Wireless iwinfo Plugin Configuration" msgstr "" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "" diff --git a/applications/luci-app-statistics/po/no/statistics.po b/applications/luci-app-statistics/po/no/statistics.po index 0e46dd13fa..c4300bc445 100644 --- a/applications/luci-app-statistics/po/no/statistics.po +++ b/applications/luci-app-statistics/po/no/statistics.po @@ -19,6 +19,9 @@ msgstr "Legg til flere verter adskilt med mellomrom." msgid "Add notification command" msgstr "Legg til varsling kommando" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "Hoved Katalog" @@ -52,9 +55,6 @@ msgstr "" msgid "CollectTopology" msgstr "" -msgid "Collectd" -msgstr "Collectd" - msgid "Collectd Settings" msgstr "Collectd Innstillinger" @@ -121,6 +121,12 @@ msgstr "Epost" msgid "Enable this plugin" msgstr "Aktiver denne plugin" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "Program" @@ -139,6 +145,15 @@ msgstr "Tømme hurtigbufferen etter" msgid "Forwarding between listen and server addresses" msgstr "Videresending mellom lyttende og server adresser" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "Grafer" @@ -166,6 +181,9 @@ msgid "" "are selected." msgstr "Her kan du definere kriterier for reglene som overvåker iptables." +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "" @@ -229,6 +247,9 @@ msgstr "" msgid "Monitor all local listen ports" msgstr "Overvåk alle lokale lyttende porter" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "Overvåk enheter" @@ -292,6 +313,15 @@ msgstr "" msgid "Only create average RRAs" msgstr "Lag kun gjennomsnittlige RRAs" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "Alternativer" @@ -349,12 +379,24 @@ msgstr "" msgid "Seconds" msgstr "Sekunder" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "Server vert" msgid "Server port" msgstr "Server port" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "Shaping class overvåking" @@ -403,9 +445,6 @@ msgstr "Lagrede tidsperioder" msgid "System Load" msgstr "System Belastning" -msgid "System plugins" -msgstr "System plugins" - msgid "TCP Connections" msgstr "TCP Forbindelser" @@ -430,6 +469,11 @@ msgid "" msgstr "" msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -476,6 +520,9 @@ msgstr "" "bli brukt i forbindelse med Mail::SpamAssasin::Plugin::Collectd men kan også " "brukes på andre måter." +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -556,18 +603,20 @@ msgstr "" "katalogen (temp). Dette kan gjøre enheten ubrukelig!</strong>" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" -"Statistikk pakken er basert på <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> og bruker <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> for å tegne diagram bilder fra innsamlede data." msgid "" "The tcpconns plugin collects informations about open tcp connections on " @@ -623,6 +672,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "Brukt PID fil" @@ -638,6 +690,10 @@ msgstr "Trådløs" msgid "Wireless iwinfo Plugin Configuration" msgstr "" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "f.eks. br-ff" @@ -659,6 +715,21 @@ msgstr "sekunder; flere adskilt med mellomrom" msgid "server interfaces" msgstr "Server grensesnitt" +#~ msgid "Collectd" +#~ msgstr "Collectd" + +#~ msgid "System plugins" +#~ msgstr "System plugins" + +#~ msgid "" +#~ "The statistics package is based on <a href=\"http://collectd.org/index." +#~ "shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/" +#~ "\">RRD Tool</a> to render diagram images from collected data." +#~ msgstr "" +#~ "Statistikk pakken er basert på <a href=\"http://collectd.org/index.shtml" +#~ "\">Collectd</a> og bruker <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " +#~ "Tool</a> for å tegne diagram bilder fra innsamlede data." + #~ msgid "Installed network plugins:" #~ msgstr "Installerte nettverks plugin:" diff --git a/applications/luci-app-statistics/po/pl/statistics.po b/applications/luci-app-statistics/po/pl/statistics.po index de86176fb3..d352bedb26 100644 --- a/applications/luci-app-statistics/po/pl/statistics.po +++ b/applications/luci-app-statistics/po/pl/statistics.po @@ -29,6 +29,9 @@ msgstr "Dodaj wiele hostów rozdzielonych spacjami." msgid "Add notification command" msgstr "Dodaj komendę powiadamiającą" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "Główny katalog" @@ -62,9 +65,6 @@ msgstr "CollectRoutes" msgid "CollectTopology" msgstr "CollectTopology" -msgid "Collectd" -msgstr "Collectd" - msgid "Collectd Settings" msgstr "Ustawienia Collectd" @@ -131,6 +131,12 @@ msgstr "E-mail" msgid "Enable this plugin" msgstr "Włącz tę wtyczkę" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "Exec" @@ -149,6 +155,15 @@ msgstr "Opróżnić cache po" msgid "Forwarding between listen and server addresses" msgstr "Przekazać przez słuchacza na adres serwera" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "Wykresy" @@ -178,6 +193,9 @@ msgstr "" "Tutaj można zdefiniować różne kryteria według których wybierane są " "monitorowane reguły iptables." +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "Host" @@ -243,6 +261,9 @@ msgstr "Monitoruj wszystko oprócz podanych" msgid "Monitor all local listen ports" msgstr "Monitoruj wszystkie lokalne otwarte porty" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "Monitoruj urządzenia" @@ -306,6 +327,15 @@ msgstr "Konfiguracja wtyczki OLSRd" msgid "Only create average RRAs" msgstr "Twórz tylko średnie archiwa RRA" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "Opcje" @@ -363,12 +393,24 @@ msgstr "Skrypt" msgid "Seconds" msgstr "Sekundy" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "Host serwer" msgid "Server port" msgstr "Port serwera" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "Shaping Klasa Monitoring" @@ -418,9 +460,6 @@ msgstr "Przechowywane okresy czasu" msgid "System Load" msgstr "Obciążenie systemu" -msgid "System plugins" -msgstr "Wtyczki systemowe" - msgid "TCP Connections" msgstr "Połączenia TCP" @@ -447,6 +486,11 @@ msgstr "" "OLSRd." msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "Wtyczka Conntrack zbiera statystyki o liczbie śledzonych połączeń." @@ -493,6 +537,9 @@ msgstr "" "with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as " "well." +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -576,18 +623,20 @@ msgstr "" "do użytku! </strong>" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" -"Statystyki bazuja na <a href=\"http://collectd.org/index.shtml\">Collectd</" -"a> oraz wykorzystują <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> " -"do generowania diagramów i wykresów z zebranych danych." msgid "" "The tcpconns plugin collects informations about open tcp connections on " @@ -641,6 +690,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "Używany plik PID" @@ -656,6 +708,10 @@ msgstr "WiFi" msgid "Wireless iwinfo Plugin Configuration" msgstr "Konfiguracja bezprzewodowego pluginu iwinfo" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "np. br-ff" @@ -677,6 +733,21 @@ msgstr "sekundy; wielokrotnie oddzielone spacją" msgid "server interfaces" msgstr "interfejsy serwera" +#~ msgid "Collectd" +#~ msgstr "Collectd" + +#~ msgid "System plugins" +#~ msgstr "Wtyczki systemowe" + +#~ msgid "" +#~ "The statistics package is based on <a href=\"http://collectd.org/index." +#~ "shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/" +#~ "\">RRD Tool</a> to render diagram images from collected data." +#~ msgstr "" +#~ "Statystyki bazuja na <a href=\"http://collectd.org/index.shtml" +#~ "\">Collectd</a> oraz wykorzystują <a href=\"http://oss.oetiker.ch/rrdtool/" +#~ "\">RRD Tool</a> do generowania diagramów i wykresów z zebranych danych." + #~ msgid "Installed network plugins:" #~ msgstr "Zainstalowane wtyczki sieciowe:" diff --git a/applications/luci-app-statistics/po/pt-br/statistics.po b/applications/luci-app-statistics/po/pt-br/statistics.po index f7b66166d7..9abba4975b 100644 --- a/applications/luci-app-statistics/po/pt-br/statistics.po +++ b/applications/luci-app-statistics/po/pt-br/statistics.po @@ -28,6 +28,9 @@ msgstr "Adicione múltiplos equipamentos separados por espaço." msgid "Add notification command" msgstr "Adicionar o comando de notificação" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "Diretório Base" @@ -61,9 +64,6 @@ msgstr "Coleção de Rotas" msgid "CollectTopology" msgstr "Coleção de Topologias" -msgid "Collectd" -msgstr "Coletar" - msgid "Collectd Settings" msgstr "Configurações do Coletadas" @@ -130,6 +130,12 @@ msgstr "Email" msgid "Enable this plugin" msgstr "Habilitar este plugin" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "Exec" @@ -149,6 +155,15 @@ msgid "Forwarding between listen and server addresses" msgstr "" "Encaminhamento entre o endereço de escuta e os endereços dos servidores" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "Gráficos" @@ -178,6 +193,9 @@ msgstr "" "Aqui você pode definir diversos critérios para as regras iptables " "selecionadas serem monitoradas." +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "Equipamento" @@ -243,6 +261,9 @@ msgstr "Monitore tudo exceto se especificado" msgid "Monitor all local listen ports" msgstr "Monitorar todas as portas locais" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "Monitorar dispositivos" @@ -306,6 +327,15 @@ msgstr "Configuração do Plugin OLSRd" msgid "Only create average RRAs" msgstr "Somente criar RRAs de média" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "Opções" @@ -363,12 +393,24 @@ msgstr "Script" msgid "Seconds" msgstr "Segundos" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "Endereço do servidor" msgid "Server port" msgstr "Porta do servidor" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "Monitoramento das Classes de Shaping" @@ -417,9 +459,6 @@ msgstr "Intervalos armazenados" msgid "System Load" msgstr "Carga do Sistema" -msgid "System plugins" -msgstr "Plugins de sistema" - msgid "TCP Connections" msgstr "Conexões TCP" @@ -446,6 +485,11 @@ msgstr "" "txtinfo do OLSRd." msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -495,6 +539,9 @@ msgstr "" "destinado a ser utilizado em conjunto com o plugin Mail::SpamAssasin::" "Plugin::Collectd mas pode ser utilizado de outras maneiras também." +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -581,18 +628,20 @@ msgstr "" "Isso pode tornar o equipamento inutilizável!</strong>" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" -"As estatísticas são baseadas no <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> e é utilizado o <a href=\"http://oss.oetiker.ch/rrdtool/" -"\">RRD Tool</a> para renderização das imagens a partir dos dados coletados." msgid "" "The tcpconns plugin collects informations about open tcp connections on " @@ -648,6 +697,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "Arquivo PID usado" @@ -663,6 +715,10 @@ msgstr "Rede Sem Fio (Wireless)" msgid "Wireless iwinfo Plugin Configuration" msgstr "Configuração do Plugin iwinfo da Rede Sem Fio (Wireless)" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "ex: br-ff" @@ -684,6 +740,22 @@ msgstr "segundos; vários valores, separar com espaço" msgid "server interfaces" msgstr "interfaces do servidor" +#~ msgid "Collectd" +#~ msgstr "Coletar" + +#~ msgid "System plugins" +#~ msgstr "Plugins de sistema" + +#~ msgid "" +#~ "The statistics package is based on <a href=\"http://collectd.org/index." +#~ "shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/" +#~ "\">RRD Tool</a> to render diagram images from collected data." +#~ msgstr "" +#~ "As estatísticas são baseadas no <a href=\"http://collectd.org/index.shtml" +#~ "\">Collectd</a> e é utilizado o <a href=\"http://oss.oetiker.ch/rrdtool/" +#~ "\">RRD Tool</a> para renderização das imagens a partir dos dados " +#~ "coletados." + #~ msgid "Installed network plugins:" #~ msgstr "Plugins de rede instalados:" diff --git a/applications/luci-app-statistics/po/pt/statistics.po b/applications/luci-app-statistics/po/pt/statistics.po index 54f58037e3..34b435c5d1 100644 --- a/applications/luci-app-statistics/po/pt/statistics.po +++ b/applications/luci-app-statistics/po/pt/statistics.po @@ -28,6 +28,9 @@ msgstr "Adicionar hosts múltiplos separados por espaço." msgid "Add notification command" msgstr "Adicionar o comando de notificação" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "Diretório Base" @@ -61,9 +64,6 @@ msgstr "" msgid "CollectTopology" msgstr "" -msgid "Collectd" -msgstr "Collectd" - msgid "Collectd Settings" msgstr "Configurações do Collectd" @@ -130,6 +130,12 @@ msgstr "Email" msgid "Enable this plugin" msgstr "Habilitar este plugin" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "Exec" @@ -148,6 +154,15 @@ msgstr "Limpar cache após" msgid "Forwarding between listen and server addresses" msgstr "Transmissão entre o endereço de escuta e dos servidores" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "Gráficos" @@ -177,6 +192,9 @@ msgstr "" "Aqui você pode definir diversos critérios para as regras iptables " "selecionadas serem monitoradas." +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "" @@ -242,6 +260,9 @@ msgstr "Monitorizar tudo excepto os especificados" msgid "Monitor all local listen ports" msgstr "Monitorar todas as portas locais" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "Monitorar dispositivos" @@ -305,6 +326,15 @@ msgstr "" msgid "Only create average RRAs" msgstr "Somente criar RRAs de média" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "Opções" @@ -362,12 +392,24 @@ msgstr "" msgid "Seconds" msgstr "Segundos" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "IP/Hostname do servidor" msgid "Server port" msgstr "Porta do servidor" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "Monitoramento das Classes de Shaping" @@ -416,9 +458,6 @@ msgstr "Intervalos armazenados" msgid "System Load" msgstr "Carga do Sistema" -msgid "System plugins" -msgstr "Plugis de Sistema" - msgid "TCP Connections" msgstr "Conexões TCP" @@ -443,6 +482,11 @@ msgid "" msgstr "" msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -490,6 +534,9 @@ msgstr "" "destinado a ser utilizado em conjunto com o plugin Mail::SpamAssasin::" "Plugin::Collectd mas pode ser utilizado de outras maneiras também." +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -574,18 +621,20 @@ msgstr "" "Isso pode tornar o equipamento inutilizável!</strong>" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" -"As estatísticas são baseadas no <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> e é utilizado o <a href=\"http://oss.oetiker.ch/rrdtool/" -"\">RRD Tool</a> para renderização das imagens à partir dos dados coletados." msgid "" "The tcpconns plugin collects informations about open tcp connections on " @@ -641,6 +690,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "Arquivo PID usado" @@ -656,6 +708,10 @@ msgstr "Wireless" msgid "Wireless iwinfo Plugin Configuration" msgstr "" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "ex. br-ff" @@ -677,6 +733,22 @@ msgstr "segundos; vários valores, separar com espaço" msgid "server interfaces" msgstr "Interfaces do servidor" +#~ msgid "Collectd" +#~ msgstr "Collectd" + +#~ msgid "System plugins" +#~ msgstr "Plugis de Sistema" + +#~ msgid "" +#~ "The statistics package is based on <a href=\"http://collectd.org/index." +#~ "shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/" +#~ "\">RRD Tool</a> to render diagram images from collected data." +#~ msgstr "" +#~ "As estatísticas são baseadas no <a href=\"http://collectd.org/index.shtml" +#~ "\">Collectd</a> e é utilizado o <a href=\"http://oss.oetiker.ch/rrdtool/" +#~ "\">RRD Tool</a> para renderização das imagens à partir dos dados " +#~ "coletados." + #~ msgid "" #~ "The wireless plugin collects statistics about wireless signal strength, " #~ "noise and quality." diff --git a/applications/luci-app-statistics/po/ro/statistics.po b/applications/luci-app-statistics/po/ro/statistics.po index f6c049f094..7990970d20 100644 --- a/applications/luci-app-statistics/po/ro/statistics.po +++ b/applications/luci-app-statistics/po/ro/statistics.po @@ -29,6 +29,9 @@ msgstr "" msgid "Add notification command" msgstr "" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "Directorul de baza" @@ -62,9 +65,6 @@ msgstr "" msgid "CollectTopology" msgstr "" -msgid "Collectd" -msgstr "Collectd" - msgid "Collectd Settings" msgstr "Setarile Collectd" @@ -131,6 +131,12 @@ msgstr "Email" msgid "Enable this plugin" msgstr "" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "Exec" @@ -149,6 +155,15 @@ msgstr "" msgid "Forwarding between listen and server addresses" msgstr "" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "Grafice" @@ -171,6 +186,9 @@ msgid "" "are selected." msgstr "" +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "" @@ -234,6 +252,9 @@ msgstr "" msgid "Monitor all local listen ports" msgstr "" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "" @@ -297,6 +318,15 @@ msgstr "" msgid "Only create average RRAs" msgstr "" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "" @@ -354,12 +384,24 @@ msgstr "" msgid "Seconds" msgstr "Secunde" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "" msgid "Server port" msgstr "" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "" @@ -408,9 +450,6 @@ msgstr "" msgid "System Load" msgstr "Incarcarea de sistem" -msgid "System plugins" -msgstr "Pluginuri de sistem" - msgid "TCP Connections" msgstr "Conexiuni TCP" @@ -435,6 +474,11 @@ msgid "" msgstr "" msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -471,6 +515,9 @@ msgid "" "be used in other ways as well." msgstr "" +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -531,14 +578,19 @@ msgid "" msgstr "" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" msgid "" @@ -587,6 +639,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "Fisierul pentru PID folosit" @@ -602,6 +657,10 @@ msgstr "Wireless" msgid "Wireless iwinfo Plugin Configuration" msgstr "" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "" @@ -622,3 +681,9 @@ msgstr "" msgid "server interfaces" msgstr "" + +#~ msgid "Collectd" +#~ msgstr "Collectd" + +#~ msgid "System plugins" +#~ msgstr "Pluginuri de sistem" diff --git a/applications/luci-app-statistics/po/ru/statistics.po b/applications/luci-app-statistics/po/ru/statistics.po index da47dff0d6..d41248f8a5 100644 --- a/applications/luci-app-statistics/po/ru/statistics.po +++ b/applications/luci-app-statistics/po/ru/statistics.po @@ -30,6 +30,9 @@ msgstr "Добавить несколько хостов, разделённых msgid "Add notification command" msgstr "Добавить команду уведомления" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "Базовая директория" @@ -63,9 +66,6 @@ msgstr "Сбор информации о маршрутах (CollectRoutes)" msgid "CollectTopology" msgstr "Сбор информации о топологии (CollectTopology)" -msgid "Collectd" -msgstr "Collectd" - msgid "Collectd Settings" msgstr "Настройки Collectd" @@ -131,6 +131,12 @@ msgstr "E-mail" msgid "Enable this plugin" msgstr "Включить этот модуль" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "Exec" @@ -150,6 +156,15 @@ msgstr "Сбросить кэш после" msgid "Forwarding between listen and server addresses" msgstr "Перенаправление между локальным адресом и адресом сервера" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "Графики" @@ -179,6 +194,9 @@ msgstr "" "Здесь вы можете указать различные критерии, по которым будут выбраны правила " "для сбора статистики." +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "Хост" @@ -244,6 +262,9 @@ msgstr "Собирать статистику со всех, кроме указ msgid "Monitor all local listen ports" msgstr "Собирать статистику со всех портов, ожидающих соединения" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "Собирать статистику с устройств" @@ -307,6 +328,15 @@ msgstr "Настройка плагина OLSRd" msgid "Only create average RRAs" msgstr "Создавать только средние RRA" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "Опции" @@ -366,12 +396,24 @@ msgstr "Скрипт" msgid "Seconds" msgstr "Секунды" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "Хост сервера" msgid "Server port" msgstr "Порт сервера" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "Мониторинг классов шейпинга" @@ -420,9 +462,6 @@ msgstr "Сохранённые промежутки времени" msgid "System Load" msgstr "Загрузка системы" -msgid "System plugins" -msgstr "Системные модули" - msgid "TCP Connections" msgstr "TCPConns" @@ -448,6 +487,11 @@ msgstr "" "Модуль OLSRd считывает информацию о узловых сетях с модуля txtinfo OLSRd." msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -494,6 +538,9 @@ msgstr "" "модуль предназначен для использования вместе с Mail::SpamAssasin::Plugin::" "Collectd." +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -572,18 +619,20 @@ msgstr "" "директории. Это, в свою очередь, может привести к отказу устройства!</strong>" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" -"Данная статистика основана на программе <a href=\"http://collectd.org/index." -"shtml\">Collectd</a> и использует <a href=\"http://oss.oetiker.ch/rrdtool/" -"\">RRD Tool</a> для построения диаграмм." msgid "" "The tcpconns plugin collects informations about open tcp connections on " @@ -640,6 +689,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "Используемый PID-файл" @@ -655,6 +707,10 @@ msgstr "Wireless" msgid "Wireless iwinfo Plugin Configuration" msgstr "Конфигурация модуля Iwinfo" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "напр. br-ff" @@ -677,6 +733,21 @@ msgstr "секунды; разделяются пробелом" msgid "server interfaces" msgstr "интерфейсы сервера" +#~ msgid "Collectd" +#~ msgstr "Collectd" + +#~ msgid "System plugins" +#~ msgstr "Системные модули" + +#~ msgid "" +#~ "The statistics package is based on <a href=\"http://collectd.org/index." +#~ "shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/" +#~ "\">RRD Tool</a> to render diagram images from collected data." +#~ msgstr "" +#~ "Данная статистика основана на программе <a href=\"http://collectd.org/" +#~ "index.shtml\">Collectd</a> и использует <a href=\"http://oss.oetiker.ch/" +#~ "rrdtool/\">RRD Tool</a> для построения диаграмм." + #~ msgid "Installed network plugins:" #~ msgstr "Установленные сетевые модули:" diff --git a/applications/luci-app-statistics/po/sk/statistics.po b/applications/luci-app-statistics/po/sk/statistics.po index b0672f99ec..e0400c2fde 100644 --- a/applications/luci-app-statistics/po/sk/statistics.po +++ b/applications/luci-app-statistics/po/sk/statistics.po @@ -23,6 +23,9 @@ msgstr "" msgid "Add notification command" msgstr "" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "" @@ -56,9 +59,6 @@ msgstr "" msgid "CollectTopology" msgstr "" -msgid "Collectd" -msgstr "" - msgid "Collectd Settings" msgstr "" @@ -122,6 +122,12 @@ msgstr "" msgid "Enable this plugin" msgstr "" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "" @@ -140,6 +146,15 @@ msgstr "" msgid "Forwarding between listen and server addresses" msgstr "" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "" @@ -162,6 +177,9 @@ msgid "" "are selected." msgstr "" +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "" @@ -225,6 +243,9 @@ msgstr "" msgid "Monitor all local listen ports" msgstr "" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "" @@ -288,6 +309,15 @@ msgstr "" msgid "Only create average RRAs" msgstr "" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "" @@ -345,12 +375,24 @@ msgstr "" msgid "Seconds" msgstr "" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "" msgid "Server port" msgstr "" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "" @@ -399,9 +441,6 @@ msgstr "" msgid "System Load" msgstr "" -msgid "System plugins" -msgstr "" - msgid "TCP Connections" msgstr "" @@ -426,6 +465,11 @@ msgid "" msgstr "" msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -460,6 +504,9 @@ msgid "" "be used in other ways as well." msgstr "" +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -520,14 +567,19 @@ msgid "" msgstr "" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" msgid "" @@ -576,6 +628,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "" @@ -591,6 +646,10 @@ msgstr "" msgid "Wireless iwinfo Plugin Configuration" msgstr "" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "" diff --git a/applications/luci-app-statistics/po/sv/statistics.po b/applications/luci-app-statistics/po/sv/statistics.po index 26f60fda52..9c7b2175a7 100644 --- a/applications/luci-app-statistics/po/sv/statistics.po +++ b/applications/luci-app-statistics/po/sv/statistics.po @@ -24,6 +24,9 @@ msgstr "" msgid "Add notification command" msgstr "" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "" @@ -57,9 +60,6 @@ msgstr "" msgid "CollectTopology" msgstr "" -msgid "Collectd" -msgstr "" - msgid "Collectd Settings" msgstr "" @@ -123,6 +123,12 @@ msgstr "" msgid "Enable this plugin" msgstr "" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "" @@ -141,6 +147,15 @@ msgstr "" msgid "Forwarding between listen and server addresses" msgstr "" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "" @@ -163,6 +178,9 @@ msgid "" "are selected." msgstr "" +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "" @@ -226,6 +244,9 @@ msgstr "" msgid "Monitor all local listen ports" msgstr "" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "" @@ -289,6 +310,15 @@ msgstr "" msgid "Only create average RRAs" msgstr "" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "" @@ -346,12 +376,24 @@ msgstr "" msgid "Seconds" msgstr "" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "" msgid "Server port" msgstr "" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "" @@ -400,9 +442,6 @@ msgstr "" msgid "System Load" msgstr "" -msgid "System plugins" -msgstr "" - msgid "TCP Connections" msgstr "" @@ -427,6 +466,11 @@ msgid "" msgstr "" msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -461,6 +505,9 @@ msgid "" "be used in other ways as well." msgstr "" +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -521,14 +568,19 @@ msgid "" msgstr "" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" msgid "" @@ -577,6 +629,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "" @@ -592,6 +647,10 @@ msgstr "" msgid "Wireless iwinfo Plugin Configuration" msgstr "" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "" diff --git a/applications/luci-app-statistics/po/templates/statistics.pot b/applications/luci-app-statistics/po/templates/statistics.pot index 2162c6606b..2b4ba7fbc2 100644 --- a/applications/luci-app-statistics/po/templates/statistics.pot +++ b/applications/luci-app-statistics/po/templates/statistics.pot @@ -16,6 +16,9 @@ msgstr "" msgid "Add notification command" msgstr "" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "" @@ -49,9 +52,6 @@ msgstr "" msgid "CollectTopology" msgstr "" -msgid "Collectd" -msgstr "" - msgid "Collectd Settings" msgstr "" @@ -115,6 +115,12 @@ msgstr "" msgid "Enable this plugin" msgstr "" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "" @@ -133,6 +139,15 @@ msgstr "" msgid "Forwarding between listen and server addresses" msgstr "" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "" @@ -155,6 +170,9 @@ msgid "" "are selected." msgstr "" +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "" @@ -218,6 +236,9 @@ msgstr "" msgid "Monitor all local listen ports" msgstr "" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "" @@ -281,6 +302,15 @@ msgstr "" msgid "Only create average RRAs" msgstr "" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "" @@ -338,12 +368,24 @@ msgstr "" msgid "Seconds" msgstr "" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "" msgid "Server port" msgstr "" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "" @@ -392,9 +434,6 @@ msgstr "" msgid "System Load" msgstr "" -msgid "System plugins" -msgstr "" - msgid "TCP Connections" msgstr "" @@ -419,6 +458,11 @@ msgid "" msgstr "" msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -453,6 +497,9 @@ msgid "" "be used in other ways as well." msgstr "" +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -513,14 +560,19 @@ msgid "" msgstr "" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" msgid "" @@ -569,6 +621,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "" @@ -584,6 +639,10 @@ msgstr "" msgid "Wireless iwinfo Plugin Configuration" msgstr "" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "" diff --git a/applications/luci-app-statistics/po/tr/statistics.po b/applications/luci-app-statistics/po/tr/statistics.po index c3267da111..505b5a16b9 100644 --- a/applications/luci-app-statistics/po/tr/statistics.po +++ b/applications/luci-app-statistics/po/tr/statistics.po @@ -24,6 +24,9 @@ msgstr "" msgid "Add notification command" msgstr "" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "" @@ -57,9 +60,6 @@ msgstr "" msgid "CollectTopology" msgstr "" -msgid "Collectd" -msgstr "" - msgid "Collectd Settings" msgstr "" @@ -123,6 +123,12 @@ msgstr "" msgid "Enable this plugin" msgstr "" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "" @@ -141,6 +147,15 @@ msgstr "" msgid "Forwarding between listen and server addresses" msgstr "" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "" @@ -163,6 +178,9 @@ msgid "" "are selected." msgstr "" +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "" @@ -226,6 +244,9 @@ msgstr "" msgid "Monitor all local listen ports" msgstr "" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "" @@ -289,6 +310,15 @@ msgstr "" msgid "Only create average RRAs" msgstr "" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "" @@ -346,12 +376,24 @@ msgstr "" msgid "Seconds" msgstr "" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "" msgid "Server port" msgstr "" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "" @@ -400,9 +442,6 @@ msgstr "" msgid "System Load" msgstr "" -msgid "System plugins" -msgstr "" - msgid "TCP Connections" msgstr "" @@ -427,6 +466,11 @@ msgid "" msgstr "" msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -461,6 +505,9 @@ msgid "" "be used in other ways as well." msgstr "" +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -521,14 +568,19 @@ msgid "" msgstr "" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" msgid "" @@ -577,6 +629,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "" @@ -592,6 +647,10 @@ msgstr "" msgid "Wireless iwinfo Plugin Configuration" msgstr "" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "" diff --git a/applications/luci-app-statistics/po/uk/statistics.po b/applications/luci-app-statistics/po/uk/statistics.po index 88b2337ab3..ee5ea8f35f 100644 --- a/applications/luci-app-statistics/po/uk/statistics.po +++ b/applications/luci-app-statistics/po/uk/statistics.po @@ -29,6 +29,9 @@ msgstr "" msgid "Add notification command" msgstr "" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "" @@ -62,9 +65,6 @@ msgstr "" msgid "CollectTopology" msgstr "" -msgid "Collectd" -msgstr "" - msgid "Collectd Settings" msgstr "" @@ -128,6 +128,12 @@ msgstr "" msgid "Enable this plugin" msgstr "" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "" @@ -146,6 +152,15 @@ msgstr "" msgid "Forwarding between listen and server addresses" msgstr "" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "" @@ -168,6 +183,9 @@ msgid "" "are selected." msgstr "" +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "" @@ -231,6 +249,9 @@ msgstr "" msgid "Monitor all local listen ports" msgstr "" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "" @@ -294,6 +315,15 @@ msgstr "" msgid "Only create average RRAs" msgstr "" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "" @@ -351,12 +381,24 @@ msgstr "" msgid "Seconds" msgstr "" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "" msgid "Server port" msgstr "" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "" @@ -405,9 +447,6 @@ msgstr "" msgid "System Load" msgstr "" -msgid "System plugins" -msgstr "" - msgid "TCP Connections" msgstr "" @@ -432,6 +471,11 @@ msgid "" msgstr "" msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -466,6 +510,9 @@ msgid "" "be used in other ways as well." msgstr "" +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -526,14 +573,19 @@ msgid "" msgstr "" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" msgid "" @@ -582,6 +634,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "" @@ -597,6 +652,10 @@ msgstr "" msgid "Wireless iwinfo Plugin Configuration" msgstr "" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "" diff --git a/applications/luci-app-statistics/po/vi/statistics.po b/applications/luci-app-statistics/po/vi/statistics.po index 02e06fbb7f..28bc8b4bc6 100644 --- a/applications/luci-app-statistics/po/vi/statistics.po +++ b/applications/luci-app-statistics/po/vi/statistics.po @@ -29,6 +29,9 @@ msgstr "" msgid "Add notification command" msgstr "Thêm lệnh thông báo" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "Thư mục Cơ sở" @@ -62,9 +65,6 @@ msgstr "" msgid "CollectTopology" msgstr "" -msgid "Collectd" -msgstr "Collectd" - msgid "Collectd Settings" msgstr "Những cài đặt collectd" @@ -131,6 +131,12 @@ msgstr "Email" msgid "Enable this plugin" msgstr "Kích hoạt plugin này" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "Exec" @@ -149,6 +155,15 @@ msgstr "Flush cache sau khi" msgid "Forwarding between listen and server addresses" msgstr "chuyển tiếp giữa listen và địa chỉ server" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "Graphs" @@ -178,6 +193,9 @@ msgstr "" "Ở đây bạn có thể định nghĩa những tiêu chuẩn khác nhau để monitor iptables " "rules được chọn." +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "" @@ -241,6 +259,9 @@ msgstr "" msgid "Monitor all local listen ports" msgstr "Monitor tất cả local listen port" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "Monitor devices" @@ -304,6 +325,15 @@ msgstr "" msgid "Only create average RRAs" msgstr "Chỉ tạo trung bình RRAs" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "Tùy chọn" @@ -361,12 +391,24 @@ msgstr "" msgid "Seconds" msgstr "Giây" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "Server host" msgid "Server port" msgstr "Server port" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "Shaping class monitoring" @@ -415,9 +457,6 @@ msgstr "Lưu timspans" msgid "System Load" msgstr "System Load" -msgid "System plugins" -msgstr "System plugins" - msgid "TCP Connections" msgstr "Kết nối TCP" @@ -442,6 +481,11 @@ msgid "" msgstr "" msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -488,6 +532,9 @@ msgstr "" "Mail::SpamAssasin::Plugin::Collectd nhưng cũng có thể dùng trong những cách " "khác." +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -574,18 +621,20 @@ msgstr "" "sử dụng được</strong>" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" -"Gói thống kê dựa trên <a href=\"http://collectd.org/index.shtml\">Collectd</" -"a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> vẽ lại " -"sơ đồ hình ảnh từ dữ liệu thu thập ." msgid "" "The tcpconns plugin collects informations about open tcp connections on " @@ -638,6 +687,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "Tập tin PID đã sử dụng" @@ -653,6 +705,10 @@ msgstr "Mạng không dây" msgid "Wireless iwinfo Plugin Configuration" msgstr "" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "e.g. br-ff" @@ -674,6 +730,21 @@ msgstr "giây; nhiều phân tách bởi khoảng trống" msgid "server interfaces" msgstr "giao diện server" +#~ msgid "Collectd" +#~ msgstr "Collectd" + +#~ msgid "System plugins" +#~ msgstr "System plugins" + +#~ msgid "" +#~ "The statistics package is based on <a href=\"http://collectd.org/index." +#~ "shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/" +#~ "\">RRD Tool</a> to render diagram images from collected data." +#~ msgstr "" +#~ "Gói thống kê dựa trên <a href=\"http://collectd.org/index.shtml" +#~ "\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " +#~ "Tool</a> vẽ lại sơ đồ hình ảnh từ dữ liệu thu thập ." + #~ msgid "" #~ "The wireless plugin collects statistics about wireless signal strength, " #~ "noise and quality." diff --git a/applications/luci-app-statistics/po/zh-cn/statistics.po b/applications/luci-app-statistics/po/zh-cn/statistics.po index 669d5f0efe..4714ab5e80 100644 --- a/applications/luci-app-statistics/po/zh-cn/statistics.po +++ b/applications/luci-app-statistics/po/zh-cn/statistics.po @@ -28,6 +28,9 @@ msgstr "使用空格分隔多个主机" msgid "Add notification command" msgstr "新增通知命令" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "基本目录" @@ -61,9 +64,6 @@ msgstr "收集路由" msgid "CollectTopology" msgstr "收集拓扑" -msgid "Collectd" -msgstr "Collectd" - msgid "Collectd Settings" msgstr "Collectd设置" @@ -129,6 +129,12 @@ msgstr "电子邮件" msgid "Enable this plugin" msgstr "启用该插件" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "Exec" @@ -147,6 +153,15 @@ msgstr "清空缓存后" msgid "Forwarding between listen and server addresses" msgstr "转发监听服务器和应用服务器之间数据" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "图表" @@ -173,6 +188,9 @@ msgid "" "are selected." msgstr "在这里，你可以定义各种监控iptables规则临界值。" +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "主机" @@ -236,6 +254,9 @@ msgstr "监测所有（除特别注明外）" msgid "Monitor all local listen ports" msgstr "监测所有本地监听端口" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "监测设备" @@ -299,6 +320,15 @@ msgstr "OLSRd插件配置" msgid "Only create average RRAs" msgstr "仅创建平均RRAs" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "选项" @@ -356,12 +386,24 @@ msgstr "脚本" msgid "Seconds" msgstr "秒" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "服务器主机" msgid "Server port" msgstr "服务器端口" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "整形类监控" @@ -410,9 +452,6 @@ msgstr "存储时间跨度" msgid "System Load" msgstr "系统加载" -msgid "System plugins" -msgstr "系统插件" - msgid "TCP Connections" msgstr "TCP连接数" @@ -437,6 +476,11 @@ msgid "" msgstr "OLSRd插件通过txtinfo获取meshed网络信息。" msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "conntrack插件获取连接数信息。" @@ -474,6 +518,9 @@ msgstr "" "这个插件主要目的是结合使用Mail::SpamAssasin::Pulgin::Collectd，但可以用在其他" "方面。" +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -543,18 +590,20 @@ msgstr "" "使用！</strong>" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" -"统计软件包是基于<a href=\"http://collectd.org/index.shtml\">Collectd</a>，并" -"使用<a href=\"http://oss.oetiker.ch/rrdtool/\">RRD工具</a>来渲染图表，用于收" -"集数据。" msgid "" "The tcpconns plugin collects informations about open tcp connections on " @@ -602,6 +651,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "正在使用的PID文件" @@ -617,6 +669,10 @@ msgstr "无线" msgid "Wireless iwinfo Plugin Configuration" msgstr "无线iwinfo插件配置" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "例如：br-ff" @@ -638,5 +694,20 @@ msgstr "秒数；多个使用空格分隔" msgid "server interfaces" msgstr "服务器接口" +#~ msgid "Collectd" +#~ msgstr "Collectd" + +#~ msgid "System plugins" +#~ msgstr "系统插件" + +#~ msgid "" +#~ "The statistics package is based on <a href=\"http://collectd.org/index." +#~ "shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/" +#~ "\">RRD Tool</a> to render diagram images from collected data." +#~ msgstr "" +#~ "统计软件包是基于<a href=\"http://collectd.org/index.shtml\">Collectd</a>，" +#~ "并使用<a href=\"http://oss.oetiker.ch/rrdtool/\">RRD工具</a>来渲染图表，用" +#~ "于收集数据。" + #~ msgid "group name" #~ msgstr "群名称" diff --git a/applications/luci-app-statistics/po/zh-tw/statistics.po b/applications/luci-app-statistics/po/zh-tw/statistics.po index b87e114b93..367f567245 100644 --- a/applications/luci-app-statistics/po/zh-tw/statistics.po +++ b/applications/luci-app-statistics/po/zh-tw/statistics.po @@ -22,6 +22,9 @@ msgstr "" msgid "Add notification command" msgstr "" +msgid "Aggregate number of connected users" +msgstr "" + msgid "Base Directory" msgstr "" @@ -55,9 +58,6 @@ msgstr "" msgid "CollectTopology" msgstr "" -msgid "Collectd" -msgstr "" - msgid "Collectd Settings" msgstr "" @@ -121,6 +121,12 @@ msgstr "" msgid "Enable this plugin" msgstr "" +msgid "Entropy" +msgstr "" + +msgid "Entropy Plugin Configuration" +msgstr "" + msgid "Exec" msgstr "" @@ -139,6 +145,15 @@ msgstr "" msgid "Forwarding between listen and server addresses" msgstr "" +msgid "Gather compression statistics" +msgstr "" + +msgid "General plugins" +msgstr "" + +msgid "Generate a separate graph for each logged user" +msgstr "" + msgid "Graphs" msgstr "" @@ -161,6 +176,9 @@ msgid "" "are selected." msgstr "" +msgid "Hold Ctrl to select multiple items or to deselect entries." +msgstr "" + msgid "Host" msgstr "" @@ -224,6 +242,9 @@ msgstr "" msgid "Monitor all local listen ports" msgstr "" +msgid "Monitor all sensors" +msgstr "" + msgid "Monitor devices" msgstr "" @@ -287,6 +308,15 @@ msgstr "" msgid "Only create average RRAs" msgstr "" +msgid "OpenVPN" +msgstr "" + +msgid "OpenVPN Plugin Configuration" +msgstr "" + +msgid "OpenVPN status files" +msgstr "" + msgid "Options" msgstr "" @@ -344,12 +374,24 @@ msgstr "" msgid "Seconds" msgstr "" +msgid "Sensor list" +msgstr "" + +msgid "Sensors" +msgstr "" + +msgid "Sensors Plugin Configuration" +msgstr "" + msgid "Server host" msgstr "" msgid "Server port" msgstr "" +msgid "Setup" +msgstr "" + msgid "Shaping class monitoring" msgstr "" @@ -398,9 +440,6 @@ msgstr "" msgid "System Load" msgstr "" -msgid "System plugins" -msgstr "" - msgid "TCP Connections" msgstr "" @@ -425,6 +464,11 @@ msgid "" msgstr "" msgid "" +"The OpenVPN plugin gathers information about the current vpn connection " +"status." +msgstr "" + +msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." msgstr "" @@ -459,6 +503,9 @@ msgid "" "be used in other ways as well." msgstr "" +msgid "The entropy plugin collects statistics about the available entropy." +msgstr "" + msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." @@ -519,14 +566,19 @@ msgid "" msgstr "" msgid "" +"The sensors plugin uses the Linux Sensors framework to gather environmental " +"statistics." +msgstr "" + +msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" msgid "" -"The statistics package is based on <a href=\"http://collectd.org/index.shtml" -"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD " -"Tool</a> to render diagram images from collected data." +"The statistics package uses <a href=\"https://collectd.org/\">Collectd</a> " +"to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " +"render diagram images." msgstr "" msgid "" @@ -575,6 +627,9 @@ msgstr "" msgid "Uptime Plugin Configuration" msgstr "" +msgid "Use improved naming schema" +msgstr "" + msgid "Used PID file" msgstr "" @@ -590,6 +645,10 @@ msgstr "" msgid "Wireless iwinfo Plugin Configuration" msgstr "" +msgid "" +"You can install additional collectd-mod-* plugins to enable more statistics." +msgstr "" + msgid "e.g. br-ff" msgstr "" diff --git a/applications/luci-app-statistics/root/etc/config/luci_statistics b/applications/luci-app-statistics/root/etc/config/luci_statistics index abcee3e938..de16f29de9 100644 --- a/applications/luci-app-statistics/root/etc/config/luci_statistics +++ b/applications/luci-app-statistics/root/etc/config/luci_statistics @@ -140,6 +140,9 @@ config statistics 'collectd_processes' option enable '0' option Processes 'uhttpd dnsmasq dropbear' +config statistics 'collectd_sensors' + option enable '0' + config statistics 'collectd_splash_leases' option enable '0' diff --git a/applications/luci-app-statistics/root/usr/bin/stat-genconfig b/applications/luci-app-statistics/root/usr/bin/stat-genconfig index 8acae46c61..49d8a09935 100755 --- a/applications/luci-app-statistics/root/usr/bin/stat-genconfig +++ b/applications/luci-app-statistics/root/usr/bin/stat-genconfig @@ -187,9 +187,9 @@ function _list_expand( c, l, nopad ) end if n:find("(%w+)ses") then - k = n:gsub("(%w+)ses", "%1s") + k = n:gsub("(%w+)ses$", "%1s") else - k = n:gsub("(%w+)s", "%1") + k = n:gsub("(%w+)s$", "%1") end str = str .. _expand( c[n], k, nopad ) @@ -375,6 +375,12 @@ plugins = { { } }, + openvpn = { + { }, + { "CollectIndividualUsers", "CollectUserCount", "CollectCompression", "ImprovedNamingSchema" }, + { "StatusFile" } + }, + ping = { { "TTL", "Interval" }, { }, @@ -393,6 +399,12 @@ plugins = { { "RRATimespans" } }, + sensors = { + { }, + { "IgnoreSelected" }, + { "Sensor" } + }, + splash_leases = { { }, { }, diff --git a/applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm b/applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm index c85a206bd3..d43a887b07 100644 --- a/applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm +++ b/applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm @@ -41,7 +41,7 @@ end <%+header%> <div class="cbi-map"> - <h2><a id="content" name="content"><%:Tinyproxy Status%></a></h2> + <h2 name="content"><%:Tinyproxy Status%></h2> <div class="cbi-section"> <iframe src="<%=REQUESTURL%>?frame=1" style="width:100%; height:350px; border:none"></iframe> </div> diff --git a/applications/luci-app-upnp/luasrc/controller/upnp.lua b/applications/luci-app-upnp/luasrc/controller/upnp.lua index 790bf29d8c..a0e2fd5a5b 100644 --- a/applications/luci-app-upnp/luasrc/controller/upnp.lua +++ b/applications/luci-app-upnp/luasrc/controller/upnp.lua @@ -15,7 +15,7 @@ function index() page.dependent = true entry({"admin", "services", "upnp", "status"}, call("act_status")).leaf = true - entry({"admin", "services", "upnp", "delete"}, call("act_delete")).leaf = true + entry({"admin", "services", "upnp", "delete"}, post("act_delete")).leaf = true end function act_status() diff --git a/applications/luci-app-upnp/luasrc/view/upnp_status.htm b/applications/luci-app-upnp/luasrc/view/upnp_status.htm index d50ed0c4d7..e358dcded3 100644 --- a/applications/luci-app-upnp/luasrc/view/upnp_status.htm +++ b/applications/luci-app-upnp/luasrc/view/upnp_status.htm @@ -1,6 +1,6 @@ <script type="text/javascript">//< to submit your patch. - @@ -30,7 +30,7 @@ LUCI_LANG.pt-br=Português do Brasil (Brazialian Portuguese) LUCI_LANG.pt=Português (Portuguese) LUCI_LANG.ro=Română (Romanian) LUCI_LANG.ru=Русский (Russian) -LUCI_LANG.sk=Slovenčina (Slovene) +LUCI_LANG.sk=Slovenčina (Slovak) LUCI_LANG.sv=Svenska (Swedish) LUCI_LANG.tr=Türkçe (Turkish) LUCI_LANG.uk=украї́нська (Ukrainian) diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/bridge.png b/modules/luci-base/htdocs/luci-static/resources/icons/bridge.png Binary files differindex 4c163bf692..7faadecf92 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/bridge.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/bridge.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/bridge_disabled.png b/modules/luci-base/htdocs/luci-static/resources/icons/bridge_disabled.png Binary files differindex 0f367c5369..b3e620b3a1 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/bridge_disabled.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/bridge_disabled.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/encryption.png b/modules/luci-base/htdocs/luci-static/resources/icons/encryption.png Binary files differindex 41d2ba9ace..7762833604 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/encryption.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/encryption.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/encryption_disabled.png b/modules/luci-base/htdocs/luci-static/resources/icons/encryption_disabled.png Binary files differindex f2e05a4251..9a8721b02c 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/encryption_disabled.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/encryption_disabled.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/ethernet.png b/modules/luci-base/htdocs/luci-static/resources/icons/ethernet.png Binary files differindex a02538124c..e3d24f2791 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/ethernet.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/ethernet.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/ethernet_disabled.png b/modules/luci-base/htdocs/luci-static/resources/icons/ethernet_disabled.png Binary files differindex 2bb02e455a..d8792df54b 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/ethernet_disabled.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/ethernet_disabled.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/port_down.png b/modules/luci-base/htdocs/luci-static/resources/icons/port_down.png Binary files differindex 25ea172324..5a2b235d0a 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/port_down.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/port_down.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/port_up.png b/modules/luci-base/htdocs/luci-static/resources/icons/port_up.png Binary files differindex e063037910..8105e77d08 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/port_up.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/port_up.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/signal-0-25.png b/modules/luci-base/htdocs/luci-static/resources/icons/signal-0-25.png Binary files differindex 2e5dff4663..b3a8118afc 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/signal-0-25.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/signal-0-25.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/signal-0.png b/modules/luci-base/htdocs/luci-static/resources/icons/signal-0.png Binary files differindex 114583a676..333b1557ba 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/signal-0.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/signal-0.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/signal-25-50.png b/modules/luci-base/htdocs/luci-static/resources/icons/signal-25-50.png Binary files differindex ee8cc4f1ce..b465de3f57 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/signal-25-50.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/signal-25-50.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/signal-50-75.png b/modules/luci-base/htdocs/luci-static/resources/icons/signal-50-75.png Binary files differindex 26bcbf715d..cd7bcaf9a6 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/signal-50-75.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/signal-50-75.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/signal-75-100.png b/modules/luci-base/htdocs/luci-static/resources/icons/signal-75-100.png Binary files differindex 5cffaa1b84..f7a3658df8 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/signal-75-100.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/signal-75-100.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/signal-none.png b/modules/luci-base/htdocs/luci-static/resources/icons/signal-none.png Binary files differindex b77585c0f0..4a11356af2 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/signal-none.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/signal-none.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/switch.png b/modules/luci-base/htdocs/luci-static/resources/icons/switch.png Binary files differindex 5c99ba5684..be99b19bad 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/switch.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/switch.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/switch_disabled.png b/modules/luci-base/htdocs/luci-static/resources/icons/switch_disabled.png Binary files differindex b8c84c8dc4..54588d24d1 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/switch_disabled.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/switch_disabled.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/tunnel.png b/modules/luci-base/htdocs/luci-static/resources/icons/tunnel.png Binary files differindex c5a09dd685..63eabfef59 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/tunnel.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/tunnel.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/tunnel_disabled.png b/modules/luci-base/htdocs/luci-static/resources/icons/tunnel_disabled.png Binary files differindex ad9856cfec..ca79d81707 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/tunnel_disabled.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/tunnel_disabled.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/vlan.png b/modules/luci-base/htdocs/luci-static/resources/icons/vlan.png Binary files differindex 5c99ba5684..be99b19bad 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/vlan.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/vlan.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/vlan_disabled.png b/modules/luci-base/htdocs/luci-static/resources/icons/vlan_disabled.png Binary files differindex b8c84c8dc4..54588d24d1 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/vlan_disabled.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/vlan_disabled.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/wifi.png b/modules/luci-base/htdocs/luci-static/resources/icons/wifi.png Binary files differindex 528ce2b4e9..80a23e8e9a 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/wifi.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/wifi.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/wifi_big.png b/modules/luci-base/htdocs/luci-static/resources/icons/wifi_big.png Binary files differindex d73a5e7401..9e466aebf4 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/wifi_big.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/wifi_big.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/wifi_big_disabled.png b/modules/luci-base/htdocs/luci-static/resources/icons/wifi_big_disabled.png Binary files differindex af93b37b7a..6f9fff3813 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/wifi_big_disabled.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/wifi_big_disabled.png diff --git a/modules/luci-base/htdocs/luci-static/resources/icons/wifi_disabled.png b/modules/luci-base/htdocs/luci-static/resources/icons/wifi_disabled.png Binary files differindex 338a34f78c..e989a2bd3d 100644 --- a/modules/luci-base/htdocs/luci-static/resources/icons/wifi_disabled.png +++ b/modules/luci-base/htdocs/luci-static/resources/icons/wifi_disabled.png diff --git a/modules/luci-base/luasrc/cbi.lua b/modules/luci-base/luasrc/cbi.lua index f3d4618b65..a0090958f6 100644 --- a/modules/luci-base/luasrc/cbi.lua +++ b/modules/luci-base/luasrc/cbi.lua @@ -367,63 +367,64 @@ end -- Use optimized UCI writing function Map.parse(self, readinput, ...) - self.readinput = (readinput ~= false) - self:_run_hooks("on_parse") - if self:formvalue("cbi.skip") then self.state = FORM_SKIP + elseif not self.save then + self.state = FORM_INVALID + elseif not self:submitstate() then + self.state = FORM_NODATA + end + + -- Back out early to prevent unauthorized changes on the subsequent parse + if self.state ~= nil then return self:state_handler(self.state) end + self.readinput = (readinput ~= false) + self:_run_hooks("on_parse") + Node.parse(self, ...) - if self.save then - self:_run_hooks("on_save", "on_before_save") + self:_run_hooks("on_save", "on_before_save") + for i, config in ipairs(self.parsechain) do + self.uci:save(config) + end + self:_run_hooks("on_after_save") + if (not self.proceed and self.flow.autoapply) or luci.http.formvalue("cbi.apply") then + self:_run_hooks("on_before_commit") for i, config in ipairs(self.parsechain) do - self.uci:save(config) - end - self:_run_hooks("on_after_save") - if self:submitstate() and ((not self.proceed and self.flow.autoapply) or luci.http.formvalue("cbi.apply")) then - self:_run_hooks("on_before_commit") - for i, config in ipairs(self.parsechain) do - self.uci:commit(config) - - -- Refresh data because commit changes section names - self.uci:load(config) - end - self:_run_hooks("on_commit", "on_after_commit", "on_before_apply") - if self.apply_on_parse then - self.uci:apply(self.parsechain) - self:_run_hooks("on_apply", "on_after_apply") - else - -- This is evaluated by the dispatcher and delegated to the - -- template which in turn fires XHR to perform the actual - -- apply actions. - self.apply_needed = true - end - - -- Reparse sections - Node.parse(self, true) + self.uci:commit(config) + -- Refresh data because commit changes section names + self.uci:load(config) end - for i, config in ipairs(self.parsechain) do - self.uci:unload(config) - end - if type(self.commit_handler) == "function" then - self:commit_handler(self:submitstate()) + self:_run_hooks("on_commit", "on_after_commit", "on_before_apply") + if self.apply_on_parse then + self.uci:apply(self.parsechain) + self:_run_hooks("on_apply", "on_after_apply") + else + -- This is evaluated by the dispatcher and delegated to the + -- template which in turn fires XHR to perform the actual + -- apply actions. + self.apply_needed = true end + + -- Reparse sections + Node.parse(self, true) + end + for i, config in ipairs(self.parsechain) do + self.uci:unload(config) + end + if type(self.commit_handler) == "function" then + self:commit_handler(self:submitstate()) end - if self:submitstate() then - if not self.save then - self.state = FORM_INVALID - elseif self.proceed then - self.state = FORM_PROCEED - else - self.state = self.changed and FORM_CHANGED or FORM_VALID - end + if self.proceed then + self.state = FORM_PROCEED + elseif self.changed then + self.state = FORM_CHANGED else - self.state = FORM_NODATA + self.state = FORM_VALID end return self:state_handler(self.state) diff --git a/modules/luci-base/luasrc/controller/admin/servicectl.lua b/modules/luci-base/luasrc/controller/admin/servicectl.lua index 5b855cb24b..1d73eb4ecc 100644 --- a/modules/luci-base/luasrc/controller/admin/servicectl.lua +++ b/modules/luci-base/luasrc/controller/admin/servicectl.lua @@ -6,7 +6,7 @@ module("luci.controller.admin.servicectl", package.seeall) function index() entry({"servicectl"}, alias("servicectl", "status")).sysauth = "root" entry({"servicectl", "status"}, call("action_status")).leaf = true - entry({"servicectl", "restart"}, call("action_restart")).leaf = true + entry({"servicectl", "restart"}, post("action_restart")).leaf = true end function action_status() diff --git a/modules/luci-base/luasrc/dispatcher.lua b/modules/luci-base/luasrc/dispatcher.lua index 8b8d1fa349..cd5d77a12b 100644 --- a/modules/luci-base/luasrc/dispatcher.lua +++ b/modules/luci-base/luasrc/dispatcher.lua @@ -1,4 +1,5 @@ -- Copyright 2008 Steven Barth <steven@midlink.org> +-- Copyright 2008-2015 Jo-Philipp Wich <jow@openwrt.org> -- Licensed to the public under the Apache License 2.0. local fs = require "nixio.fs" @@ -26,14 +27,6 @@ function build_url(...) local path = {...} local url = { http.getenv("SCRIPT_NAME") or "" } - local k, v - for k, v in pairs(context.urltoken) do - url[#url+1] = "/;" - url[#url+1] = http.urlencode(k) - url[#url+1] = "=" - url[#url+1] = http.urlencode(v) - end - local p for _, p in ipairs(path) do if p:match("^[a-zA-Z0-9_%-%.%%/,;]+$") then @@ -42,6 +35,10 @@ function build_url(...) end end + if #path == 0 then + url[#url+1] = "/" + end + return table.concat(url, "") end @@ -112,24 +109,11 @@ function authenticator.htmlauth(validator, accs, default) return user end - if context.urltoken.stok then - context.urltoken.stok = nil - - local cookie = 'sysauth=%s; expires=%s; path=%s/' %{ - http.getcookie('sysauth') or 'x', - 'Thu, 01 Jan 1970 01:00:00 GMT', - build_url() - } - - http.header("Set-Cookie", cookie) - http.redirect(build_url()) - else - require("luci.i18n") - require("luci.template") - context.path = {} - http.status(403, "Forbidden") - luci.template.render("sysauth", {duser=default, fuser=user}) - end + require("luci.i18n") + require("luci.template") + context.path = {} + http.status(403, "Forbidden") + luci.template.render("sysauth", {duser=default, fuser=user}) return false @@ -140,7 +124,6 @@ function httpdispatch(request, prefix) local r = {} context.request = r - context.urltoken = {} local pathinfo = http.urldecode(request:getenv("PATH_INFO") or "", true) @@ -150,18 +133,8 @@ function httpdispatch(request, prefix) end end - local tokensok = true for node in pathinfo:gmatch("[^/]+") do - local tkey, tval - if tokensok then - tkey, tval = node:match(";(%w+)=([a-fA-F0-9]*)") - end - if tkey then - context.urltoken[tkey] = tval - else - tokensok = false - r[#r+1] = node - end + r[#r+1] = node end local stat, err = util.coxpcall(function() @@ -173,6 +146,48 @@ function httpdispatch(request, prefix) --context._disable_memtrace() end +local function require_post_security(target) + if type(target) == "table" then + if type(target.post) == "table" then + local param_name, required_val, request_val + + for param_name, required_val in pairs(target.post) do + request_val = http.formvalue(param_name) + + if (type(required_val) == "string" and + request_val ~= required_val) or + (required_val == true and + (request_val == nil or request_val == "")) + then + return false + end + end + + return true + end + + return (target.post == true) + end + + return false +end + +function test_post_security() + if http.getenv("REQUEST_METHOD") ~= "POST" then + http.status(405, "Method Not Allowed") + http.header("Allow", "POST") + return false + end + + if http.formvalue("token") ~= context.authtoken then + http.status(403, "Forbidden") + luci.template.render("csrftoken") + return false + end + + return true +end + function dispatch(request) --context._disable_memtrace = require "luci.debug".trap_memtrace("l") local ctx = context @@ -206,7 +221,6 @@ function dispatch(request) ctx.args = args ctx.requestargs = ctx.requestargs or args local n - local token = ctx.urltoken local preq = {} local freq = {} @@ -284,11 +298,14 @@ function dispatch(request) resource = luci.config.main.resourcebase; ifattr = function(...) return _ifattr(...) end; attr = function(...) return _ifattr(true, ...) end; + url = build_url; }, {__index=function(table, key) if key == "controller" then return build_url() elseif key == "REQUEST_URI" then return build_url(unpack(ctx.requestpath)) + elseif key == "token" then + return ctx.authtoken else return rawget(table, key) or _G[key] end @@ -311,20 +328,17 @@ function dispatch(request) local def = (type(track.sysauth) == "string") and track.sysauth local accs = def and {track.sysauth} or track.sysauth local sess = ctx.authsession - local verifytoken = false if not sess then sess = http.getcookie("sysauth") sess = sess and sess:match("^[a-f0-9]*$") - verifytoken = true end local sdat = (util.ubus("session", "get", { ubus_rpc_session = sess }) or { }).values - local user + local user, token if sdat then - if not verifytoken or ctx.urltoken.stok == sdat.token then - user = sdat.user - end + user = sdat.user + token = sdat.token else local eu = http.getenv("HTTP_AUTH_USER") local ep = http.getenv("HTTP_AUTH_PASS") @@ -357,12 +371,10 @@ function dispatch(request) end if sess and token then - http.header("Set-Cookie", 'sysauth=%s; path=%s/' %{ - sess, build_url() - }) + http.header("Set-Cookie", 'sysauth=%s; path=%s' %{ sess, build_url() }) - ctx.urltoken.stok = token ctx.authsession = sess + ctx.authtoken = token ctx.authuser = user http.redirect(build_url(unpack(ctx.requestpath))) @@ -374,10 +386,17 @@ function dispatch(request) end else ctx.authsession = sess + ctx.authtoken = token ctx.authuser = user end end + if c and require_post_security(c.target) then + if not test_post_security(c) then + return + end + end + if track.setgroup then sys.process.setgroup(track.setgroup) end @@ -703,6 +722,20 @@ function call(name, ...) return {type = "call", argv = {...}, name = name, target = _call} end +function post_on(params, name, ...) + return { + type = "call", + post = params, + argv = { ... }, + name = name, + target = _call + } +end + +function post(...) + return post_on(true, ...) +end + local _template = function(self, ...) require "luci.template".render(self.view) @@ -814,7 +847,13 @@ local function _cbi(self, ...) end function cbi(model, config) - return {type = "cbi", config = config, model = model, target = _cbi} + return { + type = "cbi", + post = { ["cbi.submit"] = "1" }, + config = config, + model = model, + target = _cbi + } end @@ -854,7 +893,12 @@ local function _form(self, ...) end function form(model) - return {type = "cbi", model = model, target = _form} + return { + type = "cbi", + post = { ["cbi.submit"] = "1" }, + model = model, + target = _form + } end translate = i18n.translate diff --git a/modules/luci-base/luasrc/model/ipkg.lua b/modules/luci-base/luasrc/model/ipkg.lua index 2ed92ca706..e653b03465 100644 --- a/modules/luci-base/luasrc/model/ipkg.lua +++ b/modules/luci-base/luasrc/model/ipkg.lua @@ -139,11 +139,13 @@ local function _list(action, pat, cb) desc = "" end - if #version > 26 then - version = version:sub(1,21) .. ".." .. version:sub(-3,-1) - end + if name and version then + if #version > 26 then + version = version:sub(1,21) .. ".." .. version:sub(-3,-1) + end - cb(name, version, sz, desc) + cb(name, version, sz, desc) + end name = nil version = nil @@ -238,4 +240,3 @@ function compare_versions(ver1, comp, ver2) -- all equal and not compare greater or lower then true return not (comp == "<" or comp == ">") end - diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua index b109c712ec..ff13b1ccd2 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua @@ -105,6 +105,7 @@ TZ = { { 'America/Edmonton', 'MST7MDT,M3.2.0,M11.1.0' }, { 'America/Eirunepe', 'ACT5' }, { 'America/El Salvador', 'CST6' }, + { 'America/Fort Nelson', 'MST7' }, { 'America/Fortaleza', 'BRT3' }, { 'America/Glace Bay', 'AST4ADT,M3.2.0,M11.1.0' }, { 'America/Godthab', 'WGT3WGST,M3.5.0/-2,M10.5.0/-1' }, @@ -388,7 +389,7 @@ TZ = { { 'Pacific/Efate', 'VUT-11' }, { 'Pacific/Enderbury', 'PHOT-13' }, { 'Pacific/Fakaofo', 'TKT-13' }, - { 'Pacific/Fiji', 'FJT-12FJST,M11.1.0,M1.3.4/75' }, + { 'Pacific/Fiji', 'FJT-12FJST,M11.1.0,M1.3.0/3' }, { 'Pacific/Funafuti', 'TVT-12' }, { 'Pacific/Galapagos', 'GALT6' }, { 'Pacific/Gambier', 'GAMT9' }, @@ -404,7 +405,7 @@ TZ = { { 'Pacific/Midway', 'SST11' }, { 'Pacific/Nauru', 'NRT-12' }, { 'Pacific/Niue', 'NUT11' }, - { 'Pacific/Norfolk', 'NFT-11:30' }, + { 'Pacific/Norfolk', 'NFT-11' }, { 'Pacific/Noumea', 'NCT-11' }, { 'Pacific/Pago Pago', 'SST11' }, { 'Pacific/Palau', 'PWT-9' }, diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua index f156f3663a..53c8adbc69 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua @@ -152,7 +152,7 @@ OFFSET = { sst = -39600, -- SST nrt = 43200, -- NRT nut = -39600, -- NUT - nft = 41400, -- NFT + nft = 39600, -- NFT nct = 39600, -- NCT pwt = 32400, -- PWT pont = 39600, -- PONT diff --git a/modules/luci-base/luasrc/view/cbi/apply_xhr.htm b/modules/luci-base/luasrc/view/cbi/apply_xhr.htm index 1814c9393b..daa57c1db7 100644 --- a/modules/luci-base/luasrc/view/cbi/apply_xhr.htm +++ b/modules/luci-base/luasrc/view/cbi/apply_xhr.htm @@ -4,10 +4,10 @@ <script type="text/javascript">//<![CDATA[ var apply_xhr = new XHR(); - apply_xhr.get('<%=luci.dispatcher.build_url("servicectl", "restart", table.concat(configs, ","))%>', null, + apply_xhr.post('<%=url('servicectl/restart', table.concat(configs, ","))%>', { token: '<%=token%>' }, function() { var checkfinish = function() { - apply_xhr.get('<%=luci.dispatcher.build_url("servicectl", "status")%>', null, + apply_xhr.get('<%=url('servicectl/status')%>', null, function(x) { if( x.responseText == 'finish' ) { diff --git a/modules/luci-base/luasrc/view/cbi/browser.htm b/modules/luci-base/luasrc/view/cbi/browser.htm index e4a4077d55..a18120141d 100644 --- a/modules/luci-base/luasrc/view/cbi/browser.htm +++ b/modules/luci-base/luasrc/view/cbi/browser.htm @@ -2,6 +2,6 @@ <%+cbi/valueheader%> <input class="cbi-input-text" type="text"<%= attr("value", v) .. attr("name", cbid) .. attr("id", cbid) %> /> <script type="text/javascript"> -cbi_browser_init('<%=cbid%>', '<%=resource%>', '<%=luci.dispatcher.build_url("admin", "filebrowser")%>'<%=self.default_path and ", '"..self.default_path.."'"%>); +cbi_browser_init('<%=cbid%>', '<%=resource%>', '<%=url('admin/filebrowser')%>'<%=self.default_path and ", '"..self.default_path.."'"%>); </script> <%+cbi/valuefooter%> diff --git a/modules/luci-base/luasrc/view/cbi/error.htm b/modules/luci-base/luasrc/view/cbi/error.htm index 2acb96924e..75ec1082aa 100644 --- a/modules/luci-base/luasrc/view/cbi/error.htm +++ b/modules/luci-base/luasrc/view/cbi/error.htm @@ -1,5 +1,5 @@ <div class="cbi-map" id="cbi-<%=self.config%>"> - <% if self.title and #self.title > 0 then %><h2><a id="content" name="content"><%=self.title%></a></h2><% end %> + <% if self.title and #self.title > 0 then %><h2 name="content"><%=self.title%></h2><% end %> <% if self.description and #self.description > 0 then %><div class="cbi-map-descr"><%=self.description%></div><% end %> <p class="alert-message danger"> diff --git a/modules/luci-base/luasrc/view/cbi/header.htm b/modules/luci-base/luasrc/view/cbi/header.htm index 2bddaba61a..302df1d2fd 100644 --- a/modules/luci-base/luasrc/view/cbi/header.htm +++ b/modules/luci-base/luasrc/view/cbi/header.htm @@ -2,6 +2,7 @@ <form method="post" name="cbi" action="<%=REQUEST_URI%>" enctype="multipart/form-data" onreset="return cbi_validate_reset(this)" onsubmit="return cbi_validate_form(this, '<%:Some fields are invalid, cannot save values!%>')"> <div> <script type="text/javascript" src="<%=resource%>/cbi.js"></script> + <input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="cbi.submit" value="1" /> <input type="submit" value="<%:Save%>" class="hidden" /> </div> diff --git a/modules/luci-base/luasrc/view/cbi/map.htm b/modules/luci-base/luasrc/view/cbi/map.htm index 053220d185..e90c3f589f 100644 --- a/modules/luci-base/luasrc/view/cbi/map.htm +++ b/modules/luci-base/luasrc/view/cbi/map.htm @@ -5,7 +5,7 @@ <%-+cbi/apply_xhr-%> <div class="cbi-map" id="cbi-<%=self.config%>"> - <% if self.title and #self.title > 0 then %><h2><a id="content" name="content"><%=self.title%></a></h2><% end %> + <% if self.title and #self.title > 0 then %><h2 name="content"><%=self.title%></h2><% end %> <% if self.description and #self.description > 0 then %><div class="cbi-map-descr"><%=self.description%></div><% end %> <%- if firstmap and applymap then cbi_apply_xhr(self.config, parsechain, redirect) end -%> <%- self:render_children() %> diff --git a/modules/luci-base/luasrc/view/cbi/simpleform.htm b/modules/luci-base/luasrc/view/cbi/simpleform.htm index 5216cd50f1..78f5c5a544 100644 --- a/modules/luci-base/luasrc/view/cbi/simpleform.htm +++ b/modules/luci-base/luasrc/view/cbi/simpleform.htm @@ -2,11 +2,12 @@ <form method="post" enctype="multipart/form-data" action="<%=REQUEST_URI%>"> <div> <script type="text/javascript" src="<%=resource%>/cbi.js"></script> + <input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="cbi.submit" value="1" /> </div> <% end %> <div class="cbi-map" id="cbi-<%=self.config%>"> - <% if self.title and #self.title > 0 then %><h2><a id="content" name="content"><%=self.title%></a></h2><% end %> + <% if self.title and #self.title > 0 then %><h2 name="content"><%=self.title%></h2><% end %> <% if self.description and #self.description > 0 then %><div class="cbi-map-descr"><%=self.description%></div><% end %> <% self:render_children() %> <br /> diff --git a/modules/luci-base/luasrc/view/csrftoken.htm b/modules/luci-base/luasrc/view/csrftoken.htm new file mode 100644 index 0000000000..57ac03f3bf --- /dev/null +++ b/modules/luci-base/luasrc/view/csrftoken.htm @@ -0,0 +1,24 @@ +<%# + Copyright 2015 Jo-Philipp Wich <jow@openwrt.org> + Licensed to the public under the Apache License 2.0. +-%> + +<%+header%> + +<h2 name="content"><%:Form token mismatch%></h2> +<br /> + +<p class="alert-message"><%:The submitted security token is invalid or already expired!%></p> + +<p><%: + In order to prevent unauthorized access to the system, your request has + been blocked. Click "Continue »" below to return to the previous page. +%></p> + +<hr /> + +<p class="right"> + <strong><a href="#" onclick="window.history.back();">Continue »</a></strong> +</p> + +<%+footer%> diff --git a/modules/luci-base/luasrc/view/error404.htm b/modules/luci-base/luasrc/view/error404.htm index c2be29ed58..bc74226830 100644 --- a/modules/luci-base/luasrc/view/error404.htm +++ b/modules/luci-base/luasrc/view/error404.htm @@ -5,7 +5,7 @@ -%> <%+header%> -<h2><a id="content" name="content">404 <%:Not Found%></a></h2> +<h2 name="content">404 <%:Not Found%></h2> <p><%:Sorry, the object you requested was not found.%></p> <tt><%:Unable to dispatch%>: <%=luci.http.request.env.PATH_INFO%></tt> <%+footer%> diff --git a/modules/luci-base/luasrc/view/error500.htm b/modules/luci-base/luasrc/view/error500.htm index 8fb18ed076..34a52cda84 100644 --- a/modules/luci-base/luasrc/view/error500.htm +++ b/modules/luci-base/luasrc/view/error500.htm @@ -5,7 +5,7 @@ -%> <%+header%> -<h2><a id="content" name="content">500 <%:Internal Server Error%></a></h2> +<h2 name="content">500 <%:Internal Server Error%></h2> <p><%:Sorry, the server encountered an unexpected error.%></p> <pre class="error500"><%=message%></pre> <%+footer%> diff --git a/modules/luci-base/luasrc/view/sysauth.htm b/modules/luci-base/luasrc/view/sysauth.htm index 7f0f0a622b..e207504911 100644 --- a/modules/luci-base/luasrc/view/sysauth.htm +++ b/modules/luci-base/luasrc/view/sysauth.htm @@ -8,7 +8,7 @@ <form method="post" action="<%=pcdata(luci.http.getenv("REQUEST_URI"))%>"> <div class="cbi-map"> - <h2><a id="content" name="content"><%:Authorization Required%></a></h2> + <h2 name="content"><%:Authorization Required%></h2> <div class="cbi-map-descr"> <%:Please enter your username and password.%> <%- if fuser then %> diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index 2252e7c951..378b29511b 100644 --- a/modules/luci-base/po/ca/base.po +++ b/modules/luci-base/po/ca/base.po @@ -46,6 +46,9 @@ msgstr "Càrrega d'1 minut:" msgid "15 Minute Load:" msgstr "Càrrega de 15 minuts:" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "Càrrega de 5 minuts:" @@ -207,6 +210,9 @@ msgstr "Afegeix una interfície nova..." msgid "Additional Hosts files" msgstr "Fitxers de Hosts addicionals" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "Adreça" @@ -334,6 +340,9 @@ msgstr "Paquets disponibles" msgid "Average:" msgstr "Mitjana:" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "BSSID" @@ -410,6 +419,11 @@ msgstr "Controlador sense fil Broadcom BCM%04x 802.11" msgid "Buffered" msgstr "En memòria intermèdia" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "Botons" @@ -563,6 +577,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -659,6 +681,12 @@ msgstr "Dispositiu" msgid "Device Configuration" msgstr "Configuració de dispositiu" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "Diagnòstics" @@ -699,6 +727,9 @@ msgstr "Optimització de distància" msgid "Distance to farthest network member in meters." msgstr "Distància al membre de la xarxa més allunyat en metres." +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "Diversitat" @@ -769,6 +800,9 @@ msgid "" "having static leases will be served." msgstr "" +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "Mètode EAP" @@ -798,9 +832,6 @@ msgstr "Habilita l'<abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "Habilita negociació IPv6 en la enllaç PPP" - msgid "Enable Jumbo Frame passthrough" msgstr "Habilita el passatge de trames enormes" @@ -955,6 +986,9 @@ msgstr "Força el TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Força el TKIP i el CCMP (AES)" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "Reenvia el tràfic DHCP" @@ -994,6 +1028,9 @@ msgstr "Ajusts generals" msgid "General Setup" msgstr "" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "" @@ -1105,6 +1142,9 @@ msgstr "Màscara de xarxa IPv4" msgid "IPv4 only" msgstr "Només IPv4" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "Longitud de prefix IPv4" @@ -1200,8 +1240,8 @@ msgstr "" "es pot accedir al dispositiu d'intercanvi amb unes taxes tan altes com les " "de la <abbr title=\"Random Access Memory\">RAM</abbr>." -msgid "Ignore Hosts files" -msgstr "" +msgid "Ignore <code>/etc/hosts</code>" +msgstr "Ignora <code>/etc/hosts</code>" msgid "Ignore interface" msgstr "Ignora la interfície" @@ -1215,6 +1255,11 @@ msgstr "Imatge" msgid "In" msgstr "En" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "Temps d'espera d'inactivitat" @@ -1484,6 +1529,9 @@ msgstr "Filtre MAC" msgid "MAC-List" msgstr "Llista MAC" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -1498,6 +1546,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "Velocitat màxima" @@ -1607,6 +1658,9 @@ msgstr "Adreça de difusió selectiva" msgid "NAS ID" msgstr "NAS ID" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1837,6 +1891,12 @@ msgstr "PPPoE" msgid "PPtP" msgstr "PPtP" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "Es requereix el paquet libiwinfo!" @@ -1864,9 +1924,6 @@ msgstr "Contrasenya de la clau privada" msgid "Password successfully changed!" msgstr "La contrasenya s'ha canviat amb èxit!" -msgid "Path" -msgstr "Ruta" - msgid "Path to CA-Certificate" msgstr "Ruta als Certificats CA" @@ -1903,9 +1960,6 @@ msgstr "Paquets" msgid "Please enter your username and password." msgstr "Si us plau entra el teu nom d'usuari i contrasenya." -msgid "Please wait: Device rebooting..." -msgstr "Si us plau espera: Dispositiu arrancant-se de nou" - msgid "Policy" msgstr "Política" @@ -2282,6 +2336,9 @@ msgstr "Senyal:" msgid "Size" msgstr "Mida" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "Salta" @@ -2545,6 +2602,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "El protocol seleccionat necessita un dispositiu assignat" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2602,6 +2662,12 @@ msgid "This IPv4 address of the relay" msgstr "" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -2920,13 +2986,14 @@ msgstr "Esperant que s'apliquin els canvis..." msgid "Waiting for command to complete..." msgstr "Esperant que s'acabi l'ordre..." +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "Advertència" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "" -"Advertència: Hi ha canvis que no s'han desat i que es perdran mentre " -"s'arranca de nou!" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3159,6 +3226,21 @@ msgstr "sí" msgid "« Back" msgstr "« Enrere" +#~ msgid "Enable IPv6 negotiation on the PPP link" +#~ msgstr "Habilita negociació IPv6 en la enllaç PPP" + +#~ msgid "Path" +#~ msgstr "Ruta" + +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "Si us plau espera: Dispositiu arrancant-se de nou" + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "" +#~ "Advertència: Hi ha canvis que no s'han desat i que es perdran mentre " +#~ "s'arranca de nou!" + #~ msgid "" #~ "Always use 40MHz channels even if the secondary channel overlaps. Using " #~ "this option does not comply with IEEE 802.11n-2009!" @@ -3804,9 +3886,6 @@ msgstr "« Enrere" #~ msgid "Here you can configure installed wifi devices." #~ msgstr "Ací pots configurar els dispositius sense fils instal·lats." -#~ msgid "Ignore <code>/etc/hosts</code>" -#~ msgstr "Ignora <code>/etc/hosts</code>" - #~ msgid "Independent (Ad-Hoc)" #~ msgstr "Independent (Ad-Hoc)" diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po index 373602070c..da953ae697 100644 --- a/modules/luci-base/po/cs/base.po +++ b/modules/luci-base/po/cs/base.po @@ -44,6 +44,9 @@ msgstr "Zatížení za 1 minutu:" msgid "15 Minute Load:" msgstr "Zatížení za 15 minut:" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "Zatížení za 5 minut:" @@ -207,6 +210,9 @@ msgstr "Přidat rozhraní..." msgid "Additional Hosts files" msgstr "Dodatečné Hosts soubory" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "Adresa" @@ -334,6 +340,9 @@ msgstr "Dostupné balíčky" msgid "Average:" msgstr "Průměr:" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "BSSID" @@ -409,6 +418,11 @@ msgstr "Broadcom modul BCM%04x 802.11 bezdrátový ovladač" msgid "Buffered" msgstr "Bufferováno" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "Tlačítka" @@ -567,6 +581,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -665,6 +687,12 @@ msgstr "Zařízení" msgid "Device Configuration" msgstr "Nastavení zařízení" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "Diagnostika" @@ -705,6 +733,9 @@ msgstr "Optimalizace na vzdálenost" msgid "Distance to farthest network member in meters." msgstr "Vzdálenost nejodlehlejšího člena sítě v metrech." +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "Diverzita" @@ -779,6 +810,9 @@ msgstr "" "Pro klienty alokovat DHCP adresy dynamicky. Pokud je volba zakázána, budou " "obsloužení pouze klienti se statickými výpůjčkami." +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "Metoda EAP" @@ -808,9 +842,6 @@ msgstr "Povolit <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "Povolit dynamickou aktualizaci koncového bodu HE.net" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "Na PPP spoji povolit vyjednání IPv6" - msgid "Enable Jumbo Frame passthrough" msgstr "Povolit průchod jumbo rámců" @@ -967,6 +998,9 @@ msgstr "Vynutit TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Vynutit TKIP a CCMP (AES)" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "Přeposílat DHCP provoz" @@ -1006,6 +1040,9 @@ msgstr "Obecná nastavení" msgid "General Setup" msgstr "Obecné nastavení" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "Vytvorǐt archív" @@ -1116,6 +1153,9 @@ msgstr "IPv4 maska sítě" msgid "IPv4 only" msgstr "Pouze IPv4" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "Délka IPv4 prefixu" @@ -1211,8 +1251,8 @@ msgstr "" "přístup na odkládací zařízení je řádově pomalejší, než přístup do paměti " "<abbr title=\"Random Access Memory\">RAM</abbr>." -msgid "Ignore Hosts files" -msgstr "Ignorovat soubory Hosts" +msgid "Ignore <code>/etc/hosts</code>" +msgstr "" msgid "Ignore interface" msgstr "Ignorovat rozhraní" @@ -1226,6 +1266,11 @@ msgstr "Obraz" msgid "In" msgstr "Dovnitř" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "Časový limit nečinnosti" @@ -1506,6 +1551,9 @@ msgstr "Filtr MAC" msgid "MAC-List" msgstr "Seznam Mac" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -1520,6 +1568,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "Nejvyšší míra" @@ -1629,6 +1680,9 @@ msgstr "Adresa vícesměrového vysílání" msgid "NAS ID" msgstr "NAS ID" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1860,6 +1914,12 @@ msgstr "PPPoE" msgid "PPtP" msgstr "PPtP" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "Vyžadován balíček libiwinfo!" @@ -1887,9 +1947,6 @@ msgstr "Heslo privátního klíče" msgid "Password successfully changed!" msgstr "Heslo bylo úspěšně změněno!" -msgid "Path" -msgstr "" - msgid "Path to CA-Certificate" msgstr "Cesta k certifikátu CA" @@ -1926,9 +1983,6 @@ msgstr "Paketů" msgid "Please enter your username and password." msgstr "Prosím vložte vaše uživatelské jméno a heslo." -msgid "Please wait: Device rebooting..." -msgstr "Prosím počkejte: Provádím reboot..." - msgid "Policy" msgstr "Politika" @@ -2322,6 +2376,9 @@ msgstr "Signál:" msgid "Size" msgstr "Velikost" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "Přeskočit" @@ -2608,6 +2665,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "Vybraný protokol potřebuje mít přiřazeno zařízení" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2667,6 +2727,12 @@ msgid "This IPv4 address of the relay" msgstr "" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -2993,11 +3059,14 @@ msgstr "Čekání na realizaci změn..." msgid "Waiting for command to complete..." msgstr "Čekání na dokončení příkazu..." +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "Varování" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" -msgstr "Varování: Existují neuložené změny, které budou rebootem ztraceny!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" +msgstr "" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3227,6 +3296,19 @@ msgstr "ano" msgid "« Back" msgstr "« Zpět" +#~ msgid "Enable IPv6 negotiation on the PPP link" +#~ msgstr "Na PPP spoji povolit vyjednání IPv6" + +#~ msgid "Ignore Hosts files" +#~ msgstr "Ignorovat soubory Hosts" + +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "Prosím počkejte: Provádím reboot..." + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "Varování: Existují neuložené změny, které budou rebootem ztraceny!" + #~ msgid "" #~ "Always use 40MHz channels even if the secondary channel overlaps. Using " #~ "this option does not comply with IEEE 802.11n-2009!" diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index 361abdead9..f6980027a5 100644 --- a/modules/luci-base/po/de/base.po +++ b/modules/luci-base/po/de/base.po @@ -46,6 +46,9 @@ msgstr "Systemlast (1 Minute):" msgid "15 Minute Load:" msgstr "Systemlast (15 Minuten):" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "Systemlast (5 Minuten):" @@ -204,6 +207,9 @@ msgstr "Neue Schnittstelle hinzufügen..." msgid "Additional Hosts files" msgstr "Zusätzliche Hosts-Dateien" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "Adresse" @@ -334,6 +340,9 @@ msgstr "Verfügbare Pakete" msgid "Average:" msgstr "Durchschnitt:" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "BSSID" @@ -410,6 +419,11 @@ msgstr "Broadcom BCM%04x 802.11 W-LAN Adapter" msgid "Buffered" msgstr "Gepuffert" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "Knöpfe" @@ -565,6 +579,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "Passt das Verhalten der Geräte-LEDs an - wenn dies möglich ist." @@ -661,6 +683,12 @@ msgstr "Gerät" msgid "Device Configuration" msgstr "Gerätekonfiguration" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "Diagnosen" @@ -701,6 +729,9 @@ msgstr "Distanzoptimierung" msgid "Distance to farthest network member in meters." msgstr "Distanz zum am weitesten entfernten Funkpartner in Metern." +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "Diversität" @@ -775,6 +806,9 @@ msgstr "" "DHCP Adressen dynamisch erzeugen. Wenn dies deaktiviert ist, werden nur " "Clients mit konfigurierten statischen Leases bedient" +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "EAP-Methode" @@ -804,9 +838,6 @@ msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr> aktivieren" msgid "Enable HE.net dynamic endpoint update" msgstr "Dynamisches HE.net IP-Adress-Update aktivieren" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "Aushandeln von IPv6-Adressen auf der PPP-Verbindung aktivieren" - msgid "Enable Jumbo Frame passthrough" msgstr "Aktiviere Jumbo Frame Durchleitung" @@ -966,6 +997,9 @@ msgstr "Erzwinge TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Erzwinge TKIP und CCMP (AES)" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "DHCP Traffic weiterleiten" @@ -1005,6 +1039,9 @@ msgstr "Allgemeine Einstellungen" msgid "General Setup" msgstr "Allgemeine Einstellungen" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "Sicherung erstellen" @@ -1116,6 +1153,9 @@ msgstr "IPv4 Netzmaske" msgid "IPv4 only" msgstr "nur IPv4" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "Länge des IPv4 Präfix" @@ -1213,8 +1253,8 @@ msgstr "" "effektive Größe des Arbeitsspeichers zu erhöhen. Die Auslagerung der Daten " "ist natürlich bedeutend langsamer als direkte Arbeitsspeicherzugriffe." -msgid "Ignore Hosts files" -msgstr "Hosts-Dateien ignorieren" +msgid "Ignore <code>/etc/hosts</code>" +msgstr "Ignoriere /etc/hosts" msgid "Ignore interface" msgstr "Schnittstelle ignorieren" @@ -1228,6 +1268,11 @@ msgstr "Image" msgid "In" msgstr "Ein" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "Timeout bei Inaktivität" @@ -1510,6 +1555,9 @@ msgstr "MAC-Filter" msgid "MAC-List" msgstr "MAC-Adressliste" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -1524,6 +1572,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "Höchstübertragungsrate" @@ -1633,6 +1684,9 @@ msgstr "Multicast-Adresse" msgid "NAS ID" msgstr "NAS ID" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1866,6 +1920,12 @@ msgstr "PPPoE" msgid "PPtP" msgstr "PPtP" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "Benötige das libiwinfo Paket!" @@ -1893,9 +1953,6 @@ msgstr "Passwort des Privaten Schlüssels" msgid "Password successfully changed!" msgstr "Passwort erfolgreich geändert!" -msgid "Path" -msgstr "Pfad" - msgid "Path to CA-Certificate" msgstr "Pfad zum CA-Zertifikat" @@ -1932,9 +1989,6 @@ msgstr "Pkte." msgid "Please enter your username and password." msgstr "Bitte Benutzernamen und Passwort eingeben." -msgid "Please wait: Device rebooting..." -msgstr "Bitte warten: Neustart wird durchgeführt..." - msgid "Policy" msgstr "Standardregel" @@ -2330,6 +2384,9 @@ msgstr "Signal:" msgid "Size" msgstr "Größe" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "Überspringen" @@ -2623,6 +2680,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "Dem ausgewähltem Protokoll muss ein Gerät zugeordnet werden" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2684,6 +2744,12 @@ msgid "This IPv4 address of the relay" msgstr "IPv4-Adresse des Relais" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -3018,13 +3084,14 @@ msgstr "Änderungen werden angewandt..." msgid "Waiting for command to complete..." msgstr "Der Befehl wird ausgeführt..." +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "Warnung" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "" -"Warnung: Es gibt ungespeicherte Änderungen, die bei einem Neustart verloren " -"gehen!" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3254,6 +3321,24 @@ msgstr "ja" msgid "« Back" msgstr "« Zurück" +#~ msgid "Enable IPv6 negotiation on the PPP link" +#~ msgstr "Aushandeln von IPv6-Adressen auf der PPP-Verbindung aktivieren" + +#~ msgid "Ignore Hosts files" +#~ msgstr "Hosts-Dateien ignorieren" + +#~ msgid "Path" +#~ msgstr "Pfad" + +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "Bitte warten: Neustart wird durchgeführt..." + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "" +#~ "Warnung: Es gibt ungespeicherte Änderungen, die bei einem Neustart " +#~ "verloren gehen!" + #~ msgid "" #~ "Always use 40MHz channels even if the secondary channel overlaps. Using " #~ "this option does not comply with IEEE 802.11n-2009!" @@ -4143,9 +4228,6 @@ msgstr "« Zurück" #~ msgid "Here you can configure installed wifi devices." #~ msgstr "An dieser Stelle können eingebaute WLAN-Geräte konfiguriert werden." -#~ msgid "Ignore <code>/etc/hosts</code>" -#~ msgstr "Ignoriere /etc/hosts" - #~ msgid "Independent (Ad-Hoc)" #~ msgstr "Unabhängig (Ad-Hoc)" diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po index ed3a20737c..8d96a7ac1e 100644 --- a/modules/luci-base/po/el/base.po +++ b/modules/luci-base/po/el/base.po @@ -46,6 +46,9 @@ msgstr "Φορτίο 1 λεπτού:" msgid "15 Minute Load:" msgstr "Φορτίο 15 λεπτών:" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "Φορτίο 5 λεπτών:" @@ -209,6 +212,9 @@ msgstr "Προσθήκη νέας διεπαφής..." msgid "Additional Hosts files" msgstr "Επιπλέον αρχεία Hosts" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "Διεύθυνση" @@ -341,6 +347,9 @@ msgstr "Διαθέσιμα πακέτα" msgid "Average:" msgstr "Μέσος Όρος:" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "BSSID" @@ -418,6 +427,11 @@ msgstr "" msgid "Buffered" msgstr "" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "Κουμπιά" @@ -576,6 +590,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -674,6 +696,12 @@ msgstr "Συσκευή" msgid "Device Configuration" msgstr "Παραμετροποίηση Συσκευής" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "Διαγνωστικά" @@ -714,6 +742,9 @@ msgstr "Βελτιστοποίηση Απόστασης" msgid "Distance to farthest network member in meters." msgstr "Απόσταση σε μέτρα από το πιο απομακρυσμένο μέλος του δικτύου." +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "Διαφορική Λήψη" @@ -791,6 +822,9 @@ msgstr "" "Δυναμική απόδοση DHCP διευθύνσεων στους πελάτες. Σε περίπτωση " "απενεργοποίησης, μόνο πελάτες με στατικα leases θα εξυπηρετούνται." +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "Μέθοδος EAP" @@ -820,9 +854,6 @@ msgstr "Ενεργοποίηση <abbr title=\"Spanning Tree Protocol\">STP</abb msgid "Enable HE.net dynamic endpoint update" msgstr "Ενεργοποίηση ενημέρωσης δυναμικού τερματικού σημείου HE.net." -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "Ενεργοποίηση διαπραγμάτευσης IPv6 πάνω στη PPP ζεύξη" - msgid "Enable Jumbo Frame passthrough" msgstr "Ενεργοποίηση διέλευσης Jumbo Frame" @@ -981,6 +1012,9 @@ msgstr "Επιβολή TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Επιβολή TKIP και CCMP (AES)" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "Προώθηση κίνησης DHCP" @@ -1020,6 +1054,9 @@ msgstr "Γενικές Ρυθμίσεις" msgid "General Setup" msgstr "" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "" @@ -1129,6 +1166,9 @@ msgstr "Μάσκα IPv4" msgid "IPv4 only" msgstr "Μόνο IPv4" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "" @@ -1228,8 +1268,8 @@ msgstr "" "προσπελαστεί με τους υψηλούς ρυθμούς μεταφοράς δεδομένων που διαθέτει η " "<abbr title=\"Random Access Memory\">RAM</abbr>." -msgid "Ignore Hosts files" -msgstr "" +msgid "Ignore <code>/etc/hosts</code>" +msgstr "Αγνόησε <code>/etc/hosts</code>" msgid "Ignore interface" msgstr "Αγνόησε διεπαφή" @@ -1243,6 +1283,11 @@ msgstr "" msgid "In" msgstr "Είσοδος" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "" @@ -1512,6 +1557,9 @@ msgstr "MAC-Φίλτρο" msgid "MAC-List" msgstr "Λίστα MAC" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "" @@ -1526,6 +1574,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "Μέγιστος Ρυθμός" @@ -1637,6 +1688,9 @@ msgstr "Διεύθυνση Multicast" msgid "NAS ID" msgstr "NAS ID" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1867,6 +1921,12 @@ msgstr "PPPoE" msgid "PPtP" msgstr "PPtP" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "Απαιτείται το πακέτο libiwinfo!" @@ -1894,9 +1954,6 @@ msgstr "Κωδικός Πρόσβασης του Ιδιωτικού Κλειδι msgid "Password successfully changed!" msgstr "Ο κωδικός πρόσβασης άλλαξε επιτυχώς!" -msgid "Path" -msgstr "Διαδρομή" - msgid "Path to CA-Certificate" msgstr "Διαδρομή για Πιστοποιητικό CA" @@ -1933,9 +1990,6 @@ msgstr "Πκτ." msgid "Please enter your username and password." msgstr "Παρακαλώ εισάγετε όνομα χρήστη και κωδικό πρόσβασης." -msgid "Please wait: Device rebooting..." -msgstr "Παρακαλώ περιμένετε: Η συσκευή επανεκκινεί..." - msgid "Policy" msgstr "Πολιτική" @@ -2314,6 +2368,9 @@ msgstr "Σήμα:" msgid "Size" msgstr "Μέγεθος" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "Παράκαμψη" @@ -2573,6 +2630,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2628,6 +2688,12 @@ msgid "This IPv4 address of the relay" msgstr "" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -2943,13 +3009,14 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "Προειδοποίηση" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "" -"Προειδοποίηση: Υπάρχουν μη-αποθηκευμένες αλλαγές που θα χαθούν κατά την " -"επανεκκίνηση!" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3181,6 +3248,21 @@ msgstr "ναι" msgid "« Back" msgstr "« Πίσω" +#~ msgid "Enable IPv6 negotiation on the PPP link" +#~ msgstr "Ενεργοποίηση διαπραγμάτευσης IPv6 πάνω στη PPP ζεύξη" + +#~ msgid "Path" +#~ msgstr "Διαδρομή" + +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "Παρακαλώ περιμένετε: Η συσκευή επανεκκινεί..." + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "" +#~ "Προειδοποίηση: Υπάρχουν μη-αποθηκευμένες αλλαγές που θα χαθούν κατά την " +#~ "επανεκκίνηση!" + #~ msgid "Configures this mount as overlay storage for block-extroot" #~ msgstr "" #~ "Ορίζει το συγκεκριμένο σημείο προσάρτησης ως επικαλύπτον αποθηκευτικό " @@ -3851,9 +3933,6 @@ msgstr "« Πίσω" #~ msgid "Here you can configure installed wifi devices." #~ msgstr "Εδώ μπορείτε να ρυθμίσετε τις εγκατεστημένες ασύρματες συσκευές." -#~ msgid "Ignore <code>/etc/hosts</code>" -#~ msgstr "Αγνόησε <code>/etc/hosts</code>" - #~ msgid "Independent (Ad-Hoc)" #~ msgstr "Ανεξάρτητο (Ad-Hoc)" diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po index 3ad4b140bb..e15ceafc32 100644 --- a/modules/luci-base/po/en/base.po +++ b/modules/luci-base/po/en/base.po @@ -46,6 +46,9 @@ msgstr "1 Minute Load:" msgid "15 Minute Load:" msgstr "15 Minute Load:" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "5 Minute Load:" @@ -206,6 +209,9 @@ msgstr "Add new interface..." msgid "Additional Hosts files" msgstr "Additional Hosts files" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "Address" @@ -332,6 +338,9 @@ msgstr "Available packages" msgid "Average:" msgstr "Average:" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "BSSID" @@ -407,6 +416,11 @@ msgstr "" msgid "Buffered" msgstr "Buffered" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "Buttons" @@ -563,6 +577,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -662,6 +684,12 @@ msgstr "Device" msgid "Device Configuration" msgstr "Device Configuration" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "Diagnostics" @@ -700,6 +728,9 @@ msgstr "Distance Optimization" msgid "Distance to farthest network member in meters." msgstr "Distance to farthest network member in meters." +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "Diversity" @@ -770,6 +801,9 @@ msgid "" "having static leases will be served." msgstr "" +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "EAP-Method" @@ -799,9 +833,6 @@ msgstr "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "" - msgid "Enable Jumbo Frame passthrough" msgstr "" @@ -956,6 +987,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "" @@ -995,6 +1029,9 @@ msgstr "" msgid "General Setup" msgstr "General Setup" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "" @@ -1103,6 +1140,9 @@ msgstr "" msgid "IPv4 only" msgstr "" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "" @@ -1197,8 +1237,8 @@ msgstr "" "slow process as the swap-device cannot be accessed with the high datarates " "of the <abbr title=\"Random Access Memory\">RAM</abbr>." -msgid "Ignore Hosts files" -msgstr "" +msgid "Ignore <code>/etc/hosts</code>" +msgstr "Ignore <code>/etc/hosts</code>" msgid "Ignore interface" msgstr "Ignore interface" @@ -1212,6 +1252,11 @@ msgstr "" msgid "In" msgstr "In" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "" @@ -1481,6 +1526,9 @@ msgstr "MAC-Filter" msgid "MAC-List" msgstr "MAC-List" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "" @@ -1495,6 +1543,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "Maximum Rate" @@ -1604,6 +1655,9 @@ msgstr "" msgid "NAS ID" msgstr "NAS ID" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1834,6 +1888,12 @@ msgstr "" msgid "PPtP" msgstr "" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "" @@ -1861,9 +1921,6 @@ msgstr "Password of Private Key" msgid "Password successfully changed!" msgstr "" -msgid "Path" -msgstr "Path" - msgid "Path to CA-Certificate" msgstr "Path to CA-Certificate" @@ -1900,9 +1957,6 @@ msgstr "Pkts." msgid "Please enter your username and password." msgstr "Please enter your username and password." -msgid "Please wait: Device rebooting..." -msgstr "Please wait: Device rebooting..." - msgid "Policy" msgstr "Policy" @@ -2278,6 +2332,9 @@ msgstr "" msgid "Size" msgstr "Size" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "Skip" @@ -2533,6 +2590,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2588,6 +2648,12 @@ msgid "This IPv4 address of the relay" msgstr "" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -2902,11 +2968,14 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" -msgstr "Warning: There are unsaved changes that will be lost while rebooting!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" +msgstr "" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3135,6 +3204,17 @@ msgstr "" msgid "« Back" msgstr "« Back" +#~ msgid "Path" +#~ msgstr "Path" + +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "Please wait: Device rebooting..." + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" + #~ msgid "Cached" #~ msgstr "Cached" @@ -3796,9 +3876,6 @@ msgstr "« Back" #~ "firewall zone of the choosen network.<br />Uncheck the attach option to " #~ "define a new standalone network for this interface." -#~ msgid "Ignore <code>/etc/hosts</code>" -#~ msgstr "Ignore <code>/etc/hosts</code>" - #~ msgid "Independent (Ad-Hoc)" #~ msgstr "Independent (Ad-Hoc)" diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index 2c3ce94ad5..2867229eec 100644 --- a/modules/luci-base/po/es/base.po +++ b/modules/luci-base/po/es/base.po @@ -46,6 +46,9 @@ msgstr "Carga a 1 minuto:" msgid "15 Minute Load:" msgstr "Carga a 15 minutos:" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "Carga a 5 minutos:" @@ -210,6 +213,9 @@ msgstr "Añadir nueva interfaz..." msgid "Additional Hosts files" msgstr "Ficheros de máquinas adicionales" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "Dirección" @@ -338,6 +344,9 @@ msgstr "Paquetes disponibles" msgid "Average:" msgstr "Media:" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "BSSID" @@ -414,6 +423,11 @@ msgstr "Controlador inalámbrico 802.11 BCM%04x" msgid "Buffered" msgstr "En búfer" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "Botones" @@ -572,6 +586,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -671,6 +693,12 @@ msgstr "Dispositivo" msgid "Device Configuration" msgstr "Configuración del dispositivo" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "Diagnósticos" @@ -711,6 +739,9 @@ msgstr "Optimización de distancia" msgid "Distance to farthest network member in meters." msgstr "Distancia al miembro de la red mas lejana en metros." +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "Diversidad" @@ -785,6 +816,9 @@ msgstr "" "Reparte direcciones DHCP dinámicamente a los clientes. Si se desactiva sólo " "se servirá a clientes con cesiones estáticas." +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "Método EAP" @@ -814,9 +848,6 @@ msgstr "Activar <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "Activar actualización dinámica de punto final HE.net" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "Activar negociación IPv6 en el enlace PPP" - msgid "Enable Jumbo Frame passthrough" msgstr "Activar paso de tramas jumbo" @@ -974,6 +1005,9 @@ msgstr "Forzar TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Forzar TKIP y CCMP (AES)" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "Retransmitir tráfico DHCP" @@ -1014,6 +1048,9 @@ msgstr "Configuración general" msgid "General Setup" msgstr "Configuración general" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "Generar archivo" @@ -1125,6 +1162,9 @@ msgstr "Máscara de red IPv4" msgid "IPv4 only" msgstr "Sólo IPv4" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "Longitud de prefijo IPv4" @@ -1226,8 +1266,8 @@ msgstr "" "alta velocidad tal y como hace la memoria <abbr title=\"Random Access Memory" "\">RAM</abbr>." -msgid "Ignore Hosts files" -msgstr "Ignorar fichero de máquinas" +msgid "Ignore <code>/etc/hosts</code>" +msgstr "Ignorar <code>/etc/hosts</code>" msgid "Ignore interface" msgstr "Ignorar interfaz" @@ -1241,6 +1281,11 @@ msgstr "Imagen" msgid "In" msgstr "Entrada" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "Espera de inactividad" @@ -1520,6 +1565,9 @@ msgstr "Filtro por dirección MAC" msgid "MAC-List" msgstr "Lista de direcciones MAC" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -1534,6 +1582,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "Ratio Máximo" @@ -1643,6 +1694,9 @@ msgstr "Dirección multicast" msgid "NAS ID" msgstr "NAS ID" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1874,6 +1928,12 @@ msgstr "PPPoE" msgid "PPtP" msgstr "PPtP" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "¡Se necesita el paquete libiwinfo!" @@ -1901,9 +1961,6 @@ msgstr "Contraseña de la Clave Privada" msgid "Password successfully changed!" msgstr "¡Contraseña cambiada!" -msgid "Path" -msgstr "Ruta (path)" - msgid "Path to CA-Certificate" msgstr "Ruta al Certificado CA" @@ -1940,9 +1997,6 @@ msgstr "Paq." msgid "Please enter your username and password." msgstr "Por favor, introduzca su nombre de usuario y contraseña." -msgid "Please wait: Device rebooting..." -msgstr "Espere por favor: Rearrancando dispositivo..." - msgid "Policy" msgstr "Política" @@ -2335,6 +2389,9 @@ msgstr "Señal:" msgid "Size" msgstr "Tamaño" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "Saltar" @@ -2629,6 +2686,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "Este protocolo necesita estar asignado a un dispositivo" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2689,6 +2749,12 @@ msgid "This IPv4 address of the relay" msgstr "Dirección IPv4 del relé" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -3019,13 +3085,14 @@ msgstr "Esperando a que se realicen los cambios..." msgid "Waiting for command to complete..." msgstr "Esperando a que termine el comando..." +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "Aviso" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "" -"Advertencia: Hay cambios realizados que no han sido guardados, los mismos se " -"perderán mientras se rearranca!" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3257,6 +3324,24 @@ msgstr "sí" msgid "« Back" msgstr "« Volver" +#~ msgid "Enable IPv6 negotiation on the PPP link" +#~ msgstr "Activar negociación IPv6 en el enlace PPP" + +#~ msgid "Ignore Hosts files" +#~ msgstr "Ignorar fichero de máquinas" + +#~ msgid "Path" +#~ msgstr "Ruta (path)" + +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "Espere por favor: Rearrancando dispositivo..." + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "" +#~ "Advertencia: Hay cambios realizados que no han sido guardados, los mismos " +#~ "se perderán mientras se rearranca!" + #~ msgid "" #~ "Always use 40MHz channels even if the secondary channel overlaps. Using " #~ "this option does not comply with IEEE 802.11n-2009!" @@ -3956,9 +4041,6 @@ msgstr "« Volver" #~ msgid "Here you can configure installed wifi devices." #~ msgstr "Aquí puede configurar los dispositivos Wi-Fi instalados." -#~ msgid "Ignore <code>/etc/hosts</code>" -#~ msgstr "Ignorar <code>/etc/hosts</code>" - #~ msgid "Independent (Ad-Hoc)" #~ msgstr "Independiente (ad hoc) " diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po index 1d8d224754..b216590d6d 100644 --- a/modules/luci-base/po/fr/base.po +++ b/modules/luci-base/po/fr/base.po @@ -46,6 +46,9 @@ msgstr "Charge sur 1 minute :" msgid "15 Minute Load:" msgstr "Charge sur 15 minutes :" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "Charge sur 5 minutes :" @@ -212,6 +215,9 @@ msgstr "Ajout d'une nouvelle interface..." msgid "Additional Hosts files" msgstr "Fichiers hosts supplémetaires" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "Adresse" @@ -344,6 +350,9 @@ msgstr "Paquets disponibles" msgid "Average:" msgstr "Moyenne :" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "BSSID" @@ -419,6 +428,11 @@ msgstr "Contrôleur sans fil Broadcom BCM%04x 802.11" msgid "Buffered" msgstr "Temporisé" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "Boutons" @@ -579,6 +593,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -678,6 +700,12 @@ msgstr "Équipement" msgid "Device Configuration" msgstr "Configuration de l'équipement" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "Diagnostics" @@ -718,6 +746,9 @@ msgstr "Optimisation de la distance" msgid "Distance to farthest network member in meters." msgstr "Distance au membre du réseau le plus éloigné, en mètres." +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "Diversité" @@ -795,6 +826,9 @@ msgstr "" "Alloue dynamiquement des adresses pour les clients du DHCP. Si désactivé, " "seuls les clients ayant des baux statiques seront gérés." +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "Méthode EAP" @@ -824,9 +858,6 @@ msgstr "Activer le protocole <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "Activer la mise à jour dynamique de l'extrémité du tunnel chez HE.net" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "Activer la négociation IPv6 sur le lien PPP" - msgid "Enable Jumbo Frame passthrough" msgstr "Activer la circulation de très grandes trames (Jumbo)" @@ -986,6 +1017,9 @@ msgstr "Forcer TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Forcer TKIP et CCMP (AES)" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "Transmettre le trafic DHCP" @@ -1025,6 +1059,9 @@ msgstr "Paramètres généraux" msgid "General Setup" msgstr "Configuration générale" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "Construire l'archive" @@ -1137,6 +1174,9 @@ msgstr "Masque-réseau IPv4" msgid "IPv4 only" msgstr "IPv4 seulement" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "longueur du préfixe IPv4" @@ -1234,8 +1274,8 @@ msgstr "" "d'échange, relevant la quantité de RAM disponible. Ce processus est lent car " "la mémoire d'échange ne peut être accédée aux taux de transfert de la RAM." -msgid "Ignore Hosts files" -msgstr "Ignorer le fichiers Hosts" +msgid "Ignore <code>/etc/hosts</code>" +msgstr "Ignorer /etc/hosts" msgid "Ignore interface" msgstr "Ignorer l'interface" @@ -1249,6 +1289,11 @@ msgstr "Image" msgid "In" msgstr "Entrée" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "Délai d'inactivité" @@ -1534,6 +1579,9 @@ msgstr "Filtrage par adresses MAC" msgid "MAC-List" msgstr "Liste des adresses MAC" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -1548,6 +1596,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "Débit maximum" @@ -1657,6 +1708,9 @@ msgstr "Adresse multidiffusion" msgid "NAS ID" msgstr "NAS ID" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1887,6 +1941,12 @@ msgstr "PPPoE" msgid "PPtP" msgstr "PPtP" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "Nécessite le paquet libiwinfo !" @@ -1914,9 +1974,6 @@ msgstr "Mot de passe de la clé privée" msgid "Password successfully changed!" msgstr "Mot de passe changé avec succès !" -msgid "Path" -msgstr "Chemin" - msgid "Path to CA-Certificate" msgstr "Chemin de la CA" @@ -1953,9 +2010,6 @@ msgstr "Pqts." msgid "Please enter your username and password." msgstr "Saisissez votre nom d'utilisateur et mot de passe." -msgid "Please wait: Device rebooting..." -msgstr "Patientez s'il vous plaît: équipement en cours de redémarrage..." - msgid "Policy" msgstr "Politique" @@ -2349,6 +2403,9 @@ msgstr "Signal :" msgid "Size" msgstr "Taille" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "Passer au suivant" @@ -2641,6 +2698,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "Le protocole sélectionné nécessite l'attribution d'un périphérique" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2703,6 +2763,12 @@ msgid "This IPv4 address of the relay" msgstr "L'adresse IPv4 du relais" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -3038,13 +3104,14 @@ msgstr "En attente de l'application des changements..." msgid "Waiting for command to complete..." msgstr "En attente de la fin de la commande..." +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "Attention" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "" -"Attention : il reste des changements non appliqués qui seront perdus après " -"redémarrage !" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3275,6 +3342,24 @@ msgstr "oui" msgid "« Back" msgstr "« Retour" +#~ msgid "Enable IPv6 negotiation on the PPP link" +#~ msgstr "Activer la négociation IPv6 sur le lien PPP" + +#~ msgid "Ignore Hosts files" +#~ msgstr "Ignorer le fichiers Hosts" + +#~ msgid "Path" +#~ msgstr "Chemin" + +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "Patientez s'il vous plaît: équipement en cours de redémarrage..." + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "" +#~ "Attention : il reste des changements non appliqués qui seront perdus " +#~ "après redémarrage !" + #~ msgid "" #~ "Always use 40MHz channels even if the secondary channel overlaps. Using " #~ "this option does not comply with IEEE 802.11n-2009!" @@ -4134,9 +4219,6 @@ msgstr "« Retour" #~ msgid "Here you can configure installed wifi devices." #~ msgstr "Ici vous pouvez configurer les équipements Wi-Fi installés." -#~ msgid "Ignore <code>/etc/hosts</code>" -#~ msgstr "Ignorer /etc/hosts" - #~ msgid "Independent (Ad-Hoc)" #~ msgstr "Ad-Hoc" diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po index 237e8689ae..30286fa05d 100644 --- a/modules/luci-base/po/he/base.po +++ b/modules/luci-base/po/he/base.po @@ -44,6 +44,9 @@ msgstr "עומס במשך דקה:" msgid "15 Minute Load:" msgstr "עומס במשך רבע שעה:" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "עומס במשך 5 דקות:" @@ -202,6 +205,9 @@ msgstr "הוסף ממשק חדש..." msgid "Additional Hosts files" msgstr "קבצי מארח נוספים" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "כתובת" @@ -334,6 +340,9 @@ msgstr "חבילות זמינות" msgid "Average:" msgstr "ממוצע:" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "BSSID" @@ -410,6 +419,11 @@ msgstr "שלט אלחוטי Broadcom BCM%04x 802.11" msgid "Buffered" msgstr "" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "כפתורים" @@ -557,6 +571,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -655,6 +677,12 @@ msgstr "מכשיר" msgid "Device Configuration" msgstr "הגדרות מכשיר" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "אבחון" @@ -693,6 +721,9 @@ msgstr "" msgid "Distance to farthest network member in meters." msgstr "מרחק לנק' הרשת הרחוקה ביותר במטרים" +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "גיוון" @@ -756,6 +787,9 @@ msgid "" "having static leases will be served." msgstr "" +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "" @@ -785,9 +819,6 @@ msgstr "אפשר <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "" - msgid "Enable Jumbo Frame passthrough" msgstr "" @@ -942,6 +973,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "" @@ -981,6 +1015,9 @@ msgstr "" msgid "General Setup" msgstr "" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "" @@ -1087,6 +1124,9 @@ msgstr "" msgid "IPv4 only" msgstr "" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "" @@ -1176,7 +1216,7 @@ msgid "" "of the <abbr title=\"Random Access Memory\">RAM</abbr>." msgstr "" -msgid "Ignore Hosts files" +msgid "Ignore <code>/etc/hosts</code>" msgstr "" msgid "Ignore interface" @@ -1191,6 +1231,11 @@ msgstr "" msgid "In" msgstr "" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "" @@ -1457,6 +1502,9 @@ msgstr "" msgid "MAC-List" msgstr "" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "" @@ -1471,6 +1519,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "" @@ -1578,6 +1629,9 @@ msgstr "" msgid "NAS ID" msgstr "" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1802,6 +1856,12 @@ msgstr "" msgid "PPtP" msgstr "" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "" @@ -1829,9 +1889,6 @@ msgstr "" msgid "Password successfully changed!" msgstr "" -msgid "Path" -msgstr "" - msgid "Path to CA-Certificate" msgstr "" @@ -1868,9 +1925,6 @@ msgstr "" msgid "Please enter your username and password." msgstr "אנא הזן את שם המשתמש והסיסמה שלך:" -msgid "Please wait: Device rebooting..." -msgstr "אנא המתן: המכשיר מאותחל מחדש..." - msgid "Policy" msgstr "" @@ -2246,6 +2300,9 @@ msgstr "" msgid "Size" msgstr "" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "" @@ -2503,6 +2560,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2551,6 +2611,12 @@ msgid "This IPv4 address of the relay" msgstr "" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -2860,11 +2926,14 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "אזהרה" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" -msgstr "אזהרה: ישנם שינויים שלא נשמרו ויאבדו בעת הפעלה מחדש!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" +msgstr "" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3088,6 +3157,13 @@ msgstr "כן" msgid "« Back" msgstr "<< אחורה" +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "אנא המתן: המכשיר מאותחל מחדש..." + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "אזהרה: ישנם שינויים שלא נשמרו ויאבדו בעת הפעלה מחדש!" + #~ msgid "Cached" #~ msgstr "שמור במטמון" diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po index 975bf2dfce..e1aa398b4e 100644 --- a/modules/luci-base/po/hu/base.po +++ b/modules/luci-base/po/hu/base.po @@ -44,6 +44,9 @@ msgstr "Terhelés (utolsó 1 perc):" msgid "15 Minute Load:" msgstr "Terhelés (utolsó 15 perc):" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "Terhelés (utolsó 5 perc):" @@ -207,6 +210,9 @@ msgstr "Új interfész hozzáadása..." msgid "Additional Hosts files" msgstr "További 'hosts' fájlok" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "Cím" @@ -337,6 +343,9 @@ msgstr "Elérhető csomagok" msgid "Average:" msgstr "Átlag:" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "BSSID" @@ -413,6 +422,11 @@ msgstr "Broadcom BCM%04x 802.11 vezeték-nélküli vezérlő" msgid "Buffered" msgstr "Átmeneti tárban van" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "Gombok" @@ -574,6 +588,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -672,6 +694,12 @@ msgstr "Eszköz" msgid "Device Configuration" msgstr "Eszköz beállítások" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "Diagnosztika" @@ -712,6 +740,9 @@ msgstr "Távolság optimalizáció" msgid "Distance to farthest network member in meters." msgstr "A hálózat legtávolabbi tagjának távolsága méterben." +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "Diverzitás" @@ -788,6 +819,9 @@ msgstr "" "esetén csak a statikus DHCP bérlettel rendelkező kliensek lesznek " "kiszolgálva." +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "EAP metódus" @@ -817,9 +851,6 @@ msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr> engedélyezése" msgid "Enable HE.net dynamic endpoint update" msgstr "HE.net dinamikus végpont frissítésének engedélyezése" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "IPv6 egyeztetés engedélyezése a PPP linken" - msgid "Enable Jumbo Frame passthrough" msgstr "Óriás keretek átengedésének engedélyezése" @@ -977,6 +1008,9 @@ msgstr "TKIP kényszerítése" msgid "Force TKIP and CCMP (AES)" msgstr "TKIP és CCMP (AES) kényszerítése" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "DHCP forgalom továbbítás" @@ -1016,6 +1050,9 @@ msgstr "Általános beállítások" msgid "General Setup" msgstr "Általános beállítások" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "Archívum készítése" @@ -1126,6 +1163,9 @@ msgstr "IPv4 hálózati maszk" msgid "IPv4 only" msgstr "csak IPv4" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "IPv4 prefix hossza" @@ -1224,8 +1264,8 @@ msgstr "" "nagyon lassú folyamat mivel a swap-eszköz nem érhető el akkora sebességgel " "mint a <abbr title=\"Random Access Memory\">RAM</abbr>." -msgid "Ignore Hosts files" -msgstr "A hosts fájlok figyelmen kívül hagyása" +msgid "Ignore <code>/etc/hosts</code>" +msgstr "" msgid "Ignore interface" msgstr "Interfész figyelmen kívül hagyása" @@ -1239,6 +1279,11 @@ msgstr "Image" msgid "In" msgstr "Be" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "Inaktivitási időtúllépés" @@ -1523,6 +1568,9 @@ msgstr "MAC-szűrő" msgid "MAC-List" msgstr "MAC-lista" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -1537,6 +1585,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "Maximális sebesség" @@ -1646,6 +1697,9 @@ msgstr "Multicast cím" msgid "NAS ID" msgstr "NAS azonosító" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1877,6 +1931,12 @@ msgstr "PPPoE" msgid "PPtP" msgstr "PPtP" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "A libiwinfo csomag szükséges!" @@ -1904,9 +1964,6 @@ msgstr "A privát kulcsh jelszava" msgid "Password successfully changed!" msgstr "A jelszó megváltoztatása sikeres!" -msgid "Path" -msgstr "" - msgid "Path to CA-Certificate" msgstr "CA tanúsítvány elérési útja" @@ -1943,9 +2000,6 @@ msgstr "csom." msgid "Please enter your username and password." msgstr "Adja meg a felhasználónevét és a jelszavát." -msgid "Please wait: Device rebooting..." -msgstr "Kérem várjon: az eszköz újraindul..." - msgid "Policy" msgstr "Szabály" @@ -2340,6 +2394,9 @@ msgstr "Jel:" msgid "Size" msgstr "Méret" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "Ugrás" @@ -2632,6 +2689,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "A kiválasztott protokoll eszköz hozzárendelést igényel" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2692,6 +2752,12 @@ msgid "This IPv4 address of the relay" msgstr "Az átjátszó IPV4 címe" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -3026,13 +3092,14 @@ msgstr "Várakozás a változtatások alkalmazására..." msgid "Waiting for command to complete..." msgstr "Várakozás a parancs befejezésére..." +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "Figyelmeztetés" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "" -"Figyelem: vannak el nem mentett változások melyek el fognak veszni az " -"újraindítás során!" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3264,6 +3331,21 @@ msgstr "igen" msgid "« Back" msgstr "« Vissza" +#~ msgid "Enable IPv6 negotiation on the PPP link" +#~ msgstr "IPv6 egyeztetés engedélyezése a PPP linken" + +#~ msgid "Ignore Hosts files" +#~ msgstr "A hosts fájlok figyelmen kívül hagyása" + +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "Kérem várjon: az eszköz újraindul..." + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "" +#~ "Figyelem: vannak el nem mentett változások melyek el fognak veszni az " +#~ "újraindítás során!" + #~ msgid "" #~ "Always use 40MHz channels even if the secondary channel overlaps. Using " #~ "this option does not comply with IEEE 802.11n-2009!" diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po index ffb1fdf0ca..93cfef5d1e 100644 --- a/modules/luci-base/po/it/base.po +++ b/modules/luci-base/po/it/base.po @@ -46,6 +46,9 @@ msgstr "Carico in 1 minuto:" msgid "15 Minute Load:" msgstr "Carico in 15 minut:" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "Carico in 5 minuti:" @@ -214,6 +217,9 @@ msgstr "Aggiungi nuova interfaccia..." msgid "Additional Hosts files" msgstr "File Hosts Aggiuntivo" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "Indirizzo" @@ -344,6 +350,9 @@ msgstr "Pacchetti disponibili" msgid "Average:" msgstr "Media:" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "BSSID" @@ -419,6 +428,11 @@ msgstr "Dispositivo Wireless Broadcom BCM%04x 802.11" msgid "Buffered" msgstr "Buffered" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "Pulsanti" @@ -577,6 +591,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -676,6 +698,12 @@ msgstr "Dispositivo" msgid "Device Configuration" msgstr "Configurazione del dispositivo" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "Diagnostica" @@ -716,6 +744,9 @@ msgstr "Ottimizzazione distanza" msgid "Distance to farthest network member in meters." msgstr "Distanza del membro più lontano della rete in metri." +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "Diversità" @@ -789,6 +820,9 @@ msgstr "" "Fornisci dinamicamente gli indirizzi DHCP ai client. Se disabilitato, solo i " "client con un indirizzo statico saranno serviti." +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "Metodo EAP" @@ -818,9 +852,6 @@ msgstr "Abilita <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "Abilitazione aggiornamento endpoint dinamico HE.net" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "Attiva la negoziazione IPv6 sul collegamento PPP" - msgid "Enable Jumbo Frame passthrough" msgstr "Abilita Jumbo Frame passthrough" @@ -977,6 +1008,9 @@ msgstr "Forza TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Forza TKIP e CCMP (AES)" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "Inoltra il traffico DHCP" @@ -1016,6 +1050,9 @@ msgstr "Opzioni Generali" msgid "General Setup" msgstr "Impostazioni Generali" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "Genera Archivio" @@ -1129,6 +1166,9 @@ msgstr "Maschera rete IPv4" msgid "IPv4 only" msgstr "Solo IPv4" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "Lunghezza prefisso IPv4" @@ -1229,8 +1269,8 @@ msgstr "" "dispositivo di swap non può essere acceduto alle alte velocità della <abbr " "title=\"Random Access Memory\">RAM</abbr>." -msgid "Ignore Hosts files" -msgstr "Ignora i files Hosts" +msgid "Ignore <code>/etc/hosts</code>" +msgstr "Ignora <code>/etc/hosts</code>" msgid "Ignore interface" msgstr "Ignora interfaccia" @@ -1244,6 +1284,11 @@ msgstr "Immagine" msgid "In" msgstr "In" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "Tempo di Inattività" @@ -1521,6 +1566,9 @@ msgstr "Filtro MAC" msgid "MAC-List" msgstr "Lista MAC" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "" @@ -1535,6 +1583,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "Velocità massima" @@ -1644,6 +1695,9 @@ msgstr "" msgid "NAS ID" msgstr "ID della NAS" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1873,6 +1927,12 @@ msgstr "" msgid "PPtP" msgstr "" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "E' richiesto il pacchetto libiwinfo!" @@ -1900,9 +1960,6 @@ msgstr "Password della chiave privata" msgid "Password successfully changed!" msgstr "Password cambiata con successo!" -msgid "Path" -msgstr "Percorso" - msgid "Path to CA-Certificate" msgstr "Percorso al certificato CA" @@ -1939,9 +1996,6 @@ msgstr "" msgid "Please enter your username and password." msgstr "Per favore inserisci il tuo username e la password." -msgid "Please wait: Device rebooting..." -msgstr "Per favore attendi: Riavvio del dispositivo..." - msgid "Policy" msgstr "" @@ -2320,6 +2374,9 @@ msgstr "" msgid "Size" msgstr "Dimensione" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "Salta" @@ -2598,6 +2655,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2653,6 +2713,12 @@ msgid "This IPv4 address of the relay" msgstr "" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -2977,12 +3043,14 @@ msgstr "In attesa delle modifiche da applicare ..." msgid "Waiting for command to complete..." msgstr "In attesa del comando da completare..." +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "Avviso" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "" -"Attenzione: Ci sono modifiche non salvate che verranno persi riavviando!" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3216,6 +3284,23 @@ msgstr "Sì" msgid "« Back" msgstr "« Indietro" +#~ msgid "Enable IPv6 negotiation on the PPP link" +#~ msgstr "Attiva la negoziazione IPv6 sul collegamento PPP" + +#~ msgid "Ignore Hosts files" +#~ msgstr "Ignora i files Hosts" + +#~ msgid "Path" +#~ msgstr "Percorso" + +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "Per favore attendi: Riavvio del dispositivo..." + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "" +#~ "Attenzione: Ci sono modifiche non salvate che verranno persi riavviando!" + #~ msgid "" #~ "Always use 40MHz channels even if the secondary channel overlaps. Using " #~ "this option does not comply with IEEE 802.11n-2009!" @@ -3943,9 +4028,6 @@ msgstr "« Indietro" #~ msgid "Here you can configure installed wifi devices." #~ msgstr "Qui puoi configurare i tuoi dispositivi wireless installati." -#~ msgid "Ignore <code>/etc/hosts</code>" -#~ msgstr "Ignora <code>/etc/hosts</code>" - #~ msgid "Independent (Ad-Hoc)" #~ msgstr "Independente (Ad-Hoc)" diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index 8bea7644ea..39b81e3704 100644 --- a/modules/luci-base/po/ja/base.po +++ b/modules/luci-base/po/ja/base.po @@ -46,6 +46,9 @@ msgstr "過去1分の負荷:" msgid "15 Minute Load:" msgstr "過去15分の負荷:" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "過去5分の負荷:" @@ -205,6 +208,9 @@ msgstr "インターフェースの新規作成..." msgid "Additional Hosts files" msgstr "追加のホストファイル" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "アドレス" @@ -331,6 +337,9 @@ msgstr "インストール可能なパッケージ" msgid "Average:" msgstr "平均値:" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "BSSID" @@ -406,6 +415,11 @@ msgstr "Broadcom BCM%04x 802.11 無線LANコントローラ" msgid "Buffered" msgstr "バッファ" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "ボタン" @@ -565,6 +579,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -663,6 +685,12 @@ msgstr "デバイス" msgid "Device Configuration" msgstr "デバイス設定" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "診断機能" @@ -703,6 +731,9 @@ msgstr "距離の最適化" msgid "Distance to farthest network member in meters." msgstr "最も遠い端末との距離(メートル)を設定してください。" +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "ダイバシティ" @@ -777,6 +808,9 @@ msgstr "" "クライアントに対して動的にDHCPアドレスを割り振ります。無効に設定した場合、静" "的リースのみを行います。" +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "EAPメソッド" @@ -806,9 +840,6 @@ msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr>を有効にする" msgid "Enable HE.net dynamic endpoint update" msgstr "HE.netの動的endpoint更新を有効にします" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "PPPリンクのIPv6ネゴシエーションを有効にする" - msgid "Enable Jumbo Frame passthrough" msgstr "ジャンボフレーム・パススルーを有効にする" @@ -967,6 +998,9 @@ msgstr "TKIP を使用" msgid "Force TKIP and CCMP (AES)" msgstr "TKIP 及びCCMP (AES) を使用" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "DHCPトラフィックを転送する" @@ -1006,6 +1040,9 @@ msgstr "一般設定" msgid "General Setup" msgstr "一般設定" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "バックアップアーカイブの作成" @@ -1114,6 +1151,9 @@ msgstr "IPv4 ネットマスク" msgid "IPv4 only" msgstr "IPv4のみ" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "IPv4 プレフィクス長" @@ -1210,8 +1250,8 @@ msgstr "" "title=\"Random Access Memory\">RAM</abbr>にアクセスすることができなくなる恐れ" "があります。" -msgid "Ignore Hosts files" -msgstr "ホストファイルを無視する" +msgid "Ignore <code>/etc/hosts</code>" +msgstr "<code>/etc/hosts</code>を無視" msgid "Ignore interface" msgstr "インターフェースを無視する" @@ -1225,6 +1265,11 @@ msgstr "イメージ" msgid "In" msgstr "イン" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "未使用時タイムアウト" @@ -1499,6 +1544,9 @@ msgstr "MAC-フィルタ" msgid "MAC-List" msgstr "MAC-リスト" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -1513,6 +1561,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "最大レート" @@ -1622,6 +1673,9 @@ msgstr "マルチキャストアドレス" msgid "NAS ID" msgstr "NAS ID" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1854,6 +1908,12 @@ msgstr "PPPoE" msgid "PPtP" msgstr "PPtP" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "libiwinfo パッケージをインストールしてください！" @@ -1881,9 +1941,6 @@ msgstr "秘密鍵のパスワード" msgid "Password successfully changed!" msgstr "パスワードを変更しました" -msgid "Path" -msgstr "パス" - msgid "Path to CA-Certificate" msgstr "CA証明書のパス" @@ -1920,9 +1977,6 @@ msgstr "パケット" msgid "Please enter your username and password." msgstr "ユーザー名とパスワードを入力してください。" -msgid "Please wait: Device rebooting..." -msgstr "しばらくお待ちください: 再起動中です..." - msgid "Policy" msgstr "ポリシー" @@ -2318,6 +2372,9 @@ msgstr "信号:" msgid "Size" msgstr "サイズ" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "スキップ" @@ -2596,6 +2653,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "選択中のプロトコルを使用する場合、デバイスを設定する必要があります" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2656,6 +2716,12 @@ msgid "This IPv4 address of the relay" msgstr "" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -2990,11 +3056,14 @@ msgstr "変更を適用中です..." msgid "Waiting for command to complete..." msgstr "コマンド実行中です..." +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "警告" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" -msgstr "警告: 保存されていない変更は再起動後に失われます!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" +msgstr "" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3225,6 +3294,22 @@ msgstr "はい" msgid "« Back" msgstr "« 戻る" +#~ msgid "Enable IPv6 negotiation on the PPP link" +#~ msgstr "PPPリンクのIPv6ネゴシエーションを有効にする" + +#~ msgid "Ignore Hosts files" +#~ msgstr "ホストファイルを無視する" + +#~ msgid "Path" +#~ msgstr "パス" + +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "しばらくお待ちください: 再起動中です..." + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "警告: 保存されていない変更は再起動後に失われます!" + #~ msgid "" #~ "Always use 40MHz channels even if the secondary channel overlaps. Using " #~ "this option does not comply with IEEE 802.11n-2009!" @@ -4077,9 +4162,6 @@ msgstr "« 戻る" #~ msgid "Here you can configure installed wifi devices." #~ msgstr "ここではインストールされた無線デバイスの設定を行うことが出来ます。" -#~ msgid "Ignore <code>/etc/hosts</code>" -#~ msgstr "<code>/etc/hosts</code>を無視" - #~ msgid "Independent (Ad-Hoc)" #~ msgstr "アドホック" diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index d2a34dfbe1..e297261c7c 100644 --- a/modules/luci-base/po/ms/base.po +++ b/modules/luci-base/po/ms/base.po @@ -46,6 +46,9 @@ msgstr "" msgid "15 Minute Load:" msgstr "" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "" @@ -196,6 +199,9 @@ msgstr "" msgid "Additional Hosts files" msgstr "" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "" @@ -321,6 +327,9 @@ msgstr "" msgid "Average:" msgstr "" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "" @@ -393,6 +402,11 @@ msgstr "" msgid "Buffered" msgstr "" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "Butang" @@ -541,6 +555,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "Mengkustomisasi perilaku peranti LED jika mungkin." @@ -635,6 +657,12 @@ msgstr "Alat" msgid "Device Configuration" msgstr "" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "" @@ -673,6 +701,9 @@ msgstr "Jarak Optimasi" msgid "Distance to farthest network member in meters." msgstr "Jarak ke rangkaian terjauh ahli dalam meter." +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "Keanekaragaman" @@ -740,6 +771,9 @@ msgid "" "having static leases will be served." msgstr "" +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "EAP-Kaedah" @@ -769,9 +803,6 @@ msgstr "Mengaktifkan <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "" - msgid "Enable Jumbo Frame passthrough" msgstr "" @@ -926,6 +957,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "" @@ -965,6 +999,9 @@ msgstr "" msgid "General Setup" msgstr "Setup Umum" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "" @@ -1073,6 +1110,9 @@ msgstr "" msgid "IPv4 only" msgstr "" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "" @@ -1167,8 +1207,8 @@ msgstr "" "sangat lambat kerana peranti-penukar tidak boleh diakses dengan datarates " "yang tinggi pada RAM." -msgid "Ignore Hosts files" -msgstr "" +msgid "Ignore <code>/etc/hosts</code>" +msgstr "Mengabaikan /etc/hosts" msgid "Ignore interface" msgstr "Abaikan antara muka" @@ -1182,6 +1222,11 @@ msgstr "" msgid "In" msgstr "Masuk" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "" @@ -1452,6 +1497,9 @@ msgstr "Penapis MAC" msgid "MAC-List" msgstr "Senarai MAC" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "" @@ -1466,6 +1514,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "Rate Maksimum" @@ -1577,6 +1628,9 @@ msgstr "" msgid "NAS ID" msgstr "NAS ID" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1806,6 +1860,12 @@ msgstr "" msgid "PPtP" msgstr "" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "" @@ -1833,9 +1893,6 @@ msgstr "Kata Laluan Kunci Swasta" msgid "Password successfully changed!" msgstr "" -msgid "Path" -msgstr "Path" - msgid "Path to CA-Certificate" msgstr "Path ke CA-Sijil" @@ -1872,9 +1929,6 @@ msgstr "Pkts." msgid "Please enter your username and password." msgstr "Sila masukkan username dan kata laluan anda." -msgid "Please wait: Device rebooting..." -msgstr "Sila tunggu: Peranti sedang reboot..." - msgid "Policy" msgstr "Dasar" @@ -2249,6 +2303,9 @@ msgstr "" msgid "Size" msgstr "Saiz" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "Skip" @@ -2507,6 +2564,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2562,6 +2622,12 @@ msgid "This IPv4 address of the relay" msgstr "" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -2878,11 +2944,14 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" -msgstr "Amaran: Ada perubahan yang belum disimpan akan hilang saat reboot!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" +msgstr "" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3106,6 +3175,16 @@ msgstr "" msgid "« Back" msgstr "« Kembali" +#~ msgid "Path" +#~ msgstr "Path" + +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "Sila tunggu: Peranti sedang reboot..." + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "Amaran: Ada perubahan yang belum disimpan akan hilang saat reboot!" + #~ msgid "Frequency Hopping" #~ msgstr "Melompat Frekuensi" @@ -3695,9 +3774,6 @@ msgstr "« Kembali" #~ "dipilih. Hapus tanda pada pilihan untuk menentukan melampirkan rangkaian " #~ "mandiri baru untuk antara muka ini." -#~ msgid "Ignore <code>/etc/hosts</code>" -#~ msgstr "Mengabaikan /etc/hosts" - #~ msgid "Independent (Ad-Hoc)" #~ msgstr "(Ad-Hoc) Tersendiri" diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po index 21176ed3f4..b571cbde51 100644 --- a/modules/luci-base/po/no/base.po +++ b/modules/luci-base/po/no/base.po @@ -41,6 +41,9 @@ msgstr "1 minutts belastning:" msgid "15 Minute Load:" msgstr "15 minutters belastning:" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "5 minutters belastning:" @@ -205,6 +208,9 @@ msgstr "Legg til grensesnitt..." msgid "Additional Hosts files" msgstr "Tilleggs vertsfiler" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "Adresse" @@ -330,6 +336,9 @@ msgstr "Tilgjengelige pakker" msgid "Average:" msgstr "Gjennomsnitt:" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "BSSID" @@ -405,6 +414,11 @@ msgstr "Broadcom BCM%04x 802.11 Trådløs Kontroller" msgid "Buffered" msgstr "Bufret" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "Knapper" @@ -563,6 +577,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -661,6 +683,12 @@ msgstr "Enhet" msgid "Device Configuration" msgstr "Enhet Konfigurasjon" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "Nettverksdiagnostikk" @@ -701,6 +729,9 @@ msgstr "Avstand Optimalisering" msgid "Distance to farthest network member in meters." msgstr "Avstand i meter til det medlem av nettverket som er lengst unna." +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "Antennevariasjon" @@ -775,6 +806,9 @@ msgstr "" "Dynamisk tildeling av DHCP adresser til klienter. Om deaktivert, kan en kun " "bruke klienter med statisk leie." +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "EAP-metode" @@ -804,9 +838,6 @@ msgstr "Aktiver <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "Aktiver HE,net dynamisk endepunkt oppdatering" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "Aktiver IPv6 på PPP lenke" - msgid "Enable Jumbo Frame passthrough" msgstr "Aktiver Jumbo Frames gjennomgang" @@ -963,6 +994,9 @@ msgstr "Bruk TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Bruk TKIP og CCMP (AES)" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "Videresend DHCP trafikk" @@ -1002,6 +1036,9 @@ msgstr "Generelle Innstillinger" msgid "General Setup" msgstr "Generelt Oppsett" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "Opprett arkiv" @@ -1112,6 +1149,9 @@ msgstr "IPv4 nettmaske" msgid "IPv4 only" msgstr "Kun IPv4" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "IPv4 prefikslengde" @@ -1205,8 +1245,8 @@ msgstr "" "\"Random Access Memory\">RAM</abbr>. Vær oppmerksom på at bruk av swap er " "mye langsommere en <abbr title=\"Random Access Memory\">RAM</abbr>." -msgid "Ignore Hosts files" -msgstr "Ignorer vertsfiler" +msgid "Ignore <code>/etc/hosts</code>" +msgstr "" msgid "Ignore interface" msgstr "Ignorer grensesnitt" @@ -1220,6 +1260,11 @@ msgstr "Firmware" msgid "In" msgstr "i" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "Tidsavbrudd etter innaktivitet" @@ -1497,6 +1542,9 @@ msgstr "MAC-Filter" msgid "MAC-List" msgstr "MAC-Liste" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -1511,6 +1559,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "Maksimal hastighet" @@ -1620,6 +1671,9 @@ msgstr "Multicast adresse" msgid "NAS ID" msgstr "NAS ID" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1852,6 +1906,12 @@ msgstr "PPPoE" msgid "PPtP" msgstr "PPtP" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "Pakken libiwinfo er nødvendig!" @@ -1879,9 +1939,6 @@ msgstr "Passord for privatnøkkel" msgid "Password successfully changed!" msgstr "Passordet er endret!" -msgid "Path" -msgstr "" - msgid "Path to CA-Certificate" msgstr "Sti til CA-sertifikat" @@ -1918,9 +1975,6 @@ msgstr "Pakker." msgid "Please enter your username and password." msgstr "Skriv inn ditt brukernavn og passord." -msgid "Please wait: Device rebooting..." -msgstr "Vent: Enheten starter på nytt..." - msgid "Policy" msgstr "Policy" @@ -2313,6 +2367,9 @@ msgstr "Signal:" msgid "Size" msgstr "Størrelse" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "Gå videre" @@ -2600,6 +2657,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "Den valgte protokoll må ha en enhet tilknyttet" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2660,6 +2720,12 @@ msgid "This IPv4 address of the relay" msgstr "Dette IPv4 adressen til relayet" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -2991,11 +3057,14 @@ msgstr "Venter på at endringer utføres..." msgid "Waiting for command to complete..." msgstr "Venter på at kommando fullføres..." +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "Advarsel" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" -msgstr "Advarsel: Det er ulagrede endringer som vil gå tapt under omstarten!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" +msgstr "" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3227,6 +3296,20 @@ msgstr "ja" msgid "« Back" msgstr "« Tilbake" +#~ msgid "Enable IPv6 negotiation on the PPP link" +#~ msgstr "Aktiver IPv6 på PPP lenke" + +#~ msgid "Ignore Hosts files" +#~ msgstr "Ignorer vertsfiler" + +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "Vent: Enheten starter på nytt..." + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "" +#~ "Advarsel: Det er ulagrede endringer som vil gå tapt under omstarten!" + #~ msgid "" #~ "Always use 40MHz channels even if the secondary channel overlaps. Using " #~ "this option does not comply with IEEE 802.11n-2009!" diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index baa7ab8534..14b61f81de 100644 --- a/modules/luci-base/po/pl/base.po +++ b/modules/luci-base/po/pl/base.po @@ -42,13 +42,16 @@ msgid "-- match by label --" msgstr "" msgid "1 Minute Load:" -msgstr "Obciążenie w ciągu 1 minuty:" +msgstr "Obciążenie 1 min.:" msgid "15 Minute Load:" -msgstr "Obciążenie w ciągu 15 minut:" +msgstr "Obciążenie 15 min.:" + +msgid "464XLAT (CLAT)" +msgstr "" msgid "5 Minute Load:" -msgstr "Obciążenie w ciągu 5 minut:" +msgstr "Obciążenie 5 min.:" msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>" msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>" @@ -215,6 +218,9 @@ msgstr "Dodaj nowy interfejs..." msgid "Additional Hosts files" msgstr "Dodatkowe pliki Hosts" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "Adres" @@ -347,6 +353,9 @@ msgstr "Dostępne pakiety" msgid "Average:" msgstr "Średnia:" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "BSSID" @@ -424,6 +433,11 @@ msgstr "Bezprzewodowy kontroler Broadcom BCM%04x 802.11" msgid "Buffered" msgstr "Buforowana" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "Przyciski" @@ -583,6 +597,14 @@ msgstr "Interfejs Niestandardowy" msgid "Custom delegated IPv6-prefix" msgstr "" +msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + # Spacji zabrało i napisy się skleiły msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" @@ -684,6 +706,12 @@ msgstr "Urządzenie" msgid "Device Configuration" msgstr "Konfiguracja urządzenia" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "Diagnostyka" @@ -724,6 +752,9 @@ msgstr "Optymalizacja odległości" msgid "Distance to farthest network member in meters." msgstr "Odległość do najdalej oddalonego członka sieci w metrach." +msgid "Distribution feeds" +msgstr "" + # Jak poprzednio trzymam się konwencji msgid "Diversity" msgstr "Wielorakość" @@ -802,6 +833,9 @@ msgstr "" "Dynamicznie rezerwuje adresy DHCP dla klientów. Jeśli jest wyłączone tylko " "klienci posiadający stałe dzierżawy będą obsłużeni." +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "Metoda EAP" @@ -832,9 +866,6 @@ msgstr "Włącz <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "Włącz dynamiczną aktualizację punktu końcowego sieci HE.net" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "Włącz negocjację IPv6 na łączu PPP" - msgid "Enable Jumbo Frame passthrough" msgstr "Włącz przechodzenie ramek Jumbo" @@ -996,6 +1027,9 @@ msgstr "Wymuś TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Wymuś TKIP i CCMP (AES)" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "Przekazuj ruch DHCP" @@ -1035,6 +1069,9 @@ msgstr "Ustawienia główne" msgid "General Setup" msgstr "Ustawienia podstawowe" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "Twórz archiwum" @@ -1150,6 +1187,9 @@ msgstr "Maska IPv4" msgid "IPv4 only" msgstr "Tylko IPv4" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "Długość prefiksu IPv4" @@ -1249,8 +1289,8 @@ msgstr "" "Memory\">RAM</abbr> będzie dostępna. Uwaga - plik wymiany jest dużo " "wolniejszy niż pamięć <abbr title=\"Random Access Memory\">RAM</abbr>." -msgid "Ignore Hosts files" -msgstr "Ignoruj pliki Hosts" +msgid "Ignore <code>/etc/hosts</code>" +msgstr "" msgid "Ignore interface" msgstr "Ignoruj interfejs" @@ -1264,6 +1304,11 @@ msgstr "Obraz" msgid "In" msgstr "W" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "Czas bezczynności" @@ -1544,6 +1589,9 @@ msgstr "Filtr adresów MAC" msgid "MAC-List" msgstr "Lista MAC" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -1558,6 +1606,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "Maksymalna Szybkość" @@ -1667,6 +1718,9 @@ msgstr "Adres Multicast`u" msgid "NAS ID" msgstr "NAS ID" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1838,7 +1892,7 @@ msgid "Out" msgstr "Wychodzące" msgid "Outbound:" -msgstr "Wychodzące:" +msgstr "Wychodzący:" msgid "Outdoor Channels" msgstr "Kanały zewnętrzne" @@ -1898,6 +1952,12 @@ msgstr "PPPoE" msgid "PPtP" msgstr "PPtP" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "Wymagany pakiet libiwinfo!" @@ -1925,9 +1985,6 @@ msgstr "Hasło lub klucz prywatny" msgid "Password successfully changed!" msgstr "Pomyślnie zmieniono hasło!" -msgid "Path" -msgstr "" - msgid "Path to CA-Certificate" msgstr "Ścieżka do certyfikatu CA" @@ -1966,9 +2023,6 @@ msgstr "Pktw." msgid "Please enter your username and password." msgstr "Proszę wprowadź swój login i hasło." -msgid "Please wait: Device rebooting..." -msgstr "Proszę czekać: Ponowne uruchamianie..." - msgid "Policy" msgstr "Zasada" @@ -2365,6 +2419,9 @@ msgstr "Sygnał:" msgid "Size" msgstr "Rozmiar" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "Pomiń" @@ -2660,6 +2717,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "Wybrany protokół potrzebuje przypisanego urządzenia" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2720,6 +2780,12 @@ msgid "This IPv4 address of the relay" msgstr "Ten adres IPv4 przekaźnika" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -3057,13 +3123,14 @@ msgstr "Trwa wprowadzenie zmian..." msgid "Waiting for command to complete..." msgstr "Trwa wykonanie polecenia..." +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "Ostrzeżenie" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "" -"Ostrzeżenie: Pozostały niezapisane zmian, które zostaną utracone podczas " -"restartu!" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3296,6 +3363,21 @@ msgstr "tak" msgid "« Back" msgstr "« Wróć" +#~ msgid "Enable IPv6 negotiation on the PPP link" +#~ msgstr "Włącz negocjację IPv6 na łączu PPP" + +#~ msgid "Ignore Hosts files" +#~ msgstr "Ignoruj pliki Hosts" + +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "Proszę czekać: Ponowne uruchamianie..." + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "" +#~ "Ostrzeżenie: Pozostały niezapisane zmian, które zostaną utracone podczas " +#~ "restartu!" + #~ msgid "" #~ "Always use 40MHz channels even if the secondary channel overlaps. Using " #~ "this option does not comply with IEEE 802.11n-2009!" diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po index ec4401bde9..2515b341c6 100644 --- a/modules/luci-base/po/pt-br/base.po +++ b/modules/luci-base/po/pt-br/base.po @@ -46,6 +46,9 @@ msgstr "Carga 1 Minuto:" msgid "15 Minute Load:" msgstr "Carga 15 Minutos:" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "Carga 5 Minutos:" @@ -215,6 +218,9 @@ msgstr "Adiciona uma nova interface..." msgid "Additional Hosts files" msgstr "Arquivos adicionais de equipamentos conhecidos (hosts)" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "Endereço" @@ -345,6 +351,9 @@ msgstr "Pacotes disponíveis" msgid "Average:" msgstr "Média:" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "BSSID" @@ -420,6 +429,11 @@ msgstr "Broadcom BCM%04x 802.11 Wireless Controlador" msgid "Buffered" msgstr "Buffered" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "Botões" @@ -579,6 +593,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -678,6 +700,12 @@ msgstr "Dispositivo" msgid "Device Configuration" msgstr "Configuração do Dispositivo" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "Diagnóstico" @@ -719,6 +747,9 @@ msgstr "Otimização de Distância" msgid "Distance to farthest network member in meters." msgstr "Distância para o computador mais distante da rede (em metros)." +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "Diversidade" @@ -798,6 +829,9 @@ msgstr "" "Aloca dinamicamente os endereços do DHCP para os clientes. Se desabilitado, " "somente os clientes com atribuições estáticas serão servidos. " +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "Método EAP" @@ -827,9 +861,6 @@ msgstr "Ativar <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "Ativar a atualização de ponto final dinâmico HE.net" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "Ativar a negociação de IPv6 no enlace PPP" - msgid "Enable Jumbo Frame passthrough" msgstr "Ativar o encaminhamento de quadros jumbos (Jumbo Frames)" @@ -987,6 +1018,9 @@ msgstr "Forçar TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Forçar TKIP e CCMP (AES)" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "Encaminhar tráfego DHCP" @@ -1026,6 +1060,9 @@ msgstr "Configurações Gerais" msgid "General Setup" msgstr "Configurações Gerais" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "Gerar arquivo" @@ -1141,6 +1178,9 @@ msgstr "Máscara de rede IPv4" msgid "IPv4 only" msgstr "Somente IPv4" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "Tamanho do prefixo IPv4" @@ -1242,8 +1282,8 @@ msgstr "" "de transferência tão altas com a memória <abbr title=\"Memória de Acesso " "Aleatório\">RAM</abbr>." -msgid "Ignore Hosts files" -msgstr "Ignorar arquivos de equipamentos conhecidos (hosts)" +msgid "Ignore <code>/etc/hosts</code>" +msgstr "Ignorar <code>/etc/hosts</code>" msgid "Ignore interface" msgstr "Ignorar interface" @@ -1257,6 +1297,11 @@ msgstr "Imagem" msgid "In" msgstr "Entrada" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "Tempo limite de inatividade" @@ -1545,6 +1590,9 @@ msgstr "Filtro de MAC" msgid "MAC-List" msgstr "Lista de MAC" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -1561,6 +1609,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "Taxa Máxima" @@ -1671,6 +1722,9 @@ msgstr "Endereço de Multicast" msgid "NAS ID" msgstr "NAS ID" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1905,6 +1959,12 @@ msgstr "PPPoE" msgid "PPtP" msgstr "PPtP" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "O pacote libiwinfo é necessário!" @@ -1932,9 +1992,6 @@ msgstr "Senha da Chave Privada" msgid "Password successfully changed!" msgstr "A senha foi alterada com sucesso!" -msgid "Path" -msgstr "Directório" - msgid "Path to CA-Certificate" msgstr "Caminho para o Certificado da AC" @@ -1971,9 +2028,6 @@ msgstr "Pcts." msgid "Please enter your username and password." msgstr "Entre com o seu usuário e senha." -msgid "Please wait: Device rebooting..." -msgstr "Por favor aguarde: Equipamento reiniciando..." - msgid "Policy" msgstr "Política" @@ -2369,6 +2423,9 @@ msgstr "Sinal:" msgid "Size" msgstr "Tamanho" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "Pular" @@ -2663,6 +2720,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "O protocolo selecionado necessita estar associado a um dispositivo" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2724,6 +2784,12 @@ msgid "This IPv4 address of the relay" msgstr "Este endereço IPv4 do repassar" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -3058,13 +3124,14 @@ msgstr "Esperando a aplicação das mudanças..." msgid "Waiting for command to complete..." msgstr "Esperando o término do comando..." +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "Atenção" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "" -"Aviso: Existem alterações não salvas que serão perdidas durante a " -"reiniciação!" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3300,6 +3367,24 @@ msgstr "sim" msgid "« Back" msgstr "« Voltar" +#~ msgid "Enable IPv6 negotiation on the PPP link" +#~ msgstr "Ativar a negociação de IPv6 no enlace PPP" + +#~ msgid "Ignore Hosts files" +#~ msgstr "Ignorar arquivos de equipamentos conhecidos (hosts)" + +#~ msgid "Path" +#~ msgstr "Directório" + +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "Por favor aguarde: Equipamento reiniciando..." + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "" +#~ "Aviso: Existem alterações não salvas que serão perdidas durante a " +#~ "reiniciação!" + #~ msgid "" #~ "Always use 40MHz channels even if the secondary channel overlaps. Using " #~ "this option does not comply with IEEE 802.11n-2009!" @@ -4158,9 +4243,6 @@ msgstr "« Voltar" #~ msgid "Here you can configure installed wifi devices." #~ msgstr "Aqui pode configurar os dispositivos wifi instalados. " -#~ msgid "Ignore <code>/etc/hosts</code>" -#~ msgstr "Ignorar <code>/etc/hosts</code>" - #~ msgid "Independent (Ad-Hoc)" #~ msgstr "Independente (Ad-Hoc)" diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po index 1acc852bbf..35cd986659 100644 --- a/modules/luci-base/po/pt/base.po +++ b/modules/luci-base/po/pt/base.po @@ -46,6 +46,9 @@ msgstr "Carga de 1 Minuto:" msgid "15 Minute Load:" msgstr "Carga de 15 minutos:" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "Carga 5 Minutos:" @@ -215,6 +218,9 @@ msgstr "Adicionar uma nova interface..." msgid "Additional Hosts files" msgstr "Ficheiro Adicional de Hosts" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "Endereço" @@ -343,6 +349,9 @@ msgstr "Pacotes disponíveis" msgid "Average:" msgstr "Média:" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "BSSID" @@ -418,6 +427,11 @@ msgstr "Controlador Wireless Broadcom BCM%04x 802.11" msgid "Buffered" msgstr "" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "Botões" @@ -576,6 +590,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -675,6 +697,12 @@ msgstr "Dispositivo" msgid "Device Configuration" msgstr "Configuração do Dispositivo" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "Diagnósticos" @@ -715,6 +743,9 @@ msgstr "Optimização de Distância" msgid "Distance to farthest network member in meters." msgstr "Distância para o último host da rede em metros." +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "Diversidade" @@ -791,6 +822,9 @@ msgstr "" "Alocar dinamicamente endereços DHCP para clientes. Se desativado, só os " "clientes com reservas estáticas serão servidos." +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "Metodo-EAP" @@ -820,9 +854,6 @@ msgstr "Ativar <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "Ativar a atualização dinâmica de ponto final HE.net" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "Ativar a negociação IPv6 no link PPP" - msgid "Enable Jumbo Frame passthrough" msgstr "Ativar a passagem de Jumbo Frames" @@ -980,6 +1011,9 @@ msgstr "Forçar TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Forçar TKIP e CCMP (AES)" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "Encaminhar tráfego DHCP" @@ -1019,6 +1053,9 @@ msgstr "Definições Gerais" msgid "General Setup" msgstr "Configuração Geral" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "Gerar arquivo" @@ -1133,6 +1170,9 @@ msgstr "Máscara IPv4" msgid "IPv4 only" msgstr "Só IPv4" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "Comprimento do prefixo IPv4" @@ -1228,8 +1268,8 @@ msgstr "" "lento pois o dispositivo swap não pode ser acedido com um nível elevado de " "memória <abbr title=\"Memória de Acesso Aleatório\">RAM</abbr>." -msgid "Ignore Hosts files" -msgstr "Ignorar ficheiros de Hosts" +msgid "Ignore <code>/etc/hosts</code>" +msgstr "Ignorar <code>/etc/hosts</code>" msgid "Ignore interface" msgstr "Ignorar interface" @@ -1243,6 +1283,11 @@ msgstr "Imagem" msgid "In" msgstr "Entrada" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "Tempo de inatividade" @@ -1521,6 +1566,9 @@ msgstr "Filtro-MAC" msgid "MAC-List" msgstr "Lista-MAC" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -1535,6 +1583,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "Taxa Máxima" @@ -1644,6 +1695,9 @@ msgstr "Endereço de multicast" msgid "NAS ID" msgstr "NAS ID" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1874,6 +1928,12 @@ msgstr "PPPoE" msgid "PPtP" msgstr "PPtp" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "O pacote libiwinfo é necessário!" @@ -1901,9 +1961,6 @@ msgstr "Senha da Chave Privada" msgid "Password successfully changed!" msgstr "Password alterada com sucesso!" -msgid "Path" -msgstr "Directório" - msgid "Path to CA-Certificate" msgstr "Directorio do Certificado CA" @@ -1940,9 +1997,6 @@ msgstr "Pkts." msgid "Please enter your username and password." msgstr "Insira o seu username e password." -msgid "Please wait: Device rebooting..." -msgstr "Por favor aguarde: Equipamento a reiniciar..." - msgid "Policy" msgstr "Política" @@ -2331,6 +2385,9 @@ msgstr "Sinal:" msgid "Size" msgstr "Tamanho" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "Saltar" @@ -2605,6 +2662,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "O protocolo escolhido precisa de um dispositivo atribuído." +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2666,6 +2726,12 @@ msgid "This IPv4 address of the relay" msgstr "" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -2984,13 +3050,14 @@ msgstr "A aguardar que as mudanças sejam aplicadas..." msgid "Waiting for command to complete..." msgstr "A aguardar que o comando termine..." +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "Aviso" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "" -"Aviso: Existem alterações não salvas que serão perdidas durante a " -"reinicialização!" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3225,6 +3292,24 @@ msgstr "sim" msgid "« Back" msgstr "« Voltar" +#~ msgid "Enable IPv6 negotiation on the PPP link" +#~ msgstr "Ativar a negociação IPv6 no link PPP" + +#~ msgid "Ignore Hosts files" +#~ msgstr "Ignorar ficheiros de Hosts" + +#~ msgid "Path" +#~ msgstr "Directório" + +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "Por favor aguarde: Equipamento a reiniciar..." + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "" +#~ "Aviso: Existem alterações não salvas que serão perdidas durante a " +#~ "reinicialização!" + #~ msgid "" #~ "Always use 40MHz channels even if the secondary channel overlaps. Using " #~ "this option does not comply with IEEE 802.11n-2009!" @@ -3860,9 +3945,6 @@ msgstr "« Voltar" #~ msgid "Here you can configure installed wifi devices." #~ msgstr "Aqui pode configurar os dispositivos wifi instalados. " -#~ msgid "Ignore <code>/etc/hosts</code>" -#~ msgstr "Ignorar <code>/etc/hosts</code>" - #~ msgid "Independent (Ad-Hoc)" #~ msgstr "Independente (Ad-Hoc)" diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po index 3692b7de55..8c6c348f81 100644 --- a/modules/luci-base/po/ro/base.po +++ b/modules/luci-base/po/ro/base.po @@ -45,6 +45,9 @@ msgstr "Incarcarea in ultimul minut" msgid "15 Minute Load:" msgstr "Incarcarea in ultimele 15 minute" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "Incarcarea in ultimele 5 minute" @@ -202,6 +205,9 @@ msgstr "Adauga interfata noua.." msgid "Additional Hosts files" msgstr "Fisiere de tip hosts aditionale" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "Adresa" @@ -330,6 +336,9 @@ msgstr "Pachete disponibile" msgid "Average:" msgstr "Medie:" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "BSSID" @@ -402,6 +411,11 @@ msgstr "Broadcom BCM%04x 802.11 Controller Fara Fir" msgid "Buffered" msgstr "Incarcat" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "Butoane" @@ -552,6 +566,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -646,6 +668,12 @@ msgstr "Dispozitiv" msgid "Device Configuration" msgstr "Configurarea dispozitivului" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "Diagnosticuri" @@ -686,6 +714,9 @@ msgstr "Optimizarea distantei" msgid "Distance to farthest network member in meters." msgstr "Distanta catre cel mai departat membru din retea in metri." +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "Diversitate" @@ -747,6 +778,9 @@ msgid "" "having static leases will be served." msgstr "" +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "" @@ -776,9 +810,6 @@ msgstr "Activeaza <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "" - msgid "Enable Jumbo Frame passthrough" msgstr "" @@ -934,6 +965,9 @@ msgstr "Forteaza TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Forteaza TKIP si CCMP (AES)" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "" @@ -973,6 +1007,9 @@ msgstr "Setari principale" msgid "General Setup" msgstr "Configurare generala" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "" @@ -1081,6 +1118,9 @@ msgstr "" msgid "IPv4 only" msgstr "Doar IPv4" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "" @@ -1170,7 +1210,7 @@ msgid "" "of the <abbr title=\"Random Access Memory\">RAM</abbr>." msgstr "" -msgid "Ignore Hosts files" +msgid "Ignore <code>/etc/hosts</code>" msgstr "" msgid "Ignore interface" @@ -1185,6 +1225,11 @@ msgstr "Imagine" msgid "In" msgstr "" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "" @@ -1454,6 +1499,9 @@ msgstr "" msgid "MAC-List" msgstr "" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "" @@ -1468,6 +1516,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "Rata maxima" @@ -1575,6 +1626,9 @@ msgstr "" msgid "NAS ID" msgstr "" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1799,6 +1853,12 @@ msgstr "" msgid "PPtP" msgstr "" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "Pachetul libiwinfo este necesar !" @@ -1826,9 +1886,6 @@ msgstr "Parola cheii private" msgid "Password successfully changed!" msgstr "Parola schimbata cu succes !" -msgid "Path" -msgstr "" - msgid "Path to CA-Certificate" msgstr "Calea catre certificatul CA" @@ -1865,9 +1922,6 @@ msgstr "Packete." msgid "Please enter your username and password." msgstr "Introdu utilizatorul si parola." -msgid "Please wait: Device rebooting..." -msgstr "Asteapta: dispozitivul se restarteaza.." - msgid "Policy" msgstr "" @@ -2242,6 +2296,9 @@ msgstr "Semnal:" msgid "Size" msgstr "Marime" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "" @@ -2492,6 +2549,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2542,6 +2602,12 @@ msgid "This IPv4 address of the relay" msgstr "" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -2852,11 +2918,14 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "Avertizare" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" -msgstr "Atentie: exista modificari nesalvate care vor fi pierdute la restart !" +msgid "Warning: There are unsaved changes that will get lost on reboot!" +msgstr "" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3080,6 +3149,14 @@ msgstr "da" msgid "« Back" msgstr "« Inapoi" +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "Asteapta: dispozitivul se restarteaza.." + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "" +#~ "Atentie: exista modificari nesalvate care vor fi pierdute la restart !" + #~ msgid "" #~ "Always use 40MHz channels even if the secondary channel overlaps. Using " #~ "this option does not comply with IEEE 802.11n-2009!" diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index 94fa6fb8ee..8085a6fd5e 100644 --- a/modules/luci-base/po/ru/base.po +++ b/modules/luci-base/po/ru/base.po @@ -48,6 +48,9 @@ msgstr "Загрузка за 1 минуту:" msgid "15 Minute Load:" msgstr "Загрузка за 15 минут:" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "Загрузка за 5 минут:" @@ -212,6 +215,9 @@ msgstr "Добавить новый интерфейс..." msgid "Additional Hosts files" msgstr "Дополнительные файлы hosts" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "Адрес" @@ -342,6 +348,9 @@ msgstr "Доступные пакеты" msgid "Average:" msgstr "Средняя:" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "BSSID" @@ -418,6 +427,11 @@ msgstr "Беспроводной 802.11 контроллер Broadcom BCM%04x" msgid "Buffered" msgstr "Буферизировано" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "Кнопки" @@ -576,6 +590,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -674,6 +696,12 @@ msgstr "Устройство" msgid "Device Configuration" msgstr "Конфигурация устройства" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "Диагностика" @@ -714,6 +742,9 @@ msgstr "Оптимизация расстояния" msgid "Distance to farthest network member in meters." msgstr "Расстояние до самого удалённого сетевого узла в метрах." +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "Разновидность антенн" @@ -789,6 +820,9 @@ msgstr "" "Динамически выделять DHCP-адреса клиентам. Если выключено, то будут " "обслужены только клиенты с постоянно арендованными адресами." +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "Метод EAP" @@ -821,9 +855,6 @@ msgstr "Включить <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "Включить динамическое обновление оконечной точки HE.net" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "Включить IPv6-согласование на PPP-соединении" - msgid "Enable Jumbo Frame passthrough" msgstr "Пропускать Jumbo-кадры" @@ -982,6 +1013,9 @@ msgstr "Требовать TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "TKIP или CCMP (AES)" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "Перенаправлять трафик DHCP" @@ -1021,6 +1055,9 @@ msgstr "Основные настройки" msgid "General Setup" msgstr "Основные настройки" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "Создать архив" @@ -1132,6 +1169,9 @@ msgstr "Маска сети IPv4" msgid "IPv4 only" msgstr "Только IPv4" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "Длина префикса IPv4" @@ -1231,8 +1271,8 @@ msgstr "" "устройство, на котором располагается раздел подкачки, работает гораздо " "медленнее, чем <abbr title=\"Random Access Memory\">RAM</abbr>." -msgid "Ignore Hosts files" -msgstr "Игнорировать файлы hosts" +msgid "Ignore <code>/etc/hosts</code>" +msgstr "Ignore <code>/etc/hosts</code>" msgid "Ignore interface" msgstr "Игнорировать интерфейс" @@ -1246,6 +1286,11 @@ msgstr "Образ" msgid "In" msgstr "В" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "Таймаут бездействия" @@ -1526,6 +1571,9 @@ msgstr "MAC-фильтр" msgid "MAC-List" msgstr "Список MAC" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "МБ/с" @@ -1540,6 +1588,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "Максимальная скорость" @@ -1650,6 +1701,9 @@ msgstr "Адрес групповой передачи" msgid "NAS ID" msgstr "Идентификатор NAS" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1882,6 +1936,12 @@ msgstr "PPPoE" msgid "PPtP" msgstr "PPTP" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "Требуется пакет libiwinfo!" @@ -1909,9 +1969,6 @@ msgstr "Пароль или закрытый ключ" msgid "Password successfully changed!" msgstr "Пароль успешно изменён!" -msgid "Path" -msgstr "Путь" - msgid "Path to CA-Certificate" msgstr "Путь к центру сертификации" @@ -1948,9 +2005,6 @@ msgstr "Пакетов." msgid "Please enter your username and password." msgstr "Пожалуйста, введите логин и пароль." -msgid "Please wait: Device rebooting..." -msgstr "Пожалуйста подождите: устройство перезагружается..." - msgid "Policy" msgstr "Политика" @@ -2343,6 +2397,9 @@ msgstr "Сигнал:" msgid "Size" msgstr "Размер" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "Пропустить" @@ -2633,6 +2690,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "Для выбранного протокола необходимо задать устройство" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2693,6 +2753,12 @@ msgid "This IPv4 address of the relay" msgstr "IPv4-адрес ретранслятора" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -3027,13 +3093,14 @@ msgstr "Ожидание применения изменений..." msgid "Waiting for command to complete..." msgstr "Ожидание завершения выполнения команды..." +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "Внимание" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "" -"Внимание: есть несохранённые изменения, которые потеряются после " -"перезагрузки!" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3267,6 +3334,24 @@ msgstr "да" msgid "« Back" msgstr "« Назад" +#~ msgid "Enable IPv6 negotiation on the PPP link" +#~ msgstr "Включить IPv6-согласование на PPP-соединении" + +#~ msgid "Ignore Hosts files" +#~ msgstr "Игнорировать файлы hosts" + +#~ msgid "Path" +#~ msgstr "Путь" + +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "Пожалуйста подождите: устройство перезагружается..." + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "" +#~ "Внимание: есть несохранённые изменения, которые потеряются после " +#~ "перезагрузки!" + #~ msgid "" #~ "Always use 40MHz channels even if the secondary channel overlaps. Using " #~ "this option does not comply with IEEE 802.11n-2009!" @@ -4101,9 +4186,6 @@ msgstr "« Назад" #~ msgid "Here you can configure installed wifi devices." #~ msgstr "Здесь вы можете настроить установленные Wi-Fi устройства." -#~ msgid "Ignore <code>/etc/hosts</code>" -#~ msgstr "Ignore <code>/etc/hosts</code>" - #~ msgid "Independent (Ad-Hoc)" #~ msgstr "Незаыисимая (Ad-Hoc)" diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po index d943ccb891..3f328ebf14 100644 --- a/modules/luci-base/po/sk/base.po +++ b/modules/luci-base/po/sk/base.po @@ -41,6 +41,9 @@ msgstr "" msgid "15 Minute Load:" msgstr "" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "" @@ -190,6 +193,9 @@ msgstr "" msgid "Additional Hosts files" msgstr "" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "" @@ -315,6 +321,9 @@ msgstr "" msgid "Average:" msgstr "" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "" @@ -387,6 +396,11 @@ msgstr "" msgid "Buffered" msgstr "" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "" @@ -534,6 +548,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -628,6 +650,12 @@ msgstr "" msgid "Device Configuration" msgstr "" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "" @@ -666,6 +694,9 @@ msgstr "" msgid "Distance to farthest network member in meters." msgstr "" +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "" @@ -727,6 +758,9 @@ msgid "" "having static leases will be served." msgstr "" +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "" @@ -756,9 +790,6 @@ msgstr "" msgid "Enable HE.net dynamic endpoint update" msgstr "" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "" - msgid "Enable Jumbo Frame passthrough" msgstr "" @@ -913,6 +944,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "" @@ -952,6 +986,9 @@ msgstr "" msgid "General Setup" msgstr "" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "" @@ -1058,6 +1095,9 @@ msgstr "" msgid "IPv4 only" msgstr "" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "" @@ -1147,7 +1187,7 @@ msgid "" "of the <abbr title=\"Random Access Memory\">RAM</abbr>." msgstr "" -msgid "Ignore Hosts files" +msgid "Ignore <code>/etc/hosts</code>" msgstr "" msgid "Ignore interface" @@ -1162,6 +1202,11 @@ msgstr "" msgid "In" msgstr "" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "" @@ -1428,6 +1473,9 @@ msgstr "" msgid "MAC-List" msgstr "" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "" @@ -1442,6 +1490,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "" @@ -1549,6 +1600,9 @@ msgstr "" msgid "NAS ID" msgstr "" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1773,6 +1827,12 @@ msgstr "" msgid "PPtP" msgstr "" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "" @@ -1800,9 +1860,6 @@ msgstr "" msgid "Password successfully changed!" msgstr "" -msgid "Path" -msgstr "" - msgid "Path to CA-Certificate" msgstr "" @@ -1839,9 +1896,6 @@ msgstr "" msgid "Please enter your username and password." msgstr "" -msgid "Please wait: Device rebooting..." -msgstr "" - msgid "Policy" msgstr "" @@ -2213,6 +2267,9 @@ msgstr "" msgid "Size" msgstr "" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "" @@ -2463,6 +2520,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2511,6 +2571,12 @@ msgid "This IPv4 address of the relay" msgstr "" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -2819,10 +2885,13 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "" msgid "Whether to create an IPv6 default route over the tunnel" diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po index 86fa224e79..4e97068e90 100644 --- a/modules/luci-base/po/sv/base.po +++ b/modules/luci-base/po/sv/base.po @@ -44,6 +44,9 @@ msgstr "Belastning senaste minuten:" msgid "15 Minute Load:" msgstr "Belastning senaste 15 minutrarna:" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "Belastning senaste 5 minutrarna:" @@ -196,6 +199,9 @@ msgstr "" msgid "Additional Hosts files" msgstr "" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "" @@ -321,6 +327,9 @@ msgstr "" msgid "Average:" msgstr "" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "" @@ -393,6 +402,11 @@ msgstr "" msgid "Buffered" msgstr "" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "" @@ -540,6 +554,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -634,6 +656,12 @@ msgstr "" msgid "Device Configuration" msgstr "" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "" @@ -672,6 +700,9 @@ msgstr "" msgid "Distance to farthest network member in meters." msgstr "" +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "" @@ -733,6 +764,9 @@ msgid "" "having static leases will be served." msgstr "" +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "" @@ -762,9 +796,6 @@ msgstr "" msgid "Enable HE.net dynamic endpoint update" msgstr "" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "" - msgid "Enable Jumbo Frame passthrough" msgstr "" @@ -919,6 +950,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "" @@ -958,6 +992,9 @@ msgstr "" msgid "General Setup" msgstr "" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "" @@ -1064,6 +1101,9 @@ msgstr "" msgid "IPv4 only" msgstr "" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "" @@ -1153,7 +1193,7 @@ msgid "" "of the <abbr title=\"Random Access Memory\">RAM</abbr>." msgstr "" -msgid "Ignore Hosts files" +msgid "Ignore <code>/etc/hosts</code>" msgstr "" msgid "Ignore interface" @@ -1168,6 +1208,11 @@ msgstr "" msgid "In" msgstr "" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "" @@ -1434,6 +1479,9 @@ msgstr "" msgid "MAC-List" msgstr "" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "" @@ -1448,6 +1496,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "" @@ -1555,6 +1606,9 @@ msgstr "" msgid "NAS ID" msgstr "" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1779,6 +1833,12 @@ msgstr "" msgid "PPtP" msgstr "" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "" @@ -1806,9 +1866,6 @@ msgstr "" msgid "Password successfully changed!" msgstr "" -msgid "Path" -msgstr "" - msgid "Path to CA-Certificate" msgstr "" @@ -1845,9 +1902,6 @@ msgstr "" msgid "Please enter your username and password." msgstr "" -msgid "Please wait: Device rebooting..." -msgstr "" - msgid "Policy" msgstr "" @@ -2219,6 +2273,9 @@ msgstr "" msgid "Size" msgstr "" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "" @@ -2469,6 +2526,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2517,6 +2577,12 @@ msgid "This IPv4 address of the relay" msgstr "" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -2825,10 +2891,13 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "" msgid "Whether to create an IPv6 default route over the tunnel" diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot index 21ec6571ee..d0211cc31f 100644 --- a/modules/luci-base/po/templates/base.pot +++ b/modules/luci-base/po/templates/base.pot @@ -34,6 +34,9 @@ msgstr "" msgid "15 Minute Load:" msgstr "" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "" @@ -183,6 +186,9 @@ msgstr "" msgid "Additional Hosts files" msgstr "" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "" @@ -308,6 +314,9 @@ msgstr "" msgid "Average:" msgstr "" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "" @@ -380,6 +389,11 @@ msgstr "" msgid "Buffered" msgstr "" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "" @@ -527,6 +541,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -621,6 +643,12 @@ msgstr "" msgid "Device Configuration" msgstr "" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "" @@ -659,6 +687,9 @@ msgstr "" msgid "Distance to farthest network member in meters." msgstr "" +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "" @@ -720,12 +751,20 @@ msgid "" "having static leases will be served." msgstr "" +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "" msgid "Edit" msgstr "" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "" @@ -744,9 +783,6 @@ msgstr "" msgid "Enable HE.net dynamic endpoint update" msgstr "" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "" - msgid "Enable Jumbo Frame passthrough" msgstr "" @@ -901,6 +937,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "" @@ -940,6 +979,9 @@ msgstr "" msgid "General Setup" msgstr "" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "" @@ -1046,6 +1088,9 @@ msgstr "" msgid "IPv4 only" msgstr "" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "" @@ -1135,7 +1180,7 @@ msgid "" "of the <abbr title=\"Random Access Memory\">RAM</abbr>." msgstr "" -msgid "Ignore Hosts files" +msgid "Ignore <code>/etc/hosts</code>" msgstr "" msgid "Ignore interface" @@ -1150,6 +1195,11 @@ msgstr "" msgid "In" msgstr "" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "" @@ -1416,6 +1466,9 @@ msgstr "" msgid "MAC-List" msgstr "" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "" @@ -1430,6 +1483,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "" @@ -1537,6 +1593,9 @@ msgstr "" msgid "NAS ID" msgstr "" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1761,6 +1820,12 @@ msgstr "" msgid "PPtP" msgstr "" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "" @@ -1788,9 +1853,6 @@ msgstr "" msgid "Password successfully changed!" msgstr "" -msgid "Path" -msgstr "" - msgid "Path to CA-Certificate" msgstr "" @@ -1827,9 +1889,6 @@ msgstr "" msgid "Please enter your username and password." msgstr "" -msgid "Please wait: Device rebooting..." -msgstr "" - msgid "Policy" msgstr "" @@ -2201,6 +2260,9 @@ msgstr "" msgid "Size" msgstr "" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "" @@ -2394,6 +2456,9 @@ msgid "" "code> and <code>_</code>" msgstr "" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" @@ -2448,6 +2513,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2496,6 +2564,12 @@ msgid "This IPv4 address of the relay" msgstr "" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -2804,10 +2878,13 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "" msgid "Whether to create an IPv6 default route over the tunnel" diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po index 1bf53aa576..3ef95609e9 100644 --- a/modules/luci-base/po/tr/base.po +++ b/modules/luci-base/po/tr/base.po @@ -44,6 +44,9 @@ msgstr "1 Dakikalık Yük:" msgid "15 Minute Load:" msgstr "15 Dakikalık Yük:" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "5 Dakikalık Yük:" @@ -201,6 +204,9 @@ msgstr "Yeni arabirim ekle..." msgid "Additional Hosts files" msgstr "" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "Adresler" @@ -328,6 +334,9 @@ msgstr "Kullanılabilir Paketler" msgid "Average:" msgstr "Ortalama:" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "" @@ -400,6 +409,11 @@ msgstr "" msgid "Buffered" msgstr "" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "" @@ -547,6 +561,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -641,6 +663,12 @@ msgstr "" msgid "Device Configuration" msgstr "" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "" @@ -679,6 +707,9 @@ msgstr "" msgid "Distance to farthest network member in meters." msgstr "" +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "" @@ -740,6 +771,9 @@ msgid "" "having static leases will be served." msgstr "" +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "" @@ -769,9 +803,6 @@ msgstr "" msgid "Enable HE.net dynamic endpoint update" msgstr "" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "" - msgid "Enable Jumbo Frame passthrough" msgstr "" @@ -926,6 +957,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "" @@ -965,6 +999,9 @@ msgstr "" msgid "General Setup" msgstr "" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "" @@ -1071,6 +1108,9 @@ msgstr "" msgid "IPv4 only" msgstr "" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "" @@ -1160,7 +1200,7 @@ msgid "" "of the <abbr title=\"Random Access Memory\">RAM</abbr>." msgstr "" -msgid "Ignore Hosts files" +msgid "Ignore <code>/etc/hosts</code>" msgstr "" msgid "Ignore interface" @@ -1175,6 +1215,11 @@ msgstr "" msgid "In" msgstr "" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "" @@ -1441,6 +1486,9 @@ msgstr "" msgid "MAC-List" msgstr "" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "" @@ -1455,6 +1503,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "" @@ -1562,6 +1613,9 @@ msgstr "" msgid "NAS ID" msgstr "" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1786,6 +1840,12 @@ msgstr "" msgid "PPtP" msgstr "" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "" @@ -1813,9 +1873,6 @@ msgstr "" msgid "Password successfully changed!" msgstr "" -msgid "Path" -msgstr "" - msgid "Path to CA-Certificate" msgstr "" @@ -1852,9 +1909,6 @@ msgstr "" msgid "Please enter your username and password." msgstr "" -msgid "Please wait: Device rebooting..." -msgstr "" - msgid "Policy" msgstr "" @@ -2226,6 +2280,9 @@ msgstr "" msgid "Size" msgstr "" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "" @@ -2476,6 +2533,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2524,6 +2584,12 @@ msgid "This IPv4 address of the relay" msgstr "" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -2832,10 +2898,13 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "" msgid "Whether to create an IPv6 default route over the tunnel" diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po index c5483221c2..b5fbe506a1 100644 --- a/modules/luci-base/po/uk/base.po +++ b/modules/luci-base/po/uk/base.po @@ -45,6 +45,9 @@ msgstr "Навантаження за 1 хвилину:" msgid "15 Minute Load:" msgstr "Навантаження за 15 хвилин:" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "Навантаження за 5 хвилин:" @@ -222,6 +225,9 @@ msgstr "Додати новий інтерфейс..." msgid "Additional Hosts files" msgstr "Додаткові файли hosts" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "Адреса" @@ -352,6 +358,9 @@ msgstr "Доступні пакети" msgid "Average:" msgstr "Середнє значення:" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "BSSID" @@ -427,6 +436,11 @@ msgstr "Бездротовий 802.11 контролер Broadcom BCM%04x" msgid "Buffered" msgstr "Буферизовано" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "Кнопки" @@ -585,6 +599,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -684,6 +706,12 @@ msgstr "Пристрій" msgid "Device Configuration" msgstr "Конфігурація пристрою" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "Діагностика" @@ -724,6 +752,9 @@ msgstr "Оптимізація за відстанню" msgid "Distance to farthest network member in meters." msgstr "Відстань до найвіддаленішого вузла мережі в метрах." +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "Різновидність" @@ -801,6 +832,9 @@ msgstr "" "Динамічне виділення DHCP-адрес для клієнтів. Якщо вимкнути, будуть " "обслуговуватися тільки клієнти, які мають статичні оренди." +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "EAP-Метод" @@ -830,9 +864,6 @@ msgstr "Увімкнути <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "Увімкнути динамічне оновлення кінцевої точки HE.net" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "Увімкнути узгодження IPv6 для PPP-з'єднань" - msgid "Enable Jumbo Frame passthrough" msgstr "Пропускати Jumbo-фрейми" @@ -989,6 +1020,9 @@ msgstr "Примусово TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Примусово TKIP та CCMP (AES)" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "Спрямовувати DHCP-трафік" @@ -1028,6 +1062,9 @@ msgstr "Загальні настройки" msgid "General Setup" msgstr "Загальні настройки" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "Cтворити архів" @@ -1140,6 +1177,9 @@ msgstr "Маска мережі IPv4" msgid "IPv4 only" msgstr "Тільки IPv4" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "Довжина префікса IPv4" @@ -1239,8 +1279,8 @@ msgstr "" "своп-пристрої не можуть бути доступні з такою високою швидкістю, як <abbr " "title=\"Random Access Memory\">RAM</abbr>." -msgid "Ignore Hosts files" -msgstr "Ігнорувати файли hosts" +msgid "Ignore <code>/etc/hosts</code>" +msgstr "" msgid "Ignore interface" msgstr "Ігнорувати интерфейс" @@ -1254,6 +1294,11 @@ msgstr "Образ" msgid "In" msgstr "Вх." +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "Тайм-аут бездіяльності" @@ -1535,6 +1580,9 @@ msgstr "MAC-фільтр" msgid "MAC-List" msgstr "MAC-список" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "MБ/с" @@ -1549,6 +1597,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "Максимальна швидкість" @@ -1658,6 +1709,9 @@ msgstr "Адреса багатоадресного потоку" msgid "NAS ID" msgstr "Ідентифікатор NAS" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1893,6 +1947,12 @@ msgstr "PPPoE" msgid "PPtP" msgstr "PPtP" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "Потрібен пакет libiwinfo!" @@ -1920,9 +1980,6 @@ msgstr "Пароль закритого ключа" msgid "Password successfully changed!" msgstr "Пароль успішно змінено!" -msgid "Path" -msgstr "" - msgid "Path to CA-Certificate" msgstr "Шлях до центру сертифікції" @@ -1959,9 +2016,6 @@ msgstr "пакетів" msgid "Please enter your username and password." msgstr "Введіть ім'я користувача і пароль" -msgid "Please wait: Device rebooting..." -msgstr "Зачекайте. Пристрій перезавантажується..." - msgid "Policy" msgstr "Політика" @@ -2356,6 +2410,9 @@ msgstr "Сигнал:" msgid "Size" msgstr "Розмір" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "Пропустити" @@ -2647,6 +2704,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "Обраний протокол потребує призначених пристроїв" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2708,6 +2768,12 @@ msgid "This IPv4 address of the relay" msgstr "Це IPv4-адреса ретранслятора" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -3042,11 +3108,14 @@ msgstr "Очікуємо, доки зміни наберуть чинності. msgid "Waiting for command to complete..." msgstr "Очікуємо завершення виконання команди..." +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "Застереження" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" -msgstr "Увага: Є незбережені зміни, які будуть втрачені при перезавантаженні!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" +msgstr "" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3280,6 +3349,20 @@ msgstr "так" msgid "« Back" msgstr "« Назад" +#~ msgid "Enable IPv6 negotiation on the PPP link" +#~ msgstr "Увімкнути узгодження IPv6 для PPP-з'єднань" + +#~ msgid "Ignore Hosts files" +#~ msgstr "Ігнорувати файли hosts" + +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "Зачекайте. Пристрій перезавантажується..." + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "" +#~ "Увага: Є незбережені зміни, які будуть втрачені при перезавантаженні!" + #~ msgid "" #~ "Always use 40MHz channels even if the secondary channel overlaps. Using " #~ "this option does not comply with IEEE 802.11n-2009!" diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po index d81be16eb5..a9b2ae1784 100644 --- a/modules/luci-base/po/vi/base.po +++ b/modules/luci-base/po/vi/base.po @@ -46,6 +46,9 @@ msgstr "" msgid "15 Minute Load:" msgstr "" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "" @@ -197,6 +200,9 @@ msgstr "" msgid "Additional Hosts files" msgstr "" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "" @@ -322,6 +328,9 @@ msgstr "" msgid "Average:" msgstr "" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "" @@ -394,6 +403,11 @@ msgstr "" msgid "Buffered" msgstr "" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "" @@ -541,6 +555,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -637,6 +659,12 @@ msgstr "Công cụ" msgid "Device Configuration" msgstr "" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "" @@ -675,6 +703,9 @@ msgstr "Khoảng cách tối ưu" msgid "Distance to farthest network member in meters." msgstr "Khoảng cách tới thành viên xa nhất trong mạng lưới tính bằng mét" +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "Tính đa dạng" @@ -745,6 +776,9 @@ msgid "" "having static leases will be served." msgstr "" +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "EAP-Method" @@ -774,9 +808,6 @@ msgstr "Kích hoạt <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "" - msgid "Enable Jumbo Frame passthrough" msgstr "" @@ -931,6 +962,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "" @@ -970,6 +1004,9 @@ msgstr "" msgid "General Setup" msgstr "" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "" @@ -1078,6 +1115,9 @@ msgstr "" msgid "IPv4 only" msgstr "" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "" @@ -1172,8 +1212,8 @@ msgstr "" "một quá trình rất chậm vì một thiết bị swap không thể được truy cập với " "datarates cao hơn của <abbr title=\"Random Access Memory\">RAM</abbr>." -msgid "Ignore Hosts files" -msgstr "" +msgid "Ignore <code>/etc/hosts</code>" +msgstr "Lờ đi <code>/etc/hosts</code>" msgid "Ignore interface" msgstr "Lờ đi giao diện" @@ -1187,6 +1227,11 @@ msgstr "" msgid "In" msgstr "Trong" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "" @@ -1456,6 +1501,9 @@ msgstr "Lọc MAC" msgid "MAC-List" msgstr "Danh sách MAC" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "" @@ -1470,6 +1518,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "Mức cao nhất" @@ -1579,6 +1630,9 @@ msgstr "" msgid "NAS ID" msgstr "NAS ID" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1809,6 +1863,12 @@ msgstr "" msgid "PPtP" msgstr "" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "" @@ -1836,9 +1896,6 @@ msgstr "Mật mã của private key" msgid "Password successfully changed!" msgstr "" -msgid "Path" -msgstr "Đường dẫn" - msgid "Path to CA-Certificate" msgstr "Đường dẫn tới CA-Certificate" @@ -1875,9 +1932,6 @@ msgstr "" msgid "Please enter your username and password." msgstr "Nhập tên và mật mã" -msgid "Please wait: Device rebooting..." -msgstr "Xin chờ: Công cụ đang reboot" - msgid "Policy" msgstr "Chính sách" @@ -2253,6 +2307,9 @@ msgstr "" msgid "Size" msgstr "Dung lượng " +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "" @@ -2507,6 +2564,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2561,6 +2621,12 @@ msgid "This IPv4 address of the relay" msgstr "" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -2874,11 +2940,14 @@ msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" -msgstr "Cảnh báo: Các thay đổi chưa lưu sẽ bị mất trong khi khởi động lại!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" +msgstr "" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3109,6 +3178,16 @@ msgstr "" msgid "« Back" msgstr "" +#~ msgid "Path" +#~ msgstr "Đường dẫn" + +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "Xin chờ: Công cụ đang reboot" + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "Cảnh báo: Các thay đổi chưa lưu sẽ bị mất trong khi khởi động lại!" + #~ msgid "Frequency Hopping" #~ msgstr "Tần số Hopping" @@ -3685,9 +3764,6 @@ msgstr "" #~ msgid "Here you can configure installed wifi devices." #~ msgstr "Ở đây bạn có thể định cấu hình của công cụ wifi được cài đặt." -#~ msgid "Ignore <code>/etc/hosts</code>" -#~ msgstr "Lờ đi <code>/etc/hosts</code>" - #~ msgid "Independent (Ad-Hoc)" #~ msgstr "Độc lập (Ad-Hoc)" diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po index 72bf937952..493870c9e2 100644 --- a/modules/luci-base/po/zh-cn/base.po +++ b/modules/luci-base/po/zh-cn/base.po @@ -45,6 +45,9 @@ msgstr "1分钟负载:" msgid "15 Minute Load:" msgstr "15分钟负载:" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "5分钟负载:" @@ -200,6 +203,9 @@ msgstr "添加新接口..." msgid "Additional Hosts files" msgstr "额外的HOSTS文件" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "地址" @@ -327,6 +333,9 @@ msgstr "可用软件包" msgid "Average:" msgstr "平均:" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "BSSID" @@ -401,6 +410,11 @@ msgstr "Broadcom BCM%04x 802.11 无线网卡" msgid "Buffered" msgstr "已缓冲" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "按键" @@ -548,6 +562,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "自定义分配的IPv6前缀" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "自定义<abbr title=\"Light Emitting Diode\">LED</abbr>的活动状态。" @@ -644,6 +666,12 @@ msgstr "设备" msgid "Device Configuration" msgstr "设备配置" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "网络诊断" @@ -683,6 +711,9 @@ msgstr "距离优化" msgid "Distance to farthest network member in meters." msgstr "最远客户端的距离(米)。" +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "分集" @@ -746,6 +777,9 @@ msgid "" "having static leases will be served." msgstr "动态分配DHCP地址。如果禁用，则只能为静态租用表中的客户端提供网络服务。" +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "EAP-Method" @@ -775,9 +809,6 @@ msgstr "开启<abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "启用HE.net动态终端更新" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "在PPP链路上启用IPv6协商" - msgid "Enable Jumbo Frame passthrough" msgstr "启用巨型帧透传" @@ -933,6 +964,9 @@ msgstr "强制使用TKIP加密" msgid "Force TKIP and CCMP (AES)" msgstr "TKIP和CCMP(AES)混合加密" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "转发DHCP数据包" @@ -972,6 +1006,9 @@ msgstr "基本设置" msgid "General Setup" msgstr "基本设置" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "生成备份" @@ -1078,6 +1115,9 @@ msgstr "IPv4子网掩码" msgid "IPv4 only" msgstr "仅IPv4" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "IPv4地址前缀长度" @@ -1167,8 +1207,8 @@ msgid "" "of the <abbr title=\"Random Access Memory\">RAM</abbr>." msgstr "如果物理内存不足，闲置数据可自动移到交换区暂存，以提高可用内存。" -msgid "Ignore Hosts files" -msgstr "忽略HOSTS文件" +msgid "Ignore <code>/etc/hosts</code>" +msgstr "忽略 <code>/etc/hosts</code>" msgid "Ignore interface" msgstr "关闭DHCP" @@ -1182,6 +1222,11 @@ msgstr "固件文件" msgid "In" msgstr "入口" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "活动超时" @@ -1450,6 +1495,9 @@ msgstr "MAC-过滤" msgid "MAC-List" msgstr "MAC-列表" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -1464,6 +1512,9 @@ msgid "" "below:" msgstr "请确认你已经复制过整个根文件系统,例如使用以下命令:" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "最高速率" @@ -1571,6 +1622,9 @@ msgstr "多播地址" msgid "NAS ID" msgstr "NAS ID" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "NDP-代理" @@ -1795,6 +1849,12 @@ msgstr "PPPoE" msgid "PPtP" msgstr "PPtP" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "需要libiwinfo软件包！" @@ -1822,9 +1882,6 @@ msgstr "私有密钥" msgid "Password successfully changed!" msgstr "密码修改成功！" -msgid "Path" -msgstr "路径" - msgid "Path to CA-Certificate" msgstr "CA证书路径" @@ -1861,9 +1918,6 @@ msgstr "数据包" msgid "Please enter your username and password." msgstr "请输入用户名和密码。" -msgid "Please wait: Device rebooting..." -msgstr "请稍等：设备重启中..." - msgid "Policy" msgstr "策略" @@ -2247,6 +2301,9 @@ msgstr "信号:" msgid "Size" msgstr "大小" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "跳过" @@ -2518,6 +2575,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "所选的协议需要分配设备" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2569,6 +2629,12 @@ msgid "This IPv4 address of the relay" msgstr "中继的IPv4地址" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -2885,11 +2951,14 @@ msgstr "正在应用更改..." msgid "Waiting for command to complete..." msgstr "正在执行命令..." +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "警告" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" -msgstr "警告: 有尚未保存的更改，重启将丢失!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" +msgstr "" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3118,6 +3187,22 @@ msgstr "是" msgid "« Back" msgstr "« 后退" +#~ msgid "Enable IPv6 negotiation on the PPP link" +#~ msgstr "在PPP链路上启用IPv6协商" + +#~ msgid "Ignore Hosts files" +#~ msgstr "忽略HOSTS文件" + +#~ msgid "Path" +#~ msgstr "路径" + +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "请稍等：设备重启中..." + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "警告: 有尚未保存的更改，重启将丢失!" + #~ msgid "CPU frequency" #~ msgstr "CPU 频率" @@ -3906,9 +3991,6 @@ msgstr "« 后退" #~ "如果连接在已有网络，那么它会被<em>桥接</em>到现有接口，并且被所选的防火墙" #~ "区域覆盖。取消附加选项可以重定义此接口为新的独立网络。" -#~ msgid "Ignore <code>/etc/hosts</code>" -#~ msgstr "忽略 <code>/etc/hosts</code>" - #~ msgid "Independent (Ad-Hoc)" #~ msgstr "独立(点对点Ad-Hoc)" diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po index ec901b8af2..6efaa7f1ee 100644 --- a/modules/luci-base/po/zh-tw/base.po +++ b/modules/luci-base/po/zh-tw/base.po @@ -44,6 +44,9 @@ msgstr "1分鐘負載" msgid "15 Minute Load:" msgstr "15分鐘負載" +msgid "464XLAT (CLAT)" +msgstr "" + msgid "5 Minute Load:" msgstr "5分鐘負載" @@ -200,6 +203,9 @@ msgstr "增加新界面" msgid "Additional Hosts files" msgstr "額外的HOST檔案" +msgid "Additional servers file" +msgstr "" + msgid "Address" msgstr "位置" @@ -325,6 +331,9 @@ msgstr "可用軟體包" msgid "Average:" msgstr "平均:" +msgid "BR / DMR / AFTR" +msgstr "" + msgid "BSSID" msgstr "BSSID" @@ -399,6 +408,11 @@ msgstr "Broadcom BCM%04x 802.11 無線控制器" msgid "Buffered" msgstr "已緩衝" +msgid "" +"Build/distribution specific feed definitions. This file will NOT be " +"preserved in any sysupgrade." +msgstr "" + msgid "Buttons" msgstr "按鈕" @@ -552,6 +566,14 @@ msgid "Custom delegated IPv6-prefix" msgstr "" msgid "" +"Custom feed definitions, e.g. private feeds. This file can be preserved in a " +"sysupgrade." +msgstr "" + +msgid "Custom feeds" +msgstr "" + +msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." msgstr "" @@ -650,6 +672,12 @@ msgstr "設備" msgid "Device Configuration" msgstr "設定設備" +msgid "Device is rebooting..." +msgstr "" + +msgid "Device unreachable" +msgstr "" + msgid "Diagnostics" msgstr "診斷" @@ -689,6 +717,9 @@ msgstr "最佳化距離" msgid "Distance to farthest network member in meters." msgstr "到最遠的網路距離以米表示." +msgid "Distribution feeds" +msgstr "" + msgid "Diversity" msgstr "差異" @@ -757,6 +788,9 @@ msgid "" "having static leases will be served." msgstr "幫用戶端動態發配DHCP位址. 假如關閉的話,僅有有靜態位址的用戶端能被服務" +msgid "EA-bits length" +msgstr "" + msgid "EAP-Method" msgstr "EAP協定驗證方式" @@ -786,9 +820,6 @@ msgstr "啟用 <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "啟用HE.net服務代管動態更新" -msgid "Enable IPv6 negotiation on the PPP link" -msgstr "啟用PPP連結上的IPv6交涉" - msgid "Enable Jumbo Frame passthrough" msgstr "啟用超大訊框透穿" @@ -944,6 +975,9 @@ msgstr "強制TKIP加密" msgid "Force TKIP and CCMP (AES)" msgstr "強制TKIP+CCMP (AES)加密" +msgid "Form token mismatch" +msgstr "" + msgid "Forward DHCP traffic" msgstr "轉發DHCP流量" @@ -983,6 +1017,9 @@ msgstr "一般設定" msgid "General Setup" msgstr "一般設置" +msgid "General options for opkg" +msgstr "" + msgid "Generate archive" msgstr "製作壓縮檔" @@ -1089,6 +1126,9 @@ msgstr "IPv4網路遮罩" msgid "IPv4 only" msgstr "僅用IPv4" +msgid "IPv4 prefix" +msgstr "" + msgid "IPv4 prefix length" msgstr "IPv4前綴長度" @@ -1182,8 +1222,8 @@ msgstr "" "緩慢的過程,作為交換裝置不能用高數據速率訪問該<abbr title=\"Random Access " "Memory\">RAM</縮寫>" -msgid "Ignore Hosts files" -msgstr "被忽視的主機檔案" +msgid "Ignore <code>/etc/hosts</code>" +msgstr "" msgid "Ignore interface" msgstr "被忽視的介面" @@ -1197,6 +1237,11 @@ msgstr "映像檔" msgid "In" msgstr "輸入" +msgid "" +"In order to prevent unauthorized access to the system, your request has been " +"blocked. Click \"Continue »\" below to return to the previous page." +msgstr "" + msgid "Inactivity timeout" msgstr "閒置過期" @@ -1465,6 +1510,9 @@ msgstr "MAC-過濾" msgid "MAC-List" msgstr "MAC-清單" +msgid "MAP / LW4over6" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -1479,6 +1527,9 @@ msgid "" "below:" msgstr "" +msgid "Manual" +msgstr "" + msgid "Maximum Rate" msgstr "最快速度" @@ -1586,6 +1637,9 @@ msgstr "多點群播位址" msgid "NAS ID" msgstr " 網路附存伺服器ID" +msgid "NAT64 Prefix" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -1814,6 +1868,12 @@ msgstr "PPPoE" msgid "PPtP" msgstr "PPtP點對點VPN虛擬私人隧道協定" +msgid "PSID offset" +msgstr "" + +msgid "PSID-bits length" +msgstr "" + msgid "Package libiwinfo required!" msgstr "軟體包必需有libiwinfo!" @@ -1841,9 +1901,6 @@ msgstr "私人金鑰密碼" msgid "Password successfully changed!" msgstr "密碼已變更成功!" -msgid "Path" -msgstr "" - msgid "Path to CA-Certificate" msgstr "CA-證書的路徑" @@ -1880,9 +1937,6 @@ msgstr "封包數." msgid "Please enter your username and password." msgstr "請輸入你的用戶名稱和密碼" -msgid "Please wait: Device rebooting..." -msgstr "請稍等:設備正重開中..." - msgid "Policy" msgstr "策略" @@ -2266,6 +2320,9 @@ msgstr "信號:" msgid "Size" msgstr "大小" +msgid "Size (.ipk)" +msgstr "" + msgid "Skip" msgstr "跳過" @@ -2541,6 +2598,9 @@ msgstr "" msgid "The selected protocol needs a device assigned" msgstr "選到的協定需要指定到設備上" +msgid "The submitted security token is invalid or already expired!" +msgstr "" + msgid "" "The system is erasing the configuration partition now and will reboot itself " "when finished." @@ -2593,6 +2653,12 @@ msgid "This IPv4 address of the relay" msgstr "IPv4位址的轉驛" msgid "" +"This file may contain lines like 'server=/domain/1.2.3.4' or " +"'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " +"Name System\">DNS</abbr> servers." +msgstr "" + +msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." @@ -2914,11 +2980,14 @@ msgstr "等待修改被啟用..." msgid "Waiting for command to complete..." msgstr "等待完整性指令..." +msgid "Waiting for device..." +msgstr "" + msgid "Warning" msgstr "警告" -msgid "Warning: There are unsaved changes that will be lost while rebooting!" -msgstr "警告:重開機後某些未存檔的修改將會漏失!" +msgid "Warning: There are unsaved changes that will get lost on reboot!" +msgstr "" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3146,6 +3215,19 @@ msgstr "是的" msgid "« Back" msgstr "« 倒退" +#~ msgid "Enable IPv6 negotiation on the PPP link" +#~ msgstr "啟用PPP連結上的IPv6交涉" + +#~ msgid "Ignore Hosts files" +#~ msgstr "被忽視的主機檔案" + +#~ msgid "Please wait: Device rebooting..." +#~ msgstr "請稍等:設備正重開中..." + +#~ msgid "" +#~ "Warning: There are unsaved changes that will be lost while rebooting!" +#~ msgstr "警告:重開機後某些未存檔的修改將會漏失!" + #~ msgid "" #~ "Always use 40MHz channels even if the secondary channel overlaps. Using " #~ "this option does not comply with IEEE 802.11n-2009!" diff --git a/modules/luci-base/root/etc/config/luci b/modules/luci-base/root/etc/config/luci index c503a8f1e0..baa3ac5d1e 100644 --- a/modules/luci-base/root/etc/config/luci +++ b/modules/luci-base/root/etc/config/luci @@ -1,6 +1,6 @@ config core main option lang auto - option mediaurlbase /luci-static/openwrt.org + option mediaurlbase /luci-static/bootstrap option resourcebase /luci-static/resources config extern flash_keep diff --git a/modules/luci-base/root/www/index.html b/modules/luci-base/root/www/index.html index 0b5fa1d87e..59b0d84842 100644 --- a/modules/luci-base/root/www/index.html +++ b/modules/luci-base/root/www/index.html @@ -5,7 +5,7 @@ <meta http-equiv="Cache-Control" content="no-cache" /> <meta http-equiv="refresh" content="0; URL=/cgi-bin/luci" /> </head> -<body style="background-color: black"> -<a style="color: white; text-decoration: none" href="/cgi-bin/luci">LuCI - Lua Configuration Interface</a> +<body style="background-color: white"> +<a style="color: black; font-family: arial, helvetica, sans-serif;" href="/cgi-bin/luci">LuCI - Lua Configuration Interface</a> </body> </html> diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/index.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/index.lua index d00d546b64..cc8c2e3ae6 100644 --- a/modules/luci-mod-admin-full/luasrc/controller/admin/index.lua +++ b/modules/luci-mod-admin-full/luasrc/controller/admin/index.lua @@ -33,12 +33,10 @@ function action_logout() if sid then utl.ubus("session", "destroy", { ubus_rpc_session = sid }) - dsp.context.urltoken.stok = nil - luci.http.header("Set-Cookie", "sysauth=%s; expires=%s; path=%s/" %{ sid, 'Thu, 01 Jan 1970 01:00:00 GMT', dsp.build_url() }) end - luci.http.redirect(luci.dispatcher.build_url()) + luci.http.redirect(dsp.build_url()) end 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 6e578e013c..879e54b249 100644 --- a/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua +++ b/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua @@ -1,5 +1,5 @@ -- Copyright 2008 Steven Barth <steven@midlink.org> --- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org> +-- Copyright 2011-2015 Jo-Philipp Wich <jow@openwrt.org> -- Licensed to the public under the Apache License 2.0. module("luci.controller.admin.network", package.seeall) @@ -43,22 +43,22 @@ function index() end) if has_wifi then - page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil) + page = entry({"admin", "network", "wireless_join"}, post("wifi_join"), nil) page.leaf = true - page = entry({"admin", "network", "wireless_add"}, call("wifi_add"), nil) + page = entry({"admin", "network", "wireless_add"}, post("wifi_add"), nil) page.leaf = true - page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil) + page = entry({"admin", "network", "wireless_delete"}, post("wifi_delete"), nil) page.leaf = true page = entry({"admin", "network", "wireless_status"}, call("wifi_status"), nil) page.leaf = true - page = entry({"admin", "network", "wireless_reconnect"}, call("wifi_reconnect"), nil) + page = entry({"admin", "network", "wireless_reconnect"}, post("wifi_reconnect"), nil) page.leaf = true - page = entry({"admin", "network", "wireless_shutdown"}, call("wifi_shutdown"), nil) + page = entry({"admin", "network", "wireless_shutdown"}, post("wifi_shutdown"), nil) page.leaf = true page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), _("Wifi"), 15) @@ -85,16 +85,16 @@ function index() page = entry({"admin", "network", "iface_add"}, cbi("admin_network/iface_add"), nil) page.leaf = true - page = entry({"admin", "network", "iface_delete"}, call("iface_delete"), nil) + page = entry({"admin", "network", "iface_delete"}, post("iface_delete"), nil) page.leaf = true page = entry({"admin", "network", "iface_status"}, call("iface_status"), nil) page.leaf = true - page = entry({"admin", "network", "iface_reconnect"}, call("iface_reconnect"), nil) + page = entry({"admin", "network", "iface_reconnect"}, post("iface_reconnect"), nil) page.leaf = true - page = entry({"admin", "network", "iface_shutdown"}, call("iface_shutdown"), nil) + page = entry({"admin", "network", "iface_shutdown"}, post("iface_shutdown"), nil) page.leaf = true page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), _("Interfaces"), 10) @@ -138,44 +138,33 @@ function index() page.title = _("Diagnostics") page.order = 60 - page = entry({"admin", "network", "diag_ping"}, call("diag_ping"), nil) + page = entry({"admin", "network", "diag_ping"}, post("diag_ping"), nil) page.leaf = true - page = entry({"admin", "network", "diag_nslookup"}, call("diag_nslookup"), nil) + page = entry({"admin", "network", "diag_nslookup"}, post("diag_nslookup"), nil) page.leaf = true - page = entry({"admin", "network", "diag_traceroute"}, call("diag_traceroute"), nil) + page = entry({"admin", "network", "diag_traceroute"}, post("diag_traceroute"), nil) page.leaf = true - page = entry({"admin", "network", "diag_ping6"}, call("diag_ping6"), nil) + page = entry({"admin", "network", "diag_ping6"}, post("diag_ping6"), nil) page.leaf = true - page = entry({"admin", "network", "diag_traceroute6"}, call("diag_traceroute6"), nil) + page = entry({"admin", "network", "diag_traceroute6"}, post("diag_traceroute6"), nil) page.leaf = true -- end end function wifi_join() - local function param(x) - return luci.http.formvalue(x) - end - - local function ptable(x) - x = param(x) - return x and (type(x) ~= "table" and { x } or x) or {} - end - - local dev = param("device") - local ssid = param("join") + local tpl = require "luci.template" + local http = require "luci.http" + local dev = http.formvalue("device") + local ssid = http.formvalue("join") if dev and ssid then - local cancel = (param("cancel") or param("cbi.cancel")) and true or false - - if cancel then - luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless_join?device=" .. dev)) - else + local cancel = (http.formvalue("cancel") or http.formvalue("cbi.cancel")) + if not cancel then local cbi = require "luci.cbi" - local tpl = require "luci.template" local map = luci.cbi.load("admin_network/wifi_add")[1] if map:parse() ~= cbi.FORM_DONE then @@ -183,10 +172,12 @@ function wifi_join() map:render() tpl.render("footer") end + + return end - else - luci.template.render("admin_network/wifi_join") end + + tpl.render("admin_network/wifi_join") end function wifi_add() diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua index 1ceb24d16a..24db1e4ff5 100644 --- a/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua +++ b/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua @@ -7,7 +7,10 @@ module("luci.controller.admin.status", package.seeall) function index() entry({"admin", "status"}, alias("admin", "status", "overview"), _("Status"), 20).index = true entry({"admin", "status", "overview"}, template("admin_status/index"), _("Overview"), 1) - entry({"admin", "status", "iptables"}, call("action_iptables"), _("Firewall"), 2).leaf = true + + entry({"admin", "status", "iptables"}, template("admin_status/iptables"), _("Firewall"), 2).leaf = true + entry({"admin", "status", "iptables_action"}, post("action_iptables")).leaf = true + entry({"admin", "status", "routes"}, template("admin_status/routes"), _("Routes"), 3) entry({"admin", "status", "syslog"}, call("action_syslog"), _("System Log"), 4) entry({"admin", "status", "dmesg"}, call("action_dmesg"), _("Kernel Log"), 5) @@ -42,22 +45,16 @@ end function action_iptables() if luci.http.formvalue("zero") then - if luci.http.formvalue("zero") == "6" then - luci.util.exec("ip6tables -Z") + if luci.http.formvalue("family") == "6" then + luci.util.exec("/usr/sbin/ip6tables -Z") else - luci.util.exec("iptables -Z") + luci.util.exec("/usr/sbin/iptables -Z") end - luci.http.redirect( - luci.dispatcher.build_url("admin", "status", "iptables") - ) - elseif luci.http.formvalue("restart") == "1" then + elseif luci.http.formvalue("restart") then luci.util.exec("/etc/init.d/firewall restart") - luci.http.redirect( - luci.dispatcher.build_url("admin", "status", "iptables") - ) - else - luci.template.render("admin_status/iptables") end + + luci.http.redirect(luci.dispatcher.build_url("admin/status/iptables")) end function action_bandwidth(iface) diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua index 1b38c6783c..cbba48cc25 100644 --- a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua +++ b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua @@ -9,12 +9,12 @@ function index() entry({"admin", "system"}, alias("admin", "system", "system"), _("System"), 30).index = true entry({"admin", "system", "system"}, cbi("admin_system/system"), _("System"), 1) - entry({"admin", "system", "clock_status"}, call("action_clock_status")) + entry({"admin", "system", "clock_status"}, post_on({ set = true }, "action_clock_status")) entry({"admin", "system", "admin"}, cbi("admin_system/admin"), _("Administration"), 2) if fs.access("/bin/opkg") then - entry({"admin", "system", "packages"}, call("action_packages"), _("Software"), 10) + entry({"admin", "system", "packages"}, post_on({ exec = "1" }, "action_packages"), _("Software"), 10) entry({"admin", "system", "packages", "ipkg"}, form("admin_system/ipkg")) end @@ -32,9 +32,16 @@ function index() end entry({"admin", "system", "flashops"}, call("action_flashops"), _("Backup / Flash Firmware"), 70) + entry({"admin", "system", "flashops", "reset"}, post("action_reset")) + entry({"admin", "system", "flashops", "backup"}, post("action_backup")) entry({"admin", "system", "flashops", "backupfiles"}, form("admin_system/backupfiles")) - entry({"admin", "system", "reboot"}, call("action_reboot"), _("Reboot"), 90) + -- call() instead of post() due to upload handling! + entry({"admin", "system", "flashops", "restore"}, call("action_restore")) + entry({"admin", "system", "flashops", "sysupgrade"}, call("action_sysupgrade")) + + entry({"admin", "system", "reboot"}, template("admin_system/reboot"), _("Reboot"), 90) + entry({"admin", "system", "reboot", "call"}, post("action_reboot")) end function action_clock_status() @@ -55,7 +62,8 @@ end function action_packages() local fs = require "nixio.fs" local ipkg = require "luci.model.ipkg" - local submit = luci.http.formvalue("submit") + local submit = (luci.http.formvalue("exec") == "1") + local update, upgrade local changes = false local install = { } local remove = { } @@ -75,59 +83,62 @@ function action_packages() query = (query ~= '') and query or nil - -- Packets to be installed - local ninst = submit and luci.http.formvalue("install") - local uinst = nil - - -- Install from URL - local url = luci.http.formvalue("url") - if url and url ~= '' and submit then - uinst = url - end + -- Modifying actions + if submit then + -- Packets to be installed + local ninst = luci.http.formvalue("install") + local uinst = nil - -- Do install - if ninst then - install[ninst], out, err = ipkg.install(ninst) - stdout[#stdout+1] = out - stderr[#stderr+1] = err - changes = true - end + -- Install from URL + local url = luci.http.formvalue("url") + if url and url ~= '' then + uinst = url + end - if uinst then - local pkg - for pkg in luci.util.imatch(uinst) do - install[uinst], out, err = ipkg.install(pkg) + -- Do install + if ninst then + install[ninst], out, err = ipkg.install(ninst) stdout[#stdout+1] = out stderr[#stderr+1] = err changes = true end - end - -- Remove packets - local rem = submit and luci.http.formvalue("remove") - if rem then - remove[rem], out, err = ipkg.remove(rem) - stdout[#stdout+1] = out - stderr[#stderr+1] = err - changes = true - end + if uinst then + local pkg + for pkg in luci.util.imatch(uinst) do + install[uinst], out, err = ipkg.install(pkg) + stdout[#stdout+1] = out + stderr[#stderr+1] = err + changes = true + end + end + -- Remove packets + local rem = luci.http.formvalue("remove") + if rem then + remove[rem], out, err = ipkg.remove(rem) + stdout[#stdout+1] = out + stderr[#stderr+1] = err + changes = true + end - -- Update all packets - local update = luci.http.formvalue("update") - if update then - update, out, err = ipkg.update() - stdout[#stdout+1] = out - stderr[#stderr+1] = err - end + + -- Update all packets + update = luci.http.formvalue("update") + if update then + update, out, err = ipkg.update() + stdout[#stdout+1] = out + stderr[#stderr+1] = err + end - -- Upgrade all packets - local upgrade = luci.http.formvalue("upgrade") - if upgrade then - upgrade, out, err = ipkg.upgrade() - stdout[#stdout+1] = out - stderr[#stderr+1] = err + -- Upgrade all packets + upgrade = luci.http.formvalue("upgrade") + if upgrade then + upgrade, out, err = ipkg.upgrade() + stdout[#stdout+1] = out + stderr[#stderr+1] = err + end end @@ -166,137 +177,185 @@ function action_packages() end end -function action_flashops() - local sys = require "luci.sys" - local fs = require "nixio.fs" - - local upgrade_avail = fs.access("/lib/upgrade/platform.sh") - local reset_avail = os.execute([[grep '"rootfs_data"' /proc/mtd >/dev/null 2>&1]]) == 0 +local function image_supported(image) + return (os.execute("sysupgrade -T %q >/dev/null" % image) == 0) +end - local restore_cmd = "tar -xzC/ >/dev/null 2>&1" - local backup_cmd = "sysupgrade --create-backup - 2>/dev/null" - local image_tmp = "/tmp/firmware.img" +local function image_checksum(image) + return (luci.sys.exec("md5sum %q" % image):match("^([^%s]+)")) +end - local function image_supported() - return (os.execute("sysupgrade -T %q >/dev/null" % image_tmp) == 0) - end +local function supports_sysupgrade() + return nixio.fs.access("/lib/upgrade/platform.sh") +end - local function image_checksum() - return (luci.sys.exec("md5sum %q" % image_tmp):match("^([^%s]+)")) - end +local function supports_reset() + return (os.execute([[grep -sq '"rootfs_data"' /proc/mtd]]) == 0) +end - local function storage_size() - local size = 0 - if fs.access("/proc/mtd") then - for l in io.lines("/proc/mtd") do - local d, s, e, n = l:match('^([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+"([^%s]+)"') - if n == "linux" or n == "firmware" then - size = tonumber(s, 16) - break - end +local function storage_size() + local size = 0 + if nixio.fs.access("/proc/mtd") then + for l in io.lines("/proc/mtd") do + local d, s, e, n = l:match('^([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+"([^%s]+)"') + if n == "linux" or n == "firmware" then + size = tonumber(s, 16) + break end - elseif fs.access("/proc/partitions") then - for l in io.lines("/proc/partitions") do - local x, y, b, n = l:match('^%s*(%d+)%s+(%d+)%s+([^%s]+)%s+([^%s]+)') - if b and n and not n:match('[0-9]') then - size = tonumber(b) * 1024 - break - end + end + elseif nixio.fs.access("/proc/partitions") then + for l in io.lines("/proc/partitions") do + local x, y, b, n = l:match('^%s*(%d+)%s+(%d+)%s+([^%s]+)%s+([^%s]+)') + if b and n and not n:match('[0-9]') then + size = tonumber(b) * 1024 + break end end - return size end + return size +end + + +function action_flashops() + -- + -- Overview + -- + luci.template.render("admin_system/flashops", { + reset_avail = supports_reset(), + upgrade_avail = supports_sysupgrade() + }) +end +function action_sysupgrade() + local fs = require "nixio.fs" + local http = require "luci.http" + local image_tmp = "/tmp/firmware.img" local fp - luci.http.setfilehandler( + http.setfilehandler( function(meta, chunk, eof) - if not fp then - if meta and meta.name == "image" then - fp = io.open(image_tmp, "w") - else - fp = io.popen(restore_cmd, "w") - end + if not fp and meta and meta.name == "image" then + fp = io.open(image_tmp, "w") end - if chunk then + if fp and chunk then fp:write(chunk) end - if eof then + if fp and eof then fp:close() end end ) - if luci.http.formvalue("backup") then - -- - -- Assemble file list, generate backup - -- - local reader = ltn12_popen(backup_cmd) - luci.http.header('Content-Disposition', 'attachment; filename="backup-%s-%s.tar.gz"' % { - luci.sys.hostname(), os.date("%Y-%m-%d")}) - luci.http.prepare_content("application/x-targz") - luci.ltn12.pump.all(reader, luci.http.write) - elseif luci.http.formvalue("restore") then - -- - -- Unpack received .tar.gz - -- - local upload = luci.http.formvalue("archive") - if upload and #upload > 0 then - luci.template.render("admin_system/applyreboot") - luci.sys.reboot() + if not luci.dispatcher.test_post_security() then + fs.unlink(image_tmp) + return + end + + -- + -- Cancel firmware flash + -- + if http.formvalue("cancel") then + fs.unlink(image_tmp) + http.redirect(luci.dispatcher.build_url('admin/system/flashops')) + return + end + + -- + -- Initiate firmware flash + -- + local step = tonumber(http.formvalue("step") or 1) + if step == 1 then + if image_supported(image_tmp) then + luci.template.render("admin_system/upgrade", { + checksum = image_checksum(image_tmp), + storage = storage_size(), + size = (fs.stat(image_tmp, "size") or 0), + keep = (not not http.formvalue("keep")) + }) + else + fs.unlink(image_tmp) + luci.template.render("admin_system/flashops", { + reset_avail = supports_reset(), + upgrade_avail = supports_sysupgrade(), + image_invalid = true + }) end - elseif luci.http.formvalue("image") or luci.http.formvalue("step") then - -- - -- Initiate firmware flash - -- - local step = tonumber(luci.http.formvalue("step") or 1) - if step == 1 then - if image_supported() then - luci.template.render("admin_system/upgrade", { - checksum = image_checksum(), - storage = storage_size(), - size = (fs.stat(image_tmp, "size") or 0), - keep = (not not luci.http.formvalue("keep")) - }) - else - fs.unlink(image_tmp) - luci.template.render("admin_system/flashops", { - reset_avail = reset_avail, - upgrade_avail = upgrade_avail, - image_invalid = true - }) + -- + -- Start sysupgrade flash + -- + elseif step == 2 then + local keep = (http.formvalue("keep") == "1") and "" or "-n" + luci.template.render("admin_system/applyreboot", { + title = luci.i18n.translate("Flashing..."), + msg = luci.i18n.translate("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 address of your computer to reach the device again, depending on your settings."), + addr = (#keep > 0) and "192.168.1.1" or nil + }) + fork_exec("killall dropbear uhttpd; sleep 1; /sbin/sysupgrade %s %q" %{ keep, image_tmp }) + end +end + +function action_backup() + local reader = ltn12_popen("sysupgrade --create-backup - 2>/dev/null") + + luci.http.header( + 'Content-Disposition', 'attachment; filename="backup-%s-%s.tar.gz"' %{ + luci.sys.hostname(), + os.date("%Y-%m-%d") + }) + + luci.http.prepare_content("application/x-targz") + luci.ltn12.pump.all(reader, luci.http.write) +end + +function action_restore() + local fs = require "nixio.fs" + local http = require "luci.http" + local archive_tmp = "/tmp/restore.tar.gz" + + local fp + http.setfilehandler( + function(meta, chunk, eof) + if not fp and meta and meta.name == "archive" then + fp = io.open(archive_tmp, "w") + end + if fp and chunk then + fp:write(chunk) + end + if fp and eof then + fp:close() end - -- - -- Start sysupgrade flash - -- - elseif step == 2 then - local keep = (luci.http.formvalue("keep") == "1") and "" or "-n" - luci.template.render("admin_system/applyreboot", { - title = luci.i18n.translate("Flashing..."), - msg = luci.i18n.translate("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 address of your computer to reach the device again, depending on your settings."), - addr = (#keep > 0) and "192.168.1.1" or nil - }) - fork_exec("killall dropbear uhttpd; sleep 1; /sbin/sysupgrade %s %q" %{ keep, image_tmp }) end - elseif reset_avail and luci.http.formvalue("reset") then - -- - -- Reset system - -- + ) + + if not luci.dispatcher.test_post_security() then + fs.unlink(archive_tmp) + return + end + + local upload = http.formvalue("archive") + if upload and #upload > 0 then + luci.template.render("admin_system/applyreboot") + os.execute("tar -C / -xzf %q >/dev/null 2>&1" % archive_tmp) + luci.sys.reboot() + return + end + + http.redirect(luci.dispatcher.build_url('admin/system/flashops')) +end + +function action_reset() + if supports_reset() then luci.template.render("admin_system/applyreboot", { title = luci.i18n.translate("Erasing..."), msg = luci.i18n.translate("The system is erasing the configuration partition now and will reboot itself when finished."), addr = "192.168.1.1" }) + fork_exec("killall dropbear uhttpd; sleep 1; mtd -r erase rootfs_data") - else - -- - -- Overview - -- - luci.template.render("admin_system/flashops", { - reset_avail = reset_avail, - upgrade_avail = upgrade_avail - }) + return end + + http.redirect(luci.dispatcher.build_url('admin/system/flashops')) end function action_passwd() @@ -316,11 +375,7 @@ function action_passwd() end function action_reboot() - local reboot = luci.http.formvalue("reboot") - luci.template.render("admin_system/reboot", {reboot=reboot}) - if reboot then - luci.sys.reboot() - end + luci.sys.reboot() end function fork_exec(command) diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/uci.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/uci.lua index 6de3c73a3c..9c33d9c18b 100644 --- a/modules/luci-mod-admin-full/luasrc/controller/admin/uci.lua +++ b/modules/luci-mod-admin-full/luasrc/controller/admin/uci.lua @@ -1,5 +1,5 @@ -- Copyright 2008 Steven Barth <steven@midlink.org> --- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org> +-- Copyright 2010-2015 Jo-Philipp Wich <jow@openwrt.org> -- Licensed to the public under the Apache License 2.0. module("luci.controller.admin.uci", package.seeall) @@ -10,9 +10,9 @@ function index() entry({"admin", "uci"}, nil, _("Configuration")) entry({"admin", "uci", "changes"}, call("action_changes"), _("Changes"), 40).query = {redir=redir} - entry({"admin", "uci", "revert"}, call("action_revert"), _("Revert"), 30).query = {redir=redir} - entry({"admin", "uci", "apply"}, call("action_apply"), _("Apply"), 20).query = {redir=redir} - entry({"admin", "uci", "saveapply"}, call("action_apply"), _("Save & Apply"), 10).query = {redir=redir} + entry({"admin", "uci", "revert"}, post("action_revert"), _("Revert"), 30).query = {redir=redir} + entry({"admin", "uci", "apply"}, post("action_apply"), _("Apply"), 20).query = {redir=redir} + entry({"admin", "uci", "saveapply"}, post("action_apply"), _("Save & Apply"), 10).query = {redir=redir} end function action_changes() diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua index 49103a8113..4dc52ada06 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua @@ -51,13 +51,10 @@ rf.optional = true s:taboption("files", Flag, "nohosts", - translate("Ignore Hosts files")).optional = true + translate("Ignore <code>/etc/hosts</code>")).optional = true -hf = s:taboption("files", DynamicList, "addnhosts", - translate("Additional Hosts files")) - -hf:depends("nohosts", "") -hf.optional = true +s:taboption("files", DynamicList, "addnhosts", + translate("Additional Hosts files")).optional = true s:taboption("advanced", Flag, "boguspriv", diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua index b01b5dbb3e..7c6d7e1c66 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua @@ -11,6 +11,7 @@ f = SimpleForm("ipkgconf", translate("OPKG-Configuration"), translate("General o f:append(Template("admin_system/ipkg")) t = f:field(TextValue, "lines") +t.wrap = "off" t.rows = 10 function t.cfgvalue() return nixio.fs.readfile(ipkgfile) or "" @@ -28,6 +29,7 @@ g = SimpleForm("distfeedconf", translate("Distribution feeds"), translate("Build/distribution specific feed definitions. This file will NOT be preserved in any sysupgrade.")) d = g:field(TextValue, "lines2") +d.wrap = "off" d.rows = 10 function d.cfgvalue() return nixio.fs.readfile(distfeeds) or "" @@ -45,6 +47,7 @@ h = SimpleForm("customfeedconf", translate("Custom feeds"), translate("Custom feed definitions, e.g. private feeds. This file can be preserved in a sysupgrade.")) c = h:field(TextValue, "lines3") +c.wrap = "off" c.rows = 10 function c.cfgvalue() return nixio.fs.readfile(customfeeds) or "" diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm index 05c866128d..685082a335 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm @@ -34,7 +34,7 @@ local has_traceroute6 = fs.access("/usr/bin/traceroute6") legend.parentNode.style.display = 'block'; legend.style.display = 'inline'; - stxhr.get('<%=luci.dispatcher.build_url("admin", "network")%>/diag_' + tool + protocol + '/' + addr, null, + stxhr.post('<%=url('admin/network')%>/diag_' + tool + protocol + '/' + addr, { token: '<%=token%>' }, function(x) { if (x.responseText) @@ -53,9 +53,9 @@ local has_traceroute6 = fs.access("/usr/bin/traceroute6") } //]]></script> -<form method="post" action="<%=pcdata(luci.http.getenv("REQUEST_URI"))%>"> +<form method="post" action="<%=url('admin/network/diagnostics')%>"> <div class="cbi-map"> - <h2><a id="content" name="content"><%:Diagnostics%></a></h2> + <h2 name="content"><%:Diagnostics%></h2> <fieldset class="cbi-section"> <legend><%:Network Utilities%></legend> 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 1de349856e..9a77f89106 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 @@ -49,7 +49,7 @@ s.innerHTML = '<%:Waiting for changes to be applied...%>'; } - XHR.get('<%=luci.dispatcher.build_url("admin", "network")%>/iface_' + (reconnect ? 'reconnect' : 'shutdown') + '/' + id, null, + (new XHR()).post('<%=url('admin/network')%>/iface_' + (reconnect ? 'reconnect' : 'shutdown') + '/' + id, { token: '<%=token%>' }, function(x) { if (s) @@ -66,12 +66,22 @@ ); } + function iface_delete(id) { + if (!confirm('<%:Really delete this interface? The deletion cannot be undone!\nYou might lose access to this device if you are connected via this interface.%>')) + return; + + (new XHR()).post('<%=url('admin/network/iface_delete')%>/' + id, { token: '<%=token%>' }, + function(x) { + location.href = '<%=url('admin/network/network')%>'; + } + ); + } var iwxhr = new XHR(); var wifidevs = <%=luci.http.write_json(netdevs)%>; var arptable = <%=luci.http.write_json(arpcache)%>; - XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "iface_status", table.concat(ifaces, ","))%>', null, + XHR.poll(5, '<%=url('admin/network/iface_status', table.concat(ifaces, ","))%>', null, function(x, ifcs) { if (ifcs) @@ -178,14 +188,14 @@ d.innerHTML = String.format( '<em><%:Unsupported protocol type.%></em><br />' + '<a href="%h"><%:Install protocol extensions...%></a>', - '<%=luci.dispatcher.build_url("admin/system/packages")%>?query=luci-proto&display=available' + '<%=url("admin/system/packages")%>?query=luci-proto&display=available' ); } else if (d && !ifc.ifname) { d.innerHTML = String.format( '<em><%:Network without interfaces.%></em><br />' + - '<a href="<%=luci.dispatcher.build_url("admin/network/network/%s")%>?tab.network.%s=physical"><%:Assign interfaces...%></a>', + '<a href="<%=url("admin/network/network/%s")%>?tab.network.%s=physical"><%:Assign interfaces...%></a>', ifc.name, ifc.name ); } @@ -239,13 +249,13 @@ <td style="width:420px"> <input type="button" class="cbi-button cbi-button-reload" style="width:100px" onclick="iface_shutdown('<%=net[1]%>', true)" title="<%:Reconnect this interface%>" value="<%:Connect%>" /> <input type="button" class="cbi-button cbi-button-reset" style="width:100px" onclick="iface_shutdown('<%=net[1]%>', false)" title="<%:Shutdown this interface%>" value="<%:Stop%>" /> - <input type="button" class="cbi-button cbi-button-edit" style="width:100px" onclick="location.href='<%=luci.dispatcher.build_url("admin/network/network", net[1])%>'" title="<%:Edit this interface%>" value="<%:Edit%>" id="<%=net[1]%>-ifc-edit" /> - <input type="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="if (confirm('<%:Really delete this interface? The deletion cannot be undone!\nYou might lose access to this device if you are connected via this interface.%>')) location.href='<%=luci.dispatcher.build_url("admin/network/iface_delete", net[1])%>'" title="<%:Delete this interface%>" value="<%:Delete%>" /> + <input type="button" class="cbi-button cbi-button-edit" style="width:100px" onclick="location.href='<%=url("admin/network/network", net[1])%>'" title="<%:Edit this interface%>" value="<%:Edit%>" id="<%=net[1]%>-ifc-edit" /> + <input type="submit" class="cbi-button cbi-button-remove" style="width:100px" onclick="iface_delete('<%=net[1]%>')" value="<%:Delete%>" /> </td> </tr> <% end %> </table> - <input type="button" class="cbi-button cbi-button-add" value="<%:Add new interface...%>" onclick="location.href='<%=luci.dispatcher.build_url("admin/network/iface_add")%>'" /> + <input type="button" class="cbi-button cbi-button-add" value="<%:Add new interface...%>" onclick="location.href='<%=url("admin/network/iface_add")%>'" /> </fieldset> </div> 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 8136383969..1ebdbfcfb4 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 @@ -1,7 +1,7 @@ <%+cbi/valueheader%> <script type="text/javascript">//<![CDATA[ - XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "iface_status", self.network)%>', null, + XHR.poll(5, '<%=url('admin/network/iface_status', self.network)%>', null, function(x, ifc) { if (ifc && (ifc = ifc[0])) diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm index 0ba334ee9d..ab8e732573 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm @@ -1,5 +1,5 @@ <script type="text/javascript">//<![CDATA[ - XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "dhcplease_status")%>', null, + XHR.poll(5, '<%=url('admin/network/dhcplease_status')%>', null, function(x, st) { var tb = document.getElementById('lease_status_table'); diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm index b299575e2f..53c35ae59c 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm @@ -1,6 +1,6 @@ <script type="text/javascript">//<![CDATA[ var switches = [ '<%=table.concat(self.switches, "', '")%>' ]; - XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "switch_status")%>/' + switches.join(','), null, + XHR.poll(5, '<%=url('admin/network/switch_status')%>/' + switches.join(','), null, function(x, st) { for (var i = 0; i < switches.length; i++) diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm index 90cc4c03e1..3533c6fa4d 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm @@ -1,5 +1,5 @@ <%# - Copyright 2009 Jo-Philipp Wich <jow@openwrt.org> + Copyright 2009-2015 Jo-Philipp Wich <jow@openwrt.org> Licensed to the public under the Apache License 2.0. -%> @@ -87,7 +87,7 @@ <%+header%> -<h2><a id="content" name="content"><%:Join Network: Wireless Scan%></a></h2> +<h2 name="content"><%:Join Network: Wireless Scan%></h2> <div class="cbi-map"> <fieldset class="cbi-section"> @@ -109,7 +109,8 @@ <strong>Encryption:</strong> <%=format_wifi_encryption(net.encryption)%> </td> <td class="cbi-value-field" style="width:40px"> - <form action="<%=REQUEST_URI%>" method="post"> + <form action="<%=url('admin/network/wireless_join')%>" method="post"> + <input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>" /> <input type="hidden" name="join" value="<%=utl.pcdata(net.ssid)%>" /> <input type="hidden" name="mode" value="<%=net.mode%>" /> @@ -135,10 +136,11 @@ </fieldset> </div> <div class="cbi-page-actions right"> - <form class="inline" action="<%=luci.dispatcher.build_url("admin/network/wireless")%>" method="get"> + <form class="inline" action="<%=url("admin/network/wireless")%>" method="get"> <input class="cbi-button cbi-button-reset" type="submit" value="<%:Back to overview%>" /> </form> - <form class="inline" action="<%=REQUEST_URI%>" method="get"> + <form class="inline" action="<%=url('admin/network/wireless_join')%>" method="post"> + <input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>" /> <input class="cbi-button cbi-input-find" type="submit" value="<%:Repeat scan%>" /> </form> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm index 4fc268e66c..f82d06dcdc 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm @@ -149,7 +149,7 @@ st.innerHTML = '<em><%:Wireless is restarting...%></em>'; } - XHR.get('<%=luci.dispatcher.build_url("admin", "network")%>/wireless_' + (reconnect ? 'reconnect' : 'shutdown') + '/' + id, null, + (new XHR()).post('<%=url('admin/network')%>/wireless_' + (reconnect ? 'reconnect' : 'shutdown') + '/' + id, { token: '<%=token%>' }, function(x) { if (s) @@ -167,7 +167,18 @@ ); } - XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "wireless_status", table.concat(netlist, ","))%>', null, + function wifi_delete(id) { + if (!confirm('<%:Really delete this wireless network? The deletion cannot be undone!\nYou might lose access to this device if you are connected via this network.%>')) + return; + + (new XHR()).post('<%=url('admin/network/wireless_delete')%>/' + id, { token: '<%=token%>' }, + function(x) { + location.href = '<%=url('admin/network/wireless')%>'; + } + ); + } + + XHR.poll(5, '<%=url('admin/network/wireless_status', table.concat(netlist, ","))%>', null, function(x, st) { if (st) @@ -348,7 +359,7 @@ ); //]]></script> -<h2><a id="content" name="content"><%:Wireless Overview%></a></h2> +<h2 name="content"><%:Wireless Overview%></h2> <fieldset class="cbi-section" style="display:none"> <legend><%:Reconnecting interface%></legend> @@ -370,8 +381,16 @@ <span id="<%=dev:name()%>-iw-devinfo"></span> </td> <td style="width:310px;text-align:right"> - <input type="button" class="cbi-button cbi-button-find" style="width:100px" onclick="location.href='<%=luci.dispatcher.build_url("admin/network/wireless_join")%>?device=<%=dev:name()%>'" title="<%:Find and join network%>" value="<%:Scan%>" /> - <input type="button" class="cbi-button cbi-button-add" style="width:100px" onclick="location.href='<%=luci.dispatcher.build_url("admin/network/wireless_add")%>?device=<%=dev:name()%>'" title="<%:Provide new network%>" value="<%:Add%>" /> + <form action="<%=url('admin/network/wireless_join')%>" method="post" class="inline"> + <input type="hidden" name="device" value="<%=dev:name()%>" /> + <input type="hidden" name="token" value="<%=token%>" /> + <input type="submit" class="cbi-button cbi-button-find" style="width:100px" title="<%:Find and join network%>" value="<%:Scan%>" /> + </form> + <form action="<%=url('admin/network/wireless_add')%>" method="post" class="inline"> + <input type="hidden" name="device" value="<%=dev:name()%>" /> + <input type="hidden" name="token" value="<%=token%>" /> + <input type="submit" class="cbi-button cbi-button-add" style="width:100px" title="<%:Provide new network%>" value="<%:Add%>" /> + </form> </td> </tr> <!-- /physical device --> @@ -391,7 +410,7 @@ <td class="cbi-value-field" style="width:310px;text-align:right"> <input id="<%=net:id()%>-iw-toggle" type="button" class="cbi-button cbi-button-reload" style="width:100px" onclick="wifi_shutdown('<%=net:id()%>', this)" title="<%:Delete this network%>" value="<%:Enable%>" /> <input type="button" class="cbi-button cbi-button-edit" style="width:100px" onclick="location.href='<%=net:adminlink()%>'" title="<%:Edit this network%>" value="<%:Edit%>" /> - <input type="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="if (confirm('<%:Really delete this wireless network? The deletion cannot be undone!\nYou might lose access to this device if you are connected via this network.%>')) location.href='<%=luci.dispatcher.build_url("admin/network/wireless_delete", net:ifname())%>'" title="<%:Delete this network%>" value="<%:Remove%>" /> + <input type="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="wifi_delete('<%=net:ifname()%>')" title="<%:Delete this network%>" value="<%:Remove%>" /> </td> </tr> <% end %> @@ -410,7 +429,7 @@ <% end %> - <h2><a id="content" name="content"><%:Associated Stations%></a></h2> + <h2><%:Associated Stations%></h2> <fieldset class="cbi-section"> <table class="cbi-section-table" style="margin:10px" id="iw-assoclist"> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm index fa0a97b707..04687f38e7 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm @@ -1,7 +1,7 @@ <%+cbi/valueheader%> <script type="text/javascript">//<![CDATA[ - XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "wireless_status", self.ifname)%>', null, + XHR.poll(5, '<%=url('admin/network/wireless_status', self.ifname)%>', null, function(x, iw) { if (iw && (iw = iw[0])) diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm index dbcf06beef..04da3c1239 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm @@ -264,7 +264,7 @@ ); //]]></script> -<h2><a id="content" name="content"><%:Realtime Traffic%></a></h2> +<h2 name="content"><%:Realtime Traffic%></h2> <ul class="cbi-tabmenu"> <% for _, dev in ipairs(devices) do %> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm index 64b950e24b..0b2e52e059 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm @@ -312,7 +312,7 @@ ); //]]></script> -<h2><a id="content" name="content"><%:Realtime Connections%></a></h2> +<h2 name="content"><%:Realtime Connections%></h2> <div class="cbi-map-descr"><%:This page gives an overview over currently active network connections.%></div> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm index a63bb71128..c119b57296 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm @@ -5,7 +5,7 @@ -%> <%+header%> -<h2><a id="content" name="content"><%:Kernel Log%></a></h2> +<h2 name="content"><%:Kernel Log%></h2> <div id="content_syslog"> <textarea readonly="readonly" wrap="off" rows="<%=dmesg:cmatch("\n")+2%>" id="syslog"><%=dmesg:pcdata()%></textarea> </div> 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 07a96b2bf0..62188e45e2 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 @@ -88,7 +88,9 @@ if has_dsl then local dsl_stat = luci.sys.exec("/etc/init.d/dsl_control lucistat") local dsl_func = loadstring(dsl_stat) - rv.dsl = dsl_func() + if dsl_func then + rv.dsl = dsl_func() + end end luci.http.prepare_content("application/json") @@ -550,7 +552,7 @@ ); //]]></script> -<h2><a id="content" name="content"><%:Status%></a></h2> +<h2 name="content"><%:Status%></h2> <fieldset class="cbi-section"> <legend><%:System%></legend> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm index ba2933adef..f49469a599 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm @@ -1,6 +1,6 @@ <%# Copyright 2008-2009 Steven Barth <steven@midlink.org> - Copyright 2008-2011 Jo-Philipp Wich <jow@openwrt.org> + Copyright 2008-2015 Jo-Philipp Wich <jow@openwrt.org> Licensed to the public under the Apache License 2.0. -%> @@ -37,7 +37,7 @@ local net = wba.iface_get_network(i) if net and i ~= "lo" then return '<a href="%s">%s</a>' %{ - luci.dispatcher.build_url("admin", "network", "network", net), i + url("admin/network/network", net), i } end @@ -59,91 +59,88 @@ } </style> -<h2><a id="content" name="content"><%:Firewall Status%></a></h2> +<h2 name="content"><%:Firewall Status%></h2> +<br /> <% if has_ip6tables then %> <ul class="cbi-tabmenu"> - <li class="cbi-tab<%= mode ~= 4 and "-disabled" %>"><a href="<%=luci.dispatcher.build_url("admin/status/iptables/4")%>"><%:IPv4 Firewall%></a></li> - <li class="cbi-tab<%= mode ~= 6 and "-disabled" %>"><a href="<%=luci.dispatcher.build_url("admin/status/iptables/6")%>"><%:IPv6 Firewall%></a></li> + <li class="cbi-tab<%= mode ~= 4 and "-disabled" %>"><a href="<%=url("admin/status/iptables/4")%>"><%:IPv4 Firewall%></a></li> + <li class="cbi-tab<%= mode ~= 6 and "-disabled" %>"><a href="<%=url("admin/status/iptables/6")%>"><%:IPv6 Firewall%></a></li> </ul> <% end %> -<form method="post" action="<%=REQUEST_URI%>"> - <div class="cbi-map"> - <fieldset class="cbi-section"> - <h3><%:Actions%></h3> - <ul> - <li><a href="<%=REQUEST_URI%>?zero=<%=mode%>"><%:Reset Counters%></a></li> - <li><a href="<%=REQUEST_URI%>?restart=1"><%:Restart Firewall%></a></li> - </ul> - <br /><br /> - - <% for _, tbl in ipairs(tables) do chaincnt = 0 %> - <h3><%:Table%>: <%=tbl%></h3> - <table class="cbi-section-table" style="font-size:90%"> - <% for _, chain in ipairs(ipt:chains(tbl)) do - rowcnt = 0 - chaincnt = chaincnt + 1 - chaininfo = ipt:chain(tbl, chain) - %> - <tr class="cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>"> - <th class="cbi-section-table-cell" style="text-align:left" colspan="11"> - <br /><span id="rule_<%=tbl:lower()%>_<%=chain%>"> - <%:Chain%> <em><%=chain%></em> - (<%- if chaininfo.policy then -%> - <%:Policy%>: <em><%=chaininfo.policy%></em>, <%:Packets%>: <%=chaininfo.packets%>, <%:Traffic%>: <%=wba.byte_format(chaininfo.bytes)-%> - <%- else -%> - <%:References%>: <%=chaininfo.references-%> - <%- end -%>)</span> - </th> +<div class="cbi-map" style="position: relative"> + + <form method="post" action="<%=url("admin/status/iptables_action")%>" style="position: absolute; right: 0"> + <input type="hidden" name="token" value="<%=token%>" /> + <input type="hidden" name="family" value="<%=mode%>" /> + <input type="submit" class="cbi-button" name="zero" value="<%:Reset Counters%>" /> + <input type="submit" class="cbi-button" name="restart" value="<%:Restart Firewall%>" /> + </form> + + <fieldset class="cbi-section"> + + <% for _, tbl in ipairs(tables) do chaincnt = 0 %> + <h3><%:Table%>: <%=tbl%></h3> + <table class="cbi-section-table" style="font-size:90%"> + <% for _, chain in ipairs(ipt:chains(tbl)) do + rowcnt = 0 + chaincnt = chaincnt + 1 + chaininfo = ipt:chain(tbl, chain) + %> + <tr class="cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>"> + <th class="cbi-section-table-cell" style="text-align:left" colspan="11"> + <br /><span id="rule_<%=tbl:lower()%>_<%=chain%>"> + <%:Chain%> <em><%=chain%></em> + (<%- if chaininfo.policy then -%> + <%:Policy%>: <em><%=chaininfo.policy%></em>, <%:Packets%>: <%=chaininfo.packets%>, <%:Traffic%>: <%=wba.byte_format(chaininfo.bytes)-%> + <%- else -%> + <%:References%>: <%=chaininfo.references-%> + <%- end -%>)</span> + </th> + </tr> + <tr class="cbi-section-table-descr"> + <th class="cbi-section-table-cell"><%:Pkts.%></th> + <th class="cbi-section-table-cell"><%:Traffic%></th> + <th class="cbi-section-table-cell"><%:Target%></th> + <th class="cbi-section-table-cell"><%:Prot.%></th> + <th class="cbi-section-table-cell"><%:In%></th> + <th class="cbi-section-table-cell"><%:Out%></th> + <th class="cbi-section-table-cell"><%:Source%></th> + <th class="cbi-section-table-cell"><%:Destination%></th> + <th class="cbi-section-table-cell" style="width:30%"><%:Options%></th> + </tr> + + <% for _, rule in ipairs(ipt:find({table=tbl, chain=chain})) do %> + <tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>"> + <td><%=rule.packets%></td> + <td style="white-space: nowrap"><%=wba.byte_format(rule.bytes)%></td> + <td><%=rule.target and link_target(tbl, rule.target) or "-"%></td> + <td><%=rule.protocol%></td> + <td><%=link_iface(rule.inputif)%></td> + <td><%=link_iface(rule.outputif)%></td> + <td><%=rule.source%></td> + <td><%=rule.destination%></td> + <td style="width:30%"><small><%=#rule.options > 0 and luci.util.pcdata(table.concat(rule.options, " ")) or "-"%></small></td> </tr> - <tr class="cbi-section-table-descr"> - <th class="cbi-section-table-cell"><%:Rule #%></th> - <th class="cbi-section-table-cell"><%:Pkts.%></th> - <th class="cbi-section-table-cell"><%:Traffic%></th> - <th class="cbi-section-table-cell"><%:Target%></th> - <th class="cbi-section-table-cell"><%:Prot.%></th> - <th class="cbi-section-table-cell"><%:Flags%></th> - <th class="cbi-section-table-cell"><%:In%></th> - <th class="cbi-section-table-cell"><%:Out%></th> - <th class="cbi-section-table-cell"><%:Source%></th> - <th class="cbi-section-table-cell"><%:Destination%></th> - <th class="cbi-section-table-cell" style="width:30%"><%:Options%></th> - </tr> - - <% for _, rule in ipairs(ipt:find({table=tbl, chain=chain})) do %> - <tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>"> - <td><%=rule.index%></td> - <td><%=rule.packets%></td> - <td><%=wba.byte_format(rule.bytes)%></td> - <td><%=rule.target and link_target(tbl, rule.target) or "-"%></td> - <td><%=rule.protocol%></td> - <td><%=rule.flags%></td> - <td><%=link_iface(rule.inputif)%></td> - <td><%=link_iface(rule.outputif)%></td> - <td><%=rule.source%></td> - <td><%=rule.destination%></td> - <td style="width:30%"><small><%=#rule.options > 0 and luci.util.pcdata(table.concat(rule.options, " ")) or "-"%></small></td> - </tr> - <% end %> - - <% if rowcnt == 1 then %> - <tr class="cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>"> - <td colspan="11"><em><%:No rules in this chain%></em></td> - </tr> - <% end %> <% end %> - <% if chaincnt == 0 then %> + <% if rowcnt == 1 then %> <tr class="cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>"> - <td colspan="11"><em><%:No chains in this table%></em></td> + <td colspan="9"><em><%:No rules in this chain%></em></td> </tr> <% end %> - </table> - <br /><br /> - <% end %> - </fieldset> - </div> -</form> + <% end %> + + <% if chaincnt == 0 then %> + <tr class="cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>"> + <td colspan="9"><em><%:No chains in this table%></em></td> + </tr> + <% end %> + </table> + <br /><br /> + <% end %> + </fieldset> +</div> <%+footer%> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm index d095948e50..97a2f5ed59 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm @@ -242,7 +242,7 @@ ); //]]></script> -<h2><a id="content" name="content"><%:Realtime Load%></a></h2> +<h2 name="content"><%:Realtime Load%></h2> <embed id="bwsvg" style="width:100%; height:300px; border:1px solid #000000; background-color:#FFFFFF" src="<%=resource%>/load.svg" /> <div style="text-align:right"><small id="scale">-</small></div> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm index 82dd3a7dfe..5f2c074939 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm @@ -33,7 +33,7 @@ <%+header%> <div class="cbi-map" id="cbi-network"> - <h2><a id="content" name="content"><%:Routes%></a></h2> + <h2 name="content"><%:Routes%></h2> <div class="cbi-map-descr"><%:The following rules are currently active on this system.%></div> <fieldset class="cbi-section"> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm index 40032a1426..b87f21d08d 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm @@ -5,7 +5,7 @@ -%> <%+header%> -<h2><a id="content" name="content"><%:System Log%></a></h2> +<h2 name="content"><%:System Log%></h2> <div id="content_syslog"> <textarea readonly="readonly" wrap="off" rows="<%=syslog:cmatch("\n")+2%>" id="syslog"><%=syslog:pcdata()%></textarea> </div> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm index 025fece90b..f185926104 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm @@ -314,7 +314,7 @@ ); //]]></script> -<h2><a id="content" name="content"><%:Realtime Wireless%></a></h2> +<h2 name="content"><%:Realtime Wireless%></h2> <ul class="cbi-tabmenu"> <% for _, dev in ipairs(devices) do %> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm index 15c96e34df..e722a48096 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm @@ -25,7 +25,7 @@ <body> <div id="maincontainer"> <div id="maincontent"> - <h2><a id="content" name="content"><%:System%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %></a></h2> + <h2 name="content"><%:System%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %></h2> <fieldset class="cbi-section"> <p> <% if msg then %><%=msg%><% else %><%:Changes applied.%><% end %> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm index 0a6df109df..c1f3361ae2 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm @@ -5,6 +5,6 @@ -%> <ul class="cbi-tabmenu"> - <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/system/flashops")%>"><%:Actions%></a></li> + <li class="cbi-tab-disabled"><a href="<%=url("admin/system/flashops")%>"><%:Actions%></a></li> <li class="cbi-tab"><a href="#"><%:Configuration%></a></li> </ul> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/clock_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/clock_status.htm index 84e151075f..37d8ae0e85 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_system/clock_status.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/clock_status.htm @@ -1,7 +1,7 @@ <%+cbi/valueheader%> <script type="text/javascript">//<![CDATA[ - XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "system", "clock_status")%>', null, + XHR.poll(5, '<%=url('admin/system/clock_status')%>', null, function(x, rv) { var s = document.getElementById('<%=self.option%>-clock-status'); @@ -17,8 +17,8 @@ btn.disabled = true; btn.value = '<%:Synchronizing...%>'; - XHR.get('<%=luci.dispatcher.build_url("admin", "system", "clock_status")%>', - { set: Math.floor((new Date()).getTime() / 1000) }, + (new XHR()).post('<%=url('admin/system/clock_status')%>', + { token: '<%=token%>', set: Math.floor((new Date()).getTime() / 1000) }, function() { btn.disabled = false; diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm index bea565aa05..82a1fdbc9c 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm @@ -1,12 +1,12 @@ <%# Copyright 2008 Steven Barth <steven@midlink.org> - Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> + Copyright 2008-2015 Jo-Philipp Wich <jow@openwrt.org> Licensed to the public under the Apache License 2.0. -%> <%+header%> -<h2><a id="content" name="content"><%:Flash operations%></a></h2> +<h2 name="content"><%:Flash operations%></h2> <ul class="cbi-tabmenu"> <li class="cbi-tab"><a href="#"><%:Actions%></a></li> @@ -17,36 +17,43 @@ <fieldset class="cbi-section"> <legend><%:Backup / Restore%></legend> - <form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data"> - <div class="cbi-section-descr"><%:Click "Generate archive" to download a tar archive of the current configuration files. To reset the firmware to its initial state, click "Perform reset" (only possible with squashfs images).%></div> - <div class="cbi-section-node"> + <div class="cbi-section-descr"><%:Click "Generate archive" to download a tar archive of the current configuration files. To reset the firmware to its initial state, click "Perform reset" (only possible with squashfs images).%></div> + <div class="cbi-section-node"> + <form class="inline" method="post" action="<%=url('admin/system/flashops/backup')%>"> + <input type="hidden" name="token" value="<%=token%>" /> <div class="cbi-value<% if not reset_avail then %> cbi-value-last<% end %>"> <label class="cbi-value-title" for="image"><%:Download backup%>:</label> <div class="cbi-value-field"> <input class="cbi-button cbi-button-apply" type="submit" name="backup" value="<%:Generate archive%>" /> </div> </div> - <% if reset_avail then %> + </form> + <% if reset_avail then %> + <form class="inline" method="post" action="<%=url('admin/system/flashops/reset')%>"> + <input type="hidden" name="token" value="<%=token%>" /> <div class="cbi-value cbi-value-last"> <label class="cbi-value-title"><%:Reset to defaults%>:</label> <div class="cbi-value-field"> <input onclick="return confirm('<%:Really reset all changes?%>')" class="cbi-button cbi-button-reset" type="submit" name="reset" value="<%:Perform reset%>" /> </div> </div> - <% end %> - </div> - <br /> - <div class="cbi-section-descr"><%:To restore configuration files, you can upload a previously generated backup archive here.%></div> - <div class="cbi-section-node"> + </form> + <% end %> + </div> + <br /> + <div class="cbi-section-descr"><%:To restore configuration files, you can upload a previously generated backup archive here.%></div> + <div class="cbi-section-node"> + <form class="inline" method="post" action="<%=url('admin/system/flashops/restore')%>" enctype="multipart/form-data"> <div class="cbi-value cbi-value-last"> <label class="cbi-value-title" for="archive"><%:Restore backup%>:</label> <div class="cbi-value-field"> + <input type="hidden" name="token" value="<%=token%>" /> <input type="file" name="archive" id="archive" /> <input type="submit" class="cbi-button cbi-input-apply" name="restore" value="<%:Upload archive...%>" /> </div> </div> - </div> - </form> + </form> + </div> </fieldset> <br /> @@ -54,7 +61,8 @@ <fieldset class="cbi-section"> <legend><%:Flash new firmware image%></legend> <% if upgrade_avail then %> - <form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data"> + <form method="post" action="<%=url('admin/system/flashops/sysupgrade')%>" enctype="multipart/form-data"> + <input type="hidden" name="token" value="<%=token%>" /> <div class="cbi-section-descr"><%:Upload a sysupgrade-compatible image here to replace the running firmware. Check "Keep settings" to retain the current configuration (requires an OpenWrt compatible firmware image).%></div> <div class="cbi-section-node"> <div class="cbi-value"> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm index 6b812e837e..a7ff4e50bd 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm @@ -5,6 +5,6 @@ -%> <ul class="cbi-tabmenu"> - <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/system/packages")%>"><%:Actions%></a></li> + <li class="cbi-tab-disabled"><a href="<%=url("admin/system/packages")%>"><%:Actions%></a></li> <li class="cbi-tab"><a href="#"><%:Configuration%></a></li> </ul> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm index fe2fe04366..1bc9caceda 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm @@ -44,19 +44,20 @@ end <%+header%> -<h2><a id="content" name="content"><%:Software%></a></h2> +<h2 name="content"><%:Software%></h2> -<form method="post" action="<%=REQUEST_URI%>"> - <div class="cbi-map"> +<div class="cbi-map"> - <ul class="cbi-tabmenu"> - <li class="cbi-tab"><a href="#"><%:Actions%></a></li> - <li class="cbi-tab-disabled"><a href="<%=REQUEST_URI%>/ipkg"><%:Configuration%></a></li> - </ul> - - <fieldset class="cbi-section"> + <ul class="cbi-tabmenu"> + <li class="cbi-tab"><a href="#"><%:Actions%></a></li> + <li class="cbi-tab-disabled"><a href="<%=REQUEST_URI%>/ipkg"><%:Configuration%></a></li> + </ul> + <form method="post" action="<%=REQUEST_URI%>"> + <input type="hidden" name="exec" value="1" /> + <input type="hidden" name="token" value="<%=token%>" /> + <fieldset class="cbi-section"> <fieldset class="cbi-section-node"> <% if (install and next(install)) or (remove and next(remove)) or update or upgrade then %> <div class="cbi-value"> @@ -80,7 +81,7 @@ end <% else %> <%:No package lists available%> <% end %> - <input type="button" onclick="location.href='?update=1'" href="#" class="cbi-button cbi-button-apply" style="margin-left:3em" value="<%:Update lists%>" /> + <input type="submit" name="update" href="#" class="cbi-button cbi-button-apply" style="margin-left:3em" value="<%:Update lists%>" /> </div> <% end %> @@ -101,7 +102,7 @@ end <label class="cbi-value-title"><%:Download and install package%>:</label> <div class="cbi-value-field"> <input type="text" name="url" size="30" value="" /> - <input class="cbi-button cbi-input-save" type="submit" name="submit" value="<%:OK%>" /> + <input class="cbi-button cbi-input-save" type="submit" name="exec" value="<%:OK%>" /> </div> </div> @@ -114,83 +115,98 @@ end </div> </fieldset> </fieldset> - <br /> - - <h3><%:Status%></h3> - - - <ul class="cbi-tabmenu"> - <li class="cbi-tab<% if display ~= "installed" then %>-disabled<% end %>"><a href="?display=installed&query=<%=pcdata(query)%>"><%:Installed packages%><% if query then %> (<%=pcdata(query)%>)<% end %></a></li> - <li class="cbi-tab<% if display ~= "available" then %>-disabled<% end %>"><a href="?display=available&query=<%=pcdata(query)%>"><%:Available packages%><% if query then %> (<%=pcdata(query)%>)<% end %></a></li> - </ul> - - <% if display ~= "available" then %> - <fieldset class="cbi-section"> - <table class="cbi-section-table" style="width:100%"> - <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell" style="text-align:left"> </th> - <th class="cbi-section-table-cell" style="text-align:left"><%:Package name%></th> - <th class="cbi-section-table-cell" style="text-align:left"><%:Version%></th> - </tr> - <% local empty = true; luci.model.ipkg.list_installed(querypat, function(n, v, s, d) empty = false; filter[n] = true %> - <tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>"> - <td style="text-align:left; width:10%"><a onclick="return window.confirm('<%:Remove%> "<%=luci.util.pcdata(n)%>" ?')" href="<%=REQUEST_URI%>?submit=1&remove=<%=luci.util.pcdata(n)%>"><%:Remove%></a></td> - <td style="text-align:left"><%=luci.util.pcdata(n)%></td> - <td style="text-align:left"><%=luci.util.pcdata(v)%></td> - </tr> - <% end) %> - <% if empty then %> - <tr class="cbi-section-table-row"> - <td style="text-align:left"> </td> - <td style="text-align:left"><em><%:none%></em></td> - <td style="text-align:left"><em><%:none%></em></td> - </tr> - <% end %> - </table> - </fieldset> - <% else %> - <fieldset class="cbi-section"> - <% if not querypat then %> - <ul class="cbi-tabmenu"> - <% local i; for i = 65, 90 do %> - <li class="cbi-tab<% if letter ~= i then %>-disabled<% end %>"><a href="?display=available&letter=<%=string.char(i)%>"><%=string.char(i)%></a></li> - <% end %> - <li class="cbi-tab<% if letter ~= 35 then %>-disabled<% end %>"><a href="?display=available&letter=%23">#</a></li> - </ul> - <div class="cbi-section-node"> - <% end %> - <table class="cbi-section-table" style="width:100%"> - <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell" style="text-align:left"> </th> - <th class="cbi-section-table-cell" style="text-align:left"><%:Package name%></th> - <th class="cbi-section-table-cell" style="text-align:left"><%:Version%></th> - <th class="cbi-section-table-cell" style="text-align:right"><%:Size (.ipk)%></th> - <th class="cbi-section-table-cell" style="text-align:left"><%:Description%></th> - </tr> - <% local empty = true; opkg_list(querypat or letterpat, function(n, v, s, d) if filter[n] then return end; empty = false %> - <tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>"> - <td style="text-align:left; width:10%"><a onclick="return window.confirm('<%:Install%> "<%=luci.util.pcdata(n)%>" ?')" href="<%=REQUEST_URI%>?submit=1&install=<%=luci.util.pcdata(n)%>"><%:Install%></a></td> - <td style="text-align:left"><%=luci.util.pcdata(n)%></td> - <td style="text-align:left"><%=luci.util.pcdata(v)%></td> - <td style="text-align:right"><%=luci.util.pcdata(s)%></td> - <td style="text-align:left"><%=luci.util.pcdata(d)%></td> - </tr> - <% end) %> - <% if empty then %> - <tr class="cbi-section-table-row"> - <td style="text-align:left"> </td> - <td style="text-align:left"><em><%:none%></em></td> - <td style="text-align:left"><em><%:none%></em></td> - <td style="text-align:right"><em><%:none%></em></td> - <td style="text-align:left"><em><%:none%></em></td> - </tr> - <% end %> - </table> - <% if not querypat then %> - </div> - <% end %> - </fieldset> + </form> + + + <h3><%:Status%></h3> + + + <ul class="cbi-tabmenu"> + <li class="cbi-tab<% if display ~= "installed" then %>-disabled<% end %>"><a href="?display=installed&query=<%=pcdata(query)%>"><%:Installed packages%><% if query then %> (<%=pcdata(query)%>)<% end %></a></li> + <li class="cbi-tab<% if display ~= "available" then %>-disabled<% end %>"><a href="?display=available&query=<%=pcdata(query)%>"><%:Available packages%><% if query then %> (<%=pcdata(query)%>)<% end %></a></li> + </ul> + + <% if display ~= "available" then %> + <fieldset class="cbi-section"> + <table class="cbi-section-table" style="width:100%"> + <tr class="cbi-section-table-titles"> + <th class="cbi-section-table-cell" style="text-align:left"> </th> + <th class="cbi-section-table-cell" style="text-align:left"><%:Package name%></th> + <th class="cbi-section-table-cell" style="text-align:left"><%:Version%></th> + </tr> + <% local empty = true; luci.model.ipkg.list_installed(querypat, function(n, v, s, d) empty = false; filter[n] = true %> + <tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>"> + <td style="text-align:left; width:10%"> + <form method="post" class="inline" action="<%=REQUEST_URI%>"> + <input type="hidden" name="exec" value="1" /> + <input type="hidden" name="token" value="<%=token%>" /> + <input type="hidden" name="remove" value="<%=pcdata(n)%>" /> + <a onclick="window.confirm('<%:Remove%> "<%=luci.util.pcdata(n)%>" ?') && this.parentNode.submit(); return false" href="#"><%:Remove%></a> + </form> + </td> + <td style="text-align:left"><%=luci.util.pcdata(n)%></td> + <td style="text-align:left"><%=luci.util.pcdata(v)%></td> + </tr> + <% end) %> + <% if empty then %> + <tr class="cbi-section-table-row"> + <td style="text-align:left"> </td> + <td style="text-align:left"><em><%:none%></em></td> + <td style="text-align:left"><em><%:none%></em></td> + </tr> + <% end %> + </table> + </fieldset> + <% else %> + <fieldset class="cbi-section"> + <% if not querypat then %> + <ul class="cbi-tabmenu"> + <% local i; for i = 65, 90 do %> + <li class="cbi-tab<% if letter ~= i then %>-disabled<% end %>"><a href="?display=available&letter=<%=string.char(i)%>"><%=string.char(i)%></a></li> + <% end %> + <li class="cbi-tab<% if letter ~= 35 then %>-disabled<% end %>"><a href="?display=available&letter=%23">#</a></li> + </ul> + <div class="cbi-section-node"> + <% end %> + <table class="cbi-section-table" style="width:100%"> + <tr class="cbi-section-table-titles"> + <th class="cbi-section-table-cell" style="text-align:left"> </th> + <th class="cbi-section-table-cell" style="text-align:left"><%:Package name%></th> + <th class="cbi-section-table-cell" style="text-align:left"><%:Version%></th> + <th class="cbi-section-table-cell" style="text-align:right"><%:Size (.ipk)%></th> + <th class="cbi-section-table-cell" style="text-align:left"><%:Description%></th> + </tr> + <% local empty = true; opkg_list(querypat or letterpat, function(n, v, s, d) if filter[n] then return end; empty = false %> + <tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>"> + <td style="text-align:left; width:10%"> + <form method="post" class="inline" action="<%=REQUEST_URI%>"> + <input type="hidden" name="exec" value="1" /> + <input type="hidden" name="token" value="<%=token%>" /> + <input type="hidden" name="install" value="<%=pcdata(n)%>" /> + <a onclick="window.confirm('<%:Install%> "<%=luci.util.pcdata(n)%>" ?') && this.parentNode.submit(); return false" href="#"><%:Install%></a> + </form> + </td> + <td style="text-align:left"><%=luci.util.pcdata(n)%></td> + <td style="text-align:left"><%=luci.util.pcdata(v)%></td> + <td style="text-align:right"><%=luci.util.pcdata(s)%></td> + <td style="text-align:left"><%=luci.util.pcdata(d)%></td> + </tr> + <% end) %> + <% if empty then %> + <tr class="cbi-section-table-row"> + <td style="text-align:left"> </td> + <td style="text-align:left"><em><%:none%></em></td> + <td style="text-align:left"><em><%:none%></em></td> + <td style="text-align:right"><em><%:none%></em></td> + <td style="text-align:left"><em><%:none%></em></td> + </tr> + <% end %> + </table> + <% if not querypat then %> + </div> <% end %> - </div> -</form> + </fieldset> + <% end %> +</div> + <%+footer%> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm index 80768119fe..c9551804d2 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm @@ -1,25 +1,59 @@ <%# Copyright 2008 Steven Barth <steven@midlink.org> - Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> + Copyright 2008-2015 Jo-Philipp Wich <jow@openwrt.org> Licensed to the public under the Apache License 2.0. -%> <%+header%> -<h2><a id="content" name="content"><%:System%></a></h2> -<h3><%:Reboot%></h3> + +<h2 name="content"><%:Reboot%></h2> +<br /> + <p><%:Reboots the operating system of your device%></p> -<%- -local c = require("luci.model.uci").cursor():changes() -if c and next(c) then --%> - <p class="warning"><%:Warning: There are unsaved changes that will be lost while rebooting!%></p> -<%- -end -if not reboot then --%> -<p><a href="<%=controller%>/admin/system/reboot?reboot=1"><%:Perform reboot%></a></p> -<%- else -%> -<p><%:Please wait: Device rebooting...%></p> -<script type="text/javascript">setTimeout("location='<%=controller%>/admin'", 60000)</script> + +<%- local c = require("luci.model.uci").cursor():changes(); if c and next(c) then -%> + <p class="alert-message warning"><%:Warning: There are unsaved changes that will get lost on reboot!%></p> <%- end -%> -<%+footer%>
\ No newline at end of file + +<hr /> + +<script type="text/javascript">//<![CDATA[ + var tries = 0; + + function ok() { + window.location = '<%=controller%>/admin'; + } + + function check() { + if (tries++ < 12) + window.setTimeout(ping, 5000); + else + alert('<%:Device unreachable%>'); + } + + function ping() { + var img = document.createElement('img'); + + img.onload = ok; + img.onerror = check; + img.src = '<%=resource%>/icons/loading.gif?' + Math.random(); + + document.getElementById('reboot-message').innerHTML = '<%:Waiting for device...%>'; + } + + function reboot(button) { + button.style.display = 'none'; + document.getElementById('reboot-message').parentNode.style.display = ''; + + (new XHR()).post('<%=controller%>/admin/system/reboot/call', { token: '<%=token%>' }, check); + } +//]]></script> + +<input class="cbi-button cbi-button-apply" type="button" value="<%:Perform reboot%>" onclick="reboot(this)" /> + +<p class="alert-message" style="display:none"> + <img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> + <span id="reboot-message"><%:Device is rebooting...%></span> +</p> + +<%+footer%> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm index b9d42357bb..5ca0398e13 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm @@ -6,7 +6,7 @@ <%+header%> -<h2><a id="content" name="content"><%:Flash Firmware%> - <%:Verify%></a></h2> +<h2 name="content"><%:Flash Firmware%> - <%:Verify%></h2> <p> <%_ The flash image was uploaded. Below is the checksum and file size listed, @@ -45,12 +45,11 @@ </fieldset> <div class="cbi-page-actions right"> - <form style="display:inline" action="<%=REQUEST_URI%>" method="post"> - <input class="cbi-button cbi-button-reset" type="submit" value="<%:Cancel%>" /> - </form> - <form style="display:inline" action="<%=REQUEST_URI%>" method="post"> + <form class="inline" action="<%=REQUEST_URI%>" method="post"> + <input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="step" value="2" /> <input type="hidden" name="keep" value="<%=keep and "1" or ""%>" /> + <input class="cbi-button cbi-button-reset" name="cancel" type="submit" value="<%:Cancel%>" /> <input class="cbi-button cbi-button-apply" type="submit" value="<%:Proceed%>" /> </form> </div> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_uci/apply.htm b/modules/luci-mod-admin-full/luasrc/view/admin_uci/apply.htm index 4284b44d38..370027e510 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_uci/apply.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_uci/apply.htm @@ -6,7 +6,7 @@ <%+header%> -<h2><a id="content" name="content"><%:Configuration%> / <%:Apply%></a></h2> +<h2 name="content"><%:Configuration%> / <%:Apply%></h2> <% if changes then %> <%+cbi/apply_xhr%> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm b/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm index 84e22879e0..c3373604f3 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm @@ -1,12 +1,12 @@ <%# Copyright 2008 Steven Barth <steven@midlink.org> - Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> + Copyright 2008-2015 Jo-Philipp Wich <jow@openwrt.org> Licensed to the public under the Apache License 2.0. -%> <%+header%> -<h2><a id="content" name="content"><%:Configuration%> / <%:Changes%></a></h2> +<h2 name="content"><%:Configuration%> / <%:Changes%></h2> <% if changes then %> <%+admin_uci/changelog%> @@ -25,15 +25,18 @@ <% end %> <div style="text-align:right"> - <form class="inline" method="get" action="<%=controller%>/admin/uci/apply"> + <form class="inline" method="post" action="<%=controller%>/admin/uci/apply"> + <input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="redir" value="<%=pcdata(luci.http.formvalue("redir"))%>" /> <input class="cbi-button cbi-button-apply" type="submit" value="<%:Apply%>" /> </form> - <form class="inline" method="get" action="<%=controller%>/admin/uci/saveapply"> + <form class="inline" method="post" action="<%=controller%>/admin/uci/saveapply"> + <input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="redir" value="<%=pcdata(luci.http.formvalue("redir"))%>" /> <input class="cbi-button cbi-button-save" type="submit" value="<%:Save & Apply%>" /> </form> - <form class="inline" method="get" action="<%=controller%>/admin/uci/revert"> + <form class="inline" method="post" action="<%=controller%>/admin/uci/revert"> + <input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="redir" value="<%=pcdata(luci.http.formvalue("redir"))%>" /> <input class="cbi-button cbi-button-reset" type="submit" value="<%:Revert%>" /> </form> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm b/modules/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm index d2bdc7a971..5da7281a80 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm @@ -6,7 +6,7 @@ <%+header%> -<h2><a id="content" name="content"><%:Configuration%> / <%:Revert%></a></h2> +<h2 name="content"><%:Configuration%> / <%:Revert%></h2> <% if changes then %> <%+cbi/apply_xhr%> diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/applyreboot.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/applyreboot.htm index 4c536249ae..d33a2ca291 100644 --- a/modules/luci-mod-admin-mini/luasrc/view/mini/applyreboot.htm +++ b/modules/luci-mod-admin-mini/luasrc/view/mini/applyreboot.htm @@ -5,7 +5,7 @@ -%> <%+header%> -<h2><a id="content" name="content"><%:System%></a></h2> +<h2 name="content"><%:System%></h2> <br /> <p><% if msg then %><%=msg%><% else %><%:Changes applied.%><% end %></p> <p><%:Please wait: Device rebooting...%></p> diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/backup.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/backup.htm index b0f52f791e..efc6aa72f7 100644 --- a/modules/luci-mod-admin-mini/luasrc/view/mini/backup.htm +++ b/modules/luci-mod-admin-mini/luasrc/view/mini/backup.htm @@ -5,7 +5,7 @@ -%> <%+header%> -<h2><a id="content" name="content"><%:System%></a></h2> +<h2 name="content"><%:System%></h2> <h3><%:Backup / Restore%></h3> <p><%:Here you can backup and restore your configuration and - if possible - reset this device to the default settings.%></p> <br /> diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm index 9fb03c3c66..5818a567fc 100644 --- a/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm +++ b/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm @@ -4,7 +4,7 @@ Licensed to the public under the Apache License 2.0. -%> -<h2><a id="content" name="content"><%:Hello!%></a></h2> +<h2 name="content"><%:Hello!%></h2> <p><%_This is the administration area of <abbr title="Lua Configuration Interface">LuCI</abbr>.%></p> <p><%_<abbr title="Lua Configuration Interface">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt.%><br /> <%:On the following pages you can adjust all important settings of this device.%></p> diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/reboot.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/reboot.htm index 0717f68d88..f70e7c92da 100644 --- a/modules/luci-mod-admin-mini/luasrc/view/mini/reboot.htm +++ b/modules/luci-mod-admin-mini/luasrc/view/mini/reboot.htm @@ -5,7 +5,7 @@ -%> <%+header%> -<h2><a id="content" name="content"><%:System%></a></h2> +<h2 name="content"><%:System%></h2> <h3><%:Reboot%></h3> <p><%:Reboots the operating system of your device%></p> <%- diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm index 474c22037a..ecd1e8a7a8 100644 --- a/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm +++ b/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm @@ -6,7 +6,7 @@ <%+header%> -<h2><a id="content" name="content"><%:System%></a></h2> +<h2 name="content"><%:System%></h2> <h3><%:Flash Firmware%></h3> <% if step == 1 then %> diff --git a/modules/luci-mod-failsafe/luasrc/controller/failsafe/failsafe.lua b/modules/luci-mod-failsafe/luasrc/controller/failsafe/failsafe.lua index 6f78643018..60caadb4b1 100644 --- a/modules/luci-mod-failsafe/luasrc/controller/failsafe/failsafe.lua +++ b/modules/luci-mod-failsafe/luasrc/controller/failsafe/failsafe.lua @@ -84,11 +84,13 @@ function action_flashops() fp = io.open(image_tmp, "w") end end - if chunk then - fp:write(chunk) - end - if eof then - fp:close() + if fp then + if chunk then + fp:write(chunk) + end + if eof then + fp:close() + end end end ) diff --git a/modules/luci-mod-failsafe/luasrc/view/failsafe/applyreboot.htm b/modules/luci-mod-failsafe/luasrc/view/failsafe/applyreboot.htm index 0c8cebc137..12c138c165 100644 --- a/modules/luci-mod-failsafe/luasrc/view/failsafe/applyreboot.htm +++ b/modules/luci-mod-failsafe/luasrc/view/failsafe/applyreboot.htm @@ -25,7 +25,7 @@ <body> <div id="maincontainer"> <div id="maincontent"> - <h2><a id="content" name="content"><%:System%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %></a></h2> + <h2 name="content"><%:System%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %></h2> <fieldset class="cbi-section"> <p> <% if msg then %><%=msg%><% else %><%:Changes applied.%><% end %> diff --git a/modules/luci-mod-failsafe/luasrc/view/failsafe/flashops.htm b/modules/luci-mod-failsafe/luasrc/view/failsafe/flashops.htm index 29c4d2d6fb..3c8d11bb75 100644 --- a/modules/luci-mod-failsafe/luasrc/view/failsafe/flashops.htm +++ b/modules/luci-mod-failsafe/luasrc/view/failsafe/flashops.htm @@ -7,7 +7,7 @@ <%+header%> -<h2><a id="content" name="content"><%:Flash operations%></a></h2> +<h2 name="content"><%:Flash operations%></h2> <fieldset class="cbi-section"> <legend><%:Flash new firmware image%></legend> <% if upgrade_avail then %> diff --git a/modules/luci-mod-failsafe/luasrc/view/failsafe/reboot.htm b/modules/luci-mod-failsafe/luasrc/view/failsafe/reboot.htm index 189939afbe..cbbe13b427 100644 --- a/modules/luci-mod-failsafe/luasrc/view/failsafe/reboot.htm +++ b/modules/luci-mod-failsafe/luasrc/view/failsafe/reboot.htm @@ -6,7 +6,7 @@ -%> <%+header%> -<h2><a id="content" name="content"><%:System%></a></h2> +<h2 name="content"><%:System%></h2> <h3><%:Reboot%></h3> <p><%:Reboots the operating system of your device%></p> <%- if not reboot then -%> diff --git a/modules/luci-mod-failsafe/luasrc/view/failsafe/upgrade.htm b/modules/luci-mod-failsafe/luasrc/view/failsafe/upgrade.htm index 619ed85dea..3be9ae1193 100644 --- a/modules/luci-mod-failsafe/luasrc/view/failsafe/upgrade.htm +++ b/modules/luci-mod-failsafe/luasrc/view/failsafe/upgrade.htm @@ -7,7 +7,7 @@ <%+header%> -<h2><a id="content" name="content"><%:Flash Firmware%> - <%:Verify%></a></h2> +<h2 name="content"><%:Flash Firmware%> - <%:Verify%></h2> <p> <%_ The flash image was uploaded. Below is the checksum and file size listed, diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk-map/frame.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk-map/frame.htm index b2e168363f..dbf3820f5c 100644 --- a/modules/luci-mod-freifunk/luasrc/view/freifunk-map/frame.htm +++ b/modules/luci-mod-freifunk/luasrc/view/freifunk-map/frame.htm @@ -11,7 +11,7 @@ %> <% if has_latlon then %> - <iframe style="width:100%; height:640px; border:none" src="<%=luci.dispatcher.build_url("freifunk/map/content")%>"></iframe> + <iframe style="width:100%; height:640px; border:none" src="<%=url("freifunk/map/content")%>"></iframe> <h3><%:Legend%>:</h3> <ul> <li><strong><span style="color:#00cc00"><%:Green%></span></strong>:<%:Very good (ETX < 2)%></li> diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm index f7cb4a92bf..1add595c6c 100644 --- a/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm +++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm @@ -27,7 +27,7 @@ else end %> -<h2><a id="content" name="content"><%:Contact%></a></h2> +<h2 name="content"><%:Contact%></h2> <fieldset xmlns="http://www.w3.org/1999/xhtml" class="cbi-section"> <legend><%:Operator%></legend> diff --git a/modules/luci-mod-rpc/luasrc/controller/rpc.lua b/modules/luci-mod-rpc/luasrc/controller/rpc.lua index 129ca43b51..759bb749cf 100644 --- a/modules/luci-mod-rpc/luasrc/controller/rpc.lua +++ b/modules/luci-mod-rpc/luasrc/controller/rpc.lua @@ -49,10 +49,10 @@ function rpc_auth() server.challenge = function(user, pass) local sid, token, secret - require "luci.config" + local config = require "luci.config" if sys.user.checkpasswd(user, pass) then - local sdat = util.ubus("session", "create", { timeout = luci.config.sauth.sessiontime }) + local sdat = util.ubus("session", "create", { timeout = config.sauth.sessiontime }) if sdat then sid = sdat.ubus_rpc_session token = sys.uniqueid(16) diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua index 2f8108ef1c..37d4ec901a 100644 --- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua +++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua @@ -50,7 +50,7 @@ ip6prefixlen.datatype = "range(0,64)" s:taboption("general", Value, "ealen", - translate("EA-bits length")).datatype = "range(0,16)" + translate("EA-bits length")).datatype = "range(0,48)" s:taboption("general", Value, "psidlen", translate("PSID-bits length")).datatype = "range(0,16)" diff --git a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm index f4a6810090..3b40ad4380 100644 --- a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm +++ b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm @@ -178,7 +178,7 @@ %> <div class="pull-right"> <% if ucichanges > 0 then %> - <a class="label notice" href="<%=controller%>/<%=category%>/uci/changes"><%:Unsaved Changes%>: <%=ucichanges%></a> + <a class="label notice" href="<%=controller%>/<%=category%>/uci/changes?redir=<%=http.urlencode(http.formvalue("redir") or REQUEST_URI)%>"><%:Unsaved Changes%>: <%=ucichanges%></a> <% end %> <span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()"> <span class="label success" id="xhr_poll_status_on"><%:Auto Refresh%> <%:on%></span> diff --git a/themes/luci-theme-freifunk-bno/Makefile b/themes/luci-theme-freifunk-bno/Makefile deleted file mode 100644 index 1491a97746..0000000000 --- a/themes/luci-theme-freifunk-bno/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:=Freifunk Berlin Nordost Theme -LUCI_DEPENDS:= - -include ../../luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css deleted file mode 100644 index 4f89b2d3af..0000000000 --- a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css +++ /dev/null @@ -1,872 +0,0 @@ -* { - margin: 0; - padding: 0; -} - -body { - background-color: #ffffff; - color: #ffffff; - font-family: Verdana, Arial, sans-serif; - font-size: 100%; - line-height: 100%; - background-image: url(images/main-back.png); - background-repeat: repeat-x; - background-position: left bottom; - } -#all { - margin: 0px; - padding: 0px; - min-height: 800px; -} - -code { - font-family: monospace; - white-space: pre; -} - -a:link, a:visited { - color:#000000; - font-weight:bold; - text-decoration:none; - } -a:hover { - color:#333333; - font-weight:bold; - } - -/* Custom*/ - #wrapper -{ - width: 95%; - color: #333333; - margin-left: auto; - margin-right: auto; -/* background-image: url(images/corner-left.gif); */ -/* background-repeat: no-repeat; */ -/* background-position: left bottom; */ - background-color: #FffdF4; - min-width: 710px; - min-height: 710px; -} -#main { - clear: both; - width: 100%; - margin: 0; - padding: 0; - color: #333333; -/* background-image: url(images/corner-right.gif); */ -/* background-repeat: no-repeat; */ -/* background-position: right bottom; */ - min-height: 710px; -} - -div#maincontent ul { - margin-left: 2em; -} - -.warning { - color: red !important; - font-weight: bold; -} - -.clear { - clear: both; - height: 1px; -} - -.hidden { - display: none; -} - -.error { - color: #ff0000; -} - -#header -{ - padding: 0px; - height: 100px; -} -#headerleft -{ - height: 100px; - background-color: #FFFfff; - background-image: url(images/header-left.gif); - background-repeat: no-repeat; - background-position: left top; -} -#headerright -{ - height: 100px; - background-color: #FFfffF; - - margin-left: 5px; - background-image: url(images/header-right.gif); - background-repeat: no-repeat; - background-position: right top; -} - -#headerback -{ - margin-right: 5px; - height: 100px; - background-color: #FFfffF; - background-image: url(images/header-back.gif); - background-repeat: repeat-x; - background-position: left top; -} -#schriftzug { - font-size : 1.5em; - text-align:left; - margin-bottom: 7px; - margin-top: 7px; - float:left; - width: 450px; -} - -#schriftzug a:hover{ - background-color:transparent; -} -#logo{ - margin-top: 5px; - float:right; - width: 115px; -} - -.pathbar { - display: none; -} - -.menubar { - width: 100%; - min-height: 1.8em; - background: #ffffff; - color: #000000; - border-top:0.4em solid #DC0067; -} - -.mainmenu { - float: left; - width: auto; - min-height: 1.8em; - background: #ffffff; - color: #000000; -} -.modemenu li { - border-top:0.3em solid #DC0067; - margin-left: 0.3em; - margin-top: -0.3em; -} -.mainmenu div { - float: left; - border-top:0.3em solid #DC0067; - margin-right: 0.3em; - margin-top: -0.3em; -} -.mainmenu div.preactive { - border-top: 0.3em solid #FFCB05; - margin-top: -0.2em; -} - -.mainmenu li { - white-space: nowrap; -} - -.mainmenu div ul { - display: none; - position: absolute; - background: #ffffff; - color: #000000; - border-width: 0 1px 1px 1px; - border-style: solid; - border-color: #444444; - list-style-type: none; -} - -.mainmenu ul li:hover > ul, -.mainmenu div:hover > ul { - display: block; -} - -.mainmenu ul li > ul { - left: 100%; - margin-top: -1.8em; - border-width: 1px; -} - -.modemenu a, -.mainmenu a { - display: block; - padding: 0.2em; - color: #000000; - text-decoration: none; - font-size: 70%; - font-weight: bold; -} - - -.modemenu .active a { - color: #000000; - font-weight: bold; - border-top:0.3em solid #FFCB05; - margin-top: -0.2em; -} -.mainmenu .active a{ - color: #000000; - font-weight: bold; - border-top:0.2em solid #FFCB05; -} -.mainmenu li > span:active { - background-color: #FFE990; -} - -.mainmenu li:hover > span > a, -.mainmenu div:hover > a { -color: #ffffff; -background-color: #FFCB05; -} - - -.modemenu a:focus, -.mainmenu a:focus { - color: #000000; -} - -.mainmenu a:hover, -.modemenu a:hover { -color: #ffffff; -background-color: #FFCB05; -} - -.mainmenu div.preactive > a { - color: #DC0067; - font-weight: bold; -} -.mainmenu div.preactive > a:hover, -.mainmenu div.preactive > a:focus { - color: #ffffff; - font-weight: bold; -} - -.modemenu ul { - width: auto; - background: #000000; - color: #ffffff; - list-style-type: none; -} - -.modemenu li { - float: right; - -} - -#maincontent { - clear: both; - width: 98%; - margin: 0 auto; - padding: 0.5em; - background: #FFF4BE; - color: #000000; - font-size: 80%; - border-top:1px solid #D2A800; -} - -#maincontent h2 { - margin: 0.25em 0 0.5em 0; - font-size: 150%; - font-weight: normal; -} - -#maincontent h3 { - margin: 0.5em 0; - font-size: 120%; - font-weight: normal; - text-decoration: underline; -} - -#maincontent p { - margin-bottom: 1em; -} - -.cbi-section { - margin-bottom: 0.5em; - padding: 0.5em 1em; - border: 1px dotted #D2A800; - background-color: #FFE990; -} - -.cbi-section legend { - font-size: 110%; - font-weight: bold; - height: 1em; - padding: 0 0.25em; - color: #555555; -} - -.cbi-section h2 { - margin: 0em 0 0.5em -0.5em !important; -} - -.cbi-section h3 { - height: 1.5em; - font-size: 90%; - color: #555555; -} - -.cbi-section-descr { - margin-bottom: 0.5em; - font-size: 95%; -} - -.cbi-title-ref { - color: inherit; - text-decoration: none; - padding-right: 18px; - background: url('../resources/cbi/link.gif') no-repeat scroll right center; - background-color: inherit; -} - -input[type=submit], -input[type=reset], -input[type=image], -label { - cursor: pointer; -} - -select, -input, -textarea { - background: #FffdF4; - color: #000000; - border-width: 1px; - border-color: #000000; -} - -input[type=image] { - border: none; -} - - -input:focus, -input:hover, -select:focus, -select:hover, -textarea:focus, -textarea:hover { - background-color: #FFF4BE; -} - -select, -input[type=text], -input[type=password] { - width: 20em; -} - -td select, -td input[type=text], -td input[type=password] { - width: 99%; -} - -img.cbi-image-button { - cursor: pointer; - margin: 0 2px; - vertical-align: middle; -} - -input.cbi-input-user { - background: url('../resources/cbi/user.gif') no-repeat scroll 1px center; - background-color: inherit; - padding-left: 17px; -} - -input.cbi-input-password { - background: url('../resources/cbi/key.gif') no-repeat scroll 1px center; - background-color: inherit; - padding-left: 17px; -} - -input.cbi-input-find { - background: url('../resources/cbi/find.gif') no-repeat scroll 1px center; - background-color: inherit; - padding-left: 17px; -} - -input.cbi-input-reload { - background: url('../resources/cbi/reload.gif') no-repeat scroll 1px center; - background-color: inherit; - padding-left: 17px; -} - -input.cbi-input-add, -input.cbi-button-add { - background: url('../resources/cbi/add.gif') no-repeat scroll 1px center; - background-color: inherit; - padding-left: 17px; - padding-right: 1px; -} - -input.cbi-input-fieldadd, -input.cbi-button-fieldadd { - background: url(../resources/cbi/fieldadd.gif) no-repeat scroll 1px center; - background-color: inherit; - padding-left: 17px; - padding-right: 1px; -} - -input.cbi-input-reset, -input.cbi-button-reset { - background: url('../resources/cbi/reset.gif') no-repeat scroll 1px center; - background-color: inherit; - padding-left: 17px; - padding-right: 1px; -} - -input.cbi-input-save, -input.cbi-button-save { - background: url('../resources/cbi/save.gif') no-repeat scroll 1px center; - background-color: inherit; - padding-left: 17px; - padding-right: 1px; -} - -input.cbi-input-apply, -input.cbi-button-apply { - background: url('../resources/cbi/apply.gif') no-repeat scroll 1px center; - background-color: inherit; - padding-left: 17px; - padding-right: 1px; -} - -input.cbi-input-remove, -div.cbi-section-remove input { - background: url('../resources/cbi/remove.gif') no-repeat scroll 1px center; - background-color: inherit; - padding-left: 17px; - padding-right: 1px; -} - -input.cbi-button-up { - background-image: url('../resources/cbi/up.gif'); - padding-left: 11px; - padding-right: 1px; -} - -input.cbi-button-down { - background-image: url('../resources/cbi/down.gif'); - padding-left: 11px; - padding-right: 1px; -} - -input.cbi-button-edit { - background-image: url('../resources/cbi/edit.gif'); - color: #000000; - padding-left: 17px; - padding-right: 1px; -} - -input.cbi-button-reload { - background-image: url('../resources/cbi/reload.gif'); - color: #000000; - padding-left: 17px; - padding-right: 1px; -} - -input.cbi-button-reset { - background-image: url('../resources/cbi/reset.gif'); - color: #000000; - padding-left: 17px; - padding-right: 1px; -} - -input.cbi-button-remove { - background-image: url('../resources/cbi/remove.gif'); - color: #000000; - padding-left: 17px; - padding-right: 1px; -} - -.cbi-input-invalid { - background-image: url('../resources/cbi/reset.gif'); - background-repeat: no-repeat; - background-position: right; - color: #FF0000 !important; - border-color: #FF0000; -} - -div.cbi-section-remove input { - border-bottom: none; -} - -textarea { - margin-left: -1px; - margin-bottom: 0.5em; -} - -form > div > input[type=submit], -form > div > input[type=reset] { - float: right; - margin-left: 0.5em; -} - -table.smalltext { -background-color: #FFCB05; - border-top: 1px solid #666666; - border-right: 1px solid #666666; - border-bottom: 1px solid #666666; - font-size: 90%; - width: 80%; - margin-left: auto; - margin-right: auto; - border-collapse: collapse; -} - -table.smalltext tr:hover td { -background-color: #FFE990; -} - -table.smalltext tr th { - padding: 0 0.25em; - border-left: 1px solid #666666; - text-align: left; -} - -table.smalltext tr td { - padding: 0 0.25em; - border-top: 1px solid #666666; - border-left: 1px solid #666666; -} - -.cbi-rowstyle-1 { - background-color: #FFF4BE; -} - -.cbi-rowstyle-2 { -} - -table.cbi-section-table .cbi-section-table-cell { - padding: 3px; - white-space: nowrap; -} - -div.cbi-value { - clear: left; - vertical-align: middle; - padding-left: 0.25em; - border-bottom: 1px dotted #FFCB05; -} - -div.cbi-value:hover { - background: #FFF4BE; -} - -div.cbi-value:last-child { - border: none; -} - -.cbi-value-title { - float: left; - width: 40%; -} - -div.cbi-value-field { - width: 58%; - margin: 0.25em 0 0.25em 40%; -} - -div.cbi-value-description { - font-size: 90%; -} - -div.cbi-value-field > div.cbi-value-description { - display: none; -} - -div.cbi-value:hover div.cbi-value-field > div.cbi-value-description { - display: block; - color: #ffffff; - background-color: #FFCB05; -} - -option:active, -option:before, -option:after, -option:focus, -option:hover { - color: #ffffff; - background-color: #EEBA00; - background: url(images/bgoption.png); -} - -div.cbi-section-create { - clear: left; - white-space: nowrap; -} - -div.cbi-map-descr { - margin-bottom: 1em; -} - -div.cbi-optionals { - margin: 0.5em 0; - padding: 0 0.25em; -} - -div.cbi-section-remove { - float: right; -} - -.cbi-section-node { - clear: both; - border: 1px dotted #FFCB05; - padding-bottom: 0; -} - -.cbi-section-node div.cbi-section-table-row { - margin: 0.25em; -} - -table.cbi-section-table { - width: 100%; - font-size: 95%; -} - -table.cbi-section-table th, -table.cbi-section-table td { - text-align: center; -} - -tr.cbi-section-table-descr th { - font-weight: normal; - font-size: 90%; -} - -td.cbi-section-table-optionals { - text-align: left !important; - padding-top: 1em; -} - -.cbi-value-helpicon img { - vertical-align: bottom; -} - -div.cbi-error { - font-size: 95%; - font-weight: bold; - color: #FF0000; -} - -td.cbi-value-error { - border-color: red !important; -} - -.cbi-value-error input, -.cbi-value-error select { - color: red !important; - background-color: #FFCCCC; -} - -.cbi-section-error { - color: red; - font-size: 95%; - border: 1px dotted red; - margin: 3px; - padding: 3px; -} - -ul.cbi-apply { - font-size: 90%; -} - -ul.cbi-tabmenu { - padding: 3px 0; - margin-left: 0 !important; - margin-bottom: -1px; - list-style-type: none; -} - -ul.cbi-tabmenu li.cbi-tab, -ul.cbi-tabmenu li.cbi-tab-disabled { - display: inline; - margin: 0; -} - -ul.cbi-tabmenu li.cbi-tab a, -ul.cbi-tabmenu li.cbi-tab-disabled a { - text-decoration: none; - padding: 3px 7px; - margin-right: 3px; - border: 1px outset #000; - border-bottom: none; - background-color: #eee; - color: #bbb; -} - -ul.cbi-tabmenu li.cbi-tab-highlighted a { - color: #000; - background-color: #FFEEAA; -} - -ul.cbi-tabmenu li a:hover { - color: #000; -} - -ul.cbi-tabmenu li.cbi-tab a { - position: relative; - top: 1px; - padding-top: 4px; - color: #000; - background-color: #fff; -} - -div.cbi-tab-descr { - background-image: url(/luci-static/resources/cbi/help.gif); - background-position: 0.25em 50%; - background-repeat: no-repeat; - border-bottom: 1px solid #ccc; - margin: 0.25em 0.25em 2em; - padding: 0.5em 0.5em 0.5em 2em; -} - - -.left { - text-align: left !important; -} - -.right { - text-align: right !important; -} - -.luci { - position: fixed; - bottom: 0; - left: 0; - text-align: right; -} - -.luci a { - color: #666666; - text-decoration: none; - font-size: 70%; -} - -.inline { - display: inline; -} - -.error500 { - white-space: normal; - border: 1px dotted #FF0000; - background-color: #FFFFFF; - padding: 0.5em; -} - -/* obligatory IE6 Voodoo Code */ -* html body { - padding-left: 50% !important; -} - -* html div#header { - margin-left: -100% !important; -} - -* html div.menubar { - margin-left: -100% !important; - width: 200% !important; -} - -* html div#maincontent { - margin-left: -80% !important; - width: 160% !important; -} - -* html div.mainmenu div.hover ul, -* html div.mainmenu div li.hover ul, -* html div.mainmenu div li li.hover ul, -* html div.mainmenu div li li li.hover ul, -* html div.mainmenu div li li li li.hover ul { - display: block !important; - margin-left: 3em; -} - -* html div.mainmenu div.hover ul { - margin-left: 0; -} - -* html div.mainmenu .hover ul ul, -* html div.mainmenu .hover ul ul ul, -* html div.mainmenu .hover ul ul ul ul, -* html div.mainmenu .hover ul ul ul ul ul { - display: none !important; -} - -* html div.mainmenu li { - height: 1em !important; - width: 10em !important; -} - -* html .mainmenu { - height: 1.8em; -} - -* html div.cbi-value-description { - margin-left: 40%; -} - - -.ifacebox { - background-color: #FFFFFF; - border: 1px solid #CCCCCC; - margin: 0 10px; - text-align: center; - white-space: nowrap; -} - -.ifacebox .ifacebox-head { - border-bottom: 1px solid #CCCCCC; - padding: 2px; -} - -.ifacebox .ifacebox-body { - padding: 2px; -} - - -.ifacebadge { - background-color: #FFFFFF; - border: 1px solid #CCCCCC; - padding: 2px; - margin-left: 2px; - display: inline-block; -} - -.ifacebadge-active { - border-color: #000000; - font-weight: bold; -} - - -.zonebadge { - padding: 2px; - display: inline-block; - white-space: nowrap; - cursor: pointer; -} - -.zonebadge em, -.zonebadge strong { - margin: 3px; - display: inline-block; -} - -.zonebadge input { - width: 6em; - height: 1.5em; -} - -.zonebadge-empty { - border: 1px dashed #AAAAAA; - color: #AAAAAA; - font-style: italic; - font-size: smaller; -} diff --git a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png Binary files differdeleted file mode 100644 index 6fd1e2f347..0000000000 --- a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png +++ /dev/null diff --git a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico Binary files differdeleted file mode 100644 index 7247cfac5f..0000000000 --- a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico +++ /dev/null diff --git a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif Binary files differdeleted file mode 100644 index 21fe02b1e9..0000000000 --- a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif +++ /dev/null diff --git a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif Binary files differdeleted file mode 100644 index a3258ccb6d..0000000000 --- a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif +++ /dev/null diff --git a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif Binary files differdeleted file mode 100644 index 93d0291a21..0000000000 --- a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif +++ /dev/null diff --git a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif Binary files differdeleted file mode 100644 index ff00d6ddb8..0000000000 --- a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif +++ /dev/null diff --git a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png Binary files differdeleted file mode 100644 index 34aca44e01..0000000000 --- a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png +++ /dev/null diff --git a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif Binary files differdeleted file mode 100644 index 82607d533f..0000000000 --- a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif +++ /dev/null diff --git a/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm b/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm deleted file mode 100644 index 2dbade371f..0000000000 --- a/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm +++ /dev/null @@ -1,24 +0,0 @@ -<%# - Copyright 2008 Steven Barth <steven@midlink.org> - Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> - Licensed to the public under the Apache License 2.0. --%> - - <br class="clear" /> - </div> -</div></div> -</div> - -<div class="luci separator black whitetext bold"> - <% local ver = require "luci.version" -%> - <a href="<%=controller%>/about">Powered by <%= ver.luciname %> (<%= ver.luciversion %>)</a> -</div> -</div><!-- end main --><div align="center" style="padding-top:5px "></div> -<br> -</div><!-- end wrapper --> - -</center> -</div> - -</body> -</html> diff --git a/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm b/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm deleted file mode 100644 index d108a08939..0000000000 --- a/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm +++ /dev/null @@ -1,209 +0,0 @@ -<%# - Copyright 2008 Steven Barth <steven@midlink.org> - Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> - Licensed to the public under the Apache License 2.0. --%> - -<% -require("luci.sys") -require("luci.util") - -local boardinfo = luci.util.ubus("system", "board") - -local request = require("luci.dispatcher").context.path -local category = request[1] -local tree = luci.dispatcher.node() -local cattree = category and luci.dispatcher.node(category) -local node = luci.dispatcher.context.dispatched - -local c = tree -for i,r in ipairs(request) do - if c.nodes and c.nodes[r] then - c = c.nodes[r] - c._menu_selected = true - end -end - -require("luci.http").prepare_content("text/html") - --%> - -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> - <link rel="stylesheet" type="text/css" href="<%=media%>/cascade.css" /> - <% if node and node.css then %><link rel="stylesheet" type="text/css" href="<%=resource%>/<%=node.css%>" /><% end %> - <% if css then %><style title="text/css"> - <%-= css %> - </style> - <% end -%> - <link rel="shortcut icon" href="<%=media%>/images/favicon.ico" /> - <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" /> - <meta http-equiv="content-script-type" content="text/javascript" /> - <script type="text/javascript" src="<%=resource%>/xhr.js"></script> - <title><%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title> - - <!--[if lt IE 7]> - <script type="text/javascript"> - function setup_hover() { - function ie_hover(e) { - e.onmouseover = function() { this.className = "hover" } - e.onmouseout = function() { this.className = null } - } - - var lis = document.getElementById("mainmenu").getElementsByTagName("LI"); - var divs = document.getElementById("mainmenu").getElementsByTagName("DIV"); - - for( var i = 0; i < lis.length; i++ ) ie_hover( lis[i] ); - for( var i = 0; i < divs.length; i++ ) ie_hover( divs[i] ); - } - </script> - <![endif]--> -</head> -<body onload="window.setup_hover && setup_hover()"> -<div id="all"> -<center> - -<div id="wrapper"> -<%- if luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%> - <div class="warning"> - <strong><%:No password set!%></strong><br /> - <%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%> - </div> -<%- end -%> -<div id="main"> - - -<div id="header"> - <div id="headerleft"> - <div id="headerright"> - <div id="headerback"> - <div id="schriftzug"><img src="<%=media%>/images/schriftzug.gif" alt="Freifunk Nordost ueberschrift" name="Freifunk_nordost_ueberschrift" border="0"> </div> - <div id="logo"><img src="<%=media%>/images/logo.gif" alt="Freifunk Nordost logo" name="Freifunk_nordost" border="0"></a></div> - <div class="clear"></div> - - </div> - </div> - </div> -</div> - -<div class="pathbar separator black whitetext bold"> -<%:Path%>: <% -local c = tree -local url = controller -for k,v in pairs(request) do - if c.nodes and c.nodes[v] then - c = c.nodes[v] - url = url .. "/" .. v - %><a href="<%=url%>"><%=pcdata(striptags(translate(c.title) or v))%></a> <% if k ~= #request then %>» <% end - end -end -%> -</div> - -<div class="menubar"> - <div id="mainmenu" class="mainmenu"> -<%- -local function submenu(prefix, node) - if not node.nodes or node.hidden then - return false - end - local index = {} - local count = 0 - for k, n in pairs(node.nodes) do - if n.title and n.target then - table.insert(index, {name=k, order=n.order or 100}) - count = count + 1 - end - end - - table.sort(index, function(a, b) return a.order < b.order end) - - if count > 0 then -%> - <ul> - <%- for j, v in pairs(index) do - if not v.hidden and #v.name > 0 then - local nnode = node.nodes[v.name] - local href = controller .. prefix .. v.name - href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href - %> - <li> - <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(translate(nnode.title)))%></a></span> - <%- submenu(prefix .. v.name .. "/", nnode) %> - </li> - <%- end %> - <%- end %> - </ul> -<%- - end -end - -if cattree and cattree.nodes then - local index = {} - for k, node in pairs(cattree.nodes) do - table.insert(index, {name=k, order=node.order or 100}) - end - - table.sort(index, function(a, b) return a.order < b.order end) - - for i, k in ipairs(index) do - node = cattree.nodes[k.name] - if not node.hidden and node.title and node.target then - local href = controller.."/"..category.."/"..k.name - href = (k.query) and href .. luci.http.build_querystring(k.query) or href %> - <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(translate(node.title)))%></a> - <%submenu("/" .. category .. "/" .. k.name .. "/", node)%> - </div> -<% end - end -end -%> - </div> - <div class="modemenu"> - <ul><% - for k,node in pairs(tree.nodes) do - if node.title and not node.hidden then %> - <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=pcdata(striptags(translate(node.title)))%></a></li> -<% end - end%> - </ul> - </div> - - <% - if tree.nodes[category] and tree.nodes[category].ucidata then - local ucic = 0 - - for i, j in pairs(require("luci.model.uci").cursor():changes()) do - for k, l in pairs(j) do - for m, n in pairs(l) do - ucic = ucic + 1; - end - end - end - %> - <div class="mainmenu" style="float:right; margin-right:2em"> - <div> - <% if ucic > 0 then %> - <a class="warning" href="<%=controller%>/<%=category%>/uci/changes"><%:Unsaved Changes%>: <%=ucic%></a> - <% submenu("/" .. category .. "/uci/", tree.nodes[category].nodes["uci"]) -%> - <% else %> - <a href="#"><%:Changes%>: 0</a> - <% end %> - </div> - </div> - <% end %> - - <br class="clear" /> -</div> - -<div id="maincontent"> -<% if category ~= "freifunk" and category ~= "splash" then %> -<noscript> - <div class="errorbox"> - <strong><%:Java Script required!%></strong><br /> - <%:You must enable Java Script in your browser or LuCI will not work properly.%> - </div> -</noscript> -<% end %> diff --git a/themes/luci-theme-freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno b/themes/luci-theme-freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno deleted file mode 100755 index a19f2bb412..0000000000 --- a/themes/luci-theme-freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -uci batch <<-EOF - set luci.themes.Freifunk_BNO=/luci-static/freifunk-bno - set luci.main.mediaurlbase=/luci-static/freifunk-bno - commit luci -EOF |
