diff options
56 files changed, 1220 insertions, 551 deletions
diff --git a/applications/luci-app-adblock/luasrc/view/adblock/query.htm b/applications/luci-app-adblock/luasrc/view/adblock/query.htm index 2cf7e5baa..88108c3f2 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/query.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/query.htm @@ -11,7 +11,7 @@ This is free software, licensed under the Apache License, Version 2.0 function update_status(data) { - var domain = data.value; + var domain = data.value || data.placeholder; var input = document.getElementById('query_input'); var output = document.getElementById('query_output'); @@ -48,7 +48,7 @@ This is free software, licensed under the Apache License, Version 2.0 <div class="cbi-section"> <div class="cbi-section-descr"><%:This form allows you to query active block lists for certain domains, e.g. for whitelisting.%></div> <div style="width:33%; float:left;"> - <input type="text" value="google.com" name="input" /> + <input type="text" placeholder="google.com" name="input" /> <input type="button" value="<%:Query%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.input)" /> </div> <br style="clear:both" /> diff --git a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm index 3f4d64259..4f7cfbf8a 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm @@ -18,60 +18,50 @@ This is free software, licensed under the Apache License, Version 2.0 //<![CDATA[ function status_update(json) { - var view = document.getElementById("value_1"); - var btn1 = document.getElementById("btn1"); - var btn1_running = document.getElementById("btn1_running"); - var btn2 = document.getElementById("btn2"); - var btn2_running = document.getElementById("btn2_running"); - var input = json.data.adblock_status; + var btn1 = document.getElementById("btn1"); + var btn1_running = document.getElementById("btn1_running"); + var btn2 = document.getElementById("btn2"); + var btn2_running = document.getElementById("btn2_running"); + var input = json.data.adblock_status || "-"; - view.innerHTML = input || "-"; - if (input === "enabled") - { - btn1.value = "<%:Suspend%>"; - btn1.name = "do_suspend"; - btn2.value = "<%:Refresh%>"; - btn2.name = "do_refresh"; - btn1.disabled = false; - running(btn1_running, 0); - btn2.disabled = false; - running(btn2_running, 0); - } - else if (input === "paused") - { - btn1.value = "<%:Resume%>"; - btn1.name = "do_resume"; - btn2.value = "<%:Refresh%>"; - btn2.name = "do_refresh"; - btn1.disabled = false; - running(btn1_running, 0); - btn2.disabled = false; - running(btn2_running, 0); - } - else - { - btn1.value = "<%:Suspend%>"; - btn1.name = "do_suspend"; - btn2.value = "<%:Refresh%>"; - btn2.name = "do_refresh"; - btn1.disabled = true; - btn2.disabled = true; - } - view = document.getElementById("value_2"); - input = json.data.adblock_version; - view.innerHTML = input || "-"; - view = document.getElementById("value_3"); - input = json.data.fetch_utility; - view.innerHTML = input || "-"; - view = document.getElementById("value_4"); - input = json.data.dns_backend; - view.innerHTML = input || "-"; - view = document.getElementById("value_5"); - input = json.data.overall_domains; - view.innerHTML = input || "-"; - view = document.getElementById("value_6"); - input = json.data.last_rundate; - view.innerHTML = input || "-"; + document.getElementById("value_1").innerHTML = input; + if (input === "enabled") + { + btn1.value = "<%:Suspend%>"; + btn1.name = "do_suspend"; + btn2.value = "<%:Refresh%>"; + btn2.name = "do_refresh"; + btn1.disabled = false; + running(btn1_running, 0); + btn2.disabled = false; + running(btn2_running, 0); + } + else if (input === "paused") + { + btn1.value = "<%:Resume%>"; + btn1.name = "do_resume"; + btn2.value = "<%:Refresh%>"; + btn2.name = "do_refresh"; + btn1.disabled = false; + running(btn1_running, 0); + btn2.disabled = false; + running(btn2_running, 0); + } + else + { + btn1.value = "<%:Suspend%>"; + btn1.name = "do_suspend"; + btn2.value = "<%:Refresh%>"; + btn2.name = "do_refresh"; + btn1.disabled = true; + btn2.disabled = true; + } + + document.getElementById("value_2").innerHTML = json.data.adblock_version || "-"; + document.getElementById("value_3").innerHTML = json.data.fetch_utility || "-"; + document.getElementById("value_4").innerHTML = json.data.dns_backend || "-"; + document.getElementById("value_5").innerHTML = json.data.overall_domains || "-"; + document.getElementById("value_6").innerHTML = json.data.last_rundate || "-"; } function btn_action(action) @@ -116,32 +106,42 @@ This is free software, licensed under the Apache License, Version 2.0 } } + function reset_view() + { + document.getElementById("btn1").value = "<%:Suspend%>"; + document.getElementById("btn1").name = "do_suspend"; + document.getElementById("btn2").value = "<%:Refresh%>"; + document.getElementById("btn2").name = "do_refresh"; + document.getElementById("btn1").disabled = true; + document.getElementById("btn2").disabled = true; + document.getElementById("value_1").innerHTML = "-"; + document.getElementById("value_2").innerHTML = "-"; + document.getElementById("value_3").innerHTML = "-"; + document.getElementById("value_4").innerHTML = "-"; + document.getElementById("value_5").innerHTML = "-"; + document.getElementById("value_6").innerHTML = "-"; + } + XHR.get('<%=luci.dispatcher.build_url("admin", "services", "adblock", "status")%>', null, function(x, json_info) { - if (!x || !json_info) + if (!x || !json_info || !json_info.data) { - var btn1 = document.getElementById("btn1"); - var btn2 = document.getElementById("btn2"); - btn1.value = "<%:Suspend%>"; - btn1.name = "do_suspend"; - btn2.value = "<%:Refresh%>"; - btn2.name = "do_refresh"; - btn1.disabled = true; - btn2.disabled = true; + reset_view(); return; } - status_update(json_info) + status_update(json_info); }); XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "adblock", "status")%>', null, function(x, json_info) { - if (!x || !json_info) + if (!x || !json_info || !json_info.data) { + reset_view(); return; } - status_update(json_info) + status_update(json_info); }); //]]> </script> diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po index 3a940a246..888ecd945 100644 --- a/applications/luci-app-adblock/po/ja/adblock.po +++ b/applications/luci-app-adblock/po/ja/adblock.po @@ -8,7 +8,7 @@ msgstr "" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.7\n" +"X-Generator: Poedit 2.1.1\n" "Language: ja\n" msgid "'Jail' Blocklist Creation" @@ -37,7 +37,7 @@ msgid "Advanced" msgstr "詳細設定" msgid "Archive Categories" -msgstr "" +msgstr "アーカイブ カテゴリ" msgid "Backup Directory" msgstr "バックアップ先 ディレクトリ" @@ -49,12 +49,14 @@ msgid "Blocklist Sources" msgstr "ブロックリスト提供元" msgid "Blocklist not found!" -msgstr "" +msgstr "ブロックリストが見つかりません！" 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 " @@ -180,10 +182,14 @@ msgid "" "List of available network interfaces. Usually the startup will be triggered " "by the 'wan' interface." msgstr "" +"利用可能なネットワーク インターフェースの一覧です。通常、スタートアップは " +"'wan' インターフェースによってトリガされます。" msgid "" "List of supported DNS backends with their default list export directory." msgstr "" +"サポートされる DNS バックエンドと、それぞれのデフォルトのリスト出力先の一覧で" +"す。" msgid "List of supported and fully pre-configured download utilities." msgstr "サポートされ、かつ設定済のダウンロード ユーティリティの一覧です。" @@ -192,7 +198,7 @@ msgid "Loading" msgstr "読込中" msgid "Low Priority Service" -msgstr "" +msgstr "低優先度サービス" msgid "Max. Download Queue" msgstr "ダウンロード キューの上限" @@ -236,17 +242,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 "" +"'lan' ゾーンからの全 DNS クエリをローカル リゾルバにリダイレクトします。これ" +"は、53, 853, 5353 の各ポートにおける UDP, TCP プロトコルに適用されます。" msgid "Refresh" -msgstr "" +msgstr "リフレッシュ" msgid "Refresh Blocklist Sources" -msgstr "" +msgstr "ブロックリスト提供元のリフレッシュ" msgid "Resume" msgstr "再開" @@ -264,16 +274,21 @@ msgid "" "Send notification emails in case of a processing error or if domain count is " "≤ 0." msgstr "" +"処理エラーまたはドメイン カウントが 0 以下の場合、通知メールを送信します。" msgid "" "Set the nice level to 'low priority' and the adblock background processing " "will take less resources from the system." msgstr "" +"nice値（優先度）を '低優先度' に設定し、adblock バックグラウンド処理のシステ" +"ムリソース使用量を抑制します。" msgid "" "Size of the download queue to handle downloads & list processing in " "parallel (default '4')." msgstr "" +"ダウンロードの制御とリストの処理を同時並行的に行うダウンロード キューのサイズ" +"です（規定値: '4'）。" msgid "Startup Trigger" msgstr "スタートアップ トリガ" @@ -300,18 +315,22 @@ msgstr "" "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 "" +"このフォームでは、Adblock ブラックリスト (%s) の内容を変更することができま" +"す。" msgid "" "This form allows you to modify the content of the adblock whitelist (%s)." msgstr "" +"このフォームでは、Adblock ホワイトリスト (%s) の内容を変更することができま" +"す。" msgid "" "This form allows you to modify the content of the main adblock configuration " @@ -364,106 +383,3 @@ 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 "" -#~ "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）。<br />" - -#~ msgid "Redirect all DNS queries from 'lan' zone to the local resolver." -#~ msgstr "" -#~ "'lan' ゾーンからの全 DNS クエリを、ローカル リゾルバにリダイレクトします。" - -#~ 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 "無効" - -#~ msgid "enabled" -#~ msgstr "有効" - -#~ msgid "error" -#~ msgstr "エラー" - -#~ msgid "n/a" -#~ msgstr "利用不可" - -#~ msgid "paused" -#~ msgstr "一時停止" - -#~ msgid "running" -#~ msgstr "実行中" - -#~ msgid "Categories" -#~ msgstr "カテゴリー" - -#~ msgid "Invalid domain specified!" -#~ msgstr "無効なドメインが指定されています！" diff --git a/applications/luci-app-firewall/po/ru/firewall.po b/applications/luci-app-firewall/po/ru/firewall.po index 79c0f0b9a..b73d963d8 100644 --- a/applications/luci-app-firewall/po/ru/firewall.po +++ b/applications/luci-app-firewall/po/ru/firewall.po @@ -3,12 +3,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Project-Id-Version: LuCI: firewall\n" "POT-Creation-Date: 2013-09-05 16:02+0200\n" -"PO-Revision-Date: 2018-01-18 21:58+0300\n" +"PO-Revision-Date: 2018-09-06 09:29+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" -"Last-Translator: Vladimir aka sunny <picfun@ya.ru>\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" "Language: ru\n" @@ -43,13 +43,13 @@ msgid "<var>%s</var> and limit to %s" msgstr "<var>%s</var> с пределом в %s" msgid "Accept forward" -msgstr "Принять перенаправление" +msgstr "Принимать перенаправляемый трафик" msgid "Accept input" -msgstr "Принять входящий трафик" +msgstr "Принимать входящий трафик" msgid "Accept output" -msgstr "" +msgstr "Принимать исходящий трафик" msgid "Action" msgstr "Действие" @@ -64,7 +64,7 @@ msgid "Advanced Settings" msgstr "Дополнительные настройки" msgid "Allow forward from <em>source zones</em>:" -msgstr "Разрешить перенаправление из <em>'зон-источников'</em>:" +msgstr "Разрешить перенаправление из <em>'зон источников'</em>:" msgid "Allow forward to <em>destination zones</em>:" msgstr "Разрешить перенаправление в <em>'зоны назначения'</em>:" @@ -84,9 +84,9 @@ msgid "" "each firewall restart, right after the default ruleset has been loaded." msgstr "" "Пользовательские правила позволяют выполнять произвольные команды iptables, " -"которые не охвачены рамками межсетевого экрана.<br />Команды выполняются " -"после каждой перезагрузки межсетевого экрана, сразу после загрузки набора " -"правил по умолчанию." +"которые не охвачены рамками межсетевого экрана. Команды выполняются после " +"каждой перезагрузки межсетевого экрана, сразу после загрузки набора правил " +"по умолчанию." msgid "Destination IP address" msgstr "IP-адрес назначения" @@ -104,28 +104,28 @@ msgid "Disable" msgstr "Отключить" msgid "Discard forward" -msgstr "Отключить перенаправление" +msgstr "Отклонять перенаправляемый трафик" msgid "Discard input" -msgstr "Отключить входящий трафик" +msgstr "Отклонять входящий трафик" msgid "Discard output" -msgstr "" +msgstr "Отклонять исходящий трафик" msgid "Do not rewrite" msgstr "Не перезаписывать" msgid "Do not track forward" -msgstr "Не отслеживать перенаправление" +msgstr "Не отслеживать перенаправляемый трафик" msgid "Do not track input" msgstr "Не отслеживать входящий трафик" msgid "Do not track output" -msgstr "" +msgstr "Не отслеживать исходящий трафик" msgid "Drop invalid packets" -msgstr "Не пропускать<br />некорректные пакеты" +msgstr "Отбрасывать некорректные пакеты" msgid "Enable" msgstr "Включить" @@ -134,13 +134,13 @@ msgid "Enable NAT Loopback" msgstr "Включить NAT Loopback" msgid "Enable SYN-flood protection" -msgstr "Включить защиту<br />от SYN-flood атак" +msgstr "Включить защиту от SYN-flood атак" msgid "Enable logging on this zone" msgstr "Включить журналирование в этой зоне" msgid "Experimental feature. Not fully compatible with QoS/SQM." -msgstr "" +msgstr "Экспериментальный функционал. Не полностью совместим с QoS/SQM." msgid "External IP address" msgstr "Внешний IP-адрес" @@ -152,7 +152,7 @@ msgid "External zone" msgstr "Внешняя зона" msgid "Extra arguments" -msgstr "Дополнительные<br />аргументы" +msgstr "Дополнительные аргументы" msgid "Firewall" msgstr "Межсетевой экран" @@ -176,7 +176,7 @@ msgid "Forward" msgstr "Перенаправление" msgid "Forward to" -msgstr "Перенаправлять из" +msgstr "Перенаправлять на" msgid "Friday" msgstr "Пятница" @@ -191,19 +191,19 @@ msgid "From %s in %s with source %s and %s" msgstr "Из %s в %s с источниками %s и %s" msgid "From %s on <var>this device</var>" -msgstr "" +msgstr "Из %s в <var>это устройство</var>" msgid "From %s on <var>this device</var> with source %s" -msgstr "" +msgstr "Из %s в <var>это устройство</var> с источником %s" msgid "From %s on <var>this device</var> with source %s and %s" -msgstr "" +msgstr "Из %s в <var>это устройство</var> с источниками %s and %s" msgid "General Settings" msgstr "Основные настройки" msgid "Hardware flow offloading" -msgstr "" +msgstr "Аппаратный flow offloading" msgid "IP" msgstr "IP-адрес" @@ -260,22 +260,21 @@ msgid "Masquerading" msgstr "Маскарадинг" msgid "Match" -msgstr "Перенаправлять в" +msgstr "Входящий трафик" msgid "Match ICMP type" -msgstr "Соответствовать<br />ICMP типу" +msgstr "Соответствовать ICMP типу" msgid "Match forwarded traffic to the given destination port or port range." msgstr "" -"Перенаправить соответствующий трафик на определённый порт или диапазон " -"портов. " +"Перенаправлять соответствующий трафик на указанный порт или диапазон портов." msgid "" "Match incoming traffic directed at the given destination port or port range " "on this host" msgstr "" -"Порт который будет принимать входящий трафик из источника 'Внутренний " -"порт' (см.ниже)." +"Порт или диапазон портов, входящие подключения на который будут " +"перенаправляться на внутренний порт внутреннего IP-адреса (см. ниже)" msgid "" "Match incoming traffic originating from the given source port or port range " @@ -288,7 +287,7 @@ msgid "Monday" msgstr "Понедельник" msgid "Month Days" -msgstr "Дни Месяца" +msgstr "Дни месяца" msgid "Name" msgstr "Имя" @@ -310,22 +309,22 @@ msgstr "Новый SNAT" msgid "Only match incoming traffic directed at the given IP address." msgstr "" -"IP-адрес который будет принимать входящий трафик из источника 'Внутренний IP-" -"адрес' (см.ниже) ." +"Применять правило только для входящих подключений на указанный IP-адрес" msgid "Only match incoming traffic from these MACs." -msgstr "Выбирать только входящий трафик от этих MAC-адресов." +msgstr "Применять правило только для входящего трафика от этих MAC-адресов." msgid "Only match incoming traffic from this IP or range." msgstr "" -"Выбирать только входящий трафик от этого IP-адреса или диапазона адресов." +"Применять правило только для входящего трафика от этого IP-адреса или " +"диапазона адресов." msgid "" "Only match incoming traffic originating from the given source port or port " "range on the client host" msgstr "" -"Выбирать только входящий трафик, исходящий из указанного порта или диапазона " -"портов клиентского хоста" +"Применять правило только для входящего трафика от указанного порта или " +"диапазона портов клиентского хоста" msgid "Open ports on router" msgstr "Открыть порты на маршрутизаторе" @@ -337,7 +336,7 @@ msgid "Output" msgstr "Исходящий трафик" msgid "Output zone" -msgstr "" +msgstr "Исходящая зона" msgid "Passes additional arguments to iptables. Use with care!" msgstr "" @@ -360,24 +359,24 @@ msgstr "Протокол" msgid "" "Redirect matched incoming traffic to the given port on the internal host" msgstr "" -"Перенаправить исходящий трафик с данного порта на 'Внешний порт' (см.выше)." +"Перенаправлять трафик на указанный порт или диапазон портов внутреннего IP-" +"адреса" msgid "Redirect matched incoming traffic to the specified internal host" -msgstr "" -"Перенаправить исходящий трафик с данного IP-адреса на 'Внешний IP-адрес' (см." -"выше)." +msgstr "Перенаправлять трафик на указанный IP-адрес" msgid "Refuse forward" -msgstr "Сбрасывать перенаправление" +msgstr "Сбрасывать перенаправляемый трафик" msgid "Refuse input" msgstr "Сбрасывать входящий трафик" msgid "Refuse output" -msgstr "" +msgstr "Сбрасывать исходящий трафик" msgid "Requires hardware NAT support. Implemented at least for mt7621" msgstr "" +"Требуется аппаратная поддержка NAT. Реализовано, по крайней мере, для mt7621" msgid "Restart Firewall" msgstr "Перезапустить межсетевой экран" @@ -408,7 +407,7 @@ msgid "Rewrite to source %s, %s" msgstr "Перенаправлять к источнику %s, %s" msgid "Routing/NAT Offloading" -msgstr "" +msgstr "Маршрутизация/NAT offloading" msgid "Rule is disabled" msgstr "Правило отключено" @@ -426,10 +425,10 @@ msgid "Saturday" msgstr "Суббота" msgid "Software based offloading for routing/NAT" -msgstr "" +msgstr "Программная реализация offloading для маршрутизации/NAT" msgid "Software flow offloading" -msgstr "" +msgstr "Программный flow offloading" msgid "Source IP address" msgstr "IP-адрес источника" @@ -460,16 +459,16 @@ msgid "Source zone" msgstr "Зона источника" msgid "Start Date (yyyy-mm-dd)" -msgstr "Дата начала<br />(год-мес-день)" +msgstr "Дата начала (год-мес-день)" msgid "Start Time (hh:mm:ss)" -msgstr "Время начала<br />(чч:мм:сс)" +msgstr "Время начала (чч:мм:сс)" msgid "Stop Date (yyyy-mm-dd)" -msgstr "Дата остановки<br />(год-мес-день)" +msgstr "Дата окончания (год-мес-день)" msgid "Stop Time (hh:mm:ss)" -msgstr "Время остановки<br />(чч:мм:сс)" +msgstr "Время окончания (чч:мм:сс)" msgid "Sunday" msgstr "Воскресенье" @@ -487,26 +486,27 @@ msgid "" "rule is <em>unidirectional</em>, e.g. a forward from lan to wan does " "<em>not</em> imply a permission to forward from wan to lan as well." msgstr "" -"Данные настройки управляют политиками перенаправления между этой (%s) и " -"другими зонами. Трафиком <em>'зон-назначения'</em> является перенаправленный " -"трафик <strong>'исходящий из %q'</strong>. Трафиком <em>'зон-источников'</" -"em> является трафик <strong>'направленый в %q'</strong>. Перенаправление " -"является <em>'однонаправленным'</em>, то есть перенаправление из lan в wan " -"<em>'не'</em> допускает перенаправление трафика из wan в lan." +"Данные настройки управляют политиками перенаправления трафика между этой " +"(%s) и другими зонами. Трафиком <em>'зон-назначения'</em> является " +"перенаправленный трафик <strong>'исходящий из %q'</strong>. Трафиком " +"<em>'зон-источников'</em> является трафик <strong>'направленый в %q'</" +"strong>. Перенаправление является <em>'однонаправленным'</em>, то есть " +"перенаправление из lan в wan <em>'не'</em> допускает перенаправление трафика " +"из wan в lan." msgid "" "This page allows you to change advanced properties of the port forwarding " "entry. In most cases there is no need to modify those settings." msgstr "" "На этой странице можно изменить расширенные настройки перенаправления портов." -"<br />В большинстве случаев нет необходимости изменять эти параметры." +"В большинстве случаев нет необходимости изменять эти параметры." msgid "" "This page allows you to change advanced properties of the traffic rule " "entry, such as matched source and destination hosts." msgstr "" -"На этой странице можно изменить расширенные настройки правил для трафика." -"<br />В большинстве случаев нет необходимости изменять эти параметры." +"На этой странице можно изменить расширенные настройки правил для трафика.В " +"большинстве случаев нет необходимости изменять эти параметры." msgid "" "This section defines common properties of %q. The <em>input</em> and " @@ -518,7 +518,7 @@ msgstr "" "Страница содержит общие свойства %q. Режимы <em>'Входящий трафик'</em> и " "<em>'Исходящий трафик'</em> устанавливают политики по умолчанию для трафика, " "поступающего и покидающего эту зону, в то время как режим " -"<em>'Перенаправление'</em> описывает политику пересылки трафика между " +"<em>'Перенаправление'</em> описывает политику перенаправления трафика между " "различными сетями внутри зоны. <em>'Использовать сети'</em> указывает, какие " "доступные сети являются членами этой зоны." @@ -529,7 +529,7 @@ msgid "Time in UTC" msgstr "Время UTC" msgid "To %s at %s on <var>this device</var>" -msgstr "К %s, порту %s на <var>этом устройстве</var>" +msgstr "К %s, %s на <var>этом устройстве</var>" msgid "To %s in %s" msgstr "К %s в %s" @@ -562,19 +562,19 @@ msgid "Tuesday" msgstr "Вторник" msgid "Unnamed SNAT" -msgstr "" +msgstr "SNAT без имени" msgid "Unnamed forward" -msgstr "" +msgstr "Перенаправление без имени" msgid "Unnamed rule" -msgstr "" +msgstr "Правило без имени" msgid "Via %s" msgstr "Через %s" msgid "Via %s at %s" -msgstr "Через %s, порт %s" +msgstr "Через %s, %s" msgid "Wednesday" msgstr "Среда" diff --git a/applications/luci-app-https_dns_proxy/Makefile b/applications/luci-app-https_dns_proxy/Makefile new file mode 100644 index 000000000..2ae2b80f2 --- /dev/null +++ b/applications/luci-app-https_dns_proxy/Makefile @@ -0,0 +1,17 @@ +# Copyright 2017-2018 Stan Grishin (stangri@melmac.net) +# This is free software, licensed under the GNU General Public License v3. + +include $(TOPDIR)/rules.mk + +PKG_LICENSE:=GPL-3.0+ +PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net> + +LUCI_TITLE:=HTTPS DNS Proxy Web UI +LUCI_DESCRIPTION:=Provides Web UI for HTTPS DNS Proxy +LUCI_DEPENDS:=+luci-mod-admin-full +https_dns_proxy +LUCI_PKGARCH:=all +PKG_RELEASE:=2 + +include ../../luci.mk + +# call BuildPackage - OpenWrt buildroot signature diff --git a/applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua b/applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua new file mode 100644 index 000000000..e1fd8fcb9 --- /dev/null +++ b/applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua @@ -0,0 +1,7 @@ +module("luci.controller.https_dns_proxy", package.seeall) +function index() + if not nixio.fs.access("/etc/config/https_dns_proxy") then + return + end + entry({"admin", "services", "https_dns_proxy"}, cbi("https_dns_proxy"), _("HTTPS DNS Proxy")) +end diff --git a/applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua b/applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua new file mode 100644 index 000000000..61511a413 --- /dev/null +++ b/applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua @@ -0,0 +1,53 @@ +local uci = require("luci.model.uci").cursor() + +m = Map("https_dns_proxy", translate("HTTPS DNS Proxy Settings")) +m.template="cbi/map" + +s3 = m:section(TypedSection, "https_dns_proxy", translate("Instances")) +s3.template = "cbi/tblsection" +s3.sortable = false +s3.anonymous = true +s3.addremove = true + +prov = s3:option(ListValue, "url_prefix", translate("Provider")) +prov:value("https://cloudflare-dns.com/dns-query?ct=application/dns-json&","Cloudflare") +prov:value("https://dns.google.com/resolve?","Google") +prov.write = function(self, section, value) + if value and value:match("cloudflare") then + uci:set("https_dns_proxy", section, "bootstrap_dns", "1.1.1.1,1.0.0.1") + uci:set("https_dns_proxy", section, "url_prefix", "https://cloudflare-dns.com/dns-query?ct=application/dns-json&") + else + uci:set("https_dns_proxy", section, "bootstrap_dns", "8.8.8.8,8.8.4.4") + uci:set("https_dns_proxy", section, "url_prefix", "https://dns.google.com/resolve?") + end + uci:set("https_dns_proxy", section, "user", "nobody") + uci:set("https_dns_proxy", section, "group", "nogroup") + uci:save("https_dns_proxy") +end + +la = s3:option(Value, "listen_addr", translate("Listen address")) +la.value = "127.0.0.1" +la.rmempty = true + +lp = s3:option(Value, "listen_port", translate("Listen port")) +lp.datatype = "port" +lp.placeholder = "5053" +lp.rmempty = true + +-- user = s3:option(Value, "user", translate("User name")) +-- user.placeholder = "nobody" +-- user.rmempty = true + +-- group = s3:option(Value, "group", translate("Group name")) +-- group.placeholder = "nogroup" +-- group.rmempty = true + +sa = s3:option(Value, "subnet_addr", translate("Subnet address")) +sa.datatype = "ip4prefix" +sa.rmempty = true + +ps = s3:option(Value, "proxy_server", translate("Proxy server")) +-- ps.datatype = "or(ipaddr,hostname)" +ps.rmempty = true + +return m diff --git a/applications/luci-app-https_dns_proxy/po/templates/https_dns_proxy.pot b/applications/luci-app-https_dns_proxy/po/templates/https_dns_proxy.pot new file mode 100644 index 000000000..c292e7932 --- /dev/null +++ b/applications/luci-app-https_dns_proxy/po/templates/https_dns_proxy.pot @@ -0,0 +1,32 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8" + +msgid "Group name" +msgstr "" + +msgid "HTTPS DNS Proxy" +msgstr "" + +msgid "HTTPS DNS Proxy Settings" +msgstr "" + +msgid "Instances" +msgstr "" + +msgid "Listen address" +msgstr "" + +msgid "Listen port" +msgstr "" + +msgid "Provider" +msgstr "" + +msgid "Proxy server" +msgstr "" + +msgid "Subnet address" +msgstr "" + +msgid "User name" +msgstr "" diff --git a/applications/luci-app-https_dns_proxy/root/etc/uci-defaults/40_luci-https_dns_proxy b/applications/luci-app-https_dns_proxy/root/etc/uci-defaults/40_luci-https_dns_proxy new file mode 100644 index 000000000..7800af701 --- /dev/null +++ b/applications/luci-app-https_dns_proxy/root/etc/uci-defaults/40_luci-https_dns_proxy @@ -0,0 +1,10 @@ +#!/bin/sh +uci -q batch <<-EOF >/dev/null + delete ucitrack.@https_dns_proxy[-1] + add ucitrack https_dns_proxy + set ucitrack.@template[-1].init=https_dns_proxy + commit ucitrack +EOF + +rm -f /tmp/luci-indexcache +exit 0 diff --git a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua index 2d46953e5..d2d7422a6 100644 --- a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua +++ b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua @@ -101,6 +101,10 @@ function diagnosticsData(interface, task) if addr and addr:match("^[a-zA-Z0-9%-%.:_]+$") then local util = io.popen(cmd %{ut.shellquote(device), ut.shellquote(addr)}) if util then + luci.http.write("Command:\n") + luci.http.write(cmd %{ut.shellquote(device), + ut.shellquote(addr)} .. "\n\n") + luci.http.write("Result:\n") while true do local ln = util:read("*l") if not ln then break end @@ -140,7 +144,8 @@ function diagnosticsData(interface, task) local uci = require "luci.model.uci".cursor(nil, "/var/state") local nw = require "luci.model.network".init() local network = nw:get_network(interface) - local device = network and network:ifname() + local device = network and network:get_interface() + device = device:name() luci.http.prepare_content("text/plain") if device then @@ -150,7 +155,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(string.format("No gateway for interface %s found.", interface)) + luci.http.write(translatef("No gateway for interface %s found.", interface)) end elseif task == "ping_trackips" then local trackips = uci:get("mwan3", interface, "track_ip") @@ -159,7 +164,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(string.format("No tracking Hosts for interface %s defined.", interface)) + luci.http.write(translatef("No tracking Hosts for interface %s defined.", interface)) end elseif task == "check_rules" then local number = getInterfaceNumber(interface) @@ -168,30 +173,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(string.format("All required IP rules for interface %s found", interface)) + luci.http.write(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(string.format("Only one IP rules for interface %s found", interface)) + luci.http.write(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(string.format("Only one IP rules for interface %s found", interface)) + luci.http.write(translatef("Only one IP rules for interface %s found", interface)) luci.http.write("\n") luci.http.write(iif_rule) else - luci.http.write(string.format("Missing both IP rules for interface %s", interface)) + luci.http.write(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(string.format("Routing table %s for interface %s found", number, interface)) + luci.http.write(translatef("Routing table %s for interface %s found", number, interface)) luci.http.write("\n") luci.http.write(routeTable) else - luci.http.write(string.format("Routing table %s for interface %s not found", number, interface)) + luci.http.write(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/luasrc/model/cbi/mwan/interfaceconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua index a6570e341..d01945bf4 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua @@ -13,10 +13,8 @@ mwan_interface = m5:section(NamedSection, arg[1], "interface", "") mwan_interface.addremove = false mwan_interface.dynamic = false -enabled = mwan_interface:option(ListValue, "enabled", translate("Enabled")) -enabled.default = "1" -enabled:value("1", translate("Yes")) -enabled:value("0", translate("No")) +enabled = mwan_interface:option(Flag, "enabled", translate("Enabled")) +enabled.default = false initial_state = mwan_interface:option(ListValue, "initial_state", translate("Initial state"), translate("Expect interface state on up event")) diff --git a/applications/luci-app-mwan3/po/ja/mwan3.po b/applications/luci-app-mwan3/po/ja/mwan3.po index a5826926d..8a1cad2f6 100644 --- a/applications/luci-app-mwan3/po/ja/mwan3.po +++ b/applications/luci-app-mwan3/po/ja/mwan3.po @@ -40,6 +40,9 @@ msgstr "利用可能な値: 1-1000。空欄の場合のデフォルトは1です 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 "" + msgid "Check IP rules" msgstr "IP ルールのチェック" @@ -263,6 +266,9 @@ msgstr "最小パケットレイテンシ [ms]" msgid "Min packet loss [%]" msgstr "最小パケットロス [%]" +msgid "Missing both IP rules for interface %s" +msgstr "" + msgid "" "Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/" "youtube.com/youtube\")" @@ -276,6 +282,12 @@ msgstr "いいえ" msgid "No MWAN interfaces found" msgstr "MWAN インターフェースが見つかりません" +msgid "No gateway for interface %s found." +msgstr "" + +msgid "No tracking Hosts for interface %s defined." +msgstr "" + msgid "Notification" msgstr "通知" @@ -285,6 +297,9 @@ msgstr "オフライン" msgid "Online" msgstr "オンライン" +msgid "Only one IP rules for interface %s found" +msgstr "" + msgid "Ping count" msgstr "Ping 回数" @@ -342,6 +357,12 @@ msgstr "プロトコル" msgid "Recovery interval" msgstr "障害復旧 インターバル" +msgid "Routing table %s for interface %s found" +msgstr "" + +msgid "Routing table %s for interface %s not found" +msgstr "" + msgid "Rule" msgstr "ルール" diff --git a/applications/luci-app-mwan3/po/ru/mwan3.po b/applications/luci-app-mwan3/po/ru/mwan3.po index 140c537e7..4d52d7108 100644 --- a/applications/luci-app-mwan3/po/ru/mwan3.po +++ b/applications/luci-app-mwan3/po/ru/mwan3.po @@ -43,6 +43,9 @@ msgstr "Допустимые значения: 1-1000. По умолчанию 1 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 "" + msgid "Check IP rules" msgstr "Проверить правила IP" @@ -262,6 +265,9 @@ msgstr "" msgid "Min packet loss [%]" msgstr "" +msgid "Missing both IP rules for interface %s" +msgstr "" + msgid "" "Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/" "youtube.com/youtube\")" @@ -275,6 +281,12 @@ msgstr "Нет" msgid "No MWAN interfaces found" msgstr "Интерфейсы MWAN не найдены" +msgid "No gateway for interface %s found." +msgstr "" + +msgid "No tracking Hosts for interface %s defined." +msgstr "" + msgid "Notification" msgstr "Уведомления" @@ -284,6 +296,9 @@ msgstr "Отключен" msgid "Online" msgstr "Онлайн" +msgid "Only one IP rules for interface %s found" +msgstr "" + msgid "Ping count" msgstr "Кол-во пинг-запросов" @@ -341,6 +356,12 @@ msgstr "Протокол" msgid "Recovery interval" msgstr "Интервал восстановления" +msgid "Routing table %s for interface %s found" +msgstr "" + +msgid "Routing table %s for interface %s not found" +msgstr "" + msgid "Rule" msgstr "Правило" diff --git a/applications/luci-app-mwan3/po/templates/mwan3.pot b/applications/luci-app-mwan3/po/templates/mwan3.pot index bcc5e977a..e815afd1f 100644 --- a/applications/luci-app-mwan3/po/templates/mwan3.pot +++ b/applications/luci-app-mwan3/po/templates/mwan3.pot @@ -27,6 +27,9 @@ msgstr "" msgid "Acceptable values: 1-256. Defaults to 1 if not set" msgstr "" +msgid "All required IP rules for interface %s found" +msgstr "" + msgid "Check IP rules" msgstr "" @@ -231,6 +234,9 @@ msgstr "" msgid "Min packet loss [%]" msgstr "" +msgid "Missing both IP rules for interface %s" +msgstr "" + msgid "" "Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/" "youtube.com/youtube\")" @@ -242,6 +248,12 @@ msgstr "" msgid "No MWAN interfaces found" msgstr "" +msgid "No gateway for interface %s found." +msgstr "" + +msgid "No tracking Hosts for interface %s defined." +msgstr "" + msgid "Notification" msgstr "" @@ -251,6 +263,9 @@ msgstr "" msgid "Online" msgstr "" +msgid "Only one IP rules for interface %s found" +msgstr "" + msgid "Ping count" msgstr "" @@ -300,6 +315,12 @@ msgstr "" msgid "Recovery interval" msgstr "" +msgid "Routing table %s for interface %s found" +msgstr "" + +msgid "Routing table %s for interface %s not found" +msgstr "" + msgid "Rule" msgstr "" diff --git a/applications/luci-app-mwan3/po/zh-cn/mwan3.po b/applications/luci-app-mwan3/po/zh-cn/mwan3.po index a6d73159f..4fd681740 100644 --- a/applications/luci-app-mwan3/po/zh-cn/mwan3.po +++ b/applications/luci-app-mwan3/po/zh-cn/mwan3.po @@ -38,6 +38,9 @@ msgstr "取值范围：1-1000。如果不填写，默认值为 1" 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 "" + msgid "Check IP rules" msgstr "检查 IP 规则" @@ -251,6 +254,9 @@ msgstr "最小数据包延迟 [ms]" msgid "Min packet loss [%]" msgstr "最小数据包丢失率 [%]" +msgid "Missing both IP rules for interface %s" +msgstr "" + msgid "" "Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/" "youtube.com/youtube\")" @@ -264,6 +270,12 @@ msgstr "否" msgid "No MWAN interfaces found" msgstr "没有找到 MWAN 接口" +msgid "No gateway for interface %s found." +msgstr "" + +msgid "No tracking Hosts for interface %s defined." +msgstr "" + msgid "Notification" msgstr "通知" @@ -273,6 +285,9 @@ msgstr "离线" msgid "Online" msgstr "在线" +msgid "Only one IP rules for interface %s found" +msgstr "" + msgid "Ping count" msgstr "Ping 计数" @@ -327,6 +342,12 @@ msgstr "通信协议" msgid "Recovery interval" msgstr "故障恢复间隔" +msgid "Routing table %s for interface %s found" +msgstr "" + +msgid "Routing table %s for interface %s not found" +msgstr "" + 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 00baedf21..bb17b559d 100644 --- a/applications/luci-app-mwan3/po/zh-tw/mwan3.po +++ b/applications/luci-app-mwan3/po/zh-tw/mwan3.po @@ -38,6 +38,9 @@ msgstr "取值範圍：1-1000。如果不填寫，預設值為 1" 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 "" + msgid "Check IP rules" msgstr "檢查 IP 規則" @@ -251,6 +254,9 @@ msgstr "最小資料包延遲 [ms]" msgid "Min packet loss [%]" msgstr "最小資料包丟失率 [%]" +msgid "Missing both IP rules for interface %s" +msgstr "" + msgid "" "Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/" "youtube.com/youtube\")" @@ -264,6 +270,12 @@ msgstr "否" msgid "No MWAN interfaces found" msgstr "沒有找到 MWAN 介面" +msgid "No gateway for interface %s found." +msgstr "" + +msgid "No tracking Hosts for interface %s defined." +msgstr "" + msgid "Notification" msgstr "通知" @@ -273,6 +285,9 @@ msgstr "離線" msgid "Online" msgstr "在線" +msgid "Only one IP rules for interface %s found" +msgstr "" + msgid "Ping count" msgstr "Ping 計數" @@ -327,6 +342,12 @@ msgstr "通訊協議" msgid "Recovery interval" msgstr "故障恢復間隔" +msgid "Routing table %s for interface %s found" +msgstr "" + +msgid "Routing table %s for interface %s not found" +msgstr "" + msgid "Rule" msgstr "規則" diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua index dc7718217..6dc43bec2 100644 --- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua +++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua @@ -204,10 +204,6 @@ local knownParams = { "dev_node", "/dev/net/tun", translate("Use tun/tap device node") }, - { Flag, - "tun_ipv6", - 0, - translate("Make tun device IPv6 capable") }, { Value, "ifconfig", "10.200.200.3 10.200.200.1", @@ -248,15 +244,6 @@ local knownParams = { "mtu_test", 0, translate("Empirically measure MTU") }, - { ListValue, - "comp_lzo", - { "yes", "no", "adaptive" }, - translate("Use fast LZO compression") }, - { Flag, - "comp_noadapt", - 0, - translate("Don't use adaptive lzo compression"), - { comp_lzo=1 } }, { Value, "link_mtu", 1500, @@ -375,7 +362,7 @@ local knownParams = { { client="0" }, { client="" } }, { DynamicList, "push", - { "redirect-gateway", "comp-lzo" }, + { "redirect-gateway" }, translate("Push options to peer"), { client="0" }, { client="" } }, { Flag, @@ -398,12 +385,6 @@ local knownParams = { "/etc/openvpn/ipp.txt 600", translate("Persist/unpersist ifconfig-pool"), { client="0" }, { client="" } }, - -- deprecated and replaced by --topology p2p - -- { Flag, - -- "ifconfig_pool_linear", - -- 0, - -- translate("Use individual addresses rather than /30 subnets"), - -- { client="0" }, { client="" } }, { Value, "ifconfig_push", "10.200.200.1 255.255.255.255", @@ -470,11 +451,6 @@ local knownParams = { translate("Allowed maximum of new connections"), { client="0" }, { client="" } }, { Flag, - "client_cert_not_required", - 0, - translate("Don't require client certificate"), - { client="0" }, { client="" } }, - { Flag, "username_as_common_name", 0, translate("Use username as common name"), @@ -591,10 +567,6 @@ local knownParams = { "engine", "dynamic", translate("Enable OpenSSL hardware crypto engines") }, - { Flag, - "no_replay", - 0, - translate("Disable replay protection") }, { Value, "replay_window", "64 15", @@ -608,10 +580,6 @@ local knownParams = { "/var/run/openvpn-replay-state", translate("Persist replay-protection state") }, { Flag, - "no_iv", - 0, - translate("Disable cipher initialisation vector") }, - { Flag, "tls_server", 0, translate("Enable TLS and assume server role"), 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 3f651c0ad..483860c8e 100644 --- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua +++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua @@ -4,7 +4,6 @@ require("luci.ip") require("luci.model.uci") - local basicParams = { -- -- Widget, Name, Default(s), Description @@ -14,14 +13,12 @@ local basicParams = { { Value, "nice",0, translate("Change process priority") }, { Value,"port",1194, translate("TCP/UDP port # for both local and remote") }, { ListValue,"dev_type",{ "tun", "tap" }, translate("Type of used device") }, - { Flag,"tun_ipv6",0, translate("Make tun device IPv6 capable") }, { Value,"ifconfig","10.200.200.3 10.200.200.1", translate("Set tun/tap adapter parameters") }, { Value,"server","10.200.200.0 255.255.255.0", translate("Configure server mode") }, { Value,"server_bridge","192.168.1.1 255.255.255.0 192.168.1.128 192.168.1.254", translate("Configure server bridge") }, { Flag,"nobind",0, translate("Do not bind to local address and port") }, - { ListValue,"comp_lzo",{"yes","no","adaptive"}, translate("Use fast LZO compression") }, { Value,"keepalive","10 60", translate("Helper directive to simplify the expression of --ping and --ping-restart in server mode configurations") }, { ListValue,"proto",{ "udp", "tcp-client", "tcp-server" }, translate("Use protocol") }, diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua index a6b0e1dd9..e17aa4085 100644 --- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua +++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua @@ -52,21 +52,22 @@ function s.create(self, name) luci.cbi.CREATE_PREFIX .. self.config .. "." .. self.sectiontype .. ".select" ) - name = luci.http.formvalue( + local name = luci.http.formvalue( luci.cbi.CREATE_PREFIX .. self.config .. "." .. self.sectiontype .. ".text" ) if #name > 3 and not name:match("[^a-zA-Z0-9_]") then - uci:section( - "openvpn", "openvpn", name, - uci:get_all( "openvpn_recipes", recipe ) - ) - - uci:delete("openvpn", name, "_role") - uci:delete("openvpn", name, "_description") - uci:save("openvpn") - - luci.http.redirect( self.extedit:format(name) ) + local s = uci:section("openvpn", "openvpn", 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) + end + uci:delete("openvpn", name, "_role") + uci:delete("openvpn", name, "_description") + uci:save("openvpn") + luci.http.redirect( self.extedit:format(name) ) + end elseif #name > 0 then self.invalid_cts = true end diff --git a/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm index f22cb68c7..8cb019b46 100644 --- a/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm +++ b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm @@ -4,11 +4,11 @@ Licensed to the public under the Apache License 2.0. -%> -<fieldset class="cbi-section"> - <legend> +<div class="cbi-section"> + <h3> <a href="<%=url('admin/services/openvpn')%>"><%:Overview%></a> » <%=luci.i18n.translatef("Instance \"%s\"", self.instance)%> - </legend> + </h3> <% if self.mode == "basic" then %> <a href="<%=url('admin/services/openvpn/advanced', self.instance, "Service")%>"><%:Switch to advanced configuration »%></a> @@ -27,4 +27,4 @@ <% if next(self.categories, i) then %>|<% end %> <% end %> <% end %> -</fieldset> +</div> diff --git a/applications/luci-app-openvpn/root/etc/config/openvpn_recipes b/applications/luci-app-openvpn/root/etc/config/openvpn_recipes index 1b394dffb..69270e48e 100644 --- a/applications/luci-app-openvpn/root/etc/config/openvpn_recipes +++ b/applications/luci-app-openvpn/root/etc/config/openvpn_recipes @@ -2,101 +2,94 @@ # Routed point-to-point server # config openvpn_recipe server_tun_ptp - option _description "Simple server configuration for a routed point-to-point VPN" - option _role "server" - option dev "tun" - option ifconfig "10.0.0.1 10.0.0.2" - option secret "shared-secret.key" - option keepalive "10 60" - option comp_lzo "yes" - option verb "3" - option mssfix "1420" + option _description 'Simple server configuration for a routed point-to-point VPN' + option _role 'server' + option dev 'tun' + option ifconfig '10.0.0.1 10.0.0.2' + option secret 'shared-secret.key' + option keepalive '10 60' + option verb '3' + option mssfix '1420' # # Routed point-to-point client # config openvpn_recipe client_tun_ptp - option _description "Simple client configuration for a routed point-to-point VPN" - option _role "client" - option dev "tun" - list remote "vpnserver.example.org" - option ifconfig "10.0.0.2 10.0.0.1" - option secret "shared-secret.key" - option nobind "1" - option comp_lzo "yes" - option verb "3" + option _description 'Simple client configuration for a routed point-to-point VPN' + option _role 'client' + option dev 'tun' + list remote 'vpnserver.example.org' + option ifconfig '10.0.0.2 10.0.0.1' + option secret 'shared-secret.key' + option nobind '1' + option verb '3' # # Routed multi-client server # config openvpn_recipe server_tun - option _description "Server configuration for a routed multi-client VPN" - option _role "server" - option dev "tun" - option server "10.0.100.0 255.255.255.0" - option ca "ca.crt" - option cert "server.crt" - option key "server.key" - option dh "dh1024.pem" - option keepalive "10 60" - option comp_lzo "yes" - option verb "3" - option mssfix "1420" + option _description 'Server configuration for a routed multi-client VPN' + option _role 'server' + option dev 'tun' + option server '10.0.100.0 255.255.255.0' + option ca 'ca.crt' + option cert 'server.crt' + option key 'server.key' + option dh 'dh1024.pem' + option keepalive '10 60' + option verb '3' + option mssfix '1420' # # Routed client # config openvpn_recipe client_tun - option _description "Client configuration for a routed multi-client VPN" - option _role "client" - option client "1" - option dev "tun" - list remote "vpnserver.example.org" - option pkcs12 "my_client.p12" - option remote_cert_tls "server" - option comp_lzo "yes" - option nobind "1" - option persist_key "1" - option persist_tun "1" - option verb "3" - option reneg_sec "0" - option float "1" + option _description 'Client configuration for a routed multi-client VPN' + option _role 'client' + option client '1' + option dev 'tun' + list remote 'vpnserver.example.org' + option pkcs12 'my_client.p12' + option remote_cert_tls 'server' + option nobind '1' + option persist_key '1' + option persist_tun '1' + option verb '3' + option reneg_sec '0' + option float '1' # # Multi-client ethernet bridge server # config openvpn_recipe server_tap_bridge - option _description "Server configuration for an ethernet bridge VPN" - option _role "server" - option dev "tap" - option server_bridge "192.168.1.1 255.255.255.0 192.168.1.128 192.168.1.254" - option ca "ca.crt" - option cert "server.crt" - option key "server.key" - option dh "dh1024.pem" - option keepalive "10 60" - option comp_lzo "yes" - option verb "3" - option mssfix "1420" + option _description 'Server configuration for an ethernet bridge VPN' + option _role 'server' + option dev 'tap' + option server_bridge '192.168.1.1 255.255.255.0 192.168.1.128 192.168.1.254' + option ca 'ca.crt' + option cert 'server.crt' + option key 'server.key' + option dh 'dh1024.pem' + option keepalive '10 60' + option verb '3' + option mssfix '1420' # # Ethernet bridge client # config openvpn_recipe client_tap_bridge - option _description "Client configuration for an ethernet bridge VPN" - option _role "client" - option client "1" - option dev "tap" - list remote "vpnserver.example.org" - option ca "ca.crt" - option cert "my_client.crt" - option key "my_client.key" - option dh "dh1024.pem" - option remote_cert_tls "server" - option comp_lzo "yes" - option nobind "1" - option persist_key "1" - option verb "3" - option reneg_sec "0" - option float "1" - + option _description 'Client configuration for an ethernet bridge VPN' + option _role 'client' + option client '1' + option dev 'tap' + list remote 'vpnserver.example.org' + option ca 'ca.crt' + option cert 'my_client.crt' + option key 'my_client.key' + option dh 'dh1024.pem' + option remote_cert_tls 'server' + option nobind '1' + option persist_key '1' + option verb '3' + option reneg_sec '0' + option float '1' diff --git a/applications/luci-app-samba4/luasrc/model/cbi/samba4.lua b/applications/luci-app-samba4/luasrc/model/cbi/samba4.lua index e5c0a1bed..2a1399b96 100644 --- a/applications/luci-app-samba4/luasrc/model/cbi/samba4.lua +++ b/applications/luci-app-samba4/luasrc/model/cbi/samba4.lua @@ -15,9 +15,20 @@ h = s:taboption("general", Flag, "homes", translate("Share home-directories"), translate("Allow system users to reach their home directories via " .. "network shares")) h.rmempty = false -s:taboption("general", Flag, "disable_netbios", translate("Disable Netbios")) -s:taboption("general", Flag, "disable_ad_dc", translate("Disable Active Directory Domain Controller")) -s:taboption("general", Flag, "disable_winbind", translate("Disable Winbind")) + +macos = s:taboption("general", Flag, "macos", translate("Enable macOS compatible shares"), + translate("Enables Apple's AAPL extension globally and adds macOS compatibility options to all shares.")) +macos.rmempty = false + +if nixio.fs.access("/usr/sbin/nmbd") then + s:taboption("general", Flag, "disable_netbios", translate("Disable Netbios")) +end +if nixio.fs.access("/usr/sbin/samba") then + s:taboption("general", Flag, "disable_ad_dc", translate("Disable Active Directory Domain Controller")) +end +if nixio.fs.access("/usr/sbin/winbindd") then + s:taboption("general", Flag, "disable_winbind", translate("Disable Winbind")) +end tmpl = s:taboption("template", Value, "_tmpl", translate("Edit the template that is used for generating the samba configuration."), @@ -49,42 +60,53 @@ if nixio.fs.access("/etc/config/fstab") then pth.titleref = luci.dispatcher.build_url("admin", "system", "fstab") end -s:option(Value, "users", translate("Allowed users")).rmempty = true +br = s:option(Flag, "browseable", translate("Browse-able")) +br.enabled = "yes" +br.disabled = "no" +br.default = "yes" ro = s:option(Flag, "read_only", translate("Read-only")) -ro.rmempty = false ro.enabled = "yes" ro.disabled = "no" +ro.default = "yes" -br = s:option(Flag, "browseable", translate("Browseable")) -br.rmempty = false -br.default = "yes" -br.enabled = "yes" -br.disabled = "no" +s:option(Flag, "force_root", translate("Force Root")) + +au = s:option(Value, "users", translate("Allowed users")) +au.rmempty = true go = s:option(Flag, "guest_ok", translate("Allow guests")) -go.rmempty = false go.enabled = "yes" go.disabled = "no" +go.default = "no" gon = s:option(Flag, "guest_only", translate("Guests only")) -gon.rmempty = false gon.enabled = "yes" gon.disabled = "no" +gon.default = "no" -io = s:option(Flag, "inherit_owner", translate("Inherit owner")) -io.rmempty = false -io.enabled = "yes" -io.disabled = "no" +iown = s:option(Flag, "inherit_owner", translate("Inherit owner")) +iown.enabled = "yes" +iown.disabled = "no" +iown.default = "no" cm = s:option(Value, "create_mask", translate("Create mask")) cm.rmempty = true -cm.size = 4 +cm.maxlength = 4 +cm.placeholder = "0666" dm = s:option(Value, "dir_mask", translate("Directory mask")) dm.rmempty = true -dm.size = 4 +dm.maxlength = 4 +dm.placeholder = "0777" + +vfs = s:option(Value, "vfs_objects", translate("Vfs objects")) +vfs.rmempty = true + +s:option(Flag, "timemachine", translate("Apple Time-machine share")) -s:option(Value, "vfs_objects", translate("Vfs objects")).rmempty = true +tms = s:option(Value, "timemachine_maxsize", translate("Time-machine size in GB")) +tms.rmempty = true +tms.maxlength = 5 return m diff --git a/applications/luci-app-samba4/po/ca/samba4.po b/applications/luci-app-samba4/po/ca/samba4.po index ddd306d07..0183f56b7 100644 --- a/applications/luci-app-samba4/po/ca/samba4.po +++ b/applications/luci-app-samba4/po/ca/samba4.po @@ -26,7 +26,10 @@ msgstr "" msgid "Allowed users" msgstr "Usuaris permesos" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" msgid "Create mask" @@ -53,6 +56,17 @@ msgstr "Edita plantilla" msgid "Edit the template that is used for generating the samba configuration." msgstr "Edita la plantilla que s'usa per generar la configuració de samba." +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "Ajusts generals" @@ -99,6 +113,9 @@ msgstr "" "barra ('|') no es deuen canviar. Reben els seus valors de la pestanya " "'Ajusts generals'." +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/cs/samba4.po b/applications/luci-app-samba4/po/cs/samba4.po index a013bcc13..88cd17836 100644 --- a/applications/luci-app-samba4/po/cs/samba4.po +++ b/applications/luci-app-samba4/po/cs/samba4.po @@ -22,7 +22,10 @@ msgstr "" msgid "Allowed users" msgstr "Povolení uživatelé" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" msgid "Create mask" @@ -51,6 +54,17 @@ msgstr "" "Editovat šablonu, která je použita pro generování konfiguračního souboru pro " "sambu." +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "Obecné nastavení" @@ -96,6 +110,9 @@ msgstr "" "konfigurace samby generována. Hodnoty uzavřené rourou (\"|\"), by se neměly " "měnit. Tyto hodnoty jsou brány ze záložky \"Obecná nastavení\"." +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/de/samba4.po b/applications/luci-app-samba4/po/de/samba4.po index b9caa61d1..35a481528 100644 --- a/applications/luci-app-samba4/po/de/samba4.po +++ b/applications/luci-app-samba4/po/de/samba4.po @@ -24,17 +24,20 @@ msgstr "" msgid "Allowed users" msgstr "Legitimierte Benutzer" -msgid "Browseable" -msgstr "Suchbar" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" +msgstr "Durchsuchbar" msgid "Create mask" -msgstr "Berechtigungsmaske für neue Dateien" +msgstr "Berechtigungs-maske für neue Dateien" msgid "Description" msgstr "Beschreibung" msgid "Directory mask" -msgstr "Verzeichnismaske" +msgstr "Verzeichnis-maske" msgid "Disable Active Directory Domain Controller" msgstr "Deaktiviere Active Directory Domain Controller" @@ -53,6 +56,17 @@ msgstr "" "Hier kann das Template bearbeitet werden, das zur Erstellung der Samba-" "Konfigurationsdateien verwendet wird." +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "Allgemeine Einstellungen" @@ -69,7 +83,7 @@ msgid "Name" msgstr "Name" msgid "Network Shares" -msgstr "Netzwerkfreigaben" +msgstr "Netzwerk-freigaben" msgid "Path" msgstr "Pfad" @@ -83,7 +97,7 @@ msgid "Read-only" msgstr "Nur Lesen" msgid "Share home-directories" -msgstr "Heimatverzeichnisse freigeben" +msgstr "Heimat-verzeichnisse freigeben" msgid "Shared Directories" msgstr "Freigegebene Verzeichnisse" @@ -100,12 +114,18 @@ msgstr "" "werden, da diese beim Erstellen der Konfiguration mit den Werten aus dem Tab " "'Allgemeine Einstellungen' ersetzt werden." +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" -msgstr "Virtuelle Filesystem Module" +msgstr "" msgid "Workgroup" msgstr "Arbeitsgruppe" +#~ msgid "Browseable" +#~ msgstr "Suchbar" + #~ msgid "Mask for new directories" #~ msgstr "Maske für neue Verzeichnisse" diff --git a/applications/luci-app-samba4/po/el/samba4.po b/applications/luci-app-samba4/po/el/samba4.po index 946915f74..88999d407 100644 --- a/applications/luci-app-samba4/po/el/samba4.po +++ b/applications/luci-app-samba4/po/el/samba4.po @@ -22,7 +22,10 @@ msgstr "" msgid "Allowed users" msgstr "" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" msgid "Create mask" @@ -49,6 +52,17 @@ msgstr "" msgid "Edit the template that is used for generating the samba configuration." msgstr "" +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "" @@ -91,6 +105,9 @@ msgid "" "Settings' tab." msgstr "" +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/en/samba4.po b/applications/luci-app-samba4/po/en/samba4.po index 75ef0f96e..35ecc99e2 100644 --- a/applications/luci-app-samba4/po/en/samba4.po +++ b/applications/luci-app-samba4/po/en/samba4.po @@ -22,7 +22,10 @@ msgstr "Allow system users to reach their home directories via network shares" msgid "Allowed users" msgstr "Allowed users" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" msgid "Create mask" @@ -49,6 +52,17 @@ msgstr "Edit template" msgid "Edit the template that is used for generating the samba configuration." msgstr "Edit the template that is used for generating the Samba configuration." +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "General settings" @@ -95,6 +109,9 @@ msgstr "" "('|') should not be changed. They get their values from the 'General " "settings' tab." +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/es/samba4.po b/applications/luci-app-samba4/po/es/samba4.po index 1e6b8fd36..99d64f970 100644 --- a/applications/luci-app-samba4/po/es/samba4.po +++ b/applications/luci-app-samba4/po/es/samba4.po @@ -24,7 +24,10 @@ msgstr "" msgid "Allowed users" msgstr "Usuarios permitidos" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" msgid "Create mask" @@ -51,6 +54,17 @@ msgstr "Editar plantilla" msgid "Edit the template that is used for generating the samba configuration." msgstr "Editar la plantilla usada para generar la configuración de samba." +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "Configuración general" @@ -96,6 +110,9 @@ msgstr "" "generará la configuración de samba. Los valores entre tuberías ('|') no " "deben cambiarse. Su valor se toma desde la pestaña 'Configuración General'." +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/fr/samba4.po b/applications/luci-app-samba4/po/fr/samba4.po index 53212311c..a5b7dc793 100644 --- a/applications/luci-app-samba4/po/fr/samba4.po +++ b/applications/luci-app-samba4/po/fr/samba4.po @@ -24,7 +24,10 @@ msgstr "" msgid "Allowed users" msgstr "Utilisateurs autorisés" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" msgid "Create mask" @@ -51,6 +54,17 @@ msgstr "Éditer le modèle" msgid "Edit the template that is used for generating the samba configuration." msgstr "Éditer le modèle utilisé pour générer la configuration Samba." +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "Paramètres généraux" @@ -97,6 +111,9 @@ msgstr "" " (« | ») ne doivent pas être modifiées, elles proviennent de l'onglet " "« Paramètres généraux »." +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/he/samba4.po b/applications/luci-app-samba4/po/he/samba4.po index 3f670e6c2..859dd8d89 100644 --- a/applications/luci-app-samba4/po/he/samba4.po +++ b/applications/luci-app-samba4/po/he/samba4.po @@ -17,7 +17,10 @@ msgstr "" msgid "Allowed users" msgstr "" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" msgid "Create mask" @@ -44,6 +47,17 @@ msgstr "" msgid "Edit the template that is used for generating the samba configuration." msgstr "" +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "" @@ -86,6 +100,9 @@ msgid "" "Settings' tab." msgstr "" +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/hu/samba4.po b/applications/luci-app-samba4/po/hu/samba4.po index 08ff729f4..8dbe91558 100644 --- a/applications/luci-app-samba4/po/hu/samba4.po +++ b/applications/luci-app-samba4/po/hu/samba4.po @@ -22,7 +22,10 @@ msgstr "" msgid "Allowed users" msgstr "Engedélyezett felhasználók" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" msgid "Create mask" @@ -51,6 +54,17 @@ msgstr "" "Itt szerkesztheti a sablont, ami a végleges samba konfiguráció " "elkészítéséhez kerül felhasználásra." +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "Általános beállítások" @@ -97,6 +111,9 @@ msgstr "" "közé zárt értékek módosítása nem szükséges, az értéküket az általános " "beállítások fülről kapják." +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/it/samba4.po b/applications/luci-app-samba4/po/it/samba4.po index 93359d7ba..d7f563196 100644 --- a/applications/luci-app-samba4/po/it/samba4.po +++ b/applications/luci-app-samba4/po/it/samba4.po @@ -24,8 +24,11 @@ msgstr "" msgid "Allowed users" msgstr "Utenti ammessi" -msgid "Browseable" -msgstr "Sfogliabile" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" +msgstr "" msgid "Create mask" msgstr "Crea maschera" @@ -52,6 +55,17 @@ msgid "Edit the template that is used for generating the samba configuration." msgstr "" "Modifica il template utilizzato per generare la configurazione di samba." +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "Opzioni Generali" @@ -100,12 +114,18 @@ msgstr "" "('|') non dovrebbero essere toccati. Essi vengono generati dalla schermata " "'Opzioni Generali'." +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" msgid "Workgroup" msgstr "Gruppo di lavoro" +#~ msgid "Browseable" +#~ msgstr "Sfogliabile" + #~ msgid "Mask for new directories" #~ msgstr "Maschera per le nuove cartelle" diff --git a/applications/luci-app-samba4/po/ja/samba4.po b/applications/luci-app-samba4/po/ja/samba4.po index 3e82cbca2..1358c2bd0 100644 --- a/applications/luci-app-samba4/po/ja/samba4.po +++ b/applications/luci-app-samba4/po/ja/samba4.po @@ -22,7 +22,10 @@ msgstr "sambaを介してユーザーのホームディレクトリへのアク msgid "Allowed users" msgstr "許可されたユーザー" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" msgid "Create mask" @@ -49,6 +52,17 @@ msgstr "テンプレートの編集" msgid "Edit the template that is used for generating the samba configuration." msgstr "samba設定を生成するテンプレートを編集します。" +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "一般設定" @@ -96,6 +110,9 @@ msgstr "" "容です。パイプ('|')で閉じられた値は変更しないでください。これらの値は'一般設" "定'タブ内の値によって置き換えられます。" +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/ms/samba4.po b/applications/luci-app-samba4/po/ms/samba4.po index 9e138471d..c6ca22fba 100644 --- a/applications/luci-app-samba4/po/ms/samba4.po +++ b/applications/luci-app-samba4/po/ms/samba4.po @@ -16,7 +16,10 @@ msgstr "" msgid "Allowed users" msgstr "" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" msgid "Create mask" @@ -43,6 +46,17 @@ msgstr "" msgid "Edit the template that is used for generating the samba configuration." msgstr "" +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "" @@ -85,6 +99,9 @@ msgid "" "Settings' tab." msgstr "" +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/no/samba4.po b/applications/luci-app-samba4/po/no/samba4.po index 6e8425933..8742cbb0a 100644 --- a/applications/luci-app-samba4/po/no/samba4.po +++ b/applications/luci-app-samba4/po/no/samba4.po @@ -13,7 +13,10 @@ msgstr "Tillat systembrukere å nå sine hjemmekataloger via nettverks mapper." msgid "Allowed users" msgstr "Tillatte brukere" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" msgid "Create mask" @@ -40,6 +43,17 @@ msgstr "Rediger Mal" msgid "Edit the template that is used for generating the samba configuration." msgstr "Rediger malen som brukes til å generere samba konfigurasjonen." +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "Generelle Innstillinger" @@ -85,6 +99,9 @@ msgstr "" "konfigurasjon vil bli generert fra. Verdier omsluttet av ('|') bør ikke " "endres. De får sine verdier fra 'Generelle Innstillinger' fanen." +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/pl/samba4.po b/applications/luci-app-samba4/po/pl/samba4.po index aec7082d5..faad499c4 100644 --- a/applications/luci-app-samba4/po/pl/samba4.po +++ b/applications/luci-app-samba4/po/pl/samba4.po @@ -23,7 +23,10 @@ msgstr "" msgid "Allowed users" msgstr "Użytkownicy z prawem dostępu" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" msgid "Create mask" @@ -50,6 +53,17 @@ msgstr "Edytuj szablon" msgid "Edit the template that is used for generating the samba configuration." msgstr "Edytuj szablon, który jest używany do generowania konfiguracji samby." +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "Ustawienia ogólne" @@ -96,6 +110,9 @@ msgstr "" "kreski pionowej ('|') nie powinny być zmieniane. Wartości ich zostaną " "pobrane z zakładki \"Ustawienia ogólne\"." +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/pt-br/samba4.po b/applications/luci-app-samba4/po/pt-br/samba4.po index 8f6dbb6c9..5383aa32d 100644 --- a/applications/luci-app-samba4/po/pt-br/samba4.po +++ b/applications/luci-app-samba4/po/pt-br/samba4.po @@ -24,7 +24,10 @@ msgstr "" msgid "Allowed users" msgstr "Usuários permitidos" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" msgid "Create mask" @@ -51,6 +54,17 @@ msgstr "Editar modelo" msgid "Edit the template that is used for generating the samba configuration." msgstr "Edita o modelo que é usado para gerar a configuração do samba." +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "Configurações Gerais" @@ -97,6 +111,9 @@ msgstr "" "não devem ser alterados. Estes valores serão obtidos a partir da aba " "'Configurações Gerais'." +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/pt/samba4.po b/applications/luci-app-samba4/po/pt/samba4.po index 2f8f2dafc..50c1645f0 100644 --- a/applications/luci-app-samba4/po/pt/samba4.po +++ b/applications/luci-app-samba4/po/pt/samba4.po @@ -24,7 +24,10 @@ msgstr "" msgid "Allowed users" msgstr "Utilizadores Permitidos" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" msgid "Create mask" @@ -51,6 +54,17 @@ msgstr "Editar Template" msgid "Edit the template that is used for generating the samba configuration." msgstr "Editar a template que é utilizada para gerar a configuração samba" +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "Definições Gerais" @@ -97,6 +111,9 @@ msgstr "" "| não devem ser alterados. Eles recebem os valores do separador 'Definições " "Gerais'." +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/ro/samba4.po b/applications/luci-app-samba4/po/ro/samba4.po index d9f698971..b481b1f95 100644 --- a/applications/luci-app-samba4/po/ro/samba4.po +++ b/applications/luci-app-samba4/po/ro/samba4.po @@ -23,7 +23,10 @@ msgstr "" msgid "Allowed users" msgstr "Utilizatori acceptati" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" msgid "Create mask" @@ -50,6 +53,17 @@ msgstr "Editeaza sablon" msgid "Edit the template that is used for generating the samba configuration." msgstr "Editeaza sablonul care e folosit pentru generarea configuratiei samba." +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "Setari generale" @@ -95,6 +109,9 @@ msgstr "" "genereaza configuratia samba. Valorile dintre liniuta verticala ('|') n-ar " "trebui schimbate, ele iau valorile direct din tab-ul de \"Setari generale\"." +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/ru/samba4.po b/applications/luci-app-samba4/po/ru/samba4.po index f588424d9..f7ec3269e 100644 --- a/applications/luci-app-samba4/po/ru/samba4.po +++ b/applications/luci-app-samba4/po/ru/samba4.po @@ -26,8 +26,11 @@ msgstr "" msgid "Allowed users" msgstr "Разрешенные пользователи" -msgid "Browseable" -msgstr "Виден в списке доступных ресурсов" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" +msgstr "" msgid "Create mask" msgstr "Создать маску" @@ -53,6 +56,17 @@ msgstr "Настройка config файла" msgid "Edit the template that is used for generating the samba configuration." msgstr "Настройка config<br />файла samba." +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "Основные настройки" @@ -101,12 +115,18 @@ msgstr "" "('|'), не должны быть изменены.<br />Они будут автоматически заменены на " "значения со страницы 'Основные настройки'." +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" msgid "Workgroup" msgstr "Рабочая группа" +#~ msgid "Browseable" +#~ msgstr "Виден в списке доступных ресурсов" + #~ msgid "Mask for new directories" #~ msgstr "Маска для новых папок" diff --git a/applications/luci-app-samba4/po/sk/samba4.po b/applications/luci-app-samba4/po/sk/samba4.po index 53e8e214e..44299ac1a 100644 --- a/applications/luci-app-samba4/po/sk/samba4.po +++ b/applications/luci-app-samba4/po/sk/samba4.po @@ -17,7 +17,10 @@ msgstr "" msgid "Allowed users" msgstr "" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" msgid "Create mask" @@ -44,6 +47,17 @@ msgstr "" msgid "Edit the template that is used for generating the samba configuration." msgstr "" +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "" @@ -86,6 +100,9 @@ msgid "" "Settings' tab." msgstr "" +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/sv/samba4.po b/applications/luci-app-samba4/po/sv/samba4.po index d9c0cc0df..39695eb0b 100644 --- a/applications/luci-app-samba4/po/sv/samba4.po +++ b/applications/luci-app-samba4/po/sv/samba4.po @@ -18,7 +18,10 @@ msgstr "Tillåt systemanvändare att nå deras hem-mappar via nätverksdelningar msgid "Allowed users" msgstr "Tillåtna användare" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" msgid "Create mask" @@ -46,6 +49,17 @@ msgid "Edit the template that is used for generating the samba configuration." msgstr "" "Redigera mallen som används för att generera konfigurationen för samba." +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "Generella inställningar" @@ -88,6 +102,9 @@ msgid "" "Settings' tab." msgstr "" +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/templates/samba4.pot b/applications/luci-app-samba4/po/templates/samba4.pot index 3041807b1..33142d047 100644 --- a/applications/luci-app-samba4/po/templates/samba4.pot +++ b/applications/luci-app-samba4/po/templates/samba4.pot @@ -10,7 +10,10 @@ msgstr "" msgid "Allowed users" msgstr "" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" msgid "Create mask" @@ -37,6 +40,17 @@ msgstr "" msgid "Edit the template that is used for generating the samba configuration." msgstr "" +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "" @@ -79,6 +93,9 @@ msgid "" "Settings' tab." msgstr "" +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/tr/samba4.po b/applications/luci-app-samba4/po/tr/samba4.po index 1c233f1ec..4368fb271 100644 --- a/applications/luci-app-samba4/po/tr/samba4.po +++ b/applications/luci-app-samba4/po/tr/samba4.po @@ -17,7 +17,10 @@ msgstr "" msgid "Allowed users" msgstr "" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" msgid "Create mask" @@ -44,6 +47,17 @@ msgstr "" msgid "Edit the template that is used for generating the samba configuration." msgstr "" +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "" @@ -86,6 +100,9 @@ msgid "" "Settings' tab." msgstr "" +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/uk/samba4.po b/applications/luci-app-samba4/po/uk/samba4.po index e228baec2..a4f7e5a02 100644 --- a/applications/luci-app-samba4/po/uk/samba4.po +++ b/applications/luci-app-samba4/po/uk/samba4.po @@ -23,7 +23,10 @@ msgstr "" msgid "Allowed users" msgstr "Дозволені користувачі" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" msgid "Create mask" @@ -51,6 +54,17 @@ msgid "Edit the template that is used for generating the samba configuration." msgstr "" "Редагувати шаблон, який використовується для створення конфігурації samba." +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "Загальні настройки" @@ -97,6 +111,9 @@ msgstr "" "\" (\"|\") не повинні змінюватися. Вони отримують свої значення з вкладки " "\"Загальні налаштування\"." +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/vi/samba4.po b/applications/luci-app-samba4/po/vi/samba4.po index b176471b0..d59762822 100644 --- a/applications/luci-app-samba4/po/vi/samba4.po +++ b/applications/luci-app-samba4/po/vi/samba4.po @@ -28,7 +28,10 @@ msgstr "" msgid "Allowed users" msgstr "Người sử dụng được cho phép" -msgid "Browseable" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" msgstr "" #, fuzzy @@ -57,6 +60,17 @@ msgstr "" msgid "Edit the template that is used for generating the samba configuration." msgstr "" +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "" @@ -100,6 +114,9 @@ msgid "" "Settings' tab." msgstr "" +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "" diff --git a/applications/luci-app-samba4/po/zh-cn/samba4.po b/applications/luci-app-samba4/po/zh-cn/samba4.po index bab5f9b9c..f49abac4e 100644 --- a/applications/luci-app-samba4/po/zh-cn/samba4.po +++ b/applications/luci-app-samba4/po/zh-cn/samba4.po @@ -25,8 +25,11 @@ msgstr "允许系统用户通过网络共享访问他们的家目录" msgid "Allowed users" msgstr "允许用户" -msgid "Browseable" -msgstr "可浏览" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" +msgstr "" msgid "Create mask" msgstr "创建权限掩码" @@ -52,6 +55,17 @@ msgstr "编辑模板" msgid "Edit the template that is used for generating the samba configuration." msgstr "编辑用来生成 samba 设置的模板" +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "基本设置" @@ -96,12 +110,18 @@ msgstr "" "这是将从其上生成 samba 配置的文件“/etc/samba/smb.conf.template”的内容。由管道" "符（“|”）包围的值不应更改。它们将从“常规设置”标签中获取其值。" +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "VFS 对象" msgid "Workgroup" msgstr "工作组" +#~ msgid "Browseable" +#~ msgstr "可浏览" + #~ msgid "Mask for new directories" #~ msgstr "新目录权限掩码" diff --git a/applications/luci-app-samba4/po/zh-tw/samba4.po b/applications/luci-app-samba4/po/zh-tw/samba4.po index 17d18e620..ae962f9e8 100644 --- a/applications/luci-app-samba4/po/zh-tw/samba4.po +++ b/applications/luci-app-samba4/po/zh-tw/samba4.po @@ -25,8 +25,11 @@ msgstr "允許系統使用者通過網路共享訪問他們的家目錄" msgid "Allowed users" msgstr "允許使用者" -msgid "Browseable" -msgstr "可瀏覽" +msgid "Apple Time-machine share" +msgstr "" + +msgid "Browse-able" +msgstr "" msgid "Create mask" msgstr "建立權限掩碼" @@ -52,6 +55,17 @@ msgstr "編輯模板" msgid "Edit the template that is used for generating the samba configuration." msgstr "編輯用來生成 samba 設定的模板" +msgid "Enable macOS compatible shares" +msgstr "" + +msgid "" +"Enables Apple's AAPL extension globally and adds macOS compatibility options " +"to all shares." +msgstr "" + +msgid "Force Root" +msgstr "" + msgid "General Settings" msgstr "基本設定" @@ -96,12 +110,18 @@ msgstr "" "這是將從其上生成 samba 配置的檔案“/etc/samba/smb.conf.template”的內容。由管道" "符（“|”）包圍的值不應更改。它們將從“常規設定”標籤中獲取其值。" +msgid "Time-machine size in GB" +msgstr "" + msgid "Vfs objects" msgstr "VFS 物件" msgid "Workgroup" msgstr "工作組" +#~ msgid "Browseable" +#~ msgstr "可瀏覽" + #~ msgid "Mask for new directories" #~ msgstr "新目錄權限掩碼" diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua index df2164f8a..60d0477d5 100644 --- a/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua +++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua @@ -210,10 +210,11 @@ if (valman == "0") then pro = s1:taboption("resource", ListValue, "protocol", translate("Recursion Protocol"), - translate("Chose the protocol recursion queries leave on")) + translate("Chose the IP versions used upstream and downstream")) pro:value("default", translate("Default")) pro:value("ip4_only", translate("IP4 Only")) - pro:value("ip6_only", translate("IP6 Only")) + pro:value("ip6_local", translate("IP4 All and IP6 Local")) + pro:value("ip6_only", translate("IP6 Only*")) pro:value("ip6_prefer", translate("IP6 Preferred")) pro:value("mixed", translate("IP4 and IP6")) pro.rmempty = false diff --git a/modules/luci-base/luasrc/sys.lua b/modules/luci-base/luasrc/sys.lua index 823e20770..1436a3a23 100644 --- a/modules/luci-base/luasrc/sys.lua +++ b/modules/luci-base/luasrc/sys.lua @@ -70,6 +70,24 @@ function mounts() return data end +function mtds() + local data = {} + + if fs.access("/proc/mtd") then + for l in io.lines("/proc/mtd") do + local d, s, e, n = l:match('^([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+"([^%s]+)"') + if s and n then + local d = {} + d.size = tonumber(s, 16) + d.name = n + table.insert(data, d) + end + end + end + + return data +end + -- containing the whole environment is returned otherwise this function returns -- the corresponding string value for the given name or nil if no such variable -- exists. diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index 3d7f873c5..5295b3d90 100644 --- a/modules/luci-base/po/pl/base.po +++ b/modules/luci-base/po/pl/base.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: LuCI\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-20 09:40+0200\n" -"PO-Revision-Date: 2018-08-05 13:45+0200\n" +"PO-Revision-Date: 2018-09-02 15:25+0200\n" "Last-Translator: Rixerx <krystian.kozak20@gmail.com>\n" "Language-Team: Polish\n" "Language: pl\n" @@ -611,10 +611,10 @@ msgid "Category" msgstr "" msgid "Caution: Configuration files will be erased" -msgstr "" +msgstr "Uwaga: Pliki konfiguracyjne zostaną usunięte" msgid "Caution: System upgrade will be forced" -msgstr "" +msgstr "Uwaga: Zostanie wymuszone uaktualnienie systemu" msgid "Chain" msgstr "Łańcuch" @@ -726,7 +726,7 @@ msgid "Configuration failed" msgstr "Konfiguracja nieudana" msgid "Configuration files will be kept" -msgstr "" +msgstr "Pliki konfiguracyjne zostaną zachowane" msgid "Configuration has been applied." msgstr "Konfiguracja została zastosowana." @@ -1358,7 +1358,7 @@ msgid "Force link" msgstr "Wymuś połączenie" msgid "Force upgrade" -msgstr "" +msgstr "Wymuś uaktualnienie" msgid "Force use of NAT-T" msgstr "" @@ -1526,7 +1526,7 @@ msgid "IP Addresses" msgstr "" msgid "IP Protocol" -msgstr "" +msgstr "Protokół IP" msgid "IP address" msgstr "Adres IP" @@ -2124,10 +2124,10 @@ msgid "Model" msgstr "Model" msgid "Modem default" -msgstr "" +msgstr "Domyślny modem" msgid "Modem device" -msgstr "Modem" +msgstr "Urządzenie modemowe" msgid "Modem information query failed" msgstr "Zapytanie dotyczące modemu nie powiodło się" @@ -2635,10 +2635,10 @@ msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "Przewidziane błedy CRC (CRCP_P)" msgid "Prefer LTE" -msgstr "" +msgstr "Preferuj LTE" msgid "Prefer UMTS" -msgstr "" +msgstr "Preferuj UMTS" msgid "Prefix Delegated" msgstr "" @@ -2929,13 +2929,13 @@ msgid "Revert" msgstr "Przywróć" msgid "Revert changes" -msgstr "" +msgstr "Przywróć zmiany" msgid "Revert request failed with status <code>%h</code>" -msgstr "" +msgstr "Żądanie powrotu nie powiodło się ze statusem <code>%h</code>" msgid "Reverting configuration…" -msgstr "" +msgstr "Przywracanie konfiguracji…" msgid "Root" msgstr "Root" @@ -3028,6 +3028,9 @@ msgid "" "fails. Use only if you are sure that the firmware is correct and meant for " "your device!" msgstr "" +"Wybierz 'Wymuś uaktualnienie', aby wgrać obraz nawet jeśli sprawdzenie " +"formatu obrazu nie powiedzie się. Używaj tylko wtedy, gdy masz pewność że " +"oprogramowanie jest poprawne i jest przeznaczone dla Twojego urządzenia!" msgid "" "Send LCP echo requests at the given interval in seconds, only effective in " @@ -3099,7 +3102,7 @@ msgid "Size" msgstr "Rozmiar" msgid "Size (.ipk)" -msgstr "" +msgstr "Rozmiar (.ipk)" msgid "Size of DNS query cache" msgstr "Rozmiar pamięci podręcznej zapytań DNS" diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index f74033682..d84167a52 100644 --- a/modules/luci-base/po/ru/base.po +++ b/modules/luci-base/po/ru/base.po @@ -3,7 +3,7 @@ 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-07-21 08:10+0300\n" +"PO-Revision-Date: 2018-09-05 21:48+0300\n" "Language-Team: http://cyber-place.ru\n" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" @@ -274,13 +274,13 @@ msgid "Alert" msgstr "Тревога" msgid "Alias Interface" -msgstr "" +msgstr "Псевдоним" msgid "Alias of \"%s\"" -msgstr "" +msgstr "Псевдоним интерфейса \"%s\"" msgid "All Servers" -msgstr "" +msgstr "Все серверы" msgid "" "Allocate IP addresses sequentially, starting from the lowest available " @@ -298,6 +298,8 @@ msgstr "" msgid "Allow AP mode to disconnect STAs based on low ACK condition" msgstr "" +"Разрешить режиму AP отключение абонентов на основании низкого уровня " +"подтверждения (Acknowledge) успешности получения TCP-сегментов" msgid "Allow all except listed" msgstr "Разрешить все, кроме перечисленных" @@ -339,6 +341,8 @@ msgid "" "Always use 40MHz channels even if the secondary channel overlaps. Using this " "option does not comply with IEEE 802.11n-2009!" msgstr "" +"Всегда использовать каналы 40 МГц, даже если вторичный канал перекрывается. " +"Использование этой опции не соответствует стандарту IEEE 802.11n-2009!" msgid "Annex" msgstr "Annex" @@ -544,7 +548,7 @@ msgid "Band" msgstr "Диапазон" msgid "Beacon Interval" -msgstr "" +msgstr "Интервал рассылки пакетов Beacon" msgid "" "Below is the determined list of files to backup. It consists of changed " @@ -617,10 +621,10 @@ msgid "Category" msgstr "Категория" msgid "Caution: Configuration files will be erased" -msgstr "" +msgstr "Внимание: файлы конфигурации будут удалены" msgid "Caution: System upgrade will be forced" -msgstr "" +msgstr "Внимание: выбрано принудительное обновление системы" msgid "Chain" msgstr "Цепочка" @@ -736,7 +740,7 @@ msgid "Configuration failed" msgstr "Ошибка конфигурации" msgid "Configuration files will be kept" -msgstr "" +msgstr "Конфигурационные файлы будут сохранены" msgid "Configuration has been applied." msgstr "Конфигурация применена" @@ -880,7 +884,7 @@ msgid "DSL line mode" msgstr "DSL линейный режим" msgid "DTIM Interval" -msgstr "" +msgstr "Интервал DTIM" msgid "DUID" msgstr "DUID" @@ -922,7 +926,7 @@ msgid "Delete this network" msgstr "Удалить эту сеть" msgid "Delivery Traffic Indication Message Interval" -msgstr "" +msgstr "Интервал сообщений, регламентирующий доставку трафика" msgid "Description" msgstr "Описание" @@ -983,7 +987,7 @@ msgid "Disabled (default)" msgstr "Отключено (по умолчанию)" msgid "Disassociate On Low Acknowledgement" -msgstr "" +msgstr "Не ассоциировать при низком подтверждении" msgid "Discard upstream RFC1918 responses" msgstr "Отбрасывать ответы внешней сети RFC1918." @@ -1354,7 +1358,7 @@ msgid "Force" msgstr "Назначить" msgid "Force 40MHz mode" -msgstr "" +msgstr "Принудительно использовать режим 40 МГц" msgid "Force CCMP (AES)" msgstr "Назначить CCMP (AES)" @@ -1372,7 +1376,7 @@ msgid "Force link" msgstr "Активировать соединение" msgid "Force upgrade" -msgstr "" +msgstr "Принудительная прошивка" msgid "Force use of NAT-T" msgstr "Принудительно использовать NAT-T" @@ -1537,7 +1541,7 @@ msgid "IP Addresses" msgstr "IP-адреса" msgid "IP Protocol" -msgstr "" +msgstr "IP-протокол" msgid "IP address" msgstr "IP-адрес" @@ -1734,7 +1738,7 @@ msgid "Initscript" msgstr "Скрипт инициализации" msgid "Initscripts" -msgstr "Скрипты инциализации" +msgstr "Скрипты инициализации" msgid "Install" msgstr "Установить" @@ -2151,7 +2155,7 @@ msgid "Model" msgstr "Модель" msgid "Modem default" -msgstr "" +msgstr "Настройки модема по умолчанию" msgid "Modem device" msgstr "Модем" @@ -2302,7 +2306,7 @@ msgid "No rules in this chain" msgstr "Нет правил в данной цепочке" msgid "No scan results available yet..." -msgstr "" +msgstr "Результаты сканирования пока недоступны..." msgid "No zone assigned" msgstr "Зона не присвоена" @@ -2751,6 +2755,8 @@ msgid "" "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> " "servers" msgstr "" +"Опрашивать все имеющиеся внешние <abbr title=\"Domain Name System\">DNS</" +"abbr>-серверы" msgid "R0 Key Lifetime" msgstr "R0 Key время жизни" @@ -3056,7 +3062,7 @@ msgid "Scan" msgstr "Поиск" msgid "Scan request failed" -msgstr "" +msgstr "Ошибка запроса на сканирование" msgid "Scheduled Tasks" msgstr "Запланированные задания" @@ -3075,6 +3081,9 @@ msgid "" "fails. Use only if you are sure that the firmware is correct and meant for " "your device!" msgstr "" +"Выберите 'Принудительная прошивка' для проишвки образа даже если проверка " +"формата завершается с ошибкой. Используйте эту опцию только если уверены, " +"что файл образа корректный и предназначен именно для данного устройства!" msgid "" "Send LCP echo requests at the given interval in seconds, only effective in " @@ -3123,7 +3132,7 @@ msgid "Short GI" msgstr "Short GI" msgid "Short Preamble" -msgstr "" +msgstr "Короткая преамбула" msgid "Show current backup file list" msgstr "Показать текущий список файлов резервной копии" @@ -3237,7 +3246,7 @@ msgid "Starting configuration apply…" msgstr "Применение конфигурации..." msgid "Starting wireless scan..." -msgstr "" +msgstr "Начато сканирование беспроводных сетей..." msgid "Startup" msgstr "Загрузка" @@ -4108,7 +4117,7 @@ msgid "minutes" msgstr "минут(ы)" msgid "mixed WPA/WPA2" -msgstr "" +msgstr "смешанный WPA/WPA2" msgid "no" msgstr "нет" diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po index 5113bc986..f8d89b4b1 100644 --- a/modules/luci-base/po/tr/base.po +++ b/modules/luci-base/po/tr/base.po @@ -1,15 +1,16 @@ msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2013-11-25 14:47+0200\n" -"Last-Translator: qbilay <qbilay@mynet.com>\n" +"Project-Id-Version: \n" +"PO-Revision-Date: 2018-09-13 22:59+0300\n" +"Last-Translator: Yusuf Soyipek <yusuf@soyipek.com>\n" "Language-Team: none\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.6\n" +"X-Generator: Poedit 2.1.1\n" +"POT-Creation-Date: \n" msgid "%.1f dB" msgstr "" @@ -48,7 +49,7 @@ msgid "-- match by uuid --" msgstr "-- uuid'e göre eşleştir --" msgid "-- please select --" -msgstr "" +msgstr "-- lütfen seçin --" msgid "1 Minute Load:" msgstr "1 Dakikalık Yük:" @@ -240,13 +241,13 @@ msgid "Add new interface..." msgstr "Yeni arabirim ekle..." msgid "Additional Hosts files" -msgstr "" +msgstr "Ek Hosts dosyaları" msgid "Additional servers file" -msgstr "" +msgstr "Ek sunucular dosyası" msgid "Address" -msgstr "Adresler" +msgstr "Adres" msgid "Address to access local relay bridge" msgstr "" @@ -406,7 +407,7 @@ msgid "Apply unchecked" msgstr "" msgid "Architecture" -msgstr "" +msgstr "Mimari" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -420,7 +421,7 @@ msgid "" msgstr "" msgid "Associated Stations" -msgstr "" +msgstr "İlişkili istasyonlar" msgid "Associations" msgstr "" @@ -429,10 +430,10 @@ msgid "Auth Group" msgstr "" msgid "Authentication" -msgstr "Kimlik doğrulama" +msgstr "Kimlik Doğrulama" msgid "Authentication Type" -msgstr "" +msgstr "Kimlik doğrulama türü" msgid "Authoritative" msgstr "Yetkilendirme" @@ -504,7 +505,7 @@ msgid "Backup" msgstr "Yedekleme" msgid "Backup / Flash Firmware" -msgstr "" +msgstr "Yedek/Firmware Yazma" msgid "Backup file list" msgstr "" @@ -534,16 +535,16 @@ msgid "Bind the tunnel to this interface (optional)." msgstr "" msgid "Bitrate" -msgstr "" +msgstr "Bit hızı" msgid "Bogus NX Domain Override" msgstr "" msgid "Bridge" -msgstr "" +msgstr "Köprü" msgid "Bridge interfaces" -msgstr "" +msgstr "Köprü arabirimleri" msgid "Bridge unit number" msgstr "" @@ -558,7 +559,7 @@ msgid "Broadcom BCM%04x 802.11 Wireless Controller" msgstr "" msgid "Buffered" -msgstr "" +msgstr "Tamponlu" msgid "" "Build/distribution specific feed definitions. This file will NOT be " @@ -643,6 +644,8 @@ msgid "" "Click \"Generate archive\" to download a tar archive of the current " "configuration files." msgstr "" +"Mevcut yapılandırma dosyalarının yeni bir arşivini indirmek için \"Arşiv " +"Oluştur\"'u tıklayın." msgid "Client" msgstr "" @@ -690,22 +693,22 @@ msgid "Configuration has been rolled back!" msgstr "" msgid "Confirmation" -msgstr "" +msgstr "Onayla" msgid "Connect" -msgstr "" +msgstr "Bağlan" msgid "Connected" -msgstr "" +msgstr "Bağlandı" msgid "Connection Limit" -msgstr "" +msgstr "Bağlantı limiti" msgid "Connection attempt failed" msgstr "" msgid "Connections" -msgstr "" +msgstr "Bağlantılar" msgid "" "Could not regain access to the device after applying the configuration " @@ -714,10 +717,10 @@ msgid "" msgstr "" msgid "Country" -msgstr "" +msgstr "Ülke" msgid "Country Code" -msgstr "" +msgstr "Ülke Kodu" msgid "Cover the following interface" msgstr "" @@ -729,19 +732,19 @@ msgid "Create / Assign firewall-zone" msgstr "" msgid "Create Interface" -msgstr "" +msgstr "Arabirim Oluştur" msgid "Create a bridge over multiple interfaces" msgstr "" msgid "Critical" -msgstr "" +msgstr "Kritik" msgid "Cron Log Level" msgstr "" msgid "Custom Interface" -msgstr "" +msgstr "Özel Arabirim" msgid "Custom delegated IPv6-prefix" msgstr "" @@ -828,19 +831,19 @@ msgid "Debug" msgstr "" msgid "Default %d" -msgstr "" +msgstr "Varsayılan" msgid "Default gateway" -msgstr "" +msgstr "Default ağ geçidi" msgid "Default is stateless + stateful" msgstr "" msgid "Default state" -msgstr "" +msgstr "Varsayılan durum" msgid "Define a name for this network." -msgstr "" +msgstr "Bu ağ için bir ad tanımlayın." msgid "" "Define additional DHCP options, for example " @@ -849,69 +852,71 @@ msgid "" msgstr "" msgid "Delete" -msgstr "" +msgstr "Sil" msgid "Delete this network" -msgstr "" +msgstr "Bu ağı sil" msgid "Delivery Traffic Indication Message Interval" msgstr "" msgid "Description" -msgstr "" +msgstr "Açıklama" msgid "Design" -msgstr "" +msgstr "Tasarım" msgid "Destination" -msgstr "" +msgstr "Hedef" msgid "Device" -msgstr "" +msgstr "Cihaz" msgid "Device Configuration" -msgstr "" +msgstr "Cihaz Yapılandırması" msgid "Device is rebooting..." -msgstr "" +msgstr "Cihaz yeniden başlatılıyor..." msgid "Device unreachable!" -msgstr "" +msgstr "Cihaz ulaşılamaz!" msgid "Device unreachable! Still waiting for device..." -msgstr "" +msgstr "Cihaz ulaşılamaz! Hala cihazı bekliyorum..." msgid "Diagnostics" -msgstr "" +msgstr "Tanı" msgid "Dial number" -msgstr "" +msgstr "Arama numarası" msgid "Directory" -msgstr "" +msgstr "Dizin" msgid "Disable" -msgstr "" +msgstr "Pasif" msgid "" "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for " "this interface." msgstr "" +"Bu arabirim için <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</" +"abbr>'yi devre dışı bırakın." msgid "Disable DNS setup" -msgstr "" +msgstr "DNS kurulumunu devre dışı" msgid "Disable Encryption" -msgstr "" +msgstr "Şifrelemeyi Devre Dışı" msgid "Disable this network" -msgstr "" +msgstr "Ağ devre dışı" msgid "Disabled" -msgstr "" +msgstr "Devre dışı" msgid "Disabled (default)" -msgstr "" +msgstr "Devre dışı (varsayılan)" msgid "Disassociate On Low Acknowledgement" msgstr "" @@ -920,16 +925,16 @@ msgid "Discard upstream RFC1918 responses" msgstr "" msgid "Disconnection attempt failed" -msgstr "" +msgstr "Bağlantı kesme girişimi başarısız oldu" msgid "Dismiss" -msgstr "" +msgstr "Reddet" msgid "Displaying only packages containing" -msgstr "" +msgstr "Yalnızca içeren paketler görüntüleniyor" msgid "Distance Optimization" -msgstr "" +msgstr "Mesafe Optimizasyonu" msgid "Distance to farthest network member in meters." msgstr "" @@ -1146,7 +1151,7 @@ msgid "Expand hosts" msgstr "" msgid "Expires" -msgstr "" +msgstr "Süre Bitişi" msgid "" "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)." @@ -1236,19 +1241,19 @@ msgid "Firmware File" msgstr "" msgid "Firmware Version" -msgstr "" +msgstr "Firmware Versiyon" msgid "Fixed source port for outbound DNS queries" msgstr "" msgid "Flash Firmware" -msgstr "" +msgstr "Firmware Güncelle" msgid "Flash image..." -msgstr "" +msgstr "Dosyayı yaz..." msgid "Flash new firmware image" -msgstr "" +msgstr "Yeni firmware dosyasını yaz" msgid "Flash operations" msgstr "" @@ -1308,10 +1313,10 @@ msgid "Frame Bursting" msgstr "" msgid "Free" -msgstr "" +msgstr "Boş" msgid "Free space" -msgstr "" +msgstr "Boş alan" msgid "" "Further information about WireGuard interfaces and peers at <a href=\"http://" @@ -1325,7 +1330,7 @@ msgid "GPRS only" msgstr "" msgid "Gateway" -msgstr "" +msgstr "Ağ Geçidi" msgid "Gateway address is invalid" msgstr "" @@ -1349,7 +1354,7 @@ msgid "Generate PMK locally" msgstr "" msgid "Generate archive" -msgstr "" +msgstr "Arşiv oluştur" msgid "Generic 802.11%s Wireless Controller" msgstr "" @@ -1488,7 +1493,7 @@ msgid "IPv4+IPv6" msgstr "" msgid "IPv4-Address" -msgstr "" +msgstr "IPv4-Adres" msgid "IPv4-in-IPv4 (RFC2003)" msgstr "" @@ -1539,7 +1544,7 @@ msgid "IPv6 suffix" msgstr "" msgid "IPv6-Address" -msgstr "" +msgstr "IPv6-Adres" msgid "IPv6-PD" msgstr "" @@ -1707,7 +1712,7 @@ msgid "Kernel Log" msgstr "" msgid "Kernel Version" -msgstr "" +msgstr "Çekirdek Versiyonu" msgid "Key" msgstr "" @@ -1758,7 +1763,7 @@ msgid "Leasefile" msgstr "" msgid "Leasetime remaining" -msgstr "" +msgstr "Kalan kira süresi" msgid "Leave empty to autodetect" msgstr "" @@ -1839,7 +1844,7 @@ msgid "Load" msgstr "" msgid "Load Average" -msgstr "" +msgstr "Ortalama Yük" msgid "Loading" msgstr "" @@ -1863,7 +1868,7 @@ msgid "Local Startup" msgstr "" msgid "Local Time" -msgstr "" +msgstr "Yerel Zaman" msgid "Local domain" msgstr "" @@ -1915,7 +1920,7 @@ msgid "MAC" msgstr "" msgid "MAC-Address" -msgstr "" +msgstr "MAC-Adres" msgid "MAC-Address Filter" msgstr "" @@ -1979,7 +1984,7 @@ msgid "Mbit/s" msgstr "" msgid "Memory" -msgstr "" +msgstr "Bellek" msgid "Memory usage (%)" msgstr "" @@ -2101,10 +2106,10 @@ msgid "Navigation" msgstr "" msgid "Netmask" -msgstr "" +msgstr "Ağ Maskesi" msgid "Network" -msgstr "" +msgstr "Ağ" msgid "Network Utilities" msgstr "" @@ -2164,7 +2169,7 @@ msgid "No zone assigned" msgstr "" msgid "Noise" -msgstr "" +msgstr "Parazit" msgid "Noise Margin (SNR)" msgstr "" @@ -2349,7 +2354,7 @@ msgid "Override the table used for internal routes" msgstr "" msgid "Overview" -msgstr "" +msgstr "Genel Bakış" msgid "Owner" msgstr "" @@ -2543,7 +2548,7 @@ msgid "Prot." msgstr "" msgid "Protocol" -msgstr "" +msgstr "Protokol" msgid "Protocol family" msgstr "" @@ -3370,7 +3375,7 @@ msgid "Tone" msgstr "" msgid "Total Available" -msgstr "" +msgstr "Toplam Mevcut" msgid "Traceroute" msgstr "" @@ -3502,7 +3507,7 @@ msgid "Uploaded File" msgstr "Yüklenen Dosya" msgid "Uptime" -msgstr "Açılma süresi" +msgstr "Çalışma Zamanı" msgid "Use <code>/etc/ethers</code>" msgstr "" diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua index 2fa7847fc..46d2e36c3 100644 --- a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua +++ b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua @@ -35,6 +35,7 @@ function index() entry({"admin", "system", "flashops"}, call("action_flashops"), _("Backup / Flash Firmware"), 70) entry({"admin", "system", "flashops", "reset"}, post("action_reset")) entry({"admin", "system", "flashops", "backup"}, post("action_backup")) + entry({"admin", "system", "flashops", "backupmtdblock"}, post("action_backupmtdblock")) entry({"admin", "system", "flashops", "backupfiles"}, form("admin_system/backupfiles")) -- call() instead of post() due to upload handling! @@ -318,6 +319,23 @@ function action_backup() luci.ltn12.pump.all(reader, luci.http.write) end +function action_backupmtdblock() + local http = require "luci.http" + local mv = http.formvalue("mtdblockname") + local m, s, n = mv:match('^([^%s]+)/([^%s]+)/([^%s]+)') + + local reader = ltn12_popen("dd if=/dev/mtd%s conv=fsync,notrunc 2>/dev/null" % n) + + luci.http.header( + 'Content-Disposition', 'attachment; filename="backup-%s-%s-%s.bin"' %{ + luci.sys.hostname(), m, + os.date("%Y-%m-%d") + }) + + luci.http.prepare_content("application/octet-stream") + luci.ltn12.pump.all(reader, luci.http.write) +end + function action_restore() local fs = require "nixio.fs" local http = require "luci.http" diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm index f3d2e8d7b..8204d38e3 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm @@ -59,6 +59,40 @@ <div class="cbi-section-error"><%:The backup archive does not appear to be a valid gzip file.%></div> <% end %> </div> + + <% local mtds = require("luci.sys").mtds(); if #mtds > 0 then -%> + <h3><%:Save mtdblock contents%></h3> + <div class="cbi-section-descr"><%:Click "Save mtdblock" to download specified mtdblock file. (NOTE: THIS FEATURE IS FOR PROFESSIONALS! )%></div> + <div class="cbi-section-node"> + <form class="inline" method="post" action="<%=url('admin/system/flashops/backupmtdblock')%>"> + <input type="hidden" name="token" value="<%=token%>" /> + <div class="cbi-value"> + <label class="cbi-value-title" for="mtdblockname"><%:Choose mtdblock%></label> + <div class="cbi-value-field"> + <select class="cbi-input-select" data-update="change" name="mtdblockname" id="mtdblockname"> + <% for i, key in ipairs(mtds) do + if key and key.name ~= "rootfs_data" then -%> + <option<%= + attr("id", "mtdblockname-" .. key.name) .. + attr("value", key.name .. '/'.. key.size .. '/' .. i - 1) .. + attr("data-index", i) .. + ifattr(key.name == "linux" or key.name == "firmware", "selected", "selected") + %>><%=pcdata(key.name)%></option> + <% end + end -%> + </select> + </div> + </div> + <div class="cbi-value cbi-value-last<% if reset_avail then %> cbi-value-error<% end %>"> + <label class="cbi-value-title" for="image"><%:Download mtdblock%></label> + <div class="cbi-value-field"> + <input type="submit" class="cbi-button cbi-button-action important" value="<%:Save mtdblock%>" /> + </div> + </div> + </form> + </div> + <% end %> + </div> <div class="cbi-section"> 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 4875c33f8..b452b8ae8 100644 --- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css @@ -1226,7 +1226,7 @@ td > .ifacebadge, min-height: 14rem; padding: 0.8rem; font-size: 0.8rem; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: monospace; color: black; } |