summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-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
-rw-r--r--modules/luci-base/luasrc/dispatcher.lua2
-rw-r--r--modules/luci-base/po/ca/base.po96
-rw-r--r--modules/luci-base/po/cs/base.po96
-rw-r--r--modules/luci-base/po/de/base.po96
-rw-r--r--modules/luci-base/po/el/base.po91
-rw-r--r--modules/luci-base/po/en/base.po85
-rw-r--r--modules/luci-base/po/es/base.po96
-rw-r--r--modules/luci-base/po/fr/base.po96
-rw-r--r--modules/luci-base/po/he/base.po85
-rw-r--r--modules/luci-base/po/hu/base.po96
-rw-r--r--modules/luci-base/po/it/base.po93
-rw-r--r--modules/luci-base/po/ja/base.po91
-rw-r--r--modules/luci-base/po/ko/base.po78
-rw-r--r--modules/luci-base/po/ms/base.po80
-rw-r--r--modules/luci-base/po/no/base.po96
-rw-r--r--modules/luci-base/po/pt-br/base.po96
-rw-r--r--modules/luci-base/po/pt/base.po96
-rw-r--r--modules/luci-base/po/ro/base.po93
-rw-r--r--modules/luci-base/po/ru/base.po96
-rw-r--r--modules/luci-base/po/sk/base.po70
-rw-r--r--modules/luci-base/po/sv/base.po96
-rw-r--r--modules/luci-base/po/templates/base.pot70
-rw-r--r--modules/luci-base/po/tr/base.po80
-rw-r--r--modules/luci-base/po/uk/base.po96
-rw-r--r--modules/luci-base/po/vi/base.po80
-rw-r--r--modules/luci-base/po/zh-cn/base.po96
-rw-r--r--modules/luci-base/po/zh-tw/base.po96
48 files changed, 2352 insertions, 719 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"
diff --git a/modules/luci-base/luasrc/dispatcher.lua b/modules/luci-base/luasrc/dispatcher.lua
index 45e1e308f8..2c58b0ab3d 100644
--- a/modules/luci-base/luasrc/dispatcher.lua
+++ b/modules/luci-base/luasrc/dispatcher.lua
@@ -358,7 +358,7 @@ function dispatch(request)
elseif key == "REQUEST_URI" then
return build_url(unpack(ctx.requestpath))
elseif key == "FULL_REQUEST_URI" then
- local url = { http.getenv("SCRIPT_NAME"), http.getenv("PATH_INFO") }
+ local url = { http.getenv("SCRIPT_NAME") or "" , http.getenv("PATH_INFO") }
local query = http.getenv("QUERY_STRING")
if query and #query > 0 then
url[#url+1] = "?"
diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po
index b08344b404..22889f5dbe 100644
--- a/modules/luci-base/po/ca/base.po
+++ b/modules/luci-base/po/ca/base.po
@@ -406,11 +406,11 @@ msgstr "Configuració d'antena"
msgid "Any zone"
msgstr "Qualsevol zona"
-msgid "Apply"
-msgstr "Aplica"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "Aplicant els canvis"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -593,12 +593,20 @@ msgstr "Canvis"
msgid "Changes applied."
msgstr "Canvis aplicats."
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr "Canvia la paraula clau de l'administrador per accedir al dispositiu"
msgid "Channel"
msgstr "Canal"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr "Comprovació"
@@ -678,12 +686,15 @@ msgstr ""
msgid "Configuration"
msgstr "Configuració"
-msgid "Configuration applied."
-msgstr "S'ha aplicat la configuració."
-
msgid "Configuration files will be kept."
msgstr "Es mantindran els fitxers de configuració."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
msgid "Confirmation"
msgstr "Confirmació"
@@ -702,6 +713,12 @@ msgstr ""
msgid "Connections"
msgstr "Connexions"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr "País"
@@ -872,6 +889,9 @@ msgstr ""
msgid "Device unreachable"
msgstr ""
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr "Diagnòstics"
@@ -906,6 +926,9 @@ msgstr ""
msgid "Discard upstream RFC1918 responses"
msgstr "Descarta les respostes RFC1918 des de dalt"
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr "Mostrant només els paquets que contenen"
@@ -1160,6 +1183,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr "Fitxer"
@@ -2182,6 +2208,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr ""
@@ -2760,6 +2789,15 @@ msgstr "Mostra/amaga la contrasenya"
msgid "Revert"
msgstr "Reverteix"
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr "Arrel"
@@ -2838,9 +2876,6 @@ msgstr "Desa"
msgid "Save & Apply"
msgstr "Desa i aplica"
-msgid "Save &#38; Apply"
-msgstr "Desa i aplica"
-
msgid "Scan"
msgstr "Escaneja"
@@ -3012,6 +3047,9 @@ msgstr "Inici"
msgid "Start priority"
msgstr "Prioritat d'inici"
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr "Arrencada"
@@ -3166,6 +3204,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3191,9 +3239,6 @@ msgstr ""
"<br />Fes clic a \"Procedeix\" a continuació per començar el procés "
"d'escriptura a la memòria flaix."
-msgid "The following changes have been committed"
-msgstr "S'han comès els següents canvis"
-
msgid "The following changes have been reverted"
msgstr "S&#39;han desfet els següents canvis"
@@ -3273,8 +3318,8 @@ msgstr ""
msgid "There are no active leases."
msgstr "No hi ha arrendaments actius."
-msgid "There are no pending changes to apply!"
-msgstr "No hi ha canvis pendents per aplicar!"
+msgid "There are no changes to apply."
+msgstr ""
msgid "There are no pending changes to revert!"
msgstr "No hi ha canvis pendents per revertir!"
@@ -3654,6 +3699,9 @@ msgstr "Esperant que s'apliquin els canvis..."
msgid "Waiting for command to complete..."
msgstr "Esperant que s'acabi l'ordre..."
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr "Esperant el dispositiu..."
@@ -3895,6 +3943,24 @@ msgstr "sí"
msgid "« Back"
msgstr "« Enrere"
+#~ msgid "Apply"
+#~ msgstr "Aplica"
+
+#~ msgid "Applying changes"
+#~ msgstr "Aplicant els canvis"
+
+#~ msgid "Configuration applied."
+#~ msgstr "S'ha aplicat la configuració."
+
+#~ msgid "Save &#38; Apply"
+#~ msgstr "Desa i aplica"
+
+#~ msgid "The following changes have been committed"
+#~ msgstr "S'han comès els següents canvis"
+
+#~ msgid "There are no pending changes to apply!"
+#~ msgstr "No hi ha canvis pendents per aplicar!"
+
#~ msgid "Action"
#~ msgstr "Acció"
diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po
index aa4144758b..924d0e6769 100644
--- a/modules/luci-base/po/cs/base.po
+++ b/modules/luci-base/po/cs/base.po
@@ -402,11 +402,11 @@ msgstr "Konfigurace antén"
msgid "Any zone"
msgstr "Libovolná zóna"
-msgid "Apply"
-msgstr "Použít"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "Probíhá uplatňování nastavení"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -586,12 +586,20 @@ msgstr "Změny"
msgid "Changes applied."
msgstr "Změny aplikovány."
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr "Změní administrátorské heslo pro přístup k zařízení"
msgid "Channel"
msgstr "Kanál"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr "Kontrola"
@@ -672,12 +680,15 @@ msgstr ""
msgid "Configuration"
msgstr "Nastavení"
-msgid "Configuration applied."
-msgstr "Nastavení uplatněno."
-
msgid "Configuration files will be kept."
msgstr "Konfigurační soubory budou zachovány."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
msgid "Confirmation"
msgstr "Ověření"
@@ -696,6 +707,12 @@ msgstr ""
msgid "Connections"
msgstr "Připojení"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr "Země"
@@ -868,6 +885,9 @@ msgstr ""
msgid "Device unreachable"
msgstr ""
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr "Diagnostika"
@@ -902,6 +922,9 @@ msgstr ""
msgid "Discard upstream RFC1918 responses"
msgstr "Vyřadit upstream RFC1918 odpovědi"
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr "Zobrazeny pouze balíčky obsahující"
@@ -1162,6 +1185,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr "Soubor"
@@ -2190,6 +2216,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr "Vypnutí prodlevy"
@@ -2785,6 +2814,15 @@ msgstr "Odhalit/skrýt heslo"
msgid "Revert"
msgstr "Vrátit zpět"
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr "Root"
@@ -2862,9 +2900,6 @@ msgstr "Uložit"
msgid "Save & Apply"
msgstr "Uložit & použít"
-msgid "Save &#38; Apply"
-msgstr "Uložit &#38; použít"
-
msgid "Scan"
msgstr "Skenovat"
@@ -3043,6 +3078,9 @@ msgstr "Start"
msgid "Start priority"
msgstr "Priorita spouštění"
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr "Po spuštění"
@@ -3206,6 +3244,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3230,9 +3278,6 @@ msgstr ""
"souboru s originálním souborem pro zajištění integrity dat.<br /> Kliknutím "
"na \"Pokračovat\" spustíte proceduru flashování."
-msgid "The following changes have been committed"
-msgstr "Následující změny byly provedeny"
-
msgid "The following changes have been reverted"
msgstr "Následující změny byly vráceny"
@@ -3314,8 +3359,8 @@ msgstr ""
msgid "There are no active leases."
msgstr "Nejsou žádné aktivní zápůjčky."
-msgid "There are no pending changes to apply!"
-msgstr "Nejsou zde žádné nevyřízené změny k aplikaci!"
+msgid "There are no changes to apply."
+msgstr ""
msgid "There are no pending changes to revert!"
msgstr "Nejsou zde žádné nevyřízené změny k navrácení!"
@@ -3697,6 +3742,9 @@ msgstr "Čekání na realizaci změn..."
msgid "Waiting for command to complete..."
msgstr "Čekání na dokončení příkazu..."
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr ""
@@ -3936,6 +3984,24 @@ msgstr "ano"
msgid "« Back"
msgstr "« Zpět"
+#~ msgid "Apply"
+#~ msgstr "Použít"
+
+#~ msgid "Applying changes"
+#~ msgstr "Probíhá uplatňování nastavení"
+
+#~ msgid "Configuration applied."
+#~ msgstr "Nastavení uplatněno."
+
+#~ msgid "Save &#38; Apply"
+#~ msgstr "Uložit &#38; použít"
+
+#~ msgid "The following changes have been committed"
+#~ msgstr "Následující změny byly provedeny"
+
+#~ msgid "There are no pending changes to apply!"
+#~ msgstr "Nejsou zde žádné nevyřízené změny k aplikaci!"
+
#~ msgid "Action"
#~ msgstr "Akce"
diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po
index 574ddf184a..4271d8e901 100644
--- a/modules/luci-base/po/de/base.po
+++ b/modules/luci-base/po/de/base.po
@@ -409,11 +409,11 @@ msgstr "Antennenkonfiguration"
msgid "Any zone"
msgstr "Beliebige Zone"
-msgid "Apply"
-msgstr "Anwenden"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "Änderungen werden angewandt"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -604,12 +604,20 @@ msgstr "Änderungen"
msgid "Changes applied."
msgstr "Änderungen angewendet."
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr "Ändert das Administratorpasswort für den Zugriff auf dieses Gerät"
msgid "Channel"
msgstr "Kanal"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr "Prüfen"
@@ -696,12 +704,15 @@ msgstr ""
msgid "Configuration"
msgstr "Konfiguration"
-msgid "Configuration applied."
-msgstr "Konfiguration angewendet."
-
msgid "Configuration files will be kept."
msgstr "Konfigurationsdateien sichern"
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
msgid "Confirmation"
msgstr "Bestätigung"
@@ -720,6 +731,12 @@ msgstr "TLS zwingend vorraussetzen und abbrechen wenn TLS fehlschlägt."
msgid "Connections"
msgstr "Verbindungen"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr "Land"
@@ -892,6 +909,9 @@ msgstr "Das Gerät startet neu..."
msgid "Device unreachable"
msgstr "Das Gerät ist nicht erreichbar"
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr "Diagnosen"
@@ -926,6 +946,9 @@ msgstr "Deaktiviert (Standard)"
msgid "Discard upstream RFC1918 responses"
msgstr "Eingehende RFC1918-Antworten verwerfen"
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr "Nur Pakete mit folgendem Inhalt anzeigen"
@@ -1192,6 +1215,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr "Datei"
@@ -2256,6 +2282,9 @@ msgstr "Chiffriertes Gruppenpasswort"
msgid "Obfuscated Password"
msgstr "Chiffriertes Passwort"
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr "Verzögerung für Ausschalt-Zustand"
@@ -2879,6 +2908,15 @@ msgstr "Passwort zeigen/verstecken"
msgid "Revert"
msgstr "Verwerfen"
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr "Root"
@@ -2957,9 +2995,6 @@ msgstr "Speichern"
msgid "Save & Apply"
msgstr "Speichern & Anwenden"
-msgid "Save &#38; Apply"
-msgstr "Speichern &#38; Anwenden"
-
msgid "Scan"
msgstr "Scan"
@@ -3150,6 +3185,9 @@ msgstr "Start"
msgid "Start priority"
msgstr "Startpriorität"
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr "Systemstart"
@@ -3325,6 +3363,16 @@ msgstr ""
"werden:"
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr "Die Gerätedatei des Speichers oder der Partition (z.B.: /dev/sda)"
@@ -3345,9 +3393,6 @@ msgstr ""
"Integrität sicherzustellen.<br /> Klicken Sie \"Fortfahren\" um die Flash-"
"Prozedur zu starten."
-msgid "The following changes have been committed"
-msgstr "Die folgenden Änderungen wurden angewendet"
-
msgid "The following changes have been reverted"
msgstr "Die folgenden Änderungen wurden verworfen"
@@ -3438,8 +3483,8 @@ msgstr ""
msgid "There are no active leases."
msgstr "Es gibt z.Z. keine aktiven Leases."
-msgid "There are no pending changes to apply!"
-msgstr "Es gibt keine ausstehenen Änderungen anzuwenden!"
+msgid "There are no changes to apply."
+msgstr ""
msgid "There are no pending changes to revert!"
msgstr "Es gibt keine ausstehenen Änderungen zurückzusetzen!"
@@ -3839,6 +3884,9 @@ msgstr "Änderungen werden angewandt..."
msgid "Waiting for command to complete..."
msgstr "Der Befehl wird ausgeführt..."
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr "Warte auf Gerät..."
@@ -4083,6 +4131,24 @@ msgstr "ja"
msgid "« Back"
msgstr "« Zurück"
+#~ msgid "Apply"
+#~ msgstr "Anwenden"
+
+#~ msgid "Applying changes"
+#~ msgstr "Änderungen werden angewandt"
+
+#~ msgid "Configuration applied."
+#~ msgstr "Konfiguration angewendet."
+
+#~ msgid "Save &#38; Apply"
+#~ msgstr "Speichern &#38; Anwenden"
+
+#~ msgid "The following changes have been committed"
+#~ msgstr "Die folgenden Änderungen wurden angewendet"
+
+#~ msgid "There are no pending changes to apply!"
+#~ msgstr "Es gibt keine ausstehenen Änderungen anzuwenden!"
+
#~ msgid "Action"
#~ msgstr "Aktion"
diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po
index f746db32a4..60d62f3dd6 100644
--- a/modules/luci-base/po/el/base.po
+++ b/modules/luci-base/po/el/base.po
@@ -409,11 +409,11 @@ msgstr ""
msgid "Any zone"
msgstr "Οιαδήποτε ζώνη"
-msgid "Apply"
-msgstr "Εφαρμογή"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "Εφαρμογή αλλαγών"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -595,12 +595,20 @@ msgstr "Αλλαγές"
msgid "Changes applied."
msgstr "Αλλαγές εφαρμόστηκαν."
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr "Αλλάζει τον κωδικό διαχειριστή για πρόσβαση στη συσκευή"
msgid "Channel"
msgstr "Κανάλι"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr "Έλεγχος"
@@ -681,12 +689,15 @@ msgstr ""
msgid "Configuration"
msgstr "Παραμετροποίηση"
-msgid "Configuration applied."
-msgstr "Η Παραμετροποίηση εφαρμόστηκε."
-
msgid "Configuration files will be kept."
msgstr "Τα αρχεία παραμετροποίησης θα διατηρηθούν."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
msgid "Confirmation"
msgstr "Επιβεβαίωση"
@@ -705,6 +716,12 @@ msgstr ""
msgid "Connections"
msgstr "Συνδέσεις"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr "Χώρα"
@@ -877,6 +894,9 @@ msgstr ""
msgid "Device unreachable"
msgstr ""
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr "Διαγνωστικά"
@@ -911,6 +931,9 @@ msgstr ""
msgid "Discard upstream RFC1918 responses"
msgstr "Αγνόησε τις απαντήσεις ανοδικής ροής RFC1918"
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr "Εμφάνιση μόνο πακέτων που περιέχουν"
@@ -1175,6 +1198,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr "Αρχείο"
@@ -2198,6 +2224,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr ""
@@ -2777,6 +2806,15 @@ msgstr ""
msgid "Revert"
msgstr "Αναίρεση"
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr "Root"
@@ -2856,9 +2894,6 @@ msgstr "Αποθήκευση"
msgid "Save & Apply"
msgstr "Αποθήκευση & Εφαρμογή"
-msgid "Save &#38; Apply"
-msgstr "Αποθήκευση &#38; Εφαρμογή"
-
msgid "Scan"
msgstr "Σάρωση"
@@ -3032,6 +3067,9 @@ msgstr "Αρχή"
msgid "Start priority"
msgstr "Προτεραιότητα εκκίνησης"
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr "Εκκίνηση"
@@ -3184,6 +3222,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3205,9 +3253,6 @@ msgid ""
"\"Proceed\" below to start the flash procedure."
msgstr ""
-msgid "The following changes have been committed"
-msgstr "Οι παρακάτω αλλαγές έχουν υποβληθεί"
-
msgid "The following changes have been reverted"
msgstr "Οι παρακάτω αλλαγές έχουν αναιρεθεί"
@@ -3280,7 +3325,7 @@ msgstr ""
msgid "There are no active leases."
msgstr "Δεν υπάρχουν ενεργά leases."
-msgid "There are no pending changes to apply!"
+msgid "There are no changes to apply."
msgstr ""
msgid "There are no pending changes to revert!"
@@ -3648,6 +3693,9 @@ msgstr ""
msgid "Waiting for command to complete..."
msgstr ""
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr ""
@@ -3888,6 +3936,21 @@ msgstr "ναι"
msgid "« Back"
msgstr "« Πίσω"
+#~ msgid "Apply"
+#~ msgstr "Εφαρμογή"
+
+#~ msgid "Applying changes"
+#~ msgstr "Εφαρμογή αλλαγών"
+
+#~ msgid "Configuration applied."
+#~ msgstr "Η Παραμετροποίηση εφαρμόστηκε."
+
+#~ msgid "Save &#38; Apply"
+#~ msgstr "Αποθήκευση &#38; Εφαρμογή"
+
+#~ msgid "The following changes have been committed"
+#~ msgstr "Οι παρακάτω αλλαγές έχουν υποβληθεί"
+
#~ msgid "Action"
#~ msgstr "Ενέργεια"
diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po
index 50a7c92815..5340e83eb4 100644
--- a/modules/luci-base/po/en/base.po
+++ b/modules/luci-base/po/en/base.po
@@ -400,11 +400,11 @@ msgstr ""
msgid "Any zone"
msgstr "Any zone"
-msgid "Apply"
-msgstr "Apply"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "Applying changes"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -584,12 +584,20 @@ msgstr "Changes"
msgid "Changes applied."
msgstr "Changes applied."
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr "Changes the administrator password for accessing the device"
msgid "Channel"
msgstr "Channel"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr "Check"
@@ -668,12 +676,15 @@ msgstr ""
msgid "Configuration"
msgstr "Configuration"
-msgid "Configuration applied."
-msgstr "Configuration applied."
-
msgid "Configuration files will be kept."
msgstr "Configuration files will be kept."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
msgid "Confirmation"
msgstr "Confirmation"
@@ -692,6 +703,12 @@ msgstr ""
msgid "Connections"
msgstr "Connections"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr "Country"
@@ -865,6 +882,9 @@ msgstr ""
msgid "Device unreachable"
msgstr ""
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr "Diagnostics"
@@ -897,6 +917,9 @@ msgstr ""
msgid "Discard upstream RFC1918 responses"
msgstr ""
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr ""
@@ -1151,6 +1174,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr ""
@@ -2165,6 +2191,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr ""
@@ -2743,6 +2772,15 @@ msgstr ""
msgid "Revert"
msgstr "Revert"
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr ""
@@ -2821,9 +2859,6 @@ msgstr "Save"
msgid "Save & Apply"
msgstr "Save & Apply"
-msgid "Save &#38; Apply"
-msgstr ""
-
msgid "Scan"
msgstr "Scan"
@@ -2994,6 +3029,9 @@ msgstr "Start"
msgid "Start priority"
msgstr "Start priority"
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr ""
@@ -3144,6 +3182,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3165,9 +3213,6 @@ msgid ""
"\"Proceed\" below to start the flash procedure."
msgstr ""
-msgid "The following changes have been committed"
-msgstr ""
-
msgid "The following changes have been reverted"
msgstr "The following changes have been reverted"
@@ -3240,7 +3285,7 @@ msgstr ""
msgid "There are no active leases."
msgstr ""
-msgid "There are no pending changes to apply!"
+msgid "There are no changes to apply."
msgstr ""
msgid "There are no pending changes to revert!"
@@ -3607,6 +3652,9 @@ msgstr ""
msgid "Waiting for command to complete..."
msgstr ""
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr ""
@@ -3845,6 +3893,15 @@ msgstr ""
msgid "« Back"
msgstr "« Back"
+#~ msgid "Apply"
+#~ msgstr "Apply"
+
+#~ msgid "Applying changes"
+#~ msgstr "Applying changes"
+
+#~ msgid "Configuration applied."
+#~ msgstr "Configuration applied."
+
#~ msgid "Action"
#~ msgstr "Action"
diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po
index 8aed2e9ee3..66811e74ce 100644
--- a/modules/luci-base/po/es/base.po
+++ b/modules/luci-base/po/es/base.po
@@ -406,11 +406,11 @@ msgstr "Configuración de la antena"
msgid "Any zone"
msgstr "Cualquier zona"
-msgid "Apply"
-msgstr "Aplicar"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "Aplicando cambios"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -591,12 +591,20 @@ msgstr "Cambios"
msgid "Changes applied."
msgstr "Cambios aplicados."
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr "Cambie la contraseña del administrador para acceder al dispositivo"
msgid "Channel"
msgstr "Canal"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr "Comprobar"
@@ -677,12 +685,15 @@ msgstr ""
msgid "Configuration"
msgstr "Configuración"
-msgid "Configuration applied."
-msgstr "Configuración establecida."
-
msgid "Configuration files will be kept."
msgstr "Se mantendrán los ficheros de configuración."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
msgid "Confirmation"
msgstr "Confirmación"
@@ -701,6 +712,12 @@ msgstr ""
msgid "Connections"
msgstr "Conexiones"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr "País"
@@ -874,6 +891,9 @@ msgstr ""
msgid "Device unreachable"
msgstr ""
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr "Diagnósticos"
@@ -908,6 +928,9 @@ msgstr ""
msgid "Discard upstream RFC1918 responses"
msgstr "Descartar respuestas RFC1918 salientes"
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr "Mostrar sólo paquete que contienen"
@@ -1169,6 +1192,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr "Fichero"
@@ -2204,6 +2230,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr "Retraso de desconexión"
@@ -2797,6 +2826,15 @@ msgstr "Mostrar/ocultar contraseña"
msgid "Revert"
msgstr "Anular"
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr "Raíz"
@@ -2875,9 +2913,6 @@ msgstr "Guardar"
msgid "Save & Apply"
msgstr "Guardar y aplicar"
-msgid "Save &#38; Apply"
-msgstr "Guardar y aplicar"
-
msgid "Scan"
msgstr "Explorar"
@@ -3059,6 +3094,9 @@ msgstr "Arrancar"
msgid "Start priority"
msgstr "Prioridad de arranque"
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr "Arranque"
@@ -3226,6 +3264,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3250,9 +3298,6 @@ msgstr ""
"coinciden con los del original.<br />Pulse \"Proceder\" para empezar el "
"grabado."
-msgid "The following changes have been committed"
-msgstr "Se han hecho los siguientes cambios"
-
msgid "The following changes have been reverted"
msgstr "Se han anulado los siguientes cambios"
@@ -3336,8 +3381,8 @@ msgstr ""
msgid "There are no active leases."
msgstr "Sin cesiones activas."
-msgid "There are no pending changes to apply!"
-msgstr "¡No hay cambios pendientes!"
+msgid "There are no changes to apply."
+msgstr ""
msgid "There are no pending changes to revert!"
msgstr "¡No hay cambios a anular!"
@@ -3723,6 +3768,9 @@ msgstr "Esperando a que se realicen los cambios..."
msgid "Waiting for command to complete..."
msgstr "Esperando a que termine el comando..."
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr ""
@@ -3963,6 +4011,24 @@ msgstr "sí"
msgid "« Back"
msgstr "« Volver"
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
+
+#~ msgid "Applying changes"
+#~ msgstr "Aplicando cambios"
+
+#~ msgid "Configuration applied."
+#~ msgstr "Configuración establecida."
+
+#~ msgid "Save &#38; Apply"
+#~ msgstr "Guardar y aplicar"
+
+#~ msgid "The following changes have been committed"
+#~ msgstr "Se han hecho los siguientes cambios"
+
+#~ msgid "There are no pending changes to apply!"
+#~ msgstr "¡No hay cambios pendientes!"
+
#~ msgid "Action"
#~ msgstr "Acción"
diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po
index e09343815d..17d1248518 100644
--- a/modules/luci-base/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
@@ -412,11 +412,11 @@ msgstr "Configuration de l'antenne"
msgid "Any zone"
msgstr "N'importe quelle zone"
-msgid "Apply"
-msgstr "Appliquer"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "Changements en cours"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -596,12 +596,20 @@ msgstr "Changements"
msgid "Changes applied."
msgstr "Changements appliqués."
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr "Change le mot de passe administrateur pour accéder à l'équipement"
msgid "Channel"
msgstr "Canal"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr "Vérification"
@@ -684,12 +692,15 @@ msgstr ""
msgid "Configuration"
msgstr "Configuration"
-msgid "Configuration applied."
-msgstr "Configuration appliquée."
-
msgid "Configuration files will be kept."
msgstr "Les fichiers de configuration seront préservés."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
msgid "Confirmation"
msgstr "Confirmation"
@@ -708,6 +719,12 @@ msgstr ""
msgid "Connections"
msgstr "Connexions"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr "Pays"
@@ -881,6 +898,9 @@ msgstr ""
msgid "Device unreachable"
msgstr ""
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr "Diagnostics"
@@ -915,6 +935,9 @@ msgstr ""
msgid "Discard upstream RFC1918 responses"
msgstr "Jeter les réponses en RFC1918 amont"
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr "N'afficher que les paquets contenant"
@@ -1181,6 +1204,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr "Fichier"
@@ -2218,6 +2244,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr "Durée éteinte"
@@ -2810,6 +2839,15 @@ msgstr "Montrer/cacher le mot de passe"
msgid "Revert"
msgstr "Revenir"
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr "Racine"
@@ -2889,9 +2927,6 @@ msgstr "Sauvegarder"
msgid "Save & Apply"
msgstr "Sauvegarder et Appliquer"
-msgid "Save &#38; Apply"
-msgstr "Sauvegarder et appliquer"
-
msgid "Scan"
msgstr "Scan"
@@ -3071,6 +3106,9 @@ msgstr "Démarrer"
msgid "Start priority"
msgstr "Priorité de démarrage"
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr "Démarrage"
@@ -3238,6 +3276,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr "Le périphérique de bloc contenant la partition (ex : /dev/sda1)"
@@ -3260,9 +3308,6 @@ msgstr ""
"assurer de son intégrité.<br /> Cliquez sur \"Continuer\" pour lancer la "
"procédure d'écriture."
-msgid "The following changes have been committed"
-msgstr "Les changements suivants ont été appliqués"
-
msgid "The following changes have been reverted"
msgstr "Les changements suivants ont été annulés"
@@ -3349,8 +3394,8 @@ msgstr ""
msgid "There are no active leases."
msgstr "Il n'y a aucun bail actif."
-msgid "There are no pending changes to apply!"
-msgstr "Il n'y a aucun changement en attente d'être appliqués !"
+msgid "There are no changes to apply."
+msgstr ""
msgid "There are no pending changes to revert!"
msgstr "Il n'y a aucun changement à annuler !"
@@ -3742,6 +3787,9 @@ msgstr "En attente de l'application des changements..."
msgid "Waiting for command to complete..."
msgstr "En attente de la fin de la commande..."
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr ""
@@ -3981,6 +4029,24 @@ msgstr "oui"
msgid "« Back"
msgstr "« Retour"
+#~ msgid "Apply"
+#~ msgstr "Appliquer"
+
+#~ msgid "Applying changes"
+#~ msgstr "Changements en cours"
+
+#~ msgid "Configuration applied."
+#~ msgstr "Configuration appliquée."
+
+#~ msgid "Save &#38; Apply"
+#~ msgstr "Sauvegarder et appliquer"
+
+#~ msgid "The following changes have been committed"
+#~ msgstr "Les changements suivants ont été appliqués"
+
+#~ msgid "There are no pending changes to apply!"
+#~ msgstr "Il n'y a aucun changement en attente d'être appliqués !"
+
#~ msgid "Action"
#~ msgstr "Action"
diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po
index cb4c74a3f6..793dc80715 100644
--- a/modules/luci-base/po/he/base.po
+++ b/modules/luci-base/po/he/base.po
@@ -401,11 +401,11 @@ msgstr "הגדרות אנטנה"
msgid "Any zone"
msgstr "כל תחום"
-msgid "Apply"
-msgstr "החל"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "מחיל הגדרות"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -586,12 +586,20 @@ msgstr "שינויים"
msgid "Changes applied."
msgstr "השינויים הוחלו"
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr "משנה את סיסמת המנהל לגישה למכשיר"
msgid "Channel"
msgstr "ערוץ"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr "לבדוק"
@@ -661,12 +669,15 @@ msgstr ""
msgid "Configuration"
msgstr "הגדרות"
-msgid "Configuration applied."
-msgstr "הגדרות הוחלו"
-
msgid "Configuration files will be kept."
msgstr "קבצי ההגדרות ישמרו."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
msgid "Confirmation"
msgstr "אישור"
@@ -685,6 +696,12 @@ msgstr ""
msgid "Connections"
msgstr "חיבורים"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr "מדינה"
@@ -857,6 +874,9 @@ msgstr ""
msgid "Device unreachable"
msgstr ""
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr "אבחון"
@@ -889,6 +909,9 @@ msgstr ""
msgid "Discard upstream RFC1918 responses"
msgstr ""
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr "מציג רק חבילות המכילות"
@@ -1136,6 +1159,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr ""
@@ -2138,6 +2164,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr ""
@@ -2711,6 +2740,15 @@ msgstr ""
msgid "Revert"
msgstr ""
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr ""
@@ -2787,9 +2825,6 @@ msgstr ""
msgid "Save & Apply"
msgstr ""
-msgid "Save &#38; Apply"
-msgstr ""
-
msgid "Scan"
msgstr ""
@@ -2963,6 +2998,9 @@ msgstr ""
msgid "Start priority"
msgstr ""
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr "אתחול"
@@ -3116,6 +3154,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3132,9 +3180,6 @@ msgid ""
"\"Proceed\" below to start the flash procedure."
msgstr ""
-msgid "The following changes have been committed"
-msgstr ""
-
msgid "The following changes have been reverted"
msgstr ""
@@ -3201,7 +3246,7 @@ msgstr ""
msgid "There are no active leases."
msgstr ""
-msgid "There are no pending changes to apply!"
+msgid "There are no changes to apply."
msgstr ""
msgid "There are no pending changes to revert!"
@@ -3563,6 +3608,9 @@ msgstr ""
msgid "Waiting for command to complete..."
msgstr ""
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr ""
@@ -3796,6 +3844,15 @@ msgstr "כן"
msgid "« Back"
msgstr "<< אחורה"
+#~ msgid "Apply"
+#~ msgstr "החל"
+
+#~ msgid "Applying changes"
+#~ msgstr "מחיל הגדרות"
+
+#~ msgid "Configuration applied."
+#~ msgstr "הגדרות הוחלו"
+
#~ msgid "Action"
#~ msgstr "פעולה"
diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po
index e49b5303f0..a900733ae7 100644
--- a/modules/luci-base/po/hu/base.po
+++ b/modules/luci-base/po/hu/base.po
@@ -405,11 +405,11 @@ msgstr "Antenna beállítások"
msgid "Any zone"
msgstr "Bármelyik zóna"
-msgid "Apply"
-msgstr "Alkalmaz"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "Módosítások alkalmazása"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -590,6 +590,9 @@ msgstr "Módosítások"
msgid "Changes applied."
msgstr "A módosítások alkalmazva."
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr ""
"Itt módosíthatja az eszköz eléréséhez szükséges adminisztrátori jelszót"
@@ -597,6 +600,11 @@ msgstr ""
msgid "Channel"
msgstr "Csatorna"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr "Ellenőrzés"
@@ -679,12 +687,15 @@ msgstr ""
msgid "Configuration"
msgstr "Beállítás"
-msgid "Configuration applied."
-msgstr "Beállítások alkalmazva."
-
msgid "Configuration files will be kept."
msgstr "A konfigurációs fájlok megmaradnak."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
msgid "Confirmation"
msgstr "Megerősítés"
@@ -703,6 +714,12 @@ msgstr ""
msgid "Connections"
msgstr "Kapcsolatok"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr "Ország"
@@ -875,6 +892,9 @@ msgstr ""
msgid "Device unreachable"
msgstr ""
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr "Diagnosztika"
@@ -909,6 +929,9 @@ msgstr ""
msgid "Discard upstream RFC1918 responses"
msgstr "Beérkező RFC1918 DHCP válaszok elvetése. "
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr "Csak azon csomagok megjelenítése, amelyek tartalmazzák"
@@ -1170,6 +1193,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr "Fájl"
@@ -2207,6 +2233,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr "Kikapcsolt állapot késleltetés"
@@ -2802,6 +2831,15 @@ msgstr "Jelszó mutatása/elrejtése"
msgid "Revert"
msgstr "Visszavonás"
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr "Gyökérkönyvtár"
@@ -2880,9 +2918,6 @@ msgstr "Mentés"
msgid "Save & Apply"
msgstr "Mentés & Alkalmazás"
-msgid "Save &#38; Apply"
-msgstr "Mentés &#38; Alkalmazás"
-
msgid "Scan"
msgstr "Felderítés"
@@ -3062,6 +3097,9 @@ msgstr "Indítás"
msgid "Start priority"
msgstr "Indítás prioritása"
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr "Rendszerindítás"
@@ -3227,6 +3265,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3252,9 +3300,6 @@ msgstr ""
"ellenőrzéséhez.<br />Kattintson az alábbi \"Folytatás\" gombra a flash-elési "
"eljárás elindításához."
-msgid "The following changes have been committed"
-msgstr "A következő módosítások lettek alkalmazva"
-
msgid "The following changes have been reverted"
msgstr "A következő módosítások lettek visszavonva"
@@ -3338,8 +3383,8 @@ msgstr ""
msgid "There are no active leases."
msgstr "Nincsenek aktív bérletek."
-msgid "There are no pending changes to apply!"
-msgstr "Nincsenek alkalmazásra váró módosítások!"
+msgid "There are no changes to apply."
+msgstr ""
msgid "There are no pending changes to revert!"
msgstr "Nincsenek visszavonásra váró változtatások!"
@@ -3729,6 +3774,9 @@ msgstr "Várakozás a változtatások alkalmazására..."
msgid "Waiting for command to complete..."
msgstr "Várakozás a parancs befejezésére..."
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr ""
@@ -3970,6 +4018,24 @@ msgstr "igen"
msgid "« Back"
msgstr "« Vissza"
+#~ msgid "Apply"
+#~ msgstr "Alkalmaz"
+
+#~ msgid "Applying changes"
+#~ msgstr "Módosítások alkalmazása"
+
+#~ msgid "Configuration applied."
+#~ msgstr "Beállítások alkalmazva."
+
+#~ msgid "Save &#38; Apply"
+#~ msgstr "Mentés &#38; Alkalmazás"
+
+#~ msgid "The following changes have been committed"
+#~ msgstr "A következő módosítások lettek alkalmazva"
+
+#~ msgid "There are no pending changes to apply!"
+#~ msgstr "Nincsenek alkalmazásra váró módosítások!"
+
#~ msgid "Action"
#~ msgstr "Művelet"
diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po
index ce866d9e7b..b90d9cf7b0 100644
--- a/modules/luci-base/po/it/base.po
+++ b/modules/luci-base/po/it/base.po
@@ -414,11 +414,11 @@ msgstr "Configurazione dell'Antenna"
msgid "Any zone"
msgstr "Qualsiasi Zona"
-msgid "Apply"
-msgstr "Applica"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "Applica modifiche"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -598,12 +598,20 @@ msgstr "Modifiche"
msgid "Changes applied."
msgstr "Modifiche applicate."
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr "Cambia la password di amministratore per accedere al dispositivo"
msgid "Channel"
msgstr "Canale"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr "Verifica"
@@ -684,12 +692,15 @@ msgstr ""
msgid "Configuration"
msgstr "Configurazione"
-msgid "Configuration applied."
-msgstr "Configurazione salvata."
-
msgid "Configuration files will be kept."
msgstr "I file di configurazione verranno mantenuti."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
msgid "Confirmation"
msgstr "Conferma"
@@ -708,6 +719,12 @@ msgstr ""
msgid "Connections"
msgstr "Connessioni"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr "Nazione"
@@ -881,6 +898,9 @@ msgstr "Dispositivo in riavvio..."
msgid "Device unreachable"
msgstr "Dispositivo irraggiungibile"
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr "Diagnostica"
@@ -915,6 +935,9 @@ msgstr "Disabilitato (default)"
msgid "Discard upstream RFC1918 responses"
msgstr "Ignora risposte RFC1918 upstream"
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr "Visualizza solo i pacchetti contenenti"
@@ -1174,6 +1197,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr "File"
@@ -2207,6 +2233,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr ""
@@ -2789,6 +2818,15 @@ msgstr "Rivela/nascondi password"
msgid "Revert"
msgstr "Ripristina"
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr ""
@@ -2867,9 +2905,6 @@ msgstr "Salva"
msgid "Save & Apply"
msgstr "Salva & applica"
-msgid "Save &#38; Apply"
-msgstr "Salva &#38; Applica"
-
msgid "Scan"
msgstr "Scan"
@@ -3048,6 +3083,9 @@ msgstr "Inizio"
msgid "Start priority"
msgstr "Priorità di avvio"
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr "Avvio"
@@ -3213,6 +3251,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3233,9 +3281,6 @@ msgid ""
"\"Proceed\" below to start the flash procedure."
msgstr ""
-msgid "The following changes have been committed"
-msgstr ""
-
msgid "The following changes have been reverted"
msgstr "Le seguenti modifiche sono state annullate"
@@ -3308,8 +3353,8 @@ msgstr ""
msgid "There are no active leases."
msgstr "Non ci sono contratti attivi."
-msgid "There are no pending changes to apply!"
-msgstr "Non ci sono cambiamenti pendenti da applicare!"
+msgid "There are no changes to apply."
+msgstr ""
msgid "There are no pending changes to revert!"
msgstr "Non ci sono cambiamenti pendenti da regredire"
@@ -3690,6 +3735,9 @@ msgstr "In attesa delle modifiche da applicare ..."
msgid "Waiting for command to complete..."
msgstr "In attesa del comando da completare..."
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr ""
@@ -3932,6 +3980,21 @@ msgstr "Sì"
msgid "« Back"
msgstr "« Indietro"
+#~ msgid "Apply"
+#~ msgstr "Applica"
+
+#~ msgid "Applying changes"
+#~ msgstr "Applica modifiche"
+
+#~ msgid "Configuration applied."
+#~ msgstr "Configurazione salvata."
+
+#~ msgid "Save &#38; Apply"
+#~ msgstr "Salva &#38; Applica"
+
+#~ msgid "There are no pending changes to apply!"
+#~ msgstr "Non ci sono cambiamenti pendenti da applicare!"
+
#~ msgid "Action"
#~ msgstr "Azione"
diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po
index 07eeec5ee3..c0cbb6b6d9 100644
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-06-10 03:40+0200\n"
-"PO-Revision-Date: 2018-05-03 00:23+0900\n"
+"PO-Revision-Date: 2018-05-21 00:47+0900\n"
"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n"
"Language: ja\n"
"MIME-Version: 1.0\n"
@@ -406,11 +406,11 @@ msgstr "アンテナ設定"
msgid "Any zone"
msgstr "全てのゾーン"
-msgid "Apply"
-msgstr "適用"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr "適用リクエストはステータス <code>%h</code> により失敗しました"
-msgid "Applying changes"
-msgstr "変更を適用"
+msgid "Apply unchecked"
+msgstr "チェックなしの適用"
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -593,12 +593,22 @@ msgstr "変更"
msgid "Changes applied."
msgstr "変更が適用されました。"
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr "デバイスの管理者パスワードを変更します"
msgid "Channel"
msgstr "チャネル"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+"チャンネル %d は、 %s 領域内では規制により利用できません。%d へ自動調整されま"
+"した。"
+
msgid "Check"
msgstr "チェック"
@@ -685,12 +695,15 @@ msgstr ""
msgid "Configuration"
msgstr "設定"
-msgid "Configuration applied."
-msgstr "設定を適用しました。"
-
msgid "Configuration files will be kept."
msgstr "設定ファイルは保持されます。"
+msgid "Configuration has been applied."
+msgstr "設定が適用されました。"
+
+msgid "Configuration has been rolled back!"
+msgstr "設定はロールバックされました!"
+
msgid "Confirmation"
msgstr "確認"
@@ -709,6 +722,15 @@ msgstr "TLSが使用できないとき、サーバーへの接続は失敗しま
msgid "Connections"
msgstr "ネットワーク接続"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+"設定の変更を適用後、デバイスへのアクセスを回復できませんでした。もし IP アドレスや"
+"無線のセキュリティ認証情報などのネットワーク関連の設定を変更した場合、"
+"再接続が必要かもしれません。"
+
msgid "Country"
msgstr "国"
@@ -885,6 +907,9 @@ msgstr "デバイスを再起動中です..."
msgid "Device unreachable"
msgstr "デバイスに到達できません"
+msgid "Device unreachable!"
+msgstr "デバイスに到達できません!"
+
msgid "Diagnostics"
msgstr "診断機能"
@@ -919,6 +944,9 @@ msgstr "無効(デフォルト)"
msgid "Discard upstream RFC1918 responses"
msgstr "RFC1918の応答を破棄します"
+msgid "Dismiss"
+msgstr "警告の除去"
+
msgid "Displaying only packages containing"
msgstr "右記の文字列を含んだパッケージのみを表示中"
@@ -1180,6 +1208,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr "%d 秒以内の適用を確認できませんでした。ロールバック中です..."
+
msgid "File"
msgstr "ファイル"
@@ -2220,6 +2251,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr "消灯時間"
@@ -2822,6 +2856,15 @@ msgstr "パスワードを表示する/隠す"
msgid "Revert"
msgstr "元に戻す"
+msgid "Revert changes"
+msgstr "変更の取り消し"
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr "取り消しのリクエストはステータス <code>%h</code> により失敗しました"
+
+msgid "Reverting configuration…"
+msgstr "設定を元に戻しています..."
+
msgid "Root"
msgstr "ルート"
@@ -2900,9 +2943,6 @@ msgstr "保存"
msgid "Save & Apply"
msgstr "保存 & 適用"
-msgid "Save &#38; Apply"
-msgstr "保存 &#38; 適用"
-
msgid "Scan"
msgstr "スキャン"
@@ -3078,6 +3118,9 @@ msgstr "開始"
msgid "Start priority"
msgstr "優先順位"
+msgid "Starting configuration apply…"
+msgstr "設定の適用を開始しています..."
+
msgid "Startup"
msgstr "スタートアップ"
@@ -3240,6 +3283,22 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr "設定ファイルは以下のエラーにより読み込めませんでした:"
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+"未適用の変更を適用後、デバイスは %d 秒以内に完了できなかった可能性がありま"
+"す。これは、安全上の理由によりロールバックされる設定に起因するものです。それ"
+"でも設定の変更が正しいと思う場合は、チェックなしの変更の適用を行ってくださ"
+"い。もしくは、再度適用を試行する前にこの警告を除去して設定内容の編集を行う"
+"か、現在動作している設定状況を維持するために未適用の変更を取り消してくだ"
+"さい。"
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3264,9 +3323,6 @@ msgstr ""
"イズです。オリジナルファイルと比較し、整合性を確認してください。<br />\"続行"
"\"ボタンをクリックすると、更新処理を開始します。"
-msgid "The following changes have been committed"
-msgstr "以下の変更が適用されました"
-
msgid "The following changes have been reverted"
msgstr "以下の変更が取り消されました"
@@ -3347,8 +3403,8 @@ msgstr ""
msgid "There are no active leases."
msgstr "リース中のIPアドレスはありません。"
-msgid "There are no pending changes to apply!"
-msgstr "適用が未完了の変更はありません!"
+msgid "There are no changes to apply."
+msgstr "適用する変更はありません。"
msgid "There are no pending changes to revert!"
msgstr "復元が未完了の変更はありません!"
@@ -3741,6 +3797,9 @@ msgstr "変更を適用中です..."
msgid "Waiting for command to complete..."
msgstr "コマンド実行中です..."
+msgid "Waiting for configuration to get applied… %ds"
+msgstr "設定を適用中です... %d 秒"
+
msgid "Waiting for device..."
msgstr "デバイスを起動中です..."
diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po
index e4f77c78f5..7f1bf22e03 100644
--- a/modules/luci-base/po/ko/base.po
+++ b/modules/luci-base/po/ko/base.po
@@ -394,10 +394,10 @@ msgstr ""
msgid "Any zone"
msgstr ""
-msgid "Apply"
-msgstr "적용"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
+msgid "Apply unchecked"
msgstr ""
msgid ""
@@ -580,12 +580,20 @@ msgstr "변경 사항"
msgid "Changes applied."
msgstr ""
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr "장비 접근을 위한 관리자 암호를 변경합니다"
msgid "Channel"
msgstr ""
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr ""
@@ -664,10 +672,13 @@ msgstr ""
msgid "Configuration"
msgstr "설정"
-msgid "Configuration applied."
+msgid "Configuration files will be kept."
msgstr ""
-msgid "Configuration files will be kept."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
msgstr ""
msgid "Confirmation"
@@ -688,6 +699,12 @@ msgstr ""
msgid "Connections"
msgstr "연결"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr ""
@@ -863,6 +880,9 @@ msgstr ""
msgid "Device unreachable"
msgstr ""
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr "진단"
@@ -897,6 +917,9 @@ msgstr ""
msgid "Discard upstream RFC1918 responses"
msgstr ""
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr ""
@@ -1149,6 +1172,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr ""
@@ -2156,6 +2182,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr ""
@@ -2738,6 +2767,15 @@ msgstr "암호 보이기/숨기기"
msgid "Revert"
msgstr "변경 취소"
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr ""
@@ -2816,9 +2854,6 @@ msgstr "저장"
msgid "Save & Apply"
msgstr "저장 & 적용"
-msgid "Save &#38; Apply"
-msgstr "저장 &#38; 적용"
-
msgid "Scan"
msgstr "Scan 하기"
@@ -2989,6 +3024,9 @@ msgstr "시작"
msgid "Start priority"
msgstr "시작 우선순위"
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr "시작 프로그램"
@@ -3147,6 +3185,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3163,9 +3211,6 @@ msgid ""
"\"Proceed\" below to start the flash procedure."
msgstr ""
-msgid "The following changes have been committed"
-msgstr ""
-
msgid "The following changes have been reverted"
msgstr "다음의 변경 사항들이 취소되었습니다"
@@ -3236,7 +3281,7 @@ msgstr ""
msgid "There are no active leases."
msgstr ""
-msgid "There are no pending changes to apply!"
+msgid "There are no changes to apply."
msgstr ""
msgid "There are no pending changes to revert!"
@@ -3615,6 +3660,9 @@ msgstr "변경 사항이 적용되기를 기다리는 중입니다..."
msgid "Waiting for command to complete..."
msgstr "실행한 명령이 끝나기를 기다리는 중입니다..."
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr ""
@@ -3854,5 +3902,11 @@ msgstr ""
msgid "« Back"
msgstr ""
+#~ msgid "Apply"
+#~ msgstr "적용"
+
+#~ msgid "Save &#38; Apply"
+#~ msgstr "저장 &#38; 적용"
+
#~ msgid "Leasetime"
#~ msgstr "임대 시간"
diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po
index d5c889580b..cadaf9b3b2 100644
--- a/modules/luci-base/po/ms/base.po
+++ b/modules/luci-base/po/ms/base.po
@@ -389,11 +389,11 @@ msgstr ""
msgid "Any zone"
msgstr ""
-msgid "Apply"
-msgstr "Melaksanakan"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "Melaksanakan perubahan"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -570,12 +570,20 @@ msgstr "Laman"
msgid "Changes applied."
msgstr "Laman diterapkan."
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr ""
msgid "Channel"
msgstr "Saluran"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr ""
@@ -646,10 +654,13 @@ msgstr ""
msgid "Configuration"
msgstr "Konfigurasi"
-msgid "Configuration applied."
+msgid "Configuration files will be kept."
msgstr ""
-msgid "Configuration files will be kept."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
msgstr ""
msgid "Confirmation"
@@ -670,6 +681,12 @@ msgstr ""
msgid "Connections"
msgstr ""
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr ""
@@ -838,6 +855,9 @@ msgstr ""
msgid "Device unreachable"
msgstr ""
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr ""
@@ -870,6 +890,9 @@ msgstr ""
msgid "Discard upstream RFC1918 responses"
msgstr ""
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr ""
@@ -1121,6 +1144,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr ""
@@ -2136,6 +2162,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr ""
@@ -2712,6 +2741,15 @@ msgstr ""
msgid "Revert"
msgstr "Kembali"
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr ""
@@ -2790,9 +2828,6 @@ msgstr "Simpan"
msgid "Save & Apply"
msgstr "Simpan & Melaksanakan"
-msgid "Save &#38; Apply"
-msgstr ""
-
msgid "Scan"
msgstr "Scan"
@@ -2963,6 +2998,9 @@ msgstr "Mula"
msgid "Start priority"
msgstr ""
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr ""
@@ -3116,6 +3154,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr "Fail peranti memori atau partisyen, (contohnya: /dev/sda)"
@@ -3136,9 +3184,6 @@ msgstr ""
"integriti data.<br /> Klik butang terus di bawah untuk memulakan prosedur "
"flash."
-msgid "The following changes have been committed"
-msgstr ""
-
msgid "The following changes have been reverted"
msgstr "Laman berikut telah kembali"
@@ -3211,7 +3256,7 @@ msgstr ""
msgid "There are no active leases."
msgstr ""
-msgid "There are no pending changes to apply!"
+msgid "There are no changes to apply."
msgstr ""
msgid "There are no pending changes to revert!"
@@ -3580,6 +3625,9 @@ msgstr ""
msgid "Waiting for command to complete..."
msgstr ""
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr ""
@@ -3813,6 +3861,12 @@ msgstr ""
msgid "« Back"
msgstr "« Kembali"
+#~ msgid "Apply"
+#~ msgstr "Melaksanakan"
+
+#~ msgid "Applying changes"
+#~ msgstr "Melaksanakan perubahan"
+
#~ msgid "Action"
#~ msgstr "Aksi"
diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po
index 1805d8e990..600d007247 100644
--- a/modules/luci-base/po/no/base.po
+++ b/modules/luci-base/po/no/base.po
@@ -398,11 +398,11 @@ msgstr "Antennekonfigurasjon"
msgid "Any zone"
msgstr "Alle soner"
-msgid "Apply"
-msgstr "Bruk"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "Utfører endringer"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -582,12 +582,20 @@ msgstr "Endringer"
msgid "Changes applied."
msgstr "Endringer utført."
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr "Endrer administrator passordet for tilgang til enheten"
msgid "Channel"
msgstr "Kanal"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr "Kontroller"
@@ -668,12 +676,15 @@ msgstr ""
msgid "Configuration"
msgstr "Konfigurasjon"
-msgid "Configuration applied."
-msgstr "Konfigurasjons endring utført."
-
msgid "Configuration files will be kept."
msgstr "Konfigurasjonsfiler vil bli bevart."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
msgid "Confirmation"
msgstr "Bekreftelse"
@@ -692,6 +703,12 @@ msgstr ""
msgid "Connections"
msgstr "Tilkoblinger"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr "Land"
@@ -864,6 +881,9 @@ msgstr ""
msgid "Device unreachable"
msgstr ""
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr "Nettverksdiagnostikk"
@@ -898,6 +918,9 @@ msgstr ""
msgid "Discard upstream RFC1918 responses"
msgstr "Forkast oppstrøms RFC1918 svar"
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr "Viser bare pakker som inneholder"
@@ -1157,6 +1180,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr "Fil"
@@ -2181,6 +2207,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr "Forsinkelse ved tilstand Av"
@@ -2775,6 +2804,15 @@ msgstr "Vis/Skjul passord"
msgid "Revert"
msgstr "Tilbakestill"
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr "Rot"
@@ -2853,9 +2891,6 @@ msgstr "Lagre"
msgid "Save & Apply"
msgstr "Lagre & Aktiver"
-msgid "Save &#38; Apply"
-msgstr "Lagre &#38; Aktiver"
-
msgid "Scan"
msgstr "Skann"
@@ -3033,6 +3068,9 @@ msgstr "Start"
msgid "Start priority"
msgstr "Start prioritet"
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr "Oppstart"
@@ -3198,6 +3236,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3222,9 +3270,6 @@ msgstr ""
"sammenlign dem med den opprinnelige filen for å sikre dataintegriteten.<br /"
"> Klikk \"Fortsett\" nedenfor for å starte flash prosedyren."
-msgid "The following changes have been committed"
-msgstr "Følgende endringer er foretatt"
-
msgid "The following changes have been reverted"
msgstr "Følgende endringer er forkastet"
@@ -3307,8 +3352,8 @@ msgstr ""
msgid "There are no active leases."
msgstr "Det er ingen aktive leieavtaler."
-msgid "There are no pending changes to apply!"
-msgstr "Det finnes ingen endringer som kan utføres!"
+msgid "There are no changes to apply."
+msgstr ""
msgid "There are no pending changes to revert!"
msgstr "Det finnes ingen endriger å reversere!"
@@ -3694,6 +3739,9 @@ msgstr "Venter på at endringer utføres..."
msgid "Waiting for command to complete..."
msgstr "Venter på at kommando fullføres..."
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr ""
@@ -3935,6 +3983,24 @@ msgstr "ja"
msgid "« Back"
msgstr "« Tilbake"
+#~ msgid "Apply"
+#~ msgstr "Bruk"
+
+#~ msgid "Applying changes"
+#~ msgstr "Utfører endringer"
+
+#~ msgid "Configuration applied."
+#~ msgstr "Konfigurasjons endring utført."
+
+#~ msgid "Save &#38; Apply"
+#~ msgstr "Lagre &#38; Aktiver"
+
+#~ msgid "The following changes have been committed"
+#~ msgstr "Følgende endringer er foretatt"
+
+#~ msgid "There are no pending changes to apply!"
+#~ msgstr "Det finnes ingen endringer som kan utføres!"
+
#~ msgid "Action"
#~ msgstr "Handling"
diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po
index a51d11d2a5..bbfb8cf8d9 100644
--- a/modules/luci-base/po/pt-br/base.po
+++ b/modules/luci-base/po/pt-br/base.po
@@ -434,11 +434,11 @@ msgstr "configuração de antena"
msgid "Any zone"
msgstr "Qualquer zona"
-msgid "Apply"
-msgstr "Aplicar"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "Aplicar as alterações"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -631,12 +631,20 @@ msgstr "Alterações"
msgid "Changes applied."
msgstr "Alterações aplicadas."
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr "Muda a senha do administrador para acessar este dispositivo"
msgid "Channel"
msgstr "Canal"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr "Verificar"
@@ -719,12 +727,15 @@ msgstr ""
msgid "Configuration"
msgstr "Configuração"
-msgid "Configuration applied."
-msgstr "Configuração aplicada."
-
msgid "Configuration files will be kept."
msgstr "Os arquivos de configuração serão mantidos."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
msgid "Confirmation"
msgstr "Confirmação"
@@ -743,6 +754,12 @@ msgstr "A conexão para este servidor falhará quando o TLS não puder ser usado
msgid "Connections"
msgstr "Conexões"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr "País"
@@ -918,6 +935,9 @@ msgstr "O dispositivo está reiniciando..."
msgid "Device unreachable"
msgstr "Dispositivo não alcançável"
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr "Diagnóstico"
@@ -953,6 +973,9 @@ msgid "Discard upstream RFC1918 responses"
msgstr ""
"Descartar respostas de servidores externos para redes privadas (RFC1918)"
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr "Mostre somente os pacotes contendo"
@@ -1222,6 +1245,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr "Arquivo"
@@ -2307,6 +2333,9 @@ msgstr "Senha Ofuscada do Grupo"
msgid "Obfuscated Password"
msgstr "Senha Ofuscada"
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr "Atraso no estado de desligado"
@@ -2923,6 +2952,15 @@ msgstr "Relevar/esconder senha"
msgid "Revert"
msgstr "Reverter"
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr "Raiz"
@@ -3004,9 +3042,6 @@ msgstr "Salvar"
msgid "Save & Apply"
msgstr "Salvar & Aplicar"
-msgid "Save &#38; Apply"
-msgstr "Save &#38; Aplicar"
-
msgid "Scan"
msgstr "Procurar"
@@ -3194,6 +3229,9 @@ msgstr "Iniciar"
msgid "Start priority"
msgstr "Prioridade de iniciação"
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr "Iniciação"
@@ -3364,6 +3402,16 @@ msgstr ""
"O arquivo de configuração não pode ser carregado devido ao seguinte erro:"
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3389,9 +3437,6 @@ msgstr ""
"garantir a integridade dos dados. <br /> Clique em \"Proceder\" para iniciar "
"o procedimetno de gravação."
-msgid "The following changes have been committed"
-msgstr "As seguintes mudanças foram aplicadas"
-
msgid "The following changes have been reverted"
msgstr "As seguintes alterações foram revertidas"
@@ -3477,8 +3522,8 @@ msgstr ""
msgid "There are no active leases."
msgstr "Não existem alocações ativas."
-msgid "There are no pending changes to apply!"
-msgstr "Não existem modificações pendentes para aplicar!"
+msgid "There are no changes to apply."
+msgstr ""
msgid "There are no pending changes to revert!"
msgstr "Não existem modificações pendentes para reverter!"
@@ -3882,6 +3927,9 @@ msgstr "Esperando a aplicação das mudanças..."
msgid "Waiting for command to complete..."
msgstr "Esperando o término do comando..."
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr "Esperando pelo dispositivo..."
@@ -4129,6 +4177,24 @@ msgstr "sim"
msgid "« Back"
msgstr "« Voltar"
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
+
+#~ msgid "Applying changes"
+#~ msgstr "Aplicar as alterações"
+
+#~ msgid "Configuration applied."
+#~ msgstr "Configuração aplicada."
+
+#~ msgid "Save &#38; Apply"
+#~ msgstr "Save &#38; Aplicar"
+
+#~ msgid "The following changes have been committed"
+#~ msgstr "As seguintes mudanças foram aplicadas"
+
+#~ msgid "There are no pending changes to apply!"
+#~ msgstr "Não existem modificações pendentes para aplicar!"
+
#~ msgid "Action"
#~ msgstr "Ação"
diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po
index 843a4cac86..7e191809b8 100644
--- a/modules/luci-base/po/pt/base.po
+++ b/modules/luci-base/po/pt/base.po
@@ -411,11 +411,11 @@ msgstr "Configuração das Antenas"
msgid "Any zone"
msgstr "Qualquer zona"
-msgid "Apply"
-msgstr "Aplicar"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "A aplicar as alterações"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -595,12 +595,20 @@ msgstr "Alterações"
msgid "Changes applied."
msgstr "Alterações aplicadas."
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr "Altera a password de administrador para acesso ao dispositivo"
msgid "Channel"
msgstr "Canal"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr "Verificar"
@@ -681,12 +689,15 @@ msgstr ""
msgid "Configuration"
msgstr "Configuração"
-msgid "Configuration applied."
-msgstr "Configuração aplicada."
-
msgid "Configuration files will be kept."
msgstr "Os ficheiros de configuração serão mantidos."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
msgid "Confirmation"
msgstr "Confirmação"
@@ -705,6 +716,12 @@ msgstr ""
msgid "Connections"
msgstr "Ligações"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr "País"
@@ -878,6 +895,9 @@ msgstr ""
msgid "Device unreachable"
msgstr ""
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr "Diagnósticos"
@@ -912,6 +932,9 @@ msgstr ""
msgid "Discard upstream RFC1918 responses"
msgstr "Descartar respostas RFC1918 a montante"
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr "Mostrar somente pacotes contendo"
@@ -1175,6 +1198,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr "Ficheiro"
@@ -2205,6 +2231,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr "Atraso do Off-State"
@@ -2794,6 +2823,15 @@ msgstr "Revelar/esconder password"
msgid "Revert"
msgstr "Reverter"
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr ""
@@ -2873,9 +2911,6 @@ msgstr "Salvar"
msgid "Save & Apply"
msgstr "Salvar & Aplicar"
-msgid "Save &#38; Apply"
-msgstr "Salvar &#38; Aplicar"
-
msgid "Scan"
msgstr "Procurar"
@@ -3047,6 +3082,9 @@ msgstr "Iniciar"
msgid "Start priority"
msgstr "Prioridade de inicialização"
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr ""
@@ -3203,6 +3241,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3227,9 +3275,6 @@ msgstr ""
"compare com o ficheiro original para assegurar a integração de dados.<br /> "
"Click em \"Proceder\" para iniciar o procedimento."
-msgid "The following changes have been committed"
-msgstr "As seguintes alterações foram escritas"
-
msgid "The following changes have been reverted"
msgstr "Foram recuperadas as seguintes alterações "
@@ -3314,8 +3359,8 @@ msgstr ""
msgid "There are no active leases."
msgstr "Não há concessões ativas."
-msgid "There are no pending changes to apply!"
-msgstr "Não há alterações pendentes para aplicar!"
+msgid "There are no changes to apply."
+msgstr ""
msgid "There are no pending changes to revert!"
msgstr "Não há alterações pendentes para reverter!"
@@ -3688,6 +3733,9 @@ msgstr "A aguardar que as mudanças sejam aplicadas..."
msgid "Waiting for command to complete..."
msgstr "A aguardar que o comando termine..."
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr ""
@@ -3931,6 +3979,24 @@ msgstr "sim"
msgid "« Back"
msgstr "« Voltar"
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
+
+#~ msgid "Applying changes"
+#~ msgstr "A aplicar as alterações"
+
+#~ msgid "Configuration applied."
+#~ msgstr "Configuração aplicada."
+
+#~ msgid "Save &#38; Apply"
+#~ msgstr "Salvar &#38; Aplicar"
+
+#~ msgid "The following changes have been committed"
+#~ msgstr "As seguintes alterações foram escritas"
+
+#~ msgid "There are no pending changes to apply!"
+#~ msgstr "Não há alterações pendentes para aplicar!"
+
#~ msgid "Action"
#~ msgstr "Acção"
diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po
index 748bfdbc53..a7d45e6f6d 100644
--- a/modules/luci-base/po/ro/base.po
+++ b/modules/luci-base/po/ro/base.po
@@ -397,11 +397,11 @@ msgstr "Configurarea Antenei"
msgid "Any zone"
msgstr "Orice Zona"
-msgid "Apply"
-msgstr "Aplica"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "Se aplica modificarile"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -578,12 +578,20 @@ msgstr "Modificari"
msgid "Changes applied."
msgstr "Modificari aplicate."
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr "Schimba parola administratorului pentru accesarea dispozitivului"
msgid "Channel"
msgstr "Canal"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr "Verificare"
@@ -656,12 +664,15 @@ msgstr ""
msgid "Configuration"
msgstr "Configurare"
-msgid "Configuration applied."
-msgstr "Configurarea aplicata."
-
msgid "Configuration files will be kept."
msgstr "Fisierele de configurare vor fi pastrate."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
msgid "Confirmation"
msgstr "Confirmare"
@@ -680,6 +691,12 @@ msgstr ""
msgid "Connections"
msgstr "Conexiuni"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr "Tara"
@@ -848,6 +865,9 @@ msgstr ""
msgid "Device unreachable"
msgstr ""
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr "Diagnosticuri"
@@ -882,6 +902,9 @@ msgstr ""
msgid "Discard upstream RFC1918 responses"
msgstr ""
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr ""
@@ -1127,6 +1150,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr "Fisier"
@@ -2135,6 +2161,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr ""
@@ -2707,6 +2736,15 @@ msgstr "Arata / ascunde parola"
msgid "Revert"
msgstr ""
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr ""
@@ -2783,9 +2821,6 @@ msgstr "Salveaza"
msgid "Save & Apply"
msgstr "Salveaza si aplica"
-msgid "Save &#38; Apply"
-msgstr "Salveaza &#38; Aplica"
-
msgid "Scan"
msgstr "Scan"
@@ -2957,6 +2992,9 @@ msgstr "Start"
msgid "Start priority"
msgstr ""
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr "Pornire"
@@ -3107,6 +3145,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3123,9 +3171,6 @@ msgid ""
"\"Proceed\" below to start the flash procedure."
msgstr ""
-msgid "The following changes have been committed"
-msgstr ""
-
msgid "The following changes have been reverted"
msgstr ""
@@ -3191,8 +3236,8 @@ msgstr ""
msgid "There are no active leases."
msgstr ""
-msgid "There are no pending changes to apply!"
-msgstr "Nu exista modificari in asteptare de aplicat !"
+msgid "There are no changes to apply."
+msgstr ""
msgid "There are no pending changes to revert!"
msgstr "Nu exista modificari in asteptare de anulat !"
@@ -3556,6 +3601,9 @@ msgstr ""
msgid "Waiting for command to complete..."
msgstr ""
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr ""
@@ -3789,6 +3837,21 @@ msgstr "da"
msgid "« Back"
msgstr "« Inapoi"
+#~ msgid "Apply"
+#~ msgstr "Aplica"
+
+#~ msgid "Applying changes"
+#~ msgstr "Se aplica modificarile"
+
+#~ msgid "Configuration applied."
+#~ msgstr "Configurarea aplicata."
+
+#~ msgid "Save &#38; Apply"
+#~ msgstr "Salveaza &#38; Aplica"
+
+#~ msgid "There are no pending changes to apply!"
+#~ msgstr "Nu exista modificari in asteptare de aplicat !"
+
#~ msgid "Action"
#~ msgstr "Actiune"
diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po
index 35a697620e..91aacdeb49 100644
--- a/modules/luci-base/po/ru/base.po
+++ b/modules/luci-base/po/ru/base.po
@@ -417,11 +417,11 @@ msgstr "Настройка антенн"
msgid "Any zone"
msgstr "Любая зона"
-msgid "Apply"
-msgstr "Принять"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "Применение изменений"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -616,12 +616,20 @@ msgstr "Изменения"
msgid "Changes applied."
msgstr "Изменения приняты."
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr "Изменить пароль администратора для доступа к устройству."
msgid "Channel"
msgstr "Канал"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr "Проверить"
@@ -710,12 +718,15 @@ msgstr ""
msgid "Configuration"
msgstr "Настройка config файла"
-msgid "Configuration applied."
-msgstr "Изменение настроек config файлов."
-
msgid "Configuration files will be kept."
msgstr "Config файлы будут сохранены."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
msgid "Confirmation"
msgstr "Подтверждение пароля"
@@ -734,6 +745,12 @@ msgstr "Связь с сервером прерывается, когда TLS н
msgid "Connections"
msgstr "Соединения"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr "Страна"
@@ -909,6 +926,9 @@ msgstr "Перезагрузка..."
msgid "Device unreachable"
msgstr "Устройство недоступно"
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr "Диагностика"
@@ -943,6 +963,9 @@ msgstr "Отключено (по умолчанию)"
msgid "Discard upstream RFC1918 responses"
msgstr "Отбрасывать ответы внешней сети RFC1918."
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr "Показываются только пакеты, содержащие"
@@ -1207,6 +1230,9 @@ msgstr "FT над the Air"
msgid "FT protocol"
msgstr "FT протокол"
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr "Файл"
@@ -2263,6 +2289,9 @@ msgstr "Obfuscated Group Password"
msgid "Obfuscated Password"
msgstr "Obfuscated Password"
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr "Задержка выключенного состояния"
@@ -2884,6 +2913,15 @@ msgstr "Показать/скрыть пароль"
msgid "Revert"
msgstr "Вернуть"
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr "Корень"
@@ -2964,9 +3002,6 @@ msgstr "Сохранить"
msgid "Save & Apply"
msgstr "Сохранить и применить"
-msgid "Save &#38; Apply"
-msgstr "Сохранить и применить"
-
msgid "Scan"
msgstr "Поиск"
@@ -3152,6 +3187,9 @@ msgstr "Старт"
msgid "Start priority"
msgstr "Приоритет"
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr "Загрузка"
@@ -3320,6 +3358,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr "Не удалось загрузить config файл из-за следующей ошибки:"
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3343,9 +3391,6 @@ msgstr ""
"удостовериться в целостности данных.<br /> Нажмите 'Продолжить', чтобы "
"начать процедуру обновления прошивки."
-msgid "The following changes have been committed"
-msgstr "Ваши настройки были применены."
-
msgid "The following changes have been reverted"
msgstr "Ваши настройки были отвергнуты."
@@ -3429,8 +3474,8 @@ msgstr ""
msgid "There are no active leases."
msgstr "Нет активных арендованных адресов."
-msgid "There are no pending changes to apply!"
-msgstr "Нет изменений, которые можно применить!"
+msgid "There are no changes to apply."
+msgstr ""
msgid "There are no pending changes to revert!"
msgstr "Нет изменений, которые можно отменить!"
@@ -3832,6 +3877,9 @@ msgstr "Ожидание применения изменений..."
msgid "Waiting for command to complete..."
msgstr "Ожидание завершения выполнения команды..."
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr "Ожидание подключения устройства..."
@@ -4077,3 +4125,21 @@ msgstr "да"
msgid "« Back"
msgstr "« Назад"
+
+#~ msgid "Apply"
+#~ msgstr "Принять"
+
+#~ msgid "Applying changes"
+#~ msgstr "Применение изменений"
+
+#~ msgid "Configuration applied."
+#~ msgstr "Изменение настроек config файлов."
+
+#~ msgid "Save &#38; Apply"
+#~ msgstr "Сохранить и применить"
+
+#~ msgid "The following changes have been committed"
+#~ msgstr "Ваши настройки были применены."
+
+#~ msgid "There are no pending changes to apply!"
+#~ msgstr "Нет изменений, которые можно применить!"
diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po
index acc57792b3..7f3d249e15 100644
--- a/modules/luci-base/po/sk/base.po
+++ b/modules/luci-base/po/sk/base.po
@@ -383,10 +383,10 @@ msgstr ""
msgid "Any zone"
msgstr ""
-msgid "Apply"
+msgid "Apply request failed with status <code>%h</code>"
msgstr ""
-msgid "Applying changes"
+msgid "Apply unchecked"
msgstr ""
msgid ""
@@ -564,12 +564,20 @@ msgstr ""
msgid "Changes applied."
msgstr ""
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr ""
msgid "Channel"
msgstr ""
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr ""
@@ -639,10 +647,13 @@ msgstr ""
msgid "Configuration"
msgstr ""
-msgid "Configuration applied."
+msgid "Configuration files will be kept."
msgstr ""
-msgid "Configuration files will be kept."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
msgstr ""
msgid "Confirmation"
@@ -663,6 +674,12 @@ msgstr ""
msgid "Connections"
msgstr ""
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr ""
@@ -831,6 +848,9 @@ msgstr ""
msgid "Device unreachable"
msgstr ""
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr ""
@@ -863,6 +883,9 @@ msgstr ""
msgid "Discard upstream RFC1918 responses"
msgstr ""
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr ""
@@ -1108,6 +1131,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr ""
@@ -2110,6 +2136,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr ""
@@ -2680,6 +2709,15 @@ msgstr ""
msgid "Revert"
msgstr ""
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr ""
@@ -2756,9 +2794,6 @@ msgstr ""
msgid "Save & Apply"
msgstr ""
-msgid "Save &#38; Apply"
-msgstr ""
-
msgid "Scan"
msgstr ""
@@ -2929,6 +2964,9 @@ msgstr ""
msgid "Start priority"
msgstr ""
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr ""
@@ -3079,6 +3117,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3095,9 +3143,6 @@ msgid ""
"\"Proceed\" below to start the flash procedure."
msgstr ""
-msgid "The following changes have been committed"
-msgstr ""
-
msgid "The following changes have been reverted"
msgstr ""
@@ -3163,7 +3208,7 @@ msgstr ""
msgid "There are no active leases."
msgstr ""
-msgid "There are no pending changes to apply!"
+msgid "There are no changes to apply."
msgstr ""
msgid "There are no pending changes to revert!"
@@ -3524,6 +3569,9 @@ msgstr ""
msgid "Waiting for command to complete..."
msgstr ""
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr ""
diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po
index 632ea6f745..770fca2e53 100644
--- a/modules/luci-base/po/sv/base.po
+++ b/modules/luci-base/po/sv/base.po
@@ -394,11 +394,11 @@ msgstr "Konfiguration av antenn"
msgid "Any zone"
msgstr "Någon zon"
-msgid "Apply"
-msgstr "Verkställ"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "Verkställer ändringar"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -576,12 +576,20 @@ msgstr "Ändringar"
msgid "Changes applied."
msgstr "Tillämpade ändringar"
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr "Ändrar administratörens lösenord för att få tillgång till enheten"
msgid "Channel"
msgstr "Kanal"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr "Kontrollera"
@@ -653,12 +661,15 @@ msgstr ""
msgid "Configuration"
msgstr "Konfiguration"
-msgid "Configuration applied."
-msgstr "Konfigurationen tillämpades"
-
msgid "Configuration files will be kept."
msgstr "Konfigurationsfiler kommer att behållas."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
msgid "Confirmation"
msgstr "Bekräftelse"
@@ -677,6 +688,12 @@ msgstr ""
msgid "Connections"
msgstr "Anslutningar"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr "Land"
@@ -845,6 +862,9 @@ msgstr "Enheten startar om..."
msgid "Device unreachable"
msgstr "Enheten kan inte nås"
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr ""
@@ -879,6 +899,9 @@ msgstr "Inaktiverad (standard)"
msgid "Discard upstream RFC1918 responses"
msgstr ""
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr ""
@@ -1128,6 +1151,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr "Fil"
@@ -2131,6 +2157,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr ""
@@ -2703,6 +2732,15 @@ msgstr "Visa/göm lösenord"
msgid "Revert"
msgstr "Återgå"
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr "Root"
@@ -2779,9 +2817,6 @@ msgstr "Spara"
msgid "Save & Apply"
msgstr "Spara och Verkställ"
-msgid "Save &#38; Apply"
-msgstr "Spara &#38; Verkställ"
-
msgid "Scan"
msgstr "Skanna"
@@ -2952,6 +2987,9 @@ msgstr ""
msgid "Start priority"
msgstr ""
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr ""
@@ -3102,6 +3140,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3118,9 +3166,6 @@ msgid ""
"\"Proceed\" below to start the flash procedure."
msgstr ""
-msgid "The following changes have been committed"
-msgstr "Följande ändringar har skickats in"
-
msgid "The following changes have been reverted"
msgstr ""
@@ -3186,8 +3231,8 @@ msgstr ""
msgid "There are no active leases."
msgstr "Det finns inga aktiva kontrakt."
-msgid "There are no pending changes to apply!"
-msgstr "Det finns inga pendlande ändringar att verkställa!"
+msgid "There are no changes to apply."
+msgstr ""
msgid "There are no pending changes to revert!"
msgstr "Det finns inga pendlande ändringar att återkalla"
@@ -3551,6 +3596,9 @@ msgstr "Väntar på att ändringarna ska tillämpas..."
msgid "Waiting for command to complete..."
msgstr "Väntar på att kommandot ska avsluta..."
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr "Väntar på enheten..."
@@ -3790,6 +3838,24 @@ msgstr "ja"
msgid "« Back"
msgstr "« Bakåt"
+#~ msgid "Apply"
+#~ msgstr "Verkställ"
+
+#~ msgid "Applying changes"
+#~ msgstr "Verkställer ändringar"
+
+#~ msgid "Configuration applied."
+#~ msgstr "Konfigurationen tillämpades"
+
+#~ msgid "Save &#38; Apply"
+#~ msgstr "Spara &#38; Verkställ"
+
+#~ msgid "The following changes have been committed"
+#~ msgstr "Följande ändringar har skickats in"
+
+#~ msgid "There are no pending changes to apply!"
+#~ msgstr "Det finns inga pendlande ändringar att verkställa!"
+
#~ msgid "Action"
#~ msgstr "Åtgärd"
diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot
index ddf2e56faa..ebbe6c6dcf 100644
--- a/modules/luci-base/po/templates/base.pot
+++ b/modules/luci-base/po/templates/base.pot
@@ -376,10 +376,10 @@ msgstr ""
msgid "Any zone"
msgstr ""
-msgid "Apply"
+msgid "Apply request failed with status <code>%h</code>"
msgstr ""
-msgid "Applying changes"
+msgid "Apply unchecked"
msgstr ""
msgid ""
@@ -557,12 +557,20 @@ msgstr ""
msgid "Changes applied."
msgstr ""
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr ""
msgid "Channel"
msgstr ""
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr ""
@@ -632,10 +640,13 @@ msgstr ""
msgid "Configuration"
msgstr ""
-msgid "Configuration applied."
+msgid "Configuration files will be kept."
msgstr ""
-msgid "Configuration files will be kept."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
msgstr ""
msgid "Confirmation"
@@ -656,6 +667,12 @@ msgstr ""
msgid "Connections"
msgstr ""
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr ""
@@ -824,6 +841,9 @@ msgstr ""
msgid "Device unreachable"
msgstr ""
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr ""
@@ -856,6 +876,9 @@ msgstr ""
msgid "Discard upstream RFC1918 responses"
msgstr ""
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr ""
@@ -1101,6 +1124,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr ""
@@ -2103,6 +2129,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr ""
@@ -2673,6 +2702,15 @@ msgstr ""
msgid "Revert"
msgstr ""
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr ""
@@ -2749,9 +2787,6 @@ msgstr ""
msgid "Save & Apply"
msgstr ""
-msgid "Save &#38; Apply"
-msgstr ""
-
msgid "Scan"
msgstr ""
@@ -2922,6 +2957,9 @@ msgstr ""
msgid "Start priority"
msgstr ""
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr ""
@@ -3072,6 +3110,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3088,9 +3136,6 @@ msgid ""
"\"Proceed\" below to start the flash procedure."
msgstr ""
-msgid "The following changes have been committed"
-msgstr ""
-
msgid "The following changes have been reverted"
msgstr ""
@@ -3156,7 +3201,7 @@ msgstr ""
msgid "There are no active leases."
msgstr ""
-msgid "There are no pending changes to apply!"
+msgid "There are no changes to apply."
msgstr ""
msgid "There are no pending changes to revert!"
@@ -3517,6 +3562,9 @@ msgstr ""
msgid "Waiting for command to complete..."
msgstr ""
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr ""
diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po
index 953d1e9669..aba91126d6 100644
--- a/modules/luci-base/po/tr/base.po
+++ b/modules/luci-base/po/tr/base.po
@@ -396,11 +396,11 @@ msgstr "Anten Yapılandırması"
msgid "Any zone"
msgstr ""
-msgid "Apply"
-msgstr "Uygula"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "Değişiklikleri uygula"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -577,12 +577,20 @@ msgstr ""
msgid "Changes applied."
msgstr ""
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr ""
msgid "Channel"
msgstr ""
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr ""
@@ -652,10 +660,13 @@ msgstr ""
msgid "Configuration"
msgstr ""
-msgid "Configuration applied."
+msgid "Configuration files will be kept."
msgstr ""
-msgid "Configuration files will be kept."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
msgstr ""
msgid "Confirmation"
@@ -676,6 +687,12 @@ msgstr ""
msgid "Connections"
msgstr ""
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr ""
@@ -844,6 +861,9 @@ msgstr ""
msgid "Device unreachable"
msgstr ""
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr ""
@@ -876,6 +896,9 @@ msgstr ""
msgid "Discard upstream RFC1918 responses"
msgstr ""
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr ""
@@ -1121,6 +1144,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr ""
@@ -2123,6 +2149,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr ""
@@ -2693,6 +2722,15 @@ msgstr ""
msgid "Revert"
msgstr ""
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr ""
@@ -2769,9 +2807,6 @@ msgstr ""
msgid "Save & Apply"
msgstr ""
-msgid "Save &#38; Apply"
-msgstr ""
-
msgid "Scan"
msgstr ""
@@ -2942,6 +2977,9 @@ msgstr ""
msgid "Start priority"
msgstr ""
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr ""
@@ -3092,6 +3130,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3108,9 +3156,6 @@ msgid ""
"\"Proceed\" below to start the flash procedure."
msgstr ""
-msgid "The following changes have been committed"
-msgstr ""
-
msgid "The following changes have been reverted"
msgstr ""
@@ -3176,7 +3221,7 @@ msgstr ""
msgid "There are no active leases."
msgstr ""
-msgid "There are no pending changes to apply!"
+msgid "There are no changes to apply."
msgstr ""
msgid "There are no pending changes to revert!"
@@ -3537,6 +3582,9 @@ msgstr ""
msgid "Waiting for command to complete..."
msgstr ""
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr ""
@@ -3772,6 +3820,12 @@ msgstr "evet"
msgid "« Back"
msgstr "« Geri"
+#~ msgid "Apply"
+#~ msgstr "Uygula"
+
+#~ msgid "Applying changes"
+#~ msgstr "Değişiklikleri uygula"
+
#~ msgid "Action"
#~ msgstr "Eylem"
diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po
index 8ead616074..e86bd81a8e 100644
--- a/modules/luci-base/po/uk/base.po
+++ b/modules/luci-base/po/uk/base.po
@@ -420,11 +420,11 @@ msgstr "Конфигурація антени"
msgid "Any zone"
msgstr "Будь-яка зона"
-msgid "Apply"
-msgstr "Застосувати"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "Застосування змін"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -604,12 +604,20 @@ msgstr "Зміни"
msgid "Changes applied."
msgstr "Зміни застосовано."
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr "Зміна пароля адміністратора для доступу до пристрою"
msgid "Channel"
msgstr "Канал"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr "Перевірити"
@@ -690,12 +698,15 @@ msgstr ""
msgid "Configuration"
msgstr "Конфігурація"
-msgid "Configuration applied."
-msgstr "Конфігурація застосована."
-
msgid "Configuration files will be kept."
msgstr "Конфігураційні файли будуть збережені."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
msgid "Confirmation"
msgstr "Підтвердження"
@@ -714,6 +725,12 @@ msgstr ""
msgid "Connections"
msgstr "Підключення"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr "Країна"
@@ -887,6 +904,9 @@ msgstr ""
msgid "Device unreachable"
msgstr ""
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr "Діагностика"
@@ -921,6 +941,9 @@ msgstr ""
msgid "Discard upstream RFC1918 responses"
msgstr "Відкидати RFC1918-відповіді від клієнта на сервер"
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr "Показані тільки непорожні пакети"
@@ -1184,6 +1207,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr "Файл"
@@ -2219,6 +2245,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr "Затримка Off-State"
@@ -2818,6 +2847,15 @@ msgstr "Показати/приховати пароль"
msgid "Revert"
msgstr "Скасувати зміни"
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr "Корінь"
@@ -2896,9 +2934,6 @@ msgstr "Зберегти"
msgid "Save & Apply"
msgstr "Зберегти і застосувати"
-msgid "Save &#38; Apply"
-msgstr "Зберегти і застосувати"
-
msgid "Scan"
msgstr "Сканувати"
@@ -3079,6 +3114,9 @@ msgstr "Запустити"
msgid "Start priority"
msgstr "Стартовий пріоритет"
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr "Запуск"
@@ -3245,6 +3283,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr "Файл пристрою пам'яті або розділу (наприклад, <code>/dev/sda1</code>)"
@@ -3267,9 +3315,6 @@ msgstr ""
"їх з вихідним файлом для забезпечення цілісності даних.<br /> Натисніть "
"\"Продовжити\", щоб розпочати процедуру оновлення прошивки."
-msgid "The following changes have been committed"
-msgstr "Нижче наведені зміни були застосовані"
-
msgid "The following changes have been reverted"
msgstr "Нижче наведені зміни були скасовані"
@@ -3355,8 +3400,8 @@ msgstr ""
msgid "There are no active leases."
msgstr "Активних оренд немає."
-msgid "There are no pending changes to apply!"
-msgstr "Немає жодних змін до застосування!"
+msgid "There are no changes to apply."
+msgstr ""
msgid "There are no pending changes to revert!"
msgstr "Немає жодних змін до скасування!"
@@ -3746,6 +3791,9 @@ msgstr "Очікуємо, доки зміни наберуть чинності.
msgid "Waiting for command to complete..."
msgstr "Очікуємо завершення виконання команди..."
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr ""
@@ -3989,6 +4037,24 @@ msgstr "так"
msgid "« Back"
msgstr "« Назад"
+#~ msgid "Apply"
+#~ msgstr "Застосувати"
+
+#~ msgid "Applying changes"
+#~ msgstr "Застосування змін"
+
+#~ msgid "Configuration applied."
+#~ msgstr "Конфігурація застосована."
+
+#~ msgid "Save &#38; Apply"
+#~ msgstr "Зберегти і застосувати"
+
+#~ msgid "The following changes have been committed"
+#~ msgstr "Нижче наведені зміни були застосовані"
+
+#~ msgid "There are no pending changes to apply!"
+#~ msgstr "Немає жодних змін до застосування!"
+
#~ msgid "Action"
#~ msgstr "Дія"
diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po
index 888fc92bfe..8dacc12e65 100644
--- a/modules/luci-base/po/vi/base.po
+++ b/modules/luci-base/po/vi/base.po
@@ -390,11 +390,11 @@ msgstr ""
msgid "Any zone"
msgstr ""
-msgid "Apply"
-msgstr "Áp dụng"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "Tiến hành thay đổi"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -571,12 +571,20 @@ msgstr "Thay đổi"
msgid "Changes applied."
msgstr "Thay đổi đã áp dụng"
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr ""
msgid "Channel"
msgstr "Kênh"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr ""
@@ -646,10 +654,13 @@ msgstr ""
msgid "Configuration"
msgstr "Cấu hình"
-msgid "Configuration applied."
+msgid "Configuration files will be kept."
msgstr ""
-msgid "Configuration files will be kept."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
msgstr ""
msgid "Confirmation"
@@ -670,6 +681,12 @@ msgstr ""
msgid "Connections"
msgstr ""
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr ""
@@ -840,6 +857,9 @@ msgstr ""
msgid "Device unreachable"
msgstr ""
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr ""
@@ -872,6 +892,9 @@ msgstr ""
msgid "Discard upstream RFC1918 responses"
msgstr ""
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr ""
@@ -1126,6 +1149,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr ""
@@ -2140,6 +2166,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr ""
@@ -2718,6 +2747,15 @@ msgstr ""
msgid "Revert"
msgstr "Revert"
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr ""
@@ -2796,9 +2834,6 @@ msgstr "Lưu"
msgid "Save & Apply"
msgstr "Lưu & áp dụng "
-msgid "Save &#38; Apply"
-msgstr ""
-
msgid "Scan"
msgstr "Scan"
@@ -2969,6 +3004,9 @@ msgstr "Bắt đầu "
msgid "Start priority"
msgstr "Bắt đầu ưu tiên"
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr ""
@@ -3119,6 +3157,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3139,9 +3187,6 @@ msgid ""
"\"Proceed\" below to start the flash procedure."
msgstr ""
-msgid "The following changes have been committed"
-msgstr ""
-
msgid "The following changes have been reverted"
msgstr "Những thay đối sau đây đã được để trở về tình trạng cũ. "
@@ -3213,7 +3258,7 @@ msgstr ""
msgid "There are no active leases."
msgstr ""
-msgid "There are no pending changes to apply!"
+msgid "There are no changes to apply."
msgstr ""
msgid "There are no pending changes to revert!"
@@ -3579,6 +3624,9 @@ msgstr ""
msgid "Waiting for command to complete..."
msgstr ""
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr ""
@@ -3818,6 +3866,12 @@ msgstr ""
msgid "« Back"
msgstr ""
+#~ msgid "Apply"
+#~ msgstr "Áp dụng"
+
+#~ msgid "Applying changes"
+#~ msgstr "Tiến hành thay đổi"
+
#~ msgid "Action"
#~ msgstr "Action"
diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po
index df6ce8b746..8399e947b8 100644
--- a/modules/luci-base/po/zh-cn/base.po
+++ b/modules/luci-base/po/zh-cn/base.po
@@ -390,11 +390,11 @@ msgstr "天线配置"
msgid "Any zone"
msgstr "任意区域"
-msgid "Apply"
-msgstr "应用"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "正在应用更改"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -573,12 +573,20 @@ msgstr "修改数"
msgid "Changes applied."
msgstr "更改已应用"
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr "修改访问设备的管理员密码"
msgid "Channel"
msgstr "信道"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr "检查"
@@ -655,12 +663,15 @@ msgstr ""
msgid "Configuration"
msgstr "配置"
-msgid "Configuration applied."
-msgstr "配置已应用。"
-
msgid "Configuration files will be kept."
msgstr "配置文件将被保留。"
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
msgid "Confirmation"
msgstr "确认密码"
@@ -679,6 +690,12 @@ msgstr "当 TLS 不可用时,与服务器连接失败"
msgid "Connections"
msgstr "连接"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr "国家"
@@ -850,6 +867,9 @@ msgstr "设备正在重启..."
msgid "Device unreachable"
msgstr "无法连接到设备"
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr "网络诊断"
@@ -884,6 +904,9 @@ msgstr "禁用(默认)"
msgid "Discard upstream RFC1918 responses"
msgstr "丢弃 RFC1918 上行响应数据"
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr "只显示有内容的软件包"
@@ -1136,6 +1159,9 @@ msgstr ""
msgid "FT protocol"
msgstr "FT 协议"
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr "文件"
@@ -2156,6 +2182,9 @@ msgstr "混淆组密码"
msgid "Obfuscated Password"
msgstr "混淆密码"
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr "关闭时间"
@@ -2749,6 +2778,15 @@ msgstr "显示/隐藏 密码"
msgid "Revert"
msgstr "放弃"
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr "Root"
@@ -2825,9 +2863,6 @@ msgstr "保存"
msgid "Save & Apply"
msgstr "保存&应用"
-msgid "Save &#38; Apply"
-msgstr "保存&#38;应用"
-
msgid "Scan"
msgstr "扫描"
@@ -3002,6 +3037,9 @@ msgstr "开始"
msgid "Start priority"
msgstr "启动优先级"
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr "启动项"
@@ -3159,6 +3197,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr "由于以下错误,配置文件无法被加载:"
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr "存储器或分区的设备文件,(例如:<code>/dev/sda1</code>)"
@@ -3179,9 +3227,6 @@ msgstr ""
"固件已上传,请注意核对文件大小和校验值!<br />点击下面的“继续”开始刷写,刷新"
"过程中切勿断电!"
-msgid "The following changes have been committed"
-msgstr "以下更改已提交"
-
msgid "The following changes have been reverted"
msgstr "以下更改已放弃"
@@ -3253,8 +3298,8 @@ msgstr "不支持所上传的映像文件格式,请选择适合当前平台的
msgid "There are no active leases."
msgstr "没有已分配的租约。"
-msgid "There are no pending changes to apply!"
-msgstr "没有待生效的更改!"
+msgid "There are no changes to apply."
+msgstr ""
msgid "There are no pending changes to revert!"
msgstr "没有可放弃的更改!"
@@ -3629,6 +3674,9 @@ msgstr "正在应用更改..."
msgid "Waiting for command to complete..."
msgstr "等待命令执行完成..."
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr "等待设备..."
@@ -3868,6 +3916,24 @@ msgstr "是"
msgid "« Back"
msgstr "« 后退"
+#~ msgid "Apply"
+#~ msgstr "应用"
+
+#~ msgid "Applying changes"
+#~ msgstr "正在应用更改"
+
+#~ msgid "Configuration applied."
+#~ msgstr "配置已应用。"
+
+#~ msgid "Save &#38; Apply"
+#~ msgstr "保存&#38;应用"
+
+#~ msgid "The following changes have been committed"
+#~ msgstr "以下更改已提交"
+
+#~ msgid "There are no pending changes to apply!"
+#~ msgstr "没有待生效的更改!"
+
#~ msgid "Action"
#~ msgstr "动作"
diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po
index edc5207bd9..c62fd0d9b9 100644
--- a/modules/luci-base/po/zh-tw/base.po
+++ b/modules/luci-base/po/zh-tw/base.po
@@ -393,11 +393,11 @@ msgstr "天線設定"
msgid "Any zone"
msgstr "任意區域"
-msgid "Apply"
-msgstr "套用"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
-msgid "Applying changes"
-msgstr "正在套用變更"
+msgid "Apply unchecked"
+msgstr ""
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -576,12 +576,20 @@ msgstr "待修改"
msgid "Changes applied."
msgstr "修改已套用"
+msgid "Changes have been reverted."
+msgstr ""
+
msgid "Changes the administrator password for accessing the device"
msgstr "修改管理員密碼"
msgid "Channel"
msgstr "頻道"
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
msgid "Check"
msgstr "檢查"
@@ -657,12 +665,15 @@ msgstr ""
msgid "Configuration"
msgstr "設定"
-msgid "Configuration applied."
-msgstr "啟用設定"
-
msgid "Configuration files will be kept."
msgstr "設定檔將被存檔"
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
msgid "Confirmation"
msgstr "再確認"
@@ -681,6 +692,12 @@ msgstr ""
msgid "Connections"
msgstr "連線數"
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
msgid "Country"
msgstr "國別"
@@ -853,6 +870,9 @@ msgstr ""
msgid "Device unreachable"
msgstr ""
+msgid "Device unreachable!"
+msgstr ""
+
msgid "Diagnostics"
msgstr "診斷"
@@ -886,6 +906,9 @@ msgstr ""
msgid "Discard upstream RFC1918 responses"
msgstr "丟棄上游RFC1918 虛擬IP網路的回應"
+msgid "Dismiss"
+msgstr ""
+
msgid "Displaying only packages containing"
msgstr "僅顯示內含的軟體"
@@ -1139,6 +1162,9 @@ msgstr ""
msgid "FT protocol"
msgstr ""
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
msgid "File"
msgstr "檔案"
@@ -2147,6 +2173,9 @@ msgstr ""
msgid "Obfuscated Password"
msgstr ""
+msgid "Obtain IPv6-Address"
+msgstr ""
+
msgid "Off-State Delay"
msgstr "關閉狀態延遲"
@@ -2732,6 +2761,15 @@ msgstr "明示/隱藏 密碼"
msgid "Revert"
msgstr "回溯"
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
msgid "Root"
msgstr "根"
@@ -2808,9 +2846,6 @@ msgstr "保存"
msgid "Save & Apply"
msgstr "保存並啟用"
-msgid "Save &#38; Apply"
-msgstr "保存 &#38; 啟用"
-
msgid "Scan"
msgstr "掃描"
@@ -2984,6 +3019,9 @@ msgstr "啟用"
msgid "Start priority"
msgstr "啟用優先權順序"
+msgid "Starting configuration apply…"
+msgstr ""
+
msgid "Startup"
msgstr "啟動"
@@ -3145,6 +3183,16 @@ msgid "The configuration file could not be loaded due to the following error:"
msgstr ""
msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
"</abbr> <code>/dev/sda1</code>)"
msgstr ""
@@ -3167,9 +3215,6 @@ msgstr ""
"要刷的映像檔已上傳.下面是這個校驗碼和檔案大小詳列, 用原始檔比對它門以確保資料"
"完整性.<br />按下面的\"繼續\"便可以開啟更新流程."
-msgid "The following changes have been committed"
-msgstr "接下來的修改已經被承諾"
-
msgid "The following changes have been reverted"
msgstr "接下來的修改已經被回復"
@@ -3244,8 +3289,8 @@ msgstr ""
msgid "There are no active leases."
msgstr "租賃尚未啟動."
-msgid "There are no pending changes to apply!"
-msgstr "尚無聽候的修改被採用"
+msgid "There are no changes to apply."
+msgstr ""
msgid "There are no pending changes to revert!"
msgstr "尚無聽候的修改被復元!"
@@ -3618,6 +3663,9 @@ msgstr "等待修改被啟用..."
msgid "Waiting for command to complete..."
msgstr "等待完整性指令..."
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
msgid "Waiting for device..."
msgstr ""
@@ -3855,6 +3903,24 @@ msgstr "是的"
msgid "« Back"
msgstr "« 倒退"
+#~ msgid "Apply"
+#~ msgstr "套用"
+
+#~ msgid "Applying changes"
+#~ msgstr "正在套用變更"
+
+#~ msgid "Configuration applied."
+#~ msgstr "啟用設定"
+
+#~ msgid "Save &#38; Apply"
+#~ msgstr "保存 &#38; 啟用"
+
+#~ msgid "The following changes have been committed"
+#~ msgstr "接下來的修改已經被承諾"
+
+#~ msgid "There are no pending changes to apply!"
+#~ msgstr "尚無聽候的修改被採用"
+
#~ msgid "Action"
#~ msgstr "動作"