luci-app-firewall: rework rule descriptions, deduplicate code

Use a simple custom format string DSL to assemble the rule description
texts in the overview page.

Also move common code for shared, complex cbi options to the firewall
tool class.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

1 files changed, 89 insertions, 89 deletions

diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po
index 8448251e71..d87d9ab1ab 100644
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@ -23,7 +23,7 @@ msgstr "%.1f dB"
 msgid "%d Bit"
 msgstr "%d ビット"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2287
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2321
 msgid "%d invalid field(s)"
 msgstr "無効な入力欄: %d 個"
 
@@ -59,11 +59,11 @@ msgid "-- Additional Field --"
 msgstr "-- 追加項目 --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1658
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1789
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1680
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1811
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:315
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:415
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1249
 #: modules/luci-compat/luasrc/view/cbi/header.htm:5
 #: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
@@ -71,7 +71,7 @@ msgstr "-- 選択してください --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:416
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1244
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1250
 #: modules/luci-compat/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- 手動設定 --"
@@ -244,7 +244,7 @@ msgstr ""
 "<br />注意: 編集前の crontab ファイルが空の場合、手動で cron サービスの再起動"
 "を行う必要があります。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1695
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1729
 msgid "A directory with the same name already exists."
 msgstr "同名のディレクトリが既に存在します。"
 
@@ -367,11 +367,11 @@ msgstr "アクティブなDHCPv6リース"
 msgid "Ad-Hoc"
 msgstr "アドホック"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:909
-#: modules/luci-base/htdocs/luci-static/resources/form.js:911
-#: modules/luci-base/htdocs/luci-static/resources/form.js:924
-#: modules/luci-base/htdocs/luci-static/resources/form.js:925
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1548
+#: modules/luci-base/htdocs/luci-static/resources/form.js:931
+#: modules/luci-base/htdocs/luci-static/resources/form.js:933
+#: modules/luci-base/htdocs/luci-static/resources/form.js:946
+#: modules/luci-base/htdocs/luci-static/resources/form.js:947
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1570
 #: modules/luci-compat/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-compat/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-compat/luasrc/view/cbi/tblsection.htm:197
@@ -659,16 +659,16 @@ msgstr "全てのゾーン"
 msgid "Apply backup?"
 msgstr "バックアップの適用"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2756
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2790
 msgid "Apply request failed with status <code>%h</code>"
 msgstr "適用リクエストはステータス <code>%h</code> で失敗しました"
 
 #: modules/luci-base/htdocs/luci-static/resources/luci.js:2927
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2643
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2677
 msgid "Apply unchecked"
 msgstr "チェック無しの適用"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2715
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2749
 msgid "Applying configuration changes… %ds"
 msgstr "設定を適用中です… %d 秒"
 
@@ -898,8 +898,8 @@ msgstr "ブリッジ ユニット番号"
 msgid "Bring up on boot"
 msgstr "デフォルトで起動する"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1783
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2368
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2402
 msgid "Browse…"
 msgstr "参照..."
 
@@ -930,8 +930,8 @@ msgstr "キャッシュ済"
 msgid "Call failed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1875
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2377
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1909
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2411
 #: modules/luci-compat/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-compat/luasrc/view/cbi/simpleform.htm:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:182
@@ -997,11 +997,11 @@ msgstr ""
 msgid "Chain"
 msgstr "チェイン"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2531
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2565
 msgid "Changes"
 msgstr "変更"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2779
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2813
 msgid "Changes have been reverted."
 msgstr "変更は取り消されました。"
 
@@ -1156,16 +1156,16 @@ msgstr ""
 "この回避策は、相互運用性の問題や、特に高負荷のトラフィック環境下におけるキー "
 "ネゴシエーションの信頼性低下の原因となることがあります。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2531
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2565
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "設定"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2690
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2724
 msgid "Configuration changes applied."
 msgstr "設定が適用されました。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2629
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2663
 msgid "Configuration changes have been rolled back!"
 msgstr "設定はロールバックされました！"
 
@@ -1212,7 +1212,7 @@ msgstr "内容が保存されました。"
 msgid "Continue"
 msgstr "続行"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2665
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2699
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
@@ -1429,11 +1429,11 @@ msgstr ""
 "追加のDHCPオプションを設定します。（例：\"<code>6,192.168.2.1,192.168.2.2</"
 "code>\" と設定することで、クライアントに指定のDNSサーバーを通知します。）"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:973
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1222
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1225
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:995
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1244
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1878
 #: modules/luci-compat/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-compat/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-compat/luasrc/view/cbi/tsection.htm:16
@@ -1445,7 +1445,7 @@ msgstr "削除"
 msgid "Delete key"
 msgstr "公開鍵を削除"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1743
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1777
 msgid "Delete request failed: %s"
 msgstr "削除リクエスト失敗: %s"
 
@@ -1462,7 +1462,7 @@ msgstr "Delivery Traffic Indication Message インターバル"
 msgid "Description"
 msgstr "説明"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1840
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1874
 msgid "Deselect"
 msgstr ""
 
@@ -1507,7 +1507,7 @@ msgstr "デバイスがアクティブではありません"
 msgid "Device is restarting…"
 msgstr "デバイスを再起動中..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2664
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2698
 msgid "Device unreachable!"
 msgstr "デバイスに到達できません"
 
@@ -1524,7 +1524,7 @@ msgstr "診断機能"
 msgid "Dial number"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1644
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
 msgid "Directory"
 msgstr "ディレクトリ"
 
@@ -1591,10 +1591,10 @@ msgstr "切断"
 msgid "Disconnection attempt failed"
 msgstr "切断の試行が失敗しました"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1384
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2081
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2548
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2635
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1406
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2582
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2669
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1749
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:326
 msgid "Dismiss"
@@ -1633,7 +1633,7 @@ msgstr "パブリック DNSサーバーが返答できなかったリクエス�
 msgid "Do not forward reverse lookups for local networks"
 msgstr "ローカル ネットワークへの逆引きを転送しません"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1729
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1763
 msgid "Do you really want to delete \"%s\" ?"
 msgstr "本当に \"%s\" を削除しますか？"
 
@@ -1645,7 +1645,7 @@ msgstr "本当に以下の SSH 公開鍵を削除しますか？"
 msgid "Do you really want to erase all settings?"
 msgstr "本当に全ての設定を消去しますか？"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1727
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1761
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr "本当にディレクトリ \"%s\" を再帰的に削除しますか？"
 
@@ -1685,7 +1685,7 @@ msgstr "mtdblock のダウンロード"
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1181
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1203
 msgid "Drag to reorder"
 msgstr "ドラッグして並び替え"
 
@@ -1731,9 +1731,9 @@ msgstr "EA ビット長"
 msgid "EAP-Method"
 msgstr "EAP メソッド"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1200
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1203
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1459
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1222
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1225
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1481
 #: modules/luci-compat/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-compat/luasrc/view/cbi/tblsection.htm:160
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:334
@@ -2013,7 +2013,7 @@ msgstr ""
 msgid "Failed to change the system password."
 msgstr "システム パスワードの変更に失敗しました。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2623
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2657
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr "%d 秒以内の適用を確認できませんでした。ロールバック中です..."
 
@@ -2021,15 +2021,15 @@ msgstr "%d 秒以内の適用を確認できませんでした。ロールバッ
 msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
 msgstr "\"/etc/init.d/%s %s\" の実行に失敗しました: %s"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1685
 msgid "File"
 msgstr "ファイル"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1604
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1638
 msgid "File not accessible"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1784
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1818
 msgid "Filename"
 msgstr "ファイル名"
 
@@ -2272,8 +2272,8 @@ msgstr "グローバル ネットワークオプション"
 msgid "Go to password configuration..."
 msgstr "パスワード設定へ移動..."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1124
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1626
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1146
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-compat/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-compat/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
@@ -2982,7 +2982,7 @@ msgstr "空欄の場合、自動検知を行います"
 msgid "Leave empty to use the current WAN address"
 msgstr "空欄の場合、現在のWANアドレスを使用します"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2533
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2567
 msgid "Legend:"
 msgstr "凡例:"
 
@@ -3085,7 +3085,7 @@ msgstr "負荷"
 msgid "Load Average"
 msgstr "システム平均負荷"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1905
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1939
 msgid "Loading directory contents…"
 msgstr "ディレクトリ内を読み込み中..."
 
@@ -3417,7 +3417,7 @@ msgstr "モニター"
 msgid "More Characters"
 msgstr "文字数不足"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1067
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1089
 msgid "More…"
 msgstr "さらに表示…"
 
@@ -3508,8 +3508,8 @@ msgstr "NT ドメイン"
 msgid "NTP server candidates"
 msgstr "NTPサーバー候補"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1104
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2354
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1126
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2388
 #: modules/luci-compat/luasrc/view/cbi/tblsection.htm:27
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
@@ -3557,7 +3557,7 @@ msgstr "新規インターフェース名"
 msgid "Next »"
 msgstr "次 »"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1763
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1785
 #: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr "いいえ"
@@ -3578,7 +3578,7 @@ msgstr "NAT-Tを使用しない"
 msgid "No data received"
 msgstr "受信データ無し"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1850
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1884
 msgid "No entries in this directory"
 msgstr "ディレクトリ内にエントリーがありません"
 
@@ -3781,11 +3781,11 @@ msgstr "OpenConnect (CISCO AnyConnect)"
 msgid "Operating frequency"
 msgstr "動作周波数"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2540
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2574
 msgid "Option changed"
 msgstr "変更されるオプション"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2542
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2576
 msgid "Option removed"
 msgstr "削除されるオプション"
 
@@ -3934,7 +3934,7 @@ msgstr "内部ルートに使用されるテーブルを上書きします。"
 msgid "Overview"
 msgstr "概要"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1696
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1730
 msgid "Overwrite existing file \"%s\" ?"
 msgstr "既存のファイル \"%s\" を上書きしますか？"
 
@@ -4177,7 +4177,7 @@ msgstr "パケット"
 msgid "Please enter your username and password."
 msgstr "ユーザー名とパスワードを入力してください。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2337
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2371
 msgid "Please select the file to upload."
 msgstr "アップロードするファイルを選択してください。"
 
@@ -4626,19 +4626,19 @@ msgstr "バックアップから復元する"
 msgid "Reveal/hide password"
 msgstr "パスワードを表示する/隠す"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2556
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2590
 msgid "Revert"
 msgstr "元に戻す"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2639
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2673
 msgid "Revert changes"
 msgstr "変更の取り消し"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2788
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2822
 msgid "Revert request failed with status <code>%h</code>"
 msgstr "取り消しのリクエストはステータス <code>%h</code> で失敗しました"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2768
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2802
 msgid "Reverting configuration…"
 msgstr "設定を元に戻しています..."
 
@@ -4742,7 +4742,7 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr "スワップ"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1388
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1410
 #: modules/luci-base/htdocs/luci-static/resources/luci.js:2942
 #: modules/luci-compat/luasrc/view/cbi/error.htm:17
 #: modules/luci-compat/luasrc/view/cbi/footer.htm:26
@@ -4753,7 +4753,7 @@ msgid "Save"
 msgstr "保存"
 
 #: modules/luci-base/htdocs/luci-static/resources/luci.js:2926
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2586
 #: modules/luci-compat/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "保存 & 適用"
@@ -4775,11 +4775,11 @@ msgstr "スキャン"
 msgid "Scheduled Tasks"
 msgstr "スケジュールタスク"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2536
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2570
 msgid "Section added"
 msgstr "追加されるセクション"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2538
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2572
 msgid "Section removed"
 msgstr "削除されるセクション"
 
@@ -4797,9 +4797,9 @@ msgstr ""
 "を選択してください。ファームウェアが正しいこと、デバイスに適していることを確"
 "認できている場合にのみ使用してください！"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1736
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1895
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1770
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1929
 msgid "Select file…"
 msgstr "ファイルを選択..."
 
@@ -4916,7 +4916,7 @@ msgstr ""
 msgid "Signal:"
 msgstr "信号:"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2355
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:213
 msgid "Size"
 msgstr "サイズ"
@@ -5039,7 +5039,7 @@ msgstr "開始"
 msgid "Start priority"
 msgstr "優先順位"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2733
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2767
 msgid "Starting configuration apply…"
 msgstr "設定の適用を開始しています..."
 
@@ -5165,7 +5165,7 @@ msgstr "プロトコルの切り替え"
 msgid "Switch to CIDR list notation"
 msgstr "CIDR リスト表記へ切替"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1671
 msgid "Symbolic link"
 msgstr "シンボリックリンク"
 
@@ -5274,7 +5274,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr "設定ファイルは以下のエラーにより読み込めませんでした:"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2630
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2664
 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 "
@@ -5466,7 +5466,7 @@ msgstr ""
 msgid "There are no active leases"
 msgstr "アクティブなリースはありません"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2748
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2782
 msgid "There are no changes to apply"
 msgstr "適用する変更はありません"
 
@@ -5578,8 +5578,8 @@ msgid ""
 "This option cannot be used because the ca-bundle package is not installed."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:943
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1074
+#: modules/luci-base/htdocs/luci-static/resources/form.js:965
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1096
 #: modules/luci-compat/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-compat/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
@@ -5801,7 +5801,7 @@ msgstr "アンマウント"
 msgid "Unnamed key"
 msgstr "名称未設定の公開鍵"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2495
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Unsaved Changes"
 msgstr "保存されていない変更"
 
@@ -5827,7 +5827,7 @@ msgstr "サポートされていないプロトコルタイプ"
 msgid "Up"
 msgstr "上へ"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2429
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Upload"
 msgstr "アップロード"
 
@@ -5844,21 +5844,21 @@ msgstr ""
 msgid "Upload archive..."
 msgstr "アーカイブをアップロード..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1823
 msgid "Upload file"
 msgstr "ファイルのアップロード"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1798
 msgid "Upload file…"
 msgstr "ファイルをアップロード…"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1713
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2417
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1747
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2451
 msgid "Upload request failed: %s"
 msgstr "アップロード リクエスト失敗: %s"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2336
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2370
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2424
 msgid "Uploading file…"
 msgstr "ファイルのアップロード..."
 
@@ -6231,7 +6231,7 @@ msgstr "受信したDNSリクエストをsyslogへ記録します"
 msgid "Write system log to file"
 msgstr "システムログをファイルに書き込む"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1763
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1785
 #: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr "はい"
@@ -6453,7 +6453,7 @@ msgstr "リンクなし"
 msgid "non-empty value"
 msgstr "空ではない値"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1455
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1477
 msgid "none"
 msgstr "なし"
 
@@ -6561,7 +6561,7 @@ msgstr "不明"
 msgid "unlimited"
 msgstr "無期限"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1658
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1680
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:76
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:137
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:368