diff options
350 files changed, 5503 insertions, 2560 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 狀態" diff --git a/build/check-controllers.sh b/build/check-controllers.sh index 573e6f8642..47f66eac94 100755 --- a/build/check-controllers.sh +++ b/build/check-controllers.sh @@ -14,7 +14,7 @@ find . -type f -name '*.lua' -path '*/controller/*' | while read controller; do package="${controller##*/controller/}"; package="${package%.lua}"; package="luci.controller.${package//\//.}" if ! grep -sqE '\bmodule[[:space:]]*\(?[[:space:]]*("|\047|\[=*\[)'"$package" "$controller"; then - echo "'$controller' does not containt the expected\n\t'module(\"$package\", ...)' line.\n" + echo "'$controller' does not contain the expected\n\t'module(\"$package\", ...)' line.\n" fi grep -sqE '\b(Form|SimpleForm)[[:space:]]*\(' "$model" && ! grep -sqE '\bMap[[:space:]]*\(' "$model" && is_form=1 || is_form=0 diff --git a/build/i18n-scan.pl b/build/i18n-scan.pl index 899d90d22c..3f9ee89630 100755 --- a/build/i18n-scan.pl +++ b/build/i18n-scan.pl @@ -4,7 +4,7 @@ use strict; use warnings; use Text::Balanced qw(extract_bracketed extract_delimited extract_tagged); -@ARGV >= 1 || die "Usage: $0 <source direcory>\n"; +@ARGV >= 1 || die "Usage: $0 <source directory>\n"; my %stringtable; diff --git a/build/luadoc/luadoc/config.lua b/build/luadoc/luadoc/config.lua index 9e4b9de3c5..319e1cb03e 100644 --- a/build/luadoc/luadoc/config.lua +++ b/build/luadoc/luadoc/config.lua @@ -1,6 +1,6 @@ ------------------------------------------------------------------------------- -- LuaDoc configuration file. This file contains the default options for --- luadoc operation. These options can be overriden by the command line tool +-- luadoc operation. These options can be overridden by the command line tool -- @see luadoc.print_help -- @release $Id: config.lua,v 1.6 2007/04/18 14:28:39 tomas Exp $ ------------------------------------------------------------------------------- diff --git a/contrib/package/community-profiles/files/etc/config/profile_berlin b/contrib/package/community-profiles/files/etc/config/profile_berlin index 2307f1f3ba..e4388c76e3 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_berlin +++ b/contrib/package/community-profiles/files/etc/config/profile_berlin @@ -33,7 +33,7 @@ config 'defaults' 'ssidscheme' config 'defaults' 'interface' option 'netmask' '255.255.255.255' - option 'dns' '85.214.20.141 194.150.168.168 2001:4ce8::53 2001:910:800::12' + option 'dns' '85.214.20.141 80.67.169.40 194.150.168.168 2001:4ce8::53 2001:910:800::12' config 'dhcp' 'dhcp' option leasetime '5m' diff --git a/contrib/package/community-profiles/files/etc/config/profile_cottbus b/contrib/package/community-profiles/files/etc/config/profile_cottbus index 9b08acc256..6c7f4b6966 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_cottbus +++ b/contrib/package/community-profiles/files/etc/config/profile_cottbus @@ -31,7 +31,7 @@ config 'defaults' 'ssidscheme' config 'defaults' 'interface' option 'netmask' '255.255.255.255' - option 'dns' '85.214.20.141 194.150.168.168 2001:4ce8::53 2001:910:800::12' + option 'dns' '85.214.20.141 80.67.169.40 194.150.168.168 2001:4ce8::53 2001:910:800::12' config 'dhcp' 'dhcp' option 'leasetime' '5m' diff --git a/contrib/package/community-profiles/files/etc/config/profile_fuerstenwalde b/contrib/package/community-profiles/files/etc/config/profile_fuerstenwalde new file mode 100644 index 0000000000..f7df7ba650 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_fuerstenwalde @@ -0,0 +1,38 @@ +config 'community' 'profile' + option 'name' 'Freifunk Fürstenwalde' + option 'homepage' 'http://fuerstenwalde.freifunk.net' + option 'ssid' 'fuerstenwalde.freifunk.net' + option 'ssid_scheme' 'addchannelbefore' + option 'mesh_network' '10.0.0.0/8' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '52.35844' + option 'longitude' '14.063696' + option 'owm_api' 'http://util.berlin.freifunk.net' + +config 'defaults' 'wifi_device' + option 'channel' '13' + +config 'defaults' 'wifi_device_5' + option 'channel' '36' + +config 'defaults' 'wifi_iface' + option 'mcast_rate' '6000' + +config 'defaults' 'wifi_iface_5' + option 'mcast_rate' '12000' + +config 'defaults' 'bssidscheme' + option '13' 'D2:CA:FF:EE:BA:BE' + option '36' '02:36:CA:FF:EE:EE' + +config 'defaults' 'ssidscheme' + option '13' 'intern-ch13.freifunk.net' + option '36' 'intern-ch36.freifunk.net' + +config 'defaults' 'interface' + option 'netmask' '255.255.255.255' + option 'dns' '85.214.20.141 80.67.169.40 194.150.168.168 2001:4ce8::53 2001:910:800::12' + +config 'dhcp' 'dhcp' +option leasetime '5m' diff --git a/contrib/package/community-profiles/files/etc/config/profile_potsdam b/contrib/package/community-profiles/files/etc/config/profile_potsdam index 84bbdfe528..78db579a93 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_potsdam +++ b/contrib/package/community-profiles/files/etc/config/profile_potsdam @@ -11,7 +11,7 @@ config 'community' 'profile' config 'defaults' 'interface' option 'netmask' '255.255.0.0' - option 'dns' '85.214.20.141 194.150.168.168' + option 'dns' '85.214.20.141 80.67.169.40 194.150.168.168' option 'delegate' '0' config 'defaults' 'wifi_device' diff --git a/contrib/package/community-profiles/files/etc/config/profile_tulumlibre b/contrib/package/community-profiles/files/etc/config/profile_tulumlibre index c028a66614..ceaff2a743 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_tulumlibre +++ b/contrib/package/community-profiles/files/etc/config/profile_tulumlibre @@ -7,4 +7,4 @@ config 'community' 'profile' option 'splash_prefix' '28' config 'defaults' 'interface' - option 'dns' '216.87.84.211' + option 'dns' '80.67.169.40 216.87.84.211' diff --git a/contrib/package/freifunk-common/files/usr/bin/neigh.sh b/contrib/package/freifunk-common/files/usr/bin/neigh.sh index 468ed7a3e0..82589ecfdf 100755 --- a/contrib/package/freifunk-common/files/usr/bin/neigh.sh +++ b/contrib/package/freifunk-common/files/usr/bin/neigh.sh @@ -10,7 +10,7 @@ hostsfile_getname() while value="$( uci -q get $config.@LoadPlugin[$i].library )"; do { case "$value" in - 'olsrd_nameservice.so.'*) + 'olsrd_nameservice'*) file="$( uci -q get $config.@LoadPlugin[$i].hosts_file )" break ;; diff --git a/contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog b/contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog index 8ac803d309..af1d7ca68d 100755 --- a/contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog +++ b/contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog @@ -11,7 +11,7 @@ if fs.access("/var/run/olsrd.pid") or fs.access("/var/run/olsrd4.pid") then x:foreach("olsrd", "LoadPlugin", function(s) - if s.library == "olsrd_watchdog.so.0.1" then + if s.library == "olsrd_watchdog" then intv = tonumber(s.interval) stamp = s.file end diff --git a/contrib/package/freifunk-mapupdate/files/usr/sbin/ff_mapupdate.sh b/contrib/package/freifunk-mapupdate/files/usr/sbin/ff_mapupdate.sh index 40a077f154..b06e145d65 100755 --- a/contrib/package/freifunk-mapupdate/files/usr/sbin/ff_mapupdate.sh +++ b/contrib/package/freifunk-mapupdate/files/usr/sbin/ff_mapupdate.sh @@ -8,7 +8,7 @@ MAPSERVER="$(uci -q get freifunk-mapupdate.mapupdate.mapserver)" [ -z "$MAPSERVER" ] && logger -t "freifunk-mapupdate:" "No mapserver configured" && exit 1 #check if nameservice plugin is installed and enabled, else exit -nslib=`uci show olsrd |grep olsrd_nameservice.so |awk {' FS="."; print $1"."$2 '}` +nslib=`uci show olsrd |grep olsrd_nameservice |awk {' FS="."; print $1"."$2 '}` if [ -n "$nslib" ]; then LATLONFILE="$(uci -q get $nslib.latlon_file)" if [ -z "$LATLONFILE" ]; then diff --git a/contrib/package/freifunk-watchdog/src/watchdog.c b/contrib/package/freifunk-watchdog/src/watchdog.c index f546985c9c..4bc3ab0b67 100644 --- a/contrib/package/freifunk-watchdog/src/watchdog.c +++ b/contrib/package/freifunk-watchdog/src/watchdog.c @@ -21,7 +21,7 @@ /* Global watchdog fd, required by signal handler */ int wdfd = -1; -/* Handle finished childs */ +/* Handle finished children */ static void sigchld_handler(int sig) { pid_t pid; @@ -406,7 +406,7 @@ static int do_daemon(void) ioctl(wdfd, WDIOC_SETTIMEOUT, &wdtimeout); } - /* Install signal handler to reap childs */ + /* Install signal handler to reap children */ sa.sa_handler = sigchld_handler; sa.sa_flags = 0; sigaction(SIGCHLD, &sa, NULL); diff --git a/contrib/package/freifunk-watchdog/src/watchdog.h b/contrib/package/freifunk-watchdog/src/watchdog.h index 6f2382de38..c622856dae 100644 --- a/contrib/package/freifunk-watchdog/src/watchdog.h +++ b/contrib/package/freifunk-watchdog/src/watchdog.h @@ -64,7 +64,7 @@ #define WATCH_SHUTDOWN 'V' #define WATCH_KEEPALIVE '\0' -/* System load error action and treshold */ +/* System load error action and threshold */ #define LOAD_TRESHOLD 15.00 #define LOAD_ACTION "/sbin/reboot", "/sbin/reboot" diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/functions.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/functions.sh index b0f6cb291e..0b99530a57 100644 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/functions.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/functions.sh @@ -46,7 +46,7 @@ set_defaults() { b="${b//_/ }" string_contains "$a" "_LENGTH" && continue string_contains "$a" "_ITEM" && { - # special threatment for lists. use add_list and remove the + # special treatment for lists. use add_list and remove the # item index (_ITEMx). uci add_list $2.${a//_ITEM[0-9]*/}="$b" } || { diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh index 9ebcb46b13..a435e4b1b8 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh @@ -73,7 +73,7 @@ setup_nameservice() { uci batch <<- EOF set $cfg.olsrd_nameservice=LoadPlugin - set $cfg.olsrd_nameservice.library="olsrd_nameservice.so.0.4" + set $cfg.olsrd_nameservice.library="olsrd_nameservice" set $cfg.olsrd_nameservice.latlon_file="$llfile" set $cfg.olsrd_nameservice.hosts_file="$hosts" set $cfg.olsrd_nameservice.sighup_pid_file="/var/run/dnsmasq.pid" @@ -91,7 +91,7 @@ setup_dyngw_plain() { if [ "$general_sharenet" == 1 ]; then uci set $cfg.dyngw_plain=LoadPlugin uci set $cfg.dyngw_plain.ignore=0 - uci set $cfg.dyngw_plain.library="olsrd_dyn_gw_plain.so.0.4" + uci set $cfg.dyngw_plain.library="olsrd_dyn_gw_plain" uci_commitverbose "Setup olsrd_dyngw_plain plugin" $cfg fi @@ -106,7 +106,7 @@ setup_watchdog() { uci batch <<- EOF set $cfg.olsrd_watchdog=LoadPlugin - set $cfg.olsrd_watchdog.library="olsrd_watchdog.so.0.1" + set $cfg.olsrd_watchdog.library="olsrd_watchdog" set $cfg.olsrd_watchdog.file="$watchdogfile" set $cfg.olsrd_watchdog.interval=30 EOF @@ -118,7 +118,7 @@ setup_jsoninfo() { proto="$1" uci batch <<- EOF set $cfg.olsrd_jsoninfo=LoadPlugin - set $cfg.olsrd_jsoninfo.library="olsrd_jsoninfo.so.1.1" + set $cfg.olsrd_jsoninfo.library="olsrd_jsoninfo" EOF if [ "$proto" = "6" ]; then uci set $cfg.olsrd_jsoninfo.ipv6only='1' @@ -130,7 +130,7 @@ setup_txtinfo() { proto="$1" uci batch <<- EOF set $cfg.olsrd_txtinfo=LoadPlugin - set $cfg.olsrd_txtinfo.library="olsrd_txtinfo.so.1.1" + set $cfg.olsrd_txtinfo.library="olsrd_txtinfo" EOF if [ "$proto" = "6" ]; then uci set $cfg.olsrd_txtinfo.ipv6only='1' diff --git a/documentation/CBI.md b/documentation/CBI.md index e937fe6048..d4bc4c34e5 100644 --- a/documentation/CBI.md +++ b/documentation/CBI.md @@ -131,7 +131,7 @@ If you call this function several times the dependencies will be linked with **" Adds an entry to the selection list #### property .widget = "select" -**"select"** shows a selction list, **"radio"** shows a list of radio buttons inside form +**"select"** shows a selection list, **"radio"** shows a list of radio buttons inside form #### property .default = nil The default value @@ -194,7 +194,7 @@ If you call this function several times the dependencies will be linked with **" Adds an entry to the list #### property .widget = "checkbox" -**"select"** shows a selction list, **"checkbox"** shows a list of checkboxes inside form +**"select"** shows a selection list, **"checkbox"** shows a list of checkboxes inside form #### property .delimiter = " " The string which will be used to delimit the values inside stored option diff --git a/documentation/Templates.md b/documentation/Templates.md index dc42c28ab7..adf019c01a 100644 --- a/documentation/Templates.md +++ b/documentation/Templates.md @@ -1,7 +1,7 @@ LuCI has a simple regex based template processor which parses HTML-files to Lua functions and allows to store precompiled template files. The simplest form of a template is just an ordinary HTML-file. It will be printed out to the user as is. -In LuCI every template is an object with an own scope. It can therefore be instanciated and each instance can has a different scope. As every template processor. LuCI supports several special markups. Those are enclosed in `<% %>`-Tags. +In LuCI every template is an object with an own scope. It can therefore be instantiated and each instance can has a different scope. As every template processor. LuCI supports several special markups. Those are enclosed in `<% %>`-Tags. By adding `-` (dash) right after the opening `<%` every whitespace before the markup will be stripped. Adding a `-` right before the closing `%>` will equivalently strip every whitespace behind the markup. diff --git a/libs/luci-lib-httpprotoutils/luasrc/http/mime.luadoc b/libs/luci-lib-httpprotoutils/luasrc/http/mime.luadoc index 7751e2baf4..9c7f01aedf 100644 --- a/libs/luci-lib-httpprotoutils/luasrc/http/mime.luadoc +++ b/libs/luci-lib-httpprotoutils/luasrc/http/mime.luadoc @@ -7,7 +7,7 @@ vice versa. module "luci.http.mime" ---[[ -MIME mapping table containg extension - mimetype relations. +MIME mapping table containing extension - mimetype relations. @class table ]] diff --git a/libs/luci-lib-ip/src/ip.luadoc b/libs/luci-lib-ip/src/ip.luadoc index b1ecae1453..a2df96cdb5 100644 --- a/libs/luci-lib-ip/src/ip.luadoc +++ b/libs/luci-lib-ip/src/ip.luadoc @@ -283,7 +283,7 @@ Fetch all routes, optionally matching the given criteria. @sort 9 @name routes @param filter <p>Table containing one or more of the possible filter -critera described below (optional)</p><table> +criteria described below (optional)</p><table> <tr><th>Field</th><th>Description</th></tr> <tr><td>`family`</td><td> Number describing the address family to return - `4` selects @@ -363,7 +363,7 @@ Fetches entries from the IPv4 ARP and IPv6 neighbour kernel table @sort 10 @name neighbors @param filter <p>Table containing one or more of the possible filter -critera described below (optional)</p><table> +criteria described below (optional)</p><table> <tr><th>Field</th><th>Description</th></tr> <tr><td>`family`</td><td> Number describing the address family to return - `4` selects @@ -652,7 +652,7 @@ are considered lower than MAC addresses</li> @class function @sort 10 @name cidr.lower -@param addr A `luci.ip.cidr` instance or a string convertable by +@param addr A `luci.ip.cidr` instance or a string convertible by `luci.ip.new()` to compare against. @return `true` if this CIDR is lower than the given address, else `false`. @@ -676,7 +676,7 @@ are considered lower than MAC addresses</li> @class function @sort 11 @name cidr.higher -@param addr A `luci.ip.cidr` instance or a string convertable by +@param addr A `luci.ip.cidr` instance or a string convertible by `luci.ip.new()` to compare against. @return `true` if this CIDR is higher than the given address, else `false`. @@ -696,7 +696,7 @@ Checks whether this CIDR instance is equal to the given argument. @class function @sort 12 @name cidr.equal -@param addr A `luci.ip.cidr` instance or a string convertable by +@param addr A `luci.ip.cidr` instance or a string convertible by `luci.ip.new()` to compare against. @return `true` if this CIDR is equal to the given address, else `false`. @@ -877,7 +877,7 @@ Test whether CIDR contains given range. @class function @sort 21 @name cidr.contains -@param addr A `luci.ip.cidr` instance or a string convertable by +@param addr A `luci.ip.cidr` instance or a string convertible by `luci.ip.new()` to test. @return `true` if this instance fully contains the given address else `false`. @@ -903,12 +903,12 @@ address space, the result is set to the highest possible address. @sort 22 @name cidr.add @param amount A numeric value between 0 and 0xFFFFFFFF, a - `luci.ip.cidr` instance or a string convertable by + `luci.ip.cidr` instance or a string convertible by `luci.ip.new()`. @param inplace If `true`, modify this instance instead of returning a new derived CIDR instance. @return <ul> - <li>When adding inplace: Return `true` if the addition succeded + <li>When adding inplace: Return `true` if the addition succeeded or `false` when the addition overflowed.</li> <li>When deriving new CIDR: Return new instance representing the value of this instance plus the added amount or the highest possible address if @@ -952,7 +952,7 @@ possible address is returned. @sort 23 @name cidr.sub @param amount A numeric value between 0 and 0xFFFFFFFF, a - `luci.ip.cidr` instance or a string convertable by + `luci.ip.cidr` instance or a string convertible by `luci.ip.new()`. @param inplace If `true`, modify this instance instead of returning a new derived CIDR instance. diff --git a/libs/luci-lib-iptparser/Makefile b/libs/luci-lib-iptparser/Makefile new file mode 100644 index 0000000000..06748adbfc --- /dev/null +++ b/libs/luci-lib-iptparser/Makefile @@ -0,0 +1,14 @@ +# +# Copyright (C) 2018 The LuCI Team <luci@lists.subsignal.org> +# +# This is free software, licensed under the Apache License, Version 2.0 . +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=Iptables listing parser class +LUCI_DEPENDS:=+luci-base + +include ../../luci.mk + +# call BuildPackage - OpenWrt buildroot signature diff --git a/modules/luci-base/luasrc/sys/iptparser.lua b/libs/luci-lib-iptparser/luasrc/sys/iptparser.lua index 7ff665e7af..7ff665e7af 100644 --- a/modules/luci-base/luasrc/sys/iptparser.lua +++ b/libs/luci-lib-iptparser/luasrc/sys/iptparser.lua diff --git a/modules/luci-base/luasrc/sys/iptparser.luadoc b/libs/luci-lib-iptparser/luasrc/sys/iptparser.luadoc index 071e7d52e4..071e7d52e4 100644 --- a/modules/luci-base/luasrc/sys/iptparser.luadoc +++ b/libs/luci-lib-iptparser/luasrc/sys/iptparser.luadoc diff --git a/libs/luci-lib-nixio/docsrc/CHANGELOG.lua b/libs/luci-lib-nixio/docsrc/CHANGELOG.lua index aa31841402..8c9260317b 100644 --- a/libs/luci-lib-nixio/docsrc/CHANGELOG.lua +++ b/libs/luci-lib-nixio/docsrc/CHANGELOG.lua @@ -10,7 +10,7 @@ module "nixio.CHANGELOG" -- <li>Added support for x509 certificates in DER format.</li> -- <li>Added support for splice() in UnifiedIO.copyz().</li> -- <li>Added interface to inject chunks into UnifiedIO.linesource() buffer.</li> --- <li>Changed TLS behaviour to explicitely separate servers and clients.</li> +-- <li>Changed TLS behaviour to explicitly separate servers and clients.</li> -- <li>Fixed usage of signed datatype breaking Base64 decoding.</li> -- <li>Fixed namespace clashes for nixio.fs.</li> -- <li>Fixed splice() support for some exotic C libraries.</li> diff --git a/libs/luci-lib-nixio/docsrc/README.lua b/libs/luci-lib-nixio/docsrc/README.lua index 9860cf0919..d663b629ee 100644 --- a/libs/luci-lib-nixio/docsrc/README.lua +++ b/libs/luci-lib-nixio/docsrc/README.lua @@ -18,7 +18,7 @@ module "nixio.README" -- table <strong>nixio.const_sock</strong> for socket error codes. This might -- be important if you are dealing with Windows applications, on POSIX however -- const_sock is just an alias for const.</li> --- <li>With some exceptions - which are explicitely stated in the function +-- <li>With some exceptions - which are explicitly stated in the function -- documentation - all blocking functions are signal-protected and will not fail -- with EINTR.</li> -- <li>On POSIX the SIGPIPE signal will be set to ignore upon initialization. diff --git a/libs/luci-lib-nixio/docsrc/nixio.lua b/libs/luci-lib-nixio/docsrc/nixio.lua index 1a0d69a054..56a4afbb88 100644 --- a/libs/luci-lib-nixio/docsrc/nixio.lua +++ b/libs/luci-lib-nixio/docsrc/nixio.lua @@ -59,7 +59,7 @@ module "nixio" -- <li>aliases = Table of alias names</li> -- </ul> ---- Get all or a specifc proto entry. +--- Get all or a specific proto entry. -- @class function -- @name nixio.getproto -- @param proto protocol number or name to lookup (optional) diff --git a/libs/luci-lib-px5g/src/library/bignum.c b/libs/luci-lib-px5g/src/library/bignum.c index 8b7c12ff00..d2a8ff42e1 100644 --- a/libs/luci-lib-px5g/src/library/bignum.c +++ b/libs/luci-lib-px5g/src/library/bignum.c @@ -720,7 +720,7 @@ cleanup: } /* - * Helper for mpi substraction + * Helper for mpi subtraction */ static void mpi_sub_hlp( int n, t_int *s, t_int *d ) { @@ -741,7 +741,7 @@ static void mpi_sub_hlp( int n, t_int *s, t_int *d ) } /* - * Unsigned substraction: X = |A| - |B| (HAC 14.9) + * Unsigned subtraction: X = |A| - |B| (HAC 14.9) */ int mpi_sub_abs( mpi *X, mpi *A, mpi *B ) { @@ -809,7 +809,7 @@ cleanup: } /* - * Signed substraction: X = A - B + * Signed subtraction: X = A - B */ int mpi_sub_mpi( mpi *X, mpi *A, mpi *B ) { @@ -856,7 +856,7 @@ int mpi_add_int( mpi *X, mpi *A, int b ) } /* - * Signed substraction: X = A - b + * Signed subtraction: X = A - b */ int mpi_sub_int( mpi *X, mpi *A, int b ) { diff --git a/libs/luci-lib-px5g/src/library/x509write.c b/libs/luci-lib-px5g/src/library/x509write.c index 173610c1a0..b9ebf35bae 100644 --- a/libs/luci-lib-px5g/src/library/x509write.c +++ b/libs/luci-lib-px5g/src/library/x509write.c @@ -19,7 +19,7 @@ * MA 02110-1301 USA */ /* - * The ITU-T X.509 standard defines a certificat format for PKI. + * The ITU-T X.509 standard defines a certificate format for PKI. * * http://www.ietf.org/rfc/rfc2459.txt * http://www.ietf.org/rfc/rfc3279.txt @@ -68,7 +68,7 @@ static int asn1_eval_octet(unsigned int digit) } /* - * write the asn.1 lenght form into p + * write the asn.1 length form into p */ static int asn1_add_len(unsigned int size, x509_node *node) { @@ -788,7 +788,7 @@ static int x509write_parse_names(x509_node *node, unsigned char *names) R_len = len; } - /* set tag poiner to begin */ + /* set tag pointer to begin */ tag_sp = tag; /* is at end? */ @@ -866,7 +866,7 @@ static int x509write_parse_names(x509_node *node, unsigned char *names) } /* - * Copy raw data from orginal ca to node + * Copy raw data from original ca to node */ static int x509write_copy_from_raw(x509_node *node, x509_buf *raw) { diff --git a/libs/luci-lib-px5g/src/polarssl/bignum.h b/libs/luci-lib-px5g/src/polarssl/bignum.h index c667303329..cf443ea922 100644 --- a/libs/luci-lib-px5g/src/polarssl/bignum.h +++ b/libs/luci-lib-px5g/src/polarssl/bignum.h @@ -272,7 +272,7 @@ int mpi_cmp_int( mpi *X, int z ); int mpi_add_abs( mpi *X, mpi *A, mpi *B ); /** - * \brief Unsigned substraction: X = |A| - |B| + * \brief Unsigned subtraction: X = |A| - |B| * * \return 0 if successful, * POLARSSL_ERR_MPI_NEGATIVE_VALUE if B is greater than A @@ -288,7 +288,7 @@ int mpi_sub_abs( mpi *X, mpi *A, mpi *B ); int mpi_add_mpi( mpi *X, mpi *A, mpi *B ); /** - * \brief Signed substraction: X = A - B + * \brief Signed subtraction: X = A - B * * \return 0 if successful, * 1 if memory allocation failed @@ -304,7 +304,7 @@ int mpi_sub_mpi( mpi *X, mpi *A, mpi *B ); int mpi_add_int( mpi *X, mpi *A, int b ); /** - * \brief Signed substraction: X = A - b + * \brief Signed subtraction: X = A - b * * \return 0 if successful, * 1 if memory allocation failed diff --git a/libs/luci-lib-px5g/src/polarssl/x509.h b/libs/luci-lib-px5g/src/polarssl/x509.h index 908a1dbf51..6c9ef99a8a 100644 --- a/libs/luci-lib-px5g/src/polarssl/x509.h +++ b/libs/luci-lib-px5g/src/polarssl/x509.h @@ -375,7 +375,7 @@ int x509write_add_pubkey( x509_raw *chain, rsa_context *pubkey ); * the string parse. * * \param chain points to the raw certificate data - * \param names a string that can hold (separete with ";"): + * \param names a string that can hold (separate with ";"): * CN=CommonName * -- O=Organization * -- OU=OrgUnit @@ -402,7 +402,7 @@ int x509write_add_customize ( x509_raw *crt, * \brief Add x509 issuer field * * \param chain points to the raw certificate data -* \param issuer a string holding (separete with ";"): +* \param issuer a string holding (separate with ";"): * CN=CommonName * -- O=Organization * -- OU=OrgUnit @@ -419,7 +419,7 @@ int x509write_add_issuer( x509_raw *crt, unsigned char *issuer); * \brief Add x509 subject field * * \param chain points to the raw certificate data - * \param subject a string holding (separete with ";"): + * \param subject a string holding (separate with ";"): * CN=CommonName * -- O=Organization * -- OU=OrgUnit diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js index fcfc506942..c27cc8264e 100644 --- a/modules/luci-base/htdocs/luci-static/resources/cbi.js +++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js @@ -511,20 +511,19 @@ function cbi_d_update() { if (node && node.parentNode && !cbi_d_check(entry.deps)) { node.parentNode.removeChild(node); state = true; - } else if (parent && (!node || !node.parentNode) && cbi_d_check(entry.deps)) { + } + else if (parent && (!node || !node.parentNode) && cbi_d_check(entry.deps)) { var next = undefined; for (next = parent.firstChild; next; next = next.nextSibling) { - if (next.getAttribute && parseInt(next.getAttribute('data-index'), 10) > entry.index) { + if (next.getAttribute && parseInt(next.getAttribute('data-index'), 10) > entry.index) break; - } } - if (!next) { + if (!next) parent.appendChild(entry.node); - } else { + else parent.insertBefore(entry.node, next); - } state = true; } @@ -539,9 +538,8 @@ function cbi_d_update() { cbi_tag_last(parent); } - if (state) { + if (state) cbi_d_update(); - } } function cbi_init() { @@ -565,9 +563,8 @@ function cbi_init() { var index = parseInt(node.getAttribute('data-index'), 10); var depends = JSON.parse(node.getAttribute('data-depends')); if (!isNaN(index) && depends.length > 0) { - for (var alt = 0; alt < depends.length; alt++) { + for (var alt = 0; alt < depends.length; alt++) cbi_d_add(node, depends[alt], index); - } } } @@ -575,9 +572,8 @@ function cbi_init() { for (var i = 0, node; (node = nodes[i]) !== undefined; i++) { var events = node.getAttribute('data-update').split(' '); - for (var j = 0, event; (event = events[j]) !== undefined; j++) { + for (var j = 0, event; (event = events[j]) !== undefined; j++) cbi_bind(node, event, cbi_d_update); - } } nodes = document.querySelectorAll('[data-choices]'); @@ -670,13 +666,13 @@ function cbi_combobox(id, values, def, man, focus) { var sel = document.createElement("select"); sel.id = selid; sel.index = obj.index; - sel.className = obj.className.replace(/cbi-input-text/, 'cbi-input-select'); + sel.classList.remove('cbi-input-text'); + sel.classList.add('cbi-input-select'); - if (obj.nextSibling) { + if (obj.nextSibling) obj.parentNode.insertBefore(sel, obj.nextSibling); - } else { + else obj.parentNode.appendChild(sel); - } var dt = obj.getAttribute('cbi_datatype'); var op = obj.getAttribute('cbi_optional'); @@ -687,7 +683,8 @@ function cbi_combobox(id, values, def, man, focus) { optdef.value = ""; optdef.appendChild(document.createTextNode(typeof(def) === 'string' ? def : cbi_strings.label.choose)); sel.appendChild(optdef); - } else { + } + else { var opt = document.createElement("option"); opt.value = obj.value; opt.selected = "selected"; @@ -700,9 +697,8 @@ function cbi_combobox(id, values, def, man, focus) { var opt = document.createElement("option"); opt.value = i; - if (obj.value == i) { + if (obj.value == i) opt.selected = "selected"; - } opt.appendChild(document.createTextNode(values[i])); sel.appendChild(opt); @@ -724,7 +720,8 @@ function cbi_combobox(id, values, def, man, focus) { sel.blur(); sel.parentNode.removeChild(sel); obj.focus(); - } else { + } + else { obj.value = sel.options[sel.selectedIndex].value; } @@ -788,35 +785,30 @@ function cbi_dynlist_init(parent, datatype, optional, choices) { values = [ ]; - while (parent.firstChild) - { + while (parent.firstChild) { var n = parent.firstChild; var i = +n.index; - if (i != del) - { - if (n.nodeName.toLowerCase() == 'input') + if (i != del) { + if (matchesElem(n, 'input')) values.push(n.value || ''); - else if (n.nodeName.toLowerCase() == 'select') + else if (matchesElem(n, 'select')) values[values.length-1] = n.options[n.selectedIndex].value; } parent.removeChild(n); } - if (add >= 0) - { + if (add >= 0) { focus = add+1; values.splice(focus, 0, ''); } - else if (values.length == 0) - { + else if (values.length == 0) { focus = 0; values.push(''); } - for (var i = 0; i < values.length; i++) - { + for (var i = 0; i < values.length; i++) { var t = document.createElement('input'); t.id = prefix + '.' + (i+1); t.name = prefix; @@ -826,9 +818,7 @@ function cbi_dynlist_init(parent, datatype, optional, choices) t.className = 'cbi-input-text'; if (i == 0 && holder) - { t.placeholder = holder; - } var b = E('div', { class: 'cbi-button cbi-button-' + ((i+1) < values.length ? 'remove' : 'add') @@ -836,20 +826,16 @@ function cbi_dynlist_init(parent, datatype, optional, choices) parent.appendChild(t); parent.appendChild(b); + if (datatype == 'file') - { cbi_browser_init(t.id, null, parent.getAttribute('data-browser-path')); - } parent.appendChild(document.createElement('br')); if (datatype) - { cbi_validate_field(t.id, ((i+1) == values.length) || optional, datatype); - } - if (choices) - { + if (choices) { cbi_combobox_init(t.id, choices, '', cbi_strings.label.custom); b.index = i; @@ -859,17 +845,14 @@ function cbi_dynlist_init(parent, datatype, optional, choices) if (i == focus || -i == focus) b.focus(); } - else - { + else { cbi_bind(t, 'keydown', cbi_dynlist_keydown); cbi_bind(t, 'keypress', cbi_dynlist_keypress); - if (i == focus) - { + if (i == focus) { t.focus(); } - else if (-i == focus) - { + else if (-i == focus) { t.focus(); /* force cursor to end */ @@ -892,13 +875,11 @@ function cbi_dynlist_init(parent, datatype, optional, choices) if (se.nodeType == 3) se = se.parentNode; - switch (ev.keyCode) - { + switch (ev.keyCode) { /* backspace, delete */ case 8: case 46: - if (se.value.length == 0) - { + if (se.value.length == 0) { if (ev.preventDefault) ev.preventDefault(); @@ -941,16 +922,14 @@ function cbi_dynlist_init(parent, datatype, optional, choices) if (next && next.nextSibling.name == prefix) next = next.nextSibling; - switch (ev.keyCode) - { + switch (ev.keyCode) { /* backspace, delete */ case 8: case 46: - var del = (se.nodeName.toLowerCase() == 'select') + var del = (matchesElem(se, 'select')) ? true : (se.value.length == 0); - if (del) - { + if (del) { if (ev.preventDefault) ev.preventDefault(); @@ -994,9 +973,8 @@ function cbi_dynlist_init(parent, datatype, optional, choices) var se = ev.target ? ev.target : ev.srcElement; var input = se.previousSibling; - while (input && input.name != prefix) { + while (input && input.name != prefix) input = input.previousSibling; - } if (se.classList.contains('cbi-button-remove')) { input.value = ''; @@ -1024,39 +1002,45 @@ function cbi_t_add(section, tab) { var t = document.getElementById('tab.' + section + '.' + tab); var c = document.getElementById('container.' + section + '.' + tab); - if( t && c ) { + if (t && c) { cbi_t[section] = (cbi_t[section] || [ ]); cbi_t[section][tab] = { 'tab': t, 'container': c, 'cid': c.id }; } } function cbi_t_switch(section, tab) { - if( cbi_t[section] && cbi_t[section][tab] ) { + if (cbi_t[section] && cbi_t[section][tab]) { var o = cbi_t[section][tab]; var h = document.getElementById('tab.' + section); - for( var tid in cbi_t[section] ) { + + for (var tid in cbi_t[section]) { var o2 = cbi_t[section][tid]; - if( o.tab.id != o2.tab.id ) { - o2.tab.className = o2.tab.className.replace(/(^| )cbi-tab( |$)/, " cbi-tab-disabled "); + + if (o.tab.id != o2.tab.id) { + o2.tab.classList.remove('cbi-tab'); + o2.tab.classList.add('cbi-tab-disabled'); o2.container.style.display = 'none'; } else { - if(h) h.value = tab; - o2.tab.className = o2.tab.className.replace(/(^| )cbi-tab-disabled( |$)/, " cbi-tab "); + if(h) + h.value = tab; + + o2.tab.classList.remove('cbi-tab-disabled'); + o2.tab.classList.add('cbi-tab'); o2.container.style.display = 'block'; } } } - return false + + return false; } function cbi_t_update() { var hl_tabs = [ ]; var updated = false; - for( var sid in cbi_t ) - for( var tid in cbi_t[sid] ) - { + for (var sid in cbi_t) + for (var tid in cbi_t[sid]) { var t = cbi_t[sid][tid].tab; var c = cbi_t[sid][tid].container; @@ -1065,7 +1049,7 @@ function cbi_t_update() { } else if (t.style.display == 'none') { t.style.display = ''; - t.className += ' cbi-tab-highlighted'; + t.classList.add('cbi-tab-highlighted'); hl_tabs.push(t); } @@ -1075,8 +1059,8 @@ function cbi_t_update() { if (hl_tabs.length > 0) window.setTimeout(function() { - for( var i = 0; i < hl_tabs.length; i++ ) - hl_tabs[i].className = hl_tabs[i].className.replace(/ cbi-tab-highlighted/g, ''); + for (var i = 0; i < hl_tabs.length; i++) + hl_tabs[i].classList.remove('cbi-tab-highlighted'); }, 750); return updated; @@ -1086,16 +1070,14 @@ function cbi_t_update() { function cbi_validate_form(form, errmsg) { /* if triggered by a section removal or addition, don't validate */ - if( form.cbi_state == 'add-section' || form.cbi_state == 'del-section' ) + if (form.cbi_state == 'add-section' || form.cbi_state == 'del-section') return true; - if( form.cbi_validators ) - { - for( var i = 0; i < form.cbi_validators.length; i++ ) - { + if (form.cbi_validators) { + for (var i = 0; i < form.cbi_validators.length; i++) { var validator = form.cbi_validators[i]; - if( !validator() && errmsg ) - { + + if (!validator() && errmsg) { alert(errmsg); return false; } @@ -1123,10 +1105,8 @@ function cbi_validate_compile(code) code += ','; - for (var i = 0; i < code.length; i++) - { - if (esc) - { + for (var i = 0; i < code.length; i++) { + if (esc) { esc = false; continue; } @@ -1139,41 +1119,36 @@ function cbi_validate_compile(code) case 40: case 44: - if (depth <= 0) - { - if (pos < i) - { + if (depth <= 0) { + if (pos < i) { var label = code.substring(pos, i); label = label.replace(/\\(.)/g, '$1'); label = label.replace(/^[ \t]+/g, ''); label = label.replace(/[ \t]+$/g, ''); - if (label && !isNaN(label)) - { + if (label && !isNaN(label)) { stack.push(parseFloat(label)); } - else if (label.match(/^(['"]).*\1$/)) - { + else if (label.match(/^(['"]).*\1$/)) { stack.push(label.replace(/^(['"])(.*)\1$/, '$2')); } - else if (typeof cbi_validators[label] == 'function') - { + else if (typeof cbi_validators[label] == 'function') { stack.push(cbi_validators[label]); stack.push(null); } - else - { + else { throw "Syntax error, unhandled token '"+label+"'"; } } + pos = i+1; } + depth += (code.charCodeAt(i) == 40); break; case 41: - if (--depth <= 0) - { + if (--depth <= 0) { if (typeof stack[stack.length-2] != 'function') throw "Syntax error, argument list follows non-function"; @@ -1182,6 +1157,7 @@ function cbi_validate_compile(code) pos = i+1; } + break; } } @@ -1194,23 +1170,20 @@ function cbi_validate_field(cbid, optional, type) var field = (typeof cbid == "string") ? document.getElementById(cbid) : cbid; var vstack; try { vstack = cbi_validate_compile(type); } catch(e) { }; - if (field && vstack && typeof vstack[0] == "function") - { + if (field && vstack && typeof vstack[0] == "function") { var validator = function() { // is not detached - if( field.form ) - { - field.className = field.className.replace(/ cbi-input-invalid/g, ''); + if (field.form) { + field.classList.remove('cbi-input-invalid'); // validate value var value = (field.options && field.options.selectedIndex > -1) ? field.options[field.options.selectedIndex].value : field.value; - if (!(((value.length == 0) && optional) || vstack[0].apply(value, vstack[1]))) - { + if (!(((value.length == 0) && optional) || vstack[0].apply(value, vstack[1]))) { // invalid - field.className += ' cbi-input-invalid'; + field.classList.add('cbi-input-invalid'); return false; } } @@ -1218,7 +1191,7 @@ function cbi_validate_field(cbid, optional, type) return true; }; - if( ! field.form.cbi_validators ) + if (!field.form.cbi_validators) field.form.cbi_validators = [ ]; field.form.cbi_validators.push(validator); @@ -1226,8 +1199,7 @@ function cbi_validate_field(cbid, optional, type) cbi_bind(field, "blur", validator); cbi_bind(field, "keyup", validator); - if (field.nodeName == 'SELECT') - { + if (matchesElem(field, 'select')) { cbi_bind(field, "change", validator); cbi_bind(field, "click", validator); } @@ -1291,7 +1263,8 @@ function cbi_row_swap(elem, up, store) input.value = ids.join(' '); window.scrollTo(0, tr.offsetTop); - window.setTimeout(function() { tr.classList.add('flash'); }, 1); + void tr.offsetWidth; + tr.classList.add('flash'); return false; } @@ -1300,20 +1273,16 @@ function cbi_tag_last(container) { var last; - for (var i = 0; i < container.childNodes.length; i++) - { + for (var i = 0; i < container.childNodes.length; i++) { var c = container.childNodes[i]; - if (c.nodeType == 1 && c.nodeName.toLowerCase() == 'div') - { - c.className = c.className.replace(/ cbi-value-last$/, ''); + if (matchesElem(c, 'div')) { + c.classList.remove('cbi-value-last'); last = c; } } if (last) - { - last.className += ' cbi-value-last'; - } + last.classList.add('cbi-value-last'); } function cbi_submit(elem, name, value, action) @@ -1350,8 +1319,9 @@ String.prototype.format = function() if (typeof(s) !== 'string' && !(s instanceof String)) return ''; - for( var i = 0; i < r.length; i += 2 ) + for (var i = 0; i < r.length; i += 2) s = s.replace(r[i], r[i+1]); + return s; } @@ -1360,22 +1330,18 @@ String.prototype.format = function() var re = /^(([^%]*)%('.|0|\x20)?(-)?(\d+)?(\.\d+)?(%|b|c|d|u|f|o|s|x|X|q|h|j|t|m))/; var a = b = [], numSubstitutions = 0, numMatches = 0; - while (a = re.exec(str)) - { + while (a = re.exec(str)) { var m = a[1]; var leftpart = a[2], pPad = a[3], pJustify = a[4], pMinLength = a[5]; var pPrecision = a[6], pType = a[7]; numMatches++; - if (pType == '%') - { + if (pType == '%') { subst = '%'; } - else - { - if (numSubstitutions < arguments.length) - { + else { + if (numSubstitutions < arguments.length) { var param = arguments[numSubstitutions++]; var pad = ''; @@ -1400,8 +1366,7 @@ String.prototype.format = function() var subst = param; - switch(pType) - { + switch(pType) { case 'b': subst = (+param || 0).toString(2); break; @@ -1517,16 +1482,20 @@ String.prototype.nobr = function() String.format = function() { var a = [ ]; + for (var i = 1; i < arguments.length; i++) a.push(arguments[i]); + return ''.format.apply(arguments[0], a); } String.nobr = function() { var a = [ ]; + for (var i = 1; i < arguments.length; i++) a.push(arguments[i]); + return ''.nobr.apply(arguments[0], a); } @@ -1569,12 +1538,16 @@ function toElem(s) return elem || null; } +function matchesElem(node, selector) +{ + return ((node.matches && node.matches(selector)) || + (node.msMatchesSelector && node.msMatchesSelector(selector))); +} + function findParent(node, selector) { while (node) - if (node.msMatchesSelector && node.msMatchesSelector(selector)) - return node; - else if (node.matches && node.matches(selector)) + if (matchesElem(node, selector)) return node; else node = node.parentNode; @@ -1801,7 +1774,7 @@ CBIDropdown = { div.appendChild(E('input', { type: 'hidden', name: s.hasAttribute('name') ? s.getAttribute('name') : (sb.getAttribute('name') || ''), - value: s.hasAttribute('value') ? s.getAttribute('value') : s.innerText + value: s.hasAttribute('data-value') ? s.getAttribute('data-value') : s.innerText })); }); @@ -1813,7 +1786,7 @@ CBIDropdown = { return; document.querySelectorAll('.focus').forEach(function(e) { - if (e.nodeName.toLowerCase() !== 'input') { + if (!matchesElem(e, 'input')) { e.classList.remove('focus'); e.blur(); } @@ -1840,7 +1813,7 @@ CBIDropdown = { var new_item = null; ul.childNodes.forEach(function(li) { - if (li.getAttribute && li.getAttribute('value') === item) + if (li.getAttribute && li.getAttribute('data-value') === item) new_item = li; }); @@ -1851,7 +1824,7 @@ CBIDropdown = { if (tpl) markup = (tpl.textContent || tpl.innerHTML || tpl.firstChild.data).replace(/^<!--|-->$/, '').trim(); else - markup = '<li value="{{value}}">{{value}}</li>'; + markup = '<li data-value="{{value}}">{{value}}</li>'; new_item = E(markup.replace(/{{value}}/g, item)); @@ -1926,7 +1899,7 @@ function cbi_dropdown_init(sb) { ndisplay--; - if (this.optional && !ul.querySelector('li[value=""]')) { + if (this.optional && !ul.querySelector('li[data-value=""]')) { var placeholder = E('li', { placeholder: '' }, this.placeholder); ul.firstChild ? ul.insertBefore(placeholder, ul.firstChild) : ul.appendChild(placeholder); } @@ -1952,7 +1925,7 @@ function cbi_dropdown_init(sb) { sb.addEventListener('click', function(ev) { if (!this.hasAttribute('open')) { - if (ev.target.nodeName.toLowerCase() !== 'input') + if (!matchesElem(ev.target, 'input')) sbox.openDropdown(this); } else { @@ -1966,7 +1939,7 @@ function cbi_dropdown_init(sb) { }); sb.addEventListener('keydown', function(ev) { - if (ev.target.nodeName.toLowerCase() === 'input') + if (matchesElem(ev.target, 'input')) return; if (!this.hasAttribute('open')) { @@ -2062,8 +2035,12 @@ function cbi_dropdown_init(sb) { create.addEventListener('keydown', function(ev) { switch (ev.keyCode) { case 13: - sbox.createItems(sb, this.value); ev.preventDefault(); + + if (this.classList.contains('cbi-input-invalid')) + return; + + sbox.createItems(sb, this.value); this.value = ''; this.blur(); break; @@ -2094,7 +2071,7 @@ function cbi_dropdown_init(sb) { cbi_dropdown_init.prototype = CBIDropdown; function cbi_update_table(table, data, placeholder) { - target = isElem(table) ? table : document.querySelector(table); + var target = isElem(table) ? table : document.querySelector(table); if (!isElem(target)) return; diff --git a/modules/luci-base/luasrc/dispatcher.luadoc b/modules/luci-base/luasrc/dispatcher.luadoc index ddf534b3e1..f26256953a 100644 --- a/modules/luci-base/luasrc/dispatcher.luadoc +++ b/modules/luci-base/luasrc/dispatcher.luadoc @@ -22,7 +22,7 @@ Check whether a dispatch node shall be visible ]] ---[[ -Return a sorted table of visible childs within a given node +Return a sorted table of visible children within a given node @class function @name node_childs diff --git a/modules/luci-base/luasrc/http.lua b/modules/luci-base/luasrc/http.lua index f4ede4b8a5..20b55f2854 100644 --- a/modules/luci-base/luasrc/http.lua +++ b/modules/luci-base/luasrc/http.lua @@ -335,13 +335,13 @@ end -- Content-Type. Stores all extracted data associated with its parameter name -- in the params table within the given message object. Multiple parameter -- values are stored as tables, ordinary ones as strings. --- If an optional file callback function is given then it is feeded with the +-- If an optional file callback function is given then it is fed with the -- file contents chunk by chunk and only the extracted file name is stored -- within the params table. The callback function will be called subsequently -- with three arguments: -- o Table containing decoded (name, file) and raw (headers) mime header data -- o String value containing a chunk of the file data --- o Boolean which indicates wheather the current chunk is the last one (eof) +-- o Boolean which indicates whether the current chunk is the last one (eof) function mimedecode_message_body(src, msg, file_cb) local parser, header, field local len, maxlen = 0, tonumber(msg.env.CONTENT_LENGTH or nil) diff --git a/modules/luci-base/luasrc/http.luadoc b/modules/luci-base/luasrc/http.luadoc index f8121230b6..8f6f380d8b 100644 --- a/modules/luci-base/luasrc/http.luadoc +++ b/modules/luci-base/luasrc/http.luadoc @@ -204,13 +204,13 @@ Stores all extracted data associated with its parameter name in the params table within the given message object. Multiple parameter values are stored as tables, ordinary ones as strings. -If an optional file callback function is given then it is feeded with the +If an optional file callback function is given then it is fed with the file contents chunk by chunk and only the extracted file name is stored within the params table. The callback function will be called subsequently with three arguments: o Table containing decoded (name, file) and raw (headers) mime header data o String value containing a chunk of the file data - o Boolean which indicates wheather the current chunk is the last one (eof) + o Boolean which indicates whether the current chunk is the last one (eof) @class function @name mimedecode_message_body diff --git a/modules/luci-base/luasrc/model/uci.lua b/modules/luci-base/luasrc/model/uci.lua index 2119a210bb..a50e28a871 100644 --- a/modules/luci-base/luasrc/model/uci.lua +++ b/modules/luci-base/luasrc/model/uci.lua @@ -15,7 +15,7 @@ local type, tostring, tonumber, unpack = type, tostring, tonumber, unpack -- cursor factory, modify data (via Cursor.add, Cursor.delete, etc.), -- save the changes to the staging area via Cursor.save and finally -- Cursor.commit the data to the actual config files. --- LuCI then needs to Cursor.apply the changes so deamons etc. are +-- LuCI then needs to Cursor.apply the changes so daemons etc. are -- reloaded. module "luci.model.uci" diff --git a/modules/luci-base/luasrc/model/uci.luadoc b/modules/luci-base/luasrc/model/uci.luadoc index d798b00338..0189d49aa1 100644 --- a/modules/luci-base/luasrc/model/uci.luadoc +++ b/modules/luci-base/luasrc/model/uci.luadoc @@ -5,7 +5,7 @@ The typical workflow for UCI is: Get a cursor instance from the cursor factory, modify data (via Cursor.add, Cursor.delete, etc.), save the changes to the staging area via Cursor.save and finally Cursor.commit the data to the actual config files. -LuCI then needs to Cursor.apply the changes so deamons etc. are +LuCI then needs to Cursor.apply the changes so daemons etc. are reloaded. @cstyle instance ]] @@ -172,7 +172,7 @@ has the same effect as deleting the option. ---[[ Create a sub-state of this cursor. -The sub-state is tied to the parent curser, means it the parent unloads or +The sub-state is tied to the parent cursor, means it the parent unloads or loads configs, the sub state will do so as well. @class function @@ -339,7 +339,7 @@ Set the configuration directory. ]] ---[[ -Set the directory for uncommited changes. +Set the directory for uncommitted changes. @class function @name Cursor.set_savedir diff --git a/modules/luci-base/luasrc/sys.luadoc b/modules/luci-base/luasrc/sys.luadoc index 1c1fa92602..3c7f69c6e9 100644 --- a/modules/luci-base/luasrc/sys.luadoc +++ b/modules/luci-base/luasrc/sys.luadoc @@ -18,7 +18,7 @@ Execute a given shell command and capture its standard output @class function @name exec @param command Command to call -@return String containg the return the output of the command +@return String containing the return the output of the command ]] ---[[ @@ -38,7 +38,7 @@ exists. @class function @name getenv @param var Name of the environment variable to retrieve (optional) -@return String containg the value of the specified variable +@return String containing the value of the specified variable @return Table containing all variables if no variable name is given ]] @@ -279,7 +279,7 @@ LuCI system utilities / user related functions. ]] ---[[ -Retrieve user informations for given uid. +Retrieve user information for given uid. @class function @name getuser @@ -305,7 +305,7 @@ Test whether given string matches the password of a given system user. @name user.checkpasswd @param username String containing the Unix user name @param pass String containing the password to compare -@return Boolean indicating wheather the passwords are equal +@return Boolean indicating whether the passwords are equal ]] ---[[ diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua index 47cb901a5b..c6f4477dff 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua @@ -16,14 +16,14 @@ TZ = { { 'Africa/Brazzaville', 'WAT-1' }, { 'Africa/Bujumbura', 'CAT-2' }, { 'Africa/Cairo', 'EET-2' }, - { 'Africa/Casablanca', 'WET0WEST,M3.5.0,M10.5.0/3' }, + { 'Africa/Casablanca', '<+01>-1' }, { 'Africa/Ceuta', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Africa/Conakry', 'GMT0' }, { 'Africa/Dakar', 'GMT0' }, { 'Africa/Dar es Salaam', 'EAT-3' }, { 'Africa/Djibouti', 'EAT-3' }, { 'Africa/Douala', 'WAT-1' }, - { 'Africa/El Aaiun', 'WET0WEST,M3.5.0,M10.5.0/3' }, + { 'Africa/El Aaiun', '<+01>-1' }, { 'Africa/Freetown', 'GMT0' }, { 'Africa/Gaborone', 'CAT-2' }, { 'Africa/Harare', 'CAT-2' }, @@ -179,7 +179,7 @@ TZ = { { 'America/Resolute', 'CST6CDT,M3.2.0,M11.1.0' }, { 'America/Rio Branco', '<-05>5' }, { 'America/Santarem', '<-03>3' }, - { 'America/Santiago', '<-04>4<-03>,M8.2.6/24,M5.2.6/24' }, + { 'America/Santiago', '<-04>4<-03>,M9.1.6/24,M4.1.6/24' }, { 'America/Santo Domingo', 'AST4' }, { 'America/Sao Paulo', '<-03>3<-02>,M11.1.0/0,M2.3.0/0' }, { 'America/Scoresbysund', '<-01>1<+00>,M3.5.0/0,M10.5.0/1' }, @@ -261,7 +261,7 @@ TZ = { { 'Asia/Macau', 'CST-8' }, { 'Asia/Magadan', '<+11>-11' }, { 'Asia/Makassar', 'WITA-8' }, - { 'Asia/Manila', '<+08>-8' }, + { 'Asia/Manila', 'PST-8' }, { 'Asia/Muscat', '<+04>-4' }, { 'Asia/Nicosia', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, { 'Asia/Novokuznetsk', '<+07>-7' }, @@ -270,7 +270,7 @@ TZ = { { 'Asia/Oral', '<+05>-5' }, { 'Asia/Phnom Penh', '<+07>-7' }, { 'Asia/Pontianak', 'WIB-7' }, - { 'Asia/Pyongyang', 'KST-8:30' }, + { 'Asia/Pyongyang', 'KST-9' }, { 'Asia/Qatar', '<+03>-3' }, { 'Asia/Qyzylorda', '<+06>-6' }, { 'Asia/Riyadh', '<+03>-3' }, @@ -358,7 +358,7 @@ TZ = { { 'Europe/Busingen', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Chisinau', 'EET-2EEST,M3.5.0,M10.5.0/3' }, { 'Europe/Copenhagen', 'CET-1CEST,M3.5.0,M10.5.0/3' }, - { 'Europe/Dublin', 'GMT0IST,M3.5.0/1,M10.5.0' }, + { 'Europe/Dublin', 'IST-1GMT0,M10.5.0,M3.5.0/1' }, { 'Europe/Gibraltar', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Guernsey', 'GMT0BST,M3.5.0/1,M10.5.0' }, { 'Europe/Helsinki', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, @@ -400,7 +400,7 @@ TZ = { { 'Europe/Vatican', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Vienna', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Vilnius', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, - { 'Europe/Volgograd', '<+03>-3' }, + { 'Europe/Volgograd', '<+04>-4' }, { 'Europe/Warsaw', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Zagreb', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Zaporozhye', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, @@ -421,11 +421,11 @@ TZ = { { 'Pacific/Bougainville', '<+11>-11' }, { 'Pacific/Chatham', '<+1245>-12:45<+1345>,M9.5.0/2:45,M4.1.0/3:45' }, { 'Pacific/Chuuk', '<+10>-10' }, - { 'Pacific/Easter', '<-06>6<-05>,M8.2.6/22,M5.2.6/22' }, + { 'Pacific/Easter', '<-06>6<-05>,M9.1.6/22,M4.1.6/22' }, { 'Pacific/Efate', '<+11>-11' }, { 'Pacific/Enderbury', '<+13>-13' }, { 'Pacific/Fakaofo', '<+13>-13' }, - { 'Pacific/Fiji', '<+12>-12<+13>,M11.1.0,M1.2.1/147' }, + { 'Pacific/Fiji', '<+12>-12<+13>,M11.1.0,M1.2.2/123' }, { 'Pacific/Funafuti', '<+12>-12' }, { 'Pacific/Galapagos', '<-06>6' }, { 'Pacific/Gambier', '<-09>9' }, diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua index cf5afeb9d8..e63e2a6958 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua @@ -9,7 +9,6 @@ OFFSET = { wat = 3600, -- WAT cat = 7200, -- CAT eet = 7200, -- EET - wet = 0, -- WET sast = 7200, -- SAST hst = -36000, -- HST hdt = -32400, -- HDT @@ -34,8 +33,9 @@ OFFSET = { idt = 10800, -- IDT pkt = 18000, -- PKT wita = 28800, -- WITA - kst = 30600, -- KST + kst = 32400, -- KST jst = 32400, -- JST + wet = 0, -- WET acst = 34200, -- ACST acdt = 37800, -- ACDT aest = 36000, -- AEST diff --git a/modules/luci-base/luasrc/template.lua b/modules/luci-base/luasrc/template.lua index 588028c2ee..ed46f50753 100644 --- a/modules/luci-base/luasrc/template.lua +++ b/modules/luci-base/luasrc/template.lua @@ -95,6 +95,6 @@ function Template.render(self, scope) local stat, err = util.copcall(self.template) if not stat then error("Failed to execute template '" .. self.name .. "'.\n" .. - "A runtime error occured: " .. tostring(err or "(nil)")) + "A runtime error occurred: " .. tostring(err or "(nil)")) end end diff --git a/modules/luci-base/luasrc/util.lua b/modules/luci-base/luasrc/util.lua index f16b3afb2e..1a329f3f20 100644 --- a/modules/luci-base/luasrc/util.lua +++ b/modules/luci-base/luasrc/util.lua @@ -262,7 +262,7 @@ end -- one token per invocation, the tokens are separated by whitespace. If the -- input value is a table, it is transformed into a string first. A nil value --- will result in a valid interator which aborts with the first invocation. +-- will result in a valid iterator which aborts with the first invocation. function imatch(v) if type(v) == "table" then local k = nil diff --git a/modules/luci-base/luasrc/util.luadoc b/modules/luci-base/luasrc/util.luadoc index c4f28d039a..4ec68dd1ef 100644 --- a/modules/luci-base/luasrc/util.luadoc +++ b/modules/luci-base/luasrc/util.luadoc @@ -158,7 +158,7 @@ Return a matching iterator for the given value. The iterator will return one token per invocation, the tokens are separated by whitespace. If the input value is a table, it is transformed into a string first. -A nil value will result in a valid interator which aborts with the first invocation. +A nil value will result in a valid iterator which aborts with the first invocation. @class function @name imatch @@ -289,7 +289,7 @@ will be stripped before it is returned. ]] ---[[ -Strips unnescessary lua bytecode from given string. +Strips unnecessary lua bytecode from given string. Information like line numbers and debugging numbers will be discarded. Original version by Peter Cawley (http://lua-users.org/lists/lua-l/2008-02/msg01158.html) diff --git a/modules/luci-base/luasrc/view/cbi/apply_widget.htm b/modules/luci-base/luasrc/view/cbi/apply_widget.htm index ce279edd40..0df16e88c8 100644 --- a/modules/luci-base/luasrc/view/cbi/apply_widget.htm +++ b/modules/luci-base/luasrc/view/cbi/apply_widget.htm @@ -93,11 +93,11 @@ if (r.status === 204) { uci_status_message('warning', '<h4><%:Configuration has been rolled back!%></h4>' + - '<p><%:The device could not be reached within %d seconds after applying the pending changes, which caused the configuration to be rolled back for safety reasons. If you believe that the configuration changes are correct nonetheless, perform an unchecked configuration apply. Alternatively, you can dismiss this warning and edit changes before attempting to apply again, or revert all pending changes to keep the currently working configuration state.%></p>'.format(uci_apply_rollback) + + '<p><%:The device could not be reached within %d seconds after applying the pending changes, which caused the configuration to be rolled back for safety reasons. If you believe that the configuration changes are correct nonetheless, proceed by applying anyway. Alternatively, you can dismiss this warning and edit changes before attempting to apply again, or revert all pending changes to keep the currently working configuration state.%></p>'.format(uci_apply_rollback) + '<div class="right">' + '<input type="button" class="btn" onclick="uci_status_message(false)" value="<%:Dismiss%>" /> ' + '<input type="button" class="btn cbi-button-action important" onclick="uci_revert()" value="<%:Revert changes%>" /> ' + - '<input type="button" class="btn cbi-button-negative important" onclick="uci_apply(false)" value="<%:Apply unchecked%>" />' + + '<input type="button" class="btn cbi-button-negative important" onclick="uci_apply(false)" value="<%:Apply anyway%>" />' + '</div>'); return; diff --git a/modules/luci-base/luasrc/view/cbi/dropdown.htm b/modules/luci-base/luasrc/view/cbi/dropdown.htm index cf8c03d22c..6f4b89905b 100644 --- a/modules/luci-base/luasrc/view/cbi/dropdown.htm +++ b/modules/luci-base/luasrc/view/cbi/dropdown.htm @@ -30,7 +30,7 @@ <li<%= attr("data-index", i) .. attr("data-depends", self:deplist2json(section, self.deplist[i])) .. - attr("value", key) .. + attr("data-value", key) .. ifattr(selected[key], "selected", "selected") %>> <%=pcdata(self.vallist[i])%> diff --git a/modules/luci-base/luasrc/view/cbi/firewall_zoneforwards.htm b/modules/luci-base/luasrc/view/cbi/firewall_zoneforwards.htm index b38e4b13db..dc251dbd94 100644 --- a/modules/luci-base/luasrc/view/cbi/firewall_zoneforwards.htm +++ b/modules/luci-base/luasrc/view/cbi/firewall_zoneforwards.htm @@ -63,7 +63,7 @@ if empty then %> <label class="zonebadge zonebadge-empty"> - <strong><%=zone:forward():upper()%></strong> + <strong><%=def:forward():upper()%></strong> </label> <% end %> </div> diff --git a/modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm b/modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm index 3a108020b6..7ecec10a8f 100644 --- a/modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm +++ b/modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm @@ -30,7 +30,7 @@ ifattr(self.rmempty or self.optional, "optional", "optional") %>> <script type="item-template"><!-- - <li value="{{value}}"> + <li data-value="{{value}}"> <span class="zonebadge" style="background:repeating-linear-gradient(45deg,rgba(204,204,204,0.5),rgba(204,204,204,0.5) 5px,rgba(255,255,255,0.5) 5px,rgba(255,255,255,0.5) 10px)"> <strong>{{value}}:</strong><em>(<%:create%>)</em> </span> @@ -38,7 +38,7 @@ --></script> <ul> <% if self.allowlocal then %> - <li value=""<%=ifattr(checked[""], "selected", "selected")%>> + <li data-value=""<%=ifattr(checked[""], "selected", "selected")%>> <span style="background-color:<%=fwm.zone.get_color()%>" class="zonebadge"> <strong><%:Device%></strong> <% if self.allowany and self.allowlocal then -%> @@ -48,14 +48,14 @@ </span> </li> <% elseif self.widget ~= "checkbox" and (self.rmempty or self.optional) then %> - <li value=""<%=ifattr(checked[""], "selected", "selected")%>> + <li data-value=""<%=ifattr(checked[""], "selected", "selected")%>> <span class="zonebadge"> <em><%:unspecified%></em> </span> </li> <% end %> <% if self.allowany then %> - <li value="*"<%=ifattr(checked["*"], "selected", "selected")%>> + <li data-value="*"<%=ifattr(checked["*"], "selected", "selected")%>> <span style="background-color:<%=fwm.zone.get_color()%>" class="zonebadge"> <strong><%:Any zone%></strong> <% if self.allowany and self.allowlocal then %>(<%:forward%>)<% end %> @@ -67,7 +67,7 @@ if zone:name() ~= self.exclude then selected = selected or (value == zone:name()) %> - <li<%=attr("value", zone:name()) .. ifattr(checked[zone:name()], "selected", "selected")%>> + <li<%=attr("data-value", zone:name()) .. ifattr(checked[zone:name()], "selected", "selected")%>> <span style="background-color:<%=zone:get_color()%>" class="zonebadge"> <strong><%=zone:name()%>:</strong> <%- @@ -94,11 +94,11 @@ <% end end %> <% if self.widget ~= "checkbox" and not self.nocreate then %> - <li value="-"> + <li data-value="-"> <span class="zonebadge"> <em><%:create%>:</em> <input type="password" style="display:none" /> - <input class="create-item-input" type="text" /> + <input class="create-item-input" type="text" data-type="and(uciname,maxlength(11))" data-optional="true" /> </span> </li> <% end %> diff --git a/modules/luci-base/luasrc/view/cbi/network_ifacelist.htm b/modules/luci-base/luasrc/view/cbi/network_ifacelist.htm index a97e9ef6d0..55a7e31687 100644 --- a/modules/luci-base/luasrc/view/cbi/network_ifacelist.htm +++ b/modules/luci-base/luasrc/view/cbi/network_ifacelist.htm @@ -47,7 +47,7 @@ ifattr(self.widget == "checkbox", "optional", "optional") %>> <script type="item-template"><!-- - <li value="{{value}}"> + <li data-value="{{value}}"> <img title="<%:Custom Interface%>: "{{value}}"" src="<%=resource%>/icons/ethernet_disabled.png" /> <span class="hide-open">{{value}}</span> <span class="hide-close"><%:Custom Interface%>: "{{value}}"</span> @@ -61,7 +61,7 @@ iface:name() ~= self.exclude then %> <li<%= - attr("value", iface:name()) .. + attr("data-value", iface:name()) .. ifattr(checked[iface:name()], "selected", "selected") %>> <img<%=attr("title", iface:get_i18n())%> src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" /> @@ -78,7 +78,7 @@ </li> <% end end %> <% if not self.nocreate then %> - <li value=""> + <li data-value=""> <img title="<%:Custom Interface%>" src="<%=resource%>/icons/ethernet_disabled.png" /> <span><%:Custom Interface%>:</span> <input type="password" style="display:none" /> diff --git a/modules/luci-base/luasrc/view/cbi/network_netlist.htm b/modules/luci-base/luasrc/view/cbi/network_netlist.htm index ba6ebb8434..d3efcc062f 100644 --- a/modules/luci-base/luasrc/view/cbi/network_netlist.htm +++ b/modules/luci-base/luasrc/view/cbi/network_netlist.htm @@ -26,7 +26,7 @@ ifattr(self.widget == "checkbox", "optional", "optional") %>> <script type="item-template"><!-- - <li value="{{value}}"> + <li data-value="{{value}}"> <span class="ifacebadge" style="background:repeating-linear-gradient(45deg,rgba(204,204,204,0.5),rgba(204,204,204,0.5) 5px,rgba(255,255,255,0.5) 5px,rgba(255,255,255,0.5) 10px)"> {{value}}: <em>(<%:create%>)</em> </span> @@ -34,7 +34,7 @@ --></script> <ul> <% if self.widget ~= "checkbox" then %> - <li value=""<%= ifattr(not value, "selected", "selected") %>> + <li data-value=""<%= ifattr(not value, "selected", "selected") %>> <em><%:unspecified%></em> </li> <% end %> @@ -44,7 +44,7 @@ (net:name() ~= self.exclude) and (not self.novirtual or not net:is_virtual()) then %> - <li<%= attr("value", net:name()) .. ifattr(checked[net:name()], "selected", "selected") %>> + <li<%= attr("data-value", net:name()) .. ifattr(checked[net:name()], "selected", "selected") %>> <span class="ifacebadge"><%=net:name()%>: <% local empty = true @@ -63,7 +63,7 @@ <% end end %> <% if not self.nocreate then %> - <li value="-"<%= ifattr(not value and self.widget ~= "checkbox", "selected", "selected") %>> + <li data-value="-"<%= ifattr(not value and self.widget ~= "checkbox", "selected", "selected") %>> <em> <%- if self.widget == "checkbox" then -%> <%:create:%> diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index a7c06d5e36..146d9fe05f 100644 --- a/modules/luci-base/po/ca/base.po +++ b/modules/luci-base/po/ca/base.po @@ -409,10 +409,10 @@ msgstr "Configuració d'antena" msgid "Any zone" msgstr "Qualsevol zona" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -696,6 +696,9 @@ msgstr "Aplegant dades..." msgid "Command" msgstr "Ordre" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "Configuració comuna" @@ -940,6 +943,9 @@ msgstr "" msgid "Disable Encryption" msgstr "" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "" @@ -1458,6 +1464,9 @@ msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "" "No mostris l'<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "Nom de mà quina" @@ -2021,6 +2030,9 @@ msgstr "" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "" @@ -2195,9 +2207,6 @@ msgstr "Cap servidor DHCP configurat en aquesta interfÃcie" msgid "No NAT-T" msgstr "" -msgid "No chains in this table" -msgstr "No hi ha cadenes en aquesta taula" - msgid "No files found" msgstr "Cap fitxer trobat" @@ -2222,7 +2231,7 @@ msgstr "No hi ha llistes de paquets disponibles" msgid "No password set!" msgstr "No hi ha cap contrasenya establerta!" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "No hi ha regles en aquesta cadena" msgid "No scan results available yet..." @@ -2273,6 +2282,9 @@ msgstr "Nslookup" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "D'acord" @@ -2563,6 +2575,9 @@ msgstr "Paquets" msgid "Please enter your username and password." msgstr "Si us plau entra el teu nom d'usuari i contrasenya." +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "PolÃtica" @@ -2901,6 +2916,9 @@ msgstr "" "Les rutes especifiquen per quina interfÃcie i passarel·la es pot arribar a " "un cert ordinador o xarxa." +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "" @@ -3017,6 +3035,9 @@ msgstr "" msgid "Show current backup file list" msgstr "" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "Atura aquesta interfÃcie" @@ -3038,6 +3059,9 @@ msgstr "Mida (.ipk)" msgid "Size of DNS query cache" msgstr "" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "Salta" @@ -3142,6 +3166,9 @@ msgid "" "configurations where only hosts with a corresponding lease are served." msgstr "" +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "Estat" @@ -3278,10 +3305,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3482,6 +3508,9 @@ msgstr "Sincronització de l'hora" msgid "Time Synchronization is not configured yet." msgstr "La sincronització de hora encara no s'ha configurat." +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "Zona horà ria" @@ -3863,6 +3892,18 @@ msgid "" "or Safari." msgstr "" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "qualsevol" @@ -3981,6 +4022,9 @@ msgstr "" msgid "routed" msgstr "encaminat" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "" @@ -4020,6 +4064,9 @@ msgstr "sÃ" msgid "« Back" msgstr "« Enrere" +#~ msgid "No chains in this table" +#~ msgstr "No hi ha cadenes en aquesta taula" + #~ msgid "Configuration files will be kept." #~ msgstr "Es mantindran els fitxers de configuració." diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po index a9852f6c51..37cc646471 100644 --- a/modules/luci-base/po/cs/base.po +++ b/modules/luci-base/po/cs/base.po @@ -405,10 +405,10 @@ msgstr "Konfigurace antén" msgid "Any zone" msgstr "Libovolná zóna" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -690,6 +690,9 @@ msgstr "ProbÃhá sbÄ›r dat..." msgid "Command" msgstr "PÅ™Ãkaz" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "SpoleÄná nastavenÃ" @@ -936,6 +939,9 @@ msgstr "Zakázat nastavenà DNS" msgid "Disable Encryption" msgstr "" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "" @@ -1456,6 +1462,9 @@ msgstr "" msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "Skrývat <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "" @@ -2029,6 +2038,9 @@ msgstr "" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "NejvyÅ¡Å¡Ã povolené množstvà aktivnÃch DHCP zápůjÄek" @@ -2203,9 +2215,6 @@ msgstr "Pro toto rozhranà nenà nastaven žádný DHCP server" msgid "No NAT-T" msgstr "" -msgid "No chains in this table" -msgstr "Žádné Å™etÄ›zce v této tabulce" - msgid "No files found" msgstr "Nebyly nalezeny žádné soubory" @@ -2230,7 +2239,7 @@ msgstr "Seznam balÃÄků nenà k dispozici" msgid "No password set!" msgstr "Žádné heslo!" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "Žádná pravidla v tomto Å™etÄ›zci" msgid "No scan results available yet..." @@ -2281,6 +2290,9 @@ msgstr "Nslookup" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "OK" @@ -2572,6 +2584,9 @@ msgstr "Paketů" msgid "Please enter your username and password." msgstr "ProsÃm vložte vaÅ¡e uživatelské jméno a heslo." +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "Politika" @@ -2915,6 +2930,9 @@ msgid "" msgstr "" "Trasy urÄujÃ, pÅ™es jaké rozhranà a bránu může být konkrétnÃho hosta dosaženo." +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "Spustit kontrolu souborového systému pÅ™ed pÅ™ipojenÃm zaÅ™ÃzenÃ" @@ -3033,6 +3051,9 @@ msgstr "" msgid "Show current backup file list" msgstr "Ukázat aktuálnà seznam záložnÃch souborů" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "Shodit toho rozhranÃ" @@ -3054,6 +3075,9 @@ msgstr "" msgid "Size of DNS query cache" msgstr "" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "PÅ™eskoÄit" @@ -3166,6 +3190,9 @@ msgstr "" "jmen DHCP klientům. Jsou také vyžadovány pro nedynamické konfigurace " "rozhranÃ, kde jsou povoleni pouze hosté s odpovÃdajÃcÃm nastavenÃm." +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "Stav" @@ -3308,10 +3335,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3512,6 +3538,9 @@ msgstr "Synchronizace Äasu" msgid "Time Synchronization is not configured yet." msgstr "Synchronizace Äasu dosud nenà nakonfigurována." +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "ÄŒasové pásmo" @@ -3893,6 +3922,18 @@ msgid "" "or Safari." msgstr "" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "libovolný" @@ -4011,6 +4052,9 @@ msgstr "" msgid "routed" msgstr "smÄ›rované" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "" @@ -4050,6 +4094,9 @@ msgstr "ano" msgid "« Back" msgstr "« ZpÄ›t" +#~ msgid "No chains in this table" +#~ msgstr "Žádné Å™etÄ›zce v této tabulce" + #~ msgid "Configuration files will be kept." #~ msgstr "KonfiguraÄnà soubory budou zachovány." diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index 2154a4f084..917cf97ab6 100644 --- a/modules/luci-base/po/de/base.po +++ b/modules/luci-base/po/de/base.po @@ -412,14 +412,14 @@ msgstr "Antennenkonfiguration" msgid "Any zone" msgstr "Beliebige Zone" +msgid "Apply anyway" +msgstr "Ungeprüft anwenden" + msgid "Apply request failed with status <code>%h</code>" msgstr "" "Anforderung zur Anwendung der Änderungen mit Status <code>%h</code> " "fehlgeschlagen" -msgid "Apply unchecked" -msgstr "Ungeprüft anwenden" - msgid "Architecture" msgstr "Architektur" @@ -714,6 +714,9 @@ msgstr "Sammle Daten..." msgid "Command" msgstr "Befehl" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "Allgemeine Konfiguration" @@ -971,6 +974,9 @@ msgstr "DNS-Verarbeitung deaktivieren" msgid "Disable Encryption" msgstr "Verschlüsselung deaktivieren" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "Dieses Netzwerk deaktivieren" @@ -1510,6 +1516,9 @@ msgstr "" msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "ESSID verstecken" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "" @@ -2106,6 +2115,9 @@ msgstr "Manuell" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "Maximal erreichbare Datenrate (ATTNDR)" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "Maximal zulässige Anzahl von aktiven DHCP-Leases" @@ -2283,9 +2295,6 @@ msgstr "Kein DHCP Server auf dieser Schnittstelle eingerichtet" msgid "No NAT-T" msgstr "Kein NAT-T" -msgid "No chains in this table" -msgstr "Keine Ketten in dieser Tabelle" - msgid "No files found" msgstr "Keine Dateien gefunden" @@ -2311,7 +2320,7 @@ msgstr "Es sind keine Paketlisten vorhanden" msgid "No password set!" msgstr "Kein Passwort gesetzt!" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "Keine Regeln in dieser Kette" msgid "No scan results available yet..." @@ -2364,6 +2373,9 @@ msgstr "" "Anzahl der zwischengespeicherten DNS-Einträge. Maximum sind 10000 Einträge, " "\"0\" deaktiviert die Zwischenspeicherung." +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "OK" @@ -2670,6 +2682,9 @@ msgstr "Pkte." msgid "Please enter your username and password." msgstr "Bitte Benutzernamen und Passwort eingeben." +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "Standardregel" @@ -3029,6 +3044,9 @@ msgstr "" "Netzwerkrouten geben an, über welche Schnittstellen bestimmte Rechner oder " "Netzwerke erreicht werden können" +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "Vor dem Einhängen Dateisystemprüfung starten " @@ -3150,6 +3168,9 @@ msgstr "" msgid "Show current backup file list" msgstr "Zeige aktuelle Liste der gesicherten Dateien" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "Diese Schnittstelle herunterfahren" @@ -3171,6 +3192,9 @@ msgstr "Größe (.ipk)" msgid "Size of DNS query cache" msgstr "Größe des DNS-Caches" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "Ãœberspringen" @@ -3291,6 +3315,9 @@ msgstr "" "Konfigurationen benötigt auf denen lediglich Hosts mit zugehörigem " "statischem Lease-Eintrag bedient werden." +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "Status" @@ -3444,10 +3471,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" "Das Gerät konnte nach dem Anwenden der ausstehenden Änderungen innerhalb von " "%d Sekunden nicht mehr erreicht werden, daher wurde die Änderungen aus " @@ -3671,6 +3697,9 @@ msgstr "Zeitsynchronisation" msgid "Time Synchronization is not configured yet." msgstr "Die Zeitsynchronisation wurde noch nicht konfiguriert." +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "Zeitzone" @@ -4063,6 +4092,18 @@ msgid "" "or Safari." msgstr "" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "beliebig" @@ -4179,6 +4220,9 @@ msgstr "Relay-Modus" msgid "routed" msgstr "routed" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "Server-Modus" @@ -4218,6 +4262,9 @@ msgstr "ja" msgid "« Back" msgstr "« Zurück" +#~ msgid "No chains in this table" +#~ msgstr "Keine Ketten in dieser Tabelle" + #~ msgid "Configuration files will be kept." #~ msgstr "Konfigurationsdateien sichern" diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po index 3028cf227e..a8aa561187 100644 --- a/modules/luci-base/po/el/base.po +++ b/modules/luci-base/po/el/base.po @@ -412,10 +412,10 @@ msgstr "" msgid "Any zone" msgstr "Οιαδήποτε ζώνη" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -699,6 +699,9 @@ msgstr "Συλλογή δεδομÎνων..." msgid "Command" msgstr "Εντολή" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "Κοινή ΠαÏαμετÏοποίηση" @@ -945,6 +948,9 @@ msgstr "ΑπενεÏγοποίηση Ïυθμίσεων DNS" msgid "Disable Encryption" msgstr "" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "" @@ -1469,6 +1475,9 @@ msgstr "" msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "ΚÏυφό <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "" @@ -2035,6 +2044,9 @@ msgstr "" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "ÎœÎγιστος επιτÏεπόμενος αÏιθμός ενεÏγών DHCP leases" @@ -2211,9 +2223,6 @@ msgstr "Δεν υπάÏχει ÏυθμισμÎνος DHCP εξυπηÏετητή msgid "No NAT-T" msgstr "" -msgid "No chains in this table" -msgstr "Δεν υπάÏχουν αλυσίδες σε αυτόν τον πίνακα" - msgid "No files found" msgstr "Δε βÏÎθηκαν αÏχεία" @@ -2238,7 +2247,7 @@ msgstr "Δεν υπάÏχουν διαθÎσιμες λίστες πακÎτων msgid "No password set!" msgstr "Δεν Îχει οÏιστεί κωδικός Ï€Ïόσβασης!" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "Δεν υπάÏχει κανόνας σε αυτή την αλυσίδα" msgid "No scan results available yet..." @@ -2289,6 +2298,9 @@ msgstr "" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "Εντάξει" @@ -2579,6 +2591,9 @@ msgstr "Πκτ." msgid "Please enter your username and password." msgstr "ΠαÏακαλώ εισάγετε όνομα χÏήστη και κωδικό Ï€Ïόσβασης." +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "Πολιτική" @@ -2919,6 +2934,9 @@ msgstr "" "Οι διαδÏομÎÏ‚ οÏίζουν τη διεπαφή και Ï€Ïλη από την οποία κάποιος υπολογιστής ή " "δίκτυο μποÏεί να είναι Ï€Ïοσβάσιμο/Ï‚." +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "ΕκτÎλεση ελÎγχου του συστήματος αÏχείων Ï€Ïιν Ï€ÏοσαÏτηθεί η συσκευή" @@ -3035,6 +3053,9 @@ msgstr "" msgid "Show current backup file list" msgstr "" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "ΑπενεÏγοποίηση αυτής της διεπαφής" @@ -3056,6 +3077,9 @@ msgstr "" msgid "Size of DNS query cache" msgstr "" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "ΠαÏάκαμψη" @@ -3162,6 +3186,9 @@ msgid "" "configurations where only hosts with a corresponding lease are served." msgstr "" +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "Κατάσταση" @@ -3296,10 +3323,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3483,6 +3509,9 @@ msgstr "" msgid "Time Synchronization is not configured yet." msgstr "" +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "Ζώνη ÏŽÏας" @@ -3857,6 +3886,18 @@ msgid "" "or Safari." msgstr "" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "" @@ -3976,6 +4017,9 @@ msgstr "" msgid "routed" msgstr "" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "" @@ -4015,6 +4059,9 @@ msgstr "ναι" msgid "« Back" msgstr "« Πίσω" +#~ msgid "No chains in this table" +#~ msgstr "Δεν υπάÏχουν αλυσίδες σε αυτόν τον πίνακα" + #~ msgid "Configuration files will be kept." #~ msgstr "Τα αÏχεία παÏαμετÏοποίησης θα διατηÏηθοÏν." diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po index ffbfe6f565..bc7bc1965d 100644 --- a/modules/luci-base/po/en/base.po +++ b/modules/luci-base/po/en/base.po @@ -403,10 +403,10 @@ msgstr "" msgid "Any zone" msgstr "Any zone" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -687,6 +687,9 @@ msgstr "Collecting data..." msgid "Command" msgstr "Command" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "Common Configuration" @@ -932,6 +935,9 @@ msgstr "" msgid "Disable Encryption" msgstr "" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "" @@ -1445,6 +1451,9 @@ msgstr "" msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "" @@ -2005,6 +2014,9 @@ msgstr "" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "" @@ -2179,9 +2191,6 @@ msgstr "" msgid "No NAT-T" msgstr "" -msgid "No chains in this table" -msgstr "No chains in this table" - msgid "No files found" msgstr "" @@ -2206,8 +2215,8 @@ msgstr "" msgid "No password set!" msgstr "" -msgid "No rules in this chain" -msgstr "No rules in this chain" +msgid "No rules in this chain." +msgstr "No rules in this chain." msgid "No scan results available yet..." msgstr "" @@ -2257,6 +2266,9 @@ msgstr "" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "OK" @@ -2547,6 +2559,9 @@ msgstr "Pkts." msgid "Please enter your username and password." msgstr "Please enter your username and password." +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "Policy" @@ -2885,6 +2900,9 @@ msgstr "" "Routes specify over which interface and gateway a certain host or network " "can be reached." +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "" @@ -3000,6 +3018,9 @@ msgstr "" msgid "Show current backup file list" msgstr "" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "" @@ -3021,6 +3042,9 @@ msgstr "" msgid "Size of DNS query cache" msgstr "" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "Skip" @@ -3125,6 +3149,9 @@ msgid "" "configurations where only hosts with a corresponding lease are served." msgstr "" +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "Status" @@ -3257,10 +3284,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3441,6 +3467,9 @@ msgstr "" msgid "Time Synchronization is not configured yet." msgstr "" +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "Timezone" @@ -3815,6 +3844,18 @@ msgid "" "or Safari." msgstr "" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "" @@ -3933,6 +3974,9 @@ msgstr "" msgid "routed" msgstr "" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "" @@ -3972,6 +4016,9 @@ msgstr "" msgid "« Back" msgstr "« Back" +#~ msgid "No chains in this table" +#~ msgstr "No chains in this table" + #~ msgid "Configuration files will be kept." #~ msgstr "Configuration files will be kept." diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index 0c21b8347e..23632fd57a 100644 --- a/modules/luci-base/po/es/base.po +++ b/modules/luci-base/po/es/base.po @@ -409,10 +409,10 @@ msgstr "Configuración de la antena" msgid "Any zone" msgstr "Cualquier zona" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -696,6 +696,9 @@ msgstr "Un momento..." msgid "Command" msgstr "Comando" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "Configuración común" @@ -943,6 +946,9 @@ msgstr "Desactivar configuración de DNS" msgid "Disable Encryption" msgstr "" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "" @@ -1465,6 +1471,9 @@ msgstr "Claves públicas SSH. Ponga una por lÃnea." msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "Ocultar <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "" @@ -2044,6 +2053,9 @@ msgstr "" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "Número máximo de cesiones DHCP activas" @@ -2218,9 +2230,6 @@ msgstr "No se ha configurado un servidor DHCP para esta interfaz" msgid "No NAT-T" msgstr "" -msgid "No chains in this table" -msgstr "No hay cadenas en esta tabla" - msgid "No files found" msgstr "No se han encontrado ficheros" @@ -2245,7 +2254,7 @@ msgstr "No hay listas de paquetes disponibles" msgid "No password set!" msgstr "¡Sin contraseña!" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "No hay reglas en esta cadena" msgid "No scan results available yet..." @@ -2296,6 +2305,9 @@ msgstr "NSLookup" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "Aceptar" @@ -2587,6 +2599,9 @@ msgstr "Paq." msgid "Please enter your username and password." msgstr "Por favor, introduzca su nombre de usuario y contraseña." +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "PolÃtica" @@ -2930,6 +2945,9 @@ msgstr "" "Las rutas especifican sobre qué interfaz y pasarela se puede llegar a una " "cierta máquina o red." +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "Comprobar el sistema de ficheros antes de montar el dispositivo" @@ -3048,6 +3066,9 @@ msgstr "" msgid "Show current backup file list" msgstr "Mostrar lista de ficheros a salvar" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "Apagar esta interfaz" @@ -3069,6 +3090,9 @@ msgstr "" msgid "Size of DNS query cache" msgstr "" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "Saltar" @@ -3185,6 +3209,9 @@ msgstr "" "configuraciones de interfaz no dinámica en las que a cada máquina siempre se " "le quiere servir la misma dirección IP." +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "Estado" @@ -3330,10 +3357,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3539,6 +3565,9 @@ msgstr "Sincronización horaria" msgid "Time Synchronization is not configured yet." msgstr "Sincronización horaria no configurada." +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "Zona horaria" @@ -3922,6 +3951,18 @@ msgid "" "or Safari." msgstr "" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "cualquiera" @@ -4040,6 +4081,9 @@ msgstr "" msgid "routed" msgstr "enrutado" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "" @@ -4079,6 +4123,9 @@ msgstr "sÃ" msgid "« Back" msgstr "« Volver" +#~ msgid "No chains in this table" +#~ msgstr "No hay cadenas en esta tabla" + #~ msgid "Configuration files will be kept." #~ msgstr "Se mantendrán los ficheros de configuración." diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po index 33eb7edf54..f96ecd3893 100644 --- a/modules/luci-base/po/fr/base.po +++ b/modules/luci-base/po/fr/base.po @@ -415,10 +415,10 @@ msgstr "Configuration de l'antenne" msgid "Any zone" msgstr "N'importe quelle zone" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -702,6 +702,9 @@ msgstr "Récupération de données..." msgid "Command" msgstr "Commande" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "Configuration commune" @@ -949,6 +952,9 @@ msgstr "Désactiver la configuration DNS" msgid "Disable Encryption" msgstr "" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "" @@ -1478,6 +1484,9 @@ msgstr "" msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "Cacher le ESSID" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "" @@ -2057,6 +2066,9 @@ msgstr "" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "Nombre maximum de baux DHCP actifs" @@ -2231,9 +2243,6 @@ msgstr "Aucun serveur DHCP configuré sur cette interface" msgid "No NAT-T" msgstr "" -msgid "No chains in this table" -msgstr "Aucune chaîne dans cette table" - msgid "No files found" msgstr "Aucun fichier trouvé" @@ -2258,7 +2267,7 @@ msgstr "Aucune liste de paquets disponible" msgid "No password set!" msgstr "Pas de mot de passe positionné !" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "Aucune règle dans cette chaîne" msgid "No scan results available yet..." @@ -2309,6 +2318,9 @@ msgstr "Nslookup" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "OK" @@ -2599,6 +2611,9 @@ msgstr "Pqts." msgid "Please enter your username and password." msgstr "Saisissez votre nom d'utilisateur et mot de passe." +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "Politique" @@ -2941,6 +2956,9 @@ msgstr "" "Avec les routes statiques vous pouvez spécifier à travers quelle interface " "ou passerelle un réseau peut être contacté." +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "" "Faire un vérification du système de fichiers avant de monter le périphérique" @@ -3060,6 +3078,9 @@ msgstr "" msgid "Show current backup file list" msgstr "Afficher la liste des fichiers de la sauvegarde actuelle" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "Arrêter cet interface" @@ -3081,6 +3102,9 @@ msgstr "" msgid "Size of DNS query cache" msgstr "" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "Passer au suivant" @@ -3195,6 +3219,9 @@ msgstr "" "interfaces sans configuration dynamique où l'on fournit un bail aux seuls " "hôtes configurés." +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "Status" @@ -3340,10 +3367,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3555,6 +3581,9 @@ msgstr "Synchronisation de l'heure" msgid "Time Synchronization is not configured yet." msgstr "La synchronisation de l'heure n'est pas encore configurée." +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "Fuseau horaire" @@ -3941,6 +3970,18 @@ msgid "" "or Safari." msgstr "" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "n'importe lequel" @@ -4057,6 +4098,9 @@ msgstr "" msgid "routed" msgstr "routé" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "" @@ -4096,6 +4140,9 @@ msgstr "oui" msgid "« Back" msgstr "« Retour" +#~ msgid "No chains in this table" +#~ msgstr "Aucune chaîne dans cette table" + #~ msgid "Configuration files will be kept." #~ msgstr "Les fichiers de configuration seront préservés." diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po index 97047328c6..0b3acb89cc 100644 --- a/modules/luci-base/po/he/base.po +++ b/modules/luci-base/po/he/base.po @@ -404,10 +404,10 @@ msgstr "הגדרות ×× ×˜× ×”" msgid "Any zone" msgstr "כל תחו×" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -681,6 +681,9 @@ msgstr "×וסף מידע..." msgid "Command" msgstr "פקודה" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "הגדרות × ×¤×•×¦×•×ª" @@ -925,6 +928,9 @@ msgstr "" msgid "Disable Encryption" msgstr "" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "" @@ -1429,6 +1435,9 @@ msgstr "" msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "" @@ -1981,6 +1990,9 @@ msgstr "" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "" @@ -2153,9 +2165,6 @@ msgstr "" msgid "No NAT-T" msgstr "" -msgid "No chains in this table" -msgstr "" - msgid "No files found" msgstr "" @@ -2180,7 +2189,7 @@ msgstr "×ין רשימת חבילות ×–×ž×™× ×”" msgid "No password set!" msgstr "×œ× ×”×•×’×“×¨×” סיסמה!" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "" msgid "No scan results available yet..." @@ -2231,6 +2240,9 @@ msgstr "" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "" @@ -2515,6 +2527,9 @@ msgstr "" msgid "Please enter your username and password." msgstr "×× × ×”×–×Ÿ ×ת ×©× ×”×ž×©×ª×ž×© והסיסמה שלך:" +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "" @@ -2849,6 +2864,9 @@ msgid "" "can be reached." msgstr "" +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "" @@ -2965,6 +2983,9 @@ msgstr "" msgid "Show current backup file list" msgstr "" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "" @@ -2986,6 +3007,9 @@ msgstr "" msgid "Size of DNS query cache" msgstr "" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "" @@ -3095,6 +3119,9 @@ msgstr "" "הן × ×—×•×¦×•×ª ×’× ×¢×‘×•×¨ הגדרות ממשק ש××™× ×Ÿ ×“×™× ×מיות, בהן מטופלות רק ישויות בעלות " "הקצ××” מת×ימה." +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "מצב" @@ -3227,10 +3254,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3396,6 +3422,9 @@ msgstr "×¡× ×›×¨×•×Ÿ זמן" msgid "Time Synchronization is not configured yet." msgstr "×¡× ×›×¨×•×Ÿ זמן עדיין ×œ× ×”×•×’×“×¨." +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "×זור זמן" @@ -3763,6 +3792,18 @@ msgid "" "or Safari." msgstr "" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "כלשהו" @@ -3879,6 +3920,9 @@ msgstr "" msgid "routed" msgstr "×ž× ×•×ª×‘" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "" diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po index 94d9ad109d..5a75deb784 100644 --- a/modules/luci-base/po/hu/base.po +++ b/modules/luci-base/po/hu/base.po @@ -408,10 +408,10 @@ msgstr "Antenna beállÃtások" msgid "Any zone" msgstr "Bármelyik zóna" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -697,6 +697,9 @@ msgstr "Adatok összegyűjtése..." msgid "Command" msgstr "Parancs" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "Ãlatános beállÃtás" @@ -943,6 +946,9 @@ msgstr "DNS beállÃtás letiltása" msgid "Disable Encryption" msgstr "" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "" @@ -1467,6 +1473,9 @@ msgstr "" msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr> elrejtése" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "" @@ -2046,6 +2055,9 @@ msgstr "" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "AktÃv DHCP bérletek maximális száma" @@ -2220,9 +2232,6 @@ msgstr "Ehhez az interfészhez nincs DHCP kiszolgáló beállÃtva" msgid "No NAT-T" msgstr "" -msgid "No chains in this table" -msgstr "Ez a tábla nem tartalmaz láncokat." - msgid "No files found" msgstr "Nem találhatók fájlok" @@ -2247,7 +2256,7 @@ msgstr "Csomaglisták nem állnak rendelkezésre" msgid "No password set!" msgstr "Nincs jelszó!" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "Ez a lánc nem tartalmaz szabályokat" msgid "No scan results available yet..." @@ -2298,6 +2307,9 @@ msgstr "Nslookup" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "OK" @@ -2589,6 +2601,9 @@ msgstr "csom." msgid "Please enter your username and password." msgstr "Adja meg a felhasználónevét és a jelszavát." +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "Szabály" @@ -2933,6 +2948,9 @@ msgstr "" "Az útvonalak határozzák meg, hogy bizonyos gépek illetve hálózatok melyik " "interfészen keresztül érhetÅ‘k el." +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "Fájlrendszer ellenÅ‘rzés futtatása az eszköz csatolása elÅ‘tt" @@ -3051,6 +3069,9 @@ msgstr "" msgid "Show current backup file list" msgstr "MentendÅ‘ fájlok aktuális listájának megjelenÃtése" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "Interfész leállÃtása" @@ -3072,6 +3093,9 @@ msgstr "" msgid "Size of DNS query cache" msgstr "" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "Ugrás" @@ -3186,6 +3210,9 @@ msgstr "" "szükségesek, ahol a csak a megfelelÅ‘ bérlettel rendelkezÅ‘ hosztok kerülnek " "kiszolgálásra." +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "Ãllapot" @@ -3329,10 +3356,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3543,6 +3569,9 @@ msgstr "IdÅ‘ szinkronizálás" msgid "Time Synchronization is not configured yet." msgstr "IdÅ‘ szinkronizálás még nincs beállÃtva." +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "IdÅ‘zóna" @@ -3928,6 +3957,18 @@ msgid "" "or Safari." msgstr "" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "bármelyik" @@ -4046,6 +4087,9 @@ msgstr "" msgid "routed" msgstr "irányÃtott" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "" @@ -4085,6 +4129,9 @@ msgstr "igen" msgid "« Back" msgstr "« Vissza" +#~ msgid "No chains in this table" +#~ msgstr "Ez a tábla nem tartalmaz láncokat." + #~ msgid "Configuration files will be kept." #~ msgstr "A konfigurációs fájlok megmaradnak." diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po index 9ba9308e2c..b81b9c875e 100644 --- a/modules/luci-base/po/it/base.po +++ b/modules/luci-base/po/it/base.po @@ -417,10 +417,10 @@ msgstr "Configurazione dell'Antenna" msgid "Any zone" msgstr "Qualsiasi Zona" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -703,6 +703,9 @@ msgstr "Raccolgo i dati..." msgid "Command" msgstr "Comando" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "Configurazioni Comuni" @@ -950,6 +953,9 @@ msgstr "Disabilita il setup dei DNS" msgid "Disable Encryption" msgstr "Disabilita Crittografia" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "" @@ -1472,6 +1478,9 @@ msgstr "" msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "Nascondi <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "" @@ -2047,6 +2056,9 @@ msgstr "Manuale" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "" @@ -2221,9 +2233,6 @@ msgstr "Nessun Server DHCP configurato per questa interfaccia" msgid "No NAT-T" msgstr "" -msgid "No chains in this table" -msgstr "" - msgid "No files found" msgstr "Nessun file trovato" @@ -2248,7 +2257,7 @@ msgstr "Nessuna lista pacchetti disponibile" msgid "No password set!" msgstr "Nessuna password immessa!" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "Nessuna regola in questa catena" msgid "No scan results available yet..." @@ -2299,6 +2308,9 @@ msgstr "" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "OK" @@ -2590,6 +2602,9 @@ msgstr "" msgid "Please enter your username and password." msgstr "Per favore inserisci il tuo username e la password." +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "" @@ -2931,6 +2946,9 @@ msgstr "" "Le route specificano attraverso quale interfaccia e gateway un certo host o " "rete può essere raggiunto." +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "Esegui un controllo del filesystem prima di montare il dispositivo" @@ -3046,6 +3064,9 @@ msgstr "" msgid "Show current backup file list" msgstr "" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "" @@ -3067,6 +3088,9 @@ msgstr "" msgid "Size of DNS query cache" msgstr "" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "Salta" @@ -3183,6 +3207,9 @@ msgstr "" "di configurazione non dinamici, dove solo gli host col contratto " "corrispondente vengono serviti." +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "Stato" @@ -3326,10 +3353,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3511,6 +3537,9 @@ msgstr "Sincronizzazione Orario" msgid "Time Synchronization is not configured yet." msgstr "Sincronizzazione Orario non ancora configurata" +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "Fuso orario" @@ -3898,6 +3927,18 @@ msgid "" "or Safari." msgstr "" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "qualsiasi" @@ -4016,6 +4057,9 @@ msgstr "" msgid "routed" msgstr "instradato" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "" diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index 9d6b9b4b70..ced6c85252 100644 --- a/modules/luci-base/po/ja/base.po +++ b/modules/luci-base/po/ja/base.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-06-10 03:40+0200\n" -"PO-Revision-Date: 2018-09-20 05:12+0900\n" +"PO-Revision-Date: 2018-10-20 00:48+0900\n" "Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -411,12 +411,12 @@ msgstr "アンテナè¨å®š" msgid "Any zone" msgstr "å…¨ã¦ã®ã‚¾ãƒ¼ãƒ³" +msgid "Apply anyway" +msgstr "ãƒã‚§ãƒƒã‚¯ãªã—ã®é©ç”¨" + msgid "Apply request failed with status <code>%h</code>" msgstr "é©ç”¨ãƒªã‚¯ã‚¨ã‚¹ãƒˆã¯ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ <code>%h</code> ã«ã‚ˆã‚Šå¤±æ•—ã—ã¾ã—ãŸ" -msgid "Apply unchecked" -msgstr "ãƒã‚§ãƒƒã‚¯ãªã—ã®é©ç”¨" - msgid "Architecture" msgstr "アーã‚テクãƒãƒ£" @@ -673,7 +673,7 @@ msgid "" "Click \"Generate archive\" to download a tar archive of the current " "configuration files." msgstr "" -"\"ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ— アーカイブã®ä½œæˆ\"をクリックã™ã‚‹ã¨ã€ç¾åœ¨ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’tarå½¢" +"\"ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ— アーカイブを生æˆ\" をクリックã™ã‚‹ã¨ã€ç¾åœ¨ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’tarå½¢" "å¼ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ファイルã¨ã—ã¦ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã—ã¾ã™ã€‚" msgid "" @@ -705,6 +705,9 @@ msgstr "データåŽé›†ä¸ã§ã™..." msgid "Command" msgstr "コマンド" +msgid "Comment" +msgstr "コメント" + msgid "Common Configuration" msgstr "一般è¨å®š" @@ -846,7 +849,7 @@ msgid "DNS forwardings" msgstr "DNSフォワーディング" msgid "DNS-Label / FQDN" -msgstr "" +msgstr "DNS-ラベル / FQDN" msgid "DNSSEC" msgstr "DNSSEC" @@ -962,8 +965,11 @@ msgstr "DNSセットアップを無効ã«ã™ã‚‹" msgid "Disable Encryption" msgstr "æš—å·åŒ–を無効ã«ã™ã‚‹" +msgid "Disable Inactivity Polling" +msgstr "éžã‚¢ã‚¯ãƒ†ã‚£ãƒ–状態ãƒãƒ¼ãƒªãƒ³ã‚°ã‚’無効化" + msgid "Disable this network" -msgstr "ã“ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’無効化" +msgstr "ã“ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’無効ã«ã—ã¾ã™" msgid "Disabled" msgstr "無効" @@ -1094,7 +1100,7 @@ msgstr "" "ページをリãƒãƒ¼ãƒ‰ã—ã¾ã™ã€‚" msgid "Edit this interface" -msgstr "インターフェースを編集" +msgstr "インターフェースを編集ã—ã¾ã™" msgid "Edit this network" msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’編集" @@ -1161,13 +1167,13 @@ msgid "Enable this mount" msgstr "マウントè¨å®šã‚’有効ã«ã™ã‚‹" msgid "Enable this network" -msgstr "ã“ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’有効化" +msgstr "ã“ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’有効ã«ã—ã¾ã™" msgid "Enable this swap" msgstr "スワップè¨å®šã‚’有効ã«ã™ã‚‹" msgid "Enable/Disable" -msgstr "有効/無効" +msgstr "有効 / 無効" msgid "Enabled" msgstr "有効" @@ -1435,7 +1441,7 @@ msgid "Generate PMK locally" msgstr "" msgid "Generate archive" -msgstr "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ— アーカイブã®ä½œæˆ" +msgstr "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ— アーカイブを生æˆ" msgid "Generic 802.11%s Wireless Controller" msgstr "802.11%s ç„¡ç·šLANコントãƒãƒ¼ãƒ©" @@ -1490,6 +1496,9 @@ msgstr "SSH公開éµèªè¨¼ã§ä½¿ç”¨ã™ã‚‹SSH公開éµã‚’1è¡Œã¥ã¤ãƒšãƒ¼ã‚¹ãƒˆã msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>ã®éš 匿" +msgid "Hide empty chains" +msgstr "空ã®ãƒã‚§ã‚¤ãƒ³ã‚’éžè¡¨ç¤º" + msgid "Host" msgstr "ホスト" @@ -1938,8 +1947,8 @@ msgstr "å¾…ã¡å—ã‘ãƒãƒ¼ãƒˆ" msgid "Listen only on the given interface or, if unspecified, on all" msgstr "" -"指定ã—ãŸã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã§ã®ã¿ã‚¢ã‚¯ã‚»ã‚¹ã‚’有効ã«ã—ã¾ã™ã€‚è¨å®šã—ãªã„å ´åˆã¯ã™ã¹ã¦" -"ã®ã‚¤ãƒ³ã‚¿ãƒ•ã‚§ãƒ¼ã‚¹ãŒå¯¾è±¡ã§ã™" +"指定ã•ã‚ŒãŸã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã§ã®ã¿å¾…ã¡å—ã‘ã‚’è¡Œã„ã¾ã™ã€‚è¨å®šã—ãªã„å ´åˆã¯ã™ã¹ã¦ã®" +"インタフェースãŒå¯¾è±¡ã§ã™ã€‚" msgid "Listening port for inbound DNS queries" msgstr "DNSクエリをå—ä¿¡ã™ã‚‹ãƒãƒ¼ãƒˆ" @@ -2072,6 +2081,9 @@ msgstr "手動" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "許容ã•ã‚Œã‚‹æœ€å¤§ Listen é–“éš”" + msgid "Maximum allowed number of active DHCP leases" msgstr "DHCPリースã®è¨±å¯ã•ã‚Œã‚‹æœ€å¤§æ•°" @@ -2248,9 +2260,6 @@ msgstr "ã“ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã«ã¯DHCPサーãƒãƒ¼ãŒè¨å®šã•ã‚Œã¦ã msgid "No NAT-T" msgstr "NAT-Tを使用ã—ãªã„" -msgid "No chains in this table" -msgstr "ãƒã‚§ã‚¤ãƒ³å†…ã«ãƒ«ãƒ¼ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“" - msgid "No files found" msgstr "ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ" @@ -2275,7 +2284,7 @@ msgstr "パッケージ リストãŒã‚ã‚Šã¾ã›ã‚“" msgid "No password set!" msgstr "パスワードãŒè¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“!" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "ãƒã‚§ã‚¤ãƒ³å†…ã«ãƒ«ãƒ¼ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“" msgid "No scan results available yet..." @@ -2328,6 +2337,9 @@ msgstr "" "ã‚ャッシュã•ã‚Œã‚‹ DNS エントリーã®æ•°ã§ã™ã€‚（最大 10000 件。 0ã®å ´åˆã¯ã‚ャッ" "シュã—ã¾ã›ã‚“）" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "OK" @@ -2624,6 +2636,9 @@ msgstr "パケット" msgid "Please enter your username and password." msgstr "ユーザーåã¨ãƒ‘スワードを入力ã—ã¦ãã ã•ã„。" +msgid "Please update package lists first" +msgstr "最åˆã«ãƒ‘ッケージ リストを更新ã—ã¦ãã ã•ã„" + msgid "Policy" msgstr "ãƒãƒªã‚·ãƒ¼" @@ -2695,7 +2710,7 @@ msgid "Provide NTP server" msgstr "NTPサーãƒãƒ¼æ©Ÿèƒ½ã‚’有効ã«ã™ã‚‹" msgid "Provide new network" -msgstr "æ–°ã—ã„ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’è¨å®šã™ã‚‹" +msgstr "æ–°ã—ã„ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’è¨å®šã—ã¾ã™" msgid "Pseudo Ad-Hoc (ahdemo)" msgstr "擬似アドホック (ahdemo)" @@ -2828,7 +2843,7 @@ msgid "Recommended. IP addresses of the WireGuard interface." msgstr "WireGuard インターフェースã®IPアドレスã§ã™ã€‚（推奨）" msgid "Reconnect this interface" -msgstr "インターフェースã®å†æŽ¥ç¶š" +msgstr "インターフェースをå†æŽ¥ç¶šã—ã¾ã™" msgid "References" msgstr "å‚照カウンタ" @@ -2903,7 +2918,7 @@ msgid "Reset" msgstr "リセット" msgid "Reset Counters" -msgstr "カウンタã®ãƒªã‚»ãƒƒãƒˆ" +msgstr "カウンタをリセット" msgid "Reset to defaults" msgstr "標準è¨å®šã«ãƒªã‚»ãƒƒãƒˆ" @@ -2918,10 +2933,10 @@ msgid "Restart" msgstr "å†èµ·å‹•" msgid "Restart Firewall" -msgstr "ファイアウォールã®å†èµ·å‹•" +msgstr "ファイアウォールをå†èµ·å‹•" msgid "Restart radio interface" -msgstr "無線インターフェースã®å†èµ·å‹•" +msgstr "無線インターフェースをå†èµ·å‹•ã—ã¾ã™" msgid "Restore" msgstr "復元" @@ -2975,6 +2990,9 @@ msgstr "" "特定ã®ãƒ›ã‚¹ãƒˆåˆã¯ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«ã€ã©ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹åŠã³ã‚²ãƒ¼ãƒˆã‚¦ã‚§ã‚¤ã‚’通ã—ã¦" "通信を行ã†ã‹ã€çµŒè·¯æƒ…å ±ã‚’è¨å®šã—ã¾ã™ã€‚" +msgid "Rule" +msgstr "ルール" + msgid "Run a filesystem check before mounting the device" msgstr "デãƒã‚¤ã‚¹ã®ãƒžã‚¦ãƒ³ãƒˆã‚’è¡Œã†å‰ã«ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ ãƒã‚§ãƒƒã‚¯ã‚’è¡Œã†" @@ -3095,8 +3113,11 @@ msgstr "Short Preamble" msgid "Show current backup file list" msgstr "ç¾åœ¨ã®ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ファイルã®ãƒªã‚¹ãƒˆã‚’表示ã™ã‚‹" +msgid "Show empty chains" +msgstr "空ã®ãƒã‚§ã‚¤ãƒ³ã‚’表示" + msgid "Shutdown this interface" -msgstr "インターフェースを終了" +msgstr "インターフェースを終了ã—ã¾ã™" msgid "Signal" msgstr "ä¿¡å·å¼·åº¦" @@ -3116,6 +3137,9 @@ msgstr "サイズ (.ipk)" msgid "Size of DNS query cache" msgstr "DNS クエリ ã‚ャッシュã®ã‚µã‚¤ã‚º" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "スã‚ップ" @@ -3159,7 +3183,7 @@ msgid "Specifies the directory the device is attached to" msgstr "デãƒã‚¤ã‚¹ãŒæŽ¥ç¶šã™ã‚‹ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’è¨å®šã—ã¾ã™" msgid "Specifies the listening port of this <em>Dropbear</em> instance" -msgstr "<em>Dropbear</em>ã®å—ä¿¡ãƒãƒ¼ãƒˆã‚’è¨å®šã—ã¦ãã ã•ã„" +msgstr "<em>Dropbear</em> ã®å¾…ã¡å—ã‘ãƒãƒ¼ãƒˆã‚’è¨å®šã—ã¦ãã ã•ã„。" msgid "" "Specifies the maximum amount of failed ARP requests until hosts are presumed " @@ -3226,6 +3250,9 @@ msgstr "" "åをアサインã—ã¾ã™ã€‚ã¾ãŸã€ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã¯å¯¾å¿œã™ã‚‹ãƒªãƒ¼ã‚¹ã‚’使用ã™ã‚‹ãƒ›ã‚¹ãƒˆãŒãã®1" "å°ã®ã¿ã§ã€ã‹ã¤é™çš„ãªã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹è¨å®šã«ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚" +msgid "Station inactivity limit" +msgstr "éžã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚¹ãƒ†ãƒ¼ã‚·ãƒ§ãƒ³ã®åˆ¶é™" + msgid "Status" msgstr "ステータス" @@ -3242,7 +3269,7 @@ msgid "Suppress logging" msgstr "ãƒã‚°ã®æŠ‘制" msgid "Suppress logging of the routine operation of these protocols" -msgstr "ã“れらã®ãƒ—ãƒãƒˆã‚³ãƒ«ã®ãƒ«ãƒ¼ãƒãƒ³çš„æ“作ã«ã¤ã„ã¦ã®ãƒã‚°ã‚’抑制ã—ã¾ã™ã€‚" +msgstr "ã“れらã®ãƒ—ãƒãƒˆã‚³ãƒ«ã®ã€ãƒ«ãƒ¼ãƒãƒ³çš„æ“作ã«ã¤ã„ã¦ã®ãƒã‚°ã‚’抑制ã—ã¾ã™ã€‚" msgid "Swap" msgstr "スワップ" @@ -3371,10 +3398,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" "未é©ç”¨ã®å¤‰æ›´ã‚’é©ç”¨å¾Œã€ãƒ‡ãƒã‚¤ã‚¹ã¯ %d 秒以内ã«å®Œäº†ã§ããªã‹ã£ãŸå¯èƒ½æ€§ãŒã‚ã‚Šã¾" "ã™ã€‚ã“ã‚Œã¯ã€å®‰å…¨ä¸Šã®ç†ç”±ã«ã‚ˆã‚Šãƒãƒ¼ãƒ«ãƒãƒƒã‚¯ã•ã‚Œã‚‹è¨å®šã«èµ·å› ã™ã‚‹ã‚‚ã®ã§ã™ã€‚ãã‚Œ" @@ -3588,6 +3614,9 @@ msgstr "時刻è¨å®š" msgid "Time Synchronization is not configured yet." msgstr "時刻åŒæœŸæ©Ÿèƒ½ã¯ã¾ã è¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。" +msgid "Time interval for rekeying GTK" +msgstr "Group Temporal Key (GTK) å†ç”Ÿæˆé–“éš”" + msgid "Timezone" msgstr "タイムゾーン" @@ -3721,7 +3750,7 @@ msgid "Up" msgstr "上ã¸" msgid "Update lists" -msgstr "リストã®æ›´æ–°" +msgstr "リストを更新" msgid "" "Upload a sysupgrade-compatible image here to replace the running firmware. " @@ -3958,8 +3987,8 @@ msgid "" "scripts like \"network\", your device might become inaccessible!</strong>" msgstr "" "ルーターãŒèµ·å‹•ã™ã‚‹éš›ã®ã‚µãƒ¼ãƒ“スã®æœ‰åŠ¹åŒ–/無効化を行ã†ã“ã¨ãŒã§ãã¾ã™ã€‚ã¾ãŸã€å¤‰æ›´" -"ã¯å†èµ·å‹•å¾Œã«é©ç”¨ã•ã‚Œã¾ã™ã€‚<br /><strong>è¦å‘Š: \"network\"ã®ã‚ˆã†ãªé‡è¦ãªã‚µãƒ¼ãƒ“" -"スを無効ã«ã™ã‚‹ã¨, ルーターã«ã‚¢ã‚¯ã‚»ã‚¹ã§ããªããªã‚Šã¾ã™ã®ã§ã€æ³¨æ„ã—ã¦ãã ã•ã„。" +"ã¯å†èµ·å‹•å¾Œã«é©ç”¨ã•ã‚Œã¾ã™ã€‚<br /><strong>è¦å‘Š: \"network\" ã®ã‚ˆã†ãªé‡è¦ãªã‚µãƒ¼" +"ビスを無効ã«ã™ã‚‹ã¨ãƒ«ãƒ¼ã‚¿ãƒ¼ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ããªããªã‚Šã¾ã™ã®ã§ã€æ³¨æ„ã—ã¦ãã ã•ã„。" "</strong>" msgid "" @@ -3975,6 +4004,18 @@ msgstr "" "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ 7以上ã«ã‚¢ãƒƒãƒ—グレードã™ã‚‹ã‹ã€Firefoxã‚„Operaã€Safariãªã©åˆ¥ã®ãƒ–ラウ" "ザーを使用ã—ã¦ãã ã•ã„。" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "å…¨ã¦" @@ -4093,6 +4134,9 @@ msgstr "リレー モード" msgid "routed" msgstr "routed" +msgid "sec" +msgstr "秒" + msgid "server mode" msgstr "サーãƒãƒ¼ モード" diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po index 30ab1f79c5..2f94e495fa 100644 --- a/modules/luci-base/po/ko/base.po +++ b/modules/luci-base/po/ko/base.po @@ -397,10 +397,10 @@ msgstr "" msgid "Any zone" msgstr "" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -683,6 +683,9 @@ msgstr "Data 를 수집중입니다..." msgid "Command" msgstr "ëª…ë ¹ì–´" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "공통 ì„¤ì •" @@ -932,6 +935,9 @@ msgstr "" msgid "Disable Encryption" msgstr "" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "" @@ -1444,6 +1450,9 @@ msgstr "" msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr> 숨기기" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "호스트" @@ -1998,6 +2007,9 @@ msgstr "" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "Active DHCP lease ê±´ì˜ ìµœëŒ€ 허용 숫ìž" @@ -2170,9 +2182,6 @@ msgstr "" msgid "No NAT-T" msgstr "" -msgid "No chains in this table" -msgstr "ì´ table ì—는 ì •ì˜ëœ chain ì´ ì—†ìŒ" - msgid "No files found" msgstr "" @@ -2197,7 +2206,7 @@ msgstr "" msgid "No password set!" msgstr "암호 ì„¤ì •ì„ í•´ì£¼ì„¸ìš”!" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "" msgid "No scan results available yet..." @@ -2248,6 +2257,9 @@ msgstr "" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "" @@ -2540,6 +2552,9 @@ msgstr "Pkts." msgid "Please enter your username and password." msgstr "사용ìžì´ë¦„ê³¼ 암호를 ìž…ë ¥í•´ 주세요." +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "" @@ -2878,6 +2893,9 @@ msgstr "" "Route 경로는 íŠ¹ì • 호스트 í˜¹ì€ ë„¤íŠ¸ì›Œí¬ê°€ 사용해야 í• ì¸í„°íŽ˜ì´ìŠ¤ì™€ gateway ì •" "보를 나타냅니다." +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "" @@ -2993,6 +3011,9 @@ msgstr "" msgid "Show current backup file list" msgstr "현재 백업 íŒŒì¼ ëª©ë¡ ë³´ê¸°" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "ì´ ì¸í„°íŽ˜ì´ìŠ¤ë¥¼ ì •ì§€í•©ë‹ˆë‹¤" @@ -3014,6 +3035,9 @@ msgstr "í¬ê¸° (.ipk)" msgid "Size of DNS query cache" msgstr "" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "" @@ -3121,6 +3145,9 @@ msgstr "" "í• ë•Œ 사용ë©ë‹ˆë‹¤. ì´ ê¸°ëŠ¥ì€ ë˜í•œ ì§€ì •ëœ host ì— ëŒ€í•´ì„œë§Œ 주소 임대를 하ë„ë¡ " "하는 non-dynamic ì¸í„°íŽ˜ì´ìŠ¤ ì„¤ì •ì—ë„ ì‚¬ìš©ë©ë‹ˆë‹¤." +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "ìƒíƒœ" @@ -3258,10 +3285,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3439,6 +3465,9 @@ msgstr "시간 ë™ê¸°í™”" msgid "Time Synchronization is not configured yet." msgstr "시간 ë™ê¸°í™”ê°€ ì•„ì§ ì„¤ì •ë˜ì§€ 않았습니다." +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "시간대" @@ -3820,6 +3849,18 @@ msgid "" "or Safari." msgstr "" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "" @@ -3938,6 +3979,9 @@ msgstr "" msgid "routed" msgstr "" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "" @@ -3977,6 +4021,9 @@ msgstr "" msgid "« Back" msgstr "" +#~ msgid "No chains in this table" +#~ msgstr "ì´ table ì—는 ì •ì˜ëœ chain ì´ ì—†ìŒ" + #~ msgid "Activate this network" #~ msgstr "ì´ ë„¤íŠ¸ì›Œë¥¼ 활성화합니다" diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index 609af43c9a..42c020806b 100644 --- a/modules/luci-base/po/ms/base.po +++ b/modules/luci-base/po/ms/base.po @@ -392,10 +392,10 @@ msgstr "" msgid "Any zone" msgstr "" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -666,6 +666,9 @@ msgstr "" msgid "Command" msgstr "Perintah" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "" @@ -906,6 +909,9 @@ msgstr "" msgid "Disable Encryption" msgstr "" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "" @@ -1416,6 +1422,9 @@ msgstr "" msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "Menyembunyikan ESSID" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "" @@ -1977,6 +1986,9 @@ msgstr "" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "" @@ -2151,9 +2163,6 @@ msgstr "" msgid "No NAT-T" msgstr "" -msgid "No chains in this table" -msgstr "Tiada rantai dalam jadual ini" - msgid "No files found" msgstr "" @@ -2178,7 +2187,7 @@ msgstr "" msgid "No password set!" msgstr "" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "Tidak ada peraturan dalam rantai ini" msgid "No scan results available yet..." @@ -2229,6 +2238,9 @@ msgstr "" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "Baik" @@ -2518,6 +2530,9 @@ msgstr "Pkts." msgid "Please enter your username and password." msgstr "Sila masukkan username dan kata laluan anda." +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "Dasar" @@ -2855,6 +2870,9 @@ msgstr "" "Laluan menentukan di mana interface dan gateway host atau rangkaian tertentu " "yang boleh dicapai." +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "" @@ -2970,6 +2988,9 @@ msgstr "" msgid "Show current backup file list" msgstr "" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "" @@ -2991,6 +3012,9 @@ msgstr "" msgid "Size of DNS query cache" msgstr "" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "Skip" @@ -3095,6 +3119,9 @@ msgid "" "configurations where only hosts with a corresponding lease are served." msgstr "" +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "Status" @@ -3230,10 +3257,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3415,6 +3441,9 @@ msgstr "" msgid "Time Synchronization is not configured yet." msgstr "" +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "Zon masa" @@ -3783,6 +3812,18 @@ msgid "" "or Safari." msgstr "" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "" @@ -3899,6 +3940,9 @@ msgstr "" msgid "routed" msgstr "" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "" @@ -3938,6 +3982,9 @@ msgstr "" msgid "« Back" msgstr "« Kembali" +#~ msgid "No chains in this table" +#~ msgstr "Tiada rantai dalam jadual ini" + #~ msgid "help" #~ msgstr "Membantu" diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po index d30f4075da..dd4094df64 100644 --- a/modules/luci-base/po/no/base.po +++ b/modules/luci-base/po/no/base.po @@ -401,10 +401,10 @@ msgstr "Antennekonfigurasjon" msgid "Any zone" msgstr "Alle soner" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -687,6 +687,9 @@ msgstr "Henter data..." msgid "Command" msgstr "Kommando" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "Vanlige Innstillinger" @@ -933,6 +936,9 @@ msgstr "Deaktiver DNS oppsett" msgid "Disable Encryption" msgstr "" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "" @@ -1453,6 +1459,9 @@ msgstr "" msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "Skjul <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "" @@ -2021,6 +2030,9 @@ msgstr "" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "Maksimalt antall aktive DHCP leieavtaler" @@ -2195,9 +2207,6 @@ msgstr "Ingen DHCP server er konfigurert for dette grensesnittet" msgid "No NAT-T" msgstr "" -msgid "No chains in this table" -msgstr "Ingen lenker i denne tabellen" - msgid "No files found" msgstr "Ingen filer funnet" @@ -2222,7 +2231,7 @@ msgstr "Ingen pakkelister tilgjengelig" msgid "No password set!" msgstr "Ruteren er ikke passordbeskyttet!" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "Ingen regler i denne tabellen" msgid "No scan results available yet..." @@ -2273,6 +2282,9 @@ msgstr "Nslookup" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "OK" @@ -2565,6 +2577,9 @@ msgstr "Pakker." msgid "Please enter your username and password." msgstr "Skriv inn ditt brukernavn og passord." +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "Policy" @@ -2907,6 +2922,9 @@ msgstr "" "Ruter, angir hvilket nettverksgrensesnitt og hvilken gateway som brukes for " "Ã¥ nÃ¥ et gitt nettverk eller vert." +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "Kjør filsystem sjekk før montering av enheten" @@ -3025,6 +3043,9 @@ msgstr "" msgid "Show current backup file list" msgstr "Vis gjeldende liste med sikkerhetskopifiler" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "SlÃ¥ av dette grensesnittet" @@ -3046,6 +3067,9 @@ msgstr "" msgid "Size of DNS query cache" msgstr "" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "GÃ¥ videre" @@ -3157,6 +3181,9 @@ msgstr "" "vertsnavn til DHCP klienter. Dette er nødvendig om grensesnittet ikke er " "dynamisk konfigurert og kun klienter med dhcp leieavtale fÃ¥r IP." +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "Status" @@ -3301,10 +3328,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3509,6 +3535,9 @@ msgstr "Tidssynkronisering" msgid "Time Synchronization is not configured yet." msgstr "Tiden Synkroniseringen er ikke konfigurert ennÃ¥." +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "Tidssone" @@ -3894,6 +3923,18 @@ msgid "" "or Safari." msgstr "" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "enhver" @@ -4012,6 +4053,9 @@ msgstr "" msgid "routed" msgstr "rutet" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "" @@ -4051,6 +4095,9 @@ msgstr "ja" msgid "« Back" msgstr "« Tilbake" +#~ msgid "No chains in this table" +#~ msgstr "Ingen lenker i denne tabellen" + #~ msgid "Configuration files will be kept." #~ msgstr "Konfigurasjonsfiler vil bli bevart." diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index 66c0c7c569..c811c1316a 100644 --- a/modules/luci-base/po/pl/base.po +++ b/modules/luci-base/po/pl/base.po @@ -419,10 +419,10 @@ msgstr "Ustawienia anteny" msgid "Any zone" msgstr "Dowolna strefa" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -712,6 +712,9 @@ msgstr "Zbieranie danych..." msgid "Command" msgstr "Polecenie" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "Konfiguracja podstawowa" @@ -968,6 +971,9 @@ msgstr "WyÅ‚Ä…cz konfiguracjÄ™ DNS" msgid "Disable Encryption" msgstr "WyÅ‚Ä…cz szyfrowanie" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "WyÅ‚Ä…cz tÄ… sieć" @@ -1503,6 +1509,9 @@ msgstr "" "Ukryj <abbr title=\"Extended Service Set Identifier (NazwÄ™ sieci)\">ESSID</" "abbr>" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "" @@ -2081,6 +2090,9 @@ msgstr "" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "Max. OsiÄ…galna przepustowość danych (ATTNDR)" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "Maksymalna dozwolona liczba aktywnych dzierżaw DHCP" @@ -2255,9 +2267,6 @@ msgstr "Brak skonfigurowanego serwera DHCP dla tego interfejsu" msgid "No NAT-T" msgstr "" -msgid "No chains in this table" -msgstr "Brak Å‚aÅ„cuchów w tej tablicy" - msgid "No files found" msgstr "Nie znaleziono plików" @@ -2282,7 +2291,7 @@ msgstr "Lista pakietów nie jest dostÄ™pna" msgid "No password set!" msgstr "Nie ustawiono hasÅ‚a!" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "Brak zasad w tym Å‚aÅ„cuchu" msgid "No scan results available yet..." @@ -2335,6 +2344,9 @@ msgstr "" "Liczba buforowanych wpisów DNS (max wynosi 10000, 0 oznacza brak pamiÄ™ci " "podrÄ™cznej)" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "OK" @@ -2630,6 +2642,9 @@ msgstr "Pktw." msgid "Please enter your username and password." msgstr "ProszÄ™ wprowadź swój login i hasÅ‚o." +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "Zasada" @@ -2979,6 +2994,9 @@ msgstr "" "Åšcieżki routingu pokazujÄ… routerowi przez który interfejs oraz którÄ… bramÄ™ " "może skomunikować siÄ™ z danÄ… sieciÄ… lub komputerem." +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "" "Sprawdź czy system plików nie zawiera bÅ‚Ä™dów przed zamontowaniem urzÄ…dzenia" @@ -3103,6 +3121,9 @@ msgstr "Krótki WstÄ™p" msgid "Show current backup file list" msgstr "Pokaż aktualnÄ… listÄ™ plików do backupu" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "WyÅ‚Ä…cz ten interfejs" @@ -3124,6 +3145,9 @@ msgstr "Rozmiar (.ipk)" msgid "Size of DNS query cache" msgstr "Rozmiar pamiÄ™ci podrÄ™cznej zapytaÅ„ DNS" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "PomiÅ„" @@ -3238,6 +3262,9 @@ msgstr "" "niedynamicznych konfiguracji interfejsu, gdzie obsÅ‚ugiwane sÄ… tylko hosty z " "odpowiednim dzierżawami." +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "Status" @@ -3383,10 +3410,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3601,6 +3627,9 @@ msgstr "Synchronizacja czasu" msgid "Time Synchronization is not configured yet." msgstr "Synchronizacja czasu nie jest jeszcze skonfigurowana." +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "Strefa czasowa" @@ -3992,6 +4021,18 @@ msgstr "" "zaktualizuj go do wersji co najmniej 7 lub użyj innej przeglÄ…darki, takiej " "jak Firefox, Opera czy Safari." +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "dowolny" @@ -4111,6 +4152,9 @@ msgstr "" msgid "routed" msgstr "routowane" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "tryb serwera" @@ -4150,6 +4194,9 @@ msgstr "tak" msgid "« Back" msgstr "« Wróć" +#~ msgid "No chains in this table" +#~ msgstr "Brak Å‚aÅ„cuchów w tej tablicy" + #~ msgid "Configuration files will be kept." #~ msgstr "Pliki konfiguracyjne zostanÄ… zachowane." diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po index b77d32dfc1..42f9d505d8 100644 --- a/modules/luci-base/po/pt-br/base.po +++ b/modules/luci-base/po/pt-br/base.po @@ -439,12 +439,12 @@ msgstr "Configuração da antena" msgid "Any zone" msgstr "Qualquer zona" +msgid "Apply anyway" +msgstr "Aplicar sem verificação" + msgid "Apply request failed with status <code>%h</code>" msgstr "Pedido para aplicar falhou com o estado <code>%h</code>" -msgid "Apply unchecked" -msgstr "Aplicar sem verificação" - msgid "Architecture" msgstr "Arquitetura" @@ -744,6 +744,9 @@ msgstr "Coletando dados..." msgid "Command" msgstr "Comando" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "Configuração Comum" @@ -1007,6 +1010,9 @@ msgstr "Desabilita a configuração do DNS" msgid "Disable Encryption" msgstr "Desabilitar Cifragem" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "Desabilitar esta rede" @@ -1567,6 +1573,9 @@ msgstr "" "Ocultar <abbr title=\"Identificador de Conjunto de Serviços Estendidos" "\">ESSID</abbr>" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "Equipamento" @@ -2179,6 +2188,9 @@ msgstr "" "Taxa de Dados AtingÃvel Máxima (<abbr title=\"Maximum Attainable Data Rate" "\">ATTNDR</abbr>)" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "Número máximo permitido de alocações DHCP ativas" @@ -2355,9 +2367,6 @@ msgstr "Nenhum Servidor DHCP configurado para esta interface" msgid "No NAT-T" msgstr "Sem NAT-T" -msgid "No chains in this table" -msgstr "Nenhuma cadeira nesta tabela" - msgid "No files found" msgstr "Nenhum arquivo encontrado" @@ -2382,7 +2391,7 @@ msgstr "Nenhuma lista de pacotes disponÃvel" msgid "No password set!" msgstr "Nenhuma senha definida!" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "Sem regras nesta cadeia" msgid "No scan results available yet..." @@ -2437,6 +2446,9 @@ msgstr "Nslookup" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "Número de entradas DNS em cache (máximo é 10000, 0 desabilita o cache)" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "OK" @@ -2746,6 +2758,9 @@ msgstr "Pcts." msgid "Please enter your username and password." msgstr "Entre com o seu usuário e senha." +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "PolÃtica" @@ -3107,6 +3122,9 @@ msgstr "" "As rotas especificam através de qual interface e roteador um certo destino " "podem ser alcançado." +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "" "Execute a verificação do sistema de arquivos antes da montagem do dispositivo" @@ -3235,6 +3253,9 @@ msgstr "Preâmbulo curto" msgid "Show current backup file list" msgstr "Mostra a lista atual de arquivos para a cópia de segurança" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "Desligar esta interface" @@ -3256,6 +3277,9 @@ msgstr "Tamanho (.ipk)" msgid "Size of DNS query cache" msgstr "Tamanho do cache de consultas DNS" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "Pular" @@ -3375,6 +3399,9 @@ msgstr "" "configurações não dinâmicas onde um computador com a alocação correspondente " "é provido." +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "Estado" @@ -3524,10 +3551,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" "O dispositivo não foi alcançado em %d segundos depois de aplicar as " "configurações pendentes. Por questões de segurança, as configurações foram " @@ -3750,6 +3776,9 @@ msgstr "Sincronização de horário" msgid "Time Synchronization is not configured yet." msgstr "A sincronização do horário ainda não está configurada." +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "Fuso Horário" @@ -4151,6 +4180,18 @@ msgstr "" "Por favor, atualiza para, ao menos, a versão 7 ou use outro navegador como o " "Firefox, Opera ou Safari." +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "qualquer" @@ -4271,6 +4312,9 @@ msgstr "modo retransmissor" msgid "routed" msgstr "roteado" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "modo servidor" @@ -4310,6 +4354,9 @@ msgstr "sim" msgid "« Back" msgstr "« Voltar" +#~ msgid "No chains in this table" +#~ msgstr "Nenhuma cadeira nesta tabela" + #~ msgid "Configuration files will be kept." #~ msgstr "Os arquivos de configuração serão mantidos." diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po index 10c6846e47..394572c631 100644 --- a/modules/luci-base/po/pt/base.po +++ b/modules/luci-base/po/pt/base.po @@ -414,10 +414,10 @@ msgstr "Configuração das Antenas" msgid "Any zone" msgstr "Qualquer zona" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -700,6 +700,9 @@ msgstr "A obter dados..." msgid "Command" msgstr "Comando" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "Configuração comum" @@ -947,6 +950,9 @@ msgstr "Desativar configuração de DNS" msgid "Disable Encryption" msgstr "" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "" @@ -1474,6 +1480,9 @@ msgstr "" "Ocultar <abbr title=\"Identificador de Conjunto de Serviços Estendidos" "\">ESSID</abbr>" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "" @@ -2045,6 +2054,9 @@ msgstr "" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "Número máximo permitido de concessões DHCP ativas" @@ -2219,9 +2231,6 @@ msgstr "Sem Servidor DHCP configurado nesta interface" msgid "No NAT-T" msgstr "" -msgid "No chains in this table" -msgstr "Tabela sem chains" - msgid "No files found" msgstr "Não foram encontrados ficheiros" @@ -2246,7 +2255,7 @@ msgstr "Não há listas de pacotes disponiveis" msgid "No password set!" msgstr "Sem password definida!" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "Sem regras nesta cadeia" msgid "No scan results available yet..." @@ -2297,6 +2306,9 @@ msgstr "Nslookup" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "OK" @@ -2587,6 +2599,9 @@ msgstr "Pkts." msgid "Please enter your username and password." msgstr "Insira o seu username e password." +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "PolÃtica" @@ -2927,6 +2942,9 @@ msgstr "" "As rotas especificam através de que interfaces ou gateways podem ser " "alcançados determinadas redes ou hosts." +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "" "Correr uma verificação do sistema de ficheiros antes de montar um dispositivo" @@ -3044,6 +3062,9 @@ msgstr "" msgid "Show current backup file list" msgstr "Mostrar lista ficheiros para backup" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "Desligar esta interface" @@ -3065,6 +3086,9 @@ msgstr "" msgid "Size of DNS query cache" msgstr "" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "Saltar" @@ -3169,6 +3193,9 @@ msgid "" "configurations where only hosts with a corresponding lease are served." msgstr "" +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "Status" @@ -3307,10 +3334,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3511,6 +3537,9 @@ msgstr "Sincronização Horária" msgid "Time Synchronization is not configured yet." msgstr "A sincronização horária ainda não está configurada." +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "Fuso Horário" @@ -3889,6 +3918,18 @@ msgid "" "or Safari." msgstr "" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "qualquer" @@ -4008,6 +4049,9 @@ msgstr "" msgid "routed" msgstr "" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "" @@ -4047,6 +4091,9 @@ msgstr "sim" msgid "« Back" msgstr "« Voltar" +#~ msgid "No chains in this table" +#~ msgstr "Tabela sem chains" + #~ msgid "Configuration files will be kept." #~ msgstr "Os ficheiros de configuração serão mantidos." diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po index 3e8381d30b..e3bb7bb82a 100644 --- a/modules/luci-base/po/ro/base.po +++ b/modules/luci-base/po/ro/base.po @@ -400,10 +400,10 @@ msgstr "Configurarea Antenei" msgid "Any zone" msgstr "Orice Zona" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -676,6 +676,9 @@ msgstr "Colectez datele.." msgid "Command" msgstr "Comanda" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "Configurarea obisnuita" @@ -918,6 +921,9 @@ msgstr "Dezactiveaza configuratia DNS" msgid "Disable Encryption" msgstr "" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "" @@ -1423,6 +1429,9 @@ msgstr "" msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "Ascunde <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "" @@ -1978,6 +1987,9 @@ msgstr "" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "" @@ -2150,9 +2162,6 @@ msgstr "Nici un server DHCP configurat pentru aceasta interfata" msgid "No NAT-T" msgstr "" -msgid "No chains in this table" -msgstr "" - msgid "No files found" msgstr "Nici un fisier gasit" @@ -2177,7 +2186,7 @@ msgstr "" msgid "No password set!" msgstr "Nici o parola setata !" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "" msgid "No scan results available yet..." @@ -2228,6 +2237,9 @@ msgstr "" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "OK" @@ -2512,6 +2524,9 @@ msgstr "Packete." msgid "Please enter your username and password." msgstr "Introdu utilizatorul si parola." +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "" @@ -2848,6 +2863,9 @@ msgid "" "can be reached." msgstr "" +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "" @@ -2964,6 +2982,9 @@ msgstr "" msgid "Show current backup file list" msgstr "" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "Opreste aceasta interfata" @@ -2985,6 +3006,9 @@ msgstr "" msgid "Size of DNS query cache" msgstr "" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "" @@ -3089,6 +3113,9 @@ msgid "" "configurations where only hosts with a corresponding lease are served." msgstr "" +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "Status" @@ -3221,10 +3248,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3391,6 +3417,9 @@ msgstr "" msgid "Time Synchronization is not configured yet." msgstr "" +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "Fusul orar" @@ -3759,6 +3788,18 @@ msgid "" "or Safari." msgstr "" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "oricare" @@ -3875,6 +3916,9 @@ msgstr "" msgid "routed" msgstr "rutat" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "" diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index f62cd93a6b..d733a1a898 100644 --- a/modules/luci-base/po/ru/base.po +++ b/modules/luci-base/po/ru/base.po @@ -3,11 +3,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Project-Id-Version: LuCI: base\n" "POT-Creation-Date: 2010-05-09 01:01+0300\n" -"PO-Revision-Date: 2018-09-05 21:48+0300\n" +"PO-Revision-Date: 2018-10-25 19:04+0300\n" "Language-Team: http://cyber-place.ru\n" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Poedit 2.2\n" "Last-Translator: Anton Kikin <a.kikin@tano-systems.com>\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" @@ -104,7 +104,7 @@ msgid "" "order of the resolvfile" msgstr "" "<abbr title=\"СиÑтема доменных имен\">DNS</abbr> Ñервера будут опрошены в " -"порÑдке, определенном в resolvfile файле." +"порÑдке, определенном в resolvfile файле" msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "<abbr title=\"РаÑширенный идентификатор обÑлуживаниÑ\">ESSID</abbr>" @@ -222,10 +222,10 @@ msgid "Actions" msgstr "ДейÑтвиÑ" msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes" -msgstr "Active <abbr title=\"Интернет протокол верÑии 4\">IPv4</abbr>-маршруты" +msgstr "Ðктивные <abbr title=\"Интернет протокол верÑии 4\">IPv4</abbr>-маршруты" msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes" -msgstr "Active <abbr title=\"Интернет протокол верÑии 6\">IPv6</abbr>-маршруты" +msgstr "Ðктивные <abbr title=\"Интернет протокол верÑии 6\">IPv6</abbr>-маршруты" msgid "Active Connections" msgstr "Ðктивные ÑоединениÑ" @@ -244,10 +244,10 @@ msgstr "Добавить" msgid "Add local domain suffix to names served from hosts files" msgstr "" -"Добавить локальный ÑÑƒÑ„Ñ„Ð¸ÐºÑ Ð´Ð¾Ð¼ÐµÐ½Ð° Ð´Ð»Ñ Ð¸Ð¼ÐµÐ½ из файла хоÑтов (/etc/hosts)." +"Добавить локальный ÑÑƒÑ„Ñ„Ð¸ÐºÑ Ð´Ð¾Ð¼ÐµÐ½Ð° Ð´Ð»Ñ Ð¸Ð¼ÐµÐ½ из файла хоÑтов (/etc/hosts)" msgid "Add new interface..." -msgstr "Добавить новый интерфейÑ" +msgstr "Добавить новый интерфейÑ..." msgid "Additional Hosts files" msgstr "Дополнительный hosts файл" @@ -286,7 +286,7 @@ msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" msgstr "" -"ВыделÑÑ‚ÑŒ IP адреÑа поÑледовательно, начинать Ñ Ð¼ÐµÐ½ÑŒÑˆÐµÐ³Ð¾ доÑтупного адреÑа." +"ВыделÑÑ‚ÑŒ IP-адреÑа поÑледовательно, начинать Ñ Ð¼ÐµÐ½ÑŒÑˆÐµÐ³Ð¾ доÑтупного адреÑа" msgid "Allocate IP sequentially" msgstr "ВыделÑÑ‚ÑŒ IP-адреÑа поÑледовательно" @@ -294,7 +294,7 @@ msgstr "ВыделÑÑ‚ÑŒ IP-адреÑа поÑледовательно" msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication" msgstr "" "Разрешить <abbr title=\"Secure Shell\">SSH</abbr> аутентификацию Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ " -"паролÑ." +"паролÑ" msgid "Allow AP mode to disconnect STAs based on low ACK condition" msgstr "" @@ -316,20 +316,20 @@ msgstr "Разрешить локальный хоÑÑ‚" msgid "Allow remote hosts to connect to local SSH forwarded ports" msgstr "" "Разрешить удаленным хоÑтам подключатьÑÑ Ðº локальным перенаправленным портам " -"SSH." +"SSH" msgid "Allow root logins with password" msgstr "Root входит по паролю" msgid "Allow the <em>root</em> user to login with password" msgstr "" -"Разрешить пользователю <em>root</em> входить в ÑиÑтему Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ паролÑ." +"Разрешить пользователю <em>root</em> входить в ÑиÑтему Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ паролÑ" msgid "" "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services" msgstr "" "Разрешить ответы внешней Ñети в диапазоне 127.0.0.0/8, например, Ð´Ð»Ñ RBL-" -"ÑервиÑов." +"ÑервиÑов" msgid "Allowed IPs" msgstr "Разрешенные IP-адреÑа" @@ -421,20 +421,19 @@ msgstr "ÐаÑтройка антенн" msgid "Any zone" msgstr "Ð›ÑŽÐ±Ð°Ñ Ð·Ð¾Ð½Ð°" +msgid "Apply anyway" +msgstr "Применить без проверки" + msgid "Apply request failed with status <code>%h</code>" msgstr "Ошибка <code>%h</code> запроÑа на применение" -msgid "Apply unchecked" -msgstr "Применить без проверки" - msgid "Architecture" msgstr "Ðрхитектура" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" -"Задайте чаÑÑ‚ÑŒ данной длины, каждому публичному IPv6-префикÑу Ñтого " -"интерфейÑа." +"Задайте чаÑÑ‚ÑŒ данной длины, каждому публичному IPv6-префикÑу Ñтого интерфейÑа" msgid "Assign interfaces..." msgstr "Ðазначить интерфейÑÑ‹..." @@ -478,23 +477,23 @@ msgstr "ÐвтоматичеÑÐºÐ°Ñ Homenet (HNCP)" msgid "Automatically check filesystem for errors before mounting" msgstr "" "ÐвтоматичеÑÐºÐ°Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ° файловой ÑиÑтемы раздела на ошибки, перед " -"монтированием." +"монтированием" msgid "Automatically mount filesystems on hotplug" msgstr "" -"ÐвтоматичеÑкое монтирование раздела, при подключении к ÑиÑтеме во Ð²Ñ€ÐµÐ¼Ñ ÐµÐµ " -"работы, без Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð¸Ñ‚Ð°Ð½Ð¸Ñ Ð¸ оÑтановки ÑиÑтемы (hotplug)." +"ÐвтоматичеÑкое монтирование раздела, при подключении к ÑиÑтеме во Ð²Ñ€ÐµÐ¼Ñ ÐµÑ‘ " +"работы, без Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð¸Ñ‚Ð°Ð½Ð¸Ñ Ð¸ оÑтановки ÑиÑтемы (hotplug)" msgid "Automatically mount swap on hotplug" msgstr "" -"ÐвтоматичеÑкое монтирование swap-а при подключении к ÑиÑтеме во Ð²Ñ€ÐµÐ¼Ñ ÐµÐµ " -"работы без Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð¸Ñ‚Ð°Ð½Ð¸Ñ Ð¸ оÑтановки ÑиÑтемы (hotplug)." +"ÐвтоматичеÑкое монтирование раздела подкачки при подключении к ÑиÑтеме во Ð²Ñ€ÐµÐ¼Ñ " +"её работы без Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð¸Ñ‚Ð°Ð½Ð¸Ñ Ð¸ оÑтановки ÑиÑтемы (hotplug)" msgid "Automount Filesystem" msgstr "Hotplug раздела" msgid "Automount Swap" -msgstr "Hotplug swap раздела" +msgstr "Hotplug раздела подкачки" msgid "Available" msgstr "ДоÑтупно" @@ -639,7 +638,7 @@ msgid "Changes have been reverted." msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¸ возвращены назад." msgid "Changes the administrator password for accessing the device" -msgstr "Изменить пароль админиÑтратора Ð´Ð»Ñ Ð´Ð¾Ñтупа к уÑтройÑтву." +msgstr "Изменить пароль админиÑтратора Ð´Ð»Ñ Ð´Ð¾Ñтупа к уÑтройÑтву" msgid "Channel" msgstr "Канал" @@ -666,7 +665,7 @@ msgid "Checksum" msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð°Ñ Ñумма" msgid "Choose mtdblock" -msgstr "" +msgstr "Выберите MTD раздел" msgid "" "Choose the firewall zone you want to assign to this interface. Select " @@ -704,6 +703,8 @@ msgid "" "Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS " "FEATURE IS FOR PROFESSIONALS! )" msgstr "" +"Ðажмите \"Сохранить MTD раздел\" Ð´Ð»Ñ ÑÐºÐ°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¾Ð±Ñ€Ð°Ð·Ð° указанного MTD " +"раздела (Ð’ÐИМÐÐИЕ: ДÐÐÐЫЙ ФУÐКЦИОÐÐЛ ТОЛЬКО ДЛЯ ОПЫТÐЫХ ПОЛЬЗОВÐТЕЛЕЙ)" msgid "Client" msgstr "Клиент" @@ -716,7 +717,7 @@ msgid "" "persist connection" msgstr "" "Завершать неактивное Ñоединение поÑле заданного интервала (Ñек.), " -"иÑпользуйте значение 0 Ð´Ð»Ñ ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ Ð½ÐµÐ°ÐºÑ‚Ð¸Ð²Ð½Ð¾Ð³Ð¾ ÑоединениÑ." +"иÑпользуйте значение 0 Ð´Ð»Ñ ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ Ð½ÐµÐ°ÐºÑ‚Ð¸Ð²Ð½Ð¾Ð³Ð¾ ÑоединениÑ" msgid "Close list..." msgstr "Закрыть ÑпиÑок..." @@ -727,6 +728,9 @@ msgstr "Сбор данных..." msgid "Command" msgstr "Команда" +msgid "Comment" +msgstr "Комментарий" + msgid "Common Configuration" msgstr "Общие наÑтройки" @@ -808,7 +812,7 @@ msgid "Critical" msgstr "КритичеÑÐºÐ°Ñ ÑитуациÑ" msgid "Cron Log Level" -msgstr "ЗапиÑÑŒ Ñобытий Cron" +msgstr "ЗапиÑÑŒ Ñобытий cron" msgid "Custom Interface" msgstr "ПользовательÑкий интерфейÑ" @@ -910,7 +914,7 @@ msgid "Default gateway" msgstr "Шлюз по умолчанию" msgid "Default is stateless + stateful" -msgstr "Значение по умолчанию — 'stateless + stateful'." +msgstr "Значение по умолчанию — 'stateless + stateful'" msgid "Default state" msgstr "Ðачальное ÑоÑтоÑние" @@ -955,7 +959,7 @@ msgid "Device is rebooting..." msgstr "Перезагрузка..." msgid "Device unreachable!" -msgstr "УÑтройÑтво недоÑтупно" +msgstr "УÑтройÑтво недоÑтупно!" msgid "Device unreachable! Still waiting for device..." msgstr "УÑтройÑтво недоÑтупно! Ожидание уÑтройÑтва..." @@ -985,6 +989,9 @@ msgstr "Отключить DNS наÑтройки" msgid "Disable Encryption" msgstr "Отключить шифрование" +msgid "Disable Inactivity Polling" +msgstr "Отключить отÑлеживание неактивноÑти клиентов" + msgid "Disable this network" msgstr "Отключить данную Ñеть" @@ -998,7 +1005,7 @@ msgid "Disassociate On Low Acknowledgement" msgstr "Ðе аÑÑоциировать при низком подтверждении" msgid "Discard upstream RFC1918 responses" -msgstr "ОтбраÑывать ответы внешней Ñети RFC1918." +msgstr "ОтбраÑывать ответы внешней Ñети RFC1918" msgid "Disconnection attempt failed" msgstr "Ошибка попытки отключениÑ" @@ -1033,15 +1040,15 @@ msgstr "" "\">NAT</abbr>" msgid "Do not cache negative replies, e.g. for not existing domains" -msgstr "Ðе кешировать отрицательные ответы, в Ñ‚.ч. Ð´Ð»Ñ Ð½ÐµÑущеÑтвующих доменов." +msgstr "Ðе кешировать отрицательные ответы, в Ñ‚.ч. Ð´Ð»Ñ Ð½ÐµÑущеÑтвующих доменов" msgid "Do not forward requests that cannot be answered by public name servers" msgstr "" "Ðе перенаправлÑÑ‚ÑŒ запроÑÑ‹, которые не могут быть обработаны публичными DNS-" -"Ñерверами." +"Ñерверами" msgid "Do not forward reverse lookups for local networks" -msgstr "Ðе перенаправлÑÑ‚ÑŒ обратные DNS-запроÑÑ‹ Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ñ… Ñетей." +msgstr "Ðе перенаправлÑÑ‚ÑŒ обратные DNS-запроÑÑ‹ Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ñ… Ñетей" msgid "Domain required" msgstr "ТребуетÑÑ Ð´Ð¾Ð¼ÐµÐ½" @@ -1057,7 +1064,7 @@ msgid "" "<abbr title=\"Domain Name System\">DNS</abbr>-Name" msgstr "" "Ðе перенаправлÑÑ‚ÑŒ <abbr title=\"Служба доменных имён\">DNS</abbr>-запроÑÑ‹ " -"без <abbr title=\"Служба доменных имён\">DNS</abbr>-имени." +"без <abbr title=\"Служба доменных имён\">DNS</abbr>-имени" msgid "Down" msgstr "Вниз" @@ -1069,7 +1076,7 @@ msgid "Download backup" msgstr "Загрузить резервную копию" msgid "Download mtdblock" -msgstr "" +msgstr "Скачать MTD раздел" msgid "Downstream SNR offset" msgstr "SNR offset внутренней Ñети" @@ -1082,7 +1089,7 @@ msgid "" "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server" msgstr "" "Dropbear — Ñто <abbr title=\"Secure Shell\">SSH</abbr>-Ñервер Ñо вÑтроенным " -"<abbr title=\"Secure Copy\">SCP</abbr>." +"<abbr title=\"Secure Copy\">SCP</abbr>" msgid "Dual-Stack Lite (RFC6333)" msgstr "Dual-Stack Lite (RFC6333)" @@ -1207,7 +1214,7 @@ msgstr "" "домену мобильноÑти" msgid "Enables the Spanning Tree Protocol on this bridge" -msgstr "Включает Spanning Tree Protocol на Ñтом моÑту." +msgstr "Включает Spanning Tree Protocol на Ñтом моÑту" msgid "Encapsulation mode" msgstr "Режим инкапÑулÑции" @@ -1316,9 +1323,9 @@ msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" msgstr "" -"Ðайти вÑе разделы Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ swap и изменить config файл fstab Ñ Ð´ÐµÑ„Ð¾Ð»Ñ‚Ð½Ñ‹Ð¼Ð¸ " -"значениÑми вÑех обнаруженных разделов, Ñ‚.е. выполнить команду 'block detect " -"> /etc/config/fstab'." +"Ðайти вÑе разделы (Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ swap) и запиÑать в конфигурационный файл " +"информацию об обнаруженных разделах, Ñ‚.е. выполнить команду 'block detect > /" +"etc/config/fstab'" msgid "Find and join network" msgstr "Ðайти и приÑоединитьÑÑ Ðº Ñети" @@ -1348,7 +1355,7 @@ msgid "Firmware Version" msgstr "ВерÑÐ¸Ñ Ð¿Ñ€Ð¾ÑˆÐ¸Ð²ÐºÐ¸" msgid "Fixed source port for outbound DNS queries" -msgstr "ФикÑированный порт Ð´Ð»Ñ Ð¸ÑходÑщих DNS-запроÑов." +msgstr "ФикÑированный порт Ð´Ð»Ñ Ð¸ÑходÑщих DNS-запроÑов" msgid "Flash Firmware" msgstr "УÑтановить прошивку" @@ -1451,7 +1458,7 @@ msgid "General Setup" msgstr "ОÑновные наÑтройки" msgid "General options for opkg" -msgstr "ОÑновные наÑтройки opkg." +msgstr "ОÑновные наÑтройки opkg" msgid "Generate Config" msgstr "Создать config" @@ -1505,7 +1512,7 @@ msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." msgstr "" -"Ðа Ñтранице вы можете наÑтроить оÑновные параметры вашего уÑтройÑтва, такие " +"ЗдеÑÑŒ вы можете наÑтроить оÑновные параметры вашего уÑтройÑтва, такие " "как Ð¸Ð¼Ñ Ñ…Ð¾Ñта или чаÑовой поÑÑ." msgid "" @@ -1518,6 +1525,9 @@ msgstr "" msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "Скрыть <abbr title=\"РаÑширенный идентификатор Ñети\">ESSID</abbr>" +msgid "Hide empty chains" +msgstr "Скрыть пуÑтые цепочки" + msgid "Host" msgstr "ХоÑÑ‚" @@ -1615,10 +1625,10 @@ msgid "IPv6 Firewall" msgstr "МежÑетевой Ñкран IPv6" msgid "IPv6 Neighbours" -msgstr "IPv6 Neighbours" +msgstr "IPv6 ÑоÑеди (neighbours)" msgid "IPv6 Settings" -msgstr "IPv6 ÐаÑтройки" +msgstr "ÐаÑтройки IPv6" msgid "IPv6 ULA-Prefix" msgstr "IPv6 ULA-Prefix" @@ -1681,20 +1691,20 @@ msgid "" "If specified, mount the device by its UUID instead of a fixed device node" msgstr "" "ЕÑли выбрано, монтировать уÑтройÑтво иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ ÐµÐ³Ð¾ UUID, а не фикÑированный " -"файл уÑтройÑтва." +"файл уÑтройÑтва" msgid "" "If specified, mount the device by the partition label instead of a fixed " "device node" msgstr "" "ЕÑли выбрано, монтировать уÑтройÑтво иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ его раздела, а не " -"фикÑированный файл уÑтройÑтва." +"фикÑированный файл уÑтройÑтва" msgid "If unchecked, no default route is configured" -msgstr "ЕÑли не выбрано, то маршрут по умолчанию не наÑтраиваетÑÑ." +msgstr "ЕÑли не выбрано, то маршрут по умолчанию не наÑтраиваетÑÑ" msgid "If unchecked, the advertised DNS server addresses are ignored" -msgstr "ЕÑли не выбрано, то извещаемые адреÑа DNS Ñерверов игнорируютÑÑ." +msgstr "ЕÑли не выбрано, то извещаемые адреÑа DNS Ñерверов игнорируютÑÑ" msgid "" "If your physical memory is insufficient unused data can be temporarily " @@ -1755,7 +1765,7 @@ msgid "Install" msgstr "УÑтановить" msgid "Install iputils-traceroute6 for IPv6 traceroute" -msgstr "Ð”Ð»Ñ IPv6, уÑтановите пакет iputils-traceroute6." +msgstr "Ð”Ð»Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ IPv6, уÑтановите пакет iputils-traceroute6" msgid "Install package %q" msgstr "УÑтановить пакет %q" @@ -1893,7 +1903,7 @@ msgid "Leasetime remaining" msgstr "ОÑтавшееÑÑ Ð²Ñ€ÐµÐ¼Ñ Ð°Ñ€ÐµÐ½Ð´Ñ‹" msgid "Leave empty to autodetect" -msgstr "ОÑтавьте поле пуÑтым Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ." +msgstr "ОÑтавьте поле пуÑтым Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ" msgid "Leave empty to use the current WAN address" msgstr "ОÑтавьте пуÑтым Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ адреÑа WAN" @@ -1930,7 +1940,7 @@ msgid "" "requests to" msgstr "" "СпиÑок <abbr title=\"Domain Name System\">DNS</abbr>-Ñерверов Ð´Ð»Ñ " -"Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñов." +"Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñов" msgid "" "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" @@ -1959,13 +1969,13 @@ msgstr "" "R1KHs в MD, которые могут запроÑить PMK-R1 ключи." msgid "List of SSH key files for auth" -msgstr "СпиÑок файлов ключей SSH Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ð¸." +msgstr "СпиÑок файлов ключей SSH Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ð¸" msgid "List of domains to allow RFC1918 responses for" -msgstr "СпиÑок доменов, Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… разрешены ответы RFC1918." +msgstr "СпиÑок доменов, Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… разрешены ответы RFC1918" msgid "List of hosts that supply bogus NX domain results" -msgstr "СпиÑок хоÑтов, поÑтавлÑющих поддельные результаты домена NX." +msgstr "СпиÑок хоÑтов, поÑтавлÑющих поддельные результаты домена NX" msgid "Listen Interfaces" msgstr "Ð˜Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñщих Ñоединений" @@ -1975,11 +1985,11 @@ msgstr "Порт Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñщих Ñоединений" msgid "Listen only on the given interface or, if unspecified, on all" msgstr "" -"Ðтот Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚ Ñ Ð²Ñ…Ð¾Ð´Ñщими ÑоединениÑми или еÑли Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð½Ðµ " -"задан, значит вÑе интерфейÑÑ‹." +"Принимать Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ на указанном интерфейÑе или, еÑли Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð½Ðµ " +"задан, на вÑех интерфейÑах" msgid "Listening port for inbound DNS queries" -msgstr "Порт Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñщих DNS-запроÑов." +msgstr "Порт Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñщих DNS-запроÑов" msgid "Load" msgstr "Загрузка" @@ -2020,12 +2030,12 @@ msgid "" msgstr "" "СоглаÑно требованиÑм, имена ÑоответÑтвующие Ñтому домену, никогда не " "передаютÑÑ. И разрешаютÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ из файла DHCP (/etc/config/dhcp) или файла " -"хоÑтов (/etc/hosts)." +"хоÑтов (/etc/hosts)" msgid "Local domain suffix appended to DHCP names and hosts file entries" msgstr "" "Ð¡ÑƒÑ„Ñ„Ð¸ÐºÑ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ домена, который будет добавлен к DHCP-именам и запиÑи " -"файла хоÑтов (/etc/hosts)." +"файла хоÑтов (/etc/hosts)" msgid "Local server" msgstr "Локальный Ñервер" @@ -2035,7 +2045,7 @@ msgid "" "available" msgstr "" "Локализировать Ð¸Ð¼Ñ Ñ…Ð¾Ñта в завиÑимоÑти от запрашиваемой подÑети, еÑли " -"доÑтупно неÑколько IP-адреÑов." +"доÑтупно неÑколько IP-адреÑов" msgid "Localise queries" msgstr "Локализовывать запроÑÑ‹" @@ -2110,14 +2120,17 @@ msgstr "Вручную" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "Max. Attainable Data Rate (ATTNDR)" +msgid "Maximum allowed Listen Interval" +msgstr "МакÑимально разрешенное значение интервала проÑÐ»ÑƒÑˆÐ¸Ð²Ð°Ð½Ð¸Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð°" + msgid "Maximum allowed number of active DHCP leases" -msgstr "МакÑимальное количеÑтво активных арендованных DHCP-адреÑов." +msgstr "МакÑимальное количеÑтво активных арендованных DHCP-адреÑов" msgid "Maximum allowed number of concurrent DNS queries" -msgstr "МакÑимально допуÑтимое количеÑтво одновременных DNS-запроÑов." +msgstr "МакÑимально допуÑтимое количеÑтво одновременных DNS-запроÑов" msgid "Maximum allowed size of EDNS.0 UDP packets" -msgstr "МакÑимально допуÑтимый размер UDP пакетов-EDNS.0." +msgstr "МакÑимально допуÑтимый размер UDP пакетов EDNS.0" msgid "Maximum amount of seconds to wait for the modem to become ready" msgstr "МакÑимальное Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð³Ð¾Ñ‚Ð¾Ð²Ð½Ð¾Ñти модема (Ñекунды)" @@ -2130,7 +2143,7 @@ msgstr "" "автоматичеÑкого протокола/моÑта (br-, 6in4-, pppoe- etc.)" msgid "Maximum number of leased addresses." -msgstr "МакÑимальное количеÑтво арендованных адреÑов." +msgstr "МакÑимальное количеÑтво арендованных адреÑов" msgid "Mbit/s" msgstr "Мбит/Ñ" @@ -2190,20 +2203,20 @@ msgid "Mount Points" msgstr "Монтирование разделов" msgid "Mount Points - Mount Entry" -msgstr "Точки Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ â€” ÐаÑтройка разделов" +msgstr "Точки Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ â€” ÐаÑтройка раздела" msgid "Mount Points - Swap Entry" -msgstr "Точки Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ â€” ÐаÑтройка Swap" +msgstr "Точки Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ â€” ÐаÑтройка раздела подкачки" msgid "" "Mount Points define at which point a memory device will be attached to the " "filesystem" msgstr "" "Точки Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÑÑŽÑ‚, куда в файловой ÑиÑтеме будут Ñмонтированы " -"разделы запоминающего уÑтройÑтва." +"разделы запоминающего уÑтройÑтва" msgid "Mount filesystems not specifically configured" -msgstr "Монтирование не подготовленного раздела." +msgstr "Монтирование неÑконфигурированного раздела" msgid "Mount options" msgstr "Опции монтированиÑ" @@ -2212,7 +2225,7 @@ msgid "Mount point" msgstr "Точка монтированиÑ" msgid "Mount swap not specifically configured" -msgstr "Монтирование не подготовленного swap-а." +msgstr "Монтирование неÑконфигурированного раздела подкачки" msgid "Mounted file systems" msgstr "Смонтированные разделы" @@ -2286,9 +2299,6 @@ msgstr "DHCP-Ñервер не наÑтроен Ð´Ð»Ñ Ñтого интерфе msgid "No NAT-T" msgstr "Без NAT-T" -msgid "No chains in this table" -msgstr "Ðет цепочек в Ñтой таблице" - msgid "No files found" msgstr "Файлы не найдены" @@ -2313,7 +2323,7 @@ msgstr "СпиÑок пакетов не доÑтупен" msgid "No password set!" msgstr "Пароль не уÑтановлен!" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "Ðет правил в данной цепочке" msgid "No scan results available yet..." @@ -2366,6 +2376,9 @@ msgstr "" "КоличеÑтво кÑшированных DNS запиÑей (макÑимум — 10000, 0 — отключить " "кÑширование)" +msgid "Number of parallel threads used for compression" +msgstr "КоличеÑтво параллельных потоков иÑпользуемых Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¿Ñ€ÐµÑÑии" + msgid "OK" msgstr "OK" @@ -2516,7 +2529,7 @@ msgid "Override TTL" msgstr "Отвергать TTL" msgid "Override default interface name" -msgstr "Ðазначить Ð¸Ð¼Ñ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñа по дефолту." +msgstr "Ðазначить Ð¸Ð¼Ñ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñа по умолчанию" msgid "Override the gateway in DHCP responses" msgstr "Ðазначить шлюз в ответах DHCP" @@ -2672,6 +2685,9 @@ msgstr "Пакетов" msgid "Please enter your username and password." msgstr "Введите логин и пароль." +msgid "Please update package lists first" +msgstr "ПожалуйÑта обновите ÑпиÑок пакетов" + msgid "Policy" msgstr "Политика" @@ -2704,13 +2720,13 @@ msgid "" "ignore failures" msgstr "" "Предполагать, что узел недоÑтупен поÑле указанного количеÑтва ошибок " -"Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ñхо-пакета LCP, введите '0' Ð´Ð»Ñ Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾ÑˆÐ¸Ð±Ð¾Ðº." +"Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ñхо-пакета LCP, введите '0' Ð´Ð»Ñ Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾ÑˆÐ¸Ð±Ð¾Ðº" msgid "Prevent listening on these interfaces." msgstr "Запретить проÑлушивание Ñтих интерфейÑов." msgid "Prevents client-to-client communication" -msgstr "Ðе позволÑет клиентам обмениватьÑÑ Ð´Ñ€ÑƒÐ³ Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð¼ информацией." +msgstr "Ðе позволÑет клиентам обмениватьÑÑ Ð´Ñ€ÑƒÐ³ Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð¼ информацией" msgid "Private Key" msgstr "Приватный ключ" @@ -2815,7 +2831,7 @@ msgid "" "Configuration Protocol\">DHCP</abbr>-Server" msgstr "" "Читать <code>/etc/ethers</code> Ð´Ð»Ñ Ð½Ð°Ñтройки <abbr title=\"Протокол " -"динамичеÑкой наÑтройки узла\">DHCP</abbr>-Ñервера." +"динамичеÑкой наÑтройки узла\">DHCP</abbr>-Ñервера" msgid "" "Really delete this interface? The deletion cannot be undone! You might lose " @@ -2823,7 +2839,7 @@ msgid "" msgstr "" "ДейÑтвительно удалить Ñтот интерфейÑ? Удаление не может быть отменено! Ð’Ñ‹ " "можете потерÑÑ‚ÑŒ доÑтуп к Ñтому уÑтройÑтву, еÑли вы подключены через данный " -"интерфейÑ." +"интерфейÑ" msgid "" "Really delete this wireless network? The deletion cannot be undone! You " @@ -2868,7 +2884,7 @@ msgstr "Перезагрузка..." msgid "Reboots the operating system of your device" msgstr "" -"ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð½Ð°Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° вашего уÑтройÑтва, Ñ‚.е. выполнить команду 'reboot'." +"ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð½Ð°Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° вашего уÑтройÑтва, Ñ‚.е. выполнить команду 'reboot'" msgid "Receive" msgstr "Приём" @@ -2926,7 +2942,7 @@ msgstr "Требовать" msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3" msgstr "" -"ТребуетÑÑ Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… Интернет провайдеров, например глава Ñ DOCSIS 3." +"ТребуетÑÑ Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… Интернет провайдеров, например иÑпользующих DOCSIS 3" msgid "Required. Base64-encoded private key for this interface." msgstr "Требовать Приватный ключ в кодировке Base64 Ð´Ð»Ñ Ñтого интерфейÑа." @@ -2955,7 +2971,7 @@ msgid "" "come from unsigned domains" msgstr "" "ТребуетÑÑ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ° внешней Ñетью DNSSEC; убедитеÑÑŒ, что ответы " -"неподпиÑанного домена — дейÑтвительно поÑтупают от неподпиÑанных доменов." +"неподпиÑанного домена дейÑтвительно поÑтупают от неподпиÑанных доменов" msgid "Reset" msgstr "СброÑить" @@ -3033,8 +3049,11 @@ msgstr "" "ÐœÐ°Ñ€ÑˆÑ€ÑƒÑ‚Ð¸Ð·Ð°Ñ†Ð¸Ñ Ñлужит Ð´Ð»Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ñ‡ÐµÑ€ÐµÐ·, какой Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð¸ шлюз можно " "доÑтичь определенного хоÑта или Ñети." +msgid "Rule" +msgstr "Правило" + msgid "Run a filesystem check before mounting the device" -msgstr "ПроверÑÑ‚ÑŒ файловую ÑиÑтему перед монтированием раздела." +msgstr "ПроверÑÑ‚ÑŒ файловую ÑиÑтему перед монтированием раздела" msgid "Run filesystem check" msgstr "Проверить" @@ -3070,10 +3089,10 @@ msgid "Save & Apply" msgstr "Сохранить и применить" msgid "Save mtdblock" -msgstr "" +msgstr "Сохранить MTD раздел" msgid "Save mtdblock contents" -msgstr "" +msgstr "Сохранить Ñодержимое MTD раздела" msgid "Scan" msgstr "ПоиÑк" @@ -3091,7 +3110,7 @@ msgid "Section removed" msgstr "Строки удалены" msgid "See \"mount\" manpage for details" -msgstr "Ð”Ð»Ñ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¾Ð¹ информации обратитеÑÑŒ к Ñправке по 'mount' (man mount)." +msgstr "Ð”Ð»Ñ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¾Ð¹ информации обратитеÑÑŒ к Ñправке по 'mount' (man mount)" msgid "" "Select 'Force upgrade' to flash the image even if the image format check " @@ -3107,7 +3126,7 @@ msgid "" "conjunction with failure threshold" msgstr "" "ОтправлÑÑ‚ÑŒ Ñхо-пакеты LCP Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¼ интервалом (Ñекунды), Ñффективно " -"только в Ñочетании Ñ Ð¿Ð¾Ñ€Ð¾Ð³Ð¾Ð¼ ошибок." +"только в Ñочетании Ñ Ð¿Ð¾Ñ€Ð¾Ð³Ð¾Ð¼ ошибок" msgid "Separate Clients" msgstr "РазделÑÑ‚ÑŒ клиентов" @@ -3154,6 +3173,9 @@ msgstr "ÐšÐ¾Ñ€Ð¾Ñ‚ÐºÐ°Ñ Ð¿Ñ€ÐµÐ°Ð¼Ð±ÑƒÐ»Ð°" msgid "Show current backup file list" msgstr "Показать текущий ÑпиÑок файлов резервной копии" +msgid "Show empty chains" +msgstr "Показать пуÑтые цепочки" + msgid "Shutdown this interface" msgstr "Выключить Ñтот интерфейÑ" @@ -3175,6 +3197,9 @@ msgstr "Размер (.ipk)" msgid "Size of DNS query cache" msgstr "Размер кÑша DNS запроÑа" +msgid "Size of the ZRam device in megabytes" +msgstr "Размер ZRam в мегабайтах" + msgid "Skip" msgstr "ПропуÑтить" @@ -3215,23 +3240,23 @@ msgid "Source" msgstr "ИÑточник" msgid "Specifies the directory the device is attached to" -msgstr "Папка, к которой монтируетÑÑ Ñ€Ð°Ð·Ð´ÐµÐ» уÑтройÑтва." +msgstr "Папка, к которой монтируетÑÑ Ñ€Ð°Ð·Ð´ÐµÐ» уÑтройÑтва" msgid "Specifies the listening port of this <em>Dropbear</em> instance" -msgstr "Порт данного процеÑÑа <em>Dropbear</em>." +msgstr "Порт данного процеÑÑа <em>Dropbear</em>" msgid "" "Specifies the maximum amount of failed ARP requests until hosts are presumed " "to be dead" msgstr "" "МакÑимальное количеÑтво неудачных запроÑов ARP, поÑле которого узлы " -"ÑчитаютÑÑ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ‹Ð¼Ð¸." +"ÑчитаютÑÑ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ‹Ð¼Ð¸" msgid "" "Specifies the maximum amount of seconds after which hosts are presumed to be " "dead" msgstr "" -"МакÑимальное количеÑтво Ñекунд, поÑле которого узлы ÑчитаютÑÑ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ñ‹Ð¼Ð¸." +"МакÑимальное количеÑтво Ñекунд, поÑле которого узлы ÑчитаютÑÑ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ñ‹Ð¼Ð¸" msgid "Specify a TOS (Type of Service)." msgstr "Укажите TOS (Тип обÑлуживаниÑ)." @@ -3292,6 +3317,9 @@ msgstr "" "имён DHCP-клиентам. ПоÑтоÑÐ½Ð½Ð°Ñ Ð°Ñ€ÐµÐ½Ð´Ð° также необходима Ð´Ð»Ñ ÑтатичеÑких " "интерфейÑов, в которых обÑлуживаютÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ клиенты Ñ Ð¿Ñ€Ð¸Ñвоенными адреÑами." +msgid "Station inactivity limit" +msgstr "МакÑимально допуÑтимое Ð²Ñ€ÐµÐ¼Ñ Ð±ÐµÐ·Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð°" + msgid "Status" msgstr "СоÑтоÑние" @@ -3308,10 +3336,10 @@ msgid "Suppress logging" msgstr "Подавить логирование" msgid "Suppress logging of the routine operation of these protocols" -msgstr "Подавить логирование Ñтандартной работы Ñтих протоколов." +msgstr "Подавить логирование Ñтандартной работы Ñтих протоколов" msgid "Swap" -msgstr "Раздел подкачки (Swap)" +msgstr "Раздел подкачки (swap)" msgid "Swap Entry" msgstr "ÐаÑтройка config файла fstab (/etc/config/fstab)" @@ -3438,10 +3466,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" "УÑтройÑтво недоÑтупно в течение %d Ñекунд поÑле Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹. Ðто " "привело к откату конфигурации из Ñоображений безопаÑноÑти. ЕÑли вы Ñчитаете, " @@ -3475,13 +3502,13 @@ msgstr "" "начать процедуру Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾ÑˆÐ¸Ð²ÐºÐ¸." msgid "The following changes have been reverted" -msgstr "Ваши наÑтройки были отвергнуты." +msgstr "Следующие наÑтройки были отвергнуты" msgid "The following rules are currently active on this system." msgstr "Ðа данном уÑтройÑтве активны Ñледующие правила." msgid "The given network name is not unique" -msgstr "Заданное Ð¸Ð¼Ñ Ñети не ÑвлÑетÑÑ ÑƒÐ½Ð¸ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¼." +msgstr "Заданное Ð¸Ð¼Ñ Ñети не ÑвлÑетÑÑ ÑƒÐ½Ð¸ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¼" msgid "" "The hardware is not multi-SSID capable and the existing configuration will " @@ -3537,8 +3564,8 @@ msgid "" msgstr "" "Ð¡ÐµÐ¹Ñ‡Ð°Ñ ÑиÑтема перепрошиваетÑÑ.<br /> ÐЕ ОТКЛЮЧÐЙТЕ ПИТÐÐИЕ УСТРОЙСТВÐ!<br /" "> Подождите неÑколько минут, прежде чем попытатьÑÑ ÑоединитьÑÑ. Возможно, " -"потребуетÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð°Ð´Ñ€ÐµÑ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð°, чтобы Ñнова подключитьÑÑ Ðº уÑтройÑтву, " -"в завиÑимоÑти от наÑтроек." +"потребуетÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð°Ð´Ñ€ÐµÑ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð°, чтобы Ñнова подключитьÑÑ Ðº " +"уÑтройÑтву, в завиÑимоÑти от наÑтроек." msgid "" "The uploaded image file does not contain a supported format. Make sure that " @@ -3564,7 +3591,7 @@ msgid "" "\"Physical Settings\" tab" msgstr "" "УÑтройÑтво не назначено. Ðазначьте Ñетевое уÑтройÑтво на Ñтранице 'ÐаÑтройки " -"канала'." +"канала'" msgid "" "There is no password set on this router. Please configure a root password to " @@ -3600,7 +3627,7 @@ msgid "" "password if no update key has been configured" msgstr "" "Ðто либо \"Update Key\", наÑтроенный Ð´Ð»Ñ Ñ‚ÑƒÐ½Ð½ÐµÐ»Ñ, либо пароль учетной " -"запиÑи, еÑли ключ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ðµ был наÑтроен." +"запиÑи, еÑли ключ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ðµ был наÑтроен" msgid "" "This is the content of /etc/rc.local. Insert your own commands here (in " @@ -3614,22 +3641,22 @@ msgid "" "ends with <code>...:2/64</code>" msgstr "" "Ðто локальный адреÑ, назначенный туннельным брокером, обычно заканчиваетÑÑ " -"на <code>...:2/64</code>." +"на <code>...:2/64</code>" msgid "" "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</" "abbr> in the local network" msgstr "" "Ðто единÑтвенный <abbr title=\"Протокол динамичеÑкой наÑтройки узла\">DHCP</" -"abbr>-Ñервер в локальной Ñети." +"abbr>-Ñервер в локальной Ñети" msgid "This is the plain username for logging into the account" -msgstr "Ðто проÑто Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð° в учетную запиÑÑŒ." +msgstr "Ðто проÑто Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð° в учетную запиÑÑŒ" msgid "" "This is the prefix routed to you by the tunnel broker for use by clients" msgstr "" -"Ðто префикÑ, направлен вам брокером туннелей Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð°Ð¼Ð¸." +"Ðто префикÑ, направлен вам брокером туннелей Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð°Ð¼Ð¸" msgid "This is the system crontab in which scheduled tasks can be defined." msgstr "" @@ -3638,7 +3665,7 @@ msgstr "" msgid "" "This is usually the address of the nearest PoP operated by the tunnel broker" -msgstr "Ðто Ð°Ð´Ñ€ÐµÑ Ð±Ð»Ð¸Ð¶Ð°Ð¹ÑˆÐµÐ¹ точки приÑутÑÑ‚Ð²Ð¸Ñ Ñ‚ÑƒÐ½Ð½ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ брокера." +msgstr "Ðто Ð°Ð´Ñ€ÐµÑ Ð±Ð»Ð¸Ð¶Ð°Ð¹ÑˆÐµÐ¹ точки приÑутÑÑ‚Ð²Ð¸Ñ Ñ‚ÑƒÐ½Ð½ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ брокера" msgid "" "This list gives an overview over currently running system processes and " @@ -3658,6 +3685,9 @@ msgstr "Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸" msgid "Time Synchronization is not configured yet." msgstr "Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸ ещё не наÑтроена." +msgid "Time interval for rekeying GTK" +msgstr "Интервал регенерации ключей GTK" + msgid "Timezone" msgstr "ЧаÑовой поÑÑ" @@ -3969,7 +3999,7 @@ msgid "Waiting for command to complete..." msgstr "Ожидание Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹..." msgid "Waiting for configuration to be applied… %ds" -msgstr "Ожидание Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸... %d Ñек." +msgstr "Ожидание Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸... %d Ñек" msgid "Waiting for device..." msgstr "Ожидание Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ ÑƒÑтройÑтва..." @@ -3985,7 +4015,9 @@ msgstr "" msgid "" "When using a PSK, the PMK can be generated locally without inter AP " "communications" -msgstr "При иÑпользовании PSK, PMK может быть Ñоздан локально, без AP в ÑвÑзи." +msgstr "" +"При иÑпользовании PSK, PMK может быть Ñоздан локально без коммуникации " +"AP между Ñобой" msgid "Width" msgstr "Ширина" @@ -4024,7 +4056,7 @@ msgid "Wireless network is enabled" msgstr "БеÑÐ¿Ñ€Ð¾Ð²Ð¾Ð´Ð½Ð°Ñ Ñеть включена" msgid "Write received DNS requests to syslog" -msgstr "ЗапиÑывать полученные DNS-запроÑÑ‹ в ÑиÑтемный журнал." +msgstr "ЗапиÑывать полученные DNS-запроÑÑ‹ в ÑиÑтемный журнал" msgid "Write system log to file" msgstr "ЗапиÑывать ÑиÑтемные ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð² файл" @@ -4054,6 +4086,18 @@ msgstr "" "Обновите его до верÑии 7 или иÑпользуйте другой браузер, например Firefox, " "Opera или Safari." +msgid "ZRam Compression Algorithm" +msgstr "Ðлгоритм компреÑÑии ZRam" + +msgid "ZRam Compression Streams" +msgstr "Потоки компреÑÑии ZRam" + +msgid "ZRam Settings" +msgstr "ÐаÑтройки ZRam" + +msgid "ZRam Size" +msgstr "Размер ZRam" + msgid "any" msgstr "любой" @@ -4073,7 +4117,7 @@ msgid "create:" msgstr "Ñоздать:" msgid "creates a bridge over specified interface(s)" -msgstr "Создаёт моÑÑ‚ Ð´Ð»Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… Ñетевых интерфейÑов." +msgstr "Создаёт моÑÑ‚ Ð´Ð»Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… Ñетевых интерфейÑов" msgid "dB" msgstr "дБ" @@ -4095,7 +4139,7 @@ msgid "" "abbr>-leases will be stored" msgstr "" "Файл, где хранÑÑ‚ÑÑ Ð°Ñ€ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð½Ñ‹Ðµ <abbr title=\"Протокол динамичеÑкой " -"наÑтройки узла\">DHCP</abbr>-адреÑа." +"наÑтройки узла\">DHCP</abbr>-адреÑа" msgid "forward" msgstr "перенаправить" @@ -4128,7 +4172,7 @@ msgid "kbit/s" msgstr "кбит/Ñ" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" -msgstr "Локальный <abbr title=\"Служба доменных имён\">DNS</abbr>-файл." +msgstr "Локальный <abbr title=\"Служба доменных имён\">DNS</abbr>-файл" msgid "minutes" msgstr "минут(Ñ‹)" @@ -4172,6 +4216,9 @@ msgstr "режим передачи" msgid "routed" msgstr "маршрутизируемый" +msgid "sec" +msgstr "Ñекунды" + msgid "server mode" msgstr "режим Ñервера" @@ -4210,85 +4257,3 @@ msgstr "да" msgid "« Back" msgstr "« Ðазад" - -#~ msgid "Configuration files will be kept." -#~ msgstr "Config файлы будут Ñохранены." - -#~ msgid "Note: Configuration files will be erased." -#~ msgstr "Внимание: config файлы будут удалены." - -#~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" -#~ msgstr "<abbr title='Парный: %s / Групповой: %s'>%s - %s</abbr>" - -#~ msgid "Activate this network" -#~ msgstr "Ðктивировать Ñту Ñеть" - -#~ msgid "Hermes 802.11b Wireless Controller" -#~ msgstr "БеÑпроводной 802.11b контроллер Hermes" - -#~ msgid "Interface is shutting down..." -#~ msgstr "Ð˜Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð°ÐµÑ‚ÑÑ..." - -#~ msgid "Interface reconnected" -#~ msgstr "Ð˜Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð¿ÐµÑ€ÐµÐ¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½" - -#~ msgid "Interface shut down" -#~ msgstr "Ð˜Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½" - -#~ msgid "Prism2/2.5/3 802.11b Wireless Controller" -#~ msgstr "БеÑпроводной 802.11b контроллер Prism2/2.5/3" - -#~ msgid "RaLink 802.11%s Wireless Controller" -#~ msgstr "БеÑпроводной 802.11%s контроллер RaLink" - -#~ msgid "" -#~ "Really shutdown interface \"%s\"? You might lose access to this device if " -#~ "you are connected via this interface." -#~ msgstr "" -#~ "ДейÑтвительно отключить Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ \"%s\"? Ð’Ñ‹ можете потерÑÑ‚ÑŒ доÑтуп к " -#~ "Ñтому уÑтройÑтву, еÑли вы подключены через Ñтот интерфейÑ." - -#~ msgid "Reconnecting interface" -#~ msgstr "Ð˜Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð¿ÐµÑ€ÐµÐ¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð°ÐµÑ‚ÑÑ" - -#~ msgid "Shutdown this network" -#~ msgstr "Выключить Ñту Ñеть" - -#~ msgid "Wireless restarted" -#~ msgstr "БеÑÐ¿Ñ€Ð¾Ð²Ð¾Ð´Ð½Ð°Ñ Ñеть перезапущена" - -#~ msgid "Wireless shut down" -#~ msgstr "Выключение беÑпроводной Ñети" - -#~ msgid "DHCP Leases" -#~ msgstr "Ðренды DHCP" - -#~ msgid "DHCPv6 Leases" -#~ msgstr "Ðренды DHCPv6" - -#~ msgid "" -#~ "Really delete this interface? The deletion cannot be undone! You might " -#~ "lose access to this device if you are connected via this interface." -#~ msgstr "" -#~ "ДейÑтвительно удалить Ñтот интерфейÑ? Удаление не может быть отменено!" -#~ "\\nÐ’Ñ‹ можете потерÑÑ‚ÑŒ доÑтуп к Ñтому уÑтройÑтву, еÑли вы подключены через " -#~ "Ñтот интерфейÑ." - -#~ msgid "" -#~ "Really shut down network? You might lose access to this device if you are " -#~ "connected via this interface." -#~ msgstr "" -#~ "ДейÑтвительно отключить Ñеть? Ð’Ñ‹ можете потерÑÑ‚ÑŒ доÑтуп к Ñтому " -#~ "уÑтройÑтву, еÑли вы подключены через Ñтот интерфейÑ." - -#~ msgid "Sort" -#~ msgstr "Сортировка" - -#~ msgid "help" -#~ msgstr "помощь" - -#~ msgid "IPv4 WAN Status" -#~ msgstr "СоÑтоÑние IPv4 WAN" - -#~ msgid "IPv6 WAN Status" -#~ msgstr "СоÑтоÑние IPv6 WAN" diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po index 7a872fed3d..c944c85ec9 100644 --- a/modules/luci-base/po/sk/base.po +++ b/modules/luci-base/po/sk/base.po @@ -386,10 +386,10 @@ msgstr "" msgid "Any zone" msgstr "" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -659,6 +659,9 @@ msgstr "" msgid "Command" msgstr "" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "" @@ -899,6 +902,9 @@ msgstr "" msgid "Disable Encryption" msgstr "" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "" @@ -1401,6 +1407,9 @@ msgstr "" msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "" @@ -1953,6 +1962,9 @@ msgstr "" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "" @@ -2125,9 +2137,6 @@ msgstr "" msgid "No NAT-T" msgstr "" -msgid "No chains in this table" -msgstr "" - msgid "No files found" msgstr "" @@ -2152,7 +2161,7 @@ msgstr "" msgid "No password set!" msgstr "" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "" msgid "No scan results available yet..." @@ -2203,6 +2212,9 @@ msgstr "" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "" @@ -2487,6 +2499,9 @@ msgstr "" msgid "Please enter your username and password." msgstr "" +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "" @@ -2821,6 +2836,9 @@ msgid "" "can be reached." msgstr "" +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "" @@ -2936,6 +2954,9 @@ msgstr "" msgid "Show current backup file list" msgstr "" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "" @@ -2957,6 +2978,9 @@ msgstr "" msgid "Size of DNS query cache" msgstr "" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "" @@ -3061,6 +3085,9 @@ msgid "" "configurations where only hosts with a corresponding lease are served." msgstr "" +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "" @@ -3193,10 +3220,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3361,6 +3387,9 @@ msgstr "" msgid "Time Synchronization is not configured yet." msgstr "" +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "" @@ -3727,6 +3756,18 @@ msgid "" "or Safari." msgstr "" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "" @@ -3843,6 +3884,9 @@ msgstr "" msgid "routed" msgstr "" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "" diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po index fb0aaaa9a8..53f929c3f9 100644 --- a/modules/luci-base/po/sv/base.po +++ b/modules/luci-base/po/sv/base.po @@ -397,10 +397,10 @@ msgstr "Konfiguration av antenn" msgid "Any zone" msgstr "NÃ¥gon zon" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -673,6 +673,9 @@ msgstr "Samlar in data..." msgid "Command" msgstr "Kommando" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "Vanlig konfiguration" @@ -915,6 +918,9 @@ msgstr "" msgid "Disable Encryption" msgstr "Inaktivera kryptering" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "" @@ -1421,6 +1427,9 @@ msgstr "" msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "Göm <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "Värd" @@ -1974,6 +1983,9 @@ msgstr "Manuell" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "" @@ -2146,9 +2158,6 @@ msgstr "Det finns ingen DHCP-server inställd för det här gränssnittet" msgid "No NAT-T" msgstr "Ingen NAT-T" -msgid "No chains in this table" -msgstr "Inga kedjor i den här tabellen" - msgid "No files found" msgstr "Inga filer hittades" @@ -2173,7 +2182,7 @@ msgstr "Ingen paketlista tillgänglig" msgid "No password set!" msgstr "Inget lösenord inställt!" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "Inga regler i den här kedjan" msgid "No scan results available yet..." @@ -2224,6 +2233,9 @@ msgstr "Nslookup" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "OK" @@ -2508,6 +2520,9 @@ msgstr "Pkt." msgid "Please enter your username and password." msgstr "Vänligen ange ditt användarnamn och lösenord." +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "" @@ -2844,6 +2859,9 @@ msgid "" "can be reached." msgstr "" +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "Kör en filsystemskontroll innan enheten monteras" @@ -2959,6 +2977,9 @@ msgstr "" msgid "Show current backup file list" msgstr "" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "Stäng ner det här gränssnittet" @@ -2980,6 +3001,9 @@ msgstr "Storlek (.ipk)" msgid "Size of DNS query cache" msgstr "" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "Hoppa över" @@ -3084,6 +3108,9 @@ msgid "" "configurations where only hosts with a corresponding lease are served." msgstr "" +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "Status" @@ -3216,10 +3243,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3386,6 +3412,9 @@ msgstr "Synkronisering av tid" msgid "Time Synchronization is not configured yet." msgstr "Synkronisering av tid är inte inställd än." +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "Tidszon" @@ -3760,6 +3789,18 @@ msgstr "" "Vänligen uppgradera den till minst version 7 eller använd en annan " "webbläsare till exempel Firefox, Opera eller Safari." +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "nÃ¥got" @@ -3876,6 +3917,9 @@ msgstr "relä-läge" msgid "routed" msgstr "" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "server-läge" @@ -3915,6 +3959,9 @@ msgstr "ja" msgid "« Back" msgstr "« BakÃ¥t" +#~ msgid "No chains in this table" +#~ msgstr "Inga kedjor i den här tabellen" + #~ msgid "Configuration files will be kept." #~ msgstr "Konfigurationsfiler kommer att behÃ¥llas." diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot index cb1008a8e0..3424eee506 100644 --- a/modules/luci-base/po/templates/base.pot +++ b/modules/luci-base/po/templates/base.pot @@ -379,10 +379,10 @@ msgstr "" msgid "Any zone" msgstr "" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -652,6 +652,9 @@ msgstr "" msgid "Command" msgstr "" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "" @@ -892,6 +895,9 @@ msgstr "" msgid "Disable Encryption" msgstr "" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "" @@ -1394,6 +1400,9 @@ msgstr "" msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "" @@ -1946,6 +1955,9 @@ msgstr "" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "" @@ -2118,9 +2130,6 @@ msgstr "" msgid "No NAT-T" msgstr "" -msgid "No chains in this table" -msgstr "" - msgid "No files found" msgstr "" @@ -2145,7 +2154,7 @@ msgstr "" msgid "No password set!" msgstr "" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "" msgid "No scan results available yet..." @@ -2196,6 +2205,9 @@ msgstr "" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "" @@ -2480,6 +2492,9 @@ msgstr "" msgid "Please enter your username and password." msgstr "" +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "" @@ -2814,6 +2829,9 @@ msgid "" "can be reached." msgstr "" +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "" @@ -2929,6 +2947,9 @@ msgstr "" msgid "Show current backup file list" msgstr "" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "" @@ -2950,6 +2971,9 @@ msgstr "" msgid "Size of DNS query cache" msgstr "" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "" @@ -3054,6 +3078,9 @@ msgid "" "configurations where only hosts with a corresponding lease are served." msgstr "" +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "" @@ -3186,10 +3213,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3354,6 +3380,9 @@ msgstr "" msgid "Time Synchronization is not configured yet." msgstr "" +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "" @@ -3720,6 +3749,18 @@ msgid "" "or Safari." msgstr "" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "" @@ -3836,6 +3877,9 @@ msgstr "" msgid "routed" msgstr "" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "" diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po index cd3688ba56..769619f5d5 100644 --- a/modules/luci-base/po/tr/base.po +++ b/modules/luci-base/po/tr/base.po @@ -400,10 +400,10 @@ msgstr "Anten Yapılandırması" msgid "Any zone" msgstr "" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -675,6 +675,9 @@ msgstr "" msgid "Command" msgstr "" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "" @@ -917,6 +920,9 @@ msgstr "DNS kurulumunu devre dışı" msgid "Disable Encryption" msgstr "Åžifrelemeyi Devre Dışı" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "AÄŸ devre dışı" @@ -1419,6 +1425,9 @@ msgstr "" msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "" @@ -1971,6 +1980,9 @@ msgstr "" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "" @@ -2143,9 +2155,6 @@ msgstr "" msgid "No NAT-T" msgstr "" -msgid "No chains in this table" -msgstr "" - msgid "No files found" msgstr "" @@ -2170,7 +2179,7 @@ msgstr "" msgid "No password set!" msgstr "" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "" msgid "No scan results available yet..." @@ -2221,6 +2230,9 @@ msgstr "" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "" @@ -2505,6 +2517,9 @@ msgstr "" msgid "Please enter your username and password." msgstr "" +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "" @@ -2839,6 +2854,9 @@ msgid "" "can be reached." msgstr "" +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "Cihazı baÄŸlamadan önce bir dosya sistemi kontrolü yapın" @@ -2954,6 +2972,9 @@ msgstr "" msgid "Show current backup file list" msgstr "" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "" @@ -2975,6 +2996,9 @@ msgstr "Boyut (.ipk)" msgid "Size of DNS query cache" msgstr "" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "Atla" @@ -3079,6 +3103,9 @@ msgid "" "configurations where only hosts with a corresponding lease are served." msgstr "" +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "Durum" @@ -3211,10 +3238,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3379,6 +3405,9 @@ msgstr "" msgid "Time Synchronization is not configured yet." msgstr "" +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "" @@ -3747,6 +3776,18 @@ msgid "" "or Safari." msgstr "" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "herhangi" @@ -3863,6 +3904,9 @@ msgstr "anahtarlama modu" msgid "routed" msgstr "yönlendirildi" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "sunucu modu" diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po index 2f068298b4..fc0709605c 100644 --- a/modules/luci-base/po/uk/base.po +++ b/modules/luci-base/po/uk/base.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2018-09-20 02:55+0300\n" +"PO-Revision-Date: 2018-10-14 18:10+0300\n" "Last-Translator: Yurii <yuripet@gmail.com>\n" "Language-Team: none\n" "Language: uk\n" @@ -436,12 +436,12 @@ msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð°Ð½Ñ‚ÐµÐ½Ð¸" msgid "Any zone" msgstr "Будь-Ñка зона" +msgid "Apply anyway" +msgstr "Ð’Ñе одно заÑтоÑувати" + msgid "Apply request failed with status <code>%h</code>" msgstr "СталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° запиту на заÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ñ– ÑтатуÑом <code>%h</code>" -msgid "Apply unchecked" -msgstr "ЗаÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ðµ позначено" - msgid "Architecture" msgstr "Ðрхітектура" @@ -734,6 +734,9 @@ msgstr "Ð—Ð±Ð¸Ñ€Ð°Ð½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ…..." msgid "Command" msgstr "Команда" +msgid "Comment" +msgstr "Примітка" + msgid "Common Configuration" msgstr "Загальна конфігураціÑ" @@ -995,6 +998,9 @@ msgstr "Вимкнути Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ DNS" msgid "Disable Encryption" msgstr "Вимкнути шифруваннÑ" +msgid "Disable Inactivity Polling" +msgstr "Вимкнути Ð¾Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð½ÐµÐ°ÐºÑ‚Ð¸Ð²Ð½Ð¾ÑÑ‚Ñ–" + msgid "Disable this network" msgstr "Вимкнути цю мережу" @@ -1533,6 +1539,9 @@ msgstr "" "Приховати <abbr title=\"Extended Service Set Identifier — ідентифікатор " "розширеної Ñлужби поÑлуг\">ESSID</abbr>" +msgid "Hide empty chains" +msgstr "Приховати порожні ланцюжки" + msgid "Host" msgstr "Вузол" @@ -2136,6 +2145,9 @@ msgstr "Вручну" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "МакÑ. доÑÑжна швидкіÑÑ‚ÑŒ передачі даних (ATTNDR)" +msgid "Maximum allowed Listen Interval" +msgstr "МакÑимальний дозволений інтервал проÑлуховуваннÑ" + msgid "Maximum allowed number of active DHCP leases" msgstr "МакÑимально допуÑтима кількіÑÑ‚ÑŒ активних оренд DHCP" @@ -2312,9 +2324,6 @@ msgstr "Ðемає DHCP-Ñервера, налаштованого Ð´Ð»Ñ Ñ†ÑŒÐ¾ msgid "No NAT-T" msgstr "Ðемає NAT-T" -msgid "No chains in this table" -msgstr "У цій таблиці немає ланцюжків" - msgid "No files found" msgstr "Файли не знайдено" @@ -2339,8 +2348,8 @@ msgstr "Ðемає доÑтупних ÑпиÑків пакетів" msgid "No password set!" msgstr "Пароль не вÑтановлено!" -msgid "No rules in this chain" -msgstr "У цьму ланцюжку нема правил" +msgid "No rules in this chain." +msgstr "У цьму ланцюжку нема правил." msgid "No scan results available yet..." msgstr "Результати ÑÐºÐ°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð°Ñ€Ð°Ð·Ñ– недоÑтупні" @@ -2390,6 +2399,9 @@ msgstr "DNS-запит" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "КількіÑÑ‚ÑŒ кешованих запиÑів DNS (макÑ. - 10000, 0 - без кешуваннÑ)" +msgid "Number of parallel threads used for compression" +msgstr "КількіÑÑ‚ÑŒ паралельних потоків, що викориÑтовуютьÑÑ Ð´Ð»Ñ ÑтиÑненнÑ" + msgid "OK" msgstr "OK" @@ -2700,6 +2712,9 @@ msgstr "пакетів" msgid "Please enter your username and password." msgstr "Введіть Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача Ñ– пароль." +msgid "Please update package lists first" +msgstr "Спочатку оновіть ÑпиÑки пакетів" + msgid "Policy" msgstr "Політика" @@ -3052,6 +3067,9 @@ msgstr "" "Маршрути визначають через Ñкий Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ñ– шлюз можна доÑÑгнути певного " "вузла або мережі." +msgid "Rule" +msgstr "Правило" + msgid "Run a filesystem check before mounting the device" msgstr "Виконати перевірку файлової ÑиÑтеми перед монтуваннÑм приÑтрою" @@ -3174,6 +3192,9 @@ msgstr "Коротка преамбула" msgid "Show current backup file list" msgstr "Показати поточний ÑпиÑок файлів резервного копіюваннÑ" +msgid "Show empty chains" +msgstr "Показати порожні ланцюжки" + msgid "Shutdown this interface" msgstr "Вимкнути цей інтерфейÑ" @@ -3195,6 +3216,9 @@ msgstr "Розмір (.ipk)" msgid "Size of DNS query cache" msgstr "Розмір кешу запитів DNS" +msgid "Size of the ZRam device in megabytes" +msgstr "Розмір приÑтрою ZRam у мегабайтах" + msgid "Skip" msgstr "ПропуÑтити" @@ -3310,6 +3334,9 @@ msgstr "" "конфігурацій інтерфейÑів, коли обÑлуговуютьÑÑ Ñ‚Ñ–Ð»ÑŒÐºÐ¸ вузли з відповідною " "орендою." +msgid "Station inactivity limit" +msgstr "ÐžÐ±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð±ÐµÐ·Ð´Ñ–ÑльноÑÑ‚Ñ– Ñтанції" + msgid "Status" msgstr "Стан" @@ -3457,15 +3484,14 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" "ПриÑтрій недоÑÑжний протÑгом %d Ñекунд піÑÐ»Ñ Ð·Ð°ÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ñ‡Ñ–ÐºÑƒÑŽÑ‡Ð¸Ñ… змін, що " "призвело до Ð²Ñ–Ð´ÐºÐ¾Ñ‡ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ— з міркувань безпеки. Проте, Ñкщо ви " -"впевнені, що зміни конфігурації Ñ” правильними, заÑтоÑуйте неперевірену " -"конфігурацію. Крім того, ви можете відхилити це Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ñ‚Ð° " +"впевнені, що зміни конфігурації Ñ” правильними, вÑе одно продовжіть " +"заÑтоÑуваннÑ. Крім того, ви можете відхилити це Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ñ‚Ð° " "відредагувати зміни, перш ніж намагатиÑÑŒ заÑтоÑувати Ñ—Ñ… знову, або ж " "ÑкаÑувати вÑÑ– очікуючі зміни, щоб зберегти поточну робочу конфігурацію." @@ -3681,6 +3707,9 @@ msgstr "Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ñ–Ð·Ð°Ñ†Ñ–Ñ Ñ‡Ð°Ñу" msgid "Time Synchronization is not configured yet." msgstr "Синхронізацію чаÑу не налаштовано." +msgid "Time interval for rekeying GTK" +msgstr "Інтервал чаÑу Ð´Ð»Ñ Ð·Ð¼Ñ–Ð½Ð¸ ключа GTK" + msgid "Timezone" msgstr "ЧаÑовий поÑÑ" @@ -4074,6 +4103,18 @@ msgstr "" "Поновіть його, принаймні, до верÑÑ–Ñ— 7 або ÑкориÑтайтеÑÑŒ іншим браузером, " "таким Ñк Firefox, Opera або Safari." +msgid "ZRam Compression Algorithm" +msgstr "Ðлгоритм ÑтиÑÐ½ÐµÐ½Ð½Ñ ZRam" + +msgid "ZRam Compression Streams" +msgstr "Потоки ÑтиÑÐ½ÐµÐ½Ð½Ñ ZRam" + +msgid "ZRam Settings" +msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ZRam" + +msgid "ZRam Size" +msgstr "Розмір ZRam" + msgid "any" msgstr "будь-Ñкий" @@ -4194,6 +4235,9 @@ msgstr "режим реле" msgid "routed" msgstr "ÑпрÑмовано" +msgid "sec" +msgstr "Ñ" + msgid "server mode" msgstr "режим Ñервера" diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po index 217ca98fbd..83566f27b1 100644 --- a/modules/luci-base/po/vi/base.po +++ b/modules/luci-base/po/vi/base.po @@ -393,10 +393,10 @@ msgstr "" msgid "Any zone" msgstr "" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -666,6 +666,9 @@ msgstr "" msgid "Command" msgstr "Lệnh" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "" @@ -908,6 +911,9 @@ msgstr "" msgid "Disable Encryption" msgstr "" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "" @@ -1421,6 +1427,9 @@ msgstr "" msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "Giấu <abbr title=\"Chế Ä‘á»™ mở rá»™ng đặt Identifier\">ESSID</abbr>" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "" @@ -1981,6 +1990,9 @@ msgstr "" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "" @@ -2155,9 +2167,6 @@ msgstr "" msgid "No NAT-T" msgstr "" -msgid "No chains in this table" -msgstr "Không có chuá»—i trong bảng nà y" - msgid "No files found" msgstr "" @@ -2182,7 +2191,7 @@ msgstr "" msgid "No password set!" msgstr "" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "Không có quy luáºt trong chuá»—i nà y" msgid "No scan results available yet..." @@ -2233,6 +2242,9 @@ msgstr "" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "OK " @@ -2523,6 +2535,9 @@ msgstr "" msgid "Please enter your username and password." msgstr "Nháºp tên và máºt mã" +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "ChÃnh sách" @@ -2861,6 +2876,9 @@ msgstr "" "Routes chỉ định trên giao diện và cổng má»™t host nhất định hay network được " "tiếp cáºn." +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "" @@ -2976,6 +2994,9 @@ msgstr "" msgid "Show current backup file list" msgstr "" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "" @@ -2997,6 +3018,9 @@ msgstr "" msgid "Size of DNS query cache" msgstr "" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "" @@ -3101,6 +3125,9 @@ msgid "" "configurations where only hosts with a corresponding lease are served." msgstr "" +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "Tình trạng" @@ -3233,10 +3260,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3416,6 +3442,9 @@ msgstr "" msgid "Time Synchronization is not configured yet." msgstr "" +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "Múi giá» " @@ -3786,6 +3815,18 @@ msgid "" "or Safari." msgstr "" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "" @@ -3904,6 +3945,9 @@ msgstr "" msgid "routed" msgstr "" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "" @@ -3943,6 +3987,9 @@ msgstr "" msgid "« Back" msgstr "" +#~ msgid "No chains in this table" +#~ msgstr "Không có chuá»—i trong bảng nà y" + #~ msgid "Backup / Restore" #~ msgstr "Backup/ Restore" diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po index 2c7bdcc195..a0534db70e 100644 --- a/modules/luci-base/po/zh-cn/base.po +++ b/modules/luci-base/po/zh-cn/base.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 14:59+0800\n" +"PO-Revision-Date: 2018-08-18 12:39+0800\n" "X-Generator: Gtranslator 2.91.7\n" msgid "%.1f dB" @@ -239,7 +239,7 @@ msgid "Add local domain suffix to names served from hosts files" msgstr "æ·»åŠ æœ¬åœ°åŸŸååŽç¼€åˆ° HOSTS 文件ä¸çš„域å" msgid "Add new interface..." -msgstr "æ·»åŠ æ–°æŽ¥å£..." +msgstr "æ·»åŠ æ–°æŽ¥å£â€¦" msgid "Additional Hosts files" msgstr "é¢å¤–çš„ HOSTS 文件" @@ -400,12 +400,12 @@ msgstr "天线é…ç½®" msgid "Any zone" msgstr "ä»»æ„区域" +msgid "Apply anyway" +msgstr "强制应用" + msgid "Apply request failed with status <code>%h</code>" msgstr "åº”ç”¨è¯·æ±‚å¤±è´¥ï¼ŒçŠ¶æ€ <code>%h</code>" -msgid "Apply unchecked" -msgstr "强制应用" - msgid "Architecture" msgstr "架构" @@ -414,7 +414,7 @@ msgid "" msgstr "å°†æ¯ä¸ªå…¬å…± IPv6 å‰ç¼€çš„给定长度部分分é…ç»™æ¤æŽ¥å£" msgid "Assign interfaces..." -msgstr "分é…接å£..." +msgstr "分é…接å£â€¦" msgid "" "Assign prefix parts using this hexadecimal subprefix ID for this interface." @@ -677,6 +677,9 @@ msgstr "æ£åœ¨æ”¶é›†æ•°æ®â€¦" msgid "Command" msgstr "命令" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "一般é…ç½®" @@ -927,6 +930,9 @@ msgstr "åœç”¨ DNS 设定" msgid "Disable Encryption" msgstr "ç¦ç”¨åŠ 密" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "ç¦ç”¨æ¤ç½‘络" @@ -998,7 +1004,7 @@ msgstr "" "ä¸è½¬å‘没有 <abbr title=\"Domain Name System\">DNS</abbr> å称的解æžè¯·æ±‚" msgid "Down" -msgstr "å‘下" +msgstr "下移" msgid "Download and install package" msgstr "下载并安装软件包" @@ -1023,7 +1029,7 @@ msgstr "" "\"Secure Copy\">SCP</abbr> æœåŠ¡" msgid "Dual-Stack Lite (RFC6333)" -msgstr "Dual-Stack Lite (RFC6333)" +msgstr "轻型åŒæ ˆï¼ˆRFC6333）" msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>" msgstr "åŠ¨æ€ <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>" @@ -1038,7 +1044,7 @@ msgstr "" "为所有客户端æä¾› DHCP æœåŠ¡ã€‚如果ç¦ç”¨ï¼Œå°†åªå¯¹å…·æœ‰é™æ€ç§Ÿçº¦çš„客户æä¾›æœåŠ¡ã€‚" msgid "EA-bits length" -msgstr "EA-bits 长度" +msgstr "EA-ä½é•¿" msgid "EAP-Method" msgstr "EAP 类型" @@ -1439,6 +1445,9 @@ msgstr "请在æ¤å¤„粘贴 SSH 公钥，æ¯è¡Œä¸€ä¸ªï¼Œç”¨äºŽ SSH 公钥认è¯ã€ msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "éšè— <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "主机" @@ -2005,6 +2014,9 @@ msgstr "手动" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "最大å¯è¾¾æ•°æ®é€ŸçŽ‡ï¼ˆATTNDR）" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "å…许的最大 DHCP 租用数" @@ -2179,9 +2191,6 @@ msgstr "本接å£æœªé…ç½® DHCP æœåŠ¡å™¨" msgid "No NAT-T" msgstr "æ— NAT-T" -msgid "No chains in this table" -msgstr "本表ä¸æ²¡æœ‰é“¾" - msgid "No files found" msgstr "未找到文件" @@ -2206,7 +2215,7 @@ msgstr "æ— å¯ç”¨è½¯ä»¶åˆ—表" msgid "No password set!" msgstr "未设置密ç ï¼" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "本链没有规则" msgid "No scan results available yet..." @@ -2257,6 +2266,9 @@ msgstr "Nslookup" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "缓å˜çš„ DNS æ¡ç›®æ•°é‡ï¼ˆæœ€å¤§ 10000，0 表示ä¸ç¼“å˜ï¼‰" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "确认" @@ -2333,9 +2345,9 @@ msgid "" "server, use the suffix (like '::1') to form the IPv6 address ('a:b:c:d::1') " "for the interface." msgstr "" -"å¯é€‰ï¼Œå…许的值：'eui64'ã€'random' 和其他固定值（例如：'::1' 或 '::1:2'）。当" -"从授æƒæœåŠ¡å™¨èŽ·å–到 IPv6 å‰ç¼€ï¼ˆå¦‚ 'a:b:c:d::'），使用åŽç¼€ï¼ˆå¦‚ '::1'）åˆæˆ " -"IPv6 地å€ï¼ˆ'a:b:c:d::1'）分é…ç»™æ¤æŽ¥å£ã€‚" +"å¯é€‰ï¼Œå…许的值：“eui64â€ã€â€œrandomâ€å’Œå…¶ä»–固定值（例如：“::1â€æˆ–“::1:2â€ï¼‰ã€‚当从授" +"æƒæœåŠ¡å™¨èŽ·å–到 IPv6 å‰ç¼€ï¼ˆå¦‚“a:b:c:d::â€ï¼‰ï¼Œä½¿ç”¨åŽç¼€ï¼ˆå¦‚ “::1â€ï¼‰åˆæˆ IPv6 地å€" +"（“a:b:c:d::1â€ï¼‰åˆ†é…ç»™æ¤æŽ¥å£ã€‚" msgid "" "Optional. Base64-encoded preshared key. Adds in an additional layer of " @@ -2456,7 +2468,7 @@ msgid "PSID offset" msgstr "PSID å移" msgid "PSID-bits length" -msgstr "PSID-bits 长度" +msgstr "PSID-ä½é•¿" msgid "PTM/EFM (Packet Transfer Mode)" msgstr "PTM/EFMï¼ˆåˆ†ç»„ä¼ è¾“æ¨¡å¼ï¼‰" @@ -2551,6 +2563,9 @@ msgstr "æ•°æ®åŒ…" msgid "Please enter your username and password." msgstr "请输入用户å和密ç 。" +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "ç–ç•¥" @@ -2745,7 +2760,7 @@ msgid "Receiver Antenna" msgstr "接收天线" msgid "Recommended. IP addresses of the WireGuard interface." -msgstr "推è，Wire Guard 接å£çš„ IP 地å€ã€‚" +msgstr "推è，WireGuard 接å£çš„ IP 地å€ã€‚" msgid "Reconnect this interface" msgstr "é‡è¿žæ¤æŽ¥å£" @@ -2895,6 +2910,9 @@ msgid "" "can be reached." msgstr "路由表æ述了数æ®åŒ…çš„å¯è¾¾è·¯å¾„。" +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "挂载设备å‰è¿è¡Œæ–‡ä»¶ç³»ç»Ÿæ£€æŸ¥" @@ -2953,7 +2971,7 @@ msgid "Section removed" msgstr "移除的节点" msgid "See \"mount\" manpage for details" -msgstr "è¯¦å‚ \"mount\" è”机帮助" +msgstr "详å‚“mountâ€è”机帮助" msgid "" "Select 'Force upgrade' to flash the image even if the image format check " @@ -3012,6 +3030,9 @@ msgstr "Short Preamble" msgid "Show current backup file list" msgstr "显示当å‰å¤‡ä»½æ–‡ä»¶åˆ—表" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "å…³é—æ¤æŽ¥å£" @@ -3033,6 +3054,9 @@ msgstr "大å°ï¼ˆ.ipk）" msgid "Size of DNS query cache" msgstr "DNS 查询缓å˜çš„大å°" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "跳过" @@ -3141,6 +3165,9 @@ msgstr "" "é™æ€ç§Ÿçº¦ç”¨äºŽç»™ DHCP 客户端分é…固定的 IP 地å€å’Œä¸»æœºæ ‡è¯†ã€‚åªæœ‰æŒ‡å®šçš„主机æ‰èƒ½è¿ž" "接，并且接å£é¡»ä¸ºéžåŠ¨æ€é…置。" +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "状æ€" @@ -3278,10 +3305,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" "åœ¨åº”ç”¨æŒ‚èµ·çš„æ›´æ”¹åŽ %d ç§’å†…æ— æ³•è¿žæŽ¥åˆ°æ¤è®¾å¤‡ï¼Œå‡ºäºŽå®‰å…¨åŽŸå› 导致é…置回滚。如果您" "认为é…置的更改是æ£ç¡®çš„，请执行强制应用。或者您å¯ä»¥åœ¨å†æ¬¡å°è¯•åº”用之å‰è§£é™¤æ¤è¦" @@ -3290,7 +3316,7 @@ msgstr "" msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" -msgstr "å˜å‚¨å™¨æˆ–分区的设备文件，（例如：<code>/dev/sda1</code>）" +msgstr "å˜å‚¨å™¨æˆ–分区的设备文件（例如：<code>/dev/sda1</code>）" msgid "" "The filesystem that was used to format the memory (<abbr title=\"for example" @@ -3401,8 +3427,8 @@ msgid "" "'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " "Name System\">DNS</abbr> servers." msgstr "" -"æ¤æ–‡ä»¶åŒ…å«ç±»ä¼¼äºŽ 'server=/domain/1.2.3.4' 或 'server=1.2.3.4' 的行，用于解æž" -"特定域å或指定上游 <abbr title=\"Domain Name System\">DNS</abbr> æœåŠ¡å™¨ã€‚" +"æ¤æ–‡ä»¶åŒ…å«ç±»ä¼¼äºŽâ€œserver=/domain/1.2.3.4â€æˆ–“server=1.2.3.4â€çš„行，用于解æžç‰¹å®š" +"域å或指定上游 <abbr title=\"Domain Name System\">DNS</abbr> æœåŠ¡å™¨ã€‚" msgid "" "This is a list of shell glob patterns for matching files and directories to " @@ -3420,7 +3446,8 @@ msgstr "如果更新密钥没有设置的è¯ï¼Œéš§é“的“更新密钥â€æˆ–者 msgid "" "This is the content of /etc/rc.local. Insert your own commands here (in " "front of 'exit 0') to execute them at the end of the boot process." -msgstr "å¯åŠ¨è„šæœ¬æ’入到 'exit 0' 之å‰å³å¯éšç³»ç»Ÿå¯åŠ¨è¿è¡Œã€‚" +msgstr "" +"æ¤å¤„为 /etc/rc.local 的内容。å¯åŠ¨è„šæœ¬æ’入到“exit 0â€ä¹‹å‰å³å¯éšç³»ç»Ÿå¯åŠ¨è¿è¡Œã€‚" msgid "" "This is the local endpoint address assigned by the tunnel broker, it usually " @@ -3463,7 +3490,10 @@ msgid "Time Synchronization" msgstr "时间åŒæ¥" msgid "Time Synchronization is not configured yet." -msgstr "尚未é…置时间åŒæ¥" +msgstr "尚未é…置时间åŒæ¥ã€‚" + +msgid "Time interval for rekeying GTK" +msgstr "" msgid "Timezone" msgstr "时区" @@ -3594,7 +3624,7 @@ msgid "Unsupported protocol type." msgstr "ä¸æ”¯æŒçš„å议类型" msgid "Up" -msgstr "å‘上" +msgstr "上移" msgid "Update lists" msgstr "刷新列表" @@ -3608,7 +3638,7 @@ msgstr "" "使更新åŽçš„系统ä»ç„¶ä½¿ç”¨å½“å‰çš„系统é…置（新的固件需è¦å’Œå½“å‰å›ºä»¶å…¼å®¹ï¼‰ã€‚" msgid "Upload archive..." -msgstr "ä¸Šä¼ å¤‡ä»½..." +msgstr "ä¸Šä¼ å¤‡ä»½â€¦" msgid "Uploaded File" msgstr "ä¸Šä¼ çš„æ–‡ä»¶" @@ -3832,7 +3862,7 @@ msgid "" "scripts like \"network\", your device might become inaccessible!</strong>" msgstr "" "在æ¤å¯ç”¨æˆ–ç¦ç”¨å·²å®‰è£…çš„å¯åŠ¨è„šæœ¬ï¼Œæ›´æ”¹åœ¨è®¾å¤‡é‡å¯åŽç”Ÿæ•ˆã€‚<br /><strong>è¦å‘Šï¼šå¦‚" -"æžœç¦ç”¨äº†å¿…è¦çš„å¯åŠ¨è„šæœ¬ï¼Œæ¯”如 \"network\"，å¯èƒ½ä¼šå¯¼è‡´æ— 法访问设备ï¼</strong>" +"æžœç¦ç”¨äº†å¿…è¦çš„å¯åŠ¨è„šæœ¬ï¼Œæ¯”如“networkâ€ï¼Œå¯èƒ½ä¼šå¯¼è‡´æ— 法访问设备ï¼</strong>" msgid "" "You must enable JavaScript in your browser or LuCI will not work properly." @@ -3846,6 +3876,18 @@ msgstr "" "您的 IE æµè§ˆå™¨å¤ªè€äº†ï¼Œæ— 法æ£å¸¸æ˜¾ç¤ºè¿™ä¸ªé¡µé¢ï¼è¯·æ›´æ–°åˆ° IE7 åŠä»¥ä¸Šæˆ–使用其他æµè§ˆ" "器，如 Firefoxã€Operaã€Safari。" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "ä»»æ„" @@ -3964,6 +4006,9 @@ msgstr "ä¸ç»§æ¨¡å¼" msgid "routed" msgstr "已路由" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "æœåŠ¡å™¨æ¨¡å¼" @@ -4003,6 +4048,9 @@ msgstr "是" msgid "« Back" msgstr "« åŽé€€" +#~ msgid "No chains in this table" +#~ msgstr "本表ä¸æ²¡æœ‰é“¾" + #~ msgid "Configuration files will be kept." #~ msgstr "é…置文件将被ä¿ç•™ã€‚" diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po index f3354e1924..c34e0fe7b0 100644 --- a/modules/luci-base/po/zh-tw/base.po +++ b/modules/luci-base/po/zh-tw/base.po @@ -396,10 +396,10 @@ msgstr "天線è¨å®š" msgid "Any zone" msgstr "ä»»æ„å€åŸŸ" -msgid "Apply request failed with status <code>%h</code>" +msgid "Apply anyway" msgstr "" -msgid "Apply unchecked" +msgid "Apply request failed with status <code>%h</code>" msgstr "" msgid "Architecture" @@ -675,6 +675,9 @@ msgstr "收集資料ä¸..." msgid "Command" msgstr "指令" +msgid "Comment" +msgstr "" + msgid "Common Configuration" msgstr "一般è¨å®š" @@ -920,6 +923,9 @@ msgstr "關閉DNSè¨ç½®" msgid "Disable Encryption" msgstr "" +msgid "Disable Inactivity Polling" +msgstr "" + msgid "Disable this network" msgstr "" @@ -1430,6 +1436,9 @@ msgstr "在這裡貼上公用SSH-Keys (æ¯è¡Œä¸€å€‹)以便驗è‰" msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "éš±è— <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" +msgid "Hide empty chains" +msgstr "" + msgid "Host" msgstr "" @@ -1988,6 +1997,9 @@ msgstr "" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" +msgid "Maximum allowed Listen Interval" +msgstr "" + msgid "Maximum allowed number of active DHCP leases" msgstr "å…許啟用DHCP釋放的最大數é‡" @@ -2160,9 +2172,6 @@ msgstr "在這個介é¢å°šç„¡DHCP伺æœå™¨" msgid "No NAT-T" msgstr "" -msgid "No chains in this table" -msgstr "尚未ç¶åœ¨é€™å€‹è¡¨æ ¼ä¸" - msgid "No files found" msgstr "尚未發ç¾ä»»ä½•æª”案" @@ -2187,7 +2196,7 @@ msgstr "尚無列出的軟體包å¯é‹ç”¨" msgid "No password set!" msgstr "尚未è¨å®šå¯†ç¢¼!" -msgid "No rules in this chain" +msgid "No rules in this chain." msgstr "å°šç„¡è¦å‰‡åœ¨é€™å€‹éˆæŽ¥ä¸Š" msgid "No scan results available yet..." @@ -2238,6 +2247,9 @@ msgstr "DNSåµéŒ¯Nslookup" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +msgid "Number of parallel threads used for compression" +msgstr "" + msgid "OK" msgstr "è¡Œ" @@ -2526,6 +2538,9 @@ msgstr "å°åŒ…數." msgid "Please enter your username and password." msgstr "請輸入您的用戶å稱和密碼" +msgid "Please update package lists first" +msgstr "" + msgid "Policy" msgstr "ç–ç•¥" @@ -2864,6 +2879,9 @@ msgid "" "can be reached." msgstr "路由器指定介é¢å°Žå‡ºåˆ°ç‰¹å®šä¸»æ©Ÿæˆ–è€…èƒ½å¤ åˆ°é”的網路." +msgid "Rule" +msgstr "" + msgid "Run a filesystem check before mounting the device" msgstr "掛載這個è¨å‚™å‰å…ˆè·‘系統檢查" @@ -2980,6 +2998,9 @@ msgstr "" msgid "Show current backup file list" msgstr "顯示ç¾ä»Šçš„備份檔清單" +msgid "Show empty chains" +msgstr "" + msgid "Shutdown this interface" msgstr "關閉這個介é¢" @@ -3001,6 +3022,9 @@ msgstr "" msgid "Size of DNS query cache" msgstr "" +msgid "Size of the ZRam device in megabytes" +msgstr "" + msgid "Skip" msgstr "è·³éŽ" @@ -3109,6 +3133,9 @@ msgstr "" "éœæ…‹ç§Ÿç´„是用來指定固定的IPä½å€å’Œè¡¨ç¤ºçš„主機å稱給予DHCP用戶端. 它們也需è¦éžå‹•" "態介é¢è¨å®šå€¼ä»¥ä¾¿ç²å–相應租約的主機æœå‹™." +msgid "Station inactivity limit" +msgstr "" + msgid "Status" msgstr "狀態" @@ -3250,10 +3277,9 @@ msgid "" "The device could not be reached within %d seconds after applying the pending " "changes, which caused the configuration to be rolled back for safety " "reasons. If you believe that the configuration changes are correct " -"nonetheless, perform an unchecked configuration apply. Alternatively, you " -"can dismiss this warning and edit changes before attempting to apply again, " -"or revert all pending changes to keep the currently working configuration " -"state." +"nonetheless, proceed by applying anyway. Alternatively, you can dismiss this " +"warning and edit changes before attempting to apply again, or revert all " +"pending changes to keep the currently working configuration state." msgstr "" msgid "" @@ -3439,6 +3465,9 @@ msgstr "æ ¡æ™‚åŒæ¥" msgid "Time Synchronization is not configured yet." msgstr "æ ¡æ™‚åŒæ¥å°šæœªè¨å®š." +msgid "Time interval for rekeying GTK" +msgstr "" + msgid "Timezone" msgstr "時å€" @@ -3816,6 +3845,18 @@ msgid "" "or Safari." msgstr "" +msgid "ZRam Compression Algorithm" +msgstr "" + +msgid "ZRam Compression Streams" +msgstr "" + +msgid "ZRam Settings" +msgstr "" + +msgid "ZRam Size" +msgstr "" + msgid "any" msgstr "ä»»æ„" @@ -3934,6 +3975,9 @@ msgstr "" msgid "routed" msgstr "路由" +msgid "sec" +msgstr "" + msgid "server mode" msgstr "" @@ -3973,6 +4017,9 @@ msgstr "是的" msgid "« Back" msgstr "« 倒退" +#~ msgid "No chains in this table" +#~ msgstr "尚未ç¶åœ¨é€™å€‹è¡¨æ ¼ä¸" + #~ msgid "Configuration files will be kept." #~ msgstr "è¨å®šæª”將被å˜æª”" diff --git a/modules/luci-base/root/www/index.html b/modules/luci-base/root/www/index.html index 59b0d84842..e964175829 100644 --- a/modules/luci-base/root/www/index.html +++ b/modules/luci-base/root/www/index.html @@ -3,9 +3,9 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Cache-Control" content="no-cache" /> -<meta http-equiv="refresh" content="0; URL=/cgi-bin/luci" /> +<meta http-equiv="refresh" content="0; URL=/cgi-bin/luci/" /> </head> <body style="background-color: white"> -<a style="color: black; font-family: arial, helvetica, sans-serif;" href="/cgi-bin/luci">LuCI - Lua Configuration Interface</a> +<a style="color: black; font-family: arial, helvetica, sans-serif;" href="/cgi-bin/luci/">LuCI - Lua Configuration Interface</a> </body> </html> diff --git a/modules/luci-base/src/template_utils.c b/modules/luci-base/src/template_utils.c index 3979487f12..0411932ce9 100644 --- a/modules/luci-base/src/template_utils.c +++ b/modules/luci-base/src/template_utils.c @@ -258,7 +258,7 @@ static int _validate_utf8(unsigned char **s, int l, struct template_buffer *buf) break; } - /* advance beyound the last found valid continuation char */ + /* advance beyond the last found valid continuation char */ o = v; ptr += v; } diff --git a/modules/luci-mod-freifunk/htdocs/luci-static/resources/osm.js b/modules/luci-mod-freifunk/htdocs/luci-static/resources/osm.js index cae0cd66f7..48ae91cd81 100644 --- a/modules/luci-mod-freifunk/htdocs/luci-static/resources/osm.js +++ b/modules/luci-mod-freifunk/htdocs/luci-static/resources/osm.js @@ -53,8 +53,8 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { trigger: function(e) { var lonlat = map.getLonLatFromViewPortPx(e.xy); - lat=merc2lat(lonlat.lat); - lon=merc2lon(lonlat.lon); + var lat=merc2lat(lonlat.lat); + var lon=merc2lon(lonlat.lon); if(parent.document.getElementById(latfield_id)==null){ latfield=document.getElementById('osmlat'); }else{ @@ -92,7 +92,7 @@ function init(){ function drawmap() { OpenLayers.Lang.setCode('de'); - mapdiv=document.getElementById('map'); + var mapdiv=document.getElementById('map'); mapdiv.style.height=window.innerHeight+"px"; mapdiv.style.width=window.innerWidth+"px"; map = new OpenLayers.Map('map', { diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk-map/frame.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk-map/frame.htm index dbf3820f5c..bd936ac705 100644 --- a/modules/luci-mod-freifunk/luasrc/view/freifunk-map/frame.htm +++ b/modules/luci-mod-freifunk/luasrc/view/freifunk-map/frame.htm @@ -4,7 +4,7 @@ local has_latlon = false local uci = require "luci.model.uci".cursor() uci:foreach("olsrd", "LoadPlugin", function(s) - if s.library == "olsrd_nameservice.so.0.3" and s.latlon_file then + if s.library == "olsrd_nameservice" and s.latlon_file then has_latlon = true end end) diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk-map/map.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk-map/map.htm index c3951f9c63..f69401d6e3 100644 --- a/modules/luci-mod-freifunk/luasrc/view/freifunk-map/map.htm +++ b/modules/luci-mod-freifunk/luasrc/view/freifunk-map/map.htm @@ -85,7 +85,7 @@ local uci = require "luci.model.uci".cursor() uci:foreach("olsrd", "LoadPlugin", function(s) - if s.library == "olsrd_nameservice.so.0.3" and s.latlon_file then + if s.library == "olsrd_nameservice" and s.latlon_file then fd = io.open(s.latlon_file) end end) diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua index 8be354b448..bff859befa 100644 --- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua +++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua @@ -284,7 +284,7 @@ if not net:is_floating() then ifname_single = s:taboption("physical", Value, "ifname_single", translate("Interface")) ifname_single.template = "cbi/network_ifacelist" ifname_single.widget = "radio" - ifname_single.nobridges = true + ifname_single.nobridges = net:is_bridge() ifname_single.noaliases = false ifname_single.rmempty = false ifname_single.network = arg[1] @@ -341,7 +341,7 @@ end if not net:is_virtual() then ifname_multi = s:taboption("physical", Value, "ifname_multi", translate("Interface")) ifname_multi.template = "cbi/network_ifacelist" - ifname_multi.nobridges = true + ifname_multi.nobridges = net:is_bridge() ifname_multi.noaliases = true ifname_multi.rmempty = false ifname_multi.network = arg[1] diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua index 743efaa1e8..8ed39df486 100644 --- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua @@ -16,7 +16,8 @@ local acct_port, acct_secret, acct_server, anonymous_identity, ant1, ant2, mp, nasid, network, password, pmk_r1_push, privkey, privkey2, privkeypwd, privkeypwd2, r0_key_lifetime, r0kh, r1_key_holder, r1kh, reassociation_deadline, retry_timeout, ssid, st, tp, wepkey, wepslot, - wmm, wpakey, wps, disassoc_low_ack, short_preamble, beacon_int, dtim_period + wmm, wpakey, wps, disassoc_low_ack, short_preamble, beacon_int, dtim_period, + wparekey, inactivitypool, maxinactivity, listeninterval arg[1] = arg[1] or "" @@ -507,6 +508,26 @@ if hwtype == "mac80211" then dtim_period.optional = true dtim_period.placeholder = 2 dtim_period.datatype = "range(1,255)" + + + wparekey = s:taboption("advanced", Value, "wpa_group_rekey", translate("Time interval for rekeying GTK"), translate("sec")) + wparekey.optional = true + wparekey.placeholder = 600 + wparekey.datatype = "uinteger" + + inactivitypool = s:taboption("advanced", Flag , "skip_inactivity_poll", translate("Disable Inactivity Polling")) + inactivitypool.optional = true + inactivitypool.datatype = "uinteger" + + maxinactivity = s:taboption("advanced", Value, "max_inactivity", translate("Station inactivity limit"), translate("sec")) + maxinactivity.optional = true + maxinactivity.placeholder = 300 + maxinactivity.datatype = "uinteger" + + listeninterval = s:taboption("advanced", Value, "max_listen_interval", translate("Maximum allowed Listen Interval")) + listeninterval.optional = true + listeninterval.placeholder = 65535 + listeninterval.datatype = "uinteger" disassoc_low_ack = s:taboption("advanced", Flag, "disassoc_low_ack", translate("Disassociate On Low Acknowledgement"), translate("Allow AP mode to disconnect STAs based on low ACK condition")) @@ -794,7 +815,6 @@ for slot=1,4 do end end - if hwtype == "mac80211" or hwtype == "prism2" then -- Probe 802.11r support (and EAP support as a proxy for Openwrt) diff --git a/modules/luci-mod-status/luasrc/controller/admin/status.lua b/modules/luci-mod-status/luasrc/controller/admin/status.lua index 4f04cce545..5b496d83f2 100644 --- a/modules/luci-mod-status/luasrc/controller/admin/status.lua +++ b/modules/luci-mod-status/luasrc/controller/admin/status.lua @@ -8,6 +8,7 @@ function index() entry({"admin", "status", "overview"}, template("admin_status/index"), _("Overview"), 1) entry({"admin", "status", "iptables"}, template("admin_status/iptables"), _("Firewall"), 2).leaf = true + entry({"admin", "status", "iptables_dump"}, call("dump_iptables")).leaf = true entry({"admin", "status", "iptables_action"}, post("action_iptables")).leaf = true entry({"admin", "status", "routes"}, template("admin_status/routes"), _("Routes"), 3) @@ -44,6 +45,37 @@ function action_dmesg() luci.template.render("admin_status/dmesg", {dmesg=dmesg}) end +function dump_iptables(family, table) + local prefix = (family == "6") and "ip6" or "ip" + local ok, lines = pcall(io.lines, "/proc/net/%s_tables_names" % prefix) + if ok and lines then + local s + for s in lines do + if s == table then + local ipt = io.popen( + "/usr/sbin/%stables -t %s --line-numbers -nxvL" + %{ prefix, table }) + + if ipt then + luci.http.prepare_content("text/plain") + + while true do + s = ipt:read(1024) + if not s then break end + luci.http.write(s) + end + + ipt:close() + return + end + end + end + end + + luci.http.status(404, "No such table") + luci.http.prepare_content("text/plain") +end + function action_iptables() if luci.http.formvalue("zero") then if luci.http.formvalue("family") == "6" then diff --git a/modules/luci-mod-status/luasrc/view/admin_status/iptables.htm b/modules/luci-mod-status/luasrc/view/admin_status/iptables.htm index 51e428e40e..50defac90e 100644 --- a/modules/luci-mod-status/luasrc/view/admin_status/iptables.htm +++ b/modules/luci-mod-status/luasrc/view/admin_status/iptables.htm @@ -1,16 +1,11 @@ <%# Copyright 2008-2009 Steven Barth <steven@midlink.org> - Copyright 2008-2015 Jo-Philipp Wich <jow@openwrt.org> + Copyright 2008-2018 Jo-Philipp Wich <jo@mein.io> Licensed to the public under the Apache License 2.0. -%> <%- - - require "luci.sys.iptparser" - local wba = require "luci.tools.webadmin" local fs = require "nixio.fs" - local io = require "io" - local has_ip6tables = fs.access("/usr/sbin/ip6tables") local mode = 4 @@ -18,56 +13,286 @@ mode = luci.dispatcher.context.requestpath mode = tonumber(mode[#mode] ~= "iptables" and mode[#mode]) or 4 end +-%> - local ipt = luci.sys.iptparser.IptParser(mode) +<%+header%> - local rowcnt = 1 - function rowstyle() - rowcnt = rowcnt + 1 - return (rowcnt % 2) + 1 - end +<style type="text/css"> + span.jump, .cbi-tooltip-container { + border-bottom: 1px dotted blue; + cursor: pointer; + } - function link_target(t,c) - if ipt:is_custom_target(c) then - return '<a href="#rule_%s_%s">%s</a>' %{ t:lower(), c, c } - end - return c - end + ul { + list-style: none; + } + + .references { + position: relative; + } + + .references .cbi-tooltip { + left: 0 !important; + top: 1.5em !important; + } + + h4 > span { + font-size: 90%; + } +</style> + +<script type="text/javascript">//<![CDATA[ + var table_names = [ 'Filter', 'NAT', 'Mangle', 'Raw' ]; + + function create_table_section(table) + { + var idiv = document.getElementById('iptables'), + tdiv = idiv.querySelector('[data-table="%s"]'.format(table)), + title = '<%:Table%>: %s'.format(table); + + if (!tdiv) { + tdiv = E('div', { 'data-table': table }, [ + E('h3', {}, title), + E('div') + ]); + + if (idiv.firstElementChild.nodeName.toLowerCase() === 'p') + idiv.removeChild(idiv.firstElementChild); + + var added = false, thisIdx = table_names.indexOf(table); + + idiv.querySelectorAll('[data-table]').forEach(function(child) { + var childIdx = table_names.indexOf(child.getAttribute('data-table')); + + if (added === false && childIdx > thisIdx) { + idiv.insertBefore(tdiv, child); + added = true; + } + }); + + if (added === false) + idiv.appendChild(tdiv); + } + + return tdiv.lastElementChild; + } + + function create_chain_section(table, chain, policy, packets, bytes, references) + { + var tdiv = create_table_section(table), + cdiv = tdiv.querySelector('[data-chain="%s"]'.format(chain)), + title; + + if (policy) + title = '<%:Chain%> <em>%s</em> <span>(<%:Policy%>: <em>%s</em>, %d <%:Packets%>, %.2mB <%:Traffic%>)</span>'.format(chain, policy, packets, bytes); + else + title = '<%:Chain%> <em>%s</em> <span class="references">(%d <%:References%>)</span>'.format(chain, references); + + if (!cdiv) { + cdiv = E('div', { 'data-chain': chain }, [ + E('h4', { 'id': 'rule_%s_%s'.format(table.toLowerCase(), chain) }, title), + E('div', { 'class': 'table' }, [ + E('div', { 'class': 'tr table-titles' }, [ + E('div', { 'class': 'th center' }, '<%:Pkts.%>'), + E('div', { 'class': 'th center' }, '<%:Traffic%>'), + E('div', { 'class': 'th' }, '<%:Target%>'), + E('div', { 'class': 'th' }, '<%:Prot.%>'), + E('div', { 'class': 'th' }, '<%:In%>'), + E('div', { 'class': 'th' }, '<%:Out%>'), + E('div', { 'class': 'th' }, '<%:Source%>'), + E('div', { 'class': 'th' }, '<%:Destination%>'), + E('div', { 'class': 'th' }, '<%:Options%>'), + E('div', { 'class': 'th' }, '<%:Comment%>') + ]) + ]) + ]); + + tdiv.appendChild(cdiv); + } + else { + cdiv.firstElementChild.innerHTML = title; + } + + return cdiv.lastElementChild; + } + + function update_chain_section(chaintable, rows) + { + if (!chaintable) + return; + + cbi_update_table(chaintable, rows, '<%:No rules in this chain.%>'); - function link_iface(i) - local net = wba.iface_get_network(i) - if net and i ~= "lo" then - return '<a href="%s">%s</a>' %{ - url("admin/network/network", net), i + if (rows.length === 0 && + document.querySelector('form > [data-hide-empty="true"]')) + chaintable.parentNode.style.display = 'none'; + else + chaintable.parentNode.style.display = ''; + + chaintable.parentNode.setAttribute('data-empty', rows.length === 0); + } + + function hide_empty(btn) + { + var hide = (btn.getAttribute('data-hide-empty') === 'false'); + + btn.setAttribute('data-hide-empty', hide); + btn.value = hide ? '<%:Show empty chains%>' : '<%:Hide empty chains%>'; + btn.blur(); + + document.querySelectorAll('[data-chain][data-empty="true"]') + .forEach(function(chaintable) { + chaintable.style.display = hide ? 'none' : ''; + }); + } + + function jump_target(ev) + { + var link = ev.target, + table = findParent(link, '[data-table]').getAttribute('data-table'), + chain = link.textContent, + num = +link.getAttribute('data-num'), + elem = document.getElementById('rule_%s_%s'.format(table.toLowerCase(), chain)); + + if (elem) { + (document.documentElement || document.body.parentNode || document.body).scrollTop = elem.offsetTop - 40; + elem.classList.remove('flash'); + void elem.offsetWidth; + elem.classList.add('flash'); + + if (num) { + var rule = elem.nextElementSibling.childNodes[num]; + if (rule) { + rule.classList.remove('flash'); + void rule.offsetWidth; + rule.classList.add('flash'); + } } + } + } - end - return i - end + function parse_output(table, s) + { + var current_chain = null; + var current_rules = []; + var seen_chains = {}; + var chain_refs = {}; + var re = /([^\n]*)\n/g; + var m, m2; - local tables = { "Filter", "NAT", "Mangle", "Raw" } - if mode == 6 then - tables = { "Filter", "Mangle", "Raw" } - local ok, lines = pcall(io.lines, "/proc/net/ip6_tables_names") - if ok and lines then - local line - for line in lines do - if line == "nat" then - tables = { "Filter", "NAT", "Mangle", "Raw" } - end - end - end - end --%> + while ((m = re.exec(s)) != null) { + if (m[1].match(/^Chain (.+) \(policy (\w+) (\d+) packets, (\d+) bytes\)$/)) { + var chain = RegExp.$1, + policy = RegExp.$2, + packets = +RegExp.$3, + bytes = +RegExp.$4; -<%+header%> + update_chain_section(current_chain, current_rules); -<style type="text/css"> - span:target { - color: blue; - text-decoration: underline; + seen_chains[chain] = true; + current_chain = create_chain_section(table, chain, policy, packets, bytes); + current_rules = []; + } + else if (m[1].match(/^Chain (.+) \((\d+) references\)$/)) { + var chain = RegExp.$1, + references = +RegExp.$2; + + update_chain_section(current_chain, current_rules); + + seen_chains[chain] = true; + current_chain = create_chain_section(table, chain, null, null, null, references); + current_rules = []; + } + else if (m[1].match(/^num /)) { + continue; + } + else if ((m2 = m[1].match(/^(\d+) +(\d+) +(\d+) +(.*?) +(\S+) +(\S*) +(\S+) +(\S+) +([a-f0-9:.]+\/\d+) +([a-f0-9:.]+\/\d+) +(.+)$/)) !== null) { + var num = +m2[1], + pkts = +m2[2], + bytes = +m2[3], + target = m2[4], + proto = m2[5], + indev = m2[7], + outdev = m2[8], + srcnet = m2[9], + dstnet = m2[10], + options = m2[11] || '-', + comment = '-'; + + options = options.trim().replace(/(?:^| )\/\* (.+) \*\//, + function(m1, m2) { + comment = m2.replace(/^!fw3(: |$)/, '').trim() || '-'; + return ''; + }) || '-'; + + current_rules.push([ + '%.2m'.format(pkts).nobr(), + '%.2mB'.format(bytes).nobr(), + target ? '<span class="target">%s</span>'.format(target) : '-', + proto, + (indev !== '*') ? '<span class="ifacebadge">%s</span>'.format(indev) : '*', + (outdev !== '*') ? '<span class="ifacebadge">%s</span>'.format(outdev) : '*', + srcnet, + dstnet, + options, + comment + ]); + + if (target) { + chain_refs[target] = chain_refs[target] || []; + chain_refs[target].push([ current_chain, num ]); + } + } + } + + update_chain_section(current_chain, current_rules); + + document.querySelectorAll('[data-table="%s"] [data-chain]'.format(table)) + .forEach(function(cdiv) { + if (!seen_chains[cdiv.getAttribute('data-chain')]) { + cdiv.parentNode.removeChild(cdiv); + return; + } + + cdiv.querySelectorAll('.target').forEach(function(tspan) { + if (seen_chains[tspan.textContent]) { + tspan.classList.add('jump'); + tspan.addEventListener('click', jump_target); + } + }); + + cdiv.querySelectorAll('.references').forEach(function(rspan) { + var refs = chain_refs[cdiv.getAttribute('data-chain')]; + if (refs && refs.length) { + rspan.classList.add('cbi-tooltip-container'); + rspan.appendChild(E('small', { 'class': 'cbi-tooltip ifacebadge', 'style': 'top:1em; left:auto' }, [ E('ul') ])); + + refs.forEach(function(ref) { + var chain = ref[0].parentNode.getAttribute('data-chain'), + num = ref[1]; + + rspan.lastElementChild.lastElementChild.appendChild(E('li', {}, [ + '<%:Chain%> ', + E('span', { + 'class': 'jump', + 'data-num': num, + 'onclick': 'jump_target(event)' + }, chain), + ', <%:Rule%> #%d'.format(num) + ])); + }); + } + }); + }); } -</style> + + table_names.forEach(function(table) { + XHR.poll(5, '<%=url("admin/status/iptables_dump", tostring(mode))%>/' + table.toLowerCase(), null, + function (xhr) { + parse_output(table, xhr.responseText); + }); + }); +//]]></script> <h2 name="content"><%:Firewall Status%></h2> @@ -78,78 +303,18 @@ </ul> <% end %> -<div class="cbi-map" style="position: relative"> - +<div style="position: relative"> <form method="post" action="<%=url("admin/status/iptables_action")%>" style="position: absolute; right: 0"> <input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="family" value="<%=mode%>" /> + <input type="button" class="cbi-button" data-hide-empty="false" value="<%:Hide empty chains%>" onclick="hide_empty(this)" /> <input type="submit" class="cbi-button" name="zero" value="<%:Reset Counters%>" /> <input type="submit" class="cbi-button" name="restart" value="<%:Restart Firewall%>" /> </form> +</div> - <div class="cbi-section"> - - <% for _, tbl in ipairs(tables) do chaincnt = 0 %> - <h3><%:Table%>: <%=tbl%></h3> - - <% for _, chain in ipairs(ipt:chains(tbl)) do - rowcnt = 0 - chaincnt = chaincnt + 1 - chaininfo = ipt:chain(tbl, chain) - %> - <h4 id="rule_<%=tbl:lower()%>_<%=chain%>"> - <%:Chain%> <em><%=chain%></em> - (<%- if chaininfo.policy then -%> - <%:Policy%>: <em><%=chaininfo.policy%></em>, <%:Packets%>: <%=chaininfo.packets%>, <%:Traffic%>: <%=wba.byte_format(chaininfo.bytes)-%> - <%- else -%> - <%:References%>: <%=chaininfo.references-%> - <%- end -%>) - </h4> - - <div class="cbi-section-node"> - <div class="table" style="font-size:90%"> - <div class="tr table-titles cbi-rowstyle-<%=rowstyle()%>"> - <div class="th hide-xs"><%:Pkts.%></div> - <div class="th nowrap"><%:Traffic%></div> - <div class="th col-5"><%:Target%></div> - <div class="th"><%:Prot.%></div> - <div class="th"><%:In%></div> - <div class="th"><%:Out%></div> - <div class="th"><%:Source%></div> - <div class="th"><%:Destination%></div> - <div class="th col-9 hide-xs"><%:Options%></div> - </div> - - <% for _, rule in ipairs(ipt:find({table=tbl, chain=chain})) do %> - <div class="tr cbi-rowstyle-<%=rowstyle()%>"> - <div class="td"><%=rule.packets%></div> - <div class="td nowrap"><%=wba.byte_format(rule.bytes)%></div> - <div class="td col-5"><%=rule.target and link_target(tbl, rule.target) or "-"%></div> - <div class="td"><%=rule.protocol%></div> - <div class="td"><%=link_iface(rule.inputif)%></div> - <div class="td"><%=link_iface(rule.outputif)%></div> - <div class="td"><%=rule.source%></div> - <div class="td"><%=rule.destination%></div> - <div class="td col-9 hide-xs"><%=#rule.options > 0 and luci.util.pcdata(table.concat(rule.options, " ")) or "-"%></div> - </div> - <% end %> - - <% if rowcnt == 1 then %> - <div class="tr cbi-rowstyle-<%=rowstyle()%>"> - <div class="td" colspan="9"><em><%:No rules in this chain%></em></div> - </div> - <% end %> - </div> - </div> - <% end %> - - <% if chaincnt == 0 then %> - <em><%:No chains in this table%></em> - <% end %> - - <br /><br /> - <% end %> - </div> +<div id="iptables"> + <p><em><%:Collecting data...%></em></p> </div> <%+footer%> diff --git a/modules/luci-mod-status/luasrc/view/admin_status/wireless.htm b/modules/luci-mod-status/luasrc/view/admin_status/wireless.htm index 8ec43cb0e6..03ea2bef01 100644 --- a/modules/luci-mod-status/luasrc/view/admin_status/wireless.htm +++ b/modules/luci-mod-status/luasrc/view/admin_status/wireless.htm @@ -61,6 +61,7 @@ var label_rate_peak; var label_scale; + var label_scale_2; /* wait for SVG */ diff --git a/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua index 02fe9cc05e..6f0921fdcf 100644 --- a/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua +++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua @@ -233,7 +233,7 @@ ck.cfgvalue = function(self, section) end -swap = m:section(TypedSection, "swap", "SWAP", translate("If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>.")) +swap = m:section(TypedSection, "swap", translate("SWAP"), translate("If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>.")) swap.anonymous = true swap.addremove = true swap.template = "cbi/tblsection" diff --git a/modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua index c7fdfcddba..7558d42161 100644 --- a/modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua +++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua @@ -9,6 +9,7 @@ local conf = require "luci.config" local m, s, o local has_ntpd = fs.access("/usr/sbin/ntpd") +local has_zram = fs.access("/etc/init.d/zram") m = Map("system", translate("System"), translate("Here you can configure the basic aspects of your device like its hostname or the timezone.")) m:chain("luci") @@ -21,7 +22,7 @@ s.addremove = false s:tab("general", translate("General Settings")) s:tab("logging", translate("Logging")) s:tab("language", translate("Language and Style")) - +if has_zram then s:tab("zram", translate("ZRam Settings")) end -- -- System Properties @@ -106,7 +107,30 @@ o:value(9, translate("Warning")) -- --- Langauge & Style +-- Zram Properties +-- +if has_zram then + o = s:taboption("zram", Value, "zram_size_mb", translate("ZRam Size"), translate("Size of the ZRam device in megabytes")) + o.optional = true + o.placeholder = 16 + o.datatype = "uinteger" + + o = s:taboption("zram", ListValue, "zram_comp_algo", translate("ZRam Compression Algorithm")) + o.optional = true + o.placeholder = lzo + o:value("lzo", "lzo") + o:value("lz4", "lz4") + o:value("deflate", "deflate") + + o = s:taboption("zram", Value, "zram_comp_streams", translate("ZRam Compression Streams"), translate("Number of parallel threads used for compression")) + o.optional = true + o.placeholder = 1 + o.datatype = "uinteger" +end + + +-- +-- Language & Style -- o = s:taboption("language", ListValue, "_lang", translate("Language")) diff --git a/modules/luci-mod-system/luasrc/view/admin_system/packages.htm b/modules/luci-mod-system/luasrc/view/admin_system/packages.htm index 0adbcb4934..9e364d69ae 100644 --- a/modules/luci-mod-system/luasrc/view/admin_system/packages.htm +++ b/modules/luci-mod-system/luasrc/view/admin_system/packages.htm @@ -102,16 +102,16 @@ end <div class="cbi-value"> <label class="cbi-value-title"><%:Download and install package%>:</label> <div class="cbi-value-field"> - <span><input type="text" name="url" size="30" value="" /></span> - <input class="cbi-button cbi-button-save" type="submit" name="go" value="<%:OK%>" /> + <span><input type="text" name="url" size="30" <% if no_lists then %>disabled="disabled" placeholder="<%:Please update package lists first%>"<% end %> value="" /></span> + <input class="cbi-button cbi-button-save" type="submit" name="go" <% if no_lists then %>disabled="disabled"<% end %> value="<%:OK%>" /> </div> </div> <div class="cbi-value cbi-value-last"> <label class="cbi-value-title"><%:Filter%>:</label> <div class="cbi-value-field"> - <span><input type="text" name="query" size="20" value="<%=pcdata(query)%>" /></span> - <input type="submit" class="cbi-button cbi-button-action" name="search" value="<%:Find package%>" /> + <span><input type="text" name="query" size="20" <% if no_lists then %>disabled="disabled" placeholder="<%:Please update package lists first%>"<% else %>value="<%=pcdata(query)%>"<% end %> /></span> + <input type="submit" class="cbi-button cbi-button-action" name="search" <% if no_lists then %>disabled="disabled"<% end %> value="<%:Find package%>" /> </div> </div> </div> diff --git a/protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua b/protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua index 1b2e23cc42..e05e3a47fd 100644 --- a/protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua +++ b/protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua @@ -47,7 +47,9 @@ dialnumber.placeholder = "*99***1#" if luci.model.network:has_ipv6() then - ipv6 = section:taboption("advanced", ListValue, "ipv6") + ipv6 = section:taboption("advanced", ListValue, "ipv6", + translate("Obtain IPv6-Address")) + ipv6:value("auto", translate("Automatic")) ipv6:value("0", translate("Disabled")) ipv6:value("1", translate("Manual")) diff --git a/protocols/luci-proto-hnet/Makefile b/protocols/luci-proto-hnet/Makefile new file mode 100644 index 0000000000..10beb032bc --- /dev/null +++ b/protocols/luci-proto-hnet/Makefile @@ -0,0 +1,17 @@ +# +# Copyright (C) 2018 Florian Eckert <fe@dev.tdt.de> +# +# This is free software, licensed under the Apache License, Version 2.0 . +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=Support for hnet +LUCI_DEPENDS:= + +PKG_LICENSE:=Apache-2.0 +PKG_MAINTAINER:=Steven Barth <steven@midlink.org> + +include ../../luci.mk + +# call BuildPackage - OpenWrt buildroot signature diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua b/protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua index 2ed34faf71..2ed34faf71 100644 --- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua +++ b/protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua diff --git a/protocols/luci-proto-ipv6/luasrc/model/network/proto_hnet.lua b/protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua index f525061be4..f525061be4 100644 --- a/protocols/luci-proto-ipv6/luasrc/model/network/proto_hnet.lua +++ b/protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua diff --git a/protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua b/protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua index 3afb7de4f5..f87b30fcc1 100644 --- a/protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua +++ b/protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua @@ -4,7 +4,7 @@ local netmod = luci.model.network local _, p -for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "l2tp", "pppossh"}) do +for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "l2tp"}) do local proto = netmod:register_protocol(p) @@ -19,8 +19,6 @@ for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "l2tp", "pppossh"}) do return luci.i18n.translate("PPPoATM") elseif p == "l2tp" then return luci.i18n.translate("L2TP") - elseif p == "pppossh" then - return luci.i18n.translate("PPPoSSH") end end @@ -39,8 +37,6 @@ for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "l2tp", "pppossh"}) do return "ppp-mod-pppoa" elseif p == "l2tp" then return "xl2tpd" - elseif p == "pppossh" then - return "pppossh" end end @@ -53,8 +49,6 @@ for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "l2tp", "pppossh"}) do return (nixio.fs.glob("/usr/lib/pppd/*/pptp.so")() ~= nil) elseif p == "l2tp" then return nixio.fs.access("/lib/netifd/proto/l2tp.sh") - elseif p == "pppossh" then - return nixio.fs.access("/lib/netifd/proto/pppossh.sh") else return nixio.fs.access("/lib/netifd/proto/ppp.sh") end diff --git a/protocols/luci-proto-pppossh/Makefile b/protocols/luci-proto-pppossh/Makefile new file mode 100644 index 0000000000..1c0a63b0f2 --- /dev/null +++ b/protocols/luci-proto-pppossh/Makefile @@ -0,0 +1,17 @@ +# +# Copyright (C) 2018 Florian Eckert <fe@dev.tdt.de> +# +# This is free software, licensed under the Apache License, Version 2.0 . +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=Support for pppossh +LUCI_DEPENDS:=+pppossh + +PKG_LICENSE:=Apache-2.0 +PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com> + +include ../../luci.mk + +# call BuildPackage - OpenWrt buildroot signature diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppossh.lua b/protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua index e53262b5dc..e53262b5dc 100644 --- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppossh.lua +++ b/protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua diff --git a/protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua b/protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua new file mode 100644 index 0000000000..a0e2a510c9 --- /dev/null +++ b/protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua @@ -0,0 +1,40 @@ +-- Copyright 2018 Florian Eckert <fe@dev.tdt.de> +-- Licensed to the public under the Apache License 2.0. + +local netmod = luci.model.network + +local proto = netmod:register_protocol("pppossh") + +function proto.get_i18n(self) + return luci.i18n.translate("PPPoSSH") +end + +function proto.ifname(self) + return "pppossh-" .. self.sid +end + +function proto.opkg_package(self) + return "pppossh" +end + +function proto.is_installed(self) + return nixio.fs.access("/lib/netifd/proto/pppossh.sh") +end + +function proto.is_floating(self) + return true +end + +function proto.is_virtual(self) + return true +end + +function proto.get_interfaces(self) + return nil +end + +function proto.contains_interface(self, ifc) + return (netmod:ifnameof(ifc) == self:ifname()) +end + +netmod:register_pattern_virtual("^pppossh%-%w") diff --git a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css index 8fa45d9809..6961bfe2d7 100644 --- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css @@ -125,7 +125,7 @@ html, body { margin: 0px; padding: 0px; height: 100%; - font-family: Microsoft Yahei, WenQuanYi Micro Hei, sans-serif, "Helvetica Neue", Helvetica, Hiragino Sans GB; + font-family: var(--font-body, "Microsoft Yahei", "WenQuanYi Micro Hei", "sans-serif", "Helvetica Neue", "Helvetica", "Hiragino Sans GB"); } select { @@ -154,7 +154,7 @@ input, select:not([multiple="multiple"]):focus, input:focus { - border-color: #0099CC; + border-color: var(--main-color, #0099CC); } select[multiple="multiple"] { @@ -162,7 +162,7 @@ select[multiple="multiple"] { } code { - color: #0099CC; + color: var(--main-color, #0099CC); } abbr { @@ -235,8 +235,8 @@ footer > a { .main > .loading > span > .loading-img { animation: anim-rotate 2s infinite linear; - margin-right: 0.2rem; display: inline-block; + margin: 5rem; } @keyframes anim-rotate { @@ -457,7 +457,7 @@ header > .fill > .container > .status { } .main > .main-left > .nav > .slide > .slide-menu > .active:hover { - background-color: #0099CC; + background-color: var(--main-color, #0099CC); cursor: hand; } @@ -615,7 +615,7 @@ div > .table > .tbody > .tr:nth-of-type(2n) { #conns > div > div, #memtotal > div > div { height: 100% !important; - background-color: #0099CC !important; + background-color: var(--main-color, #0099CC) !important; } /* fix multiple table */ @@ -796,13 +796,13 @@ td > table > tbody > tr > td, .tabs > li[class~="active"], .tabs > li:hover { cursor: pointer; - border-bottom: 0.2rem solid #0099CC; - color: #0099CC; + border-bottom: 0.2rem solid var(--main-color, #0099CC); + color: var(--main-color, #0099CC); margin-bottom: -0.18751rem; } .tabs > li[class~="active"] > a { - color: #0099cc; + color: var(--main-color, #0099CC); } .tabs > li:hover { @@ -1611,7 +1611,7 @@ header > .container > .pull-right > * { } .node-main-login > .main .cbi-value-title { - width: 7rem; + width: 8rem; } .node-main-login > .main #maincontent { diff --git a/themes/luci-theme-material/htdocs/luci-static/material/custom.css b/themes/luci-theme-material/htdocs/luci-static/material/custom.css index b32eb2af1b..e53ac6db4c 100644 --- a/themes/luci-theme-material/htdocs/luci-static/material/custom.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/custom.css @@ -1,9 +1,11 @@ :root { + --main-color: #0099CC; --header-bg: #0099CC; --header-color: #FFFFFF; --menu-bg-color: #FFFFFF; --menu-color: #404040; --submenu-bg-hover: #D4D4D4; --submenu-bg-hover-active: #0099CC; + --font-body: "Microsoft Yahei", "WenQuanYi Micro Hei", "sans-serif", "Helvetica Neue", "Helvetica", "Hiragino Sans GB"; } diff --git a/themes/luci-theme-material/htdocs/luci-static/material/js/script.js b/themes/luci-theme-material/htdocs/luci-static/material/js/script.js index 583d66d91f..27bb5ac038 100755 --- a/themes/luci-theme-material/htdocs/luci-static/material/js/script.js +++ b/themes/luci-theme-material/htdocs/luci-static/material/js/script.js @@ -35,6 +35,7 @@ var nodeUrl = ""; (function(node){ + var luciLocation; if (node[0] == "admin"){ luciLocation = [node[1], node[2]]; }else{ |