summaryrefslogtreecommitdiffhomepage
path: root/applications
diff options
context:
space:
mode:
Diffstat (limited to 'applications')
-rw-r--r--applications/luci-app-adblock/po/it/adblock.po50
-rw-r--r--applications/luci-app-adblock/po/ja/adblock.po51
-rw-r--r--applications/luci-app-adblock/po/pt-br/adblock.po40
-rw-r--r--applications/luci-app-adblock/po/ru/adblock.po78
-rw-r--r--applications/luci-app-adblock/po/sv/adblock.po44
-rw-r--r--applications/luci-app-adblock/po/templates/adblock.pot31
-rw-r--r--applications/luci-app-adblock/po/zh-cn/adblock.po47
-rw-r--r--applications/luci-app-adblock/po/zh-tw/adblock.po47
-rw-r--r--applications/luci-app-lxc/Makefile2
-rw-r--r--applications/luci-app-lxc/luasrc/controller/lxc.lua28
-rw-r--r--applications/luci-app-lxc/luasrc/model/cbi/lxc.lua4
-rw-r--r--applications/luci-app-lxc/luasrc/view/lxc.htm122
-rw-r--r--applications/luci-app-mwan3/po/ja/mwan3.po15
-rw-r--r--applications/luci-app-mwan3/po/ru/mwan3.po15
-rw-r--r--applications/luci-app-mwan3/po/templates/mwan3.pot15
-rw-r--r--applications/luci-app-mwan3/po/zh-cn/mwan3.po15
-rw-r--r--applications/luci-app-mwan3/po/zh-tw/mwan3.po15
-rw-r--r--applications/luci-app-travelmate/po/ja/travelmate.po49
-rw-r--r--applications/luci-app-travelmate/po/pt-br/travelmate.po14
-rw-r--r--applications/luci-app-travelmate/po/ru/travelmate.po33
-rw-r--r--applications/luci-app-travelmate/po/templates/travelmate.pot14
21 files changed, 382 insertions, 347 deletions
diff --git a/applications/luci-app-adblock/po/it/adblock.po b/applications/luci-app-adblock/po/it/adblock.po
index 0a1b65ac36..7c64468e6a 100644
--- a/applications/luci-app-adblock/po/it/adblock.po
+++ b/applications/luci-app-adblock/po/it/adblock.po
@@ -17,6 +17,11 @@ 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!"
+msgstr ""
+
msgid "Adblock"
msgstr "Adblock"
@@ -35,9 +40,6 @@ msgstr "Tempo addizionale in secondi di attesa prima che adblock si avvii."
msgid "Advanced"
msgstr "Avanzato"
-msgid "Available blocklist sources."
-msgstr "Fonti lista di blocco disponibili."
-
msgid "Backup Directory"
msgstr "Directory del Backup"
@@ -52,9 +54,7 @@ msgid ""
"domains except those listed in the whitelist file.<br />"
msgstr ""
-msgid ""
-"Caution: To prevent OOM exceptions on low memory devices with less than 64 "
-"MB free RAM, please do not select more than five blocklist sources!"
+msgid "Categories"
msgstr ""
msgid ""
@@ -100,12 +100,6 @@ msgstr ""
msgid "Download Utility (SSL Library)"
msgstr ""
-msgid ""
-"During opkg package installation use the '--force-maintainer' option to "
-"overwrite the pre-existing config file or download a fresh default config "
-"from <a href=\"%s\" target=\"_blank\">here</a>"
-msgstr ""
-
msgid "Edit Blacklist"
msgstr "Modifica Lista Nera"
@@ -182,13 +176,6 @@ msgid "Last Run"
msgstr "Ultimo Avvio"
msgid ""
-"List URLs and Shallalist category selections are configurable in the "
-"'Advanced' section.<br />"
-msgstr ""
-"Le selezioni degli URL delle liste e categorie Shallalist sono configurabili "
-"nella sezione 'Avanzato'.<br />"
-
-msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface.<br />"
msgstr ""
@@ -239,9 +226,6 @@ msgid ""
"Please note: this needs additional 'msmtp' package installation and setup."
msgstr ""
-msgid "Please update your adblock config file to use this package.<br />"
-msgstr ""
-
msgid "Query"
msgstr "Interrogazione"
@@ -296,10 +280,8 @@ msgstr ""
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "Directory per la lista di blocco generata 'adb_list.overall'."
-msgid "The file size is too large for online editing in LuCI (&gt; 512 KB)."
+msgid "The file size is too large for online editing in LuCI (&ge; 100 KB)."
msgstr ""
-"La grandezza del file è troppo grande per modificarla online in LuCI (&gt; "
-"512 KB)."
msgid ""
"This form allows you to modify the content of the adblock blacklist (%s)."
@@ -336,9 +318,6 @@ msgstr ""
"Questo form mostra l'output del registro, prefiltrato per messaggi relativi "
"solo ad adblock."
-msgid "This section contains no values yet"
-msgstr ""
-
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
@@ -392,6 +371,21 @@ msgstr "in pausa"
msgid "running"
msgstr ""
+#~ msgid "Available blocklist sources."
+#~ msgstr "Fonti lista di blocco disponibili."
+
+#~ msgid ""
+#~ "List URLs and Shallalist category selections are configurable in the "
+#~ "'Advanced' section.<br />"
+#~ msgstr ""
+#~ "Le selezioni degli URL delle liste e categorie Shallalist sono "
+#~ "configurabili nella sezione 'Avanzato'.<br />"
+
+#~ msgid "The file size is too large for online editing in LuCI (&gt; 512 KB)."
+#~ msgstr ""
+#~ "La grandezza del file è troppo grande per modificarla online in LuCI "
+#~ "(&gt; 512 KB)."
+
#~ msgid ""
#~ "For SSL protected blocklist sources you need a suitable SSL library, e.g. "
#~ "'libustream-ssl' or the wget 'built-in'."
diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po
index dfd72cbf6c..5276f69626 100644
--- a/applications/luci-app-adblock/po/ja/adblock.po
+++ b/applications/luci-app-adblock/po/ja/adblock.po
@@ -8,7 +8,7 @@ msgstr ""
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.0.7\n"
"Language: ja\n"
msgid "'Jail' Blocklist Creation"
@@ -17,6 +17,13 @@ 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!"
+msgstr ""
+"<b>警告:</b> RAM の空き容量が 64MB に満たないメモリー容量の小さいデバイスで"
+"は、 OutOfMemory (OOM) 例外を防ぐために少数のみを選択してください。"
+
msgid "Adblock"
msgstr "Adblock"
@@ -35,9 +42,6 @@ msgstr "Adblock の処理が開始されるまでの、追加の遅延時間(
msgid "Advanced"
msgstr "詳細設定"
-msgid "Available blocklist sources."
-msgstr "利用可能なブロックリスト提供元です。"
-
msgid "Backup Directory"
msgstr "バックアップ先 ディレクトリ"
@@ -54,13 +58,8 @@ msgstr ""
"ホワイトリストに存在しない全ドメインへのアクセスをブロックするために、追加で "
"'Jail' リスト (/tmp/adb_list.jail) を作成します。<br />"
-msgid ""
-"Caution: To prevent OOM exceptions on low memory devices with less than 64 "
-"MB free RAM, please do not select more than five blocklist sources!"
-msgstr ""
-"警告: RAM の空き容量が 64MB に満たないメモリー容量の小さいデバイスでは、 "
-"OutOfMemory (OOM) 例外を防ぐために、5個よりも多くのリストを選択しないようにし"
-"てください。"
+msgid "Categories"
+msgstr "カテゴリー"
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
@@ -109,15 +108,6 @@ msgstr "ダウンロード ユーティリティ"
msgid "Download Utility (SSL Library)"
msgstr "ダウンロード ユーティリティ(SSL ライブラリ)"
-msgid ""
-"During opkg package installation use the '--force-maintainer' option to "
-"overwrite the pre-existing config file or download a fresh default config "
-"from <a href=\"%s\" target=\"_blank\">here</a>"
-msgstr ""
-"opkg でパッケージをインストールする際に '--force-maintainer' オプションを使用"
-"して既存の設定ファイルを上書きするか、 <a href=\"%s\" target=\"_blank\">ここ"
-"</a> からデフォルトの設定ファイルをダウンロードしてください。"
-
msgid "Edit Blacklist"
msgstr "ブラックリストの編集"
@@ -202,13 +192,6 @@ msgid "Last Run"
msgstr "最終実行"
msgid ""
-"List URLs and Shallalist category selections are configurable in the "
-"'Advanced' section.<br />"
-msgstr ""
-"リストの URL 及び \"Shalla\" リストのカテゴリー設定は、'詳細設定' セクション"
-"で設定することができます。<br />"
-
-msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface.<br />"
msgstr ""
@@ -260,11 +243,6 @@ msgid ""
msgstr ""
"注意: これには、追加で 'msmtp' のインストールとセットアップが必要です。"
-msgid "Please update your adblock config file to use this package.<br />"
-msgstr ""
-"このパッケージを使用するには、既存の Adblock 設定ファイルを更新してください。"
-"<br />"
-
msgid "Query"
msgstr "検索"
@@ -326,10 +304,10 @@ msgstr ""
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 (&gt; 512 KB)."
+msgid "The file size is too large for online editing in LuCI (&ge; 100 KB)."
msgstr ""
-"ファイル サイズが大きすぎる(512 KB超)ため、 LuCI 上でオンライン編集できませ"
-"ん。"
+"LuCI上でのオンライン編集を行うには、ファイルサイズが大きすぎます (&ge; 100 "
+"KB)。"
msgid ""
"This form allows you to modify the content of the adblock blacklist (%s)."
@@ -366,9 +344,6 @@ msgstr ""
"このフォームには、システムログ内の Adblock に関連するメッセージのみが表示され"
"ます。"
-msgid "This section contains no values yet"
-msgstr "このセクションには、まだ値がありません"
-
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po
index c0d9d816db..6e8098a395 100644
--- a/applications/luci-app-adblock/po/pt-br/adblock.po
+++ b/applications/luci-app-adblock/po/pt-br/adblock.po
@@ -18,6 +18,11 @@ 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!"
+msgstr ""
+
msgid "Adblock"
msgstr "Adblock"
@@ -38,9 +43,6 @@ msgstr ""
msgid "Advanced"
msgstr "Avançado"
-msgid "Available blocklist sources."
-msgstr "Fontes de listas de bloqueio disponíveis."
-
msgid "Backup Directory"
msgstr "Diretório da cópia de segurança"
@@ -55,9 +57,7 @@ msgid ""
"domains except those listed in the whitelist file.<br />"
msgstr ""
-msgid ""
-"Caution: To prevent OOM exceptions on low memory devices with less than 64 "
-"MB free RAM, please do not select more than five blocklist sources!"
+msgid "Categories"
msgstr ""
msgid ""
@@ -101,12 +101,6 @@ msgstr ""
msgid "Download Utility (SSL Library)"
msgstr "Utilitário de Download (Biblioteca SSL)"
-msgid ""
-"During opkg package installation use the '--force-maintainer' option to "
-"overwrite the pre-existing config file or download a fresh default config "
-"from <a href=\"%s\" target=\"_blank\">here</a>"
-msgstr ""
-
msgid "Edit Blacklist"
msgstr "Editar Lista de Bloqueio"
@@ -182,11 +176,6 @@ msgid "Last Run"
msgstr ""
msgid ""
-"List URLs and Shallalist category selections are configurable in the "
-"'Advanced' section.<br />"
-msgstr ""
-
-msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface.<br />"
msgstr ""
@@ -232,9 +221,6 @@ msgid ""
"Please note: this needs additional 'msmtp' package installation and setup."
msgstr ""
-msgid "Please update your adblock config file to use this package.<br />"
-msgstr ""
-
msgid "Query"
msgstr "Consulta"
@@ -288,9 +274,8 @@ msgstr ""
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr ""
-msgid "The file size is too large for online editing in LuCI (&gt; 512 KB)."
+msgid "The file size is too large for online editing in LuCI (&ge; 100 KB)."
msgstr ""
-"O tamanho do arquivo é muito grande para edição online no LuCI (&gt; 512 KB)."
msgid ""
"This form allows you to modify the content of the adblock blacklist (%s)."
@@ -327,9 +312,6 @@ msgstr ""
"Esse formulário mostra a saída do syslog, pré-filtrado para mensagens do "
"adblock apenas."
-msgid "This section contains no values yet"
-msgstr ""
-
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
@@ -381,6 +363,14 @@ msgstr ""
msgid "running"
msgstr ""
+#~ msgid "Available blocklist sources."
+#~ msgstr "Fontes de listas de bloqueio disponíveis."
+
+#~ msgid "The file size is too large for online editing in LuCI (&gt; 512 KB)."
+#~ msgstr ""
+#~ "O tamanho do arquivo é muito grande para edição online no LuCI (&gt; 512 "
+#~ "KB)."
+
#~ msgid ""
#~ "For SSL protected blocklist sources you need a suitable SSL library, e.g. "
#~ "'libustream-ssl' or the wget 'built-in'."
diff --git a/applications/luci-app-adblock/po/ru/adblock.po b/applications/luci-app-adblock/po/ru/adblock.po
index 17f39fdd87..24f42a7760 100644
--- a/applications/luci-app-adblock/po/ru/adblock.po
+++ b/applications/luci-app-adblock/po/ru/adblock.po
@@ -21,6 +21,11 @@ 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 ""
+
msgid "Adblock"
msgstr "AdBlock"
@@ -39,9 +44,6 @@ msgstr "Дополнительная задержка в секундах до
msgid "Advanced"
msgstr "Дополнительно"
-msgid "Available blocklist sources."
-msgstr "Источники списков блокировки. "
-
msgid "Backup Directory"
msgstr "Папка для бэкапа"
@@ -59,13 +61,8 @@ msgstr ""
"заблокировать доступ ко всем доменам, кроме тех что перечислены в файле "
"Белого списка.<br />"
-msgid ""
-"Caution: To prevent OOM exceptions on low memory devices with less than 64 "
-"MB free RAM, please do not select more than five blocklist sources!"
+msgid "Categories"
msgstr ""
-"ВНИМАНИЕ: Для предотвращения возможного программного сбоя и перезагрузки, на "
-"устройствах с объемом оперативной памяти менее 64MB, не выбирайте больше 5 "
-"списков."
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
@@ -113,15 +110,6 @@ msgstr "Скачать утилиту"
msgid "Download Utility (SSL Library)"
msgstr "Загрузить утилиту (библиотека SSL)"
-msgid ""
-"During opkg package installation use the '--force-maintainer' option to "
-"overwrite the pre-existing config file or download a fresh default config "
-"from <a href=\"%s\" target=\"_blank\">here</a>"
-msgstr ""
-"Устанавливая пакет с помощью opkg, используйте '--force-maintainer', чтобы "
-"перезаписать существующий config файл или загрузить новый дефолтный config "
-"файл <a href=\"%s\" target=\"_blank\">здесь</a>"
-
msgid "Edit Blacklist"
msgstr "Редактировать Черный список"
@@ -205,13 +193,6 @@ msgid "Last Run"
msgstr "Последнее время запуска"
msgid ""
-"List URLs and Shallalist category selections are configurable in the "
-"'Advanced' section.<br />"
-msgstr ""
-"Список URL-адресов и настройка списка использования, настраиваются на "
-"странице 'Дополнительно'.<br />"
-
-msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface.<br />"
msgstr ""
@@ -263,9 +244,6 @@ msgid ""
"Please note: this needs additional 'msmtp' package installation and setup."
msgstr "Внимание: это потребует дополнительной установки пакета 'msmtp'."
-msgid "Please update your adblock config file to use this package.<br />"
-msgstr "Обновите config файл Adblock, чтобы использовать этот пакет.<br />"
-
msgid "Query"
msgstr "Запрос"
@@ -328,9 +306,8 @@ msgstr ""
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 (&gt; 512 KB)."
+msgid "The file size is too large for online editing in LuCI (&ge; 100 KB)."
msgstr ""
-"Размер файла слишком большой, для онлайн редактирования в LuCI (&gt; 512 KB)."
msgid ""
"This form allows you to modify the content of the adblock blacklist (%s)."
@@ -363,9 +340,6 @@ msgid ""
"only."
msgstr "Страница системного журнала. Только сообщения связанные с Adblock."
-msgid "This section contains no values yet"
-msgstr "Здесь не содержатся необходимые значения"
-
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
@@ -422,3 +396,41 @@ msgstr "остановлено"
msgid "running"
msgstr "работает"
+
+#~ msgid "Available blocklist sources."
+#~ msgstr "Источники списков блокировки. "
+
+#~ msgid ""
+#~ "Caution: To prevent OOM exceptions on low memory devices with less than "
+#~ "64 MB free RAM, please do not select more than five blocklist sources!"
+#~ msgstr ""
+#~ "ВНИМАНИЕ: Для предотвращения возможного программного сбоя и перезагрузки, "
+#~ "на устройствах с объемом оперативной памяти менее 64MB, не выбирайте "
+#~ "больше 5 списков."
+
+#~ msgid ""
+#~ "During opkg package installation use the '--force-maintainer' option to "
+#~ "overwrite the pre-existing config file or download a fresh default config "
+#~ "from <a href=\"%s\" target=\"_blank\">here</a>"
+#~ msgstr ""
+#~ "Устанавливая пакет с помощью opkg, используйте '--force-maintainer', "
+#~ "чтобы перезаписать существующий config файл или загрузить новый дефолтный "
+#~ "config файл <a href=\"%s\" target=\"_blank\">здесь</a>"
+
+#~ msgid ""
+#~ "List URLs and Shallalist category selections are configurable in the "
+#~ "'Advanced' section.<br />"
+#~ msgstr ""
+#~ "Список URL-адресов и настройка списка использования, настраиваются на "
+#~ "странице 'Дополнительно'.<br />"
+
+#~ msgid "Please update your adblock config file to use this package.<br />"
+#~ msgstr "Обновите config файл Adblock, чтобы использовать этот пакет.<br />"
+
+#~ msgid "The file size is too large for online editing in LuCI (&gt; 512 KB)."
+#~ msgstr ""
+#~ "Размер файла слишком большой, для онлайн редактирования в LuCI (&gt; 512 "
+#~ "KB)."
+
+#~ msgid "This section contains no values yet"
+#~ msgstr "Здесь не содержатся необходимые значения"
diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po
index d875a69f96..349d0cc490 100644
--- a/applications/luci-app-adblock/po/sv/adblock.po
+++ b/applications/luci-app-adblock/po/sv/adblock.po
@@ -7,6 +7,11 @@ 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!"
+msgstr ""
+
msgid "Adblock"
msgstr "Adblock"
@@ -25,9 +30,6 @@ msgstr ""
msgid "Advanced"
msgstr "Avancerat"
-msgid "Available blocklist sources."
-msgstr "Tillgängliga källor för blockeringslistor"
-
msgid "Backup Directory"
msgstr "Säkerhetskopiera mapp"
@@ -42,9 +44,7 @@ msgid ""
"domains except those listed in the whitelist file.<br />"
msgstr ""
-msgid ""
-"Caution: To prevent OOM exceptions on low memory devices with less than 64 "
-"MB free RAM, please do not select more than five blocklist sources!"
+msgid "Categories"
msgstr ""
msgid ""
@@ -91,12 +91,6 @@ msgstr ""
msgid "Download Utility (SSL Library)"
msgstr "Nerladdningsprogram (SSL-bibliotek)"
-msgid ""
-"During opkg package installation use the '--force-maintainer' option to "
-"overwrite the pre-existing config file or download a fresh default config "
-"from <a href=\"%s\" target=\"_blank\">here</a>"
-msgstr ""
-
msgid "Edit Blacklist"
msgstr "Redigera svartlista"
@@ -173,11 +167,6 @@ msgid "Last Run"
msgstr "Kördes senast"
msgid ""
-"List URLs and Shallalist category selections are configurable in the "
-"'Advanced' section.<br />"
-msgstr ""
-
-msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface.<br />"
msgstr ""
@@ -221,9 +210,6 @@ msgid ""
"Please note: this needs additional 'msmtp' package installation and setup."
msgstr ""
-msgid "Please update your adblock config file to use this package.<br />"
-msgstr ""
-
msgid "Query"
msgstr "Fråga"
@@ -256,8 +242,8 @@ msgid ""
msgstr ""
msgid ""
-"Size of the download queue to handle downloads &amp; list processing in parallel "
-"(default '4').<br />"
+"Size of the download queue to handle downloads &amp; list processing in "
+"parallel (default '4').<br />"
msgstr ""
msgid "Startup Trigger"
@@ -277,8 +263,8 @@ msgstr ""
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr ""
-msgid "The file size is too large for online editing in LuCI (&gt; 512 KB)."
-msgstr "Filstorleken är för stor för online-redigering i LuCi (&gt; 512 KB)."
+msgid "The file size is too large for online editing in LuCI (&ge; 100 KB)."
+msgstr ""
msgid ""
"This form allows you to modify the content of the adblock blacklist (%s)."
@@ -311,9 +297,6 @@ msgid ""
"only."
msgstr ""
-msgid "This section contains no values yet"
-msgstr ""
-
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
@@ -365,6 +348,13 @@ msgstr "pausad"
msgid "running"
msgstr ""
+#~ msgid "Available blocklist sources."
+#~ msgstr "Tillgängliga källor för blockeringslistor"
+
+#~ msgid "The file size is too large for online editing in LuCI (&gt; 512 KB)."
+#~ msgstr ""
+#~ "Filstorleken är för stor för online-redigering i LuCi (&gt; 512 KB)."
+
#~ msgid ""
#~ "Caution: Please don't select big lists or many lists at once on low "
#~ "memory devices to prevent OOM exceptions!"
diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot
index 6fbaa652ae..67c52eaacd 100644
--- a/applications/luci-app-adblock/po/templates/adblock.pot
+++ b/applications/luci-app-adblock/po/templates/adblock.pot
@@ -7,6 +7,11 @@ 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!"
+msgstr ""
+
msgid "Adblock"
msgstr ""
@@ -25,9 +30,6 @@ msgstr ""
msgid "Advanced"
msgstr ""
-msgid "Available blocklist sources."
-msgstr ""
-
msgid "Backup Directory"
msgstr ""
@@ -42,9 +44,7 @@ msgid ""
"domains except those listed in the whitelist file.<br />"
msgstr ""
-msgid ""
-"Caution: To prevent OOM exceptions on low memory devices with less than 64 "
-"MB free RAM, please do not select more than five blocklist sources!"
+msgid "Categories"
msgstr ""
msgid ""
@@ -84,12 +84,6 @@ msgstr ""
msgid "Download Utility (SSL Library)"
msgstr ""
-msgid ""
-"During opkg package installation use the '--force-maintainer' option to "
-"overwrite the pre-existing config file or download a fresh default config "
-"from <a href=\"%s\" target=\"_blank\">here</a>"
-msgstr ""
-
msgid "Edit Blacklist"
msgstr ""
@@ -165,11 +159,6 @@ msgid "Last Run"
msgstr ""
msgid ""
-"List URLs and Shallalist category selections are configurable in the "
-"'Advanced' section.<br />"
-msgstr ""
-
-msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface.<br />"
msgstr ""
@@ -213,9 +202,6 @@ msgid ""
"Please note: this needs additional 'msmtp' package installation and setup."
msgstr ""
-msgid "Please update your adblock config file to use this package.<br />"
-msgstr ""
-
msgid "Query"
msgstr ""
@@ -269,7 +255,7 @@ msgstr ""
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr ""
-msgid "The file size is too large for online editing in LuCI (&gt; 512 KB)."
+msgid "The file size is too large for online editing in LuCI (&ge; 100 KB)."
msgstr ""
msgid ""
@@ -297,9 +283,6 @@ msgid ""
"only."
msgstr ""
-msgid "This section contains no values yet"
-msgstr ""
-
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po
index e26c44c4da..42bf0c04b9 100644
--- a/applications/luci-app-adblock/po/zh-cn/adblock.po
+++ b/applications/luci-app-adblock/po/zh-cn/adblock.po
@@ -21,6 +21,11 @@ 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!"
+msgstr ""
+
msgid "Adblock"
msgstr "Adblock"
@@ -39,9 +44,6 @@ msgstr "触发 Adblock 开始处理前的额外延迟(以秒为单位)。"
msgid "Advanced"
msgstr "高级"
-msgid "Available blocklist sources."
-msgstr "可用的 blocklist 来源。"
-
msgid "Backup Directory"
msgstr "备份目录"
@@ -56,9 +58,7 @@ msgid ""
"domains except those listed in the whitelist file.<br />"
msgstr ""
-msgid ""
-"Caution: To prevent OOM exceptions on low memory devices with less than 64 "
-"MB free RAM, please do not select more than five blocklist sources!"
+msgid "Categories"
msgstr ""
msgid ""
@@ -100,12 +100,6 @@ msgstr ""
msgid "Download Utility (SSL Library)"
msgstr "下载实用程序(SSL 库)"
-msgid ""
-"During opkg package installation use the '--force-maintainer' option to "
-"overwrite the pre-existing config file or download a fresh default config "
-"from <a href=\"%s\" target=\"_blank\">here</a>"
-msgstr ""
-
msgid "Edit Blacklist"
msgstr "编辑黑名单"
@@ -181,11 +175,6 @@ msgid "Last Run"
msgstr "最后运行"
msgid ""
-"List URLs and Shallalist category selections are configurable in the "
-"'Advanced' section.<br />"
-msgstr "列表 URL 和 Shallalist 类别选择可在“高级”选项卡中配置。<br />"
-
-msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface.<br />"
msgstr ""
@@ -231,9 +220,6 @@ msgid ""
"Please note: this needs additional 'msmtp' package installation and setup."
msgstr ""
-msgid "Please update your adblock config file to use this package.<br />"
-msgstr ""
-
msgid "Query"
msgstr "查询"
@@ -266,8 +252,8 @@ msgid ""
msgstr ""
msgid ""
-"Size of the download queue to handle downloads &amp; list processing in parallel "
-"(default '4').<br />"
+"Size of the download queue to handle downloads &amp; list processing in "
+"parallel (default '4').<br />"
msgstr ""
msgid "Startup Trigger"
@@ -287,8 +273,8 @@ msgstr ""
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "生成的 blocklist 'adb_list.overall'的目标目录。"
-msgid "The file size is too large for online editing in LuCI (&gt; 512 KB)."
-msgstr "文件大小太大,无法在 LuCI(&gt; 512 KB)中进行在线编辑。"
+msgid "The file size is too large for online editing in LuCI (&ge; 100 KB)."
+msgstr ""
msgid ""
"This form allows you to modify the content of the adblock blacklist (%s)."
@@ -315,9 +301,6 @@ msgid ""
"only."
msgstr "此表单显示系统日志输出,仅针对 adblock 相关的消息进行了预筛选。"
-msgid "This section contains no values yet"
-msgstr ""
-
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
@@ -369,3 +352,13 @@ msgstr "已暂停"
msgid "running"
msgstr ""
+#~ msgid "Available blocklist sources."
+#~ msgstr "可用的 blocklist 来源。"
+
+#~ msgid ""
+#~ "List URLs and Shallalist category selections are configurable in the "
+#~ "'Advanced' section.<br />"
+#~ msgstr "列表 URL 和 Shallalist 类别选择可在“高级”选项卡中配置。<br />"
+
+#~ msgid "The file size is too large for online editing in LuCI (&gt; 512 KB)."
+#~ msgstr "文件大小太大,无法在 LuCI(&gt; 512 KB)中进行在线编辑。"
diff --git a/applications/luci-app-adblock/po/zh-tw/adblock.po b/applications/luci-app-adblock/po/zh-tw/adblock.po
index 417fc6bcc3..f42d1b3807 100644
--- a/applications/luci-app-adblock/po/zh-tw/adblock.po
+++ b/applications/luci-app-adblock/po/zh-tw/adblock.po
@@ -21,6 +21,11 @@ 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!"
+msgstr ""
+
msgid "Adblock"
msgstr "Adblock"
@@ -39,9 +44,6 @@ msgstr "觸發 Adblock 開始處理前的額外延遲(以秒為單位)。"
msgid "Advanced"
msgstr "高階"
-msgid "Available blocklist sources."
-msgstr "可用的 blocklist 來源。"
-
msgid "Backup Directory"
msgstr "備份目錄"
@@ -56,9 +58,7 @@ msgid ""
"domains except those listed in the whitelist file.<br />"
msgstr ""
-msgid ""
-"Caution: To prevent OOM exceptions on low memory devices with less than 64 "
-"MB free RAM, please do not select more than five blocklist sources!"
+msgid "Categories"
msgstr ""
msgid ""
@@ -100,12 +100,6 @@ msgstr ""
msgid "Download Utility (SSL Library)"
msgstr "下載實用程式(SSL 庫)"
-msgid ""
-"During opkg package installation use the '--force-maintainer' option to "
-"overwrite the pre-existing config file or download a fresh default config "
-"from <a href=\"%s\" target=\"_blank\">here</a>"
-msgstr ""
-
msgid "Edit Blacklist"
msgstr "編輯黑名單"
@@ -181,11 +175,6 @@ msgid "Last Run"
msgstr "最後執行"
msgid ""
-"List URLs and Shallalist category selections are configurable in the "
-"'Advanced' section.<br />"
-msgstr "列表 URL 和 Shallalist 類別選擇可在“高階”選項卡中配置。<br />"
-
-msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface.<br />"
msgstr ""
@@ -231,9 +220,6 @@ msgid ""
"Please note: this needs additional 'msmtp' package installation and setup."
msgstr ""
-msgid "Please update your adblock config file to use this package.<br />"
-msgstr ""
-
msgid "Query"
msgstr "查詢"
@@ -266,8 +252,8 @@ msgid ""
msgstr ""
msgid ""
-"Size of the download queue to handle downloads &amp; list processing in parallel "
-"(default '4').<br />"
+"Size of the download queue to handle downloads &amp; list processing in "
+"parallel (default '4').<br />"
msgstr ""
msgid "Startup Trigger"
@@ -287,8 +273,8 @@ msgstr ""
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "生成的 blocklist 'adb_list.overall'的目標目錄。"
-msgid "The file size is too large for online editing in LuCI (&gt; 512 KB)."
-msgstr "檔案大小太大,無法在 LuCI(&gt; 512 KB)中進行線上編輯。"
+msgid "The file size is too large for online editing in LuCI (&ge; 100 KB)."
+msgstr ""
msgid ""
"This form allows you to modify the content of the adblock blacklist (%s)."
@@ -315,9 +301,6 @@ msgid ""
"only."
msgstr "此表單顯示系統日誌輸出,僅針對 adblock 相關的訊息進行了預篩選。"
-msgid "This section contains no values yet"
-msgstr ""
-
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
@@ -369,3 +352,13 @@ msgstr "已暫停"
msgid "running"
msgstr ""
+#~ msgid "Available blocklist sources."
+#~ msgstr "可用的 blocklist 來源。"
+
+#~ msgid ""
+#~ "List URLs and Shallalist category selections are configurable in the "
+#~ "'Advanced' section.<br />"
+#~ msgstr "列表 URL 和 Shallalist 類別選擇可在“高階”選項卡中配置。<br />"
+
+#~ msgid "The file size is too large for online editing in LuCI (&gt; 512 KB)."
+#~ msgstr "檔案大小太大,無法在 LuCI(&gt; 512 KB)中進行線上編輯。"
diff --git a/applications/luci-app-lxc/Makefile b/applications/luci-app-lxc/Makefile
index 85cae5c405..379cccbfc9 100644
--- a/applications/luci-app-lxc/Makefile
+++ b/applications/luci-app-lxc/Makefile
@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
LUCI_TITLE:=LXC management Web UI
-LUCI_DEPENDS:=+luci-mod-admin-full +lxc +lxc-attach +lxc-console +lxc-create +liblxc +rpcd-mod-lxc +getopt
+LUCI_DEPENDS:=+luci-mod-admin-full +lxc +lxc-attach +lxc-console +lxc-create +liblxc +rpcd-mod-lxc +getopt +!LXC_BUSYBOX_OPTIONS:tar
LUCI_PKGARCH:=all
PKG_MAINTAINER:=Petar Koretic <petar.koretic@sartura.hr>
diff --git a/applications/luci-app-lxc/luasrc/controller/lxc.lua b/applications/luci-app-lxc/luasrc/controller/lxc.lua
index cc490f0b81..e15915df5d 100644
--- a/applications/luci-app-lxc/luasrc/controller/lxc.lua
+++ b/applications/luci-app-lxc/luasrc/controller/lxc.lua
@@ -14,33 +14,33 @@ Author: Petar Koretic <petar.koretic@sartura.hr>
]]--
-local uci = require "luci.model.uci"
+local uci = require "luci.model.uci".cursor()
local util = require "luci.util"
-local nixio = require "nixio"
+local fs = require "nixio"
module("luci.controller.lxc", package.seeall)
function fork_exec(command)
- local pid = nixio.fork()
+ local pid = fs.fork()
if pid > 0 then
return
elseif pid == 0 then
-- change to root dir
- nixio.chdir("/")
+ fs.chdir("/")
-- patch stdin, out, err to /dev/null
- local null = nixio.open("/dev/null", "w+")
+ local null = fs.open("/dev/null", "w+")
if null then
- nixio.dup(null, nixio.stderr)
- nixio.dup(null, nixio.stdout)
- nixio.dup(null, nixio.stdin)
+ fs.dup(null, fs.stderr)
+ fs.dup(null, fs.stdout)
+ fs.dup(null, fs.stdin)
if null:fileno() > 2 then
null:close()
end
end
-- replace with target command
- nixio.exec("/bin/sh", "-c", command)
+ fs.exec("/bin/sh", "-c", command)
end
end
@@ -71,9 +71,8 @@ function lxc_get_downloadable()
local target = lxc_get_arch_target()
local templates = {}
- local f = io.popen('sh /usr/share/lxc/templates/lxc-download --list --no-validate --server %s'
- % util.shellquote(uci.cursor():get("lxc", "lxc", "url")), 'r')
-
+ local f = io.popen('sh /usr/share/lxc/templates/lxc-download --list --no-validate --server %s 2>/dev/null'
+ % util.shellquote(uci:get("lxc", "lxc", "url")), 'r')
local line
for line in f:lines() do
local dist, version, dist_target = line:match("^(%S+)%s+(%S+)%s+(%S+)%s+default%s+%S+$")
@@ -101,7 +100,7 @@ function lxc_create(lxc_name, lxc_template)
name = lxc_name,
template = "download",
args = {
- "--server", uci.cursor():get("lxc", "lxc", "url"),
+ "--server", uci:get("lxc", "lxc", "url"),
"--no-validate",
"--dist", lxc_dist,
"--release", lxc_release,
@@ -121,6 +120,7 @@ function lxc_get_config_path()
local f = io.open("/etc/lxc/lxc.conf", "r")
local content = f:read("*all")
f:close()
+
local ret = content:match('^%s*lxc.lxcpath%s*=%s*([^%s]*)')
if ret then
return ret .. "/"
@@ -160,7 +160,7 @@ function lxc_configuration_set(lxc_name)
end
function lxc_get_arch_target()
- local target = nixio.uname().machine
+ local target = fs.uname().machine
local target_map = {
armv5 = "armel",
armv6 = "armel",
diff --git a/applications/luci-app-lxc/luasrc/model/cbi/lxc.lua b/applications/luci-app-lxc/luasrc/model/cbi/lxc.lua
index ac0fdff332..7040f0ecff 100644
--- a/applications/luci-app-lxc/luasrc/model/cbi/lxc.lua
+++ b/applications/luci-app-lxc/luasrc/model/cbi/lxc.lua
@@ -16,7 +16,9 @@ Author: Petar Koretic <petar.koretic@sartura.hr>
local fs = require "nixio.fs"
-m = Map("lxc", translate("LXC Containers"))
+m = Map("lxc", translate("LXC Containers"),
+ translate("<b>Please note:</b> For LXC Containers you need a custom OpenWrt image.<br />")
+ .. translate("The image should include at least support for 'kernel cgroups', 'kernel namespaces' and 'miscellaneous LXC related options'."))
if fs.access("/etc/config/lxc") then
m:section(SimpleSection).template = "lxc"
diff --git a/applications/luci-app-lxc/luasrc/view/lxc.htm b/applications/luci-app-lxc/luasrc/view/lxc.htm
index edfff8e063..c1b44f8671 100644
--- a/applications/luci-app-lxc/luasrc/view/lxc.htm
+++ b/applications/luci-app-lxc/luasrc/view/lxc.htm
@@ -14,6 +14,32 @@ Author: Petar Koretic <petar.koretic@sartura.hr>
-%>
+<%
+local fs = require "nixio"
+local target = fs.uname().machine
+%>
+
+<style type="text/css">
+table.cbi-section-table th,
+table.cbi-section-table td,
+.cbi-section-table-cell,
+.cbi-input-select,
+.cbi-input-text
+{
+ text-align:left;
+ vertical-align:top;
+ padding-left:2px;
+ margin-right:auto;
+ margin-left:0px;
+}
+
+.cbi-input-select,
+.cbi-input-text
+{
+ width:15em;
+}
+</style>
+
<fieldset class="cbi-section">
<legend><%:Available Containers%></legend>
<div class="cbi-section-node">
@@ -43,7 +69,7 @@ Author: Petar Koretic <petar.koretic@sartura.hr>
</tr>
<tr id="tr_holder">
<td>
- <input type="text" id="tx_name" placeholder="<%:Enter new name%>" value='' />
+ <input class="cbi-input-text" type="text" id="tx_name" placeholder="<%:Enter new name%>" value='' />
</td>
<td>
<select id="s_template" class="cbi-input-select cbi-button">
@@ -65,21 +91,23 @@ Author: Petar Koretic <petar.koretic@sartura.hr>
<hr/>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-<script type="text/javascript">//<![CDATA[
-
- window.img = { "red" : "<%=resource%>/cbi/red.gif", "green" : "<%=resource%>/cbi/green.gif", "purple" : "<%=resource%>/cbi/purple.gif" }
- window.states = { "STOPPED" : "red", "RUNNING" : "green", "FROZEN" : "purple"}
+<script type="text/javascript">
+//<![CDATA[
+ window.img = { "red" : "<%=resource%>/cbi/red.gif", "green" : "<%=resource%>/cbi/green.gif", "purple" : "<%=resource%>/cbi/purple.gif" }
+ window.states = { "STOPPED" : "red", "RUNNING" : "green", "FROZEN" : "purple" }
- var t_lxc_list = document.getElementById('t_lxc_list');
- var loader_html = '<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" width="16" height="16" style="vertical-align:middle" /> ';
+ var t_lxc_list = document.getElementById('t_lxc_list');
+ var loader_html = '<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" width="16" height="16" style="vertical-align:middle" />';
var timeout_msg = 0
var output_list = document.getElementById("lxc-list-output")
- var output_add = document.getElementById("lxc-add-output")
- var loader_add = document.getElementById("lxc-add-loader")
+ var output_add = document.getElementById("lxc-add-output")
+ var loader_add = document.getElementById("lxc-add-loader")
+
+ info_message(output_add, "Template download in progress, please be patient!", 10000)
function lxc_create(tr)
{
- var lxc_name = tr.querySelector("#tx_name").value.trim()
+ var lxc_name = tr.querySelector("#tx_name").value.replace(/\s/g,'')
var lxc_template = tr.querySelector("#s_template").value
var bt_create = tr.querySelector("#bt_create")
@@ -92,7 +120,13 @@ Author: Petar Koretic <petar.koretic@sartura.hr>
if (!lxc_name || !lxc_name.length)
{
bt_create.disabled = false
- return info_message(output_add, "Name cannot be empty!", 4000)
+ return info_message(output_add, "The 'Name' field must not be empty!", 4000)
+ }
+
+ if (!lxc_template)
+ {
+ bt_create.disabled = false
+ return info_message(output_add, "The 'Template' field must not be empty!", 4000)
}
loading(loader_add)
@@ -101,6 +135,7 @@ Author: Petar Koretic <petar.koretic@sartura.hr>
function(x)
{
bt_create.disabled = false
+
loading(loader_add, 0)
if (!x)
@@ -116,16 +151,16 @@ Author: Petar Koretic <petar.koretic@sartura.hr>
var actions = ''
actions += '<input type="button" onclick="action_handler(this)" data-action="start" value="<%:Start%>" class="cbi-button cbi-button-apply" />'
- actions+= '<input type="button" onclick="action_handler(this)" data-action="stop" value="<%:Stop%>" class="cbi-button cbi-button-reset" />'
- actions+= '<input type="button" onclick="action_handler(this)" data-action="destroy" value="<%:Delete%>" class="cbi-button cbi-button-remove" />'
- actions+= ' <select class="cbi-input-select cbi-button" onchange="action_more_handler(this)">\
- <option selected disabled>more</option>\
+ actions += '&#160;<input type="button" onclick="action_handler(this)" data-action="stop" value="<%:Stop%>" class="cbi-button cbi-button-reset" />'
+ actions += '&#160;<input type="button" onclick="action_handler(this)" data-action="destroy" value="<%:Delete%>" class="cbi-button cbi-button-remove" />'
+ actions += '&#160;<select class="cbi-input-select cbi-button" onchange="action_more_handler(this)">\
+ <option selected="selected" disabled="disabled">more</option>\
<option>configure</option>\
<option>freeze</option>\
<option>unfreeze</option>\
<option>reboot</option>\
</select>'
- actions+= '<span data-loader style="display:inline-block; width:16px; height:16px; margin:0 5px"></span>'
+ actions += '<span data-loader="" style="display:inline-block; width:16px; height:16px; margin:0 5px"></span>'
var row = t_lxc_list.insertRow(-1)
var cell = row.insertCell(-1)
@@ -144,12 +179,11 @@ Author: Petar Koretic <petar.koretic@sartura.hr>
function action_handler(self)
{
- var action = self.getAttribute("data-action");
-
- var bt_action = self
- var lxc_name = self.parentNode.parentNode.children[0].getAttribute('data-id')
+ var action = self.getAttribute("data-action");
+ var bt_action = self
+ var lxc_name = self.parentNode.parentNode.children[0].getAttribute('data-id')
var status_img = self.parentNode.parentNode.querySelector('img')
- var loader = self.parentNode.querySelector('[data-loader]')
+ var loader = self.parentNode.querySelector('[data-loader]')
bt_action.disabled = true
@@ -181,18 +215,16 @@ Author: Petar Koretic <petar.koretic@sartura.hr>
loading(loader, 0)
bt_action.disabled = false
- //FIXME: uncomment after fixing 'lxc-start'
if (!x /*|| ec */)
return info_message(output_list,"Action failed!")
- //FIXME: uncomment after fixing 'lxc-start'
- //set_status(status_img, "green")
+ set_status(status_img, "green")
});
}
else if (action == "destroy")
{
- if (!confirm("This will completely remove LXC container from the disk. Are you sure? (container will be stopped if running)"))
+ if (!confirm("This will completely remove a stopped LXC container from disk. Are you sure?"))
return
loading(loader)
@@ -253,13 +285,12 @@ Author: Petar Koretic <petar.koretic@sartura.hr>
function action_more_handler(self)
{
var lxc_name = self.parentNode.parentNode.querySelector('[data-id]').getAttribute('data-id')
- var loader = self.parentNode.parentNode.querySelector('[data-loader]')
-
- var option = self.options[self.selectedIndex].text
+ var loader = self.parentNode.parentNode.querySelector('[data-loader]')
+ var option = self.options[self.selectedIndex].text
self.value = "more"
- switch (option)
+ switch(option)
{
case "configure":
var tr = document.createElement('tr')
@@ -352,10 +383,25 @@ Author: Petar Koretic <petar.koretic@sartura.hr>
var row = t_lxc_list.insertRow(-1);
row.id = 'empty'
var cell = row.insertCell(0);
- cell.colSpan = 4;
+ cell.colSpan = 3;
cell.innerHTML = '<em><br />There are no containers available yet.</em>';
}
+ function set_empty_template()
+ {
+ if (document.getElementById('tr_holder') !== null)
+ return
+
+ var row_count = t_lxc_create.rows.length;
+ while(--row_count) t_lxc_create.deleteRow(row_count);
+
+ var row = t_lxc_create.insertRow(-1);
+ row.id = 'tr_holder'
+ var cell = row.insertCell(0);
+ cell.colSpan = 3;
+ cell.innerHTML = '<em><br />There are no templates for your architecture (<%=target%>) available, please select another Containers URL.</em>';
+ }
+
function lxc_list_update()
{
XHR.poll(4, '<%=luci.dispatcher.build_url("admin", "services")%>/lxc_action/list', null,
@@ -363,8 +409,11 @@ Author: Petar Koretic <petar.koretic@sartura.hr>
{
if (!x) return;
+ if (!data)
+ return set_empty(t_lxc_list)
+
var lxc_count = Object.keys(data).length
- if (!data || !lxc_count)
+ if (!lxc_count)
return set_empty(t_lxc_list)
if (document.getElementById('empty') !== null)
@@ -443,8 +492,11 @@ Author: Petar Koretic <petar.koretic@sartura.hr>
{
if (!x) return;
- var lxc_count = Object.keys(data).length
- if (!data || !lxc_count) return;
+ if (!data) return set_empty_template();
+
+ var lxc_count = Object.keys(data).length;
+ if (!lxc_count) return set_empty_template();
+
var select = document.getElementById("s_template");
for(var key in data)
{
@@ -454,5 +506,5 @@ Author: Petar Koretic <petar.koretic@sartura.hr>
select.add(option, -1);
}
})
-
-//]]></script>
+//]]>
+</script>
diff --git a/applications/luci-app-mwan3/po/ja/mwan3.po b/applications/luci-app-mwan3/po/ja/mwan3.po
index 6ee351c4c2..cfbf5ac464 100644
--- a/applications/luci-app-mwan3/po/ja/mwan3.po
+++ b/applications/luci-app-mwan3/po/ja/mwan3.po
@@ -43,6 +43,9 @@ msgstr "利用可能な値: 1-256。空欄の場合のデフォルトは1です
msgid "Check IP rules"
msgstr "IP ルールのチェック"
+msgid "Check link quality"
+msgstr ""
+
msgid "Check routing table"
msgstr "ルーティング テーブルのチェック"
@@ -214,6 +217,12 @@ msgstr ""
"スは使用できません。<br />インターフェースには、設定済みのメンバーやポリ"
"シー、ルールと同じ名前を使用することはできません。"
+msgid "Max packet latency [ms]"
+msgstr ""
+
+msgid "Max packet loss [%]"
+msgstr ""
+
msgid ""
"May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or "
"as a portrange (eg \"1024:2048\") without quotes"
@@ -246,6 +255,12 @@ msgstr "アサイン済みメンバー"
msgid "Metric"
msgstr "メトリック"
+msgid "Min packet latency [ms]"
+msgstr ""
+
+msgid "Min packet loss [%]"
+msgstr ""
+
msgid ""
"Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/"
"youtube.com/youtube\")"
diff --git a/applications/luci-app-mwan3/po/ru/mwan3.po b/applications/luci-app-mwan3/po/ru/mwan3.po
index 11721ecc57..140c537e73 100644
--- a/applications/luci-app-mwan3/po/ru/mwan3.po
+++ b/applications/luci-app-mwan3/po/ru/mwan3.po
@@ -46,6 +46,9 @@ msgstr "Допустимые значения: 1-256 По умолчанию 1,
msgid "Check IP rules"
msgstr "Проверить правила IP"
+msgid "Check link quality"
+msgstr ""
+
msgid "Check routing table"
msgstr "Проверить таблицу маршрутизации"
@@ -216,6 +219,12 @@ msgstr ""
"символы A-Z, a-z, 0-9, _ и пробелы.<br />Интерфейсы не могут иметь "
"одинаковые имена с настроенными узлами, политиками или правилами."
+msgid "Max packet latency [ms]"
+msgstr ""
+
+msgid "Max packet loss [%]"
+msgstr ""
+
msgid ""
"May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or "
"as a portrange (eg \"1024:2048\") without quotes"
@@ -247,6 +256,12 @@ msgstr "Назначенные узлы"
msgid "Metric"
msgstr "Метрика"
+msgid "Min packet latency [ms]"
+msgstr ""
+
+msgid "Min packet loss [%]"
+msgstr ""
+
msgid ""
"Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/"
"youtube.com/youtube\")"
diff --git a/applications/luci-app-mwan3/po/templates/mwan3.pot b/applications/luci-app-mwan3/po/templates/mwan3.pot
index f6b3a1b380..bcc5e977a5 100644
--- a/applications/luci-app-mwan3/po/templates/mwan3.pot
+++ b/applications/luci-app-mwan3/po/templates/mwan3.pot
@@ -30,6 +30,9 @@ msgstr ""
msgid "Check IP rules"
msgstr ""
+msgid "Check link quality"
+msgstr ""
+
msgid "Check routing table"
msgstr ""
@@ -190,6 +193,12 @@ msgid ""
"rules"
msgstr ""
+msgid "Max packet latency [ms]"
+msgstr ""
+
+msgid "Max packet loss [%]"
+msgstr ""
+
msgid ""
"May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or "
"as a portrange (eg \"1024:2048\") without quotes"
@@ -216,6 +225,12 @@ msgstr ""
msgid "Metric"
msgstr ""
+msgid "Min packet latency [ms]"
+msgstr ""
+
+msgid "Min packet loss [%]"
+msgstr ""
+
msgid ""
"Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/"
"youtube.com/youtube\")"
diff --git a/applications/luci-app-mwan3/po/zh-cn/mwan3.po b/applications/luci-app-mwan3/po/zh-cn/mwan3.po
index ef59339862..4a92c7abd9 100644
--- a/applications/luci-app-mwan3/po/zh-cn/mwan3.po
+++ b/applications/luci-app-mwan3/po/zh-cn/mwan3.po
@@ -41,6 +41,9 @@ msgstr "取值范围:1-256。如果不填写,默认值为 1"
msgid "Check IP rules"
msgstr "检查 IP 规则"
+msgid "Check link quality"
+msgstr ""
+
msgid "Check routing table"
msgstr "检查路由表"
@@ -205,6 +208,12 @@ msgstr ""
"的接口名称匹配。<br />名称允许包括 A-Z、a-z、0-9、_ 但是不能有空格。<br />接"
"口不应该与成员、策略、规则中的任意一个设置项使用相同的名称"
+msgid "Max packet latency [ms]"
+msgstr ""
+
+msgid "Max packet loss [%]"
+msgstr ""
+
msgid ""
"May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or "
"as a portrange (eg \"1024:2048\") without quotes"
@@ -236,6 +245,12 @@ msgstr "分配的成员"
msgid "Metric"
msgstr "跃点数"
+msgid "Min packet latency [ms]"
+msgstr ""
+
+msgid "Min packet loss [%]"
+msgstr ""
+
msgid ""
"Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/"
"youtube.com/youtube\")"
diff --git a/applications/luci-app-mwan3/po/zh-tw/mwan3.po b/applications/luci-app-mwan3/po/zh-tw/mwan3.po
index 6af9fae7e3..9fa5263428 100644
--- a/applications/luci-app-mwan3/po/zh-tw/mwan3.po
+++ b/applications/luci-app-mwan3/po/zh-tw/mwan3.po
@@ -41,6 +41,9 @@ msgstr "取值範圍:1-256。如果不填寫,預設值為 1"
msgid "Check IP rules"
msgstr "檢查 IP 規則"
+msgid "Check link quality"
+msgstr ""
+
msgid "Check routing table"
msgstr "檢查路由表"
@@ -205,6 +208,12 @@ msgstr ""
"中的介面名稱匹配。<br />名稱允許包括 A-Z、a-z、0-9、_ 但是不能有空格。<br />"
"介面不應該與成員、策略、規則中的任意一個設定項使用相同的名稱"
+msgid "Max packet latency [ms]"
+msgstr ""
+
+msgid "Max packet loss [%]"
+msgstr ""
+
msgid ""
"May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or "
"as a portrange (eg \"1024:2048\") without quotes"
@@ -236,6 +245,12 @@ msgstr "分配的成員"
msgid "Metric"
msgstr "躍點數"
+msgid "Min packet latency [ms]"
+msgstr ""
+
+msgid "Min packet loss [%]"
+msgstr ""
+
msgid ""
"Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/"
"youtube.com/youtube\")"
diff --git a/applications/luci-app-travelmate/po/ja/travelmate.po b/applications/luci-app-travelmate/po/ja/travelmate.po
index 535a9db260..6a46ea3c87 100644
--- a/applications/luci-app-travelmate/po/ja/travelmate.po
+++ b/applications/luci-app-travelmate/po/ja/travelmate.po
@@ -7,7 +7,7 @@ msgstr ""
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.0.7\n"
"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Language: ja\n"
@@ -15,9 +15,6 @@ msgstr ""
msgid "Actions"
msgstr "操作"
-msgid "Add Interface"
-msgstr "インターフェースの追加"
-
msgid "Add Uplink"
msgstr "アップリンクの追加"
@@ -71,7 +68,7 @@ msgstr ""
msgid "Connection Limit"
msgstr "接続制限"
-msgid "Create Uplink Interface"
+msgid "Create Uplink interface"
msgstr "アップリンク インターフェースの作成"
msgid ""
@@ -202,7 +199,7 @@ msgid "Overall Timeout"
msgstr "実行間隔"
msgid "Overall retry timeout in seconds."
-msgstr ""
+msgstr "全体的な再試行タイムアウト(秒)です。"
msgid "Overview"
msgstr "概要"
@@ -283,6 +280,8 @@ msgstr "ステーション電波"
msgid ""
"The BSSID information '%s' is optional and only required for hidden networks"
msgstr ""
+"BSSID 情報 '%s' はオプションであり、ステルス化されたネットワークにのみ必要で"
+"す。"
msgid ""
"This form allows you to modify the content of the main firewall "
@@ -319,6 +318,9 @@ msgstr ""
"このフォームには、システムログ内の Travelmate に関するメッセージのみが表示さ"
"れます。"
+msgid "This step has only to be done once."
+msgstr "この手順は、一度だけ実行される必要があります。"
+
msgid "Travelmate"
msgstr "Travelmate"
@@ -346,9 +348,6 @@ msgstr "アップリンク BSSID"
msgid "Uplink SSID"
msgstr "アップリンク SSID"
-msgid "Uplink interface"
-msgstr "アップリンク インターフェース"
-
msgid "View AP QR-Codes"
msgstr "AP QR-コードを確認"
@@ -379,37 +378,11 @@ msgstr "無線スキャン"
msgid "Wireless Stations"
msgstr "無線ステーション"
-msgid ""
-"add it to the wan zone of the firewall. This step has only to be done once."
-msgstr ""
-"ファイアウォールの wan ゾーンに追加します。このステップは、一度だけ実行される"
-"必要があります。"
+msgid "add it to the wan zone of the firewall.<br />"
+msgstr "ファイアウォールの wan ゾーンに追加します。<br />"
msgid "hidden"
-msgstr "(不明)"
+msgstr "(ステルス)"
msgid "n/a"
msgstr "利用不可"
-
-#~ msgid "Enable 'automatic' mode"
-#~ msgstr "'automatic' モードの有効化"
-
-#~ msgid "Force a manual uplink rescan / reconnect in 'trigger' mode."
-#~ msgstr ""
-#~ "'trigger' モード時に、手動でアップリンクの再スキャンと再接続を行います。"
-
-#~ msgid ""
-#~ "Keep travelmate in an active state. Check every n seconds the connection "
-#~ "status, i.e. the uplink availability."
-#~ msgstr ""
-#~ "Travelmate をアクティブ状態で維持します。\"実行間隔\" で設定された時間毎"
-#~ "(秒)に、アップリンクの可用性を確認するために接続状態をチェックします"
-
-#~ msgid "Manual Rescan"
-#~ msgstr "手動再スキャン"
-
-#~ msgid "Rescan"
-#~ msgstr "再スキャン"
-
-#~ msgid "Timeout in seconds between retries in 'automatic' mode."
-#~ msgstr "'automatic' モード時に接続を確認または再試行する間隔(秒)です。"
diff --git a/applications/luci-app-travelmate/po/pt-br/travelmate.po b/applications/luci-app-travelmate/po/pt-br/travelmate.po
index 5ea4d4a0d3..6bf65b9370 100644
--- a/applications/luci-app-travelmate/po/pt-br/travelmate.po
+++ b/applications/luci-app-travelmate/po/pt-br/travelmate.po
@@ -15,9 +15,6 @@ msgstr ""
msgid "Actions"
msgstr ""
-msgid "Add Interface"
-msgstr ""
-
msgid "Add Uplink"
msgstr ""
@@ -67,7 +64,7 @@ msgstr ""
msgid "Connection Limit"
msgstr ""
-msgid "Create Uplink Interface"
+msgid "Create Uplink interface"
msgstr ""
msgid ""
@@ -292,6 +289,9 @@ msgid ""
"messages only."
msgstr ""
+msgid "This step has only to be done once."
+msgstr ""
+
msgid "Travelmate"
msgstr "Travelmate"
@@ -319,9 +319,6 @@ msgstr ""
msgid "Uplink SSID"
msgstr ""
-msgid "Uplink interface"
-msgstr ""
-
msgid "View AP QR-Codes"
msgstr ""
@@ -352,8 +349,7 @@ msgstr ""
msgid "Wireless Stations"
msgstr ""
-msgid ""
-"add it to the wan zone of the firewall. This step has only to be done once."
+msgid "add it to the wan zone of the firewall.<br />"
msgstr ""
msgid "hidden"
diff --git a/applications/luci-app-travelmate/po/ru/travelmate.po b/applications/luci-app-travelmate/po/ru/travelmate.po
index fad31bb849..8b25e9b139 100644
--- a/applications/luci-app-travelmate/po/ru/travelmate.po
+++ b/applications/luci-app-travelmate/po/ru/travelmate.po
@@ -18,9 +18,6 @@ msgstr ""
msgid "Actions"
msgstr "Действия"
-msgid "Add Interface"
-msgstr "Добавить интерфейс"
-
msgid "Add Uplink"
msgstr "Подключение к сети"
@@ -70,8 +67,8 @@ msgstr ""
msgid "Connection Limit"
msgstr "Ограничение соединений"
-msgid "Create Uplink Interface"
-msgstr "Создать интерфейс сети"
+msgid "Create Uplink interface"
+msgstr ""
msgid ""
"Create a new wireless wan uplink interface, configure it to use dhcp and"
@@ -315,6 +312,9 @@ msgstr ""
"Страница просмотра системного журнала, показаны только события связанные с "
"работой утилиты TravelMate."
+msgid "This step has only to be done once."
+msgstr ""
+
msgid "Travelmate"
msgstr "TravelMate"
@@ -342,9 +342,6 @@ msgstr "BSSID внешней сети"
msgid "Uplink SSID"
msgstr "SSID внешней сети"
-msgid "Uplink interface"
-msgstr "Интерфейс внешней сети"
-
msgid "View AP QR-Codes"
msgstr ""
@@ -375,9 +372,8 @@ msgstr "Найденные точки доступа Wi-Fi"
msgid "Wireless Stations"
msgstr "Клиенты беспроводной сети"
-msgid ""
-"add it to the wan zone of the firewall. This step has only to be done once."
-msgstr "добавить в wan зону межсетевого экрана. Можно сделать только один раз."
+msgid "add it to the wan zone of the firewall.<br />"
+msgstr ""
msgid "hidden"
msgstr "скрытый"
@@ -385,6 +381,21 @@ msgstr "скрытый"
msgid "n/a"
msgstr "нет данных"
+#~ msgid "Add Interface"
+#~ msgstr "Добавить интерфейс"
+
+#~ msgid "Create Uplink Interface"
+#~ msgstr "Создать интерфейс сети"
+
+#~ msgid "Uplink interface"
+#~ msgstr "Интерфейс внешней сети"
+
+#~ msgid ""
+#~ "add it to the wan zone of the firewall. This step has only to be done "
+#~ "once."
+#~ msgstr ""
+#~ "добавить в wan зону межсетевого экрана. Можно сделать только один раз."
+
#~ msgid "Enable 'automatic' mode"
#~ msgstr "Включить режим 'автоматически'"
diff --git a/applications/luci-app-travelmate/po/templates/travelmate.pot b/applications/luci-app-travelmate/po/templates/travelmate.pot
index 8ba17668ec..f4f3418422 100644
--- a/applications/luci-app-travelmate/po/templates/travelmate.pot
+++ b/applications/luci-app-travelmate/po/templates/travelmate.pot
@@ -4,9 +4,6 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
msgid "Actions"
msgstr ""
-msgid "Add Interface"
-msgstr ""
-
msgid "Add Uplink"
msgstr ""
@@ -56,7 +53,7 @@ msgstr ""
msgid "Connection Limit"
msgstr ""
-msgid "Create Uplink Interface"
+msgid "Create Uplink interface"
msgstr ""
msgid ""
@@ -281,6 +278,9 @@ msgid ""
"messages only."
msgstr ""
+msgid "This step has only to be done once."
+msgstr ""
+
msgid "Travelmate"
msgstr ""
@@ -308,9 +308,6 @@ msgstr ""
msgid "Uplink SSID"
msgstr ""
-msgid "Uplink interface"
-msgstr ""
-
msgid "View AP QR-Codes"
msgstr ""
@@ -341,8 +338,7 @@ msgstr ""
msgid "Wireless Stations"
msgstr ""
-msgid ""
-"add it to the wan zone of the firewall. This step has only to be done once."
+msgid "add it to the wan zone of the firewall.<br />"
msgstr ""
msgid "hidden"