diff options
120 files changed, 2809 insertions, 1174 deletions
diff --git a/applications/luci-app-adblock/luasrc/view/adblock/query.htm b/applications/luci-app-adblock/luasrc/view/adblock/query.htm index 2cf7e5baaf..88108c3f21 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 3f4d642592..4f7cfbf8a1 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/it/adblock.po b/applications/luci-app-adblock/po/it/adblock.po index 9eddb7d91b..14c64bcaea 100644 --- a/applications/luci-app-adblock/po/it/adblock.po +++ b/applications/luci-app-adblock/po/it/adblock.po @@ -14,9 +14,6 @@ msgstr "" msgid "'Jail' Blocklist Creation" msgstr "" -msgid "-------" -msgstr "" - msgid "" "<b>Caution:</b> To prevent OOM exceptions on low memory devices with less " "than 64 MB free RAM, please only select a few of them!" @@ -25,9 +22,6 @@ msgstr "" msgid "Adblock" msgstr "Adblock" -msgid "Adblock Logfile" -msgstr "Registro Adblock" - msgid "Adblock Status" msgstr "Status Adblock" @@ -57,7 +51,7 @@ msgstr "" msgid "" "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all " -"domains except those listed in the whitelist file.<br />" +"domains except those listed in the whitelist file." msgstr "" msgid "" @@ -146,11 +140,6 @@ msgid "Flush DNS Cache after adblock processing." msgstr "" msgid "" -"For SSL protected blocklist sources you need a suitable SSL library, e.g. " -"'libustream-ssl' or 'built-in'." -msgstr "" - -msgid "" "For further information <a href=\"%s\" target=\"_blank\">check the online " "documentation</a>" msgstr "" @@ -177,15 +166,12 @@ msgstr "Ultimo Avvio" msgid "" "List of available network interfaces. Usually the startup will be triggered " -"by the 'wan' interface.<br />" +"by the 'wan' interface." msgstr "" msgid "" -"List of supported DNS backends with their default list export directory.<br /" -">" +"List of supported DNS backends with their default list export directory." msgstr "" -"Lista dei backend DNS supportati con la loro directory di default di esporto " -"della lista.<br />" msgid "List of supported and fully pre-configured download utilities." msgstr "" @@ -193,10 +179,10 @@ msgstr "" msgid "Loading" msgstr "Caricando" -msgid "Max. Download Queue" +msgid "Low Priority Service" msgstr "" -msgid "Name" +msgid "Max. Download Queue" msgstr "" msgid "No" @@ -237,12 +223,19 @@ msgstr "Interrogazione domini" 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 />" +"count is less or equal to the given limit (default 0)," +msgstr "" + +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 "" + +msgid "Refresh" msgstr "" -msgid "Redirect all DNS queries from 'lan' zone to the local resolver." +msgid "Refresh Blocklist Sources" msgstr "" -"Reindirizza tutte le richieste DNS dalla zona 'lan' al risolvitore locale." msgid "Resume" msgstr "Riprendi" @@ -258,12 +251,17 @@ msgstr "Salva" msgid "" "Send notification emails in case of a processing error or if domain count is " -"≤ 0.<br />" +"≤ 0." +msgstr "" + +msgid "" +"Set the nice level to 'low priority' and the adblock background processing " +"will take less resources from the system." msgstr "" msgid "" "Size of the download queue to handle downloads & list processing in " -"parallel (default '4').<br />" +"parallel (default '4')." msgstr "" msgid "Startup Trigger" @@ -286,19 +284,19 @@ msgstr "Directory per la lista di blocco generata 'adb_list.overall'." msgid "The file size is too large for online editing in LuCI (≥ 100 KB)." msgstr "" +msgid "The syslog output, pre-filtered for adblock related messages only." +msgstr "" + +msgid "This change requires a manual service stop/re-start to take effect." +msgstr "" + msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." -"<br />" msgstr "" -"Questo form ti consente di modificare il contenuto della lista nera di " -"adblock (%s).<br />" msgid "" "This form allows you to modify the content of the adblock whitelist (%s)." -"<br />" msgstr "" -"Questo form ti consente di modificare il contenuto della lista bianca di " -"adblock (%s).<br />" msgid "" "This form allows you to modify the content of the main adblock configuration " @@ -315,13 +313,6 @@ msgstr "" "determinati domini, p.e. per metterli nella lista bianca." msgid "" -"This form shows the syslog output, pre-filtered for adblock related messages " -"only." -msgstr "" -"Questo form mostra l'output del registro, prefiltrato per messaggi relativi " -"solo ad adblock." - -msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." msgstr "" @@ -351,28 +342,60 @@ msgid "" "kidsafe configurations." msgstr "" -msgid "disabled" -msgstr "disabilitato" - msgid "" "e.g. to receive an email notification with every adblock update set this " "value to 150000." msgstr "" -msgid "enabled" -msgstr "abilitato" +#~ msgid "Adblock Logfile" +#~ msgstr "Registro Adblock" -msgid "error" -msgstr "errore" +#~ msgid "" +#~ "List of supported DNS backends with their default list export directory." +#~ "<br />" +#~ msgstr "" +#~ "Lista dei backend DNS supportati con la loro directory di default di " +#~ "esporto della lista.<br />" -msgid "n/a" -msgstr "n/d" +#~ msgid "Redirect all DNS queries from 'lan' zone to the local resolver." +#~ msgstr "" +#~ "Reindirizza tutte le richieste DNS dalla zona 'lan' al risolvitore locale." -msgid "paused" -msgstr "in pausa" +#~ msgid "" +#~ "This form allows you to modify the content of the adblock blacklist (%s)." +#~ "<br />" +#~ msgstr "" +#~ "Questo form ti consente di modificare il contenuto della lista nera di " +#~ "adblock (%s).<br />" -msgid "running" -msgstr "" +#~ msgid "" +#~ "This form allows you to modify the content of the adblock whitelist (%s)." +#~ "<br />" +#~ msgstr "" +#~ "Questo form ti consente di modificare il contenuto della lista bianca di " +#~ "adblock (%s).<br />" + +#~ msgid "" +#~ "This form shows the syslog output, pre-filtered for adblock related " +#~ "messages only." +#~ msgstr "" +#~ "Questo form mostra l'output del registro, prefiltrato per messaggi " +#~ "relativi solo ad adblock." + +#~ msgid "disabled" +#~ msgstr "disabilitato" + +#~ msgid "enabled" +#~ msgstr "abilitato" + +#~ msgid "error" +#~ msgstr "errore" + +#~ msgid "n/a" +#~ msgstr "n/d" + +#~ msgid "paused" +#~ msgstr "in pausa" #~ msgid "Invalid domain specified!" #~ msgstr "Dominio invalido specificato!" diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po index ff3234175a..888ecd945e 100644 --- a/applications/luci-app-adblock/po/ja/adblock.po +++ b/applications/luci-app-adblock/po/ja/adblock.po @@ -8,15 +8,12 @@ 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" msgstr "'Jail' ブロックリストの作成" -msgid "-------" -msgstr "（利用不可）" - msgid "" "<b>Caution:</b> To prevent OOM exceptions on low memory devices with less " "than 64 MB free RAM, please only select a few of them!" @@ -27,9 +24,6 @@ msgstr "" msgid "Adblock" msgstr "Adblock" -msgid "Adblock Logfile" -msgstr "Adblock ログファイル" - msgid "Adblock Status" msgstr "Adblock ステータス" @@ -43,7 +37,7 @@ msgid "Advanced" msgstr "詳細設定" msgid "Archive Categories" -msgstr "" +msgstr "アーカイブ カテゴリ" msgid "Backup Directory" msgstr "バックアップ先 ディレクトリ" @@ -55,14 +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.<br />" +"domains except those listed in the whitelist file." msgstr "" -"ホワイトリストに存在しない全ドメインへのアクセスをブロックするために、追加で " -"'Jail' リスト (/tmp/adb_list.jail) を作成します。<br />" +"ホワイトリストに列挙されたものを除く全てのドメインをブロックする、追加の " +"'Jail' リスト (/tmp/adb_list.jail) を作成します。" msgid "" "Choose 'none' to disable automatic startups, 'timed' to use a classic " @@ -156,13 +150,6 @@ msgid "Flush DNS Cache after adblock processing." msgstr "Adblock 処理の後に DNS キャッシュをクリアします。" 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 "" "For further information <a href=\"%s\" target=\"_blank\">check the online " "documentation</a>" msgstr "" @@ -193,17 +180,16 @@ msgstr "最終実行" msgid "" "List of available network interfaces. Usually the startup will be triggered " -"by the 'wan' interface.<br />" +"by the 'wan' interface." msgstr "" -"利用可能なネットワーク インターフェースの一覧です。通常、 'wan' インター" -"フェースによりスタートアップがトリガされます。<br />" +"利用可能なネットワーク インターフェースの一覧です。通常、スタートアップは " +"'wan' インターフェースによってトリガされます。" msgid "" -"List of supported DNS backends with their default list export directory.<br /" -">" +"List of supported DNS backends with their default list export directory." msgstr "" -"サポートされる DNS バックエンドと、それぞれのデフォルトのリスト出力先ディレク" -"トリのリストです<br />" +"サポートされる DNS バックエンドと、それぞれのデフォルトのリスト出力先の一覧で" +"す。" msgid "List of supported and fully pre-configured download utilities." msgstr "サポートされ、かつ設定済のダウンロード ユーティリティの一覧です。" @@ -211,12 +197,12 @@ msgstr "サポートされ、かつ設定済のダウンロード ユーティ msgid "Loading" msgstr "読込中" +msgid "Low Priority Service" +msgstr "低優先度サービス" + msgid "Max. Download Queue" msgstr "ダウンロード キューの上限" -msgid "Name" -msgstr "" - msgid "No" msgstr "いいえ" @@ -254,14 +240,23 @@ msgstr "ドメインの検索" msgid "" "Raise the minimum email notification count, to get emails if the overall " -"count is less or equal to the given limit (default 0),<br />" +"count is less or equal to the given limit (default 0)," msgstr "" -"メール通知を行うドメイン カウントの下限を設定します。全体カウントが指定された" -"値以下の場合、メールを受け取ります（規定値: 0）。<br />" +"メール通知を行うメール通知カウントの下限値を設定します。全体カウントが指定さ" +"れた値以下の場合、メールを受け取ります（規定値: 0）。" -msgid "Redirect all DNS queries from 'lan' zone to the local resolver." +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 クエリを、ローカル リゾルバにリダイレクトします。" +"'lan' ゾーンからの全 DNS クエリをローカル リゾルバにリダイレクトします。これ" +"は、53, 853, 5353 の各ポートにおける UDP, TCP プロトコルに適用されます。" + +msgid "Refresh" +msgstr "リフレッシュ" + +msgid "Refresh Blocklist Sources" +msgstr "ブロックリスト提供元のリフレッシュ" msgid "Resume" msgstr "再開" @@ -277,16 +272,23 @@ msgstr "保存" msgid "" "Send notification emails in case of a processing error or if domain count is " -"≤ 0.<br />" +"≤ 0." +msgstr "" +"処理エラーまたはドメイン カウントが 0 以下の場合、通知メールを送信します。" + +msgid "" +"Set the nice level to 'low priority' and the adblock background processing " +"will take less resources from the system." msgstr "" -"処理エラーまたはドメイン カウントが0以下の場合、メールを送信します。<br />" +"nice値（優先度）を '低優先度' に設定し、adblock バックグラウンド処理のシステ" +"ムリソース使用量を抑制します。" msgid "" "Size of the download queue to handle downloads & list processing in " -"parallel (default '4').<br />" +"parallel (default '4')." msgstr "" "ダウンロードの制御とリストの処理を同時並行的に行うダウンロード キューのサイズ" -"です（既定値: '4'）。<br />" +"です（規定値: '4'）。" msgid "Startup Trigger" msgstr "スタートアップ トリガ" @@ -312,19 +314,23 @@ msgstr "" "LuCI上でのオンライン編集を行うには、ファイルサイズが大きすぎます (≥ 100 " "KB)。" +msgid "The syslog output, pre-filtered for adblock related messages only." +msgstr "Adblock に関連するメッセージのみが抽出された、システムログ出力です。" + +msgid "This change requires a manual service stop/re-start to take effect." +msgstr "この変更の反映には、手動でのサービスの停止 / 再起動が必要です。" + 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 allows you to modify the content of the main adblock configuration " @@ -341,13 +347,6 @@ msgstr "" "す。例: ホワイトリスト内" msgid "" -"This form shows the syslog output, pre-filtered for adblock related messages " -"only." -msgstr "" -"このフォームには、システムログ内の Adblock に関連するメッセージのみが表示され" -"ます。" - -msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." msgstr "" @@ -379,32 +378,8 @@ msgstr "" "この制約の厳しいブロックリストを、ゲスト WiFi や子供の安全を守る設定などに手" "動で利用することができます。" -msgid "disabled" -msgstr "無効" - msgid "" "e.g. to receive an email notification with every adblock update set this " "value to 150000." msgstr "" "例: Adblock のアップデート毎にメールを受け取るには、150000 に設定します。" - -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-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po index 6e5c7497c7..2cd4dcfaca 100644 --- a/applications/luci-app-adblock/po/pt-br/adblock.po +++ b/applications/luci-app-adblock/po/pt-br/adblock.po @@ -15,9 +15,6 @@ msgstr "" msgid "'Jail' Blocklist Creation" msgstr "" -msgid "-------" -msgstr "" - msgid "" "<b>Caution:</b> To prevent OOM exceptions on low memory devices with less " "than 64 MB free RAM, please only select a few of them!" @@ -26,9 +23,6 @@ msgstr "" msgid "Adblock" msgstr "Adblock" -msgid "Adblock Logfile" -msgstr "Arquivo de log do Adblock" - msgid "Adblock Status" msgstr "" @@ -60,7 +54,7 @@ msgstr "" msgid "" "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all " -"domains except those listed in the whitelist file.<br />" +"domains except those listed in the whitelist file." msgstr "" msgid "" @@ -146,11 +140,6 @@ msgid "Flush DNS Cache after adblock processing." msgstr "" msgid "" -"For SSL protected blocklist sources you need a suitable SSL library, e.g. " -"'libustream-ssl' or 'built-in'." -msgstr "" - -msgid "" "For further information <a href=\"%s\" target=\"_blank\">check the online " "documentation</a>" msgstr "" @@ -177,12 +166,11 @@ msgstr "" msgid "" "List of available network interfaces. Usually the startup will be triggered " -"by the 'wan' interface.<br />" +"by the 'wan' interface." msgstr "" msgid "" -"List of supported DNS backends with their default list export directory.<br /" -">" +"List of supported DNS backends with their default list export directory." msgstr "" msgid "List of supported and fully pre-configured download utilities." @@ -191,10 +179,10 @@ msgstr "" msgid "Loading" msgstr "Carregando" -msgid "Max. Download Queue" +msgid "Low Priority Service" msgstr "" -msgid "Name" +msgid "Max. Download Queue" msgstr "" msgid "No" @@ -232,10 +220,18 @@ msgstr "Consulta de domínios" 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 />" +"count is less or equal to the given limit (default 0)," +msgstr "" + +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 "" -msgid "Redirect all DNS queries from 'lan' zone to the local resolver." +msgid "Refresh" +msgstr "" + +msgid "Refresh Blocklist Sources" msgstr "" msgid "Resume" @@ -252,12 +248,17 @@ msgstr "Salvar" msgid "" "Send notification emails in case of a processing error or if domain count is " -"≤ 0.<br />" +"≤ 0." +msgstr "" + +msgid "" +"Set the nice level to 'low priority' and the adblock background processing " +"will take less resources from the system." msgstr "" msgid "" "Size of the download queue to handle downloads & list processing in " -"parallel (default '4').<br />" +"parallel (default '4')." msgstr "" msgid "Startup Trigger" @@ -280,19 +281,19 @@ msgstr "" msgid "The file size is too large for online editing in LuCI (≥ 100 KB)." msgstr "" +msgid "The syslog output, pre-filtered for adblock related messages only." +msgstr "" + +msgid "This change requires a manual service stop/re-start to take effect." +msgstr "" + msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." -"<br />" msgstr "" -"Esse formulário permite que você modifique o conteúdo das listas de bloqueio " -"do adblock (%s).<br />" msgid "" "This form allows you to modify the content of the adblock whitelist (%s)." -"<br />" msgstr "" -"Esse formulário permite que você modifique o conteúdo das listas de " -"permissão do adblock (%s).<br />" msgid "" "This form allows you to modify the content of the main adblock configuration " @@ -309,13 +310,6 @@ msgstr "" "certos domínios, e.x. para listas de permissão." msgid "" -"This form shows the syslog output, pre-filtered for adblock related messages " -"only." -msgstr "" -"Esse formulário mostra a saída do syslog, pré-filtrado para mensagens do " -"adblock apenas." - -msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." msgstr "" @@ -343,28 +337,37 @@ msgid "" "kidsafe configurations." msgstr "" -msgid "disabled" -msgstr "" - msgid "" "e.g. to receive an email notification with every adblock update set this " "value to 150000." msgstr "" -msgid "enabled" -msgstr "" +#~ msgid "Adblock Logfile" +#~ msgstr "Arquivo de log do Adblock" -msgid "error" -msgstr "" +#~ msgid "" +#~ "This form allows you to modify the content of the adblock blacklist (%s)." +#~ "<br />" +#~ msgstr "" +#~ "Esse formulário permite que você modifique o conteúdo das listas de " +#~ "bloqueio do adblock (%s).<br />" -msgid "n/a" -msgstr "n/d" +#~ msgid "" +#~ "This form allows you to modify the content of the adblock whitelist (%s)." +#~ "<br />" +#~ msgstr "" +#~ "Esse formulário permite que você modifique o conteúdo das listas de " +#~ "permissão do adblock (%s).<br />" -msgid "paused" -msgstr "" +#~ msgid "" +#~ "This form shows the syslog output, pre-filtered for adblock related " +#~ "messages only." +#~ msgstr "" +#~ "Esse formulário mostra a saída do syslog, pré-filtrado para mensagens do " +#~ "adblock apenas." -msgid "running" -msgstr "" +#~ msgid "n/a" +#~ msgstr "n/d" #~ msgid "Invalid domain specified!" #~ msgstr "Domínio especificado inválido!" diff --git a/applications/luci-app-adblock/po/ru/adblock.po b/applications/luci-app-adblock/po/ru/adblock.po index f4957994b6..166681463b 100644 --- a/applications/luci-app-adblock/po/ru/adblock.po +++ b/applications/luci-app-adblock/po/ru/adblock.po @@ -18,22 +18,16 @@ msgstr "" msgid "'Jail' Blocklist Creation" msgstr "Создание Черного<br />списка 'Jail'" -msgid "-------" -msgstr "-------" - msgid "" "<b>Caution:</b> To prevent OOM exceptions on low memory devices with less " "than 64 MB free RAM, please only select a few of them!" msgstr "" -"<b>Внимание:</b> Для предотвращения переполнения ОЗУ, на устройствах" -"с ОЗУ менее 64MB, выбирайте только необходимый минимум списков!" +"<b>Внимание:</b> Для предотвращения переполнения ОЗУ, на устройствахс ОЗУ " +"менее 64MB, выбирайте только необходимый минимум списков!" msgid "Adblock" msgstr "AdBlock" -msgid "Adblock Logfile" -msgstr "Системный журнал Adblock" - msgid "Adblock Status" msgstr "Состояние Adblock" @@ -63,11 +57,8 @@ msgstr "Список блокировок не найден!" msgid "" "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all " -"domains except those listed in the whitelist file.<br />" +"domains except those listed in the whitelist file." msgstr "" -"Создать дополнительный Черный список 'Jail' (/tmp/adb_list.jail), чтобы " -"заблокировать доступ ко всем доменам, кроме тех что перечислены в файле " -"Белого списка.<br />" msgid "" "Choose 'none' to disable automatic startups, 'timed' to use a classic " @@ -90,8 +81,8 @@ msgid "" "Create compressed blocklist backups, they will be used in case of download " "errors or during startup in backup mode." msgstr "" -"Создание сжатых резервных копий списков блокировок, они будут " -"использоваться в случае ошибок загрузки или при запуске в ручном режиме." +"Создание сжатых резервных копий списков блокировок, они будут использоваться " +"в случае ошибок загрузки или при запуске в ручном режиме." msgid "DNS Backend (DNS Directory)" msgstr "DNS бэкенд (папка DNS)" @@ -140,8 +131,9 @@ msgid "" "Enable memory intense overall sort / duplicate removal on low memory devices " "(< 64 MB free RAM)" msgstr "" -"Включить полную сортировку / удаление дубликатов в памяти. Используйте на устройствах с " -"низким объемом памяти (< 64 MB свободной оперативной памяти)." +"Включить полную сортировку / удаление дубликатов в памяти. Используйте на " +"устройствах с низким объемом памяти (< 64 MB свободной оперативной " +"памяти)." msgid "Enable verbose debug logging in case of any processing error." msgstr "Включить подробное ведение журнала отладки в случае ошибок обработки." @@ -159,13 +151,6 @@ msgid "Flush DNS Cache after adblock processing." msgstr "Очистка DNS-кэша после обработки Adblock-ом." 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 "" "For further information <a href=\"%s\" target=\"_blank\">check the online " "documentation</a>" msgstr "" @@ -176,8 +161,8 @@ msgid "" "For further performance improvements you can raise this value, e.g. '8' or " "'16' should be safe." msgstr "" -"Для дополнительного повышения производительности вы можете увеличить это значение, например " -"значения '8' или '16' должны быть безопасными." +"Для дополнительного повышения производительности вы можете увеличить это " +"значение, например значения '8' или '16' должны быть безопасными." msgid "Force Local DNS" msgstr "Локальный DNS" @@ -196,30 +181,27 @@ msgstr "Последний запуск" msgid "" "List of available network interfaces. Usually the startup will be triggered " -"by the 'wan' interface.<br />" +"by the 'wan' interface." msgstr "" -"Список доступных сетевых интерфейсов. По умолчанию установлен 'wan' " -"интерфейс.<br />" msgid "" -"List of supported DNS backends with their default list export directory.<br /" -">" +"List of supported DNS backends with their default list export directory." msgstr "" -"Список поддерживаемых серверов DNS с их стандартными папками для экспорта списков.<br />" msgid "List of supported and fully pre-configured download utilities." msgstr "" -"Список поддерживаемых и полностью предварительно настроенных утилит для скачивания." +"Список поддерживаемых и полностью предварительно настроенных утилит для " +"скачивания." msgid "Loading" msgstr "Загрузка" +msgid "Low Priority Service" +msgstr "" + msgid "Max. Download Queue" msgstr "Максимальная очередь загрузки" -msgid "Name" -msgstr "" - msgid "No" msgstr "Нет" @@ -257,14 +239,19 @@ msgstr "Запрос доменов" msgid "" "Raise the minimum email notification count, to get emails if the overall " -"count is less or equal to the given limit (default 0),<br />" +"count is less or equal to the given limit (default 0)," +msgstr "" + +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 "" -"Увеличьте количество email уведомлений, чтобы получить сообщения, если " -"общее количество меньше или равно заданному пределу (по умолчанию 0),<br />" -msgid "Redirect all DNS queries from 'lan' zone to the local resolver." +msgid "Refresh" +msgstr "" + +msgid "Refresh Blocklist Sources" msgstr "" -"Перенаправлять все DNS запросы с интерфейса 'lan' на обработку Adblock-ом." msgid "Resume" msgstr "Возобновить" @@ -280,17 +267,18 @@ msgstr "Сохранить" msgid "" "Send notification emails in case of a processing error or if domain count is " -"≤ 0.<br />" +"≤ 0." +msgstr "" + +msgid "" +"Set the nice level to 'low priority' and the adblock background processing " +"will take less resources from the system." msgstr "" -"Отправлять email уведомления в случае ошибки обработки или если количество обработанных доменов равно" -" 0.<br />" msgid "" "Size of the download queue to handle downloads & list processing in " -"parallel (default '4').<br />" +"parallel (default '4')." msgstr "" -"Количество потоков для скачивания списков блокировок (по умолчанию " -"'4').<br />" msgid "Startup Trigger" msgstr "Триггер запуска" @@ -305,26 +293,30 @@ msgid "" "Target directory for adblock backups. Please use only non-volatile disks, e." "g. an external usb stick." msgstr "" -"Папка для бэкапов списков блокировок. Используйте такие " -"накопители, как usb флешка." +"Папка для бэкапов списков блокировок. Используйте такие накопители, как usb " +"флешка." msgid "Target directory for the generated blocklist 'adb_list.overall'." msgstr "Папка для созданного списка блокировки 'adb_list.overall'." msgid "The file size is too large for online editing in LuCI (≥ 100 KB)." -msgstr "Этот файл слишком большой для редактирования в Web-интерфейсе LuCI (≥ 100 KB)." +msgstr "" +"Этот файл слишком большой для редактирования в Web-интерфейсе LuCI (≥ 100 " +"KB)." + +msgid "The syslog output, pre-filtered for adblock related messages only." +msgstr "" + +msgid "This change requires a manual service stop/re-start to take effect." +msgstr "" 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 allows you to modify the content of the main adblock configuration " @@ -341,11 +333,6 @@ msgstr "" "Белого списка." msgid "" -"This form shows the syslog output, pre-filtered for adblock related messages " -"only." -msgstr "Страница системного журнала. Только сообщения связанные с Adblock." - -msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." msgstr "" @@ -377,27 +364,107 @@ msgstr "" "Вы можете вручную настраивать и использовать этот Черный список, например " "для гостевой wifi сети или режима родительского контроля." -msgid "disabled" -msgstr "отключено" - msgid "" "e.g. to receive an email notification with every adblock update set this " "value to 150000." msgstr "" -"например, чтобы получать email уведомления при каждом " -"обновлении Adblock-а установите значение 150000." - -msgid "enabled" -msgstr "включено" - -msgid "error" -msgstr "ошибка" - -msgid "n/a" -msgstr "нет данных" - -msgid "paused" -msgstr "приостановлено" - -msgid "running" -msgstr "работает" +"например, чтобы получать email уведомления при каждом обновлении 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 "" +#~ "Увеличьте количество email уведомлений, чтобы получить сообщения, если " +#~ "общее количество меньше или равно заданному пределу (по умолчанию 0),<br /" +#~ ">" + +#~ msgid "Redirect all DNS queries from 'lan' zone to the local resolver." +#~ msgstr "" +#~ "Перенаправлять все DNS запросы с интерфейса 'lan' на обработку Adblock-ом." + +#~ msgid "" +#~ "Send notification emails in case of a processing error or if domain count " +#~ "is ≤ 0.<br />" +#~ msgstr "" +#~ "Отправлять email уведомления в случае ошибки обработки или если " +#~ "количество обработанных доменов равно 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 "работает" diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po index 3fb7bbe2e0..5b101c3a96 100644 --- a/applications/luci-app-adblock/po/sv/adblock.po +++ b/applications/luci-app-adblock/po/sv/adblock.po @@ -4,9 +4,6 @@ msgstr "Content-Type: text/plain; charset=UTF-8\n" msgid "'Jail' Blocklist Creation" msgstr "" -msgid "-------" -msgstr "-------" - msgid "" "<b>Caution:</b> To prevent OOM exceptions on low memory devices with less " "than 64 MB free RAM, please only select a few of them!" @@ -15,9 +12,6 @@ msgstr "" msgid "Adblock" msgstr "Adblock" -msgid "Adblock Logfile" -msgstr "Adblock's loggfil" - msgid "Adblock Status" msgstr "Status för Adblock" @@ -47,7 +41,7 @@ msgstr "" msgid "" "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all " -"domains except those listed in the whitelist file.<br />" +"domains except those listed in the whitelist file." msgstr "" msgid "" @@ -136,11 +130,6 @@ msgid "Flush DNS Cache after adblock processing." msgstr "" msgid "" -"For SSL protected blocklist sources you need a suitable SSL library, e.g. " -"'libustream-ssl' or 'built-in'." -msgstr "" - -msgid "" "For further information <a href=\"%s\" target=\"_blank\">check the online " "documentation</a>" msgstr "" @@ -168,12 +157,11 @@ msgstr "Kördes senast" msgid "" "List of available network interfaces. Usually the startup will be triggered " -"by the 'wan' interface.<br />" +"by the 'wan' interface." msgstr "" msgid "" -"List of supported DNS backends with their default list export directory.<br /" -">" +"List of supported DNS backends with their default list export directory." msgstr "" msgid "List of supported and fully pre-configured download utilities." @@ -182,10 +170,10 @@ msgstr "" msgid "Loading" msgstr "Laddar" -msgid "Max. Download Queue" +msgid "Low Priority Service" msgstr "" -msgid "Name" +msgid "Max. Download Queue" msgstr "" msgid "No" @@ -221,10 +209,18 @@ msgstr "Fråga efter domäner" 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 />" +"count is less or equal to the given limit (default 0)," msgstr "" -msgid "Redirect all DNS queries from 'lan' zone to the local resolver." +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 "" + +msgid "Refresh" +msgstr "" + +msgid "Refresh Blocklist Sources" msgstr "" msgid "Resume" @@ -241,12 +237,17 @@ msgstr "Spara" msgid "" "Send notification emails in case of a processing error or if domain count is " -"≤ 0.<br />" +"≤ 0." +msgstr "" + +msgid "" +"Set the nice level to 'low priority' and the adblock background processing " +"will take less resources from the system." msgstr "" msgid "" "Size of the download queue to handle downloads & list processing in " -"parallel (default '4').<br />" +"parallel (default '4')." msgstr "" msgid "Startup Trigger" @@ -269,19 +270,19 @@ msgstr "" msgid "The file size is too large for online editing in LuCI (≥ 100 KB)." msgstr "" +msgid "The syslog output, pre-filtered for adblock related messages only." +msgstr "" + +msgid "This change requires a manual service stop/re-start to take effect." +msgstr "" + msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." -"<br />" msgstr "" -"Det här formuläret tillåter dig att förändra innehållet i adblock's " -"svartlista (%s).<br />" msgid "" "This form allows you to modify the content of the adblock whitelist (%s)." -"<br />" msgstr "" -"Det här formuläret tillåter dig att förändra innehållet i adblock's vitlista " -"(%s).<br />" msgid "" "This form allows you to modify the content of the main adblock configuration " @@ -296,11 +297,6 @@ msgid "" msgstr "" msgid "" -"This form shows the syslog output, pre-filtered for adblock related messages " -"only." -msgstr "" - -msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." msgstr "" @@ -328,28 +324,45 @@ msgid "" "kidsafe configurations." msgstr "" -msgid "disabled" -msgstr "inaktiverad" - msgid "" "e.g. to receive an email notification with every adblock update set this " "value to 150000." msgstr "" -msgid "enabled" -msgstr "aktiverad" +#~ msgid "-------" +#~ msgstr "-------" + +#~ msgid "Adblock Logfile" +#~ msgstr "Adblock's loggfil" -msgid "error" -msgstr "fel" +#~ msgid "" +#~ "This form allows you to modify the content of the adblock blacklist (%s)." +#~ "<br />" +#~ msgstr "" +#~ "Det här formuläret tillåter dig att förändra innehållet i adblock's " +#~ "svartlista (%s).<br />" + +#~ msgid "" +#~ "This form allows you to modify the content of the adblock whitelist (%s)." +#~ "<br />" +#~ msgstr "" +#~ "Det här formuläret tillåter dig att förändra innehållet i adblock's " +#~ "vitlista (%s).<br />" -msgid "n/a" -msgstr "n/a" +#~ msgid "disabled" +#~ msgstr "inaktiverad" -msgid "paused" -msgstr "pausad" +#~ msgid "enabled" +#~ msgstr "aktiverad" -msgid "running" -msgstr "" +#~ msgid "error" +#~ msgstr "fel" + +#~ msgid "n/a" +#~ msgstr "n/a" + +#~ msgid "paused" +#~ msgstr "pausad" #~ msgid "Invalid domain specified!" #~ msgstr "Ogiltig domän angiven!" diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot index e4c2a71418..117ce1faff 100644 --- a/applications/luci-app-adblock/po/templates/adblock.pot +++ b/applications/luci-app-adblock/po/templates/adblock.pot @@ -4,9 +4,6 @@ msgstr "Content-Type: text/plain; charset=UTF-8" msgid "'Jail' Blocklist Creation" msgstr "" -msgid "-------" -msgstr "" - msgid "" "<b>Caution:</b> To prevent OOM exceptions on low memory devices with less " "than 64 MB free RAM, please only select a few of them!" @@ -15,9 +12,6 @@ msgstr "" msgid "Adblock" msgstr "" -msgid "Adblock Logfile" -msgstr "" - msgid "Adblock Status" msgstr "" @@ -47,7 +41,7 @@ msgstr "" msgid "" "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all " -"domains except those listed in the whitelist file.<br />" +"domains except those listed in the whitelist file." msgstr "" msgid "" @@ -129,11 +123,6 @@ msgid "Flush DNS Cache after adblock processing." msgstr "" msgid "" -"For SSL protected blocklist sources you need a suitable SSL library, e.g. " -"'libustream-ssl' or 'built-in'." -msgstr "" - -msgid "" "For further information <a href=\"%s\" target=\"_blank\">check the online " "documentation</a>" msgstr "" @@ -160,12 +149,11 @@ msgstr "" msgid "" "List of available network interfaces. Usually the startup will be triggered " -"by the 'wan' interface.<br />" +"by the 'wan' interface." msgstr "" msgid "" -"List of supported DNS backends with their default list export directory.<br /" -">" +"List of supported DNS backends with their default list export directory." msgstr "" msgid "List of supported and fully pre-configured download utilities." @@ -174,10 +162,10 @@ msgstr "" msgid "Loading" msgstr "" -msgid "Max. Download Queue" +msgid "Low Priority Service" msgstr "" -msgid "Name" +msgid "Max. Download Queue" msgstr "" msgid "No" @@ -213,10 +201,18 @@ msgstr "" msgid "" "Raise the minimum email notification count, to get emails if the overall " -"count is less or equal to the given limit (default 0),<br />" +"count is less or equal to the given limit (default 0)," msgstr "" -msgid "Redirect all DNS queries from 'lan' zone to the local resolver." +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 "" + +msgid "Refresh" +msgstr "" + +msgid "Refresh Blocklist Sources" msgstr "" msgid "Resume" @@ -233,12 +229,17 @@ msgstr "" msgid "" "Send notification emails in case of a processing error or if domain count is " -"≤ 0.<br />" +"≤ 0." +msgstr "" + +msgid "" +"Set the nice level to 'low priority' and the adblock background processing " +"will take less resources from the system." msgstr "" msgid "" "Size of the download queue to handle downloads & list processing in " -"parallel (default '4').<br />" +"parallel (default '4')." msgstr "" msgid "Startup Trigger" @@ -261,14 +262,18 @@ msgstr "" msgid "The file size is too large for online editing in LuCI (≥ 100 KB)." msgstr "" +msgid "The syslog output, pre-filtered for adblock related messages only." +msgstr "" + +msgid "This change requires a manual service stop/re-start to take effect." +msgstr "" + msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." -"<br />" msgstr "" msgid "" "This form allows you to modify the content of the adblock whitelist (%s)." -"<br />" msgstr "" msgid "" @@ -282,11 +287,6 @@ msgid "" msgstr "" msgid "" -"This form shows the syslog output, pre-filtered for adblock related messages " -"only." -msgstr "" - -msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." msgstr "" @@ -314,25 +314,7 @@ msgid "" "kidsafe configurations." msgstr "" -msgid "disabled" -msgstr "" - msgid "" "e.g. to receive an email notification with every adblock update set this " "value to 150000." msgstr "" - -msgid "enabled" -msgstr "" - -msgid "error" -msgstr "" - -msgid "n/a" -msgstr "" - -msgid "paused" -msgstr "" - -msgid "running" -msgstr "" diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po index 76718612e4..0b0d2d2fe4 100644 --- a/applications/luci-app-adblock/po/zh-cn/adblock.po +++ b/applications/luci-app-adblock/po/zh-cn/adblock.po @@ -18,9 +18,6 @@ msgstr "" msgid "'Jail' Blocklist Creation" msgstr "“Jail”拦截列表创建" -msgid "-------" -msgstr "-------" - msgid "" "<b>Caution:</b> To prevent OOM exceptions on low memory devices with less " "than 64 MB free RAM, please only select a few of them!" @@ -31,9 +28,6 @@ msgstr "" msgid "Adblock" msgstr "Adblock" -msgid "Adblock Logfile" -msgstr "Adblock 日志文件" - msgid "Adblock Status" msgstr "Adblock 状态" @@ -63,10 +57,8 @@ msgstr "拦截列表未找到！" msgid "" "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all " -"domains except those listed in the whitelist file.<br />" +"domains except those listed in the whitelist file." msgstr "" -"构建一个额外的“Jail”列表（/tmp/adb_list.jail），除白名单文件中列出的域名外，" -"阻止访问其他所有的域名。<br />" msgid "" "Choose 'none' to disable automatic startups, 'timed' to use a classic " @@ -149,13 +141,6 @@ msgid "Flush DNS Cache after adblock processing." msgstr "在 adblock 进程启动后清空 DNS 缓存。" 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 "" "For further information <a href=\"%s\" target=\"_blank\">check the online " "documentation</a>" msgstr "进一步信息<a href=\"%s\" target=\"_blank\">请访问在线文档</a>" @@ -182,13 +167,12 @@ msgstr "最后运行" msgid "" "List of available network interfaces. Usually the startup will be triggered " -"by the 'wan' interface.<br />" -msgstr "可用网络接口列表。通常启动将由“wan”接口触发。<br />" +"by the 'wan' interface." +msgstr "" msgid "" -"List of supported DNS backends with their default list export directory.<br /" -">" -msgstr "支持的 DNS 后端列表及其默认列表导出目录。<br />" +"List of supported DNS backends with their default list export directory." +msgstr "" msgid "List of supported and fully pre-configured download utilities." msgstr "支持和完全预配置的下载工具列表。" @@ -196,12 +180,12 @@ msgstr "支持和完全预配置的下载工具列表。" msgid "Loading" msgstr "加载中" +msgid "Low Priority Service" +msgstr "" + msgid "Max. Download Queue" msgstr "最大下载队列" -msgid "Name" -msgstr "名称" - msgid "No" msgstr "否" @@ -237,13 +221,19 @@ msgstr "查询域" msgid "" "Raise the minimum email notification count, to get emails if the overall " -"count is less or equal to the given limit (default 0),<br />" +"count is less or equal to the given limit (default 0)," +msgstr "" + +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 "" + +msgid "Refresh" msgstr "" -"如果总数小于或等于给定限制（默认为 0），请提高最小电子邮件通知数，以获取电子" -"邮件。" -msgid "Redirect all DNS queries from 'lan' zone to the local resolver." -msgstr "将所有 DNS 查询从“lan”区域重定向到本地解析器。" +msgid "Refresh Blocklist Sources" +msgstr "" msgid "Resume" msgstr "恢复" @@ -259,13 +249,18 @@ msgstr "保存" msgid "" "Send notification emails in case of a processing error or if domain count is " -"≤ 0.<br />" -msgstr "如果发生错误或域计数 ≤ 0，发送通知电子邮件。<br />" +"≤ 0." +msgstr "" + +msgid "" +"Set the nice level to 'low priority' and the adblock background processing " +"will take less resources from the system." +msgstr "" msgid "" "Size of the download queue to handle downloads & list processing in " -"parallel (default '4').<br />" -msgstr "处理下载队列的大小及并行处理列表（默认“4”）。<br />" +"parallel (default '4')." +msgstr "" msgid "Startup Trigger" msgstr "启动触发器" @@ -287,15 +282,19 @@ msgstr "生成拦截列表“adb_list.overall”的目标目录。" msgid "The file size is too large for online editing in LuCI (≥ 100 KB)." msgstr "文件过大，无法使用 LuCI 的在线编辑（≥ 100 KB）。" +msgid "The syslog output, pre-filtered for adblock related messages only." +msgstr "" + +msgid "This change requires a manual service stop/re-start to take effect." +msgstr "" + msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." -"<br />" -msgstr "此表单允许您修改 adblock 黑名单（%s）的内容。<br />" +msgstr "" msgid "" "This form allows you to modify the content of the adblock whitelist (%s)." -"<br />" -msgstr "此表单允许您修改 adblock 白名单（%s）的内容。<br />" +msgstr "" msgid "" "This form allows you to modify the content of the main adblock configuration " @@ -308,11 +307,6 @@ msgid "" msgstr "此表单允许您查询某些域的活动块列表，例如用于列出白名单。" msgid "" -"This form shows the syslog output, pre-filtered for adblock related messages " -"only." -msgstr "此表单显示系统日志输出，仅针对 adblock 相关的消息进行了预筛选。" - -msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." msgstr "要覆盖默认路径，请使用下面额外部分中的“DNS 目录”选项。" @@ -341,28 +335,96 @@ msgid "" msgstr "" "您可以手动使用此限制性拦截列表，例如：为客人提供 wifi 或 kidsafe 配置。" -msgid "disabled" -msgstr "已禁用" - msgid "" "e.g. to receive an email notification with every adblock update set this " "value to 150000." msgstr "例如：要接收每个 adblock 更新的电子邮件通知时将此值设置为 150000。" -msgid "enabled" -msgstr "已启用" +#~ msgid "-------" +#~ msgstr "-------" + +#~ msgid "Adblock Logfile" +#~ msgstr "Adblock 日志文件" + +#~ msgid "" +#~ "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to " +#~ "all domains except those listed in the whitelist file.<br />" +#~ msgstr "" +#~ "构建一个额外的“Jail”列表（/tmp/adb_list.jail），除白名单文件中列出的域名" +#~ "外，阻止访问其他所有的域名。<br />" + +#~ msgid "" +#~ "For SSL protected blocklist sources you need a suitable SSL library, e.g. " +#~ "'libustream-ssl' or 'built-in'." +#~ msgstr "" +#~ "对受 SSL 保护的拦截列表源，您需要一个合适的 SSL 库，如“libustream-" +#~ "ssl”或“built-in”。" + +#~ msgid "" +#~ "List of available network interfaces. Usually the startup will be " +#~ "triggered by the 'wan' interface.<br />" +#~ msgstr "可用网络接口列表。通常启动将由“wan”接口触发。<br />" + +#~ msgid "" +#~ "List of supported DNS backends with their default list export directory." +#~ "<br />" +#~ msgstr "支持的 DNS 后端列表及其默认列表导出目录。<br />" + +#~ msgid "Name" +#~ msgstr "名称" + +#~ msgid "" +#~ "Raise the minimum email notification count, to get emails if the overall " +#~ "count is less or equal to the given limit (default 0),<br />" +#~ msgstr "" +#~ "如果总数小于或等于给定限制（默认为 0），请提高最小电子邮件通知数，以获取电" +#~ "子邮件。" + +#~ msgid "Redirect all DNS queries from 'lan' zone to the local resolver." +#~ msgstr "将所有 DNS 查询从“lan”区域重定向到本地解析器。" + +#~ msgid "" +#~ "Send notification emails in case of a processing error or if domain count " +#~ "is ≤ 0.<br />" +#~ msgstr "如果发生错误或域计数 ≤ 0，发送通知电子邮件。<br />" + +#~ msgid "" +#~ "Size of the download queue to handle downloads & list processing in " +#~ "parallel (default '4').<br />" +#~ msgstr "处理下载队列的大小及并行处理列表（默认“4”）。<br />" + +#~ msgid "" +#~ "This form allows you to modify the content of the adblock blacklist (%s)." +#~ "<br />" +#~ msgstr "此表单允许您修改 adblock 黑名单（%s）的内容。<br />" + +#~ msgid "" +#~ "This form allows you to modify the content of the adblock whitelist (%s)." +#~ "<br />" +#~ msgstr "此表单允许您修改 adblock 白名单（%s）的内容。<br />" + +#~ msgid "" +#~ "This form shows the syslog output, pre-filtered for adblock related " +#~ "messages only." +#~ msgstr "此表单显示系统日志输出，仅针对 adblock 相关的消息进行了预筛选。" + +#~ msgid "disabled" +#~ msgstr "已禁用" + +#~ msgid "enabled" +#~ msgstr "已启用" -msgid "error" -msgstr "错误" +#~ msgid "error" +#~ msgstr "错误" -msgid "n/a" -msgstr "不可用" +#~ msgid "n/a" +#~ msgstr "不可用" -msgid "paused" -msgstr "已暂停" +#~ msgid "paused" +#~ msgstr "已暂停" -msgid "running" -msgstr "运行中" +#~ msgid "running" +#~ msgstr "运行中" #~ msgid "Invalid domain specified!" #~ msgstr "无效域名！" diff --git a/applications/luci-app-adblock/po/zh-tw/adblock.po b/applications/luci-app-adblock/po/zh-tw/adblock.po index 8c2f91be14..f9830a5098 100644 --- a/applications/luci-app-adblock/po/zh-tw/adblock.po +++ b/applications/luci-app-adblock/po/zh-tw/adblock.po @@ -18,9 +18,6 @@ msgstr "" msgid "'Jail' Blocklist Creation" msgstr "“Jail”攔截列表建立" -msgid "-------" -msgstr "-------" - msgid "" "<b>Caution:</b> To prevent OOM exceptions on low memory devices with less " "than 64 MB free RAM, please only select a few of them!" @@ -31,9 +28,6 @@ msgstr "" msgid "Adblock" msgstr "Adblock" -msgid "Adblock Logfile" -msgstr "Adblock 日誌檔案" - msgid "Adblock Status" msgstr "Adblock 狀態" @@ -63,10 +57,8 @@ msgstr "攔截列表未找到！" msgid "" "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all " -"domains except those listed in the whitelist file.<br />" +"domains except those listed in the whitelist file." msgstr "" -"構建一個額外的“Jail”列表（/tmp/adb_list.jail），除白名單檔案中列出的域名外，" -"阻止訪問其他所有的域名。<br />" msgid "" "Choose 'none' to disable automatic startups, 'timed' to use a classic " @@ -150,13 +142,6 @@ msgid "Flush DNS Cache after adblock processing." msgstr "在 adblock 程序啟動後清空 DNS 快取。" 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 "" "For further information <a href=\"%s\" target=\"_blank\">check the online " "documentation</a>" msgstr "進一步資訊<a href=\"%s\" target=\"_blank\">請訪問線上文檔</a>" @@ -183,13 +168,12 @@ msgstr "最後執行" msgid "" "List of available network interfaces. Usually the startup will be triggered " -"by the 'wan' interface.<br />" -msgstr "可用網路介面列表。通常啟動將由“wan”介面觸發。<br />" +"by the 'wan' interface." +msgstr "" msgid "" -"List of supported DNS backends with their default list export directory.<br /" -">" -msgstr "支援的 DNS 後端列表及其預設列表匯出目錄。<br />" +"List of supported DNS backends with their default list export directory." +msgstr "" msgid "List of supported and fully pre-configured download utilities." msgstr "支援和完全預配置的下載工具列表。" @@ -197,12 +181,12 @@ msgstr "支援和完全預配置的下載工具列表。" msgid "Loading" msgstr "載入中" +msgid "Low Priority Service" +msgstr "" + msgid "Max. Download Queue" msgstr "最大下載佇列" -msgid "Name" -msgstr "名稱" - msgid "No" msgstr "否" @@ -238,13 +222,19 @@ msgstr "查詢域" msgid "" "Raise the minimum email notification count, to get emails if the overall " -"count is less or equal to the given limit (default 0),<br />" +"count is less or equal to the given limit (default 0)," +msgstr "" + +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 "" + +msgid "Refresh" msgstr "" -"如果總數小於或等於給定限制（預設為 0），請提高最小電子郵件通知數，以獲取電子" -"郵件。" -msgid "Redirect all DNS queries from 'lan' zone to the local resolver." -msgstr "將所有 DNS 查詢從“lan”區域重定向到本地解析器。" +msgid "Refresh Blocklist Sources" +msgstr "" msgid "Resume" msgstr "恢復" @@ -260,13 +250,18 @@ msgstr "儲存" msgid "" "Send notification emails in case of a processing error or if domain count is " -"≤ 0.<br />" -msgstr "如果發生錯誤或域計數 ≤ 0，傳送通知電子郵件。<br />" +"≤ 0." +msgstr "" + +msgid "" +"Set the nice level to 'low priority' and the adblock background processing " +"will take less resources from the system." +msgstr "" msgid "" "Size of the download queue to handle downloads & list processing in " -"parallel (default '4').<br />" -msgstr "處理下載佇列的大小及並行處理列表（預設“4”）。<br />" +"parallel (default '4')." +msgstr "" msgid "Startup Trigger" msgstr "啟動觸發器" @@ -288,15 +283,19 @@ msgstr "生成攔截列表“adb_list.overall”的目標目錄。" msgid "The file size is too large for online editing in LuCI (≥ 100 KB)." msgstr "檔案過大，無法使用 LuCI 的線上編輯（≥ 100 KB）。" +msgid "The syslog output, pre-filtered for adblock related messages only." +msgstr "" + +msgid "This change requires a manual service stop/re-start to take effect." +msgstr "" + msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." -"<br />" -msgstr "此表單允許您修改 adblock 黑名單（%s）的內容。<br />" +msgstr "" msgid "" "This form allows you to modify the content of the adblock whitelist (%s)." -"<br />" -msgstr "此表單允許您修改 adblock 白名單（%s）的內容。<br />" +msgstr "" msgid "" "This form allows you to modify the content of the main adblock configuration " @@ -309,11 +308,6 @@ msgid "" msgstr "此表單允許您查詢某些域的活動塊列表，例如用於列出白名單。" msgid "" -"This form shows the syslog output, pre-filtered for adblock related messages " -"only." -msgstr "此表單顯示系統日誌輸出，僅針對 adblock 相關的訊息進行了預篩選。" - -msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." msgstr "要覆蓋預設路徑，請使用下面額外部分中的“DNS 目錄”選項。" @@ -342,28 +336,96 @@ msgid "" msgstr "" "您可以手動使用此限制性攔截列表，例如：為客人提供 wifi 或 kidsafe 配置。" -msgid "disabled" -msgstr "已禁用" - msgid "" "e.g. to receive an email notification with every adblock update set this " "value to 150000." msgstr "例如：要接收每個 adblock 更新的電子郵件通知時將此值設定為 150000。" -msgid "enabled" -msgstr "已啟用" +#~ msgid "-------" +#~ msgstr "-------" + +#~ msgid "Adblock Logfile" +#~ msgstr "Adblock 日誌檔案" + +#~ msgid "" +#~ "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to " +#~ "all domains except those listed in the whitelist file.<br />" +#~ msgstr "" +#~ "構建一個額外的“Jail”列表（/tmp/adb_list.jail），除白名單檔案中列出的域名" +#~ "外，阻止訪問其他所有的域名。<br />" + +#~ msgid "" +#~ "For SSL protected blocklist sources you need a suitable SSL library, e.g. " +#~ "'libustream-ssl' or 'built-in'." +#~ msgstr "" +#~ "對受 SSL 保護的攔截列表源，您需要一個合適的 SSL 庫，如“libustream-" +#~ "ssl”或“built-in”。" + +#~ msgid "" +#~ "List of available network interfaces. Usually the startup will be " +#~ "triggered by the 'wan' interface.<br />" +#~ msgstr "可用網路介面列表。通常啟動將由“wan”介面觸發。<br />" + +#~ msgid "" +#~ "List of supported DNS backends with their default list export directory." +#~ "<br />" +#~ msgstr "支援的 DNS 後端列表及其預設列表匯出目錄。<br />" + +#~ msgid "Name" +#~ msgstr "名稱" + +#~ msgid "" +#~ "Raise the minimum email notification count, to get emails if the overall " +#~ "count is less or equal to the given limit (default 0),<br />" +#~ msgstr "" +#~ "如果總數小於或等於給定限制（預設為 0），請提高最小電子郵件通知數，以獲取電" +#~ "子郵件。" + +#~ msgid "Redirect all DNS queries from 'lan' zone to the local resolver." +#~ msgstr "將所有 DNS 查詢從“lan”區域重定向到本地解析器。" + +#~ msgid "" +#~ "Send notification emails in case of a processing error or if domain count " +#~ "is ≤ 0.<br />" +#~ msgstr "如果發生錯誤或域計數 ≤ 0，傳送通知電子郵件。<br />" + +#~ msgid "" +#~ "Size of the download queue to handle downloads & list processing in " +#~ "parallel (default '4').<br />" +#~ msgstr "處理下載佇列的大小及並行處理列表（預設“4”）。<br />" + +#~ msgid "" +#~ "This form allows you to modify the content of the adblock blacklist (%s)." +#~ "<br />" +#~ msgstr "此表單允許您修改 adblock 黑名單（%s）的內容。<br />" + +#~ msgid "" +#~ "This form allows you to modify the content of the adblock whitelist (%s)." +#~ "<br />" +#~ msgstr "此表單允許您修改 adblock 白名單（%s）的內容。<br />" + +#~ msgid "" +#~ "This form shows the syslog output, pre-filtered for adblock related " +#~ "messages only." +#~ msgstr "此表單顯示系統日誌輸出，僅針對 adblock 相關的訊息進行了預篩選。" + +#~ msgid "disabled" +#~ msgstr "已禁用" + +#~ msgid "enabled" +#~ msgstr "已啟用" -msgid "error" -msgstr "錯誤" +#~ msgid "error" +#~ msgstr "錯誤" -msgid "n/a" -msgstr "不可用" +#~ msgid "n/a" +#~ msgstr "不可用" -msgid "paused" -msgstr "已暫停" +#~ msgid "paused" +#~ msgstr "已暫停" -msgid "running" -msgstr "執行中" +#~ msgid "running" +#~ msgstr "執行中" #~ msgid "Invalid domain specified!" #~ msgstr "無效域名！" diff --git a/applications/luci-app-ddns/po/ru/ddns.po b/applications/luci-app-ddns/po/ru/ddns.po index 4731cc379f..415f7badb8 100644 --- a/applications/luci-app-ddns/po/ru/ddns.po +++ b/applications/luci-app-ddns/po/ru/ddns.po @@ -56,22 +56,22 @@ msgid "" "BusyBox's nslookup and Wget do not support to specify the IP version to use " "for communication with DDNS Provider!" msgstr "" -"Утилиты nslookup и wget из состава busybox не поддерживают указание IP-версии" -", используемой для связи с DDNS провайдером!" +"Утилиты nslookup и wget из состава busybox не поддерживают указание IP-" +"версии, используемой для связи с DDNS провайдером!" msgid "" "BusyBox's nslookup and hostip do not support to specify to use TCP instead " "of default UDP when requesting DNS server!" msgstr "" -"Утилиты nslookup и hostip из состава busybox не поддерживают указание использ" -"овать TCP вместо UDP по умолчанию при запросе DNS сервера!" +"Утилиты nslookup и hostip из состава busybox не поддерживают указание " +"использовать TCP вместо UDP по умолчанию при запросе DNS сервера!" msgid "" "BusyBox's nslookup in the current compiled version does not handle given DNS " "Servers correctly!" msgstr "" -"Благодаря текущей скомпилированной версии busybox, утилита nslookup не обраба" -"тывает данные DNS сервера правильно!" +"Благодаря текущей скомпилированной версии busybox, утилита nslookup не " +"обрабатывает данные DNS сервера правильно!" msgid "Casual users should not change this setting" msgstr "Обычный пользователь не должен изменять данную опцию" @@ -116,8 +116,8 @@ msgid "" ">You can start/stop each configuration here. It will run until next reboot." msgstr "" "В настоящее время, обновления DDNS не запускаются при загрузке или при " -"событиях интерфейса.<br />Вы можете запустить/остановить каждый " -"config здесь. Он будет работать до следующей перезагрузки." +"событиях интерфейса.<br />Вы можете запустить/остановить каждый config " +"здесь. Он будет работать до следующей перезагрузки." msgid "Custom update script to be used for updating your DDNS Provider." msgstr "" @@ -310,9 +310,9 @@ msgid "" "the instructions on OpenWrt's homepage to enable IPv6 support<br />or update " "your system to the latest OpenWrt Release" msgstr "" -"IPv6 не поддерживается вашей прошивкой.<br />Следуйте инструкциям на " -"главной странице OpenWrt, чтобы включить поддержку IPv6<br / >или обновить " -"прошивку до последнего выпуска OpenWrt с включенной поддержкой IPv6" +"IPv6 не поддерживается вашей прошивкой.<br />Следуйте инструкциям на главной " +"странице OpenWrt, чтобы включить поддержку IPv6<br / >или обновить прошивку " +"до последнего выпуска OpenWrt с включенной поддержкой IPv6" msgid "IPv6 not supported" msgstr "IPv6 не поддерживается" @@ -322,8 +322,7 @@ msgstr "IPv6-адрес" msgid "If both cURL and GNU Wget are installed, Wget is used by default." msgstr "" -"Если установлены и cURL и GNU wget, по умолчанию будет использоваться " -"wget." +"Если установлены и cURL и GNU wget, по умолчанию будет использоваться wget." msgid "" "If this service section is disabled it could not be started.<br />Neither " @@ -381,8 +380,7 @@ msgstr "" msgid "It is NOT recommended for casual users to change settings on this page." msgstr "" -"Настройки на данной странице не рекомендуется изменять обычным " -"пользователям." +"Настройки на данной странице не рекомендуется изменять обычным пользователям." msgid "Last Update" msgstr "Последнее обновление" @@ -414,8 +412,9 @@ msgstr "Не установлено" msgid "" "Neither GNU Wget with SSL nor cURL installed to select a network to use for " "communication." -msgstr "Не установлены пакеты GNU wget c SSL или cURL для возможности выбора " -"сети для связи." +msgstr "" +"Не установлены пакеты GNU wget c SSL или cURL для возможности выбора сети " +"для связи." msgid "" "Neither GNU Wget with SSL nor cURL installed to support secure updates via " @@ -459,8 +458,8 @@ msgstr "Необязательно: использовать только чис msgid "OPTIONAL: Force the use of TCP instead of default UDP on DNS requests." msgstr "" -"Необязательно: использовать протокол TCP вместо UDP по умолчанию " -"для DNS-запросов." +"Необязательно: использовать протокол TCP вместо UDP по умолчанию для DNS-" +"запросов." msgid "OPTIONAL: Network to use for communication" msgstr "Необязательно: сеть для связи" @@ -470,8 +469,8 @@ msgstr "Необязательно: прокси-сервер для обнар msgid "OPTIONAL: Use non-default DNS-Server to detect 'Registered IP'." msgstr "" -"Необязательно: использовать DNS сервер не используемый по умолчанию, " -"для обнаружения 'Зарегистрированного IP-адреса'." +"Необязательно: использовать DNS сервер не используемый по умолчанию, для " +"обнаружения 'Зарегистрированного IP-адреса'." msgid "On Error the script will retry the failed action after given time" msgstr "" @@ -496,8 +495,7 @@ msgid "Optional: Replaces [PARAMENC] in Update-URL (URL-encoded)" msgstr "Необязательно: заменяет [PARAMENC] в Update-URL (URL-encoded)" msgid "Optional: Replaces [PARAMOPT] in Update-URL (NOT URL-encoded)" -msgstr "" -"Необязательно: заменяет [PARAMOPT] в Update-URL (не URL-encoded)" +msgstr "Необязательно: заменяет [PARAMOPT] в Update-URL (не URL-encoded)" msgid "Overview" msgstr "Обзор" @@ -605,8 +603,8 @@ msgid "" "Update URL to be used for updating your DDNS Provider.<br />Follow " "instructions you will find on their WEB page." msgstr "" -"URL обновления используется для обновления вашего DDNS-провайдера.<br />Следуйте " -"инструкциям, которые вы найдете на их на веб-странице." +"URL обновления используется для обновления вашего DDNS-провайдера.<br /" +">Следуйте инструкциям, которые вы найдете на их на веб-странице." msgid "Update error" msgstr "Ошибка обновления" @@ -658,14 +656,15 @@ msgid "" "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' " "package, if you need to specify a DNS server to detect your registered IP." msgstr "" -"Установите пакет 'bind-host', 'knot-host', 'drill' или 'hostip' если " -"вам нужно указать DNS сервер для обнаружения вашего зарегистрированного IP-" +"Установите пакет 'bind-host', 'knot-host', 'drill' или 'hostip' если вам " +"нужно указать DNS сервер для обнаружения вашего зарегистрированного IP-" "адреса." msgid "" "You should install 'bind-host' or 'knot-host' or 'drill' package for DNS " "requests." -msgstr "Установите пакет 'bind-host', 'knot-host' или 'drill' для DNS запросов." +msgstr "" +"Установите пакет 'bind-host', 'knot-host' или 'drill' для DNS запросов." msgid "You should install 'wget' or 'curl' or 'uclient-fetch' package." msgstr "Установите пакет 'wget', 'curl' или 'uclient-fetch'." @@ -757,8 +756,7 @@ msgid "no data" msgstr "нет данных" msgid "not found or not executable - Sample: '/path/to/script.sh'" -msgstr "" -"Не найден или не является исполняемым — пример: '/path/to/script.sh'" +msgstr "Не найден или не является исполняемым — пример: '/path/to/script.sh'" msgid "nslookup can not resolve host" msgstr "Утилита nslookup не может разрешить хост" diff --git a/applications/luci-app-firewall/po/ru/firewall.po b/applications/luci-app-firewall/po/ru/firewall.po index 79c0f0b9a6..0ffe581d0e 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,7 +84,7 @@ msgid "" "each firewall restart, right after the default ruleset has been loaded." msgstr "" "Пользовательские правила позволяют выполнять произвольные команды iptables, " -"которые не охвачены рамками межсетевого экрана.<br />Команды выполняются " +"которые не охвачены рамками межсетевого экрана. Команды выполняются " "после каждой перезагрузки межсетевого экрана, сразу после загрузки набора " "правил по умолчанию." @@ -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,22 @@ 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 +288,7 @@ msgid "Monday" msgstr "Понедельник" msgid "Month Days" -msgstr "Дни Месяца" +msgstr "Дни месяца" msgid "Name" msgstr "Имя" @@ -310,22 +310,21 @@ 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,23 @@ 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-адрес' (см." -"выше)." +"Перенаправлять трафик на указанный 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 "" +msgstr "Требуется аппаратная поддержка NAT. Реализовано, по крайней мере, для mt7621" msgid "Restart Firewall" msgstr "Перезапустить межсетевой экран" @@ -408,7 +406,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 +424,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 +458,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,7 +485,7 @@ 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) и " +"Данные настройки управляют политиками перенаправления трафика между этой (%s) и " "другими зонами. Трафиком <em>'зон-назначения'</em> является перенаправленный " "трафик <strong>'исходящий из %q'</strong>. Трафиком <em>'зон-источников'</" "em> является трафик <strong>'направленый в %q'</strong>. Перенаправление " @@ -499,14 +497,14 @@ msgid "" "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 +516,7 @@ msgstr "" "Страница содержит общие свойства %q. Режимы <em>'Входящий трафик'</em> и " "<em>'Исходящий трафик'</em> устанавливают политики по умолчанию для трафика, " "поступающего и покидающего эту зону, в то время как режим " -"<em>'Перенаправление'</em> описывает политику пересылки трафика между " +"<em>'Перенаправление'</em> описывает политику перенаправления трафика между " "различными сетями внутри зоны. <em>'Использовать сети'</em> указывает, какие " "доступные сети являются членами этой зоны." @@ -529,7 +527,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 +560,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 0000000000..2ae2b80f2f --- /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 0000000000..e1fd8fcb9b --- /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 0000000000..61511a4130 --- /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 0000000000..1b0b66aae2 --- /dev/null +++ b/applications/luci-app-https_dns_proxy/po/templates/https_dns_proxy.pot @@ -0,0 +1,2 @@ +Set up git to auto-update pot-file: +echo '../i18n-scan.pl luci-app-template/ > luci-app-template/po/templates/template.pot; git add .' >> ../.git/hooks/pre-commit 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 0000000000..7800af701e --- /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-minidlna/po/ca/minidlna.po b/applications/luci-app-minidlna/po/ca/minidlna.po index 2c0dbafb48..93ba90fad7 100644 --- a/applications/luci-app-minidlna/po/ca/minidlna.po +++ b/applications/luci-app-minidlna/po/ca/minidlna.po @@ -35,15 +35,15 @@ msgstr "" msgid "Database directory" msgstr "" +msgid "Enable" +msgstr "Habilita" + msgid "Enable TIVO" msgstr "Habilita TIVO" msgid "Enable inotify" msgstr "Habilita inotify" -msgid "Enable" -msgstr "Habilita" - msgid "Friendly name" msgstr "Nom amistós" @@ -75,21 +75,21 @@ msgstr "Música" msgid "Network interfaces to serve." msgstr "" -msgid "Notify interval in seconds." -msgstr "Interval de notificació en segons." - msgid "Notify interval" msgstr "Interval de notificació" +msgid "Notify interval in seconds." +msgstr "Interval de notificació en segons." + msgid "Pictures" msgstr "Imatges" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." -msgstr "Port de tràfic HTTP (descripcions, SOAP, transferència de medis)" - msgid "Port" msgstr "Port" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgstr "Port de tràfic HTTP (descripcions, SOAP, transferència de medis)" + msgid "Presentation URL" msgstr "" diff --git a/applications/luci-app-minidlna/po/cs/minidlna.po b/applications/luci-app-minidlna/po/cs/minidlna.po index 1c20511884..ca07599200 100644 --- a/applications/luci-app-minidlna/po/cs/minidlna.po +++ b/applications/luci-app-minidlna/po/cs/minidlna.po @@ -35,15 +35,15 @@ msgstr "Shromažďování dat ..." msgid "Database directory" msgstr "Adresář databáze" +msgid "Enable" +msgstr "Povolit" + msgid "Enable TIVO" msgstr "Povolit TIVO" msgid "Enable inotify" msgstr "Povolit inotify" -msgid "Enable" -msgstr "Povolit" - msgid "Friendly name" msgstr "Popisek" @@ -77,21 +77,21 @@ msgstr "Hudba" msgid "Network interfaces to serve." msgstr "" -msgid "Notify interval in seconds." -msgstr "Notifikační interval v sekundách." - msgid "Notify interval" msgstr "Notifikační interval" +msgid "Notify interval in seconds." +msgstr "Notifikační interval v sekundách." + msgid "Pictures" msgstr "Obrázky" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." -msgstr "Port pro HTTP (popisy, SOAP, přenos médií) provoz." - msgid "Port" msgstr "Port" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgstr "Port pro HTTP (popisy, SOAP, přenos médií) provoz." + msgid "Presentation URL" msgstr "Prezentační URL" diff --git a/applications/luci-app-minidlna/po/de/minidlna.po b/applications/luci-app-minidlna/po/de/minidlna.po index 552651ead0..34914034dc 100644 --- a/applications/luci-app-minidlna/po/de/minidlna.po +++ b/applications/luci-app-minidlna/po/de/minidlna.po @@ -35,15 +35,15 @@ msgstr "Sammle Daten..." msgid "Database directory" msgstr "Datenbankverzeichnis" +msgid "Enable" +msgstr "Aktivieren" + msgid "Enable TIVO" msgstr "TIVO aktivieren" msgid "Enable inotify" msgstr "Inotify aktivieren" -msgid "Enable" -msgstr "Aktivieren" - msgid "Friendly name" msgstr "Spitzname" @@ -79,21 +79,21 @@ msgstr "Musik" msgid "Network interfaces to serve." msgstr "Zu bedienende Netzwerkschnittstellen." -msgid "Notify interval in seconds." -msgstr "Ankündigungsinterval in Sekunden." - msgid "Notify interval" msgstr "Ankündigunsintervall" +msgid "Notify interval in seconds." +msgstr "Ankündigungsinterval in Sekunden." + msgid "Pictures" msgstr "Bilder" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." -msgstr "Port für HTTP-Verkehr (Beschreibungen, SOAP, Mediendaten)." - msgid "Port" msgstr "Port" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgstr "Port für HTTP-Verkehr (Beschreibungen, SOAP, Mediendaten)." + msgid "Presentation URL" msgstr "Präsentations-URL" diff --git a/applications/luci-app-minidlna/po/el/minidlna.po b/applications/luci-app-minidlna/po/el/minidlna.po index aeb6fb0883..f08917e5c5 100644 --- a/applications/luci-app-minidlna/po/el/minidlna.po +++ b/applications/luci-app-minidlna/po/el/minidlna.po @@ -32,13 +32,13 @@ msgstr "" msgid "Database directory" msgstr "" -msgid "Enable TIVO" +msgid "Enable" msgstr "" -msgid "Enable inotify" +msgid "Enable TIVO" msgstr "" -msgid "Enable" +msgid "Enable inotify" msgstr "" msgid "Friendly name" @@ -72,19 +72,19 @@ msgstr "" msgid "Network interfaces to serve." msgstr "" -msgid "Notify interval in seconds." +msgid "Notify interval" msgstr "" -msgid "Notify interval" +msgid "Notify interval in seconds." msgstr "" msgid "Pictures" msgstr "" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgid "Port" msgstr "" -msgid "Port" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." msgstr "" msgid "Presentation URL" diff --git a/applications/luci-app-minidlna/po/en/minidlna.po b/applications/luci-app-minidlna/po/en/minidlna.po index 1ea7cb8b9e..7339fdcd6f 100644 --- a/applications/luci-app-minidlna/po/en/minidlna.po +++ b/applications/luci-app-minidlna/po/en/minidlna.po @@ -32,15 +32,15 @@ msgstr "" msgid "Database directory" msgstr "Database directory" +msgid "Enable" +msgstr "Enable" + msgid "Enable TIVO" msgstr "Enable TIVO" msgid "Enable inotify" msgstr "Enable inotify" -msgid "Enable" -msgstr "Enable" - msgid "Friendly name" msgstr "Friendly name" @@ -76,21 +76,21 @@ msgstr "Music" msgid "Network interfaces to serve." msgstr "" -msgid "Notify interval in seconds." -msgstr "Notify interval in seconds." - msgid "Notify interval" msgstr "Notify interval" +msgid "Notify interval in seconds." +msgstr "Notify interval in seconds." + msgid "Pictures" msgstr "Pictures" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." -msgstr "Port for HTTP (descriptions, SOAP, media transfer) traffic." - msgid "Port" msgstr "Port" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgstr "Port for HTTP (descriptions, SOAP, media transfer) traffic." + msgid "Presentation URL" msgstr "Presentation URL" diff --git a/applications/luci-app-minidlna/po/es/minidlna.po b/applications/luci-app-minidlna/po/es/minidlna.po index aa97674e76..44e7097cb5 100644 --- a/applications/luci-app-minidlna/po/es/minidlna.po +++ b/applications/luci-app-minidlna/po/es/minidlna.po @@ -35,15 +35,15 @@ msgstr "Recopilando información..." msgid "Database directory" msgstr "Directorio de la base de datos" +msgid "Enable" +msgstr "Activar" + msgid "Enable TIVO" msgstr "Activar TIVO" msgid "Enable inotify" msgstr "Activar inotify" -msgid "Enable" -msgstr "Activar" - msgid "Friendly name" msgstr "Nombre amigable" @@ -78,22 +78,22 @@ msgstr "Música" msgid "Network interfaces to serve." msgstr "Interfaces de red a usar." -msgid "Notify interval in seconds." -msgstr "Intervalo de notificación en segundos." - msgid "Notify interval" msgstr "Intervalo de notificación" +msgid "Notify interval in seconds." +msgstr "Intervalo de notificación en segundos." + msgid "Pictures" msgstr "Imágenes" +msgid "Port" +msgstr "Puerto" + msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." msgstr "" "Puerto para tráfico HTTP (descripciones, SOAP y transferencia de medios)." -msgid "Port" -msgstr "Puerto" - msgid "Presentation URL" msgstr "URL de presentación" diff --git a/applications/luci-app-minidlna/po/fr/minidlna.po b/applications/luci-app-minidlna/po/fr/minidlna.po index 4956da955d..4bb4e5ac91 100644 --- a/applications/luci-app-minidlna/po/fr/minidlna.po +++ b/applications/luci-app-minidlna/po/fr/minidlna.po @@ -32,13 +32,13 @@ msgstr "" msgid "Database directory" msgstr "" -msgid "Enable TIVO" +msgid "Enable" msgstr "" -msgid "Enable inotify" +msgid "Enable TIVO" msgstr "" -msgid "Enable" +msgid "Enable inotify" msgstr "" msgid "Friendly name" @@ -72,19 +72,19 @@ msgstr "" msgid "Network interfaces to serve." msgstr "" -msgid "Notify interval in seconds." +msgid "Notify interval" msgstr "" -msgid "Notify interval" +msgid "Notify interval in seconds." msgstr "" msgid "Pictures" msgstr "" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgid "Port" msgstr "" -msgid "Port" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." msgstr "" msgid "Presentation URL" diff --git a/applications/luci-app-minidlna/po/he/minidlna.po b/applications/luci-app-minidlna/po/he/minidlna.po index aeb6fb0883..f08917e5c5 100644 --- a/applications/luci-app-minidlna/po/he/minidlna.po +++ b/applications/luci-app-minidlna/po/he/minidlna.po @@ -32,13 +32,13 @@ msgstr "" msgid "Database directory" msgstr "" -msgid "Enable TIVO" +msgid "Enable" msgstr "" -msgid "Enable inotify" +msgid "Enable TIVO" msgstr "" -msgid "Enable" +msgid "Enable inotify" msgstr "" msgid "Friendly name" @@ -72,19 +72,19 @@ msgstr "" msgid "Network interfaces to serve." msgstr "" -msgid "Notify interval in seconds." +msgid "Notify interval" msgstr "" -msgid "Notify interval" +msgid "Notify interval in seconds." msgstr "" msgid "Pictures" msgstr "" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgid "Port" msgstr "" -msgid "Port" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." msgstr "" msgid "Presentation URL" diff --git a/applications/luci-app-minidlna/po/hu/minidlna.po b/applications/luci-app-minidlna/po/hu/minidlna.po index 91744f578c..cb86dfcf92 100644 --- a/applications/luci-app-minidlna/po/hu/minidlna.po +++ b/applications/luci-app-minidlna/po/hu/minidlna.po @@ -35,15 +35,15 @@ msgstr "Adatok gyűjtése..." msgid "Database directory" msgstr "Adatbázis könyvtár" +msgid "Enable" +msgstr "Engedélyezés" + msgid "Enable TIVO" msgstr "TIVO engedélyezése" msgid "Enable inotify" msgstr "Inotify engedélyezése" -msgid "Enable" -msgstr "Engedélyezés" - msgid "Friendly name" msgstr "Egyéni név" @@ -78,21 +78,21 @@ msgstr "Zene" msgid "Network interfaces to serve." msgstr "Kiszolgált hálózati interfészek." -msgid "Notify interval in seconds." -msgstr "Értesítés intervalluma másodpercben." - msgid "Notify interval" msgstr "Értesítési intervallum" +msgid "Notify interval in seconds." +msgstr "Értesítés intervalluma másodpercben." + msgid "Pictures" msgstr "Képek" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." -msgstr "HTTP forgalom (leírások, SOAP, média átvitel) portja." - msgid "Port" msgstr "Port" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgstr "HTTP forgalom (leírások, SOAP, média átvitel) portja." + msgid "Presentation URL" msgstr "Szolgáltatott URL" diff --git a/applications/luci-app-minidlna/po/it/minidlna.po b/applications/luci-app-minidlna/po/it/minidlna.po index 452873466a..58eae32f70 100644 --- a/applications/luci-app-minidlna/po/it/minidlna.po +++ b/applications/luci-app-minidlna/po/it/minidlna.po @@ -35,15 +35,15 @@ msgstr "Recuperando i dati..." msgid "Database directory" msgstr "Directory database" +msgid "Enable" +msgstr "Abilita" + msgid "Enable TIVO" msgstr "Abilita TIVO" msgid "Enable inotify" msgstr "Abilita inotify" -msgid "Enable" -msgstr "Abilita" - msgid "Friendly name" msgstr "Nome Comune" @@ -79,21 +79,21 @@ msgstr "Musica" msgid "Network interfaces to serve." msgstr "Interfaccia di rete usata." -msgid "Notify interval in seconds." -msgstr "Intervallo di notifica in secondi." - msgid "Notify interval" msgstr "Intervallo di notifica" +msgid "Notify interval in seconds." +msgstr "Intervallo di notifica in secondi." + msgid "Pictures" msgstr "Immagini" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." -msgstr "Porta per traffico (descrizione, SOAP, trasferimento supporto) HTTP" - msgid "Port" msgstr "Porta" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgstr "Porta per traffico (descrizione, SOAP, trasferimento supporto) HTTP" + msgid "Presentation URL" msgstr "URL di Presentazione" diff --git a/applications/luci-app-minidlna/po/ja/minidlna.po b/applications/luci-app-minidlna/po/ja/minidlna.po index e6d11c75ea..50dcfa5348 100644 --- a/applications/luci-app-minidlna/po/ja/minidlna.po +++ b/applications/luci-app-minidlna/po/ja/minidlna.po @@ -36,15 +36,15 @@ msgstr "データ収集中です..." msgid "Database directory" msgstr "データベース・ディレクトリ" +msgid "Enable" +msgstr "サービスを有効にする" + msgid "Enable TIVO" msgstr "TIVO を有効にする" msgid "Enable inotify" msgstr "inotify を有効にする" -msgid "Enable" -msgstr "サービスを有効にする" - msgid "Friendly name" msgstr "Friendly名" @@ -78,21 +78,21 @@ msgstr "ミュージック" msgid "Network interfaces to serve." msgstr "サービスが使用するネットワーク・インターフェースを設定します。" -msgid "Notify interval in seconds." -msgstr "通知間隔を秒単位で設定します。" - msgid "Notify interval" msgstr "通知間隔" +msgid "Notify interval in seconds." +msgstr "通知間隔を秒単位で設定します。" + msgid "Pictures" msgstr "ピクチャ" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." -msgstr "ステータス表示のためのHTTPポート番号を設定してください。" - msgid "Port" msgstr "ポート" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgstr "ステータス表示のためのHTTPポート番号を設定してください。" + msgid "Presentation URL" msgstr "プレゼンテーションURL" diff --git a/applications/luci-app-minidlna/po/ms/minidlna.po b/applications/luci-app-minidlna/po/ms/minidlna.po index 078693e4eb..7ab7be4a7c 100644 --- a/applications/luci-app-minidlna/po/ms/minidlna.po +++ b/applications/luci-app-minidlna/po/ms/minidlna.po @@ -31,13 +31,13 @@ msgstr "" msgid "Database directory" msgstr "" -msgid "Enable TIVO" +msgid "Enable" msgstr "" -msgid "Enable inotify" +msgid "Enable TIVO" msgstr "" -msgid "Enable" +msgid "Enable inotify" msgstr "" msgid "Friendly name" @@ -71,19 +71,19 @@ msgstr "" msgid "Network interfaces to serve." msgstr "" -msgid "Notify interval in seconds." +msgid "Notify interval" msgstr "" -msgid "Notify interval" +msgid "Notify interval in seconds." msgstr "" msgid "Pictures" msgstr "" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgid "Port" msgstr "" -msgid "Port" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." msgstr "" msgid "Presentation URL" diff --git a/applications/luci-app-minidlna/po/no/minidlna.po b/applications/luci-app-minidlna/po/no/minidlna.po index f409220bc2..efabe28d4a 100644 --- a/applications/luci-app-minidlna/po/no/minidlna.po +++ b/applications/luci-app-minidlna/po/no/minidlna.po @@ -35,15 +35,15 @@ msgstr "Samler inn data..." msgid "Database directory" msgstr "Database katalog" +msgid "Enable" +msgstr "Aktiver" + msgid "Enable TIVO" msgstr "Aktiver TIVO" msgid "Enable inotify" msgstr "Aktiver inotify" -msgid "Enable" -msgstr "Aktiver" - msgid "Friendly name" msgstr "Vennlig navn" @@ -79,21 +79,21 @@ msgstr "Musikk" msgid "Network interfaces to serve." msgstr "Nettverksgrensesnittene å tjene." -msgid "Notify interval in seconds." -msgstr "Notify intervall i sekunder." - msgid "Notify interval" msgstr "Notify intervall" +msgid "Notify interval in seconds." +msgstr "Notify intervall i sekunder." + msgid "Pictures" msgstr "Bilder" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." -msgstr "Port for HTTP (beskrivelser, SOAP, media overføring) trafikk." - msgid "Port" msgstr "Port" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgstr "Port for HTTP (beskrivelser, SOAP, media overføring) trafikk." + msgid "Presentation URL" msgstr "Presentasjon URL" diff --git a/applications/luci-app-minidlna/po/pl/minidlna.po b/applications/luci-app-minidlna/po/pl/minidlna.po index bfbc871c14..122e9562b8 100644 --- a/applications/luci-app-minidlna/po/pl/minidlna.po +++ b/applications/luci-app-minidlna/po/pl/minidlna.po @@ -36,15 +36,15 @@ msgstr "Zbieranie informacji..." msgid "Database directory" msgstr "Katalog bazy danych" +msgid "Enable" +msgstr "Włącz" + msgid "Enable TIVO" msgstr "Włącz TIVO" msgid "Enable inotify" msgstr "Włącz inotify" -msgid "Enable" -msgstr "Włącz" - msgid "Friendly name" msgstr "Przyjazna nazwa" @@ -78,21 +78,21 @@ msgstr "Muzyka" msgid "Network interfaces to serve." msgstr "Interfejsy sieciowe do obsługiwania." -msgid "Notify interval in seconds." -msgstr "Interwał powiadamiania w sekundach." - msgid "Notify interval" msgstr "Interwał powiadamiania." +msgid "Notify interval in seconds." +msgstr "Interwał powiadamiania w sekundach." + msgid "Pictures" msgstr "Obrazy" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." -msgstr "Port dla ruchu HTTP (opisy, SOAP, transfer mediów)." - msgid "Port" msgstr "Port" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgstr "Port dla ruchu HTTP (opisy, SOAP, transfer mediów)." + msgid "Presentation URL" msgstr "URL prezentacyjny" diff --git a/applications/luci-app-minidlna/po/pt-br/minidlna.po b/applications/luci-app-minidlna/po/pt-br/minidlna.po index 5739c6ff89..f5eb735789 100644 --- a/applications/luci-app-minidlna/po/pt-br/minidlna.po +++ b/applications/luci-app-minidlna/po/pt-br/minidlna.po @@ -32,15 +32,15 @@ msgstr "Coletando dados..." msgid "Database directory" msgstr "Banco de dados de diretório" +msgid "Enable" +msgstr "Ativado" + msgid "Enable TIVO" msgstr "Ativar TIVO" msgid "Enable inotify" msgstr "Ativar inotify" -msgid "Enable" -msgstr "Ativado" - msgid "Friendly name" msgstr "Nome amigável" @@ -76,21 +76,21 @@ msgstr "Musica" msgid "Network interfaces to serve." msgstr "As interfaces de rede para servir." -msgid "Notify interval in seconds." -msgstr "Notificação de intervalo em segundos." - msgid "Notify interval" msgstr "Intervalo de Notificação" +msgid "Notify interval in seconds." +msgstr "Notificação de intervalo em segundos." + msgid "Pictures" msgstr "Imagems" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." -msgstr "Porta para HTTP (descrições, SOAP, transferência de mídia) de tráfego." - msgid "Port" msgstr "Porta" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgstr "Porta para HTTP (descrições, SOAP, transferência de mídia) de tráfego." + msgid "Presentation URL" msgstr "URL para Apresentação" diff --git a/applications/luci-app-minidlna/po/pt/minidlna.po b/applications/luci-app-minidlna/po/pt/minidlna.po index 5eff3034f8..f1b8ee4440 100644 --- a/applications/luci-app-minidlna/po/pt/minidlna.po +++ b/applications/luci-app-minidlna/po/pt/minidlna.po @@ -35,15 +35,15 @@ msgstr "A obter dados..." msgid "Database directory" msgstr "Directório da base de dados" +msgid "Enable" +msgstr "Ativar" + msgid "Enable TIVO" msgstr "Ativar TIVO" msgid "Enable inotify" msgstr "Ativar inotify" -msgid "Enable" -msgstr "Ativar" - msgid "Friendly name" msgstr "Nome amigável" @@ -79,21 +79,21 @@ msgstr "Música" msgid "Network interfaces to serve." msgstr "Interfaces de rede a serem seervidas." -msgid "Notify interval in seconds." -msgstr "Intervalo de notificação em segundos." - msgid "Notify interval" msgstr "Intervalo de Notificação" +msgid "Notify interval in seconds." +msgstr "Intervalo de notificação em segundos." + msgid "Pictures" msgstr "Imagens" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." -msgstr "Porta para tráfego HTTP (descrições, SOAP, tranferencia de conteudos)." - msgid "Port" msgstr "Porta" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgstr "Porta para tráfego HTTP (descrições, SOAP, tranferencia de conteudos)." + msgid "Presentation URL" msgstr "" diff --git a/applications/luci-app-minidlna/po/ro/minidlna.po b/applications/luci-app-minidlna/po/ro/minidlna.po index f3714c2167..c129b06aa9 100644 --- a/applications/luci-app-minidlna/po/ro/minidlna.po +++ b/applications/luci-app-minidlna/po/ro/minidlna.po @@ -36,15 +36,15 @@ msgstr "Colectare date..." msgid "Database directory" msgstr "" +msgid "Enable" +msgstr "Activare" + msgid "Enable TIVO" msgstr "Activare TIVO" msgid "Enable inotify" msgstr "Activare inotify" -msgid "Enable" -msgstr "Activare" - msgid "Friendly name" msgstr "Nume prieten" @@ -76,21 +76,21 @@ msgstr "Muzică" msgid "Network interfaces to serve." msgstr "" -msgid "Notify interval in seconds." -msgstr "Notificare interval în secunde." - msgid "Notify interval" msgstr "Notificare interval" +msgid "Notify interval in seconds." +msgstr "Notificare interval în secunde." + msgid "Pictures" msgstr "Fotografii" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." -msgstr "Port pentru HTTP (descrieri, SOAP, transfer media) trafic." - msgid "Port" msgstr "Port" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgstr "Port pentru HTTP (descrieri, SOAP, transfer media) trafic." + msgid "Presentation URL" msgstr "URL de prezentare" diff --git a/applications/luci-app-minidlna/po/ru/minidlna.po b/applications/luci-app-minidlna/po/ru/minidlna.po index ea28c56a49..04a2305588 100644 --- a/applications/luci-app-minidlna/po/ru/minidlna.po +++ b/applications/luci-app-minidlna/po/ru/minidlna.po @@ -39,15 +39,15 @@ msgstr "Сбор данных..." msgid "Database directory" msgstr "Папка базы данных" +msgid "Enable" +msgstr "Включить" + msgid "Enable TIVO" msgstr "Включить TiVo" msgid "Enable inotify" msgstr "Включить inotify" -msgid "Enable" -msgstr "Включить" - msgid "Friendly name" msgstr "Имя протокола" @@ -81,21 +81,21 @@ msgstr "Музыка" msgid "Network interfaces to serve." msgstr "Использовать сетевые интерфейсы." -msgid "Notify interval in seconds." -msgstr "Интервал уведомления в секундах." - msgid "Notify interval" msgstr "Интервал уведомления" +msgid "Notify interval in seconds." +msgstr "Интервал уведомления в секундах." + msgid "Pictures" msgstr "Картинки" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." -msgstr "Задайте порт для HTTP-трафика (описания, SOAP, передача мультимедиа)." - msgid "Port" msgstr "Порт" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgstr "Задайте порт для HTTP-трафика (описания, SOAP, передача мультимедиа)." + msgid "Presentation URL" msgstr "Задать URL-адрес" diff --git a/applications/luci-app-minidlna/po/sk/minidlna.po b/applications/luci-app-minidlna/po/sk/minidlna.po index 2d72745803..df3b619889 100644 --- a/applications/luci-app-minidlna/po/sk/minidlna.po +++ b/applications/luci-app-minidlna/po/sk/minidlna.po @@ -32,13 +32,13 @@ msgstr "" msgid "Database directory" msgstr "" -msgid "Enable TIVO" +msgid "Enable" msgstr "" -msgid "Enable inotify" +msgid "Enable TIVO" msgstr "" -msgid "Enable" +msgid "Enable inotify" msgstr "" msgid "Friendly name" @@ -72,19 +72,19 @@ msgstr "" msgid "Network interfaces to serve." msgstr "" -msgid "Notify interval in seconds." +msgid "Notify interval" msgstr "" -msgid "Notify interval" +msgid "Notify interval in seconds." msgstr "" msgid "Pictures" msgstr "" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgid "Port" msgstr "" -msgid "Port" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." msgstr "" msgid "Presentation URL" diff --git a/applications/luci-app-minidlna/po/sv/minidlna.po b/applications/luci-app-minidlna/po/sv/minidlna.po index 4d9cea96c6..d69cacd503 100644 --- a/applications/luci-app-minidlna/po/sv/minidlna.po +++ b/applications/luci-app-minidlna/po/sv/minidlna.po @@ -33,13 +33,13 @@ msgstr "" msgid "Database directory" msgstr "" -msgid "Enable TIVO" +msgid "Enable" msgstr "" -msgid "Enable inotify" +msgid "Enable TIVO" msgstr "" -msgid "Enable" +msgid "Enable inotify" msgstr "" msgid "Friendly name" @@ -73,19 +73,19 @@ msgstr "" msgid "Network interfaces to serve." msgstr "" -msgid "Notify interval in seconds." +msgid "Notify interval" msgstr "" -msgid "Notify interval" +msgid "Notify interval in seconds." msgstr "" msgid "Pictures" msgstr "" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgid "Port" msgstr "" -msgid "Port" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." msgstr "" msgid "Presentation URL" diff --git a/applications/luci-app-minidlna/po/templates/minidlna.pot b/applications/luci-app-minidlna/po/templates/minidlna.pot index cef3374311..985def9c94 100644 --- a/applications/luci-app-minidlna/po/templates/minidlna.pot +++ b/applications/luci-app-minidlna/po/templates/minidlna.pot @@ -25,13 +25,13 @@ msgstr "" msgid "Database directory" msgstr "" -msgid "Enable TIVO" +msgid "Enable" msgstr "" -msgid "Enable inotify" +msgid "Enable TIVO" msgstr "" -msgid "Enable" +msgid "Enable inotify" msgstr "" msgid "Friendly name" @@ -65,19 +65,19 @@ msgstr "" msgid "Network interfaces to serve." msgstr "" -msgid "Notify interval in seconds." +msgid "Notify interval" msgstr "" -msgid "Notify interval" +msgid "Notify interval in seconds." msgstr "" msgid "Pictures" msgstr "" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgid "Port" msgstr "" -msgid "Port" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." msgstr "" msgid "Presentation URL" diff --git a/applications/luci-app-minidlna/po/tr/minidlna.po b/applications/luci-app-minidlna/po/tr/minidlna.po index 95353845cf..1f4559f86b 100644 --- a/applications/luci-app-minidlna/po/tr/minidlna.po +++ b/applications/luci-app-minidlna/po/tr/minidlna.po @@ -32,13 +32,13 @@ msgstr "" msgid "Database directory" msgstr "" -msgid "Enable TIVO" +msgid "Enable" msgstr "" -msgid "Enable inotify" +msgid "Enable TIVO" msgstr "" -msgid "Enable" +msgid "Enable inotify" msgstr "" msgid "Friendly name" @@ -72,19 +72,19 @@ msgstr "" msgid "Network interfaces to serve." msgstr "" -msgid "Notify interval in seconds." +msgid "Notify interval" msgstr "" -msgid "Notify interval" +msgid "Notify interval in seconds." msgstr "" msgid "Pictures" msgstr "" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgid "Port" msgstr "" -msgid "Port" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." msgstr "" msgid "Presentation URL" diff --git a/applications/luci-app-minidlna/po/uk/minidlna.po b/applications/luci-app-minidlna/po/uk/minidlna.po index 89b15ce26a..21312658e7 100644 --- a/applications/luci-app-minidlna/po/uk/minidlna.po +++ b/applications/luci-app-minidlna/po/uk/minidlna.po @@ -33,13 +33,13 @@ msgstr "" msgid "Database directory" msgstr "" -msgid "Enable TIVO" +msgid "Enable" msgstr "" -msgid "Enable inotify" +msgid "Enable TIVO" msgstr "" -msgid "Enable" +msgid "Enable inotify" msgstr "" msgid "Friendly name" @@ -73,19 +73,19 @@ msgstr "" msgid "Network interfaces to serve." msgstr "" -msgid "Notify interval in seconds." +msgid "Notify interval" msgstr "" -msgid "Notify interval" +msgid "Notify interval in seconds." msgstr "" msgid "Pictures" msgstr "" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgid "Port" msgstr "" -msgid "Port" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." msgstr "" msgid "Presentation URL" diff --git a/applications/luci-app-minidlna/po/vi/minidlna.po b/applications/luci-app-minidlna/po/vi/minidlna.po index 95353845cf..1f4559f86b 100644 --- a/applications/luci-app-minidlna/po/vi/minidlna.po +++ b/applications/luci-app-minidlna/po/vi/minidlna.po @@ -32,13 +32,13 @@ msgstr "" msgid "Database directory" msgstr "" -msgid "Enable TIVO" +msgid "Enable" msgstr "" -msgid "Enable inotify" +msgid "Enable TIVO" msgstr "" -msgid "Enable" +msgid "Enable inotify" msgstr "" msgid "Friendly name" @@ -72,19 +72,19 @@ msgstr "" msgid "Network interfaces to serve." msgstr "" -msgid "Notify interval in seconds." +msgid "Notify interval" msgstr "" -msgid "Notify interval" +msgid "Notify interval in seconds." msgstr "" msgid "Pictures" msgstr "" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgid "Port" msgstr "" -msgid "Port" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." msgstr "" msgid "Presentation URL" diff --git a/applications/luci-app-minidlna/po/zh-cn/minidlna.po b/applications/luci-app-minidlna/po/zh-cn/minidlna.po index 243d57470d..49eeeb22d9 100644 --- a/applications/luci-app-minidlna/po/zh-cn/minidlna.po +++ b/applications/luci-app-minidlna/po/zh-cn/minidlna.po @@ -38,15 +38,15 @@ msgstr "正在收集数据…" msgid "Database directory" msgstr "数据库目录：" +msgid "Enable" +msgstr "启用：" + msgid "Enable TIVO" msgstr "启用 TIVO：" msgid "Enable inotify" msgstr "启用 inotify：" -msgid "Enable" -msgstr "启用：" - msgid "Friendly name" msgstr "友好名称：" @@ -78,21 +78,21 @@ msgstr "音乐" msgid "Network interfaces to serve." msgstr "服务的网络接口。" -msgid "Notify interval in seconds." -msgstr "通知的时间间隔（秒）。" - msgid "Notify interval" msgstr "通知的时间间隔：" +msgid "Notify interval in seconds." +msgstr "通知的时间间隔（秒）。" + msgid "Pictures" msgstr "图片" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." -msgstr "HTTP（描述，SOAP，媒体传输）流量的端口。" - msgid "Port" msgstr "端口：" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgstr "HTTP（描述，SOAP，媒体传输）流量的端口。" + msgid "Presentation URL" msgstr "服务网址" diff --git a/applications/luci-app-minidlna/po/zh-tw/minidlna.po b/applications/luci-app-minidlna/po/zh-tw/minidlna.po index 3bdf86a088..76b8d48ab2 100644 --- a/applications/luci-app-minidlna/po/zh-tw/minidlna.po +++ b/applications/luci-app-minidlna/po/zh-tw/minidlna.po @@ -39,15 +39,15 @@ msgstr "正在收集資料…" msgid "Database directory" msgstr "資料庫目錄：" +msgid "Enable" +msgstr "啟用：" + msgid "Enable TIVO" msgstr "啟用 TIVO：" msgid "Enable inotify" msgstr "啟用 inotify：" -msgid "Enable" -msgstr "啟用：" - msgid "Friendly name" msgstr "友善名稱：" @@ -79,21 +79,21 @@ msgstr "音樂" msgid "Network interfaces to serve." msgstr "服務的網路介面。" -msgid "Notify interval in seconds." -msgstr "通知的時間間隔（秒）。" - msgid "Notify interval" msgstr "通知的時間間隔：" +msgid "Notify interval in seconds." +msgstr "通知的時間間隔（秒）。" + msgid "Pictures" msgstr "圖片" -msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." -msgstr "HTTP（描述，SOAP，媒體傳輸）流量的埠。" - msgid "Port" msgstr "埠：" +msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic." +msgstr "HTTP（描述，SOAP，媒體傳輸）流量的埠。" + msgid "Presentation URL" msgstr "服務網址" diff --git a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua index 2d46953e55..d2d7422a6b 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 a6570e341c..d01945bf4a 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-nlbwmon/po/zh-tw/nlbwmon.po b/applications/luci-app-nlbwmon/po/zh-tw/nlbwmon.po index f713ec516f..e5a4b5a777 100644 --- a/applications/luci-app-nlbwmon/po/zh-tw/nlbwmon.po +++ b/applications/luci-app-nlbwmon/po/zh-tw/nlbwmon.po @@ -366,8 +366,8 @@ msgid "" "mainly useful for memory constrained systems which might not be able to " "satisfy memory allocation after longer uptime periods." msgstr "" -"是否預先分配資料庫最大可能佔用的記憶體大小。這主要適用於記憶體較小系統，這些系統" -"在長時間執行之後可能無法滿足資料庫的記憶體需求。" +"是否預先分配資料庫最大可能佔用的記憶體大小。這主要適用於記憶體較小系統，這些" +"系統在長時間執行之後可能無法滿足資料庫的記憶體需求。" msgid "no traffic" msgstr "無流量資料" diff --git a/applications/luci-app-nut/Makefile b/applications/luci-app-nut/Makefile new file mode 100644 index 0000000000..b5c5b0d4c3 --- /dev/null +++ b/applications/luci-app-nut/Makefile @@ -0,0 +1,16 @@ +# +# Copyright (C) 2015 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=Network UPS Tools Configuration +LUCI_PKGARCH:=all +PKG_RELEASE:=1 + +include ../../luci.mk + +# call BuildPackage - OpenWrt buildroot signature diff --git a/applications/luci-app-nut/luasrc/controller/nut.lua b/applications/luci-app-nut/luasrc/controller/nut.lua new file mode 100644 index 0000000000..5598451d6e --- /dev/null +++ b/applications/luci-app-nut/luasrc/controller/nut.lua @@ -0,0 +1,25 @@ +-- Copyright 2015 Daniel Dickinson <openwrt@daniel.thecshore.com> +-- Licensed to the public under the Apache License 2.0. + +module("luci.controller.nut", package.seeall) + +function index() + if not nixio.fs.access("/etc/config/nut_server") and not nixio.fs.access("/etc/config/nut_monitor") and not nixio.fs.access("/etc/config/nut_cgi") then + return + end + + entry({"admin", "services", "nut"}, firstchild(), _("Network UPS Tools")) + + if nixio.fs.access("/etc/config/nut_server") then + entry({"admin", "services", "nut", "server"}, cbi("nut_server"), _("Network UPS Tools (Server)"), 20) + end + + if nixio.fs.access("/etc/config/nut_monitor") then + entry({"admin", "services", "nut", "monitor"}, cbi("nut_monitor"), _("Network UPS Tools (Monitor)"), 30) + end + + if nixio.fs.access("/etc/config/nut_cgi") then + entry({"admin", "services", "nut", "cgi"}, cbi("nut_cgi"), _("Network UPS Tools (CGI)"), 40) + end +end + diff --git a/applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua b/applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua new file mode 100644 index 0000000000..9afa2ed24e --- /dev/null +++ b/applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua @@ -0,0 +1,44 @@ +-- Copyright 2015 Daniel Dickinson <openwrt@daniel.thecshore.com> +-- Licensed to the public under the Apache License 2.0. + +local m, s, o + +m = Map("nut_cgi", translate("Network UPS Tools (CGI)"), + translate("Network UPS Tools CGI Configuration")) + +s = m:section(SimpleSection, translate("NUT CGI Access")) +s.addremove = false +s.anonymous = true + +o = s:option(DummyValue, "nut_cgi_go", '<a href="/nut">' .. translate("Go to NUT CGI") .. '</a>') +o.section = "cbi-nut_cgi" + +s = m:section(TypedSection, "host", translate("Host")) +s.addremove = true +s.anonymous = true + +o = s:option(Value, "upsname", translate("UPS name"), translate("As configured by NUT")) +o.optional = false + +o = s:option(Value, "hostname", translate("Hostname or IP address")) +o.optional = false +o.datatype = "host" + +o = s:option(Value, "port", translate("Port")) +o.datatype = "port" +o.optional = true +o.placeholder = 3493 + +o = s:option(Value, "displayname", translate("Display name")) +o.optional = false + +s = m:section(TypedSection, "upsset", translate("Control UPS via CGI")) +s.addremove = false +s.anonymous = true +s.optional = false + +o = s:option(Flag, "enable", translate("Enable")) +o.optional = false +o.default = false + +return m diff --git a/applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua b/applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua new file mode 100644 index 0000000000..0eda5d83e0 --- /dev/null +++ b/applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua @@ -0,0 +1,241 @@ +-- Copyright 2015 Daniel Dickinson <openwrt@daniel.thecshore.com> +-- Licensed to the public under the Apache License 2.0. + +local m, s, o +require "luci.util" + +m = Map("nut_monitor", translate("Network UPS Tools (Monitor)"), + translate("Network UPS Tools Monitoring Configuration")) + +s = m:section(NamedSection, "upsmon", "upsmon", translate("Global Settings")) +s.addremove = true +s.optional = true + +o = s:option(Value, "runas", translate("RunAs User"), translate("upsmon drops privileges to this user")) +o.placeholder = "nutmon" + +o = s:option(Value, "minsupplies", translate("Minimum required number or power supplies")) +o.datatype = "uinteger" +o.placeholder = 1 +o.optional = true + +o = s:option(Value, "shutdowncmd", translate("Shutdown command")) +o.optional = true +o.placeholder = "/sbin/halt" + +o = s:option(Value, "notifycmd", translate("Notify command")) +o.optional = true + +o = s:option(Value, "pollfreq", translate("Poll frequency")) +o.datatype = "uinteger" +o.placeholder = 5 +o.optional = true + +o = s:option(Value, "pollfreqalert", translate("Poll frequency alert")) +o.datatype = "uinteger" +o.optional = true +o.placeholder = 5 + +o = s:option(Value, "hotsync", translate("Hot Sync")) +o.optional = true +o.placeholder = 15 + +o = s:option(Value, "deadtime", translate("Deadtime")) +o.datatype = "uinteger" +o.optional = true +o.placeholder = 15 + +o = s:option(Value, "onlinemsg", translate("Online message")) +o.optional = true + +o = s:option(Value, "onbattmsg", translate("On battery message")) +o.optional = true + +o = s:option(Value, "lowbattmsg", translate("Low battery message")) +o.optional = true + +o = s:option(Value, "fsdmsg", translate("Forced shutdown message")) +o.optional = true + +o = s:option(Value, "comokmsg", translate("Communications restored message")) +o.optional = true + +o = s:option(Value, "combadmsg", translate("Communications lost message")) +o.optional = true + +o = s:option(Value, "shutdownmsg", translate("Shutdown message")) +o.optional = true + +o = s:option(Value, "replbattmsg", translate("Replace battery message")) +o.optional = true + +o = s:option(Value, "nocommsg", translate("No communications message")) +o.optional = true + +o = s:option(Value, "noparentmsg", translate("No parent message")) +o.optional = true + +validatenotify = function(self, value) + val = StaticList.validate(self, value) + if val then + for k, v in pairs(val) do + if (v == 'IGNORE') then + return nil, "Ignore must the only option selected, when selected" + end + end + end + return val +end + +o = s:option(StaticList, "defaultnotify", translate("Notification defaults")) +o.optional = true +o.widget = "select" +o:value("EXEC", translate("Execute notify command")) +o:value("SYSLOG", translate("Write to syslog")) +o:value("IGNORE", translate("Ignore")) +o.default = "SYSLOG" +o.validate = validatenotify + +o = s:option(StaticList, "onlinenotify", translate("Notify when back online")) +o.optional = true +o.widget = "select" +o:value("EXEC", translate("Execute notify command")) +o:value("SYSLOG", translate("Write to syslog")) +o:value("IGNORE", translate("Ignore")) +o.validate = validatenotify + +o = s:option(StaticList, "onbattnotify", translate("Notify when on battery")) +o.optional = true +o.widget = "select" +o:value("EXEC", translate("Execute notify command")) +o:value("SYSLOG", translate("Write to syslog")) +o:value("IGNORE", translate("Ignore")) +o.validate = validatenotify + +o = s:option(StaticList, "nowbattnotify", translate("Notify when low battery")) +o.optional = true +o.widget = "select" +o:value("EXEC", translate("Execute notify command")) +o:value("SYSLOG", translate("Write to syslog")) +o:value("IGNORE", translate("Ignore")) +o.validate = validatenotify + +o = s:option(StaticList, "nowbattnotify", translate("Notify when low battery")) +o.optional = true +o.widget = "select" +o:value("EXEC", translate("Execute notify command")) +o:value("SYSLOG", translate("Write to syslog")) +o:value("IGNORE", translate("Ignore")) +o.validate = validatenotify + +o = s:option(StaticList, "fsdnotify", translate("Notify when force shutdown")) +o.optional = true +o.widget = "select" +o:value("EXEC", translate("Execute notify command")) +o:value("SYSLOG", translate("Write to syslog")) +o:value("IGNORE", translate("Ignore")) +o.validate = validatenotify + +o = s:option(StaticList, "comoknotify", translate("Notify when communications restored")) +o.optional = true +o.widget = "select" +o:value("EXEC", translate("Execute notify command")) +o:value("SYSLOG", translate("Write to syslog")) +o:value("IGNORE", translate("Ignore")) +o.validate = validatenotify + +o = s:option(StaticList, "combadnotify", translate("Notify when communications lost")) +o.optional = true +o.widget = "select" +o:value("EXEC", translate("Execute notify command")) +o:value("SYSLOG", translate("Write to syslog")) +o:value("IGNORE", translate("Ignore")) +o.validate = validatenotify + +o = s:option(StaticList, "shutdownotify", translate("Notify when shutting down")) +o.optional = true +o.widget = "select" +o:value("EXEC", translate("Execute notify command")) +o:value("SYSLOG", translate("Write to syslog")) +o:value("IGNORE", translate("Ignore")) +o.validate = validatenotify + +o = s:option(StaticList, "replbattnotify", translate("Notify when battery needs replacing")) +o.optional = true +o.widget = "select" +o:value("EXEC", translate("Execute notify command")) +o:value("SYSLOG", translate("Write to syslog")) +o:value("IGNORE", translate("Ignore")) +o.validate = validatenotify + +local have_ssl_support = luci.util.checklib("/usr/sbin/upsmon", "libssl.so") + +if have_ssl_support then + o = s:option(Value, "certpath", translate("CA Certificate path"), translate("Path containing ca certificates to match against host certificate")) + o.optional = true + o.placeholder = "/etc/ssl/certs" + + o = s:option(Flag, "certverify", translate("Verify all connection with SSL"), translate("Require SSL and make sure server CN matches hostname")) + o.optional = true + o.default = false +end + +s = m:section(TypedSection, "master", translate("UPS Master")) +s.optional = true +s.addremove = true +s.anonymous = true + +o = s:option(Value, "upsname", translate("Name of UPS"), translate("As configured by NUT")) +o.optional = false + +o = s:option(Value, "hostname", translate("Hostname or address of UPS")) +o.optional = false +s.datetype = "host" + +o = s:option(Value, "port", translate("Port")) +o.optional = true +o.placeholder = 3493 +o.datatype = "port" + +o = s:option(Value, "powervalue", translate("Power value")) +o.optional = false +o.datatype = "uinteger" +o.default = 1 + +o = s:option(Value, "username", translate("Username")) +o.optional = false + +o = s:option(Value, "password", translate("Password")) +o.optional = false +o.password = true + +s = m:section(TypedSection, "slave", translate("UPS Slave")) +s.optional = true +s.addremove = true +s.anonymous = true + +o = s:option(Value, "upsname", translate("Name of UPS"), translate("As configured by NUT")) +o.optional = false + +o = s:option(Value, "hostname", translate("Hostname or address of UPS")) +o.optional = false +s.datetype = "host" + +o = s:option(Value, "port", translate("Port")) +o.optional = true +o.placeholder = 3493 +o.datatype = "port" + +o = s:option(Value, "powervalue", translate("Power value")) +o.optional = false +o.datatype = "uinteger" +o.default = 1 + +o = s:option(Value, "username", translate("Username")) +o.optional = false + +o = s:option(Value, "password", translate("Password")) +o.optional = false +o.password = true + +return m diff --git a/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua b/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua new file mode 100644 index 0000000000..dea7932395 --- /dev/null +++ b/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua @@ -0,0 +1,191 @@ +-- Copyright 2015 Daniel Dickinson <openwrt@daniel.thecshore.com> +-- Licensed to the public under the Apache License 2.0. + +local m, s, o + +local nixio = require "nixio" +require "luci.util" + +m = Map("nut_server", translate("Network UPS Tools (Server)"), + translate("Network UPS Tools Server Configuration")) + +s = m:section(TypedSection, "user", translate("NUT Users")) +s.addremove = true +s.anonymous = true + +o = s:option(Value, "username", translate("Username")) +o.optional = false + +o = s:option(Value, "password", translate("Password")) +o.password = true +o.optional = false + +o = s:option(MultiValue, "actions", translate("Allowed actions")) +o.widget = "select" +o:value("set", translate("Set variables")) +o:value("fsd", translate("Forced Shutdown")) +o.optional = true + +o = s:option(DynamicList, "instcmd", translate("Instant commands"), translate("Use upscmd -l to see full list which the commands your UPS supports (requires upscmd package)")) +o.optional = true + +o = s:option(ListValue, "upsmon", translate("Role")) +o:value("slave", translate("Slave")) +o:value("master", translate("Master")) +o.optional = false + +s = m:section(TypedSection, "listen_address", translate("Addresses on which to listen")) +s.addremove = true +s.anonymous = true + +o = s:option(Value, "address", translate("IP Address")) +o.optional = false +o.datatype = "ipaddr" +o.placeholder = "127.0.0.1" + +o = s:option(Value, "port", translate("Port")) +o.optional = true +o.datatype = "port" +o.placeholder = "3493" + +s = m:section(NamedSection, "upsd", "upsd", translate("Global Settings")) +s.addremove = true + +o = s:option(Value, "maxage", translate("Maximum Age of Data"), translate("Period after which data is considered stale")) +o.datatype = "uinteger" +o.optional = true +o.placeholder = 15 + +o = s:option(Value, "runas", translate("RunAs User"), translate("Drop privileges to this user")) +o.optional = true +o.placeholder = "nut" + +o = s:option(Value, "statepath", translate("Path to state file")) +o.optional = true +o.placeholder = "/var/run/nut" + +o = s:option(Value, "maxconn", translate("Maximum connections")) +o.optional = true +o.datatype = "uinteger" +o.placeholder = 24 + +if luci.util.checklib("/usr/sbin/upsd", "libssl.so") then + o = s:option(Value, "certfile", translate("Certificate file (SSL)")) + o.optional = true +end + +s = m:section(TypedSection, "driver", translate("Driver Configuration"), + translate("The name of this section will be used as UPS name elsewhere")) +s.addremove = true +s.anonymous = false + +driverlist = nixio.fs.dir("/lib/nut") + +o = s:option(ListValue, "driver", translate("Driver")) +for driver in driverlist do + o:value(driver) +end +o.optional = false + +o = s:option(Value, "port", translate("Port")) +o.optional = false +o.default = "auto" + +o = s:option(Value, "mfr", translate("Manufacturer (Display)")) +o.optional = true + +o = s:option(Value, "model", translate("Model (Display)")) +o.optional = true + +o = s:option(Value, "serial", translate("Serial Number")) +o.optional = true + +o = s:option(Value, "sdtime", translate("Additional Shutdown Time(s)")) +o.optional = true + +o = s:option(Value, "offdelay", translate("Off Delay(s)"), translate("Delay for kill power command")) +o.optional = true +o.placeholder = 20 + +n = s:option(Value, "ondelay", translate("On Delay(s)"), translate("Delay to power on UPS if power returns after kill power")) +n.optional = true +n.placeholder = 30 + +function o.validate(self, cfg, value) + if n:cfgvalue(cfg) <= value then + return nil + end +end + +function n.validate(self, cfg, value) + if o:cfgvalue(cfg) >= value then + return nil + end +end + +o = s:option(Value, "pollfreq", translate("Polling Frequency(s)")) +o.optional = true +o.datatype = "integer" +o.placeholder = 30 + +o = s:option(Value, "vendor", translate("Vendor (regex)")) +o.optional = true + +o = s:option(Value, "product", translate("Product (regex)")) +o.optional = true + +o = s:option(Value, "bus", translate("USB Bus(es) (regex)")) +o.optional = true +o.datatype = "uinteger" + +o = s:option(Flag, "interruptonly", translate("Interrupt Only")) +o.optional = true +o.default = false + +o = s:option(Value, "interruptsize", translate("Interrupt Size"), translate("Bytes to read from interrupt pipe")) +o.optional = true +o.datatype = "integer" + +o = s:option(Value, "maxreport", translate("Max USB HID Length Reported"), translate("Workaround for buggy firmware")) +o.optional = true +o.datatype = "integer" +o.default = nil + +o = s:option(Value, "vendorid", translate("USB Vendor Id")) +o.optional = true + +o = s:option(Value, "productid", translate("USB Product Id")) +o.optional = true + +o = s:option(Value, "runas", translate("RunAs User"), translate("User as which to execute driver; requires device file accessed by driver be read-write for that user.")) +o.optional = true +o.placeholder = "nut" + +o = s:option(Value, "community", translate("SNMP Community")) +o.optional = true +o.placeholder = "private" + +o = s:option(ListValue, "snmp_version", translate("SNMP version")) +o.optional = true +o:value("v1", translate("SNMPv1")) +o:value("v2c", translate("SNMPv2c")) +o:value("v3", translate("SNMPv3")) +o:value("", "") +o.default = "" + +o = s:option(Value, "snmp_retries", translate("SNMP retries")) +o.optional = true +o.datatype = "uinteger" + +o = s:option(Value, "snmp_timeout", translate("SNMP timeout(s)")) +o.optional = true +o.datatype = "uinteger" + +o = s:option(Flag, "notransferoids", translate("No low/high voltage transfer OIDs")) +o.optional = true +o.default = false + +o = s:option(Value, "other", translate("Additional Parameters")) +o.optional = true + +return m diff --git a/applications/luci-app-nut/root/etc/uci-defaults/40_luci-nut b/applications/luci-app-nut/root/etc/uci-defaults/40_luci-nut new file mode 100755 index 0000000000..621f6a6a38 --- /dev/null +++ b/applications/luci-app-nut/root/etc/uci-defaults/40_luci-nut @@ -0,0 +1,22 @@ +#!/bin/sh + +version="$(opkg status nut|grep 'Version: '|cut -f2 -d\ )" +release="$(echo $version|cut -f2 -d-)" + +if [ "$version" = "2.7.4" ] && [ "$release" -lt 8 ]; then + uci -q batch <<-EOF >/dev/null + delete ucitrack.@nut_server[-1] + delete ucitrack.@nut_monitor[-1] + delete ucitrack.@nut_cgi[-1] + add ucitrack nut_server + set ucitrack.@nut_server[-1].init=nut-server + add ucitrack nut_monitor + set ucitrack.@nut_monitor[-1].init=nut-monitor + add ucitrack nut_cgi + set ucitrack.@nut_cgi[-1].init=nut-cgi + commit ucitrack +EOF +fi + +rm -f /tmp/luci-indexcache +exit 0 diff --git a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot index 38baf58a44..f5c11ac7b7 100644 --- a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot +++ b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot @@ -94,6 +94,9 @@ msgstr "" msgid "Some output" msgstr "" +msgid "Start Simple Adblock service" +msgstr "" + msgid "Stop the download if it is stalled for set number of seconds" msgstr "" diff --git a/applications/luci-app-transmission/po/ca/transmission.po b/applications/luci-app-transmission/po/ca/transmission.po index 2498393a9c..43f092d55a 100644 --- a/applications/luci-app-transmission/po/ca/transmission.po +++ b/applications/luci-app-transmission/po/ca/transmission.po @@ -61,6 +61,9 @@ msgstr "" msgid "Config file directory" msgstr "Directori de fitxer de configuració" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "DHT habilitat" diff --git a/applications/luci-app-transmission/po/cs/transmission.po b/applications/luci-app-transmission/po/cs/transmission.po index b6166ec03c..f29e8acc5d 100644 --- a/applications/luci-app-transmission/po/cs/transmission.po +++ b/applications/luci-app-transmission/po/cs/transmission.po @@ -59,6 +59,9 @@ msgstr "Velikost mezipaměti v MB" msgid "Config file directory" msgstr "Složka pro uložení konfiguračního souboru" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "Povolit DHT" diff --git a/applications/luci-app-transmission/po/de/transmission.po b/applications/luci-app-transmission/po/de/transmission.po index 4b665ff656..ae405b59b8 100644 --- a/applications/luci-app-transmission/po/de/transmission.po +++ b/applications/luci-app-transmission/po/de/transmission.po @@ -61,6 +61,9 @@ msgstr "Cache-Größe in MB" msgid "Config file directory" msgstr "Verzeichnis für Konfigurationsdatei" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "DHT eingeschaltet" @@ -142,8 +145,8 @@ msgid "" "8, Thursday - 16, Friday - 32, Saturday - 64" msgstr "" "Zahl/Bitfeld. Starte mit 0, für jeden Tag, an dem die Zeitplanung aktiv sein " -"soll, füge einen Wert hinzu. Sonntag - 1, Montag - 2, Dienstag - 4, " -"Mittwoch - 8, Donnerstag - 16, Freitag - 32, Samstag - 64" +"soll, füge einen Wert hinzu. Sonntag - 1, Montag - 2, Dienstag - 4, Mittwoch " +"- 8, Donnerstag - 16, Freitag - 32, Samstag - 64" msgid "Off" msgstr "Aus" diff --git a/applications/luci-app-transmission/po/el/transmission.po b/applications/luci-app-transmission/po/el/transmission.po index 3125fc2751..2b6f6247e0 100644 --- a/applications/luci-app-transmission/po/el/transmission.po +++ b/applications/luci-app-transmission/po/el/transmission.po @@ -46,6 +46,9 @@ msgstr "" msgid "Config file directory" msgstr "" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "" diff --git a/applications/luci-app-transmission/po/en/transmission.po b/applications/luci-app-transmission/po/en/transmission.po index 3125fc2751..2b6f6247e0 100644 --- a/applications/luci-app-transmission/po/en/transmission.po +++ b/applications/luci-app-transmission/po/en/transmission.po @@ -46,6 +46,9 @@ msgstr "" msgid "Config file directory" msgstr "" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "" diff --git a/applications/luci-app-transmission/po/es/transmission.po b/applications/luci-app-transmission/po/es/transmission.po index 9eeb2fb6bc..ab2fbf8db3 100644 --- a/applications/luci-app-transmission/po/es/transmission.po +++ b/applications/luci-app-transmission/po/es/transmission.po @@ -61,6 +61,9 @@ msgstr "Tamaño de la caché en MB" msgid "Config file directory" msgstr "Directorio del fichero de configuración" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "DHT activado" diff --git a/applications/luci-app-transmission/po/fr/transmission.po b/applications/luci-app-transmission/po/fr/transmission.po index 3125fc2751..2b6f6247e0 100644 --- a/applications/luci-app-transmission/po/fr/transmission.po +++ b/applications/luci-app-transmission/po/fr/transmission.po @@ -46,6 +46,9 @@ msgstr "" msgid "Config file directory" msgstr "" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "" diff --git a/applications/luci-app-transmission/po/he/transmission.po b/applications/luci-app-transmission/po/he/transmission.po index 3125fc2751..2b6f6247e0 100644 --- a/applications/luci-app-transmission/po/he/transmission.po +++ b/applications/luci-app-transmission/po/he/transmission.po @@ -46,6 +46,9 @@ msgstr "" msgid "Config file directory" msgstr "" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "" diff --git a/applications/luci-app-transmission/po/hu/transmission.po b/applications/luci-app-transmission/po/hu/transmission.po index 040f83802e..3cab990a65 100644 --- a/applications/luci-app-transmission/po/hu/transmission.po +++ b/applications/luci-app-transmission/po/hu/transmission.po @@ -61,6 +61,9 @@ msgstr "Puffer méret (MB)" msgid "Config file directory" msgstr "Beállítási fájl könyvtára" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "DHT engedélyezve" diff --git a/applications/luci-app-transmission/po/it/transmission.po b/applications/luci-app-transmission/po/it/transmission.po index 1008fad277..52dce23b84 100644 --- a/applications/luci-app-transmission/po/it/transmission.po +++ b/applications/luci-app-transmission/po/it/transmission.po @@ -61,6 +61,9 @@ msgstr "" msgid "Config file directory" msgstr "" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "" diff --git a/applications/luci-app-transmission/po/ja/transmission.po b/applications/luci-app-transmission/po/ja/transmission.po index dded65038a..502740bd05 100644 --- a/applications/luci-app-transmission/po/ja/transmission.po +++ b/applications/luci-app-transmission/po/ja/transmission.po @@ -61,6 +61,9 @@ msgstr "キャッシュサイズ (MB)" msgid "Config file directory" msgstr "コンフィグファイル・ディレクトリ" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "DHTを有効にする" diff --git a/applications/luci-app-transmission/po/ms/transmission.po b/applications/luci-app-transmission/po/ms/transmission.po index 3125fc2751..2b6f6247e0 100644 --- a/applications/luci-app-transmission/po/ms/transmission.po +++ b/applications/luci-app-transmission/po/ms/transmission.po @@ -46,6 +46,9 @@ msgstr "" msgid "Config file directory" msgstr "" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "" diff --git a/applications/luci-app-transmission/po/no/transmission.po b/applications/luci-app-transmission/po/no/transmission.po index cb8684181c..5031ae312d 100644 --- a/applications/luci-app-transmission/po/no/transmission.po +++ b/applications/luci-app-transmission/po/no/transmission.po @@ -61,6 +61,9 @@ msgstr "Bufferstørrelse i MB" msgid "Config file directory" msgstr "Mappe for konfigurasjonsfil" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "DHT aktivert" diff --git a/applications/luci-app-transmission/po/pl/transmission.po b/applications/luci-app-transmission/po/pl/transmission.po index f010d56da8..f0f19dc514 100644 --- a/applications/luci-app-transmission/po/pl/transmission.po +++ b/applications/luci-app-transmission/po/pl/transmission.po @@ -62,6 +62,9 @@ msgstr "Wielkość cache w MB" msgid "Config file directory" msgstr "Katalog z plikiem konfiguracyjnym" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "DHT włączone" diff --git a/applications/luci-app-transmission/po/pt-br/transmission.po b/applications/luci-app-transmission/po/pt-br/transmission.po index 82ba6a46e4..8fe5073c63 100644 --- a/applications/luci-app-transmission/po/pt-br/transmission.po +++ b/applications/luci-app-transmission/po/pt-br/transmission.po @@ -61,6 +61,9 @@ msgstr "Tamanho em MB do cache" msgid "Config file directory" msgstr "Diretório dos arquivos de configuração" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "DHT habilitado" diff --git a/applications/luci-app-transmission/po/pt/transmission.po b/applications/luci-app-transmission/po/pt/transmission.po index 512ca970dc..00604e2153 100644 --- a/applications/luci-app-transmission/po/pt/transmission.po +++ b/applications/luci-app-transmission/po/pt/transmission.po @@ -61,6 +61,9 @@ msgstr "" msgid "Config file directory" msgstr "Directório do ficheiro de configuração" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "" diff --git a/applications/luci-app-transmission/po/ro/transmission.po b/applications/luci-app-transmission/po/ro/transmission.po index 8e0fc7dcce..c99f64f36c 100644 --- a/applications/luci-app-transmission/po/ro/transmission.po +++ b/applications/luci-app-transmission/po/ro/transmission.po @@ -62,6 +62,9 @@ msgstr "" msgid "Config file directory" msgstr "" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "" diff --git a/applications/luci-app-transmission/po/ru/transmission.po b/applications/luci-app-transmission/po/ru/transmission.po index 32edc4f51a..449177e1d9 100644 --- a/applications/luci-app-transmission/po/ru/transmission.po +++ b/applications/luci-app-transmission/po/ru/transmission.po @@ -63,6 +63,9 @@ msgstr "Размер кэша в МБ" msgid "Config file directory" msgstr "Папка расположения<br />сonfig файла" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "DHT включен" diff --git a/applications/luci-app-transmission/po/sk/transmission.po b/applications/luci-app-transmission/po/sk/transmission.po index 4b4c3afd9a..787083ee1e 100644 --- a/applications/luci-app-transmission/po/sk/transmission.po +++ b/applications/luci-app-transmission/po/sk/transmission.po @@ -56,6 +56,9 @@ msgstr "" msgid "Config file directory" msgstr "" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "" diff --git a/applications/luci-app-transmission/po/sv/transmission.po b/applications/luci-app-transmission/po/sv/transmission.po index 324bdab033..7cad76a542 100644 --- a/applications/luci-app-transmission/po/sv/transmission.po +++ b/applications/luci-app-transmission/po/sv/transmission.po @@ -57,6 +57,9 @@ msgstr "Storlek på cache i MB" msgid "Config file directory" msgstr "Ställ in fil-mapp" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "DHT aktiverat" diff --git a/applications/luci-app-transmission/po/templates/transmission.pot b/applications/luci-app-transmission/po/templates/transmission.pot index 5892abcad1..54658683f7 100644 --- a/applications/luci-app-transmission/po/templates/transmission.pot +++ b/applications/luci-app-transmission/po/templates/transmission.pot @@ -49,6 +49,9 @@ msgstr "" msgid "Config file directory" msgstr "" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "" diff --git a/applications/luci-app-transmission/po/tr/transmission.po b/applications/luci-app-transmission/po/tr/transmission.po index 5a4df01496..e6f9fd5d63 100644 --- a/applications/luci-app-transmission/po/tr/transmission.po +++ b/applications/luci-app-transmission/po/tr/transmission.po @@ -56,6 +56,9 @@ msgstr "" msgid "Config file directory" msgstr "" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "" diff --git a/applications/luci-app-transmission/po/uk/transmission.po b/applications/luci-app-transmission/po/uk/transmission.po index 1736934420..f3c01697f0 100644 --- a/applications/luci-app-transmission/po/uk/transmission.po +++ b/applications/luci-app-transmission/po/uk/transmission.po @@ -62,6 +62,9 @@ msgstr "" msgid "Config file directory" msgstr "" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "" diff --git a/applications/luci-app-transmission/po/vi/transmission.po b/applications/luci-app-transmission/po/vi/transmission.po index 3125fc2751..2b6f6247e0 100644 --- a/applications/luci-app-transmission/po/vi/transmission.po +++ b/applications/luci-app-transmission/po/vi/transmission.po @@ -46,6 +46,9 @@ msgstr "" msgid "Config file directory" msgstr "" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "" diff --git a/applications/luci-app-transmission/po/zh-cn/transmission.po b/applications/luci-app-transmission/po/zh-cn/transmission.po index f4dba62591..81280cdcda 100644 --- a/applications/luci-app-transmission/po/zh-cn/transmission.po +++ b/applications/luci-app-transmission/po/zh-cn/transmission.po @@ -64,6 +64,9 @@ msgstr "缓存大小（MB）" msgid "Config file directory" msgstr "配置文件的目录" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "启用 DHT" diff --git a/applications/luci-app-transmission/po/zh-tw/transmission.po b/applications/luci-app-transmission/po/zh-tw/transmission.po index 304bfdad1e..6edf3b6d22 100644 --- a/applications/luci-app-transmission/po/zh-tw/transmission.po +++ b/applications/luci-app-transmission/po/zh-tw/transmission.po @@ -64,6 +64,9 @@ msgstr "快取大小（MB）" msgid "Config file directory" msgstr "配置檔案的目錄" +msgid "Custom WEB UI directory" +msgstr "" + msgid "DHT enabled" msgstr "啟用 DHT" diff --git a/applications/luci-app-travelmate/po/ja/travelmate.po b/applications/luci-app-travelmate/po/ja/travelmate.po index f1d1220b7c..f608a2aa9a 100644 --- a/applications/luci-app-travelmate/po/ja/travelmate.po +++ b/applications/luci-app-travelmate/po/ja/travelmate.po @@ -12,6 +12,9 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "Language: ja\n" +msgid "Action" +msgstr "" + msgid "Add Uplink" msgstr "アップリンクの追加" @@ -122,6 +125,9 @@ msgstr "暗号化" msgid "Extra options" msgstr "拡張オプション" +msgid "Faulty Stations" +msgstr "" + msgid "Find and join network on" msgstr "ネットワークの検索と参加:" @@ -169,8 +175,11 @@ msgstr "インターフェース タイムアウト" msgid "Interface Wizard" msgstr "インターフェース ウィザード" -msgid "Last rundate" -msgstr "最終実行日時" +msgid "Last Run" +msgstr "" + +msgid "Loading" +msgstr "" msgid "" "Minimum signal quality threshold as percent for conditional uplink (dis-) " @@ -225,12 +234,8 @@ msgstr "秘密鍵へのパス" msgid "" "Provides an overview of all configured uplinks for the travelmate interface " "(%s). You can edit, delete or re-order existing uplinks or scan for a new " -"one. The currently used uplink is emphasized in blue." +"one. The currently used uplink is emphasized in blue, faulty stations in red." msgstr "" -"Travelmate 用インターフェース（%s）に設定済みの全アップリンクの一覧です。既存" -"のアップリンクの編集や削除、並べ替えを行ったり、スキャンを行って新規アップリ" -"ンクを追加することができます。現在使用されているアップリンクは、青色で強調さ" -"れます。" msgid "QR-Codes" msgstr "QR-コード" @@ -241,6 +246,12 @@ msgstr "無線の選択" msgid "Repeat scan" msgstr "再スキャン" +msgid "Restart" +msgstr "" + +msgid "Restart Travelmate" +msgstr "" + msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." msgstr "Travelmate が指定された無線に接続するよう制御します。（例: 'radio0'）" @@ -268,21 +279,21 @@ msgstr "シグナル品質閾値" msgid "Signal strength" msgstr "信号強度" -msgid "Station ID (SSID/BSSID)" -msgstr "ステーション ID (SSID / BSSID)" +msgid "Station ID (RADIO/SSID/BSSID)" +msgstr "" msgid "Station Interface" msgstr "ステーション インターフェース" -msgid "Station Radio" -msgstr "ステーション電波" - msgid "" "The BSSID information '%s' is optional and only required for hidden networks" msgstr "" "BSSID 情報 '%s' はオプションであり、ステルス化されたネットワークにのみ必要で" "す。" +msgid "The syslog output, pre-filtered for travelmate related messages only." +msgstr "" + msgid "" "This form allows you to modify the content of the main firewall " "configuration file (/etc/config/firewall)." @@ -311,22 +322,12 @@ msgstr "" "このフォームでは、無線 設定ファイル (/etc/config/wireless) の内容を変更するこ" "とができます。" -msgid "" -"This form shows the syslog output, pre-filtered for travelmate related " -"messages only." -msgstr "" -"このフォームには、システムログ内の Travelmate に関するメッセージのみが表示さ" -"れます。" - msgid "This step has only to be done once." msgstr "この手順は、一度だけ実行される必要があります。" msgid "Travelmate" msgstr "Travelmate" -msgid "Travelmate Logfile" -msgstr "Travelmate ログファイル" - msgid "Travelmate Status (Quality)" msgstr "Travelmate ステータス（品質）" @@ -381,14 +382,46 @@ msgstr "無線スキャン" msgid "Wireless Stations" msgstr "無線ステーション" -msgid "add it to the wan zone of the firewall.<br />" -msgstr "ファイアウォールの wan ゾーンに追加します。<br />" +msgid "add it to the wan zone of the firewall." +msgstr "" msgid "hidden" msgstr "（ステルス）" -msgid "n/a" -msgstr "利用不可" +#~ msgid "Last rundate" +#~ msgstr "最終実行日時" + +#~ msgid "" +#~ "Provides an overview of all configured uplinks for the travelmate " +#~ "interface (%s). You can edit, delete or re-order existing uplinks or scan " +#~ "for a new one. The currently used uplink is emphasized in blue." +#~ msgstr "" +#~ "Travelmate 用インターフェース（%s）に設定済みの全アップリンクの一覧です。" +#~ "既存のアップリンクの編集や削除、並べ替えを行ったり、スキャンを行って新規" +#~ "アップリンクを追加することができます。現在使用されているアップリンクは、青" +#~ "色で強調されます。" + +#~ msgid "Station ID (SSID/BSSID)" +#~ msgstr "ステーション ID (SSID / BSSID)" + +#~ msgid "Station Radio" +#~ msgstr "ステーション電波" + +#~ msgid "" +#~ "This form shows the syslog output, pre-filtered for travelmate related " +#~ "messages only." +#~ msgstr "" +#~ "このフォームには、システムログ内の Travelmate に関するメッセージのみが表示" +#~ "されます。" + +#~ msgid "Travelmate Logfile" +#~ msgstr "Travelmate ログファイル" + +#~ msgid "add it to the wan zone of the firewall.<br />" +#~ msgstr "ファイアウォールの wan ゾーンに追加します。<br />" + +#~ msgid "n/a" +#~ msgstr "利用不可" #~ msgid "Actions" #~ msgstr "操作" diff --git a/applications/luci-app-travelmate/po/pt-br/travelmate.po b/applications/luci-app-travelmate/po/pt-br/travelmate.po index 2bed677d35..2655b7ca11 100644 --- a/applications/luci-app-travelmate/po/pt-br/travelmate.po +++ b/applications/luci-app-travelmate/po/pt-br/travelmate.po @@ -12,6 +12,9 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "Language: pt_BR\n" +msgid "Action" +msgstr "" + msgid "Add Uplink" msgstr "" @@ -116,6 +119,9 @@ msgstr "" msgid "Extra options" msgstr "Opções adicionais" +msgid "Faulty Stations" +msgstr "" + msgid "Find and join network on" msgstr "" @@ -158,7 +164,10 @@ msgstr "" msgid "Interface Wizard" msgstr "" -msgid "Last rundate" +msgid "Last Run" +msgstr "" + +msgid "Loading" msgstr "" msgid "" @@ -212,7 +221,7 @@ msgstr "" msgid "" "Provides an overview of all configured uplinks for the travelmate interface " "(%s). You can edit, delete or re-order existing uplinks or scan for a new " -"one. The currently used uplink is emphasized in blue." +"one. The currently used uplink is emphasized in blue, faulty stations in red." msgstr "" msgid "QR-Codes" @@ -224,6 +233,12 @@ msgstr "" msgid "Repeat scan" msgstr "" +msgid "Restart" +msgstr "" + +msgid "Restart Travelmate" +msgstr "" + msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." msgstr "" @@ -251,19 +266,19 @@ msgstr "" msgid "Signal strength" msgstr "" -msgid "Station ID (SSID/BSSID)" +msgid "Station ID (RADIO/SSID/BSSID)" msgstr "" msgid "Station Interface" msgstr "" -msgid "Station Radio" -msgstr "" - msgid "" "The BSSID information '%s' is optional and only required for hidden networks" msgstr "" +msgid "The syslog output, pre-filtered for travelmate related messages only." +msgstr "" + msgid "" "This form allows you to modify the content of the main firewall " "configuration file (/etc/config/firewall)." @@ -284,20 +299,12 @@ msgid "" "configuration file (/etc/config/wireless)." msgstr "" -msgid "" -"This form shows the syslog output, pre-filtered for travelmate related " -"messages only." -msgstr "" - msgid "This step has only to be done once." msgstr "" msgid "Travelmate" msgstr "Travelmate" -msgid "Travelmate Logfile" -msgstr "" - msgid "Travelmate Status (Quality)" msgstr "" @@ -352,15 +359,12 @@ msgstr "" msgid "Wireless Stations" msgstr "" -msgid "add it to the wan zone of the firewall.<br />" +msgid "add it to the wan zone of the firewall." msgstr "" msgid "hidden" msgstr "" -msgid "n/a" -msgstr "" - #~ msgid "" #~ "Brief advice: Create a wwan interface, configure it to use dhcp and add " #~ "it to the wan zone in firewall. Create the wifi interfaces to be used " diff --git a/applications/luci-app-travelmate/po/ru/travelmate.po b/applications/luci-app-travelmate/po/ru/travelmate.po index d3dbd24752..b97e76dd05 100644 --- a/applications/luci-app-travelmate/po/ru/travelmate.po +++ b/applications/luci-app-travelmate/po/ru/travelmate.po @@ -15,6 +15,9 @@ msgstr "" "Project-Info: Это технический перевод, не дословный. Главное-удобный русский " "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n" +msgid "Action" +msgstr "" + msgid "Add Uplink" msgstr "Подключение к сети" @@ -121,6 +124,9 @@ msgstr "Шифрование" msgid "Extra options" msgstr "Дополнительные настройки" +msgid "Faulty Stations" +msgstr "" + msgid "Find and join network on" msgstr "Найти сеть для подключения используя" @@ -165,8 +171,11 @@ msgstr "Временная задержка интерфейса" msgid "Interface Wizard" msgstr "Помощник настройки интерфейса" -msgid "Last rundate" -msgstr "Дата последнего запуска" +msgid "Last Run" +msgstr "" + +msgid "Loading" +msgstr "" msgid "" "Minimum signal quality threshold as percent for conditional uplink (dis-) " @@ -221,12 +230,8 @@ msgstr "Путь к Приватному ключу" msgid "" "Provides an overview of all configured uplinks for the travelmate interface " "(%s). You can edit, delete or re-order existing uplinks or scan for a new " -"one. The currently used uplink is emphasized in blue." +"one. The currently used uplink is emphasized in blue, faulty stations in red." msgstr "" -"Общие сведения обо всех настроенных внешних сетевых соединениях интерфейса " -"TravelMate (%s).<br />Вы можете редактировать, удалять или пере " -"упорядочивать существующий список внешних сетей или выполнять их поиск.<br /" -">Используемое сетевое соединение выделено синим цветом." msgid "QR-Codes" msgstr "" @@ -237,6 +242,12 @@ msgstr "Выбор Wi-Fi устройства" msgid "Repeat scan" msgstr "Повторить поиск" +msgid "Restart" +msgstr "" + +msgid "Restart Travelmate" +msgstr "" + msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." msgstr "Выделить TravelMate-у конкретное Wi-Fi устройство, например 'radio0'." @@ -264,19 +275,19 @@ msgstr "" msgid "Signal strength" msgstr "Мощность сигнала" -msgid "Station ID (SSID/BSSID)" -msgstr "ID (SSID/BSSID) клиента" +msgid "Station ID (RADIO/SSID/BSSID)" +msgstr "" msgid "Station Interface" msgstr "Интерфейс клиента" -msgid "Station Radio" -msgstr "Wi-Fi устройство клиента" - msgid "" "The BSSID information '%s' is optional and only required for hidden networks" msgstr "" +msgid "The syslog output, pre-filtered for travelmate related messages only." +msgstr "" + msgid "" "This form allows you to modify the content of the main firewall " "configuration file (/etc/config/firewall)." @@ -305,22 +316,12 @@ msgstr "" "Страница настройки беспроводных соединений, изменение содержимого config " "файла wireless настройки беспроводных сетей (/etc/config/wireless)." -msgid "" -"This form shows the syslog output, pre-filtered for travelmate related " -"messages only." -msgstr "" -"Страница просмотра системного журнала, показаны только события связанные с " -"работой утилиты TravelMate." - msgid "This step has only to be done once." msgstr "" msgid "Travelmate" msgstr "TravelMate" -msgid "Travelmate Logfile" -msgstr "Системный журнал TravelMate" - msgid "Travelmate Status (Quality)" msgstr "" @@ -375,14 +376,43 @@ msgstr "Найденные точки доступа Wi-Fi" msgid "Wireless Stations" msgstr "Клиенты беспроводной сети" -msgid "add it to the wan zone of the firewall.<br />" +msgid "add it to the wan zone of the firewall." msgstr "" msgid "hidden" msgstr "скрытый" -msgid "n/a" -msgstr "нет данных" +#~ msgid "Last rundate" +#~ msgstr "Дата последнего запуска" + +#~ msgid "" +#~ "Provides an overview of all configured uplinks for the travelmate " +#~ "interface (%s). You can edit, delete or re-order existing uplinks or scan " +#~ "for a new one. The currently used uplink is emphasized in blue." +#~ msgstr "" +#~ "Общие сведения обо всех настроенных внешних сетевых соединениях " +#~ "интерфейса TravelMate (%s).<br />Вы можете редактировать, удалять или " +#~ "пере упорядочивать существующий список внешних сетей или выполнять их " +#~ "поиск.<br />Используемое сетевое соединение выделено синим цветом." + +#~ msgid "Station ID (SSID/BSSID)" +#~ msgstr "ID (SSID/BSSID) клиента" + +#~ msgid "Station Radio" +#~ msgstr "Wi-Fi устройство клиента" + +#~ msgid "" +#~ "This form shows the syslog output, pre-filtered for travelmate related " +#~ "messages only." +#~ msgstr "" +#~ "Страница просмотра системного журнала, показаны только события связанные " +#~ "с работой утилиты TravelMate." + +#~ msgid "Travelmate Logfile" +#~ msgstr "Системный журнал TravelMate" + +#~ msgid "n/a" +#~ msgstr "нет данных" #~ msgid "Actions" #~ msgstr "Действия" diff --git a/applications/luci-app-travelmate/po/templates/travelmate.pot b/applications/luci-app-travelmate/po/templates/travelmate.pot index b3e80e3c96..b8c235ff48 100644 --- a/applications/luci-app-travelmate/po/templates/travelmate.pot +++ b/applications/luci-app-travelmate/po/templates/travelmate.pot @@ -1,6 +1,9 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" +msgid "Action" +msgstr "" + msgid "Add Uplink" msgstr "" @@ -105,6 +108,9 @@ msgstr "" msgid "Extra options" msgstr "" +msgid "Faulty Stations" +msgstr "" + msgid "Find and join network on" msgstr "" @@ -147,7 +153,10 @@ msgstr "" msgid "Interface Wizard" msgstr "" -msgid "Last rundate" +msgid "Last Run" +msgstr "" + +msgid "Loading" msgstr "" msgid "" @@ -201,7 +210,7 @@ msgstr "" msgid "" "Provides an overview of all configured uplinks for the travelmate interface " "(%s). You can edit, delete or re-order existing uplinks or scan for a new " -"one. The currently used uplink is emphasized in blue." +"one. The currently used uplink is emphasized in blue, faulty stations in red." msgstr "" msgid "QR-Codes" @@ -213,6 +222,12 @@ msgstr "" msgid "Repeat scan" msgstr "" +msgid "Restart" +msgstr "" + +msgid "Restart Travelmate" +msgstr "" + msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." msgstr "" @@ -240,19 +255,19 @@ msgstr "" msgid "Signal strength" msgstr "" -msgid "Station ID (SSID/BSSID)" +msgid "Station ID (RADIO/SSID/BSSID)" msgstr "" msgid "Station Interface" msgstr "" -msgid "Station Radio" -msgstr "" - msgid "" "The BSSID information '%s' is optional and only required for hidden networks" msgstr "" +msgid "The syslog output, pre-filtered for travelmate related messages only." +msgstr "" + msgid "" "This form allows you to modify the content of the main firewall " "configuration file (/etc/config/firewall)." @@ -273,20 +288,12 @@ msgid "" "configuration file (/etc/config/wireless)." msgstr "" -msgid "" -"This form shows the syslog output, pre-filtered for travelmate related " -"messages only." -msgstr "" - msgid "This step has only to be done once." msgstr "" msgid "Travelmate" msgstr "" -msgid "Travelmate Logfile" -msgstr "" - msgid "Travelmate Status (Quality)" msgstr "" @@ -341,11 +348,8 @@ msgstr "" msgid "Wireless Stations" msgstr "" -msgid "add it to the wan zone of the firewall.<br />" +msgid "add it to the wan zone of the firewall." msgstr "" msgid "hidden" msgstr "" - -msgid "n/a" -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 8170f3d2be..df2164f8a6 100644 --- a/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua +++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua @@ -250,7 +250,7 @@ if (valman == "0") then qrs:depends("query_minimize", true) eds = s1:taboption("resource", Value, "edns_size", - translate("EDNS Size:"), + translate("EDNS Size"), translate("Limit extended DNS packet size")) eds.datatype = "and(uinteger,min(512),max(4096))" eds.placeholder = "1280" diff --git a/modules/luci-base/luasrc/view/cbi/value.htm b/modules/luci-base/luasrc/view/cbi/value.htm index 24fb428e65..8eec865348 100644 --- a/modules/luci-base/luasrc/view/cbi/value.htm +++ b/modules/luci-base/luasrc/view/cbi/value.htm @@ -1,6 +1,6 @@ <%+cbi/valueheader%> <%- if self.password then -%> - <input type="password" style="position:absolute; left:-1000px" aria-hidden="true"<%= + <input type="password" style="position:absolute; left:-1000px" aria-hidden="true" tabindex="-1"<%= attr("name", "password." .. cbid) %> /> <%- end -%> diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index 6fd182693f..603c77834f 100644 --- a/modules/luci-base/po/ca/base.po +++ b/modules/luci-base/po/ca/base.po @@ -596,6 +596,12 @@ msgstr "Cancel·la" msgid "Category" msgstr "" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "Cadena" @@ -698,8 +704,8 @@ msgstr "Configuració" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." -msgstr "Es mantindran els fitxers de configuració." +msgid "Configuration files will be kept" +msgstr "" msgid "Configuration has been applied." msgstr "" @@ -1308,6 +1314,9 @@ msgstr "Força el TKIP i el CCMP (AES)" msgid "Force link" msgstr "" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1471,6 +1480,9 @@ msgstr "" msgid "IP Addresses" msgstr "" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "Adreça IP" @@ -1516,6 +1528,9 @@ msgstr "" msgid "IPv4 prefix length" msgstr "Longitud de prefix IPv4" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "Adreça IPv4" @@ -2048,6 +2063,9 @@ msgstr "Mode" msgid "Model" msgstr "" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "Dispositiu mòdem" @@ -2232,9 +2250,6 @@ msgstr "No associat" msgid "Not connected" msgstr "No connectat" -msgid "Note: Configuration files will be erased." -msgstr "Nota: Els fitxers de configuració s'esborraran." - msgid "Note: interface name length" msgstr "" @@ -2930,6 +2945,12 @@ msgid "See \"mount\" manpage for details" msgstr "" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" @@ -3982,6 +4003,12 @@ msgstr "sí" msgid "« Back" msgstr "« Enrere" +#~ msgid "Configuration files will be kept." +#~ msgstr "Es mantindran els fitxers de configuració." + +#~ msgid "Note: Configuration files will be erased." +#~ msgstr "Nota: Els fitxers de configuració s'esborraran." + #~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" #~ msgstr "<abbr title='Parella: %s / Grup: %s'>%s - %s</abbr>" diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po index 6182378a74..b5947dbcf8 100644 --- a/modules/luci-base/po/cs/base.po +++ b/modules/luci-base/po/cs/base.po @@ -589,6 +589,12 @@ msgstr "Storno" msgid "Category" msgstr "" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "Řetěz" @@ -692,8 +698,8 @@ msgstr "Nastavení" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." -msgstr "Konfigurační soubory budou zachovány." +msgid "Configuration files will be kept" +msgstr "" msgid "Configuration has been applied." msgstr "" @@ -1310,6 +1316,9 @@ msgstr "Vynutit TKIP a CCMP (AES)" msgid "Force link" msgstr "" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1470,6 +1479,9 @@ msgstr "" msgid "IP Addresses" msgstr "" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "IP adresy" @@ -1515,6 +1527,9 @@ msgstr "" msgid "IPv4 prefix length" msgstr "Délka IPv4 prefixu" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "IPv4 adresa" @@ -2056,6 +2071,9 @@ msgstr "Mód" msgid "Model" msgstr "" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "Modemové zařízení" @@ -2240,9 +2258,6 @@ msgstr "Neasociováno" msgid "Not connected" msgstr "Nepřipojeno" -msgid "Note: Configuration files will be erased." -msgstr "Pozn: Konfigurační soubory budou vymazány." - msgid "Note: interface name length" msgstr "" @@ -2944,6 +2959,12 @@ msgid "See \"mount\" manpage for details" msgstr "Podrobnosti viz manuálová stránka příkazu \"mount\"" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" @@ -4012,6 +4033,12 @@ msgstr "ano" msgid "« Back" msgstr "« Zpět" +#~ msgid "Configuration files will be kept." +#~ msgstr "Konfigurační soubory budou zachovány." + +#~ msgid "Note: Configuration files will be erased." +#~ msgstr "Pozn: Konfigurační soubory budou vymazány." + #~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" #~ msgstr "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index a70a2e9855..e7f8826df8 100644 --- a/modules/luci-base/po/de/base.po +++ b/modules/luci-base/po/de/base.po @@ -609,6 +609,12 @@ msgstr "Abbrechen" msgid "Category" msgstr "Kategorie" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "Kette" @@ -720,8 +726,8 @@ msgstr "Konfiguration" msgid "Configuration failed" msgstr "Konfiguration fehlgeschlagen" -msgid "Configuration files will be kept." -msgstr "Konfigurationsdateien sichern" +msgid "Configuration files will be kept" +msgstr "" msgid "Configuration has been applied." msgstr "Die Konfiguration wurde angewendet." @@ -1360,6 +1366,9 @@ msgstr "Erzwinge TKIP und CCMP (AES)" msgid "Force link" msgstr "Erzwinge Verbindung" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "Benutzung von NAT-T erzwingen" @@ -1523,6 +1532,9 @@ msgstr "" msgid "IP Addresses" msgstr "IP-Adressen" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "IP-Adresse" @@ -1568,6 +1580,9 @@ msgstr "IPv4 Bereich" msgid "IPv4 prefix length" msgstr "Länge des IPv4 Präfix" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "IPv4-Adresse" @@ -2136,6 +2151,9 @@ msgstr "Modus" msgid "Model" msgstr "Modell" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "Modemgerät" @@ -2321,9 +2339,6 @@ msgstr "Nicht assoziiert" msgid "Not connected" msgstr "Nicht verbunden" -msgid "Note: Configuration files will be erased." -msgstr "Warnung: Konfigurationsdateien werden gelöscht." - msgid "Note: interface name length" msgstr "Hinweis: Länge des Namens beachten" @@ -3058,6 +3073,12 @@ msgid "See \"mount\" manpage for details" msgstr "Siehe \"mount\" Handbuch für Details" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" @@ -4180,6 +4201,12 @@ msgstr "ja" msgid "« Back" msgstr "« Zurück" +#~ msgid "Configuration files will be kept." +#~ msgstr "Konfigurationsdateien sichern" + +#~ msgid "Note: Configuration files will be erased." +#~ msgstr "Warnung: Konfigurationsdateien werden gelöscht." + #~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" #~ msgstr "<abbr title='Paarweise: %s / Gruppe: %s'>%s - %s</abbr>" diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po index 03055bcca9..839e5ff83d 100644 --- a/modules/luci-base/po/el/base.po +++ b/modules/luci-base/po/el/base.po @@ -598,6 +598,12 @@ msgstr "Ακύρωση" msgid "Category" msgstr "" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "Αλυσίδα" @@ -701,8 +707,8 @@ msgstr "Παραμετροποίηση" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." -msgstr "Τα αρχεία παραμετροποίησης θα διατηρηθούν." +msgid "Configuration files will be kept" +msgstr "" msgid "Configuration has been applied." msgstr "" @@ -1324,6 +1330,9 @@ msgstr "Επιβολή TKIP και CCMP (AES)" msgid "Force link" msgstr "" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1483,6 +1492,9 @@ msgstr "" msgid "IP Addresses" msgstr "" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "Διεύθυνση IP" @@ -1528,6 +1540,9 @@ msgstr "" msgid "IPv4 prefix length" msgstr "" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "IPv4-Διεύθυνση" @@ -2063,6 +2078,9 @@ msgstr "Λειτουργία" msgid "Model" msgstr "" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "Συσκευή Modem" @@ -2248,9 +2266,6 @@ msgstr "" msgid "Not connected" msgstr "" -msgid "Note: Configuration files will be erased." -msgstr "Σημείωση: Τα αρχεία παραμετροποίησης θα διαγραφούν." - msgid "Note: interface name length" msgstr "" @@ -2948,6 +2963,12 @@ msgid "See \"mount\" manpage for details" msgstr "Δείτε το manpage του \"mount\" για λεπτομέρειες" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" @@ -3977,6 +3998,12 @@ msgstr "ναι" msgid "« Back" msgstr "« Πίσω" +#~ msgid "Configuration files will be kept." +#~ msgstr "Τα αρχεία παραμετροποίησης θα διατηρηθούν." + +#~ msgid "Note: Configuration files will be erased." +#~ msgstr "Σημείωση: Τα αρχεία παραμετροποίησης θα διαγραφούν." + #~ msgid "Activate this network" #~ msgstr "Ενεργοποίηση αυτού του δικτύου" diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po index f9f8f07978..603d39275d 100644 --- a/modules/luci-base/po/en/base.po +++ b/modules/luci-base/po/en/base.po @@ -587,6 +587,12 @@ msgstr "Cancel" msgid "Category" msgstr "" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "Chain" @@ -689,8 +695,8 @@ msgstr "Configuration" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." -msgstr "Configuration files will be kept." +msgid "Configuration files will be kept" +msgstr "" msgid "Configuration has been applied." msgstr "" @@ -1300,6 +1306,9 @@ msgstr "" msgid "Force link" msgstr "" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1458,6 +1467,9 @@ msgstr "" msgid "IP Addresses" msgstr "" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "IP address" @@ -1503,6 +1515,9 @@ msgstr "" msgid "IPv4 prefix length" msgstr "" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "" @@ -2032,6 +2047,9 @@ msgstr "Mode" msgid "Model" msgstr "" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "Modem device" @@ -2216,9 +2234,6 @@ msgstr "" msgid "Not connected" msgstr "" -msgid "Note: Configuration files will be erased." -msgstr "" - msgid "Note: interface name length" msgstr "" @@ -2914,6 +2929,12 @@ msgid "See \"mount\" manpage for details" msgstr "" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" @@ -3934,6 +3955,9 @@ msgstr "" msgid "« Back" msgstr "« Back" +#~ msgid "Configuration files will be kept." +#~ msgstr "Configuration files will be kept." + #~ msgid "Activate this network" #~ msgstr "Activate this network" diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index 5ae04552be..67415460c7 100644 --- a/modules/luci-base/po/es/base.po +++ b/modules/luci-base/po/es/base.po @@ -594,6 +594,12 @@ msgstr "Cancelar" msgid "Category" msgstr "" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "Cadena" @@ -698,8 +704,8 @@ msgstr "Configuración" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." -msgstr "Se mantendrán los ficheros de configuración." +msgid "Configuration files will be kept" +msgstr "" msgid "Configuration has been applied." msgstr "" @@ -1318,6 +1324,9 @@ msgstr "Forzar TKIP y CCMP (AES)" msgid "Force link" msgstr "" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1480,6 +1489,9 @@ msgstr "" msgid "IP Addresses" msgstr "" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "Dirección IP" @@ -1525,6 +1537,9 @@ msgstr "" msgid "IPv4 prefix length" msgstr "Longitud de prefijo IPv4" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "Dirección IPv4" @@ -2071,6 +2086,9 @@ msgstr "Modo" msgid "Model" msgstr "" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "Dispositivo de módem" @@ -2255,9 +2273,6 @@ msgstr "No asociado" msgid "Not connected" msgstr "No conectado" -msgid "Note: Configuration files will be erased." -msgstr "Nota: se borrarán los ficheros de configuración." - msgid "Note: interface name length" msgstr "" @@ -2959,6 +2974,12 @@ msgid "See \"mount\" manpage for details" msgstr "Vea la página del manual de \"mount\" para detalles" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" @@ -4041,6 +4062,12 @@ msgstr "sí" msgid "« Back" msgstr "« Volver" +#~ msgid "Configuration files will be kept." +#~ msgstr "Se mantendrán los ficheros de configuración." + +#~ msgid "Note: Configuration files will be erased." +#~ msgstr "Nota: se borrarán los ficheros de configuración." + #~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" #~ msgstr "<abbr title='Pairwise: %s / Grupo: %s'>%s - %s</abbr>" diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po index f0a593deaf..204c5e88c6 100644 --- a/modules/luci-base/po/fr/base.po +++ b/modules/luci-base/po/fr/base.po @@ -599,6 +599,12 @@ msgstr "Annuler" msgid "Category" msgstr "" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "Chaîne" @@ -704,8 +710,8 @@ msgstr "Configuration" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." -msgstr "Les fichiers de configuration seront préservés." +msgid "Configuration files will be kept" +msgstr "" msgid "Configuration has been applied." msgstr "" @@ -1329,6 +1335,9 @@ msgstr "Forcer TKIP et CCMP (AES)" msgid "Force link" msgstr "" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1491,6 +1500,9 @@ msgstr "" msgid "IP Addresses" msgstr "" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "Adresse IP" @@ -1536,6 +1548,9 @@ msgstr "" msgid "IPv4 prefix length" msgstr "longueur du préfixe IPv4" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "Adresse IPv4" @@ -2084,6 +2099,9 @@ msgstr "Mode" msgid "Model" msgstr "" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "Interface Modem" @@ -2268,9 +2286,6 @@ msgstr "Pas associé" msgid "Not connected" msgstr "Non connecté" -msgid "Note: Configuration files will be erased." -msgstr "Note : les fichiers de configuration seront effacés." - msgid "Note: interface name length" msgstr "" @@ -2971,6 +2986,12 @@ msgid "See \"mount\" manpage for details" msgstr "Voir le manuel de « mount » pour les détails" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" @@ -4058,6 +4079,12 @@ msgstr "oui" msgid "« Back" msgstr "« Retour" +#~ msgid "Configuration files will be kept." +#~ msgstr "Les fichiers de configuration seront préservés." + +#~ msgid "Note: Configuration files will be erased." +#~ msgstr "Note : les fichiers de configuration seront effacés." + #~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" #~ msgstr "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po index cc92f5259d..73a4622814 100644 --- a/modules/luci-base/po/he/base.po +++ b/modules/luci-base/po/he/base.po @@ -589,6 +589,12 @@ msgstr "בטל" msgid "Category" msgstr "" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "שרשרת" @@ -683,8 +689,8 @@ msgstr "הגדרות" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." -msgstr "קבצי ההגדרות ישמרו." +msgid "Configuration files will be kept" +msgstr "" msgid "Configuration has been applied." msgstr "" @@ -1286,6 +1292,9 @@ msgstr "" msgid "Force link" msgstr "" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1442,6 +1451,9 @@ msgstr "" msgid "IP Addresses" msgstr "" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "" @@ -1487,6 +1499,9 @@ msgstr "" msgid "IPv4 prefix length" msgstr "" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "" @@ -2008,6 +2023,9 @@ msgstr "" msgid "Model" msgstr "" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "" @@ -2190,9 +2208,6 @@ msgstr "" msgid "Not connected" msgstr "לא מחובר" -msgid "Note: Configuration files will be erased." -msgstr "" - msgid "Note: interface name length" msgstr "" @@ -2878,6 +2893,12 @@ msgid "See \"mount\" manpage for details" msgstr "" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" @@ -3880,6 +3901,9 @@ msgstr "כן" msgid "« Back" msgstr "<< אחורה" +#~ msgid "Configuration files will be kept." +#~ msgstr "קבצי ההגדרות ישמרו." + #~ msgid "Activate this network" #~ msgstr "הפעל רשת זו" diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po index b391113314..47a0197c94 100644 --- a/modules/luci-base/po/hu/base.po +++ b/modules/luci-base/po/hu/base.po @@ -593,6 +593,12 @@ msgstr "Mégsem" msgid "Category" msgstr "" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "Lánc" @@ -699,8 +705,8 @@ msgstr "Beállítás" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." -msgstr "A konfigurációs fájlok megmaradnak." +msgid "Configuration files will be kept" +msgstr "" msgid "Configuration has been applied." msgstr "" @@ -1320,6 +1326,9 @@ msgstr "TKIP és CCMP (AES) kényszerítése" msgid "Force link" msgstr "" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1480,6 +1489,9 @@ msgstr "" msgid "IP Addresses" msgstr "" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "IP cím" @@ -1525,6 +1537,9 @@ msgstr "" msgid "IPv4 prefix length" msgstr "IPv4 prefix hossza" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "IPv4-cím" @@ -2073,6 +2088,9 @@ msgstr "Mód" msgid "Model" msgstr "" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "Modemeszköz" @@ -2257,9 +2275,6 @@ msgstr "Nincs hozzárendelve" msgid "Not connected" msgstr "Nincs kapcsolódva" -msgid "Note: Configuration files will be erased." -msgstr "Megjegyzés: konfigurációs fájlok törölve lesznek." - msgid "Note: interface name length" msgstr "" @@ -2962,6 +2977,12 @@ msgid "See \"mount\" manpage for details" msgstr "Részletekért lásd a 'mount' man oldalát" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" @@ -4047,6 +4068,12 @@ msgstr "igen" msgid "« Back" msgstr "« Vissza" +#~ msgid "Configuration files will be kept." +#~ msgstr "A konfigurációs fájlok megmaradnak." + +#~ msgid "Note: Configuration files will be erased." +#~ msgstr "Megjegyzés: konfigurációs fájlok törölve lesznek." + #~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" #~ msgstr "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po index 24efdff558..83fb6054b3 100644 --- a/modules/luci-base/po/it/base.po +++ b/modules/luci-base/po/it/base.po @@ -601,6 +601,12 @@ msgstr "Annulla" msgid "Category" msgstr "Categoria" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "Catena" @@ -705,8 +711,8 @@ msgstr "Configurazione" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." -msgstr "I file di configurazione verranno mantenuti." +msgid "Configuration files will be kept" +msgstr "" msgid "Configuration has been applied." msgstr "" @@ -1323,6 +1329,9 @@ msgstr "Forza TKIP e CCMP (AES)" msgid "Force link" msgstr "Forza collegamento" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "Forza uso del NAT-T" @@ -1486,6 +1495,9 @@ msgstr "" msgid "IP Addresses" msgstr "Indirizzi IP" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "Indirizzo IP" @@ -1531,6 +1543,9 @@ msgstr "Prefisso IPv4" msgid "IPv4 prefix length" msgstr "Lunghezza prefisso IPv4" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "Indirizzo-IPv4" @@ -2074,6 +2089,9 @@ msgstr "Modalità" msgid "Model" msgstr "Modello" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "Dispositivo modem" @@ -2258,9 +2276,6 @@ msgstr "Non associato" msgid "Not connected" msgstr "Non connesso" -msgid "Note: Configuration files will be erased." -msgstr "Nota: i files di Configurazione saranno eliminati" - msgid "Note: interface name length" msgstr "Nota: lunghezza nome interfaccia" @@ -2960,6 +2975,12 @@ msgid "See \"mount\" manpage for details" msgstr "Vedi \"mount\" manpage per dettagli" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" @@ -4017,6 +4038,12 @@ msgstr "Sì" msgid "« Back" msgstr "« Indietro" +#~ msgid "Configuration files will be kept." +#~ msgstr "I file di configurazione verranno mantenuti." + +#~ msgid "Note: Configuration files will be erased." +#~ msgstr "Nota: i files di Configurazione saranno eliminati" + #~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" #~ msgstr "<abbr title='Accoppiata: %s / Gruppo: %s'>%s - %s</abbr>" diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index 003b22893e..b0d74f97ce 100644 --- a/modules/luci-base/po/ja/base.po +++ b/modules/luci-base/po/ja/base.po @@ -3,14 +3,14 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-06-10 03:40+0200\n" -"PO-Revision-Date: 2018-07-20 15:27+0900\n" +"PO-Revision-Date: 2018-09-01 03:29+0900\n" "Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.0.8\n" +"X-Generator: Poedit 2.1.1\n" "Language-Team: \n" msgid "%.1f dB" @@ -273,10 +273,10 @@ msgid "Alert" msgstr "警告" msgid "Alias Interface" -msgstr "" +msgstr "エイリアス インターフェース" msgid "Alias of \"%s\"" -msgstr "" +msgstr "\"%s\" のエイリアス" msgid "All Servers" msgstr "全てのサーバー" @@ -598,6 +598,12 @@ msgstr "キャンセル" msgid "Category" msgstr "カテゴリー" +msgid "Caution: Configuration files will be erased" +msgstr "注意: 設定ファイルは消去されます" + +msgid "Caution: System upgrade will be forced" +msgstr "注意: システムは強制的にアップグレードされます" + msgid "Chain" msgstr "チェイン" @@ -707,10 +713,10 @@ msgid "Configuration" msgstr "設定" msgid "Configuration failed" -msgstr "" +msgstr "設定が失敗しました" -msgid "Configuration files will be kept." -msgstr "設定ファイルは保持されます。" +msgid "Configuration files will be kept" +msgstr "設定ファイルは保持されます" msgid "Configuration has been applied." msgstr "設定が適用されました。" @@ -1342,6 +1348,9 @@ msgstr "TKIP 及びCCMP (AES) を使用" msgid "Force link" msgstr "強制リンク" +msgid "Force upgrade" +msgstr "強制アップグレード" + msgid "Force use of NAT-T" msgstr "NAT-Tの強制使用" @@ -1502,6 +1511,9 @@ msgstr "IKE DHグループ" msgid "IP Addresses" msgstr "IPアドレス" +msgid "IP Protocol" +msgstr "IP プロトコル" + msgid "IP address" msgstr "IPアドレス" @@ -1547,6 +1559,9 @@ msgstr "IPv4 プレフィクス" msgid "IPv4 prefix length" msgstr "IPv4 プレフィクス長" +msgid "IPv4+IPv6" +msgstr "IPv4+IPv6" + msgid "IPv4-Address" msgstr "IPv4-アドレス" @@ -1672,6 +1687,8 @@ msgid "" "In order to prevent unauthorized access to the system, your request has been " "blocked. Click \"Continue »\" below to return to the previous page." msgstr "" +"システムへの未認証のアクセスを防ぐために、リクエストはブロックされました。以" +"下の \"続行\" をクリックして、前のページに戻ります。" msgid "Inactivity timeout" msgstr "未使用時タイムアウト" @@ -1966,6 +1983,8 @@ msgid "" "Localise hostname depending on the requesting subnet if multiple IPs are " "available" msgstr "" +"複数の IP が利用可能な場合に、ホスト名をリクエスト中のサブネットによってロー" +"カライズします" msgid "Localise queries" msgstr "ローカライズクエリ" @@ -1996,7 +2015,7 @@ msgstr "" "ネットワークアドレスをオフセットとして、最小のアドレスを設定してください" msgid "MAC" -msgstr "" +msgstr "MAC" msgid "MAC-Address" msgstr "MAC-アドレス" @@ -2060,7 +2079,7 @@ msgstr "" "6in4-, pppoe- など）と合わせて最大15文字です。" msgid "Maximum number of leased addresses." -msgstr "リースするアドレスの最大数です" +msgstr "リースされるアドレスの最大数です。" msgid "Mbit/s" msgstr "Mbit/s" @@ -2095,6 +2114,9 @@ msgstr "モード" msgid "Model" msgstr "モデル" +msgid "Modem default" +msgstr "モデム デフォルト" + msgid "Modem device" msgstr "モデム デバイス" @@ -2279,9 +2301,6 @@ msgstr "アソシエーションされていません" msgid "Not connected" msgstr "未接続" -msgid "Note: Configuration files will be erased." -msgstr "注意: 設定ファイルは消去されます。" - msgid "Note: interface name length" msgstr "注意: インターフェース名の長さ" @@ -2345,7 +2364,7 @@ msgid "One or more required fields have no value!" msgstr "1つ以上のフィールドに値が設定されていません！" msgid "Open list..." -msgstr "リストを開く" +msgstr "リストを開く..." msgid "OpenConnect (CISCO AnyConnect)" msgstr "OpenConnect (CISCO AnyConnect)" @@ -2503,7 +2522,7 @@ msgid "PTM/EFM (Packet Transfer Mode)" msgstr "" msgid "Package libiwinfo required!" -msgstr "libiwinfo パッケージをインストールしてください！" +msgstr "libiwinfo パッケージが必要です！" msgid "Package lists are older than 24 hours" msgstr "パッケージ リストは24時間以上前のものです" @@ -2530,7 +2549,7 @@ msgid "Password of inner Private Key" msgstr "秘密鍵のパスワード" msgid "Password successfully changed!" -msgstr "パスワードを変更しました" +msgstr "パスワードを変更しました！" msgid "Password2" msgstr "パスワード2" @@ -2738,9 +2757,8 @@ msgid "" "access to this device if you are connected via this interface" msgstr "" "本当にこのインターフェースを削除しますか？一度削除すると、元に戻すことはでき" -"ません！\n" -"もしこのインターフェースを経由して接続している場合、このデバイスにアクセスで" -"きなくなる場合があります" +"ません！もしこのインターフェースを経由して接続している場合、このデバイスにア" +"クセスできなくなる場合があります" msgid "" "Really delete this wireless network? The deletion cannot be undone! You " @@ -2999,6 +3017,15 @@ msgid "See \"mount\" manpage for details" msgstr "詳細情報は \"mount\" のmanページを参照してください" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" @@ -3305,6 +3332,8 @@ msgstr "" msgid "" "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>" msgstr "" +"プロバイダに割り当てられる IPv6 プレフィクスです。通常、 <code>::</code> で終" +"わります。" msgid "" "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</" @@ -4083,52 +4112,3 @@ msgstr "はい" msgid "« Back" msgstr "« 戻る" - -#~ msgid "Activate this network" -#~ msgstr "このネットワークを有効にする" - -#~ msgid "Hermes 802.11b Wireless Controller" -#~ msgstr "Hermes 802.11b 無線LANコントローラ" - -#~ msgid "Interface is shutting down..." -#~ msgstr "インターフェース終了中..." - -#~ msgid "Interface reconnected" -#~ msgstr "インターフェースの再接続" - -#~ msgid "Interface shut down" -#~ msgstr "インターフェースの終了" - -#~ msgid "Prism2/2.5/3 802.11b Wireless Controller" -#~ msgstr "Prism2/2.5/3 802.11b 無線LANコントローラ" - -#~ msgid "RaLink 802.11%s Wireless Controller" -#~ msgstr "RaLink 802.11%s 無線LANコントローラ" - -#~ msgid "" -#~ "Really shut down network? You might lose access to this device if you are " -#~ "connected via this interface" -#~ msgstr "" -#~ "本当にネットワークを停止しますか？\n" -#~ "このネットワークを経由して接続している場合、デバイスにアクセスできなくなる" -#~ "場合があります" - -#~ msgid "" -#~ "Really shutdown interface \"%s\"? You might lose access to this device if " -#~ "you are connected via this interface." -#~ msgstr "" -#~ "本当にインターフェース \"%s\" を停止しますか?\n" -#~ "このインターフェースを経由して接続している場合、デバイスにアクセスできなく" -#~ "なる場合があります。" - -#~ msgid "Reconnecting interface" -#~ msgstr "インターフェース再接続中" - -#~ msgid "Shutdown this network" -#~ msgstr "ネットワークを終了" - -#~ msgid "Wireless restarted" -#~ msgstr "無線LAN機能の再起動" - -#~ msgid "Wireless shut down" -#~ msgstr "無線LAN機能停止" diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po index 2b709110b3..92a36e67f2 100644 --- a/modules/luci-base/po/ko/base.po +++ b/modules/luci-base/po/ko/base.po @@ -583,6 +583,12 @@ msgstr "" msgid "Category" msgstr "" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "" @@ -685,7 +691,7 @@ msgstr "설정" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." +msgid "Configuration files will be kept" msgstr "" msgid "Configuration has been applied." @@ -1298,6 +1304,9 @@ msgstr "" msgid "Force link" msgstr "" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1457,6 +1466,9 @@ msgstr "" msgid "IP Addresses" msgstr "" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "IP 주소" @@ -1502,6 +1514,9 @@ msgstr "" msgid "IPv4 prefix length" msgstr "" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "IPv4-주소" @@ -2025,6 +2040,9 @@ msgstr "" msgid "Model" msgstr "모델" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "" @@ -2207,9 +2225,6 @@ msgstr "" msgid "Not connected" msgstr "연결되지 않음" -msgid "Note: Configuration files will be erased." -msgstr "" - msgid "Note: interface name length" msgstr "" @@ -2907,6 +2922,12 @@ msgid "See \"mount\" manpage for details" msgstr "" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index d4cdece558..b17c961bda 100644 --- a/modules/luci-base/po/ms/base.po +++ b/modules/luci-base/po/ms/base.po @@ -573,6 +573,12 @@ msgstr "Batal" msgid "Category" msgstr "" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "Rantai" @@ -668,7 +674,7 @@ msgstr "Konfigurasi" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." +msgid "Configuration files will be kept" msgstr "" msgid "Configuration has been applied." @@ -1271,6 +1277,9 @@ msgstr "" msgid "Force link" msgstr "" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1429,6 +1438,9 @@ msgstr "" msgid "IP Addresses" msgstr "" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "Alamat IP" @@ -1474,6 +1486,9 @@ msgstr "" msgid "IPv4 prefix length" msgstr "" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "" @@ -2004,6 +2019,9 @@ msgstr "Mode" msgid "Model" msgstr "" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "Alat modem" @@ -2188,9 +2206,6 @@ msgstr "" msgid "Not connected" msgstr "" -msgid "Note: Configuration files will be erased." -msgstr "" - msgid "Note: interface name length" msgstr "" @@ -2884,6 +2899,12 @@ msgid "See \"mount\" manpage for details" msgstr "Rujuk \"mount\" laman manual untuk detail" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po index 3e6dbea726..d7e128a8b9 100644 --- a/modules/luci-base/po/no/base.po +++ b/modules/luci-base/po/no/base.po @@ -585,6 +585,12 @@ msgstr "Avbryt" msgid "Category" msgstr "" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "Lenke" @@ -689,8 +695,8 @@ msgstr "Konfigurasjon" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." -msgstr "Konfigurasjonsfiler vil bli bevart." +msgid "Configuration files will be kept" +msgstr "" msgid "Configuration has been applied." msgstr "" @@ -1307,6 +1313,9 @@ msgstr "Bruk TKIP og CCMP (AES)" msgid "Force link" msgstr "" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1467,6 +1476,9 @@ msgstr "" msgid "IP Addresses" msgstr "" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "IP adresse" @@ -1512,6 +1524,9 @@ msgstr "" msgid "IPv4 prefix length" msgstr "IPv4 prefikslengde" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "IPv4-Adresse" @@ -2048,6 +2063,9 @@ msgstr "Modus" msgid "Model" msgstr "" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "Modem" @@ -2232,9 +2250,6 @@ msgstr "Ikke tilknyttet" msgid "Not connected" msgstr "Ikke tilkoblet" -msgid "Note: Configuration files will be erased." -msgstr "Merk: Konfigurasjonsfiler vil bli slettet" - msgid "Note: interface name length" msgstr "" @@ -2936,6 +2951,12 @@ msgid "See \"mount\" manpage for details" msgstr "Se \"mount\" manpage for detaljer" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" @@ -4013,6 +4034,12 @@ msgstr "ja" msgid "« Back" msgstr "« Tilbake" +#~ msgid "Configuration files will be kept." +#~ msgstr "Konfigurasjonsfiler vil bli bevart." + +#~ msgid "Note: Configuration files will be erased." +#~ msgstr "Merk: Konfigurasjonsfiler vil bli slettet" + #~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" #~ msgstr "<abbr title='Parvis: %s / Gruppe: %s'>%s - %s</abbr>" diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index dcd8af8d57..5295b3d90a 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" @@ -592,8 +592,8 @@ msgid "" "Build/distribution specific feed definitions. This file will NOT be " "preserved in any sysupgrade." msgstr "" -"Kompiluj/rozpowszechniaj określone definicje źródeł. Ten plik NIE " -"zostanie zachowany w procesie sysupgrade" +"Kompiluj/rozpowszechniaj określone definicje źródeł. Ten plik NIE zostanie " +"zachowany w procesie sysupgrade" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" @@ -610,6 +610,12 @@ msgstr "Anuluj" msgid "Category" msgstr "" +msgid "Caution: Configuration files will be erased" +msgstr "Uwaga: Pliki konfiguracyjne zostaną usunięte" + +msgid "Caution: System upgrade will be forced" +msgstr "Uwaga: Zostanie wymuszone uaktualnienie systemu" + msgid "Chain" msgstr "Łańcuch" @@ -719,8 +725,8 @@ msgstr "Konfiguracja" msgid "Configuration failed" msgstr "Konfiguracja nieudana" -msgid "Configuration files will be kept." -msgstr "Pliki konfiguracyjne zostaną zachowane." +msgid "Configuration files will be kept" +msgstr "Pliki konfiguracyjne zostaną zachowane" msgid "Configuration has been applied." msgstr "Konfiguracja została zastosowana." @@ -790,8 +796,8 @@ msgid "" "Custom feed definitions, e.g. private feeds. This file can be preserved in a " "sysupgrade." msgstr "" -"Niestandardowe definicje plików danych, np. prywatne źródła. Ten plik może być " -"zachowany podczas sysupgrade. " +"Niestandardowe definicje plików danych, np. prywatne źródła. Ten plik może " +"być zachowany podczas sysupgrade. " msgid "Custom feeds" msgstr "Niestandardowe źródła" @@ -997,10 +1003,10 @@ msgid "" "Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> " "firewalls" msgstr "" -"Dnsmasq jest kombajnem serwera <abbr title=\"Dynamic Host Configuration Protocol" -"\">DHCP</abbr> połączonym z serwerem <abbr title=\"Domain Name System\">DNS</" -"abbr>. Jest to serwer przekazujący (Fowarder) dla firewalli <abbr title=" -"\"Network Address Translation\">NAT</abbr>" +"Dnsmasq jest kombajnem serwera <abbr title=\"Dynamic Host Configuration " +"Protocol\">DHCP</abbr> połączonym z serwerem <abbr title=\"Domain Name System" +"\">DNS</abbr>. Jest to serwer przekazujący (Fowarder) dla firewalli <abbr " +"title=\"Network Address Translation\">NAT</abbr>" msgid "Do not cache negative replies, e.g. for not existing domains" msgstr "Nie cache`uj odpowiedzi negatywnych, np. nie dla bieżących domen" @@ -1351,6 +1357,9 @@ msgstr "Wymuś TKIP i CCMP (AES)" msgid "Force link" msgstr "Wymuś połączenie" +msgid "Force upgrade" +msgstr "Wymuś uaktualnienie" + msgid "Force use of NAT-T" msgstr "" @@ -1516,6 +1525,9 @@ msgstr "" msgid "IP Addresses" msgstr "" +msgid "IP Protocol" +msgstr "Protokół IP" + msgid "IP address" msgstr "Adres IP" @@ -1561,6 +1573,9 @@ msgstr "" msgid "IPv4 prefix length" msgstr "Długość prefiksu IPv4" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "Adres IPv4" @@ -2108,8 +2123,11 @@ msgstr "Tryb" msgid "Model" msgstr "Model" +msgid "Modem default" +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ę" @@ -2292,9 +2310,6 @@ msgstr "Nie powiązany" msgid "Not connected" msgstr "Nie podłączony" -msgid "Note: Configuration files will be erased." -msgstr "Uwaga: Pliki konfiguracyjne zostaną usunięte." - msgid "Note: interface name length" msgstr "" @@ -2620,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 "" @@ -2696,7 +2711,8 @@ msgid "" "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> " "servers" msgstr "" -"Zapytaj o wszystkie dostępne serwery <abbr title=\"Domain Name System\">DNS</abbr> " +"Zapytaj o wszystkie dostępne serwery <abbr title=\"Domain Name System\">DNS</" +"abbr> " msgid "R0 Key Lifetime" msgstr "" @@ -2913,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" @@ -3008,11 +3024,20 @@ msgid "See \"mount\" manpage for details" msgstr "Aby poznać szczegóły przeczytaj stronę instrukcji \"mount\"" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" -"Wysyłaj żądania echa LCP w określonym przedziale czasowym, " -"efektywne tylko wtedy gdy jest ustawiony próg błedu LCP" +"Wysyłaj żądania echa LCP w określonym przedziale czasowym, efektywne tylko " +"wtedy gdy jest ustawiony próg błedu LCP" msgid "Separate Clients" msgstr "Rozdziel klientów" @@ -3077,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" @@ -3369,9 +3394,9 @@ msgid "" "compare them with the original file to ensure data integrity.<br /> Click " "\"Proceed\" below to start the flash procedure." msgstr "" -"Obraz flash został przesłany. Poniżej znajduje się suma kontrolna i " -"rozmiar pliku, porównaj je z orginałem aby zapewnić integralność " -"danych.<br /> Wciśnij \"Wykonaj\" aby kontynuować aktualizację." +"Obraz flash został przesłany. Poniżej znajduje się suma kontrolna i rozmiar " +"pliku, porównaj je z orginałem aby zapewnić integralność danych.<br /> " +"Wciśnij \"Wykonaj\" aby kontynuować aktualizację." msgid "The following changes have been reverted" msgstr "Następujące zmiany zostały odrzucone" @@ -4108,6 +4133,12 @@ msgstr "tak" msgid "« Back" msgstr "« Wróć" +#~ msgid "Configuration files will be kept." +#~ msgstr "Pliki konfiguracyjne zostaną zachowane." + +#~ msgid "Note: Configuration files will be erased." +#~ msgstr "Uwaga: Pliki konfiguracyjne zostaną usunięte." + #~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" #~ msgstr "<abbr title='Par: %s / Grup: %s'>%s - %s</abbr>" diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po index 1065865d4b..bf5ca103a6 100644 --- a/modules/luci-base/po/pt-br/base.po +++ b/modules/luci-base/po/pt-br/base.po @@ -630,6 +630,12 @@ msgstr "Cancelar" msgid "Category" msgstr "Categoria" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "Cadeia" @@ -736,8 +742,8 @@ msgstr "Configuração" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." -msgstr "Os arquivos de configuração serão mantidos." +msgid "Configuration files will be kept" +msgstr "" msgid "Configuration has been applied." msgstr "" @@ -1370,6 +1376,9 @@ msgstr "Forçar TKIP e CCMP (AES)" msgid "Force link" msgstr "" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "Force o uso do NAT-T" @@ -1544,6 +1553,9 @@ msgstr "" msgid "IP Addresses" msgstr "Endereços IP" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "Endereço IP" @@ -1589,6 +1601,9 @@ msgstr "Prefixo IPv4" msgid "IPv4 prefix length" msgstr "Tamanho do prefixo IPv4" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "Endereço IPv4" @@ -2168,6 +2183,9 @@ msgstr "Modo" msgid "Model" msgstr "Modelo" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "Dispositivo do Modem" @@ -2354,9 +2372,6 @@ msgstr "Não conectado" msgid "Not connected" msgstr "Não conectado" -msgid "Note: Configuration files will be erased." -msgstr "Nota: Os arquivos de configuração serão apagados." - msgid "Note: interface name length" msgstr "Aviso: tamanho do nome da interface" @@ -3081,6 +3096,12 @@ msgid "See \"mount\" manpage for details" msgstr "Veja o manual (man) do comando \"mount\" para detalhes" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" @@ -4194,6 +4215,12 @@ msgstr "sim" msgid "« Back" msgstr "« Voltar" +#~ msgid "Configuration files will be kept." +#~ msgstr "Os arquivos de configuração serão mantidos." + +#~ msgid "Note: Configuration files will be erased." +#~ msgstr "Nota: Os arquivos de configuração serão apagados." + #~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" #~ msgstr "<abbr title='Par: %s / Grupo: %s'>%s - %s</abbr>" diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po index a871405cf5..cf23162aaf 100644 --- a/modules/luci-base/po/pt/base.po +++ b/modules/luci-base/po/pt/base.po @@ -598,6 +598,12 @@ msgstr "Cancelar" msgid "Category" msgstr "" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "Cadeia" @@ -702,8 +708,8 @@ msgstr "Configuração" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." -msgstr "Os ficheiros de configuração serão mantidos." +msgid "Configuration files will be kept" +msgstr "" msgid "Configuration has been applied." msgstr "" @@ -1324,6 +1330,9 @@ msgstr "Forçar TKIP e CCMP (AES)" msgid "Force link" msgstr "" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1488,6 +1497,9 @@ msgstr "" msgid "IP Addresses" msgstr "" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "Endereço IP" @@ -1533,6 +1545,9 @@ msgstr "" msgid "IPv4 prefix length" msgstr "Comprimento do prefixo IPv4" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "Endereço-IPv4" @@ -2072,6 +2087,9 @@ msgstr "Modo" msgid "Model" msgstr "" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "Dispositivo do modem" @@ -2256,9 +2274,6 @@ msgstr "Não associado" msgid "Not connected" msgstr "Não ligado" -msgid "Note: Configuration files will be erased." -msgstr "Nota: Os ficheiros de configuração serão apagados." - msgid "Note: interface name length" msgstr "" @@ -2957,6 +2972,12 @@ msgid "See \"mount\" manpage for details" msgstr "" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" @@ -4009,6 +4030,12 @@ msgstr "sim" msgid "« Back" msgstr "« Voltar" +#~ msgid "Configuration files will be kept." +#~ msgstr "Os ficheiros de configuração serão mantidos." + +#~ msgid "Note: Configuration files will be erased." +#~ msgstr "Nota: Os ficheiros de configuração serão apagados." + #~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" #~ msgstr "<abbr title='Emparelhada: %s / Grupo: %s'>%s - %s</abbr>" diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po index a7c4cf03ae..bbd60abb69 100644 --- a/modules/luci-base/po/ro/base.po +++ b/modules/luci-base/po/ro/base.po @@ -581,6 +581,12 @@ msgstr "Anuleaza" msgid "Category" msgstr "" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "Lant" @@ -678,8 +684,8 @@ msgstr "Configurare" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." -msgstr "Fisierele de configurare vor fi pastrate." +msgid "Configuration files will be kept" +msgstr "" msgid "Configuration has been applied." msgstr "" @@ -1278,6 +1284,9 @@ msgstr "Forteaza TKIP si CCMP (AES)" msgid "Force link" msgstr "" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1436,6 +1445,9 @@ msgstr "" msgid "IP Addresses" msgstr "" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "Adresa IP" @@ -1481,6 +1493,9 @@ msgstr "" msgid "IPv4 prefix length" msgstr "" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "Adresa IPv4" @@ -2005,6 +2020,9 @@ msgstr "Mod" msgid "Model" msgstr "" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "" @@ -2187,9 +2205,6 @@ msgstr "Nu este asociat." msgid "Not connected" msgstr "Nu este conectat" -msgid "Note: Configuration files will be erased." -msgstr "Nota: fisierele de configurare vor fi sterse." - msgid "Note: interface name length" msgstr "" @@ -2877,6 +2892,12 @@ msgid "See \"mount\" manpage for details" msgstr "" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" @@ -3876,6 +3897,12 @@ msgstr "da" msgid "« Back" msgstr "« Inapoi" +#~ msgid "Configuration files will be kept." +#~ msgstr "Fisierele de configurare vor fi pastrate." + +#~ msgid "Note: Configuration files will be erased." +#~ msgstr "Nota: fisierele de configurare vor fi sterse." + #~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" #~ msgstr "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index 892e838da8..4fa5940c4b 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 " @@ -616,6 +620,12 @@ msgstr "Отменить" msgid "Category" msgstr "Категория" +msgid "Caution: Configuration files will be erased" +msgstr "Внимание: файлы конфигурации будут удалены" + +msgid "Caution: System upgrade will be forced" +msgstr "Внимание: выбрано принудительное обновление системы" + msgid "Chain" msgstr "Цепочка" @@ -729,8 +739,8 @@ msgstr "Настройка config файла" msgid "Configuration failed" msgstr "Ошибка конфигурации" -msgid "Configuration files will be kept." -msgstr "Config файлы будут сохранены." +msgid "Configuration files will be kept" +msgstr "Конфигурационные файлы будут сохранены" msgid "Configuration has been applied." msgstr "Конфигурация применена" @@ -874,7 +884,7 @@ msgid "DSL line mode" msgstr "DSL линейный режим" msgid "DTIM Interval" -msgstr "" +msgstr "Интервал DTIM" msgid "DUID" msgstr "DUID" @@ -916,7 +926,7 @@ msgid "Delete this network" msgstr "Удалить эту сеть" msgid "Delivery Traffic Indication Message Interval" -msgstr "" +msgstr "Интервал сообщений, регламентирующий доставку трафика" msgid "Description" msgstr "Описание" @@ -977,7 +987,7 @@ msgid "Disabled (default)" msgstr "Отключено (по умолчанию)" msgid "Disassociate On Low Acknowledgement" -msgstr "" +msgstr "Не ассоциировать при низком подтверждении" msgid "Discard upstream RFC1918 responses" msgstr "Отбрасывать ответы внешней сети RFC1918." @@ -1348,7 +1358,7 @@ msgid "Force" msgstr "Назначить" msgid "Force 40MHz mode" -msgstr "" +msgstr "Принудительно использовать режим 40 МГц" msgid "Force CCMP (AES)" msgstr "Назначить CCMP (AES)" @@ -1365,6 +1375,9 @@ msgstr "Назначить TKIP и CCMP (AES)" msgid "Force link" msgstr "Активировать соединение" +msgid "Force upgrade" +msgstr "Принудительная прошивка" + msgid "Force use of NAT-T" msgstr "Принудительно использовать NAT-T" @@ -1527,6 +1540,9 @@ msgstr "IKE DH Group" msgid "IP Addresses" msgstr "IP-адреса" +msgid "IP Protocol" +msgstr "IP-протокол" + msgid "IP address" msgstr "IP-адрес" @@ -1572,6 +1588,9 @@ msgstr "IPv4 префикс" msgid "IPv4 prefix length" msgstr "Длина префикса IPv4" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "IPv4-адрес" @@ -1719,7 +1738,7 @@ msgid "Initscript" msgstr "Скрипт инициализации" msgid "Initscripts" -msgstr "Скрипты инциализации" +msgstr "Скрипты инициализации" msgid "Install" msgstr "Установить" @@ -2135,6 +2154,9 @@ msgstr "Режим" msgid "Model" msgstr "Модель" +msgid "Modem default" +msgstr "Настройки модема по умолчанию" + msgid "Modem device" msgstr "Модем" @@ -2284,7 +2306,7 @@ msgid "No rules in this chain" msgstr "Нет правил в данной цепочке" msgid "No scan results available yet..." -msgstr "" +msgstr "Результаты сканирования пока недоступны..." msgid "No zone assigned" msgstr "Зона не присвоена" @@ -2319,9 +2341,6 @@ msgstr "Не связанный" msgid "Not connected" msgstr "Не подключено" -msgid "Note: Configuration files will be erased." -msgstr "Внимание: config файлы будут удалены." - msgid "Note: interface name length" msgstr "Внимание: длина имени интерфейса" @@ -2736,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 время жизни" @@ -3041,7 +3062,7 @@ msgid "Scan" msgstr "Поиск" msgid "Scan request failed" -msgstr "" +msgstr "Ошибка запроса на сканирование" msgid "Scheduled Tasks" msgstr "Запланированные задания" @@ -3056,6 +3077,15 @@ msgid "See \"mount\" manpage for details" msgstr "Для подробной информации обратитесь к справке по 'mount' (man mount)." msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" @@ -3102,7 +3132,7 @@ msgid "Short GI" msgstr "Short GI" msgid "Short Preamble" -msgstr "" +msgstr "Короткая преамбула" msgid "Show current backup file list" msgstr "Показать текущий список файлов резервной копии" @@ -3216,7 +3246,7 @@ msgid "Starting configuration apply…" msgstr "Применение конфигурации..." msgid "Starting wireless scan..." -msgstr "" +msgstr "Начато сканирование беспроводных сетей..." msgid "Startup" msgstr "Загрузка" @@ -4087,7 +4117,7 @@ msgid "minutes" msgstr "минут(ы)" msgid "mixed WPA/WPA2" -msgstr "" +msgstr "смешанный WPA/WPA2" msgid "no" msgstr "нет" @@ -4164,6 +4194,12 @@ msgstr "да" msgid "« Back" msgstr "« Назад" +#~ msgid "Configuration files will be kept." +#~ msgstr "Config файлы будут сохранены." + +#~ msgid "Note: Configuration files will be erased." +#~ msgstr "Внимание: config файлы будут удалены." + #~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" #~ msgstr "<abbr title='Парный: %s / Групповой: %s'>%s - %s</abbr>" diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po index afabaf138e..a22640b9ce 100644 --- a/modules/luci-base/po/sk/base.po +++ b/modules/luci-base/po/sk/base.po @@ -567,6 +567,12 @@ msgstr "" msgid "Category" msgstr "" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "" @@ -661,7 +667,7 @@ msgstr "" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." +msgid "Configuration files will be kept" msgstr "" msgid "Configuration has been applied." @@ -1258,6 +1264,9 @@ msgstr "" msgid "Force link" msgstr "" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1414,6 +1423,9 @@ msgstr "" msgid "IP Addresses" msgstr "" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "" @@ -1459,6 +1471,9 @@ msgstr "" msgid "IPv4 prefix length" msgstr "" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "" @@ -1980,6 +1995,9 @@ msgstr "" msgid "Model" msgstr "" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "" @@ -2162,9 +2180,6 @@ msgstr "" msgid "Not connected" msgstr "" -msgid "Note: Configuration files will be erased." -msgstr "" - msgid "Note: interface name length" msgstr "" @@ -2850,6 +2865,12 @@ msgid "See \"mount\" manpage for details" msgstr "" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po index 4792474f65..e892e04081 100644 --- a/modules/luci-base/po/sv/base.po +++ b/modules/luci-base/po/sv/base.po @@ -579,6 +579,12 @@ msgstr "Avbryt" msgid "Category" msgstr "Kategori" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "Kedja" @@ -675,8 +681,8 @@ msgstr "Konfiguration" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." -msgstr "Konfigurationsfiler kommer att behållas." +msgid "Configuration files will be kept" +msgstr "" msgid "Configuration has been applied." msgstr "" @@ -1278,6 +1284,9 @@ msgstr "Tvinga TKIP och CCMP (AES)" msgid "Force link" msgstr "Tvinga länk" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "Tvinga användning av NAT-T" @@ -1434,6 +1443,9 @@ msgstr "" msgid "IP Addresses" msgstr "IP-adresser" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "IP-adress" @@ -1479,6 +1491,9 @@ msgstr "" msgid "IPv4 prefix length" msgstr "" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "IPv4-Adress" @@ -2001,6 +2016,9 @@ msgstr "Läge" msgid "Model" msgstr "Modell" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "Modem-enhet" @@ -2183,9 +2201,6 @@ msgstr "Inte associerad" msgid "Not connected" msgstr "Inte ansluten" -msgid "Note: Configuration files will be erased." -msgstr "Notera: Konfigurationsfiler kommer att raderas." - msgid "Note: interface name length" msgstr "Notera: längden på gränssnittets namn" @@ -2873,6 +2888,12 @@ msgid "See \"mount\" manpage for details" msgstr "" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" @@ -3877,6 +3898,12 @@ msgstr "ja" msgid "« Back" msgstr "« Bakåt" +#~ msgid "Configuration files will be kept." +#~ msgstr "Konfigurationsfiler kommer att behållas." + +#~ msgid "Note: Configuration files will be erased." +#~ msgstr "Notera: Konfigurationsfiler kommer att raderas." + #~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" #~ msgstr "<abbr title='Pairvis: %s / Grupp: %s'>%s - %s</abbr>" diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot index 7cd1d9d7c9..d8621c02c5 100644 --- a/modules/luci-base/po/templates/base.pot +++ b/modules/luci-base/po/templates/base.pot @@ -560,6 +560,12 @@ msgstr "" msgid "Category" msgstr "" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "" @@ -654,7 +660,7 @@ msgstr "" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." +msgid "Configuration files will be kept" msgstr "" msgid "Configuration has been applied." @@ -1251,6 +1257,9 @@ msgstr "" msgid "Force link" msgstr "" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1407,6 +1416,9 @@ msgstr "" msgid "IP Addresses" msgstr "" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "" @@ -1452,6 +1464,9 @@ msgstr "" msgid "IPv4 prefix length" msgstr "" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "" @@ -1973,6 +1988,9 @@ msgstr "" msgid "Model" msgstr "" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "" @@ -2155,9 +2173,6 @@ msgstr "" msgid "Not connected" msgstr "" -msgid "Note: Configuration files will be erased." -msgstr "" - msgid "Note: interface name length" msgstr "" @@ -2843,6 +2858,12 @@ msgid "See \"mount\" manpage for details" msgstr "" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po index 23dbe531a5..5113bc9869 100644 --- a/modules/luci-base/po/tr/base.po +++ b/modules/luci-base/po/tr/base.po @@ -580,6 +580,12 @@ msgstr "Vazgeç" msgid "Category" msgstr "Kategori" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "Zincir" @@ -674,7 +680,7 @@ msgstr "" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." +msgid "Configuration files will be kept" msgstr "" msgid "Configuration has been applied." @@ -1271,6 +1277,9 @@ msgstr "" msgid "Force link" msgstr "" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1427,6 +1436,9 @@ msgstr "" msgid "IP Addresses" msgstr "" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "" @@ -1472,6 +1484,9 @@ msgstr "" msgid "IPv4 prefix length" msgstr "" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "" @@ -1993,6 +2008,9 @@ msgstr "" msgid "Model" msgstr "" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "" @@ -2175,9 +2193,6 @@ msgstr "" msgid "Not connected" msgstr "" -msgid "Note: Configuration files will be erased." -msgstr "" - msgid "Note: interface name length" msgstr "" @@ -2863,6 +2878,12 @@ msgid "See \"mount\" manpage for details" msgstr "" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po index 34a3efe65f..950d894b1d 100644 --- a/modules/luci-base/po/uk/base.po +++ b/modules/luci-base/po/uk/base.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2018-08-10 17:30+0300\n" +"PO-Revision-Date: 2018-09-01 00:10+0300\n" "Last-Translator: Yurii <yuripet@gmail.com>\n" "Language-Team: none\n" "Language: uk\n" @@ -628,6 +628,12 @@ msgstr "Скасувати" msgid "Category" msgstr "Категорія" +msgid "Caution: Configuration files will be erased" +msgstr "Увага: файли конфігурації буде видалено." + +msgid "Caution: System upgrade will be forced" +msgstr "Увага: систему буде оновлено примусово" + msgid "Chain" msgstr "Ланцюжок" @@ -738,8 +744,8 @@ msgstr "Конфігурація" msgid "Configuration failed" msgstr "Помилка налаштування" -msgid "Configuration files will be kept." -msgstr "Конфігураційні файли буде збережено." +msgid "Configuration files will be kept" +msgstr "Конфігураційні файли буде збережено" msgid "Configuration has been applied." msgstr "Конфігурацію застосовано." @@ -1380,6 +1386,9 @@ msgstr "Примусово TKIP та CCMP (AES)" msgid "Force link" msgstr "Примусове з’єднання" +msgid "Force upgrade" +msgstr "Примусове оновлення" + msgid "Force use of NAT-T" msgstr "Примусово використовувати NAT-T" @@ -1544,6 +1553,9 @@ msgstr "Група IKE DH" msgid "IP Addresses" msgstr "IP-адреси" +msgid "IP Protocol" +msgstr "IP-протокол" + msgid "IP address" msgstr "IP-адреса" @@ -1589,6 +1601,9 @@ msgstr "Префікс IPv4" msgid "IPv4 prefix length" msgstr "Довжина префікса IPv4" +msgid "IPv4+IPv6" +msgstr "IPv4+IPv6" + msgid "IPv4-Address" msgstr "IPv4-адреса" @@ -2163,6 +2178,9 @@ msgstr "Режим" msgid "Model" msgstr "Модель" +msgid "Modem default" +msgstr "Типові налаштування модема" + msgid "Modem device" msgstr "Модем" @@ -2347,9 +2365,6 @@ msgstr "Не пов’язаний" msgid "Not connected" msgstr "Не підключено" -msgid "Note: Configuration files will be erased." -msgstr "Примітка: конфігураційні файли буде видалено." - msgid "Note: interface name length" msgstr "Примітка: довжина імені інтерфейсу" @@ -3079,6 +3094,15 @@ msgid "See \"mount\" manpage for details" msgstr "Подробиці дивись на сторінці керівництва \"mount\"." msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po index f9d0e85981..cdf3d6be46 100644 --- a/modules/luci-base/po/vi/base.po +++ b/modules/luci-base/po/vi/base.po @@ -574,6 +574,12 @@ msgstr "Bỏ qua" msgid "Category" msgstr "" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "chuỗi" @@ -668,7 +674,7 @@ msgstr "Cấu hình" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." +msgid "Configuration files will be kept" msgstr "" msgid "Configuration has been applied." @@ -1276,6 +1282,9 @@ msgstr "" msgid "Force link" msgstr "" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1434,6 +1443,9 @@ msgstr "" msgid "IP Addresses" msgstr "" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "Địa chỉ IP" @@ -1479,6 +1491,9 @@ msgstr "" msgid "IPv4 prefix length" msgstr "" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "" @@ -2008,6 +2023,9 @@ msgstr "Chế độ" msgid "Model" msgstr "" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "Thiết bị modem" @@ -2192,9 +2210,6 @@ msgstr "" msgid "Not connected" msgstr "" -msgid "Note: Configuration files will be erased." -msgstr "" - msgid "Note: interface name length" msgstr "" @@ -2890,6 +2905,12 @@ msgid "See \"mount\" manpage for details" msgstr "" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "" diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po index d232f28c03..57e2b07ec7 100644 --- a/modules/luci-base/po/zh-cn/base.po +++ b/modules/luci-base/po/zh-cn/base.po @@ -583,6 +583,12 @@ msgstr "取消" msgid "Category" msgstr "分类" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "链" @@ -682,8 +688,8 @@ msgstr "配置" msgid "Configuration failed" msgstr "配置失败" -msgid "Configuration files will be kept." -msgstr "配置文件将被保留。" +msgid "Configuration files will be kept" +msgstr "" msgid "Configuration has been applied." msgstr "配置已应用。" @@ -1294,6 +1300,9 @@ msgstr "强制 TKIP 和 CCMP（AES）" msgid "Force link" msgstr "强制链路" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "强制使用 NAT-T" @@ -1452,6 +1461,9 @@ msgstr "IKE DH 组" msgid "IP Addresses" msgstr "IP 地址" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "IP 地址" @@ -1497,6 +1509,9 @@ msgstr "IPv4 地址前缀" msgid "IPv4 prefix length" msgstr "IPv4 地址前缀长度" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "IPv4 地址" @@ -2034,6 +2049,9 @@ msgstr "模式" msgid "Model" msgstr "主机型号" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "调制解调器节点" @@ -2216,9 +2234,6 @@ msgstr "未关联" msgid "Not connected" msgstr "未连接" -msgid "Note: Configuration files will be erased." -msgstr "注意：配置文件将被删除。" - msgid "Note: interface name length" msgstr "注意：接口名称长度" @@ -2924,6 +2939,12 @@ msgid "See \"mount\" manpage for details" msgstr "详参 \"mount\" 联机帮助" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "定时发送 LCP 响应（秒），仅在结合了故障阈值时有效" @@ -3965,6 +3986,12 @@ msgstr "是" msgid "« Back" msgstr "« 后退" +#~ msgid "Configuration files will be kept." +#~ msgstr "配置文件将被保留。" + +#~ msgid "Note: Configuration files will be erased." +#~ msgstr "注意：配置文件将被删除。" + #~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" #~ msgstr "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po index be6d86403f..97e79922d0 100644 --- a/modules/luci-base/po/zh-tw/base.po +++ b/modules/luci-base/po/zh-tw/base.po @@ -579,6 +579,12 @@ msgstr "取消" msgid "Category" msgstr "" +msgid "Caution: Configuration files will be erased" +msgstr "" + +msgid "Caution: System upgrade will be forced" +msgstr "" + msgid "Chain" msgstr "鏈" @@ -677,8 +683,8 @@ msgstr "設定" msgid "Configuration failed" msgstr "" -msgid "Configuration files will be kept." -msgstr "設定檔將被存檔" +msgid "Configuration files will be kept" +msgstr "" msgid "Configuration has been applied." msgstr "" @@ -1287,6 +1293,9 @@ msgstr "強制TKIP+CCMP (AES)加密" msgid "Force link" msgstr "" +msgid "Force upgrade" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1443,6 +1452,9 @@ msgstr "" msgid "IP Addresses" msgstr "" +msgid "IP Protocol" +msgstr "" + msgid "IP address" msgstr "IP位址" @@ -1488,6 +1500,9 @@ msgstr "" msgid "IPv4 prefix length" msgstr "IPv4前綴長度" +msgid "IPv4+IPv6" +msgstr "" + msgid "IPv4-Address" msgstr "IPv4-位址" @@ -2015,6 +2030,9 @@ msgstr "模式" msgid "Model" msgstr "" +msgid "Modem default" +msgstr "" + msgid "Modem device" msgstr "數據機設備" @@ -2197,9 +2215,6 @@ msgstr "尚未關聯" msgid "Not connected" msgstr "尚未連線" -msgid "Note: Configuration files will be erased." -msgstr "注意:設定檔將被刪除." - msgid "Note: interface name length" msgstr "" @@ -2893,6 +2908,12 @@ msgid "See \"mount\" manpage for details" msgstr "查看\"mount\"主頁獲取進階資訊" msgid "" +"Select 'Force upgrade' to flash the image even if the image format check " +"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 " "conjunction with failure threshold" msgstr "傳送LCP呼叫請求在這個給予的秒數間隔內, 僅影響關聯到失敗門檻" @@ -3935,6 +3956,12 @@ msgstr "是的" msgid "« Back" msgstr "« 倒退" +#~ msgid "Configuration files will be kept." +#~ msgstr "設定檔將被存檔" + +#~ msgid "Note: Configuration files will be erased." +#~ msgstr "注意:設定檔將被刪除." + #~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" #~ msgstr "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" 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 153615b58a..2fa7847fc6 100644 --- a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua +++ b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua @@ -269,15 +269,17 @@ function action_sysupgrade() -- -- Initiate firmware flash -- - local step = tonumber(http.formvalue("step") or 1) + local step = tonumber(http.formvalue("step")) or 1 if step == 1 then - if image_supported(image_tmp) then + local force = http.formvalue("force") + if image_supported(image_tmp) or force then luci.template.render("admin_system/upgrade", { checksum = image_checksum(image_tmp), sha256ch = image_sha256_checksum(image_tmp), storage = storage_size(), size = (fs.stat(image_tmp, "size") or 0), - keep = (not not http.formvalue("keep")) + keep = (not not http.formvalue("keep")), + force = (not not http.formvalue("force")) }) else fs.unlink(image_tmp) @@ -287,17 +289,19 @@ function action_sysupgrade() image_invalid = true }) end + -- -- Start sysupgrade flash -- elseif step == 2 then local keep = (http.formvalue("keep") == "1") and "" or "-n" + local force = (http.formvalue("force") == "1") and "-F" or "" luci.template.render("admin_system/applyreboot", { title = luci.i18n.translate("Flashing..."), msg = luci.i18n.translate("The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."), - addr = (#keep > 0) and "192.168.1.1" or nil + addr = (#keep > 0) and (#force > 0) and "192.168.1.1" or nil }) - fork_exec("sleep 1; killall dropbear uhttpd; sleep 1; /sbin/sysupgrade %s %q" %{ keep, image_tmp }) + fork_exec("sleep 1; killall dropbear uhttpd; sleep 1; /sbin/sysupgrade %s %s %q" %{ keep, force, image_tmp }) end end 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 ee9c2f8fd3..f3d2e8d7b0 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 @@ -20,7 +20,7 @@ <form class="inline" method="post" action="<%=url('admin/system/flashops/backup')%>"> <input type="hidden" name="token" value="<%=token%>" /> <div class="cbi-value<% if not reset_avail then %> cbi-value-last<% end %>"> - <label class="cbi-value-title" for="image"><%:Download backup%>:</label> + <label class="cbi-value-title" for="image"><%:Download backup%></label> <div class="cbi-value-field"> <input class="cbi-button cbi-button-action important" type="submit" name="backup" value="<%:Generate archive%>" /> </div> @@ -35,7 +35,7 @@ <form class="inline" method="post" action="<%=url('admin/system/flashops/reset')%>"> <input type="hidden" name="token" value="<%=token%>" /> <div class="cbi-value cbi-value-last"> - <label class="cbi-value-title"><%:Reset to defaults%>:</label> + <label class="cbi-value-title"><%:Reset to defaults%></label> <div class="cbi-value-field"> <input onclick="return confirm('<%:Really reset all changes?%>')" class="cbi-button cbi-button-reset" type="submit" name="reset" value="<%:Perform reset%>" /> </div> @@ -44,7 +44,7 @@ <% end %> <form class="inline" method="post" action="<%=url('admin/system/flashops/restore')%>" enctype="multipart/form-data"> <div class="cbi-value cbi-value-last"> - <label class="cbi-value-title" for="archive"><%:Restore backup%>:</label> + <label class="cbi-value-title" for="archive"><%:Restore backup%></label> <div class="cbi-value-field"> <input type="hidden" name="token" value="<%=token%>" /> <input type="file" name="archive" id="archive" /> @@ -69,22 +69,31 @@ <div class="cbi-section-descr"><%:Upload a sysupgrade-compatible image here to replace the running firmware. Check "Keep settings" to retain the current configuration (requires a compatible firmware image).%></div> <div class="cbi-section-node"> <div class="cbi-value"> - <label class="cbi-value-title" for="keep"><%:Keep settings%>:</label> + <label class="cbi-value-title" for="keep"><%:Keep settings%></label> <div class="cbi-value-field"> <input type="checkbox" name="keep" id="keep" checked="checked" /> </div> </div> + <% if image_invalid then %> + <div class="cbi-value"> + <label class="cbi-value-title" for="force"><%:Force upgrade%></label> + <div class="cbi-value-field"> + <input type="checkbox" name="force" id="force" /> + </div> + <div class="cbi-section-error"> + <%:The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform. %> + <%:Select 'Force upgrade' to flash the image even if the image format check fails. Use only if you are sure that the firmware is correct and meant for your device! %> + </div> + </div> + <% end %> <div class="cbi-value cbi-value-last<% if image_invalid then %> cbi-value-error<% end %>"> - <label class="cbi-value-title" for="image"><%:Image%>:</label> + <label class="cbi-value-title" for="image"><%:Image%></label> <div class="cbi-value-field"> <input type="file" name="image" id="image" /> <input type="submit" class="cbi-button cbi-button-action important" value="<%:Flash image...%>" /> </div> </div> </div> - <% if image_invalid then %> - <div class="cbi-section-error"><%:The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform. %></div> - <% end %> </form> <% else %> <div class="cbi-section-descr"><%:Sorry, there is no sysupgrade support present; a new firmware image must be flashed manually. Please refer to the wiki for device specific install instructions.%></div> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm index 7175248dbb..597ddfd6bf 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm @@ -22,7 +22,7 @@ </p> -<fieldset class="cbi-section"> +<div class="cbi-section"> <ul> <li><%:Checksum%><br /> <%:MD5%>: <code><%=checksum%></code><br /> @@ -39,18 +39,24 @@ end %></li> <li><% if keep then %> - <%:Configuration files will be kept.%> + <%:Configuration files will be kept%> <% else %> - <%:Note: Configuration files will be erased.%> + <%:Caution: Configuration files will be erased%> <% end %></li> + <% if force then %> + <li> + <%:Caution: System upgrade will be forced%> + </li> + <% end %> </ul> -</fieldset> +</div> <div class="cbi-page-actions right"> <form class="inline" action="<%=REQUEST_URI%>" method="post"> <input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="step" value="2" /> <input type="hidden" name="keep" value="<%=keep and "1" or ""%>" /> + <input type="hidden" name="force" value="<%=force and "1" or ""%>" /> <input class="cbi-button cbi-button-reset" name="cancel" type="submit" value="<%:Cancel%>" /> <input class="cbi-button cbi-button-apply" type="submit" value="<%:Proceed%>" /> </form> diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua index 355d9b5b39..5f468bc14c 100644 --- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua +++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua @@ -103,7 +103,7 @@ function keepalive_interval.write(self, section, value) if f > 0 then m:set(section, "keepalive", "%d %d" %{ f, i }) else - m:del(section, "keepalive") + m:set(section, "keepalive", "0") end end diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua index a5f76a38ad..004fd7ef67 100644 --- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua +++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua @@ -109,7 +109,7 @@ function keepalive_interval.write(self, section, value) if f > 0 then m:set(section, "keepalive", "%d %d" %{ f, i }) else - m:del(section, "keepalive") + m:set(section, "keepalive", "0") end end diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua index 078b5ffe94..f785b7fb6f 100644 --- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua +++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua @@ -103,7 +103,7 @@ function keepalive_interval.write(self, section, value) if f > 0 then m:set(section, "keepalive", "%d %d" %{ f, i }) else - m:del(section, "keepalive") + m:set(section, "keepalive", "0") end end diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppossh.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppossh.lua index eca7bdd4d3..e53262b5dc 100644 --- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppossh.lua +++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppossh.lua @@ -105,7 +105,7 @@ function keepalive_interval.write(self, section, value) if f > 0 then m:set(section, "keepalive", "%d %d" %{ f, i }) else - m:del(section, "keepalive") + m:set(section, "keepalive", "0") end end diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua index 462d7019f0..6a828efe96 100644 --- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua +++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua @@ -82,7 +82,7 @@ function keepalive_interval.write(self, section, value) if f > 0 then m:set(section, "keepalive", "%d %d" %{ f, i }) else - m:del(section, "keepalive") + m:set(section, "keepalive", "0") end end |