diff options
Diffstat (limited to 'applications')
252 files changed, 3106 insertions, 1671 deletions
diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po index 0b0d2d2fe4..83d247ed06 100644 --- a/applications/luci-app-adblock/po/zh-cn/adblock.po +++ b/applications/luci-app-adblock/po/zh-cn/adblock.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2018-08-07 20:41+0800\n" +"PO-Revision-Date: 2018-10-01 10:02+0800\n" "Last-Translator: Yangfl <mmyangfl@gmail.com>\n" "Language-Team: <debian-l10n-chinese@lists.debian.org>\n" "Language: zh_CN\n" @@ -59,6 +59,8 @@ msgid "" "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all " "domains except those listed in the whitelist file." msgstr "" +"构建一个额外的“Jail”列表（/tmp/adb_list.jail），除白名单文件中列出的域名外，" +"阻止访问其他所有的域名。" msgid "" "Choose 'none' to disable automatic startups, 'timed' to use a classic " @@ -168,11 +170,11 @@ msgstr "最后运行" msgid "" "List of available network interfaces. Usually the startup will be triggered " "by the 'wan' interface." -msgstr "" +msgstr "可用网络接口列表。通常启动将由“wan”接口触发。" msgid "" "List of supported DNS backends with their default list export directory." -msgstr "" +msgstr "支持的 DNS 后端列表及其默认列表导出目录。" msgid "List of supported and fully pre-configured download utilities." msgstr "支持和完全预配置的下载工具列表。" @@ -181,7 +183,7 @@ msgid "Loading" msgstr "加载中" msgid "Low Priority Service" -msgstr "" +msgstr "低优先级服务" msgid "Max. Download Queue" msgstr "最大下载队列" @@ -223,17 +225,21 @@ msgid "" "Raise the minimum email notification count, to get emails if the overall " "count is less or equal to the given limit (default 0)," msgstr "" +"如果总数小于或等于给定限制（默认为 0），请提高最小电子邮件通知数，以获取电子" +"邮件。" msgid "" "Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp " "and tcp protocol on ports 53, 853 and 5353." msgstr "" +"将所有 DNS 查询从“lan”区域重定向到本地解析器，适用于端口53、853和5353上的 " +"udp 和 tcp 协议。" msgid "Refresh" -msgstr "" +msgstr "刷新" msgid "Refresh Blocklist Sources" -msgstr "" +msgstr "刷新拦截列表源" msgid "Resume" msgstr "恢复" @@ -250,17 +256,17 @@ msgstr "保存" msgid "" "Send notification emails in case of a processing error or if domain count is " "≤ 0." -msgstr "" +msgstr "如果发生错误或域计数 ≤ 0，发送通知电子邮件。" msgid "" "Set the nice level to 'low priority' and the adblock background processing " "will take less resources from the system." -msgstr "" +msgstr "设置 nice 级别为“低优先级”，adblock 后台进程将从系统中获取更少的资源。" msgid "" "Size of the download queue to handle downloads & list processing in " "parallel (default '4')." -msgstr "" +msgstr "处理下载队列的大小及并行处理列表（默认“4”）。" msgid "Startup Trigger" msgstr "启动触发器" @@ -283,18 +289,18 @@ msgid "The file size is too large for online editing in LuCI (≥ 100 KB)." msgstr "文件过大，无法使用 LuCI 的在线编辑（≥ 100 KB）。" msgid "The syslog output, pre-filtered for adblock related messages only." -msgstr "" +msgstr "系统日志输出，仅针对 adblock 相关的消息进行了预筛选。" msgid "This change requires a manual service stop/re-start to take effect." -msgstr "" +msgstr "此更改需要手动停止/重启服务才能生效。" msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." -msgstr "" +msgstr "此表单允许您修改 adblock 黑名单（%s）的内容。" msgid "" "This form allows you to modify the content of the adblock whitelist (%s)." -msgstr "" +msgstr "此表单允许您修改 adblock 白名单（%s）的内容。" msgid "" "This form allows you to modify the content of the main adblock configuration " @@ -340,74 +346,19 @@ msgid "" "value to 150000." msgstr "例如：要接收每个 adblock 更新的电子邮件通知时将此值设置为 150000。" -#~ msgid "-------" -#~ msgstr "-------" - #~ msgid "Adblock Logfile" #~ msgstr "Adblock 日志文件" #~ msgid "" -#~ "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to " -#~ "all domains except those listed in the whitelist file.<br />" -#~ msgstr "" -#~ "构建一个额外的“Jail”列表（/tmp/adb_list.jail），除白名单文件中列出的域名" -#~ "外，阻止访问其他所有的域名。<br />" - -#~ msgid "" #~ "For SSL protected blocklist sources you need a suitable SSL library, e.g. " #~ "'libustream-ssl' or 'built-in'." #~ msgstr "" #~ "对受 SSL 保护的拦截列表源，您需要一个合适的 SSL 库，如“libustream-" #~ "ssl”或“built-in”。" -#~ msgid "" -#~ "List of available network interfaces. Usually the startup will be " -#~ "triggered by the 'wan' interface.<br />" -#~ msgstr "可用网络接口列表。通常启动将由“wan”接口触发。<br />" - -#~ msgid "" -#~ "List of supported DNS backends with their default list export directory." -#~ "<br />" -#~ msgstr "支持的 DNS 后端列表及其默认列表导出目录。<br />" - #~ msgid "Name" #~ msgstr "名称" -#~ msgid "" -#~ "Raise the minimum email notification count, to get emails if the overall " -#~ "count is less or equal to the given limit (default 0),<br />" -#~ msgstr "" -#~ "如果总数小于或等于给定限制（默认为 0），请提高最小电子邮件通知数，以获取电" -#~ "子邮件。" - -#~ msgid "Redirect all DNS queries from 'lan' zone to the local resolver." -#~ msgstr "将所有 DNS 查询从“lan”区域重定向到本地解析器。" - -#~ msgid "" -#~ "Send notification emails in case of a processing error or if domain count " -#~ "is ≤ 0.<br />" -#~ msgstr "如果发生错误或域计数 ≤ 0，发送通知电子邮件。<br />" - -#~ msgid "" -#~ "Size of the download queue to handle downloads & list processing in " -#~ "parallel (default '4').<br />" -#~ msgstr "处理下载队列的大小及并行处理列表（默认“4”）。<br />" - -#~ msgid "" -#~ "This form allows you to modify the content of the adblock blacklist (%s)." -#~ "<br />" -#~ msgstr "此表单允许您修改 adblock 黑名单（%s）的内容。<br />" - -#~ msgid "" -#~ "This form allows you to modify the content of the adblock whitelist (%s)." -#~ "<br />" -#~ msgstr "此表单允许您修改 adblock 白名单（%s）的内容。<br />" - -#~ msgid "" -#~ "This form shows the syslog output, pre-filtered for adblock related " -#~ "messages only." -#~ msgstr "此表单显示系统日志输出，仅针对 adblock 相关的消息进行了预筛选。" - #~ msgid "disabled" #~ msgstr "已禁用" diff --git a/applications/luci-app-adblock/po/zh-tw/adblock.po b/applications/luci-app-adblock/po/zh-tw/adblock.po index f9830a5098..e01759b5e7 100644 --- a/applications/luci-app-adblock/po/zh-tw/adblock.po +++ b/applications/luci-app-adblock/po/zh-tw/adblock.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2018-08-07 20:41+0800\n" +"PO-Revision-Date: 2018-10-01 10:02+0800\n" "Last-Translator: Yangfl <mmyangfl@gmail.com>\n" "Language-Team: <debian-l10n-chinese@lists.debian.org>\n" "Language: zh_TW\n" @@ -22,8 +22,8 @@ msgid "" "<b>Caution:</b> To prevent OOM exceptions on low memory devices with less " "than 64 MB free RAM, please only select a few of them!" msgstr "" -"<b>注意：</b>為防止在小於 64M 空閒記憶體的裝置上出現記憶體不足異常，請只選擇" -"其中的幾個！" +"<b>注意：</b>為防止在小於 64M 空閒記憶體的裝置上出現記憶體不足異常，請只選擇其中" +"的幾個！" msgid "Adblock" msgstr "Adblock" @@ -59,6 +59,8 @@ msgid "" "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all " "domains except those listed in the whitelist file." msgstr "" +"構建一個額外的“Jail”列表（/tmp/adb_list.jail），除白名單檔案中列出的域名外，" +"阻止訪問其他所有的域名。" msgid "" "Choose 'none' to disable automatic startups, 'timed' to use a classic " @@ -123,8 +125,7 @@ msgstr "啟用 Blocklist 備份" msgid "" "Enable memory intense overall sort / duplicate removal on low memory devices " "(< 64 MB free RAM)" -msgstr "" -"在低記憶體裝置上啟用積極的記憶體整體排序/重複移除（< 64 MB 空閒記憶體）" +msgstr "在低記憶體裝置上啟用積極的記憶體整體排序/重複移除（< 64 MB 空閒記憶體）" msgid "Enable verbose debug logging in case of any processing error." msgstr "在出現任何處理錯誤的情況下啟用詳細除錯日誌記錄。" @@ -169,11 +170,11 @@ msgstr "最後執行" msgid "" "List of available network interfaces. Usually the startup will be triggered " "by the 'wan' interface." -msgstr "" +msgstr "可用網路介面列表。通常啟動將由“wan”介面觸發。" msgid "" "List of supported DNS backends with their default list export directory." -msgstr "" +msgstr "支援的 DNS 後端列表及其預設列表匯出目錄。" msgid "List of supported and fully pre-configured download utilities." msgstr "支援和完全預配置的下載工具列表。" @@ -182,7 +183,7 @@ msgid "Loading" msgstr "載入中" msgid "Low Priority Service" -msgstr "" +msgstr "低優先順序服務" msgid "Max. Download Queue" msgstr "最大下載佇列" @@ -204,8 +205,8 @@ msgid "" "Please add only one domain per line. Comments introduced with '#' are " "allowed - ip addresses, wildcards and regex are not." msgstr "" -"請每行只新增一個域。允許使用“#”開頭的註釋 - ip 位址、萬用字元和正則表示式都不" -"允許。" +"請每行只新增一個域。允許使用“#”開頭的註釋 - ip 地址、萬用字元和正則表示式都不允" +"許。" msgid "Please edit this file directly in a terminal session." msgstr "請在終端會話中直接編輯此檔案。" @@ -224,17 +225,21 @@ msgid "" "Raise the minimum email notification count, to get emails if the overall " "count is less or equal to the given limit (default 0)," msgstr "" +"如果總數小於或等於給定限制（預設為 0），請提高最小電子郵件通知數，以獲取電子" +"郵件。" msgid "" "Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp " "and tcp protocol on ports 53, 853 and 5353." msgstr "" +"將所有 DNS 查詢從“lan”區域重定向到本地解析器，適用於埠53、853和5353上的 " +"udp 和 tcp 協議。" msgid "Refresh" -msgstr "" +msgstr "重新整理" msgid "Refresh Blocklist Sources" -msgstr "" +msgstr "重新整理攔截列表源" msgid "Resume" msgstr "恢復" @@ -251,17 +256,17 @@ msgstr "儲存" msgid "" "Send notification emails in case of a processing error or if domain count is " "≤ 0." -msgstr "" +msgstr "如果發生錯誤或域計數 ≤ 0，傳送通知電子郵件。" msgid "" "Set the nice level to 'low priority' and the adblock background processing " "will take less resources from the system." -msgstr "" +msgstr "設定 nice 級別為“低優先順序”，adblock 後臺程序將從系統中獲取更少的資源。" msgid "" "Size of the download queue to handle downloads & list processing in " "parallel (default '4')." -msgstr "" +msgstr "處理下載佇列的大小及並行處理列表（預設“4”）。" msgid "Startup Trigger" msgstr "啟動觸發器" @@ -284,18 +289,18 @@ msgid "The file size is too large for online editing in LuCI (≥ 100 KB)." msgstr "檔案過大，無法使用 LuCI 的線上編輯（≥ 100 KB）。" msgid "The syslog output, pre-filtered for adblock related messages only." -msgstr "" +msgstr "系統日誌輸出，僅針對 adblock 相關的訊息進行了預篩選。" msgid "This change requires a manual service stop/re-start to take effect." -msgstr "" +msgstr "此更改需要手動停止/重啟服務才能生效。" msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." -msgstr "" +msgstr "此表單允許您修改 adblock 黑名單（%s）的內容。" msgid "" "This form allows you to modify the content of the adblock whitelist (%s)." -msgstr "" +msgstr "此表單允許您修改 adblock 白名單（%s）的內容。" msgid "" "This form allows you to modify the content of the main adblock configuration " @@ -341,74 +346,19 @@ msgid "" "value to 150000." msgstr "例如：要接收每個 adblock 更新的電子郵件通知時將此值設定為 150000。" -#~ msgid "-------" -#~ msgstr "-------" - #~ msgid "Adblock Logfile" #~ msgstr "Adblock 日誌檔案" #~ msgid "" -#~ "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to " -#~ "all domains except those listed in the whitelist file.<br />" -#~ msgstr "" -#~ "構建一個額外的“Jail”列表（/tmp/adb_list.jail），除白名單檔案中列出的域名" -#~ "外，阻止訪問其他所有的域名。<br />" - -#~ msgid "" #~ "For SSL protected blocklist sources you need a suitable SSL library, e.g. " #~ "'libustream-ssl' or 'built-in'." #~ msgstr "" #~ "對受 SSL 保護的攔截列表源，您需要一個合適的 SSL 庫，如“libustream-" #~ "ssl”或“built-in”。" -#~ msgid "" -#~ "List of available network interfaces. Usually the startup will be " -#~ "triggered by the 'wan' interface.<br />" -#~ msgstr "可用網路介面列表。通常啟動將由“wan”介面觸發。<br />" - -#~ msgid "" -#~ "List of supported DNS backends with their default list export directory." -#~ "<br />" -#~ msgstr "支援的 DNS 後端列表及其預設列表匯出目錄。<br />" - #~ msgid "Name" #~ msgstr "名稱" -#~ msgid "" -#~ "Raise the minimum email notification count, to get emails if the overall " -#~ "count is less or equal to the given limit (default 0),<br />" -#~ msgstr "" -#~ "如果總數小於或等於給定限制（預設為 0），請提高最小電子郵件通知數，以獲取電" -#~ "子郵件。" - -#~ msgid "Redirect all DNS queries from 'lan' zone to the local resolver." -#~ msgstr "將所有 DNS 查詢從“lan”區域重定向到本地解析器。" - -#~ msgid "" -#~ "Send notification emails in case of a processing error or if domain count " -#~ "is ≤ 0.<br />" -#~ msgstr "如果發生錯誤或域計數 ≤ 0，傳送通知電子郵件。<br />" - -#~ msgid "" -#~ "Size of the download queue to handle downloads & list processing in " -#~ "parallel (default '4').<br />" -#~ msgstr "處理下載佇列的大小及並行處理列表（預設“4”）。<br />" - -#~ msgid "" -#~ "This form allows you to modify the content of the adblock blacklist (%s)." -#~ "<br />" -#~ msgstr "此表單允許您修改 adblock 黑名單（%s）的內容。<br />" - -#~ msgid "" -#~ "This form allows you to modify the content of the adblock whitelist (%s)." -#~ "<br />" -#~ msgstr "此表單允許您修改 adblock 白名單（%s）的內容。<br />" - -#~ msgid "" -#~ "This form shows the syslog output, pre-filtered for adblock related " -#~ "messages only." -#~ msgstr "此表單顯示系統日誌輸出，僅針對 adblock 相關的訊息進行了預篩選。" - #~ msgid "disabled" #~ msgstr "已禁用" diff --git a/applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm b/applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm index b14cca228f..66db6ce550 100644 --- a/applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm +++ b/applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm @@ -24,7 +24,7 @@ function randomString(len) { var $chars = 'abcdefghijklmnopqrstuvwxyz1234567890'; var maxPos = $chars.length; var pwd = ''; - for (i = 0; i < len; i++) { + for (var i = 0; i < len; i++) { pwd += $chars.charAt(Math.floor(Math.random() * maxPos)); } return pwd; @@ -41,6 +41,7 @@ function showRPCURL() { var newTextNode = document.getElementById("aria2rpcpath"); var auth_method = document.getElementById("cbid.aria2.main.rpc_auth_method"); var auth_port = document.getElementById("cbid.aria2.main.rpc_listen_port"); + var auth_port_value; if (auth_port.value == "") { auth_port_value = "6800" } else { diff --git a/applications/luci-app-aria2/po/zh-cn/aria2.po b/applications/luci-app-aria2/po/zh-cn/aria2.po index 3acd3c616d..83ccbe84ef 100644 --- a/applications/luci-app-aria2/po/zh-cn/aria2.po +++ b/applications/luci-app-aria2/po/zh-cn/aria2.po @@ -8,7 +8,7 @@ msgstr "" "Language-Team: <debian-l10n-chinese@lists.debian.org>\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"PO-Revision-Date: 2018-08-07 17:11+0800\n" +"PO-Revision-Date: 2018-10-01 10:05+0800\n" "X-Generator: Gtranslator 2.91.7\n" msgid "\"Falloc\" is not available in all cases." @@ -194,7 +194,7 @@ msgid "Token" msgstr "令牌" msgid "Trunc" -msgstr "" +msgstr "Trunc" msgid "Use WebSocket" msgstr "使用 WebSocket" diff --git a/applications/luci-app-aria2/po/zh-tw/aria2.po b/applications/luci-app-aria2/po/zh-tw/aria2.po index 2bd9041b96..4c44bb75dc 100644 --- a/applications/luci-app-aria2/po/zh-tw/aria2.po +++ b/applications/luci-app-aria2/po/zh-tw/aria2.po @@ -8,7 +8,7 @@ msgstr "" "Language-Team: <debian-l10n-chinese@lists.debian.org>\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"PO-Revision-Date: 2018-08-07 17:11+0800\n" +"PO-Revision-Date: 2018-10-01 10:05+0800\n" "X-Generator: Gtranslator 2.91.7\n" msgid "\"Falloc\" is not available in all cases." @@ -194,7 +194,7 @@ msgid "Token" msgstr "令牌" msgid "Trunc" -msgstr "" +msgstr "Trunc" msgid "Use WebSocket" msgstr "使用 WebSocket" diff --git a/applications/luci-app-asterisk/luasrc/asterisk.lua b/applications/luci-app-asterisk/luasrc/asterisk.lua index ceb738d112..da94c556f9 100644 --- a/applications/luci-app-asterisk/luasrc/asterisk.lua +++ b/applications/luci-app-asterisk/luasrc/asterisk.lua @@ -35,7 +35,7 @@ function io.exec(command) return buffer end ---- Execute command and invoke given callback for each readed line +--- Execute command and invoke given callback for each read line -- @param command String containing the command to execute -- @param callback Function to call back for each line -- @return Always true @@ -53,7 +53,7 @@ function io.execl(command, callback) return true end ---- Execute command and return an iterator that returns one line per invokation +--- Execute command and return an iterator that returns one line per invocation -- @param command String containing the command to execute -- @return Iterator function function io.execi(command) @@ -71,7 +71,7 @@ end --- LuCI Asterisk - core status core = luci.util.class() ---- Retrive version string. +--- Retrieve version string. -- @return String containing the reported asterisk version function core.version(self) local version = io.exec("core show version") @@ -141,7 +141,7 @@ function sip.peers(self) return peers end ---- Get informations of given SIP peer +--- Get information of given SIP peer -- @param peer String containing the name of the SIP peer function sip.peer(peer) local info = { } @@ -217,7 +217,7 @@ end --- Convert given list to a collection of hyperlinks -- @param list Table of tokens -- @param url String pattern or callback function to construct urls (optional) --- @param sep String containing the seperator (optional, default is ", ") +-- @param sep String containing the separator (optional, default is ", ") -- @return String containing the html fragment function tools.hyperlinks(list, url, sep) local html diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-app.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-app.lua index 72685b0110..ac64754cb7 100644 --- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-app.lua +++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-app.lua @@ -153,7 +153,7 @@ app_lookupblacklist:value("no", "Do Not Load") app_lookupblacklist:value("auto", "Load as Required") app_lookupblacklist.rmempty = true -app_lookupcidname = module:option(ListValue, "app_lookupcidname", "Look up CallerID Name from local databas", "") +app_lookupcidname = module:option(ListValue, "app_lookupcidname", "Look up CallerID Name from local database", "") app_lookupcidname:value("yes", "Load") app_lookupcidname:value("no", "Do Not Load") app_lookupcidname:value("auto", "Load as Required") diff --git a/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm b/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm index 66a06b20f7..3cbc5002be 100644 --- a/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm +++ b/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm @@ -126,7 +126,7 @@ <div class="cbi-section-create cbi-tblsection-create" style="padding: 3px"> <h3>Create a new dialzone</h3> The name is required and must be unique. It may only contain the characters A-Z, a-z, 0-9 and _ .<br /> - You can specifiy multiple number matches by separating them with spaces.<br /> + You can specify multiple number matches by separating them with spaces.<br /> <%- if create_error then %> <br /><span style="color:red">Invalid name given!</span><br /> diff --git a/applications/luci-app-asterisk/po/ca/asterisk.po b/applications/luci-app-asterisk/po/ca/asterisk.po index aa534432e1..978c47392d 100644 --- a/applications/luci-app-asterisk/po/ca/asterisk.po +++ b/applications/luci-app-asterisk/po/ca/asterisk.po @@ -316,7 +316,7 @@ msgstr "" #~ msgid "Look up Caller*ID name/number from black" #~ msgstr "Cerca la ID/nom/número de qui truca de negre" -#~ msgid "Look up CallerID Name from local databas" +#~ msgid "Look up CallerID Name from local database" #~ msgstr "Cerca la ID/nom/número de qui truca de la base de dades local" #~ msgid "Extension Macros" diff --git a/applications/luci-app-asterisk/po/en/asterisk.po b/applications/luci-app-asterisk/po/en/asterisk.po index fc095087e2..c1ac54403c 100644 --- a/applications/luci-app-asterisk/po/en/asterisk.po +++ b/applications/luci-app-asterisk/po/en/asterisk.po @@ -316,8 +316,8 @@ msgstr "" #~ msgid "Look up Caller*ID name/number from black" #~ msgstr "Look up Caller*ID name/number from black" -#~ msgid "Look up CallerID Name from local databas" -#~ msgstr "Look up CallerID Name from local databas" +#~ msgid "Look up CallerID Name from local database" +#~ msgstr "Look up CallerID Name from local database" #~ msgid "Extension Macros" #~ msgstr "Extension Macros" diff --git a/applications/luci-app-asterisk/po/es/asterisk.po b/applications/luci-app-asterisk/po/es/asterisk.po index f42ddb4fd5..2b2b8d2a69 100644 --- a/applications/luci-app-asterisk/po/es/asterisk.po +++ b/applications/luci-app-asterisk/po/es/asterisk.po @@ -314,7 +314,7 @@ msgstr "" #~ msgid "Look up Caller*ID name/number from black" #~ msgstr "Buscar la identidad del llamante nombre/número en la lista negra" -#~ msgid "Look up CallerID Name from local databas" +#~ msgid "Look up CallerID Name from local database" #~ msgstr "" #~ "Buscar el nombre de identidad del llamante en las bases de datos locales" diff --git a/applications/luci-app-asterisk/po/fr/asterisk.po b/applications/luci-app-asterisk/po/fr/asterisk.po index 63d085a1af..275253cd10 100644 --- a/applications/luci-app-asterisk/po/fr/asterisk.po +++ b/applications/luci-app-asterisk/po/fr/asterisk.po @@ -269,7 +269,7 @@ msgstr "" #~ msgid "Image Transmission Application" #~ msgstr "Application d'envoi d'image" -#~ msgid "Look up CallerID Name from local databas" +#~ msgid "Look up CallerID Name from local database" #~ msgstr "Rechercher le nom de l'appelant dans la base locale" #~ msgid "Extension Macros" diff --git a/applications/luci-app-asterisk/po/ms/asterisk.po b/applications/luci-app-asterisk/po/ms/asterisk.po index d4b6baac90..86639026fe 100644 --- a/applications/luci-app-asterisk/po/ms/asterisk.po +++ b/applications/luci-app-asterisk/po/ms/asterisk.po @@ -325,7 +325,7 @@ msgstr "" #~ msgid "Look up Caller*ID name/number from black" #~ msgstr "Mencari nama / nombor Pemangil dari hitam" -#~ msgid "Look up CallerID Name from local databas" +#~ msgid "Look up CallerID Name from local database" #~ msgstr "Mencari Nama Pemangil dari database tempatan" #~ msgid "Extension Macros" diff --git a/applications/luci-app-asterisk/po/pt-br/asterisk.po b/applications/luci-app-asterisk/po/pt-br/asterisk.po index 00a0bb6431..21cb88ed33 100644 --- a/applications/luci-app-asterisk/po/pt-br/asterisk.po +++ b/applications/luci-app-asterisk/po/pt-br/asterisk.po @@ -324,7 +324,7 @@ msgstr "" #~ msgid "Look up Caller*ID name/number from black" #~ msgstr "Buscar o Identificador de chamadas/nome/número do preto" -#~ msgid "Look up CallerID Name from local databas" +#~ msgid "Look up CallerID Name from local database" #~ msgstr "Buscar o Identificador de chamadas/nome/número do banco de dados" #~ msgid "Extension Macros" diff --git a/applications/luci-app-asterisk/po/ru/asterisk.po b/applications/luci-app-asterisk/po/ru/asterisk.po index d27ba33d7c..171808710e 100644 --- a/applications/luci-app-asterisk/po/ru/asterisk.po +++ b/applications/luci-app-asterisk/po/ru/asterisk.po @@ -238,7 +238,7 @@ msgstr "" #~ msgid "Look up Caller*ID name/number from black" #~ msgstr "Искать имя CallerID в \"черном\" списке" -#~ msgid "Look up CallerID Name from local databas" +#~ msgid "Look up CallerID Name from local database" #~ msgstr "Искать имя CallerID в локальной базе" #~ msgid "Extension Macros" diff --git a/applications/luci-app-asterisk/po/vi/asterisk.po b/applications/luci-app-asterisk/po/vi/asterisk.po index 133f864abb..bebf1abcf0 100644 --- a/applications/luci-app-asterisk/po/vi/asterisk.po +++ b/applications/luci-app-asterisk/po/vi/asterisk.po @@ -316,7 +316,7 @@ msgstr "" #~ msgid "Look up Caller*ID name/number from black" #~ msgstr "Tra cứu tên/số của người gọi" -#~ msgid "Look up CallerID Name from local databas" +#~ msgid "Look up CallerID Name from local database" #~ msgstr "Tra cứu tên người gọi từ cơ sở dữ liệu địa phương" #~ msgid "Extension Macros" diff --git a/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js b/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js index 60f586ded4..4b8cc2bd04 100644 --- a/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js +++ b/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js @@ -33,7 +33,7 @@ function edit_server() { $("#server").className = ''; $("#server").onclick = null; - button_set = document.createElement("input"); + var button_set = document.createElement("input"); button_set.type = "button"; button_set.value = "Save"; button_set.name = "button_set"; @@ -111,7 +111,7 @@ function ubus_call(command, argument, params, variable) { request_data.id = ubus_counter; request_data.method = "call"; request_data.params = [ data.ubus_rpc_session, command, argument, params ] - request_json = JSON.stringify(request_data) + var request_json = JSON.stringify(request_data) ubus_counter++; var request = new XMLHttpRequest(); request.open("POST", ubus_url, true); @@ -128,7 +128,7 @@ function ubus_call(command, argument, params, variable) { } } } else { - error_box("<b>Ubus call faild:</b><br />Request: " + request_json + "<br />Response: " + JSON.stringify(response)) + error_box("<b>Ubus call failed:</b><br />Request: " + request_json + "<br />Response: " + JSON.stringify(response)) } ubus_closed++; } @@ -170,7 +170,7 @@ function upgrade_check() { function upgrade_check_callback(request_text) { var request_json = JSON.parse(request_text) - // create simple output to tell user whats going to be upgrade (release/packages) + // create simple output to tell user what's going to be upgrade (release/packages) var info_output = "" if(request_json.version != undefined) { info_output += "<h3>New firmware release available</h3>" @@ -179,7 +179,7 @@ function upgrade_check_callback(request_text) { } if(request_json.upgrades != undefined) { info_output += "<h3>Package upgrades available</h3>" - for (upgrade in request_json.upgrades) { + for (var upgrade in request_json.upgrades) { info_output += "<b>" + upgrade + "</b>: " + request_json.upgrades[upgrade][1] + " to " + request_json.upgrades[upgrade][0] + "<br />" } } @@ -201,7 +201,7 @@ function upgrade_request() { // Request the image // Needed values // version/release - // board_name or model (server tries to find the corrent profile) + // board_name or model (server tries to find the correct profile) // packages // The rest is added by server_request() $("#upgrade_button").disabled = true; @@ -231,7 +231,7 @@ function upgrade_request_callback(request) { var filename_split = data.sysupgrade_url.split("/") data.filename = filename_split[filename_split.length - 1] - info_output = 'Firmware created: <a href="' + data.sysupgrade_url + '"><b>' + data.filename + '</b></a>' + var info_output = 'Firmware created: <a href="' + data.sysupgrade_url + '"><b>' + data.filename + '</b></a>' if(data.advanced_mode == 1) { info_output += '<br /><a target="_blank" href="' + data.sysupgrade_url + '.log">Build log</a>' } @@ -320,6 +320,7 @@ function download_image() { } function server_request(request_dict, path, callback) { + var request_json; request_dict.distro = data.release.distribution; request_dict.target = data.release.target.split("\/")[0]; request_dict.subtarget = data.release.target.split("\/")[1]; @@ -332,7 +333,7 @@ function server_request(request_dict, path, callback) { show("#server_div"); } request.addEventListener('load', function(event) { - request_text = request.responseText; + var request_text = request.responseText; if (request.status === 200) { callback(request_text) @@ -378,7 +379,7 @@ function server_request(request_dict, path, callback) { } else if (request.status === 500) { request_json = JSON.parse(request_text) - error_box_content = "<b>Internal server error</b><br />" + var error_box_content = "<b>Internal server error</b><br />" error_box_content += request_json.error if(request_json.log != undefined) { data.log_url = request_json.log @@ -386,7 +387,7 @@ function server_request(request_dict, path, callback) { error_box(error_box_content) } else if (request.status === 501) { - error_box("No sysupgrade file produced, may not supported by modell.") + error_box("No sysupgrade file produced, may not supported by model.") } else if (request.status === 502) { // python part offline 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 eb2159076e..ecabec4e22 100644 --- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua +++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua @@ -90,7 +90,7 @@ end -- will use dynamic_dns_lucihelper to check if -- local IP can be read local function _verify_ip_source() - -- section is globally defined here be calling agrument (see above) + -- section is globally defined here be calling argument (see above) local _arg local _ipv6 = usev6:formvalue(section) @@ -173,7 +173,7 @@ end -- function to verify if option is valid local function _option_validate(self, value, optional) - -- section is globally defined here be calling agrument (see above) + -- section is globally defined here be calling argument (see above) local fusev6 = usev6:formvalue(section) or "0" local fsvc4 = svc4:formvalue(section) or "-" local fsvc6 = svc6:formvalue(section) or "-" @@ -200,7 +200,7 @@ local function _option_validate(self, value, optional) if (#urlsh == 0) then return "" end used = _option_used(self.option, urlsh) - -- on error or not used return empty sting + -- on error or not used return empty string if used < 1 then return "" end -- needed but no data then return error if not value or (#value == 0) then 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 b409ed0728..f3f45e0d04 100644 --- a/applications/luci-app-ddns/luasrc/view/ddns/overview_status.htm +++ b/applications/luci-app-ddns/luasrc/view/ddns/overview_status.htm @@ -14,7 +14,7 @@ // called by XHR.poll and onclick_startstop function _data2elements(data) { // Service sections - for( i = 1; i < data.length; i++ ) + for( var i = 1; i < data.length; i++ ) { var section = data[i].section // Section to handle var cbx = document.getElementById("cbid.ddns." + section + ".enabled"); // Enabled @@ -141,7 +141,7 @@ if (x.responseText == "_uncommitted_") { // we need a trick to display Ampersand "&" in stead of "&" or "&" // after translation - txt="<%:Please [Save & Apply] your changes first%>"; + var txt="<%:Please [Save & Apply] your changes first%>"; alert( txt.replace(new RegExp("<%:&%>", "g"), "&") ); } else { // should have data because status changed 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 615b6b4336..41799cd4da 100644 --- a/applications/luci-app-ddns/luasrc/view/ddns/system_status.htm +++ b/applications/luci-app-ddns/luasrc/view/ddns/system_status.htm @@ -20,7 +20,7 @@ '<a class="cbi-button cbi-button-action important" type="button" href="' + data[0].url_up + '"><%:enable here%></a></strong>' ]); } else { - for( j = 1; j < data.length; j++ ) + for(var j = 1; j < data.length; j++ ) { rows.push([ @@ -57,4 +57,4 @@ </div> </div> </fieldset> -<!-- ++ END ++ Dynamic DNS ++ system_status.htm ++ -->
\ No newline at end of file +<!-- ++ END ++ Dynamic DNS ++ system_status.htm ++ --> diff --git a/applications/luci-app-dump1090/luasrc/model/cbi/dump1090.lua b/applications/luci-app-dump1090/luasrc/model/cbi/dump1090.lua index 4470a0d2f0..51b2d20a4f 100644 --- a/applications/luci-app-dump1090/luasrc/model/cbi/dump1090.lua +++ b/applications/luci-app-dump1090/luasrc/model/cbi/dump1090.lua @@ -136,8 +136,8 @@ no_crc_check.default = false phase_enhance=s:option(Flag, "phase_enhance", translate("Enable phase enhancement")) phase_enhance.default = false -agressive=s:option(Flag, "agressive", translate("More CPU for more messages")) -agressive.default = false +aggressive=s:option(Flag, "aggressive", translate("More CPU for more messages")) +aggressive.default = false mlat=s:option(Flag, "mlat", translate("Display raw messages in Beast ascii mode")) mlat.default = false diff --git a/applications/luci-app-freifunk-policyrouting/luasrc/model/cbi/freifunk/policyrouting.lua b/applications/luci-app-freifunk-policyrouting/luasrc/model/cbi/freifunk/policyrouting.lua index b09c237ca2..b563054824 100644 --- a/applications/luci-app-freifunk-policyrouting/luasrc/model/cbi/freifunk/policyrouting.lua +++ b/applications/luci-app-freifunk-policyrouting/luasrc/model/cbi/freifunk/policyrouting.lua @@ -4,7 +4,7 @@ local uci = require "luci.model.uci".cursor() m = Map("freifunk-policyrouting", translate("Policy Routing"), translate("These pages can be used to setup policy routing for certain firewall zones. ".. - "This is useful if you need to use your own internet connection for yourself but you don't want to share it with others (thats why it can also be ".. + "This is useful if you need to use your own internet connection for yourself but you don't want to share it with others (that's why it can also be ".. "called 'Ego Mode'). Your own traffic is then sent via your internet connection while traffic originating from the mesh will use another gateway in the mesh. ")) m:chain("network") diff --git a/applications/luci-app-freifunk-policyrouting/po/ca/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/ca/freifunk-policyrouting.po index c1d96e03ee..2f0dbf57da 100644 --- a/applications/luci-app-freifunk-policyrouting/po/ca/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/ca/freifunk-policyrouting.po @@ -50,7 +50,7 @@ msgstr "Filtració estricta" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/cs/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/cs/freifunk-policyrouting.po index 4ec9f8da82..a607f6e810 100644 --- a/applications/luci-app-freifunk-policyrouting/po/cs/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/cs/freifunk-policyrouting.po @@ -46,7 +46,7 @@ msgstr "Striktní filtrování" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/de/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/de/freifunk-policyrouting.po index bb24f61853..cb9a094e88 100644 --- a/applications/luci-app-freifunk-policyrouting/po/de/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/de/freifunk-policyrouting.po @@ -55,7 +55,7 @@ msgstr "Strenges Filtern" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/el/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/el/freifunk-policyrouting.po index 3c9a17e0d4..6814b17300 100644 --- a/applications/luci-app-freifunk-policyrouting/po/el/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/el/freifunk-policyrouting.po @@ -33,7 +33,7 @@ msgstr "" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/en/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/en/freifunk-policyrouting.po index 3c9a17e0d4..6814b17300 100644 --- a/applications/luci-app-freifunk-policyrouting/po/en/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/en/freifunk-policyrouting.po @@ -33,7 +33,7 @@ msgstr "" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/es/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/es/freifunk-policyrouting.po index 8af3458dfe..ab3c8bd642 100644 --- a/applications/luci-app-freifunk-policyrouting/po/es/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/es/freifunk-policyrouting.po @@ -55,7 +55,7 @@ msgstr "Filtrado estricto" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/fr/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/fr/freifunk-policyrouting.po index 3c9a17e0d4..6814b17300 100644 --- a/applications/luci-app-freifunk-policyrouting/po/fr/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/fr/freifunk-policyrouting.po @@ -33,7 +33,7 @@ msgstr "" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/he/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/he/freifunk-policyrouting.po index 8d83098d6f..976b3b22d5 100644 --- a/applications/luci-app-freifunk-policyrouting/po/he/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/he/freifunk-policyrouting.po @@ -44,7 +44,7 @@ msgstr "" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/hu/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/hu/freifunk-policyrouting.po index 8d83098d6f..976b3b22d5 100644 --- a/applications/luci-app-freifunk-policyrouting/po/hu/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/hu/freifunk-policyrouting.po @@ -44,7 +44,7 @@ msgstr "" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/it/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/it/freifunk-policyrouting.po index 61ac6c0d4b..dfa3be6b52 100644 --- a/applications/luci-app-freifunk-policyrouting/po/it/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/it/freifunk-policyrouting.po @@ -56,7 +56,7 @@ msgstr "Livello massimo di filtraggio" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/ja/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/ja/freifunk-policyrouting.po index 3c9a17e0d4..6814b17300 100644 --- a/applications/luci-app-freifunk-policyrouting/po/ja/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/ja/freifunk-policyrouting.po @@ -33,7 +33,7 @@ msgstr "" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/ms/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/ms/freifunk-policyrouting.po index 3c9a17e0d4..6814b17300 100644 --- a/applications/luci-app-freifunk-policyrouting/po/ms/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/ms/freifunk-policyrouting.po @@ -33,7 +33,7 @@ msgstr "" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/no/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/no/freifunk-policyrouting.po index 3c9a17e0d4..6814b17300 100644 --- a/applications/luci-app-freifunk-policyrouting/po/no/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/no/freifunk-policyrouting.po @@ -33,7 +33,7 @@ msgstr "" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/pl/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/pl/freifunk-policyrouting.po index bcb4492a09..20373030d3 100644 --- a/applications/luci-app-freifunk-policyrouting/po/pl/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/pl/freifunk-policyrouting.po @@ -57,7 +57,7 @@ msgstr "Ścisłe filtrowanie" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/pt-br/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/pt-br/freifunk-policyrouting.po index 4aac8ca15a..9b61a4e481 100644 --- a/applications/luci-app-freifunk-policyrouting/po/pt-br/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/pt-br/freifunk-policyrouting.po @@ -56,7 +56,7 @@ msgstr "Filtragem Estrita" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/pt/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/pt/freifunk-policyrouting.po index 41a6b21b7c..2323c9d090 100644 --- a/applications/luci-app-freifunk-policyrouting/po/pt/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/pt/freifunk-policyrouting.po @@ -50,7 +50,7 @@ msgstr "Filtragem Estrita" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/ro/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/ro/freifunk-policyrouting.po index 3386101bb9..9d5141328d 100644 --- a/applications/luci-app-freifunk-policyrouting/po/ro/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/ro/freifunk-policyrouting.po @@ -47,7 +47,7 @@ msgstr "" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/ru/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/ru/freifunk-policyrouting.po index 7dd2c8a17a..8af0b98d22 100644 --- a/applications/luci-app-freifunk-policyrouting/po/ru/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/ru/freifunk-policyrouting.po @@ -58,7 +58,7 @@ msgstr "Строгая фильтрация" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/sk/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/sk/freifunk-policyrouting.po index b1a7810324..51ad36bc24 100644 --- a/applications/luci-app-freifunk-policyrouting/po/sk/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/sk/freifunk-policyrouting.po @@ -43,7 +43,7 @@ msgstr "" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/sv/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/sv/freifunk-policyrouting.po index 1310afa962..769bda9c2c 100644 --- a/applications/luci-app-freifunk-policyrouting/po/sv/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/sv/freifunk-policyrouting.po @@ -44,7 +44,7 @@ msgstr "" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/templates/freifunk-policyrouting.pot b/applications/luci-app-freifunk-policyrouting/po/templates/freifunk-policyrouting.pot index b4c35c177c..4d393c7507 100644 --- a/applications/luci-app-freifunk-policyrouting/po/templates/freifunk-policyrouting.pot +++ b/applications/luci-app-freifunk-policyrouting/po/templates/freifunk-policyrouting.pot @@ -36,7 +36,7 @@ msgstr "" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/tr/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/tr/freifunk-policyrouting.po index af1616fa48..d801ce245f 100644 --- a/applications/luci-app-freifunk-policyrouting/po/tr/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/tr/freifunk-policyrouting.po @@ -44,7 +44,7 @@ msgstr "" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/uk/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/uk/freifunk-policyrouting.po index e4cc687e92..25eda199df 100644 --- a/applications/luci-app-freifunk-policyrouting/po/uk/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/uk/freifunk-policyrouting.po @@ -60,7 +60,7 @@ msgstr "Жорстка фільтрація" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/vi/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/vi/freifunk-policyrouting.po index 3c9a17e0d4..6814b17300 100644 --- a/applications/luci-app-freifunk-policyrouting/po/vi/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/vi/freifunk-policyrouting.po @@ -33,7 +33,7 @@ msgstr "" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/zh-cn/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/zh-cn/freifunk-policyrouting.po index 3e2dd55ff0..2512d03329 100644 --- a/applications/luci-app-freifunk-policyrouting/po/zh-cn/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/zh-cn/freifunk-policyrouting.po @@ -53,7 +53,7 @@ msgstr "严格过滤" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-freifunk-policyrouting/po/zh-tw/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/zh-tw/freifunk-policyrouting.po index f5b891a968..5be29e8e80 100644 --- a/applications/luci-app-freifunk-policyrouting/po/zh-tw/freifunk-policyrouting.po +++ b/applications/luci-app-freifunk-policyrouting/po/zh-tw/freifunk-policyrouting.po @@ -53,7 +53,7 @@ msgstr "嚴格過濾" msgid "" "These pages can be used to setup policy routing for certain firewall zones. " "This is useful if you need to use your own internet connection for yourself " -"but you don't want to share it with others (thats why it can also be called " +"but you don't want to share it with others (that's why it can also be called " "'Ego Mode'). Your own traffic is then sent via your internet connection " "while traffic originating from the mesh will use another gateway in the mesh." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua b/applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua index d89ab27c29..ad77a9022c 100644 --- a/applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua +++ b/applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua @@ -74,7 +74,7 @@ quality = s:taboption(this_tab, Value, "quality", translate("JPEG compression qu minimum_size = s:taboption(this_tab, Value, "minimum_size", translate("Drop frames smaller then this limit"),translate("Set the minimum size if the webcam produces small-sized garbage frames. May happen under low light conditions")) minimum_size.datatype = "uinteger" -no_dynctrl = s:taboption(this_tab, Flag, "no_dynctrl", translate("Don't initalize dynctrls"), translate("Do not initalize dynctrls of Linux-UVC driver")) +no_dynctrl = s:taboption(this_tab, Flag, "no_dynctrl", translate("Don't initialize dynctrls"), translate("Do not initialize dynctrls of Linux-UVC driver")) led = s:taboption(this_tab, ListValue, "led", translate("Led control")) led:value("on", translate("On")) @@ -206,7 +206,7 @@ folder=s:taboption(this_tab, Value, "folder", translate("Folder"), translate("Se --mjpeg=s:taboption(this_tab, Value, "mjpeg", translate("Mjpeg output"), translate("Check to save the stream to an mjpeg file")) -delay=s:taboption(this_tab, Value, "delay", translate("Interval between saving pictures"), translate("Set the inteval in millisecond")) +delay=s:taboption(this_tab, Value, "delay", translate("Interval between saving pictures"), translate("Set the interval in millisecond")) delay.placeholder="5000" delay.datatype = "uinteger" diff --git a/applications/luci-app-mjpg-streamer/po/ja/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/ja/mjpg-streamer.po index 7da3444613..907a792987 100644 --- a/applications/luci-app-mjpg-streamer/po/ja/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/ja/mjpg-streamer.po @@ -38,10 +38,10 @@ msgstr "実行するコマンド" msgid "Device" msgstr "デバイス" -msgid "Do not initalize dynctrls of Linux-UVC driver" +msgid "Do not initialize dynctrls of Linux-UVC driver" msgstr "Linux-UVCドライバのdynctrlsを初期化しません。" -msgid "Don't initalize dynctrls" +msgid "Don't initialize dynctrls" msgstr "dynctrlsを初期化しない" msgid "Drop frames smaller then this limit" @@ -135,7 +135,7 @@ msgstr "リングバッファー サイズ" msgid "Set folder to save pictures" msgstr "画像を保存するフォルダーを設定します。" -msgid "Set the inteval in millisecond" +msgid "Set the interval in millisecond" msgstr "間隔をミリ秒で設定します。" msgid "" diff --git a/applications/luci-app-mjpg-streamer/po/pt-br/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/pt-br/mjpg-streamer.po index 28bfa186b0..d53202109d 100644 --- a/applications/luci-app-mjpg-streamer/po/pt-br/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/pt-br/mjpg-streamer.po @@ -39,10 +39,10 @@ msgstr "Comando para executar:" msgid "Device" msgstr "Dispositivo" -msgid "Do not initalize dynctrls of Linux-UVC driver" +msgid "Do not initialize dynctrls of Linux-UVC driver" msgstr "Não inicie o dynctrls do driver do Linux-UVC" -msgid "Don't initalize dynctrls" +msgid "Don't initialize dynctrls" msgstr "Não inicia o dynctrls" msgid "Drop frames smaller then this limit" @@ -136,7 +136,7 @@ msgstr "Tamanho do buffer em anel" msgid "Set folder to save pictures" msgstr "Definir pasta para salvas as imagens" -msgid "Set the inteval in millisecond" +msgid "Set the interval in millisecond" msgstr "Defina o intervalo em milisegundos" msgid "" diff --git a/applications/luci-app-mjpg-streamer/po/ru/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/ru/mjpg-streamer.po index 6ba8664518..b71bb3c71b 100644 --- a/applications/luci-app-mjpg-streamer/po/ru/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/ru/mjpg-streamer.po @@ -43,10 +43,10 @@ msgstr "Введите команду" msgid "Device" msgstr "Устройство" -msgid "Do not initalize dynctrls of Linux-UVC driver" +msgid "Do not initialize dynctrls of Linux-UVC driver" msgstr "Не задействует dynctrls драйвера Linux-UVC." -msgid "Don't initalize dynctrls" +msgid "Don't initialize dynctrls" msgstr "Отключить dynctrls" msgid "Drop frames smaller then this limit" @@ -140,7 +140,7 @@ msgstr "Задать размер буфера" msgid "Set folder to save pictures" msgstr "Задать папку для сохранения снимков." -msgid "Set the inteval in millisecond" +msgid "Set the interval in millisecond" msgstr "Задать интервал в миллисекундах." msgid "" 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 ecb374d7f3..27eb99987c 100644 --- a/applications/luci-app-mjpg-streamer/po/templates/mjpg-streamer.pot +++ b/applications/luci-app-mjpg-streamer/po/templates/mjpg-streamer.pot @@ -28,10 +28,10 @@ msgstr "" msgid "Device" msgstr "" -msgid "Do not initalize dynctrls of Linux-UVC driver" +msgid "Do not initialize dynctrls of Linux-UVC driver" msgstr "" -msgid "Don't initalize dynctrls" +msgid "Don't initialize dynctrls" msgstr "" msgid "Drop frames smaller then this limit" @@ -123,7 +123,7 @@ msgstr "" msgid "Set folder to save pictures" msgstr "" -msgid "Set the inteval in millisecond" +msgid "Set the interval in millisecond" msgstr "" msgid "" 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 cfb2981b15..b2e916884f 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 @@ -44,10 +44,10 @@ msgstr "运行的命令" msgid "Device" msgstr "设备" -msgid "Do not initalize dynctrls of Linux-UVC driver" +msgid "Do not initialize dynctrls of Linux-UVC driver" msgstr "不要初始化 Linux-UVC 驱动的 dynctrls" -msgid "Don't initalize dynctrls" +msgid "Don't initialize dynctrls" msgstr "不要初始化 dynctrls" msgid "Drop frames smaller then this limit" @@ -139,7 +139,7 @@ msgstr "环形缓冲区大小" msgid "Set folder to save pictures" msgstr "图片保存位置" -msgid "Set the inteval in millisecond" +msgid "Set the interval in millisecond" msgstr "设置时间间隔（毫秒）" msgid "" diff --git a/applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po index d7b969c841..d3b3455e9f 100644 --- a/applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po @@ -44,10 +44,10 @@ msgstr "執行的指令" msgid "Device" msgstr "裝置" -msgid "Do not initalize dynctrls of Linux-UVC driver" +msgid "Do not initialize dynctrls of Linux-UVC driver" msgstr "不要初始化 Linux-UVC 驅動的 dynctrls" -msgid "Don't initalize dynctrls" +msgid "Don't initialize dynctrls" msgstr "不要初始化 dynctrls" msgid "Drop frames smaller then this limit" @@ -139,7 +139,7 @@ msgstr "環形緩衝區大小" msgid "Set folder to save pictures" msgstr "圖片儲存位置" -msgid "Set the inteval in millisecond" +msgid "Set the interval in millisecond" msgstr "設定時間間隔（毫秒）" msgid "" diff --git a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua index d2d7422a6b..35385912ce 100644 --- a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua +++ b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua @@ -117,7 +117,7 @@ function diagnosticsData(interface, task) end end - function get_gateway(inteface) + function get_gateway(interface) local gateway = nil local dump = nil @@ -143,6 +143,7 @@ function diagnosticsData(interface, task) local uci = require "luci.model.uci".cursor(nil, "/var/state") local nw = require "luci.model.network".init() + local i18n = require "luci.i18n" local network = nw:get_network(interface) local device = network and network:get_interface() device = device:name() @@ -155,7 +156,7 @@ function diagnosticsData(interface, task) diag_command("ping -I %s -c 5 -W 1 %s 2>&1", device, gateway) else luci.http.prepare_content("text/plain") - luci.http.write(translatef("No gateway for interface %s found.", interface)) + luci.http.write(i18n.translatef("No gateway for interface %s found.", interface)) end elseif task == "ping_trackips" then local trackips = uci:get("mwan3", interface, "track_ip") @@ -164,7 +165,7 @@ function diagnosticsData(interface, task) diag_command("ping -I %s -c 5 -W 1 %s 2>&1", device, trackips[i]) end else - luci.http.write(translatef("No tracking Hosts for interface %s defined.", interface)) + luci.http.write(i18n.translatef("No tracking Hosts for interface %s defined.", interface)) end elseif task == "check_rules" then local number = getInterfaceNumber(interface) @@ -173,30 +174,30 @@ function diagnosticsData(interface, task) local iif_rule = sys.exec(string.format("ip rule | grep %d", iif)) local fwmark_rule = sys.exec(string.format("ip rule | grep %d", fwmark)) if iif_rule ~= "" and fwmark_rule ~= "" then - luci.http.write(translatef("All required IP rules for interface %s found", interface)) + luci.http.write(i18n.translatef("All required IP rules for interface %s found", interface)) luci.http.write("\n") luci.http.write(fwmark_rule) luci.http.write(iif_rule) elseif iif_rule == "" and fwmark_rule ~= "" then - luci.http.write(translatef("Only one IP rules for interface %s found", interface)) + luci.http.write(i18n.translatef("Only one IP rules for interface %s found", interface)) luci.http.write("\n") luci.http.write(fwmark_rule) elseif iif_rule ~= "" and fwmark_rule == "" then - luci.http.write(translatef("Only one IP rules for interface %s found", interface)) + luci.http.write(i18n.translatef("Only one IP rules for interface %s found", interface)) luci.http.write("\n") luci.http.write(iif_rule) else - luci.http.write(translatef("Missing both IP rules for interface %s", interface)) + luci.http.write(i18n.translatef("Missing both IP rules for interface %s", interface)) end elseif task == "check_routes" then local number = getInterfaceNumber(interface) local routeTable = sys.exec(string.format("ip route list table %s", number)) if routeTable ~= "" then - luci.http.write(translatef("Routing table %s for interface %s found", number, interface)) + luci.http.write(i18n.translatef("Routing table %s for interface %s found", number, interface)) luci.http.write("\n") luci.http.write(routeTable) else - luci.http.write(translatef("Routing table %s for interface %s not found", number, interface)) + luci.http.write(i18n.translatef("Routing table %s for interface %s not found", number, interface)) end elseif task == "hotplug_ifup" then os.execute(string.format("/usr/sbin/mwan3 ifup %s", ut.shellquote(interface))) diff --git a/applications/luci-app-mwan3/po/de/mwan3.po b/applications/luci-app-mwan3/po/de/mwan3.po index 6f391e84d0..641733e5ac 100644 --- a/applications/luci-app-mwan3/po/de/mwan3.po +++ b/applications/luci-app-mwan3/po/de/mwan3.po @@ -202,6 +202,9 @@ msgid "" "rules" msgstr "" +msgid "Max TTL" +msgstr "" + msgid "Max packet latency [ms]" msgstr "" diff --git a/applications/luci-app-mwan3/po/ja/mwan3.po b/applications/luci-app-mwan3/po/ja/mwan3.po index 8a1cad2f6b..40c71b00ac 100644 --- a/applications/luci-app-mwan3/po/ja/mwan3.po +++ b/applications/luci-app-mwan3/po/ja/mwan3.po @@ -222,6 +222,9 @@ msgstr "" "スは使用できません。<br />インターフェースには、設定済みのメンバーやポリ" "シー、ルールと同じ名前を使用することはできません。" +msgid "Max TTL" +msgstr "" + msgid "Max packet latency [ms]" msgstr "最大パケットレイテンシ [ms]" diff --git a/applications/luci-app-mwan3/po/ru/mwan3.po b/applications/luci-app-mwan3/po/ru/mwan3.po index 4d52d7108c..884848da4b 100644 --- a/applications/luci-app-mwan3/po/ru/mwan3.po +++ b/applications/luci-app-mwan3/po/ru/mwan3.po @@ -222,6 +222,9 @@ msgstr "" "символы A-Z, a-z, 0-9, _ и пробелы.<br />Интерфейсы не могут иметь " "одинаковые имена с настроенными узлами, политиками или правилами." +msgid "Max TTL" +msgstr "" + msgid "Max packet latency [ms]" msgstr "" diff --git a/applications/luci-app-mwan3/po/templates/mwan3.pot b/applications/luci-app-mwan3/po/templates/mwan3.pot index e815afd1f0..8f43b3dd10 100644 --- a/applications/luci-app-mwan3/po/templates/mwan3.pot +++ b/applications/luci-app-mwan3/po/templates/mwan3.pot @@ -196,6 +196,9 @@ msgid "" "rules" msgstr "" +msgid "Max TTL" +msgstr "" + msgid "Max packet latency [ms]" msgstr "" diff --git a/applications/luci-app-mwan3/po/zh-cn/mwan3.po b/applications/luci-app-mwan3/po/zh-cn/mwan3.po index 4fd6817407..91475a61e0 100644 --- a/applications/luci-app-mwan3/po/zh-cn/mwan3.po +++ b/applications/luci-app-mwan3/po/zh-cn/mwan3.po @@ -8,7 +8,7 @@ msgstr "" "Language-Team: <debian-l10n-chinese@lists.debian.org>\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"PO-Revision-Date: 2018-08-08 08:31+0800\n" +"PO-Revision-Date: 2018-10-01 10:10+0800\n" "X-Generator: Gtranslator 2.91.7\n" msgid "%d hour" @@ -39,7 +39,7 @@ msgid "Acceptable values: 1-256. Defaults to 1 if not set" msgstr "取值范围：1-256。如果不填写，默认值为 1" msgid "All required IP rules for interface %s found" -msgstr "" +msgstr "找到接口 %s 的所有必需 IP 规则" msgid "Check IP rules" msgstr "检查 IP 规则" @@ -211,6 +211,9 @@ msgstr "" "的接口名称匹配。<br />名称允许包括 A-Z、a-z、0-9、_ 但是不能有空格。<br />接" "口不应该与成员、策略、规则中的任意一个设置项使用相同的名称" +msgid "Max TTL" +msgstr "" + msgid "Max packet latency [ms]" msgstr "最大数据包延迟 [ms]" @@ -255,7 +258,7 @@ msgid "Min packet loss [%]" msgstr "最小数据包丢失率 [%]" msgid "Missing both IP rules for interface %s" -msgstr "" +msgstr "缺少接口 %s 的两个 IP 规则" msgid "" "Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/" @@ -271,10 +274,10 @@ msgid "No MWAN interfaces found" msgstr "没有找到 MWAN 接口" msgid "No gateway for interface %s found." -msgstr "" +msgstr "没有找到接口 %s 的网关。" msgid "No tracking Hosts for interface %s defined." -msgstr "" +msgstr "未定义接口 %s 的跟踪主机。" msgid "Notification" msgstr "通知" @@ -286,7 +289,7 @@ msgid "Online" msgstr "在线" msgid "Only one IP rules for interface %s found" -msgstr "" +msgstr "只找到接口 %s 的一个 IP 规则" msgid "Ping count" msgstr "Ping 计数" @@ -343,10 +346,10 @@ msgid "Recovery interval" msgstr "故障恢复间隔" msgid "Routing table %s for interface %s found" -msgstr "" +msgstr "找到路由表 %s，为接口 %s" msgid "Routing table %s for interface %s not found" -msgstr "" +msgstr "没有找到路由表 %s，为接口 %s" msgid "Rule" msgstr "规则" diff --git a/applications/luci-app-mwan3/po/zh-tw/mwan3.po b/applications/luci-app-mwan3/po/zh-tw/mwan3.po index bb17b559d2..3aaf030cf2 100644 --- a/applications/luci-app-mwan3/po/zh-tw/mwan3.po +++ b/applications/luci-app-mwan3/po/zh-tw/mwan3.po @@ -8,7 +8,7 @@ msgstr "" "Language-Team: <debian-l10n-chinese@lists.debian.org>\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"PO-Revision-Date: 2018-08-08 08:31+0800\n" +"PO-Revision-Date: 2018-10-01 10:10+0800\n" "X-Generator: Gtranslator 2.91.7\n" msgid "%d hour" @@ -39,7 +39,7 @@ msgid "Acceptable values: 1-256. Defaults to 1 if not set" msgstr "取值範圍：1-256。如果不填寫，預設值為 1" msgid "All required IP rules for interface %s found" -msgstr "" +msgstr "找到介面 %s 的所有必需 IP 規則" msgid "Check IP rules" msgstr "檢查 IP 規則" @@ -209,7 +209,10 @@ msgstr "" "MWAN 支援最多 252 個物理或邏輯介面。<br />MWAN 要求所有介面必須在 /etc/" "config/network 中設定唯一的閘道器躍點。<br />名稱必須與 /etc/config/network " "中的介面名稱匹配。<br />名稱允許包括 A-Z、a-z、0-9、_ 但是不能有空格。<br />" -"介面不應該與成員、策略、規則中的任意一個設定項使用相同的名稱" +"接口不應該與成員、策略、規則中的任意一個設定項使用相同的名稱" + +msgid "Max TTL" +msgstr "" msgid "Max packet latency [ms]" msgstr "最大資料包延遲 [ms]" @@ -255,7 +258,7 @@ msgid "Min packet loss [%]" msgstr "最小資料包丟失率 [%]" msgid "Missing both IP rules for interface %s" -msgstr "" +msgstr "缺少介面 %s 的兩個 IP 規則" msgid "" "Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/" @@ -271,10 +274,10 @@ msgid "No MWAN interfaces found" msgstr "沒有找到 MWAN 介面" msgid "No gateway for interface %s found." -msgstr "" +msgstr "沒有找到介面 %s 的閘道器。" msgid "No tracking Hosts for interface %s defined." -msgstr "" +msgstr "未定義介面 %s 的跟蹤主機。" msgid "Notification" msgstr "通知" @@ -286,7 +289,7 @@ msgid "Online" msgstr "在線" msgid "Only one IP rules for interface %s found" -msgstr "" +msgstr "只找到介面 %s 的一個 IP 規則" msgid "Ping count" msgstr "Ping 計數" @@ -343,10 +346,10 @@ msgid "Recovery interval" msgstr "故障恢復間隔" msgid "Routing table %s for interface %s found" -msgstr "" +msgstr "找到路由表 %s，為介面 %s" msgid "Routing table %s for interface %s not found" -msgstr "" +msgstr "沒有找到路由表 %s，為介面 %s" msgid "Rule" msgstr "規則" @@ -424,10 +427,10 @@ msgstr "" "這裡允許您修改“/etc/mwan3.user”的內容。<br />該檔案在 sysupgrade 期間也會保" "留。<br /><br />注意：<br />該檔案會作為 shell 指令碼解釋。<br />指令碼的第一" "行必須是 "#!/bin/sh"，不帶引號。<br />以 # 開頭的行是註釋，不會執行。" -"<br />將您的自訂 mwan3 動作放在這裡，他們將<br />在啟用 mwan3 的介面上<br />" -"在 netifd hotplug 介面事件時執行。<br /><br />有三個主要的環境變數傳遞給這個" +"<br />將您的自定義 mwan3 動作放在這裡，他們將<br />在啟用 mwan3 的介面上<br /" +">在 netifd hotplug 介面事件時執行。<br /><br />有三個主要的環境變數傳遞給這個" "指令碼。<br /><br />$ACTION “ifup”或“ifdown”<br />$INTERFACE 啟動或停止的介面" -"名（例如 “wan”或“wwan”）<br />$DEVICE 啟動或停止介面的物理裝置名（例" +"名（例如“wan”或“wwan”）<br />$DEVICE 啟動或停止介面的物理裝置名（例" "如“eth0”或“wwan0”）<br /><br />" msgid "Tracking hostname or IP address" @@ -517,13 +520,13 @@ msgid "unreachable (reject)" msgstr "不可達（拒絕）" #~ msgid "Online (tracking active)" -#~ msgstr "線上（跟蹤啟用中）" +#~ msgstr "在線（跟蹤啟用中）" #~ msgid "MWAN Interface Live Status" #~ msgstr "MWAN 介面實時狀態" #~ msgid "Online (tracking off)" -#~ msgstr "線上（跟蹤已關閉）" +#~ msgstr "在線（跟蹤已關閉）" #~ msgid "" #~ "This section allows you to modify the content of \"/etc/mwan3.user\".<br /" diff --git a/applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua b/applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua index d50b77d0f4..0d15bea648 100644 --- a/applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua +++ b/applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua @@ -57,8 +57,6 @@ function action_data() json = "application/json" } - local filename = "data." .. mtype - local args = { } local mtype = http.formvalue("type") or "json" local delim = http.formvalue("delim") or "," @@ -94,7 +92,7 @@ function action_data() end http.prepare_content(types[mtype]) - http.header("Content-Disposition", "attachment; filename=\"%s\"" % filename) + http.header("Content-Disposition", "attachment; filename=\"data.%s\"" % mtype) exec("/usr/sbin/nlbw", args, http.write) end diff --git a/applications/luci-app-olsr-services/luasrc/controller/services.lua b/applications/luci-app-olsr-services/luasrc/controller/services.lua index a4636bfd57..7a543d3531 100644 --- a/applications/luci-app-olsr-services/luasrc/controller/services.lua +++ b/applications/luci-app-olsr-services/luasrc/controller/services.lua @@ -4,7 +4,7 @@ function index() local uci = require "luci.model.uci".cursor() uci:foreach("olsrd", "LoadPlugin", function(s) - if s.library == "olsrd_nameservice.so.0.3" then + if s.library == "olsrd_nameservice" then has_serv = true end end) 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 94f01cb51c..91624f3b30 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 @@ -16,7 +16,7 @@ local uci = require "luci.model.uci".cursor() local ip = require "luci.ip" uci:foreach("olsrd", "LoadPlugin", function(s) - if s.library == "olsrd_nameservice.so.0.3" then + if s.library == "olsrd_nameservice" then local services_file=s.services_file if services_file and fs.access(services_file) then has_services = true diff --git a/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz.js b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz.js index 49435a4a33..81eb78fb02 100644 --- a/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz.js +++ b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz.js @@ -103,15 +103,15 @@ function edge(n1,n2){ return ""; } - x = this.n1.x*scale; - y = this.n1.y*scale; - dx = this.n2.x*scale - x; - dy = this.n2.y*scale - y; + var x = this.n1.x*scale; + var y = this.n1.y*scale; + var dx = this.n2.x*scale - x; + var dy = this.n2.y*scale - y; x += xoff*scale + 75; y += yoff*scale + 15; - imgtag = "<img src='/luci-static/resources/olsr-viz/dot_" + var imgtag = "<img src='/luci-static/resources/olsr-viz/dot_" if (this.etx > 0 && this.etx < 2) { imgtag += "good.gif'"; } @@ -126,9 +126,9 @@ function edge(n1,n2){ } imgtag += " alt='ETX: " + this.etx + "' title='ETX: " + this.etx + "' "; - d = Math.sqrt(dx*dx+dy*dy); + var d = Math.sqrt(dx*dx+dy*dy); - for (j = 0; j < d; j += 15) { + for (var j = 0; j < d; j += 15) { nh += imgtag + "style='top:" + parseInt(y+dy * j / d) + "px; left:" + parseInt(x+dx * j / d) + "px; " @@ -182,7 +182,7 @@ function edge(n1,n2){ function getEdgeKey(ip1,ip2) { - key = ""; + var key = ""; if(ip1 > ip2) { key = ip2 + "-" + ip1; } @@ -215,7 +215,7 @@ function node(ip) { return ""; } var igw = 0; - for(h in this.hna) { + for(var h in this.hna) { if(h == "0.0.0.0") { igw = 1; break; @@ -285,7 +285,7 @@ function node(ip) { } function touch_node(ip) { - n = nodes[ip]; + var n = nodes[ip]; if(!n) { n = new node(ip); nodes[ip] = n; @@ -298,19 +298,22 @@ function touch_node(ip) { function place_new_nodes() { var nc = 0; - for(i = 0;i<newnodes.length;i++){ - n = newnodes[i]; + for(var i = 0;i<newnodes.length;i++){ + var n = newnodes[i]; if(n.placed){continue;} + var sp; if(sp = getCookie("node_"+n.ip)) { - xy = sp.split("x"); + var xy = sp.split("x"); debug_writeln("sp: "+sp+" xy[0]: "+xy[0]+" xy[1]: "+xy[1]); n.x = parseFloat(xy[0]); n.y = parseFloat(xy[1]); } else if(n.weight>1){ - // see if we find allredy placed nodes - ox=0,oy=0;dx=0,dy=0;c=0; - for(e in n.edges){ + // see if we find already placed nodes + var ox=0, oy=0; + var dx=0, dy=0; + var c=0; + for(var e in n.edges){ if(nodes[e] && nodes[e].placed){ if(!ox && !oy) { ox = nodes[e].x; @@ -329,7 +332,7 @@ function place_new_nodes() { } } else { - // beginn somewhere + // begin somewhere n.x = Math.random()*400; n.y = Math.random()*400; } @@ -349,7 +352,7 @@ function hna(gw,net,mask) { } function touch_hna(node,net,mask) { - h = node.hna[net]; + var h = node.hna[net]; if(!h) { h = new hna(node.ip,net,mask); node.hna[net] = h; @@ -379,17 +382,20 @@ function viz_setup(iframeid,maindivid,nodedivid,edgedivid) { edgediv=document.getElementById(edgedivid); // autosave on exit? + var autosave; if((autosave = getCookie("prefs_autosave"))) { auto_save = parseInt(autosave); } viz_autosave(auto_save); // maximum metric of surrounding nodes + var mmx; if(mmx = getCookie("prefs_maxmetric")) { set_maxmetric(mmx,true,true); } // scale of view + var savescale; if((savescale = getCookie("prefs_scale")) && (savescale = parseFloat(savescale))) { set_scale(savescale,true); @@ -414,10 +420,10 @@ function viz_setup(iframeid,maindivid,nodedivid,edgedivid) { function viz_save() { // let cookie survive a month - exp = new Date(); + var exp = new Date(); exp.setTime(exp.getTime() + 2592000000); // save node positions - for(ip in nodes) + for(var ip in nodes) { if(nodes[ip].metric > maxmetric) { continue; @@ -451,10 +457,10 @@ function viz_autosave(autosave) function viz_reset() { deleteAllCookies(); - for(ip in nodes) { + for(var ip in nodes) { delete nodes[ip]; } - for(e in edges) { + for(var e in edges) { delete edges[e]; } viz_update(); @@ -571,6 +577,10 @@ function fa(x) { var dclTimer = 0; var declump_running = false; function declump(t) { + var dx; + var dy; + var d; + // clear declump timer if(dclTimer) { clearTimeout(dclTimer); @@ -581,7 +591,7 @@ function declump(t) { declump_running = true; // nodes - nc = 0; + var nc = 0; for (var ip1 in nodes) { nodes[ip1].fr_x=0; nodes[ip1].fr_y=0; @@ -595,7 +605,7 @@ function declump(t) { if(nodes[ip1].metric > maxmetric || nodes[ip1].pinned) { continue; } - for (ip2 in nodes) { + for (var ip2 in nodes) { if (nodes[ip2].metric > maxmetric || ip1 == ip2) { continue; } @@ -611,14 +621,14 @@ function declump(t) { dx = nodes[ip1].fr_x; dy = nodes[ip1].fr_y; d = Math.sqrt(dx*dx+dy*dy); - md = Math.min(d,iel/nodes[ip1].weight); + var md = Math.min(d,iel/nodes[ip1].weight); nodes[ip1].x_next += (dx / d) * md; nodes[ip1].y_next += (dy / d) * md; nc++; } // edges - ec = 0; + var ec = 0; for (var e in edges) { if (!edges[e].n1 || !edges[e].n2 || edges[e].n1.metric > maxmetric || edges[e].n2.metric > maxmetric) { @@ -637,7 +647,11 @@ function declump(t) { } // displacement - xmin=-20;ymin=-20;xmax=20;ymax=20;dsum=0; + var xmin=-20; + var ymin=-20; + var xmax=20; + var ymax=20; + var dsum=0; for (var ip in nodes) { if(nodes[ip].metric > maxmetric || nodes[ip].pinned) { continue; @@ -713,7 +727,7 @@ function dragstart(element) { dragx = posx - element.offsetLeft; dragy = posy - element.offsetTop; - n = nodes[dragip]; + var n = nodes[dragip]; if(n) { n.pinned = true; } @@ -723,7 +737,7 @@ function dragstart(element) { function dragstop() { //Wird aufgerufen, wenn ein Objekt nicht mehr bewegt werden soll. - n = nodes[dragip]; + var n = nodes[dragip]; if(n) { n.pinned = false; } @@ -738,12 +752,12 @@ function drag(ereignis) { posx = document.all ? window.event.clientX : ereignis.pageX; posy = document.all ? window.event.clientY : ereignis.pageY; if(dragip != null) { - n = nodes[dragip]; + var n = nodes[dragip]; if(n) { n.x = (posx - dragx)/scale - xoff; n.y = (posy - dragy)/scale - yoff; } - e = document.getElementById('node_'+dragip); + var e = document.getElementById('node_'+dragip); e.style.left = parseInt((n.x+xoff)*scale) + "px"; e.style.top = parseInt((n.y+yoff)*scale) + "px"; } @@ -811,8 +825,8 @@ function deleteCookie(name, path, domain) { } function deleteAllCookies() { - cookies = document.cookie.split("; "); - for(i=0;i<cookies.length;i++) { + var cookies = document.cookie.split("; "); + for(var i=0;i<cookies.length;i++) { deleteCookie(cookies[i].split("=")[0]); } } diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua index a075bcf26d..90a615699a 100644 --- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua +++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua @@ -259,7 +259,7 @@ function lqmult.validate(self, value) local host = val[1] local mult = val[2] if not host or not mult then - return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) seperated by space.") + return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) separated by space.") end if not (host == "default" or ip.IPv4(host) or ip.IPv6(host)) then return nil, translate("Can only be a valid IPv4 or IPv6 address or 'default'") diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua index 0007e673e2..0206b67dc0 100644 --- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua +++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua @@ -253,7 +253,7 @@ function lqmult.validate(self, value) local host = val[1] local mult = val[2] if not host or not mult then - return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) seperated by space.") + return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) separated by space.") end if not (host == "default" or ip.IPv6(host)) then return nil, translate("Can only be a valid IPv6 address or 'default'") diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua index d6b7cd16a6..7de2ad9b44 100644 --- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua +++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua @@ -84,7 +84,7 @@ function lqmult.validate(self, value) local host = val[1] local mult = val[2] if not host or not mult then - return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) seperated by space.") + return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) separated by space.") end if not (host == "default" or ip.IPv4(host) or ip.IPv6(host)) then return nil, translate("Can only be a valid IPv4 or IPv6 address or 'default'") diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua index 2f0fa6c38d..00f242df1b 100644 --- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua +++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua @@ -84,7 +84,7 @@ function lqmult.validate(self, value) local host = val[1] local mult = val[2] if not host or not mult then - return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) seperated by space.") + return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) separated by space.") end if not (host == "default" or ip.IPv6(host)) then return nil, translate("Can only be a valid IPv6 address or 'default'") diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua index 43d6a08ad1..2d7cffe6e9 100644 --- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua +++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua @@ -62,7 +62,7 @@ if arg[1] then local knownPlParams = { - ["olsrd_bmf.so.1.5.3"] = { + ["olsrd_bmf"] = { { Value, "BmfInterface", "bmf0" }, { Value, "BmfInterfaceIp", "10.10.10.234/24" }, { Flag, "DoLocalBroadcast", "no" }, @@ -73,19 +73,19 @@ if arg[1] then { DynamicList, "NonOlsrIf", "br-lan" } }, - ["olsrd_dyn_gw.so.0.4"] = { + ["olsrd_dyn_gw"] = { { Value, "Interval", "40" }, { DynamicList, "Ping", "141.1.1.1" }, { DynamicList, "HNA", "192.168.80.0/24", IpMask2Cidr, Cidr2IpMask } }, - ["olsrd_httpinfo.so.0.1"] = { + ["olsrd_httpinfo"] = { { Value, "port", "80" }, { DynamicList, "Host", "163.24.87.3" }, { DynamicList, "Net", "0.0.0.0/0", Cidr2IpMask } }, - ["olsrd_nameservice.so.0.3"] = { + ["olsrd_nameservice"] = { { DynamicList, "name", "my-name.mesh" }, { DynamicList, "hosts", "1.2.3.4 name-for-other-interface.mesh" }, { Value, "suffix", ".olsr" }, @@ -109,7 +109,7 @@ if arg[1] then { Value, "macs_change_script", "/path/to/script" } }, - ["olsrd_quagga.so.0.2.2"] = { + ["olsrd_quagga"] = { { StaticList, "redistribute", { "system", "kernel", "connect", "static", "rip", "ripng", "ospf", "ospf6", "isis", "bgp", "hsls" @@ -119,40 +119,40 @@ if arg[1] then { Value, "Distance", Range(0,255) } }, - ["olsrd_secure.so.0.5"] = { + ["olsrd_secure"] = { { Value, "Keyfile", "/etc/private-olsr.key" } }, - ["olsrd_txtinfo.so.0.1"] = { + ["olsrd_txtinfo"] = { { Value, "accept", "127.0.0.1" } }, - ["olsrd_jsoninfo.so.0.0"] = { + ["olsrd_jsoninfo"] = { { Value, "accept", "127.0.0.1" }, { Value, "port", "9090" }, { Value, "UUIDFile", "/etc/olsrd/olsrd.uuid" }, }, - ["olsrd_watchdog.so.0.1"] = { + ["olsrd_watchdog"] = { { Value, "file", "/var/run/olsrd.watchdog" }, { Value, "interval", "30" } }, - ["olsrd_mdns.so.1.0.0"] = { + ["olsrd_mdns"] = { { DynamicList, "NonOlsrIf", "lan" } }, - ["olsrd_p2pd.so.0.1.0"] = { + ["olsrd_p2pd"] = { { DynamicList, "NonOlsrIf", "lan" }, { Value, "P2pdTtl", "10" } }, - ["olsrd_arprefresh.so.0.1"] = {}, - ["olsrd_dot_draw.so.0.3"] = {}, - ["olsrd_dyn_gw_plain.so.0.4"] = {}, - ["olsrd_pgraph.so.1.1"] = {}, - ["olsrd_tas.so.0.1"] = {} + ["olsrd_arprefresh"] = {}, + ["olsrd_dot_draw"] = {}, + ["olsrd_dyn_gw_plain"] = {}, + ["olsrd_pgraph"] = {}, + ["olsrd_tas"] = {} } diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua index d1c68be24b..12fa0a171e 100644 --- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua +++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua @@ -62,7 +62,7 @@ if arg[1] then local knownPlParams = { - ["olsrd_bmf.so.1.5.3"] = { + ["olsrd_bmf"] = { { Value, "BmfInterface", "bmf0" }, { Value, "BmfInterfaceIp", "10.10.10.234/24" }, { Flag, "DoLocalBroadcast", "no" }, @@ -73,19 +73,19 @@ if arg[1] then { DynamicList, "NonOlsrIf", "br-lan" } }, - ["olsrd_dyn_gw.so.0.4"] = { + ["olsrd_dyn_gw"] = { { Value, "Interval", "40" }, { DynamicList, "Ping", "141.1.1.1" }, { DynamicList, "HNA", "192.168.80.0/24", IpMask2Cidr, Cidr2IpMask } }, - ["olsrd_httpinfo.so.0.1"] = { + ["olsrd_httpinfo"] = { { Value, "port", "80" }, { DynamicList, "Host", "163.24.87.3" }, { DynamicList, "Net", "0.0.0.0/0", Cidr2IpMask } }, - ["olsrd_nameservice.so.0.3"] = { + ["olsrd_nameservice"] = { { DynamicList, "name", "my-name.mesh" }, { DynamicList, "hosts", "1.2.3.4 name-for-other-interface.mesh" }, { Value, "suffix", ".olsr" }, @@ -109,7 +109,7 @@ if arg[1] then { Value, "macs_change_script", "/path/to/script" } }, - ["olsrd_quagga.so.0.2.2"] = { + ["olsrd_quagga"] = { { StaticList, "redistribute", { "system", "kernel", "connect", "static", "rip", "ripng", "ospf", "ospf6", "isis", "bgp", "hsls" @@ -119,40 +119,40 @@ if arg[1] then { Value, "Distance", Range(0,255) } }, - ["olsrd_secure.so.0.5"] = { + ["olsrd_secure"] = { { Value, "Keyfile", "/etc/private-olsr.key" } }, - ["olsrd_txtinfo.so.0.1"] = { + ["olsrd_txtinfo"] = { { Value, "accept", "::1/128" } }, - ["olsrd_jsoninfo.so.0.0"] = { + ["olsrd_jsoninfo"] = { { Value, "accept", "::1/128" }, { Value, "port", "9090" }, { Value, "UUIDFile", "/etc/olsrd/olsrd.uuid.ipv6" }, }, - ["olsrd_watchdog.so.0.1"] = { + ["olsrd_watchdog"] = { { Value, "file", "/var/run/olsrd.watchdog.ipv6" }, { Value, "interval", "30" } }, - ["olsrd_mdns.so.1.0.0"] = { + ["olsrd_mdns.so"] = { { DynamicList, "NonOlsrIf", "lan" } }, - ["olsrd_p2pd.so.0.1.0"] = { + ["olsrd_p2pd.so"] = { { DynamicList, "NonOlsrIf", "lan" }, { Value, "P2pdTtl", "10" } }, - ["olsrd_arprefresh.so.0.1"] = {}, - ["olsrd_dot_draw.so.0.3"] = {}, - ["olsrd_dyn_gw_plain.so.0.4"] = {}, - ["olsrd_pgraph.so.1.1"] = {}, - ["olsrd_tas.so.0.1"] = {} + ["olsrd_arprefresh"] = {}, + ["olsrd_dot_draw"] = {}, + ["olsrd_dyn_gw_plain"] = {}, + ["olsrd_pgraph"] = {}, + ["olsrd_tas"] = {} } diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/common_js.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/common_js.htm index 1ee763e119..213013f22c 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/common_js.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/common_js.htm @@ -9,7 +9,7 @@ function css(selector, property, value) { } window.onload = function() { - buttons = '<input type="button" name="show-proto-4" id="show-proto-4" class="cbi-button cbi-button-apply" style="margin-right: 5px" value="<%:Hide IPv4%>">' + var buttons = '<input type="button" name="show-proto-4" id="show-proto-4" class="cbi-button cbi-button-apply" style="margin-right: 5px" value="<%:Hide IPv4%>">' buttons += '<input type="button" name="show-proto-6" id="show-proto-6" class="cbi-button cbi-button-apply" value="<%:Hide IPv6%>">' document.getElementById('togglebuttons').innerHTML = buttons; 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 1c178f1810..f04d926918 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm @@ -47,12 +47,14 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 }, linkgw = '<a href="http://' + hna.gateway + '/cgi-bin-status.html">' + hna.gateway + '</a>' } + var validity; if (hna.validityTime != undefined) { validity = hna.validityTime + 's' } else { validity = '-' } + var hostname; if (hna.hostname != undefined) { hostname = ' / <a href="http://' + hna.hostname + '/cgi-bin-status.html">' + hna.hostname + '</a>' } else { 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 9afd367d1f..46cc27dec6 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm @@ -55,6 +55,7 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 }, for (var idx = 0; idx < info.length; idx++) { var smartgw = info[idx]; + var linkgw; s += '<div class="tr cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+' proto-' + smartgw.proto + '">' if (smartgw.proto == '6') { linkgw = '<a href="http://[' + smartgw.ipAddress + ']/cgi-bin-status.html">' + smartgw.ipAddress + '</a>' diff --git a/applications/luci-app-olsr/po/ca/olsr.po b/applications/luci-app-olsr/po/ca/olsr.po index db4bce1b19..441eb36aca 100644 --- a/applications/luci-app-olsr/po/ca/olsr.po +++ b/applications/luci-app-olsr/po/ca/olsr.po @@ -304,7 +304,7 @@ msgstr "Nivell LQ" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/cs/olsr.po b/applications/luci-app-olsr/po/cs/olsr.po index 31669072d8..e40a47d54c 100644 --- a/applications/luci-app-olsr/po/cs/olsr.po +++ b/applications/luci-app-olsr/po/cs/olsr.po @@ -299,7 +299,7 @@ msgstr "" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/de/olsr.po b/applications/luci-app-olsr/po/de/olsr.po index a23a20d58c..e631dcc0c4 100644 --- a/applications/luci-app-olsr/po/de/olsr.po +++ b/applications/luci-app-olsr/po/de/olsr.po @@ -349,7 +349,7 @@ msgstr "LQ-Level" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/el/olsr.po b/applications/luci-app-olsr/po/el/olsr.po index a3cf0d2ae1..668b3db02e 100644 --- a/applications/luci-app-olsr/po/el/olsr.po +++ b/applications/luci-app-olsr/po/el/olsr.po @@ -301,7 +301,7 @@ msgstr "" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/en/olsr.po b/applications/luci-app-olsr/po/en/olsr.po index 131005e1ee..1eba365586 100644 --- a/applications/luci-app-olsr/po/en/olsr.po +++ b/applications/luci-app-olsr/po/en/olsr.po @@ -302,7 +302,7 @@ msgstr "LQ level" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/es/olsr.po b/applications/luci-app-olsr/po/es/olsr.po index 0e161bda43..3c3c2f1dcb 100644 --- a/applications/luci-app-olsr/po/es/olsr.po +++ b/applications/luci-app-olsr/po/es/olsr.po @@ -346,7 +346,7 @@ msgstr "LQ - Nivel" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" "LQMult precisa dos valores (dirección IP o \"por defecto\" y multiplicador) " "separados por un espacio." diff --git a/applications/luci-app-olsr/po/fr/olsr.po b/applications/luci-app-olsr/po/fr/olsr.po index e93a6bd20f..fcf5aa3b24 100644 --- a/applications/luci-app-olsr/po/fr/olsr.po +++ b/applications/luci-app-olsr/po/fr/olsr.po @@ -301,7 +301,7 @@ msgstr "" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/he/olsr.po b/applications/luci-app-olsr/po/he/olsr.po index 38aa43bffb..a036b030dd 100644 --- a/applications/luci-app-olsr/po/he/olsr.po +++ b/applications/luci-app-olsr/po/he/olsr.po @@ -296,7 +296,7 @@ msgstr "" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/hu/olsr.po b/applications/luci-app-olsr/po/hu/olsr.po index 38aa43bffb..a036b030dd 100644 --- a/applications/luci-app-olsr/po/hu/olsr.po +++ b/applications/luci-app-olsr/po/hu/olsr.po @@ -296,7 +296,7 @@ msgstr "" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/it/olsr.po b/applications/luci-app-olsr/po/it/olsr.po index a88d2970ce..ec4210bcbb 100644 --- a/applications/luci-app-olsr/po/it/olsr.po +++ b/applications/luci-app-olsr/po/it/olsr.po @@ -325,7 +325,7 @@ msgstr "" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/ja/olsr.po b/applications/luci-app-olsr/po/ja/olsr.po index b3f0109345..298866a9f3 100644 --- a/applications/luci-app-olsr/po/ja/olsr.po +++ b/applications/luci-app-olsr/po/ja/olsr.po @@ -339,7 +339,7 @@ msgstr "LQ レベル" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/ms/olsr.po b/applications/luci-app-olsr/po/ms/olsr.po index c0edce15c1..58ebfa5569 100644 --- a/applications/luci-app-olsr/po/ms/olsr.po +++ b/applications/luci-app-olsr/po/ms/olsr.po @@ -295,7 +295,7 @@ msgstr "" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/no/olsr.po b/applications/luci-app-olsr/po/no/olsr.po index 38aa43bffb..a036b030dd 100644 --- a/applications/luci-app-olsr/po/no/olsr.po +++ b/applications/luci-app-olsr/po/no/olsr.po @@ -296,7 +296,7 @@ msgstr "" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/pl/olsr.po b/applications/luci-app-olsr/po/pl/olsr.po index 64a99f6069..ee0f0e274f 100644 --- a/applications/luci-app-olsr/po/pl/olsr.po +++ b/applications/luci-app-olsr/po/pl/olsr.po @@ -331,7 +331,7 @@ msgstr "Poziom LQ" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/pt-br/olsr.po b/applications/luci-app-olsr/po/pt-br/olsr.po index 499176c16b..6097093e7f 100644 --- a/applications/luci-app-olsr/po/pt-br/olsr.po +++ b/applications/luci-app-olsr/po/pt-br/olsr.po @@ -379,7 +379,7 @@ msgstr "Nível <abbr title=\"Link Quality, Qualidade do Enlace\">LQ</abbr>" # 20140621: edersg: tradução msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" "LQMult exige dois valores (endereço IP ou 'padrão' e multiplicador) " "separados por espaços." diff --git a/applications/luci-app-olsr/po/pt/olsr.po b/applications/luci-app-olsr/po/pt/olsr.po index 4e04248f5b..e1ab725013 100644 --- a/applications/luci-app-olsr/po/pt/olsr.po +++ b/applications/luci-app-olsr/po/pt/olsr.po @@ -311,7 +311,7 @@ msgstr "Nível LQ" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/ro/olsr.po b/applications/luci-app-olsr/po/ro/olsr.po index 257fab3733..87cea095bf 100644 --- a/applications/luci-app-olsr/po/ro/olsr.po +++ b/applications/luci-app-olsr/po/ro/olsr.po @@ -300,7 +300,7 @@ msgstr "Nivel LQ" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/ru/olsr.po b/applications/luci-app-olsr/po/ru/olsr.po index 453454ca64..df59afa02a 100644 --- a/applications/luci-app-olsr/po/ru/olsr.po +++ b/applications/luci-app-olsr/po/ru/olsr.po @@ -353,7 +353,7 @@ msgstr "LQ частота" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" "LQMult требует двух значений (IP-адрес или 'default' и множитель), " "разделенных пробелом." diff --git a/applications/luci-app-olsr/po/sk/olsr.po b/applications/luci-app-olsr/po/sk/olsr.po index fdd37e3aff..2016a0a5a3 100644 --- a/applications/luci-app-olsr/po/sk/olsr.po +++ b/applications/luci-app-olsr/po/sk/olsr.po @@ -296,7 +296,7 @@ msgstr "" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/sv/olsr.po b/applications/luci-app-olsr/po/sv/olsr.po index adf690c3ac..f4c8381dd5 100644 --- a/applications/luci-app-olsr/po/sv/olsr.po +++ b/applications/luci-app-olsr/po/sv/olsr.po @@ -299,7 +299,7 @@ msgstr "LQ-nivå" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/templates/olsr.pot b/applications/luci-app-olsr/po/templates/olsr.pot index 6bd63c2a2a..a65c5d0986 100644 --- a/applications/luci-app-olsr/po/templates/olsr.pot +++ b/applications/luci-app-olsr/po/templates/olsr.pot @@ -289,7 +289,7 @@ msgstr "" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/tr/olsr.po b/applications/luci-app-olsr/po/tr/olsr.po index 18641896de..d67e6685fe 100644 --- a/applications/luci-app-olsr/po/tr/olsr.po +++ b/applications/luci-app-olsr/po/tr/olsr.po @@ -296,7 +296,7 @@ msgstr "" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/uk/olsr.po b/applications/luci-app-olsr/po/uk/olsr.po index d35fe31737..603abe98ff 100644 --- a/applications/luci-app-olsr/po/uk/olsr.po +++ b/applications/luci-app-olsr/po/uk/olsr.po @@ -297,7 +297,7 @@ msgstr "" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/vi/olsr.po b/applications/luci-app-olsr/po/vi/olsr.po index 698e5288e2..8a27dda67c 100644 --- a/applications/luci-app-olsr/po/vi/olsr.po +++ b/applications/luci-app-olsr/po/vi/olsr.po @@ -303,7 +303,7 @@ msgstr "LQ level" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." +"separated by space." msgstr "" msgid "Last hop" diff --git a/applications/luci-app-olsr/po/zh-cn/olsr.po b/applications/luci-app-olsr/po/zh-cn/olsr.po index 37264f584a..dcb55ba0e8 100644 --- a/applications/luci-app-olsr/po/zh-cn/olsr.po +++ b/applications/luci-app-olsr/po/zh-cn/olsr.po @@ -1,45 +1,48 @@ +# +# Yangfl <mmyangfl@gmail.com>, 2018. +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2013-10-10 20:26+0200\n" -"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n" -"Language-Team: none\n" +"PO-Revision-Date: 2018-10-01 11:10+0800\n" +"Last-Translator: Yangfl <mmyangfl@gmail.com>\n" +"Language-Team: <debian-l10n-chinese@lists.debian.org>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.6\n" +"X-Generator: Gtranslator 2.91.7\n" msgid "Active MID announcements" -msgstr "" +msgstr "活动的 MID 通告" msgid "Active OLSR nodes" -msgstr "" +msgstr "活动的 OLSR 节点" msgid "Active host net announcements" -msgstr "" +msgstr "活动的主机网络通告" msgid "Advanced Settings" msgstr "高级设置" msgid "Allow gateways with NAT" -msgstr "允许网关使用NAT" +msgstr "允许带 NAT 的网关" msgid "Allow the selection of an outgoing ipv4 gateway with NAT" -msgstr "允许选定的IPv4通过网关NAT" +msgstr "允许选择有 NAT 的 IPv4 网关" msgid "Announce uplink" -msgstr "广告上行" +msgstr "通告上行链接" msgid "Announced network" -msgstr "广告网络" +msgstr "通告的网络" msgid "Bad (ETX > 10)" -msgstr "" +msgstr "差（ETX > 10）" msgid "Bad (SNR < 5)" -msgstr "" +msgstr "差（SNR < 5）" msgid "Both values must use the dotted decimal notation." msgstr "两个值必须使用点分十进制表示法。" @@ -48,10 +51,10 @@ msgid "Broadcast address" msgstr "广播地址" msgid "Can only be a valid IPv4 or IPv6 address or 'default'" -msgstr "" +msgstr "必须是有效的 IPv4 或 IPv6 地址，或“默认”" msgid "Can only be a valid IPv6 address or 'default'" -msgstr "" +msgstr "必须是有效的 IPv6 地址，或“默认”" msgid "Configuration" msgstr "配置" @@ -60,12 +63,13 @@ msgid "" "Could not get any data. Make sure the jsoninfo plugin is installed and " "allows connections from localhost." msgstr "" +"无法获取任何数据。确保已安装 jsoninfo 插件，并允许来自 localhost 的连接。" msgid "Display" msgstr "显示" msgid "Downlink" -msgstr "断线" +msgstr "下行链接" msgid "Download Config" msgstr "下载配置" @@ -74,25 +78,26 @@ msgid "ETX" msgstr "ETX" msgid "Enable" -msgstr "允许" +msgstr "启用" msgid "" "Enable SmartGateway. If it is disabled, then all other SmartGateway " "parameters are ignored. Default is \"no\"." msgstr "" -"启用SmartGateway。如果禁用，则SmartGateway其他所有参数将忽略。缺省值：“禁用”" +"启用 SmartGateway。如果禁用，则将忽略 SmartGateway 的其他所有参数。缺省" +"值：“no”" msgid "Enable this interface." msgstr "启用这个端口" msgid "Enabled" -msgstr "启用" +msgstr "已启用" msgid "Expected retransmission count" msgstr "预期重发数" msgid "FIB metric" -msgstr "FIB度量" +msgstr "FIB 度量" msgid "" "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" " @@ -102,58 +107,61 @@ msgid "" "value too, but does only update the hopcount if the nexthop changes too. " "Default is \"flat\"." msgstr "" +"FIBMetric 控制主机路由 OLSRd 集的度量标准值。“flat”表示度量值始终为2。这是首" +"选值，因为它有助于 linux 内核清理旧路由。“correct”使用 hopcount 作为度量" +"值。“approx”也使用 hopcount 作为度量值，但只有在下一次更改时才更新 hopcount。" +"默认为“flat”。" msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\"" -msgstr "" +msgstr "TC 的鱼眼机制（校验和开启）。默认为“开启”" msgid "Gateway" msgstr "网关" msgid "General Settings" -msgstr "通用设置" +msgstr "一般设置" msgid "General settings" -msgstr "通用设置" +msgstr "一般设置" msgid "Good (2 < ETX < 4)" -msgstr "" +msgstr "好（2 < ETX < 4）" msgid "Good (30 > SNR > 20)" -msgstr "" +msgstr "好（30 > SNR > 20）" msgid "Green" -msgstr "" +msgstr "绿" msgid "HNA" msgstr "HNA" msgid "HNA Announcements" -msgstr "HNA公告" +msgstr "HNA 通告" msgid "HNA interval" -msgstr "HNA间隙" +msgstr "HNA 间隔" msgid "HNA validity time" -msgstr "HNA有效时长" +msgstr "HNA 有效时长" -#, fuzzy msgid "HNA6 Announcements" -msgstr "HNA公告" +msgstr "HNA 通告" msgid "Hello" msgstr "Hello" msgid "Hello interval" -msgstr "Hello间隙" +msgstr "Hello 间隔" msgid "Hello validity time" -msgstr "Hello有效时长" +msgstr "Hello 有效时长" msgid "Hide IPv4" -msgstr "" +msgstr "隐藏 IPv4" msgid "Hide IPv6" -msgstr "" +msgstr "隐藏 IPv6" msgid "Hna4" msgstr "Hna4" @@ -162,7 +170,7 @@ msgid "Hna6" msgstr "Hna6" msgid "Hops" -msgstr "跳" +msgstr "跃点" msgid "Hostname" msgstr "主机名" @@ -170,73 +178,79 @@ msgstr "主机名" msgid "" "Hosts in a OLSR routed network can announce connecitivity to external " "networks using HNA messages." -msgstr "" +msgstr "OLSR 路由网络中的主机可以使用 HNA 消息通告与外部网络的连接。" msgid "" "Hosts in a OLSR routed network can announce connecitivity to external " "networks using HNA6 messages." -msgstr "" +msgstr "OLSR 路由网络中的主机可以使用 HNA6 消息通告与外部网络的连接。" msgid "" "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more " "robustness to the link sensing but delays neighbor registration. Defaults is " "\"yes\"" msgstr "" +"滞后链路检测（仅适用于 hopcount 度量）。滞后增加了链路感测的健壮性，但延迟了" +"邻居注册过程。默认值为“是”" msgid "IP Addresses" -msgstr "IP地址" +msgstr "IP 地址" msgid "" "IP-version to use. If 6and4 is selected then one olsrd instance is started " "for each protocol." -msgstr "" +msgstr "要使用的 IP 版本。如果选择 6and4，则为每个协议启动一个 olsrd 实例。" msgid "IPv4" msgstr "IPv4" msgid "IPv4 broadcast" -msgstr "IPv4广播地址" +msgstr "IPv4 广播地址" msgid "" "IPv4 broadcast address for outgoing OLSR packets. One useful example would " "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the " "interface broadcast IP." msgstr "" +"传出 OLSR 数据包的 IPv4 广播地址。一个有用的例子是 255.255.255.255。默认" +"为“0.0.0.0”，将触发使用接口的 IP 广播地址。" msgid "IPv4 source" -msgstr "" +msgstr "IPv4 源地址" msgid "" "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which " "triggers usage of the interface IP." -msgstr "" +msgstr "传出 OLSR 包的 IPv4 源地址。默认为“0.0.0.0”，将触发使用接口的 IP。" msgid "IPv6" -msgstr "" +msgstr "IPv6" msgid "IPv6 multicast" -msgstr "" +msgstr "IPv6 组播地址" msgid "" "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal " "multicast." -msgstr "" +msgstr "IPv6 组播地址。默认为“FF02::6D”，即 manet-router 链路本地组播地址。" msgid "" "IPv6 network must be given in full notation, prefix must be in CIDR notation." -msgstr "" +msgstr "IPv6 网络必须完整表出，前缀必须是 CIDR 表示法。" msgid "IPv6 source" -msgstr "" +msgstr "IPv6 源地址" msgid "" "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches " "the prefix of this parameter. Default is \"0::/0\", which triggers the usage " "of a not-linklocal interface IP." msgstr "" +"IPv6 源前缀。OLSRd 将选择一个与此参数前缀匹配的接口 IP。默认为“0::/0”，触发使" +"用接口的非链路本地 IP。" msgid "IPv6-Prefix of the uplink" -msgstr "" +msgstr "IPv6 上行链路前缀" msgid "" "If the route to the current gateway is to be changed, the ETX value of this " @@ -245,82 +259,89 @@ msgid "" "if changed.<br /><b>WARNING:</b> This parameter should not be used together " "with the etx_ffeth metric!<br />Defaults to \"1.0\"." msgstr "" +"如果要更改到当前网关的路由，则在将该网关与新网关进行比较之前，将该网关的ETX值" +"乘以该值。参数可以是介于0.1和1.0之间的值，但如果更改则应接近1.0。<br /><b>警" +"告：</b>此参数不应与etx_ffeth指标一起使用！<br />默认值到“1.0”。" msgid "" "If this Node uses NAT for connections to the internet. Default is \"yes\"." -msgstr "" +msgstr "如果此节点使用 NAT 连接到互联网。默认为“是”。" msgid "Interface" -msgstr "" +msgstr "接口" msgid "" "Interface Mode is used to prevent unnecessary packet forwarding on switched " "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is " "\"mesh\"." msgstr "" +"接口模式用于防止以太网交换机接口上不必要的数据包转发。有效模式" +"是“mesh”和“ether”。默认为“mesh”。" msgid "Interfaces" -msgstr "" +msgstr "接口" msgid "Interfaces Defaults" -msgstr "" +msgstr "接口默认值" msgid "Internet protocol" -msgstr "" +msgstr "互联网协议" msgid "" "Interval to poll network interfaces for configuration changes (in seconds). " "Default is \"2.5\"." -msgstr "" +msgstr "轮询网络接口以进行配置更改的间隔（秒）。默认值为“2.5”。" msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0." -msgstr "" +msgstr "LQMult-Value 的值无效。必须介于0.01和1.0之间。" msgid "" "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 " "and 1.0 here." -msgstr "" +msgstr "LQMult-Value 的值无效。您必须在此处使用介于0.01和1.0之间的十进制数。" msgid "Known OLSR routes" -msgstr "" +msgstr "已知的 OLSR 路由" msgid "LQ" -msgstr "" +msgstr "LQ" msgid "LQ aging" -msgstr "" +msgstr "LQ 老化" msgid "LQ algorithm" -msgstr "" +msgstr "LQ 算法" msgid "LQ fisheye" -msgstr "" +msgstr "LQ 鱼眼" msgid "LQ level" -msgstr "" +msgstr "LQ 级别" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." -msgstr "" +"separated by space." +msgstr "LQMult 需要用空格分隔的两个值（IP 地址或“default”，加上乘数）。" msgid "Last hop" -msgstr "" +msgstr "最后一跳" msgid "Legend" -msgstr "" +msgstr "Legend" msgid "Library" -msgstr "" +msgstr "库" msgid "Link Quality Settings" -msgstr "" +msgstr "链接质量设置" msgid "" "Link quality aging factor (only for lq level 2). Tuning parameter for " "etx_float and etx_fpm, smaller values mean slower changes of ETX value. " "(allowed values are between 0.01 and 1.0)" msgstr "" +"链路质量老化因子（仅适用于 lq 级别2）。调整 etx_float 和 etx_fpm 的参数，值越" +"小意味着 ETX 值的变化越慢。（允许值介于0.01和1.0之间）" msgid "" "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: " @@ -330,50 +351,60 @@ msgid "" "calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that " "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\"" msgstr "" +"链路质量算法（仅适用于 lq 级别2）。<br /><b>etx_float</b>：浮点数 ETX，按指数" +"函数老化<br /><b>etx_fpm</b>：与etx_float 相同，但按整数算术<br /><b>etx_ff</" +"b>：ETX freifunk，一种使用所有 OLSR 流量（而不仅仅是 hello）进行 ETX 计算的 " +"etx 变体<br /><b>etx_ffeth</b>：不兼容的变体 etx_ff，允许以太网链接使用 ETX " +"0.1。<br />默认为“etx_ff”" msgid "" "Link quality level switch between hopcount and cost-based (mostly ETX) " "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link " "quality for MPR selection and routing<br />Default is \"2\"" msgstr "" +"在 hopcount 和基于代价（主要是 ETX）路由之间切换链接质量级别。<br /><b>0</b> " +"= 不使用链接质量<br /><b>2</b> = 使用链接质量进行 MPR 选择和路由<br />默认" +"为“2”" msgid "LinkQuality Multiplicator" -msgstr "" +msgstr "LinkQuality 乘数" msgid "Links per node (average)" -msgstr "" +msgstr "每个节点的链接数（平均）" msgid "Links total" -msgstr "" +msgstr "链接总数" msgid "Local interface IP" -msgstr "" +msgstr "本地接口 IP" msgid "MID" -msgstr "" +msgstr "MID" msgid "MID interval" -msgstr "" +msgstr "MID 间隔" msgid "MID validity time" -msgstr "" +msgstr "MID 有效期" msgid "MTU" -msgstr "" +msgstr "MTU" msgid "Main IP" -msgstr "" +msgstr "主要 IP" msgid "" "Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, " "configured on port 9090 and accepts connections from \"127.0.0.1\"." msgstr "" +"确保 OLSRd 正在运行，加载了“jsoninfo”插件，在端口9090上配置接受来" +"自“127.0.0.1”的连接。" msgid "Metric" -msgstr "" +msgstr "度量" msgid "Mode" -msgstr "" +msgstr "模式" msgid "" "Multiply routes with the factor given here. Allowed values are between 0.01 " @@ -381,6 +412,9 @@ msgid "" ">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all " "nodes on this interface by 20%: default 0.8" msgstr "" +"使用此处给出的因子放大路由 LQ。允许值介于0.01和1.0之间。它仅在 LQ-Level 大于0" +"时使用。示例：<br />将到 192.168.0.1 的 LQ 减半：192.168.0.1 0.5<br />将此接" +"口到所有节点的 LQ 减少20％：default 0.8" msgid "" "Multiply routes with the factor given here. Allowed values are between 0.01 " @@ -388,201 +422,211 @@ msgid "" ">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce " "LQ to all nodes on this interface by 20%: default 0.8" msgstr "" +"使用此处给出的因子放大路由 LQ。允许值介于0.01和1.0之间。它仅在 LQ-Level 大于0" +"时使用。示例：<br />将到 fd91:662e:3c58::1 的 LQ 减半：fd91:662e:3c58::1 " +"0.5<br />将此接口到所有节点的 LQ 减少20％：default 0.8" msgid "NAT threshold" -msgstr "" +msgstr "NAT 阈值" msgid "NLQ" -msgstr "" +msgstr "NLQ" msgid "Neighbors" -msgstr "" +msgstr "邻居" msgid "Neighbour IP" -msgstr "" +msgstr "邻居 IP" msgid "Neighbours" -msgstr "" +msgstr "邻居" msgid "Netmask" -msgstr "" +msgstr "子网掩码" msgid "Network" -msgstr "" +msgstr "网络" msgid "Network address" -msgstr "" +msgstr "网络地址" msgid "Nic changes poll interval" -msgstr "" +msgstr "Nic 更改轮询间隔" msgid "Nodes" -msgstr "" +msgstr "节点" msgid "OLSR" -msgstr "" +msgstr "OLSR" msgid "OLSR - Display Options" -msgstr "" +msgstr "OLSR - 显示选项" msgid "OLSR - HNA-Announcements" -msgstr "" +msgstr "OLSR - HNA-通告" -#, fuzzy msgid "OLSR - HNA6-Announcements" -msgstr "HNA公告" +msgstr "OLSR - HNA6-通告" msgid "OLSR - Plugins" -msgstr "" +msgstr "OLSR - 插件" msgid "OLSR Daemon" -msgstr "" +msgstr "OLSR 守护进程" msgid "OLSR Daemon - Interface" -msgstr "" +msgstr "OLSR 守护进程 - 接口" msgid "OLSR connections" -msgstr "" +msgstr "OLSR 连接" msgid "OLSR gateway" -msgstr "" +msgstr "OLSR 网关" msgid "OLSR node" -msgstr "" +msgstr "OLSR 节点" msgid "Orange" -msgstr "" +msgstr "橙色" msgid "Overview" -msgstr "" +msgstr "概览" msgid "Overview of currently active OLSR host net announcements" -msgstr "" +msgstr "当前活动的 OLSR 主机网络通告概览" msgid "Overview of currently established OLSR connections" -msgstr "" +msgstr "当前建立的 OLSR 连接概览" msgid "Overview of currently known OLSR nodes" -msgstr "" +msgstr "当前已知的 OLSR 节点概览" msgid "Overview of currently known routes to other OLSR nodes" -msgstr "" +msgstr "当前已知到其他 OLSR 节点的路由概览" msgid "Overview of interfaces where OLSR is running" -msgstr "" +msgstr "OLSR 正在运行的接口概览" msgid "Overview of known multiple interface announcements" -msgstr "" +msgstr "已知的多接口通告概览" msgid "Overview of smart gateways in this network" -msgstr "" +msgstr "此网络中的智能网关概览" msgid "Plugin configuration" -msgstr "" +msgstr "插件配置" msgid "Plugins" -msgstr "" +msgstr "插件" msgid "Polling rate for OLSR sockets in seconds. Default is 0.05." -msgstr "" +msgstr "OLSR 套接字的轮询速率，以秒为单位。默认值为0.05。" msgid "Pollrate" -msgstr "" +msgstr "轮询速率" msgid "Port" -msgstr "" +msgstr "端口" msgid "Prefix" -msgstr "" +msgstr "前缀" msgid "Red" -msgstr "" +msgstr "红色" msgid "Resolve" -msgstr "" +msgstr "解析" msgid "" "Resolve hostnames on status pages. It is generally safe to allow this, but " "if you use public IPs and have unstable DNS-Setup then those pages will load " "really slow. In this case disable it here." msgstr "" +"解析状态页面上的主机名。通常允许这样做是安全的，但如果您使用公共 IP，且具有不" +"稳定的 DNS 设置，则这些页面的加载速度会非常慢。这种情况下，在此禁用它。" msgid "Routes" -msgstr "" +msgstr "路由" msgid "Secondary OLSR interfaces" -msgstr "" +msgstr "辅助 OLSR 接口" msgid "" "Sets the main IP (originator ip) of the router. This IP will NEVER change " "during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the " "IP of the first interface." msgstr "" +"设置路由器的主 IP（发起方 IP）。在 olsrd 的正常运行时间内，此 IP 永远不会改" +"变。默认为 0.0.0.0，触发使用第一个接口的 IP。" msgid "" "Sets the main IP (originator ip) of the router. This IP will NEVER change " "during the uptime of olsrd. Default is ::, which triggers usage of the IP of " "the first interface." msgstr "" +"设置路由器的主 IP（发起方 IP）。在 olsrd 的正常运行时间内，此 IP 永远不会改" +"变。默认为 ::，触发使用第一个接口的 IP。" msgid "Show IPv4" -msgstr "" +msgstr "显示 IPv4" msgid "Show IPv6" -msgstr "" +msgstr "显示 IPv6" msgid "Signal Noise Ratio in dB" -msgstr "" +msgstr "信噪比（dB）" msgid "SmartGW" -msgstr "" +msgstr "SmartGW" msgid "SmartGW announcements" -msgstr "" +msgstr "SmartGW 通告" msgid "SmartGateway is not configured on this system." -msgstr "" +msgstr "此系统上未配置 SmartGateway。" msgid "Source address" -msgstr "" +msgstr "源地址" msgid "" "Specifies the speed of the uplink in kilobits/s. First parameter is " "upstream, second parameter is downstream. Default is \"128 1024\"." msgstr "" +"以千比特/秒为单位指定上行链路的速度。第一个参数是上传，第二个参数是下载。默认" +"值为“128 1024”。" msgid "Speed of the uplink" -msgstr "" +msgstr "上行链路的速度" msgid "State" -msgstr "" +msgstr "状态" msgid "Status" -msgstr "" +msgstr "状态" msgid "Still usable (20 > SNR > 5)" -msgstr "" +msgstr "仍可使用（20 > SNR > 5）" msgid "Still usable (4 < ETX < 10)" -msgstr "" +msgstr "仍可使用（4 < ETX < 10）" msgid "Success rate of packages received from the neighbour" -msgstr "" +msgstr "从邻居收包的成功率" msgid "Success rate of packages sent to the neighbour" -msgstr "" +msgstr "向邻居发包的成功率" msgid "TC" -msgstr "" +msgstr "TC" msgid "TC interval" -msgstr "" +msgstr "TC 间隔" msgid "TC validity time" -msgstr "" +msgstr "TC 有效时间" msgid "TOS value" -msgstr "" +msgstr "TOS 值" msgid "" "The OLSR daemon is an implementation of the Optimized Link State Routing " @@ -591,19 +635,27 @@ msgid "" "device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and " "documentation." msgstr "" +"OLSR 守护程序是优化链路状态路由（Optimized Link State Routing）协议的实现。因" +"此，它允许在任何网络设备上建立网状路由。它可以在支持 ad-hoc 模式的任何 wifi " +"卡上运行，当然也可以在任何以太网设备上运行。访问 <a href='http://www.olsr." +"org'>olsrd.org</a> 获取帮助和文档。" msgid "" "The fixed willingness to use. If not set willingness will be calculated " "dynamically based on battery/power status. Default is \"3\"." msgstr "" +"固定的使用意愿值。如果未设置，则将根据电池/电源状态动态计算意愿值。默认值" +"为“3”。" msgid "The interface OLSRd should serve." -msgstr "" +msgstr "OLSRd 应该服务的接口。" msgid "" "The port OLSR uses. This should usually stay at the IANA assigned port 698. " "It can have a value between 1 and 65535." msgstr "" +"OLSR 使用的端口。通常应使用 IANA 分配的保留端口698。它的值可以在1到65535之" +"间。" msgid "" "This can be used to signal the external IPv6 prefix of the uplink to the " @@ -611,52 +663,57 @@ msgid "" "the IPv6 gateway without any kind of address translation. The maximum prefix " "length is 64 bits. Default is \"::/0\" (no prefix)." msgstr "" +"这可用于向客户端通知上行链路的外部 IPv6 前缀。这可能可使客户端更改其本地 " +"IPv6 地址，以使用 IPv6 网关，而无需任何类型的地址转换。前缀长度最大为64位。默" +"认为“::/0”（无前缀）。" msgid "Timing and Validity" -msgstr "" +msgstr "时间和有效性" msgid "Topology" -msgstr "" +msgstr "拓扑" msgid "" "Type of service value for the IP header of control traffic. Default is " "\"16\"." -msgstr "" +msgstr "IP 流量控制头的服务类型值。默认值为“16”。" msgid "Unable to connect to the OLSR daemon!" -msgstr "" +msgstr "无法连接到 OLSR 守护程序！" msgid "Uplink" -msgstr "" +msgstr "上行链接" msgid "Uplink uses NAT" -msgstr "" +msgstr "上行链接使用 NAT" msgid "Use hysteresis" -msgstr "" +msgstr "使用滞后" msgid "Validity Time" -msgstr "" +msgstr "有效时间" msgid "Version" -msgstr "" +msgstr "版本" msgid "Very good (ETX < 2)" -msgstr "" +msgstr "非常好（ETX < 2）" msgid "Very good (SNR > 30)" -msgstr "" +msgstr "非常好（SNR > 30）" msgid "WLAN" -msgstr "" +msgstr "WLAN" msgid "" "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not " "work, please install it." msgstr "" +"警告：未安装 kmod-ipip。没有 kmod-ipip，SmartGateway 将无法正常工作，请安装" +"它。" msgid "Weight" -msgstr "" +msgstr "体重" msgid "" "When multiple links exist between hosts the weight of interface is used to " @@ -667,30 +724,38 @@ msgid "" "0. For any other value of LinkQualityLevel, the interface ETX value is used " "instead." msgstr "" +"当主机之间存在多个链路时，接口权重用于确定要使用的链路。通常，权重由 olsrd 根" +"据接口的特性自动计算，但您可以在此处指定固定值。Olsrd 将选择值最低的链接。" +"<br /><b>注意：</b>仅当 LinkQualityLevel 设置为0时才使用接口权重。" +"LinkQualityLevel 的任何其他值都将使用接口的 ETX 值。" msgid "" "Which kind of uplink is exported to the other mesh nodes. An uplink is " "detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. " "Default setting is \"both\"." msgstr "" +"将导出哪种上行链路到其他网状节点。通过查找本地 HNA 0.0.0.0/0、::ffff:0:0/96 " +"或 2000::/3 来检测上行链路。默认设置为“两者”。" msgid "" "Which kind of uplink is exported to the other mesh nodes. An uplink is " "detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default " "setting is \"both\"." msgstr "" +"将导出哪种上行链路到其他网状节点。通过查找本地 HNA6 ::ffff:0:0/96 或 " +"2000::/3 来检测上行链路。默认设置为“两者”。" msgid "Willingness" -msgstr "" +msgstr "意愿值" msgid "Yellow" -msgstr "" +msgstr "黄色" msgid "no" -msgstr "" +msgstr "否" msgid "yes" -msgstr "" +msgstr "是" #~ msgid "Device" #~ msgstr "设备" diff --git a/applications/luci-app-olsr/po/zh-tw/olsr.po b/applications/luci-app-olsr/po/zh-tw/olsr.po index 797874d8f1..749026585c 100644 --- a/applications/luci-app-olsr/po/zh-tw/olsr.po +++ b/applications/luci-app-olsr/po/zh-tw/olsr.po @@ -1,77 +1,81 @@ +# +# Yangfl <mmyangfl@gmail.com>, 2018. +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2014-05-15 07:15+0200\n" -"Last-Translator: omnistack <omnistack@gmail.com>\n" -"Language-Team: none\n" +"PO-Revision-Date: 2018-10-01 11:10+0800\n" +"Last-Translator: Yangfl <mmyangfl@gmail.com>\n" +"Language-Team: <debian-l10n-chinese@lists.debian.org>\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.6\n" +"X-Generator: Gtranslator 2.91.7\n" msgid "Active MID announcements" -msgstr "啟用Mesh網狀網路ID公告" +msgstr "活動的 MID 通告" msgid "Active OLSR nodes" -msgstr "啟用OLSR路由協議節點" +msgstr "活動的 OLSR 節點" msgid "Active host net announcements" -msgstr "啟用主機網路公告" +msgstr "活動的主機網路通告" msgid "Advanced Settings" msgstr "進階設定" msgid "Allow gateways with NAT" -msgstr "允許帶NAT的匝道器" +msgstr "允許帶 NAT 的閘道器" msgid "Allow the selection of an outgoing ipv4 gateway with NAT" -msgstr "允許帶NAT的匝道器選擇輸出ipv4封包" +msgstr "允許選擇有 NAT 的 IPv4 閘道器" msgid "Announce uplink" -msgstr "公告上傳" +msgstr "通告上行連結" msgid "Announced network" -msgstr "公告網路" +msgstr "通告的網路" msgid "Bad (ETX > 10)" -msgstr "" +msgstr "差（ETX > 10）" msgid "Bad (SNR < 5)" -msgstr "" +msgstr "差（SNR < 5）" msgid "Both values must use the dotted decimal notation." -msgstr "這兩個值都必須採用點分十進位制格式" +msgstr "兩個值必須使用點分十進位制表示法。" msgid "Broadcast address" msgstr "廣播位址" msgid "Can only be a valid IPv4 or IPv6 address or 'default'" -msgstr "" +msgstr "必須是有效的 IPv4 或 IPv6 位址，或“預設”" msgid "Can only be a valid IPv6 address or 'default'" -msgstr "" +msgstr "必須是有效的 IPv6 位址，或“預設”" msgid "Configuration" -msgstr "設定" +msgstr "配置" msgid "" "Could not get any data. Make sure the jsoninfo plugin is installed and " "allows connections from localhost." msgstr "" +"無法獲取任何資料。確保已安裝 jsoninfo 外掛，並允許來自 localhost 的連線。" msgid "Display" msgstr "顯示" msgid "Downlink" -msgstr "下行" +msgstr "下行連結" msgid "Download Config" -msgstr "下載設置" +msgstr "下載配置" msgid "ETX" -msgstr "" +msgstr "ETX" msgid "Enable" msgstr "啟用" @@ -80,20 +84,20 @@ msgid "" "Enable SmartGateway. If it is disabled, then all other SmartGateway " "parameters are ignored. Default is \"no\"." msgstr "" -"啟用機動式匝道器. 假如它失效, 其它所有機動式匝道器參數將被忽視. 預設值是\"no" -"\"" +"啟用 SmartGateway。如果禁用，則將忽略 SmartGateway 的其他所有引數。預設" +"值：“no”" msgid "Enable this interface." -msgstr "啟用這個介面" +msgstr "啟用這個埠" msgid "Enabled" -msgstr "啟用" +msgstr "已啟用" msgid "Expected retransmission count" -msgstr "預計重傳次數" +msgstr "預期重發數" msgid "FIB metric" -msgstr "FIB指標" +msgstr "FIB 度量" msgid "" "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" " @@ -103,16 +107,16 @@ msgid "" "value too, but does only update the hopcount if the nexthop changes too. " "Default is \"flat\"." msgstr "" -"FIBMetric控制OLSR主機路由的公用路由計量設定. \"flat\" 代表是公用計量數永遠是" -"2. 這是較受歡迎的數值, 因為它會協助linux核心路由清除舊的路由表. \"correct\"使" -"用跳躍數當作公用路由計量. \"approx\"也使用跳躍數當作公用路由計量, 但只作用在" -"跳躍數也更新時. 預設值是\"flat\"." +"FIBMetric 控制主機路由 OLSRd 集的度量標準值。“flat”表示度量值始終為2。這是首" +"選值，因為它有助於 linux 核心清理舊路由。“correct”使用 hopcount 作為度量" +"值。“approx”也使用 hopcount 作為度量值，但只有在下一次更改時才更新 hopcount。" +"預設為“flat”。" msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\"" -msgstr "" +msgstr "TC 的魚眼機制（校驗和開啟）。預設為“開啟”" msgid "Gateway" -msgstr "匝道器" +msgstr "閘道器" msgid "General Settings" msgstr "一般設定" @@ -121,127 +125,132 @@ msgid "General settings" msgstr "一般設定" msgid "Good (2 < ETX < 4)" -msgstr "" +msgstr "好（2 < ETX < 4）" msgid "Good (30 > SNR > 20)" -msgstr "" +msgstr "好（30 > SNR > 20）" msgid "Green" -msgstr "" +msgstr "綠" msgid "HNA" -msgstr "" +msgstr "HNA" msgid "HNA Announcements" -msgstr "" +msgstr "HNA 通告" msgid "HNA interval" -msgstr "" +msgstr "HNA 間隔" msgid "HNA validity time" -msgstr "" +msgstr "HNA 有效時長" -#, fuzzy msgid "HNA6 Announcements" -msgstr "啟用Mesh網狀網路ID公告" +msgstr "HNA 通告" msgid "Hello" -msgstr "" +msgstr "Hello" msgid "Hello interval" -msgstr "" +msgstr "Hello 間隔" msgid "Hello validity time" -msgstr "" +msgstr "Hello 有效時長" msgid "Hide IPv4" -msgstr "" +msgstr "隱藏 IPv4" msgid "Hide IPv6" -msgstr "" +msgstr "隱藏 IPv6" msgid "Hna4" -msgstr "" +msgstr "Hna4" msgid "Hna6" -msgstr "" +msgstr "Hna6" msgid "Hops" -msgstr "" +msgstr "躍點" msgid "Hostname" -msgstr "" +msgstr "主機名" msgid "" "Hosts in a OLSR routed network can announce connecitivity to external " "networks using HNA messages." -msgstr "" +msgstr "OLSR 路由網路中的主機可以使用 HNA 訊息通告與外部網路的連線。" msgid "" "Hosts in a OLSR routed network can announce connecitivity to external " "networks using HNA6 messages." -msgstr "" +msgstr "OLSR 路由網路中的主機可以使用 HNA6 訊息通告與外部網路的連線。" msgid "" "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more " "robustness to the link sensing but delays neighbor registration. Defaults is " "\"yes\"" msgstr "" +"滯後鏈路檢測（僅適用於 hopcount 度量）。滯後增加了鏈路感測的健壯性，但延遲了" +"鄰居註冊過程。預設值為“是”" msgid "IP Addresses" -msgstr "" +msgstr "IP 位址" msgid "" "IP-version to use. If 6and4 is selected then one olsrd instance is started " "for each protocol." -msgstr "" +msgstr "要使用的 IP 版本。如果選擇 6and4，則為每個協議啟動一個 olsrd 例項。" msgid "IPv4" -msgstr "" +msgstr "IPv4" msgid "IPv4 broadcast" -msgstr "" +msgstr "IPv4 廣播位址" msgid "" "IPv4 broadcast address for outgoing OLSR packets. One useful example would " "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the " "interface broadcast IP." msgstr "" +"傳出 OLSR 資料包的 IPv4 廣播位址。一個有用的例子是 255.255.255.255。預設" +"為“0.0.0.0”，將觸發使用介面的 IP 廣播位址。" msgid "IPv4 source" -msgstr "" +msgstr "IPv4 源位址" msgid "" "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which " "triggers usage of the interface IP." -msgstr "" +msgstr "傳出 OLSR 包的 IPv4 源位址。預設為“0.0.0.0”，將觸發使用介面的 IP。" msgid "IPv6" -msgstr "" +msgstr "IPv6" msgid "IPv6 multicast" -msgstr "" +msgstr "IPv6 組播位址" msgid "" "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal " "multicast." -msgstr "" +msgstr "IPv6 組播位址。預設為“FF02::6D”，即 manet-router 鏈路本地組播位址。" msgid "" "IPv6 network must be given in full notation, prefix must be in CIDR notation." -msgstr "" +msgstr "IPv6 網路必須完整表出，字首必須是 CIDR 表示法。" msgid "IPv6 source" -msgstr "" +msgstr "IPv6 源位址" msgid "" "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches " "the prefix of this parameter. Default is \"0::/0\", which triggers the usage " "of a not-linklocal interface IP." msgstr "" +"IPv6 源字首。OLSRd 將選擇一個與此引數字首匹配的介面 IP。預設為“0::/0”，觸發使" +"用介面的非鏈路本地 IP。" msgid "IPv6-Prefix of the uplink" -msgstr "" +msgstr "IPv6 上行鏈路字首" msgid "" "If the route to the current gateway is to be changed, the ETX value of this " @@ -250,82 +259,89 @@ msgid "" "if changed.<br /><b>WARNING:</b> This parameter should not be used together " "with the etx_ffeth metric!<br />Defaults to \"1.0\"." msgstr "" +"如果要更改到當前閘道器的路由，則在將該閘道器與新閘道器進行比較之前，將該閘道" +"器的ETX值乘以該值。引數可以是介於0.1和1.0之間的值，但如果更改則應接近1.0。" +"<br /><b>警告：</b>此引數不應與etx_ffeth指標一起使用！<br />預設值到“1.0”。" msgid "" "If this Node uses NAT for connections to the internet. Default is \"yes\"." -msgstr "" +msgstr "如果此節點使用 NAT 連線到網際網路。預設為“是”。" msgid "Interface" -msgstr "" +msgstr "介面" msgid "" "Interface Mode is used to prevent unnecessary packet forwarding on switched " "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is " "\"mesh\"." msgstr "" +"介面模式用於防止乙太網交換機介面上不必要的資料包轉發。有效模式" +"是“mesh”和“ether”。預設為“mesh”。" msgid "Interfaces" -msgstr "" +msgstr "介面" msgid "Interfaces Defaults" -msgstr "" +msgstr "介面預設值" msgid "Internet protocol" -msgstr "" +msgstr "網際網路協議" msgid "" "Interval to poll network interfaces for configuration changes (in seconds). " "Default is \"2.5\"." -msgstr "" +msgstr "輪詢網路介面以進行配置更改的間隔（秒）。預設值為“2.5”。" msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0." -msgstr "" +msgstr "LQMult-Value 的值無效。必須介於0.01和1.0之間。" msgid "" "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 " "and 1.0 here." -msgstr "" +msgstr "LQMult-Value 的值無效。您必須在此處使用介於0.01和1.0之間的十進位制數。" msgid "Known OLSR routes" -msgstr "" +msgstr "已知的 OLSR 路由" msgid "LQ" -msgstr "" +msgstr "LQ" msgid "LQ aging" -msgstr "" +msgstr "LQ 老化" msgid "LQ algorithm" -msgstr "" +msgstr "LQ 演算法" msgid "LQ fisheye" -msgstr "" +msgstr "LQ 魚眼" msgid "LQ level" -msgstr "" +msgstr "LQ 級別" msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " -"seperated by space." -msgstr "" +"separated by space." +msgstr "LQMult 需要用空格分隔的兩個值（IP 位址或“default”，加上乘數）。" msgid "Last hop" -msgstr "" +msgstr "最後一跳" msgid "Legend" -msgstr "" +msgstr "Legend" msgid "Library" -msgstr "" +msgstr "庫" msgid "Link Quality Settings" -msgstr "" +msgstr "連結質量設定" msgid "" "Link quality aging factor (only for lq level 2). Tuning parameter for " "etx_float and etx_fpm, smaller values mean slower changes of ETX value. " "(allowed values are between 0.01 and 1.0)" msgstr "" +"鏈路質量老化因子（僅適用於 lq 級別2）。調整 etx_float 和 etx_fpm 的引數，值越" +"小意味著 ETX 值的變化越慢。（允許值介於0.01和1.0之間）" msgid "" "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: " @@ -335,50 +351,60 @@ msgid "" "calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that " "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\"" msgstr "" +"鏈路質量演算法（僅適用於 lq 級別2）。<br /><b>etx_float</b>：浮點數 ETX，按指" +"數函式老化<br /><b>etx_fpm</b>：與etx_float 相同，但按整數算術<br /" +"><b>etx_ff</b>：ETX freifunk，一種使用所有 OLSR 流量（而不僅僅是 hello）進行 " +"ETX 計算的 etx 變體<br /><b>etx_ffeth</b>：不相容的變體 etx_ff，允許乙太網連" +"結使用 ETX 0.1。<br />預設為“etx_ff”" msgid "" "Link quality level switch between hopcount and cost-based (mostly ETX) " "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link " "quality for MPR selection and routing<br />Default is \"2\"" msgstr "" +"在 hopcount 和基於代價（主要是 ETX）路由之間切換連結質量級別。<br /><b>0</b> " +"= 不使用連結質量<br /><b>2</b> = 使用連結質量進行 MPR 選擇和路由<br />預設" +"為“2”" msgid "LinkQuality Multiplicator" -msgstr "" +msgstr "LinkQuality 乘數" msgid "Links per node (average)" -msgstr "" +msgstr "每個節點的連結數（平均）" msgid "Links total" -msgstr "" +msgstr "連結總數" msgid "Local interface IP" -msgstr "" +msgstr "本地介面 IP" msgid "MID" -msgstr "" +msgstr "MID" msgid "MID interval" -msgstr "" +msgstr "MID 間隔" msgid "MID validity time" -msgstr "" +msgstr "MID 有效期" msgid "MTU" -msgstr "" +msgstr "MTU" msgid "Main IP" -msgstr "" +msgstr "主要 IP" msgid "" "Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, " "configured on port 9090 and accepts connections from \"127.0.0.1\"." msgstr "" +"確保 OLSRd 正在執行，載入了“jsoninfo”外掛，在埠9090上配置接受來" +"自“127.0.0.1”的連線。" msgid "Metric" -msgstr "" +msgstr "度量" msgid "Mode" -msgstr "" +msgstr "模式" msgid "" "Multiply routes with the factor given here. Allowed values are between 0.01 " @@ -386,6 +412,9 @@ msgid "" ">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all " "nodes on this interface by 20%: default 0.8" msgstr "" +"使用此處給出的因子放大路由 LQ。允許值介於0.01和1.0之間。它僅在 LQ-Level 大於0" +"時使用。示例：<br />將到 192.168.0.1 的 LQ 減半：192.168.0.1 0.5<br />將此接" +"口到所有節點的 LQ 減少20％：default 0.8" msgid "" "Multiply routes with the factor given here. Allowed values are between 0.01 " @@ -393,200 +422,211 @@ msgid "" ">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce " "LQ to all nodes on this interface by 20%: default 0.8" msgstr "" +"使用此處給出的因子放大路由 LQ。允許值介於0.01和1.0之間。它僅在 LQ-Level 大於0" +"時使用。示例：<br />將到 fd91:662e:3c58::1 的 LQ 減半：fd91:662e:3c58::1 " +"0.5<br />將此介面到所有節點的 LQ 減少20％：default 0.8" msgid "NAT threshold" -msgstr "" +msgstr "NAT 閾值" msgid "NLQ" -msgstr "" +msgstr "NLQ" msgid "Neighbors" -msgstr "" +msgstr "鄰居" msgid "Neighbour IP" -msgstr "" +msgstr "鄰居 IP" msgid "Neighbours" -msgstr "" +msgstr "鄰居" msgid "Netmask" -msgstr "" +msgstr "子網掩碼" msgid "Network" -msgstr "" +msgstr "網路" msgid "Network address" -msgstr "" +msgstr "網路位址" msgid "Nic changes poll interval" -msgstr "" +msgstr "Nic 更改輪詢間隔" msgid "Nodes" -msgstr "" +msgstr "節點" msgid "OLSR" -msgstr "" +msgstr "OLSR" msgid "OLSR - Display Options" -msgstr "" +msgstr "OLSR - 顯示選項" msgid "OLSR - HNA-Announcements" -msgstr "" +msgstr "OLSR - HNA-通告" msgid "OLSR - HNA6-Announcements" -msgstr "" +msgstr "OLSR - HNA6-通告" msgid "OLSR - Plugins" -msgstr "" +msgstr "OLSR - 外掛" msgid "OLSR Daemon" -msgstr "" +msgstr "OLSR 守護程序" msgid "OLSR Daemon - Interface" -msgstr "" +msgstr "OLSR 守護程序 - 介面" msgid "OLSR connections" -msgstr "" +msgstr "OLSR 連線" msgid "OLSR gateway" -msgstr "" +msgstr "OLSR 閘道器" msgid "OLSR node" -msgstr "" +msgstr "OLSR 節點" msgid "Orange" -msgstr "" +msgstr "橙色" msgid "Overview" -msgstr "" +msgstr "概覽" msgid "Overview of currently active OLSR host net announcements" -msgstr "" +msgstr "當前活動的 OLSR 主機網路通告概覽" msgid "Overview of currently established OLSR connections" -msgstr "" +msgstr "當前建立的 OLSR 連線概覽" msgid "Overview of currently known OLSR nodes" -msgstr "" +msgstr "當前已知的 OLSR 節點概覽" msgid "Overview of currently known routes to other OLSR nodes" -msgstr "" +msgstr "當前已知到其他 OLSR 節點的路由概覽" msgid "Overview of interfaces where OLSR is running" -msgstr "" +msgstr "OLSR 正在執行的介面概覽" msgid "Overview of known multiple interface announcements" -msgstr "" +msgstr "已知的多介面通告概覽" msgid "Overview of smart gateways in this network" -msgstr "" +msgstr "此網路中的智慧閘道器概覽" msgid "Plugin configuration" -msgstr "" +msgstr "外掛配置" msgid "Plugins" -msgstr "" +msgstr "外掛" msgid "Polling rate for OLSR sockets in seconds. Default is 0.05." -msgstr "" +msgstr "OLSR 套接字的輪詢速率，以秒為單位。預設值為0.05。" msgid "Pollrate" -msgstr "" +msgstr "輪詢速率" msgid "Port" -msgstr "" +msgstr "埠" msgid "Prefix" -msgstr "" +msgstr "字首" msgid "Red" -msgstr "" +msgstr "紅色" msgid "Resolve" -msgstr "" +msgstr "解析" msgid "" "Resolve hostnames on status pages. It is generally safe to allow this, but " "if you use public IPs and have unstable DNS-Setup then those pages will load " "really slow. In this case disable it here." msgstr "" +"解析狀態頁面上的主機名。通常允許這樣做是安全的，但如果您使用公共 IP，且具有不" +"穩定的 DNS 設定，則這些頁面的載入速度會非常慢。這種情況下，在此禁用它。" msgid "Routes" -msgstr "" +msgstr "路由" msgid "Secondary OLSR interfaces" -msgstr "" +msgstr "輔助 OLSR 介面" msgid "" "Sets the main IP (originator ip) of the router. This IP will NEVER change " "during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the " "IP of the first interface." msgstr "" +"設定路由器的主 IP（發起方 IP）。在 olsrd 的正常執行時間內，此 IP 永遠不會改" +"變。預設為 0.0.0.0，觸發使用第一個介面的 IP。" msgid "" "Sets the main IP (originator ip) of the router. This IP will NEVER change " "during the uptime of olsrd. Default is ::, which triggers usage of the IP of " "the first interface." msgstr "" +"設定路由器的主 IP（發起方 IP）。在 olsrd 的正常執行時間內，此 IP 永遠不會改" +"變。預設為 ::，觸發使用第一個介面的 IP。" msgid "Show IPv4" -msgstr "" +msgstr "顯示 IPv4" msgid "Show IPv6" -msgstr "" +msgstr "顯示 IPv6" msgid "Signal Noise Ratio in dB" -msgstr "" +msgstr "信噪比（dB）" msgid "SmartGW" -msgstr "" +msgstr "SmartGW" msgid "SmartGW announcements" -msgstr "" +msgstr "SmartGW 通告" msgid "SmartGateway is not configured on this system." -msgstr "" +msgstr "此係統上未配置 SmartGateway。" msgid "Source address" -msgstr "" +msgstr "源位址" msgid "" "Specifies the speed of the uplink in kilobits/s. First parameter is " "upstream, second parameter is downstream. Default is \"128 1024\"." msgstr "" +"以千位元/秒為單位指定上行鏈路的速度。第一個引數是上傳，第二個引數是下載。預設" +"值為“128 1024”。" msgid "Speed of the uplink" -msgstr "" +msgstr "上行鏈路的速度" msgid "State" -msgstr "" +msgstr "狀態" msgid "Status" -msgstr "" +msgstr "狀態" msgid "Still usable (20 > SNR > 5)" -msgstr "" +msgstr "仍可使用（20 > SNR > 5）" msgid "Still usable (4 < ETX < 10)" -msgstr "" +msgstr "仍可使用（4 < ETX < 10）" msgid "Success rate of packages received from the neighbour" -msgstr "" +msgstr "從鄰居收包的成功率" msgid "Success rate of packages sent to the neighbour" -msgstr "" +msgstr "向鄰居發包的成功率" msgid "TC" -msgstr "" +msgstr "TC" msgid "TC interval" -msgstr "" +msgstr "TC 間隔" msgid "TC validity time" -msgstr "" +msgstr "TC 有效時間" msgid "TOS value" -msgstr "" +msgstr "TOS 值" msgid "" "The OLSR daemon is an implementation of the Optimized Link State Routing " @@ -595,19 +635,26 @@ msgid "" "device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and " "documentation." msgstr "" +"OLSR 守護程式是優化鏈路狀態路由（Optimized Link State Routing）協議的實現。因" +"此，它允許在任何網路裝置上建立網狀路由。它可以在支援 ad-hoc 模式的任何 wifi " +"卡上執行，當然也可以在任何乙太網裝置上執行。訪問 <a href='http://www.olsr." +"org'>olsrd.org</a> 獲取幫助和文件。" msgid "" "The fixed willingness to use. If not set willingness will be calculated " "dynamically based on battery/power status. Default is \"3\"." msgstr "" +"固定的使用意願值。如果未設定，則將根據電池/電源狀態動態計算意願值。預設值" +"為“3”。" msgid "The interface OLSRd should serve." -msgstr "" +msgstr "OLSRd 應該服務的介面。" msgid "" "The port OLSR uses. This should usually stay at the IANA assigned port 698. " "It can have a value between 1 and 65535." msgstr "" +"OLSR 使用的埠。通常應使用 IANA 分配的保留埠698。它的值可以在1到65535之間。" msgid "" "This can be used to signal the external IPv6 prefix of the uplink to the " @@ -615,52 +662,57 @@ msgid "" "the IPv6 gateway without any kind of address translation. The maximum prefix " "length is 64 bits. Default is \"::/0\" (no prefix)." msgstr "" +"這可用於向客戶端通知上行鏈路的外部 IPv6 字首。這可能可使客戶端更改其本地 " +"IPv6 位址，以使用 IPv6 閘道器，而無需任何型別的位址轉換。字首長度最大為64位。" +"默認為“::/0”（無字首）。" msgid "Timing and Validity" -msgstr "" +msgstr "時間和有效性" msgid "Topology" -msgstr "" +msgstr "拓撲" msgid "" "Type of service value for the IP header of control traffic. Default is " "\"16\"." -msgstr "" +msgstr "IP 流量控制頭的服務型別值。預設值為“16”。" msgid "Unable to connect to the OLSR daemon!" -msgstr "" +msgstr "無法連線到 OLSR 守護程式！" msgid "Uplink" -msgstr "" +msgstr "上行連結" msgid "Uplink uses NAT" -msgstr "" +msgstr "上行連結使用 NAT" msgid "Use hysteresis" -msgstr "" +msgstr "使用滯後" msgid "Validity Time" -msgstr "" +msgstr "有效時間" msgid "Version" -msgstr "" +msgstr "版本" msgid "Very good (ETX < 2)" -msgstr "" +msgstr "非常好（ETX < 2）" msgid "Very good (SNR > 30)" -msgstr "" +msgstr "非常好（SNR > 30）" msgid "WLAN" -msgstr "" +msgstr "WLAN" msgid "" "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not " "work, please install it." msgstr "" +"警告：未安裝 kmod-ipip。沒有 kmod-ipip，SmartGateway 將無法正常工作，請安裝" +"它。" msgid "Weight" -msgstr "" +msgstr "體重" msgid "" "When multiple links exist between hosts the weight of interface is used to " @@ -671,30 +723,38 @@ msgid "" "0. For any other value of LinkQualityLevel, the interface ETX value is used " "instead." msgstr "" +"當主機之間存在多個鏈路時，介面權重用於確定要使用的鏈路。通常，權重由 olsrd 根" +"據介面的特性自動計算，但您可以在此處指定固定值。Olsrd 將選擇值最低的連結。" +"<br /><b>注意：</b>僅當 LinkQualityLevel 設定為0時才使用介面權重。" +"LinkQualityLevel 的任何其他值都將使用介面的 ETX 值。" msgid "" "Which kind of uplink is exported to the other mesh nodes. An uplink is " "detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. " "Default setting is \"both\"." msgstr "" +"將匯出哪種上行鏈路到其他網狀節點。通過查詢本地 HNA 0.0.0.0/0、::ffff:0:0/96 " +"或 2000::/3 來檢測上行鏈路。預設設定為“兩者”。" msgid "" "Which kind of uplink is exported to the other mesh nodes. An uplink is " "detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default " "setting is \"both\"." msgstr "" +"將匯出哪種上行鏈路到其他網狀節點。通過查詢本地 HNA6 ::ffff:0:0/96 或 " +"2000::/3 來檢測上行鏈路。預設設定為“兩者”。" msgid "Willingness" -msgstr "" +msgstr "意願值" msgid "Yellow" -msgstr "" +msgstr "黃色" msgid "no" -msgstr "" +msgstr "否" msgid "yes" -msgstr "" +msgstr "是" #~ msgid "Device" -#~ msgstr "設備" +#~ msgstr "裝置" diff --git a/applications/luci-app-openvpn/luasrc/controller/openvpn.lua b/applications/luci-app-openvpn/luasrc/controller/openvpn.lua index 2e48a469a1..61592d0fac 100644 --- a/applications/luci-app-openvpn/luasrc/controller/openvpn.lua +++ b/applications/luci-app-openvpn/luasrc/controller/openvpn.lua @@ -8,4 +8,47 @@ function index() entry( {"admin", "services", "openvpn"}, cbi("openvpn"), _("OpenVPN") ) entry( {"admin", "services", "openvpn", "basic"}, cbi("openvpn-basic"), nil ).leaf = true entry( {"admin", "services", "openvpn", "advanced"}, cbi("openvpn-advanced"), nil ).leaf = true + entry( {"admin", "services", "openvpn", "file"}, form("openvpn-file"), nil ).leaf = true + entry( {"admin", "services", "openvpn", "upload"}, call("ovpn_upload")) +end + +function ovpn_upload() + local fs = require("nixio.fs") + local http = require("luci.http") + local util = require("luci.util") + local uci = require("luci.model.uci").cursor() + local upload = http.formvalue("ovpn_file") + local name = string.gsub(util.shellquote(http.formvalue("instance_name2")), "'", "") + local file = "/etc/openvpn/" ..name.. ".ovpn" + + if name and upload then + local fp + + http.setfilehandler( + function(meta, chunk, eof) + local data = util.trim(chunk:gsub("\r\n", "\n")) .. "\n" + data = util.trim(data:gsub("[\128-\255]", "")) + + if not fp and meta and meta.name == "ovpn_file" then + fp = io.open(file, "w") + end + if fp and data then + fp:write(data) + end + if fp and eof then + fp:close() + end + end + ) + + if fs.access(file) then + if not uci:get_first("openvpn", name) then + uci:set("openvpn", name, "openvpn") + uci:set("openvpn", name, "config", file) + uci:save("openvpn") + uci:commit("openvpn") + end + end + end + http.redirect(luci.dispatcher.build_url('admin/services/openvpn')) end diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua index 483860c8e9..6b6323e078 100644 --- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua +++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua @@ -85,4 +85,3 @@ for _, option in ipairs(basicParams) do end return m - diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-file.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-file.lua new file mode 100644 index 0000000000..6878275d78 --- /dev/null +++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-file.lua @@ -0,0 +1,61 @@ +-- Licensed to the public under the Apache License 2.0. + +local ip = require("luci.ip") +local fs = require("nixio.fs") +local util = require("luci.util") +local uci = require("luci.model.uci").cursor() +local cfg_file = uci:get("openvpn", arg[1], "config") + +local m = Map("openvpn") + +local p = m:section( SimpleSection ) +p.template = "openvpn/pageswitch" +p.mode = "file" +p.instance = arg[1] + +if not cfg_file or not fs.access(cfg_file) then + local f = SimpleForm("error", nil, translatef("The OVPN config file (%s) could not be found, please check your configuration.", cfg_file or "n/a")) + f:append(Template("openvpn/ovpn_css")) + f.reset = false + f.submit = false + return m, f +end + +if fs.stat(cfg_file).size >= 102400 then + f = SimpleForm("error", nil, + translatef("The size of the OVPN config file (%s) is too large for online editing in LuCI (≥ 100 KB). ", cfg_file) + .. translate("Please edit this file directly in a terminal session.")) + f:append(Template("openvpn/ovpn_css")) + f.reset = false + f.submit = false + return m, f +end + +f = SimpleForm("cfg", nil) +f:append(Template("openvpn/ovpn_css")) +f.submit = translate("Save") +f.reset = false + +s = f:section(SimpleSection, nil, translatef("This form allows you to modify the content of the OVPN config file (%s). ", cfg_file)) +file = s:option(TextValue, "data") +file.datatype = "string" +file.rows = 20 +file.rmempty = true + +function file.cfgvalue() + return fs.readfile(cfg_file) or "" +end + +function file.write(self, section, data) + return fs.writefile(cfg_file, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n") +end + +function file.remove(self, section, value) + return fs.writefile(cfg_file, "") +end + +function s.handle(self, state, data) + return true +end + +return m, f diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua index e17aa4085b..8f4859c0e5 100644 --- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua +++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua @@ -4,7 +4,7 @@ local fs = require "nixio.fs" local sys = require "luci.sys" local uci = require "luci.model.uci".cursor() -local testfullps = luci.sys.exec("ps --help 2>&1 | grep BusyBox") --check which ps do we have +local testfullps = sys.exec("ps --help 2>&1 | grep BusyBox") --check which ps do we have local psstring = (string.len(testfullps)>0) and "ps w" or "ps axfw" --set command we use to get pid local m = Map("openvpn", translate("OpenVPN")) @@ -13,9 +13,16 @@ s.template = "cbi/tblsection" s.template_addremove = "openvpn/cbi-select-input-add" s.addremove = true s.add_select_options = { } -s.extedit = luci.dispatcher.build_url( - "admin", "services", "openvpn", "basic", "%s" -) + +file_cfg = s:option(DummyValue, "config") +function file_cfg.cfgvalue(self, section) + local file_cfg = self.map:get(section, "config") + if file_cfg then + s.extedit = luci.dispatcher.build_url("admin", "services", "openvpn", "file", "%s") + else + s.extedit = luci.dispatcher.build_url("admin", "services", "openvpn", "basic", "%s") + end +end uci:load("openvpn_recipes") uci:foreach( "openvpn_recipes", "openvpn_recipe", @@ -61,10 +68,10 @@ function s.create(self, name) if s then local options = uci:get_all("openvpn_recipes", recipe) for k, v in pairs(options) do - uci:set("openvpn", name, k, v) + if k ~= "_role" and k ~= "_description" then + uci:set("openvpn", name, k, v) + end end - uci:delete("openvpn", name, "_role") - uci:delete("openvpn", name, "_description") uci:save("openvpn") luci.http.redirect( self.extedit:format(name) ) end @@ -75,7 +82,6 @@ function s.create(self, name) return 0 end - s:option( Flag, "enabled", translate("Enabled") ) local active = s:option( DummyValue, "_active", translate("Started") ) @@ -106,28 +112,27 @@ function updown.cfgvalue(self, section) end function updown.write(self, section, value) if self.option == "stop" then - luci.sys.call("/etc/init.d/openvpn stop %s" % section) + sys.call("/etc/init.d/openvpn stop %s" % section) else - luci.sys.call("/etc/init.d/openvpn start %s" % section) + sys.call("/etc/init.d/openvpn start %s" % section) end luci.http.redirect( self.redirect ) end - local port = s:option( DummyValue, "port", translate("Port") ) function port.cfgvalue(self, section) local val = AbstractValue.cfgvalue(self, section) - return val or "1194" + return val or "-" end local proto = s:option( DummyValue, "proto", translate("Protocol") ) function proto.cfgvalue(self, section) local val = AbstractValue.cfgvalue(self, section) - return val or "udp" + return val or "-" end -function m.on_after_commit(self,map) - require("luci.sys").call('/etc/init.d/openvpn reload') +function m.on_after_apply(self,map) + sys.call('/etc/init.d/openvpn reload') end return m diff --git a/applications/luci-app-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm b/applications/luci-app-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm index 0166de778e..09da2eb22d 100644 --- a/applications/luci-app-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm +++ b/applications/luci-app-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm @@ -1,11 +1,111 @@ -<div class="cbi-section-create"> - <% if self.invalid_cts then -%><div class="cbi-section-error"><% end %> - <input type="text" class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.text" /> - <select class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.select"> - <%- for k, v in luci.util.kspairs(self.add_select_options) do %> - <option value="<%=k%>"><%=luci.util.pcdata(v)%></option> - <% end -%> - </select> - <input class="cbi-button cbi-button-add" type="submit" value="<%:Add%>" title="<%:Add%>" /> - <% if self.invalid_cts then %><br /><%:Invalid%></div><% end %> + +<script type="text/javascript"> +//<![CDATA[ + function vpn_add() + { + var vpn_name = div_add.querySelector("#instance_name1").value.replace(/[^\x00-\x7F]|[\s!@#$%^&*()+=\[\]{};':"\\|,<>\/?]/g,''); + var vpn_template = div_add.querySelector("#instance_template").value; + var form = document.getElementsByName('cbi')[0]; + + if (!vpn_name || !vpn_name.length) + { + return info_message(vpn_output, "<%=pcdata(translate("The 'Name' field must not be empty!"))%>", 2000); + } + + document.getElementById("instance_name1").value = vpn_name; + if (document.getElementById("cbi-openvpn-" + vpn_name) != null) + { + return info_message(vpn_output, "<%=pcdata(translate("Instance with that name already exists!"))%>", 2000); + } + + if (!vpn_template || !vpn_template.length) + { + return info_message(vpn_output, "<%=pcdata(translate("Please select a valid VPN template!"))%>", 2000); + } + + if (form) + { + form.submit(); + } + } + + function vpn_upload() + { + var vpn_name = div_upload.querySelector("#instance_name2").value.replace(/[^\x00-\x7F]|[\s!@#$%^&*()+=\[\]{};':"\\|,<>\/?]/g,''); + var vpn_file = document.getElementById("ovpn_file").value; + var form = document.getElementsByName('cbi')[0]; + + if (!vpn_name || !vpn_name.length) + { + return info_message(vpn_output, "<%=pcdata(translate("The 'Name' field must not be empty!"))%>", 2000); + } + + document.getElementById("instance_name2").value = vpn_name; + if (document.getElementById("cbi-openvpn-" + vpn_name) != null) + { + return info_message(vpn_output, "<%=pcdata(translate("Instance with that name already exists!"))%>", 2000); + } + + if (!vpn_file || !vpn_file.length) + { + return info_message(vpn_output, "<%=pcdata(translate("Please select a valid OVPN config file to upload!"))%>", 2000); + } + + if (form) + { + form.enctype = 'multipart/form-data'; + form.action = '<%=url('admin/services/openvpn/upload')%>'; + form.submit(); + } + } + + function info_message(output, msg, timeout) + { + timeout = timeout || 0; + output.innerHTML = '<em>' + msg + '</em>'; + if (timeout > 0) + { + setTimeout(function(){ output.innerHTML=""}, timeout); + } + } +//]]> +</script> + +<%+openvpn/ovpn_css%> + +<div class="cbi-section-node"> + <div class="table cbi-section-table"> + <h4><%:Template based configuration%></h4> + <div class="tr cbi-section-table-row" id="div_add"> + <div class="td"> + <input type="text" maxlength="20" placeholder="Instance name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.text" id="instance_name1" /> + </div> + <div class="td"> + <select id="instance_template" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.select"> + <option value="" selected="selected" disabled="disabled"><%:Select template ...%></option> + <%- for k, v in luci.util.kspairs(self.add_select_options) do %> + <option value="<%=k%>"><%=luci.util.pcdata(v)%></option> + <% end -%> + </select> + </div> + <div class="td"> + <input class="cbi-button cbi-button-add" type="submit" onclick="vpn_add(); return false;" value="<%:Add%>" title="<%:Add template based configuration%>" /><br /> + </div> + </div> + <h4><%:OVPN configuration file upload%></h4> + <div class="tr cbi-section-table-row" id="div_upload"> + <div class="td"> + <input type="text" maxlength="20" placeholder="Instance name" name="instance_name2" id="instance_name2" /> + </div> + <div class="td"> + <input type="file" name="ovpn_file" id="ovpn_file" accept="application/x-openvpn-profile,.ovpn" /> + </div> + <div class="td"> + <input class="cbi-button cbi-button-add" type="submit" onclick="vpn_upload(); return false;" value="<%:Upload%>" title="<%:Upload ovpn file%>" /> + </div> + </div> + </div> + <div class="vpn-output"> + <span id="vpn_output"></span> + </div> </div> diff --git a/applications/luci-app-openvpn/luasrc/view/openvpn/ovpn_css.htm b/applications/luci-app-openvpn/luasrc/view/openvpn/ovpn_css.htm new file mode 100644 index 0000000000..c7062b8d7a --- /dev/null +++ b/applications/luci-app-openvpn/luasrc/view/openvpn/ovpn_css.htm @@ -0,0 +1,44 @@ +<style type="text/css"> + h4 + { + white-space: nowrap; + border-bottom: 0px; + margin: 10px 5px 5px 5px; + } + .tr + { + border: 0px; + text-align: left; + } + .td + { + text-align: left; + border-top: 0px; + margin: 5px; + } + .vpn-output + { + box-shadow: none; + margin: 10px 5px 5px 5px; + color: #a22; + } + textarea + { + border: 1px solid #cccccc; + padding: 5px; + font-size: 12px; + font-family: monospace; + resize: none; + white-space: pre; + overflow-wrap: normal; + overflow-x: scroll; + } + a + { + line-height: 1.5; + } + hr + { + margin: 0.5em 0; + } +</style> diff --git a/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm index 8cb019b461..17beef0d39 100644 --- a/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm +++ b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm @@ -4,25 +4,31 @@ Licensed to the public under the Apache License 2.0. -%> +<%+openvpn/ovpn_css%> + <div class="cbi-section"> <h3> - <a href="<%=url('admin/services/openvpn')%>"><%:Overview%></a> » + <a href="<%=url('admin/services/openvpn')%>"><%:Overview%></a> » <%=luci.i18n.translatef("Instance \"%s\"", self.instance)%> </h3> - - <% if self.mode == "basic" then %> - <a href="<%=url('admin/services/openvpn/advanced', self.instance, "Service")%>"><%:Switch to advanced configuration »%></a> - <% else %> - <a href="<%=url('admin/services/openvpn/basic', self.instance)%>"><%:« Switch to basic configuration%></a> - <hr style="margin:0.5em 0" /> + <% if self.mode == "file" then %> + <a href="<%=url('admin/services/openvpn/basic', self.instance)%>"><%:Switch to basic configuration%> »</a><p/> + <a href="<%=url('admin/services/openvpn/advanced', self.instance, "Service")%>"><%:Switch to advanced configuration%> »</a> + <hr /> + <% elseif self.mode == "basic" then %> + <a href="<%=url('admin/services/openvpn/advanced', self.instance, "Service")%>"><%:Switch to advanced configuration%> »</a><p/> + <a href="<%=url('admin/services/openvpn/file', self.instance)%>"><%:Switch to file based configuration%> »</a> + <hr /> + <% elseif self.mode == "advanced" then %> + <a href="<%=url('admin/services/openvpn/basic', self.instance)%>"><%:Switch to basic configuration%> »</a><p/> + <a href="<%=url('admin/services/openvpn/file', self.instance)%>"><%:Switch to file based configuration%> »</a> + <hr /> <%:Configuration category%>: <% for i, c in ipairs(self.categories) do %> <% if c == self.category then %> <strong><%=translate(c)%></strong> <% else %> - <a href="<%=luci.dispatcher.build_url( - "admin", "services", "openvpn", "advanced", self.instance, c - )%>"><%=translate(c)%></a> + <a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn", "advanced", self.instance, c)%>"><%=translate(c)%></a> <% end %> <% if next(self.categories, i) then %>|<% end %> <% end %> diff --git a/applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua b/applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua index 90754c2bc1..722af19e21 100644 --- a/applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua +++ b/applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua @@ -544,7 +544,7 @@ function bl.validate(self, value) elseif v < 1 or v > 4096 then return nil, err_tab_access(self.title_base, translate("Value not between 1 and 4096") ) elseif v == self.default then - return "" -- dont need to save default + return "" -- don't need to save default end return value end @@ -721,7 +721,7 @@ function st.validate(self, value) elseif v < 1 then return nil, err_tab_misc(self.title_base, translate("Value not greater 0 or empty") ) elseif v == self.default then - return "" -- dont need to save default + return "" -- don't need to save default end return value end @@ -740,7 +740,7 @@ function mcc.validate(self, value) elseif v < 1 then return nil, err_tab_misc(self.title_base, translate("Value not greater 0 or empty") ) elseif v == self.default then - return "" -- dont need to save default + return "" -- don't need to save default end return value end diff --git a/applications/luci-app-samba4/po/zh-cn/samba4.po b/applications/luci-app-samba4/po/zh-cn/samba4.po index f49abac4e9..1ee9996bc7 100644 --- a/applications/luci-app-samba4/po/zh-cn/samba4.po +++ b/applications/luci-app-samba4/po/zh-cn/samba4.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-06-10 03:40+0200\n" -"PO-Revision-Date: 2018-08-07 20:10+0800\n" +"PO-Revision-Date: 2018-10-01 11:12+0800\n" "Last-Translator: Yangfl <mmyangfl@gmail.com>\n" "Language-Team: <debian-l10n-chinese@lists.debian.org>\n" "Language: zh_CN\n" @@ -26,10 +26,10 @@ msgid "Allowed users" msgstr "允许用户" msgid "Apple Time-machine share" -msgstr "" +msgstr "Apple Time-machine 共享" msgid "Browse-able" -msgstr "" +msgstr "可浏览" msgid "Create mask" msgstr "创建权限掩码" @@ -56,15 +56,15 @@ msgid "Edit the template that is used for generating the samba configuration." msgstr "编辑用来生成 samba 设置的模板" msgid "Enable macOS compatible shares" -msgstr "" +msgstr "启用 macOS 兼容共享" msgid "" "Enables Apple's AAPL extension globally and adds macOS compatibility options " "to all shares." -msgstr "" +msgstr "全局启用 Apple 的 AAPL 扩展，并为所有共享添加 macOS 兼容性选项。" msgid "Force Root" -msgstr "" +msgstr "强制 Root" msgid "General Settings" msgstr "基本设置" @@ -111,7 +111,7 @@ msgstr "" "符（“|”）包围的值不应更改。它们将从“常规设置”标签中获取其值。" msgid "Time-machine size in GB" -msgstr "" +msgstr "Time-machine 大小（GB）" msgid "Vfs objects" msgstr "VFS 对象" diff --git a/applications/luci-app-samba4/po/zh-tw/samba4.po b/applications/luci-app-samba4/po/zh-tw/samba4.po index ae962f9e82..6121a74119 100644 --- a/applications/luci-app-samba4/po/zh-tw/samba4.po +++ b/applications/luci-app-samba4/po/zh-tw/samba4.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-06-10 03:40+0200\n" -"PO-Revision-Date: 2018-08-07 20:10+0800\n" +"PO-Revision-Date: 2018-10-01 11:12+0800\n" "Last-Translator: Yangfl <mmyangfl@gmail.com>\n" "Language-Team: <debian-l10n-chinese@lists.debian.org>\n" "Language: zh_TW\n" @@ -26,10 +26,10 @@ msgid "Allowed users" msgstr "允許使用者" msgid "Apple Time-machine share" -msgstr "" +msgstr "Apple Time-machine 共享" msgid "Browse-able" -msgstr "" +msgstr "可瀏覽" msgid "Create mask" msgstr "建立權限掩碼" @@ -56,15 +56,15 @@ msgid "Edit the template that is used for generating the samba configuration." msgstr "編輯用來生成 samba 設定的模板" msgid "Enable macOS compatible shares" -msgstr "" +msgstr "啟用 macOS 相容共享" msgid "" "Enables Apple's AAPL extension globally and adds macOS compatibility options " "to all shares." -msgstr "" +msgstr "全域性啟用 Apple 的 AAPL 擴充套件，併為所有共享新增 macOS 相容性選項。" msgid "Force Root" -msgstr "" +msgstr "強制 Root" msgid "General Settings" msgstr "基本設定" @@ -111,7 +111,7 @@ msgstr "" "符（“|”）包圍的值不應更改。它們將從“常規設定”標籤中獲取其值。" msgid "Time-machine size in GB" -msgstr "" +msgstr "Time-machine 大小（GB）" msgid "Vfs objects" msgstr "VFS 物件" diff --git a/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/servers.lua b/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/servers.lua index 71c66562e1..a0d0079278 100644 --- a/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/servers.lua +++ b/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/servers.lua @@ -9,7 +9,7 @@ local m, s m = Map("shadowsocks-libev", translate("Remote Servers"), translate("Definition of remote shadowsocks servers. \ - Disable any of them will also disable instances refering to it.")) + Disable any of them will also disable instances referring to it.")) local sname = arg[1] if sname then diff --git a/applications/luci-app-shadowsocks-libev/po/templates/shadowsocks-libev.pot b/applications/luci-app-shadowsocks-libev/po/templates/shadowsocks-libev.pot new file mode 100644 index 0000000000..8c9b3fc903 --- /dev/null +++ b/applications/luci-app-shadowsocks-libev/po/templates/shadowsocks-libev.pot @@ -0,0 +1,241 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8" + +msgid "<hidden>" +msgstr "" + +msgid "Add" +msgstr "" + +msgid "Advanced Settings" +msgstr "" + +msgid "Bind address" +msgstr "" + +msgid "Bypass ss-redir for packets with dst address in this list" +msgstr "" + +msgid "Bypass ss-redir for packets with src address in this list" +msgstr "" + +msgid "" +"Continue to have dst address checked for packets with src address in this " +"list" +msgstr "" + +msgid "Default action for locally generated TCP packets" +msgstr "" + +msgid "" +"Default action for packets whose dst address do not match any of the dst ip " +"list" +msgstr "" + +msgid "" +"Default action for packets whose src address do not match any of the src ip/" +"net list" +msgstr "" + +msgid "" +"Definition of remote shadowsocks servers. Disable any of them will also " +"disable instances referring to it." +msgstr "" + +msgid "Destination Settings" +msgstr "" + +msgid "Disable" +msgstr "" + +msgid "Disabled" +msgstr "" + +msgid "Dst default" +msgstr "" + +msgid "Dst ip/net bypass" +msgstr "" + +msgid "Dst ip/net bypass file" +msgstr "" + +msgid "Dst ip/net forward" +msgstr "" + +msgid "Dst ip/net forward file" +msgstr "" + +msgid "Enable SO_REUSEPORT" +msgstr "" + +msgid "Enable TCP Fast Open" +msgstr "" + +msgid "Enable TCP_NODELAY" +msgstr "" + +msgid "Enable/Disable" +msgstr "" + +msgid "Enabled" +msgstr "" + +msgid "Extra arguments" +msgstr "" + +msgid "" +"File containing ip/net for the purposes as with <em>Dst ip/net bypass</em>" +msgstr "" + +msgid "" +"File containing ip/net for the purposes as with <em>Dst ip/net forward</em>" +msgstr "" + +msgid "Forward recentrst" +msgstr "" + +msgid "" +"Forward those packets whose dst have recently sent to us multiple tcp-rst" +msgstr "" + +msgid "Forward through ss-redir for packets with dst address in this list" +msgstr "" + +msgid "Forward through ss-redir for packets with src address in this list" +msgstr "" + +msgid "General Settings" +msgstr "" + +msgid "IPv6 First" +msgstr "" + +msgid "Ingress interfaces" +msgstr "" + +msgid "Install package %q" +msgstr "" + +msgid "Install package iptables-mod-conntrack-extra" +msgstr "" + +msgid "" +"Instances of shadowsocks-libev components, e.g. ss-local, ss-redir, ss-" +"tunnel, ss-server, etc. To enable an instance it is required to enable both " +"the instance itself and the remote server it refers to." +msgstr "" + +msgid "Key (base64 encoding)" +msgstr "" + +msgid "Local Instances" +msgstr "" + +msgid "Local address" +msgstr "" + +msgid "Local port" +msgstr "" + +msgid "Local-out default" +msgstr "" + +msgid "MTU" +msgstr "" + +msgid "Method" +msgstr "" + +msgid "Mode of operation" +msgstr "" + +msgid "Name" +msgstr "" + +msgid "" +"On this page you can configure how traffics are to be forwarded to ss-redir " +"instances. If enabled, packets will first have their src ip addresses " +"checked against <em>Src ip/net bypass</em>, <em>Src ip/net forward</em>, " +"<em>Src ip/net checkdst</em> and if none matches <em>Src default</em> will " +"give the default action to be taken. If the prior check results in action " +"<em>checkdst</em>, packets will continue to have their dst addresses checked." +msgstr "" + +msgid "Only apply rules on packets from these network interfaces" +msgstr "" + +msgid "Overview" +msgstr "" + +msgid "Package is not installed" +msgstr "" + +msgid "Passes additional arguments to iptables. Use with care!" +msgstr "" + +msgid "Password" +msgstr "" + +msgid "Prefer IPv6 addresses when resolving names" +msgstr "" + +msgid "Redir Rules" +msgstr "" + +msgid "Remote Servers" +msgstr "" + +msgid "Remote server" +msgstr "" + +msgid "Run as" +msgstr "" + +msgid "Running" +msgstr "" + +msgid "Server" +msgstr "" + +msgid "Server port" +msgstr "" + +msgid "Shadowsocks-libev" +msgstr "" + +msgid "Source Settings" +msgstr "" + +msgid "Src default" +msgstr "" + +msgid "Src ip/net bypass" +msgstr "" + +msgid "Src ip/net checkdst" +msgstr "" + +msgid "Src ip/net forward" +msgstr "" + +msgid "The address ss-server will initiate connection from" +msgstr "" + +msgid "The address ss-tunnel will forward traffic to" +msgstr "" + +msgid "Timeout (sec)" +msgstr "" + +msgid "Tunnel address" +msgstr "" + +msgid "Verbose" +msgstr "" + +msgid "ss-redir for TCP" +msgstr "" + +msgid "ss-redir for UDP" +msgstr "" diff --git a/applications/luci-app-siitwizard/luasrc/controller/siitwizard.lua b/applications/luci-app-siitwizard/luasrc/controller/siitwizard.lua index 4d1c140b03..0bbedaa9de 100644 --- a/applications/luci-app-siitwizard/luasrc/controller/siitwizard.lua +++ b/applications/luci-app-siitwizard/luasrc/controller/siitwizard.lua @@ -5,5 +5,5 @@ module "luci.controller.siitwizard" function index() - entry({"admin", "network", "siitwizard"}, form("siitwizard"), "SIIT 4over6 assistent", 99) + entry({"admin", "network", "siitwizard"}, form("siitwizard"), "SIIT 4over6 assistant", 99) end diff --git a/applications/luci-app-siitwizard/luasrc/model/cbi/siitwizard.lua b/applications/luci-app-siitwizard/luasrc/model/cbi/siitwizard.lua index 0d738326a0..f3501e5d72 100644 --- a/applications/luci-app-siitwizard/luasrc/model/cbi/siitwizard.lua +++ b/applications/luci-app-siitwizard/luasrc/model/cbi/siitwizard.lua @@ -167,7 +167,7 @@ function mode.write(self, section, value) -- * wl0 gets an ipv6 address, in this case the fdca:ffee:babe::1:1/64 -- * we do a ::ffff:ffff:0/96 route into siit0, so everything from 6mesh goes into translation. -- * an HNA6 of ::ffff:ffff:0:0/96 announces the mapped 0.0.0.0/0 ipv4 space. - -- * MTU on WAN, LAN down to 1400, ipv6 headers are slighly larger. + -- * MTU on WAN, LAN down to 1400, ipv6 headers are slightly larger. if value == "gateway" then @@ -342,9 +342,9 @@ function mode.write(self, section, value) -- txtinfo v6 & olsrd nameservice uci:foreach("olsrd", "LoadPlugin", function(s) - if s.library == "olsrd_txtinfo.so.0.1" then + if s.library == "olsrd_txtinfo" then uci:set("olsrd", s['.name'], "accept", "::1") - elseif s.library == "olsrd_nameservice.so.0.3" then + elseif s.library == "olsrd_nameservice" then uci:set("olsrd", s['.name'], "name", hostname) end end) diff --git a/applications/luci-app-simple-adblock/po/zh-cn/simple-adblock.po b/applications/luci-app-simple-adblock/po/zh-cn/simple-adblock.po index b926fd0837..11a2364ffe 100644 --- a/applications/luci-app-simple-adblock/po/zh-cn/simple-adblock.po +++ b/applications/luci-app-simple-adblock/po/zh-cn/simple-adblock.po @@ -104,6 +104,9 @@ msgstr "简单 AdBlock 设置" msgid "Some output" msgstr "一些输出" +msgid "Start Simple Adblock service" +msgstr "" + msgid "Stop the download if it is stalled for set number of seconds" msgstr "如果下载停滞设定的秒数后，则停止下载" diff --git a/applications/luci-app-simple-adblock/po/zh-tw/simple-adblock.po b/applications/luci-app-simple-adblock/po/zh-tw/simple-adblock.po index bbeda42c29..c4c31aa071 100644 --- a/applications/luci-app-simple-adblock/po/zh-tw/simple-adblock.po +++ b/applications/luci-app-simple-adblock/po/zh-tw/simple-adblock.po @@ -104,6 +104,9 @@ msgstr "簡單 AdBlock 設定" msgid "Some output" msgstr "一些輸出" +msgid "Start Simple Adblock service" +msgstr "" + msgid "Stop the download if it is stalled for set number of seconds" msgstr "如果下載停滯設定的秒數後，則停止下載" diff --git a/applications/luci-app-snmpd/luasrc/model/cbi/snmpd.lua b/applications/luci-app-snmpd/luasrc/model/cbi/snmpd.lua index b3c0f2660b..cc6951e171 100644 --- a/applications/luci-app-snmpd/luasrc/model/cbi/snmpd.lua +++ b/applications/luci-app-snmpd/luasrc/model/cbi/snmpd.lua @@ -26,11 +26,12 @@ s.anonymous = true p = s:option(Value, "agentaddress", "The address the agent should listen on", [[Eg: UDP:161, or UDP:10.5.4.3:161 to only listen on a given interface]]) -s = m:section(TypedSection, "agentx", "AgentX settings") +s = m:section(TypedSection, "agentx", "AgentX settings", "Delete this section to disable agentx") s.anonymous = true p = s:option(Value, "agentxsocket", "The address the agent should allow agentX connections to", [[This is only necessary if you have subagents using the agentX socket protocol. - Note that agentX requires TCP transport]]) + Eg: /var/run/agentx.sock]]) +s.addremove=true s = m:section(TypedSection, "com2sec", "com2sec security") p = s:option(Value, "secname", "secname") diff --git a/applications/luci-app-splash/Makefile b/applications/luci-app-splash/Makefile index 5740aa5f7c..4653724871 100644 --- a/applications/luci-app-splash/Makefile +++ b/applications/luci-app-splash/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Freifunk DHCP-Splash application -LUCI_DEPENDS:=+luci-lib-nixio +tc +kmod-sched +iptables-mod-nat-extra +iptables-mod-ipopt +LUCI_DEPENDS:=+luci-lib-nixio +luci-lib-iptparser +tc +kmod-sched +iptables-mod-nat-extra +iptables-mod-ipopt define Package/luci-app-splash/conffiles /etc/config/luci_splash diff --git a/applications/luci-app-splash/luasrc/model/cbi/splash/splash.lua b/applications/luci-app-splash/luasrc/model/cbi/splash/splash.lua index c09d2e0f78..bd88e8a6e2 100644 --- a/applications/luci-app-splash/luasrc/model/cbi/splash/splash.lua +++ b/applications/luci-app-splash/luasrc/model/cbi/splash/splash.lua @@ -2,7 +2,7 @@ require("luci.model.uci") -m = Map("luci_splash", translate("Client-Splash"), translate("Client-Splash is a hotspot authentification system for wireless mesh networks.")) +m = Map("luci_splash", translate("Client-Splash"), translate("Client-Splash is a hotspot authentication system for wireless mesh networks.")) s = m:section(NamedSection, "general", "core", translate("General")) s.addremove = false diff --git a/applications/luci-app-splash/luasrc/view/splash/splash.htm b/applications/luci-app-splash/luasrc/view/splash/splash.htm index 8d84463ef7..64c326ff3a 100644 --- a/applications/luci-app-splash/luasrc/view/splash/splash.htm +++ b/applications/luci-app-splash/luasrc/view/splash/splash.htm @@ -81,7 +81,7 @@ if has_custom_splash then is limited and because of this we ask you not to do any of the following:%></p> <ul> <li><%:use filesharing applications on this network%></li> - <li><%:waste bandwidth with unneccesary downloads or streams%></li> + <li><%:waste bandwidth with unnecessary downloads or streams%></li> <li><%:perform any kind of illegal activities%></li> </ul> <br /> diff --git a/applications/luci-app-splash/po/ca/splash.po b/applications/luci-app-splash/po/ca/splash.po index 3afef1a7b3..a71742d0c3 100644 --- a/applications/luci-app-splash/po/ca/splash.po +++ b/applications/luci-app-splash/po/ca/splash.po @@ -71,7 +71,7 @@ msgid "Client-Splash" msgstr "" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "" @@ -323,7 +323,7 @@ msgstr "desconegut" msgid "use filesharing applications on this network" msgstr "utilitza aplicacions de compartició de fitxers en aquesta xarxa" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "malgasta l'amplada de banda amb baixades o corrents innecessaris" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/cs/splash.po b/applications/luci-app-splash/po/cs/splash.po index 671afd79e2..114eaf4e3d 100644 --- a/applications/luci-app-splash/po/cs/splash.po +++ b/applications/luci-app-splash/po/cs/splash.po @@ -79,7 +79,7 @@ msgid "Client-Splash" msgstr "Client-Splash" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "" @@ -324,7 +324,7 @@ msgstr "neznámý" msgid "use filesharing applications on this network" msgstr "používat aplikace na sdílení souborů v této síti" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "plýtvat šířkou pásma nepotřebným stahováním nebo streamy" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/de/splash.po b/applications/luci-app-splash/po/de/splash.po index 8b1cd9a5ec..592012302e 100644 --- a/applications/luci-app-splash/po/de/splash.po +++ b/applications/luci-app-splash/po/de/splash.po @@ -86,7 +86,7 @@ msgid "Client-Splash" msgstr "Client-Splash" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "" "Client-Splash ist ein Hotspot-Authentifizierungssystem für Freifunk und " @@ -368,7 +368,7 @@ msgstr "Unbekannt" msgid "use filesharing applications on this network" msgstr "Filesharing betreiben" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "Bandbreite durch unnötige Downloads oder Streams zu verschwenden." msgid "whitelisted" diff --git a/applications/luci-app-splash/po/el/splash.po b/applications/luci-app-splash/po/el/splash.po index df90478f71..1d09bbb16d 100644 --- a/applications/luci-app-splash/po/el/splash.po +++ b/applications/luci-app-splash/po/el/splash.po @@ -68,7 +68,7 @@ msgid "Client-Splash" msgstr "" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "" @@ -300,7 +300,7 @@ msgstr "" msgid "use filesharing applications on this network" msgstr "" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/en/splash.po b/applications/luci-app-splash/po/en/splash.po index 615be16b23..734e7d89c0 100644 --- a/applications/luci-app-splash/po/en/splash.po +++ b/applications/luci-app-splash/po/en/splash.po @@ -53,7 +53,7 @@ msgid "Client-Splash" msgstr "" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "" @@ -285,7 +285,7 @@ msgstr "" msgid "use filesharing applications on this network" msgstr "" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/es/splash.po b/applications/luci-app-splash/po/es/splash.po index 836352ea9b..360faa7b9e 100644 --- a/applications/luci-app-splash/po/es/splash.po +++ b/applications/luci-app-splash/po/es/splash.po @@ -84,7 +84,7 @@ msgid "Client-Splash" msgstr "Cliente-Splash" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "Cliente-Splash es un sistema de autentificación para redes mesh." @@ -350,7 +350,7 @@ msgstr "desconocido" msgid "use filesharing applications on this network" msgstr "usar aplicaciones de compartición de ficheros en esta red" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "malgastar ancho de banda con descargas innecesarias o multimedia" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/fr/splash.po b/applications/luci-app-splash/po/fr/splash.po index e525ab316c..96195c9001 100644 --- a/applications/luci-app-splash/po/fr/splash.po +++ b/applications/luci-app-splash/po/fr/splash.po @@ -69,7 +69,7 @@ msgid "Client-Splash" msgstr "Client-Splash" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "" "Client-Splash est un système d'authentification de HotSpot pour des réseaux " @@ -308,7 +308,7 @@ msgstr "inconnu" msgid "use filesharing applications on this network" msgstr "" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/he/splash.po b/applications/luci-app-splash/po/he/splash.po index bf7e2f0745..eb12759663 100644 --- a/applications/luci-app-splash/po/he/splash.po +++ b/applications/luci-app-splash/po/he/splash.po @@ -71,7 +71,7 @@ msgid "Client-Splash" msgstr "" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "" @@ -309,7 +309,7 @@ msgstr "לא ידוע" msgid "use filesharing applications on this network" msgstr "השתמש בתוכנות לשיתוף קבצים ברשת זו." -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "לבזבז רוחב פס עם הורדות או שידורים מיותרים" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/hu/splash.po b/applications/luci-app-splash/po/hu/splash.po index f2c7da14ab..bd66926da6 100644 --- a/applications/luci-app-splash/po/hu/splash.po +++ b/applications/luci-app-splash/po/hu/splash.po @@ -64,7 +64,7 @@ msgid "Client-Splash" msgstr "" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "" @@ -296,7 +296,7 @@ msgstr "" msgid "use filesharing applications on this network" msgstr "" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/it/splash.po b/applications/luci-app-splash/po/it/splash.po index 8964b6c3fb..870e5f8614 100644 --- a/applications/luci-app-splash/po/it/splash.po +++ b/applications/luci-app-splash/po/it/splash.po @@ -79,7 +79,7 @@ msgid "Client-Splash" msgstr "Client-Splash" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "" "Client-Splash è un sistema di autenticazione hotspot per le reti mesh " @@ -333,7 +333,7 @@ msgstr "sconosciuto" msgid "use filesharing applications on this network" msgstr "utilizzare le applicazioni di filesharing su questa rete" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "sprecate banda con download o flussi inutili" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/ja/splash.po b/applications/luci-app-splash/po/ja/splash.po index 615be16b23..734e7d89c0 100644 --- a/applications/luci-app-splash/po/ja/splash.po +++ b/applications/luci-app-splash/po/ja/splash.po @@ -53,7 +53,7 @@ msgid "Client-Splash" msgstr "" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "" @@ -285,7 +285,7 @@ msgstr "" msgid "use filesharing applications on this network" msgstr "" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/ms/splash.po b/applications/luci-app-splash/po/ms/splash.po index 615be16b23..734e7d89c0 100644 --- a/applications/luci-app-splash/po/ms/splash.po +++ b/applications/luci-app-splash/po/ms/splash.po @@ -53,7 +53,7 @@ msgid "Client-Splash" msgstr "" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "" @@ -285,7 +285,7 @@ msgstr "" msgid "use filesharing applications on this network" msgstr "" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/no/splash.po b/applications/luci-app-splash/po/no/splash.po index 615be16b23..734e7d89c0 100644 --- a/applications/luci-app-splash/po/no/splash.po +++ b/applications/luci-app-splash/po/no/splash.po @@ -53,7 +53,7 @@ msgid "Client-Splash" msgstr "" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "" @@ -285,7 +285,7 @@ msgstr "" msgid "use filesharing applications on this network" msgstr "" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/pl/splash.po b/applications/luci-app-splash/po/pl/splash.po index 68568848f0..660f2db8e6 100644 --- a/applications/luci-app-splash/po/pl/splash.po +++ b/applications/luci-app-splash/po/pl/splash.po @@ -87,7 +87,7 @@ msgstr "Splash kliencki" # nie ma słowa "autentykacja" - to brzydka kalka z angielskiego. msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "" "Klient Splash - sposób uwierzytelniania użytkowników dla sieci WiFi oparty o " @@ -359,7 +359,7 @@ msgid "use filesharing applications on this network" msgstr "używał programów do dzielenia się plikami w tej sieci" # j.w. -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "marnował transfer na niepotrzebne pobieranie plików i strumieni" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/pt-br/splash.po b/applications/luci-app-splash/po/pt-br/splash.po index cbdc8016c1..c839a74a42 100644 --- a/applications/luci-app-splash/po/pt-br/splash.po +++ b/applications/luci-app-splash/po/pt-br/splash.po @@ -84,7 +84,7 @@ msgid "Client-Splash" msgstr "Client-Splash" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "" "Client-Splash é um sistema de autenticação de ponto de acesso para redes sem " @@ -363,7 +363,7 @@ msgstr "desconhecido" msgid "use filesharing applications on this network" msgstr "usar aplicativos de compartilhamento de arquivos nesta rede" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "usar banda com fluxos ou arquivos baixados não necessários" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/pt/splash.po b/applications/luci-app-splash/po/pt/splash.po index 05bee4f323..ff99eb3bd9 100644 --- a/applications/luci-app-splash/po/pt/splash.po +++ b/applications/luci-app-splash/po/pt/splash.po @@ -68,7 +68,7 @@ msgid "Client-Splash" msgstr "" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "" @@ -302,7 +302,7 @@ msgstr "desconhecido" msgid "use filesharing applications on this network" msgstr "" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/ro/splash.po b/applications/luci-app-splash/po/ro/splash.po index 615be16b23..734e7d89c0 100644 --- a/applications/luci-app-splash/po/ro/splash.po +++ b/applications/luci-app-splash/po/ro/splash.po @@ -53,7 +53,7 @@ msgid "Client-Splash" msgstr "" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "" @@ -285,7 +285,7 @@ msgstr "" msgid "use filesharing applications on this network" msgstr "" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/ru/splash.po b/applications/luci-app-splash/po/ru/splash.po index 24151654a6..655cd9aa98 100644 --- a/applications/luci-app-splash/po/ru/splash.po +++ b/applications/luci-app-splash/po/ru/splash.po @@ -88,8 +88,7 @@ msgid "Client-Splash" msgstr "Splash-Клиент" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " -"networks." +"Client-Splash is a hotspot authentication system for wireless mesh networks." msgstr "" "Splash-Клиент - это система аутентификации точек доступа для беспроводных " "Mesh сетей." @@ -359,7 +358,7 @@ msgstr "неизвестно" msgid "use filesharing applications on this network" msgstr "использование файлообменных приложений в этой сети" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "тратить пропускную способность на ненужные загрузки или потоки" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/sk/splash.po b/applications/luci-app-splash/po/sk/splash.po index e9dd448ec5..6372baf63b 100644 --- a/applications/luci-app-splash/po/sk/splash.po +++ b/applications/luci-app-splash/po/sk/splash.po @@ -64,7 +64,7 @@ msgid "Client-Splash" msgstr "" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "" @@ -296,7 +296,7 @@ msgstr "" msgid "use filesharing applications on this network" msgstr "" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/sv/splash.po b/applications/luci-app-splash/po/sv/splash.po index a5ebcb7efe..3cb6121808 100644 --- a/applications/luci-app-splash/po/sv/splash.po +++ b/applications/luci-app-splash/po/sv/splash.po @@ -66,8 +66,7 @@ msgid "Client-Splash" msgstr "" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " -"networks." +"Client-Splash is a hotspot authentication system for wireless mesh networks." msgstr "" msgid "" @@ -313,7 +312,7 @@ msgstr "okänd" msgid "use filesharing applications on this network" msgstr "använd fildelningsapplikationer i det här nätverket" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "slösa bandbredd med onödiga nerladdningar eller strömmar" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/templates/splash.pot b/applications/luci-app-splash/po/templates/splash.pot index f29b736915..70a3f6dcee 100644 --- a/applications/luci-app-splash/po/templates/splash.pot +++ b/applications/luci-app-splash/po/templates/splash.pot @@ -56,8 +56,7 @@ msgid "Client-Splash" msgstr "" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " -"networks." +"Client-Splash is a hotspot authentication system for wireless mesh networks." msgstr "" msgid "" @@ -288,7 +287,7 @@ msgstr "" msgid "use filesharing applications on this network" msgstr "" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/tr/splash.po b/applications/luci-app-splash/po/tr/splash.po index 03fa7b3b74..04faa37ca3 100644 --- a/applications/luci-app-splash/po/tr/splash.po +++ b/applications/luci-app-splash/po/tr/splash.po @@ -64,7 +64,7 @@ msgid "Client-Splash" msgstr "" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "" @@ -296,7 +296,7 @@ msgstr "" msgid "use filesharing applications on this network" msgstr "" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/uk/splash.po b/applications/luci-app-splash/po/uk/splash.po index 2364c63d41..2fd76fd439 100644 --- a/applications/luci-app-splash/po/uk/splash.po +++ b/applications/luci-app-splash/po/uk/splash.po @@ -65,7 +65,7 @@ msgid "Client-Splash" msgstr "" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "" @@ -297,7 +297,7 @@ msgstr "" msgid "use filesharing applications on this network" msgstr "" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/vi/splash.po b/applications/luci-app-splash/po/vi/splash.po index 615be16b23..734e7d89c0 100644 --- a/applications/luci-app-splash/po/vi/splash.po +++ b/applications/luci-app-splash/po/vi/splash.po @@ -53,7 +53,7 @@ msgid "Client-Splash" msgstr "" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." msgstr "" @@ -285,7 +285,7 @@ msgstr "" msgid "use filesharing applications on this network" msgstr "" -msgid "waste bandwidth with unneccesary downloads or streams" +msgid "waste bandwidth with unnecessary downloads or streams" msgstr "" msgid "whitelisted" diff --git a/applications/luci-app-splash/po/zh-cn/splash.po b/applications/luci-app-splash/po/zh-cn/splash.po index 4ad7404701..773e5d65e7 100644 --- a/applications/luci-app-splash/po/zh-cn/splash.po +++ b/applications/luci-app-splash/po/zh-cn/splash.po @@ -1,20 +1,23 @@ +# +# Yangfl <mmyangfl@gmail.com>, 2018. +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-06-28 08:58+0200\n" -"PO-Revision-Date: 2014-07-23 02:07+0200\n" -"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2018-10-01 11:38+0800\n" +"Last-Translator: Yangfl <mmyangfl@gmail.com>\n" +"Language-Team: <debian-l10n-chinese@lists.debian.org>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.6\n" +"X-Generator: Gtranslator 2.91.7\n" msgid "Accept" -msgstr "接收" +msgstr "接受" msgid "" "Access to the internet might be possible nevertheless, because some " @@ -22,97 +25,107 @@ msgid "" "few connections are shared between all users. That means available bandwidth " "is limited and because of this we ask you not to do any of the following:" msgstr "" +"尽管如此，您仍然可以访问互联网，因为该项目的一些活动人士愿意分享他们的私人互" +"联网连接。所有用户之间共享这些连接。这意味着可用带宽有限，因此我们要求您不要" +"执行以下任何操作：" msgid "" "Access to the network is not guaranteed. It can be interrupted at any time " "without notice for any reason, for certain devices, and/or may be blocked " "for certain users." msgstr "" +"网络访问没有任何保证。对于某些设备，它可以因任何原因随时中断而不加以提前通" +"知，及/或可能被某些用户阻止。" msgid "Active Clients" msgstr "活动的客户端" msgid "Allowed hosts/subnets" -msgstr "允许的 主机/掩码" +msgstr "允许的主机/掩码" msgid "" "As an alternative to editing the complete splash text you can also just " "include some custom text in the default splash page by entering it here." msgstr "" +"除了编辑完整的 splash 文本，您还可以在此处输入，向默认启动页面加入一些自定义" +"文本。" msgid "" "Bandwidth limit for clients is only activated when both up- and download " "limit are set. Use a value of 0 here to completely disable this limitation. " "Whitelisted clients are not limited." msgstr "" -"只有当 上传和下载的限制都设置的时候对客户端的带宽限制才会生效。在这里使用0 可" -"以完全禁用此限制。白名单客户端不受限制。" +"仅当设置了上传和下载限制时，才会激活客户端带宽限制。在此处使用值0可完全禁用此" +"限制。白名单客户不受限制。" # Something wwrong? msgid "" "Become an active member of this community and help by operating your own node" -msgstr "成为这个社区的一个活跃成员并且运营您自己的节点以帮助别人。" +msgstr "成为此社区的活跃成员，并通过操作您自己的节点提供帮助" msgid "Blacklist" msgstr "黑名单" msgid "Blocked" -msgstr "锁定" +msgstr "封锁" msgid "" "By accepting these rules you can use this network for %s hour(s). After this " "time you need to accept these rules again." msgstr "" +"接受这些规则，您可以使用此网络 %s 小时。在此之后，您需要再次接受这些规则。" msgid "Clearance time" msgstr "清理时间" msgid "Client-Splash" -msgstr "客户端弹窗" +msgstr "Client-Splash" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." -msgstr "Client-Splash是无线MESH网络的一个热点认证系统" +msgstr "Client-Splash 是无线网状网络的一个热点认证系统。" msgid "" "Clients are redirected to this page after they have accepted the splash. If " "this is left empty they are redirected to the page they had requested." msgstr "" +"客户端连接到 splash 后将会重定向到此页面。如果留空，则会重定向到他们请求的页" +"面。" msgid "Clients download speed is limited to this value (kbyte/s)" -msgstr "客户端下载速度限制为此值(kbyte/s)" +msgstr "客户端下载速度限制（kbyte/s）" msgid "" "Clients that have accepted the splash are allowed to use the network for " "that many hours." -msgstr "已接受Splash的客户端允许使用这个网络N小时" +msgstr "已接受 splash 的客户端允许使用这个网络 N 小时。" msgid "Clients upload speed is limited to this value (kbyte/s)" -msgstr "客户端上传速度限制为此值(kbyte/s)" +msgstr "客户端上传速度限制（kbyte/s）" msgid "Contact" -msgstr "联系" +msgstr "联系方式" msgid "Decline" -msgstr "下降" +msgstr "拒绝" msgid "" "Destination hosts and networks that are excluded from splashing, i.e. they " "are always allowed." -msgstr "" +msgstr "Splashing 将排除的主机和网络，如：始终允许访问。" msgid "Donate some money to help us keep this project alive." -msgstr "捐助我们一些钱以帮助我们维护这个项目。" +msgstr "捐出一些钱来帮助我们维护这个项目。" msgid "Download limit" msgstr "下载限制" msgid "Edit the complete splash text" -msgstr "" +msgstr "编辑完整的 splash 文本" msgid "Fair Use Policy" -msgstr "" +msgstr "合理使用政策" msgid "Firewall zone" msgstr "防火墙区域" @@ -121,23 +134,23 @@ msgid "General" msgstr "概述" msgid "Get in %s with the operator of this access point." -msgstr "" +msgstr "在 %s 与此访问点的操作者取得联系。" msgid "Hostname" msgstr "主机名" msgid "IP Address" -msgstr "IP地址" +msgstr "IP 地址" msgid "" "If you operate your own wifi equipment use channels different from ours." -msgstr "如果您操作您自有的wifi设备，使用与我们不同的频道" +msgstr "如果您操作您自有的 wifi 设备，请使用不同的频道。" msgid "If you use this network on a regular basis we ask for your support:" -msgstr "如果您经常使用这个网络，我们需要您的支持" +msgstr "如果您经常使用这个网络，我们需要您的支持：" msgid "Include your own text in the default splash" -msgstr "" +msgstr "在默认的 splash 中包含您自己的文本" msgid "Intercept client traffic on this Interface" msgstr "在这个接口上拦截客户端通信流量" @@ -146,12 +159,12 @@ msgid "Interfaces" msgstr "接口" msgid "Interfaces that are used for Splash." -msgstr "Splash使用的接口" +msgstr "Splash 使用的接口。" msgid "" "KB/s (Download/Upload). You may be able to remove this limit by actively " "contributing to this project." -msgstr "" +msgstr "KB/s（下载/上传）。您可以通过积极参与此项目来消除此限制。" msgid "Legally Prohibited Activities" msgstr "法律禁止行为" @@ -160,15 +173,15 @@ msgid "Legally Prohibited content" msgstr "法律禁止内容" msgid "MAC Address" -msgstr "MAC地址" +msgstr "MAC 地址" msgid "MAC addresses in this list are blocked." -msgstr "在本列表中的MAC地址将被阻挡" +msgstr "在本列表中的 MAC 地址将被阻挡。" msgid "" "MAC addresses of whitelisted clients. These do not need to accept the splash " "and are not bandwidth limited." -msgstr "白名单中的MAC地址，可不用接受splash，同时没有带宽限制。" +msgstr "白名单中的 MAC 地址，可不用接受 splash，同时没有带宽限制。" msgid "Netmask" msgstr "网络掩码" @@ -182,10 +195,10 @@ msgstr "无客户端连接" msgid "" "Please note that we are not an internet service provider but an experimental " "community network." -msgstr "我们不是ISP（互联网运行商），仅仅只是一个实验性的社区网络。" +msgstr "我们不是 ISP（互联网运行商），仅仅只是一个实验性的社区网络。" msgid "Policy" -msgstr "策略" +msgstr "政策" msgid "Redirect target" msgstr "重定向目标" @@ -197,58 +210,68 @@ msgid "Save" msgstr "保存" msgid "Splash rules are integrated in this firewall zone" -msgstr "" +msgstr "Splash 规则集成在此防火墙区域中" msgid "Splashtext" -msgstr "" +msgstr "Splashtext" msgid "" "The network, like the Internet, is unencrypted and open. Each participant is " "responsible for the safety of their own connections and devices." msgstr "" +"与互联网一样，此网络是未加密及开放的。每个参与者都对自己的连接和设备的安全负" +"责。" msgid "" "The open and free wireless network of volunteers (\"Operators\") provides " "the necessary equipment and Internet connections (\"Infrastructure\") at " "their own expense." msgstr "" +"开放和免费无线网络的志愿者（“操作者”）自费提供必要的设备和互联网连接（“基础设" +"施”）。" msgid "" "The operator claims no liability for loss of data, unauthorized access/" "damage to devices, or financial losses that participants may suffer from the " "use of the network." msgstr "" +"操作者不对数据丢失，对设备未经授权的访问/损坏，或参与者因使用网络而可能遭受的" +"经济损失承担任何责任。" msgid "" "The participant agrees to not perform any action and refrain from acts which " "may violate the law or infringe upon the rights of third parties." -msgstr "" +msgstr "参与者同意不采取及避免任何可能违反法律或侵犯第三方权利的行为。" msgid "" "The participant agrees to not transfer content over the network which " "violates the law." -msgstr "" +msgstr "参与者同意不通过网络传播违反法律的内容。" msgid "" "The participant agrees to not use the network in any way which will harm the " "infrastructure, the network itself, its operators or other participants." msgstr "" +"参与者同意不以任何有损基础设施、网络本身、操作者或其他参与者的方式使用本网" +"络。" msgid "" "These Terms of Use govern the use of the network by its participants' " "computer, PDA, or similar device (\"Devices\") within the network." msgstr "" +"这些使用条款规定了网络中参与者的计算机、PDA 或类似设备（“设备”）使用网络的方" +"式。" msgid "Time remaining" -msgstr "" +msgstr "剩余时间:" msgid "" "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:" -msgstr "" +msgstr "要询问您被封禁的原因，或要求再次访问，您可以尝试联系此访问点的所有者：" msgid "Traffic in/out" -msgstr "流量 入/出" +msgstr "流量入站/出站" msgid "Upload limit" msgstr "上传限制" @@ -263,18 +286,21 @@ msgid "Whitelist" msgstr "白名单" msgid "You are now connected to the free wireless mesh network" -msgstr "" +msgstr "您现在已连接到免费无线网状网络" msgid "" "You can enter your own text that is displayed to clients here.<br />It is " "possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, " "###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###." msgstr "" +"您可以在此处输入自己显示给客户的文本。<br />可以使用以下标记：" +"###COMMUNITY###，###COMMUNITY_URL###，###CONTACTURL###，###LEASETIME###，" +"###LIMIT### 和 ###ACCEPT###。" msgid "" "Your access to this network has been blocked, most likely because you did " "something that our rules explicitly forbid." -msgstr "" +msgstr "您已被禁止访问此网络，很可能是因为您执行了规则中明令禁止的操作。" msgid "Your bandwidth is limited to" msgstr "您的带宽限制为" @@ -283,39 +309,31 @@ msgid "blacklisted" msgstr "黑名单" msgid "expired" -msgstr "过期" +msgstr "已过期" msgid "optional when using host addresses" -msgstr "" +msgstr "使用主机地址时可选" msgid "perform any kind of illegal activities" -msgstr "" +msgstr "进行任何形式的非法活动" msgid "splashed" -msgstr "" +msgstr "splash 通过" msgid "temporarily blocked" -msgstr "" +msgstr "暂时被阻止" msgid "unknown" -msgstr "" +msgstr "未知" msgid "use filesharing applications on this network" -msgstr "" +msgstr "在此网络上使用文件共享应用程序" -msgid "waste bandwidth with unneccesary downloads or streams" -msgstr "" +msgid "waste bandwidth with unnecessary downloads or streams" +msgstr "用不必要的下载或流媒体浪费带宽" msgid "whitelisted" -msgstr "" - -#~ msgid "" -#~ "Hosts and Networks that are listed here are excluded from splashing, i.e. " -#~ "they are always allowed." -#~ msgstr "列在这里的主机和网络都排除在Splashing之外，例如:一直被允许访问。" - -#~ msgid "By accepting these rules you can use this network for" -#~ msgstr "接受这些条款以便使用这个网络" +msgstr "白名单" #~ msgid "Edit Splash text" #~ msgstr "编辑Splash文本" diff --git a/applications/luci-app-splash/po/zh-tw/splash.po b/applications/luci-app-splash/po/zh-tw/splash.po index 1125abfeda..c20a1ba7a3 100644 --- a/applications/luci-app-splash/po/zh-tw/splash.po +++ b/applications/luci-app-splash/po/zh-tw/splash.po @@ -1,15 +1,23 @@ +# +# Yangfl <mmyangfl@gmail.com>, 2018. +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-06-28 08:58+0200\n" +"PO-Revision-Date: 2018-10-01 11:38+0800\n" +"Last-Translator: Yangfl <mmyangfl@gmail.com>\n" +"Language-Team: <debian-l10n-chinese@lists.debian.org>\n" +"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Gtranslator 2.91.7\n" msgid "Accept" -msgstr "" +msgstr "接受" msgid "" "Access to the internet might be possible nevertheless, because some " @@ -17,286 +25,315 @@ msgid "" "few connections are shared between all users. That means available bandwidth " "is limited and because of this we ask you not to do any of the following:" msgstr "" +"儘管如此，您仍然可以訪問網際網路，因為該專案的一些活動人士願意分享他們的私人" +"互聯網連線。所有使用者之間共享這些連線。這意味著可用頻寬有限，因此我們要求您" +"不要執行以下任何操作：" msgid "" "Access to the network is not guaranteed. It can be interrupted at any time " "without notice for any reason, for certain devices, and/or may be blocked " "for certain users." msgstr "" +"網路訪問沒有任何保證。對於某些裝置，它可以因任何原因隨時中斷而不加以提前通" +"知，及/或可能被某些使用者阻止。" msgid "Active Clients" -msgstr "" +msgstr "活動的客戶端" msgid "Allowed hosts/subnets" -msgstr "" +msgstr "允許的主機/掩碼" msgid "" "As an alternative to editing the complete splash text you can also just " "include some custom text in the default splash page by entering it here." msgstr "" +"除了編輯完整的 splash 文字，您還可以在此處輸入，向預設啟動頁面加入一些自定義" +"文字。" msgid "" "Bandwidth limit for clients is only activated when both up- and download " "limit are set. Use a value of 0 here to completely disable this limitation. " "Whitelisted clients are not limited." msgstr "" +"僅當設定了上傳和下載限制時，才會啟用客戶端頻寬限制。在此處使用值0可完全禁用此" +"限制。白名單客戶不受限制。" +# Something wwrong? msgid "" "Become an active member of this community and help by operating your own node" -msgstr "" +msgstr "成為此社群的活躍成員，並通過操作您自己的節點提供幫助" msgid "Blacklist" -msgstr "" +msgstr "黑名單" msgid "Blocked" -msgstr "" +msgstr "封鎖" msgid "" "By accepting these rules you can use this network for %s hour(s). After this " "time you need to accept these rules again." msgstr "" +"接受這些規則，您可以使用此網路 %s 小時。在此之後，您需要再次接受這些規則。" msgid "Clearance time" -msgstr "" +msgstr "清理時間" msgid "Client-Splash" -msgstr "" +msgstr "Client-Splash" msgid "" -"Client-Splash is a hotspot authentification system for wireless mesh " +"Client-Splash is a hotspot authentication system for wireless mesh " "networks." -msgstr "" +msgstr "Client-Splash 是無線網狀網路的一個熱點認證系統。" msgid "" "Clients are redirected to this page after they have accepted the splash. If " "this is left empty they are redirected to the page they had requested." msgstr "" +"客戶端連線到 splash 後將會重定向到此頁面。如果留空，則會重定向到他們請求的頁" +"面。" msgid "Clients download speed is limited to this value (kbyte/s)" -msgstr "" +msgstr "客戶端下載速度限制（kbyte/s）" msgid "" "Clients that have accepted the splash are allowed to use the network for " "that many hours." -msgstr "" +msgstr "已接受 splash 的客戶端允許使用這個網路 N 小時。" msgid "Clients upload speed is limited to this value (kbyte/s)" -msgstr "" +msgstr "客戶端上傳速度限制（kbyte/s）" msgid "Contact" -msgstr "" +msgstr "聯絡方式" msgid "Decline" -msgstr "" +msgstr "拒絕" msgid "" "Destination hosts and networks that are excluded from splashing, i.e. they " "are always allowed." -msgstr "" +msgstr "Splashing 將排除的主機和網路，如：始終允許訪問。" msgid "Donate some money to help us keep this project alive." -msgstr "" +msgstr "捐出一些錢來幫助我們維護這個專案。" msgid "Download limit" -msgstr "" +msgstr "下載限制" msgid "Edit the complete splash text" -msgstr "" +msgstr "編輯完整的 splash 文字" msgid "Fair Use Policy" -msgstr "" +msgstr "合理使用政策" msgid "Firewall zone" -msgstr "" +msgstr "防火牆區域" msgid "General" -msgstr "" +msgstr "概述" msgid "Get in %s with the operator of this access point." -msgstr "" +msgstr "在 %s 與此訪問點的操作者取得聯絡。" msgid "Hostname" -msgstr "" +msgstr "主機名" msgid "IP Address" -msgstr "" +msgstr "IP 地址" msgid "" "If you operate your own wifi equipment use channels different from ours." -msgstr "" +msgstr "如果您操作您自有的 wifi 裝置，請使用不同的頻道。" msgid "If you use this network on a regular basis we ask for your support:" -msgstr "" +msgstr "如果您經常使用這個網路，我們需要您的支援：" msgid "Include your own text in the default splash" -msgstr "" +msgstr "在預設的 splash 中包含您自己的文字" msgid "Intercept client traffic on this Interface" -msgstr "" +msgstr "在這個介面上攔截客戶端通訊流量" msgid "Interfaces" -msgstr "" +msgstr "介面" msgid "Interfaces that are used for Splash." -msgstr "" +msgstr "Splash 使用的介面。" msgid "" "KB/s (Download/Upload). You may be able to remove this limit by actively " "contributing to this project." -msgstr "" +msgstr "KB/s（下載/上傳）。您可以通過積極參與此專案來消除此限制。" msgid "Legally Prohibited Activities" -msgstr "" +msgstr "法律禁止行為" msgid "Legally Prohibited content" -msgstr "" +msgstr "法律禁止內容" msgid "MAC Address" -msgstr "" +msgstr "MAC 地址" msgid "MAC addresses in this list are blocked." -msgstr "" +msgstr "在本列表中的 MAC 地址將被阻擋。" msgid "" "MAC addresses of whitelisted clients. These do not need to accept the splash " "and are not bandwidth limited." -msgstr "" +msgstr "白名單中的 MAC 地址，可不用接受 splash，同時沒有頻寬限制。" msgid "Netmask" -msgstr "" +msgstr "網路掩碼" msgid "Network" -msgstr "" +msgstr "網路" msgid "No clients connected" -msgstr "" +msgstr "無客戶端連線" msgid "" "Please note that we are not an internet service provider but an experimental " "community network." -msgstr "" +msgstr "我們不是 ISP（網際網路執行商），僅僅只是一個實驗性的社群網路。" msgid "Policy" -msgstr "" +msgstr "政策" msgid "Redirect target" -msgstr "" +msgstr "重定向目標" msgid "Safety" -msgstr "" +msgstr "安全" msgid "Save" -msgstr "" +msgstr "儲存" msgid "Splash rules are integrated in this firewall zone" -msgstr "" +msgstr "Splash 規則整合在此防火牆區域中" msgid "Splashtext" -msgstr "" +msgstr "Splashtext" msgid "" "The network, like the Internet, is unencrypted and open. Each participant is " "responsible for the safety of their own connections and devices." msgstr "" +"與網際網路一樣，此網路是未加密及開放的。每個參與者都對自己的連線和裝置的安全" +"負責。" msgid "" "The open and free wireless network of volunteers (\"Operators\") provides " "the necessary equipment and Internet connections (\"Infrastructure\") at " "their own expense." msgstr "" +"開放和免費無線網路的志願者（“操作者”）自費提供必要的裝置和網際網路連線（“基礎" +"設施”）。" msgid "" "The operator claims no liability for loss of data, unauthorized access/" "damage to devices, or financial losses that participants may suffer from the " "use of the network." msgstr "" +"操作者不對資料丟失，對裝置未經授權的訪問/損壞，或參與者因使用網路而可能遭受的" +"經濟損失承擔任何責任。" msgid "" "The participant agrees to not perform any action and refrain from acts which " "may violate the law or infringe upon the rights of third parties." -msgstr "" +msgstr "參與者同意不採取及避免任何可能違反法律或侵犯第三方權利的行為。" msgid "" "The participant agrees to not transfer content over the network which " "violates the law." -msgstr "" +msgstr "參與者同意不通過網路傳播違反法律的內容。" msgid "" "The participant agrees to not use the network in any way which will harm the " "infrastructure, the network itself, its operators or other participants." msgstr "" +"參與者同意不以任何有損基礎設施、網路本身、操作者或其他參與者的方式使用本網" +"絡。" msgid "" "These Terms of Use govern the use of the network by its participants' " "computer, PDA, or similar device (\"Devices\") within the network." msgstr "" +"這些使用條款規定了網路中參與者的計算機、PDA 或類似裝置（“裝置”）使用網路的方" +"式。" msgid "Time remaining" -msgstr "" +msgstr "剩餘時間:" msgid "" "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:" -msgstr "" +msgstr "要詢問您被封禁的原因，或要求再次訪問，您可以嘗試聯絡此訪問點的所有者：" msgid "Traffic in/out" -msgstr "" +msgstr "流量入站/出站" msgid "Upload limit" -msgstr "" +msgstr "上傳限制" msgid "Usage Agreement" -msgstr "" +msgstr "使用協議" msgid "Welcome" -msgstr "" +msgstr "歡迎" msgid "Whitelist" -msgstr "" +msgstr "白名單" msgid "You are now connected to the free wireless mesh network" -msgstr "" +msgstr "您現在已連線到免費無線網狀網路" msgid "" "You can enter your own text that is displayed to clients here.<br />It is " "possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, " "###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###." msgstr "" +"您可以在此處輸入自己顯示給客戶的文字。<br />可以使用以下標記：" +"###COMMUNITY###，###COMMUNITY_URL###，###CONTACTURL###，###LEASETIME###，" +"###LIMIT### 和 ###ACCEPT###。" msgid "" "Your access to this network has been blocked, most likely because you did " "something that our rules explicitly forbid." -msgstr "" +msgstr "您已被禁止訪問此網路，很可能是因為您執行了規則中明令禁止的操作。" msgid "Your bandwidth is limited to" -msgstr "" +msgstr "您的頻寬限制為" msgid "blacklisted" -msgstr "" +msgstr "黑名單" msgid "expired" -msgstr "" +msgstr "已過期" msgid "optional when using host addresses" -msgstr "" +msgstr "使用主機地址時可選" msgid "perform any kind of illegal activities" -msgstr "" +msgstr "進行任何形式的非法活動" msgid "splashed" -msgstr "" +msgstr "splash 通過" msgid "temporarily blocked" -msgstr "" +msgstr "暫時被阻止" msgid "unknown" -msgstr "" +msgstr "未知" msgid "use filesharing applications on this network" -msgstr "" +msgstr "在此網路上使用檔案共享應用程式" -msgid "waste bandwidth with unneccesary downloads or streams" -msgstr "" +msgid "waste bandwidth with unnecessary downloads or streams" +msgstr "用不必要的下載或流媒體浪費頻寬" msgid "whitelisted" -msgstr "" +msgstr "白名單" + +#~ msgid "Edit Splash text" +#~ msgstr "編輯Splash文字" diff --git a/applications/luci-app-splash/root/etc/init.d/luci_splash b/applications/luci-app-splash/root/etc/init.d/luci_splash index feefabd81a..01a606c321 100755 --- a/applications/luci-app-splash/root/etc/init.d/luci_splash +++ b/applications/luci-app-splash/root/etc/init.d/luci_splash @@ -237,12 +237,12 @@ start() { [ -s $IPT_REPLAY ] && . $IPT_REPLAY echo -n > $IPT_REPLAY - ### Add interface independant prerouting rules + ### Add interface independent prerouting rules $IPT -t nat -A luci_splash_prerouting -j luci_splash_leases $IPT -t nat -A luci_splash_leases -p udp --dport 53 -j REDIRECT --to-ports 53 $IPT -t nat -A luci_splash_leases -p tcp --dport 80 -j REDIRECT --to-ports 8082 - ### Add interface independant forwarding rules + ### Add interface independent forwarding rules $IPT -t filter -A luci_splash_forwarding -j luci_splash_filter $IPT -t filter -A luci_splash_filter -p tcp -j REJECT --reject-with tcp-reset $IPT -t filter -A luci_splash_filter -j REJECT --reject-with icmp-net-prohibited diff --git a/applications/luci-app-statistics/Makefile b/applications/luci-app-statistics/Makefile index 008792a5d0..b552400fed 100644 --- a/applications/luci-app-statistics/Makefile +++ b/applications/luci-app-statistics/Makefile @@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI Statistics Application LUCI_DEPENDS:= \ + +luci-lib-iptparser \ +collectd +rrdtool1 +collectd-mod-rrdtool +collectd-mod-iwinfo \ +collectd-mod-cpu +collectd-mod-memory \ +collectd-mod-interface +collectd-mod-load +collectd-mod-network 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 ec26f02d0d..9a3850d683 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 @@ -10,7 +10,7 @@ function index() require("luci.util") require("luci.statistics.datatree") - -- override entry(): check for existance <plugin>.so where <plugin> is derived from the called path + -- override entry(): check for existence <plugin>.so where <plugin> is derived from the called path function _entry( path, ... ) local file = path[5] or path[4] if nixio.fs.access( "/usr/lib/collectd/" .. file .. ".so" ) then @@ -29,6 +29,7 @@ function index() cpu = _("Processor"), cpufreq = _("CPU Frequency"), csv = _("CSV Output"), + curl = _("cUrl"), df = _("Disk Space Usage"), disk = _("Disk Usage"), dns = _("DNS"), @@ -63,7 +64,7 @@ function index() general = { "apcups", "contextswitch", "cpu", "cpufreq", "df", "disk", "email", "entropy", "exec", "irq", "load", "memory", "nut", "processes", "sensors", "thermal", "uptime" }, - network = { "conntrack", "dns", "interface", "iptables", + network = { "conntrack", "curl", "dns", "interface", "iptables", "netlink", "olsrd", "openvpn", "ping", "splash_leases", "tcpconns", "iwinfo" } } diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua new file mode 100644 index 0000000000..606e1cb0da --- /dev/null +++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua @@ -0,0 +1,24 @@ +-- Copyright 2018 Chizhong Jin <pjincz@gmail.com> +-- Licensed to the public under the BSD 3-clause license + +m = Map("luci_statistics", + translate("cUrl Plugin Configuration")) + +s = m:section(NamedSection, "collectd_curl") +s_enable = s:option(Flag, "enable", translate("Enable this plugin")) +s_enable.default = 0 + +page = m:section(TypedSection, "collectd_curl_page") +page.addremove = true +page.anonymous = true +page.template = "cbi/tblsection" +page.sortable = true + +page_enable = page:option(Flag, "enable", translate("Enable")) +page_enable.default = 1 + +page_name = page:option(Value, "name", translate("Name")) + +page_addr = page:option(Value, "url", translate("URL")) + +return m diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/disk.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/disk.lua index dc3d3fb2be..d336a7e51c 100644 --- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/disk.lua +++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/disk.lua @@ -4,7 +4,7 @@ m = Map("luci_statistics", translate("Disk Plugin Configuration"), translate( - "The disk plugin collects detailled usage statistics " .. + "The disk plugin collects detailed usage statistics " .. "for selected partitions or whole disks." )) diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/dns.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/dns.lua index 29b998b877..dafcc452cc 100644 --- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/dns.lua +++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/dns.lua @@ -7,7 +7,7 @@ require("luci.sys") m = Map("luci_statistics", translate("DNS Plugin Configuration"), translate( - "The dns plugin collects detailled statistics about dns " .. + "The dns plugin collects detailed statistics about dns " .. "related traffic on selected interfaces." )) diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/exec.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/exec.lua index 48e0ec2d7a..9c8e3e1880 100644 --- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/exec.lua +++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/exec.lua @@ -51,8 +51,8 @@ notify = m:section( TypedSection, "collectd_exec_notify", translate( "Here you can define external commands which will be " .. "started by collectd when certain threshold values have " .. - "been reached. The values leading to invokation will be " .. - "feeded to the the called programs stdin." + "been reached. The values leading to invocation will be " .. + "fed to the the called programs stdin." )) notify.addremove = true notify.anonymous = true diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua index aa469843ec..ded3f7f996 100644 --- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua +++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua @@ -19,7 +19,7 @@ m = Map("luci_statistics", translate("Iptables Plugin Configuration"), translate( "The iptables plugin will monitor selected firewall rules and " .. - "collect informations about processed bytes and packets per rule." + "collect information about processed bytes and packets per rule." )) -- collectd_iptables config section diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua index 917abd0c43..66449ec467 100644 --- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua +++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua @@ -9,7 +9,7 @@ local devices = luci.sys.net.devices() m = Map("luci_statistics", translate("Netlink Plugin Configuration"), translate( - "The netlink plugin collects extended informations like " .. + "The netlink plugin collects extended information like " .. "qdisc-, class- and filter-statistics for selected interfaces." )) diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/processes.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/processes.lua index 4171a886b9..c0a18a9c1f 100644 --- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/processes.lua +++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/processes.lua @@ -4,7 +4,7 @@ m = Map("luci_statistics", translate("Processes Plugin Configuration"), translate( - "The processes plugin collects informations like cpu time, " .. + "The processes plugin collects information like cpu time, " .. "page faults and memory usage of selected processes." )) diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua index 3c650180aa..a02b2be4fd 100644 --- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua +++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua @@ -4,7 +4,7 @@ m = Map("luci_statistics", translate("TCPConns Plugin Configuration"), translate( - "The tcpconns plugin collects informations about open tcp " .. + "The tcpconns plugin collects information about open tcp " .. "connections on selected ports." )) diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/curl.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/curl.lua new file mode 100644 index 0000000000..89a65a6b5f --- /dev/null +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/curl.lua @@ -0,0 +1,22 @@ +-- Copyright 2018 Chizhong Jin <pjincz@gmail.com> +-- Licensed to the public under the BSD 3-clause license + +module("luci.statistics.rrdtool.definitions.curl", package.seeall) + +function rrdargs( graph, plugin, plugin_instance, dtype ) + return { + title = "%H: cUrl Response Time for #%pi", + y_min = "0", + alt_autoscale_max = true, + vlabel = "Response Time", + number_format = "%5.1lf%Ss", + data = { + types = { "response_time" }, + options = { + response_time = { + title = "" + } + } + } + } +end 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 6f687d218d..6ca65e539f 100644 --- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua @@ -17,7 +17,7 @@ function rrdargs( graph, plugin, plugin_instance ) -- diagram data description data = { - -- defined sources for data types, if ommitted assume a single DS named "value" (optional) + -- defined sources for data types, if omitted assume a single DS named "value" (optional) sources = { if_octets = { "tx", "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 7b6acf3663..a612126ed0 100644 --- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua @@ -14,7 +14,7 @@ function rrdargs( graph, plugin, plugin_instance ) -- diagram data description data = { - -- defined sources for data types, if ommitted assume a single DS named "value" (optional) + -- defined sources for data types, if omitted assume a single DS named "value" (optional) sources = { if_octets = { "tx", "rx" } }, diff --git a/applications/luci-app-statistics/po/ca/statistics.po b/applications/luci-app-statistics/po/ca/statistics.po index 738af5510f..367857cd3f 100644 --- a/applications/luci-app-statistics/po/ca/statistics.po +++ b/applications/luci-app-statistics/po/ca/statistics.po @@ -201,8 +201,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" "Ací pots definir ordres externes que s'iniciaran pel collectd quan s'aribi a " "uns certs valors llindars. Els valors que condueixin a la invocació, " @@ -558,14 +558,14 @@ msgstr "" "dispositius, punts de muntatge i tipus de sistema de fitxers." msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" "El connector de disc recull estadístiques d'ús detallades per les particions " "seleccionades o per tot el disc." msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" "El connector DNS recull estadístiques detallades sobre el tràfic DNS a les " @@ -600,7 +600,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" "El connector iptables monitoritzarà les regles de tallafocs seleccionades i " "recollirà informacions sobre els bytes i paquests processats per regla." @@ -629,7 +629,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "El connector de memòria recull estadístiques sobre l'ús de memòria." msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" "El connector d'enllaç de xarxa recull informació extensa com estadístiques " @@ -655,7 +655,7 @@ msgstr "" "i mesurarà el temps d'anada i tornada en cada màquina." msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" "El connector de processor recollirà informacions com el temps de cpu, errors " @@ -689,7 +689,7 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" "El connector TCPConns recull informació sobre les connexions TCP obertes en " diff --git a/applications/luci-app-statistics/po/cs/statistics.po b/applications/luci-app-statistics/po/cs/statistics.po index fc3f513c5c..703dc393a0 100644 --- a/applications/luci-app-statistics/po/cs/statistics.po +++ b/applications/luci-app-statistics/po/cs/statistics.po @@ -198,8 +198,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" msgid "" @@ -551,14 +551,14 @@ msgstr "" "zařízeních, přípojných bodech nebo typech souborových systémů." msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" "Plugin Disk shromažďuje podrobné statistiky o využívání vybraného oddílu " "nebo celého disku." msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" "Plugin DNS shromažďuje podrobné statistky o provozu, vztahující se k DNS, na " @@ -590,7 +590,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" "Plugin Iptables monitoruje vybraná pravidla firewallu a shromažďuje " "informace o zpracovaných bajtech a paketech pro každé pravidlo." @@ -616,7 +616,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "Plugin Memory shromažďuje statistiky o využití paměti." msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" "Plugin Netlink shromažďuje rozšířené informace jako statistiky qdisk, class " @@ -641,7 +641,7 @@ msgstr "" "zpáteční čas pro každého hosta." msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" "Plugin Processes shromažďuje informace o procesorovém času, výpadcích " @@ -675,7 +675,7 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" "Plugin Tcpconns shromažďuje informace o otevřených TCP spojeních na " diff --git a/applications/luci-app-statistics/po/de/statistics.po b/applications/luci-app-statistics/po/de/statistics.po index 45ba020ada..151d1d73eb 100644 --- a/applications/luci-app-statistics/po/de/statistics.po +++ b/applications/luci-app-statistics/po/de/statistics.po @@ -200,8 +200,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" "Hier können externe Kommandos definiert werden, welche durch Collectd " "gestartet werden sobald konfigurierte Grenzwerte erreicht werden. Die Werte " @@ -563,14 +563,14 @@ msgstr "" "verschiedenen Geräten, Mount-Punkten oder Dateisystemtypen." msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" "Das Disk-Plugin sammelt detaillierte Statistiken über die Auslastung auf " "ausgewählten Festplatten und Partitionen." msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" "Das DNS-Plugin sammelt detaillierte Statistiken über DNS-bezogenen Verkehr " @@ -605,7 +605,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" "Das Iptables-Plugin überwacht ausgewählte Firewall-Regeln und sammelt Werte " "über die Anzahl der verarbeiteten Pakete und Bytes." @@ -633,7 +633,7 @@ msgstr "" "Das memory-Plugin sammelt Statistiken über die RAM-Auslastung des Systems." msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" "Das Netlink-Plugin sammelt erweiterte QoS-Informationen wie QDisc-, Class- " @@ -659,7 +659,7 @@ msgstr "" "Antwortzeiten für jede Adresse." msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" "Das Prozess-Plugin sammelt Statistiken über Prozess-Zeit, Speicher-Fehler " @@ -694,7 +694,7 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" "Das TCPConns-Plugin sammelt Informationen über offene TCP-Verbindungen auf " diff --git a/applications/luci-app-statistics/po/el/statistics.po b/applications/luci-app-statistics/po/el/statistics.po index 4062868446..b2d88f51ca 100644 --- a/applications/luci-app-statistics/po/el/statistics.po +++ b/applications/luci-app-statistics/po/el/statistics.po @@ -199,8 +199,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" msgid "" @@ -544,12 +544,12 @@ msgid "" msgstr "" msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" @@ -574,7 +574,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" msgid "" @@ -594,7 +594,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "" msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" @@ -611,7 +611,7 @@ msgid "" msgstr "" msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" @@ -639,7 +639,7 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" diff --git a/applications/luci-app-statistics/po/en/statistics.po b/applications/luci-app-statistics/po/en/statistics.po index f7ebfe0c2b..5c02e36287 100644 --- a/applications/luci-app-statistics/po/en/statistics.po +++ b/applications/luci-app-statistics/po/en/statistics.po @@ -199,12 +199,12 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgid "" "Here you can define various criteria by which the monitored iptables rules " @@ -553,17 +553,17 @@ msgstr "" "devices, mount points or filesystem types." msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgid "" @@ -594,10 +594,10 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgid "" "The irq plugin will monitor the rate of issues per second for each selected " @@ -618,10 +618,10 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "" msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgid "" @@ -643,10 +643,10 @@ msgstr "" "the roundtrip time for each host." msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgid "" @@ -677,10 +677,10 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgid "" diff --git a/applications/luci-app-statistics/po/es/statistics.po b/applications/luci-app-statistics/po/es/statistics.po index 3c811ffeff..86370b48f3 100644 --- a/applications/luci-app-statistics/po/es/statistics.po +++ b/applications/luci-app-statistics/po/es/statistics.po @@ -199,8 +199,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" "Aquí puede definir los comandos externos que iniciará collectd cuando se " "alcancen ciertos valores umbral." @@ -560,14 +560,14 @@ msgstr "" "en diferentes dispositivos, puntos de montaje y tipos de sistema de archivos." msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" "El plugin \"Disco\" recolecta estadísticas detallada acerca de su " "utilización para las particiones seleccionadas o bien el disco completo." msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" "El plugin \"DNS\" recolecta estadísticas detalladas acerca del trafico DNS " @@ -603,7 +603,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" "El plugin \"Iptables\" monitoriza las reglas seleccionadas del cortafuegos y " "recoge información de bytes y paquetes procesados por cada regla." @@ -630,7 +630,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "El plugin \"memoria\" recoge estadísticas sobre el uso de memoria." msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" "El plugin \"netlink\" recoge informaciones extendidas como estadísticas " @@ -656,7 +656,7 @@ msgstr "" "tiempo de viaje para cada host." msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" "El plugin \"procesos\" recoge información como tiempo de CPU, fallos de " @@ -690,7 +690,7 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" "El plugin \"tcpconns\" recoge información de conexiones TCP abiertas en los " diff --git a/applications/luci-app-statistics/po/fr/statistics.po b/applications/luci-app-statistics/po/fr/statistics.po index bc156dd42a..3c4ca7ba4b 100644 --- a/applications/luci-app-statistics/po/fr/statistics.po +++ b/applications/luci-app-statistics/po/fr/statistics.po @@ -200,8 +200,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" "Vous pouvez définir ici des commandes externes qui seront démarrées par " "collectd quand certaines valeurs-seuil seront atteintes. Les valeurs " @@ -554,14 +554,14 @@ msgstr "" "différents périphériques, points de montage ou types de systèmes de fichiers." msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" "Le greffon Disque récupère des informations détaillées sur des disques ou " "partitions sélectionnées." msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" "Le greffon DNS récupère des données détaillées à propos du trafic lié au DNS " @@ -596,7 +596,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" "Le greffon IPtables surveillera des règles de pare-feu sélectionnées et " "collectera des informations sur les octets et paquets IP traités par chaque " @@ -624,11 +624,11 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "" msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" "Le greffon de lien-réseau récupère sur les interfaces sélectionnées des " -"informations avancées liées à la QOS, aux classes et au filtrage." +"informations avancées liées à la QOS, aux classes et au filtrage." msgid "" "The network plugin provides network based communication between different " @@ -640,7 +640,7 @@ msgstr "" "instances collectd : ce programme peut fonctionner à la fois comme client et " "serveur. En mode client, les données collectées localement sont transférées " "à un serveur, en mode serveur, l'instance collectd locale reçoit des " -"informations d'autres hôtes." +"informations d'autres hôtes." msgid "" "The ping plugin will send icmp echo replies to selected hosts and measure " @@ -650,7 +650,7 @@ msgstr "" "mesure le temps d'aller-retour avec chacun." msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" "Le greffon des processus récupère des informations comme le temps CPU, les " @@ -685,7 +685,7 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" "Le greffon des connexions TCP récupère des informations sur les ouvertures " diff --git a/applications/luci-app-statistics/po/he/statistics.po b/applications/luci-app-statistics/po/he/statistics.po index 35f978ed20..27b9993d2d 100644 --- a/applications/luci-app-statistics/po/he/statistics.po +++ b/applications/luci-app-statistics/po/he/statistics.po @@ -194,8 +194,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" msgid "" @@ -539,12 +539,12 @@ msgid "" msgstr "" msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" @@ -569,7 +569,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" msgid "" @@ -589,7 +589,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "" msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" @@ -606,7 +606,7 @@ msgid "" msgstr "" msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" @@ -634,7 +634,7 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" diff --git a/applications/luci-app-statistics/po/hu/statistics.po b/applications/luci-app-statistics/po/hu/statistics.po index e5c4e601cb..64a58a0873 100644 --- a/applications/luci-app-statistics/po/hu/statistics.po +++ b/applications/luci-app-statistics/po/hu/statistics.po @@ -198,8 +198,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" "Itt megadhatók külső parancsok amelyek a collectd által lesznek futtatva " "amikor bizonyos küszbértékek elérésre kerülnek. A hívást kiváltó értékek a " @@ -565,14 +565,14 @@ msgstr "" "eszközökön, csatolási pontokon vagy fájlrendszereken." msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" "A lemez bővítmény részletes használati statisztikákat készít a kiválasztott " "paticiókhoz vagy teljes lemezekhez." msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" "A DNS bővítmény részletes adatokat gyűjt a kiválasztott interfészek DNS-hez " @@ -607,7 +607,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" "Az iptables bővítmény kiválasztott tűzfal szabályok alapján információt " "gyűjt a szabályonként feldolgozott bájtokról és csomagokról." @@ -630,7 +630,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "A memória bővítmény a memórahasználatról gyűjt információkat." msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" @@ -649,7 +649,7 @@ msgstr "" "oda-vissza eltelt időt minden gép esetében." msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" @@ -677,7 +677,7 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" "A tcpconns bővítmény a kiválasztott portokon lévő TCP kapcsolatokról gyűjt " diff --git a/applications/luci-app-statistics/po/it/statistics.po b/applications/luci-app-statistics/po/it/statistics.po index 2451503f23..c40e38f4e6 100644 --- a/applications/luci-app-statistics/po/it/statistics.po +++ b/applications/luci-app-statistics/po/it/statistics.po @@ -199,8 +199,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" "Qui puoi definire un comando che sarà avviato da collectd quando un certo " "valore soglia sia raggiunto. Il valore in questione sarà passato al comando " @@ -549,12 +549,12 @@ msgid "" msgstr "" msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" @@ -579,7 +579,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" msgid "" @@ -599,7 +599,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "" msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" @@ -616,7 +616,7 @@ msgid "" msgstr "" msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" @@ -644,7 +644,7 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" diff --git a/applications/luci-app-statistics/po/ja/statistics.po b/applications/luci-app-statistics/po/ja/statistics.po index 53941cf0f8..632dc02614 100644 --- a/applications/luci-app-statistics/po/ja/statistics.po +++ b/applications/luci-app-statistics/po/ja/statistics.po @@ -198,8 +198,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" "ここでは、特定の閾値に到達したときにcollectによって開始される外部コマンドを設" "定することができます。呼び出しにつながる値は、呼び出されたプログラムの標準入" @@ -559,14 +559,14 @@ msgstr "" "ディスク使用量についての統計を収集します。" msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" "ディスク プラグインは、選択されたパーティションまたはディスク全体の詳細な使用" "統計を収集します。" msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" "DNS プラグインは、選択されたインターフェースでのDNSに関連したトラフィックにつ" @@ -602,7 +602,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" "iptables プラグインは、選択されたファイアウォール規をモニターし、規則ごとの処" "理されたバイト数とパケット数についての情報を収集します。" @@ -627,7 +627,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "メモリー プラグインは、メモリー使用についての統計を収集します。" msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" "Netlink プラグインは、選択されたインターフェースの qdisc- や class- 、filter-" @@ -653,7 +653,7 @@ msgstr "" "復時間を計測します。" msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" "プロセス プラグインは、選択されたプロセスのCPU時間やページフォルト、メモリー" @@ -692,7 +692,7 @@ msgstr "" "rrdtool/\">RRDtool</a>を使用します。" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" "TCP接続プラグインは、選択されたポートにおいてオープンなTCP接続についての情報" diff --git a/applications/luci-app-statistics/po/ms/statistics.po b/applications/luci-app-statistics/po/ms/statistics.po index c02556fc86..55fcd3207a 100644 --- a/applications/luci-app-statistics/po/ms/statistics.po +++ b/applications/luci-app-statistics/po/ms/statistics.po @@ -191,8 +191,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" msgid "" @@ -536,12 +536,12 @@ msgid "" msgstr "" msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" @@ -566,7 +566,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" msgid "" @@ -586,7 +586,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "" msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" @@ -603,7 +603,7 @@ msgid "" msgstr "" msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" @@ -631,7 +631,7 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" diff --git a/applications/luci-app-statistics/po/no/statistics.po b/applications/luci-app-statistics/po/no/statistics.po index 4de2ee6b55..d3318518e3 100644 --- a/applications/luci-app-statistics/po/no/statistics.po +++ b/applications/luci-app-statistics/po/no/statistics.po @@ -190,8 +190,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" "Her kan du definere eksterne kommandoer som blir startet av collectd når " "visse grenseverdier er blitt nådd. Verdiene som fører til aktivering vil bli " @@ -542,14 +542,14 @@ msgstr "" "punkter eller filsystem typer." msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" "Disk plugin samler detaljert brukerstatistikk for utvalgte partisjoner og " "hele disker." msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" "DNS pluging samler detaljert statistikk om DNS relatert trafikk på utvalgte " @@ -582,7 +582,7 @@ msgstr "Grensesnitt plugin samler trafikk statistikk på utvalgte grensesnitt." msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" "Iptables plugin vil overvåke utvalgte brannmurregler og samle informasjon om " "bearbeidet data per regel." @@ -606,7 +606,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "" msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" "Netlink plugin samler utvidet informasjon som qdisc-, klasse- og filter-" @@ -631,7 +631,7 @@ msgstr "" "rundtur tar for hver vert." msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" "Prosess plugin samler informasjon som f.eks. CPU tid, sidefeil og minnebruk " @@ -665,7 +665,7 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" "Tcpconns plugin samler informasjon om åpne TCP tilkoblinger på utvalgte " diff --git a/applications/luci-app-statistics/po/pl/statistics.po b/applications/luci-app-statistics/po/pl/statistics.po index 6e34ce0725..208580d15a 100644 --- a/applications/luci-app-statistics/po/pl/statistics.po +++ b/applications/luci-app-statistics/po/pl/statistics.po @@ -200,8 +200,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" "Tutaj można zdefiniować zewnętrzne komendy, które będą włączane przez " "collectd, kiedy zostaną osiągnięte konkretne wartości progowe. Wartości " @@ -559,14 +559,14 @@ msgstr "" "urządzenia, dyskach i systemach plików." msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" "Wtyczka \"disk\" zbiera szczegółowe informacje z poszczególnych partycji lub " "całych dysków." msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" "Wtyczka \"dns\" zbiera statystyki odnośnie ruchu DNS dla wybranych " @@ -599,7 +599,7 @@ msgstr "Wtyczka \"interface\" zbiera statystyki z wybranych interfejsów." msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" "Wtyczka \"iptables\" monitoruje wybrane reguły firewalla i zbiera statystyki " "o procesach, bajtach i pakietach przypadających na daną regułę." @@ -625,7 +625,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "Wtyczka \"memory\" zbiera statystyki dotyczące wykorzystania pamięci." msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" "Wtyczki netlink zbiera rozszerzone informacje statystyk z qdisc-, klasa- i " @@ -650,7 +650,7 @@ msgstr "" "hostów oraz mierzy czasy odpowiedzi zwrotnych dla każdego z nich." msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" "Wtyczki processes zbiera informacje o czasie procesora, błędach strony i " @@ -685,7 +685,7 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" "Wtyczka \"tcpconns\" zbiera informacje o otwartych połączeniach tcp dla " diff --git a/applications/luci-app-statistics/po/pt-br/statistics.po b/applications/luci-app-statistics/po/pt-br/statistics.po index 601ac962ea..acfcb3c2db 100644 --- a/applications/luci-app-statistics/po/pt-br/statistics.po +++ b/applications/luci-app-statistics/po/pt-br/statistics.po @@ -200,8 +200,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" "Aqui você pode definir os comandos externos que serão iniciados pelo " "collectd quando determinados valores limite forem atingidos. Os valores " @@ -568,14 +568,14 @@ msgstr "" "diferentes dispositivos, pontos de montagem ou tipos de sistemas de arquivos." msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" "O plugin disco coleta estatísticas de uso detalhadas das partições " "selecionadas ou discos inteiros." msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" "O plugin dns coleta estatísticas detalhadas sobre o tráfego do dns nas " @@ -610,7 +610,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" "O plugin iptables irá monitorar as regras de firewall selecionadas e coletar " "informações sobre pacotes e bytes processados pela regra." @@ -637,7 +637,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "O plugin de memória coleta estatísticas sobre o uso da memória." msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" "O plugin Netlink coleta informações detalhadas como qdisc-, classe- e " @@ -663,7 +663,7 @@ msgstr "" "selecionados e medir o tempo de resposta para cada equipamento." msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" "O plugin de processos coleta informações como o tempo da cpu, falha de " @@ -704,7 +704,7 @@ msgstr "" "a> para desenhar os gráficos." msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" "O plugin tcpconns coleta informações sobre as conexões TCP abertas das " diff --git a/applications/luci-app-statistics/po/pt/statistics.po b/applications/luci-app-statistics/po/pt/statistics.po index 245e6e9bf9..1256878ee3 100644 --- a/applications/luci-app-statistics/po/pt/statistics.po +++ b/applications/luci-app-statistics/po/pt/statistics.po @@ -199,8 +199,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" "Aqui pode definir os comandos externos que serão iniciados pelo collectd " "quando determinados valores limite forem atingidos. Os valores passados ao " @@ -556,14 +556,14 @@ msgstr "" "diferentes dispositivos, pontos de montagem ou tipos de sistemas de arquivos." msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" "O plugin disco coleta estatísticas de uso detalhadas das partições " "selecionadas ou discos inteiros." msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" "O plugin dns coleta estatísticas detalhadas sobre o tráfego do dns nas " @@ -598,7 +598,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" "O plugin iptables irá monitorar as regras de firewall selecionadas e coletar " "informações sobre pacotes e bytes processados pela regra." @@ -623,7 +623,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "" msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" "O plugin Netlink coleta informações detalhadas como qdisc-, classe- e filtro " @@ -649,7 +649,7 @@ msgstr "" "medir o tempo de resposta para cada host." msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" "O plugin processo coleta informações como o tempo da cpu, página falhas e " @@ -683,7 +683,7 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" "O plugin tcpconns coleta informações sobre as conexões TCP abertas das " diff --git a/applications/luci-app-statistics/po/ro/statistics.po b/applications/luci-app-statistics/po/ro/statistics.po index a326fec799..84a3aa1044 100644 --- a/applications/luci-app-statistics/po/ro/statistics.po +++ b/applications/luci-app-statistics/po/ro/statistics.po @@ -198,8 +198,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" msgid "" @@ -545,12 +545,12 @@ msgid "" msgstr "" msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" @@ -575,7 +575,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" msgid "" @@ -595,7 +595,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "" msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" @@ -612,7 +612,7 @@ msgid "" msgstr "" msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" @@ -640,7 +640,7 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" diff --git a/applications/luci-app-statistics/po/ru/statistics.po b/applications/luci-app-statistics/po/ru/statistics.po index 300b1c07da..9af2767da6 100644 --- a/applications/luci-app-statistics/po/ru/statistics.po +++ b/applications/luci-app-statistics/po/ru/statistics.po @@ -201,8 +201,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" "На странице вы можете определить внешние команды, которые будут выполнены, " "когда значения достигнут определенного порога. Значения будут переданы на " @@ -567,13 +567,13 @@ msgstr "" "устройствах, точках монтирования или файловых системах." msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" "Плагин 'Disk' собирает подробную статистику по выбранным разделам или дискам." msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" "Плагин 'DNS' собирает подробную статистику о DNS трафике на выбранных " @@ -607,7 +607,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" "Плагин 'Iptables' собирает статистику с определенных правил межсетевого " "экрана." @@ -634,7 +634,7 @@ msgstr "" "памяти." msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" "Плагин 'Netlink' собирает расширенную статистику с выбранных интерфейсов." @@ -658,7 +658,7 @@ msgstr "" "отклика." msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" "Плагин 'Processes' собирает информацию, такую как время CPU, ошибки страницы " @@ -698,7 +698,7 @@ msgstr "" "и представления их в виде графиков." msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" "Плагин 'TCPConns' собирает информацию об открытых TCP соединениях на " diff --git a/applications/luci-app-statistics/po/sk/statistics.po b/applications/luci-app-statistics/po/sk/statistics.po index 53858ca540..ff0af62b35 100644 --- a/applications/luci-app-statistics/po/sk/statistics.po +++ b/applications/luci-app-statistics/po/sk/statistics.po @@ -189,8 +189,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" msgid "" @@ -534,12 +534,12 @@ msgid "" msgstr "" msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" @@ -564,7 +564,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" msgid "" @@ -584,7 +584,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "" msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" @@ -601,7 +601,7 @@ msgid "" msgstr "" msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" @@ -629,7 +629,7 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" diff --git a/applications/luci-app-statistics/po/sv/statistics.po b/applications/luci-app-statistics/po/sv/statistics.po index 9d738f2f33..0aa1381ee1 100644 --- a/applications/luci-app-statistics/po/sv/statistics.po +++ b/applications/luci-app-statistics/po/sv/statistics.po @@ -193,8 +193,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" msgid "" @@ -539,12 +539,12 @@ msgid "" msgstr "" msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" @@ -569,7 +569,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" msgid "" @@ -589,7 +589,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "" msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" @@ -606,7 +606,7 @@ msgid "" msgstr "" msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" @@ -634,7 +634,7 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" diff --git a/applications/luci-app-statistics/po/templates/statistics.pot b/applications/luci-app-statistics/po/templates/statistics.pot index ec630b6962..c5997ace9a 100644 --- a/applications/luci-app-statistics/po/templates/statistics.pot +++ b/applications/luci-app-statistics/po/templates/statistics.pot @@ -182,8 +182,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" msgid "" @@ -527,12 +527,12 @@ msgid "" msgstr "" msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" @@ -557,7 +557,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" msgid "" @@ -577,7 +577,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "" msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" @@ -594,7 +594,7 @@ msgid "" msgstr "" msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" @@ -622,7 +622,7 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" diff --git a/applications/luci-app-statistics/po/tr/statistics.po b/applications/luci-app-statistics/po/tr/statistics.po index 860ff95e88..0bcff9dc0e 100644 --- a/applications/luci-app-statistics/po/tr/statistics.po +++ b/applications/luci-app-statistics/po/tr/statistics.po @@ -190,8 +190,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" msgid "" @@ -535,12 +535,12 @@ msgid "" msgstr "" msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" @@ -565,7 +565,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" msgid "" @@ -585,7 +585,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "" msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" @@ -602,7 +602,7 @@ msgid "" msgstr "" msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" @@ -630,7 +630,7 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" diff --git a/applications/luci-app-statistics/po/uk/statistics.po b/applications/luci-app-statistics/po/uk/statistics.po index ac9ae50940..87136d0946 100644 --- a/applications/luci-app-statistics/po/uk/statistics.po +++ b/applications/luci-app-statistics/po/uk/statistics.po @@ -195,8 +195,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" msgid "" @@ -540,12 +540,12 @@ msgid "" msgstr "" msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" @@ -570,7 +570,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" msgid "" @@ -590,7 +590,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "" msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" @@ -607,7 +607,7 @@ msgid "" msgstr "" msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" @@ -635,7 +635,7 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" diff --git a/applications/luci-app-statistics/po/vi/statistics.po b/applications/luci-app-statistics/po/vi/statistics.po index f5798a2651..09d2e9e79c 100644 --- a/applications/luci-app-statistics/po/vi/statistics.po +++ b/applications/luci-app-statistics/po/vi/statistics.po @@ -200,12 +200,12 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" "Ở đây bạn có thể định nghĩa các lệnh bên ngoài cái mà bắt đầu bằng collectd " "khi những giá trị threshold nhất định được tiếp cận. Những giá trị dẫn tới " -"invokation sẽ được feed tới một chương trình gọi là stdin" +"invocation sẽ được feed tới một chương trình gọi là stdin" msgid "" "Here you can define various criteria by which the monitored iptables rules " @@ -554,14 +554,14 @@ msgstr "" "thiết bị khác, mount points hoặc những loại filesystem." msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "" "Disk plugin thu thập số liệu thống kê chi tiết về cách sử dụng cho những " "phân vùng lựa chọn hoặc toàn bộ đĩa." msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "" " dns plugin thu thập những thông kê chi tiết về dns liên quan đến lưu thông " @@ -597,7 +597,7 @@ msgstr "" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "" "iptables plugin sẽ monitor những cái firewall rules được chọn và thu thập " "thông tin về bytes xử lý và gói trên rule. " @@ -623,7 +623,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "" msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" "Netlink plugin thu thập những thông tin mở rộng như qdisc-, class- and " @@ -649,7 +649,7 @@ msgstr "" "gian vận hành qua lại cho từng host" msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "" "Processes plugin thu thập thông tin như cpu time, page faults và memory " @@ -683,7 +683,7 @@ msgid "" msgstr "" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "" "Tcpconns plugin thu thập thông tin về open tcp kết nối trên những cổng được " diff --git a/applications/luci-app-statistics/po/zh-cn/statistics.po b/applications/luci-app-statistics/po/zh-cn/statistics.po index fe631b5e8f..0075fabbc5 100644 --- a/applications/luci-app-statistics/po/zh-cn/statistics.po +++ b/applications/luci-app-statistics/po/zh-cn/statistics.po @@ -201,8 +201,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" "在这里，您可以定义外部命令，当 Collectd 达到一定阈值时，将启动命令。阀值将会" "作为命令的标准输入。" @@ -550,12 +550,12 @@ msgid "" msgstr "df 插件收集磁盘空间使用情况、挂载点及文件系统相关信息。" msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "disk 插件收集磁盘分区使用情况及相关信息。" msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "dns 插件收集 dns 数据流相关信息。" @@ -584,7 +584,7 @@ msgstr "Interface 插件用于收集选定接口的数据包的统计信息。" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "iptables 插件将监测选定防火墙规则和收集关于每个规则处理的数据包信息。" msgid "" @@ -606,7 +606,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "memory 插件收集关于内存使用情况的统计信息。" msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "netlink 插件收集为选定接口 qdisc-、class- 和 filter- 的扩展数据。" @@ -626,7 +626,7 @@ msgid "" msgstr "ping 插件将发送 icmp echo replies 到选定主机来测量每台主机的响应时间。" msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "processes 插件收集选定进程的 cpu 时间、页面错误和内存使用信息。" @@ -660,7 +660,7 @@ msgstr "" "表。" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "tcpconns 插件收集选定端口 TCP 连接信息。" diff --git a/applications/luci-app-statistics/po/zh-tw/statistics.po b/applications/luci-app-statistics/po/zh-tw/statistics.po index f0bfae35da..9661a7b906 100644 --- a/applications/luci-app-statistics/po/zh-tw/statistics.po +++ b/applications/luci-app-statistics/po/zh-tw/statistics.po @@ -201,8 +201,8 @@ msgstr "" msgid "" "Here you can define external commands which will be started by collectd when " -"certain threshold values have been reached. The values leading to invokation " -"will be feeded to the the called programs stdin." +"certain threshold values have been reached. The values leading to invocation " +"will be fed to the the called programs stdin." msgstr "" "在這裡，您可以定義外部指令，當 Collectd 達到一定閾值時，將啟動指令。閥值將會" "作為指令的標準輸入。" @@ -550,12 +550,12 @@ msgid "" msgstr "df 外掛收集磁碟空間使用情況、掛載點及檔案系統相關資訊。" msgid "" -"The disk plugin collects detailled usage statistics for selected partitions " +"The disk plugin collects detailed usage statistics for selected partitions " "or whole disks." msgstr "disk 外掛收集磁碟分割槽使用情況及相關資訊。" msgid "" -"The dns plugin collects detailled statistics about dns related traffic on " +"The dns plugin collects detailed statistics about dns related traffic on " "selected interfaces." msgstr "dns 外掛收集 dns 資料流相關資訊。" @@ -584,7 +584,7 @@ msgstr "Interface 外掛用於收集選定介面的資料包的統計資訊。" msgid "" "The iptables plugin will monitor selected firewall rules and collect " -"informations about processed bytes and packets per rule." +"information about processed bytes and packets per rule." msgstr "iptables 外掛將監測選定防火牆規則和收集關於每個規則處理的資料包資訊。" msgid "" @@ -606,7 +606,7 @@ msgid "The memory plugin collects statistics about the memory usage." msgstr "memory 外掛收集關於記憶體使用情況的統計資訊。" msgid "" -"The netlink plugin collects extended informations like qdisc-, class- and " +"The netlink plugin collects extended information like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "netlink 外掛收集為選定介面 qdisc-、class- 和 filter- 的擴充套件資料。" @@ -626,7 +626,7 @@ msgid "" msgstr "ping 外掛將傳送 icmp echo replies 到選定主機來測量每臺主機的響應時間。" msgid "" -"The processes plugin collects informations like cpu time, page faults and " +"The processes plugin collects information like cpu time, page faults and " "memory usage of selected processes." msgstr "processes 外掛收集選定程序的 cpu 時間、頁面錯誤和記憶體使用資訊。" @@ -660,7 +660,7 @@ msgstr "" "表。" msgid "" -"The tcpconns plugin collects informations about open tcp connections on " +"The tcpconns plugin collects information about open tcp connections on " "selected ports." msgstr "tcpconns 外掛收集選定埠 TCP 連線資訊。" diff --git a/applications/luci-app-statistics/root/etc/config/luci_statistics b/applications/luci-app-statistics/root/etc/config/luci_statistics index 8cc918e3db..1e841fec8a 100644 --- a/applications/luci-app-statistics/root/etc/config/luci_statistics +++ b/applications/luci-app-statistics/root/etc/config/luci_statistics @@ -66,6 +66,9 @@ config statistics 'collectd_cpu' config statistics 'collectd_cpufreq' option enable '0' +config statistics 'collectd_curl' + option enable '0' + config statistics 'collectd_df' option enable '0' option Devices '/dev/mtdblock/4' diff --git a/applications/luci-app-statistics/root/usr/bin/stat-genconfig b/applications/luci-app-statistics/root/usr/bin/stat-genconfig index 2bf63c1fe6..7d1349b249 100755 --- a/applications/luci-app-statistics/root/usr/bin/stat-genconfig +++ b/applications/luci-app-statistics/root/usr/bin/stat-genconfig @@ -117,6 +117,21 @@ function config_exec( c ) return str end +function config_curl( c ) + local str = "" + + for s in pairs(sections) do + if sections[s][".type"] == "collectd_curl_page" then + str = str .. "\t<Page \"" .. sections[s].name .. "\">\n" .. + "\t\tURL \"" .. sections[s].url .. "\"\n" .. + "\t\tMeasureResponseTime true\n" .. + "\t</Page>\n" + end + end + + return str +end + function config_iptables( c ) local str = "" @@ -297,6 +312,8 @@ plugins = { { } }, + curl = config_curl, + df = { { }, { "IgnoreSelected" }, diff --git a/applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua b/applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua index 11f34fbad4..e38dec4b91 100644 --- a/applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua +++ b/applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua @@ -216,7 +216,7 @@ s.addremove = true t = s:option(ListValue, "type", translate("Policy"), - translate("<em>Via proxy</em> routes requests to the given target via the specifed upstream proxy, <em>Reject access</em> disables any upstream proxy for the target")) + translate("<em>Via proxy</em> routes requests to the given target via the specified upstream proxy, <em>Reject access</em> disables any upstream proxy for the target")) t:value("proxy", translate("Via proxy")) t:value("reject", translate("Reject access")) diff --git a/applications/luci-app-tinyproxy/po/ca/tinyproxy.po b/applications/luci-app-tinyproxy/po/ca/tinyproxy.po index 69cd99e5b9..f6f2ba32ee 100644 --- a/applications/luci-app-tinyproxy/po/ca/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/ca/tinyproxy.po @@ -16,7 +16,7 @@ msgstr "" "X-Generator: Pootle 2.0.6\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/cs/tinyproxy.po b/applications/luci-app-tinyproxy/po/cs/tinyproxy.po index 2a2cbdc84a..5d350d62ce 100644 --- a/applications/luci-app-tinyproxy/po/cs/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/cs/tinyproxy.po @@ -12,7 +12,7 @@ msgstr "" "X-Generator: Pootle 2.0.6\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/de/tinyproxy.po b/applications/luci-app-tinyproxy/po/de/tinyproxy.po index d444872437..aa719c6f3e 100644 --- a/applications/luci-app-tinyproxy/po/de/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/de/tinyproxy.po @@ -14,7 +14,7 @@ msgstr "" "X-Generator: Pootle 2.0.6\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/el/tinyproxy.po b/applications/luci-app-tinyproxy/po/el/tinyproxy.po index 718424e0ce..2f4f59fb93 100644 --- a/applications/luci-app-tinyproxy/po/el/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/el/tinyproxy.po @@ -14,7 +14,7 @@ msgstr "" "X-Generator: Pootle 2.0.4\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/en/tinyproxy.po b/applications/luci-app-tinyproxy/po/en/tinyproxy.po index 4650f3e1fc..276797b927 100644 --- a/applications/luci-app-tinyproxy/po/en/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/en/tinyproxy.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Translate Toolkit 1.1.1\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/es/tinyproxy.po b/applications/luci-app-tinyproxy/po/es/tinyproxy.po index c9faff194a..ec99699927 100644 --- a/applications/luci-app-tinyproxy/po/es/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/es/tinyproxy.po @@ -14,7 +14,7 @@ msgstr "" "X-Generator: Pootle 2.0.6\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/fr/tinyproxy.po b/applications/luci-app-tinyproxy/po/fr/tinyproxy.po index d359442a20..38f86d69d1 100644 --- a/applications/luci-app-tinyproxy/po/fr/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/fr/tinyproxy.po @@ -14,7 +14,7 @@ msgstr "" "X-Generator: Pootle 2.0.6\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/he/tinyproxy.po b/applications/luci-app-tinyproxy/po/he/tinyproxy.po index 5c4ddddb09..a1368218b6 100644 --- a/applications/luci-app-tinyproxy/po/he/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/he/tinyproxy.po @@ -9,7 +9,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/hu/tinyproxy.po b/applications/luci-app-tinyproxy/po/hu/tinyproxy.po index 5c4ddddb09..a1368218b6 100644 --- a/applications/luci-app-tinyproxy/po/hu/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/hu/tinyproxy.po @@ -9,7 +9,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/it/tinyproxy.po b/applications/luci-app-tinyproxy/po/it/tinyproxy.po index 34528c1139..4fea270dbc 100644 --- a/applications/luci-app-tinyproxy/po/it/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/it/tinyproxy.po @@ -14,7 +14,7 @@ msgstr "" "X-Generator: Pootle 2.0.6\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/ja/tinyproxy.po b/applications/luci-app-tinyproxy/po/ja/tinyproxy.po index 03ea890fee..00dddaaf57 100644 --- a/applications/luci-app-tinyproxy/po/ja/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/ja/tinyproxy.po @@ -14,7 +14,7 @@ msgstr "" "X-Generator: Pootle 2.0.4\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/ms/tinyproxy.po b/applications/luci-app-tinyproxy/po/ms/tinyproxy.po index 08ed7dc47a..51079ddae9 100644 --- a/applications/luci-app-tinyproxy/po/ms/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/ms/tinyproxy.po @@ -8,7 +8,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/no/tinyproxy.po b/applications/luci-app-tinyproxy/po/no/tinyproxy.po index 5c4ddddb09..a1368218b6 100644 --- a/applications/luci-app-tinyproxy/po/no/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/no/tinyproxy.po @@ -9,7 +9,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/pl/tinyproxy.po b/applications/luci-app-tinyproxy/po/pl/tinyproxy.po index 8e3bfc7f75..962455a0ce 100644 --- a/applications/luci-app-tinyproxy/po/pl/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/pl/tinyproxy.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Pootle 2.0.6\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/pt-br/tinyproxy.po b/applications/luci-app-tinyproxy/po/pt-br/tinyproxy.po index ef7ffdad87..92945ad227 100644 --- a/applications/luci-app-tinyproxy/po/pt-br/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/pt-br/tinyproxy.po @@ -14,7 +14,7 @@ msgstr "" "X-Generator: Pootle 2.0.6\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/pt/tinyproxy.po b/applications/luci-app-tinyproxy/po/pt/tinyproxy.po index 833a7fa621..aa8f498ef2 100644 --- a/applications/luci-app-tinyproxy/po/pt/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/pt/tinyproxy.po @@ -14,7 +14,7 @@ msgstr "" "X-Generator: Pootle 2.0.6\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/ro/tinyproxy.po b/applications/luci-app-tinyproxy/po/ro/tinyproxy.po index 799fecbc9f..4acfdf6044 100644 --- a/applications/luci-app-tinyproxy/po/ro/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/ro/tinyproxy.po @@ -10,7 +10,7 @@ msgstr "" "20)) ? 1 : 2;\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/ru/tinyproxy.po b/applications/luci-app-tinyproxy/po/ru/tinyproxy.po index 8e7362a458..64f2036806 100644 --- a/applications/luci-app-tinyproxy/po/ru/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/ru/tinyproxy.po @@ -16,7 +16,7 @@ msgstr "" "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/sk/tinyproxy.po b/applications/luci-app-tinyproxy/po/sk/tinyproxy.po index 128c71d4f2..3f97c8864b 100644 --- a/applications/luci-app-tinyproxy/po/sk/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/sk/tinyproxy.po @@ -9,7 +9,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/sv/tinyproxy.po b/applications/luci-app-tinyproxy/po/sv/tinyproxy.po index d49df605e7..1daf6b2f49 100644 --- a/applications/luci-app-tinyproxy/po/sv/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/sv/tinyproxy.po @@ -10,7 +10,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/templates/tinyproxy.pot b/applications/luci-app-tinyproxy/po/templates/tinyproxy.pot index 712fad92aa..a560550e21 100644 --- a/applications/luci-app-tinyproxy/po/templates/tinyproxy.pot +++ b/applications/luci-app-tinyproxy/po/templates/tinyproxy.pot @@ -2,7 +2,7 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/tr/tinyproxy.po b/applications/luci-app-tinyproxy/po/tr/tinyproxy.po index a7af49df2f..99ec20164e 100644 --- a/applications/luci-app-tinyproxy/po/tr/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/tr/tinyproxy.po @@ -9,7 +9,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/uk/tinyproxy.po b/applications/luci-app-tinyproxy/po/uk/tinyproxy.po index 2e268ba7fe..73742f9617 100644 --- a/applications/luci-app-tinyproxy/po/uk/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/uk/tinyproxy.po @@ -10,7 +10,7 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/vi/tinyproxy.po b/applications/luci-app-tinyproxy/po/vi/tinyproxy.po index 6c825f5368..f9df4b7525 100644 --- a/applications/luci-app-tinyproxy/po/vi/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/vi/tinyproxy.po @@ -14,7 +14,7 @@ msgstr "" "X-Generator: Pootle 1.1.0\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/zh-cn/tinyproxy.po b/applications/luci-app-tinyproxy/po/zh-cn/tinyproxy.po index 828e952e09..f56bd0611b 100644 --- a/applications/luci-app-tinyproxy/po/zh-cn/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/zh-cn/tinyproxy.po @@ -12,7 +12,7 @@ msgstr "" "X-Generator: Pootle 2.0.6\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-tinyproxy/po/zh-tw/tinyproxy.po b/applications/luci-app-tinyproxy/po/zh-tw/tinyproxy.po index 849fcdeffb..ae7b640850 100644 --- a/applications/luci-app-tinyproxy/po/zh-tw/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/zh-tw/tinyproxy.po @@ -8,7 +8,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" msgid "" -"<em>Via proxy</em> routes requests to the given target via the specifed " +"<em>Via proxy</em> routes requests to the given target via the specified " "upstream proxy, <em>Reject access</em> disables any upstream proxy for the " "target" msgstr "" diff --git a/applications/luci-app-transmission/po/zh-cn/transmission.po b/applications/luci-app-transmission/po/zh-cn/transmission.po index 81280cdcda..b8277d4cf3 100644 --- a/applications/luci-app-transmission/po/zh-cn/transmission.po +++ b/applications/luci-app-transmission/po/zh-cn/transmission.po @@ -1,12 +1,12 @@ # -# Yangfl <mmyangfl@gmail.com>, 2017. +# Yangfl <mmyangfl@gmail.com>, 2017, 2018. # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-10-08 14:06+0200\n" -"PO-Revision-Date: 2017-10-29 15:56+0800\n" +"PO-Revision-Date: 2018-10-01 11:39+0800\n" "Last-Translator: Yangfl <mmyangfl@gmail.com>\n" "Language-Team: <debian-l10n-chinese@lists.debian.org>\n" "Language: zh_CN\n" @@ -65,7 +65,7 @@ msgid "Config file directory" msgstr "配置文件的目录" msgid "Custom WEB UI directory" -msgstr "" +msgstr "自定义 WEB UI 目录" msgid "DHT enabled" msgstr "启用 DHT" diff --git a/applications/luci-app-transmission/po/zh-tw/transmission.po b/applications/luci-app-transmission/po/zh-tw/transmission.po index 6edf3b6d22..f73fc86349 100644 --- a/applications/luci-app-transmission/po/zh-tw/transmission.po +++ b/applications/luci-app-transmission/po/zh-tw/transmission.po @@ -1,12 +1,12 @@ # -# Yangfl <mmyangfl@gmail.com>, 2017. +# Yangfl <mmyangfl@gmail.com>, 2017, 2018. # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-10-08 14:06+0200\n" -"PO-Revision-Date: 2017-10-29 15:56+0800\n" +"PO-Revision-Date: 2018-10-01 11:39+0800\n" "Last-Translator: Yangfl <mmyangfl@gmail.com>\n" "Language-Team: <debian-l10n-chinese@lists.debian.org>\n" "Language: zh_TW\n" @@ -65,7 +65,7 @@ msgid "Config file directory" msgstr "配置檔案的目錄" msgid "Custom WEB UI directory" -msgstr "" +msgstr "自訂 WEB UI 目錄" msgid "DHT enabled" msgstr "啟用 DHT" diff --git a/applications/luci-app-travelmate/luasrc/controller/travelmate.lua b/applications/luci-app-travelmate/luasrc/controller/travelmate.lua index 775831d9d0..0c5890810e 100644 --- a/applications/luci-app-travelmate/luasrc/controller/travelmate.lua +++ b/applications/luci-app-travelmate/luasrc/controller/travelmate.lua @@ -27,7 +27,6 @@ function index() entry({"admin", "services", "travelmate", "logread"}, call("logread"), nil).leaf = true entry({"admin", "services", "travelmate", "status"}, call("status_update"), nil).leaf = true entry({"admin", "services", "travelmate", "action"}, call("trm_action"), nil).leaf = true - entry({"admin", "services", "travelmate", "apqr"}, template("travelmate/ap_qr")).leaf = true entry({"admin", "services", "travelmate", "wifiscan"}, template("travelmate/wifi_scan")).leaf = true entry({"admin", "services", "travelmate", "wifiadd"}, form("travelmate/wifi_add", {hideresetbtn=true, hidesavebtn=true})).leaf = true entry({"admin", "services", "travelmate", "wifiedit"}, form("travelmate/wifi_edit", {hideresetbtn=true, hidesavebtn=true})).leaf = true diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua index a1a7ed72c3..e98cde719c 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua @@ -56,7 +56,7 @@ end s = m:section(NamedSection, "global", "travelmate") -o1 = s:option(Flag, "trm_enabled", translate("Enable travelmate")) +o1 = s:option(Flag, "trm_enabled", translate("Enable Travelmate")) o1.default = o1.disabled o1.rmempty = false @@ -65,30 +65,23 @@ o2 = s:option(Flag, "trm_captive", translate("Captive Portal Detection"), o2.default = o2.enabled o2.rmempty = false -o3 = s:option(ListValue, "trm_iface", translate("Uplink / Trigger interface"), +o3 = s:option(Flag, "trm_proactive", translate("ProActive Uplink Switch"), + translate("Proactively scan and switch to a higher prioritized uplink, despite of an already existing connection.")) +o3.default = o3.enabled +o3.rmempty = false + +o4 = s:option(ListValue, "trm_iface", translate("Uplink / Trigger interface"), translate("Name of the used uplink interface.")) if dump then local i, v for i, v in ipairs(dump.interface) do if v.interface ~= "loopback" and v.interface ~= "lan" then - o3:value(v.interface) + o4:value(v.interface) end end end -o3.default = trmiface -o3.rmempty = false - -if fs.access("/usr/bin/qrencode") then - btn = s:option(Button, "btn", translate("View AP QR-Codes"), - translate("Connect your Android or iOS devices to your router's WiFi using the shown QR code.")) - btn.inputtitle = translate("QR-Codes") - btn.inputstyle = "apply" - btn.disabled = false - - function btn.write() - luci.http.redirect(luci.dispatcher.build_url("admin", "services", "travelmate", "apqr")) - end -end +o4.default = trmiface +o4.rmempty = false -- Runtime information @@ -97,16 +90,15 @@ ds.template = "travelmate/runtime" -- Extra options -e = m:section(NamedSection, "global", "travelmate", translate("Extra options"), +e = m:section(NamedSection, "global", "travelmate", translate("Extra Options"), translate("Options for further tweaking in case the defaults are not suitable for you.")) -e1 = e:option(Flag, "trm_debug", translate("Enable verbose debug logging")) +e1 = e:option(Flag, "trm_debug", translate("Enable Verbose Debug Logging")) e1.default = e1.disabled e1.rmempty = false -e2 = e:option(Value, "trm_radio", translate("Radio selection"), - translate("Restrict travelmate to a dedicated radio, e.g. 'radio0'.")) -e2.datatype = "and(uciname,rangelength(6,6))" +e2 = e:option(Value, "trm_radio", translate("Radio Selection / Order"), + translate("Restrict travelmate to a single radio (e.g. 'radio1') or change the overall scanning order (e.g. 'radio1 radio2 radio0').")) e2.rmempty = true e3 = e:option(Value, "trm_triggerdelay", translate("Trigger Delay"), diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/ap_qr.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/ap_qr.htm deleted file mode 100644 index 3f01a81e35..0000000000 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/ap_qr.htm +++ /dev/null @@ -1,66 +0,0 @@ -<%# -Copyright 2018 Dirk Brenken (dev@brenken.org) -This is free software, licensed under the Apache License, Version 2.0 --%> - -<%+header%> - -<div class="cbi-map"> - <div class="cbi-map-descr"> - <%=translate("Here you'll find the QR codes from all of your configured Access Points. It allows you to connect your Android or iOS devices to your router's WiFi using the QR code shown below.")%> - </div> - <%- local uci = require("luci.model.uci").cursor() - - uci:foreach("wireless", "wifi-iface", function(s) - local device = s.device or "" - local mode = s.mode or "" - local ssid = s.ssid or "" - local enc = s.encryption or "" - local key = s.key or "" - local hidden = s.hidden or "false" - local disabled = s.disabled or "" - local wep_slots = {s.key1 or "", s.key2 or "", s.key3 or "", s.key4 or ""} - - if device and mode == "ap" and disabled ~= "1" then - if string.match(enc, '^psk') then - enc = "WPA" - elseif string.match(enc, '^wep') then - enc = "WEP" - if tonumber(key) then - key = wep_slots[tonumber(key)] - end - elseif enc == "none" then - enc = "nopass" - key = "nokey" - else - enc = "" - end - - if hidden == "1" then - hidden = "true" - end - - if ssid and enc and key then - local e_ssid = string.gsub(ssid,"[\"\\';:, ]",[[\\\%1]]) - local e_key = string.gsub(key,"[\"\\';:, ]",[[\\\%1]]) - local qrcode = "" - - qrcode = luci.sys.exec("/usr/bin/qrencode --inline --8bit --type=SVG --output=- 'WIFI:S:\"'" .. e_ssid .. "'\";T:'" .. enc .. "';P:\"'" .. e_key .. "'\";H:'" .. hidden .. "';'") - -%> - <div class="cbi-section"> - <h3>AP on <%=device%> with SSID "<%=ssid%>"</h3> - <h3><%=qrcode%></h3> - </div> - <%- - end - end - end) - -%> -</div> -<div class="cbi-page-actions right"> - <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/tab_from_cbi')%>" method="post"> - <input class="cbi-button cbi-button-reset" type="submit" value="<%:Back to overview%>" /> - </form> -</div> - -<%+footer%> diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm index 272612600c..1a53b577d1 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm @@ -75,6 +75,15 @@ This is free software, licensed under the Apache License, Version 2.0 } } + function toggle_qrcode() { + var view = document.getElementById("qrcode"); + if (view.style.display === "none") { + view.style.display = "block"; + } else { + view.style.display = "none"; + } + } + XHR.get('<%=luci.dispatcher.build_url("admin", "services", "travelmate", "status")%>', null, function(x, json_info) { @@ -142,3 +151,74 @@ This is free software, licensed under the Apache License, Version 2.0 <span id="btn1_running" style="display:inline-block; width:16px; height:16px; margin:0 5px"></span> </div> </div> +<div class="cbi-value" id="button_2"> + <label class="cbi-value-title" for="button_2"><%:View AP QR-Codes%></label> + <div class="cbi-value-field"> + <input class="cbi-button cbi-button-apply" type="button" value="<%:Show/Hide QR-Codes%>" onclick="toggle_qrcode()" /> + </div> +</div> +<div class="cbi-value" style="margin-bottom: 0px"> + <span class="cbi-value" style="display: none" id="qrcode"> +<%- + local fs = require("nixio.fs") + local uci = require("luci.model.uci").cursor() + local qrcode + + uci:foreach("wireless", "wifi-iface", function(s) + local device = s.device or "" + local mode = s.mode or "" + local ssid = s.ssid or "" + local enc = s.encryption or "" + local key = s.key or "" + local hidden = s.hidden or "false" + local disabled = s.disabled or "" + local wep_slots = {s.key1 or "", s.key2 or "", s.key3 or "", s.key4 or ""} + + if device and mode == "ap" and disabled ~= "1" then + if string.match(enc, '^psk') then + enc = "WPA" + elseif string.match(enc, '^wep') then + enc = "WEP" + if tonumber(key) then + key = wep_slots[tonumber(key)] + end + elseif enc == "none" then + enc = "nopass" + key = "nokey" + else + enc = "" + end + + if hidden == "1" then + hidden = "true" + end + + if ssid and enc and key then + local e_ssid = string.gsub(ssid,"[\"\\';:, ]",[[\\\%1]]) + local e_key = string.gsub(key,"[\"\\';:, ]",[[\\\%1]]) + + if fs.access("/usr/bin/qrencode") then + qrcode = luci.sys.exec("/usr/bin/qrencode --inline --8bit --type=SVG --output=- 'WIFI:S:\"'" .. e_ssid .. "'\";T:'" .. enc .. "';P:\"'" .. e_key .. "'\";H:'" .. hidden .. "';'") +-%> + <div class="cbi-value" style="border-bottom: 0px; margin-bottom: 0px; padding: 0.25em 0.6em; text-align: left"> + <%=qrcode%> + </div> + <div class="cbi-value" style="border-bottom: 0px; margin-bottom: 0px; padding: 0.25em 0.6em; text-align: left"> + <em><%:AP on %><%=device%><%: with SSID %>"<%=ssid%>"</em> + <hr /> + </div> +<%- + end + end + end + end) + if not qrcode then +-%> + <div class="cbi-value" style="border-bottom: 0px; margin-bottom: 0px; padding: 0.25em 0.6em; text-align: left"> + <em><%:For QR-Code support please install package 'qrencode'!%></em> + </div> +<%- + end +-%> + </span> +</div> diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm index ab3fe77fbc..67568f179e 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm @@ -18,7 +18,7 @@ This is free software, licensed under the Apache License, Version 2.0 if info.wep == true then return translate("WEP") elseif info.wpa > 0 then - return "%s (%s/%s)" %{label[info.wpa], table.concat(info.auth_suites), table.concat(info.group_ciphers)} + return "%s (%s/%s)" %{label[info.wpa] or translate("Unknown"), table.concat(info.auth_suites), table.concat(info.group_ciphers)} elseif info.enabled then return translate("Unknown") else diff --git a/applications/luci-app-travelmate/po/ja/travelmate.po b/applications/luci-app-travelmate/po/ja/travelmate.po index f608a2aa9a..ee081d62d2 100644 --- a/applications/luci-app-travelmate/po/ja/travelmate.po +++ b/applications/luci-app-travelmate/po/ja/travelmate.po @@ -12,6 +12,9 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "Language: ja\n" +msgid "AP on" +msgstr "" + msgid "Action" msgstr "" @@ -59,12 +62,6 @@ msgid "" msgstr "" "トラベル ルーター機能を有効化するための、 Travelmate パッケージの設定です。" -msgid "" -"Connect your Android or iOS devices to your router's WiFi using the shown QR " -"code." -msgstr "" -"Android や iOS デバイスを、表示される QR コードを使用して WiFi に接続します。" - msgid "Connection Limit" msgstr "接続制限" @@ -113,16 +110,16 @@ msgstr "無線アップリンク設定の編集" msgid "Edit this Uplink" msgstr "このアップリンクを編集" -msgid "Enable travelmate" +msgid "Enable Travelmate" msgstr "Travelmate の有効化" -msgid "Enable verbose debug logging" +msgid "Enable Verbose Debug Logging" msgstr "詳細なデバッグ ログの有効化" msgid "Encryption" msgstr "暗号化" -msgid "Extra options" +msgid "Extra Options" msgstr "拡張オプション" msgid "Faulty Stations" @@ -131,6 +128,9 @@ msgstr "" msgid "Find and join network on" msgstr "ネットワークの検索と参加:" +msgid "For QR-Code support please install package 'qrencode'!" +msgstr "" + msgid "" "For further information <a href=\"%s\" target=\"_blank\">see online " "documentation</a>" @@ -148,15 +148,6 @@ msgid "Force TKIP and CCMP (AES)" msgstr "TKIP と CCMP (AES)" msgid "" -"Here you'll find the QR codes from all of your configured Access Points. It " -"allows you to connect your Android or iOS devices to your router's WiFi " -"using the QR code shown below." -msgstr "" -"ここには、構成済みの全アクセスポイントの QR コードを表示しています。以下の " -"QR コードを使用して、 Android または iOS デバイスをルータの WiFi に接続するこ" -"とができます。" - -msgid "" "How long should travelmate wait for a successful wlan uplink connection." msgstr "Travelmate が無線アップリンクへの接続成功を待つ時間です。" @@ -237,11 +228,8 @@ msgid "" "one. The currently used uplink is emphasized in blue, faulty stations in red." msgstr "" -msgid "QR-Codes" -msgstr "QR-コード" - -msgid "Radio selection" -msgstr "無線の選択" +msgid "Radio Selection / Order" +msgstr "" msgid "Repeat scan" msgstr "再スキャン" @@ -252,8 +240,10 @@ msgstr "" msgid "Restart Travelmate" msgstr "" -msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." -msgstr "Travelmate が指定された無線に接続するよう制御します。（例: 'radio0'）" +msgid "" +"Restrict travelmate to a single radio (e.g. 'radio1') or change the overall " +"scanning order (e.g. 'radio1 radio2 radio0')." +msgstr "" msgid "Retry limit to connect to an uplink." msgstr "アップリンクへの接続を試行する回数です。" @@ -273,6 +263,9 @@ msgstr "保存" msgid "Scan" msgstr "スキャン:" +msgid "Show/Hide QR-Codes" +msgstr "" + msgid "Signal Quality Threshold" msgstr "シグナル品質閾値" @@ -388,6 +381,35 @@ msgstr "" msgid "hidden" msgstr "（ステルス）" +msgid "with SSID" +msgstr "" + +#~ msgid "" +#~ "Connect your Android or iOS devices to your router's WiFi using the shown " +#~ "QR code." +#~ msgstr "" +#~ "Android や iOS デバイスを、表示される QR コードを使用して WiFi に接続しま" +#~ "す。" + +#~ msgid "" +#~ "Here you'll find the QR codes from all of your configured Access Points. " +#~ "It allows you to connect your Android or iOS devices to your router's " +#~ "WiFi using the QR code shown below." +#~ msgstr "" +#~ "ここには、構成済みの全アクセスポイントの QR コードを表示しています。以下" +#~ "の QR コードを使用して、 Android または iOS デバイスをルータの WiFi に接続" +#~ "することができます。" + +#~ msgid "QR-Codes" +#~ msgstr "QR-コード" + +#~ msgid "Radio selection" +#~ msgstr "無線の選択" + +#~ msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." +#~ msgstr "" +#~ "Travelmate が指定された無線に接続するよう制御します。（例: 'radio0'）" + #~ msgid "Last rundate" #~ msgstr "最終実行日時" diff --git a/applications/luci-app-travelmate/po/pt-br/travelmate.po b/applications/luci-app-travelmate/po/pt-br/travelmate.po index 5079c5bc8b..4bc72fe25a 100644 --- a/applications/luci-app-travelmate/po/pt-br/travelmate.po +++ b/applications/luci-app-travelmate/po/pt-br/travelmate.po @@ -114,16 +114,16 @@ msgstr "Editar Configurações da Rede sem fio de saída" msgid "Edit this Uplink" msgstr "Editar Configurações da Rede de saída" -msgid "Enable travelmate" +msgid "Enable Travelmate" msgstr "Habilitar o Travelmate" -msgid "Enable verbose debug logging" +msgid "Enable Verbose Debug Logging" msgstr "Habilitar os registros de depuração detalhados" msgid "Encryption" msgstr "Cifragem" -msgid "Extra options" +msgid "Extra Options" msgstr "Opções adicionais" msgid "Faulty Stations" diff --git a/applications/luci-app-travelmate/po/ru/travelmate.po b/applications/luci-app-travelmate/po/ru/travelmate.po index b97e76dd05..8d03cfebda 100644 --- a/applications/luci-app-travelmate/po/ru/travelmate.po +++ b/applications/luci-app-travelmate/po/ru/travelmate.po @@ -15,6 +15,9 @@ msgstr "" "Project-Info: Это технический перевод, не дословный. Главное-удобный русский " "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n" +msgid "AP on" +msgstr "" + msgid "Action" msgstr "" @@ -59,11 +62,6 @@ msgid "" "functionality." msgstr "Настройка утилиты TravelMate - помощника путешественника. " -msgid "" -"Connect your Android or iOS devices to your router's WiFi using the shown QR " -"code." -msgstr "" - msgid "Connection Limit" msgstr "Ограничение соединений" @@ -112,16 +110,16 @@ msgstr "Редактировать настройки беспроводной msgid "Edit this Uplink" msgstr "Редактировать настройки сети" -msgid "Enable travelmate" +msgid "Enable Travelmate" msgstr "Включить Travelmate" -msgid "Enable verbose debug logging" +msgid "Enable Verbose Debug Logging" msgstr "Включить подробное ведение журнала отладки" msgid "Encryption" msgstr "Шифрование" -msgid "Extra options" +msgid "Extra Options" msgstr "Дополнительные настройки" msgid "Faulty Stations" @@ -130,6 +128,9 @@ msgstr "" msgid "Find and join network on" msgstr "Найти сеть для подключения используя" +msgid "For QR-Code support please install package 'qrencode'!" +msgstr "" + msgid "" "For further information <a href=\"%s\" target=\"_blank\">see online " "documentation</a>" @@ -147,12 +148,6 @@ msgid "Force TKIP and CCMP (AES)" msgstr "Назначить TKIP и CCMP (AES)" msgid "" -"Here you'll find the QR codes from all of your configured Access Points. It " -"allows you to connect your Android or iOS devices to your router's WiFi " -"using the QR code shown below." -msgstr "" - -msgid "" "How long should travelmate wait for a successful wlan uplink connection." msgstr "" @@ -233,12 +228,9 @@ msgid "" "one. The currently used uplink is emphasized in blue, faulty stations in red." msgstr "" -msgid "QR-Codes" +msgid "Radio Selection / Order" msgstr "" -msgid "Radio selection" -msgstr "Выбор Wi-Fi устройства" - msgid "Repeat scan" msgstr "Повторить поиск" @@ -248,8 +240,10 @@ msgstr "" msgid "Restart Travelmate" msgstr "" -msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." -msgstr "Выделить TravelMate-у конкретное Wi-Fi устройство, например 'radio0'." +msgid "" +"Restrict travelmate to a single radio (e.g. 'radio1') or change the overall " +"scanning order (e.g. 'radio1 radio2 radio0')." +msgstr "" msgid "Retry limit to connect to an uplink." msgstr "" @@ -269,6 +263,9 @@ msgstr "Сохранить" msgid "Scan" msgstr "Поиск" +msgid "Show/Hide QR-Codes" +msgstr "" + msgid "Signal Quality Threshold" msgstr "" @@ -382,6 +379,16 @@ msgstr "" msgid "hidden" msgstr "скрытый" +msgid "with SSID" +msgstr "" + +#~ msgid "Radio selection" +#~ msgstr "Выбор Wi-Fi устройства" + +#~ msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." +#~ msgstr "" +#~ "Выделить TravelMate-у конкретное Wi-Fi устройство, например 'radio0'." + #~ msgid "Last rundate" #~ msgstr "Дата последнего запуска" diff --git a/applications/luci-app-travelmate/po/templates/travelmate.pot b/applications/luci-app-travelmate/po/templates/travelmate.pot index b8c235ff48..c712c10658 100644 --- a/applications/luci-app-travelmate/po/templates/travelmate.pot +++ b/applications/luci-app-travelmate/po/templates/travelmate.pot @@ -1,6 +1,9 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" +msgid "AP on" +msgstr "" + msgid "Action" msgstr "" @@ -45,11 +48,6 @@ msgid "" "functionality." msgstr "" -msgid "" -"Connect your Android or iOS devices to your router's WiFi using the shown QR " -"code." -msgstr "" - msgid "Connection Limit" msgstr "" @@ -96,16 +94,16 @@ msgstr "" msgid "Edit this Uplink" msgstr "" -msgid "Enable travelmate" +msgid "Enable Travelmate" msgstr "" -msgid "Enable verbose debug logging" +msgid "Enable Verbose Debug Logging" msgstr "" msgid "Encryption" msgstr "" -msgid "Extra options" +msgid "Extra Options" msgstr "" msgid "Faulty Stations" @@ -114,6 +112,9 @@ msgstr "" msgid "Find and join network on" msgstr "" +msgid "For QR-Code support please install package 'qrencode'!" +msgstr "" + msgid "" "For further information <a href=\"%s\" target=\"_blank\">see online " "documentation</a>" @@ -129,12 +130,6 @@ msgid "Force TKIP and CCMP (AES)" msgstr "" msgid "" -"Here you'll find the QR codes from all of your configured Access Points. It " -"allows you to connect your Android or iOS devices to your router's WiFi " -"using the QR code shown below." -msgstr "" - -msgid "" "How long should travelmate wait for a successful wlan uplink connection." msgstr "" @@ -213,10 +208,7 @@ msgid "" "one. The currently used uplink is emphasized in blue, faulty stations in red." msgstr "" -msgid "QR-Codes" -msgstr "" - -msgid "Radio selection" +msgid "Radio Selection / Order" msgstr "" msgid "Repeat scan" @@ -228,7 +220,9 @@ msgstr "" msgid "Restart Travelmate" msgstr "" -msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." +msgid "" +"Restrict travelmate to a single radio (e.g. 'radio1') or change the overall " +"scanning order (e.g. 'radio1 radio2 radio0')." msgstr "" msgid "Retry limit to connect to an uplink." @@ -249,6 +243,9 @@ msgstr "" msgid "Scan" msgstr "" +msgid "Show/Hide QR-Codes" +msgstr "" + msgid "Signal Quality Threshold" msgstr "" @@ -353,3 +350,6 @@ msgstr "" msgid "hidden" msgstr "" + +msgid "with SSID" +msgstr "" diff --git a/applications/luci-app-travelmate/po/zh-cn/travelmate.po b/applications/luci-app-travelmate/po/zh-cn/travelmate.po index e52d8e8546..6bfa3532f4 100644 --- a/applications/luci-app-travelmate/po/zh-cn/travelmate.po +++ b/applications/luci-app-travelmate/po/zh-cn/travelmate.po @@ -11,6 +11,12 @@ msgstr "" "PO-Revision-Date: 2018-08-17 17:06+0800\n" "X-Generator: Gtranslator 2.91.7\n" +msgid "AP on" +msgstr "" + +msgid "Action" +msgstr "" + msgid "Add Uplink" msgstr "添加上行连接" @@ -52,11 +58,6 @@ msgid "" "functionality." msgstr "配置 travelmate 包，以启用旅行路由器功能。" -msgid "" -"Connect your Android or iOS devices to your router's WiFi using the shown QR " -"code." -msgstr "使用显示的 QR 码，将您的 Android 或 iOS 设备连接到路由器 WiFi。" - msgid "Connection Limit" msgstr "连接限制" @@ -103,21 +104,27 @@ msgstr "编辑无线上行连接配置" msgid "Edit this Uplink" msgstr "编辑此上行连接" -msgid "Enable travelmate" +msgid "Enable Travelmate" msgstr "启用 travelmate" -msgid "Enable verbose debug logging" +msgid "Enable Verbose Debug Logging" msgstr "启用详细调试日志" msgid "Encryption" msgstr "加密" -msgid "Extra options" +msgid "Extra Options" msgstr "额外选项" +msgid "Faulty Stations" +msgstr "" + msgid "Find and join network on" msgstr "查找并加入网络" +msgid "For QR-Code support please install package 'qrencode'!" +msgstr "" + msgid "" "For further information <a href=\"%s\" target=\"_blank\">see online " "documentation</a>" @@ -133,14 +140,6 @@ msgid "Force TKIP and CCMP (AES)" msgstr "强制 TKIP 和 CCMP（AES）" msgid "" -"Here you'll find the QR codes from all of your configured Access Points. It " -"allows you to connect your Android or iOS devices to your router's WiFi " -"using the QR code shown below." -msgstr "" -"在这里，您可以找到所有已配置的接入点的 QR 码。您可以使用下面显示的 QR 码，使 " -"Android 或 iOS 设备连接到路由器 WiFi。" - -msgid "" "How long should travelmate wait for a successful wlan uplink connection." msgstr "travelmate 等待 wlan 上行连接成功最长时间。" @@ -159,8 +158,11 @@ msgstr "接口超时" msgid "Interface Wizard" msgstr "接口向导" -msgid "Last rundate" -msgstr "最后运行时间" +msgid "Last Run" +msgstr "" + +msgid "Loading" +msgstr "" msgid "" "Minimum signal quality threshold as percent for conditional uplink (dis-) " @@ -213,22 +215,25 @@ msgstr "私钥路径" msgid "" "Provides an overview of all configured uplinks for the travelmate interface " "(%s). You can edit, delete or re-order existing uplinks or scan for a new " -"one. The currently used uplink is emphasized in blue." +"one. The currently used uplink is emphasized in blue, faulty stations in red." msgstr "" -"此处显示 travelmate 接口（%s）所有已配置上行连接的概述。您可以编辑、删除或重" -"新排序现有连接，或扫描新上行连接。当前使用的上行连接以蓝色突出显示。" - -msgid "QR-Codes" -msgstr "QR 码" -msgid "Radio selection" -msgstr "无线选择" +msgid "Radio Selection / Order" +msgstr "" msgid "Repeat scan" msgstr "重新扫描" -msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." -msgstr "将 travelmate 限制在专用无线电中，如“radio0”。" +msgid "Restart" +msgstr "" + +msgid "Restart Travelmate" +msgstr "" + +msgid "" +"Restrict travelmate to a single radio (e.g. 'radio1') or change the overall " +"scanning order (e.g. 'radio1 radio2 radio0')." +msgstr "" msgid "Retry limit to connect to an uplink." msgstr "连接到上行连接的重试限制。" @@ -248,25 +253,28 @@ msgstr "保存" msgid "Scan" msgstr "扫描" +msgid "Show/Hide QR-Codes" +msgstr "" + msgid "Signal Quality Threshold" msgstr "信号质量阈值" msgid "Signal strength" msgstr "信号强度" -msgid "Station ID (SSID/BSSID)" -msgstr "站点 ID（SSID/BSSID）" +msgid "Station ID (RADIO/SSID/BSSID)" +msgstr "" msgid "Station Interface" msgstr "站点接口" -msgid "Station Radio" -msgstr "站点无线" - msgid "" "The BSSID information '%s' is optional and only required for hidden networks" msgstr "BSSID 信息“%s”是可选的，仅对隐藏网络必需" +msgid "The syslog output, pre-filtered for travelmate related messages only." +msgstr "" + msgid "" "This form allows you to modify the content of the main firewall " "configuration file (/etc/config/firewall)." @@ -287,20 +295,12 @@ msgid "" "configuration file (/etc/config/wireless)." msgstr "此表单允许您修改主无线配置文件（/etc/config/wireless）的内容。" -msgid "" -"This form shows the syslog output, pre-filtered for travelmate related " -"messages only." -msgstr "此表单显示 syslog 输出，仅针对 travelmate 相关消息进行预过滤。" - msgid "This step has only to be done once." msgstr "此步骤只需执行一次。" msgid "Travelmate" msgstr "Travelmate" -msgid "Travelmate Logfile" -msgstr "Travelmate 日志文件" - msgid "Travelmate Status (Quality)" msgstr "Travelmate 状态（质量）" @@ -355,11 +355,64 @@ msgstr "无线扫描" msgid "Wireless Stations" msgstr "无线站点" -msgid "add it to the wan zone of the firewall.<br />" -msgstr "将其添加到防火墙的 wan 区域。<br />" +msgid "add it to the wan zone of the firewall." +msgstr "" msgid "hidden" msgstr "隐藏" -msgid "n/a" -msgstr "n/a" +msgid "with SSID" +msgstr "" + +#~ msgid "" +#~ "Connect your Android or iOS devices to your router's WiFi using the shown " +#~ "QR code." +#~ msgstr "使用显示的 QR 码，将您的 Android 或 iOS 设备连接到路由器 WiFi。" + +#~ msgid "" +#~ "Here you'll find the QR codes from all of your configured Access Points. " +#~ "It allows you to connect your Android or iOS devices to your router's " +#~ "WiFi using the QR code shown below." +#~ msgstr "" +#~ "在这里，您可以找到所有已配置的接入点的 QR 码。您可以使用下面显示的 QR 码，" +#~ "使 Android 或 iOS 设备连接到路由器 WiFi。" + +#~ msgid "Last rundate" +#~ msgstr "最后运行时间" + +#~ msgid "" +#~ "Provides an overview of all configured uplinks for the travelmate " +#~ "interface (%s). You can edit, delete or re-order existing uplinks or scan " +#~ "for a new one. The currently used uplink is emphasized in blue." +#~ msgstr "" +#~ "此处显示 travelmate 接口（%s）所有已配置上行连接的概述。您可以编辑、删除或" +#~ "重新排序现有连接，或扫描新上行连接。当前使用的上行连接以蓝色突出显示。" + +#~ msgid "QR-Codes" +#~ msgstr "QR 码" + +#~ msgid "Radio selection" +#~ msgstr "无线选择" + +#~ msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." +#~ msgstr "将 travelmate 限制在专用无线电中，如“radio0”。" + +#~ msgid "Station ID (SSID/BSSID)" +#~ msgstr "站点 ID（SSID/BSSID）" + +#~ msgid "Station Radio" +#~ msgstr "站点无线" + +#~ msgid "" +#~ "This form shows the syslog output, pre-filtered for travelmate related " +#~ "messages only." +#~ msgstr "此表单显示 syslog 输出，仅针对 travelmate 相关消息进行预过滤。" + +#~ msgid "Travelmate Logfile" +#~ msgstr "Travelmate 日志文件" + +#~ msgid "add it to the wan zone of the firewall.<br />" +#~ msgstr "将其添加到防火墙的 wan 区域。<br />" + +#~ msgid "n/a" +#~ msgstr "n/a" diff --git a/applications/luci-app-travelmate/po/zh-tw/travelmate.po b/applications/luci-app-travelmate/po/zh-tw/travelmate.po index aa4612b6d0..529bbbdb07 100644 --- a/applications/luci-app-travelmate/po/zh-tw/travelmate.po +++ b/applications/luci-app-travelmate/po/zh-tw/travelmate.po @@ -11,6 +11,12 @@ msgstr "" "PO-Revision-Date: 2018-08-17 17:06+0800\n" "X-Generator: Gtranslator 2.91.7\n" +msgid "AP on" +msgstr "" + +msgid "Action" +msgstr "" + msgid "Add Uplink" msgstr "新增上行連線" @@ -42,7 +48,8 @@ msgstr "強制門戶檢測" msgid "" "Check the internet availability, log captive portal redirections and keep " "the uplink connection 'alive'." -msgstr "檢查網際網路可用性，記錄強制網路門戶重定向，並保持上行連線為“活動”狀態。" +msgstr "" +"檢查網際網路可用性，記錄強制網路門戶重定向，並保持上行連線為“活動”狀態。" msgid "Cipher" msgstr "密碼" @@ -52,11 +59,6 @@ msgid "" "functionality." msgstr "配置 travelmate 包，以啟用旅行路由器功能。" -msgid "" -"Connect your Android or iOS devices to your router's WiFi using the shown QR " -"code." -msgstr "使用顯示的 QR 碼，將您的 Android 或 iOS 裝置連線到路由器 WiFi。" - msgid "Connection Limit" msgstr "連線限制" @@ -103,21 +105,27 @@ msgstr "編輯無線上行連線配置" msgid "Edit this Uplink" msgstr "編輯此上行連線" -msgid "Enable travelmate" +msgid "Enable Travelmate" msgstr "啟用 travelmate" -msgid "Enable verbose debug logging" +msgid "Enable Verbose Debug Logging" msgstr "啟用詳細除錯日誌" msgid "Encryption" msgstr "加密" -msgid "Extra options" +msgid "Extra Options" msgstr "額外選項" +msgid "Faulty Stations" +msgstr "" + msgid "Find and join network on" msgstr "查詢並加入網路" +msgid "For QR-Code support please install package 'qrencode'!" +msgstr "" + msgid "" "For further information <a href=\"%s\" target=\"_blank\">see online " "documentation</a>" @@ -133,14 +141,6 @@ msgid "Force TKIP and CCMP (AES)" msgstr "強制 TKIP 和 CCMP（AES）" msgid "" -"Here you'll find the QR codes from all of your configured Access Points. It " -"allows you to connect your Android or iOS devices to your router's WiFi " -"using the QR code shown below." -msgstr "" -"在這裡，您可以找到所有已配置的接入點的 QR 碼。您可以使用下面顯示的 QR 碼，使 " -"Android 或 iOS 裝置連線到路由器 WiFi。" - -msgid "" "How long should travelmate wait for a successful wlan uplink connection." msgstr "travelmate 等待 wlan 上行連線成功最長時間。" @@ -159,8 +159,11 @@ msgstr "介面超時" msgid "Interface Wizard" msgstr "介面嚮導" -msgid "Last rundate" -msgstr "最後執行時間" +msgid "Last Run" +msgstr "" + +msgid "Loading" +msgstr "" msgid "" "Minimum signal quality threshold as percent for conditional uplink (dis-) " @@ -213,22 +216,25 @@ msgstr "私鑰路徑" msgid "" "Provides an overview of all configured uplinks for the travelmate interface " "(%s). You can edit, delete or re-order existing uplinks or scan for a new " -"one. The currently used uplink is emphasized in blue." +"one. The currently used uplink is emphasized in blue, faulty stations in red." msgstr "" -"此處顯示 travelmate 介面（%s）所有已配置上行連線的概述。您可以編輯、刪除或重" -"新排序現有連線，或掃描新上行連線。當前使用的上行連線以藍色突出顯示。" - -msgid "QR-Codes" -msgstr "QR 碼" -msgid "Radio selection" -msgstr "無線選擇" +msgid "Radio Selection / Order" +msgstr "" msgid "Repeat scan" msgstr "重新掃描" -msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." -msgstr "將 travelmate 限制在專用無線電中，如“radio0”。" +msgid "Restart" +msgstr "" + +msgid "Restart Travelmate" +msgstr "" + +msgid "" +"Restrict travelmate to a single radio (e.g. 'radio1') or change the overall " +"scanning order (e.g. 'radio1 radio2 radio0')." +msgstr "" msgid "Retry limit to connect to an uplink." msgstr "連線到上行連線的重試限制。" @@ -248,25 +254,28 @@ msgstr "儲存" msgid "Scan" msgstr "掃描" +msgid "Show/Hide QR-Codes" +msgstr "" + msgid "Signal Quality Threshold" msgstr "訊號質量閾值" msgid "Signal strength" msgstr "訊號強度" -msgid "Station ID (SSID/BSSID)" -msgstr "站點 ID（SSID/BSSID）" +msgid "Station ID (RADIO/SSID/BSSID)" +msgstr "" msgid "Station Interface" msgstr "站點介面" -msgid "Station Radio" -msgstr "站點無線" - msgid "" "The BSSID information '%s' is optional and only required for hidden networks" msgstr "BSSID 資訊“%s”是可選的，僅對隱藏網路必需" +msgid "The syslog output, pre-filtered for travelmate related messages only." +msgstr "" + msgid "" "This form allows you to modify the content of the main firewall " "configuration file (/etc/config/firewall)." @@ -287,20 +296,12 @@ msgid "" "configuration file (/etc/config/wireless)." msgstr "此表單允許您修改主無線配置檔案（/etc/config/wireless）的內容。" -msgid "" -"This form shows the syslog output, pre-filtered for travelmate related " -"messages only." -msgstr "此表單顯示 syslog 輸出，僅針對 travelmate 相關訊息進行預過濾。" - msgid "This step has only to be done once." msgstr "此步驟只需執行一次。" msgid "Travelmate" msgstr "Travelmate" -msgid "Travelmate Logfile" -msgstr "Travelmate 日誌檔案" - msgid "Travelmate Status (Quality)" msgstr "Travelmate 狀態（質量）" @@ -355,11 +356,64 @@ msgstr "無線掃描" msgid "Wireless Stations" msgstr "無線站點" -msgid "add it to the wan zone of the firewall.<br />" -msgstr "將其新增到防火牆的 wan 區域。<br />" +msgid "add it to the wan zone of the firewall." +msgstr "" msgid "hidden" msgstr "隱藏" -msgid "n/a" -msgstr "n/a" +msgid "with SSID" +msgstr "" + +#~ msgid "" +#~ "Connect your Android or iOS devices to your router's WiFi using the shown " +#~ "QR code." +#~ msgstr "使用顯示的 QR 碼，將您的 Android 或 iOS 裝置連線到路由器 WiFi。" + +#~ msgid "" +#~ "Here you'll find the QR codes from all of your configured Access Points. " +#~ "It allows you to connect your Android or iOS devices to your router's " +#~ "WiFi using the QR code shown below." +#~ msgstr "" +#~ "在這裡，您可以找到所有已配置的接入點的 QR 碼。您可以使用下面顯示的 QR 碼，" +#~ "使 Android 或 iOS 裝置連線到路由器 WiFi。" + +#~ msgid "Last rundate" +#~ msgstr "最後執行時間" + +#~ msgid "" +#~ "Provides an overview of all configured uplinks for the travelmate " +#~ "interface (%s). You can edit, delete or re-order existing uplinks or scan " +#~ "for a new one. The currently used uplink is emphasized in blue." +#~ msgstr "" +#~ "此處顯示 travelmate 介面（%s）所有已配置上行連線的概述。您可以編輯、刪除或" +#~ "重新排序現有連線，或掃描新上行連線。當前使用的上行連線以藍色突出顯示。" + +#~ msgid "QR-Codes" +#~ msgstr "QR 碼" + +#~ msgid "Radio selection" +#~ msgstr "無線選擇" + +#~ msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." +#~ msgstr "將 travelmate 限制在專用無線電中，如“radio0”。" + +#~ msgid "Station ID (SSID/BSSID)" +#~ msgstr "站點 ID（SSID/BSSID）" + +#~ msgid "Station Radio" +#~ msgstr "站點無線" + +#~ msgid "" +#~ "This form shows the syslog output, pre-filtered for travelmate related " +#~ "messages only." +#~ msgstr "此表單顯示 syslog 輸出，僅針對 travelmate 相關訊息進行預過濾。" + +#~ msgid "Travelmate Logfile" +#~ msgstr "Travelmate 日誌檔案" + +#~ msgid "add it to the wan zone of the firewall.<br />" +#~ msgstr "將其新增到防火牆的 wan 區域。<br />" + +#~ msgid "n/a" +#~ msgstr "n/a" diff --git a/applications/luci-app-unbound/luasrc/controller/unbound.lua b/applications/luci-app-unbound/luasrc/controller/unbound.lua index 734476acae..5e19621842 100644 --- a/applications/luci-app-unbound/luasrc/controller/unbound.lua +++ b/applications/luci-app-unbound/luasrc/controller/unbound.lua @@ -158,7 +158,7 @@ function QueryCacheDump() "unbound-control -c /var/lib/unbound/unbound.conf dump_cache") local lcldesc = luci.i18n.translate( - "This shows Unbound 'cache_dump'. Usefull to check if unbound is actually caching dns entities.") + "This shows Unbound 'cache_dump'. Useful to check if unbound is actually caching dns entities.") luci.template.render("unbound/show-textbox", {heading = "", description = lcldesc, content = lcldata}) diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua index 798ca6a45c..3a13c23df9 100644 --- a/applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua +++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua @@ -58,7 +58,7 @@ end function ztype.cfgvalue(self, s) - -- Format a meaninful tile for the Zone Type column + -- Format a meaningful tile for the Zone Type column local itxt = self.map:get(s, "zone_type") local itls = self.map:get(s, "tls_upstream") @@ -84,7 +84,7 @@ end function zones.cfgvalue(self, s) - -- Format a meaninful sentence for the Zones viewed column + -- Format a meaningful sentence for the Zones viewed column local xtxt, otxt local itxt = self.map:get(s, "zone_name") local itype = self.map:get(s, "zone_type") @@ -131,7 +131,7 @@ end function servers.cfgvalue(self, s) - -- Format a meaninful sentence for the Servers (and URL) column + -- Format a meaningful sentence for the Servers (and URL) column local xtxt, otxt, rtxt, found local itxt = self.map:get(s, "server") local iurl = self.map:get(s, "url_dir") diff --git a/applications/luci-app-unbound/po/templates/unbound.pot b/applications/luci-app-unbound/po/templates/unbound.pot new file mode 100644 index 0000000000..0870962e8f --- /dev/null +++ b/applications/luci-app-unbound/po/templates/unbound.pot @@ -0,0 +1,539 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8" + +msgid "(root)" +msgstr "" + +msgid ", and <var>%s</var> entries" +msgstr "" + +msgid ", and try <var>%s</var>" +msgstr "" + +msgid "AXFR" +msgstr "" + +msgid "Accept queries only from local subnets" +msgstr "" + +msgid "Adblock domain list '" +msgstr "" + +msgid "Advanced" +msgstr "" + +msgid "Aggressive" +msgstr "" + +msgid "Allow open recursion when record not in zone" +msgstr "" + +msgid "Authoritative (zone file)" +msgstr "" + +msgid "Basic" +msgstr "" + +msgid "Break down query components for limited added privacy" +msgstr "" + +msgid "Break the loop where DNSSEC needs NTP and NTP needs DNS" +msgstr "" + +msgid "Cache Dump" +msgstr "" + +msgid "Choose Unbounds listening port" +msgstr "" + +msgid "Chose the IP versions used upstream and downstream" +msgstr "" + +msgid "Connect to servers using TLS" +msgstr "" + +msgid "DHCP" +msgstr "" + +msgid "DHCP Link" +msgstr "" + +msgid "DHCPv4 to SLAAC" +msgstr "" + +msgid "DNS over TLS" +msgstr "" + +msgid "DNS64 Prefix" +msgstr "" + +msgid "DNSSEC NTP Fix" +msgstr "" + +msgid "Default" +msgstr "" + +msgid "Denied (nxdomain)" +msgstr "" + +msgid "Directed Zone" +msgstr "" + +msgid "Directory only part of URL" +msgstr "" + +msgid "Domain Insecure" +msgstr "" + +msgid "Domain name to verify TLS certificate" +msgstr "" + +msgid "Domain suffix for this router and DHCP clients" +msgstr "" + +msgid "EDNS Size" +msgstr "" + +msgid "Edit '" +msgstr "" + +msgid "Edit 'server:' clause options for 'include:" +msgstr "" + +msgid "" +"Edit a forward, stub, or zone-file-cache zone for Unbound to use instead of " +"recursion." +msgstr "" + +msgid "Edit clauses such as 'forward-zone:' for 'include:" +msgstr "" + +msgid "Edit: Extended" +msgstr "" + +msgid "Edit: Server" +msgstr "" + +msgid "Edit: UCI" +msgstr "" + +msgid "Edit: Unbound" +msgstr "" + +msgid "Enable" +msgstr "" + +msgid "Enable DNS64" +msgstr "" + +msgid "Enable DNSSEC" +msgstr "" + +msgid "Enable Unbound" +msgstr "" + +msgid "Enable access for unbound-control" +msgstr "" + +msgid "Enable the DNS64 module" +msgstr "" + +msgid "Enable the DNSSEC validator module" +msgstr "" + +msgid "Enable the initialization scripts for Unbound" +msgstr "" + +msgid "Enable this directed zone" +msgstr "" + +msgid "Enabled" +msgstr "" + +msgid "Extended Statistics" +msgstr "" + +msgid "Extended statistics are printed from unbound-control" +msgstr "" + +msgid "Extra DNS" +msgstr "" + +msgid "Fall Back" +msgstr "" + +msgid "Fallback" +msgstr "" + +msgid "Files" +msgstr "" + +msgid "Filter Entire Subnet" +msgstr "" + +msgid "Filter Localhost Rebind" +msgstr "" + +msgid "Filter Private Address" +msgstr "" + +msgid "Filter Private Rebind" +msgstr "" + +msgid "Forward" +msgstr "" + +msgid "Forward (simple handoff)" +msgstr "" + +msgid "Forward TLS" +msgstr "" + +msgid "Forward to upstream nameservers (ISP)" +msgstr "" + +msgid "Host FQDN, All Addresses" +msgstr "" + +msgid "Host Records" +msgstr "" + +msgid "Host/MX/SRV RR" +msgstr "" + +msgid "Host/MX/SRV/CNAME RR" +msgstr "" + +msgid "Hostname, All Addresses" +msgstr "" + +msgid "Hostname, Primary Address" +msgstr "" + +msgid "How to enter the LAN or local network router in DNS" +msgstr "" + +msgid "How to treat queries of this local domain" +msgstr "" + +msgid "IP4 All and IP6 Local" +msgstr "" + +msgid "IP4 Only" +msgstr "" + +msgid "IP4 and IP6" +msgstr "" + +msgid "IP6 Only*" +msgstr "" + +msgid "IP6 Preferred" +msgstr "" + +msgid "Ignore" +msgstr "" + +msgid "Interface FQDN, All Addresses" +msgstr "" + +msgid "LAN DNS" +msgstr "" + +msgid "Large" +msgstr "" + +msgid "Limit days between RFC5011 copies to reduce flash writes" +msgstr "" + +msgid "Limit extended DNS packet size" +msgstr "" + +msgid "Link to supported programs to load DHCP into DNS" +msgstr "" + +msgid "List domains to bypass checks of DNSSEC" +msgstr "" + +msgid "Listening Port" +msgstr "" + +msgid "Local Data" +msgstr "" + +msgid "Local Domain" +msgstr "" + +msgid "Local Domain Type" +msgstr "" + +msgid "Local Host, Encrypted" +msgstr "" + +msgid "Local Host, No Encryption" +msgstr "" + +msgid "Local Service" +msgstr "" + +msgid "Local Subnet, Encrypted" +msgstr "" + +msgid "Local Subnet, Static Encryption" +msgstr "" + +msgid "Local Zones" +msgstr "" + +msgid "Log" +msgstr "" + +msgid "Manual Conf" +msgstr "" + +msgid "Medium" +msgstr "" + +msgid "Memory Resource" +msgstr "" + +msgid "Networks that may trigger Unbound to reload (avoid wan6)" +msgstr "" + +msgid "No Entry" +msgstr "" + +msgid "No Filter" +msgstr "" + +msgid "No Link" +msgstr "" + +msgid "No Remote Control" +msgstr "" + +msgid "" +"Note: SSL/TLS library is missing an API. Please review syslog. >> logread ..." +msgstr "" + +msgid "" +"Organize directed forward, stub, and authoritative zones <a href=\"%s\" " +"target=\"_blank\">(help)</a>." +msgstr "" + +msgid "Override the WAN side router entry in DNS" +msgstr "" + +msgid "Passive" +msgstr "" + +msgid "Port servers will receive queries on" +msgstr "" + +msgid "Prefix for generated DNS64 addresses" +msgstr "" + +msgid "Prevent excessively short cache periods" +msgstr "" + +msgid "Protect against upstream response of 127.0.0.0/8" +msgstr "" + +msgid "Protect against upstream responses within local subnets" +msgstr "" + +msgid "Query Minimize" +msgstr "" + +msgid "Recurse" +msgstr "" + +msgid "Recursion Protocol" +msgstr "" + +msgid "Recursion Strength" +msgstr "" + +msgid "Recursion activity affects memory growth and CPU load" +msgstr "" + +msgid "Recursive DNS" +msgstr "" + +msgid "Refused" +msgstr "" + +msgid "Resource" +msgstr "" + +msgid "Root DSKEY Age" +msgstr "" + +msgid "Save" +msgstr "" + +msgid "Server Port" +msgstr "" + +msgid "Server TLS Port" +msgstr "" + +msgid "Servers" +msgstr "" + +msgid "Servers for this zone; see README.md for optional form" +msgstr "" + +msgid "Show: Adblock" +msgstr "" + +msgid "Show: DHCP" +msgstr "" + +msgid "Show: Unbound" +msgstr "" + +msgid "Skip UCI and use /etc/unbound/unbound.conf" +msgstr "" + +msgid "Small" +msgstr "" + +msgid "Static (local only)" +msgstr "" + +msgid "Statistics" +msgstr "" + +msgid "Status" +msgstr "" + +msgid "Strict Minimize" +msgstr "" + +msgid "Strict version of 'query minimize' but it can break DNS" +msgstr "" + +msgid "Stub (forced recursion)" +msgstr "" + +msgid "TLS Name Index" +msgstr "" + +msgid "TTL Minimum" +msgstr "" + +msgid "This could display more statistics with the unbound-control package." +msgstr "" + +msgid "This shows '" +msgstr "" + +msgid "" +"This shows Unbound 'cache_dump'. Useful to check if unbound is actually " +"caching dns entities." +msgstr "" + +msgid "" +"This shows Unbound 'local-data:' entries from default, .conf, or control." +msgstr "" + +msgid "" +"This shows Unbound 'local-zone:' entries from default, .conf, or control." +msgstr "" + +msgid "This shows Unbound self reported performance statistics." +msgstr "" + +msgid "This shows syslog filtered for events involving Unbound." +msgstr "" + +msgid "Tiny" +msgstr "" + +msgid "Transparent (local/global)" +msgstr "" + +msgid "Trigger Networks" +msgstr "" + +msgid "Type" +msgstr "" + +msgid "Unbound" +msgstr "" + +msgid "" +"Unbound <a href=\"%s\" target=\"_blank\">(NLnet Labs)</a> is a validating, " +"recursive, and caching DNS resolver <a href=\"%s\" target=\"_blank\">(help)</" +"a>." +msgstr "" + +msgid "Unbound Control App" +msgstr "" + +msgid "Undefined" +msgstr "" + +msgid "Use 'resolv.conf.auto'" +msgstr "" + +msgid "Use DHCPv4 MAC to discover IP6 hosts SLAAC (EUI64)" +msgstr "" + +msgid "Use Upstream" +msgstr "" + +msgid "Use extra DNS entries found in /etc/config/dhcp" +msgstr "" + +msgid "Use menu System/Processes to observe any memory growth" +msgstr "" + +msgid "WAN DNS" +msgstr "" + +msgid "Zone (Domain) names included in this zone combination" +msgstr "" + +msgid "Zone Download URL" +msgstr "" + +msgid "Zone Names" +msgstr "" + +msgid "Zone Type" +msgstr "" + +msgid "Zones" +msgstr "" + +msgid "accept upstream results for" +msgstr "" + +msgid "default" +msgstr "" + +msgid "download from <var>%s</var>" +msgstr "" + +msgid "never" +msgstr "" + +msgid "prefetch zone files for" +msgstr "" + +msgid "select recursion for" +msgstr "" + +msgid "unknown action for" +msgstr "" + +msgid "use <var>%s</var> nameservers" +msgstr "" + +msgid "use nameservers" +msgstr "" + +msgid "with default certificate for <var>%s</var>" +msgstr "" diff --git a/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po b/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po index 049b1a9244..b6248e4bcc 100644 --- a/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po +++ b/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po @@ -25,8 +25,7 @@ msgid "" "Local IP addresses or subnets with direct internet access (outside of the " "VPN tunnel)" msgstr "" -"Endereço IP Local ou subrede com acesso direto à internet (fora do túnel " -"VPN)" +"Endereço IP Local ou subrede com acesso direto à internet (fora do túnel VPN)" msgid "Local Ports to Bypass" msgstr "Portas locais para evitar a VPN" @@ -44,8 +43,8 @@ msgid "" "Remote IP addresses or subnets which will be accessed directly (outside of " "the VPN tunnel)" msgstr "" -"Endereço IP Remoto ou subrede que serão acessados diretamente (fora do " -"túnel VPN)" +"Endereço IP Remoto ou subrede que serão acessados diretamente (fora do túnel " +"VPN)" msgid "Remote Ports to Bypass" msgstr "Portas remotas para evitar a VPN" diff --git a/applications/luci-app-wifischedule/README.md b/applications/luci-app-wifischedule/README.md index 591abb1049..4a57b3f7b4 100644 --- a/applications/luci-app-wifischedule/README.md +++ b/applications/luci-app-wifischedule/README.md @@ -7,7 +7,7 @@ Turns WiFi on and off according to a schedule on an openwrt router ## Use cases -You can create user-defined events when to enable or disable WiFi. +You can create user-defined events when to enable or disable WiFi. There are various use cases why you would like to do so: 1. Reduce power consumption and therefore reduce CO2 emissions. @@ -17,13 +17,13 @@ There are various use cases why you would like to do so: Regarding 1: Please note, that you need to unload the wireless driver modules in order to get the most effect of saving power. In my test scenario only disabling WiFi saves about ~0.4 Watt, unloading the modules removes another ~0.4 Watt. -Regarding 2: Think of a wireless accesspoint e.g. in your bedrom, kids room where you want to remove the ammount of radiation emitted. +Regarding 2: Think of a wireless accesspoint e.g. in your bedrom, kids room where you want to remove the amount of radiation emitted. -Regarding 3: E.g. in a company, why would wireless need to be enabled weekends if no one is there working? +Regarding 3: E.g. in a company, why would wireless need to be enabled weekends if no one is there working? Or think of an accesspoint in your kids room when you want the youngsters to sleep after 10 pm instead of facebooking... ## Configuration -You can create an arbitrary number of schedule events. Please note that there is on sanity check done wheather the start / stop times overlap or make sense. +You can create an arbitrary number of schedule events. Please note that there is on sanity check done whether the start / stop times overlap or make sense. If start and stop time are equal, this leads to disabling the WiFi at the given time. Logging if enabled is done to the file `/var/log/wifi_schedule.log` and can be reviewed through the "View Logfile" tab. @@ -71,7 +71,7 @@ Then call the script as follows in order to get the necessary cron jobs created: `wifi_schedule.sh cron` All commands: - + ``` wifi_schedule.sh cron|start|stop|forcestop|recheck|getmodules|savemodules|help diff --git a/applications/luci-app-wifischedule/luasrc/model/cbi/wifischedule/wifi_schedule.lua b/applications/luci-app-wifischedule/luasrc/model/cbi/wifischedule/wifi_schedule.lua index 07730225b0..61a94ca5dc 100644 --- a/applications/luci-app-wifischedule/luasrc/model/cbi/wifischedule/wifi_schedule.lua +++ b/applications/luci-app-wifischedule/luasrc/model/cbi/wifischedule/wifi_schedule.lua @@ -239,7 +239,7 @@ function force_wifi.validate(self, value, d) if fs.access("/usr/bin/iwinfo") then return value else - return nil, translate("Could not find required programm /usr/bin/iwinfo") + return nil, translate("Could not find required program /usr/bin/iwinfo") end else return "1" diff --git a/applications/luci-app-wifischedule/po/it/wifischedule.po b/applications/luci-app-wifischedule/po/it/wifischedule.po index 18a9dce23a..e7126ced84 100644 --- a/applications/luci-app-wifischedule/po/it/wifischedule.po +++ b/applications/luci-app-wifischedule/po/it/wifischedule.po @@ -7,7 +7,7 @@ msgstr "Attiva wifi" msgid "Could not find required /usr/bin/wifi_schedule.sh or /sbin/wifi" msgstr "Impossibile trovare /usr/bin/wifi_schedule.sh o /sbin/wifi" -msgid "Could not find required programm /usr/bin/iwinfo" +msgid "Could not find required program /usr/bin/iwinfo" msgstr "Impossibile trovare il programma /usr/bin/iwinfo" msgid "Cron Jobs" diff --git a/applications/luci-app-wifischedule/po/ja/wifischedule.po b/applications/luci-app-wifischedule/po/ja/wifischedule.po index 3bc7864ad7..8842d6d3c3 100644 --- a/applications/luci-app-wifischedule/po/ja/wifischedule.po +++ b/applications/luci-app-wifischedule/po/ja/wifischedule.po @@ -18,7 +18,7 @@ msgstr "WiFiのアクティブ化" msgid "Could not find required /usr/bin/wifi_schedule.sh or /sbin/wifi" msgstr "必須の /usr/bin/wifi_schedule.sh または /sbin/wifi が見つかりませんでした。" -msgid "Could not find required programm /usr/bin/iwinfo" +msgid "Could not find required program /usr/bin/iwinfo" msgstr "必須のプログラム /usr/bin/iwinfo が見つかりませんでした。" msgid "Cron Jobs" diff --git a/applications/luci-app-wifischedule/po/pt-br/wifischedule.po b/applications/luci-app-wifischedule/po/pt-br/wifischedule.po index 19e31b54ca..b4eb8f60e5 100644 --- a/applications/luci-app-wifischedule/po/pt-br/wifischedule.po +++ b/applications/luci-app-wifischedule/po/pt-br/wifischedule.po @@ -20,7 +20,7 @@ msgstr "" "Não foi possível localizar os programas necessários '/usr/bin/wifi_schedule." "sh' ou '/sbin/wifi'." -msgid "Could not find required programm /usr/bin/iwinfo" +msgid "Could not find required program /usr/bin/iwinfo" msgstr "Não foi possível localizar o programa necessário '/usr/bin/iwinfo'" msgid "Cron Jobs" diff --git a/applications/luci-app-wifischedule/po/ru/wifischedule.po b/applications/luci-app-wifischedule/po/ru/wifischedule.po index 8eb3966297..b983552d14 100644 --- a/applications/luci-app-wifischedule/po/ru/wifischedule.po +++ b/applications/luci-app-wifischedule/po/ru/wifischedule.po @@ -21,7 +21,7 @@ msgstr "Включить Wi-Fi" msgid "Could not find required /usr/bin/wifi_schedule.sh or /sbin/wifi" msgstr "Не удалось найти файл /usr/bin/wifi_schedule.sh или /sbin/wifi" -msgid "Could not find required programm /usr/bin/iwinfo" +msgid "Could not find required program /usr/bin/iwinfo" msgstr "Не удалось найти требуемую программу /usr/bin/iwinfo" msgid "Cron Jobs" diff --git a/applications/luci-app-wifischedule/po/sv/wifischedule.po b/applications/luci-app-wifischedule/po/sv/wifischedule.po index 50953aa285..9ec1ec94c8 100644 --- a/applications/luci-app-wifischedule/po/sv/wifischedule.po +++ b/applications/luci-app-wifischedule/po/sv/wifischedule.po @@ -7,7 +7,7 @@ msgstr "Aktivera wifi" msgid "Could not find required /usr/bin/wifi_schedule.sh or /sbin/wifi" msgstr "" -msgid "Could not find required programm /usr/bin/iwinfo" +msgid "Could not find required program /usr/bin/iwinfo" msgstr "" msgid "Cron Jobs" diff --git a/applications/luci-app-wifischedule/po/templates/wifischedule.pot b/applications/luci-app-wifischedule/po/templates/wifischedule.pot index 639c432e5e..9386ee115f 100644 --- a/applications/luci-app-wifischedule/po/templates/wifischedule.pot +++ b/applications/luci-app-wifischedule/po/templates/wifischedule.pot @@ -7,7 +7,7 @@ msgstr "" msgid "Could not find required /usr/bin/wifi_schedule.sh or /sbin/wifi" msgstr "" -msgid "Could not find required programm /usr/bin/iwinfo" +msgid "Could not find required program /usr/bin/iwinfo" msgstr "" msgid "Cron Jobs" diff --git a/applications/luci-app-wifischedule/po/zh-cn/wifischedule.po b/applications/luci-app-wifischedule/po/zh-cn/wifischedule.po index ab3a8d0bf3..f8a3c3efa4 100644 --- a/applications/luci-app-wifischedule/po/zh-cn/wifischedule.po +++ b/applications/luci-app-wifischedule/po/zh-cn/wifischedule.po @@ -7,7 +7,7 @@ msgstr "激活 WiFi" msgid "Could not find required /usr/bin/wifi_schedule.sh or /sbin/wifi" msgstr "无法找到必需的 /usr/bin/wifi_schedule.sh 或 /sbin/wifi" -msgid "Could not find required programm /usr/bin/iwinfo" +msgid "Could not find required program /usr/bin/iwinfo" msgstr "无法找到必需程序：/usr/bin/iwinfo" msgid "Cron Jobs" diff --git a/applications/luci-app-wifischedule/po/zh-tw/wifischedule.po b/applications/luci-app-wifischedule/po/zh-tw/wifischedule.po index ad605e1d06..51de1afb4e 100644 --- a/applications/luci-app-wifischedule/po/zh-tw/wifischedule.po +++ b/applications/luci-app-wifischedule/po/zh-tw/wifischedule.po @@ -7,7 +7,7 @@ msgstr "啟用 WiFi" msgid "Could not find required /usr/bin/wifi_schedule.sh or /sbin/wifi" msgstr "無法找到必需的 /usr/bin/wifi_schedule.sh 或 /sbin/wifi" -msgid "Could not find required programm /usr/bin/iwinfo" +msgid "Could not find required program /usr/bin/iwinfo" msgstr "無法找到必需程式：/usr/bin/iwinfo" msgid "Cron Jobs" diff --git a/applications/luci-app-wireguard/luasrc/controller/wireguard.lua b/applications/luci-app-wireguard/luasrc/controller/wireguard.lua index 68a82fe5cc..5a91960974 100644 --- a/applications/luci-app-wireguard/luasrc/controller/wireguard.lua +++ b/applications/luci-app-wireguard/luasrc/controller/wireguard.lua @@ -4,5 +4,5 @@ module("luci.controller.wireguard", package.seeall) function index() - entry({"admin", "status", "wireguard"}, template("wireguard"), _("WireGuard Status"), 92) + entry({"admin", "status", "wireguard"}, template("wireguard"), _("WireGuard Status"), 92) end diff --git a/applications/luci-app-wireguard/luasrc/view/wireguard.htm b/applications/luci-app-wireguard/luasrc/view/wireguard.htm index c25ef85caa..6ec9ddb368 100644 --- a/applications/luci-app-wireguard/luasrc/view/wireguard.htm +++ b/applications/luci-app-wireguard/luasrc/view/wireguard.htm @@ -1,224 +1,271 @@ <%# - Copyright 2016-2017 Dan Luedtke <mail@danrl.com> - Licensed to the public under the Apache License 2.0. + Copyright 2016-2017 Dan Luedtke <mail@danrl.com> + Licensed to the public under the Apache License 2.0. -%> <% - local data = { } - local last_device = "" + local uci = uci.cursor() + local data = { } + local last_device = "" + local enc = { } - local wg_dump = io.popen("wg show all dump") - if wg_dump then - local line - for line in wg_dump:lines() do - local line = string.split(line, "\t") - if not (last_device == line[1]) then - last_device = line[1] - data[line[1]] = { - name = line[1], - public_key = line[3], - listen_port = line[4], - fwmark = line[5], - peers = { } - } - else - local peer = { - public_key = line[2], - endpoint = line[4], - allowed_ips = { }, - latest_handshake = line[6], - transfer_rx = line[7], - transfer_tx = line[8], - persistent_keepalive = line[9] - } - if not (line[4] == '(none)') then - for ipkey, ipvalue in pairs(string.split(line[5], ",")) do - if #ipvalue > 0 then - table.insert(peer['allowed_ips'], ipvalue) - end - end - end - table.insert(data[line[1]].peers, peer) - end - end - end + local function wg_clean(value) + if value and value == "(none)" then + value = "" + end + return value + end - if luci.http.formvalue("status") == "1" then - luci.http.prepare_content("application/json") - luci.http.write_json(data) - return - end + local wg_dump = io.popen("wg show all dump") + if wg_dump then + local line + for line in wg_dump:lines() do + local line = string.split(line, "\t") + if not (last_device == line[1]) then + last_device = line[1] + data[line[1]] = { + name = line[1], + public_key = line[3], + listen_port = line[4], + fwmark = line[5], + peers = { } + } + local s = uci:get_list("network", line[1], "addresses") + local address = "" + local key, value + for key, value in pairs(s) do + if address ~= "" then + address = address.. ", " ..value + else + address = value + end + end + enc[line[1]] = "[Interface]\nPrivateKey = " ..wg_clean(line[2]).. "\nAddress = " ..address + else + local peer = { + public_key = line[2], + endpoint = line[4], + allowed_ips = { }, + latest_handshake = line[6], + transfer_rx = line[7], + transfer_tx = line[8], + persistent_keepalive = line[9] + } + if not (line[4] == '(none)') then + local ipkey, ipvalue + for ipkey, ipvalue in pairs(string.split(line[5], ",")) do + if #ipvalue > 0 then + table.insert(peer['allowed_ips'], ipvalue) + end + end + end + table.insert(data[line[1]].peers, peer) + enc[line[1]] = enc[line[1]].. "\n\n[Peer]\nEndpoint = " ..wg_clean(line[4]).. "\nPublicKey = " ..wg_clean(line[2]).. "\nAllowedIPs = " ..wg_clean(line[5]) + end + end + end + + if luci.http.formvalue("status") == "1" then + luci.http.prepare_content("application/json") + luci.http.write_json(data) + return + end -%> <%+header%> <script type="text/javascript">//<![CDATA[ - function bytes_to_str(bytes) { - bytes = parseFloat(bytes); - if (bytes < 1) { return "0 B"; } - var sizes = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB']; - var i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024))); - return Math.round(bytes / Math.pow(1024, i), 2) + ' ' + sizes[i]; - }; + function bytes_to_str(bytes) { + bytes = parseFloat(bytes); + if (bytes < 1) { return "0 B"; } + var sizes = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB']; + var i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024))); + return Math.round(bytes / Math.pow(1024, i), 2) + ' ' + sizes[i]; + }; + + function timestamp_to_str(timestamp) { + if (timestamp < 1) { + return '<%:Never%>'; + } + var now = new Date(); + var seconds = (now.getTime() / 1000) - timestamp; + var ago = ""; + if (seconds < 60) { + ago = parseInt(seconds) + '<%:s ago%>'; + } else if (seconds < 3600) { + ago = parseInt(seconds / 60) + '<%:m ago%>'; + } else if (seconds < 86401) { + ago = parseInt(seconds / 3600) + '<%:h ago%>'; + } else { + ago = '<%:over a day ago%>'; + } + var t = new Date(timestamp * 1000); + return t.toUTCString() + ' (' + ago + ')'; + } - function timestamp_to_str(timestamp) { - if (timestamp < 1) { - return '<%:Never%>'; - } - var now = new Date(); - var seconds = (now.getTime() / 1000) - timestamp; - var ago = ""; - if (seconds < 60) { - ago = parseInt(seconds) + '<%:s ago%>'; - } else if (seconds < 3600) { - ago = parseInt(seconds / 60) + '<%:m ago%>'; - } else if (seconds < 86401) { - ago = parseInt(seconds / 3600) + '<%:h ago%>'; - } else { - ago = '<%:over a day ago%>'; - } - var t = new Date(timestamp * 1000); - return t.toUTCString() + ' (' + ago + ')'; - } + function toggle_qrcode(iface) { + var view = document.getElementById(iface.name); + if (view.style.display === "none") { + view.style.display = "block"; + } else { + view.style.display = "none"; + } + } - XHR.poll(5, '<%=REQUEST_URI%>', { status: 1 }, - function(x, data) { - for (var key in data) { - if (!data.hasOwnProperty(key)) { continue; } - var ifname = key; - var iface = data[key]; - var s = ""; - if (iface.public_key == '(none)') { - s += '<em><%:Interface does not have a public key!%></em>'; - } else { - s += String.format( - '<strong><%:Public Key%>: </strong>%s', - iface.public_key - ); - } - if (iface.listen_port > 0) { - s += String.format( - '<br /><strong><%:Listen Port%>: </strong>%s', - iface.listen_port - ); - } - if (iface.fwmark != 'off') { - s += String.format( - '<br /><strong><%:Firewall Mark%>: </strong>%s', - iface.fwmark - ); - } - document.getElementById(ifname + "_info").innerHTML = s; - for (var i = 0, ilen = iface.peers.length; i < ilen; i++) { - var peer = iface.peers[i]; - var s = String.format( - '<strong><%:Public Key%>: </strong>%s', - peer.public_key - ); - if (peer.endpoint != '(none)') { - s += String.format( - '<br /><strong><%:Endpoint%>: </strong>%s', - peer.endpoint - ); - } - if (peer.allowed_ips.length > 0) { - s += '<br /><strong><%:Allowed IPs%>:</strong>'; - for (var k = 0, klen = peer.allowed_ips.length; k < klen; k++) { - s += '<br /> • ' + peer.allowed_ips[k]; - } - } - if (peer.persistent_keepalive != 'off') { - s += String.format( - '<br /><strong><%:Persistent Keepalive%>: </strong>%ss', - peer.persistent_keepalive - ); - } - var icon = '<img src="<%=resource%>/icons/tunnel_disabled.png" />'; - var now = new Date(); - if (((now.getTime() / 1000) - peer.latest_handshake) < 140) { - icon = '<img src="<%=resource%>/icons/tunnel.png" />'; - } - s += String.format( - '<br /><strong><%:Latest Handshake%>: </strong>%s', - timestamp_to_str(peer.latest_handshake) - ); - s += String.format( - '<br /><strong><%:Data Received%>: </strong>%s' + - '<br /><strong><%:Data Transmitted%>: </strong>%s', - bytes_to_str(peer.transfer_rx), - bytes_to_str(peer.transfer_tx) - ); - document.getElementById(ifname + "_" + peer.public_key + "_icon").innerHTML = icon; - document.getElementById(ifname + "_" + peer.public_key + "_info").innerHTML = s; - } - } - }); + XHR.poll(5, '<%=REQUEST_URI%>', { status: 1 }, + function(x, data) { + for (var key in data) { + if (!data.hasOwnProperty(key)) { continue; } + var ifname = key; + var iface = data[key]; + var s = ""; + if (iface.public_key == '(none)') { + s += '<em><%:Interface does not have a public key!%></em>'; + } else { + s += String.format( + '<strong><%:Public Key%>: </strong>%s', + iface.public_key + ); + } + if (iface.listen_port > 0) { + s += String.format( + '<br /><strong><%:Listen Port%>: </strong>%s', + iface.listen_port + ); + } + if (iface.fwmark != 'off') { + s += String.format( + '<br /><strong><%:Firewall Mark%>: </strong>%s', + iface.fwmark + ); + } + document.getElementById(ifname + "_info").innerHTML = s; + for (var i = 0, ilen = iface.peers.length; i < ilen; i++) { + var peer = iface.peers[i]; + var s = String.format( + '<strong><%:Public Key%>: </strong>%s', + peer.public_key + ); + if (peer.endpoint != '(none)') { + s += String.format( + '<br /><strong><%:Endpoint%>: </strong>%s', + peer.endpoint + ); + } + if (peer.allowed_ips.length > 0) { + s += '<br /><strong><%:Allowed IPs%>:</strong>'; + for (var k = 0, klen = peer.allowed_ips.length; k < klen; k++) { + s += '<br />  • ' + peer.allowed_ips[k]; + } + } + if (peer.persistent_keepalive != 'off') { + s += String.format( + '<br /><strong><%:Persistent Keepalive%>: </strong>%ss', + peer.persistent_keepalive + ); + } + var icon = '<img src="<%=resource%>/icons/tunnel_disabled.png" />'; + var now = new Date(); + if (((now.getTime() / 1000) - peer.latest_handshake) < 140) { + icon = '<img src="<%=resource%>/icons/tunnel.png" />'; + } + s += String.format( + '<br /><strong><%:Latest Handshake%>: </strong>%s', + timestamp_to_str(peer.latest_handshake) + ); + s += String.format( + '<br /><strong><%:Data Received%>: </strong>%s' + + '<br /><strong><%:Data Transmitted%>: </strong>%s', + bytes_to_str(peer.transfer_rx), + bytes_to_str(peer.transfer_tx), + ); + document.getElementById(ifname + "_" + peer.public_key + "_icon").innerHTML = icon; + document.getElementById(ifname + "_" + peer.public_key + "_info").innerHTML = s; + } + } + }); //]]></script> <h2>WireGuard Status</h2> -<fieldset class="cbi-section"> +<div class="cbi-section"> <%- +local ikey, iface for ikey, iface in pairs(data) do - -%> - <legend><%:Interface%> <%=ikey%></legend> - <div class="table" width="100%" cellspacing="10"> - <div class="tr"> - <div class="td" width="33%" style="vertical-align:top"><%:Configuration%></div> - <div class="td"> - <div class="table"> - <div class="tr"> - <div class="td" id="<%=ikey%>_icon" style="width:16px; text-align:center; padding:3px"> - - </div> - <div class="td" id="<%=ikey%>_info" style="vertical-align:middle; padding: 3px"> - <em><%:Collecting data...%></em> - </div> - </div></div> - </div> - </div> - <%- - local cur = uci.cursor() - for pkey, peer in pairs(iface.peers) do - local desc, tmp_desc, pub_key = "", "", "" - cur:foreach("network", "wireguard_" .. ikey, function(s) - local tmp_desc, pub_key = "", "" - for key, value in pairs(s) do - if key == "description" then - tmp_desc = value - end - if value == peer.public_key then - pub_key = value - end - if pub_key == peer.public_key and tmp_desc ~= "" then - desc = ': ' .. tmp_desc - end - end - end) - -%> - <div class="tr"> - <div class="td" width="33%" style="vertical-align:top"><%:Peer%><%=desc%></div> - <div class="td"> - <div class="table"> - <div class="tr"> - <div class="td" id="<%=ikey%>_<%=peer.public_key%>_icon" style="width:16px; text-align:center; padding:3px"> - <img src="<%=resource%>/icons/tunnel_disabled.png" /><br /> - <small>?</small> - </div> - <div class="td" id="<%=ikey%>_<%=peer.public_key%>_info" style="vertical-align:middle; padding: 3px"> - <em><%:Collecting data...%></em> - </div> - </div></div> - </div> - </div> - <%- - end - -%> - </div> - <%- +-%> + <h3><%:Interface%> <%=ikey%></h3> + <div class="cbi-value" id="button" style="padding: 5px"> + <input class="cbi-button cbi-button-apply" type="button" name="qrcode_<%=ikey%>" value="<%:Show/Hide QR-Code%>" onclick="toggle_qrcode(this)" /> + </div> +<%- + local qrcode + if fs.access("/usr/bin/qrencode") then + if enc[ikey]:sub(26, 26) ~= "\n" then + qrcode = luci.sys.exec("/usr/bin/qrencode --inline --8bit --type=SVG --output=- '" ..enc[ikey].. "'") + end + else + qrcode = "<em>For QR-Code support please install package 'qrencode'!</em>" + end +-%> + <div class="cbi-value-title"> + <span class="cbi-value" style="display: none" id="qrcode_<%=ikey%>"><%=qrcode%></span> + </div> + <div class="cbi-section-node"> + <div class="table cbi-section-table"> + <div class="tr cbi-section-table-row" style="text-align: left;"> + <div class="td" style="text-align: left; vertical-align:top"><%:Configuration%></div> + <div class="td" style="flex: 0 1 90%; text-align: left;"> + <div class="table cbi-section-table" style="border: 0px;"> + <div class="tr cbi-section-table-row" style="text-align: left; border: 0px;"> + <div class="td" id="<%=ikey%>_icon" style="width: 22px; text-align: left; border-top: 0px; padding: 3px;"> </div> + <div class="td" id="<%=ikey%>_info" style="flex: 0 1 90%; text-align: left; vertical-align:middle; padding: 3px; border-top: 0px;"><em><%:Collecting data...%></em></div> + </div> + </div> + </div> + </div> + <%- + local cur = uci.cursor() + local pkey, peer + for pkey, peer in pairs(iface.peers) do + local desc + cur:foreach("network", "wireguard_" .. ikey, function(s) + local key, value, tmp_desc, pub_key + for key, value in pairs(s) do + if key == "description" then + tmp_desc = value + end + if value == peer.public_key then + pub_key = value + end + if pub_key and tmp_desc then + desc = ': ' ..tmp_desc + end + end + end) + -%> + <div class="tr cbi-section-table-row" style="text-align: left;"> + <div class="td" style="text-align: left; vertical-align:top"><%:Peer%><%=desc%></div> + <div class="td" style="flex: 0 1 90%; text-align: left;"> + <div class="table cbi-section-table" style="border: 0px"> + <div class="tr cbi-section-table-row" style="border: 0px;"> + <div class="td" id="<%=ikey%>_<%=peer.public_key%>_icon" style="width:16px; text-align: left; padding: 3px;border-top: 0px;"> + <img src="<%=resource%>/icons/tunnel_disabled.png" /> + <small>?</small> + </div> + <div class="td" id="<%=ikey%>_<%=peer.public_key%>_info" style="flex: 0 1 90%; text-align: left; vertical-align:middle; padding: 3px;border-top: 0px;"><em><%:Collecting data...%></em></div> + </div> + </div> + </div> + </div> + <%- + end + -%> + </div> + </div> + <%- end -%> -</fieldset> +</div> <%+footer%> diff --git a/applications/luci-app-wireguard/po/ja/wireguard.po b/applications/luci-app-wireguard/po/ja/wireguard.po index 5cd7a90037..921ede1244 100644 --- a/applications/luci-app-wireguard/po/ja/wireguard.po +++ b/applications/luci-app-wireguard/po/ja/wireguard.po @@ -58,6 +58,9 @@ msgstr "永続的なキープアライブ" msgid "Public Key" msgstr "公開鍵" +msgid "Show/Hide QR-Code" +msgstr "" + msgid "WireGuard Status" msgstr "WireGuard ステータス" diff --git a/applications/luci-app-wireguard/po/pt-br/wireguard.po b/applications/luci-app-wireguard/po/pt-br/wireguard.po index d3b5059d5f..2874639b67 100644 --- a/applications/luci-app-wireguard/po/pt-br/wireguard.po +++ b/applications/luci-app-wireguard/po/pt-br/wireguard.po @@ -57,6 +57,9 @@ msgstr "Manter Conexões Abertas (Keepalive)" msgid "Public Key" msgstr "Chave Pública" +msgid "Show/Hide QR-Code" +msgstr "" + msgid "WireGuard Status" msgstr "Estado do WireGuard" diff --git a/applications/luci-app-wireguard/po/ru/wireguard.po b/applications/luci-app-wireguard/po/ru/wireguard.po index 202a49eff4..3781d89522 100644 --- a/applications/luci-app-wireguard/po/ru/wireguard.po +++ b/applications/luci-app-wireguard/po/ru/wireguard.po @@ -58,6 +58,9 @@ msgstr "Постоянные Проверки Активности" msgid "Public Key" msgstr "Публичный Ключ" +msgid "Show/Hide QR-Code" +msgstr "" + msgid "WireGuard Status" msgstr "Состояние WireGuard" diff --git a/applications/luci-app-wireguard/po/sv/wireguard.po b/applications/luci-app-wireguard/po/sv/wireguard.po index 3422ae91e9..c0f7040c67 100644 --- a/applications/luci-app-wireguard/po/sv/wireguard.po +++ b/applications/luci-app-wireguard/po/sv/wireguard.po @@ -46,6 +46,9 @@ msgstr "Hålla vid liv ständigt" msgid "Public Key" msgstr "Publik nyckel" +msgid "Show/Hide QR-Code" +msgstr "" + msgid "WireGuard Status" msgstr "Status för WireGuard" diff --git a/applications/luci-app-wireguard/po/templates/wireguard.pot b/applications/luci-app-wireguard/po/templates/wireguard.pot index 9ec5c60048..3cec473ecf 100644 --- a/applications/luci-app-wireguard/po/templates/wireguard.pot +++ b/applications/luci-app-wireguard/po/templates/wireguard.pot @@ -46,6 +46,9 @@ msgstr "" msgid "Public Key" msgstr "" +msgid "Show/Hide QR-Code" +msgstr "" + msgid "WireGuard Status" msgstr "" diff --git a/applications/luci-app-wireguard/po/zh-cn/wireguard.po b/applications/luci-app-wireguard/po/zh-cn/wireguard.po index 38fd784b12..1864048d5b 100644 --- a/applications/luci-app-wireguard/po/zh-cn/wireguard.po +++ b/applications/luci-app-wireguard/po/zh-cn/wireguard.po @@ -60,6 +60,9 @@ msgstr "Keepalive 间隔（秒）" msgid "Public Key" msgstr "公钥" +msgid "Show/Hide QR-Code" +msgstr "" + msgid "WireGuard Status" msgstr "WireGuard 状态" diff --git a/applications/luci-app-wireguard/po/zh-tw/wireguard.po b/applications/luci-app-wireguard/po/zh-tw/wireguard.po index 66fd9649e6..83da0c351a 100644 --- a/applications/luci-app-wireguard/po/zh-tw/wireguard.po +++ b/applications/luci-app-wireguard/po/zh-tw/wireguard.po @@ -60,6 +60,9 @@ msgstr "Keepalive 間隔（秒）" msgid "Public Key" msgstr "公鑰" +msgid "Show/Hide QR-Code" +msgstr "" + msgid "WireGuard Status" msgstr "WireGuard 狀態" |